From d60d4a03bc5b073998d1c2f7a51d0fe8592a4ced Mon Sep 17 00:00:00 2001 From: paul Date: Wed, 3 Oct 2018 19:34:04 +0200 Subject: fetch some graphics --- asm/battle_1.s | 8 ++-- asm/egg_hatch.s | 4 +- asm/link.s | 8 ++-- asm/trade.s | 12 ++--- data/data.s | 19 ++++---- data/graphics.s | 136 +++++++++++++++++++++++++++++++++++++++++++++++++++++++- 6 files changed, 161 insertions(+), 26 deletions(-) diff --git a/asm/battle_1.s b/asm/battle_1.s index 6df441371..bf9b4876f 100644 --- a/asm/battle_1.s +++ b/asm/battle_1.s @@ -298,7 +298,7 @@ LoadBattleTextboxAndBackground: @ 800F420 movs r1, 0xC0 lsls r1, 19 bl LZDecompressVram - ldr r1, _0800F458 @ =gUnknown_8D0051C + ldr r1, _0800F458 @ =gMenuMapBin movs r0, 0 movs r2, 0 movs r3, 0 @@ -315,7 +315,7 @@ LoadBattleTextboxAndBackground: @ 800F420 bx r0 .align 2, 0 _0800F454: .4byte gUnknown_8D00000 -_0800F458: .4byte gUnknown_8D0051C +_0800F458: .4byte gMenuMapBin _0800F45C: .4byte gUnknown_8D004D8 thumb_func_end LoadBattleTextboxAndBackground @@ -1393,7 +1393,7 @@ _0800FCEC: .align 2, 0 _0800FCF8: .4byte gUnknown_8D00000 _0800FCFC: - ldr r1, _0800FD10 @ =gUnknown_8D0051C + ldr r1, _0800FD10 @ =gMenuMapBin movs r0, 0 movs r2, 0 movs r3, 0 @@ -1402,7 +1402,7 @@ _0800FCFC: bl CopyBgTilemapBufferToVram b _0800FD94 .align 2, 0 -_0800FD10: .4byte gUnknown_8D0051C +_0800FD10: .4byte gMenuMapBin _0800FD14: ldr r0, _0800FD20 @ =gUnknown_8D004D8 movs r1, 0 diff --git a/asm/egg_hatch.s b/asm/egg_hatch.s index 02a47548e..20e32a74e 100644 --- a/asm/egg_hatch.s +++ b/asm/egg_hatch.s @@ -648,7 +648,7 @@ _08047174: movs r2, 0 movs r3, 0 bl sub_80F696C - ldr r1, _080471A0 @ =gUnknown_8D0051C + ldr r1, _080471A0 @ =gMenuMapBin movs r0, 0 movs r2, 0 movs r3, 0 @@ -660,7 +660,7 @@ _08047174: b _0804724A .align 2, 0 _0804719C: .4byte gUnknown_8D00000 -_080471A0: .4byte gUnknown_8D0051C +_080471A0: .4byte gMenuMapBin _080471A4: .4byte gUnknown_8D004D8 _080471A8: ldr r0, _080471BC @ =gUnknown_826011C diff --git a/asm/link.s b/asm/link.s index 378b1a2e8..68c12260c 100644 --- a/asm/link.s +++ b/asm/link.s @@ -3354,14 +3354,14 @@ _0800AE18: .4byte sub_800AF2C sub_800AE1C: @ 800AE1C push {r4,r5,lr} sub sp, 0xC - ldr r1, _0800AEB8 @ =gUnknown_8231EE4 + ldr r1, _0800AEB8 @ =gWirelessLinkDisplay4bpp movs r5, 0 str r5, [sp] movs r0, 0x1 movs r2, 0 movs r3, 0 bl sub_80F696C - ldr r1, _0800AEBC @ =gUnknown_823238C + ldr r1, _0800AEBC @ =gWirelessLinkDisplayBin movs r0, 0x1 movs r2, 0 movs r3, 0 @@ -3416,8 +3416,8 @@ sub_800AE1C: @ 800AE1C pop {r0} bx r0 .align 2, 0 -_0800AEB8: .4byte gUnknown_8231EE4 -_0800AEBC: .4byte gUnknown_823238C +_0800AEB8: .4byte gWirelessLinkDisplay4bpp +_0800AEBC: .4byte gWirelessLinkDisplayBin _0800AEC0: .4byte gUnknown_8231EC4 _0800AEC4: .4byte gUnknown_8234610 _0800AEC8: .4byte gUnknown_841DEF0 diff --git a/asm/trade.s b/asm/trade.s index 0cfac7187..588b3229a 100644 --- a/asm/trade.s +++ b/asm/trade.s @@ -7850,7 +7850,7 @@ sub_80504CC: @ 80504CC movs r2, 0 movs r3, 0 bl sub_80F696C - ldr r0, _080505BC @ =gUnknown_8D0051C + ldr r0, _080505BC @ =gMenuMapBin mov r8, r0 ldr r4, _080505C0 @ =gUnknown_201C000 adds r1, r4, 0 @@ -7897,7 +7897,7 @@ sub_80504CC: @ 80504CC .align 2, 0 _080505B4: .4byte gUnknown_826D1D4 _080505B8: .4byte gUnknown_8D00000 -_080505BC: .4byte gUnknown_8D0051C +_080505BC: .4byte gMenuMapBin _080505C0: .4byte gUnknown_201C000 _080505C4: .4byte gUnknown_8D004D8 _080505C8: .4byte gUnknown_826D1BC @@ -8490,7 +8490,7 @@ _08050AC4: ldr r1, _08050AF8 @ =0x00001241 movs r0, 0 bl SetGpuReg - ldr r0, _08050AFC @ =gUnknown_826BA5C + ldr r0, _08050AFC @ =gUnknown_3379A0Bin ldr r1, _08050B00 @ =0x06002800 bl LZ77UnCompVram movs r0, 0x8 @@ -8498,7 +8498,7 @@ _08050AC4: .align 2, 0 _08050AF4: .4byte gUnknown_2031DAC _08050AF8: .4byte 0x00001241 -_08050AFC: .4byte gUnknown_826BA5C +_08050AFC: .4byte gUnknown_3379A0Bin _08050B00: .4byte 0x06002800 _08050B04: ldr r1, _08050B28 @ =0x00001241 @@ -8529,7 +8529,7 @@ _08050B3C: movs r1, 0x30 movs r2, 0x20 bl LoadPalette - ldr r0, _08050B70 @ =gUnknown_826BF7C + ldr r0, _08050B70 @ =gWirelessSignal4bpp ldr r1, _08050B74 @ =0x06004000 bl LZ77UnCompVram ldr r0, _08050B78 @ =gUnknown_826C60C @@ -8548,7 +8548,7 @@ _08050B64: b _08050DB4 .align 2, 0 _08050B6C: .4byte gUnknown_826BF5C -_08050B70: .4byte gUnknown_826BF7C +_08050B70: .4byte gWirelessSignal4bpp _08050B74: .4byte 0x06004000 _08050B78: .4byte gUnknown_826C60C _08050B7C: .4byte 0x06009000 diff --git a/data/data.s b/data/data.s index e36981474..5cd626130 100644 --- a/data/data.s +++ b/data/data.s @@ -4,11 +4,13 @@ gUnknown_8231EC4:: @ 8231EC4 .incbin "baserom.gba", 0x231EC4, 0x20 -gUnknown_8231EE4:: @ 8231EE4 - .incbin "baserom.gba", 0x231EE4, 0x4A8 + .align 2 +gWirelessLinkDisplay4bpp:: @ 8231EE4 + .incbin "graphics/interface/wireless_link_display.4bpp.lz" -gUnknown_823238C:: @ 823238C - .incbin "baserom.gba", 0x23238C, 0x1EC + .align 2 +gWirelessLinkDisplayBin:: @ 823238C + .incbin "graphics/interface/wireless_link_display.bin.lz" gUnknown_8232578:: @ 8232578 .incbin "baserom.gba", 0x232578, 0x20 @@ -667,8 +669,9 @@ gUnknown_8269A5C:: @ 8269A5C gUnknown_826AA5C:: @ 826AA5C .incbin "baserom.gba", 0x26AA5C, 0x1000 -gUnknown_826BA5C:: @ 826BA5C - .incbin "baserom.gba", 0x26BA5C, 0x100 + .align 2 +gUnknown_3379A0Bin:: @ 826BA5C + .incbin "graphics/trade/unknown_3379A0.bin.lz" gUnknown_826BB5C:: @ 826BB5C .incbin "baserom.gba", 0x26BB5C, 0x200 @@ -679,8 +682,8 @@ gUnknown_826BD5C:: @ 826BD5C gUnknown_826BF5C:: @ 826BF5C .incbin "baserom.gba", 0x26BF5C, 0x20 -gUnknown_826BF7C:: @ 826BF7C - .incbin "baserom.gba", 0x26BF7C, 0x690 +gWirelessSignal4bpp:: @ 826BF7C + .incbin "graphics/trade/wireless_signal.4bpp.lz" gUnknown_826C60C:: @ 826C60C .incbin "baserom.gba", 0x26C60C, 0x7C8 diff --git a/data/graphics.s b/data/graphics.s index a81ff20c2..62234423a 100644 --- a/data/graphics.s +++ b/data/graphics.s @@ -6,8 +6,140 @@ gUnknown_8D00000:: @ 8D00000 gUnknown_8D004D8:: @ 8D004D8 .incbin "baserom.gba", 0xD004D8, 0x44 -gUnknown_8D0051C:: @ 8D0051C - .incbin "baserom.gba", 0xD0051C, 0x1DCC + .align 2 +gMenuMapBin:: @ 8D0051C + .incbin "graphics/interface/menu_map.bin.lz" + +gUnknown_8D00748:: @ 8D00748 + .incbin "baserom.gba", 0xD00748, 0x488 + + @ circled questionmark normal palette, different locations in ruby/emerald +gUnknown_8D00BD0:: @ 8D00BD0 + .incbin "baserom.gba", 0xD00BD0, 0x18 + + @ circled questionmark shiny palette, different locations in ruby/emerald +gUnknown_8D00BE8:: @ 8D00BE8 + .incbin "baserom.gba", 0xD00BE8, 0x18 + +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; + + .align 2 +gOldCharmap4bpp:: @ 8D00C00 + .incbin "graphics/unused/old_charmap.4bpp.lz" @from ruby + + .align 2 +gOldCharmapBin:: @ 8D013D8 + .incbin "graphics/unused/old_charmap.bin.lz" @from ruby + + .align 2 +gOldCharmapGbapal:: @ 8D01604 + .incbin "graphics/unused/old_charmap.gbapal.lz" @from ruby + + .align 2 +gSmokescreenImpact4bpp:: @ 8D0162C + .incbin "graphics/battle_anims/sprites/smokescreen_impact.4bpp.lz" + + .align 2 +gSmokescreenImpactGbapal:: @ 8D0170C + .incbin "graphics/battle_anims/sprites/smokescreen_impact.gbapal.lz" + + .align 2 +gBallPoke4bpp:: @ 8D01724 + .incbin "graphics/interface/ball/poke.4bpp.lz" + + .align 2 +gBallPokeGbaPal:: @ 8D017E0 + .incbin "graphics/interface/ball/poke.gbapal.lz" + + .align 2 +gBallGreat4bpp:: @ 8D01800 + .incbin "graphics/interface/ball/great.4bpp.lz" + + .align 2 +gBallGreatGbapal:: @ 8D018BC + .incbin "graphics/interface/ball/great.gbapal.lz" + + .align 2 +gBallSafari4bpp:: @ 8D018E0 + .incbin "graphics/interface/ball/safari.4bpp.lz" + + .align 2 +gBallSafariGbapal:: @ 8D019A4 + .incbin "graphics/interface/ball/safari.gbapal.lz" + + .align 2 +gBallUltra4bpp:: @ 8D019C8 + .incbin "graphics/interface/ball/ultra.4bpp.lz" + + .align 2 +gBallUltraGbapal:: @ 8D01A7C + .incbin "graphics/interface/ball/ultra.gbapal.lz" + + .align 2 +gBallMaster4bpp:: @ 8D01A9C + .incbin "graphics/interface/ball/master.4bpp.lz" + + .align 2 +gBallMasterGbapal:: @ 8D01B5C + .incbin "graphics/interface/ball/master.gbapal.lz" + + .align 2 +gBallNet4bpp:: @ 8D01B80 + .incbin "graphics/interface/ball/net.4bpp.lz" + + .align 2 +gBallNetGbapal:: @ 8D01C40 + .incbin "graphics/interface/ball/net.gbapal.lz" + + .align 2 +gBallDive4bpp:: @ 8D01C60 + .incbin "graphics/interface/ball/dive.4bpp.lz" + + .align 2 +gBallDiveGbapal:: @ 8D01D74 + .incbin "graphics/interface/ball/dive.gbapal.lz" + + .align 2 +gBallNest4bpp:: @ 8D01D9C + .incbin "graphics/interface/ball/nest.4bpp.lz" + + .align 2 +gBallNestGbapal:: @ 8D01E60 + .incbin "graphics/interface/ball/nest.gbapal.lz" + + .align 2 +gBallRepeat4bpp:: @ 8D01E84 + .incbin "graphics/interface/ball/repeat.4bpp.lz" + + .align 2 +gBallRepeatGbapal:: @ 8D01F44 + .incbin "graphics/interface/ball/repeat.gbapal.lz" + + .align 2 +gBallTimer4bpp:: @ 8D01F68 + .incbin "graphics/interface/ball/timer.4bpp.lz" + + .align 2 +gBallTimerGbapal:: @ 8D02060 + .incbin "graphics/interface/ball/timer.gbapal.lz" + + .align 2 +gBallLuxury4bpp:: @ 8D02084 + .incbin "graphics/interface/ball/luxury.4bpp.lz" + + .align 2 +gBallLuxuryGbapal:: @ 8D021B0 + .incbin "graphics/interface/ball/luxury.gbapal.lz" + + .align 2 +gBallPremier4bpp:: @ 8D021D8 + .incbin "graphics/interface/ball/premier.4bpp.lz" + + .align 2 +gBallPremierGbapal:: @ 8D022C8 + .incbin "graphics/interface/ball/premier.gbapal.lz" + +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; gUnknown_8D022E8:: @ 8D022E8 .incbin "baserom.gba", 0xD022E8, 0x70F0 -- cgit v1.2.3 From 43579dc5bcbbfc0de561326007213df990b02584 Mon Sep 17 00:00:00 2001 From: paul Date: Sat, 6 Oct 2018 17:01:47 +0200 Subject: add source graphics --- graphics/battle_anims/sprites/smokescreen_impact.png | Bin 0 -> 254 bytes graphics/interface/ball/dive.png | Bin 0 -> 326 bytes graphics/interface/ball/great.png | Bin 0 -> 257 bytes graphics/interface/ball/luxury.png | Bin 0 -> 350 bytes graphics/interface/ball/master.png | Bin 0 -> 260 bytes graphics/interface/ball/nest.png | Bin 0 -> 266 bytes graphics/interface/ball/net.png | Bin 0 -> 246 bytes graphics/interface/ball/poke.png | Bin 0 -> 249 bytes graphics/interface/ball/premier.png | Bin 0 -> 289 bytes graphics/interface/ball/repeat.png | Bin 0 -> 257 bytes graphics/interface/ball/safari.png | Bin 0 -> 259 bytes graphics/interface/ball/timer.png | Bin 0 -> 296 bytes graphics/interface/ball/ultra.png | Bin 0 -> 245 bytes graphics/interface/menu_map.bin | Bin 0 -> 4096 bytes graphics/interface/wireless_link_display.bin | Bin 0 -> 2048 bytes graphics/interface/wireless_link_display.png | Bin 0 -> 904 bytes graphics/unused/old_charmap.bin | Bin 0 -> 4096 bytes graphics/unused/old_charmap.png | Bin 0 -> 1934 bytes 18 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 graphics/battle_anims/sprites/smokescreen_impact.png create mode 100644 graphics/interface/ball/dive.png create mode 100644 graphics/interface/ball/great.png create mode 100644 graphics/interface/ball/luxury.png create mode 100644 graphics/interface/ball/master.png create mode 100644 graphics/interface/ball/nest.png create mode 100644 graphics/interface/ball/net.png create mode 100644 graphics/interface/ball/poke.png create mode 100644 graphics/interface/ball/premier.png create mode 100644 graphics/interface/ball/repeat.png create mode 100644 graphics/interface/ball/safari.png create mode 100644 graphics/interface/ball/timer.png create mode 100644 graphics/interface/ball/ultra.png create mode 100644 graphics/interface/menu_map.bin create mode 100644 graphics/interface/wireless_link_display.bin create mode 100644 graphics/interface/wireless_link_display.png create mode 100644 graphics/unused/old_charmap.bin create mode 100644 graphics/unused/old_charmap.png diff --git a/graphics/battle_anims/sprites/smokescreen_impact.png b/graphics/battle_anims/sprites/smokescreen_impact.png new file mode 100644 index 000000000..01a94429a Binary files /dev/null and b/graphics/battle_anims/sprites/smokescreen_impact.png differ diff --git a/graphics/interface/ball/dive.png b/graphics/interface/ball/dive.png new file mode 100644 index 000000000..5be9b1ed6 Binary files /dev/null and b/graphics/interface/ball/dive.png differ diff --git a/graphics/interface/ball/great.png b/graphics/interface/ball/great.png new file mode 100644 index 000000000..0c054d7d3 Binary files /dev/null and b/graphics/interface/ball/great.png differ diff --git a/graphics/interface/ball/luxury.png b/graphics/interface/ball/luxury.png new file mode 100644 index 000000000..8056416b2 Binary files /dev/null and b/graphics/interface/ball/luxury.png differ diff --git a/graphics/interface/ball/master.png b/graphics/interface/ball/master.png new file mode 100644 index 000000000..9787a8896 Binary files /dev/null and b/graphics/interface/ball/master.png differ diff --git a/graphics/interface/ball/nest.png b/graphics/interface/ball/nest.png new file mode 100644 index 000000000..a2fa81c1e Binary files /dev/null and b/graphics/interface/ball/nest.png differ diff --git a/graphics/interface/ball/net.png b/graphics/interface/ball/net.png new file mode 100644 index 000000000..6fef48101 Binary files /dev/null and b/graphics/interface/ball/net.png differ diff --git a/graphics/interface/ball/poke.png b/graphics/interface/ball/poke.png new file mode 100644 index 000000000..1e4aba669 Binary files /dev/null and b/graphics/interface/ball/poke.png differ diff --git a/graphics/interface/ball/premier.png b/graphics/interface/ball/premier.png new file mode 100644 index 000000000..f5aaadbaf Binary files /dev/null and b/graphics/interface/ball/premier.png differ diff --git a/graphics/interface/ball/repeat.png b/graphics/interface/ball/repeat.png new file mode 100644 index 000000000..5abe789a2 Binary files /dev/null and b/graphics/interface/ball/repeat.png differ diff --git a/graphics/interface/ball/safari.png b/graphics/interface/ball/safari.png new file mode 100644 index 000000000..0dd49aef9 Binary files /dev/null and b/graphics/interface/ball/safari.png differ diff --git a/graphics/interface/ball/timer.png b/graphics/interface/ball/timer.png new file mode 100644 index 000000000..2b63f6795 Binary files /dev/null and b/graphics/interface/ball/timer.png differ diff --git a/graphics/interface/ball/ultra.png b/graphics/interface/ball/ultra.png new file mode 100644 index 000000000..1221cec4e Binary files /dev/null and b/graphics/interface/ball/ultra.png differ diff --git a/graphics/interface/menu_map.bin b/graphics/interface/menu_map.bin new file mode 100644 index 000000000..8a7b3f1f0 Binary files /dev/null and b/graphics/interface/menu_map.bin differ diff --git a/graphics/interface/wireless_link_display.bin b/graphics/interface/wireless_link_display.bin new file mode 100644 index 000000000..1832ae850 Binary files /dev/null and b/graphics/interface/wireless_link_display.bin differ diff --git a/graphics/interface/wireless_link_display.png b/graphics/interface/wireless_link_display.png new file mode 100644 index 000000000..3946b9b22 Binary files /dev/null and b/graphics/interface/wireless_link_display.png differ diff --git a/graphics/unused/old_charmap.bin b/graphics/unused/old_charmap.bin new file mode 100644 index 000000000..aa15ea36e Binary files /dev/null and b/graphics/unused/old_charmap.bin differ diff --git a/graphics/unused/old_charmap.png b/graphics/unused/old_charmap.png new file mode 100644 index 000000000..b5ea6e803 Binary files /dev/null and b/graphics/unused/old_charmap.png differ -- cgit v1.2.3 From efebe909c604beff57c7e2481a0de83dfe084d21 Mon Sep 17 00:00:00 2001 From: paul Date: Sat, 6 Oct 2018 17:21:26 +0200 Subject: fix not building data.o --- data/data.s | 1 + graphics/trade/unknown_3379A0.bin | Bin 0 -> 2048 bytes graphics/trade/wireless_signal.bin | Bin 0 -> 2048 bytes graphics/trade/wireless_signal.png | Bin 0 -> 1307 bytes 4 files changed, 1 insertion(+) create mode 100644 graphics/trade/unknown_3379A0.bin create mode 100644 graphics/trade/wireless_signal.bin create mode 100644 graphics/trade/wireless_signal.png diff --git a/data/data.s b/data/data.s index 5cd626130..15a5b2120 100644 --- a/data/data.s +++ b/data/data.s @@ -12,6 +12,7 @@ gWirelessLinkDisplay4bpp:: @ 8231EE4 gWirelessLinkDisplayBin:: @ 823238C .incbin "graphics/interface/wireless_link_display.bin.lz" + .align 2 gUnknown_8232578:: @ 8232578 .incbin "baserom.gba", 0x232578, 0x20 diff --git a/graphics/trade/unknown_3379A0.bin b/graphics/trade/unknown_3379A0.bin new file mode 100644 index 000000000..d1e364a29 Binary files /dev/null and b/graphics/trade/unknown_3379A0.bin differ diff --git a/graphics/trade/wireless_signal.bin b/graphics/trade/wireless_signal.bin new file mode 100644 index 000000000..4ce5d18b8 Binary files /dev/null and b/graphics/trade/wireless_signal.bin differ diff --git a/graphics/trade/wireless_signal.png b/graphics/trade/wireless_signal.png new file mode 100644 index 000000000..a48c70ae7 Binary files /dev/null and b/graphics/trade/wireless_signal.png differ -- cgit v1.2.3 From 0c6d127007b8e0830f89b06bded74ec3cb9cc512 Mon Sep 17 00:00:00 2001 From: paul Date: Sat, 6 Oct 2018 20:33:33 +0200 Subject: copy graphics_file_rules.mk from emerald and modify Makefile to get multi-graphic-sprites working --- Makefile | 2 + graphics_file_rules.mk | 671 +++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 673 insertions(+) create mode 100644 graphics_file_rules.mk diff --git a/Makefile b/Makefile index 04690e382..a7dc34802 100644 --- a/Makefile +++ b/Makefile @@ -88,6 +88,8 @@ clean: tidy tidy: rm -f $(ROM) $(ELF) $(MAP) rm -r build/* + +include graphics_file_rules.mk %.s: ; %.png: ; diff --git a/graphics_file_rules.mk b/graphics_file_rules.mk new file mode 100644 index 000000000..fb250ad82 --- /dev/null +++ b/graphics_file_rules.mk @@ -0,0 +1,671 @@ +MONSTILLFRONTGFXDIR := graphics/pokemon/front_pics +MONBACKGFXDIR := graphics/pokemon/back_pics +MONFRONTGFXDIR := graphics/pokemon/anim_front_pics +MONPALDIR := graphics/pokemon/palettes +TILESETGFXDIR := data/tilesets +FONTGFXDIR := data/graphics/fonts +INTERFACEGFXDIR := graphics/interface +BTLANMSPRGFXDIR := graphics/battle_anims/sprites +UNUSEDGFXDIR := graphics/unused +UNKNOWNGFXDIR := graphics/unknown +BATINTGFXDIR := graphics/battle_interface +MASKSGFXDIR := graphics/battle_anims/masks +BATTRANSGFXDIR := graphics/battle_transitions +TYPESGFXDIR := graphics/types +RAYQUAZAGFXDIR := graphics/rayquaza_scene +ROULETTEGFXDIR := graphics/roulette +SLOTMACHINEGFXDIR := graphics/slot_machine +PKNAVGFXDIR := graphics/pokenav +PKNAVOPTIONSGFXDIR := graphics/pokenav/options +PSSGFXDIR := graphics/pokemon_storage +EVENTOBJGFXDIR := graphics/event_objects +MISCGFXDIR := graphics/misc + +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 + +$(MONSTILLFRONTGFXDIR)/castform_still_front_pic.4bpp: $(MONSTILLFRONTGFXDIR)/castform_normal_form_still_front_pic.4bpp \ + $(MONSTILLFRONTGFXDIR)/castform_sunny_form_still_front_pic.4bpp \ + $(MONSTILLFRONTGFXDIR)/castform_rainy_form_still_front_pic.4bpp \ + $(MONSTILLFRONTGFXDIR)/castform_snowy_form_still_front_pic.4bpp + @cat $^ >$@ + +$(MONBACKGFXDIR)/castform_back_pic.4bpp: $(MONBACKGFXDIR)/castform_normal_form_back_pic.4bpp \ + $(MONBACKGFXDIR)/castform_sunny_form_back_pic.4bpp \ + $(MONBACKGFXDIR)/castform_rainy_form_back_pic.4bpp \ + $(MONBACKGFXDIR)/castform_snowy_form_back_pic.4bpp + @cat $^ >$@ + +$(MONFRONTGFXDIR)/castform_front_pic.4bpp: $(MONFRONTGFXDIR)/castform_normal_form_front_pic.4bpp \ + $(MONFRONTGFXDIR)/castform_sunny_form_front_pic.4bpp \ + $(MONFRONTGFXDIR)/castform_rainy_form_front_pic.4bpp \ + $(MONFRONTGFXDIR)/castform_snowy_form_front_pic.4bpp + @cat $^ >$@ + +$(MONPALDIR)/castform_palette.gbapal: $(MONPALDIR)/castform_normal_form_palette.gbapal \ + $(MONPALDIR)/castform_sunny_form_palette.gbapal \ + $(MONPALDIR)/castform_rainy_form_palette.gbapal \ + $(MONPALDIR)/castform_snowy_form_palette.gbapal + @cat $^ >$@ + +$(MONPALDIR)/castform_shiny_palette.gbapal: $(MONPALDIR)/castform_normal_form_shiny_palette.gbapal \ + $(MONPALDIR)/castform_sunny_form_shiny_palette.gbapal \ + $(MONPALDIR)/castform_rainy_form_shiny_palette.gbapal \ + $(MONPALDIR)/castform_snowy_form_shiny_palette.gbapal + @cat $^ >$@ + +$(TILESETGFXDIR)/secondary/petalburg/tiles.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 159 + +$(TILESETGFXDIR)/secondary/rustboro/tiles.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 498 + +$(TILESETGFXDIR)/secondary/dewford/tiles.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 503 + +$(TILESETGFXDIR)/secondary/slateport/tiles.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 504 + +$(TILESETGFXDIR)/secondary/mauville/tiles.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 503 + +$(TILESETGFXDIR)/secondary/lavaridge/tiles.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 450 + +$(TILESETGFXDIR)/secondary/fortree/tiles.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 493 + +$(TILESETGFXDIR)/secondary/pacifidlog/tiles.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 504 + +$(TILESETGFXDIR)/secondary/sootopolis/tiles.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 328 + +$(TILESETGFXDIR)/secondary/battle_frontier_outside_west/tiles.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 508 + +$(TILESETGFXDIR)/secondary/battle_frontier_outside_east/tiles.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 508 + +$(TILESETGFXDIR)/primary/building/tiles.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 502 + +$(TILESETGFXDIR)/secondary/shop/tiles.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 502 + +$(TILESETGFXDIR)/secondary/pokemon_center/tiles.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 478 + +$(TILESETGFXDIR)/secondary/cave/tiles.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 425 + +$(TILESETGFXDIR)/secondary/pokemon_school/tiles.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 278 + +$(TILESETGFXDIR)/secondary/pokemon_fan_club/tiles.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 319 + +$(TILESETGFXDIR)/secondary/unused_1/tiles.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 17 + +$(TILESETGFXDIR)/secondary/meteor_falls/tiles.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 460 + +$(TILESETGFXDIR)/secondary/oceanic_museum/tiles.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 319 + +$(TILESETGFXDIR)/secondary/cable_club/unknown_tiles.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 120 + +$(TILESETGFXDIR)/secondary/seashore_house/tiles.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 312 + +$(TILESETGFXDIR)/secondary/pretty_petal_flower_shop/tiles.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 345 + +$(TILESETGFXDIR)/secondary/pokemon_day_care/tiles.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 355 + +$(TILESETGFXDIR)/secondary/secret_base/brown_cave/unused_tiles.4bpp: $(TILESETGFXDIR)/secondary/secret_base/brown_cave/tiles.png + $(GFX) $< $@ -num_tiles 82 + +$(TILESETGFXDIR)/secondary/secret_base/tree/unused_tiles.4bpp: $(TILESETGFXDIR)/secondary/secret_base/tree/tiles.png + $(GFX) $< $@ -num_tiles 82 + +$(TILESETGFXDIR)/secondary/secret_base/shrub/unused_tiles.4bpp: $(TILESETGFXDIR)/secondary/secret_base/shrub/tiles.png + $(GFX) $< $@ -num_tiles 82 + +$(TILESETGFXDIR)/secondary/secret_base/blue_cave/unused_tiles.4bpp: $(TILESETGFXDIR)/secondary/secret_base/blue_cave/tiles.png + $(GFX) $< $@ -num_tiles 82 + +$(TILESETGFXDIR)/secondary/secret_base/yellow_cave/unused_tiles.4bpp: $(TILESETGFXDIR)/secondary/secret_base/yellow_cave/tiles.png + $(GFX) $< $@ -num_tiles 82 + +$(TILESETGFXDIR)/secondary/secret_base/red_cave/unused_tiles.4bpp: $(TILESETGFXDIR)/secondary/secret_base/red_cave/tiles.png + $(GFX) $< $@ -num_tiles 82 + +$(TILESETGFXDIR)/secondary/secret_base/brown_cave/tiles.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 83 + +$(TILESETGFXDIR)/secondary/secret_base/tree/tiles.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 83 + +$(TILESETGFXDIR)/secondary/secret_base/shrub/tiles.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 83 + +$(TILESETGFXDIR)/secondary/secret_base/blue_cave/tiles.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 83 + +$(TILESETGFXDIR)/secondary/secret_base/yellow_cave/tiles.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 83 + +$(TILESETGFXDIR)/secondary/secret_base/red_cave/tiles.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 83 + +$(TILESETGFXDIR)/secondary/inside_of_truck/tiles.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 62 + +$(TILESETGFXDIR)/secondary/contest/tiles.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 430 + +$(TILESETGFXDIR)/secondary/lilycove_museum/tiles.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 431 + +$(TILESETGFXDIR)/secondary/lab/tiles.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 500 + +$(TILESETGFXDIR)/secondary/underwater/tiles.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 500 + +$(TILESETGFXDIR)/secondary/generic_building/tiles.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 509 + +$(TILESETGFXDIR)/secondary/mauville_game_corner/tiles.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 469 + +$(TILESETGFXDIR)/secondary/unused_2/tiles.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 150 + +$(TILESETGFXDIR)/secondary/rustboro_gym/tiles.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 60 + +$(TILESETGFXDIR)/secondary/dewford_gym/tiles.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 61 + +$(TILESETGFXDIR)/secondary/lavaridge_gym/tiles.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 54 + +$(TILESETGFXDIR)/secondary/petalburg_gym/tiles.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 148 + +$(TILESETGFXDIR)/secondary/fortree_gym/tiles.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 61 + +$(TILESETGFXDIR)/secondary/mossdeep_gym/tiles.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 82 + +$(TILESETGFXDIR)/secondary/sootopolis_gym/tiles.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 484 + +$(TILESETGFXDIR)/secondary/trick_house_puzzle/tiles.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 294 + +$(TILESETGFXDIR)/secondary/inside_ship/tiles.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 342 + +$(TILESETGFXDIR)/secondary/elite_four/tiles.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 505 + +$(TILESETGFXDIR)/secondary/battle_frontier/tiles.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 310 + +$(TILESETGFXDIR)/secondary/battle_factory/tiles.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 424 + +$(TILESETGFXDIR)/secondary/battle_pike/tiles.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 382 + +$(TILESETGFXDIR)/secondary/mirage_tower/tiles.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 420 + +$(TILESETGFXDIR)/secondary/mossdeep_game_corner/tiles.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 95 + +$(TILESETGFXDIR)/secondary/island_harbor/tiles.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 503 + +$(TILESETGFXDIR)/secondary/trainer_hill/tiles.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 374 + +$(TILESETGFXDIR)/secondary/navel_rock/tiles.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 420 + +$(TILESETGFXDIR)/secondary/battle_frontier_ranking_hall/tiles.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 136 + +$(TILESETGFXDIR)/secondary/mystery_events_house/tiles.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 509 + +$(FONTGFXDIR)/font0.latfont: $(FONTGFXDIR)/font0_latin.png + $(GFX) $< $@ + +$(FONTGFXDIR)/font1.latfont: $(FONTGFXDIR)/font1_latin.png + $(GFX) $< $@ + +$(FONTGFXDIR)/font2.latfont: $(FONTGFXDIR)/font2_latin.png + $(GFX) $< $@ + +$(FONTGFXDIR)/font7.latfont: $(FONTGFXDIR)/font7_latin.png + $(GFX) $< $@ + +$(FONTGFXDIR)/font8.latfont: $(FONTGFXDIR)/font8_latin.png + $(GFX) $< $@ + +$(FONTGFXDIR)/font0.hwjpnfont: $(FONTGFXDIR)/font0_japanese.png + $(GFX) $< $@ + +$(FONTGFXDIR)/font1.hwjpnfont: $(FONTGFXDIR)/font1_japanese.png + $(GFX) $< $@ + +$(FONTGFXDIR)/font9.hwjpnfont: $(FONTGFXDIR)/font9_japanese.png + $(GFX) $< $@ + +$(FONTGFXDIR)/font2.fwjpnfont: $(FONTGFXDIR)/font2_japanese.png + $(GFX) $< $@ + +$(FONTGFXDIR)/font6.fwjpnfont: $(FONTGFXDIR)/font6_braille.png + $(GFX) $< $@ + +$(FONTGFXDIR)/unused_frlg_male.fwjpnfont: $(FONTGFXDIR)/unused_japanese_frlg_male_font.png + $(GFX) $< $@ + +$(FONTGFXDIR)/unused_frlg_female.fwjpnfont: $(FONTGFXDIR)/unused_japanese_frlg_female_font.png + $(GFX) $< $@ + +$(FONTGFXDIR)/down_arrow.4bpp: %.4bpp: %.png + $(GFX) $< $@ + +$(FONTGFXDIR)/down_arrow_rs.4bpp: %.4bpp: %.png + $(GFX) $< $@ + +$(FONTGFXDIR)/unused_frlg_blanked_down_arrow.4bpp: %.4bpp: %.png + $(GFX) $< $@ + +$(FONTGFXDIR)/unused_frlg_down_arrow.4bpp: %.4bpp: %.png + $(GFX) $< $@ + +$(FONTGFXDIR)/keypad_icons.4bpp: %.4bpp: %.png + $(GFX) $< $@ + +graphics/title_screen/pokemon_logo.gbapal: %.gbapal: %.pal + $(GFX) $< $@ -num_colors 224 + +graphics/link_games/pkmnjump_bg.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 63 + +graphics/pokenav/region_map.8bpp: %.8bpp: %.png + $(GFX) $< $@ -num_tiles 233 + +$(MISCGFXDIR)/japanese_hof.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 29 + +$(INTERFACEGFXDIR)/menu.gbapal: $(INTERFACEGFXDIR)/menu_0.gbapal \ + $(INTERFACEGFXDIR)/menu_1.gbapal + @cat $^ >$@ + +$(BTLANMSPRGFXDIR)/010.4bpp: $(BTLANMSPRGFXDIR)/010_0.4bpp \ + $(BTLANMSPRGFXDIR)/010_1.4bpp \ + $(BTLANMSPRGFXDIR)/010_2.4bpp \ + $(BTLANMSPRGFXDIR)/010_3.4bpp + @cat $^ >$@ + +$(UNUSEDGFXDIR)/obi_palpak1.gbapal: $(UNUSEDGFXDIR)/old_pal1.gbapal \ + $(UNUSEDGFXDIR)/old_pal2.gbapal \ + $(UNUSEDGFXDIR)/old_pal3.gbapal + @cat $^ >$@ + +$(UNUSEDGFXDIR)/obi_palpak3.gbapal: $(UNUSEDGFXDIR)/old_pal5.gbapal \ + $(UNUSEDGFXDIR)/old_pal6.gbapal \ + $(UNUSEDGFXDIR)/old_pal7.gbapal + @cat $^ >$@ + +$(UNUSEDGFXDIR)/obi1.4bpp: $(UNUSEDGFXDIR)/old_bulbasaur.4bpp \ + $(UNUSEDGFXDIR)/old_charizard.4bpp + @cat $^ >$@ + +$(UNUSEDGFXDIR)/obi2.4bpp: $(UNUSEDGFXDIR)/old_bulbasaur2.4bpp \ + $(UNUSEDGFXDIR)/old_battle_interface_1.4bpp \ + $(UNUSEDGFXDIR)/old_battle_interface_2.4bpp \ + $(UNUSEDGFXDIR)/old_battle_interface_3.4bpp + @cat $^ >$@ + +$(INTERFACEGFXDIR)/hp_numbers.4bpp: $(INTERFACEGFXDIR)/hpbar_anim.4bpp \ + $(INTERFACEGFXDIR)/numbers1.4bpp \ + $(INTERFACEGFXDIR)/numbers2.4bpp + @cat $^ >$@ + +$(UNUSEDGFXDIR)/redyellowgreen_frame.bin: $(UNUSEDGFXDIR)/red_frame.bin \ + $(UNUSEDGFXDIR)/yellow_frame.bin \ + $(UNUSEDGFXDIR)/green_frame.bin \ + $(UNUSEDGFXDIR)/blank_frame.bin + @cat $^ >$@ + +$(UNUSEDGFXDIR)/color_frames.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 353 + +$(BATINTGFXDIR)/unused_window2bar.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 5 + +$(UNUSEDGFXDIR)/old_contest.4bpp: $(UNUSEDGFXDIR)/old_contest_frame_1.4bpp \ + $(UNUSEDGFXDIR)/old_contest_floor.4bpp \ + $(UNUSEDGFXDIR)/old_contest_frame_2.4bpp \ + $(UNUSEDGFXDIR)/old_contest_symbols.4bpp \ + $(UNUSEDGFXDIR)/old_contest_meter.4bpp \ + $(UNUSEDGFXDIR)/old_contest_classes.4bpp \ + $(UNUSEDGFXDIR)/old_contest_numbers.4bpp + @cat $^ >$@ + +$(UNUSEDGFXDIR)/old_contest_2.4bpp: $(UNUSEDGFXDIR)/old_contest_2_1.4bpp \ + $(UNUSEDGFXDIR)/old_contest_2_2.4bpp + @cat $^ >$@ + +$(UNKNOWNGFXDIR)/unknown_C19470.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 36 + +$(BTLANMSPRGFXDIR)/141.4bpp: $(BTLANMSPRGFXDIR)/141_0.4bpp \ + $(BTLANMSPRGFXDIR)/141_1.4bpp \ + $(BTLANMSPRGFXDIR)/141_2.4bpp \ + $(BTLANMSPRGFXDIR)/141_3.4bpp \ + $(BTLANMSPRGFXDIR)/141_4.4bpp + @cat $^ >$@ + +$(BTLANMSPRGFXDIR)/074.4bpp: $(BTLANMSPRGFXDIR)/074_0.4bpp \ + $(BTLANMSPRGFXDIR)/074_1.4bpp + @cat $^ >$@ + +$(BTLANMSPRGFXDIR)/159.4bpp: $(BTLANMSPRGFXDIR)/159_0.4bpp \ + $(BTLANMSPRGFXDIR)/159_1.4bpp + @cat $^ >$@ + +$(BTLANMSPRGFXDIR)/001.4bpp: $(BTLANMSPRGFXDIR)/001_0.4bpp \ + $(BTLANMSPRGFXDIR)/001_1.4bpp + @cat $^ >$@ + +$(MASKSGFXDIR)/unknown_C2EA50.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 14 + +$(BATTRANSGFXDIR)/vs_frame.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 16 + +$(INTERFACEGFXDIR)/party_menu_misc.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 62 + +$(TYPESGFXDIR)/move_types.4bpp: $(types:%=$(TYPESGFXDIR)/%.4bpp) $(contest_types:%=$(TYPESGFXDIR)/contest_%.4bpp) + @cat $^ >$@ + +$(TYPESGFXDIR)/move_types.gbapal: $(TYPESGFXDIR)/move_types_1.gbapal \ + $(TYPESGFXDIR)/move_types_2.gbapal \ + $(TYPESGFXDIR)/move_types_3.gbapal + @cat $^ >$@ + +$(INTERFACEGFXDIR)/bag_screen.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 53 + +$(RAYQUAZAGFXDIR)/rayquaza.8bpp: %.8bpp: %.png + $(GFX) $< $@ -num_tiles 227 + +$(RAYQUAZAGFXDIR)/overcast.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 313 + +$(RAYQUAZAGFXDIR)/rayquaza_fly1.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 124 + +$(RAYQUAZAGFXDIR)/rayquaza_tail_fix.4bpp: $(RAYQUAZAGFXDIR)/rayquaza_tail.4bpp + cp $< $@ + head -c 12 /dev/zero >> $@ + +$(RAYQUAZAGFXDIR)/chase_streaks.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 19 + +$(RAYQUAZAGFXDIR)/rayquaza_chase.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 155 + +graphics/picture_frame/frame5.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 86 + +$(ROULETTEGFXDIR)/roulette_tilt.4bpp: $(ROULETTEGFXDIR)/shroomish.4bpp \ + $(ROULETTEGFXDIR)/tailow.4bpp + @cat $^ >$@ + +$(ROULETTEGFXDIR)/poke_icons2.4bpp: $(ROULETTEGFXDIR)/wynaut.4bpp \ + $(ROULETTEGFXDIR)/azurill.4bpp \ + $(ROULETTEGFXDIR)/skitty.4bpp \ + $(ROULETTEGFXDIR)/makuhita.4bpp + @cat $^ >$@ + +$(BATTRANSGFXDIR)/85BBC14.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 53 + +$(BATTRANSGFXDIR)/rayquaza.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 938 + +$(BATTRANSGFXDIR)/frontier_square_1.4bpp: $(BATTRANSGFXDIR)/frontier_squares_blanktiles.4bpp \ + $(BATTRANSGFXDIR)/frontier_squares_1.4bpp + @cat $^ >$@ + +$(BATTRANSGFXDIR)/frontier_square_2.4bpp: $(BATTRANSGFXDIR)/frontier_squares_blanktiles.4bpp \ + $(BATTRANSGFXDIR)/frontier_squares_2.4bpp + @cat $^ >$@ + +$(BATTRANSGFXDIR)/frontier_square_3.4bpp: $(BATTRANSGFXDIR)/frontier_squares_blanktiles.4bpp \ + $(BATTRANSGFXDIR)/frontier_squares_3.4bpp + @cat $^ >$@ + +$(BATTRANSGFXDIR)/frontier_square_4.4bpp: $(BATTRANSGFXDIR)/frontier_squares_blanktiles.4bpp \ + $(BATTRANSGFXDIR)/frontier_squares_4.4bpp + @cat $^ >$@ + +$(SLOTMACHINEGFXDIR)/reel_time_gfx.4bpp: $(SLOTMACHINEGFXDIR)/reel_time_pikachu.4bpp \ + $(SLOTMACHINEGFXDIR)/reel_time_machine.4bpp + @cat $^ >$@ + +$(UNUSEDGFXDIR)/intro_birch_beauty.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 822 + +$(PSSGFXDIR)/forest_frame.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 55 + +$(PSSGFXDIR)/forest.4bpp: $(PSSGFXDIR)/forest_frame.4bpp $(PSSGFXDIR)/forest_bg.4bpp + @cat $^ >$@ + +$(PSSGFXDIR)/city_frame.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 52 + +$(PSSGFXDIR)/city.4bpp: $(PSSGFXDIR)/city_frame.4bpp $(PSSGFXDIR)/city_bg.4bpp + @cat $^ >$@ + +$(PSSGFXDIR)/desert.4bpp: $(PSSGFXDIR)/desert_frame.4bpp $(PSSGFXDIR)/desert_bg.4bpp + @cat $^ >$@ + +$(PSSGFXDIR)/savanna_frame.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 45 + +$(PSSGFXDIR)/savanna_bg.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 23 + +$(PSSGFXDIR)/savanna.4bpp: $(PSSGFXDIR)/savanna_frame.4bpp $(PSSGFXDIR)/savanna_bg.4bpp + @cat $^ >$@ + +$(PSSGFXDIR)/crag_frame.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 49 + +$(PSSGFXDIR)/crag.4bpp: $(PSSGFXDIR)/crag_frame.4bpp $(PSSGFXDIR)/crag_bg.4bpp + @cat $^ >$@ + +$(PSSGFXDIR)/volcano_frame.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 56 + +$(PSSGFXDIR)/volcano.4bpp: $(PSSGFXDIR)/volcano_frame.4bpp $(PSSGFXDIR)/volcano_bg.4bpp + @cat $^ >$@ + +$(PSSGFXDIR)/snow_frame.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 57 + +$(PSSGFXDIR)/snow.4bpp: $(PSSGFXDIR)/snow_frame.4bpp $(PSSGFXDIR)/snow_bg.4bpp + @cat $^ >$@ + +$(PSSGFXDIR)/cave_frame.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 55 + +$(PSSGFXDIR)/cave.4bpp: $(PSSGFXDIR)/cave_frame.4bpp $(PSSGFXDIR)/cave_bg.4bpp + @cat $^ >$@ + +$(PSSGFXDIR)/beach_frame.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 46 + +$(PSSGFXDIR)/beach_bg.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 23 + +$(PSSGFXDIR)/beach.4bpp: $(PSSGFXDIR)/beach_frame.4bpp $(PSSGFXDIR)/beach_bg.4bpp + @cat $^ >$@ + +$(PSSGFXDIR)/seafloor_frame.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 54 + +$(PSSGFXDIR)/seafloor.4bpp: $(PSSGFXDIR)/seafloor_frame.4bpp $(PSSGFXDIR)/seafloor_bg.4bpp + @cat $^ >$@ + +$(PSSGFXDIR)/river_frame.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 51 + +$(PSSGFXDIR)/river_bg.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 11 + +$(PSSGFXDIR)/river.4bpp: $(PSSGFXDIR)/river_frame.4bpp $(PSSGFXDIR)/river_bg.4bpp + @cat $^ >$@ + +$(PSSGFXDIR)/sky_frame.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 45 + +$(PSSGFXDIR)/sky.4bpp: $(PSSGFXDIR)/sky_frame.4bpp $(PSSGFXDIR)/sky_bg.4bpp + @cat $^ >$@ + +$(PSSGFXDIR)/polkadot_frame.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 54 + +$(PSSGFXDIR)/polkadot.4bpp: $(PSSGFXDIR)/polkadot_frame.4bpp $(PSSGFXDIR)/polkadot_bg.4bpp + @cat $^ >$@ + +$(PSSGFXDIR)/pokecenter_frame.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 35 + +$(PSSGFXDIR)/pokecenter.4bpp: $(PSSGFXDIR)/pokecenter_frame.4bpp $(PSSGFXDIR)/pokecenter_bg.4bpp + @cat $^ >$@ + +$(PSSGFXDIR)/machine_frame.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 33 + +$(PSSGFXDIR)/machine.4bpp: $(PSSGFXDIR)/machine_frame.4bpp $(PSSGFXDIR)/machine_bg.4bpp + @cat $^ >$@ + +$(PSSGFXDIR)/plain_frame.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 18 + +$(PSSGFXDIR)/plain.4bpp: $(PSSGFXDIR)/plain_frame.4bpp $(PSSGFXDIR)/plain_bg.4bpp + @cat $^ >$@ + +$(PSSGFXDIR)/friends_frame1.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 57 + +$(PSSGFXDIR)/friends_frame2.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 57 + +$(PSSGFXDIR)/zigzagoon.4bpp: $(PSSGFXDIR)/friends_frame1.4bpp $(PSSGFXDIR)/zigzagoon_bg.4bpp + @cat $^ >$@ + +$(PSSGFXDIR)/screen.4bpp: $(PSSGFXDIR)/friends_frame1.4bpp $(PSSGFXDIR)/screen_bg.4bpp + @cat $^ >$@ + +$(PSSGFXDIR)/horizontal.4bpp: $(PSSGFXDIR)/friends_frame1.4bpp $(PSSGFXDIR)/horizontal_bg.4bpp + @cat $^ >$@ + +$(PSSGFXDIR)/diagonal.4bpp: $(PSSGFXDIR)/friends_frame1.4bpp $(PSSGFXDIR)/diagonal_bg.4bpp + @cat $^ >$@ + +$(PSSGFXDIR)/block.4bpp: $(PSSGFXDIR)/friends_frame1.4bpp $(PSSGFXDIR)/block_bg.4bpp + @cat $^ >$@ + +$(PSSGFXDIR)/ribbon.4bpp: $(PSSGFXDIR)/friends_frame1.4bpp $(PSSGFXDIR)/ribbon_bg.4bpp + @cat $^ >$@ + +$(PSSGFXDIR)/pokecenter2.4bpp: $(PSSGFXDIR)/friends_frame1.4bpp $(PSSGFXDIR)/pokecenter2_bg.4bpp + @cat $^ >$@ + +$(PSSGFXDIR)/frame.4bpp: $(PSSGFXDIR)/friends_frame1.4bpp $(PSSGFXDIR)/frame_bg.4bpp + @cat $^ >$@ + +$(PSSGFXDIR)/blank.4bpp: $(PSSGFXDIR)/friends_frame1.4bpp $(PSSGFXDIR)/blank_bg.4bpp + @cat $^ >$@ + +$(PSSGFXDIR)/circles.4bpp: $(PSSGFXDIR)/friends_frame1.4bpp $(PSSGFXDIR)/circles_bg.4bpp + @cat $^ >$@ + +$(PSSGFXDIR)/azumarill.4bpp: $(PSSGFXDIR)/friends_frame2.4bpp $(PSSGFXDIR)/azumarill_bg.4bpp + @cat $^ >$@ + +$(PSSGFXDIR)/pikachu.4bpp: $(PSSGFXDIR)/friends_frame2.4bpp $(PSSGFXDIR)/pikachu_bg.4bpp + @cat $^ >$@ + +$(PSSGFXDIR)/legendary.4bpp: $(PSSGFXDIR)/friends_frame2.4bpp $(PSSGFXDIR)/legendary_bg.4bpp + @cat $^ >$@ + +$(PSSGFXDIR)/dusclops.4bpp: $(PSSGFXDIR)/friends_frame2.4bpp $(PSSGFXDIR)/dusclops_bg.4bpp + @cat $^ >$@ + +$(PSSGFXDIR)/ludicolo.4bpp: $(PSSGFXDIR)/friends_frame2.4bpp $(PSSGFXDIR)/ludicolo_bg.4bpp + @cat $^ >$@ + +$(PSSGFXDIR)/whiscash.4bpp: $(PSSGFXDIR)/friends_frame2.4bpp $(PSSGFXDIR)/whiscash_bg.4bpp + @cat $^ >$@ + +$(EVENTOBJGFXDIR)/pics/effects/unknown_4F6D38/0.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 11 + +$(INTERFACEGFXDIR)/selector_outline.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 8 + +$(BATTRANSGFXDIR)/frontier_transition.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 43 + +$(PKNAVOPTIONSGFXDIR)/options.4bpp: $(PKNAVOPTIONSGFXDIR)/hoenn_map.4bpp \ + $(PKNAVOPTIONSGFXDIR)/condition.4bpp \ + $(PKNAVOPTIONSGFXDIR)/match_call.4bpp \ + $(PKNAVOPTIONSGFXDIR)/ribbons.4bpp \ + $(PKNAVOPTIONSGFXDIR)/switch_off.4bpp \ + $(PKNAVOPTIONSGFXDIR)/party.4bpp \ + $(PKNAVOPTIONSGFXDIR)/search.4bpp \ + $(PKNAVOPTIONSGFXDIR)/cool.4bpp \ + $(PKNAVOPTIONSGFXDIR)/beauty.4bpp \ + $(PKNAVOPTIONSGFXDIR)/cute.4bpp \ + $(PKNAVOPTIONSGFXDIR)/smart.4bpp \ + $(PKNAVOPTIONSGFXDIR)/tough.4bpp \ + $(PKNAVOPTIONSGFXDIR)/cancel.4bpp + @cat $^ >$@ + +$(PKNAVGFXDIR)/header.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 53 + +$(PKNAVGFXDIR)/outline.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 53 + +$(PKNAVGFXDIR)/ui_matchcall.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 13 + +$(INTERFACEGFXDIR)/region_map.8bpp: %.8bpp: %.png + $(GFX) $< $@ -num_tiles 232 + +$(INTERFACEGFXDIR)/region_map_affine.8bpp: %.8bpp: %.png + $(GFX) $< $@ -num_tiles 233 + +$(MISCGFXDIR)/birch_help.4bpp: $(MISCGFXDIR)/birch_bag.4bpp $(MISCGFXDIR)/birch_grass.4bpp + @cat $^ >$@ -- cgit v1.2.3 From 1ee1ebe23a49bbbc040a43e0e6fb81badc588f22 Mon Sep 17 00:00:00 2001 From: paul Date: Sun, 7 Oct 2018 00:16:05 +0200 Subject: push through first incbin, two files are apparently missing --- asm/pokeball.s | 4 +- data/graphics.s | 489 ++++++++++++++++++++++- graphics/battle_anims/sprites/000.png | Bin 0 -> 223 bytes graphics/battle_anims/sprites/003.png | Bin 0 -> 197 bytes graphics/battle_anims/sprites/004.png | Bin 0 -> 233 bytes graphics/battle_anims/sprites/005.png | Bin 0 -> 200 bytes graphics/battle_anims/sprites/006.png | Bin 0 -> 275 bytes graphics/battle_anims/sprites/007.png | Bin 0 -> 334 bytes graphics/battle_anims/sprites/008.png | Bin 0 -> 147 bytes graphics/battle_anims/sprites/009.png | Bin 0 -> 635 bytes graphics/battle_anims/sprites/010.pal | 19 + graphics/battle_anims/sprites/010_0.png | Bin 0 -> 346 bytes graphics/battle_anims/sprites/010_1.png | Bin 0 -> 272 bytes graphics/battle_anims/sprites/010_2.png | Bin 0 -> 257 bytes graphics/battle_anims/sprites/010_3.png | Bin 0 -> 222 bytes graphics/battle_anims/sprites/011.png | Bin 0 -> 212 bytes graphics/battle_anims/sprites/012.png | Bin 0 -> 199 bytes graphics/battle_anims/sprites/013.png | Bin 0 -> 161 bytes graphics/battle_anims/sprites/015.png | Bin 0 -> 199 bytes graphics/battle_anims/sprites/016.png | Bin 0 -> 198 bytes graphics/battle_anims/sprites/017.png | Bin 0 -> 149 bytes graphics/battle_anims/sprites/019.png | Bin 0 -> 255 bytes graphics/battle_anims/sprites/020.png | Bin 0 -> 260 bytes graphics/battle_anims/sprites/021.png | Bin 0 -> 671 bytes graphics/battle_anims/sprites/022.pal | 19 + graphics/battle_anims/sprites/023.png | Bin 0 -> 312 bytes graphics/battle_anims/sprites/024.png | Bin 0 -> 231 bytes graphics/battle_anims/sprites/025.png | Bin 0 -> 274 bytes graphics/battle_anims/sprites/026.png | Bin 0 -> 671 bytes graphics/battle_anims/sprites/027.png | Bin 0 -> 619 bytes graphics/battle_anims/sprites/028.png | Bin 0 -> 707 bytes graphics/battle_anims/sprites/029.png | Bin 0 -> 537 bytes graphics/battle_anims/sprites/030.png | Bin 0 -> 761 bytes graphics/battle_anims/sprites/031.png | Bin 0 -> 736 bytes graphics/battle_anims/sprites/032.png | Bin 0 -> 283 bytes graphics/battle_anims/sprites/033.png | Bin 0 -> 1916 bytes graphics/battle_anims/sprites/034.png | Bin 0 -> 850 bytes graphics/battle_anims/sprites/035.png | Bin 0 -> 721 bytes graphics/battle_anims/sprites/036.png | Bin 0 -> 783 bytes graphics/battle_anims/sprites/037.png | Bin 0 -> 645 bytes graphics/battle_anims/sprites/038.png | Bin 0 -> 386 bytes graphics/battle_anims/sprites/039.png | Bin 0 -> 590 bytes graphics/battle_anims/sprites/040.png | Bin 0 -> 362 bytes graphics/battle_anims/sprites/041.png | Bin 0 -> 249 bytes graphics/battle_anims/sprites/042.png | Bin 0 -> 633 bytes graphics/battle_anims/sprites/043.png | Bin 0 -> 864 bytes graphics/battle_anims/sprites/044.png | Bin 0 -> 500 bytes graphics/battle_anims/sprites/045.png | Bin 0 -> 422 bytes graphics/battle_anims/sprites/115.png | Bin 0 -> 267 bytes graphics/battle_anims/sprites/146.png | Bin 0 -> 253 bytes graphics/battle_anims/sprites/152.png | Bin 0 -> 175 bytes graphics/battle_anims/sprites/161.png | Bin 0 -> 143 bytes graphics/battle_interface/unused_window.png | Bin 0 -> 608 bytes graphics/interface/ball_open.png | Bin 0 -> 215 bytes graphics/interface/blank.pal | 19 + graphics/interface/blank.png | Bin 0 -> 88 bytes graphics/interface/party_menu_hpbar.png | Bin 0 -> 136 bytes graphics/unknown/party_menu_hpbar.png | Bin 0 -> 136 bytes graphics/unknown/unknown_D035A0.png | Bin 0 -> 156 bytes graphics/unknown/unknown_D06D80.png | Bin 0 -> 181 bytes graphics/unknown/unknown_D06D80_2.pal | 35 ++ graphics/unknown/unused_window.png | Bin 0 -> 608 bytes graphics/unused/battle_anim_023.pal | 19 + graphics/unused/music_notes.png | Bin 0 -> 310 bytes graphics/unused/old_battle_interface_1.png | Bin 0 -> 524 bytes graphics/unused/old_battle_interface_2.png | Bin 0 -> 198 bytes graphics/unused/old_battle_interface_3.png | Bin 0 -> 226 bytes graphics/unused/old_battle_interface_tilemap.bin | Bin 0 -> 2048 bytes graphics/unused/old_bulbasaur.png | Bin 0 -> 490 bytes graphics/unused/old_bulbasaur2.png | Bin 0 -> 520 bytes graphics/unused/old_charizard.png | Bin 0 -> 335 bytes graphics/unused/old_pal1.pal | 19 + graphics/unused/old_pal2.pal | 19 + graphics/unused/old_pal3.pal | 19 + graphics/unused/old_pal4.pal | 19 + graphics/unused/old_pal5.pal | 19 + graphics/unused/old_pal6.pal | 19 + graphics/unused/old_pal7.pal | 19 + 78 files changed, 730 insertions(+), 7 deletions(-) create mode 100644 graphics/battle_anims/sprites/000.png create mode 100644 graphics/battle_anims/sprites/003.png create mode 100644 graphics/battle_anims/sprites/004.png create mode 100644 graphics/battle_anims/sprites/005.png create mode 100644 graphics/battle_anims/sprites/006.png create mode 100644 graphics/battle_anims/sprites/007.png create mode 100644 graphics/battle_anims/sprites/008.png create mode 100644 graphics/battle_anims/sprites/009.png create mode 100644 graphics/battle_anims/sprites/010.pal create mode 100644 graphics/battle_anims/sprites/010_0.png create mode 100644 graphics/battle_anims/sprites/010_1.png create mode 100644 graphics/battle_anims/sprites/010_2.png create mode 100644 graphics/battle_anims/sprites/010_3.png create mode 100644 graphics/battle_anims/sprites/011.png create mode 100644 graphics/battle_anims/sprites/012.png create mode 100644 graphics/battle_anims/sprites/013.png create mode 100644 graphics/battle_anims/sprites/015.png create mode 100644 graphics/battle_anims/sprites/016.png create mode 100644 graphics/battle_anims/sprites/017.png create mode 100644 graphics/battle_anims/sprites/019.png create mode 100644 graphics/battle_anims/sprites/020.png create mode 100644 graphics/battle_anims/sprites/021.png create mode 100644 graphics/battle_anims/sprites/022.pal create mode 100644 graphics/battle_anims/sprites/023.png create mode 100644 graphics/battle_anims/sprites/024.png create mode 100644 graphics/battle_anims/sprites/025.png create mode 100644 graphics/battle_anims/sprites/026.png create mode 100644 graphics/battle_anims/sprites/027.png create mode 100644 graphics/battle_anims/sprites/028.png create mode 100644 graphics/battle_anims/sprites/029.png create mode 100644 graphics/battle_anims/sprites/030.png create mode 100644 graphics/battle_anims/sprites/031.png create mode 100644 graphics/battle_anims/sprites/032.png create mode 100644 graphics/battle_anims/sprites/033.png create mode 100644 graphics/battle_anims/sprites/034.png create mode 100644 graphics/battle_anims/sprites/035.png create mode 100644 graphics/battle_anims/sprites/036.png create mode 100644 graphics/battle_anims/sprites/037.png create mode 100644 graphics/battle_anims/sprites/038.png create mode 100644 graphics/battle_anims/sprites/039.png create mode 100644 graphics/battle_anims/sprites/040.png create mode 100644 graphics/battle_anims/sprites/041.png create mode 100644 graphics/battle_anims/sprites/042.png create mode 100644 graphics/battle_anims/sprites/043.png create mode 100644 graphics/battle_anims/sprites/044.png create mode 100644 graphics/battle_anims/sprites/045.png create mode 100644 graphics/battle_anims/sprites/115.png create mode 100644 graphics/battle_anims/sprites/146.png create mode 100644 graphics/battle_anims/sprites/152.png create mode 100644 graphics/battle_anims/sprites/161.png create mode 100644 graphics/battle_interface/unused_window.png create mode 100644 graphics/interface/ball_open.png create mode 100644 graphics/interface/blank.pal create mode 100644 graphics/interface/blank.png create mode 100644 graphics/interface/party_menu_hpbar.png create mode 100644 graphics/unknown/party_menu_hpbar.png create mode 100644 graphics/unknown/unknown_D035A0.png create mode 100644 graphics/unknown/unknown_D06D80.png create mode 100644 graphics/unknown/unknown_D06D80_2.pal create mode 100644 graphics/unknown/unused_window.png create mode 100644 graphics/unused/battle_anim_023.pal create mode 100644 graphics/unused/music_notes.png create mode 100644 graphics/unused/old_battle_interface_1.png create mode 100644 graphics/unused/old_battle_interface_2.png create mode 100644 graphics/unused/old_battle_interface_3.png create mode 100644 graphics/unused/old_battle_interface_tilemap.bin create mode 100644 graphics/unused/old_bulbasaur.png create mode 100644 graphics/unused/old_bulbasaur2.png create mode 100644 graphics/unused/old_charizard.png create mode 100644 graphics/unused/old_pal1.pal create mode 100644 graphics/unused/old_pal2.pal create mode 100644 graphics/unused/old_pal3.pal create mode 100644 graphics/unused/old_pal4.pal create mode 100644 graphics/unused/old_pal5.pal create mode 100644 graphics/unused/old_pal6.pal create mode 100644 graphics/unused/old_pal7.pal diff --git a/asm/pokeball.s b/asm/pokeball.s index 5408e5567..cc24efb91 100644 --- a/asm/pokeball.s +++ b/asm/pokeball.s @@ -2811,7 +2811,7 @@ _0804BF2C: bl GetSpriteTileStartByTag adds r1, r0, 0 lsls r1, 16 - ldr r0, _0804BF5C @ =gUnknown_8D022E8 + ldr r0, _0804BF5C @ =gBallOpen4bpp lsrs r1, 11 ldr r2, _0804BF60 @ =0x06010100 adds r1, r2 @@ -2824,7 +2824,7 @@ _0804BF48: _0804BF50: .4byte gUnknown_826056C _0804BF54: .4byte 0xffff0000 _0804BF58: .4byte gUnknown_82605CC -_0804BF5C: .4byte gUnknown_8D022E8 +_0804BF5C: .4byte gBallOpen4bpp _0804BF60: .4byte 0x06010100 thumb_func_end LoadBallGfx diff --git a/data/graphics.s b/data/graphics.s index 62234423a..8b7d09760 100644 --- a/data/graphics.s +++ b/data/graphics.s @@ -21,8 +21,6 @@ gUnknown_8D00BD0:: @ 8D00BD0 gUnknown_8D00BE8:: @ 8D00BE8 .incbin "baserom.gba", 0xD00BE8, 0x18 -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; - .align 2 gOldCharmap4bpp:: @ 8D00C00 .incbin "graphics/unused/old_charmap.4bpp.lz" @from ruby @@ -139,10 +137,491 @@ gBallPremier4bpp:: @ 8D021D8 gBallPremierGbapal:: @ 8D022C8 .incbin "graphics/interface/ball/premier.gbapal.lz" -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; + .align 2 +gBallOpen4bpp:: @ 8D022E8 + .incbin "graphics/interface/ball_open.4bpp.lz" + + .align 2 +gBlank4bpp:: @ 8D02364 + .incbin "graphics/interface/blank.4bpp.lz" + + .align 2 +gSprite1464bpp:: @ 8D02460 + .incbin "graphics/battle_anims/sprites/146.4bpp.lz" + + .align 2 +gSprite0004bpp:: @ 8D02520 + .incbin "graphics/battle_anims/sprites/000.4bpp.lz" + + .align 2 +gSprite0034bpp:: @ 8D025D0 + .incbin "graphics/battle_anims/sprites/003.4bpp.lz" + + .align 2 +gSprite0044bpp:: @ 8D02644 + .incbin "graphics/battle_anims/sprites/004.4bpp.lz" + + .align 2 +gSprite0054bpp:: @ 8D026F4 + .incbin "graphics/battle_anims/sprites/005.4bpp.lz" + + .align 2 +gSprite0064bpp:: @ 8D027C8 + .incbin "graphics/battle_anims/sprites/006.4bpp.lz" + + .align 2 +gSprite115Gbapal:: @ 8D02894 + .incbin "graphics/battle_anims/sprites/115.gbapal.lz" + + .align 2 +gSprite000Gbapal:: @ 8D028B4 + .incbin "graphics/battle_anims/sprites/000.gbapal.lz" + + .align 2 +gSprite003Gbapal:: @ 8D028D8 + .incbin "graphics/battle_anims/sprites/003.gbapal.lz" + + .align 2 +gSprite004Gbapal:: @ 8D02900 + .incbin "graphics/battle_anims/sprites/004.gbapal.lz" + + .align 2 +gSprite005Gbapal:: @ 8D02914 + .incbin "graphics/battle_anims/sprites/005.gbapal.lz" + + .align 2 +gSprite006Gbapal:: @ 8D0293C + .incbin "graphics/battle_anims/sprites/006.gbapal.lz" + + .align 2 +gSprite1614bpp:: @ 8D02964 + .incbin "graphics/battle_anims/sprites/161.4bpp.lz" + + .align 2 +gSprite161Gbapal:: @ 8D0298C + .incbin "graphics/battle_anims/sprites/161.gbapal.lz" + + .align 2 +gSprite0074bpp:: @ 8D029B4 + .incbin "graphics/battle_anims/sprites/007.4bpp.lz" + + .align 2 +gSprite0074Gbapal:: @ 8D02B30 + .incbin "graphics/battle_anims/sprites/007.gbapal.lz" + + .align 2 +gSprite0084bpp:: @ 8D02B50 + .incbin "graphics/battle_anims/sprites/008.4bpp.lz" + + .align 2 +gSprite008Gbapal:: @ 8D02B70 + .incbin "graphics/battle_anims/sprites/008.gbapal.lz" + + .align 2 +gSprite010Gbapal:: @ 8D02B8C + .incbin "graphics/battle_anims/sprites/010.gbapal.lz" + + .align 2 +gSprite0104bpp:: @ 8D02BAC + .incbin "graphics/battle_anims/sprites/010.4bpp.lz" + + .align 2 +gSprite0094bpp:: @ 8D02F8C + .incbin "graphics/battle_anims/sprites/009.4bpp.lz" + + .align 2 +gSprite009Gbapal:: @ 8D03274 + .incbin "graphics/battle_anims/sprites/009.gbapal.lz" + @ BEGINHERE + .align 2 +gSprite0114bpp:: @ 8D03294 + .incbin "graphics/battle_anims/sprites/011.4bpp.lz" + + .align 2 +gSprite011Gbapal:: @ 8D0330C + .incbin "graphics/battle_anims/sprites/011.gbapal.lz" + + .align 2 +gSprite0124bpp:: @ 8D03334 + .incbin "graphics/battle_anims/sprites/012.4bpp.lz" + + .align 2 +gSprite012Gbapal:: @ 8D0339C + .incbin "graphics/battle_anims/sprites/012.gbapal.lz" + + .align 2 +gSprite1524bpp:: @ 8D033B4 + .incbin "graphics/battle_anims/sprites/152.4bpp.lz" + + .align 2 +gSprite152Gbapal:: @ 8D033FC + .incbin "graphics/battle_anims/sprites/152.gbapal.lz" + + .align 2 +gSprite0134bpp:: @ 8D03420 + .incbin "graphics/battle_anims/sprites/013.4bpp.lz" + + .align 2 +gSprite013Gbapal:: @ 8D03454 + .incbin "graphics/battle_anims/sprites/013.gbapal.lz" + + .align 2 +gSprite0154bpp:: @ 8D0346C + .incbin "graphics/battle_anims/sprites/015.4bpp.lz" + + .align 2 +gSprite015Gbapal:: @ 8D034D8 + .incbin "graphics/battle_anims/sprites/015.gbapal.lz" + + .align 2 +gSprite0164bpp:: @ 8D03500 + .incbin "graphics/battle_anims/sprites/016.4bpp.lz" + + .align 2 +gSprite016Gbapal:: @ 8D03570 + .incbin "graphics/battle_anims/sprites/016.gbapal.lz" + + .align 2 +gSprite0174bpp:: @ 8D03580 + .incbin "graphics/battle_anims/sprites/017.4bpp.lz" + + .align 2 +gUnknown_8D035A0:: @ 8D035A0 + .incbin "graphics/unknown/unknown_D035A0.4bpp.lz" + + .align 2 +gSprite019Gbapal:: @ 8D035C4 + .incbin "graphics/battle_anims/sprites/019.gbapal.lz" + + .align 2 +gSprite0194bpp:: @ 8D035E0 + .incbin "graphics/battle_anims/sprites/019.4bpp.lz" + + .align 2 +gSprite0204bpp:: @ 8D036A0 + .incbin "graphics/battle_anims/sprites/020.4bpp.lz" + + .align 2 +gSprite020Gbapal:: @ 8D0376C + .incbin "graphics/battle_anims/sprites/020.gbapal.lz" + + .align 2 +gSprite023Gbapal:: @ 8D03794 + .incbin "graphics/battle_anims/sprites/023.gbapal.lz" + + .align 2 +gSprite0234bpp:: @ 8D037BC + .incbin "graphics/battle_anims/sprites/023.4bpp.lz" + + .align 2 +gSprite023UnusedGbapal:: @ 8D038C4 + .incbin "graphics/unused/battle_anim_023.gbapal.lz" + + .align 2 +gSpriteMusicNotes4bpp:: @ 8D038EC + .incbin "graphics/unused/music_notes.4bpp.lz" + + .align 2 +gSprite021Gbapal:: @ 8D039E8 + .incbin "graphics/battle_anims/sprites/021.gbapal.lz" + + .align 2 +gSprite0214bpp:: @ 8D03A10 + .incbin "graphics/battle_anims/sprites/021.4bpp.lz" + + .align 2 +gSprite022Gbapal:: @ 8D03D48 + .incbin "graphics/battle_anims/sprites/022.gbapal.lz" + + .align 2 +gSprite025Gbapal:: @ 8D03D70 + .incbin "graphics/battle_anims/sprites/025.gbapal.lz" + + .align 2 +gSprite0254bpp:: @ 8D03D98 + .incbin "graphics/battle_anims/sprites/025.4bpp.lz" + + .align 2 +gSprite0244bpp:: @ 8D03E88 + .incbin "graphics/battle_anims/sprites/024.4bpp.lz" + + .align 2 +gSprite024Gbapal:: @ 8D03F54 + .incbin "graphics/battle_anims/sprites/024.gbapal.lz" + + .align 2 +gSprite0314bpp:: @ 8D03F68 + .incbin "graphics/battle_anims/sprites/031.4bpp.lz" + + .align 2 +gSprite031Gbapal:: @ 8D04348 + .incbin "graphics/battle_anims/sprites/031.gbapal.lz" + + .align 2 +gSprite032Gbapal:: @ 8D04368 + .incbin "graphics/battle_anims/sprites/032.gbapal.lz" + + .align 2 +gSprite0324bpp:: @ 8D04390 + .incbin "graphics/battle_anims/sprites/032.4bpp.lz" + + .align 2 +gSprite0264bpp:: @ 8D0447C + .incbin "graphics/battle_anims/sprites/026.4bpp.lz" + + .align 2 +gSprite026Gbapal:: @ 8D047B4 + .incbin "graphics/battle_anims/sprites/026.gbapal.lz" + + .align 2 +gSprite027Gbapal:: @ 8D047DC + .incbin "baserom.gba", 0xD047DC, 0x28 @ this should be 027.gbapal.lz but my matcher didnt pick it up... + + .align 2 +gSprite0274bpp:: @ 8D04804 + .incbin "graphics/battle_anims/sprites/027.4bpp.lz" + + + + .align 2 +gSprite028Gbapal:: @ 8D04B00 + .incbin "graphics/battle_anims/sprites/028.gbapal.lz" + + + + .align 2 +gSprite0284bpp:: @ 8D04B28 + .incbin "graphics/battle_anims/sprites/028.4bpp.lz" + + + + .align 2 +gSprite0294bpp:: @ 8D04E78 + .incbin "graphics/battle_anims/sprites/029.4bpp.lz" + + + + .align 2 +gSprite029Gbapal:: @ 8D05130 + .incbin "graphics/battle_anims/sprites/029.gbapal.lz" + + + + + .align 2 +gSprite0304bpp:: @ 8D05158 + .incbin "graphics/battle_anims/sprites/030.4bpp.lz" + + + + .align 2 +gSprite030Gbapal:: @ 8D05518 + .incbin "graphics/battle_anims/sprites/030.gbapal.lz" + + + + .align 2 +gSprite033Gbapal:: @ 8D0553C + .incbin "graphics/battle_anims/sprites/033.gbapal.lz" + + + + .align 2 +gSprite0334bpp:: @ 8D05564 + .incbin "graphics/battle_anims/sprites/033.4bpp.lz" + + + + .align 2 +gSprite0344bpp:: @ 8D05ED4 + .incbin "graphics/battle_anims/sprites/034.4bpp.lz" + + + + .align 2 +gSprite0354bpp:: @ 8D062A0 + .incbin "graphics/battle_anims/sprites/035.4bpp.lz" + + + + .align 2 +gSprite036Gbapal:: @ 8D06638 + .incbin "graphics/battle_anims/sprites/036.gbapal.lz" + + + + .align 2 +gSprite0364bpp:: @ 8D06660 + .incbin "graphics/battle_anims/sprites/036.4bpp.lz" + + + + .align 2 +gSprite0374bpp:: @ 8D06A34 + .incbin "graphics/battle_anims/sprites/037.4bpp.lz" + + + + + .align 2 +gUnknown_D06D804bpp:: @ 8D06D80 + .incbin "graphics/unknown/unknown_D06D80.4bpp.lz" + + + + + .align 2 +gUnknown_D06D80Gbapal:: @ 8D06DC4 + .incbin "graphics/unknown/unknown_D06D80.gbapal.lz" + + + + + .align 2 +gUnknown_D06D80Gbapal2:: @ 8D06DD8 + .incbin "graphics/unknown/unknown_D06D80_2.gbapal.lz" + + + + + .align 2 +gUnusedObi14bpp:: @ 8D06E0C + .incbin "graphics/unused/obi1.4bpp.lz" + + + + .align 2 +gUnusedObiPalpak1Gbapal:: @ 8D07170 + .incbin "graphics/unused/obi_palpak1.gbapal.lz" + + + + .align 2 +gUnusedOldPal4Gbapal:: @ 8D071B4 + .incbin "graphics/unused/old_pal4.gbapal.lz" + + + + .align 2 +gUnusedObiPalpak3Gbapal:: @ 8D071CC + .incbin "graphics/unused/obi_palpak3.gbapal.lz" + + + + .align 2 +gUnusedObi24bpp:: @ 8D07224 + .incbin "graphics/unused/obi2.4bpp.lz" + + + + .align 2 +gUnusedOldBattleInterfaceTilemapBin:: @ 8D077EC + .incbin "graphics/unused/old_battle_interface_tilemap.bin.lz" + + + + + .align 2 +gSprite038Gbapal:: @ 8D078FC + .incbin "graphics/battle_anims/sprites/038.gbapal.lz" + + + + .align 2 +gSprite039Gbapal:: @ 8D07924 + .incbin "graphics/battle_anims/sprites/039.gbapal.lz" + + + + .align 2 +gSprite0384bpp:: @ 8D0794C + .incbin "graphics/battle_anims/sprites/038.4bpp.lz" + + + + .align 2 +gSprite0394bpp:: @ 8D07B70 + .incbin "graphics/battle_anims/sprites/039.4bpp.lz" + + + + .align 2 +gSprite0404bpp:: @ 8D07E6C + .incbin "graphics/battle_anims/sprites/040.4bpp.lz" + + + + + .align 2 +gSprite0414bpp:: @ 8D08078 + .incbin "graphics/battle_anims/sprites/041.4bpp.lz" + + + + .align 2 +gIntefacePartyMenuHpBar4bpp:: @ 8D08218 + .incbin "graphics/interface/party_menu_hpbar.4bpp.lz" + + + + .align 2 +gSprite0424bpp:: @ 8D082AC + .incbin "graphics/battle_anims/sprites/042.4bpp.lz" + + + + .align 2 +gSprite042Gbapal:: @ 8D0857C + .incbin "graphics/battle_anims/sprites/042.gbapal.lz" + + + + .align 2 +gSprite0434bpp:: @ 8D085A4 + .incbin "graphics/battle_anims/sprites/043.4bpp.lz" + + + + .align 2 +gSprite043Gbapal:: @ 8D089A4 + .incbin "graphics/battle_anims/sprites/043.gbapal.lz" + + + .align 2 +gSprite044Gbapal:: @ 8D089CC + .incbin "baserom.gba", 0xD089CC, 0x28 @ this should be 044.gbapal.lz but my matched didnt pick it up... + + + .align 2 +gSprite0444bpp:: @ 8D089F4 + .incbin "graphics/battle_anims/sprites/044.4bpp.lz" + + + + .align 2 +gSprite045Gbapal:: @ 8D08C60 + .incbin "graphics/battle_anims/sprites/045.gbapal.lz" + + + + .align 2 +gSprite0454bpp:: @ 8D08C88 + .incbin "graphics/battle_anims/sprites/045.4bpp.lz" + + + + .align 2 +gBattleInterfaceUnusedWindow4bpp:: @ 8D08EF4 + .incbin "graphics/battle_interface/unused_window.4bpp.lz" + + + + .align 2 +gBattleInterfaceUnusedWindowGbapal:: @ 8D093B0 + .incbin "graphics/battle_interface/unused_window.gbapal.lz" + -gUnknown_8D022E8:: @ 8D022E8 - .incbin "baserom.gba", 0xD022E8, 0x70F0 +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; gUnknown_8D093D8:: @ 8D093D8 .incbin "baserom.gba", 0xD093D8, 0x87EC diff --git a/graphics/battle_anims/sprites/000.png b/graphics/battle_anims/sprites/000.png new file mode 100644 index 000000000..3d8662a86 Binary files /dev/null and b/graphics/battle_anims/sprites/000.png differ diff --git a/graphics/battle_anims/sprites/003.png b/graphics/battle_anims/sprites/003.png new file mode 100644 index 000000000..b3164ff01 Binary files /dev/null and b/graphics/battle_anims/sprites/003.png differ diff --git a/graphics/battle_anims/sprites/004.png b/graphics/battle_anims/sprites/004.png new file mode 100644 index 000000000..c7cad5ef9 Binary files /dev/null and b/graphics/battle_anims/sprites/004.png differ diff --git a/graphics/battle_anims/sprites/005.png b/graphics/battle_anims/sprites/005.png new file mode 100644 index 000000000..8bd4ac426 Binary files /dev/null and b/graphics/battle_anims/sprites/005.png differ diff --git a/graphics/battle_anims/sprites/006.png b/graphics/battle_anims/sprites/006.png new file mode 100644 index 000000000..30e2dffc1 Binary files /dev/null and b/graphics/battle_anims/sprites/006.png differ diff --git a/graphics/battle_anims/sprites/007.png b/graphics/battle_anims/sprites/007.png new file mode 100644 index 000000000..5a2369dad Binary files /dev/null and b/graphics/battle_anims/sprites/007.png differ diff --git a/graphics/battle_anims/sprites/008.png b/graphics/battle_anims/sprites/008.png new file mode 100644 index 000000000..634c4d2bb Binary files /dev/null and b/graphics/battle_anims/sprites/008.png differ diff --git a/graphics/battle_anims/sprites/009.png b/graphics/battle_anims/sprites/009.png new file mode 100644 index 000000000..5818ae41d Binary files /dev/null and b/graphics/battle_anims/sprites/009.png differ diff --git a/graphics/battle_anims/sprites/010.pal b/graphics/battle_anims/sprites/010.pal new file mode 100644 index 000000000..c5f241feb --- /dev/null +++ b/graphics/battle_anims/sprites/010.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +106 148 139 +98 90 255 +115 106 255 +139 131 255 +164 156 255 +180 180 255 +205 205 255 +230 230 255 +255 255 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +180 180 255 +205 205 255 +230 230 255 diff --git a/graphics/battle_anims/sprites/010_0.png b/graphics/battle_anims/sprites/010_0.png new file mode 100644 index 000000000..8eea99de0 Binary files /dev/null and b/graphics/battle_anims/sprites/010_0.png differ diff --git a/graphics/battle_anims/sprites/010_1.png b/graphics/battle_anims/sprites/010_1.png new file mode 100644 index 000000000..ba3ca6192 Binary files /dev/null and b/graphics/battle_anims/sprites/010_1.png differ diff --git a/graphics/battle_anims/sprites/010_2.png b/graphics/battle_anims/sprites/010_2.png new file mode 100644 index 000000000..b71a875e7 Binary files /dev/null and b/graphics/battle_anims/sprites/010_2.png differ diff --git a/graphics/battle_anims/sprites/010_3.png b/graphics/battle_anims/sprites/010_3.png new file mode 100644 index 000000000..e310ca5df Binary files /dev/null and b/graphics/battle_anims/sprites/010_3.png differ diff --git a/graphics/battle_anims/sprites/011.png b/graphics/battle_anims/sprites/011.png new file mode 100644 index 000000000..23ce049b0 Binary files /dev/null and b/graphics/battle_anims/sprites/011.png differ diff --git a/graphics/battle_anims/sprites/012.png b/graphics/battle_anims/sprites/012.png new file mode 100644 index 000000000..1a9e4c870 Binary files /dev/null and b/graphics/battle_anims/sprites/012.png differ diff --git a/graphics/battle_anims/sprites/013.png b/graphics/battle_anims/sprites/013.png new file mode 100644 index 000000000..407671ff6 Binary files /dev/null and b/graphics/battle_anims/sprites/013.png differ diff --git a/graphics/battle_anims/sprites/015.png b/graphics/battle_anims/sprites/015.png new file mode 100644 index 000000000..48895d36a Binary files /dev/null and b/graphics/battle_anims/sprites/015.png differ diff --git a/graphics/battle_anims/sprites/016.png b/graphics/battle_anims/sprites/016.png new file mode 100644 index 000000000..df9651411 Binary files /dev/null and b/graphics/battle_anims/sprites/016.png differ diff --git a/graphics/battle_anims/sprites/017.png b/graphics/battle_anims/sprites/017.png new file mode 100644 index 000000000..e287698b4 Binary files /dev/null and b/graphics/battle_anims/sprites/017.png differ diff --git a/graphics/battle_anims/sprites/019.png b/graphics/battle_anims/sprites/019.png new file mode 100644 index 000000000..af29ec730 Binary files /dev/null and b/graphics/battle_anims/sprites/019.png differ diff --git a/graphics/battle_anims/sprites/020.png b/graphics/battle_anims/sprites/020.png new file mode 100644 index 000000000..73c7f1344 Binary files /dev/null and b/graphics/battle_anims/sprites/020.png differ diff --git a/graphics/battle_anims/sprites/021.png b/graphics/battle_anims/sprites/021.png new file mode 100644 index 000000000..c531b820c Binary files /dev/null and b/graphics/battle_anims/sprites/021.png differ diff --git a/graphics/battle_anims/sprites/022.pal b/graphics/battle_anims/sprites/022.pal new file mode 100644 index 000000000..35cbf0096 --- /dev/null +++ b/graphics/battle_anims/sprites/022.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +255 255 255 +205 255 255 +156 255 255 +106 255 255 +57 255 255 +8 255 255 +8 205 255 +8 156 255 +8 106 255 +8 57 255 +8 8 255 +8 8 106 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/battle_anims/sprites/023.png b/graphics/battle_anims/sprites/023.png new file mode 100644 index 000000000..a1dbc20c2 Binary files /dev/null and b/graphics/battle_anims/sprites/023.png differ diff --git a/graphics/battle_anims/sprites/024.png b/graphics/battle_anims/sprites/024.png new file mode 100644 index 000000000..7c5d0f382 Binary files /dev/null and b/graphics/battle_anims/sprites/024.png differ diff --git a/graphics/battle_anims/sprites/025.png b/graphics/battle_anims/sprites/025.png new file mode 100644 index 000000000..864f71065 Binary files /dev/null and b/graphics/battle_anims/sprites/025.png differ diff --git a/graphics/battle_anims/sprites/026.png b/graphics/battle_anims/sprites/026.png new file mode 100644 index 000000000..c531b820c Binary files /dev/null and b/graphics/battle_anims/sprites/026.png differ diff --git a/graphics/battle_anims/sprites/027.png b/graphics/battle_anims/sprites/027.png new file mode 100644 index 000000000..28b3876b7 Binary files /dev/null and b/graphics/battle_anims/sprites/027.png differ diff --git a/graphics/battle_anims/sprites/028.png b/graphics/battle_anims/sprites/028.png new file mode 100644 index 000000000..b3a096996 Binary files /dev/null and b/graphics/battle_anims/sprites/028.png differ diff --git a/graphics/battle_anims/sprites/029.png b/graphics/battle_anims/sprites/029.png new file mode 100644 index 000000000..b04a8dc65 Binary files /dev/null and b/graphics/battle_anims/sprites/029.png differ diff --git a/graphics/battle_anims/sprites/030.png b/graphics/battle_anims/sprites/030.png new file mode 100644 index 000000000..ba7161fa1 Binary files /dev/null and b/graphics/battle_anims/sprites/030.png differ diff --git a/graphics/battle_anims/sprites/031.png b/graphics/battle_anims/sprites/031.png new file mode 100644 index 000000000..c6727ad1c Binary files /dev/null and b/graphics/battle_anims/sprites/031.png differ diff --git a/graphics/battle_anims/sprites/032.png b/graphics/battle_anims/sprites/032.png new file mode 100644 index 000000000..80ffb7b72 Binary files /dev/null and b/graphics/battle_anims/sprites/032.png differ diff --git a/graphics/battle_anims/sprites/033.png b/graphics/battle_anims/sprites/033.png new file mode 100644 index 000000000..eb1ed3473 Binary files /dev/null and b/graphics/battle_anims/sprites/033.png differ diff --git a/graphics/battle_anims/sprites/034.png b/graphics/battle_anims/sprites/034.png new file mode 100644 index 000000000..22f836d1e Binary files /dev/null and b/graphics/battle_anims/sprites/034.png differ diff --git a/graphics/battle_anims/sprites/035.png b/graphics/battle_anims/sprites/035.png new file mode 100644 index 000000000..cde2105dd Binary files /dev/null and b/graphics/battle_anims/sprites/035.png differ diff --git a/graphics/battle_anims/sprites/036.png b/graphics/battle_anims/sprites/036.png new file mode 100644 index 000000000..bddf4a25a Binary files /dev/null and b/graphics/battle_anims/sprites/036.png differ diff --git a/graphics/battle_anims/sprites/037.png b/graphics/battle_anims/sprites/037.png new file mode 100644 index 000000000..62a692036 Binary files /dev/null and b/graphics/battle_anims/sprites/037.png differ diff --git a/graphics/battle_anims/sprites/038.png b/graphics/battle_anims/sprites/038.png new file mode 100644 index 000000000..2dfa037c1 Binary files /dev/null and b/graphics/battle_anims/sprites/038.png differ diff --git a/graphics/battle_anims/sprites/039.png b/graphics/battle_anims/sprites/039.png new file mode 100644 index 000000000..bc61b20d7 Binary files /dev/null and b/graphics/battle_anims/sprites/039.png differ diff --git a/graphics/battle_anims/sprites/040.png b/graphics/battle_anims/sprites/040.png new file mode 100644 index 000000000..c7d493d92 Binary files /dev/null and b/graphics/battle_anims/sprites/040.png differ diff --git a/graphics/battle_anims/sprites/041.png b/graphics/battle_anims/sprites/041.png new file mode 100644 index 000000000..e088c1f86 Binary files /dev/null and b/graphics/battle_anims/sprites/041.png differ diff --git a/graphics/battle_anims/sprites/042.png b/graphics/battle_anims/sprites/042.png new file mode 100644 index 000000000..cf8909080 Binary files /dev/null and b/graphics/battle_anims/sprites/042.png differ diff --git a/graphics/battle_anims/sprites/043.png b/graphics/battle_anims/sprites/043.png new file mode 100644 index 000000000..e5e929ede Binary files /dev/null and b/graphics/battle_anims/sprites/043.png differ diff --git a/graphics/battle_anims/sprites/044.png b/graphics/battle_anims/sprites/044.png new file mode 100644 index 000000000..7baf82357 Binary files /dev/null and b/graphics/battle_anims/sprites/044.png differ diff --git a/graphics/battle_anims/sprites/045.png b/graphics/battle_anims/sprites/045.png new file mode 100644 index 000000000..45aeae356 Binary files /dev/null and b/graphics/battle_anims/sprites/045.png differ diff --git a/graphics/battle_anims/sprites/115.png b/graphics/battle_anims/sprites/115.png new file mode 100644 index 000000000..51c909134 Binary files /dev/null and b/graphics/battle_anims/sprites/115.png differ diff --git a/graphics/battle_anims/sprites/146.png b/graphics/battle_anims/sprites/146.png new file mode 100644 index 000000000..e7b0360a6 Binary files /dev/null and b/graphics/battle_anims/sprites/146.png differ diff --git a/graphics/battle_anims/sprites/152.png b/graphics/battle_anims/sprites/152.png new file mode 100644 index 000000000..1b5e8e904 Binary files /dev/null and b/graphics/battle_anims/sprites/152.png differ diff --git a/graphics/battle_anims/sprites/161.png b/graphics/battle_anims/sprites/161.png new file mode 100644 index 000000000..5976b2b8c Binary files /dev/null and b/graphics/battle_anims/sprites/161.png differ diff --git a/graphics/battle_interface/unused_window.png b/graphics/battle_interface/unused_window.png new file mode 100644 index 000000000..73086d4d2 Binary files /dev/null and b/graphics/battle_interface/unused_window.png differ diff --git a/graphics/interface/ball_open.png b/graphics/interface/ball_open.png new file mode 100644 index 000000000..1030f4942 Binary files /dev/null and b/graphics/interface/ball_open.png differ diff --git a/graphics/interface/blank.pal b/graphics/interface/blank.pal new file mode 100644 index 000000000..9757f2e57 --- /dev/null +++ b/graphics/interface/blank.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +255 255 255 +189 189 197 +131 131 139 +98 98 123 +65 74 106 +41 49 90 +148 255 164 +139 246 115 +65 205 57 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +213 213 205 +74 74 74 diff --git a/graphics/interface/blank.png b/graphics/interface/blank.png new file mode 100644 index 000000000..3a4ba289c Binary files /dev/null and b/graphics/interface/blank.png differ diff --git a/graphics/interface/party_menu_hpbar.png b/graphics/interface/party_menu_hpbar.png new file mode 100644 index 000000000..763b91210 Binary files /dev/null and b/graphics/interface/party_menu_hpbar.png differ diff --git a/graphics/unknown/party_menu_hpbar.png b/graphics/unknown/party_menu_hpbar.png new file mode 100644 index 000000000..763b91210 Binary files /dev/null and b/graphics/unknown/party_menu_hpbar.png differ diff --git a/graphics/unknown/unknown_D035A0.png b/graphics/unknown/unknown_D035A0.png new file mode 100644 index 000000000..0b2ae80f9 Binary files /dev/null and b/graphics/unknown/unknown_D035A0.png differ diff --git a/graphics/unknown/unknown_D06D80.png b/graphics/unknown/unknown_D06D80.png new file mode 100644 index 000000000..d36afa64d Binary files /dev/null and b/graphics/unknown/unknown_D06D80.png differ diff --git a/graphics/unknown/unknown_D06D80_2.pal b/graphics/unknown/unknown_D06D80_2.pal new file mode 100644 index 000000000..44f4b55d6 --- /dev/null +++ b/graphics/unknown/unknown_D06D80_2.pal @@ -0,0 +1,35 @@ +JASC-PAL +0100 +32 +98 156 131 +57 57 57 +156 156 156 +255 255 255 +255 205 0 +255 255 98 +213 98 24 +255 123 32 +106 65 172 +65 24 172 +255 205 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +98 156 131 +57 57 57 +156 156 156 +255 255 255 +57 123 0 +90 189 0 +123 255 8 +230 106 148 +255 139 255 +255 205 0 +255 255 98 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/unknown/unused_window.png b/graphics/unknown/unused_window.png new file mode 100644 index 000000000..73086d4d2 Binary files /dev/null and b/graphics/unknown/unused_window.png differ diff --git a/graphics/unused/battle_anim_023.pal b/graphics/unused/battle_anim_023.pal new file mode 100644 index 000000000..8e6e6e902 --- /dev/null +++ b/graphics/unused/battle_anim_023.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 230 255 +115 230 255 +213 230 255 +0 0 0 +255 255 172 +255 255 115 +0 0 0 +98 139 98 +0 0 0 +0 0 0 +131 131 131 +164 164 164 +213 205 205 +255 255 255 diff --git a/graphics/unused/music_notes.png b/graphics/unused/music_notes.png new file mode 100644 index 000000000..af89e55a0 Binary files /dev/null and b/graphics/unused/music_notes.png differ diff --git a/graphics/unused/old_battle_interface_1.png b/graphics/unused/old_battle_interface_1.png new file mode 100644 index 000000000..0b2fe5eb7 Binary files /dev/null and b/graphics/unused/old_battle_interface_1.png differ diff --git a/graphics/unused/old_battle_interface_2.png b/graphics/unused/old_battle_interface_2.png new file mode 100644 index 000000000..04229ccda Binary files /dev/null and b/graphics/unused/old_battle_interface_2.png differ diff --git a/graphics/unused/old_battle_interface_3.png b/graphics/unused/old_battle_interface_3.png new file mode 100644 index 000000000..428c7765d Binary files /dev/null and b/graphics/unused/old_battle_interface_3.png differ diff --git a/graphics/unused/old_battle_interface_tilemap.bin b/graphics/unused/old_battle_interface_tilemap.bin new file mode 100644 index 000000000..aae3307e7 Binary files /dev/null and b/graphics/unused/old_battle_interface_tilemap.bin differ diff --git a/graphics/unused/old_bulbasaur.png b/graphics/unused/old_bulbasaur.png new file mode 100644 index 000000000..729ebe789 Binary files /dev/null and b/graphics/unused/old_bulbasaur.png differ diff --git a/graphics/unused/old_bulbasaur2.png b/graphics/unused/old_bulbasaur2.png new file mode 100644 index 000000000..f374e5a9f Binary files /dev/null and b/graphics/unused/old_bulbasaur2.png differ diff --git a/graphics/unused/old_charizard.png b/graphics/unused/old_charizard.png new file mode 100644 index 000000000..e1470aada Binary files /dev/null and b/graphics/unused/old_charizard.png differ diff --git a/graphics/unused/old_pal1.pal b/graphics/unused/old_pal1.pal new file mode 100644 index 000000000..1e2ef9083 --- /dev/null +++ b/graphics/unused/old_pal1.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +16 139 0 +0 0 0 +148 65 65 +0 0 0 +148 65 32 +16 0 0 +148 65 32 +8 8 0 +148 65 32 +148 8 8 +148 65 65 +24 16 0 +16 139 98 +32 0 0 +0 16 139 +0 0 0 diff --git a/graphics/unused/old_pal2.pal b/graphics/unused/old_pal2.pal new file mode 100644 index 000000000..3c5e6ad7f --- /dev/null +++ b/graphics/unused/old_pal2.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +16 139 0 +0 0 0 +148 65 65 +0 0 0 +148 65 32 +16 0 0 +148 65 32 +8 8 0 +148 65 32 +16 0 0 +148 65 65 +0 0 0 +16 139 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/unused/old_pal3.pal b/graphics/unused/old_pal3.pal new file mode 100644 index 000000000..d07e21019 --- /dev/null +++ b/graphics/unused/old_pal3.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 16 139 +0 0 0 +0 213 98 +32 0 0 +0 213 98 +24 16 0 +0 213 98 +156 8 8 +0 213 98 +24 16 0 +0 213 98 +32 0 0 +0 16 139 +0 0 0 diff --git a/graphics/unused/old_pal4.pal b/graphics/unused/old_pal4.pal new file mode 100644 index 000000000..60b814f75 --- /dev/null +++ b/graphics/unused/old_pal4.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 255 255 +41 41 57 +90 90 106 +172 172 180 +197 197 205 +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 diff --git a/graphics/unused/old_pal5.pal b/graphics/unused/old_pal5.pal new file mode 100644 index 000000000..b6f481d46 --- /dev/null +++ b/graphics/unused/old_pal5.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +98 156 131 +115 115 115 +189 189 189 +255 255 255 +189 164 41 +246 246 41 +222 106 32 +246 131 41 +115 98 246 +98 74 205 +238 115 156 +246 148 246 +115 172 246 +8 8 8 +90 90 90 +65 65 65 diff --git a/graphics/unused/old_pal6.pal b/graphics/unused/old_pal6.pal new file mode 100644 index 000000000..6d91e9918 --- /dev/null +++ b/graphics/unused/old_pal6.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +98 156 131 +115 115 115 +189 189 189 +255 255 255 +115 148 74 +156 205 74 +148 246 74 +238 115 156 +246 148 246 +189 164 41 +246 246 41 +8 8 8 +8 8 8 +8 8 8 +90 90 90 +65 65 65 diff --git a/graphics/unused/old_pal7.pal b/graphics/unused/old_pal7.pal new file mode 100644 index 000000000..d380bc65d --- /dev/null +++ b/graphics/unused/old_pal7.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +98 156 131 +115 115 115 +156 156 156 +255 255 255 +98 115 246 +115 172 246 +164 98 41 +230 172 139 +189 164 41 +246 246 41 +246 98 82 +148 123 205 +197 164 205 +213 41 156 +90 90 90 +65 65 65 -- cgit v1.2.3 From d1381d8b77ee691cc5dc1fe1fdcb158e7524283a Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Tue, 9 Oct 2018 21:17:43 -0400 Subject: Start decompiling quest_log.o --- asm/quest_log.s | 87 ----------------------------------------------------- include/global.h | 9 +++++- include/quest_log.h | 4 +++ ld_script.txt | 1 + src/quest_log.c | 43 ++++++++++++++++++++++++++ 5 files changed, 56 insertions(+), 88 deletions(-) create mode 100644 include/quest_log.h create mode 100644 src/quest_log.c diff --git a/asm/quest_log.s b/asm/quest_log.s index 9b7c29ccc..cc5c32e64 100644 --- a/asm/quest_log.s +++ b/asm/quest_log.s @@ -5,93 +5,6 @@ .text - thumb_func_start sub_8110840 -sub_8110840: @ 8110840 - push {lr} - ldr r1, _08110888 @ =gSaveBlock1Ptr - ldr r1, [r1] - subs r1, r0 - ldr r2, _0811088C @ =gUnknown_203AE04 - ldr r0, [r2] - cmp r0, 0 - beq _08110854 - adds r0, r1 - str r0, [r2] -_08110854: - ldr r0, _08110890 @ =gUnknown_203ADFA - ldrb r2, [r0] - cmp r2, 0 - beq _08110882 - ldr r3, _08110894 @ =gUnknown_203AE08 - ldr r0, [r3] - cmp r0, 0 - beq _08110868 - adds r0, r1 - str r0, [r3] -_08110868: - cmp r2, 0x2 - bne _08110882 - ldr r2, _08110898 @ =gUnknown_203AE0C - movs r3, 0x1F -_08110870: - ldr r0, [r2] - cmp r0, 0 - beq _0811087A - adds r0, r1 - str r0, [r2] -_0811087A: - adds r2, 0x4 - subs r3, 0x1 - cmp r3, 0 - bge _08110870 -_08110882: - pop {r0} - bx r0 - .align 2, 0 -_08110888: .4byte gSaveBlock1Ptr -_0811088C: .4byte gUnknown_203AE04 -_08110890: .4byte gUnknown_203ADFA -_08110894: .4byte gUnknown_203AE08 -_08110898: .4byte gUnknown_203AE0C - thumb_func_end sub_8110840 - - thumb_func_start sub_811089C -sub_811089C: @ 811089C - push {lr} - ldr r0, _081108D8 @ =gSaveBlock1Ptr - ldr r0, [r0] - movs r1, 0x98 - lsls r1, 5 - adds r0, r1 - movs r2, 0xCD - lsls r2, 5 - movs r1, 0 - bl memset - ldr r0, _081108DC @ =gUnknown_203ADF8 - movs r1, 0 - strb r1, [r0] - ldr r0, _081108E0 @ =gUnknown_203ADFA - strb r1, [r0] - ldr r0, _081108E4 @ =gUnknown_203AE8C - movs r1, 0 - str r1, [r0] - ldr r0, _081108E8 @ =gUnknown_203AE08 - str r1, [r0] - ldr r0, _081108EC @ =gUnknown_203AE04 - str r1, [r0] - bl sub_8113BD8 - bl sub_81138F8 - pop {r0} - bx r0 - .align 2, 0 -_081108D8: .4byte gSaveBlock1Ptr -_081108DC: .4byte gUnknown_203ADF8 -_081108E0: .4byte gUnknown_203ADFA -_081108E4: .4byte gUnknown_203AE8C -_081108E8: .4byte gUnknown_203AE08 -_081108EC: .4byte gUnknown_203AE04 - thumb_func_end sub_811089C - thumb_func_start sub_81108F0 sub_81108F0: @ 81108F0 push {lr} diff --git a/include/global.h b/include/global.h index 11a79ebe8..791eb2dbf 100644 --- a/include/global.h +++ b/include/global.h @@ -474,6 +474,11 @@ struct MysteryEventStruct u8 unk_1; }; +struct QuestLog +{ + /*0x0000*/ u8 filler_0000[0x19a0]; +}; + #define MAP_OBJECTS_COUNT 16 #define BERRY_TREES_COUNT 128 #define FLAGS_COUNT 300 @@ -494,7 +499,9 @@ struct SaveBlock1 /*0x63a*/ u8 trainerRematches[100]; /*0x06A0*/ struct MapObject mapObjects[MAP_OBJECTS_COUNT]; /*0x08E0*/ struct MapObjectTemplate mapObjectTemplates[64]; - /*0x0EE0*/ u8 fillerEE0[0x2580]; + /*0x0EE0*/ u8 fillerEE0[0x420]; + /*0x1300*/ struct QuestLog questLog; + /*0x2ca0*/ u8 filler2CA0[0x7c0]; /*0x3460*/ struct MysteryEventStruct unk_3460; /*0x3464*/ u8 filler_3464[0x1b8]; /*0x361C*/ struct RamScript ramScript; diff --git a/include/quest_log.h b/include/quest_log.h new file mode 100644 index 000000000..015f4966e --- /dev/null +++ b/include/quest_log.h @@ -0,0 +1,4 @@ +#ifndef GUARD_QUEST_LOG_H +#define GUARD_QUEST_LOG_H + +#endif //GUARD_QUEST_LOG_H diff --git a/ld_script.txt b/ld_script.txt index 70084ef0e..0cd3d6202 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -222,6 +222,7 @@ SECTIONS { asm/item_pc.o(.text); asm/mailbox_pc.o(.text); asm/menu.o(.text); + src/quest_log.o(.text); asm/quest_log.o(.text); asm/link_rfu_3.o(.text); asm/pokemon_special_anim.o(.text); diff --git a/src/quest_log.c b/src/quest_log.c new file mode 100644 index 000000000..00b79516d --- /dev/null +++ b/src/quest_log.c @@ -0,0 +1,43 @@ +#include "global.h" +#include "quest_log.h" + +EWRAM_DATA u8 gUnknown_203ADF8 = 0; +EWRAM_DATA u8 gUnknown_203ADFA = 0; +EWRAM_DATA void * gUnknown_203AE04 = NULL; +EWRAM_DATA void * gUnknown_203AE08 = NULL; +EWRAM_DATA void * gUnknown_203AE0C[32] = {NULL}; +EWRAM_DATA u32 gUnknown_203AE8C = 0; + +void sub_8113BD8(void); +void sub_81138F8(void); + +void sub_8110840(void * a0) +{ + size_t r1 = (void *)gSaveBlock1Ptr - a0; + if (gUnknown_203AE04) + gUnknown_203AE04 += r1; + if (gUnknown_203ADFA != 0) + { + if (gUnknown_203AE08) + gUnknown_203AE08 += r1; + if (gUnknown_203ADFA == 2) + { + int r3; + for (r3 = 0; r3 < 0x20; r3++) + if (gUnknown_203AE0C[r3]) + gUnknown_203AE0C[r3] += r1; + } + } +} + +void sub_811089C(void) +{ + gSaveBlock1Ptr->questLog = (struct QuestLog){}; + gUnknown_203ADF8 = 0; + gUnknown_203ADFA = 0; + gUnknown_203AE8C = 0; + gUnknown_203AE08 = 0; + gUnknown_203AE04 = 0; + sub_8113BD8(); + sub_81138F8(); +} -- cgit v1.2.3 From f5964c58bd51718381c5492c063662354a86309e Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Tue, 9 Oct 2018 21:28:20 -0400 Subject: through sub_811092C --- asm/quest_log.s | 51 --------------------------------------------------- include/global.h | 4 ++-- src/quest_log.c | 21 +++++++++++++++++++-- 3 files changed, 21 insertions(+), 55 deletions(-) diff --git a/asm/quest_log.s b/asm/quest_log.s index cc5c32e64..bad86c36d 100644 --- a/asm/quest_log.s +++ b/asm/quest_log.s @@ -5,57 +5,6 @@ .text - thumb_func_start sub_81108F0 -sub_81108F0: @ 81108F0 - push {lr} - lsls r0, 24 - lsrs r0, 24 - ldr r1, _08110918 @ =gSaveBlock1Ptr - ldr r1, [r1] - movs r2, 0xCD - lsls r2, 3 - muls r0, r2 - adds r0, r1 - movs r1, 0x98 - lsls r1, 5 - adds r0, r1 - movs r1, 0 - bl memset - ldr r1, _0811091C @ =gUnknown_203AE04 - movs r0, 0 - str r0, [r1] - pop {r0} - bx r0 - .align 2, 0 -_08110918: .4byte gSaveBlock1Ptr -_0811091C: .4byte gUnknown_203AE04 - thumb_func_end sub_81108F0 - - thumb_func_start sub_8110920 -sub_8110920: @ 8110920 - ldr r1, _08110928 @ =gUnknown_203AE04 - movs r0, 0 - str r0, [r1] - bx lr - .align 2, 0 -_08110928: .4byte gUnknown_203AE04 - thumb_func_end sub_8110920 - - thumb_func_start sub_811092C -sub_811092C: @ 811092C - push {lr} - ldr r0, _08110940 @ =gUnknown_203AE8C - ldr r0, [r0] - cmp r0, 0 - beq _0811093A - bl _call_via_r0 -_0811093A: - pop {r0} - bx r0 - .align 2, 0 -_08110940: .4byte gUnknown_203AE8C - thumb_func_end sub_811092C - thumb_func_start sub_8110944 sub_8110944: @ 8110944 push {r4,r5,lr} diff --git a/include/global.h b/include/global.h index 791eb2dbf..e1b6ff579 100644 --- a/include/global.h +++ b/include/global.h @@ -476,7 +476,7 @@ struct MysteryEventStruct struct QuestLog { - /*0x0000*/ u8 filler_0000[0x19a0]; + /*0x0000*/ u8 filler_000[0x668]; }; #define MAP_OBJECTS_COUNT 16 @@ -500,7 +500,7 @@ struct SaveBlock1 /*0x06A0*/ struct MapObject mapObjects[MAP_OBJECTS_COUNT]; /*0x08E0*/ struct MapObjectTemplate mapObjectTemplates[64]; /*0x0EE0*/ u8 fillerEE0[0x420]; - /*0x1300*/ struct QuestLog questLog; + /*0x1300*/ struct QuestLog questLog[4]; /*0x2ca0*/ u8 filler2CA0[0x7c0]; /*0x3460*/ struct MysteryEventStruct unk_3460; /*0x3464*/ u8 filler_3464[0x1b8]; diff --git a/src/quest_log.c b/src/quest_log.c index 00b79516d..c59de93db 100644 --- a/src/quest_log.c +++ b/src/quest_log.c @@ -6,7 +6,7 @@ EWRAM_DATA u8 gUnknown_203ADFA = 0; EWRAM_DATA void * gUnknown_203AE04 = NULL; EWRAM_DATA void * gUnknown_203AE08 = NULL; EWRAM_DATA void * gUnknown_203AE0C[32] = {NULL}; -EWRAM_DATA u32 gUnknown_203AE8C = 0; +EWRAM_DATA void (* gUnknown_203AE8C)(void) = 0; void sub_8113BD8(void); void sub_81138F8(void); @@ -32,7 +32,7 @@ void sub_8110840(void * a0) void sub_811089C(void) { - gSaveBlock1Ptr->questLog = (struct QuestLog){}; + memset(gSaveBlock1Ptr->questLog, 0, sizeof(gSaveBlock1Ptr->questLog)); gUnknown_203ADF8 = 0; gUnknown_203ADFA = 0; gUnknown_203AE8C = 0; @@ -41,3 +41,20 @@ void sub_811089C(void) sub_8113BD8(); sub_81138F8(); } + +void sub_81108F0(u8 a0) +{ + memset(gSaveBlock1Ptr->questLog + a0, 0, sizeof(struct QuestLog)); + gUnknown_203AE04 = NULL; +} + +void sub_8110920(void) +{ + gUnknown_203AE04 = NULL; +} + +void sub_811092C(void) +{ + if (gUnknown_203AE8C) + gUnknown_203AE8C(); +} -- cgit v1.2.3 From b78aef06258d5bc6f44cdcc43987a5dd11f1d975 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Wed, 10 Oct 2018 07:59:47 -0400 Subject: sub_8110944 --- asm/quest_log.s | 39 --------------------------------------- include/global.h | 4 +++- src/quest_log.c | 10 ++++++++++ 3 files changed, 13 insertions(+), 40 deletions(-) diff --git a/asm/quest_log.s b/asm/quest_log.s index bad86c36d..d1beeb0c4 100644 --- a/asm/quest_log.s +++ b/asm/quest_log.s @@ -5,45 +5,6 @@ .text - thumb_func_start sub_8110944 -sub_8110944: @ 8110944 - push {r4,r5,lr} - adds r5, r0, 0 - ldr r4, _08110978 @ =gSaveBlock1Ptr - ldr r0, _0811097C @ =gUnknown_203ADF8 - ldrb r0, [r0] - movs r3, 0xCD - lsls r3, 3 - adds r2, r0, 0 - muls r2, r3 - movs r0, 0x98 - lsls r0, 5 - adds r2, r0 - ldr r0, [r4] - adds r0, r2 - movs r4, 0xAD - lsls r4, 3 - adds r2, r0, r4 - adds r0, r3 - subs r0, r1 - cmp r5, r2 - bcc _08110972 - cmp r5, r0 - bls _08110980 -_08110972: - movs r0, 0 - b _08110982 - .align 2, 0 -_08110978: .4byte gSaveBlock1Ptr -_0811097C: .4byte gUnknown_203ADF8 -_08110980: - movs r0, 0x1 -_08110982: - pop {r4,r5} - pop {r1} - bx r1 - thumb_func_end sub_8110944 - thumb_func_start sub_8110988 sub_8110988: @ 8110988 push {r4,r5,lr} diff --git a/include/global.h b/include/global.h index e1b6ff579..907dc7eaa 100644 --- a/include/global.h +++ b/include/global.h @@ -476,7 +476,9 @@ struct MysteryEventStruct struct QuestLog { - /*0x0000*/ u8 filler_000[0x668]; + /*0x0000*/ u8 filler_000[0x568]; + /*0x0568*/ u8 filler_568[0x100]; + /*0x0668*/ u8 end[0]; }; #define MAP_OBJECTS_COUNT 16 diff --git a/src/quest_log.c b/src/quest_log.c index c59de93db..4dc0a5719 100644 --- a/src/quest_log.c +++ b/src/quest_log.c @@ -58,3 +58,13 @@ void sub_811092C(void) if (gUnknown_203AE8C) gUnknown_203AE8C(); } + +bool8 sub_8110944(u8 * a0, s32 a1) +{ + u8 * r2 = gSaveBlock1Ptr->questLog[gUnknown_203ADF8].filler_568; + u8 * r0 = gSaveBlock1Ptr->questLog[gUnknown_203ADF8].end; + r0 -= a1; + if (a0 < r2 || a0 > r0) + return FALSE; + return TRUE; +} -- cgit v1.2.3 From dc37cd7de0d60727e4b45fd4c83301a59a194bdf Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Wed, 10 Oct 2018 10:45:50 -0400 Subject: through sub_8110A3C --- asm/quest_log.s | 158 ---------------------------------------------- common_syms/quest_log.txt | 1 + include/quest_log.h | 2 + src/quest_log.c | 69 +++++++++++++++++++- sym_common.txt | 3 +- 5 files changed, 72 insertions(+), 161 deletions(-) create mode 100644 common_syms/quest_log.txt diff --git a/asm/quest_log.s b/asm/quest_log.s index d1beeb0c4..880f6c290 100644 --- a/asm/quest_log.s +++ b/asm/quest_log.s @@ -5,164 +5,6 @@ .text - thumb_func_start sub_8110988 -sub_8110988: @ 8110988 - push {r4,r5,lr} - adds r5, r0, 0 - ldr r4, _081109BC @ =gSaveBlock1Ptr - ldr r0, _081109C0 @ =gUnknown_203ADF8 - ldrb r0, [r0] - movs r3, 0xCD - lsls r3, 3 - adds r2, r0, 0 - muls r2, r3 - movs r0, 0x98 - lsls r0, 5 - adds r2, r0 - ldr r0, [r4] - adds r0, r2 - movs r4, 0xAD - lsls r4, 3 - adds r2, r0, r4 - adds r0, r3 - subs r0, r1 - cmp r5, r2 - bcc _081109B6 - cmp r5, r0 - bls _081109C4 -_081109B6: - movs r0, 0 - b _081109C6 - .align 2, 0 -_081109BC: .4byte gSaveBlock1Ptr -_081109C0: .4byte gUnknown_203ADF8 -_081109C4: - movs r0, 0x1 -_081109C6: - pop {r4,r5} - pop {r1} - bx r1 - thumb_func_end sub_8110988 - - thumb_func_start sub_81109CC -sub_81109CC: @ 81109CC - push {lr} - lsls r0, 24 - lsrs r0, 24 - ldr r1, _081109E0 @ =gUnknown_203ADFA - strb r0, [r1] - cmp r0, 0x1 - bne _081109EC - ldr r1, _081109E4 @ =gUnknown_203AE8C - ldr r0, _081109E8 @ =sub_8110A00 - b _081109F0 - .align 2, 0 -_081109E0: .4byte gUnknown_203ADFA -_081109E4: .4byte gUnknown_203AE8C -_081109E8: .4byte sub_8110A00 -_081109EC: - ldr r1, _081109F8 @ =gUnknown_203AE8C - ldr r0, _081109FC @ =sub_8110A3C -_081109F0: - str r0, [r1] - pop {r0} - bx r0 - .align 2, 0 -_081109F8: .4byte gUnknown_203AE8C -_081109FC: .4byte sub_8110A3C - thumb_func_end sub_81109CC - - thumb_func_start sub_8110A00 -sub_8110A00: @ 8110A00 - push {r4,lr} - ldr r0, _08110A2C @ =gUnknown_203AE98 - bl sub_8110E68 - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x1 - beq _08110A24 - ldr r0, _08110A30 @ =gUnknown_3005E88 - movs r4, 0 - strb r4, [r0] - bl sub_8110E3C - ldr r0, _08110A34 @ =gUnknown_203ADFA - strb r4, [r0] - ldr r1, _08110A38 @ =gUnknown_203AE8C - movs r0, 0 - str r0, [r1] -_08110A24: - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_08110A2C: .4byte gUnknown_203AE98 -_08110A30: .4byte gUnknown_3005E88 -_08110A34: .4byte gUnknown_203ADFA -_08110A38: .4byte gUnknown_203AE8C - thumb_func_end sub_8110A00 - - thumb_func_start sub_8110A3C -sub_8110A3C: @ 8110A3C - push {r4,lr} - ldr r1, _08110A8C @ =gUnknown_203AE94 - ldrb r2, [r1] - movs r4, 0xF - adds r0, r4, 0 - ands r0, r2 - adds r3, r1, 0 - cmp r0, 0x2 - bne _08110A56 - movs r0, 0x10 - negs r0, r0 - ands r0, r2 - strb r0, [r3] -_08110A56: - ldrb r1, [r3] - movs r0, 0xC0 - ands r0, r1 - cmp r0, 0 - bne _08110AAE - ldr r0, _08110A90 @ =gUnknown_3005E88 - ldrb r0, [r0] - cmp r0, 0 - bne _08110A84 - adds r0, r4, 0 - ands r0, r1 - cmp r0, 0x1 - beq _08110A84 - ldrb r0, [r3, 0x1] - cmp r0, 0x1F - bhi _08110A98 - ldr r0, _08110A94 @ =gUnknown_203AE0C - ldrb r1, [r3, 0x1] - lsls r1, 2 - adds r1, r0 - ldr r0, [r1] - cmp r0, 0 - beq _08110A98 -_08110A84: - bl sub_8111AD8 - b _08110AAE - .align 2, 0 -_08110A8C: .4byte gUnknown_203AE94 -_08110A90: .4byte gUnknown_3005E88 -_08110A94: .4byte gUnknown_203AE0C -_08110A98: - ldrb r0, [r3] - movs r1, 0x3F - ands r1, r0 - movs r0, 0x80 - orrs r1, r0 - strb r1, [r3] - bl ScriptContext2_Enable - movs r0, 0 - bl sub_81118F4 -_08110AAE: - pop {r4} - pop {r0} - bx r0 - thumb_func_end sub_8110A3C - thumb_func_start sub_8110AB4 sub_8110AB4: @ 8110AB4 ldr r0, _08110AC0 @ =gUnknown_20370D0 diff --git a/common_syms/quest_log.txt b/common_syms/quest_log.txt new file mode 100644 index 000000000..4ecbf66a8 --- /dev/null +++ b/common_syms/quest_log.txt @@ -0,0 +1 @@ +gUnknown_3005E88 diff --git a/include/quest_log.h b/include/quest_log.h index 015f4966e..dfdd4bf41 100644 --- a/include/quest_log.h +++ b/include/quest_log.h @@ -1,4 +1,6 @@ #ifndef GUARD_QUEST_LOG_H #define GUARD_QUEST_LOG_H +extern u8 gUnknown_3005E88; + #endif //GUARD_QUEST_LOG_H diff --git a/src/quest_log.c b/src/quest_log.c index 4dc0a5719..0454dd7ad 100644 --- a/src/quest_log.c +++ b/src/quest_log.c @@ -1,13 +1,32 @@ #include "global.h" +#include "script.h" #include "quest_log.h" +u8 gUnknown_3005E88; + +struct UnkStruct_203AE94 +{ + u8 unk_0_0:4; + u8 unk_0_4:2; + u8 unk_0_6:2; + u8 unk_1; +}; + EWRAM_DATA u8 gUnknown_203ADF8 = 0; EWRAM_DATA u8 gUnknown_203ADFA = 0; EWRAM_DATA void * gUnknown_203AE04 = NULL; EWRAM_DATA void * gUnknown_203AE08 = NULL; EWRAM_DATA void * gUnknown_203AE0C[32] = {NULL}; EWRAM_DATA void (* gUnknown_203AE8C)(void) = 0; +EWRAM_DATA struct UnkStruct_203AE94 gUnknown_203AE94 = {0}; +EWRAM_DATA u8 gUnknown_203AE98[0x100] = {0}; +void sub_8110A00(void); +u8 sub_8110E68(void *); +void sub_8110A3C(void); +void sub_8110E3C(void); +void sub_8111AD8(void); +void sub_81118F4(s8); void sub_8113BD8(void); void sub_81138F8(void); @@ -59,7 +78,17 @@ void sub_811092C(void) gUnknown_203AE8C(); } -bool8 sub_8110944(u8 * a0, s32 a1) +bool8 sub_8110944(u8 * a0, size_t a1) +{ + u8 * r2 = gSaveBlock1Ptr->questLog[gUnknown_203ADF8].filler_568; + u8 * r0 = gSaveBlock1Ptr->questLog[gUnknown_203ADF8].end; + r0 -= a1; + if (a0 < r2 || a0 > r0) + return FALSE; + return TRUE; +} + +bool8 sub_8110988(u8 * a0, size_t a1) { u8 * r2 = gSaveBlock1Ptr->questLog[gUnknown_203ADF8].filler_568; u8 * r0 = gSaveBlock1Ptr->questLog[gUnknown_203ADF8].end; @@ -68,3 +97,41 @@ bool8 sub_8110944(u8 * a0, s32 a1) return FALSE; return TRUE; } + +void sub_81109CC(u8 a0) +{ + gUnknown_203ADFA = a0; + if (a0 == 1) + gUnknown_203AE8C = sub_8110A00; + else + gUnknown_203AE8C = sub_8110A3C; +} + +void sub_8110A00(void) +{ + if (sub_8110E68(gUnknown_203AE98) != 1) + { + gUnknown_3005E88 = 0; + sub_8110E3C(); + gUnknown_203ADFA = 0; + gUnknown_203AE8C = NULL; + } +} + +void sub_8110A3C(void) +{ + if (gUnknown_203AE94.unk_0_0 == 2) + gUnknown_203AE94.unk_0_0 = 0; + + if (gUnknown_203AE94.unk_0_6 == 0) + { + if (gUnknown_3005E88 || gUnknown_203AE94.unk_0_0 == 1 || (gUnknown_203AE94.unk_1 < 32 && gUnknown_203AE0C[gUnknown_203AE94.unk_1])) + sub_8111AD8(); + else + { + gUnknown_203AE94.unk_0_6 = 2; + ScriptContext2_Enable(); + sub_81118F4(0); + } + } +} diff --git a/sym_common.txt b/sym_common.txt index 4049c48f5..7c2f0ff7f 100644 --- a/sym_common.txt +++ b/sym_common.txt @@ -345,8 +345,7 @@ gUnknown_3005E60: @ 3005E60 gUnknown_3005E70: @ 3005E70 .space 0x18 -gUnknown_3005E88: @ 3005E88 - .space 0x4 + .include "quest_log.o" gUnknown_3005E8C: @ 3005E8C .space 0x4 -- cgit v1.2.3 From a7a6457014c93b3314c6fc8bfe9be1b3c6e946d5 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Wed, 10 Oct 2018 11:08:56 -0400 Subject: through sub_8110AEC --- asm/quest_log.s | 121 -------------------------------------------------------- src/quest_log.c | 49 ++++++++++++++++++++++- 2 files changed, 47 insertions(+), 123 deletions(-) diff --git a/asm/quest_log.s b/asm/quest_log.s index 880f6c290..40689ba5e 100644 --- a/asm/quest_log.s +++ b/asm/quest_log.s @@ -5,127 +5,6 @@ .text - thumb_func_start sub_8110AB4 -sub_8110AB4: @ 8110AB4 - ldr r0, _08110AC0 @ =gUnknown_20370D0 - ldr r1, _08110AC4 @ =gUnknown_203ADFA - ldrb r1, [r1] - strh r1, [r0] - bx lr - .align 2, 0 -_08110AC0: .4byte gUnknown_20370D0 -_08110AC4: .4byte gUnknown_203ADFA - thumb_func_end sub_8110AB4 - - thumb_func_start sub_8110AC8 -sub_8110AC8: @ 8110AC8 - ldr r0, _08110AE4 @ =gSaveBlock1Ptr - ldr r1, [r0] - ldr r0, _08110AE8 @ =gUnknown_203ADF8 - ldrb r2, [r0] - movs r0, 0xCD - lsls r0, 3 - muls r0, r2 - adds r1, r0 - movs r0, 0x98 - lsls r0, 5 - adds r1, r0 - ldrb r0, [r1] - bx lr - .align 2, 0 -_08110AE4: .4byte gSaveBlock1Ptr -_08110AE8: .4byte gUnknown_203ADF8 - thumb_func_end sub_8110AC8 - - thumb_func_start sub_8110AEC -sub_8110AEC: @ 8110AEC - push {r4-r7,lr} - lsls r0, 16 - lsrs r6, r0, 16 - ldr r4, _08110B44 @ =gUnknown_203ADF8 - ldrb r0, [r4] - cmp r0, 0x3 - bls _08110AFE - movs r0, 0 - strb r0, [r4] -_08110AFE: - ldrb r0, [r4] - bl sub_81108F0 - bl sub_8113B88 - ldr r2, _08110B48 @ =gUnknown_203AE08 - ldr r1, _08110B4C @ =gSaveBlock1Ptr - ldrb r0, [r4] - movs r3, 0xCD - lsls r3, 3 - muls r0, r3 - movs r5, 0x98 - lsls r5, 5 - adds r0, r5 - ldr r1, [r1] - adds r0, r1, r0 - movs r7, 0xAD - lsls r7, 3 - adds r0, r7 - str r0, [r2] - adds r0, r6, 0 - subs r0, 0xC - lsls r0, 16 - lsrs r0, 16 - cmp r0, 0x7 - bls _08110B36 - cmp r6, 0x23 - bne _08110B50 -_08110B36: - ldrb r0, [r4] - muls r0, r3 - adds r0, r1, r0 - adds r0, r5 - movs r1, 0x2 - b _08110B5A - .align 2, 0 -_08110B44: .4byte gUnknown_203ADF8 -_08110B48: .4byte gUnknown_203AE08 -_08110B4C: .4byte gSaveBlock1Ptr -_08110B50: - ldrb r0, [r4] - muls r0, r3 - adds r0, r1, r0 - adds r0, r5 - movs r1, 0x1 -_08110B5A: - strb r1, [r0] - bl sub_81115E8 - ldr r4, _08110BA4 @ =gUnknown_203ADF8 - ldrb r0, [r4] - bl sub_8110BB0 - ldrb r0, [r4] - bl sub_8110BE8 - bl sub_8110D94 - bl sub_8110E20 - ldrb r0, [r4] - bl sub_8110D48 - ldr r1, _08110BA8 @ =gUnknown_203ADFC - movs r0, 0 - strh r0, [r1] - ldr r4, _08110BAC @ =gUnknown_203AE98 - movs r2, 0x80 - lsls r2, 1 - movs r0, 0x2 - adds r1, r4, 0 - bl sub_8112940 - adds r0, r4, 0 - bl sub_8110E68 - movs r0, 0x1 - bl sub_81109CC - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_08110BA4: .4byte gUnknown_203ADF8 -_08110BA8: .4byte gUnknown_203ADFC -_08110BAC: .4byte gUnknown_203AE98 - thumb_func_end sub_8110AEC - thumb_func_start sub_8110BB0 sub_8110BB0: @ 8110BB0 lsls r0, 24 diff --git a/src/quest_log.c b/src/quest_log.c index 0454dd7ad..3a5ca7b30 100644 --- a/src/quest_log.c +++ b/src/quest_log.c @@ -1,5 +1,6 @@ #include "global.h" #include "script.h" +#include "event_data.h" #include "quest_log.h" u8 gUnknown_3005E88; @@ -14,6 +15,7 @@ struct UnkStruct_203AE94 EWRAM_DATA u8 gUnknown_203ADF8 = 0; EWRAM_DATA u8 gUnknown_203ADFA = 0; +EWRAM_DATA u16 gUnknown_203ADFC = 0; EWRAM_DATA void * gUnknown_203AE04 = NULL; EWRAM_DATA void * gUnknown_203AE08 = NULL; EWRAM_DATA void * gUnknown_203AE0C[32] = {NULL}; @@ -22,13 +24,22 @@ EWRAM_DATA struct UnkStruct_203AE94 gUnknown_203AE94 = {0}; EWRAM_DATA u8 gUnknown_203AE98[0x100] = {0}; void sub_8110A00(void); -u8 sub_8110E68(void *); void sub_8110A3C(void); void sub_8110E3C(void); -void sub_8111AD8(void); +u8 sub_8110E68(void *); void sub_81118F4(s8); +void sub_8111AD8(void); +void sub_8113B88(void); void sub_8113BD8(void); void sub_81138F8(void); +void sub_81115E8(void); +void sub_8110BB0(u8); +void sub_8110BE8(u8); +void sub_8110D94(void); +void sub_8110E20(void); +void sub_8110D48(u8); +void sub_8112940(u8, u8 *, u16); + void sub_8110840(void * a0) { @@ -135,3 +146,37 @@ void sub_8110A3C(void) } } } + +void sub_8110AB4(void) +{ + gUnknown_20370D0 = gUnknown_203ADFA; +} + +u8 sub_8110AC8(void) +{ + return gSaveBlock1Ptr->questLog[gUnknown_203ADF8].filler_000[0]; +} + +void sub_8110AEC(u16 a0) +{ + if (gUnknown_203ADF8 > 3) + gUnknown_203ADF8 = 0; + + sub_81108F0(gUnknown_203ADF8); + sub_8113B88(); + gUnknown_203AE08 = gSaveBlock1Ptr->questLog[gUnknown_203ADF8].filler_568; + if ((a0 >= 12 && a0 < 20) || a0 == 35) + gSaveBlock1Ptr->questLog[gUnknown_203ADF8].filler_000[0] = 2; + else + gSaveBlock1Ptr->questLog[gUnknown_203ADF8].filler_000[0] = 1; + sub_81115E8(); + sub_8110BB0(gUnknown_203ADF8); + sub_8110BE8(gUnknown_203ADF8); + sub_8110D94(); + sub_8110E20(); + sub_8110D48(gUnknown_203ADF8); + gUnknown_203ADFC = 0; + sub_8112940(2, gUnknown_203AE98, 0x100); + sub_8110E68(gUnknown_203AE98); + sub_81109CC(1); +} -- cgit v1.2.3 From 572929c3523aeb2f563821f07724f5356df61d76 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Wed, 10 Oct 2018 11:25:05 -0400 Subject: sub_8110BB0 --- asm/quest_log.s | 31 ------------------------------- include/global.h | 10 ++++++++-- src/quest_log.c | 16 +++++++++++++--- 3 files changed, 21 insertions(+), 36 deletions(-) diff --git a/asm/quest_log.s b/asm/quest_log.s index 40689ba5e..3a4b5eb8e 100644 --- a/asm/quest_log.s +++ b/asm/quest_log.s @@ -5,37 +5,6 @@ .text - thumb_func_start sub_8110BB0 -sub_8110BB0: @ 8110BB0 - lsls r0, 24 - lsrs r0, 24 - ldr r2, _08110BE4 @ =gSaveBlock1Ptr - movs r1, 0xCD - lsls r1, 3 - muls r1, r0 - movs r0, 0x98 - lsls r0, 5 - adds r1, r0 - ldr r0, [r2] - adds r1, r0, r1 - ldrb r0, [r0, 0x4] - strb r0, [r1, 0x1] - ldr r0, [r2] - ldrb r0, [r0, 0x5] - strb r0, [r1, 0x2] - ldr r0, [r2] - ldrb r0, [r0, 0x6] - strb r0, [r1, 0x3] - ldr r2, [r2] - ldrh r0, [r2] - strh r0, [r1, 0x4] - ldrh r0, [r2, 0x2] - strh r0, [r1, 0x6] - bx lr - .align 2, 0 -_08110BE4: .4byte gSaveBlock1Ptr - thumb_func_end sub_8110BB0 - thumb_func_start sub_8110BE8 sub_8110BE8: @ 8110BE8 push {r4-r7,lr} diff --git a/include/global.h b/include/global.h index 907dc7eaa..4efd21e48 100644 --- a/include/global.h +++ b/include/global.h @@ -476,7 +476,13 @@ struct MysteryEventStruct struct QuestLog { - /*0x0000*/ u8 filler_000[0x568]; + /*0x0000*/ u8 unk_000; + /*0x0001*/ s8 unk_001; + /*0x0002*/ s8 unk_002; + /*0x0003*/ s8 unk_003; + /*0x0004*/ s16 unk_004; + /*0x0006*/ s16 unk_006; + /*0x0008*/ u8 filler_008[0x560]; /*0x0568*/ u8 filler_568[0x100]; /*0x0668*/ u8 end[0]; }; @@ -489,7 +495,7 @@ struct QuestLog struct SaveBlock1 { - /*0x0000*/ u8 filler[0x4]; + /*0x0000*/ struct Coords16 pos; /*0x0004*/ struct WarpData location; /*0x0C*/ struct WarpData warp1; /*0x14*/ struct WarpData warp2; diff --git a/src/quest_log.c b/src/quest_log.c index 3a5ca7b30..900194040 100644 --- a/src/quest_log.c +++ b/src/quest_log.c @@ -154,7 +154,7 @@ void sub_8110AB4(void) u8 sub_8110AC8(void) { - return gSaveBlock1Ptr->questLog[gUnknown_203ADF8].filler_000[0]; + return gSaveBlock1Ptr->questLog[gUnknown_203ADF8].unk_000; } void sub_8110AEC(u16 a0) @@ -166,9 +166,9 @@ void sub_8110AEC(u16 a0) sub_8113B88(); gUnknown_203AE08 = gSaveBlock1Ptr->questLog[gUnknown_203ADF8].filler_568; if ((a0 >= 12 && a0 < 20) || a0 == 35) - gSaveBlock1Ptr->questLog[gUnknown_203ADF8].filler_000[0] = 2; + gSaveBlock1Ptr->questLog[gUnknown_203ADF8].unk_000 = 2; else - gSaveBlock1Ptr->questLog[gUnknown_203ADF8].filler_000[0] = 1; + gSaveBlock1Ptr->questLog[gUnknown_203ADF8].unk_000 = 1; sub_81115E8(); sub_8110BB0(gUnknown_203ADF8); sub_8110BE8(gUnknown_203ADF8); @@ -180,3 +180,13 @@ void sub_8110AEC(u16 a0) sub_8110E68(gUnknown_203AE98); sub_81109CC(1); } + +void sub_8110BB0(u8 a0) +{ + struct QuestLog * questLog = &gSaveBlock1Ptr->questLog[a0]; + questLog->unk_001 = gSaveBlock1Ptr->location.mapGroup; + questLog->unk_002 = gSaveBlock1Ptr->location.mapNum; + questLog->unk_003 = gSaveBlock1Ptr->location.warpId; + questLog->unk_004 = gSaveBlock1Ptr->pos.x; + questLog->unk_006 = gSaveBlock1Ptr->pos.y; +} -- cgit v1.2.3 From f24d9344e8c26414b0776eff693d27ec8a6ddea1 Mon Sep 17 00:00:00 2001 From: paul Date: Wed, 10 Oct 2018 23:00:46 +0200 Subject: revert to previous graphics_file_rules.mk and fix up font rules. fix double include in makefile --- Makefile | 2 - graphics_file_rules.mk | 621 ++++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 620 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 559d0d3d2..0b83cb5c5 100644 --- a/Makefile +++ b/Makefile @@ -88,8 +88,6 @@ clean: tidy tidy: rm -f $(ROM) $(ELF) $(MAP) rm -r build/* - -include graphics_file_rules.mk include graphics_file_rules.mk diff --git a/graphics_file_rules.mk b/graphics_file_rules.mk index 74246425d..055c459b2 100644 --- a/graphics_file_rules.mk +++ b/graphics_file_rules.mk @@ -1,4 +1,250 @@ +MONSTILLFRONTGFXDIR := graphics/pokemon/front_pics +MONBACKGFXDIR := graphics/pokemon/back_pics +MONFRONTGFXDIR := graphics/pokemon/anim_front_pics +MONPALDIR := graphics/pokemon/palettes +TILESETGFXDIR := data/tilesets FONTGFXDIR := data/graphics/fonts +INTERFACEGFXDIR := graphics/interface +BTLANMSPRGFXDIR := graphics/battle_anims/sprites +UNUSEDGFXDIR := graphics/unused +UNKNOWNGFXDIR := graphics/unknown +BATINTGFXDIR := graphics/battle_interface +MASKSGFXDIR := graphics/battle_anims/masks +BATTRANSGFXDIR := graphics/battle_transitions +TYPESGFXDIR := graphics/types +RAYQUAZAGFXDIR := graphics/rayquaza_scene +ROULETTEGFXDIR := graphics/roulette +SLOTMACHINEGFXDIR := graphics/slot_machine +PKNAVGFXDIR := graphics/pokenav +PKNAVOPTIONSGFXDIR := graphics/pokenav/options +PSSGFXDIR := graphics/pokemon_storage +EVENTOBJGFXDIR := graphics/event_objects +MISCGFXDIR := graphics/misc + +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 + +$(MONSTILLFRONTGFXDIR)/castform_still_front_pic.4bpp: $(MONSTILLFRONTGFXDIR)/castform_normal_form_still_front_pic.4bpp \ + $(MONSTILLFRONTGFXDIR)/castform_sunny_form_still_front_pic.4bpp \ + $(MONSTILLFRONTGFXDIR)/castform_rainy_form_still_front_pic.4bpp \ + $(MONSTILLFRONTGFXDIR)/castform_snowy_form_still_front_pic.4bpp + @cat $^ >$@ + +$(MONBACKGFXDIR)/castform_back_pic.4bpp: $(MONBACKGFXDIR)/castform_normal_form_back_pic.4bpp \ + $(MONBACKGFXDIR)/castform_sunny_form_back_pic.4bpp \ + $(MONBACKGFXDIR)/castform_rainy_form_back_pic.4bpp \ + $(MONBACKGFXDIR)/castform_snowy_form_back_pic.4bpp + @cat $^ >$@ + +$(MONFRONTGFXDIR)/castform_front_pic.4bpp: $(MONFRONTGFXDIR)/castform_normal_form_front_pic.4bpp \ + $(MONFRONTGFXDIR)/castform_sunny_form_front_pic.4bpp \ + $(MONFRONTGFXDIR)/castform_rainy_form_front_pic.4bpp \ + $(MONFRONTGFXDIR)/castform_snowy_form_front_pic.4bpp + @cat $^ >$@ + +$(MONPALDIR)/castform_palette.gbapal: $(MONPALDIR)/castform_normal_form_palette.gbapal \ + $(MONPALDIR)/castform_sunny_form_palette.gbapal \ + $(MONPALDIR)/castform_rainy_form_palette.gbapal \ + $(MONPALDIR)/castform_snowy_form_palette.gbapal + @cat $^ >$@ + +$(MONPALDIR)/castform_shiny_palette.gbapal: $(MONPALDIR)/castform_normal_form_shiny_palette.gbapal \ + $(MONPALDIR)/castform_sunny_form_shiny_palette.gbapal \ + $(MONPALDIR)/castform_rainy_form_shiny_palette.gbapal \ + $(MONPALDIR)/castform_snowy_form_shiny_palette.gbapal + @cat $^ >$@ + +$(TILESETGFXDIR)/secondary/petalburg/tiles.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 159 + +$(TILESETGFXDIR)/secondary/rustboro/tiles.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 498 + +$(TILESETGFXDIR)/secondary/dewford/tiles.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 503 + +$(TILESETGFXDIR)/secondary/slateport/tiles.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 504 + +$(TILESETGFXDIR)/secondary/mauville/tiles.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 503 + +$(TILESETGFXDIR)/secondary/lavaridge/tiles.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 450 + +$(TILESETGFXDIR)/secondary/fortree/tiles.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 493 + +$(TILESETGFXDIR)/secondary/pacifidlog/tiles.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 504 + +$(TILESETGFXDIR)/secondary/sootopolis/tiles.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 328 + +$(TILESETGFXDIR)/secondary/battle_frontier_outside_west/tiles.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 508 + +$(TILESETGFXDIR)/secondary/battle_frontier_outside_east/tiles.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 508 + +$(TILESETGFXDIR)/primary/building/tiles.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 502 + +$(TILESETGFXDIR)/secondary/shop/tiles.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 502 + +$(TILESETGFXDIR)/secondary/pokemon_center/tiles.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 478 + +$(TILESETGFXDIR)/secondary/cave/tiles.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 425 + +$(TILESETGFXDIR)/secondary/pokemon_school/tiles.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 278 + +$(TILESETGFXDIR)/secondary/pokemon_fan_club/tiles.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 319 + +$(TILESETGFXDIR)/secondary/unused_1/tiles.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 17 + +$(TILESETGFXDIR)/secondary/meteor_falls/tiles.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 460 + +$(TILESETGFXDIR)/secondary/oceanic_museum/tiles.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 319 + +$(TILESETGFXDIR)/secondary/cable_club/unknown_tiles.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 120 + +$(TILESETGFXDIR)/secondary/seashore_house/tiles.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 312 + +$(TILESETGFXDIR)/secondary/pretty_petal_flower_shop/tiles.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 345 + +$(TILESETGFXDIR)/secondary/pokemon_day_care/tiles.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 355 + +$(TILESETGFXDIR)/secondary/secret_base/brown_cave/unused_tiles.4bpp: $(TILESETGFXDIR)/secondary/secret_base/brown_cave/tiles.png + $(GFX) $< $@ -num_tiles 82 + +$(TILESETGFXDIR)/secondary/secret_base/tree/unused_tiles.4bpp: $(TILESETGFXDIR)/secondary/secret_base/tree/tiles.png + $(GFX) $< $@ -num_tiles 82 + +$(TILESETGFXDIR)/secondary/secret_base/shrub/unused_tiles.4bpp: $(TILESETGFXDIR)/secondary/secret_base/shrub/tiles.png + $(GFX) $< $@ -num_tiles 82 + +$(TILESETGFXDIR)/secondary/secret_base/blue_cave/unused_tiles.4bpp: $(TILESETGFXDIR)/secondary/secret_base/blue_cave/tiles.png + $(GFX) $< $@ -num_tiles 82 + +$(TILESETGFXDIR)/secondary/secret_base/yellow_cave/unused_tiles.4bpp: $(TILESETGFXDIR)/secondary/secret_base/yellow_cave/tiles.png + $(GFX) $< $@ -num_tiles 82 + +$(TILESETGFXDIR)/secondary/secret_base/red_cave/unused_tiles.4bpp: $(TILESETGFXDIR)/secondary/secret_base/red_cave/tiles.png + $(GFX) $< $@ -num_tiles 82 + +$(TILESETGFXDIR)/secondary/secret_base/brown_cave/tiles.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 83 + +$(TILESETGFXDIR)/secondary/secret_base/tree/tiles.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 83 + +$(TILESETGFXDIR)/secondary/secret_base/shrub/tiles.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 83 + +$(TILESETGFXDIR)/secondary/secret_base/blue_cave/tiles.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 83 + +$(TILESETGFXDIR)/secondary/secret_base/yellow_cave/tiles.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 83 + +$(TILESETGFXDIR)/secondary/secret_base/red_cave/tiles.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 83 + +$(TILESETGFXDIR)/secondary/inside_of_truck/tiles.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 62 + +$(TILESETGFXDIR)/secondary/contest/tiles.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 430 + +$(TILESETGFXDIR)/secondary/lilycove_museum/tiles.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 431 + +$(TILESETGFXDIR)/secondary/lab/tiles.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 500 + +$(TILESETGFXDIR)/secondary/underwater/tiles.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 500 + +$(TILESETGFXDIR)/secondary/generic_building/tiles.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 509 + +$(TILESETGFXDIR)/secondary/mauville_game_corner/tiles.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 469 + +$(TILESETGFXDIR)/secondary/unused_2/tiles.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 150 + +$(TILESETGFXDIR)/secondary/rustboro_gym/tiles.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 60 + +$(TILESETGFXDIR)/secondary/dewford_gym/tiles.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 61 + +$(TILESETGFXDIR)/secondary/lavaridge_gym/tiles.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 54 + +$(TILESETGFXDIR)/secondary/petalburg_gym/tiles.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 148 + +$(TILESETGFXDIR)/secondary/fortree_gym/tiles.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 61 + +$(TILESETGFXDIR)/secondary/mossdeep_gym/tiles.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 82 + +$(TILESETGFXDIR)/secondary/sootopolis_gym/tiles.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 484 + +$(TILESETGFXDIR)/secondary/trick_house_puzzle/tiles.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 294 + +$(TILESETGFXDIR)/secondary/inside_ship/tiles.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 342 + +$(TILESETGFXDIR)/secondary/elite_four/tiles.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 505 + +$(TILESETGFXDIR)/secondary/battle_frontier/tiles.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 310 + +$(TILESETGFXDIR)/secondary/battle_factory/tiles.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 424 + +$(TILESETGFXDIR)/secondary/battle_pike/tiles.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 382 + +$(TILESETGFXDIR)/secondary/mirage_tower/tiles.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 420 + +$(TILESETGFXDIR)/secondary/mossdeep_game_corner/tiles.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 95 + +$(TILESETGFXDIR)/secondary/island_harbor/tiles.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 503 + +$(TILESETGFXDIR)/secondary/trainer_hill/tiles.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 374 + +$(TILESETGFXDIR)/secondary/navel_rock/tiles.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 420 + +$(TILESETGFXDIR)/secondary/battle_frontier_ranking_hall/tiles.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 136 + +$(TILESETGFXDIR)/secondary/mystery_events_house/tiles.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 509 $(FONTGFXDIR)/font0_latin.latfont: $(FONTGFXDIR)/font0_latin.png $(GFX) $< $@ @@ -31,4 +277,377 @@ $(FONTGFXDIR)/font5_jap.fwjpnfont: $(FONTGFXDIR)/font5_jap.png $(GFX) $< $@ $(FONTGFXDIR)/font9_jap.fwjpnfont: $(FONTGFXDIR)/font9_jap.png - $(GFX) $< $@ \ No newline at end of file + $(GFX) $< $@ + +graphics/title_screen/pokemon_logo.gbapal: %.gbapal: %.pal + $(GFX) $< $@ -num_colors 224 + +graphics/link_games/pkmnjump_bg.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 63 + +graphics/pokenav/region_map.8bpp: %.8bpp: %.png + $(GFX) $< $@ -num_tiles 233 + +$(MISCGFXDIR)/japanese_hof.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 29 + +$(INTERFACEGFXDIR)/menu.gbapal: $(INTERFACEGFXDIR)/menu_0.gbapal \ + $(INTERFACEGFXDIR)/menu_1.gbapal + @cat $^ >$@ + +$(BTLANMSPRGFXDIR)/010.4bpp: $(BTLANMSPRGFXDIR)/010_0.4bpp \ + $(BTLANMSPRGFXDIR)/010_1.4bpp \ + $(BTLANMSPRGFXDIR)/010_2.4bpp \ + $(BTLANMSPRGFXDIR)/010_3.4bpp + @cat $^ >$@ + +$(UNUSEDGFXDIR)/obi_palpak1.gbapal: $(UNUSEDGFXDIR)/old_pal1.gbapal \ + $(UNUSEDGFXDIR)/old_pal2.gbapal \ + $(UNUSEDGFXDIR)/old_pal3.gbapal + @cat $^ >$@ + +$(UNUSEDGFXDIR)/obi_palpak3.gbapal: $(UNUSEDGFXDIR)/old_pal5.gbapal \ + $(UNUSEDGFXDIR)/old_pal6.gbapal \ + $(UNUSEDGFXDIR)/old_pal7.gbapal + @cat $^ >$@ + +$(UNUSEDGFXDIR)/obi1.4bpp: $(UNUSEDGFXDIR)/old_bulbasaur.4bpp \ + $(UNUSEDGFXDIR)/old_charizard.4bpp + @cat $^ >$@ + +$(UNUSEDGFXDIR)/obi2.4bpp: $(UNUSEDGFXDIR)/old_bulbasaur2.4bpp \ + $(UNUSEDGFXDIR)/old_battle_interface_1.4bpp \ + $(UNUSEDGFXDIR)/old_battle_interface_2.4bpp \ + $(UNUSEDGFXDIR)/old_battle_interface_3.4bpp + @cat $^ >$@ + +$(INTERFACEGFXDIR)/hp_numbers.4bpp: $(INTERFACEGFXDIR)/hpbar_anim.4bpp \ + $(INTERFACEGFXDIR)/numbers1.4bpp \ + $(INTERFACEGFXDIR)/numbers2.4bpp + @cat $^ >$@ + +$(UNUSEDGFXDIR)/redyellowgreen_frame.bin: $(UNUSEDGFXDIR)/red_frame.bin \ + $(UNUSEDGFXDIR)/yellow_frame.bin \ + $(UNUSEDGFXDIR)/green_frame.bin \ + $(UNUSEDGFXDIR)/blank_frame.bin + @cat $^ >$@ + +$(UNUSEDGFXDIR)/color_frames.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 353 + +$(BATINTGFXDIR)/unused_window2bar.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 5 + +$(UNUSEDGFXDIR)/old_contest.4bpp: $(UNUSEDGFXDIR)/old_contest_frame_1.4bpp \ + $(UNUSEDGFXDIR)/old_contest_floor.4bpp \ + $(UNUSEDGFXDIR)/old_contest_frame_2.4bpp \ + $(UNUSEDGFXDIR)/old_contest_symbols.4bpp \ + $(UNUSEDGFXDIR)/old_contest_meter.4bpp \ + $(UNUSEDGFXDIR)/old_contest_classes.4bpp \ + $(UNUSEDGFXDIR)/old_contest_numbers.4bpp + @cat $^ >$@ + +$(UNUSEDGFXDIR)/old_contest_2.4bpp: $(UNUSEDGFXDIR)/old_contest_2_1.4bpp \ + $(UNUSEDGFXDIR)/old_contest_2_2.4bpp + @cat $^ >$@ + +$(UNKNOWNGFXDIR)/unknown_C19470.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 36 + +$(BTLANMSPRGFXDIR)/141.4bpp: $(BTLANMSPRGFXDIR)/141_0.4bpp \ + $(BTLANMSPRGFXDIR)/141_1.4bpp \ + $(BTLANMSPRGFXDIR)/141_2.4bpp \ + $(BTLANMSPRGFXDIR)/141_3.4bpp \ + $(BTLANMSPRGFXDIR)/141_4.4bpp + @cat $^ >$@ + +$(BTLANMSPRGFXDIR)/074.4bpp: $(BTLANMSPRGFXDIR)/074_0.4bpp \ + $(BTLANMSPRGFXDIR)/074_1.4bpp + @cat $^ >$@ + +$(BTLANMSPRGFXDIR)/159.4bpp: $(BTLANMSPRGFXDIR)/159_0.4bpp \ + $(BTLANMSPRGFXDIR)/159_1.4bpp + @cat $^ >$@ + +$(BTLANMSPRGFXDIR)/001.4bpp: $(BTLANMSPRGFXDIR)/001_0.4bpp \ + $(BTLANMSPRGFXDIR)/001_1.4bpp + @cat $^ >$@ + +$(MASKSGFXDIR)/unknown_C2EA50.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 14 + +$(BATTRANSGFXDIR)/vs_frame.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 16 + +$(INTERFACEGFXDIR)/party_menu_misc.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 62 + +$(TYPESGFXDIR)/move_types.4bpp: $(types:%=$(TYPESGFXDIR)/%.4bpp) $(contest_types:%=$(TYPESGFXDIR)/contest_%.4bpp) + @cat $^ >$@ + +$(TYPESGFXDIR)/move_types.gbapal: $(TYPESGFXDIR)/move_types_1.gbapal \ + $(TYPESGFXDIR)/move_types_2.gbapal \ + $(TYPESGFXDIR)/move_types_3.gbapal + @cat $^ >$@ + +$(INTERFACEGFXDIR)/bag_screen.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 53 + +$(RAYQUAZAGFXDIR)/rayquaza.8bpp: %.8bpp: %.png + $(GFX) $< $@ -num_tiles 227 + +$(RAYQUAZAGFXDIR)/overcast.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 313 + +$(RAYQUAZAGFXDIR)/rayquaza_fly1.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 124 + +$(RAYQUAZAGFXDIR)/rayquaza_tail_fix.4bpp: $(RAYQUAZAGFXDIR)/rayquaza_tail.4bpp + cp $< $@ + head -c 12 /dev/zero >> $@ + +$(RAYQUAZAGFXDIR)/chase_streaks.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 19 + +$(RAYQUAZAGFXDIR)/rayquaza_chase.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 155 + +graphics/picture_frame/frame5.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 86 + +$(ROULETTEGFXDIR)/roulette_tilt.4bpp: $(ROULETTEGFXDIR)/shroomish.4bpp \ + $(ROULETTEGFXDIR)/tailow.4bpp + @cat $^ >$@ + +$(ROULETTEGFXDIR)/poke_icons2.4bpp: $(ROULETTEGFXDIR)/wynaut.4bpp \ + $(ROULETTEGFXDIR)/azurill.4bpp \ + $(ROULETTEGFXDIR)/skitty.4bpp \ + $(ROULETTEGFXDIR)/makuhita.4bpp + @cat $^ >$@ + +$(BATTRANSGFXDIR)/85BBC14.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 53 + +$(BATTRANSGFXDIR)/rayquaza.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 938 + +$(BATTRANSGFXDIR)/frontier_square_1.4bpp: $(BATTRANSGFXDIR)/frontier_squares_blanktiles.4bpp \ + $(BATTRANSGFXDIR)/frontier_squares_1.4bpp + @cat $^ >$@ + +$(BATTRANSGFXDIR)/frontier_square_2.4bpp: $(BATTRANSGFXDIR)/frontier_squares_blanktiles.4bpp \ + $(BATTRANSGFXDIR)/frontier_squares_2.4bpp + @cat $^ >$@ + +$(BATTRANSGFXDIR)/frontier_square_3.4bpp: $(BATTRANSGFXDIR)/frontier_squares_blanktiles.4bpp \ + $(BATTRANSGFXDIR)/frontier_squares_3.4bpp + @cat $^ >$@ + +$(BATTRANSGFXDIR)/frontier_square_4.4bpp: $(BATTRANSGFXDIR)/frontier_squares_blanktiles.4bpp \ + $(BATTRANSGFXDIR)/frontier_squares_4.4bpp + @cat $^ >$@ + +$(SLOTMACHINEGFXDIR)/reel_time_gfx.4bpp: $(SLOTMACHINEGFXDIR)/reel_time_pikachu.4bpp \ + $(SLOTMACHINEGFXDIR)/reel_time_machine.4bpp + @cat $^ >$@ + +$(UNUSEDGFXDIR)/intro_birch_beauty.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 822 + +$(PSSGFXDIR)/forest_frame.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 55 + +$(PSSGFXDIR)/forest.4bpp: $(PSSGFXDIR)/forest_frame.4bpp $(PSSGFXDIR)/forest_bg.4bpp + @cat $^ >$@ + +$(PSSGFXDIR)/city_frame.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 52 + +$(PSSGFXDIR)/city.4bpp: $(PSSGFXDIR)/city_frame.4bpp $(PSSGFXDIR)/city_bg.4bpp + @cat $^ >$@ + +$(PSSGFXDIR)/desert.4bpp: $(PSSGFXDIR)/desert_frame.4bpp $(PSSGFXDIR)/desert_bg.4bpp + @cat $^ >$@ + +$(PSSGFXDIR)/savanna_frame.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 45 + +$(PSSGFXDIR)/savanna_bg.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 23 + +$(PSSGFXDIR)/savanna.4bpp: $(PSSGFXDIR)/savanna_frame.4bpp $(PSSGFXDIR)/savanna_bg.4bpp + @cat $^ >$@ + +$(PSSGFXDIR)/crag_frame.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 49 + +$(PSSGFXDIR)/crag.4bpp: $(PSSGFXDIR)/crag_frame.4bpp $(PSSGFXDIR)/crag_bg.4bpp + @cat $^ >$@ + +$(PSSGFXDIR)/volcano_frame.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 56 + +$(PSSGFXDIR)/volcano.4bpp: $(PSSGFXDIR)/volcano_frame.4bpp $(PSSGFXDIR)/volcano_bg.4bpp + @cat $^ >$@ + +$(PSSGFXDIR)/snow_frame.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 57 + +$(PSSGFXDIR)/snow.4bpp: $(PSSGFXDIR)/snow_frame.4bpp $(PSSGFXDIR)/snow_bg.4bpp + @cat $^ >$@ + +$(PSSGFXDIR)/cave_frame.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 55 + +$(PSSGFXDIR)/cave.4bpp: $(PSSGFXDIR)/cave_frame.4bpp $(PSSGFXDIR)/cave_bg.4bpp + @cat $^ >$@ + +$(PSSGFXDIR)/beach_frame.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 46 + +$(PSSGFXDIR)/beach_bg.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 23 + +$(PSSGFXDIR)/beach.4bpp: $(PSSGFXDIR)/beach_frame.4bpp $(PSSGFXDIR)/beach_bg.4bpp + @cat $^ >$@ + +$(PSSGFXDIR)/seafloor_frame.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 54 + +$(PSSGFXDIR)/seafloor.4bpp: $(PSSGFXDIR)/seafloor_frame.4bpp $(PSSGFXDIR)/seafloor_bg.4bpp + @cat $^ >$@ + +$(PSSGFXDIR)/river_frame.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 51 + +$(PSSGFXDIR)/river_bg.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 11 + +$(PSSGFXDIR)/river.4bpp: $(PSSGFXDIR)/river_frame.4bpp $(PSSGFXDIR)/river_bg.4bpp + @cat $^ >$@ + +$(PSSGFXDIR)/sky_frame.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 45 + +$(PSSGFXDIR)/sky.4bpp: $(PSSGFXDIR)/sky_frame.4bpp $(PSSGFXDIR)/sky_bg.4bpp + @cat $^ >$@ + +$(PSSGFXDIR)/polkadot_frame.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 54 + +$(PSSGFXDIR)/polkadot.4bpp: $(PSSGFXDIR)/polkadot_frame.4bpp $(PSSGFXDIR)/polkadot_bg.4bpp + @cat $^ >$@ + +$(PSSGFXDIR)/pokecenter_frame.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 35 + +$(PSSGFXDIR)/pokecenter.4bpp: $(PSSGFXDIR)/pokecenter_frame.4bpp $(PSSGFXDIR)/pokecenter_bg.4bpp + @cat $^ >$@ + +$(PSSGFXDIR)/machine_frame.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 33 + +$(PSSGFXDIR)/machine.4bpp: $(PSSGFXDIR)/machine_frame.4bpp $(PSSGFXDIR)/machine_bg.4bpp + @cat $^ >$@ + +$(PSSGFXDIR)/plain_frame.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 18 + +$(PSSGFXDIR)/plain.4bpp: $(PSSGFXDIR)/plain_frame.4bpp $(PSSGFXDIR)/plain_bg.4bpp + @cat $^ >$@ + +$(PSSGFXDIR)/friends_frame1.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 57 + +$(PSSGFXDIR)/friends_frame2.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 57 + +$(PSSGFXDIR)/zigzagoon.4bpp: $(PSSGFXDIR)/friends_frame1.4bpp $(PSSGFXDIR)/zigzagoon_bg.4bpp + @cat $^ >$@ + +$(PSSGFXDIR)/screen.4bpp: $(PSSGFXDIR)/friends_frame1.4bpp $(PSSGFXDIR)/screen_bg.4bpp + @cat $^ >$@ + +$(PSSGFXDIR)/horizontal.4bpp: $(PSSGFXDIR)/friends_frame1.4bpp $(PSSGFXDIR)/horizontal_bg.4bpp + @cat $^ >$@ + +$(PSSGFXDIR)/diagonal.4bpp: $(PSSGFXDIR)/friends_frame1.4bpp $(PSSGFXDIR)/diagonal_bg.4bpp + @cat $^ >$@ + +$(PSSGFXDIR)/block.4bpp: $(PSSGFXDIR)/friends_frame1.4bpp $(PSSGFXDIR)/block_bg.4bpp + @cat $^ >$@ + +$(PSSGFXDIR)/ribbon.4bpp: $(PSSGFXDIR)/friends_frame1.4bpp $(PSSGFXDIR)/ribbon_bg.4bpp + @cat $^ >$@ + +$(PSSGFXDIR)/pokecenter2.4bpp: $(PSSGFXDIR)/friends_frame1.4bpp $(PSSGFXDIR)/pokecenter2_bg.4bpp + @cat $^ >$@ + +$(PSSGFXDIR)/frame.4bpp: $(PSSGFXDIR)/friends_frame1.4bpp $(PSSGFXDIR)/frame_bg.4bpp + @cat $^ >$@ + +$(PSSGFXDIR)/blank.4bpp: $(PSSGFXDIR)/friends_frame1.4bpp $(PSSGFXDIR)/blank_bg.4bpp + @cat $^ >$@ + +$(PSSGFXDIR)/circles.4bpp: $(PSSGFXDIR)/friends_frame1.4bpp $(PSSGFXDIR)/circles_bg.4bpp + @cat $^ >$@ + +$(PSSGFXDIR)/azumarill.4bpp: $(PSSGFXDIR)/friends_frame2.4bpp $(PSSGFXDIR)/azumarill_bg.4bpp + @cat $^ >$@ + +$(PSSGFXDIR)/pikachu.4bpp: $(PSSGFXDIR)/friends_frame2.4bpp $(PSSGFXDIR)/pikachu_bg.4bpp + @cat $^ >$@ + +$(PSSGFXDIR)/legendary.4bpp: $(PSSGFXDIR)/friends_frame2.4bpp $(PSSGFXDIR)/legendary_bg.4bpp + @cat $^ >$@ + +$(PSSGFXDIR)/dusclops.4bpp: $(PSSGFXDIR)/friends_frame2.4bpp $(PSSGFXDIR)/dusclops_bg.4bpp + @cat $^ >$@ + +$(PSSGFXDIR)/ludicolo.4bpp: $(PSSGFXDIR)/friends_frame2.4bpp $(PSSGFXDIR)/ludicolo_bg.4bpp + @cat $^ >$@ + +$(PSSGFXDIR)/whiscash.4bpp: $(PSSGFXDIR)/friends_frame2.4bpp $(PSSGFXDIR)/whiscash_bg.4bpp + @cat $^ >$@ + +$(EVENTOBJGFXDIR)/pics/effects/unknown_4F6D38/0.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 11 + +$(INTERFACEGFXDIR)/selector_outline.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 8 + +$(BATTRANSGFXDIR)/frontier_transition.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 43 + +$(PKNAVOPTIONSGFXDIR)/options.4bpp: $(PKNAVOPTIONSGFXDIR)/hoenn_map.4bpp \ + $(PKNAVOPTIONSGFXDIR)/condition.4bpp \ + $(PKNAVOPTIONSGFXDIR)/match_call.4bpp \ + $(PKNAVOPTIONSGFXDIR)/ribbons.4bpp \ + $(PKNAVOPTIONSGFXDIR)/switch_off.4bpp \ + $(PKNAVOPTIONSGFXDIR)/party.4bpp \ + $(PKNAVOPTIONSGFXDIR)/search.4bpp \ + $(PKNAVOPTIONSGFXDIR)/cool.4bpp \ + $(PKNAVOPTIONSGFXDIR)/beauty.4bpp \ + $(PKNAVOPTIONSGFXDIR)/cute.4bpp \ + $(PKNAVOPTIONSGFXDIR)/smart.4bpp \ + $(PKNAVOPTIONSGFXDIR)/tough.4bpp \ + $(PKNAVOPTIONSGFXDIR)/cancel.4bpp + @cat $^ >$@ + +$(PKNAVGFXDIR)/header.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 53 + +$(PKNAVGFXDIR)/outline.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 53 + +$(PKNAVGFXDIR)/ui_matchcall.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 13 + +$(INTERFACEGFXDIR)/region_map.8bpp: %.8bpp: %.png + $(GFX) $< $@ -num_tiles 232 + +$(INTERFACEGFXDIR)/region_map_affine.8bpp: %.8bpp: %.png + $(GFX) $< $@ -num_tiles 233 + +$(MISCGFXDIR)/birch_help.4bpp: $(MISCGFXDIR)/birch_bag.4bpp $(MISCGFXDIR)/birch_grass.4bpp + @cat $^ >$@ -- cgit v1.2.3 From 7e35bd4266a9573a6fbc6d73efb5175a44ba5b93 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Wed, 10 Oct 2018 19:43:12 -0400 Subject: nonmatching sub_8110BE8 --- asm/quest_log.s | 175 ---------------------------------------------- include/global.h | 13 +++- src/quest_log.c | 206 ++++++++++++++++++++++++++++++++++++++++++++++++++++++- 3 files changed, 216 insertions(+), 178 deletions(-) diff --git a/asm/quest_log.s b/asm/quest_log.s index 3a4b5eb8e..f97ef90eb 100644 --- a/asm/quest_log.s +++ b/asm/quest_log.s @@ -5,181 +5,6 @@ .text - thumb_func_start sub_8110BE8 -sub_8110BE8: @ 8110BE8 - push {r4-r7,lr} - mov r7, r10 - mov r6, r9 - mov r5, r8 - push {r5-r7} - lsls r0, 24 - lsrs r0, 24 - ldr r4, _08110C54 @ =gSaveBlock1Ptr - movs r1, 0xCD - lsls r1, 3 - muls r0, r1 - movs r1, 0x98 - lsls r1, 5 - adds r0, r1 - ldr r1, [r4] - adds r7, r1, r0 - adds r0, r7, 0 - bl sub_815A008 - movs r6, 0 - mov r9, r4 - movs r2, 0x8D - lsls r2, 3 - mov r8, r2 - ldr r3, _08110C58 @ =0x0000046a - mov r10, r3 -_08110C1C: - mov r4, r9 - ldr r1, [r4] - lsls r2, r6, 1 - adds r0, r2, r6 - lsls r0, 3 - adds r1, r0 - ldr r0, _08110C5C @ =0x000008e4 - adds r1, r0 - ldrh r4, [r1] - movs r3, 0 - ldrsh r0, [r1, r3] - mov r12, r2 - cmp r0, 0 - bge _08110C64 - lsls r3, r6, 2 - adds r2, r7, r3 - negs r0, r0 - mov r4, r8 - adds r1, r2, r4 - strb r0, [r1] - ldr r0, _08110C60 @ =0x00000469 - adds r2, r0 - ldrb r0, [r2] - movs r1, 0x1 - orrs r0, r1 - strb r0, [r2] - b _08110C7C - .align 2, 0 -_08110C54: .4byte gSaveBlock1Ptr -_08110C58: .4byte 0x0000046a -_08110C5C: .4byte 0x000008e4 -_08110C60: .4byte 0x00000469 -_08110C64: - lsls r3, r6, 2 - adds r1, r7, r3 - mov r2, r8 - adds r0, r1, r2 - strb r4, [r0] - ldr r4, _08110CBC @ =0x00000469 - adds r1, r4 - ldrb r2, [r1] - movs r0, 0x2 - negs r0, r0 - ands r0, r2 - strb r0, [r1] -_08110C7C: - adds r5, r3, 0 - mov r1, r9 - ldr r0, [r1] - mov r2, r12 - adds r1, r2, r6 - lsls r1, 3 - adds r0, r1 - ldr r3, _08110CC0 @ =0x000008e6 - adds r1, r0, r3 - ldrh r2, [r1] - movs r4, 0 - ldrsh r0, [r1, r4] - cmp r0, 0 - bge _08110CC8 - adds r3, r7, r5 - adds r1, r0, 0 - negs r1, r1 - lsls r1, 24 - mov r2, r8 - adds r4, r3, r2 - lsrs r1, 15 - ldr r0, [r4] - ldr r2, _08110CC4 @ =0xfffe01ff - ands r0, r2 - orrs r0, r1 - str r0, [r4] - add r3, r10 - ldrb r0, [r3] - movs r1, 0x2 - orrs r0, r1 - b _08110CE6 - .align 2, 0 -_08110CBC: .4byte 0x00000469 -_08110CC0: .4byte 0x000008e6 -_08110CC4: .4byte 0xfffe01ff -_08110CC8: - adds r3, r7, r5 - lsls r2, 24 - mov r0, r8 - adds r4, r3, r0 - lsrs r2, 15 - ldr r0, [r4] - ldr r1, _08110D38 @ =0xfffe01ff - ands r0, r1 - orrs r0, r2 - str r0, [r4] - add r3, r10 - ldrb r1, [r3] - movs r0, 0x3 - negs r0, r0 - ands r0, r1 -_08110CE6: - strb r0, [r3] - adds r5, r7, r5 - mov r1, r9 - ldr r0, [r1] - mov r2, r12 - adds r3, r2, r6 - lsls r3, 3 - adds r0, r3 - ldr r4, _08110D3C @ =0x000008e8 - adds r0, r4 - ldrb r1, [r0] - mov r0, r10 - adds r4, r5, r0 - lsls r1, 2 - ldrb r2, [r4] - movs r0, 0x3 - ands r0, r2 - orrs r0, r1 - strb r0, [r4] - mov r1, r9 - ldr r0, [r1] - adds r0, r3 - ldr r2, _08110D40 @ =0x000008e9 - adds r0, r2 - ldrb r0, [r0] - ldr r3, _08110D44 @ =0x0000046b - adds r5, r3 - strb r0, [r5] - adds r0, r6, 0x1 - lsls r0, 16 - lsrs r6, r0, 16 - cmp r6, 0x3F - bhi _08110D2A - b _08110C1C -_08110D2A: - pop {r3-r5} - mov r8, r3 - mov r9, r4 - mov r10, r5 - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_08110D38: .4byte 0xfffe01ff -_08110D3C: .4byte 0x000008e8 -_08110D40: .4byte 0x000008e9 -_08110D44: .4byte 0x0000046b - thumb_func_end sub_8110BE8 - thumb_func_start sub_8110D48 sub_8110D48: @ 8110D48 push {r4,r5,lr} diff --git a/include/global.h b/include/global.h index 4efd21e48..1655ac4e3 100644 --- a/include/global.h +++ b/include/global.h @@ -474,6 +474,16 @@ struct MysteryEventStruct u8 unk_1; }; +struct QuestLogNPCData +{ + u32 x:8; + u32 negx:1; + u32 y:8; + u32 negy:1; + u32 elevation:6; + u32 movementType:8; +}; + struct QuestLog { /*0x0000*/ u8 unk_000; @@ -482,7 +492,8 @@ struct QuestLog /*0x0003*/ s8 unk_003; /*0x0004*/ s16 unk_004; /*0x0006*/ s16 unk_006; - /*0x0008*/ u8 filler_008[0x560]; + /*0x0008*/ u8 filler_008[0x460]; + /*0x0468*/ struct QuestLogNPCData npcData[64]; /*0x0568*/ u8 filler_568[0x100]; /*0x0668*/ u8 end[0]; }; diff --git a/src/quest_log.c b/src/quest_log.c index 900194040..782e0efe4 100644 --- a/src/quest_log.c +++ b/src/quest_log.c @@ -25,6 +25,9 @@ EWRAM_DATA u8 gUnknown_203AE98[0x100] = {0}; void sub_8110A00(void); void sub_8110A3C(void); +void sub_8110BB0(u8); +void sub_8110BE8(u8); +void sub_815A008(struct QuestLog *); void sub_8110E3C(void); u8 sub_8110E68(void *); void sub_81118F4(s8); @@ -33,8 +36,6 @@ void sub_8113B88(void); void sub_8113BD8(void); void sub_81138F8(void); void sub_81115E8(void); -void sub_8110BB0(u8); -void sub_8110BE8(u8); void sub_8110D94(void); void sub_8110E20(void); void sub_8110D48(u8); @@ -190,3 +191,204 @@ void sub_8110BB0(u8 a0) questLog->unk_004 = gSaveBlock1Ptr->pos.x; questLog->unk_006 = gSaveBlock1Ptr->pos.y; } + +#ifdef NONMATCHING +void sub_8110BE8(u8 a0) +{ + struct QuestLog * questLog = &gSaveBlock1Ptr->questLog[a0]; + u16 i; // r6 + + sub_815A008(questLog); + + for (i = 0; i < ARRAY_COUNT(gSaveBlock1Ptr->mapObjectTemplates); i++) + { + if (gSaveBlock1Ptr->mapObjectTemplates[i].x < 0) + { + questLog->npcData[i].x = (u8)-gSaveBlock1Ptr->mapObjectTemplates[i].x; + questLog->npcData[i].negx = TRUE; + } + else + { + questLog->npcData[i].x = (u8)gSaveBlock1Ptr->mapObjectTemplates[i].x; + questLog->npcData[i].negx = FALSE; + } + if (gSaveBlock1Ptr->mapObjectTemplates[i].y < 0) + { + questLog->npcData[i].y = (u8)-gSaveBlock1Ptr->mapObjectTemplates[i].y; + questLog->npcData[i].negy = TRUE; + } + else + { + questLog->npcData[i].y = (u8)gSaveBlock1Ptr->mapObjectTemplates[i].y; + questLog->npcData[i].negy = FALSE; + } + questLog->npcData[i].elevation = gSaveBlock1Ptr->mapObjectTemplates[i].elevation; + questLog->npcData[i].movementType = gSaveBlock1Ptr->mapObjectTemplates[i].movementType; + } +} +#else +NAKED +void sub_8110BE8(u8 a0) +{ + asm_unified("\tpush {r4-r7,lr}\n" + "\tmov r7, r10\n" + "\tmov r6, r9\n" + "\tmov r5, r8\n" + "\tpush {r5-r7}\n" + "\tlsls r0, 24\n" + "\tlsrs r0, 24\n" + "\tldr r4, =gSaveBlock1Ptr\n" + "\tmovs r1, 0xCD\n" + "\tlsls r1, 3\n" + "\tmuls r0, r1\n" + "\tmovs r1, 0x98\n" + "\tlsls r1, 5\n" + "\tadds r0, r1\n" + "\tldr r1, [r4]\n" + "\tadds r7, r1, r0\n" + "\tadds r0, r7, 0\n" + "\tbl sub_815A008\n" + "\tmovs r6, 0\n" + "\tmov r9, r4\n" + "\tmovs r2, 0x8D\n" + "\tlsls r2, 3\n" + "\tmov r8, r2\n" + "\tldr r3, =0x0000046a\n" + "\tmov r10, r3\n" + "_08110C1C:\n" + "\tmov r4, r9\n" + "\tldr r1, [r4]\n" + "\tlsls r2, r6, 1\n" + "\tadds r0, r2, r6\n" + "\tlsls r0, 3\n" + "\tadds r1, r0\n" + "\tldr r0, =0x000008e4\n" + "\tadds r1, r0\n" + "\tldrh r4, [r1]\n" + "\tmovs r3, 0\n" + "\tldrsh r0, [r1, r3]\n" + "\tmov r12, r2\n" + "\tcmp r0, 0\n" + "\tbge _08110C64\n" + "\tlsls r3, r6, 2\n" + "\tadds r2, r7, r3\n" + "\tnegs r0, r0\n" + "\tmov r4, r8\n" + "\tadds r1, r2, r4\n" + "\tstrb r0, [r1]\n" + "\tldr r0, =0x00000469\n" + "\tadds r2, r0\n" + "\tldrb r0, [r2]\n" + "\tmovs r1, 0x1\n" + "\torrs r0, r1\n" + "\tstrb r0, [r2]\n" + "\tb _08110C7C\n" + "\t.pool\n" + "_08110C64:\n" + "\tlsls r3, r6, 2\n" + "\tadds r1, r7, r3\n" + "\tmov r2, r8\n" + "\tadds r0, r1, r2\n" + "\tstrb r4, [r0]\n" + "\tldr r4, =0x00000469\n" + "\tadds r1, r4\n" + "\tldrb r2, [r1]\n" + "\tmovs r0, 0x2\n" + "\tnegs r0, r0\n" + "\tands r0, r2\n" + "\tstrb r0, [r1]\n" + "_08110C7C:\n" + "\tadds r5, r3, 0\n" + "\tmov r1, r9\n" + "\tldr r0, [r1]\n" + "\tmov r2, r12\n" + "\tadds r1, r2, r6\n" + "\tlsls r1, 3\n" + "\tadds r0, r1\n" + "\tldr r3, =0x000008e6\n" + "\tadds r1, r0, r3\n" + "\tldrh r2, [r1]\n" + "\tmovs r4, 0\n" + "\tldrsh r0, [r1, r4]\n" + "\tcmp r0, 0\n" + "\tbge _08110CC8\n" + "\tadds r3, r7, r5\n" + "\tadds r1, r0, 0\n" + "\tnegs r1, r1\n" + "\tlsls r1, 24\n" + "\tmov r2, r8\n" + "\tadds r4, r3, r2\n" + "\tlsrs r1, 15\n" + "\tldr r0, [r4]\n" + "\tldr r2, =0xfffe01ff\n" + "\tands r0, r2\n" + "\torrs r0, r1\n" + "\tstr r0, [r4]\n" + "\tadd r3, r10\n" + "\tldrb r0, [r3]\n" + "\tmovs r1, 0x2\n" + "\torrs r0, r1\n" + "\tb _08110CE6\n" + "\t.pool\n" + "_08110CC8:\n" + "\tadds r3, r7, r5\n" + "\tlsls r2, 24\n" + "\tmov r0, r8\n" + "\tadds r4, r3, r0\n" + "\tlsrs r2, 15\n" + "\tldr r0, [r4]\n" + "\tldr r1, =0xfffe01ff\n" + "\tands r0, r1\n" + "\torrs r0, r2\n" + "\tstr r0, [r4]\n" + "\tadd r3, r10\n" + "\tldrb r1, [r3]\n" + "\tmovs r0, 0x3\n" + "\tnegs r0, r0\n" + "\tands r0, r1\n" + "_08110CE6:\n" + "\tstrb r0, [r3]\n" + "\tadds r5, r7, r5\n" + "\tmov r1, r9\n" + "\tldr r0, [r1]\n" + "\tmov r2, r12\n" + "\tadds r3, r2, r6\n" + "\tlsls r3, 3\n" + "\tadds r0, r3\n" + "\tldr r4, =0x000008e8\n" + "\tadds r0, r4\n" + "\tldrb r1, [r0]\n" + "\tmov r0, r10\n" + "\tadds r4, r5, r0\n" + "\tlsls r1, 2\n" + "\tldrb r2, [r4]\n" + "\tmovs r0, 0x3\n" + "\tands r0, r2\n" + "\torrs r0, r1\n" + "\tstrb r0, [r4]\n" + "\tmov r1, r9\n" + "\tldr r0, [r1]\n" + "\tadds r0, r3\n" + "\tldr r2, =0x000008e9\n" + "\tadds r0, r2\n" + "\tldrb r0, [r0]\n" + "\tldr r3, =0x0000046b\n" + "\tadds r5, r3\n" + "\tstrb r0, [r5]\n" + "\tadds r0, r6, 0x1\n" + "\tlsls r0, 16\n" + "\tlsrs r6, r0, 16\n" + "\tcmp r6, 0x3F\n" + "\tbhi _08110D2A\n" + "\tb _08110C1C\n" + "_08110D2A:\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\n" + "\t.pool"); +} +#endif // NONMATCHING -- cgit v1.2.3 From 230f58b77dae53c2934cafbff6ef96807232a9d0 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Thu, 11 Oct 2018 10:13:08 -0400 Subject: through sub_8110E20 --- asm/quest_log.s | 128 ------------------------------------------------------- include/global.h | 23 ++++++++-- src/quest_log.c | 32 ++++++++++++++ 3 files changed, 51 insertions(+), 132 deletions(-) diff --git a/asm/quest_log.s b/asm/quest_log.s index f97ef90eb..22d19fab9 100644 --- a/asm/quest_log.s +++ b/asm/quest_log.s @@ -5,134 +5,6 @@ .text - thumb_func_start sub_8110D48 -sub_8110D48: @ 8110D48 - push {r4,r5,lr} - lsls r0, 24 - lsrs r0, 24 - ldr r4, _08110D90 @ =gSaveBlock1Ptr - movs r1, 0xCD - lsls r1, 3 - muls r1, r0 - movs r0, 0x98 - lsls r0, 5 - adds r1, r0 - ldr r0, [r4] - adds r5, r0, r1 - movs r1, 0xEE - lsls r1, 4 - adds r0, r1 - movs r2, 0xA4 - lsls r2, 1 - adds r1, r5, r2 - movs r2, 0x90 - bl CpuSet - ldr r0, [r4] - movs r1, 0x80 - lsls r1, 5 - adds r0, r1 - movs r2, 0x9A - lsls r2, 2 - adds r1, r5, r2 - movs r2, 0x80 - lsls r2, 1 - bl CpuSet - pop {r4,r5} - pop {r0} - bx r0 - .align 2, 0 -_08110D90: .4byte gSaveBlock1Ptr - thumb_func_end sub_8110D48 - - thumb_func_start sub_8110D94 -sub_8110D94: @ 8110D94 - push {r4-r7,lr} - mov r7, r10 - mov r6, r9 - mov r5, r8 - push {r5-r7} - sub sp, 0xC - movs r4, 0 - ldr r0, _08110E14 @ =gSaveBlock1Ptr - mov r10, r0 - ldr r1, _08110E18 @ =0x0000063a - mov r9, r1 - movs r2, 0x1 - mov r8, r2 -_08110DAE: - lsls r1, r4, 1 - mov r7, sp - adds r2, r7, r1 - movs r0, 0 - strh r0, [r2] - movs r3, 0 - adds r6, r1, 0 - adds r0, r4, 0x1 - str r0, [sp, 0x8] - mov r1, r10 - ldr r0, [r1] - mov r7, r9 - adds r5, r0, r7 - lsls r1, r4, 4 -_08110DCA: - adds r0, r1, r3 - adds r0, r5, r0 - ldrb r0, [r0] - cmp r0, 0 - beq _08110DDE - mov r0, r8 - lsls r0, r3 - ldrh r7, [r2] - adds r0, r7 - strh r0, [r2] -_08110DDE: - adds r0, r3, 0x1 - lsls r0, 16 - lsrs r3, r0, 16 - cmp r3, 0xF - bls _08110DCA - ldr r1, _08110E1C @ =0x000040aa - adds r0, r4, r1 - lsls r0, 16 - lsrs r0, 16 - mov r2, sp - adds r1, r2, r6 - ldrh r1, [r1] - bl VarSet - ldr r7, [sp, 0x8] - lsls r0, r7, 16 - lsrs r4, r0, 16 - cmp r4, 0x3 - bls _08110DAE - add sp, 0xC - pop {r3-r5} - mov r8, r3 - mov r9, r4 - mov r10, r5 - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_08110E14: .4byte gSaveBlock1Ptr -_08110E18: .4byte 0x0000063a -_08110E1C: .4byte 0x000040aa - thumb_func_end sub_8110D94 - - thumb_func_start sub_8110E20 -sub_8110E20: @ 8110E20 - push {lr} - ldr r0, _08110E34 @ =0x000040ae - ldr r1, _08110E38 @ =gSaveBlock1Ptr - ldr r1, [r1] - ldrh r1, [r1, 0x32] - bl VarSet - pop {r0} - bx r0 - .align 2, 0 -_08110E34: .4byte 0x000040ae -_08110E38: .4byte gSaveBlock1Ptr - thumb_func_end sub_8110E20 - thumb_func_start sub_8110E3C sub_8110E3C: @ 8110E3C push {lr} diff --git a/include/global.h b/include/global.h index 1655ac4e3..f1efeb4e0 100644 --- a/include/global.h +++ b/include/global.h @@ -492,7 +492,9 @@ struct QuestLog /*0x0003*/ s8 unk_003; /*0x0004*/ s16 unk_004; /*0x0006*/ s16 unk_006; - /*0x0008*/ u8 filler_008[0x460]; + /*0x0008*/ u8 filler_008[0x140]; + /*0x0148*/ u8 unk_148[0x120]; + /*0x02c8*/ u8 unk_268[0x200]; /*0x0468*/ struct QuestLogNPCData npcData[64]; /*0x0568*/ u8 filler_568[0x100]; /*0x0668*/ u8 end[0]; @@ -500,7 +502,7 @@ struct QuestLog #define MAP_OBJECTS_COUNT 16 #define BERRY_TREES_COUNT 128 -#define FLAGS_COUNT 300 +#define FLAGS_COUNT 288 // 300 #define VARS_COUNT 256 #define MAIL_COUNT 16 @@ -512,13 +514,26 @@ struct SaveBlock1 /*0x14*/ struct WarpData warp2; /*0x1C*/ struct WarpData lastHealLocation; /*0x24*/ struct WarpData warp4; - /*0x002C*/ u8 filler2C[0x60C]; + /*0x2C*/ u16 savedMusic; + /*0x2E*/ u8 weather; + /*0x2F*/ u8 filler_2F; + /*0x30*/ u8 flashLevel; + /*0x32*/ u16 mapDataId; + /*0x34*/ u16 mapView[0x100]; + /*0x234*/ u8 playerPartyCount; + /*0x238*/ struct Pokemon playerParty[PARTY_SIZE]; + /*0x490*/ u32 money; + /*0x494*/ u16 coins; + /*0x496*/ u16 registeredItem; // registered for use with SELECT button + /*0x498*/ u8 filler_0498[0x1a0]; /*0x638*/ u8 trainerRematchStepCounter; u8 filler_639; /*0x63a*/ u8 trainerRematches[100]; /*0x06A0*/ struct MapObject mapObjects[MAP_OBJECTS_COUNT]; /*0x08E0*/ struct MapObjectTemplate mapObjectTemplates[64]; - /*0x0EE0*/ u8 fillerEE0[0x420]; + /*0x0EE0*/ u8 flags[FLAGS_COUNT]; + /*0x1000*/ u16 vars[VARS_COUNT]; + /*0x1200*/ u8 filler1200[0x100]; /*0x1300*/ struct QuestLog questLog[4]; /*0x2ca0*/ u8 filler2CA0[0x7c0]; /*0x3460*/ struct MysteryEventStruct unk_3460; diff --git a/src/quest_log.c b/src/quest_log.c index 782e0efe4..08b504057 100644 --- a/src/quest_log.c +++ b/src/quest_log.c @@ -392,3 +392,35 @@ void sub_8110BE8(u8 a0) "\t.pool"); } #endif // NONMATCHING + +void sub_8110D48(u8 a0) +{ + struct QuestLog * questLog = &gSaveBlock1Ptr->questLog[a0]; + + CpuCopy16(gSaveBlock1Ptr->flags, questLog->unk_148, 0x120); + CpuCopy16(gSaveBlock1Ptr->vars, questLog->unk_268, 0x200); +} + +void sub_8110D94(void) +{ + u16 i, j; + u16 sp0[4]; + + for (i = 0; i < 4; i++) + { + sp0[i] = 0; + for (j = 0; j < 16; j++) + { + if (gSaveBlock1Ptr->trainerRematches[16 * i + j]) + { + sp0[i] += (1 << j); + } + } + VarSet(VAR_0x40AA + i, sp0[i]); + } +} + +void sub_8110E20(void) +{ + VarSet(VAR_0x40AE, gSaveBlock1Ptr->mapDataId); +} -- cgit v1.2.3 From c340377fe527fffd0df58cbe7c1d6b79d9f19827 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Thu, 11 Oct 2018 10:26:12 -0400 Subject: sub_8110E3C --- asm/quest_log.s | 24 ------------------------ src/quest_log.c | 20 ++++++++++++++------ 2 files changed, 14 insertions(+), 30 deletions(-) diff --git a/asm/quest_log.s b/asm/quest_log.s index 22d19fab9..5f7b6b627 100644 --- a/asm/quest_log.s +++ b/asm/quest_log.s @@ -5,30 +5,6 @@ .text - thumb_func_start sub_8110E3C -sub_8110E3C: @ 8110E3C - push {lr} - ldr r0, _08110E60 @ =gUnknown_203AE08 - ldr r0, [r0] - bl sub_8113BF4 - ldr r1, _08110E64 @ =gUnknown_203ADF8 - ldrb r0, [r1] - adds r0, 0x1 - strb r0, [r1] - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x3 - bls _08110E5A - movs r0, 0 - strb r0, [r1] -_08110E5A: - pop {r0} - bx r0 - .align 2, 0 -_08110E60: .4byte gUnknown_203AE08 -_08110E64: .4byte gUnknown_203ADF8 - thumb_func_end sub_8110E3C - thumb_func_start sub_8110E68 sub_8110E68: @ 8110E68 push {r4-r7,lr} diff --git a/src/quest_log.c b/src/quest_log.c index 08b504057..97313674e 100644 --- a/src/quest_log.c +++ b/src/quest_log.c @@ -27,19 +27,20 @@ void sub_8110A00(void); void sub_8110A3C(void); void sub_8110BB0(u8); void sub_8110BE8(u8); -void sub_815A008(struct QuestLog *); void sub_8110E3C(void); +void sub_8110D94(void); +void sub_8110E20(void); +void sub_8110D48(u8); +void sub_81115E8(void); u8 sub_8110E68(void *); void sub_81118F4(s8); void sub_8111AD8(void); void sub_8113B88(void); void sub_8113BD8(void); -void sub_81138F8(void); -void sub_81115E8(void); -void sub_8110D94(void); -void sub_8110E20(void); -void sub_8110D48(u8); +void sub_8113BF4(void *); void sub_8112940(u8, u8 *, u16); +void sub_81138F8(void); +void sub_815A008(struct QuestLog *); void sub_8110840(void * a0) @@ -424,3 +425,10 @@ void sub_8110E20(void) { VarSet(VAR_0x40AE, gSaveBlock1Ptr->mapDataId); } + +void sub_8110E3C(void) +{ + sub_8113BF4(gUnknown_203AE08); + if (++gUnknown_203ADF8 > 3) + gUnknown_203ADF8 = 0; +} -- cgit v1.2.3 From 0046efe86762b893b8bc688ff8172a071a952fac Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Thu, 11 Oct 2018 11:06:25 -0400 Subject: sub_8110E68 --- asm/quest_log.s | 87 --------------------------------------------------- include/unk_8159F40.h | 6 ++++ src/quest_log.c | 52 +++++++++++++++++++++++++++--- 3 files changed, 53 insertions(+), 92 deletions(-) create mode 100644 include/unk_8159F40.h diff --git a/asm/quest_log.s b/asm/quest_log.s index 5f7b6b627..633a15489 100644 --- a/asm/quest_log.s +++ b/asm/quest_log.s @@ -5,93 +5,6 @@ .text - thumb_func_start sub_8110E68 -sub_8110E68: @ 8110E68 - push {r4-r7,lr} - mov r7, r8 - push {r7} - adds r7, r0, 0 - ldr r0, _08110EA0 @ =gUnknown_203ADFC - ldrh r5, [r0] - ldr r0, _08110EA4 @ =gUnknown_203AF98 - mov r8, r0 - ldrh r0, [r0] - cmp r5, r0 - bcs _08110ECA - ldr r6, _08110EA8 @ =gUnknown_203AE08 -_08110E80: - ldr r4, [r6] - cmp r4, 0 - beq _08110F02 - lsls r0, r5, 3 - adds r1, r0, r7 - ldrb r2, [r1, 0x6] - adds r3, r0, 0 - cmp r2, 0x1 - bgt _08110EAC - cmp r2, 0 - blt _08110EAC - adds r0, r4, 0 - bl sub_8113D48 - b _08110EB4 - .align 2, 0 -_08110EA0: .4byte gUnknown_203ADFC -_08110EA4: .4byte gUnknown_203AF98 -_08110EA8: .4byte gUnknown_203AE08 -_08110EAC: - ldr r0, [r6] - adds r1, r7, r3 - bl sub_8113CC8 -_08110EB4: - str r0, [r6] - ldr r1, [r6] - cmp r1, 0 - beq _08110EEC - adds r0, r5, 0x1 - lsls r0, 16 - lsrs r5, r0, 16 - ldr r0, _08110EE0 @ =gUnknown_203AF98 - ldrh r0, [r0] - cmp r5, r0 - bcc _08110E80 -_08110ECA: - ldr r0, _08110EE4 @ =gUnknown_3005E88 - ldrb r0, [r0] - cmp r0, 0 - beq _08110EF8 - ldr r1, _08110EE8 @ =gUnknown_203ADFC - mov r2, r8 - ldrh r0, [r2] - strh r0, [r1] - movs r0, 0x1 - b _08110F04 - .align 2, 0 -_08110EE0: .4byte gUnknown_203AF98 -_08110EE4: .4byte gUnknown_3005E88 -_08110EE8: .4byte gUnknown_203ADFC -_08110EEC: - ldr r0, _08110EF4 @ =gUnknown_3005E88 - strb r1, [r0] - b _08110F02 - .align 2, 0 -_08110EF4: .4byte gUnknown_3005E88 -_08110EF8: - ldr r4, _08110F10 @ =gUnknown_203AE08 - ldr r0, [r4] - bl sub_8113BF4 - str r0, [r4] -_08110F02: - movs r0, 0 -_08110F04: - pop {r3} - mov r8, r3 - pop {r4-r7} - pop {r1} - bx r1 - .align 2, 0 -_08110F10: .4byte gUnknown_203AE08 - thumb_func_end sub_8110E68 - thumb_func_start sub_8110F14 sub_8110F14: @ 8110F14 push {r4-r7,lr} diff --git a/include/unk_8159F40.h b/include/unk_8159F40.h new file mode 100644 index 000000000..7343dc629 --- /dev/null +++ b/include/unk_8159F40.h @@ -0,0 +1,6 @@ +#ifndef GUARD_UNK_8159F40_H +#define GUARD_UNK_8159F40_H + +void sub_815A008(struct QuestLog *); + +#endif //GUARD_UNK_8159F40_H diff --git a/src/quest_log.c b/src/quest_log.c index 97313674e..c16f41236 100644 --- a/src/quest_log.c +++ b/src/quest_log.c @@ -13,6 +13,12 @@ struct UnkStruct_203AE94 u8 unk_1; }; +struct UnkStruct_203AE98 +{ + u8 filler_0[6]; + u8 unk_6; +}; + EWRAM_DATA u8 gUnknown_203ADF8 = 0; EWRAM_DATA u8 gUnknown_203ADFA = 0; EWRAM_DATA u16 gUnknown_203ADFC = 0; @@ -21,7 +27,8 @@ EWRAM_DATA void * gUnknown_203AE08 = NULL; EWRAM_DATA void * gUnknown_203AE0C[32] = {NULL}; EWRAM_DATA void (* gUnknown_203AE8C)(void) = 0; EWRAM_DATA struct UnkStruct_203AE94 gUnknown_203AE94 = {0}; -EWRAM_DATA u8 gUnknown_203AE98[0x100] = {0}; +EWRAM_DATA struct UnkStruct_203AE98 gUnknown_203AE98[32] = {0}; +EWRAM_DATA u16 gUnknown_203AF98 = 0; void sub_8110A00(void); void sub_8110A3C(void); @@ -31,16 +38,17 @@ void sub_8110E3C(void); void sub_8110D94(void); void sub_8110E20(void); void sub_8110D48(u8); +u8 sub_8110E68(struct UnkStruct_203AE98 *); void sub_81115E8(void); -u8 sub_8110E68(void *); void sub_81118F4(s8); void sub_8111AD8(void); +void sub_8112940(u8, struct UnkStruct_203AE98 *, u16); void sub_8113B88(void); void sub_8113BD8(void); -void sub_8113BF4(void *); -void sub_8112940(u8, u8 *, u16); +void * sub_8113BF4(void *); void sub_81138F8(void); -void sub_815A008(struct QuestLog *); +void * sub_8113D48(void *, struct UnkStruct_203AE98 *); +void * sub_8113CC8(void *, struct UnkStruct_203AE98 *); void sub_8110840(void * a0) @@ -432,3 +440,37 @@ void sub_8110E3C(void) if (++gUnknown_203ADF8 > 3) gUnknown_203ADF8 = 0; } + +bool8 sub_8110E68(struct UnkStruct_203AE98 * a0) +{ + u16 i; + + for (i = gUnknown_203ADFC; i < gUnknown_203AF98; i++) + { + if (gUnknown_203AE08 == NULL) + return FALSE; + switch (a0[i].unk_6) + { + case 0: + case 1: + gUnknown_203AE08 = sub_8113D48(gUnknown_203AE08, &a0[i]); + break; + default: + gUnknown_203AE08 = sub_8113CC8(gUnknown_203AE08, &a0[i]); + break; + } + if (gUnknown_203AE08 == NULL) + { + gUnknown_3005E88 = 0; + return FALSE; + } + } + + if (gUnknown_3005E88 == 0) + { + gUnknown_203AE08 = sub_8113BF4(gUnknown_203AE08); + return FALSE; + } + gUnknown_203ADFC = gUnknown_203AF98; + return TRUE; +} -- cgit v1.2.3 From 1e655837127f458d5fcaf6e57d89032f74950540 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Thu, 11 Oct 2018 12:04:54 -0400 Subject: through sub_8110FCC --- asm/quest_log.s | 116 ----------------------------------------------- include/help_system.h | 6 +++ include/overworld.h | 4 ++ include/wild_encounter.h | 1 + src/quest_log.c | 59 +++++++++++++++++++++++- 5 files changed, 68 insertions(+), 118 deletions(-) create mode 100644 include/help_system.h diff --git a/asm/quest_log.s b/asm/quest_log.s index 633a15489..c6ca210b8 100644 --- a/asm/quest_log.s +++ b/asm/quest_log.s @@ -5,122 +5,6 @@ .text - thumb_func_start sub_8110F14 -sub_8110F14: @ 8110F14 - push {r4-r7,lr} - lsls r0, 24 - lsrs r4, r0, 24 - bl sub_811381C - ldr r1, _08110F6C @ =gUnknown_203ADF9 - movs r0, 0 - strb r0, [r1] - movs r2, 0 - ldr r0, _08110F70 @ =gSaveBlock1Ptr - ldr r5, [r0] - movs r7, 0xCD - lsls r7, 3 - movs r6, 0x98 - lsls r6, 5 -_08110F32: - adds r0, r2, 0 - muls r0, r7 - adds r0, r5, r0 - adds r0, r6 - ldrb r0, [r0] - ldr r3, _08110F6C @ =gUnknown_203ADF9 - cmp r0, 0 - beq _08110F48 - ldrb r0, [r1] - adds r0, 0x1 - strb r0, [r1] -_08110F48: - adds r0, r2, 0x1 - lsls r0, 24 - lsrs r2, r0, 24 - cmp r2, 0x3 - bls _08110F32 - ldrb r0, [r3] - cmp r0, 0 - beq _08110F78 - ldr r1, _08110F74 @ =gUnknown_3005ECC - movs r0, 0 - strb r0, [r1] - adds r0, r4, 0 - bl sub_8110F90 - adds r0, r4, 0 - bl DestroyTask - b _08110F84 - .align 2, 0 -_08110F6C: .4byte gUnknown_203ADF9 -_08110F70: .4byte gSaveBlock1Ptr -_08110F74: .4byte gUnknown_3005ECC -_08110F78: - ldr r0, _08110F8C @ =sub_8056938 - bl SetMainCallback2 - adds r0, r4, 0 - bl DestroyTask -_08110F84: - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_08110F8C: .4byte sub_8056938 - thumb_func_end sub_8110F14 - - thumb_func_start sub_8110F90 -sub_8110F90: @ 8110F90 - push {lr} - ldr r1, _08110FC0 @ =gSaveBlock1Ptr - ldr r2, [r1] - movs r3, 0 - movs r0, 0x3 - strb r0, [r2, 0x4] - ldr r2, [r1] - movs r0, 0x13 - strb r0, [r2, 0x5] - ldr r1, [r1] - movs r0, 0xFF - strb r0, [r1, 0x6] - ldr r0, _08110FC4 @ =gUnknown_203ADF8 - strb r3, [r0] - ldr r1, _08110FC8 @ =gUnknown_2031DD8 - movs r0, 0x1 - strb r0, [r1] - movs r0, 0x1 - bl sub_8082740 - bl sub_8111368 - pop {r0} - bx r0 - .align 2, 0 -_08110FC0: .4byte gSaveBlock1Ptr -_08110FC4: .4byte gUnknown_203ADF8 -_08110FC8: .4byte gUnknown_2031DD8 - thumb_func_end sub_8110F90 - - thumb_func_start sub_8110FCC -sub_8110FCC: @ 8110FCC - push {r4,r5,lr} - ldr r5, _08110FF8 @ =gUnknown_203ADF8 - ldrb r0, [r5] - ldr r4, _08110FFC @ =gUnknown_203AE98 - adds r1, r4, 0 - bl sub_811175C - bl sub_8113B88 - movs r2, 0x80 - lsls r2, 1 - movs r0, 0x1 - adds r1, r4, 0 - bl sub_8112940 - ldrb r0, [r5] - bl sub_8111150 - pop {r4,r5} - pop {r0} - bx r0 - .align 2, 0 -_08110FF8: .4byte gUnknown_203ADF8 -_08110FFC: .4byte gUnknown_203AE98 - thumb_func_end sub_8110FCC - thumb_func_start sub_8111000 sub_8111000: @ 8111000 push {lr} diff --git a/include/help_system.h b/include/help_system.h new file mode 100644 index 000000000..3a4c52f2e --- /dev/null +++ b/include/help_system.h @@ -0,0 +1,6 @@ +#ifndef GUARD_HELP_SYSTEM_H +#define GUARD_HELP_SYSTEM_H + +extern bool8 gUnknown_3005ECC; + +#endif //GUARD_HELP_SYSTEM_H diff --git a/include/overworld.h b/include/overworld.h index a5fba0c10..7f7c92743 100644 --- a/include/overworld.h +++ b/include/overworld.h @@ -71,4 +71,8 @@ void mapldr_default(void); void IncrementGameStat(u8); u32 GetGameStat(u8); +void sub_8056938(void); + +extern u8 gUnknown_2031DD8; + #endif //GUARD_ROM4_H diff --git a/include/wild_encounter.h b/include/wild_encounter.h index 55bbaa7dd..a1e26fe45 100644 --- a/include/wild_encounter.h +++ b/include/wild_encounter.h @@ -40,5 +40,6 @@ void FishingWildEncounter(u8 rod); u16 GetLocalWildMon(bool8 *isWaterMon); u16 GetLocalWaterMon(void); bool8 UpdateRepelCounter(void); +void sub_8082740(u8); #endif // GUARD_WILD_ENCOUNTER_H diff --git a/src/quest_log.c b/src/quest_log.c index c16f41236..0e8d5dd48 100644 --- a/src/quest_log.c +++ b/src/quest_log.c @@ -1,6 +1,11 @@ #include "global.h" -#include "script.h" +#include "main.h" +#include "task.h" #include "event_data.h" +#include "script.h" +#include "overworld.h" +#include "wild_encounter.h" +#include "help_system.h" #include "quest_log.h" u8 gUnknown_3005E88; @@ -20,6 +25,7 @@ struct UnkStruct_203AE98 }; EWRAM_DATA u8 gUnknown_203ADF8 = 0; +EWRAM_DATA u8 gUnknown_203ADF9 = 0; EWRAM_DATA u8 gUnknown_203ADFA = 0; EWRAM_DATA u16 gUnknown_203ADFC = 0; EWRAM_DATA void * gUnknown_203AE04 = NULL; @@ -39,14 +45,19 @@ void sub_8110D94(void); void sub_8110E20(void); void sub_8110D48(u8); u8 sub_8110E68(struct UnkStruct_203AE98 *); +void sub_8110F90(u8); +void sub_8111150(u8); +void sub_8111368(void); void sub_81115E8(void); +void sub_811175C(u8, struct UnkStruct_203AE98 *); void sub_81118F4(s8); +void sub_81138F8(void); void sub_8111AD8(void); void sub_8112940(u8, struct UnkStruct_203AE98 *, u16); +void sub_811381C(void); void sub_8113B88(void); void sub_8113BD8(void); void * sub_8113BF4(void *); -void sub_81138F8(void); void * sub_8113D48(void *, struct UnkStruct_203AE98 *); void * sub_8113CC8(void *, struct UnkStruct_203AE98 *); @@ -474,3 +485,47 @@ bool8 sub_8110E68(struct UnkStruct_203AE98 * a0) gUnknown_203ADFC = gUnknown_203AF98; return TRUE; } + +void sub_8110F14(u8 taskId) +{ + u8 i; + + sub_811381C(); + gUnknown_203ADF9 = 0; + for (i = 0; i < 4; i++) + { + if (gSaveBlock1Ptr->questLog[i].unk_000) + gUnknown_203ADF9++; + } + + if (gUnknown_203ADF9 != 0) + { + gUnknown_3005ECC = FALSE; + sub_8110F90(taskId); + DestroyTask(taskId); + } + else + { + SetMainCallback2(sub_8056938); + DestroyTask(taskId); + } +} + +void sub_8110F90(u8 unused) +{ + gSaveBlock1Ptr->location.mapGroup = 3; + gSaveBlock1Ptr->location.mapNum = 19; + gSaveBlock1Ptr->location.warpId = -1; + gUnknown_203ADF8 = 0; + gUnknown_2031DD8 = 1; + sub_8082740(1); + sub_8111368(); +} + +void sub_8110FCC(void) +{ + sub_811175C(gUnknown_203ADF8, gUnknown_203AE98); + sub_8113B88(); + sub_8112940(1, gUnknown_203AE98, 0x100); + sub_8111150(gUnknown_203ADF8); +} -- cgit v1.2.3 From b8054bbe5bae6eb87b60840c49606f96e034e6e0 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Thu, 11 Oct 2018 12:36:39 -0400 Subject: through sub_8111070 --- asm/quest_log.s | 142 ----------------------------------------- data/data_84827AC.s | 77 ++-------------------- data/quest_log.s | 68 ++++++++++++++++++++ include/field_fadetransition.h | 2 + include/menu.h | 2 +- ld_script.txt | 3 + src/quest_log.c | 62 ++++++++++++++++++ 7 files changed, 140 insertions(+), 216 deletions(-) create mode 100644 data/quest_log.s diff --git a/asm/quest_log.s b/asm/quest_log.s index c6ca210b8..24ffaeb24 100644 --- a/asm/quest_log.s +++ b/asm/quest_log.s @@ -5,148 +5,6 @@ .text - thumb_func_start sub_8111000 -sub_8111000: @ 8111000 - push {lr} - movs r0, 0x4 - bl stdpal_get - movs r1, 0xF0 - movs r2, 0x20 - bl LoadPalette - movs r0, 0x2 - bl sub_81109CC - bl sub_807DF64 - ldr r2, _08111034 @ =gUnknown_203AE94 - movs r0, 0 - str r0, [r2] - ldrb r1, [r2] - subs r0, 0x10 - ands r0, r1 - movs r1, 0x2 - orrs r0, r1 - strb r0, [r2] - movs r0, 0x1 - pop {r1} - bx r1 - .align 2, 0 -_08111034: .4byte gUnknown_203AE94 - thumb_func_end sub_8111000 - - thumb_func_start sub_8111038 -sub_8111038: @ 8111038 - push {lr} - movs r0, 0x4 - bl stdpal_get - movs r1, 0xF0 - movs r2, 0x20 - bl LoadPalette - movs r0, 0x2 - bl sub_81109CC - bl sub_807DF7C - ldr r2, _0811106C @ =gUnknown_203AE94 - movs r0, 0 - str r0, [r2] - ldrb r1, [r2] - subs r0, 0x10 - ands r0, r1 - movs r1, 0x2 - orrs r0, r1 - strb r0, [r2] - movs r0, 0x1 - pop {r1} - bx r1 - .align 2, 0 -_0811106C: .4byte gUnknown_203AE94 - thumb_func_end sub_8111038 - - thumb_func_start sub_8111070 -sub_8111070: @ 8111070 - push {r4-r7,lr} - sub sp, 0x14 - lsls r0, 24 - lsrs r7, r0, 24 - movs r5, 0 -_0811107A: - lsls r4, r5, 3 - ldr r0, _0811111C @ =gUnknown_845661C - adds r4, r0 - adds r0, r4, 0 - bl AddWindow - ldr r6, _08111120 @ =gUnknown_203ADFE - adds r1, r5, r6 - strb r0, [r1] - ldrb r0, [r1] - ldrb r1, [r4, 0x3] - lsls r1, 3 - str r1, [sp] - ldrb r1, [r4, 0x4] - lsls r1, 3 - str r1, [sp, 0x4] - movs r1, 0xF - movs r2, 0 - movs r3, 0 - bl FillWindowPixelRect - adds r0, r5, 0x1 - lsls r0, 24 - lsrs r5, r0, 24 - cmp r5, 0x2 - bls _0811107A - ldr r5, _08111124 @ =gStringVar4 - ldr r1, _08111128 @ =gUnknown_841A155 - adds r0, r5, 0 - bl StringExpandPlaceholders - cmp r7, 0 - beq _081110D2 - ldr r4, _0811112C @ =gStringVar1 - adds r0, r4, 0 - adds r1, r7, 0 - movs r2, 0 - movs r3, 0x1 - bl ConvertIntToDecimalStringN - adds r0, r5, 0 - adds r1, r4, 0 - bl StringAppend -_081110D2: - ldrb r0, [r6] - movs r1, 0x1 - str r1, [sp] - movs r1, 0x2 - str r1, [sp, 0x4] - ldr r1, _08111130 @ =gUnknown_8456634 - str r1, [sp, 0x8] - movs r1, 0 - str r1, [sp, 0xC] - str r5, [sp, 0x10] - movs r1, 0x2 - movs r2, 0x2 - movs r3, 0x2 - bl AddTextPrinterParametrized2 - ldrb r0, [r6] - bl PutWindowTilemap - ldrb r0, [r6, 0x1] - bl PutWindowTilemap - ldrb r0, [r6] - movs r1, 0x2 - bl CopyWindowToVram - ldrb r0, [r6, 0x2] - movs r1, 0x2 - bl CopyWindowToVram - ldrb r0, [r6, 0x1] - movs r1, 0x3 - bl CopyWindowToVram - add sp, 0x14 - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_0811111C: .4byte gUnknown_845661C -_08111120: .4byte gUnknown_203ADFE -_08111124: .4byte gStringVar4 -_08111128: .4byte gUnknown_841A155 -_0811112C: .4byte gStringVar1 -_08111130: .4byte gUnknown_8456634 - thumb_func_end sub_8111070 - thumb_func_start sub_8111134 sub_8111134: @ 8111134 push {r4,lr} diff --git a/data/data_84827AC.s b/data/data_84827AC.s index 565a6adf2..e2b460385 100644 --- a/data/data_84827AC.s +++ b/data/data_84827AC.s @@ -2089,7 +2089,7 @@ gUnknown_8419F54:: @ 8419F54 .incbin "baserom.gba", 0x419F54, 0x201 gUnknown_841A155:: @ 841A155 - .incbin "baserom.gba", 0x41A155, 0x1A + .string "Previously on your quest…$" gUnknown_841A16F:: @ 841A16F .incbin "baserom.gba", 0x41A16F, 0x24 @@ -3386,78 +3386,9 @@ gUnknown_8454003:: @ 8454003 gUnknown_8456618:: @ 8456618 .incbin "baserom.gba", 0x456618, 0x4 -gUnknown_845661C:: @ 845661C - .incbin "baserom.gba", 0x45661C, 0x18 - -gUnknown_8456634:: @ 8456634 - .incbin "baserom.gba", 0x456634, 0x4 - -gUnknown_8456638:: @ 8456638 - .incbin "baserom.gba", 0x456638, 0x60 - -gUnknown_8456698:: @ 8456698 - .incbin "baserom.gba", 0x456698, 0x4 - -gUnknown_845669C:: @ 845669C - .incbin "baserom.gba", 0x45669C, 0x8 - -gUnknown_84566A4:: @ 84566A4 - .incbin "baserom.gba", 0x4566A4, 0x4 - -gUnknown_84566A8:: @ 84566A8 - .incbin "baserom.gba", 0x4566A8, 0x280 - -gUnknown_8456928:: @ 8456928 - .incbin "baserom.gba", 0x456928, 0x8 - -gUnknown_8456930:: @ 8456930 - .incbin "baserom.gba", 0x456930, 0x4 - -gUnknown_8456934:: @ 8456934 - .incbin "baserom.gba", 0x456934, 0x4 - -gUnknown_8456938:: @ 8456938 - .incbin "baserom.gba", 0x456938, 0x8 - -gUnknown_8456940:: @ 8456940 - .incbin "baserom.gba", 0x456940, 0x8 - -gUnknown_8456948:: @ 8456948 - .incbin "baserom.gba", 0x456948, 0xAC - -gUnknown_84569F4:: @ 84569F4 - .incbin "baserom.gba", 0x4569F4, 0xAC - -gUnknown_8456AA0:: @ 8456AA0 - .incbin "baserom.gba", 0x456AA0, 0x2C - -gUnknown_8456ACC:: @ 8456ACC - .incbin "baserom.gba", 0x456ACC, 0xC - -gUnknown_8456AD8:: @ 8456AD8 - .incbin "baserom.gba", 0x456AD8, 0xC - -gUnknown_8456AE4:: @ 8456AE4 - .incbin "baserom.gba", 0x456AE4, 0xC - -gUnknown_8456AF0:: @ 8456AF0 - .incbin "baserom.gba", 0x456AF0, 0xCC - -gUnknown_8456BBC:: @ 8456BBC - .incbin "baserom.gba", 0x456BBC, 0x28 - -gUnknown_8456BE4:: @ 8456BE4 - .incbin "baserom.gba", 0x456BE4, 0x33 - -gUnknown_8456C17:: @ 8456C17 - .incbin "baserom.gba", 0x456C17, 0x9 - -gUnknown_8456C20:: @ 8456C20 - .incbin "baserom.gba", 0x456C20, 0x30 - -gUnknown_8456C50:: @ 8456C50 - .incbin "baserom.gba", 0x456C50, 0x24 - + @ quest_log.o + @ link_rfu_3.o + .section .rodata.8456C74 gUnknown_8456C74:: @ 8456C74 .incbin "baserom.gba", 0x456C74, 0x5C diff --git a/data/quest_log.s b/data/quest_log.s new file mode 100644 index 000000000..c2e776414 --- /dev/null +++ b/data/quest_log.s @@ -0,0 +1,68 @@ + .section .rodata + + .align 2, 0 +gUnknown_8456638:: @ 8456638 + .incbin "baserom.gba", 0x456638, 0x60 + +gUnknown_8456698:: @ 8456698 + .incbin "baserom.gba", 0x456698, 0x4 + +gUnknown_845669C:: @ 845669C + .incbin "baserom.gba", 0x45669C, 0x8 + +gUnknown_84566A4:: @ 84566A4 + .incbin "baserom.gba", 0x4566A4, 0x4 + +gUnknown_84566A8:: @ 84566A8 + .incbin "baserom.gba", 0x4566A8, 0x280 + +gUnknown_8456928:: @ 8456928 + .incbin "baserom.gba", 0x456928, 0x8 + +gUnknown_8456930:: @ 8456930 + .incbin "baserom.gba", 0x456930, 0x4 + +gUnknown_8456934:: @ 8456934 + .incbin "baserom.gba", 0x456934, 0x4 + +gUnknown_8456938:: @ 8456938 + .incbin "baserom.gba", 0x456938, 0x8 + +gUnknown_8456940:: @ 8456940 + .incbin "baserom.gba", 0x456940, 0x8 + +gUnknown_8456948:: @ 8456948 + .incbin "baserom.gba", 0x456948, 0xAC + +gUnknown_84569F4:: @ 84569F4 + .incbin "baserom.gba", 0x4569F4, 0xAC + +gUnknown_8456AA0:: @ 8456AA0 + .incbin "baserom.gba", 0x456AA0, 0x2C + +gUnknown_8456ACC:: @ 8456ACC + .incbin "baserom.gba", 0x456ACC, 0xC + +gUnknown_8456AD8:: @ 8456AD8 + .incbin "baserom.gba", 0x456AD8, 0xC + +gUnknown_8456AE4:: @ 8456AE4 + .incbin "baserom.gba", 0x456AE4, 0xC + +gUnknown_8456AF0:: @ 8456AF0 + .incbin "baserom.gba", 0x456AF0, 0xCC + +gUnknown_8456BBC:: @ 8456BBC + .incbin "baserom.gba", 0x456BBC, 0x28 + +gUnknown_8456BE4:: @ 8456BE4 + .incbin "baserom.gba", 0x456BE4, 0x33 + +gUnknown_8456C17:: @ 8456C17 + .incbin "baserom.gba", 0x456C17, 0x9 + +gUnknown_8456C20:: @ 8456C20 + .incbin "baserom.gba", 0x456C20, 0x30 + +gUnknown_8456C50:: @ 8456C50 + .incbin "baserom.gba", 0x456C50, 0x24 diff --git a/include/field_fadetransition.h b/include/field_fadetransition.h index 7c2d16a24..2cd01601e 100644 --- a/include/field_fadetransition.h +++ b/include/field_fadetransition.h @@ -8,5 +8,7 @@ void sp13F_fall_to_last_warp(void); void sub_80AF848(void); void sub_80AF87C(void); +void sub_807DF64(void); +void sub_807DF7C(void); #endif // GUARD_FIELD_FADETRANSITION_H diff --git a/include/menu.h b/include/menu.h index 99ff35adb..86a67adc4 100644 --- a/include/menu.h +++ b/include/menu.h @@ -32,7 +32,7 @@ void CreateYesNoMenu(const struct WindowTemplate *windowTemplate, u16 borderFirs s8 ProcessMenuInputNoWrap_(void); void do_scheduled_bg_tilemap_copies_to_vram(void); void clear_scheduled_bg_copies_to_vram(void); -void AddTextPrinterParametrized2(u8 windowId, u8 fontId, u8 x, u8 y, u8 letterSpacing, u8 lineSpacing, struct TextColor *color, s8 speed, const u8 *str); +void AddTextPrinterParametrized2(u8 windowId, u8 fontId, u8 x, u8 y, u8 letterSpacing, u8 lineSpacing, const struct TextColor *color, s8 speed, const u8 *str); void sub_8197B1C(u8 windowId, bool8 copyToVram, u16 a2, u16 a3); #endif // GUARD_MENU_H diff --git a/ld_script.txt b/ld_script.txt index 0cd3d6202..53c8fe077 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -370,6 +370,9 @@ SECTIONS { data/data.o(.rodata); src/battle_ai_script_commands.o(.rodata); data/data_84827AC.o(.rodata); + src/quest_log.o(.rodata); + data/quest_log.o(.rodata); + data/data_84827AC.o(.rodata.8456C74); src/menews_jisan.o(.rodata); data/data_84827AC.o(.rodata.8468C98); src/m4a_tables.o(.rodata); diff --git a/src/quest_log.c b/src/quest_log.c index 0e8d5dd48..61c4de211 100644 --- a/src/quest_log.c +++ b/src/quest_log.c @@ -1,9 +1,15 @@ #include "global.h" #include "main.h" #include "task.h" +#include "palette.h" +#include "menu.h" +#include "window.h" +#include "text_window.h" #include "event_data.h" +#include "string_util.h" #include "script.h" #include "overworld.h" +#include "field_fadetransition.h" #include "wild_encounter.h" #include "help_system.h" #include "quest_log.h" @@ -28,6 +34,7 @@ EWRAM_DATA u8 gUnknown_203ADF8 = 0; EWRAM_DATA u8 gUnknown_203ADF9 = 0; EWRAM_DATA u8 gUnknown_203ADFA = 0; EWRAM_DATA u16 gUnknown_203ADFC = 0; +EWRAM_DATA u8 gUnknown_203ADFE[3]; EWRAM_DATA void * gUnknown_203AE04 = NULL; EWRAM_DATA void * gUnknown_203AE08 = NULL; EWRAM_DATA void * gUnknown_203AE0C[32] = {NULL}; @@ -61,6 +68,15 @@ void * sub_8113BF4(void *); void * sub_8113D48(void *, struct UnkStruct_203AE98 *); void * sub_8113CC8(void *, struct UnkStruct_203AE98 *); +extern const u8 gUnknown_841A155[]; + +const struct WindowTemplate gUnknown_845661C[3] = { + { 0, 0, 0, 30, 2, 15, 0x0e9 }, + { 0, 0, 18, 30, 2, 15, 0x0ad }, + { 0, 0, 14, 30, 6, 15, 0x14c } +}; + +const struct TextColor gUnknown_8456634 = {15, 1, 12}; void sub_8110840(void * a0) { @@ -529,3 +545,49 @@ void sub_8110FCC(void) sub_8112940(1, gUnknown_203AE98, 0x100); sub_8111150(gUnknown_203ADF8); } + +bool8 sub_8111000(void) +{ + LoadPalette(stdpal_get(4), 0xF0, 0x20); + sub_81109CC(2); + sub_807DF64(); + gUnknown_203AE94 = (struct UnkStruct_203AE94){}; + gUnknown_203AE94.unk_0_0 = 2; + return 1; +} + +bool8 sub_8111038(void) +{ + LoadPalette(stdpal_get(4), 0xF0, 0x20); + sub_81109CC(2); + sub_807DF7C(); + gUnknown_203AE94 = (struct UnkStruct_203AE94){}; + gUnknown_203AE94.unk_0_0 = 2; + return 1; +} + +void sub_8111070(u8 a0) +{ + u8 i; + + for (i = 0; i < 3; i++) + { + gUnknown_203ADFE[i] = AddWindow(&gUnknown_845661C[i]); + FillWindowPixelRect(gUnknown_203ADFE[i], 15, 0, 0, gUnknown_845661C[i].width * 8, gUnknown_845661C[i].height * 8); + } + + StringExpandPlaceholders(gStringVar4, gUnknown_841A155); + + if (a0) + { + ConvertIntToDecimalStringN(gStringVar1, a0, STR_CONV_MODE_LEFT_ALIGN, 1); + StringAppend(gStringVar4, gStringVar1); + } + + AddTextPrinterParametrized2(gUnknown_203ADFE[0], 2, 2, 2, 1, 2, &gUnknown_8456634, 0, gStringVar4); + PutWindowTilemap(gUnknown_203ADFE[0]); + PutWindowTilemap(gUnknown_203ADFE[1]); + CopyWindowToVram(gUnknown_203ADFE[0], 2); + CopyWindowToVram(gUnknown_203ADFE[2], 2); + CopyWindowToVram(gUnknown_203ADFE[1], 3); +} -- cgit v1.2.3 From 21224433ab5ce61f3c0b5c14bf2d76cbdb3ed740 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Thu, 11 Oct 2018 13:56:18 -0400 Subject: through sub_8111150 --- asm/quest_log.s | 162 -------------------------------------------------- include/unk_8159F40.h | 1 + src/quest_log.c | 30 ++++++++++ 3 files changed, 31 insertions(+), 162 deletions(-) diff --git a/asm/quest_log.s b/asm/quest_log.s index 24ffaeb24..9bde28c53 100644 --- a/asm/quest_log.s +++ b/asm/quest_log.s @@ -5,168 +5,6 @@ .text - thumb_func_start sub_8111134 -sub_8111134: @ 8111134 - push {r4,lr} - ldr r4, _0811114C @ =gUnknown_203ADFE - ldrb r0, [r4, 0x1] - bl PutWindowTilemap - ldrb r0, [r4, 0x1] - movs r1, 0x1 - bl CopyWindowToVram - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_0811114C: .4byte gUnknown_203ADFE - thumb_func_end sub_8111134 - - thumb_func_start sub_8111150 -sub_8111150: @ 8111150 - push {r4-r7,lr} - mov r7, r10 - mov r6, r9 - mov r5, r8 - push {r5-r7} - lsls r0, 24 - lsrs r0, 24 - ldr r2, _081111A8 @ =gSaveBlock1Ptr - movs r1, 0xCD - lsls r1, 3 - muls r0, r1 - movs r1, 0x98 - lsls r1, 5 - adds r0, r1 - ldr r1, [r2] - adds r5, r1, r0 - movs r4, 0 - mov r9, r2 - mov r6, r9 - movs r2, 0x8D - lsls r2, 3 - mov r12, r2 - ldr r7, _081111AC @ =0x000008e4 - mov r8, r7 -_08111180: - lsls r0, r4, 2 - adds r3, r5, r0 - ldr r2, _081111B0 @ =0x00000469 - adds r1, r3, r2 - ldrb r1, [r1] - lsls r1, 31 - mov r10, r0 - cmp r1, 0 - beq _081111B4 - ldr r1, [r6] - lsls r2, r4, 1 - adds r0, r2, r4 - lsls r0, 3 - adds r1, r0 - mov r7, r12 - adds r0, r3, r7 - ldrb r0, [r0] - negs r0, r0 - b _081111C4 - .align 2, 0 -_081111A8: .4byte gSaveBlock1Ptr -_081111AC: .4byte 0x000008e4 -_081111B0: .4byte 0x00000469 -_081111B4: - ldr r1, [r6] - lsls r2, r4, 1 - adds r0, r2, r4 - lsls r0, 3 - adds r1, r0 - mov r7, r12 - adds r0, r3, r7 - ldrb r0, [r0] -_081111C4: - add r1, r8 - strh r0, [r1] - adds r3, r2, 0 - mov r0, r10 - adds r2, r5, r0 - ldr r1, _081111F0 @ =0x0000046a - adds r0, r2, r1 - ldrb r0, [r0] - lsls r0, 30 - cmp r0, 0 - bge _081111F4 - ldr r1, [r6] - adds r0, r3, r4 - lsls r0, 3 - adds r1, r0 - mov r7, r12 - adds r0, r2, r7 - ldr r0, [r0] - lsls r0, 15 - lsrs r0, 24 - negs r0, r0 - b _08111206 - .align 2, 0 -_081111F0: .4byte 0x0000046a -_081111F4: - ldr r1, [r6] - adds r0, r3, r4 - lsls r0, 3 - adds r1, r0 - mov r7, r12 - adds r0, r2, r7 - ldr r0, [r0] - lsls r0, 15 - lsrs r0, 24 -_08111206: - ldr r2, _08111260 @ =0x000008e6 - adds r1, r2 - strh r0, [r1] - ldr r1, [r6] - adds r3, r4 - lsls r3, 3 - adds r1, r3 - mov r7, r10 - adds r2, r5, r7 - ldr r7, _08111264 @ =0x0000046a - adds r0, r2, r7 - ldrb r0, [r0] - lsrs r0, 2 - ldr r7, _08111268 @ =0x000008e8 - adds r1, r7 - strb r0, [r1] - ldr r0, [r6] - adds r0, r3 - ldr r1, _0811126C @ =0x0000046b - adds r2, r1 - ldrb r1, [r2] - ldr r2, _08111270 @ =0x000008e9 - adds r0, r2 - strb r1, [r0] - adds r0, r4, 0x1 - lsls r0, 16 - lsrs r4, r0, 16 - cmp r4, 0x3F - bls _08111180 - mov r7, r9 - ldr r1, [r7] - movs r0, 0x8E - lsls r0, 4 - adds r1, r0 - adds r0, r5, 0 - bl sub_815A1F8 - pop {r3-r5} - mov r8, r3 - mov r9, r4 - mov r10, r5 - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_08111260: .4byte 0x000008e6 -_08111264: .4byte 0x0000046a -_08111268: .4byte 0x000008e8 -_0811126C: .4byte 0x0000046b -_08111270: .4byte 0x000008e9 - thumb_func_end sub_8111150 - thumb_func_start sub_8111274 sub_8111274: @ 8111274 push {r4,lr} diff --git a/include/unk_8159F40.h b/include/unk_8159F40.h index 7343dc629..b7666766f 100644 --- a/include/unk_8159F40.h +++ b/include/unk_8159F40.h @@ -2,5 +2,6 @@ #define GUARD_UNK_8159F40_H void sub_815A008(struct QuestLog *); +void sub_815A1F8(struct QuestLog *, struct MapObjectTemplate *); #endif //GUARD_UNK_8159F40_H diff --git a/src/quest_log.c b/src/quest_log.c index 61c4de211..3e41d7d31 100644 --- a/src/quest_log.c +++ b/src/quest_log.c @@ -12,6 +12,7 @@ #include "field_fadetransition.h" #include "wild_encounter.h" #include "help_system.h" +#include "unk_8159F40.h" #include "quest_log.h" u8 gUnknown_3005E88; @@ -576,6 +577,7 @@ void sub_8111070(u8 a0) FillWindowPixelRect(gUnknown_203ADFE[i], 15, 0, 0, gUnknown_845661C[i].width * 8, gUnknown_845661C[i].height * 8); } + // _("Previously on your quest…$") StringExpandPlaceholders(gStringVar4, gUnknown_841A155); if (a0) @@ -591,3 +593,31 @@ void sub_8111070(u8 a0) CopyWindowToVram(gUnknown_203ADFE[2], 2); CopyWindowToVram(gUnknown_203ADFE[1], 3); } + +void sub_8111134(void) +{ + PutWindowTilemap(gUnknown_203ADFE[1]); + CopyWindowToVram(gUnknown_203ADFE[1], 1); +} + +void sub_8111150(u8 a0) +{ + struct QuestLog *questLog = &gSaveBlock1Ptr->questLog[a0]; + u16 i; + + for (i = 0; i < 64; i++) + { + if (questLog->npcData[i].negx) + gSaveBlock1Ptr->mapObjectTemplates[i].x = -questLog->npcData[i].x; + else + gSaveBlock1Ptr->mapObjectTemplates[i].x = questLog->npcData[i].x; + if (questLog->npcData[i].negy) + gSaveBlock1Ptr->mapObjectTemplates[i].y = -(u8)questLog->npcData[i].y; + else + gSaveBlock1Ptr->mapObjectTemplates[i].y = questLog->npcData[i].y; + gSaveBlock1Ptr->mapObjectTemplates[i].elevation = questLog->npcData[i].elevation; + gSaveBlock1Ptr->mapObjectTemplates[i].movementType = questLog->npcData[i].movementType; + } + + sub_815A1F8(questLog, gSaveBlock1Ptr->mapObjectTemplates); +} -- cgit v1.2.3 From 1fd187fb57a8b588f68455366d81f4b839939cb5 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Thu, 11 Oct 2018 15:06:35 -0400 Subject: through sub_81113E4 --- asm/quest_log.s | 206 --------------------------------------------------- include/event_data.h | 1 + include/item.h | 2 + include/overworld.h | 5 ++ src/quest_log.c | 59 ++++++++++++++- 5 files changed, 65 insertions(+), 208 deletions(-) diff --git a/asm/quest_log.s b/asm/quest_log.s index 9bde28c53..f2da90afc 100644 --- a/asm/quest_log.s +++ b/asm/quest_log.s @@ -5,212 +5,6 @@ .text - thumb_func_start sub_8111274 -sub_8111274: @ 8111274 - push {r4,lr} - sub sp, 0x8 - lsls r0, 24 - lsrs r4, r0, 24 - lsls r1, 24 - cmp r1, 0 - bne _081112D4 - ldr r3, _081112C8 @ =gSaveBlock1Ptr - ldr r2, [r3] - movs r0, 0xCD - lsls r0, 3 - adds r1, r4, 0 - muls r1, r0 - adds r0, r2, r1 - ldr r4, _081112CC @ =0x00001301 - adds r0, r4 - ldrb r0, [r0] - strb r0, [r2, 0x4] - ldr r2, [r3] - adds r0, r2, r1 - adds r4, 0x1 - adds r0, r4 - ldrb r0, [r0] - strb r0, [r2, 0x5] - ldr r2, [r3] - adds r0, r2, r1 - adds r4, 0x1 - adds r0, r4 - ldrb r0, [r0] - strb r0, [r2, 0x6] - ldr r2, [r3] - adds r1, r2, r1 - ldr r3, _081112D0 @ =0x00001304 - adds r0, r1, r3 - ldrh r0, [r0] - strh r0, [r2] - adds r4, 0x3 - adds r1, r4 - ldrh r0, [r1] - strh r0, [r2, 0x2] - b _08111336 - .align 2, 0 -_081112C8: .4byte gSaveBlock1Ptr -_081112CC: .4byte 0x00001301 -_081112D0: .4byte 0x00001304 -_081112D4: - ldr r0, _08111340 @ =gSaveBlock1Ptr - ldr r3, [r0] - movs r0, 0xCD - lsls r0, 3 - muls r0, r4 - adds r3, r0 - ldr r1, _08111344 @ =0x00001301 - adds r0, r3, r1 - ldrb r2, [r0] - ldr r0, _08111348 @ =0xffffff00 - ldr r1, [sp] - ands r1, r0 - orrs r1, r2 - str r1, [sp] - ldr r2, _0811134C @ =0x00001302 - adds r0, r3, r2 - ldrb r0, [r0] - lsls r0, 8 - ldr r2, _08111350 @ =0xffff00ff - ands r2, r1 - orrs r2, r0 - str r2, [sp] - ldr r4, _08111354 @ =0x00001303 - adds r0, r3, r4 - ldrb r1, [r0] - lsls r1, 16 - ldr r0, _08111358 @ =0xff00ffff - ands r0, r2 - orrs r0, r1 - str r0, [sp] - ldr r1, _0811135C @ =0x00001304 - adds r0, r3, r1 - ldrh r1, [r0] - ldr r0, _08111360 @ =0xffff0000 - ldr r2, [sp, 0x4] - ands r2, r0 - orrs r2, r1 - str r2, [sp, 0x4] - adds r4, 0x3 - adds r3, r4 - ldrh r1, [r3] - lsls r1, 16 - ldr r0, _08111364 @ =0x0000ffff - ands r0, r2 - orrs r0, r1 - str r0, [sp, 0x4] - mov r0, sp - bl sub_8055D5C -_08111336: - add sp, 0x8 - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_08111340: .4byte gSaveBlock1Ptr -_08111344: .4byte 0x00001301 -_08111348: .4byte 0xffffff00 -_0811134C: .4byte 0x00001302 -_08111350: .4byte 0xffff00ff -_08111354: .4byte 0x00001303 -_08111358: .4byte 0xff00ffff -_0811135C: .4byte 0x00001304 -_08111360: .4byte 0xffff0000 -_08111364: .4byte 0x0000ffff - thumb_func_end sub_8111274 - - thumb_func_start sub_8111368 -sub_8111368: @ 8111368 - push {lr} - ldr r1, _081113A0 @ =gUnknown_203ADFA - movs r0, 0x2 - strb r0, [r1] - bl sub_806E6FC - bl sub_809A2DC - bl sub_809A2A4 - bl sub_8110AC8 - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x1 - bne _081113B4 - ldr r0, _081113A4 @ =gUnknown_203ADF8 - ldrb r0, [r0] - movs r1, 0 - bl sub_8111274 - ldr r1, _081113A8 @ =gUnknown_3005024 - ldr r0, _081113AC @ =sub_8111038 - str r0, [r1] - ldr r0, _081113B0 @ =sub_80572A8 - bl SetMainCallback2 - b _081113CE - .align 2, 0 -_081113A0: .4byte gUnknown_203ADFA -_081113A4: .4byte gUnknown_203ADF8 -_081113A8: .4byte gUnknown_3005024 -_081113AC: .4byte sub_8111038 -_081113B0: .4byte sub_80572A8 -_081113B4: - ldr r0, _081113D4 @ =gUnknown_203ADF8 - ldrb r0, [r0] - movs r1, 0x1 - bl sub_8111274 - bl warp_in - ldr r1, _081113D8 @ =gUnknown_3005024 - ldr r0, _081113DC @ =sub_8111000 - str r0, [r1] - ldr r0, _081113E0 @ =sub_805726C - bl SetMainCallback2 -_081113CE: - pop {r0} - bx r0 - .align 2, 0 -_081113D4: .4byte gUnknown_203ADF8 -_081113D8: .4byte gUnknown_3005024 -_081113DC: .4byte sub_8111000 -_081113E0: .4byte sub_805726C - thumb_func_end sub_8111368 - - thumb_func_start sub_81113E4 -sub_81113E4: @ 81113E4 - push {r4,r5,lr} - ldr r4, _08111430 @ =gSaveBlock1Ptr - ldr r0, _08111434 @ =gUnknown_203ADF8 - ldrb r1, [r0] - movs r0, 0xCD - lsls r0, 3 - muls r0, r1 - movs r1, 0x98 - lsls r1, 5 - adds r0, r1 - ldr r1, [r4] - adds r5, r1, r0 - movs r2, 0xA4 - lsls r2, 1 - adds r0, r5, r2 - movs r2, 0xEE - lsls r2, 4 - adds r1, r2 - movs r2, 0x90 - bl CpuSet - movs r1, 0x9A - lsls r1, 2 - adds r0, r5, r1 - ldr r1, [r4] - movs r2, 0x80 - lsls r2, 5 - adds r1, r2 - movs r2, 0x80 - lsls r2, 1 - bl CpuSet - bl sub_8111688 - pop {r4,r5} - pop {r0} - bx r0 - .align 2, 0 -_08111430: .4byte gSaveBlock1Ptr -_08111434: .4byte gUnknown_203ADF8 - thumb_func_end sub_81113E4 - thumb_func_start sub_8111438 sub_8111438: @ 8111438 push {r4-r7,lr} diff --git a/include/event_data.h b/include/event_data.h index f28ed4f75..77bc41603 100644 --- a/include/event_data.h +++ b/include/event_data.h @@ -31,6 +31,7 @@ u8 FlagClear(u16 id); bool8 FlagGet(u16 id); u16 * sub_806E454(u16 id); bool32 sub_806E2BC(void); +void sub_806E6FC(void); extern u16 gSpecialVar_0x8000; extern u16 gSpecialVar_0x8001; diff --git a/include/item.h b/include/item.h index a136f03ec..199b3b65e 100644 --- a/include/item.h +++ b/include/item.h @@ -60,5 +60,7 @@ u8 ItemId_GetBattleUsage(u16 itemId); ItemUseFunc ItemId_GetBattleFunc(u16 itemId); u8 ItemId_GetSecondaryId(u16 itemId); u16 itemid_get_market_price(u16 itemId); +void sub_809A2DC(void); +void sub_809A2A4(void); #endif // ITEM_H diff --git a/include/overworld.h b/include/overworld.h index 7f7c92743..ab9e114ef 100644 --- a/include/overworld.h +++ b/include/overworld.h @@ -72,7 +72,12 @@ void IncrementGameStat(u8); u32 GetGameStat(u8); void sub_8056938(void); +void sub_8055D5C(struct WarpData *); +void sub_80572A8(void); +void sub_805726C(void); extern u8 gUnknown_2031DD8; +extern bool8 (* gUnknown_3005024)(void); + #endif //GUARD_ROM4_H diff --git a/src/quest_log.c b/src/quest_log.c index 3e41d7d31..d03319434 100644 --- a/src/quest_log.c +++ b/src/quest_log.c @@ -10,6 +10,7 @@ #include "script.h" #include "overworld.h" #include "field_fadetransition.h" +#include "item.h" #include "wild_encounter.h" #include "help_system.h" #include "unk_8159F40.h" @@ -57,6 +58,7 @@ void sub_8110F90(u8); void sub_8111150(u8); void sub_8111368(void); void sub_81115E8(void); +void sub_8111688(void); void sub_811175C(u8, struct UnkStruct_203AE98 *); void sub_81118F4(s8); void sub_81138F8(void); @@ -434,8 +436,8 @@ void sub_8110D48(u8 a0) { struct QuestLog * questLog = &gSaveBlock1Ptr->questLog[a0]; - CpuCopy16(gSaveBlock1Ptr->flags, questLog->unk_148, 0x120); - CpuCopy16(gSaveBlock1Ptr->vars, questLog->unk_268, 0x200); + CpuCopy16(gSaveBlock1Ptr->flags, questLog->unk_148, FLAGS_COUNT * sizeof(u8)); + CpuCopy16(gSaveBlock1Ptr->vars, questLog->unk_268, VARS_COUNT * sizeof(u16)); } void sub_8110D94(void) @@ -621,3 +623,56 @@ void sub_8111150(u8 a0) sub_815A1F8(questLog, gSaveBlock1Ptr->mapObjectTemplates); } + +void sub_8111274(u8 a0, u8 a1) +{ + struct WarpData sp0; + + if (!a1) + { + gSaveBlock1Ptr->location.mapGroup = gSaveBlock1Ptr->questLog[a0].unk_001; + gSaveBlock1Ptr->location.mapNum = gSaveBlock1Ptr->questLog[a0].unk_002; + gSaveBlock1Ptr->location.warpId = gSaveBlock1Ptr->questLog[a0].unk_003; + gSaveBlock1Ptr->pos.x = gSaveBlock1Ptr->questLog[a0].unk_004; + gSaveBlock1Ptr->pos.y = gSaveBlock1Ptr->questLog[a0].unk_006; + } + else + { + sp0.mapGroup = gSaveBlock1Ptr->questLog[a0].unk_001; + sp0.mapNum = gSaveBlock1Ptr->questLog[a0].unk_002; + sp0.warpId = gSaveBlock1Ptr->questLog[a0].unk_003; + sp0.x = gSaveBlock1Ptr->questLog[a0].unk_004; + sp0.y = gSaveBlock1Ptr->questLog[a0].unk_006; + sub_8055D5C(&sp0); + } +} + +void sub_8111368(void) +{ + gUnknown_203ADFA = 2; + sub_806E6FC(); + sub_809A2DC(); + sub_809A2A4(); + if (sub_8110AC8() == 1) + { + sub_8111274(gUnknown_203ADF8, 0); + gUnknown_3005024 = sub_8111038; + SetMainCallback2(sub_80572A8); + } + else + { + sub_8111274(gUnknown_203ADF8, 1); + warp_in(); + gUnknown_3005024 = sub_8111000; + SetMainCallback2(sub_805726C); + } +} + +void sub_81113E4(void) +{ + struct QuestLog * questLog = &gSaveBlock1Ptr->questLog[gUnknown_203ADF8]; + + CpuCopy16(questLog->unk_148, gSaveBlock1Ptr->flags, FLAGS_COUNT * sizeof(u8)); + CpuCopy16(questLog->unk_268, gSaveBlock1Ptr->vars, VARS_COUNT * sizeof(u16)); + sub_8111688(); +} -- cgit v1.2.3 From 3310b1445ac759a042776d8931cfe8d7dec46bd5 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Thu, 11 Oct 2018 16:13:46 -0400 Subject: sub_8111438 --- asm/quest_log.s | 215 --------------------------------------- include/pokemon_storage_system.h | 5 +- src/quest_log.c | 84 +++++++++++++++ 3 files changed, 87 insertions(+), 217 deletions(-) diff --git a/asm/quest_log.s b/asm/quest_log.s index f2da90afc..5c965a4f1 100644 --- a/asm/quest_log.s +++ b/asm/quest_log.s @@ -5,221 +5,6 @@ .text - thumb_func_start sub_8111438 -sub_8111438: @ 8111438 - push {r4-r7,lr} - mov r7, r9 - mov r6, r8 - push {r6,r7} - sub sp, 0x14 - movs r0, 0x68 - bl AllocZeroed - mov r9, r0 - movs r0, 0 - str r0, [sp] - str r0, [sp, 0x4] - str r0, [sp, 0x8] - str r0, [sp, 0xC] - mov r0, r9 - movs r1, 0x13 - movs r2, 0x1 - movs r3, 0x20 - bl CreateMon - ldr r0, _081114BC @ =0x00004027 - bl VarGet - lsls r0, 16 - lsrs r1, r0, 28 - mov r6, r9 - adds r6, 0x64 - strh r1, [r6] - lsls r0, 4 - lsrs r0, 20 - mov r4, r9 - adds r4, 0x66 - strh r0, [r4] - bl sub_8111618 - lsls r0, 16 - lsrs r5, r0, 16 - ldrh r0, [r6] - cmp r5, r0 - bls _081114C4 - movs r3, 0 - subs r0, r5, r0 - mov r8, r4 - cmp r3, r0 - bge _0811150E -_08111492: - movs r0, 0x5 - subs r0, r3 - movs r1, 0x64 - muls r0, r1 - ldr r1, _081114C0 @ =gPlayerParty - adds r0, r1 - str r3, [sp, 0x10] - bl ZeroMonData - ldr r3, [sp, 0x10] - adds r0, r3, 0x1 - lsls r0, 16 - lsrs r3, r0, 16 - mov r0, r9 - adds r0, 0x64 - ldrh r0, [r0] - subs r0, r5, r0 - cmp r3, r0 - blt _08111492 - b _0811150E - .align 2, 0 -_081114BC: .4byte 0x00004027 -_081114C0: .4byte gPlayerParty -_081114C4: - mov r8, r4 - cmp r5, r0 - bcs _0811150E - movs r3, 0 - adds r4, r6, 0 -_081114CE: - lsls r1, r3, 24 - lsrs r1, 24 - movs r0, 0 - str r3, [sp, 0x10] - bl sub_808BCB4 - ldr r3, [sp, 0x10] - adds r0, r3, 0x1 - lsls r0, 16 - lsrs r3, r0, 16 - cmp r3, 0x4 - bls _081114CE - adds r3, r5, 0 - ldrh r0, [r4] - cmp r3, r0 - bcs _0811150E -_081114EE: - movs r0, 0x64 - muls r0, r3 - ldr r1, _08111574 @ =gPlayerParty - adds r0, r1 - mov r1, r9 - movs r2, 0x64 - str r3, [sp, 0x10] - bl CopyMon - ldr r3, [sp, 0x10] - adds r0, r3, 0x1 - lsls r0, 16 - lsrs r3, r0, 16 - ldrh r1, [r4] - cmp r3, r1 - bcc _081114EE -_0811150E: - bl sub_811164C - lsls r0, 16 - lsrs r5, r0, 16 - mov r1, r8 - ldrh r0, [r1] - cmp r5, r0 - bls _08111578 - movs r3, 0 -_08111520: - movs r6, 0 - lsls r7, r3, 24 - lsrs r7, 24 -_08111526: - lsls r0, r6, 24 - lsrs r4, r0, 24 - adds r0, r7, 0 - adds r1, r4, 0 - movs r2, 0x5 - str r3, [sp, 0x10] - bl GetBoxMonDataFromAnyBox - ldr r3, [sp, 0x10] - cmp r0, 0 - beq _08111554 - adds r0, r7, 0 - adds r1, r4, 0 - bl sub_808BCB4 - subs r0, r5, 0x1 - lsls r0, 16 - lsrs r5, r0, 16 - ldr r3, [sp, 0x10] - mov r0, r8 - ldrh r0, [r0] - cmp r5, r0 - beq _081115D2 -_08111554: - adds r0, r6, 0x1 - lsls r0, 16 - lsrs r6, r0, 16 - cmp r6, 0x1D - bls _08111526 - mov r1, r8 - ldrh r1, [r1] - cmp r5, r1 - beq _081115D2 - adds r0, r3, 0x1 - lsls r0, 16 - lsrs r3, r0, 16 - cmp r3, 0xD - bls _08111520 - b _081115D2 - .align 2, 0 -_08111574: .4byte gPlayerParty -_08111578: - cmp r5, r0 - bcs _081115D2 - movs r3, 0 -_0811157E: - movs r6, 0 - lsls r7, r3, 24 -_08111582: - lsls r1, r6, 24 - lsrs r1, 24 - lsrs r0, r7, 24 - str r3, [sp, 0x10] - bl GetBoxedMonPtr - adds r4, r0, 0 - movs r1, 0x5 - bl GetBoxMonData - ldr r3, [sp, 0x10] - cmp r0, 0 - bne _081115B6 - adds r0, r4, 0 - mov r1, r9 - movs r2, 0x50 - bl CopyMon - adds r0, r5, 0x1 - lsls r0, 16 - lsrs r5, r0, 16 - ldr r3, [sp, 0x10] - mov r0, r8 - ldrh r0, [r0] - cmp r5, r0 - beq _081115D2 -_081115B6: - adds r0, r6, 0x1 - lsls r0, 16 - lsrs r6, r0, 16 - cmp r6, 0x1D - bls _08111582 - mov r1, r8 - ldrh r1, [r1] - cmp r5, r1 - beq _081115D2 - adds r0, r3, 0x1 - lsls r0, 16 - lsrs r3, r0, 16 - cmp r3, 0xD - bls _0811157E -_081115D2: - mov r0, r9 - bl Free - add sp, 0x14 - pop {r3,r4} - mov r8, r3 - mov r9, r4 - pop {r4-r7} - pop {r0} - bx r0 - thumb_func_end sub_8111438 - thumb_func_start sub_81115E8 sub_81115E8: @ 81115E8 push {r4,lr} diff --git a/include/pokemon_storage_system.h b/include/pokemon_storage_system.h index 9fcfdba96..04d739314 100644 --- a/include/pokemon_storage_system.h +++ b/include/pokemon_storage_system.h @@ -5,9 +5,10 @@ #define IN_BOX_COUNT 30 u8* GetBoxNamePtr(u8 boxNumber); -struct BoxPokemon *GetBoxedMonPtr(u8, u8); -void SetBoxMonNickFromAnyBox(u8, u8, u8 *); +struct BoxPokemon *GetBoxedMonPtr(u8 boxId, u8 monPosition); +void SetBoxMonNickFromAnyBox(u8 boxId, u8 monPosition, u8 * newNick); void CompactPartySlots(void); u32 GetBoxMonDataFromAnyBox(u8 boxId, u8 monPosition, u32 request); +void sub_808BCB4(u8 boxId, u8 monPosition); #endif // GUARD_POKEMON_STORAGE_SYSTEM_H diff --git a/src/quest_log.c b/src/quest_log.c index d03319434..b1f1dc870 100644 --- a/src/quest_log.c +++ b/src/quest_log.c @@ -1,4 +1,6 @@ #include "global.h" +#include "constants/species.h" +#include "malloc.h" #include "main.h" #include "task.h" #include "palette.h" @@ -14,6 +16,7 @@ #include "wild_encounter.h" #include "help_system.h" #include "unk_8159F40.h" +#include "pokemon_storage_system.h" #include "quest_log.h" u8 gUnknown_3005E88; @@ -58,6 +61,8 @@ void sub_8110F90(u8); void sub_8111150(u8); void sub_8111368(void); void sub_81115E8(void); +u16 sub_8111618(void); +u16 sub_811164C(void); void sub_8111688(void); void sub_811175C(u8, struct UnkStruct_203AE98 *); void sub_81118F4(s8); @@ -676,3 +681,82 @@ void sub_81113E4(void) CpuCopy16(questLog->unk_268, gSaveBlock1Ptr->vars, VARS_COUNT * sizeof(u16)); sub_8111688(); } + +struct PokemonAndSomethingElse +{ + struct Pokemon mon; + u16 unk_64; + u16 unk_66; +}; + +void sub_8111438(void) +{ + struct PokemonAndSomethingElse *r9 = AllocZeroed(sizeof(struct PokemonAndSomethingElse)); + u16 r0, r3, r5, r6; + + CreateMon(&r9->mon, SPECIES_RATTATA, 1, 0x20, FALSE, 0, 0, 0); + r0 = VarGet(VAR_0x4027); + r9->unk_64 = r0 >> 12; + r9->unk_66 = r0 % 0x1000; + + r5 = sub_8111618(); + if (r5 > r9->unk_64) + { + for (r3 = 0; r3 < r5 - r9->unk_64; r3++) + { + ZeroMonData(&gPlayerParty[5 - r3]); + } + } + else if (r5 < r9->unk_64) + { + for (r3 = 0; r3 < 5; r3++) + { + sub_808BCB4(0, r3); + } + for (r3 = r5; r3 < r9->unk_64; r3++) + { + CopyMon(&gPlayerParty[r3], &r9->mon, sizeof(struct Pokemon)); + } + } + + r5 = sub_811164C(); + if (r5 > r9->unk_66) + { + for (r3 = 0; r3 < 14; r3++) + { + for (r6 = 0; r6 < 30; r6++) + { + if (GetBoxMonDataFromAnyBox(r3, r6, MON_DATA_SANITY_BIT2)) + { + sub_808BCB4(r3, r6); + r5--; + if (r5 == r9->unk_66) + break; + } + } + if (r5 == r9->unk_66) + break; + } + } + else if (r5 < r9->unk_66) + { + for (r3 = 0; r3 < 14; r3++) + { + for (r6 = 0; r6 < 30; r6++) + { + struct BoxPokemon * boxMon = GetBoxedMonPtr(r3, r6); + if (!GetBoxMonData(boxMon, MON_DATA_SANITY_BIT2)) + { + CopyMon(boxMon, &r9->mon.box, sizeof(struct BoxPokemon)); + r5++; + if (r5 == r9->unk_66) + break; + } + } + if (r5 == r9->unk_66) + break; + } + } + + Free(r9); +} -- cgit v1.2.3 From feadfc8911db9bde3bc8678ea0a5d9bab0aeef15 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Thu, 11 Oct 2018 16:21:47 -0400 Subject: through sub_811164C --- asm/quest_log.s | 91 --------------------------------------------------------- src/quest_log.c | 42 ++++++++++++++++++++++++-- 2 files changed, 40 insertions(+), 93 deletions(-) diff --git a/asm/quest_log.s b/asm/quest_log.s index 5c965a4f1..b26643b9f 100644 --- a/asm/quest_log.s +++ b/asm/quest_log.s @@ -5,97 +5,6 @@ .text - thumb_func_start sub_81115E8 -sub_81115E8: @ 81115E8 - push {r4,lr} - bl sub_8111618 - adds r4, r0, 0 - lsls r4, 16 - lsrs r4, 16 - bl sub_811164C - adds r1, r0, 0 - lsls r1, 16 - lsrs r1, 16 - ldr r0, _08111614 @ =0x00004027 - lsls r4, 12 - adds r1, r4 - lsls r1, 16 - lsrs r1, 16 - bl VarSet - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_08111614: .4byte 0x00004027 - thumb_func_end sub_81115E8 - - thumb_func_start sub_8111618 -sub_8111618: @ 8111618 - push {r4,r5,lr} - movs r5, 0 - movs r4, 0 -_0811161E: - movs r0, 0x64 - muls r0, r4 - ldr r1, _08111648 @ =gPlayerParty - adds r0, r1 - movs r1, 0x5 - bl GetMonData - cmp r0, 0 - beq _08111636 - adds r0, r5, 0x1 - lsls r0, 16 - lsrs r5, r0, 16 -_08111636: - adds r0, r4, 0x1 - lsls r0, 16 - lsrs r4, r0, 16 - cmp r4, 0x5 - bls _0811161E - adds r0, r5, 0 - pop {r4,r5} - pop {r1} - bx r1 - .align 2, 0 -_08111648: .4byte gPlayerParty - thumb_func_end sub_8111618 - - thumb_func_start sub_811164C -sub_811164C: @ 811164C - push {r4-r7,lr} - movs r6, 0 - movs r0, 0 -_08111652: - movs r4, 0 - lsls r5, r0, 24 - adds r7, r0, 0x1 -_08111658: - lsls r1, r4, 24 - lsrs r1, 24 - lsrs r0, r5, 24 - movs r2, 0x5 - bl GetBoxMonDataFromAnyBox - cmp r0, 0 - beq _0811166E - adds r0, r6, 0x1 - lsls r0, 16 - lsrs r6, r0, 16 -_0811166E: - adds r0, r4, 0x1 - lsls r0, 16 - lsrs r4, r0, 16 - cmp r4, 0x1D - bls _08111658 - lsls r0, r7, 16 - lsrs r0, 16 - cmp r0, 0xD - bls _08111652 - adds r0, r6, 0 - pop {r4-r7} - pop {r1} - bx r1 - thumb_func_end sub_811164C - thumb_func_start sub_8111688 sub_8111688: @ 8111688 push {r4-r7,lr} diff --git a/src/quest_log.c b/src/quest_log.c index b1f1dc870..7ed5e0560 100644 --- a/src/quest_log.c +++ b/src/quest_log.c @@ -740,9 +740,9 @@ void sub_8111438(void) } else if (r5 < r9->unk_66) { - for (r3 = 0; r3 < 14; r3++) + for (r3 = 0; r3 < TOTAL_BOXES_COUNT; r3++) { - for (r6 = 0; r6 < 30; r6++) + for (r6 = 0; r6 < IN_BOX_COUNT; r6++) { struct BoxPokemon * boxMon = GetBoxedMonPtr(r3, r6); if (!GetBoxMonData(boxMon, MON_DATA_SANITY_BIT2)) @@ -760,3 +760,41 @@ void sub_8111438(void) Free(r9); } + +void sub_81115E8(void) +{ + u16 r4 = sub_8111618(); + u16 r1 = sub_811164C(); + VarSet(VAR_0x4027, (r4 << 12) + r1); +} + +u16 sub_8111618(void) +{ + u16 count = 0; + u16 i; + + for (i = 0; i < PARTY_SIZE; i++) + { + if (GetMonData(&gPlayerParty[i], MON_DATA_SANITY_BIT2)) + count++; + } + + return count; +} + +u16 sub_811164C(void) +{ + u16 count = 0; + u16 i, j; + + for (i = 0; i < TOTAL_BOXES_COUNT; i++) + { + for (j = 0; j < IN_BOX_COUNT; j++) + { + if (GetBoxMonDataFromAnyBox(i, j, MON_DATA_SANITY_BIT2)) + count++; + } + } + + return count; +} -- cgit v1.2.3 From 6533d659321f97181b6a7a5d62976f87469601d6 Mon Sep 17 00:00:00 2001 From: paul Date: Thu, 11 Oct 2018 22:49:56 +0200 Subject: more preparation for copypate --- data/graphics.s | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/data/graphics.s b/data/graphics.s index fd965ede6..241b27bc3 100644 --- a/data/graphics.s +++ b/data/graphics.s @@ -653,7 +653,13 @@ gUnknown_8D2FBD4:: @ 8D2FBD4 @ INSERT TRAINERS HERE gUnknown_8E48D58:: @ 8E48D58 - .incbin "baserom.gba", 0xE48D58, 0x2E624 + .incbin "baserom.gba", 0xE48D58, 0x21164 + +gUnknown_8E69EBC:: @ 8E69EBC + .incbin "baserom.gba", 0xE69EBC, 0xD0A0 + +gUnknown_8E76F5C:: @ 8E76F5C + .incbin "baserom.gba", 0xE76F5C, 0x420 @ THIS IS ./graphics/battle_transitions/vs_frame.4bpp.lz gUnknown_8E7737C:: @ 8E7737C -- cgit v1.2.3 From 913f2a9a1d88ca8fb86557cc265cd6ca7fac80e4 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Thu, 11 Oct 2018 17:21:45 -0400 Subject: through sub_811175C --- asm/quest_log.s | 280 ------------------------------------------------------- include/global.h | 4 +- src/quest_log.c | 107 ++++++++++++++++++--- 3 files changed, 98 insertions(+), 293 deletions(-) diff --git a/asm/quest_log.s b/asm/quest_log.s index b26643b9f..82816d861 100644 --- a/asm/quest_log.s +++ b/asm/quest_log.s @@ -5,286 +5,6 @@ .text - thumb_func_start sub_8111688 -sub_8111688: @ 8111688 - push {r4-r7,lr} - mov r7, r8 - push {r7} - sub sp, 0x8 - movs r5, 0 - ldr r0, _081116CC @ =gSaveBlock1Ptr - mov r8, r0 - ldr r7, _081116D0 @ =0x0000063a -_08111698: - ldr r1, _081116D4 @ =0x000040aa - adds r0, r5, r1 - lsls r0, 16 - lsrs r0, 16 - bl VarGet - lsls r1, r5, 1 - add r1, sp - strh r0, [r1] - movs r4, 0 - adds r6, r5, 0x1 - adds r3, r1, 0 - lsls r5, 4 -_081116B2: - ldrh r0, [r3] - movs r2, 0x1 - ands r2, r0 - cmp r2, 0 - beq _081116D8 - mov r1, r8 - ldr r0, [r1] - adds r1, r5, r4 - adds r0, r7 - adds r0, r1 - movs r1, 0x1E - strb r1, [r0] - b _081116E4 - .align 2, 0 -_081116CC: .4byte gSaveBlock1Ptr -_081116D0: .4byte 0x0000063a -_081116D4: .4byte 0x000040aa -_081116D8: - mov r1, r8 - ldr r0, [r1] - adds r1, r5, r4 - adds r0, r7 - adds r0, r1 - strb r2, [r0] -_081116E4: - ldrh r0, [r3] - lsrs r0, 1 - strh r0, [r3] - adds r0, r4, 0x1 - lsls r0, 16 - lsrs r4, r0, 16 - cmp r4, 0xF - bls _081116B2 - lsls r0, r6, 16 - lsrs r5, r0, 16 - cmp r5, 0x3 - bls _08111698 - add sp, 0x8 - pop {r3} - mov r8, r3 - pop {r4-r7} - pop {r0} - bx r0 - thumb_func_end sub_8111688 - - thumb_func_start sub_8111708 -sub_8111708: @ 8111708 - push {r4,r5,lr} - sub sp, 0x1C - ldr r0, _08111754 @ =0x000040ae - bl VarGet - ldr r4, _08111758 @ =gSaveBlock1Ptr - ldr r1, [r4] - strh r0, [r1, 0x32] - lsls r0, 16 - cmp r0, 0 - bne _0811174A - movs r0, 0x4 - ldrsb r0, [r1, r0] - lsls r0, 16 - lsrs r0, 16 - ldrb r1, [r1, 0x5] - lsls r1, 24 - asrs r1, 24 - lsls r1, 16 - lsrs r1, 16 - bl get_mapheader_by_bank_and_number - mov r1, sp - ldm r0!, {r2,r3,r5} - stm r1!, {r2,r3,r5} - ldm r0!, {r2,r3,r5} - stm r1!, {r2,r3,r5} - ldr r0, [r0] - str r0, [r1] - ldr r1, [r4] - mov r0, sp - ldrh r0, [r0, 0x12] - strh r0, [r1, 0x32] -_0811174A: - add sp, 0x1C - pop {r4,r5} - pop {r0} - bx r0 - .align 2, 0 -_08111754: .4byte 0x000040ae -_08111758: .4byte gSaveBlock1Ptr - thumb_func_end sub_8111708 - - thumb_func_start sub_811175C -sub_811175C: @ 811175C - push {r4-r7,lr} - mov r7, r9 - mov r6, r8 - push {r6,r7} - mov r8, r1 - lsls r0, 24 - lsrs r4, r0, 24 - movs r6, 0 - mov r9, r6 - movs r2, 0x80 - lsls r2, 1 - mov r0, r8 - movs r1, 0 - bl memset - movs r7, 0 - ldr r2, _081117B8 @ =gUnknown_203AE0C - movs r1, 0 -_08111780: - lsls r0, r7, 2 - adds r0, r2 - str r1, [r0] - adds r0, r7, 0x1 - lsls r0, 16 - lsrs r7, r0, 16 - cmp r7, 0x1F - bls _08111780 - ldr r1, _081117BC @ =gSaveBlock1Ptr - movs r0, 0xCD - lsls r0, 3 - muls r0, r4 - ldr r1, [r1] - adds r0, r1 - ldr r1, _081117C0 @ =0x00001868 - adds r4, r0, r1 - movs r7, 0 -_081117A2: - ldrh r0, [r4] - ldr r1, _081117C4 @ =0x00000fff - ands r1, r0 - cmp r1, 0x29 - bls _081117AE - b _081118AC -_081117AE: - lsls r0, r1, 2 - ldr r1, _081117C8 @ =_081117CC - adds r0, r1 - ldr r0, [r0] - mov pc, r0 - .align 2, 0 -_081117B8: .4byte gUnknown_203AE0C -_081117BC: .4byte gSaveBlock1Ptr -_081117C0: .4byte 0x00001868 -_081117C4: .4byte 0x00000fff -_081117C8: .4byte _081117CC - .align 2, 0 -_081117CC: - .4byte _08111874 - .4byte _08111880 - .4byte _08111880 - .4byte _081118AC - .4byte _081118AC - .4byte _081118AC - .4byte _081118AC - .4byte _081118AC - .4byte _081118AC - .4byte _081118AC - .4byte _081118AC - .4byte _081118AC - .4byte _081118AC - .4byte _081118AC - .4byte _081118AC - .4byte _081118AC - .4byte _081118AC - .4byte _081118AC - .4byte _081118AC - .4byte _081118AC - .4byte _081118AC - .4byte _081118AC - .4byte _081118AC - .4byte _081118AC - .4byte _081118AC - .4byte _081118AC - .4byte _081118AC - .4byte _081118AC - .4byte _081118AC - .4byte _081118AC - .4byte _081118AC - .4byte _081118AC - .4byte _081118AC - .4byte _081118AC - .4byte _081118AC - .4byte _081118AC - .4byte _081118AC - .4byte _081118AC - .4byte _081118AC - .4byte _0811188C - .4byte _081118AC - .4byte _08111898 -_08111874: - lsls r1, r6, 3 - add r1, r8 - adds r0, r4, 0 - bl sub_8113D08 - b _081118A2 -_08111880: - lsls r1, r6, 3 - add r1, r8 - adds r0, r4, 0 - bl sub_8113D94 - b _081118A2 -_0811188C: - lsls r1, r6, 3 - add r1, r8 - adds r0, r4, 0 - bl sub_8113C20 - b _081118A2 -_08111898: - lsls r1, r6, 3 - add r1, r8 - adds r0, r4, 0 - bl sub_8113C8C -_081118A2: - adds r4, r0, 0 - adds r0, r6, 0x1 - lsls r0, 16 - lsrs r6, r0, 16 - b _081118D2 -_081118AC: - mov r0, r9 - lsls r1, r0, 2 - ldr r5, _081118F0 @ =gUnknown_203AE0C - adds r1, r5 - adds r0, r4, 0 - bl sub_8113A78 - adds r4, r0, 0 - mov r1, r9 - cmp r1, 0 - bne _081118C8 - ldr r0, [r5] - bl sub_8113ABC -_081118C8: - mov r0, r9 - adds r0, 0x1 - lsls r0, 16 - lsrs r0, 16 - mov r9, r0 -_081118D2: - cmp r4, 0 - beq _081118E2 - adds r0, r7, 0x1 - lsls r0, 16 - lsrs r7, r0, 16 - cmp r7, 0x1F - bhi _081118E2 - b _081117A2 -_081118E2: - pop {r3,r4} - mov r8, r3 - mov r9, r4 - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_081118F0: .4byte gUnknown_203AE0C - thumb_func_end sub_811175C - thumb_func_start sub_81118F4 sub_81118F4: @ 81118F4 push {lr} diff --git a/include/global.h b/include/global.h index f1efeb4e0..5cbdbb360 100644 --- a/include/global.h +++ b/include/global.h @@ -496,8 +496,8 @@ struct QuestLog /*0x0148*/ u8 unk_148[0x120]; /*0x02c8*/ u8 unk_268[0x200]; /*0x0468*/ struct QuestLogNPCData npcData[64]; - /*0x0568*/ u8 filler_568[0x100]; - /*0x0668*/ u8 end[0]; + /*0x0568*/ u16 unk_568[0x80]; + /*0x0668*/ u16 end[0]; }; #define MAP_OBJECTS_COUNT 16 diff --git a/src/quest_log.c b/src/quest_log.c index 7ed5e0560..da918be79 100644 --- a/src/quest_log.c +++ b/src/quest_log.c @@ -41,7 +41,7 @@ EWRAM_DATA u8 gUnknown_203ADFA = 0; EWRAM_DATA u16 gUnknown_203ADFC = 0; EWRAM_DATA u8 gUnknown_203ADFE[3]; EWRAM_DATA void * gUnknown_203AE04 = NULL; -EWRAM_DATA void * gUnknown_203AE08 = NULL; +EWRAM_DATA u16 * gUnknown_203AE08 = NULL; EWRAM_DATA void * gUnknown_203AE0C[32] = {NULL}; EWRAM_DATA void (* gUnknown_203AE8C)(void) = 0; EWRAM_DATA struct UnkStruct_203AE94 gUnknown_203AE94 = {0}; @@ -65,7 +65,12 @@ u16 sub_8111618(void); u16 sub_811164C(void); void sub_8111688(void); void sub_811175C(u8, struct UnkStruct_203AE98 *); -void sub_81118F4(s8); +void * sub_8113D08(void *, struct UnkStruct_203AE98 *); +void * sub_8113D94(void *, struct UnkStruct_203AE98 *); +void * sub_8113C20(void *, struct UnkStruct_203AE98 *); +void * sub_8113C8C(void *, struct UnkStruct_203AE98 *); +void * sub_8113A78(void *, void **); +void sub_8113ABC(void *); void sub_81138F8(void); void sub_8111AD8(void); void sub_8112940(u8, struct UnkStruct_203AE98 *, u16); @@ -75,6 +80,7 @@ void sub_8113BD8(void); void * sub_8113BF4(void *); void * sub_8113D48(void *, struct UnkStruct_203AE98 *); void * sub_8113CC8(void *, struct UnkStruct_203AE98 *); +void sub_81118F4(s8); extern const u8 gUnknown_841A155[]; @@ -94,7 +100,7 @@ void sub_8110840(void * a0) if (gUnknown_203ADFA != 0) { if (gUnknown_203AE08) - gUnknown_203AE08 += r1; + gUnknown_203AE08 = (void *)gUnknown_203AE08 + r1; if (gUnknown_203ADFA == 2) { int r3; @@ -111,7 +117,7 @@ void sub_811089C(void) gUnknown_203ADF8 = 0; gUnknown_203ADFA = 0; gUnknown_203AE8C = 0; - gUnknown_203AE08 = 0; + gUnknown_203AE08 = NULL; gUnknown_203AE04 = 0; sub_8113BD8(); sub_81138F8(); @@ -134,20 +140,20 @@ void sub_811092C(void) gUnknown_203AE8C(); } -bool8 sub_8110944(u8 * a0, size_t a1) +bool8 sub_8110944(void * a0, size_t a1) { - u8 * r2 = gSaveBlock1Ptr->questLog[gUnknown_203ADF8].filler_568; - u8 * r0 = gSaveBlock1Ptr->questLog[gUnknown_203ADF8].end; + void * r2 = gSaveBlock1Ptr->questLog[gUnknown_203ADF8].unk_568; + void * r0 = gSaveBlock1Ptr->questLog[gUnknown_203ADF8].end; r0 -= a1; if (a0 < r2 || a0 > r0) return FALSE; return TRUE; } -bool8 sub_8110988(u8 * a0, size_t a1) +bool8 sub_8110988(void * a0, size_t a1) { - u8 * r2 = gSaveBlock1Ptr->questLog[gUnknown_203ADF8].filler_568; - u8 * r0 = gSaveBlock1Ptr->questLog[gUnknown_203ADF8].end; + void * r2 = gSaveBlock1Ptr->questLog[gUnknown_203ADF8].unk_568; + void * r0 = gSaveBlock1Ptr->questLog[gUnknown_203ADF8].end; r0 -= a1; if (a0 < r2 || a0 > r0) return FALSE; @@ -209,7 +215,7 @@ void sub_8110AEC(u16 a0) sub_81108F0(gUnknown_203ADF8); sub_8113B88(); - gUnknown_203AE08 = gSaveBlock1Ptr->questLog[gUnknown_203ADF8].filler_568; + gUnknown_203AE08 = gSaveBlock1Ptr->questLog[gUnknown_203ADF8].unk_568; if ((a0 >= 12 && a0 < 20) || a0 == 35) gSaveBlock1Ptr->questLog[gUnknown_203ADF8].unk_000 = 2; else @@ -798,3 +804,82 @@ u16 sub_811164C(void) return count; } + +void sub_8111688(void) +{ + u16 i, j; + u16 sp0[4]; + + for (i = 0; i < 4; i++) + { + sp0[i] = VarGet(VAR_0x40AA + i); + + for (j = 0; j < 16; j++) + { + if (sp0[i] & 1) + gSaveBlock1Ptr->trainerRematches[16 * i + j] = 30; + else + gSaveBlock1Ptr->trainerRematches[16 * i + j] = 0; + sp0[i] >>= 1; + } + } +} + +void sub_8111708(void) +{ + struct MapHeader sp0; + + gSaveBlock1Ptr->mapDataId = VarGet(VAR_0x40AE); + if (gSaveBlock1Ptr->mapDataId == 0) + { + sp0 = *get_mapheader_by_bank_and_number(gSaveBlock1Ptr->location.mapGroup, gSaveBlock1Ptr->location.mapNum); + gSaveBlock1Ptr->mapDataId = sp0.mapDataId; + } +} + +void sub_811175C(u8 a0, struct UnkStruct_203AE98 * a1) +{ + u16 i; + u16 *r4; + u16 r6 = 0; + u16 r9 = 0; + + memset(a1, 0, 32 * sizeof(struct UnkStruct_203AE98)); + for (i = 0; i < 32; i++) + { + gUnknown_203AE0C[i] = NULL; + } + + r4 = gSaveBlock1Ptr->questLog[a0].unk_568; + for (i = 0; i < 32; i++) + { + switch (*r4 & 0xFFF) + { + case 0: + r4 = sub_8113D08(r4, &a1[r6]); + r6++; + break; + case 1: + case 2: + r4 = sub_8113D94(r4, &a1[r6]); + r6++; + break; + case 39: + r4 = sub_8113C20(r4, &a1[r6]); + r6++; + break; + case 41: + r4 = sub_8113C8C(r4, &a1[r6]); + r6++; + break; + default: + r4 = sub_8113A78(r4, &gUnknown_203AE0C[r9]); + if (r9 == 0) + sub_8113ABC(gUnknown_203AE0C[0]); + r9++; + break; + } + if (r4 == NULL) + break; + } +} -- cgit v1.2.3 From 7ce6c69138a1de6f6e736a2b73b06cf1e7c889fb Mon Sep 17 00:00:00 2001 From: paul Date: Fri, 12 Oct 2018 00:00:46 +0200 Subject: almost complete working pokemon and trainer images, offending ones are baserom'd --- data/graphics.s | 13975 ++++++++++++++++++- graphics/pokemon/back_pics/abra_back_pic.png | Bin 0 -> 578 bytes graphics/pokemon/back_pics/absol_back_pic.png | Bin 0 -> 673 bytes graphics/pokemon/back_pics/aerodactyl_back_pic.png | Bin 0 -> 602 bytes graphics/pokemon/back_pics/aggron_back_pic.png | Bin 0 -> 860 bytes graphics/pokemon/back_pics/aipom_back_pic.png | Bin 0 -> 592 bytes graphics/pokemon/back_pics/alakazam_back_pic.png | Bin 0 -> 729 bytes graphics/pokemon/back_pics/altaria_back_pic.png | Bin 0 -> 685 bytes graphics/pokemon/back_pics/ampharos_back_pic.png | Bin 0 -> 714 bytes graphics/pokemon/back_pics/anorith_back_pic.png | Bin 0 -> 445 bytes graphics/pokemon/back_pics/arbok_back_pic.png | Bin 0 -> 491 bytes graphics/pokemon/back_pics/arcanine_back_pic.png | Bin 0 -> 790 bytes graphics/pokemon/back_pics/ariados_back_pic.png | Bin 0 -> 706 bytes graphics/pokemon/back_pics/armaldo_back_pic.png | Bin 0 -> 898 bytes graphics/pokemon/back_pics/aron_back_pic.png | Bin 0 -> 437 bytes graphics/pokemon/back_pics/articuno_back_pic.png | Bin 0 -> 504 bytes graphics/pokemon/back_pics/azumarill_back_pic.png | Bin 0 -> 541 bytes graphics/pokemon/back_pics/azurill_back_pic.png | Bin 0 -> 601 bytes graphics/pokemon/back_pics/bagon_back_pic.png | Bin 0 -> 574 bytes graphics/pokemon/back_pics/baltoy_back_pic.png | Bin 0 -> 517 bytes graphics/pokemon/back_pics/banette_back_pic.png | Bin 0 -> 503 bytes graphics/pokemon/back_pics/barboach_back_pic.png | Bin 0 -> 551 bytes graphics/pokemon/back_pics/bayleef_back_pic.png | Bin 0 -> 737 bytes graphics/pokemon/back_pics/beautifly_back_pic.png | Bin 0 -> 771 bytes graphics/pokemon/back_pics/beedrill_back_pic.png | Bin 0 -> 734 bytes graphics/pokemon/back_pics/beldum_back_pic.png | Bin 0 -> 575 bytes graphics/pokemon/back_pics/bellossom_back_pic.png | Bin 0 -> 633 bytes graphics/pokemon/back_pics/bellsprout_back_pic.png | Bin 0 -> 529 bytes graphics/pokemon/back_pics/blastoise_back_pic.png | Bin 0 -> 842 bytes graphics/pokemon/back_pics/blaziken_back_pic.png | Bin 0 -> 835 bytes graphics/pokemon/back_pics/blissey_back_pic.png | Bin 0 -> 566 bytes graphics/pokemon/back_pics/breloom_back_pic.png | Bin 0 -> 825 bytes graphics/pokemon/back_pics/bulbasaur_back_pic.png | Bin 0 -> 554 bytes graphics/pokemon/back_pics/butterfree_back_pic.png | Bin 0 -> 868 bytes graphics/pokemon/back_pics/cacnea_back_pic.png | Bin 0 -> 713 bytes graphics/pokemon/back_pics/cacturne_back_pic.png | Bin 0 -> 653 bytes graphics/pokemon/back_pics/camerupt_back_pic.png | Bin 0 -> 527 bytes graphics/pokemon/back_pics/carvanha_back_pic.png | Bin 0 -> 648 bytes graphics/pokemon/back_pics/cascoon_back_pic.png | Bin 0 -> 404 bytes .../back_pics/castform_normal_form_back_pic.png | Bin 0 -> 373 bytes .../back_pics/castform_rainy_form_back_pic.png | Bin 0 -> 495 bytes .../back_pics/castform_snowy_form_back_pic.png | Bin 0 -> 628 bytes .../back_pics/castform_sunny_form_back_pic.png | Bin 0 -> 559 bytes graphics/pokemon/back_pics/caterpie_back_pic.png | Bin 0 -> 521 bytes graphics/pokemon/back_pics/celebi_back_pic.png | Bin 0 -> 757 bytes graphics/pokemon/back_pics/chansey_back_pic.png | Bin 0 -> 453 bytes graphics/pokemon/back_pics/charizard_back_pic.png | Bin 0 -> 799 bytes graphics/pokemon/back_pics/charmander_back_pic.png | Bin 0 -> 543 bytes graphics/pokemon/back_pics/charmeleon_back_pic.png | Bin 0 -> 625 bytes graphics/pokemon/back_pics/chikorita_back_pic.png | Bin 0 -> 569 bytes graphics/pokemon/back_pics/chimecho_back_pic.png | Bin 0 -> 507 bytes graphics/pokemon/back_pics/chinchou_back_pic.png | Bin 0 -> 637 bytes .../back_pics/circled_question_mark_back_pic.png | Bin 0 -> 397 bytes graphics/pokemon/back_pics/clamperl_back_pic.png | Bin 0 -> 475 bytes graphics/pokemon/back_pics/claydol_back_pic.png | Bin 0 -> 774 bytes graphics/pokemon/back_pics/clefable_back_pic.png | Bin 0 -> 638 bytes graphics/pokemon/back_pics/clefairy_back_pic.png | Bin 0 -> 561 bytes graphics/pokemon/back_pics/cleffa_back_pic.png | Bin 0 -> 461 bytes graphics/pokemon/back_pics/cloyster_back_pic.png | Bin 0 -> 769 bytes graphics/pokemon/back_pics/combusken_back_pic.png | Bin 0 -> 812 bytes graphics/pokemon/back_pics/corphish_back_pic.png | Bin 0 -> 662 bytes graphics/pokemon/back_pics/corsola_back_pic.png | Bin 0 -> 525 bytes graphics/pokemon/back_pics/cradily_back_pic.png | Bin 0 -> 824 bytes graphics/pokemon/back_pics/crawdaunt_back_pic.png | Bin 0 -> 787 bytes graphics/pokemon/back_pics/crobat_back_pic.png | Bin 0 -> 600 bytes graphics/pokemon/back_pics/croconaw_back_pic.png | Bin 0 -> 709 bytes graphics/pokemon/back_pics/cubone_back_pic.png | Bin 0 -> 685 bytes graphics/pokemon/back_pics/cyndaquil_back_pic.png | Bin 0 -> 670 bytes graphics/pokemon/back_pics/delcatty_back_pic.png | Bin 0 -> 737 bytes graphics/pokemon/back_pics/delibird_back_pic.png | Bin 0 -> 786 bytes graphics/pokemon/back_pics/deoxys_back_pic.png | Bin 0 -> 1146 bytes graphics/pokemon/back_pics/dewgong_back_pic.png | Bin 0 -> 523 bytes graphics/pokemon/back_pics/diglett_back_pic.png | Bin 0 -> 406 bytes graphics/pokemon/back_pics/ditto_back_pic.png | Bin 0 -> 399 bytes graphics/pokemon/back_pics/dodrio_back_pic.png | Bin 0 -> 910 bytes graphics/pokemon/back_pics/doduo_back_pic.png | Bin 0 -> 651 bytes graphics/pokemon/back_pics/donphan_back_pic.png | Bin 0 -> 571 bytes .../back_pics/double_question_mark_back_pic.png | Bin 0 -> 308 bytes graphics/pokemon/back_pics/dragonair_back_pic.png | Bin 0 -> 672 bytes graphics/pokemon/back_pics/dragonite_back_pic.png | Bin 0 -> 624 bytes graphics/pokemon/back_pics/dratini_back_pic.png | Bin 0 -> 525 bytes graphics/pokemon/back_pics/drowzee_back_pic.png | Bin 0 -> 440 bytes graphics/pokemon/back_pics/dugtrio_back_pic.png | Bin 0 -> 541 bytes graphics/pokemon/back_pics/dunsparce_back_pic.png | Bin 0 -> 593 bytes graphics/pokemon/back_pics/dusclops_back_pic.png | Bin 0 -> 559 bytes graphics/pokemon/back_pics/duskull_back_pic.png | Bin 0 -> 537 bytes graphics/pokemon/back_pics/dustox_back_pic.png | Bin 0 -> 481 bytes graphics/pokemon/back_pics/eevee_back_pic.png | Bin 0 -> 641 bytes graphics/pokemon/back_pics/ekans_back_pic.png | Bin 0 -> 616 bytes graphics/pokemon/back_pics/electabuzz_back_pic.png | Bin 0 -> 611 bytes graphics/pokemon/back_pics/electrike_back_pic.png | Bin 0 -> 499 bytes graphics/pokemon/back_pics/electrode_back_pic.png | Bin 0 -> 477 bytes graphics/pokemon/back_pics/elekid_back_pic.png | Bin 0 -> 660 bytes graphics/pokemon/back_pics/entei_back_pic.png | Bin 0 -> 859 bytes graphics/pokemon/back_pics/espeon_back_pic.png | Bin 0 -> 554 bytes graphics/pokemon/back_pics/exeggcute_back_pic.png | Bin 0 -> 597 bytes graphics/pokemon/back_pics/exeggutor_back_pic.png | Bin 0 -> 778 bytes graphics/pokemon/back_pics/exploud_back_pic.png | Bin 0 -> 838 bytes graphics/pokemon/back_pics/farfetch_d_back_pic.png | Bin 0 -> 696 bytes graphics/pokemon/back_pics/fearow_back_pic.png | Bin 0 -> 635 bytes graphics/pokemon/back_pics/feebas_back_pic.png | Bin 0 -> 666 bytes graphics/pokemon/back_pics/feraligatr_back_pic.png | Bin 0 -> 999 bytes graphics/pokemon/back_pics/flaaffy_back_pic.png | Bin 0 -> 663 bytes graphics/pokemon/back_pics/flareon_back_pic.png | Bin 0 -> 709 bytes graphics/pokemon/back_pics/flygon_back_pic.png | Bin 0 -> 888 bytes graphics/pokemon/back_pics/forretress_back_pic.png | Bin 0 -> 525 bytes graphics/pokemon/back_pics/furret_back_pic.png | Bin 0 -> 660 bytes graphics/pokemon/back_pics/gardevoir_back_pic.png | Bin 0 -> 674 bytes graphics/pokemon/back_pics/gastly_back_pic.png | Bin 0 -> 613 bytes graphics/pokemon/back_pics/gengar_back_pic.png | Bin 0 -> 661 bytes graphics/pokemon/back_pics/geodude_back_pic.png | Bin 0 -> 506 bytes graphics/pokemon/back_pics/girafarig_back_pic.png | Bin 0 -> 769 bytes graphics/pokemon/back_pics/glalie_back_pic.png | Bin 0 -> 701 bytes graphics/pokemon/back_pics/gligar_back_pic.png | Bin 0 -> 768 bytes graphics/pokemon/back_pics/gloom_back_pic.png | Bin 0 -> 709 bytes graphics/pokemon/back_pics/golbat_back_pic.png | Bin 0 -> 561 bytes graphics/pokemon/back_pics/goldeen_back_pic.png | Bin 0 -> 700 bytes graphics/pokemon/back_pics/golduck_back_pic.png | Bin 0 -> 630 bytes graphics/pokemon/back_pics/golem_back_pic.png | Bin 0 -> 510 bytes graphics/pokemon/back_pics/gorebyss_back_pic.png | Bin 0 -> 560 bytes graphics/pokemon/back_pics/granbull_back_pic.png | Bin 0 -> 627 bytes graphics/pokemon/back_pics/graveler_back_pic.png | Bin 0 -> 490 bytes graphics/pokemon/back_pics/grimer_back_pic.png | Bin 0 -> 550 bytes graphics/pokemon/back_pics/groudon_back_pic.png | Bin 0 -> 890 bytes graphics/pokemon/back_pics/grovyle_back_pic.png | Bin 0 -> 657 bytes graphics/pokemon/back_pics/growlithe_back_pic.png | Bin 0 -> 650 bytes graphics/pokemon/back_pics/grumpig_back_pic.png | Bin 0 -> 727 bytes graphics/pokemon/back_pics/gulpin_back_pic.png | Bin 0 -> 497 bytes graphics/pokemon/back_pics/gyarados_back_pic.png | Bin 0 -> 1010 bytes graphics/pokemon/back_pics/hariyama_back_pic.png | Bin 0 -> 780 bytes graphics/pokemon/back_pics/haunter_back_pic.png | Bin 0 -> 612 bytes graphics/pokemon/back_pics/heracross_back_pic.png | Bin 0 -> 690 bytes graphics/pokemon/back_pics/hitmonchan_back_pic.png | Bin 0 -> 632 bytes graphics/pokemon/back_pics/hitmonlee_back_pic.png | Bin 0 -> 534 bytes graphics/pokemon/back_pics/hitmontop_back_pic.png | Bin 0 -> 892 bytes graphics/pokemon/back_pics/ho_oh_back_pic.png | Bin 0 -> 831 bytes graphics/pokemon/back_pics/hoothoot_back_pic.png | Bin 0 -> 618 bytes graphics/pokemon/back_pics/hoppip_back_pic.png | Bin 0 -> 582 bytes graphics/pokemon/back_pics/horsea_back_pic.png | Bin 0 -> 585 bytes graphics/pokemon/back_pics/houndoom_back_pic.png | Bin 0 -> 626 bytes graphics/pokemon/back_pics/houndour_back_pic.png | Bin 0 -> 508 bytes graphics/pokemon/back_pics/huntail_back_pic.png | Bin 0 -> 688 bytes graphics/pokemon/back_pics/hypno_back_pic.png | Bin 0 -> 658 bytes graphics/pokemon/back_pics/igglybuff_back_pic.png | Bin 0 -> 443 bytes graphics/pokemon/back_pics/illumise_back_pic.png | Bin 0 -> 663 bytes graphics/pokemon/back_pics/ivysaur_back_pic.png | Bin 0 -> 695 bytes graphics/pokemon/back_pics/jigglypuff_back_pic.png | Bin 0 -> 451 bytes graphics/pokemon/back_pics/jirachi_back_pic.png | Bin 0 -> 738 bytes graphics/pokemon/back_pics/jolteon_back_pic.png | Bin 0 -> 754 bytes graphics/pokemon/back_pics/jumpluff_back_pic.png | Bin 0 -> 809 bytes graphics/pokemon/back_pics/jynx_back_pic.png | Bin 0 -> 610 bytes graphics/pokemon/back_pics/kabuto_back_pic.png | Bin 0 -> 499 bytes graphics/pokemon/back_pics/kabutops_back_pic.png | Bin 0 -> 753 bytes graphics/pokemon/back_pics/kadabra_back_pic.png | Bin 0 -> 754 bytes graphics/pokemon/back_pics/kakuna_back_pic.png | Bin 0 -> 490 bytes graphics/pokemon/back_pics/kangaskhan_back_pic.png | Bin 0 -> 881 bytes graphics/pokemon/back_pics/kecleon_back_pic.png | Bin 0 -> 818 bytes graphics/pokemon/back_pics/kingdra_back_pic.png | Bin 0 -> 743 bytes graphics/pokemon/back_pics/kingler_back_pic.png | Bin 0 -> 716 bytes graphics/pokemon/back_pics/kirlia_back_pic.png | Bin 0 -> 723 bytes graphics/pokemon/back_pics/koffing_back_pic.png | Bin 0 -> 634 bytes graphics/pokemon/back_pics/krabby_back_pic.png | Bin 0 -> 710 bytes graphics/pokemon/back_pics/kyogre_back_pic.png | Bin 0 -> 497 bytes graphics/pokemon/back_pics/lairon_back_pic.png | Bin 0 -> 575 bytes graphics/pokemon/back_pics/lanturn_back_pic.png | Bin 0 -> 644 bytes graphics/pokemon/back_pics/lapras_back_pic.png | Bin 0 -> 686 bytes graphics/pokemon/back_pics/larvitar_back_pic.png | Bin 0 -> 517 bytes graphics/pokemon/back_pics/latias_back_pic.png | Bin 0 -> 619 bytes graphics/pokemon/back_pics/latios_back_pic.png | Bin 0 -> 672 bytes graphics/pokemon/back_pics/ledian_back_pic.png | Bin 0 -> 720 bytes graphics/pokemon/back_pics/ledyba_back_pic.png | Bin 0 -> 642 bytes graphics/pokemon/back_pics/lickitung_back_pic.png | Bin 0 -> 517 bytes graphics/pokemon/back_pics/lileep_back_pic.png | Bin 0 -> 679 bytes graphics/pokemon/back_pics/linoone_back_pic.png | Bin 0 -> 546 bytes graphics/pokemon/back_pics/lombre_back_pic.png | Bin 0 -> 585 bytes graphics/pokemon/back_pics/lotad_back_pic.png | Bin 0 -> 544 bytes graphics/pokemon/back_pics/loudred_back_pic.png | Bin 0 -> 686 bytes graphics/pokemon/back_pics/ludicolo_back_pic.png | Bin 0 -> 604 bytes graphics/pokemon/back_pics/lugia_back_pic.png | Bin 0 -> 783 bytes graphics/pokemon/back_pics/lunatone_back_pic.png | Bin 0 -> 719 bytes graphics/pokemon/back_pics/luvdisc_back_pic.png | Bin 0 -> 357 bytes graphics/pokemon/back_pics/machamp_back_pic.png | Bin 0 -> 903 bytes graphics/pokemon/back_pics/machoke_back_pic.png | Bin 0 -> 675 bytes graphics/pokemon/back_pics/machop_back_pic.png | Bin 0 -> 584 bytes graphics/pokemon/back_pics/magby_back_pic.png | Bin 0 -> 546 bytes graphics/pokemon/back_pics/magcargo_back_pic.png | Bin 0 -> 829 bytes graphics/pokemon/back_pics/magikarp_back_pic.png | Bin 0 -> 673 bytes graphics/pokemon/back_pics/magmar_back_pic.png | Bin 0 -> 689 bytes graphics/pokemon/back_pics/magnemite_back_pic.png | Bin 0 -> 391 bytes graphics/pokemon/back_pics/magneton_back_pic.png | Bin 0 -> 749 bytes graphics/pokemon/back_pics/makuhita_back_pic.png | Bin 0 -> 579 bytes graphics/pokemon/back_pics/manectric_back_pic.png | Bin 0 -> 437 bytes graphics/pokemon/back_pics/mankey_back_pic.png | Bin 0 -> 697 bytes graphics/pokemon/back_pics/mantine_back_pic.png | Bin 0 -> 526 bytes graphics/pokemon/back_pics/mareep_back_pic.png | Bin 0 -> 635 bytes graphics/pokemon/back_pics/marill_back_pic.png | Bin 0 -> 514 bytes graphics/pokemon/back_pics/marowak_back_pic.png | Bin 0 -> 629 bytes graphics/pokemon/back_pics/marshtomp_back_pic.png | Bin 0 -> 748 bytes graphics/pokemon/back_pics/masquerain_back_pic.png | Bin 0 -> 697 bytes graphics/pokemon/back_pics/mawile_back_pic.png | Bin 0 -> 825 bytes graphics/pokemon/back_pics/medicham_back_pic.png | Bin 0 -> 696 bytes graphics/pokemon/back_pics/meditite_back_pic.png | Bin 0 -> 565 bytes graphics/pokemon/back_pics/meganium_back_pic.png | Bin 0 -> 736 bytes graphics/pokemon/back_pics/meowth_back_pic.png | Bin 0 -> 576 bytes graphics/pokemon/back_pics/metagross_back_pic.png | Bin 0 -> 515 bytes graphics/pokemon/back_pics/metang_back_pic.png | Bin 0 -> 618 bytes graphics/pokemon/back_pics/metapod_back_pic.png | Bin 0 -> 411 bytes graphics/pokemon/back_pics/mew_back_pic.png | Bin 0 -> 654 bytes graphics/pokemon/back_pics/mewtwo_back_pic.png | Bin 0 -> 815 bytes graphics/pokemon/back_pics/mightyena_back_pic.png | Bin 0 -> 724 bytes graphics/pokemon/back_pics/milotic_back_pic.png | Bin 0 -> 588 bytes graphics/pokemon/back_pics/miltank_back_pic.png | Bin 0 -> 731 bytes graphics/pokemon/back_pics/minun_back_pic.png | Bin 0 -> 575 bytes graphics/pokemon/back_pics/misdreavus_back_pic.png | Bin 0 -> 618 bytes graphics/pokemon/back_pics/moltres_back_pic.png | Bin 0 -> 682 bytes graphics/pokemon/back_pics/mr_mime_back_pic.png | Bin 0 -> 677 bytes graphics/pokemon/back_pics/mudkip_back_pic.png | Bin 0 -> 627 bytes graphics/pokemon/back_pics/muk_back_pic.png | Bin 0 -> 582 bytes graphics/pokemon/back_pics/murkrow_back_pic.png | Bin 0 -> 640 bytes graphics/pokemon/back_pics/natu_back_pic.png | Bin 0 -> 401 bytes graphics/pokemon/back_pics/nidoking_back_pic.png | Bin 0 -> 849 bytes graphics/pokemon/back_pics/nidoqueen_back_pic.png | Bin 0 -> 761 bytes graphics/pokemon/back_pics/nidoran_f_back_pic.png | Bin 0 -> 587 bytes graphics/pokemon/back_pics/nidoran_m_back_pic.png | Bin 0 -> 630 bytes graphics/pokemon/back_pics/nidorina_back_pic.png | Bin 0 -> 693 bytes graphics/pokemon/back_pics/nidorino_back_pic.png | Bin 0 -> 741 bytes graphics/pokemon/back_pics/nincada_back_pic.png | Bin 0 -> 576 bytes graphics/pokemon/back_pics/ninetales_back_pic.png | Bin 0 -> 770 bytes graphics/pokemon/back_pics/ninjask_back_pic.png | Bin 0 -> 797 bytes graphics/pokemon/back_pics/noctowl_back_pic.png | Bin 0 -> 659 bytes graphics/pokemon/back_pics/nosepass_back_pic.png | Bin 0 -> 517 bytes graphics/pokemon/back_pics/numel_back_pic.png | Bin 0 -> 573 bytes graphics/pokemon/back_pics/nuzleaf_back_pic.png | Bin 0 -> 583 bytes graphics/pokemon/back_pics/octillery_back_pic.png | Bin 0 -> 558 bytes graphics/pokemon/back_pics/oddish_back_pic.png | Bin 0 -> 548 bytes graphics/pokemon/back_pics/omanyte_back_pic.png | Bin 0 -> 661 bytes graphics/pokemon/back_pics/omastar_back_pic.png | Bin 0 -> 634 bytes graphics/pokemon/back_pics/onix_back_pic.png | Bin 0 -> 696 bytes graphics/pokemon/back_pics/paras_back_pic.png | Bin 0 -> 509 bytes graphics/pokemon/back_pics/parasect_back_pic.png | Bin 0 -> 602 bytes graphics/pokemon/back_pics/pelipper_back_pic.png | Bin 0 -> 737 bytes graphics/pokemon/back_pics/persian_back_pic.png | Bin 0 -> 663 bytes graphics/pokemon/back_pics/phanpy_back_pic.png | Bin 0 -> 541 bytes graphics/pokemon/back_pics/pichu_back_pic.png | Bin 0 -> 495 bytes graphics/pokemon/back_pics/pidgeot_back_pic.png | Bin 0 -> 800 bytes graphics/pokemon/back_pics/pidgeotto_back_pic.png | Bin 0 -> 673 bytes graphics/pokemon/back_pics/pidgey_back_pic.png | Bin 0 -> 702 bytes graphics/pokemon/back_pics/pikachu_back_pic.png | Bin 0 -> 587 bytes graphics/pokemon/back_pics/piloswine_back_pic.png | Bin 0 -> 436 bytes graphics/pokemon/back_pics/pineco_back_pic.png | Bin 0 -> 520 bytes graphics/pokemon/back_pics/pinsir_back_pic.png | Bin 0 -> 657 bytes graphics/pokemon/back_pics/plusle_back_pic.png | Bin 0 -> 568 bytes graphics/pokemon/back_pics/politoed_back_pic.png | Bin 0 -> 565 bytes graphics/pokemon/back_pics/poliwag_back_pic.png | Bin 0 -> 465 bytes graphics/pokemon/back_pics/poliwhirl_back_pic.png | Bin 0 -> 487 bytes graphics/pokemon/back_pics/poliwrath_back_pic.png | Bin 0 -> 615 bytes graphics/pokemon/back_pics/ponyta_back_pic.png | Bin 0 -> 680 bytes graphics/pokemon/back_pics/poochyena_back_pic.png | Bin 0 -> 676 bytes graphics/pokemon/back_pics/porygon2_back_pic.png | Bin 0 -> 656 bytes graphics/pokemon/back_pics/porygon_back_pic.png | Bin 0 -> 537 bytes graphics/pokemon/back_pics/primeape_back_pic.png | Bin 0 -> 714 bytes graphics/pokemon/back_pics/psyduck_back_pic.png | Bin 0 -> 534 bytes graphics/pokemon/back_pics/pupitar_back_pic.png | Bin 0 -> 642 bytes graphics/pokemon/back_pics/quagsire_back_pic.png | Bin 0 -> 602 bytes graphics/pokemon/back_pics/quilava_back_pic.png | Bin 0 -> 746 bytes graphics/pokemon/back_pics/qwilfish_back_pic.png | Bin 0 -> 572 bytes graphics/pokemon/back_pics/raichu_back_pic.png | Bin 0 -> 625 bytes graphics/pokemon/back_pics/raikou_back_pic.png | Bin 0 -> 745 bytes graphics/pokemon/back_pics/ralts_back_pic.png | Bin 0 -> 451 bytes graphics/pokemon/back_pics/rapidash_back_pic.png | Bin 0 -> 840 bytes graphics/pokemon/back_pics/raticate_back_pic.png | Bin 0 -> 643 bytes graphics/pokemon/back_pics/rattata_back_pic.png | Bin 0 -> 566 bytes graphics/pokemon/back_pics/rayquaza_back_pic.png | Bin 0 -> 666 bytes graphics/pokemon/back_pics/regice_back_pic.png | Bin 0 -> 551 bytes graphics/pokemon/back_pics/regirock_back_pic.png | Bin 0 -> 859 bytes graphics/pokemon/back_pics/registeel_back_pic.png | Bin 0 -> 615 bytes graphics/pokemon/back_pics/relicanth_back_pic.png | Bin 0 -> 704 bytes graphics/pokemon/back_pics/remoraid_back_pic.png | Bin 0 -> 596 bytes graphics/pokemon/back_pics/rhydon_back_pic.png | Bin 0 -> 880 bytes graphics/pokemon/back_pics/rhyhorn_back_pic.png | Bin 0 -> 633 bytes graphics/pokemon/back_pics/roselia_back_pic.png | Bin 0 -> 774 bytes graphics/pokemon/back_pics/sableye_back_pic.png | Bin 0 -> 654 bytes graphics/pokemon/back_pics/salamence_back_pic.png | Bin 0 -> 578 bytes graphics/pokemon/back_pics/sandshrew_back_pic.png | Bin 0 -> 606 bytes graphics/pokemon/back_pics/sandslash_back_pic.png | Bin 0 -> 837 bytes graphics/pokemon/back_pics/sceptile_back_pic.png | Bin 0 -> 838 bytes graphics/pokemon/back_pics/scizor_back_pic.png | Bin 0 -> 739 bytes graphics/pokemon/back_pics/scyther_back_pic.png | Bin 0 -> 854 bytes graphics/pokemon/back_pics/seadra_back_pic.png | Bin 0 -> 727 bytes graphics/pokemon/back_pics/seaking_back_pic.png | Bin 0 -> 693 bytes graphics/pokemon/back_pics/sealeo_back_pic.png | Bin 0 -> 503 bytes graphics/pokemon/back_pics/seedot_back_pic.png | Bin 0 -> 561 bytes graphics/pokemon/back_pics/seel_back_pic.png | Bin 0 -> 581 bytes graphics/pokemon/back_pics/sentret_back_pic.png | Bin 0 -> 549 bytes graphics/pokemon/back_pics/seviper_back_pic.png | Bin 0 -> 934 bytes graphics/pokemon/back_pics/sharpedo_back_pic.png | Bin 0 -> 676 bytes graphics/pokemon/back_pics/shedinja_back_pic.png | Bin 0 -> 763 bytes graphics/pokemon/back_pics/shelgon_back_pic.png | Bin 0 -> 549 bytes graphics/pokemon/back_pics/shellder_back_pic.png | Bin 0 -> 586 bytes graphics/pokemon/back_pics/shiftry_back_pic.png | Bin 0 -> 580 bytes graphics/pokemon/back_pics/shroomish_back_pic.png | Bin 0 -> 540 bytes graphics/pokemon/back_pics/shuckle_back_pic.png | Bin 0 -> 483 bytes graphics/pokemon/back_pics/shuppet_back_pic.png | Bin 0 -> 485 bytes graphics/pokemon/back_pics/silcoon_back_pic.png | Bin 0 -> 396 bytes graphics/pokemon/back_pics/skarmory_back_pic.png | Bin 0 -> 577 bytes graphics/pokemon/back_pics/skiploom_back_pic.png | Bin 0 -> 575 bytes graphics/pokemon/back_pics/skitty_back_pic.png | Bin 0 -> 677 bytes graphics/pokemon/back_pics/slaking_back_pic.png | Bin 0 -> 788 bytes graphics/pokemon/back_pics/slakoth_back_pic.png | Bin 0 -> 583 bytes graphics/pokemon/back_pics/slowbro_back_pic.png | Bin 0 -> 737 bytes graphics/pokemon/back_pics/slowking_back_pic.png | Bin 0 -> 712 bytes graphics/pokemon/back_pics/slowpoke_back_pic.png | Bin 0 -> 494 bytes graphics/pokemon/back_pics/slugma_back_pic.png | Bin 0 -> 584 bytes graphics/pokemon/back_pics/smeargle_back_pic.png | Bin 0 -> 648 bytes graphics/pokemon/back_pics/smoochum_back_pic.png | Bin 0 -> 507 bytes graphics/pokemon/back_pics/sneasel_back_pic.png | Bin 0 -> 664 bytes graphics/pokemon/back_pics/snorlax_back_pic.png | Bin 0 -> 419 bytes graphics/pokemon/back_pics/snorunt_back_pic.png | Bin 0 -> 557 bytes graphics/pokemon/back_pics/snubbull_back_pic.png | Bin 0 -> 627 bytes graphics/pokemon/back_pics/solrock_back_pic.png | Bin 0 -> 802 bytes graphics/pokemon/back_pics/spearow_back_pic.png | Bin 0 -> 601 bytes graphics/pokemon/back_pics/spheal_back_pic.png | Bin 0 -> 405 bytes graphics/pokemon/back_pics/spinarak_back_pic.png | Bin 0 -> 465 bytes graphics/pokemon/back_pics/spinda_back_pic.png | Bin 0 -> 684 bytes graphics/pokemon/back_pics/spoink_back_pic.png | Bin 0 -> 453 bytes graphics/pokemon/back_pics/squirtle_back_pic.png | Bin 0 -> 484 bytes graphics/pokemon/back_pics/stantler_back_pic.png | Bin 0 -> 680 bytes graphics/pokemon/back_pics/starmie_back_pic.png | Bin 0 -> 501 bytes graphics/pokemon/back_pics/staryu_back_pic.png | Bin 0 -> 446 bytes graphics/pokemon/back_pics/steelix_back_pic.png | Bin 0 -> 819 bytes graphics/pokemon/back_pics/sudowoodo_back_pic.png | Bin 0 -> 696 bytes graphics/pokemon/back_pics/suicune_back_pic.png | Bin 0 -> 975 bytes graphics/pokemon/back_pics/sunflora_back_pic.png | Bin 0 -> 749 bytes graphics/pokemon/back_pics/sunkern_back_pic.png | Bin 0 -> 555 bytes graphics/pokemon/back_pics/surskit_back_pic.png | Bin 0 -> 459 bytes graphics/pokemon/back_pics/swablu_back_pic.png | Bin 0 -> 740 bytes graphics/pokemon/back_pics/swalot_back_pic.png | Bin 0 -> 687 bytes graphics/pokemon/back_pics/swampert_back_pic.png | Bin 0 -> 768 bytes graphics/pokemon/back_pics/swellow_back_pic.png | Bin 0 -> 669 bytes graphics/pokemon/back_pics/swinub_back_pic.png | Bin 0 -> 382 bytes graphics/pokemon/back_pics/taillow_back_pic.png | Bin 0 -> 446 bytes graphics/pokemon/back_pics/tangela_back_pic.png | Bin 0 -> 676 bytes graphics/pokemon/back_pics/tauros_back_pic.png | Bin 0 -> 561 bytes graphics/pokemon/back_pics/teddiursa_back_pic.png | Bin 0 -> 512 bytes graphics/pokemon/back_pics/tentacool_back_pic.png | Bin 0 -> 556 bytes graphics/pokemon/back_pics/tentacruel_back_pic.png | Bin 0 -> 736 bytes graphics/pokemon/back_pics/togepi_back_pic.png | Bin 0 -> 514 bytes graphics/pokemon/back_pics/togetic_back_pic.png | Bin 0 -> 630 bytes graphics/pokemon/back_pics/torchic_back_pic.png | Bin 0 -> 576 bytes graphics/pokemon/back_pics/torkoal_back_pic.png | Bin 0 -> 569 bytes graphics/pokemon/back_pics/totodile_back_pic.png | Bin 0 -> 599 bytes graphics/pokemon/back_pics/trapinch_back_pic.png | Bin 0 -> 437 bytes graphics/pokemon/back_pics/treecko_back_pic.png | Bin 0 -> 636 bytes graphics/pokemon/back_pics/tropius_back_pic.png | Bin 0 -> 632 bytes graphics/pokemon/back_pics/typhlosion_back_pic.png | Bin 0 -> 849 bytes graphics/pokemon/back_pics/tyranitar_back_pic.png | Bin 0 -> 776 bytes graphics/pokemon/back_pics/tyrogue_back_pic.png | Bin 0 -> 618 bytes graphics/pokemon/back_pics/umbreon_back_pic.png | Bin 0 -> 638 bytes graphics/pokemon/back_pics/unown_a_back_pic.png | Bin 0 -> 376 bytes graphics/pokemon/back_pics/unown_b_back_pic.png | Bin 0 -> 394 bytes graphics/pokemon/back_pics/unown_c_back_pic.png | Bin 0 -> 505 bytes graphics/pokemon/back_pics/unown_d_back_pic.png | Bin 0 -> 451 bytes graphics/pokemon/back_pics/unown_e_back_pic.png | Bin 0 -> 400 bytes .../back_pics/unown_exclamation_mark_back_pic.png | Bin 0 -> 312 bytes graphics/pokemon/back_pics/unown_f_back_pic.png | Bin 0 -> 417 bytes graphics/pokemon/back_pics/unown_g_back_pic.png | Bin 0 -> 431 bytes graphics/pokemon/back_pics/unown_h_back_pic.png | Bin 0 -> 534 bytes graphics/pokemon/back_pics/unown_i_back_pic.png | Bin 0 -> 328 bytes graphics/pokemon/back_pics/unown_j_back_pic.png | Bin 0 -> 370 bytes graphics/pokemon/back_pics/unown_k_back_pic.png | Bin 0 -> 388 bytes graphics/pokemon/back_pics/unown_l_back_pic.png | Bin 0 -> 356 bytes graphics/pokemon/back_pics/unown_m_back_pic.png | Bin 0 -> 499 bytes graphics/pokemon/back_pics/unown_n_back_pic.png | Bin 0 -> 474 bytes graphics/pokemon/back_pics/unown_o_back_pic.png | Bin 0 -> 517 bytes graphics/pokemon/back_pics/unown_p_back_pic.png | Bin 0 -> 333 bytes graphics/pokemon/back_pics/unown_q_back_pic.png | Bin 0 -> 335 bytes .../back_pics/unown_question_mark_back_pic.png | Bin 0 -> 382 bytes graphics/pokemon/back_pics/unown_r_back_pic.png | Bin 0 -> 337 bytes graphics/pokemon/back_pics/unown_s_back_pic.png | Bin 0 -> 439 bytes graphics/pokemon/back_pics/unown_t_back_pic.png | Bin 0 -> 324 bytes graphics/pokemon/back_pics/unown_u_back_pic.png | Bin 0 -> 454 bytes graphics/pokemon/back_pics/unown_v_back_pic.png | Bin 0 -> 416 bytes graphics/pokemon/back_pics/unown_w_back_pic.png | Bin 0 -> 378 bytes graphics/pokemon/back_pics/unown_x_back_pic.png | Bin 0 -> 376 bytes graphics/pokemon/back_pics/unown_y_back_pic.png | Bin 0 -> 404 bytes graphics/pokemon/back_pics/unown_z_back_pic.png | Bin 0 -> 348 bytes graphics/pokemon/back_pics/ursaring_back_pic.png | Bin 0 -> 718 bytes graphics/pokemon/back_pics/vaporeon_back_pic.png | Bin 0 -> 572 bytes graphics/pokemon/back_pics/venomoth_back_pic.png | Bin 0 -> 769 bytes graphics/pokemon/back_pics/venonat_back_pic.png | Bin 0 -> 678 bytes graphics/pokemon/back_pics/venusaur_back_pic.png | Bin 0 -> 948 bytes graphics/pokemon/back_pics/vibrava_back_pic.png | Bin 0 -> 518 bytes graphics/pokemon/back_pics/victreebel_back_pic.png | Bin 0 -> 752 bytes graphics/pokemon/back_pics/vigoroth_back_pic.png | Bin 0 -> 589 bytes graphics/pokemon/back_pics/vileplume_back_pic.png | Bin 0 -> 860 bytes graphics/pokemon/back_pics/volbeat_back_pic.png | Bin 0 -> 702 bytes graphics/pokemon/back_pics/voltorb_back_pic.png | Bin 0 -> 475 bytes graphics/pokemon/back_pics/vulpix_back_pic.png | Bin 0 -> 656 bytes graphics/pokemon/back_pics/wailmer_back_pic.png | Bin 0 -> 347 bytes graphics/pokemon/back_pics/wailord_back_pic.png | Bin 0 -> 368 bytes graphics/pokemon/back_pics/walrein_back_pic.png | Bin 0 -> 727 bytes graphics/pokemon/back_pics/wartortle_back_pic.png | Bin 0 -> 689 bytes graphics/pokemon/back_pics/weedle_back_pic.png | Bin 0 -> 502 bytes graphics/pokemon/back_pics/weepinbell_back_pic.png | Bin 0 -> 625 bytes graphics/pokemon/back_pics/weezing_back_pic.png | Bin 0 -> 687 bytes graphics/pokemon/back_pics/whiscash_back_pic.png | Bin 0 -> 690 bytes graphics/pokemon/back_pics/whismur_back_pic.png | Bin 0 -> 493 bytes graphics/pokemon/back_pics/wigglytuff_back_pic.png | Bin 0 -> 538 bytes graphics/pokemon/back_pics/wingull_back_pic.png | Bin 0 -> 684 bytes graphics/pokemon/back_pics/wobbuffet_back_pic.png | Bin 0 -> 433 bytes graphics/pokemon/back_pics/wooper_back_pic.png | Bin 0 -> 533 bytes graphics/pokemon/back_pics/wurmple_back_pic.png | Bin 0 -> 488 bytes graphics/pokemon/back_pics/wynaut_back_pic.png | Bin 0 -> 498 bytes graphics/pokemon/back_pics/xatu_back_pic.png | Bin 0 -> 716 bytes graphics/pokemon/back_pics/yanma_back_pic.png | Bin 0 -> 796 bytes graphics/pokemon/back_pics/zangoose_back_pic.png | Bin 0 -> 734 bytes graphics/pokemon/back_pics/zapdos_back_pic.png | Bin 0 -> 652 bytes graphics/pokemon/back_pics/zigzagoon_back_pic.png | Bin 0 -> 683 bytes graphics/pokemon/back_pics/zubat_back_pic.png | Bin 0 -> 526 bytes graphics/pokemon/footprints/abra_footprint.png | Bin 0 -> 94 bytes graphics/pokemon/footprints/absol_footprint.png | Bin 0 -> 102 bytes .../pokemon/footprints/aerodactyl_footprint.png | Bin 0 -> 92 bytes graphics/pokemon/footprints/aggron_footprint.png | Bin 0 -> 102 bytes graphics/pokemon/footprints/aipom_footprint.png | Bin 0 -> 86 bytes graphics/pokemon/footprints/alakazam_footprint.png | Bin 0 -> 95 bytes graphics/pokemon/footprints/altaria_footprint.png | Bin 0 -> 100 bytes graphics/pokemon/footprints/ampharos_footprint.png | Bin 0 -> 90 bytes graphics/pokemon/footprints/anorith_footprint.png | Bin 0 -> 71 bytes graphics/pokemon/footprints/arbok_footprint.png | Bin 0 -> 71 bytes graphics/pokemon/footprints/arcanine_footprint.png | Bin 0 -> 99 bytes graphics/pokemon/footprints/ariados_footprint.png | Bin 0 -> 86 bytes graphics/pokemon/footprints/armaldo_footprint.png | Bin 0 -> 95 bytes graphics/pokemon/footprints/aron_footprint.png | Bin 0 -> 90 bytes graphics/pokemon/footprints/articuno_footprint.png | Bin 0 -> 106 bytes .../pokemon/footprints/azumarill_footprint.png | Bin 0 -> 88 bytes graphics/pokemon/footprints/azurill_footprint.png | Bin 0 -> 84 bytes graphics/pokemon/footprints/bagon_footprint.png | Bin 0 -> 91 bytes graphics/pokemon/footprints/baltoy_footprint.png | Bin 0 -> 76 bytes graphics/pokemon/footprints/banette_footprint.png | Bin 0 -> 85 bytes graphics/pokemon/footprints/barboach_footprint.png | Bin 0 -> 71 bytes graphics/pokemon/footprints/bayleef_footprint.png | Bin 0 -> 87 bytes .../pokemon/footprints/beautifly_footprint.png | Bin 0 -> 89 bytes graphics/pokemon/footprints/beedrill_footprint.png | Bin 0 -> 84 bytes graphics/pokemon/footprints/beldum_footprint.png | Bin 0 -> 82 bytes .../pokemon/footprints/bellossom_footprint.png | Bin 0 -> 71 bytes .../pokemon/footprints/bellsprout_footprint.png | Bin 0 -> 109 bytes .../pokemon/footprints/blastoise_footprint.png | Bin 0 -> 98 bytes graphics/pokemon/footprints/blaziken_footprint.png | Bin 0 -> 116 bytes graphics/pokemon/footprints/blissey_footprint.png | Bin 0 -> 96 bytes graphics/pokemon/footprints/breloom_footprint.png | Bin 0 -> 94 bytes .../pokemon/footprints/bulbasaur_footprint.png | Bin 0 -> 88 bytes .../pokemon/footprints/butterfree_footprint.png | Bin 0 -> 87 bytes graphics/pokemon/footprints/cacnea_footprint.png | Bin 0 -> 81 bytes graphics/pokemon/footprints/cacturne_footprint.png | Bin 0 -> 87 bytes graphics/pokemon/footprints/camerupt_footprint.png | Bin 0 -> 109 bytes graphics/pokemon/footprints/carvanha_footprint.png | Bin 0 -> 71 bytes graphics/pokemon/footprints/cascoon_footprint.png | Bin 0 -> 71 bytes graphics/pokemon/footprints/castform_footprint.png | Bin 0 -> 71 bytes graphics/pokemon/footprints/caterpie_footprint.png | Bin 0 -> 81 bytes graphics/pokemon/footprints/celebi_footprint.png | Bin 0 -> 88 bytes graphics/pokemon/footprints/chansey_footprint.png | Bin 0 -> 88 bytes .../pokemon/footprints/charizard_footprint.png | Bin 0 -> 95 bytes .../pokemon/footprints/charmander_footprint.png | Bin 0 -> 90 bytes .../pokemon/footprints/charmeleon_footprint.png | Bin 0 -> 95 bytes .../pokemon/footprints/chikorita_footprint.png | Bin 0 -> 81 bytes graphics/pokemon/footprints/chimecho_footprint.png | Bin 0 -> 71 bytes graphics/pokemon/footprints/chinchou_footprint.png | Bin 0 -> 71 bytes graphics/pokemon/footprints/clamperl_footprint.png | Bin 0 -> 71 bytes graphics/pokemon/footprints/claydol_footprint.png | Bin 0 -> 80 bytes graphics/pokemon/footprints/clefable_footprint.png | Bin 0 -> 101 bytes graphics/pokemon/footprints/clefairy_footprint.png | Bin 0 -> 85 bytes graphics/pokemon/footprints/cleffa_footprint.png | Bin 0 -> 79 bytes graphics/pokemon/footprints/cloyster_footprint.png | Bin 0 -> 71 bytes .../pokemon/footprints/combusken_footprint.png | Bin 0 -> 109 bytes graphics/pokemon/footprints/corphish_footprint.png | Bin 0 -> 102 bytes graphics/pokemon/footprints/corsola_footprint.png | Bin 0 -> 81 bytes graphics/pokemon/footprints/cradily_footprint.png | Bin 0 -> 98 bytes .../pokemon/footprints/crawdaunt_footprint.png | Bin 0 -> 104 bytes graphics/pokemon/footprints/crobat_footprint.png | Bin 0 -> 71 bytes graphics/pokemon/footprints/croconaw_footprint.png | Bin 0 -> 85 bytes graphics/pokemon/footprints/cubone_footprint.png | Bin 0 -> 87 bytes .../pokemon/footprints/cyndaquil_footprint.png | Bin 0 -> 84 bytes graphics/pokemon/footprints/delcatty_footprint.png | Bin 0 -> 107 bytes graphics/pokemon/footprints/delibird_footprint.png | Bin 0 -> 90 bytes graphics/pokemon/footprints/deoxys_footprint.png | Bin 0 -> 84 bytes graphics/pokemon/footprints/dewgong_footprint.png | Bin 0 -> 71 bytes graphics/pokemon/footprints/diglett_footprint.png | Bin 0 -> 71 bytes graphics/pokemon/footprints/ditto_footprint.png | Bin 0 -> 71 bytes graphics/pokemon/footprints/dodrio_footprint.png | Bin 0 -> 110 bytes graphics/pokemon/footprints/doduo_footprint.png | Bin 0 -> 101 bytes graphics/pokemon/footprints/donphan_footprint.png | Bin 0 -> 96 bytes .../pokemon/footprints/dragonair_footprint.png | Bin 0 -> 71 bytes .../pokemon/footprints/dragonite_footprint.png | Bin 0 -> 92 bytes graphics/pokemon/footprints/dratini_footprint.png | Bin 0 -> 71 bytes graphics/pokemon/footprints/drowzee_footprint.png | Bin 0 -> 87 bytes graphics/pokemon/footprints/dugtrio_footprint.png | Bin 0 -> 71 bytes .../pokemon/footprints/dunsparce_footprint.png | Bin 0 -> 71 bytes graphics/pokemon/footprints/dusclops_footprint.png | Bin 0 -> 106 bytes graphics/pokemon/footprints/duskull_footprint.png | Bin 0 -> 71 bytes graphics/pokemon/footprints/dustox_footprint.png | Bin 0 -> 92 bytes graphics/pokemon/footprints/eevee_footprint.png | Bin 0 -> 96 bytes graphics/pokemon/footprints/ekans_footprint.png | Bin 0 -> 71 bytes .../pokemon/footprints/electabuzz_footprint.png | Bin 0 -> 93 bytes .../pokemon/footprints/electrike_footprint.png | Bin 0 -> 101 bytes .../pokemon/footprints/electrode_footprint.png | Bin 0 -> 71 bytes graphics/pokemon/footprints/elekid_footprint.png | Bin 0 -> 89 bytes graphics/pokemon/footprints/entei_footprint.png | Bin 0 -> 101 bytes graphics/pokemon/footprints/espeon_footprint.png | Bin 0 -> 85 bytes .../pokemon/footprints/exeggcute_footprint.png | Bin 0 -> 71 bytes .../pokemon/footprints/exeggutor_footprint.png | Bin 0 -> 92 bytes graphics/pokemon/footprints/exploud_footprint.png | Bin 0 -> 108 bytes .../pokemon/footprints/farfetch_d_footprint.png | Bin 0 -> 99 bytes graphics/pokemon/footprints/fearow_footprint.png | Bin 0 -> 102 bytes graphics/pokemon/footprints/feebas_footprint.png | Bin 0 -> 71 bytes .../pokemon/footprints/feraligatr_footprint.png | Bin 0 -> 94 bytes graphics/pokemon/footprints/flaaffy_footprint.png | Bin 0 -> 81 bytes graphics/pokemon/footprints/flareon_footprint.png | Bin 0 -> 103 bytes graphics/pokemon/footprints/flygon_footprint.png | Bin 0 -> 92 bytes .../pokemon/footprints/forretress_footprint.png | Bin 0 -> 71 bytes graphics/pokemon/footprints/furret_footprint.png | Bin 0 -> 87 bytes .../pokemon/footprints/gardevoir_footprint.png | Bin 0 -> 86 bytes graphics/pokemon/footprints/gastly_footprint.png | Bin 0 -> 71 bytes graphics/pokemon/footprints/gengar_footprint.png | Bin 0 -> 91 bytes graphics/pokemon/footprints/geodude_footprint.png | Bin 0 -> 71 bytes .../pokemon/footprints/girafarig_footprint.png | Bin 0 -> 83 bytes graphics/pokemon/footprints/glalie_footprint.png | Bin 0 -> 71 bytes graphics/pokemon/footprints/gligar_footprint.png | Bin 0 -> 92 bytes graphics/pokemon/footprints/gloom_footprint.png | Bin 0 -> 90 bytes graphics/pokemon/footprints/golbat_footprint.png | Bin 0 -> 94 bytes graphics/pokemon/footprints/goldeen_footprint.png | Bin 0 -> 71 bytes graphics/pokemon/footprints/golduck_footprint.png | Bin 0 -> 98 bytes graphics/pokemon/footprints/golem_footprint.png | Bin 0 -> 97 bytes graphics/pokemon/footprints/gorebyss_footprint.png | Bin 0 -> 71 bytes graphics/pokemon/footprints/granbull_footprint.png | Bin 0 -> 93 bytes graphics/pokemon/footprints/graveler_footprint.png | Bin 0 -> 91 bytes graphics/pokemon/footprints/grimer_footprint.png | Bin 0 -> 71 bytes graphics/pokemon/footprints/groudon_footprint.png | Bin 0 -> 103 bytes graphics/pokemon/footprints/grovyle_footprint.png | Bin 0 -> 100 bytes .../pokemon/footprints/growlithe_footprint.png | Bin 0 -> 91 bytes graphics/pokemon/footprints/grumpig_footprint.png | Bin 0 -> 96 bytes graphics/pokemon/footprints/gulpin_footprint.png | Bin 0 -> 71 bytes graphics/pokemon/footprints/gyarados_footprint.png | Bin 0 -> 71 bytes graphics/pokemon/footprints/hariyama_footprint.png | Bin 0 -> 94 bytes graphics/pokemon/footprints/haunter_footprint.png | Bin 0 -> 71 bytes .../pokemon/footprints/heracross_footprint.png | Bin 0 -> 92 bytes .../pokemon/footprints/hitmonchan_footprint.png | Bin 0 -> 90 bytes .../pokemon/footprints/hitmonlee_footprint.png | Bin 0 -> 104 bytes .../pokemon/footprints/hitmontop_footprint.png | Bin 0 -> 103 bytes graphics/pokemon/footprints/ho_oh_footprint.png | Bin 0 -> 95 bytes graphics/pokemon/footprints/hoothoot_footprint.png | Bin 0 -> 102 bytes graphics/pokemon/footprints/hoppip_footprint.png | Bin 0 -> 84 bytes graphics/pokemon/footprints/horsea_footprint.png | Bin 0 -> 71 bytes graphics/pokemon/footprints/houndoom_footprint.png | Bin 0 -> 103 bytes graphics/pokemon/footprints/houndour_footprint.png | Bin 0 -> 91 bytes graphics/pokemon/footprints/huntail_footprint.png | Bin 0 -> 71 bytes graphics/pokemon/footprints/hypno_footprint.png | Bin 0 -> 95 bytes .../pokemon/footprints/igglybuff_footprint.png | Bin 0 -> 85 bytes graphics/pokemon/footprints/illumise_footprint.png | Bin 0 -> 84 bytes graphics/pokemon/footprints/ivysaur_footprint.png | Bin 0 -> 96 bytes .../pokemon/footprints/jigglypuff_footprint.png | Bin 0 -> 85 bytes graphics/pokemon/footprints/jirachi_footprint.png | Bin 0 -> 83 bytes graphics/pokemon/footprints/jolteon_footprint.png | Bin 0 -> 91 bytes graphics/pokemon/footprints/jumpluff_footprint.png | Bin 0 -> 84 bytes graphics/pokemon/footprints/jynx_footprint.png | Bin 0 -> 71 bytes graphics/pokemon/footprints/kabuto_footprint.png | Bin 0 -> 76 bytes graphics/pokemon/footprints/kabutops_footprint.png | Bin 0 -> 94 bytes graphics/pokemon/footprints/kadabra_footprint.png | Bin 0 -> 100 bytes graphics/pokemon/footprints/kakuna_footprint.png | Bin 0 -> 71 bytes .../pokemon/footprints/kangaskhan_footprint.png | Bin 0 -> 96 bytes graphics/pokemon/footprints/kecleon_footprint.png | Bin 0 -> 96 bytes graphics/pokemon/footprints/kingdra_footprint.png | Bin 0 -> 71 bytes graphics/pokemon/footprints/kingler_footprint.png | Bin 0 -> 93 bytes graphics/pokemon/footprints/kirlia_footprint.png | Bin 0 -> 81 bytes graphics/pokemon/footprints/koffing_footprint.png | Bin 0 -> 71 bytes graphics/pokemon/footprints/krabby_footprint.png | Bin 0 -> 86 bytes graphics/pokemon/footprints/kyogre_footprint.png | Bin 0 -> 104 bytes graphics/pokemon/footprints/lairon_footprint.png | Bin 0 -> 101 bytes graphics/pokemon/footprints/lanturn_footprint.png | Bin 0 -> 71 bytes graphics/pokemon/footprints/lapras_footprint.png | Bin 0 -> 71 bytes graphics/pokemon/footprints/larvitar_footprint.png | Bin 0 -> 82 bytes graphics/pokemon/footprints/latias_footprint.png | Bin 0 -> 104 bytes graphics/pokemon/footprints/latios_footprint.png | Bin 0 -> 105 bytes graphics/pokemon/footprints/ledian_footprint.png | Bin 0 -> 94 bytes graphics/pokemon/footprints/ledyba_footprint.png | Bin 0 -> 99 bytes .../pokemon/footprints/lickitung_footprint.png | Bin 0 -> 102 bytes graphics/pokemon/footprints/lileep_footprint.png | Bin 0 -> 99 bytes graphics/pokemon/footprints/linoone_footprint.png | Bin 0 -> 90 bytes graphics/pokemon/footprints/lombre_footprint.png | Bin 0 -> 110 bytes graphics/pokemon/footprints/lotad_footprint.png | Bin 0 -> 88 bytes graphics/pokemon/footprints/loudred_footprint.png | Bin 0 -> 105 bytes graphics/pokemon/footprints/ludicolo_footprint.png | Bin 0 -> 94 bytes graphics/pokemon/footprints/lugia_footprint.png | Bin 0 -> 95 bytes graphics/pokemon/footprints/lunatone_footprint.png | Bin 0 -> 71 bytes graphics/pokemon/footprints/luvdisc_footprint.png | Bin 0 -> 71 bytes graphics/pokemon/footprints/machamp_footprint.png | Bin 0 -> 98 bytes graphics/pokemon/footprints/machoke_footprint.png | Bin 0 -> 97 bytes graphics/pokemon/footprints/machop_footprint.png | Bin 0 -> 90 bytes graphics/pokemon/footprints/magby_footprint.png | Bin 0 -> 88 bytes graphics/pokemon/footprints/magcargo_footprint.png | Bin 0 -> 71 bytes graphics/pokemon/footprints/magikarp_footprint.png | Bin 0 -> 71 bytes graphics/pokemon/footprints/magmar_footprint.png | Bin 0 -> 94 bytes .../pokemon/footprints/magnemite_footprint.png | Bin 0 -> 83 bytes graphics/pokemon/footprints/magneton_footprint.png | Bin 0 -> 90 bytes graphics/pokemon/footprints/makuhita_footprint.png | Bin 0 -> 97 bytes .../pokemon/footprints/manectric_footprint.png | Bin 0 -> 100 bytes graphics/pokemon/footprints/mankey_footprint.png | Bin 0 -> 110 bytes graphics/pokemon/footprints/mantine_footprint.png | Bin 0 -> 71 bytes graphics/pokemon/footprints/mareep_footprint.png | Bin 0 -> 84 bytes graphics/pokemon/footprints/marill_footprint.png | Bin 0 -> 85 bytes graphics/pokemon/footprints/marowak_footprint.png | Bin 0 -> 86 bytes .../pokemon/footprints/marshtomp_footprint.png | Bin 0 -> 90 bytes .../pokemon/footprints/masquerain_footprint.png | Bin 0 -> 71 bytes graphics/pokemon/footprints/mawile_footprint.png | Bin 0 -> 102 bytes graphics/pokemon/footprints/medicham_footprint.png | Bin 0 -> 92 bytes graphics/pokemon/footprints/meditite_footprint.png | Bin 0 -> 89 bytes graphics/pokemon/footprints/meganium_footprint.png | Bin 0 -> 97 bytes graphics/pokemon/footprints/meowth_footprint.png | Bin 0 -> 94 bytes .../pokemon/footprints/metagross_footprint.png | Bin 0 -> 91 bytes graphics/pokemon/footprints/metang_footprint.png | Bin 0 -> 92 bytes graphics/pokemon/footprints/metapod_footprint.png | Bin 0 -> 71 bytes graphics/pokemon/footprints/mew_footprint.png | Bin 0 -> 88 bytes graphics/pokemon/footprints/mewtwo_footprint.png | Bin 0 -> 100 bytes .../pokemon/footprints/mightyena_footprint.png | Bin 0 -> 113 bytes graphics/pokemon/footprints/milotic_footprint.png | Bin 0 -> 71 bytes graphics/pokemon/footprints/miltank_footprint.png | Bin 0 -> 86 bytes graphics/pokemon/footprints/minun_footprint.png | Bin 0 -> 86 bytes .../pokemon/footprints/misdreavus_footprint.png | Bin 0 -> 71 bytes graphics/pokemon/footprints/moltres_footprint.png | Bin 0 -> 101 bytes graphics/pokemon/footprints/mr_mime_footprint.png | Bin 0 -> 89 bytes graphics/pokemon/footprints/mudkip_footprint.png | Bin 0 -> 90 bytes graphics/pokemon/footprints/muk_footprint.png | Bin 0 -> 71 bytes graphics/pokemon/footprints/murkrow_footprint.png | Bin 0 -> 94 bytes graphics/pokemon/footprints/natu_footprint.png | Bin 0 -> 84 bytes graphics/pokemon/footprints/nidoking_footprint.png | Bin 0 -> 94 bytes .../pokemon/footprints/nidoqueen_footprint.png | Bin 0 -> 98 bytes .../pokemon/footprints/nidoran_f_footprint.png | Bin 0 -> 87 bytes .../pokemon/footprints/nidoran_m_footprint.png | Bin 0 -> 89 bytes graphics/pokemon/footprints/nidorina_footprint.png | Bin 0 -> 94 bytes graphics/pokemon/footprints/nidorino_footprint.png | Bin 0 -> 100 bytes graphics/pokemon/footprints/nincada_footprint.png | Bin 0 -> 92 bytes .../pokemon/footprints/ninetales_footprint.png | Bin 0 -> 96 bytes graphics/pokemon/footprints/ninjask_footprint.png | Bin 0 -> 91 bytes graphics/pokemon/footprints/noctowl_footprint.png | Bin 0 -> 101 bytes graphics/pokemon/footprints/nosepass_footprint.png | Bin 0 -> 96 bytes graphics/pokemon/footprints/numel_footprint.png | Bin 0 -> 87 bytes graphics/pokemon/footprints/nuzleaf_footprint.png | Bin 0 -> 101 bytes .../pokemon/footprints/octillery_footprint.png | Bin 0 -> 101 bytes graphics/pokemon/footprints/oddish_footprint.png | Bin 0 -> 81 bytes graphics/pokemon/footprints/omanyte_footprint.png | Bin 0 -> 80 bytes graphics/pokemon/footprints/omastar_footprint.png | Bin 0 -> 85 bytes graphics/pokemon/footprints/onix_footprint.png | Bin 0 -> 71 bytes graphics/pokemon/footprints/paras_footprint.png | Bin 0 -> 83 bytes graphics/pokemon/footprints/parasect_footprint.png | Bin 0 -> 85 bytes graphics/pokemon/footprints/pelipper_footprint.png | Bin 0 -> 102 bytes graphics/pokemon/footprints/persian_footprint.png | Bin 0 -> 98 bytes graphics/pokemon/footprints/phanpy_footprint.png | Bin 0 -> 85 bytes graphics/pokemon/footprints/pichu_footprint.png | Bin 0 -> 85 bytes graphics/pokemon/footprints/pidgeot_footprint.png | Bin 0 -> 100 bytes .../pokemon/footprints/pidgeotto_footprint.png | Bin 0 -> 93 bytes graphics/pokemon/footprints/pidgey_footprint.png | Bin 0 -> 94 bytes graphics/pokemon/footprints/pikachu_footprint.png | Bin 0 -> 84 bytes .../pokemon/footprints/piloswine_footprint.png | Bin 0 -> 94 bytes graphics/pokemon/footprints/pineco_footprint.png | Bin 0 -> 71 bytes graphics/pokemon/footprints/pinsir_footprint.png | Bin 0 -> 93 bytes graphics/pokemon/footprints/plusle_footprint.png | Bin 0 -> 86 bytes graphics/pokemon/footprints/politoed_footprint.png | Bin 0 -> 95 bytes graphics/pokemon/footprints/poliwag_footprint.png | Bin 0 -> 86 bytes .../pokemon/footprints/poliwhirl_footprint.png | Bin 0 -> 90 bytes .../pokemon/footprints/poliwrath_footprint.png | Bin 0 -> 92 bytes graphics/pokemon/footprints/ponyta_footprint.png | Bin 0 -> 90 bytes .../pokemon/footprints/poochyena_footprint.png | Bin 0 -> 107 bytes graphics/pokemon/footprints/porygon2_footprint.png | Bin 0 -> 87 bytes graphics/pokemon/footprints/porygon_footprint.png | Bin 0 -> 88 bytes graphics/pokemon/footprints/primeape_footprint.png | Bin 0 -> 99 bytes graphics/pokemon/footprints/psyduck_footprint.png | Bin 0 -> 95 bytes graphics/pokemon/footprints/pupitar_footprint.png | Bin 0 -> 71 bytes graphics/pokemon/footprints/quagsire_footprint.png | Bin 0 -> 88 bytes .../pokemon/footprints/question_mark_footprint.png | Bin 0 -> 110 bytes graphics/pokemon/footprints/quilava_footprint.png | Bin 0 -> 85 bytes graphics/pokemon/footprints/qwilfish_footprint.png | Bin 0 -> 71 bytes graphics/pokemon/footprints/raichu_footprint.png | Bin 0 -> 87 bytes graphics/pokemon/footprints/raikou_footprint.png | Bin 0 -> 95 bytes graphics/pokemon/footprints/ralts_footprint.png | Bin 0 -> 76 bytes graphics/pokemon/footprints/rapidash_footprint.png | Bin 0 -> 94 bytes graphics/pokemon/footprints/raticate_footprint.png | Bin 0 -> 95 bytes graphics/pokemon/footprints/rattata_footprint.png | Bin 0 -> 88 bytes graphics/pokemon/footprints/rayquaza_footprint.png | Bin 0 -> 71 bytes graphics/pokemon/footprints/regice_footprint.png | Bin 0 -> 76 bytes graphics/pokemon/footprints/regirock_footprint.png | Bin 0 -> 100 bytes .../pokemon/footprints/registeel_footprint.png | Bin 0 -> 105 bytes .../pokemon/footprints/relicanth_footprint.png | Bin 0 -> 71 bytes graphics/pokemon/footprints/remoraid_footprint.png | Bin 0 -> 71 bytes graphics/pokemon/footprints/rhydon_footprint.png | Bin 0 -> 97 bytes graphics/pokemon/footprints/rhyhorn_footprint.png | Bin 0 -> 85 bytes graphics/pokemon/footprints/roselia_footprint.png | Bin 0 -> 82 bytes graphics/pokemon/footprints/sableye_footprint.png | Bin 0 -> 84 bytes .../pokemon/footprints/salamence_footprint.png | Bin 0 -> 102 bytes .../pokemon/footprints/sandshrew_footprint.png | Bin 0 -> 91 bytes .../pokemon/footprints/sandslash_footprint.png | Bin 0 -> 90 bytes graphics/pokemon/footprints/sceptile_footprint.png | Bin 0 -> 99 bytes graphics/pokemon/footprints/scizor_footprint.png | Bin 0 -> 87 bytes graphics/pokemon/footprints/scyther_footprint.png | Bin 0 -> 99 bytes graphics/pokemon/footprints/seadra_footprint.png | Bin 0 -> 71 bytes graphics/pokemon/footprints/seaking_footprint.png | Bin 0 -> 71 bytes graphics/pokemon/footprints/sealeo_footprint.png | Bin 0 -> 71 bytes graphics/pokemon/footprints/seedot_footprint.png | Bin 0 -> 90 bytes graphics/pokemon/footprints/seel_footprint.png | Bin 0 -> 71 bytes graphics/pokemon/footprints/sentret_footprint.png | Bin 0 -> 85 bytes graphics/pokemon/footprints/seviper_footprint.png | Bin 0 -> 71 bytes graphics/pokemon/footprints/sharpedo_footprint.png | Bin 0 -> 71 bytes graphics/pokemon/footprints/shedinja_footprint.png | Bin 0 -> 92 bytes graphics/pokemon/footprints/shelgon_footprint.png | Bin 0 -> 88 bytes graphics/pokemon/footprints/shellder_footprint.png | Bin 0 -> 71 bytes graphics/pokemon/footprints/shiftry_footprint.png | Bin 0 -> 76 bytes .../pokemon/footprints/shroomish_footprint.png | Bin 0 -> 89 bytes graphics/pokemon/footprints/shuckle_footprint.png | Bin 0 -> 86 bytes graphics/pokemon/footprints/shuppet_footprint.png | Bin 0 -> 71 bytes graphics/pokemon/footprints/silcoon_footprint.png | Bin 0 -> 71 bytes graphics/pokemon/footprints/skarmory_footprint.png | Bin 0 -> 101 bytes graphics/pokemon/footprints/skiploom_footprint.png | Bin 0 -> 87 bytes graphics/pokemon/footprints/skitty_footprint.png | Bin 0 -> 106 bytes graphics/pokemon/footprints/slaking_footprint.png | Bin 0 -> 114 bytes graphics/pokemon/footprints/slakoth_footprint.png | Bin 0 -> 97 bytes graphics/pokemon/footprints/slowbro_footprint.png | Bin 0 -> 90 bytes graphics/pokemon/footprints/slowking_footprint.png | Bin 0 -> 84 bytes graphics/pokemon/footprints/slowpoke_footprint.png | Bin 0 -> 85 bytes graphics/pokemon/footprints/slugma_footprint.png | Bin 0 -> 71 bytes graphics/pokemon/footprints/smeargle_footprint.png | Bin 0 -> 94 bytes graphics/pokemon/footprints/smoochum_footprint.png | Bin 0 -> 83 bytes graphics/pokemon/footprints/sneasel_footprint.png | Bin 0 -> 93 bytes graphics/pokemon/footprints/snorlax_footprint.png | Bin 0 -> 102 bytes graphics/pokemon/footprints/snorunt_footprint.png | Bin 0 -> 91 bytes graphics/pokemon/footprints/snubbull_footprint.png | Bin 0 -> 89 bytes graphics/pokemon/footprints/solrock_footprint.png | Bin 0 -> 71 bytes graphics/pokemon/footprints/spearow_footprint.png | Bin 0 -> 94 bytes graphics/pokemon/footprints/spheal_footprint.png | Bin 0 -> 71 bytes graphics/pokemon/footprints/spinarak_footprint.png | Bin 0 -> 76 bytes graphics/pokemon/footprints/spinda_footprint.png | Bin 0 -> 94 bytes graphics/pokemon/footprints/spoink_footprint.png | Bin 0 -> 71 bytes graphics/pokemon/footprints/squirtle_footprint.png | Bin 0 -> 89 bytes graphics/pokemon/footprints/stantler_footprint.png | Bin 0 -> 86 bytes graphics/pokemon/footprints/starmie_footprint.png | Bin 0 -> 81 bytes graphics/pokemon/footprints/staryu_footprint.png | Bin 0 -> 81 bytes graphics/pokemon/footprints/steelix_footprint.png | Bin 0 -> 71 bytes .../pokemon/footprints/sudowoodo_footprint.png | Bin 0 -> 87 bytes graphics/pokemon/footprints/suicune_footprint.png | Bin 0 -> 84 bytes graphics/pokemon/footprints/sunflora_footprint.png | Bin 0 -> 89 bytes graphics/pokemon/footprints/sunkern_footprint.png | Bin 0 -> 71 bytes graphics/pokemon/footprints/surskit_footprint.png | Bin 0 -> 87 bytes graphics/pokemon/footprints/swablu_footprint.png | Bin 0 -> 82 bytes graphics/pokemon/footprints/swalot_footprint.png | Bin 0 -> 71 bytes graphics/pokemon/footprints/swampert_footprint.png | Bin 0 -> 103 bytes graphics/pokemon/footprints/swellow_footprint.png | Bin 0 -> 107 bytes graphics/pokemon/footprints/swinub_footprint.png | Bin 0 -> 81 bytes graphics/pokemon/footprints/taillow_footprint.png | Bin 0 -> 97 bytes graphics/pokemon/footprints/tangela_footprint.png | Bin 0 -> 97 bytes graphics/pokemon/footprints/tauros_footprint.png | Bin 0 -> 91 bytes .../pokemon/footprints/teddiursa_footprint.png | Bin 0 -> 91 bytes .../pokemon/footprints/tentacool_footprint.png | Bin 0 -> 71 bytes .../pokemon/footprints/tentacruel_footprint.png | Bin 0 -> 71 bytes graphics/pokemon/footprints/togepi_footprint.png | Bin 0 -> 90 bytes graphics/pokemon/footprints/togetic_footprint.png | Bin 0 -> 90 bytes graphics/pokemon/footprints/torchic_footprint.png | Bin 0 -> 103 bytes graphics/pokemon/footprints/torkoal_footprint.png | Bin 0 -> 104 bytes graphics/pokemon/footprints/totodile_footprint.png | Bin 0 -> 88 bytes graphics/pokemon/footprints/trapinch_footprint.png | Bin 0 -> 95 bytes graphics/pokemon/footprints/treecko_footprint.png | Bin 0 -> 96 bytes graphics/pokemon/footprints/tropius_footprint.png | Bin 0 -> 109 bytes .../pokemon/footprints/typhlosion_footprint.png | Bin 0 -> 88 bytes .../pokemon/footprints/tyranitar_footprint.png | Bin 0 -> 97 bytes graphics/pokemon/footprints/tyrogue_footprint.png | Bin 0 -> 81 bytes graphics/pokemon/footprints/umbreon_footprint.png | Bin 0 -> 81 bytes graphics/pokemon/footprints/unown_footprint.png | Bin 0 -> 71 bytes graphics/pokemon/footprints/ursaring_footprint.png | Bin 0 -> 99 bytes graphics/pokemon/footprints/vaporeon_footprint.png | Bin 0 -> 94 bytes graphics/pokemon/footprints/venomoth_footprint.png | Bin 0 -> 76 bytes graphics/pokemon/footprints/venonat_footprint.png | Bin 0 -> 89 bytes graphics/pokemon/footprints/venusaur_footprint.png | Bin 0 -> 96 bytes graphics/pokemon/footprints/vibrava_footprint.png | Bin 0 -> 86 bytes .../pokemon/footprints/victreebel_footprint.png | Bin 0 -> 71 bytes graphics/pokemon/footprints/vigoroth_footprint.png | Bin 0 -> 110 bytes .../pokemon/footprints/vileplume_footprint.png | Bin 0 -> 89 bytes graphics/pokemon/footprints/volbeat_footprint.png | Bin 0 -> 84 bytes graphics/pokemon/footprints/voltorb_footprint.png | Bin 0 -> 71 bytes graphics/pokemon/footprints/vulpix_footprint.png | Bin 0 -> 95 bytes graphics/pokemon/footprints/wailmer_footprint.png | Bin 0 -> 71 bytes graphics/pokemon/footprints/wailord_footprint.png | Bin 0 -> 71 bytes graphics/pokemon/footprints/walrein_footprint.png | Bin 0 -> 71 bytes .../pokemon/footprints/wartortle_footprint.png | Bin 0 -> 93 bytes graphics/pokemon/footprints/weedle_footprint.png | Bin 0 -> 81 bytes .../pokemon/footprints/weepinbell_footprint.png | Bin 0 -> 71 bytes graphics/pokemon/footprints/weezing_footprint.png | Bin 0 -> 71 bytes graphics/pokemon/footprints/whiscash_footprint.png | Bin 0 -> 71 bytes graphics/pokemon/footprints/whismur_footprint.png | Bin 0 -> 114 bytes .../pokemon/footprints/wigglytuff_footprint.png | Bin 0 -> 89 bytes graphics/pokemon/footprints/wingull_footprint.png | Bin 0 -> 92 bytes .../pokemon/footprints/wobbuffet_footprint.png | Bin 0 -> 81 bytes graphics/pokemon/footprints/wooper_footprint.png | Bin 0 -> 81 bytes graphics/pokemon/footprints/wurmple_footprint.png | Bin 0 -> 81 bytes graphics/pokemon/footprints/wynaut_footprint.png | Bin 0 -> 88 bytes graphics/pokemon/footprints/xatu_footprint.png | Bin 0 -> 88 bytes graphics/pokemon/footprints/yanma_footprint.png | Bin 0 -> 84 bytes graphics/pokemon/footprints/zangoose_footprint.png | Bin 0 -> 103 bytes graphics/pokemon/footprints/zapdos_footprint.png | Bin 0 -> 104 bytes .../pokemon/footprints/zigzagoon_footprint.png | Bin 0 -> 100 bytes graphics/pokemon/footprints/zubat_footprint.png | Bin 0 -> 71 bytes .../pokemon/front_pics/abra_still_front_pic.png | Bin 0 -> 575 bytes .../pokemon/front_pics/absol_still_front_pic.png | Bin 0 -> 890 bytes .../front_pics/aerodactyl_still_front_pic.png | Bin 0 -> 917 bytes .../pokemon/front_pics/aggron_still_front_pic.png | Bin 0 -> 1158 bytes .../pokemon/front_pics/aipom_still_front_pic.png | Bin 0 -> 639 bytes .../front_pics/alakazam_still_front_pic.png | Bin 0 -> 1015 bytes .../pokemon/front_pics/altaria_still_front_pic.png | Bin 0 -> 825 bytes .../front_pics/ampharos_still_front_pic.png | Bin 0 -> 721 bytes .../pokemon/front_pics/anorith_still_front_pic.png | Bin 0 -> 691 bytes .../pokemon/front_pics/arbok_still_front_pic.png | Bin 0 -> 899 bytes .../front_pics/arcanine_still_front_pic.png | Bin 0 -> 1061 bytes .../pokemon/front_pics/ariados_still_front_pic.png | Bin 0 -> 850 bytes .../pokemon/front_pics/armaldo_still_front_pic.png | Bin 0 -> 1165 bytes .../pokemon/front_pics/aron_still_front_pic.png | Bin 0 -> 384 bytes .../front_pics/articuno_still_front_pic.png | Bin 0 -> 1072 bytes .../front_pics/azumarill_still_front_pic.png | Bin 0 -> 631 bytes .../pokemon/front_pics/azurill_still_front_pic.png | Bin 0 -> 589 bytes .../pokemon/front_pics/bagon_still_front_pic.png | Bin 0 -> 512 bytes .../pokemon/front_pics/baltoy_still_front_pic.png | Bin 0 -> 416 bytes .../pokemon/front_pics/banette_still_front_pic.png | Bin 0 -> 546 bytes .../front_pics/barboach_still_front_pic.png | Bin 0 -> 565 bytes .../pokemon/front_pics/bayleef_still_front_pic.png | Bin 0 -> 815 bytes .../front_pics/beautifly_still_front_pic.png | Bin 0 -> 699 bytes .../front_pics/beedrill_still_front_pic.png | Bin 0 -> 913 bytes .../pokemon/front_pics/beldum_still_front_pic.png | Bin 0 -> 465 bytes .../front_pics/bellossom_still_front_pic.png | Bin 0 -> 520 bytes .../front_pics/bellsprout_still_front_pic.png | Bin 0 -> 547 bytes .../front_pics/blastoise_still_front_pic.png | Bin 0 -> 1076 bytes .../front_pics/blaziken_still_front_pic.png | Bin 0 -> 1010 bytes .../pokemon/front_pics/blissey_still_front_pic.png | Bin 0 -> 827 bytes .../pokemon/front_pics/breloom_still_front_pic.png | Bin 0 -> 849 bytes .../front_pics/bulbasaur_still_front_pic.png | Bin 0 -> 558 bytes .../front_pics/butterfree_still_front_pic.png | Bin 0 -> 748 bytes .../pokemon/front_pics/cacnea_still_front_pic.png | Bin 0 -> 662 bytes .../front_pics/cacturne_still_front_pic.png | Bin 0 -> 917 bytes .../front_pics/camerupt_still_front_pic.png | Bin 0 -> 839 bytes .../front_pics/carvanha_still_front_pic.png | Bin 0 -> 692 bytes .../pokemon/front_pics/cascoon_still_front_pic.png | Bin 0 -> 493 bytes .../castform_normal_form_still_front_pic.png | Bin 0 -> 382 bytes .../castform_rainy_form_still_front_pic.png | Bin 0 -> 549 bytes .../castform_snowy_form_still_front_pic.png | Bin 0 -> 688 bytes .../castform_sunny_form_still_front_pic.png | Bin 0 -> 656 bytes .../front_pics/caterpie_still_front_pic.png | Bin 0 -> 501 bytes .../pokemon/front_pics/celebi_still_front_pic.png | Bin 0 -> 514 bytes .../pokemon/front_pics/chansey_still_front_pic.png | Bin 0 -> 669 bytes .../front_pics/charizard_still_front_pic.png | Bin 0 -> 1090 bytes .../front_pics/charmander_still_front_pic.png | Bin 0 -> 566 bytes .../front_pics/charmeleon_still_front_pic.png | Bin 0 -> 781 bytes .../front_pics/chikorita_still_front_pic.png | Bin 0 -> 507 bytes .../front_pics/chimecho_still_front_pic.png | Bin 0 -> 458 bytes .../front_pics/chinchou_still_front_pic.png | Bin 0 -> 607 bytes .../circled_question_mark_still_front_pic.png | Bin 0 -> 397 bytes .../front_pics/clamperl_still_front_pic.png | Bin 0 -> 611 bytes .../pokemon/front_pics/claydol_still_front_pic.png | Bin 0 -> 771 bytes .../front_pics/clefable_still_front_pic.png | Bin 0 -> 674 bytes .../front_pics/clefairy_still_front_pic.png | Bin 0 -> 540 bytes .../pokemon/front_pics/cleffa_still_front_pic.png | Bin 0 -> 381 bytes .../front_pics/cloyster_still_front_pic.png | Bin 0 -> 875 bytes .../front_pics/combusken_still_front_pic.png | Bin 0 -> 838 bytes .../front_pics/corphish_still_front_pic.png | Bin 0 -> 704 bytes .../pokemon/front_pics/corsola_still_front_pic.png | Bin 0 -> 601 bytes .../pokemon/front_pics/cradily_still_front_pic.png | Bin 0 -> 887 bytes .../front_pics/crawdaunt_still_front_pic.png | Bin 0 -> 1006 bytes .../pokemon/front_pics/crobat_still_front_pic.png | Bin 0 -> 780 bytes .../front_pics/croconaw_still_front_pic.png | Bin 0 -> 730 bytes .../pokemon/front_pics/cubone_still_front_pic.png | Bin 0 -> 572 bytes .../front_pics/cyndaquil_still_front_pic.png | Bin 0 -> 546 bytes .../front_pics/delcatty_still_front_pic.png | Bin 0 -> 765 bytes .../front_pics/delibird_still_front_pic.png | Bin 0 -> 733 bytes .../pokemon/front_pics/deoxys_still_front_pic.png | Bin 0 -> 1579 bytes .../pokemon/front_pics/dewgong_still_front_pic.png | Bin 0 -> 763 bytes .../pokemon/front_pics/diglett_still_front_pic.png | Bin 0 -> 424 bytes .../pokemon/front_pics/ditto_still_front_pic.png | Bin 0 -> 377 bytes .../pokemon/front_pics/dodrio_still_front_pic.png | Bin 0 -> 910 bytes .../pokemon/front_pics/doduo_still_front_pic.png | Bin 0 -> 619 bytes .../pokemon/front_pics/donphan_still_front_pic.png | Bin 0 -> 923 bytes .../double_question_mark_still_front_pic.png | Bin 0 -> 306 bytes .../front_pics/dragonair_still_front_pic.png | Bin 0 -> 758 bytes .../front_pics/dragonite_still_front_pic.png | Bin 0 -> 1172 bytes .../pokemon/front_pics/dratini_still_front_pic.png | Bin 0 -> 568 bytes .../pokemon/front_pics/drowzee_still_front_pic.png | Bin 0 -> 653 bytes .../pokemon/front_pics/dugtrio_still_front_pic.png | Bin 0 -> 642 bytes .../front_pics/dunsparce_still_front_pic.png | Bin 0 -> 645 bytes .../front_pics/dusclops_still_front_pic.png | Bin 0 -> 741 bytes .../pokemon/front_pics/duskull_still_front_pic.png | Bin 0 -> 616 bytes .../pokemon/front_pics/dustox_still_front_pic.png | Bin 0 -> 724 bytes .../pokemon/front_pics/eevee_still_front_pic.png | Bin 0 -> 597 bytes .../pokemon/front_pics/egg_still_front_pic.png | Bin 0 -> 318 bytes .../pokemon/front_pics/ekans_still_front_pic.png | Bin 0 -> 566 bytes .../front_pics/electabuzz_still_front_pic.png | Bin 0 -> 882 bytes .../front_pics/electrike_still_front_pic.png | Bin 0 -> 511 bytes .../front_pics/electrode_still_front_pic.png | Bin 0 -> 490 bytes .../pokemon/front_pics/elekid_still_front_pic.png | Bin 0 -> 646 bytes .../pokemon/front_pics/entei_still_front_pic.png | Bin 0 -> 1284 bytes .../pokemon/front_pics/espeon_still_front_pic.png | Bin 0 -> 659 bytes .../front_pics/exeggcute_still_front_pic.png | Bin 0 -> 711 bytes .../front_pics/exeggutor_still_front_pic.png | Bin 0 -> 930 bytes .../pokemon/front_pics/exploud_still_front_pic.png | Bin 0 -> 1157 bytes .../front_pics/farfetch_d_still_front_pic.png | Bin 0 -> 701 bytes .../pokemon/front_pics/fearow_still_front_pic.png | Bin 0 -> 1022 bytes .../pokemon/front_pics/feebas_still_front_pic.png | Bin 0 -> 539 bytes .../front_pics/feraligatr_still_front_pic.png | Bin 0 -> 1122 bytes .../pokemon/front_pics/flaaffy_still_front_pic.png | Bin 0 -> 652 bytes .../pokemon/front_pics/flareon_still_front_pic.png | Bin 0 -> 717 bytes .../pokemon/front_pics/flygon_still_front_pic.png | Bin 0 -> 1076 bytes .../front_pics/forretress_still_front_pic.png | Bin 0 -> 835 bytes .../pokemon/front_pics/furret_still_front_pic.png | Bin 0 -> 659 bytes .../front_pics/gardevoir_still_front_pic.png | Bin 0 -> 737 bytes .../pokemon/front_pics/gastly_still_front_pic.png | Bin 0 -> 772 bytes .../pokemon/front_pics/gengar_still_front_pic.png | Bin 0 -> 704 bytes .../pokemon/front_pics/geodude_still_front_pic.png | Bin 0 -> 486 bytes .../front_pics/girafarig_still_front_pic.png | Bin 0 -> 871 bytes .../pokemon/front_pics/glalie_still_front_pic.png | Bin 0 -> 788 bytes .../pokemon/front_pics/gligar_still_front_pic.png | Bin 0 -> 914 bytes .../pokemon/front_pics/gloom_still_front_pic.png | Bin 0 -> 727 bytes .../pokemon/front_pics/golbat_still_front_pic.png | Bin 0 -> 764 bytes .../pokemon/front_pics/goldeen_still_front_pic.png | Bin 0 -> 725 bytes .../pokemon/front_pics/golduck_still_front_pic.png | Bin 0 -> 799 bytes .../pokemon/front_pics/golem_still_front_pic.png | Bin 0 -> 876 bytes .../front_pics/gorebyss_still_front_pic.png | Bin 0 -> 659 bytes .../front_pics/granbull_still_front_pic.png | Bin 0 -> 720 bytes .../front_pics/graveler_still_front_pic.png | Bin 0 -> 767 bytes .../pokemon/front_pics/grimer_still_front_pic.png | Bin 0 -> 626 bytes .../pokemon/front_pics/groudon_still_front_pic.png | Bin 0 -> 1247 bytes .../pokemon/front_pics/grovyle_still_front_pic.png | Bin 0 -> 970 bytes .../front_pics/growlithe_still_front_pic.png | Bin 0 -> 657 bytes .../pokemon/front_pics/grumpig_still_front_pic.png | Bin 0 -> 831 bytes .../pokemon/front_pics/gulpin_still_front_pic.png | Bin 0 -> 428 bytes .../front_pics/gyarados_still_front_pic.png | Bin 0 -> 1229 bytes .../front_pics/hariyama_still_front_pic.png | Bin 0 -> 1006 bytes .../pokemon/front_pics/haunter_still_front_pic.png | Bin 0 -> 806 bytes .../front_pics/heracross_still_front_pic.png | Bin 0 -> 811 bytes .../front_pics/hitmonchan_still_front_pic.png | Bin 0 -> 693 bytes .../front_pics/hitmonlee_still_front_pic.png | Bin 0 -> 739 bytes .../front_pics/hitmontop_still_front_pic.png | Bin 0 -> 772 bytes .../pokemon/front_pics/ho_oh_still_front_pic.png | Bin 0 -> 1332 bytes .../front_pics/hoothoot_still_front_pic.png | Bin 0 -> 525 bytes .../pokemon/front_pics/hoppip_still_front_pic.png | Bin 0 -> 551 bytes .../pokemon/front_pics/horsea_still_front_pic.png | Bin 0 -> 510 bytes .../front_pics/houndoom_still_front_pic.png | Bin 0 -> 853 bytes .../front_pics/houndour_still_front_pic.png | Bin 0 -> 558 bytes .../pokemon/front_pics/huntail_still_front_pic.png | Bin 0 -> 833 bytes .../pokemon/front_pics/hypno_still_front_pic.png | Bin 0 -> 862 bytes .../front_pics/igglybuff_still_front_pic.png | Bin 0 -> 376 bytes .../front_pics/illumise_still_front_pic.png | Bin 0 -> 729 bytes .../pokemon/front_pics/ivysaur_still_front_pic.png | Bin 0 -> 689 bytes .../front_pics/jigglypuff_still_front_pic.png | Bin 0 -> 496 bytes .../pokemon/front_pics/jirachi_still_front_pic.png | Bin 0 -> 637 bytes .../pokemon/front_pics/jolteon_still_front_pic.png | Bin 0 -> 706 bytes .../front_pics/jumpluff_still_front_pic.png | Bin 0 -> 734 bytes .../pokemon/front_pics/jynx_still_front_pic.png | Bin 0 -> 832 bytes .../pokemon/front_pics/kabuto_still_front_pic.png | Bin 0 -> 440 bytes .../front_pics/kabutops_still_front_pic.png | Bin 0 -> 844 bytes .../pokemon/front_pics/kadabra_still_front_pic.png | Bin 0 -> 1016 bytes .../pokemon/front_pics/kakuna_still_front_pic.png | Bin 0 -> 442 bytes .../front_pics/kangaskhan_still_front_pic.png | Bin 0 -> 981 bytes .../pokemon/front_pics/kecleon_still_front_pic.png | Bin 0 -> 762 bytes .../pokemon/front_pics/kingdra_still_front_pic.png | Bin 0 -> 858 bytes .../pokemon/front_pics/kingler_still_front_pic.png | Bin 0 -> 936 bytes .../pokemon/front_pics/kirlia_still_front_pic.png | Bin 0 -> 618 bytes .../pokemon/front_pics/koffing_still_front_pic.png | Bin 0 -> 634 bytes .../pokemon/front_pics/krabby_still_front_pic.png | Bin 0 -> 633 bytes .../pokemon/front_pics/kyogre_still_front_pic.png | Bin 0 -> 965 bytes .../pokemon/front_pics/lairon_still_front_pic.png | Bin 0 -> 814 bytes .../pokemon/front_pics/lanturn_still_front_pic.png | Bin 0 -> 738 bytes .../pokemon/front_pics/lapras_still_front_pic.png | Bin 0 -> 811 bytes .../front_pics/larvitar_still_front_pic.png | Bin 0 -> 480 bytes .../pokemon/front_pics/latias_still_front_pic.png | Bin 0 -> 867 bytes .../pokemon/front_pics/latios_still_front_pic.png | Bin 0 -> 959 bytes .../pokemon/front_pics/ledian_still_front_pic.png | Bin 0 -> 766 bytes .../pokemon/front_pics/ledyba_still_front_pic.png | Bin 0 -> 637 bytes .../front_pics/lickitung_still_front_pic.png | Bin 0 -> 821 bytes .../pokemon/front_pics/lileep_still_front_pic.png | Bin 0 -> 692 bytes .../pokemon/front_pics/linoone_still_front_pic.png | Bin 0 -> 703 bytes .../pokemon/front_pics/lombre_still_front_pic.png | Bin 0 -> 647 bytes .../pokemon/front_pics/lotad_still_front_pic.png | Bin 0 -> 492 bytes .../pokemon/front_pics/loudred_still_front_pic.png | Bin 0 -> 936 bytes .../front_pics/ludicolo_still_front_pic.png | Bin 0 -> 1040 bytes .../pokemon/front_pics/lugia_still_front_pic.png | Bin 0 -> 1030 bytes .../front_pics/lunatone_still_front_pic.png | Bin 0 -> 660 bytes .../pokemon/front_pics/luvdisc_still_front_pic.png | Bin 0 -> 328 bytes .../pokemon/front_pics/machamp_still_front_pic.png | Bin 0 -> 1046 bytes .../pokemon/front_pics/machoke_still_front_pic.png | Bin 0 -> 796 bytes .../pokemon/front_pics/machop_still_front_pic.png | Bin 0 -> 516 bytes .../pokemon/front_pics/magby_still_front_pic.png | Bin 0 -> 506 bytes .../front_pics/magcargo_still_front_pic.png | Bin 0 -> 708 bytes .../front_pics/magikarp_still_front_pic.png | Bin 0 -> 753 bytes .../pokemon/front_pics/magmar_still_front_pic.png | Bin 0 -> 921 bytes .../front_pics/magnemite_still_front_pic.png | Bin 0 -> 390 bytes .../front_pics/magneton_still_front_pic.png | Bin 0 -> 707 bytes .../front_pics/makuhita_still_front_pic.png | Bin 0 -> 637 bytes .../front_pics/manectric_still_front_pic.png | Bin 0 -> 685 bytes .../pokemon/front_pics/mankey_still_front_pic.png | Bin 0 -> 646 bytes .../pokemon/front_pics/mantine_still_front_pic.png | Bin 0 -> 983 bytes .../pokemon/front_pics/mareep_still_front_pic.png | Bin 0 -> 571 bytes .../pokemon/front_pics/marill_still_front_pic.png | Bin 0 -> 563 bytes .../pokemon/front_pics/marowak_still_front_pic.png | Bin 0 -> 753 bytes .../front_pics/marshtomp_still_front_pic.png | Bin 0 -> 736 bytes .../front_pics/masquerain_still_front_pic.png | Bin 0 -> 782 bytes .../pokemon/front_pics/mawile_still_front_pic.png | Bin 0 -> 774 bytes .../front_pics/medicham_still_front_pic.png | Bin 0 -> 711 bytes .../front_pics/meditite_still_front_pic.png | Bin 0 -> 573 bytes .../front_pics/meganium_still_front_pic.png | Bin 0 -> 1117 bytes .../pokemon/front_pics/meowth_still_front_pic.png | Bin 0 -> 637 bytes .../front_pics/metagross_still_front_pic.png | Bin 0 -> 911 bytes .../pokemon/front_pics/metang_still_front_pic.png | Bin 0 -> 899 bytes .../pokemon/front_pics/metapod_still_front_pic.png | Bin 0 -> 406 bytes .../pokemon/front_pics/mew_still_front_pic.png | Bin 0 -> 577 bytes .../pokemon/front_pics/mewtwo_still_front_pic.png | Bin 0 -> 875 bytes .../front_pics/mightyena_still_front_pic.png | Bin 0 -> 856 bytes .../pokemon/front_pics/milotic_still_front_pic.png | Bin 0 -> 966 bytes .../pokemon/front_pics/miltank_still_front_pic.png | Bin 0 -> 791 bytes .../pokemon/front_pics/minun_still_front_pic.png | Bin 0 -> 505 bytes .../front_pics/misdreavus_still_front_pic.png | Bin 0 -> 590 bytes .../pokemon/front_pics/moltres_still_front_pic.png | Bin 0 -> 1014 bytes .../pokemon/front_pics/mr_mime_still_front_pic.png | Bin 0 -> 821 bytes .../pokemon/front_pics/mudkip_still_front_pic.png | Bin 0 -> 572 bytes .../pokemon/front_pics/muk_still_front_pic.png | Bin 0 -> 710 bytes .../pokemon/front_pics/murkrow_still_front_pic.png | Bin 0 -> 601 bytes .../pokemon/front_pics/natu_still_front_pic.png | Bin 0 -> 375 bytes .../front_pics/nidoking_still_front_pic.png | Bin 0 -> 1084 bytes .../front_pics/nidoqueen_still_front_pic.png | Bin 0 -> 893 bytes .../front_pics/nidoran_f_still_front_pic.png | Bin 0 -> 480 bytes .../front_pics/nidoran_m_still_front_pic.png | Bin 0 -> 505 bytes .../front_pics/nidorina_still_front_pic.png | Bin 0 -> 632 bytes .../front_pics/nidorino_still_front_pic.png | Bin 0 -> 716 bytes .../pokemon/front_pics/nincada_still_front_pic.png | Bin 0 -> 578 bytes .../front_pics/ninetales_still_front_pic.png | Bin 0 -> 885 bytes .../pokemon/front_pics/ninjask_still_front_pic.png | Bin 0 -> 740 bytes .../pokemon/front_pics/noctowl_still_front_pic.png | Bin 0 -> 700 bytes .../front_pics/nosepass_still_front_pic.png | Bin 0 -> 565 bytes .../pokemon/front_pics/numel_still_front_pic.png | Bin 0 -> 574 bytes .../pokemon/front_pics/nuzleaf_still_front_pic.png | Bin 0 -> 624 bytes .../front_pics/octillery_still_front_pic.png | Bin 0 -> 653 bytes .../pokemon/front_pics/oddish_still_front_pic.png | Bin 0 -> 451 bytes .../pokemon/front_pics/omanyte_still_front_pic.png | Bin 0 -> 514 bytes .../pokemon/front_pics/omastar_still_front_pic.png | Bin 0 -> 783 bytes .../pokemon/front_pics/onix_still_front_pic.png | Bin 0 -> 929 bytes .../pokemon/front_pics/paras_still_front_pic.png | Bin 0 -> 505 bytes .../front_pics/parasect_still_front_pic.png | Bin 0 -> 721 bytes .../front_pics/pelipper_still_front_pic.png | Bin 0 -> 771 bytes .../pokemon/front_pics/persian_still_front_pic.png | Bin 0 -> 710 bytes .../pokemon/front_pics/phanpy_still_front_pic.png | Bin 0 -> 462 bytes .../pokemon/front_pics/pichu_still_front_pic.png | Bin 0 -> 447 bytes .../pokemon/front_pics/pidgeot_still_front_pic.png | Bin 0 -> 1085 bytes .../front_pics/pidgeotto_still_front_pic.png | Bin 0 -> 783 bytes .../pokemon/front_pics/pidgey_still_front_pic.png | Bin 0 -> 515 bytes .../pokemon/front_pics/pikachu_still_front_pic.png | Bin 0 -> 600 bytes .../front_pics/piloswine_still_front_pic.png | Bin 0 -> 643 bytes .../pokemon/front_pics/pineco_still_front_pic.png | Bin 0 -> 646 bytes .../pokemon/front_pics/pinsir_still_front_pic.png | Bin 0 -> 867 bytes .../pokemon/front_pics/plusle_still_front_pic.png | Bin 0 -> 524 bytes .../front_pics/politoed_still_front_pic.png | Bin 0 -> 706 bytes .../pokemon/front_pics/poliwag_still_front_pic.png | Bin 0 -> 526 bytes .../front_pics/poliwhirl_still_front_pic.png | Bin 0 -> 725 bytes .../front_pics/poliwrath_still_front_pic.png | Bin 0 -> 777 bytes .../pokemon/front_pics/ponyta_still_front_pic.png | Bin 0 -> 752 bytes .../front_pics/poochyena_still_front_pic.png | Bin 0 -> 570 bytes .../front_pics/porygon2_still_front_pic.png | Bin 0 -> 541 bytes .../pokemon/front_pics/porygon_still_front_pic.png | Bin 0 -> 559 bytes .../front_pics/primeape_still_front_pic.png | Bin 0 -> 777 bytes .../pokemon/front_pics/psyduck_still_front_pic.png | Bin 0 -> 589 bytes .../pokemon/front_pics/pupitar_still_front_pic.png | Bin 0 -> 594 bytes .../front_pics/quagsire_still_front_pic.png | Bin 0 -> 706 bytes .../pokemon/front_pics/quilava_still_front_pic.png | Bin 0 -> 671 bytes .../front_pics/qwilfish_still_front_pic.png | Bin 0 -> 566 bytes .../pokemon/front_pics/raichu_still_front_pic.png | Bin 0 -> 877 bytes .../pokemon/front_pics/raikou_still_front_pic.png | Bin 0 -> 1155 bytes .../pokemon/front_pics/ralts_still_front_pic.png | Bin 0 -> 433 bytes .../front_pics/rapidash_still_front_pic.png | Bin 0 -> 986 bytes .../front_pics/raticate_still_front_pic.png | Bin 0 -> 754 bytes .../pokemon/front_pics/rattata_still_front_pic.png | Bin 0 -> 488 bytes .../front_pics/rayquaza_still_front_pic.png | Bin 0 -> 1059 bytes .../pokemon/front_pics/regice_still_front_pic.png | Bin 0 -> 883 bytes .../front_pics/regirock_still_front_pic.png | Bin 0 -> 965 bytes .../front_pics/registeel_still_front_pic.png | Bin 0 -> 948 bytes .../front_pics/relicanth_still_front_pic.png | Bin 0 -> 759 bytes .../front_pics/remoraid_still_front_pic.png | Bin 0 -> 483 bytes .../pokemon/front_pics/rhydon_still_front_pic.png | Bin 0 -> 1039 bytes .../pokemon/front_pics/rhyhorn_still_front_pic.png | Bin 0 -> 789 bytes .../pokemon/front_pics/roselia_still_front_pic.png | Bin 0 -> 745 bytes .../pokemon/front_pics/sableye_still_front_pic.png | Bin 0 -> 619 bytes .../front_pics/salamence_still_front_pic.png | Bin 0 -> 918 bytes .../front_pics/sandshrew_still_front_pic.png | Bin 0 -> 600 bytes .../front_pics/sandslash_still_front_pic.png | Bin 0 -> 884 bytes .../front_pics/sceptile_still_front_pic.png | Bin 0 -> 1047 bytes .../pokemon/front_pics/scizor_still_front_pic.png | Bin 0 -> 998 bytes .../pokemon/front_pics/scyther_still_front_pic.png | Bin 0 -> 896 bytes .../pokemon/front_pics/seadra_still_front_pic.png | Bin 0 -> 734 bytes .../pokemon/front_pics/seaking_still_front_pic.png | Bin 0 -> 944 bytes .../pokemon/front_pics/sealeo_still_front_pic.png | Bin 0 -> 758 bytes .../pokemon/front_pics/seedot_still_front_pic.png | Bin 0 -> 502 bytes .../pokemon/front_pics/seel_still_front_pic.png | Bin 0 -> 644 bytes .../pokemon/front_pics/sentret_still_front_pic.png | Bin 0 -> 610 bytes .../pokemon/front_pics/seviper_still_front_pic.png | Bin 0 -> 886 bytes .../front_pics/sharpedo_still_front_pic.png | Bin 0 -> 748 bytes .../front_pics/shedinja_still_front_pic.png | Bin 0 -> 654 bytes .../pokemon/front_pics/shelgon_still_front_pic.png | Bin 0 -> 631 bytes .../front_pics/shellder_still_front_pic.png | Bin 0 -> 494 bytes .../pokemon/front_pics/shiftry_still_front_pic.png | Bin 0 -> 1023 bytes .../front_pics/shroomish_still_front_pic.png | Bin 0 -> 493 bytes .../pokemon/front_pics/shuckle_still_front_pic.png | Bin 0 -> 587 bytes .../pokemon/front_pics/shuppet_still_front_pic.png | Bin 0 -> 435 bytes .../pokemon/front_pics/silcoon_still_front_pic.png | Bin 0 -> 520 bytes .../front_pics/skarmory_still_front_pic.png | Bin 0 -> 992 bytes .../front_pics/skiploom_still_front_pic.png | Bin 0 -> 503 bytes .../pokemon/front_pics/skitty_still_front_pic.png | Bin 0 -> 639 bytes .../pokemon/front_pics/slaking_still_front_pic.png | Bin 0 -> 1034 bytes .../pokemon/front_pics/slakoth_still_front_pic.png | Bin 0 -> 602 bytes .../pokemon/front_pics/slowbro_still_front_pic.png | Bin 0 -> 982 bytes .../front_pics/slowking_still_front_pic.png | Bin 0 -> 792 bytes .../front_pics/slowpoke_still_front_pic.png | Bin 0 -> 578 bytes .../pokemon/front_pics/slugma_still_front_pic.png | Bin 0 -> 493 bytes .../front_pics/smeargle_still_front_pic.png | Bin 0 -> 758 bytes .../front_pics/smoochum_still_front_pic.png | Bin 0 -> 495 bytes .../pokemon/front_pics/sneasel_still_front_pic.png | Bin 0 -> 698 bytes .../pokemon/front_pics/snorlax_still_front_pic.png | Bin 0 -> 814 bytes .../pokemon/front_pics/snorunt_still_front_pic.png | Bin 0 -> 574 bytes .../front_pics/snubbull_still_front_pic.png | Bin 0 -> 606 bytes .../pokemon/front_pics/solrock_still_front_pic.png | Bin 0 -> 945 bytes .../pokemon/front_pics/spearow_still_front_pic.png | Bin 0 -> 615 bytes .../pokemon/front_pics/spheal_still_front_pic.png | Bin 0 -> 507 bytes .../front_pics/spinarak_still_front_pic.png | Bin 0 -> 511 bytes .../pokemon/front_pics/spinda_still_front_pic.png | Bin 0 -> 623 bytes .../pokemon/front_pics/spoink_still_front_pic.png | Bin 0 -> 491 bytes .../front_pics/squirtle_still_front_pic.png | Bin 0 -> 543 bytes .../front_pics/stantler_still_front_pic.png | Bin 0 -> 881 bytes .../pokemon/front_pics/starmie_still_front_pic.png | Bin 0 -> 780 bytes .../pokemon/front_pics/staryu_still_front_pic.png | Bin 0 -> 566 bytes .../pokemon/front_pics/steelix_still_front_pic.png | Bin 0 -> 943 bytes .../front_pics/sudowoodo_still_front_pic.png | Bin 0 -> 651 bytes .../pokemon/front_pics/suicune_still_front_pic.png | Bin 0 -> 1179 bytes .../front_pics/sunflora_still_front_pic.png | Bin 0 -> 707 bytes .../pokemon/front_pics/sunkern_still_front_pic.png | Bin 0 -> 448 bytes .../pokemon/front_pics/surskit_still_front_pic.png | Bin 0 -> 417 bytes .../pokemon/front_pics/swablu_still_front_pic.png | Bin 0 -> 586 bytes .../pokemon/front_pics/swalot_still_front_pic.png | Bin 0 -> 677 bytes .../front_pics/swampert_still_front_pic.png | Bin 0 -> 1160 bytes .../pokemon/front_pics/swellow_still_front_pic.png | Bin 0 -> 816 bytes .../pokemon/front_pics/swinub_still_front_pic.png | Bin 0 -> 381 bytes .../pokemon/front_pics/taillow_still_front_pic.png | Bin 0 -> 508 bytes .../pokemon/front_pics/tangela_still_front_pic.png | Bin 0 -> 737 bytes .../pokemon/front_pics/tauros_still_front_pic.png | Bin 0 -> 956 bytes .../front_pics/teddiursa_still_front_pic.png | Bin 0 -> 544 bytes .../front_pics/tentacool_still_front_pic.png | Bin 0 -> 571 bytes .../front_pics/tentacruel_still_front_pic.png | Bin 0 -> 1059 bytes .../pokemon/front_pics/togepi_still_front_pic.png | Bin 0 -> 390 bytes .../pokemon/front_pics/togetic_still_front_pic.png | Bin 0 -> 513 bytes .../pokemon/front_pics/torchic_still_front_pic.png | Bin 0 -> 548 bytes .../pokemon/front_pics/torkoal_still_front_pic.png | Bin 0 -> 977 bytes .../front_pics/totodile_still_front_pic.png | Bin 0 -> 533 bytes .../front_pics/trapinch_still_front_pic.png | Bin 0 -> 420 bytes .../pokemon/front_pics/treecko_still_front_pic.png | Bin 0 -> 635 bytes .../pokemon/front_pics/tropius_still_front_pic.png | Bin 0 -> 1172 bytes .../front_pics/typhlosion_still_front_pic.png | Bin 0 -> 896 bytes .../front_pics/tyranitar_still_front_pic.png | Bin 0 -> 1095 bytes .../pokemon/front_pics/tyrogue_still_front_pic.png | Bin 0 -> 530 bytes .../pokemon/front_pics/umbreon_still_front_pic.png | Bin 0 -> 650 bytes .../pokemon/front_pics/unown_a_still_front_pic.png | Bin 0 -> 337 bytes .../pokemon/front_pics/unown_b_still_front_pic.png | Bin 0 -> 355 bytes .../pokemon/front_pics/unown_c_still_front_pic.png | Bin 0 -> 395 bytes .../pokemon/front_pics/unown_d_still_front_pic.png | Bin 0 -> 352 bytes .../pokemon/front_pics/unown_e_still_front_pic.png | Bin 0 -> 325 bytes .../unown_exclamation_mark_still_front_pic.png | Bin 0 -> 294 bytes .../pokemon/front_pics/unown_f_still_front_pic.png | Bin 0 -> 364 bytes .../pokemon/front_pics/unown_g_still_front_pic.png | Bin 0 -> 359 bytes .../pokemon/front_pics/unown_h_still_front_pic.png | Bin 0 -> 424 bytes .../pokemon/front_pics/unown_i_still_front_pic.png | Bin 0 -> 305 bytes .../pokemon/front_pics/unown_j_still_front_pic.png | Bin 0 -> 334 bytes .../pokemon/front_pics/unown_k_still_front_pic.png | Bin 0 -> 347 bytes .../pokemon/front_pics/unown_l_still_front_pic.png | Bin 0 -> 315 bytes .../pokemon/front_pics/unown_m_still_front_pic.png | Bin 0 -> 414 bytes .../pokemon/front_pics/unown_n_still_front_pic.png | Bin 0 -> 379 bytes .../pokemon/front_pics/unown_o_still_front_pic.png | Bin 0 -> 417 bytes .../pokemon/front_pics/unown_p_still_front_pic.png | Bin 0 -> 312 bytes .../pokemon/front_pics/unown_q_still_front_pic.png | Bin 0 -> 320 bytes .../unown_question_mark_still_front_pic.png | Bin 0 -> 332 bytes .../pokemon/front_pics/unown_r_still_front_pic.png | Bin 0 -> 313 bytes .../pokemon/front_pics/unown_s_still_front_pic.png | Bin 0 -> 363 bytes .../pokemon/front_pics/unown_t_still_front_pic.png | Bin 0 -> 316 bytes .../pokemon/front_pics/unown_u_still_front_pic.png | Bin 0 -> 391 bytes .../pokemon/front_pics/unown_v_still_front_pic.png | Bin 0 -> 349 bytes .../pokemon/front_pics/unown_w_still_front_pic.png | Bin 0 -> 355 bytes .../pokemon/front_pics/unown_x_still_front_pic.png | Bin 0 -> 337 bytes .../pokemon/front_pics/unown_y_still_front_pic.png | Bin 0 -> 347 bytes .../pokemon/front_pics/unown_z_still_front_pic.png | Bin 0 -> 324 bytes .../front_pics/ursaring_still_front_pic.png | Bin 0 -> 894 bytes .../front_pics/vaporeon_still_front_pic.png | Bin 0 -> 802 bytes .../front_pics/venomoth_still_front_pic.png | Bin 0 -> 851 bytes .../pokemon/front_pics/venonat_still_front_pic.png | Bin 0 -> 696 bytes .../front_pics/venusaur_still_front_pic.png | Bin 0 -> 1107 bytes .../pokemon/front_pics/vibrava_still_front_pic.png | Bin 0 -> 708 bytes .../front_pics/victreebel_still_front_pic.png | Bin 0 -> 907 bytes .../front_pics/vigoroth_still_front_pic.png | Bin 0 -> 886 bytes .../front_pics/vileplume_still_front_pic.png | Bin 0 -> 694 bytes .../pokemon/front_pics/volbeat_still_front_pic.png | Bin 0 -> 774 bytes .../pokemon/front_pics/voltorb_still_front_pic.png | Bin 0 -> 407 bytes .../pokemon/front_pics/vulpix_still_front_pic.png | Bin 0 -> 669 bytes .../pokemon/front_pics/wailmer_still_front_pic.png | Bin 0 -> 596 bytes .../pokemon/front_pics/wailord_still_front_pic.png | Bin 0 -> 766 bytes .../pokemon/front_pics/walrein_still_front_pic.png | Bin 0 -> 997 bytes .../front_pics/wartortle_still_front_pic.png | Bin 0 -> 794 bytes .../pokemon/front_pics/weedle_still_front_pic.png | Bin 0 -> 471 bytes .../front_pics/weepinbell_still_front_pic.png | Bin 0 -> 681 bytes .../pokemon/front_pics/weezing_still_front_pic.png | Bin 0 -> 988 bytes .../front_pics/whiscash_still_front_pic.png | Bin 0 -> 752 bytes .../pokemon/front_pics/whismur_still_front_pic.png | Bin 0 -> 527 bytes .../front_pics/wigglytuff_still_front_pic.png | Bin 0 -> 717 bytes .../pokemon/front_pics/wingull_still_front_pic.png | Bin 0 -> 471 bytes .../front_pics/wobbuffet_still_front_pic.png | Bin 0 -> 683 bytes .../pokemon/front_pics/wooper_still_front_pic.png | Bin 0 -> 464 bytes .../pokemon/front_pics/wurmple_still_front_pic.png | Bin 0 -> 522 bytes .../pokemon/front_pics/wynaut_still_front_pic.png | Bin 0 -> 532 bytes .../pokemon/front_pics/xatu_still_front_pic.png | Bin 0 -> 597 bytes .../pokemon/front_pics/yanma_still_front_pic.png | Bin 0 -> 747 bytes .../front_pics/zangoose_still_front_pic.png | Bin 0 -> 844 bytes .../pokemon/front_pics/zapdos_still_front_pic.png | Bin 0 -> 904 bytes .../front_pics/zigzagoon_still_front_pic.png | Bin 0 -> 797 bytes .../pokemon/front_pics/zubat_still_front_pic.png | Bin 0 -> 570 bytes graphics/pokemon/icon notes | 3 + graphics/pokemon/icon_palettes/icon_palette_0.pal | 19 + graphics/pokemon/icon_palettes/icon_palette_1.pal | 19 + graphics/pokemon/icon_palettes/icon_palette_2.pal | 19 + graphics/pokemon/icons/abra_icon.png | Bin 0 -> 327 bytes graphics/pokemon/icons/absol_icon.png | Bin 0 -> 371 bytes graphics/pokemon/icons/aerodactyl_icon.png | Bin 0 -> 369 bytes graphics/pokemon/icons/aggron_icon.png | Bin 0 -> 367 bytes graphics/pokemon/icons/aipom_icon.png | Bin 0 -> 399 bytes graphics/pokemon/icons/alakazam_icon.png | Bin 0 -> 401 bytes graphics/pokemon/icons/altaria_icon.png | Bin 0 -> 419 bytes graphics/pokemon/icons/ampharos_icon.png | Bin 0 -> 430 bytes graphics/pokemon/icons/anorith_icon.png | Bin 0 -> 377 bytes graphics/pokemon/icons/arbok_icon.png | Bin 0 -> 373 bytes graphics/pokemon/icons/arcanine_icon.png | Bin 0 -> 445 bytes graphics/pokemon/icons/ariados_icon.png | Bin 0 -> 430 bytes graphics/pokemon/icons/armaldo_icon.png | Bin 0 -> 383 bytes graphics/pokemon/icons/aron_icon.png | Bin 0 -> 262 bytes graphics/pokemon/icons/articuno_icon.png | Bin 0 -> 384 bytes graphics/pokemon/icons/azumarill_icon.png | Bin 0 -> 445 bytes graphics/pokemon/icons/azurill_icon.png | Bin 0 -> 342 bytes graphics/pokemon/icons/bagon_icon.png | Bin 0 -> 359 bytes graphics/pokemon/icons/baltoy_icon.png | Bin 0 -> 279 bytes graphics/pokemon/icons/banette_icon.png | Bin 0 -> 321 bytes graphics/pokemon/icons/barboach_icon.png | Bin 0 -> 337 bytes graphics/pokemon/icons/bayleef_icon.png | Bin 0 -> 427 bytes graphics/pokemon/icons/beautifly_icon.png | Bin 0 -> 449 bytes graphics/pokemon/icons/beedrill_icon.png | Bin 0 -> 437 bytes graphics/pokemon/icons/beldum_icon.png | Bin 0 -> 294 bytes graphics/pokemon/icons/bellossom_icon.png | Bin 0 -> 363 bytes graphics/pokemon/icons/bellsprout_icon.png | Bin 0 -> 252 bytes graphics/pokemon/icons/blastoise_icon.png | Bin 0 -> 397 bytes graphics/pokemon/icons/blaziken_icon.png | Bin 0 -> 448 bytes graphics/pokemon/icons/blissey_icon.png | Bin 0 -> 406 bytes graphics/pokemon/icons/breloom_icon.png | Bin 0 -> 321 bytes graphics/pokemon/icons/bulbasaur_icon.png | Bin 0 -> 316 bytes graphics/pokemon/icons/butterfree_icon.png | Bin 0 -> 421 bytes graphics/pokemon/icons/cacnea_icon.png | Bin 0 -> 370 bytes graphics/pokemon/icons/cacturne_icon.png | Bin 0 -> 299 bytes graphics/pokemon/icons/camerupt_icon.png | Bin 0 -> 404 bytes graphics/pokemon/icons/carvanha_icon.png | Bin 0 -> 392 bytes graphics/pokemon/icons/cascoon_icon.png | Bin 0 -> 342 bytes graphics/pokemon/icons/castform_icon.png | Bin 0 -> 263 bytes graphics/pokemon/icons/caterpie_icon.png | Bin 0 -> 277 bytes graphics/pokemon/icons/celebi_icon.png | Bin 0 -> 330 bytes graphics/pokemon/icons/chansey_icon.png | Bin 0 -> 317 bytes graphics/pokemon/icons/charizard_icon.png | Bin 0 -> 462 bytes graphics/pokemon/icons/charmander_icon.png | Bin 0 -> 303 bytes graphics/pokemon/icons/charmeleon_icon.png | Bin 0 -> 412 bytes graphics/pokemon/icons/chikorita_icon.png | Bin 0 -> 334 bytes graphics/pokemon/icons/chimecho_icon.png | Bin 0 -> 258 bytes graphics/pokemon/icons/chinchou_icon.png | Bin 0 -> 378 bytes graphics/pokemon/icons/clamperl_icon.png | Bin 0 -> 345 bytes graphics/pokemon/icons/claydol_icon.png | Bin 0 -> 331 bytes graphics/pokemon/icons/clefable_icon.png | Bin 0 -> 339 bytes graphics/pokemon/icons/clefairy_icon.png | Bin 0 -> 305 bytes graphics/pokemon/icons/cleffa_icon.png | Bin 0 -> 302 bytes graphics/pokemon/icons/cloyster_icon.png | Bin 0 -> 507 bytes graphics/pokemon/icons/combusken_icon.png | Bin 0 -> 351 bytes graphics/pokemon/icons/corphish_icon.png | Bin 0 -> 286 bytes graphics/pokemon/icons/corsola_icon.png | Bin 0 -> 365 bytes graphics/pokemon/icons/cradily_icon.png | Bin 0 -> 452 bytes graphics/pokemon/icons/crawdaunt_icon.png | Bin 0 -> 402 bytes graphics/pokemon/icons/crobat_icon.png | Bin 0 -> 422 bytes graphics/pokemon/icons/croconaw_icon.png | Bin 0 -> 356 bytes graphics/pokemon/icons/cubone_icon.png | Bin 0 -> 350 bytes graphics/pokemon/icons/cyndaquil_icon.png | Bin 0 -> 360 bytes graphics/pokemon/icons/delcatty_icon.png | Bin 0 -> 420 bytes graphics/pokemon/icons/delibird_icon.png | Bin 0 -> 357 bytes graphics/pokemon/icons/deoxys_icon.png | Bin 0 -> 430 bytes graphics/pokemon/icons/deoxys_speed_icon.png | Bin 0 -> 456 bytes graphics/pokemon/icons/dewgong_icon.png | Bin 0 -> 415 bytes graphics/pokemon/icons/diglett_icon.png | Bin 0 -> 249 bytes graphics/pokemon/icons/ditto_icon.png | Bin 0 -> 270 bytes graphics/pokemon/icons/dodrio_icon.png | Bin 0 -> 446 bytes graphics/pokemon/icons/doduo_icon.png | Bin 0 -> 351 bytes graphics/pokemon/icons/donphan_icon.png | Bin 0 -> 471 bytes graphics/pokemon/icons/dragonair_icon.png | Bin 0 -> 383 bytes graphics/pokemon/icons/dragonite_icon.png | Bin 0 -> 414 bytes graphics/pokemon/icons/dratini_icon.png | Bin 0 -> 334 bytes graphics/pokemon/icons/drowzee_icon.png | Bin 0 -> 416 bytes graphics/pokemon/icons/dugtrio_icon.png | Bin 0 -> 296 bytes graphics/pokemon/icons/dunsparce_icon.png | Bin 0 -> 341 bytes graphics/pokemon/icons/dusclops_icon.png | Bin 0 -> 344 bytes graphics/pokemon/icons/duskull_icon.png | Bin 0 -> 294 bytes graphics/pokemon/icons/dustox_icon.png | Bin 0 -> 428 bytes graphics/pokemon/icons/eevee_icon.png | Bin 0 -> 296 bytes graphics/pokemon/icons/egg_icon.png | Bin 0 -> 310 bytes graphics/pokemon/icons/ekans_icon.png | Bin 0 -> 333 bytes graphics/pokemon/icons/electabuzz_icon.png | Bin 0 -> 321 bytes graphics/pokemon/icons/electrike_icon.png | Bin 0 -> 352 bytes graphics/pokemon/icons/electrode_icon.png | Bin 0 -> 245 bytes graphics/pokemon/icons/elekid_icon.png | Bin 0 -> 327 bytes graphics/pokemon/icons/entei_icon.png | Bin 0 -> 453 bytes graphics/pokemon/icons/espeon_icon.png | Bin 0 -> 354 bytes graphics/pokemon/icons/exeggcute_icon.png | Bin 0 -> 383 bytes graphics/pokemon/icons/exeggutor_icon.png | Bin 0 -> 368 bytes graphics/pokemon/icons/exploud_icon.png | Bin 0 -> 447 bytes graphics/pokemon/icons/farfetch_d_icon.png | Bin 0 -> 396 bytes graphics/pokemon/icons/fearow_icon.png | Bin 0 -> 465 bytes graphics/pokemon/icons/feebas_icon.png | Bin 0 -> 359 bytes graphics/pokemon/icons/feraligatr_icon.png | Bin 0 -> 488 bytes graphics/pokemon/icons/flaaffy_icon.png | Bin 0 -> 376 bytes graphics/pokemon/icons/flareon_icon.png | Bin 0 -> 380 bytes graphics/pokemon/icons/flygon_icon.png | Bin 0 -> 411 bytes graphics/pokemon/icons/forretress_icon.png | Bin 0 -> 332 bytes graphics/pokemon/icons/furret_icon.png | Bin 0 -> 401 bytes graphics/pokemon/icons/gardevoir_icon.png | Bin 0 -> 386 bytes graphics/pokemon/icons/gastly_icon.png | Bin 0 -> 442 bytes graphics/pokemon/icons/gengar_icon.png | Bin 0 -> 382 bytes graphics/pokemon/icons/geodude_icon.png | Bin 0 -> 304 bytes graphics/pokemon/icons/girafarig_icon.png | Bin 0 -> 370 bytes graphics/pokemon/icons/glalie_icon.png | Bin 0 -> 305 bytes graphics/pokemon/icons/gligar_icon.png | Bin 0 -> 425 bytes graphics/pokemon/icons/gloom_icon.png | Bin 0 -> 313 bytes graphics/pokemon/icons/golbat_icon.png | Bin 0 -> 355 bytes graphics/pokemon/icons/goldeen_icon.png | Bin 0 -> 354 bytes graphics/pokemon/icons/golduck_icon.png | Bin 0 -> 351 bytes graphics/pokemon/icons/golem_icon.png | Bin 0 -> 395 bytes graphics/pokemon/icons/gorebyss_icon.png | Bin 0 -> 382 bytes graphics/pokemon/icons/granbull_icon.png | Bin 0 -> 352 bytes graphics/pokemon/icons/graveler_icon.png | Bin 0 -> 366 bytes graphics/pokemon/icons/grimer_icon.png | Bin 0 -> 356 bytes graphics/pokemon/icons/groudon_icon.png | Bin 0 -> 377 bytes graphics/pokemon/icons/grovyle_icon.png | Bin 0 -> 363 bytes graphics/pokemon/icons/growlithe_icon.png | Bin 0 -> 348 bytes graphics/pokemon/icons/grumpig_icon.png | Bin 0 -> 329 bytes graphics/pokemon/icons/gulpin_icon.png | Bin 0 -> 293 bytes graphics/pokemon/icons/gyarados_icon.png | Bin 0 -> 524 bytes graphics/pokemon/icons/hariyama_icon.png | Bin 0 -> 387 bytes graphics/pokemon/icons/haunter_icon.png | Bin 0 -> 485 bytes graphics/pokemon/icons/heracross_icon.png | Bin 0 -> 370 bytes graphics/pokemon/icons/hitmonchan_icon.png | Bin 0 -> 306 bytes graphics/pokemon/icons/hitmonlee_icon.png | Bin 0 -> 335 bytes graphics/pokemon/icons/hitmontop_icon.png | Bin 0 -> 477 bytes graphics/pokemon/icons/ho_oh_icon.png | Bin 0 -> 480 bytes graphics/pokemon/icons/hoothoot_icon.png | Bin 0 -> 350 bytes graphics/pokemon/icons/hoppip_icon.png | Bin 0 -> 367 bytes graphics/pokemon/icons/horsea_icon.png | Bin 0 -> 354 bytes graphics/pokemon/icons/houndoom_icon.png | Bin 0 -> 406 bytes graphics/pokemon/icons/houndour_icon.png | Bin 0 -> 358 bytes graphics/pokemon/icons/huntail_icon.png | Bin 0 -> 419 bytes graphics/pokemon/icons/hypno_icon.png | Bin 0 -> 391 bytes graphics/pokemon/icons/igglybuff_icon.png | Bin 0 -> 322 bytes graphics/pokemon/icons/illumise_icon.png | Bin 0 -> 325 bytes graphics/pokemon/icons/ivysaur_icon.png | Bin 0 -> 326 bytes graphics/pokemon/icons/jigglypuff_icon.png | Bin 0 -> 315 bytes graphics/pokemon/icons/jirachi_icon.png | Bin 0 -> 340 bytes graphics/pokemon/icons/jolteon_icon.png | Bin 0 -> 324 bytes graphics/pokemon/icons/jumpluff_icon.png | Bin 0 -> 398 bytes graphics/pokemon/icons/jynx_icon.png | Bin 0 -> 375 bytes graphics/pokemon/icons/kabuto_icon.png | Bin 0 -> 264 bytes graphics/pokemon/icons/kabutops_icon.png | Bin 0 -> 322 bytes graphics/pokemon/icons/kadabra_icon.png | Bin 0 -> 432 bytes graphics/pokemon/icons/kakuna_icon.png | Bin 0 -> 266 bytes graphics/pokemon/icons/kangaskhan_icon.png | Bin 0 -> 389 bytes graphics/pokemon/icons/kecleon_icon.png | Bin 0 -> 384 bytes graphics/pokemon/icons/kingdra_icon.png | Bin 0 -> 385 bytes graphics/pokemon/icons/kingler_icon.png | Bin 0 -> 440 bytes graphics/pokemon/icons/kirlia_icon.png | Bin 0 -> 351 bytes graphics/pokemon/icons/koffing_icon.png | Bin 0 -> 315 bytes graphics/pokemon/icons/krabby_icon.png | Bin 0 -> 432 bytes graphics/pokemon/icons/kyogre_icon.png | Bin 0 -> 444 bytes graphics/pokemon/icons/lairon_icon.png | Bin 0 -> 362 bytes graphics/pokemon/icons/lanturn_icon.png | Bin 0 -> 442 bytes graphics/pokemon/icons/lapras_icon.png | Bin 0 -> 409 bytes graphics/pokemon/icons/larvitar_icon.png | Bin 0 -> 304 bytes graphics/pokemon/icons/latias_icon.png | Bin 0 -> 396 bytes graphics/pokemon/icons/latios_icon.png | Bin 0 -> 396 bytes graphics/pokemon/icons/ledian_icon.png | Bin 0 -> 377 bytes graphics/pokemon/icons/ledyba_icon.png | Bin 0 -> 314 bytes graphics/pokemon/icons/lickitung_icon.png | Bin 0 -> 368 bytes graphics/pokemon/icons/lileep_icon.png | Bin 0 -> 361 bytes graphics/pokemon/icons/linoone_icon.png | Bin 0 -> 390 bytes graphics/pokemon/icons/lombre_icon.png | Bin 0 -> 319 bytes graphics/pokemon/icons/lotad_icon.png | Bin 0 -> 283 bytes graphics/pokemon/icons/loudred_icon.png | Bin 0 -> 387 bytes graphics/pokemon/icons/ludicolo_icon.png | Bin 0 -> 379 bytes graphics/pokemon/icons/lugia_icon.png | Bin 0 -> 454 bytes graphics/pokemon/icons/lunatone_icon.png | Bin 0 -> 261 bytes graphics/pokemon/icons/luvdisc_icon.png | Bin 0 -> 281 bytes graphics/pokemon/icons/machamp_icon.png | Bin 0 -> 414 bytes graphics/pokemon/icons/machoke_icon.png | Bin 0 -> 415 bytes graphics/pokemon/icons/machop_icon.png | Bin 0 -> 313 bytes graphics/pokemon/icons/magby_icon.png | Bin 0 -> 296 bytes graphics/pokemon/icons/magcargo_icon.png | Bin 0 -> 444 bytes graphics/pokemon/icons/magikarp_icon.png | Bin 0 -> 381 bytes graphics/pokemon/icons/magmar_icon.png | Bin 0 -> 398 bytes graphics/pokemon/icons/magnemite_icon.png | Bin 0 -> 289 bytes graphics/pokemon/icons/magneton_icon.png | Bin 0 -> 416 bytes graphics/pokemon/icons/makuhita_icon.png | Bin 0 -> 326 bytes graphics/pokemon/icons/manectric_icon.png | Bin 0 -> 316 bytes graphics/pokemon/icons/mankey_icon.png | Bin 0 -> 374 bytes graphics/pokemon/icons/mantine_icon.png | Bin 0 -> 374 bytes graphics/pokemon/icons/mareep_icon.png | Bin 0 -> 391 bytes graphics/pokemon/icons/marill_icon.png | Bin 0 -> 365 bytes graphics/pokemon/icons/marowak_icon.png | Bin 0 -> 388 bytes graphics/pokemon/icons/marshtomp_icon.png | Bin 0 -> 294 bytes graphics/pokemon/icons/masquerain_icon.png | Bin 0 -> 371 bytes graphics/pokemon/icons/mawile_icon.png | Bin 0 -> 433 bytes graphics/pokemon/icons/medicham_icon.png | Bin 0 -> 369 bytes graphics/pokemon/icons/meditite_icon.png | Bin 0 -> 329 bytes graphics/pokemon/icons/meganium_icon.png | Bin 0 -> 451 bytes graphics/pokemon/icons/meowth_icon.png | Bin 0 -> 304 bytes graphics/pokemon/icons/metagross_icon.png | Bin 0 -> 439 bytes graphics/pokemon/icons/metang_icon.png | Bin 0 -> 445 bytes graphics/pokemon/icons/metapod_icon.png | Bin 0 -> 241 bytes graphics/pokemon/icons/mew_icon.png | Bin 0 -> 377 bytes graphics/pokemon/icons/mewtwo_icon.png | Bin 0 -> 368 bytes graphics/pokemon/icons/mightyena_icon.png | Bin 0 -> 403 bytes graphics/pokemon/icons/milotic_icon.png | Bin 0 -> 455 bytes graphics/pokemon/icons/miltank_icon.png | Bin 0 -> 351 bytes graphics/pokemon/icons/minun_icon.png | Bin 0 -> 296 bytes graphics/pokemon/icons/misdreavus_icon.png | Bin 0 -> 369 bytes graphics/pokemon/icons/moltres_icon.png | Bin 0 -> 421 bytes graphics/pokemon/icons/mr_mime_icon.png | Bin 0 -> 311 bytes graphics/pokemon/icons/mudkip_icon.png | Bin 0 -> 353 bytes graphics/pokemon/icons/muk_icon.png | Bin 0 -> 441 bytes graphics/pokemon/icons/murkrow_icon.png | Bin 0 -> 370 bytes graphics/pokemon/icons/natu_icon.png | Bin 0 -> 318 bytes graphics/pokemon/icons/nidoking_icon.png | Bin 0 -> 420 bytes graphics/pokemon/icons/nidoqueen_icon.png | Bin 0 -> 374 bytes graphics/pokemon/icons/nidoran_f_icon.png | Bin 0 -> 287 bytes graphics/pokemon/icons/nidoran_m_icon.png | Bin 0 -> 326 bytes graphics/pokemon/icons/nidorina_icon.png | Bin 0 -> 325 bytes graphics/pokemon/icons/nidorino_icon.png | Bin 0 -> 324 bytes graphics/pokemon/icons/nincada_icon.png | Bin 0 -> 352 bytes graphics/pokemon/icons/ninetales_icon.png | Bin 0 -> 421 bytes graphics/pokemon/icons/ninjask_icon.png | Bin 0 -> 324 bytes graphics/pokemon/icons/noctowl_icon.png | Bin 0 -> 362 bytes graphics/pokemon/icons/nosepass_icon.png | Bin 0 -> 282 bytes graphics/pokemon/icons/numel_icon.png | Bin 0 -> 301 bytes graphics/pokemon/icons/nuzleaf_icon.png | Bin 0 -> 342 bytes graphics/pokemon/icons/octillery_icon.png | Bin 0 -> 349 bytes graphics/pokemon/icons/oddish_icon.png | Bin 0 -> 284 bytes graphics/pokemon/icons/omanyte_icon.png | Bin 0 -> 308 bytes graphics/pokemon/icons/omastar_icon.png | Bin 0 -> 350 bytes graphics/pokemon/icons/onix_icon.png | Bin 0 -> 456 bytes graphics/pokemon/icons/paras_icon.png | Bin 0 -> 387 bytes graphics/pokemon/icons/parasect_icon.png | Bin 0 -> 329 bytes graphics/pokemon/icons/pelipper_icon.png | Bin 0 -> 374 bytes graphics/pokemon/icons/persian_icon.png | Bin 0 -> 328 bytes graphics/pokemon/icons/phanpy_icon.png | Bin 0 -> 371 bytes graphics/pokemon/icons/pichu_icon.png | Bin 0 -> 281 bytes graphics/pokemon/icons/pidgeot_icon.png | Bin 0 -> 456 bytes graphics/pokemon/icons/pidgeotto_icon.png | Bin 0 -> 387 bytes graphics/pokemon/icons/pidgey_icon.png | Bin 0 -> 364 bytes graphics/pokemon/icons/pikachu_icon.png | Bin 0 -> 353 bytes graphics/pokemon/icons/piloswine_icon.png | Bin 0 -> 341 bytes graphics/pokemon/icons/pineco_icon.png | Bin 0 -> 290 bytes graphics/pokemon/icons/pinsir_icon.png | Bin 0 -> 334 bytes graphics/pokemon/icons/plusle_icon.png | Bin 0 -> 303 bytes graphics/pokemon/icons/politoed_icon.png | Bin 0 -> 428 bytes graphics/pokemon/icons/poliwag_icon.png | Bin 0 -> 339 bytes graphics/pokemon/icons/poliwhirl_icon.png | Bin 0 -> 348 bytes graphics/pokemon/icons/poliwrath_icon.png | Bin 0 -> 389 bytes graphics/pokemon/icons/ponyta_icon.png | Bin 0 -> 457 bytes graphics/pokemon/icons/poochyena_icon.png | Bin 0 -> 360 bytes graphics/pokemon/icons/porygon2_icon.png | Bin 0 -> 341 bytes graphics/pokemon/icons/porygon_icon.png | Bin 0 -> 386 bytes graphics/pokemon/icons/primeape_icon.png | Bin 0 -> 370 bytes graphics/pokemon/icons/psyduck_icon.png | Bin 0 -> 329 bytes graphics/pokemon/icons/pupitar_icon.png | Bin 0 -> 291 bytes graphics/pokemon/icons/quagsire_icon.png | Bin 0 -> 362 bytes graphics/pokemon/icons/question_mark_icon.png | Bin 0 -> 271 bytes graphics/pokemon/icons/quilava_icon.png | Bin 0 -> 402 bytes graphics/pokemon/icons/qwilfish_icon.png | Bin 0 -> 337 bytes graphics/pokemon/icons/raichu_icon.png | Bin 0 -> 411 bytes graphics/pokemon/icons/raikou_icon.png | Bin 0 -> 486 bytes graphics/pokemon/icons/ralts_icon.png | Bin 0 -> 262 bytes graphics/pokemon/icons/rapidash_icon.png | Bin 0 -> 478 bytes graphics/pokemon/icons/raticate_icon.png | Bin 0 -> 374 bytes graphics/pokemon/icons/rattata_icon.png | Bin 0 -> 318 bytes graphics/pokemon/icons/rayquaza_icon.png | Bin 0 -> 507 bytes graphics/pokemon/icons/regice_icon.png | Bin 0 -> 334 bytes graphics/pokemon/icons/regirock_icon.png | Bin 0 -> 379 bytes graphics/pokemon/icons/registeel_icon.png | Bin 0 -> 351 bytes graphics/pokemon/icons/relicanth_icon.png | Bin 0 -> 413 bytes graphics/pokemon/icons/remoraid_icon.png | Bin 0 -> 330 bytes graphics/pokemon/icons/rhydon_icon.png | Bin 0 -> 381 bytes graphics/pokemon/icons/rhyhorn_icon.png | Bin 0 -> 356 bytes graphics/pokemon/icons/roselia_icon.png | Bin 0 -> 414 bytes graphics/pokemon/icons/sableye_icon.png | Bin 0 -> 319 bytes graphics/pokemon/icons/salamence_icon.png | Bin 0 -> 477 bytes graphics/pokemon/icons/sandshrew_icon.png | Bin 0 -> 338 bytes graphics/pokemon/icons/sandslash_icon.png | Bin 0 -> 402 bytes graphics/pokemon/icons/sceptile_icon.png | Bin 0 -> 383 bytes graphics/pokemon/icons/scizor_icon.png | Bin 0 -> 447 bytes graphics/pokemon/icons/scyther_icon.png | Bin 0 -> 345 bytes graphics/pokemon/icons/seadra_icon.png | Bin 0 -> 351 bytes graphics/pokemon/icons/seaking_icon.png | Bin 0 -> 368 bytes graphics/pokemon/icons/sealeo_icon.png | Bin 0 -> 387 bytes graphics/pokemon/icons/seedot_icon.png | Bin 0 -> 271 bytes graphics/pokemon/icons/seel_icon.png | Bin 0 -> 382 bytes graphics/pokemon/icons/sentret_icon.png | Bin 0 -> 363 bytes graphics/pokemon/icons/seviper_icon.png | Bin 0 -> 368 bytes graphics/pokemon/icons/sharpedo_icon.png | Bin 0 -> 373 bytes graphics/pokemon/icons/shedinja_icon.png | Bin 0 -> 298 bytes graphics/pokemon/icons/shelgon_icon.png | Bin 0 -> 333 bytes graphics/pokemon/icons/shellder_icon.png | Bin 0 -> 295 bytes graphics/pokemon/icons/shiftry_icon.png | Bin 0 -> 349 bytes graphics/pokemon/icons/shroomish_icon.png | Bin 0 -> 317 bytes graphics/pokemon/icons/shuckle_icon.png | Bin 0 -> 334 bytes graphics/pokemon/icons/shuppet_icon.png | Bin 0 -> 275 bytes graphics/pokemon/icons/silcoon_icon.png | Bin 0 -> 329 bytes graphics/pokemon/icons/skarmory_icon.png | Bin 0 -> 418 bytes graphics/pokemon/icons/skiploom_icon.png | Bin 0 -> 375 bytes graphics/pokemon/icons/skitty_icon.png | Bin 0 -> 371 bytes graphics/pokemon/icons/slaking_icon.png | Bin 0 -> 437 bytes graphics/pokemon/icons/slakoth_icon.png | Bin 0 -> 319 bytes graphics/pokemon/icons/slowbro_icon.png | Bin 0 -> 446 bytes graphics/pokemon/icons/slowking_icon.png | Bin 0 -> 364 bytes graphics/pokemon/icons/slowpoke_icon.png | Bin 0 -> 342 bytes graphics/pokemon/icons/slugma_icon.png | Bin 0 -> 343 bytes graphics/pokemon/icons/smeargle_icon.png | Bin 0 -> 377 bytes graphics/pokemon/icons/smoochum_icon.png | Bin 0 -> 414 bytes graphics/pokemon/icons/sneasel_icon.png | Bin 0 -> 347 bytes graphics/pokemon/icons/snorlax_icon.png | Bin 0 -> 346 bytes graphics/pokemon/icons/snorunt_icon.png | Bin 0 -> 283 bytes graphics/pokemon/icons/snubbull_icon.png | Bin 0 -> 325 bytes graphics/pokemon/icons/solrock_icon.png | Bin 0 -> 286 bytes graphics/pokemon/icons/spearow_icon.png | Bin 0 -> 346 bytes graphics/pokemon/icons/spheal_icon.png | Bin 0 -> 317 bytes graphics/pokemon/icons/spinarak_icon.png | Bin 0 -> 345 bytes graphics/pokemon/icons/spinda_icon.png | Bin 0 -> 375 bytes graphics/pokemon/icons/spoink_icon.png | Bin 0 -> 277 bytes graphics/pokemon/icons/squirtle_icon.png | Bin 0 -> 344 bytes graphics/pokemon/icons/stantler_icon.png | Bin 0 -> 356 bytes graphics/pokemon/icons/starmie_icon.png | Bin 0 -> 380 bytes graphics/pokemon/icons/staryu_icon.png | Bin 0 -> 294 bytes graphics/pokemon/icons/steelix_icon.png | Bin 0 -> 433 bytes graphics/pokemon/icons/sudowoodo_icon.png | Bin 0 -> 395 bytes graphics/pokemon/icons/suicune_icon.png | Bin 0 -> 471 bytes graphics/pokemon/icons/sunflora_icon.png | Bin 0 -> 447 bytes graphics/pokemon/icons/sunkern_icon.png | Bin 0 -> 366 bytes graphics/pokemon/icons/surskit_icon.png | Bin 0 -> 325 bytes graphics/pokemon/icons/swablu_icon.png | Bin 0 -> 324 bytes graphics/pokemon/icons/swalot_icon.png | Bin 0 -> 315 bytes graphics/pokemon/icons/swampert_icon.png | Bin 0 -> 417 bytes graphics/pokemon/icons/swellow_icon.png | Bin 0 -> 369 bytes graphics/pokemon/icons/swinub_icon.png | Bin 0 -> 320 bytes graphics/pokemon/icons/taillow_icon.png | Bin 0 -> 329 bytes graphics/pokemon/icons/tangela_icon.png | Bin 0 -> 365 bytes graphics/pokemon/icons/tauros_icon.png | Bin 0 -> 421 bytes graphics/pokemon/icons/teddiursa_icon.png | Bin 0 -> 304 bytes graphics/pokemon/icons/tentacool_icon.png | Bin 0 -> 333 bytes graphics/pokemon/icons/tentacruel_icon.png | Bin 0 -> 486 bytes graphics/pokemon/icons/togepi_icon.png | Bin 0 -> 347 bytes graphics/pokemon/icons/togetic_icon.png | Bin 0 -> 324 bytes graphics/pokemon/icons/torchic_icon.png | Bin 0 -> 338 bytes graphics/pokemon/icons/torkoal_icon.png | Bin 0 -> 342 bytes graphics/pokemon/icons/totodile_icon.png | Bin 0 -> 331 bytes graphics/pokemon/icons/trapinch_icon.png | Bin 0 -> 314 bytes graphics/pokemon/icons/treecko_icon.png | Bin 0 -> 346 bytes graphics/pokemon/icons/tropius_icon.png | Bin 0 -> 422 bytes graphics/pokemon/icons/typhlosion_icon.png | Bin 0 -> 417 bytes graphics/pokemon/icons/tyranitar_icon.png | Bin 0 -> 435 bytes graphics/pokemon/icons/tyrogue_icon.png | Bin 0 -> 321 bytes graphics/pokemon/icons/umbreon_icon.png | Bin 0 -> 358 bytes graphics/pokemon/icons/unown_B_icon.png | Bin 0 -> 256 bytes graphics/pokemon/icons/unown_C_icon.png | Bin 0 -> 276 bytes graphics/pokemon/icons/unown_D_icon.png | Bin 0 -> 257 bytes graphics/pokemon/icons/unown_E_icon.png | Bin 0 -> 249 bytes graphics/pokemon/icons/unown_F_icon.png | Bin 0 -> 269 bytes graphics/pokemon/icons/unown_G_icon.png | Bin 0 -> 241 bytes graphics/pokemon/icons/unown_H_icon.png | Bin 0 -> 270 bytes graphics/pokemon/icons/unown_I_icon.png | Bin 0 -> 223 bytes graphics/pokemon/icons/unown_J_icon.png | Bin 0 -> 244 bytes graphics/pokemon/icons/unown_K_icon.png | Bin 0 -> 244 bytes graphics/pokemon/icons/unown_L_icon.png | Bin 0 -> 243 bytes graphics/pokemon/icons/unown_M_icon.png | Bin 0 -> 268 bytes graphics/pokemon/icons/unown_N_icon.png | Bin 0 -> 259 bytes graphics/pokemon/icons/unown_O_icon.png | Bin 0 -> 260 bytes graphics/pokemon/icons/unown_P_icon.png | Bin 0 -> 227 bytes graphics/pokemon/icons/unown_Q_icon.png | Bin 0 -> 238 bytes graphics/pokemon/icons/unown_R_icon.png | Bin 0 -> 232 bytes graphics/pokemon/icons/unown_S_icon.png | Bin 0 -> 259 bytes graphics/pokemon/icons/unown_T_icon.png | Bin 0 -> 241 bytes graphics/pokemon/icons/unown_U_icon.png | Bin 0 -> 250 bytes graphics/pokemon/icons/unown_V_icon.png | Bin 0 -> 255 bytes graphics/pokemon/icons/unown_W_icon.png | Bin 0 -> 261 bytes graphics/pokemon/icons/unown_X_icon.png | Bin 0 -> 255 bytes graphics/pokemon/icons/unown_Y_icon.png | Bin 0 -> 251 bytes graphics/pokemon/icons/unown_Z_icon.png | Bin 0 -> 244 bytes graphics/pokemon/icons/unown_a_icon.png | Bin 0 -> 245 bytes .../pokemon/icons/unown_exclamation_mark_icon.png | Bin 0 -> 220 bytes .../pokemon/icons/unown_question_mark_icon.png | Bin 0 -> 245 bytes graphics/pokemon/icons/ursaring_icon.png | Bin 0 -> 355 bytes graphics/pokemon/icons/vaporeon_icon.png | Bin 0 -> 393 bytes graphics/pokemon/icons/venomoth_icon.png | Bin 0 -> 400 bytes graphics/pokemon/icons/venonat_icon.png | Bin 0 -> 322 bytes graphics/pokemon/icons/venusaur_icon.png | Bin 0 -> 447 bytes graphics/pokemon/icons/vibrava_icon.png | Bin 0 -> 356 bytes graphics/pokemon/icons/victreebel_icon.png | Bin 0 -> 437 bytes graphics/pokemon/icons/vigoroth_icon.png | Bin 0 -> 358 bytes graphics/pokemon/icons/vileplume_icon.png | Bin 0 -> 410 bytes graphics/pokemon/icons/volbeat_icon.png | Bin 0 -> 335 bytes graphics/pokemon/icons/voltorb_icon.png | Bin 0 -> 242 bytes graphics/pokemon/icons/vulpix_icon.png | Bin 0 -> 307 bytes graphics/pokemon/icons/wailmer_icon.png | Bin 0 -> 359 bytes graphics/pokemon/icons/wailord_icon.png | Bin 0 -> 392 bytes graphics/pokemon/icons/walrein_icon.png | Bin 0 -> 473 bytes graphics/pokemon/icons/wartortle_icon.png | Bin 0 -> 371 bytes graphics/pokemon/icons/weedle_icon.png | Bin 0 -> 279 bytes graphics/pokemon/icons/weepinbell_icon.png | Bin 0 -> 365 bytes graphics/pokemon/icons/weezing_icon.png | Bin 0 -> 456 bytes graphics/pokemon/icons/whiscash_icon.png | Bin 0 -> 420 bytes graphics/pokemon/icons/whismur_icon.png | Bin 0 -> 291 bytes graphics/pokemon/icons/wigglytuff_icon.png | Bin 0 -> 327 bytes graphics/pokemon/icons/wingull_icon.png | Bin 0 -> 360 bytes graphics/pokemon/icons/wobbuffet_icon.png | Bin 0 -> 335 bytes graphics/pokemon/icons/wooper_icon.png | Bin 0 -> 307 bytes graphics/pokemon/icons/wurmple_icon.png | Bin 0 -> 331 bytes graphics/pokemon/icons/wynaut_icon.png | Bin 0 -> 353 bytes graphics/pokemon/icons/xatu_icon.png | Bin 0 -> 350 bytes graphics/pokemon/icons/yanma_icon.png | Bin 0 -> 388 bytes graphics/pokemon/icons/zangoose_icon.png | Bin 0 -> 419 bytes graphics/pokemon/icons/zapdos_icon.png | Bin 0 -> 375 bytes graphics/pokemon/icons/zigzagoon_icon.png | Bin 0 -> 347 bytes graphics/pokemon/icons/zubat_icon.png | Bin 0 -> 335 bytes graphics/pokemon/palettes/abra_palette.pal | 19 + graphics/pokemon/palettes/abra_shiny_palette.pal | 19 + graphics/pokemon/palettes/absol_palette.pal | 19 + graphics/pokemon/palettes/absol_shiny_palette.pal | 19 + graphics/pokemon/palettes/aerodactyl_palette.pal | 19 + .../pokemon/palettes/aerodactyl_shiny_palette.pal | 19 + graphics/pokemon/palettes/aggron_palette.pal | 19 + graphics/pokemon/palettes/aggron_shiny_palette.pal | 19 + graphics/pokemon/palettes/aipom_palette.pal | 19 + graphics/pokemon/palettes/aipom_shiny_palette.pal | 19 + graphics/pokemon/palettes/alakazam_palette.pal | 19 + .../pokemon/palettes/alakazam_shiny_palette.pal | 19 + graphics/pokemon/palettes/altaria_palette.pal | 19 + .../pokemon/palettes/altaria_shiny_palette.pal | 19 + graphics/pokemon/palettes/ampharos_palette.pal | 19 + .../pokemon/palettes/ampharos_shiny_palette.pal | 19 + graphics/pokemon/palettes/anorith_palette.pal | 19 + .../pokemon/palettes/anorith_shiny_palette.pal | 19 + graphics/pokemon/palettes/arbok_palette.pal | 19 + graphics/pokemon/palettes/arbok_shiny_palette.pal | 19 + graphics/pokemon/palettes/arcanine_palette.pal | 19 + .../pokemon/palettes/arcanine_shiny_palette.pal | 19 + graphics/pokemon/palettes/ariados_palette.pal | 19 + .../pokemon/palettes/ariados_shiny_palette.pal | 19 + graphics/pokemon/palettes/armaldo_palette.pal | 19 + .../pokemon/palettes/armaldo_shiny_palette.pal | 19 + graphics/pokemon/palettes/aron_palette.pal | 19 + graphics/pokemon/palettes/aron_shiny_palette.pal | 19 + graphics/pokemon/palettes/articuno_palette.pal | 19 + .../pokemon/palettes/articuno_shiny_palette.pal | 19 + graphics/pokemon/palettes/azumarill_palette.pal | 19 + .../pokemon/palettes/azumarill_shiny_palette.pal | 19 + graphics/pokemon/palettes/azurill_palette.pal | 19 + .../pokemon/palettes/azurill_shiny_palette.pal | 19 + graphics/pokemon/palettes/bagon_palette.pal | 19 + graphics/pokemon/palettes/bagon_shiny_palette.pal | 19 + graphics/pokemon/palettes/baltoy_palette.pal | 19 + graphics/pokemon/palettes/baltoy_shiny_palette.pal | 19 + graphics/pokemon/palettes/banette_palette.pal | 19 + .../pokemon/palettes/banette_shiny_palette.pal | 19 + graphics/pokemon/palettes/barboach_palette.pal | 19 + .../pokemon/palettes/barboach_shiny_palette.pal | 19 + graphics/pokemon/palettes/bayleef_palette.pal | 19 + .../pokemon/palettes/bayleef_shiny_palette.pal | 19 + graphics/pokemon/palettes/beautifly_palette.pal | 19 + .../pokemon/palettes/beautifly_shiny_palette.pal | 19 + graphics/pokemon/palettes/beedrill_palette.pal | 19 + .../pokemon/palettes/beedrill_shiny_palette.pal | 19 + graphics/pokemon/palettes/beldum_palette.pal | 19 + graphics/pokemon/palettes/beldum_shiny_palette.pal | 19 + graphics/pokemon/palettes/bellossom_palette.pal | 19 + .../pokemon/palettes/bellossom_shiny_palette.pal | 19 + graphics/pokemon/palettes/bellsprout_palette.pal | 19 + .../pokemon/palettes/bellsprout_shiny_palette.pal | 19 + graphics/pokemon/palettes/blastoise_palette.pal | 19 + .../pokemon/palettes/blastoise_shiny_palette.pal | 19 + graphics/pokemon/palettes/blaziken_palette.pal | 19 + .../pokemon/palettes/blaziken_shiny_palette.pal | 19 + graphics/pokemon/palettes/blissey_palette.pal | 19 + .../pokemon/palettes/blissey_shiny_palette.pal | 19 + graphics/pokemon/palettes/breloom_palette.pal | 19 + .../pokemon/palettes/breloom_shiny_palette.pal | 19 + graphics/pokemon/palettes/bulbasaur_palette.pal | 19 + .../pokemon/palettes/bulbasaur_shiny_palette.pal | 19 + graphics/pokemon/palettes/butterfree_palette.pal | 19 + .../pokemon/palettes/butterfree_shiny_palette.pal | 19 + graphics/pokemon/palettes/cacnea_palette.pal | 19 + graphics/pokemon/palettes/cacnea_shiny_palette.pal | 19 + graphics/pokemon/palettes/cacturne_palette.pal | 19 + .../pokemon/palettes/cacturne_shiny_palette.pal | 19 + graphics/pokemon/palettes/camerupt_palette.pal | 19 + .../pokemon/palettes/camerupt_shiny_palette.pal | 19 + graphics/pokemon/palettes/carvanha_palette.pal | 19 + .../pokemon/palettes/carvanha_shiny_palette.pal | 19 + graphics/pokemon/palettes/cascoon_palette.pal | 19 + .../pokemon/palettes/cascoon_shiny_palette.pal | 19 + .../palettes/castform_normal_form_palette.pal | 19 + .../castform_normal_form_shiny_palette.pal | 19 + .../palettes/castform_rainy_form_palette.pal | 19 + .../palettes/castform_rainy_form_shiny_palette.pal | 19 + .../palettes/castform_snowy_form_palette.pal | 19 + .../palettes/castform_snowy_form_shiny_palette.pal | 19 + .../palettes/castform_sunny_form_palette.pal | 19 + .../palettes/castform_sunny_form_shiny_palette.pal | 19 + graphics/pokemon/palettes/caterpie_palette.pal | 19 + .../pokemon/palettes/caterpie_shiny_palette.pal | 19 + graphics/pokemon/palettes/celebi_palette.pal | 19 + graphics/pokemon/palettes/celebi_shiny_palette.pal | 19 + graphics/pokemon/palettes/chansey_palette.pal | 19 + .../pokemon/palettes/chansey_shiny_palette.pal | 19 + graphics/pokemon/palettes/charizard_palette.pal | 19 + .../pokemon/palettes/charizard_shiny_palette.pal | 19 + graphics/pokemon/palettes/charmander_palette.pal | 19 + .../pokemon/palettes/charmander_shiny_palette.pal | 19 + graphics/pokemon/palettes/charmeleon_palette.pal | 19 + .../pokemon/palettes/charmeleon_shiny_palette.pal | 19 + graphics/pokemon/palettes/chikorita_palette.pal | 19 + .../pokemon/palettes/chikorita_shiny_palette.pal | 19 + graphics/pokemon/palettes/chimecho_palette.pal | 19 + .../pokemon/palettes/chimecho_shiny_palette.pal | 19 + graphics/pokemon/palettes/chinchou_palette.pal | 19 + .../pokemon/palettes/chinchou_shiny_palette.pal | 19 + graphics/pokemon/palettes/clamperl_palette.pal | 19 + .../pokemon/palettes/clamperl_shiny_palette.pal | 19 + graphics/pokemon/palettes/claydol_palette.pal | 19 + .../pokemon/palettes/claydol_shiny_palette.pal | 19 + graphics/pokemon/palettes/clefable_palette.pal | 19 + .../pokemon/palettes/clefable_shiny_palette.pal | 19 + graphics/pokemon/palettes/clefairy_palette.pal | 19 + .../pokemon/palettes/clefairy_shiny_palette.pal | 19 + graphics/pokemon/palettes/cleffa_palette.pal | 19 + graphics/pokemon/palettes/cleffa_shiny_palette.pal | 19 + graphics/pokemon/palettes/cloyster_palette.pal | 19 + .../pokemon/palettes/cloyster_shiny_palette.pal | 19 + graphics/pokemon/palettes/combusken_palette.pal | 19 + .../pokemon/palettes/combusken_shiny_palette.pal | 19 + graphics/pokemon/palettes/corphish_palette.pal | 19 + .../pokemon/palettes/corphish_shiny_palette.pal | 19 + graphics/pokemon/palettes/corsola_palette.pal | 19 + .../pokemon/palettes/corsola_shiny_palette.pal | 19 + graphics/pokemon/palettes/cradily_palette.pal | 19 + .../pokemon/palettes/cradily_shiny_palette.pal | 19 + graphics/pokemon/palettes/crawdaunt_palette.pal | 19 + .../pokemon/palettes/crawdaunt_shiny_palette.pal | 19 + graphics/pokemon/palettes/crobat_palette.pal | 19 + graphics/pokemon/palettes/crobat_shiny_palette.pal | 19 + graphics/pokemon/palettes/croconaw_palette.pal | 19 + .../pokemon/palettes/croconaw_shiny_palette.pal | 19 + graphics/pokemon/palettes/cubone_palette.pal | 19 + graphics/pokemon/palettes/cubone_shiny_palette.pal | 19 + graphics/pokemon/palettes/cyndaquil_palette.pal | 19 + .../pokemon/palettes/cyndaquil_shiny_palette.pal | 19 + graphics/pokemon/palettes/delcatty_palette.pal | 19 + .../pokemon/palettes/delcatty_shiny_palette.pal | 19 + graphics/pokemon/palettes/delibird_palette.pal | 19 + .../pokemon/palettes/delibird_shiny_palette.pal | 19 + graphics/pokemon/palettes/deoxys_palette.pal | 19 + graphics/pokemon/palettes/deoxys_shiny_palette.pal | 19 + graphics/pokemon/palettes/dewgong_palette.pal | 19 + .../pokemon/palettes/dewgong_shiny_palette.pal | 19 + graphics/pokemon/palettes/diglett_palette.pal | 19 + .../pokemon/palettes/diglett_shiny_palette.pal | 19 + graphics/pokemon/palettes/ditto_palette.pal | 19 + graphics/pokemon/palettes/ditto_shiny_palette.pal | 19 + graphics/pokemon/palettes/dodrio_palette.pal | 19 + graphics/pokemon/palettes/dodrio_shiny_palette.pal | 19 + graphics/pokemon/palettes/doduo_palette.pal | 19 + graphics/pokemon/palettes/doduo_shiny_palette.pal | 19 + graphics/pokemon/palettes/donphan_palette.pal | 19 + .../pokemon/palettes/donphan_shiny_palette.pal | 19 + .../palettes/double_question_mark_palette.pal | 19 + .../double_question_mark_shiny_palette.pal | 19 + graphics/pokemon/palettes/dragonair_palette.pal | 19 + .../pokemon/palettes/dragonair_shiny_palette.pal | 19 + graphics/pokemon/palettes/dragonite_palette.pal | 19 + .../pokemon/palettes/dragonite_shiny_palette.pal | 19 + graphics/pokemon/palettes/dratini_palette.pal | 19 + .../pokemon/palettes/dratini_shiny_palette.pal | 19 + graphics/pokemon/palettes/drowzee_palette.pal | 19 + .../pokemon/palettes/drowzee_shiny_palette.pal | 19 + graphics/pokemon/palettes/dugtrio_palette.pal | 19 + .../pokemon/palettes/dugtrio_shiny_palette.pal | 19 + graphics/pokemon/palettes/dunsparce_palette.pal | 19 + .../pokemon/palettes/dunsparce_shiny_palette.pal | 19 + graphics/pokemon/palettes/dusclops_palette.pal | 19 + .../pokemon/palettes/dusclops_shiny_palette.pal | 19 + graphics/pokemon/palettes/duskull_palette.pal | 19 + .../pokemon/palettes/duskull_shiny_palette.pal | 19 + graphics/pokemon/palettes/dustox_palette.pal | 19 + graphics/pokemon/palettes/dustox_shiny_palette.pal | 19 + graphics/pokemon/palettes/eevee_palette.pal | 19 + graphics/pokemon/palettes/eevee_shiny_palette.pal | 19 + graphics/pokemon/palettes/egg_palette.pal | 19 + graphics/pokemon/palettes/ekans_palette.pal | 19 + graphics/pokemon/palettes/ekans_shiny_palette.pal | 19 + graphics/pokemon/palettes/electabuzz_palette.pal | 19 + .../pokemon/palettes/electabuzz_shiny_palette.pal | 19 + graphics/pokemon/palettes/electrike_palette.pal | 19 + .../pokemon/palettes/electrike_shiny_palette.pal | 19 + graphics/pokemon/palettes/electrode_palette.pal | 19 + .../pokemon/palettes/electrode_shiny_palette.pal | 19 + graphics/pokemon/palettes/elekid_palette.pal | 19 + graphics/pokemon/palettes/elekid_shiny_palette.pal | 19 + graphics/pokemon/palettes/entei_palette.pal | 19 + graphics/pokemon/palettes/entei_shiny_palette.pal | 19 + graphics/pokemon/palettes/espeon_palette.pal | 19 + graphics/pokemon/palettes/espeon_shiny_palette.pal | 19 + graphics/pokemon/palettes/exeggcute_palette.pal | 19 + .../pokemon/palettes/exeggcute_shiny_palette.pal | 19 + graphics/pokemon/palettes/exeggutor_palette.pal | 19 + .../pokemon/palettes/exeggutor_shiny_palette.pal | 19 + graphics/pokemon/palettes/exploud_palette.pal | 19 + .../pokemon/palettes/exploud_shiny_palette.pal | 19 + graphics/pokemon/palettes/farfetch_d_palette.pal | 19 + .../pokemon/palettes/farfetch_d_shiny_palette.pal | 19 + graphics/pokemon/palettes/fearow_palette.pal | 19 + graphics/pokemon/palettes/fearow_shiny_palette.pal | 19 + graphics/pokemon/palettes/feebas_palette.pal | 19 + graphics/pokemon/palettes/feebas_shiny_palette.pal | 19 + graphics/pokemon/palettes/feraligatr_palette.pal | 19 + .../pokemon/palettes/feraligatr_shiny_palette.pal | 19 + graphics/pokemon/palettes/flaaffy_palette.pal | 19 + .../pokemon/palettes/flaaffy_shiny_palette.pal | 19 + graphics/pokemon/palettes/flareon_palette.pal | 19 + .../pokemon/palettes/flareon_shiny_palette.pal | 19 + graphics/pokemon/palettes/flygon_palette.pal | 19 + graphics/pokemon/palettes/flygon_shiny_palette.pal | 19 + graphics/pokemon/palettes/forretress_palette.pal | 19 + .../pokemon/palettes/forretress_shiny_palette.pal | 19 + graphics/pokemon/palettes/furret_palette.pal | 19 + graphics/pokemon/palettes/furret_shiny_palette.pal | 19 + graphics/pokemon/palettes/gardevoir_palette.pal | 19 + .../pokemon/palettes/gardevoir_shiny_palette.pal | 19 + graphics/pokemon/palettes/gastly_palette.pal | 19 + graphics/pokemon/palettes/gastly_shiny_palette.pal | 19 + graphics/pokemon/palettes/gengar_palette.pal | 19 + graphics/pokemon/palettes/gengar_shiny_palette.pal | 19 + graphics/pokemon/palettes/geodude_palette.pal | 19 + .../pokemon/palettes/geodude_shiny_palette.pal | 19 + graphics/pokemon/palettes/girafarig_palette.pal | 19 + .../pokemon/palettes/girafarig_shiny_palette.pal | 19 + graphics/pokemon/palettes/glalie_palette.pal | 19 + graphics/pokemon/palettes/glalie_shiny_palette.pal | 19 + graphics/pokemon/palettes/gligar_palette.pal | 19 + graphics/pokemon/palettes/gligar_shiny_palette.pal | 19 + graphics/pokemon/palettes/gloom_palette.pal | 19 + graphics/pokemon/palettes/gloom_shiny_palette.pal | 19 + graphics/pokemon/palettes/golbat_palette.pal | 19 + graphics/pokemon/palettes/golbat_shiny_palette.pal | 19 + graphics/pokemon/palettes/goldeen_palette.pal | 19 + .../pokemon/palettes/goldeen_shiny_palette.pal | 19 + graphics/pokemon/palettes/golduck_palette.pal | 19 + .../pokemon/palettes/golduck_shiny_palette.pal | 19 + graphics/pokemon/palettes/golem_palette.pal | 19 + graphics/pokemon/palettes/golem_shiny_palette.pal | 19 + graphics/pokemon/palettes/gorebyss_palette.pal | 19 + .../pokemon/palettes/gorebyss_shiny_palette.pal | 19 + graphics/pokemon/palettes/granbull_palette.pal | 19 + .../pokemon/palettes/granbull_shiny_palette.pal | 19 + graphics/pokemon/palettes/graveler_palette.pal | 19 + .../pokemon/palettes/graveler_shiny_palette.pal | 19 + graphics/pokemon/palettes/grimer_palette.pal | 19 + graphics/pokemon/palettes/grimer_shiny_palette.pal | 19 + graphics/pokemon/palettes/groudon_palette.pal | 19 + .../pokemon/palettes/groudon_shiny_palette.pal | 19 + graphics/pokemon/palettes/grovyle_palette.pal | 19 + .../pokemon/palettes/grovyle_shiny_palette.pal | 19 + graphics/pokemon/palettes/growlithe_palette.pal | 19 + .../pokemon/palettes/growlithe_shiny_palette.pal | 19 + graphics/pokemon/palettes/grumpig_palette.pal | 19 + .../pokemon/palettes/grumpig_shiny_palette.pal | 19 + graphics/pokemon/palettes/gulpin_palette.pal | 19 + graphics/pokemon/palettes/gulpin_shiny_palette.pal | 19 + graphics/pokemon/palettes/gyarados_palette.pal | 19 + .../pokemon/palettes/gyarados_shiny_palette.pal | 19 + graphics/pokemon/palettes/hariyama_palette.pal | 19 + .../pokemon/palettes/hariyama_shiny_palette.pal | 19 + graphics/pokemon/palettes/haunter_palette.pal | 19 + .../pokemon/palettes/haunter_shiny_palette.pal | 19 + graphics/pokemon/palettes/heracross_palette.pal | 19 + .../pokemon/palettes/heracross_shiny_palette.pal | 19 + graphics/pokemon/palettes/hitmonchan_palette.pal | 19 + .../pokemon/palettes/hitmonchan_shiny_palette.pal | 19 + graphics/pokemon/palettes/hitmonlee_palette.pal | 19 + .../pokemon/palettes/hitmonlee_shiny_palette.pal | 19 + graphics/pokemon/palettes/hitmontop_palette.pal | 19 + .../pokemon/palettes/hitmontop_shiny_palette.pal | 19 + graphics/pokemon/palettes/ho_oh_palette.pal | 19 + graphics/pokemon/palettes/ho_oh_shiny_palette.pal | 19 + graphics/pokemon/palettes/hoothoot_palette.pal | 19 + .../pokemon/palettes/hoothoot_shiny_palette.pal | 19 + graphics/pokemon/palettes/hoppip_palette.pal | 19 + graphics/pokemon/palettes/hoppip_shiny_palette.pal | 19 + graphics/pokemon/palettes/horsea_palette.pal | 19 + graphics/pokemon/palettes/horsea_shiny_palette.pal | 19 + graphics/pokemon/palettes/houndoom_palette.pal | 19 + .../pokemon/palettes/houndoom_shiny_palette.pal | 19 + graphics/pokemon/palettes/houndour_palette.pal | 19 + .../pokemon/palettes/houndour_shiny_palette.pal | 19 + graphics/pokemon/palettes/huntail_palette.pal | 19 + .../pokemon/palettes/huntail_shiny_palette.pal | 19 + graphics/pokemon/palettes/hypno_palette.pal | 19 + graphics/pokemon/palettes/hypno_shiny_palette.pal | 19 + graphics/pokemon/palettes/igglybuff_palette.pal | 19 + .../pokemon/palettes/igglybuff_shiny_palette.pal | 19 + graphics/pokemon/palettes/illumise_palette.pal | 19 + .../pokemon/palettes/illumise_shiny_palette.pal | 19 + graphics/pokemon/palettes/ivysaur_palette.pal | 19 + .../pokemon/palettes/ivysaur_shiny_palette.pal | 19 + graphics/pokemon/palettes/jigglypuff_palette.pal | 19 + .../pokemon/palettes/jigglypuff_shiny_palette.pal | 19 + graphics/pokemon/palettes/jirachi_palette.pal | 19 + .../pokemon/palettes/jirachi_shiny_palette.pal | 19 + graphics/pokemon/palettes/jolteon_palette.pal | 19 + .../pokemon/palettes/jolteon_shiny_palette.pal | 19 + graphics/pokemon/palettes/jumpluff_palette.pal | 19 + .../pokemon/palettes/jumpluff_shiny_palette.pal | 19 + graphics/pokemon/palettes/jynx_palette.pal | 19 + graphics/pokemon/palettes/jynx_shiny_palette.pal | 19 + graphics/pokemon/palettes/kabuto_palette.pal | 19 + graphics/pokemon/palettes/kabuto_shiny_palette.pal | 19 + graphics/pokemon/palettes/kabutops_palette.pal | 19 + .../pokemon/palettes/kabutops_shiny_palette.pal | 19 + graphics/pokemon/palettes/kadabra_palette.pal | 19 + .../pokemon/palettes/kadabra_shiny_palette.pal | 19 + graphics/pokemon/palettes/kakuna_palette.pal | 19 + graphics/pokemon/palettes/kakuna_shiny_palette.pal | 19 + graphics/pokemon/palettes/kangaskhan_palette.pal | 19 + .../pokemon/palettes/kangaskhan_shiny_palette.pal | 19 + graphics/pokemon/palettes/kecleon_palette.pal | 19 + .../pokemon/palettes/kecleon_shiny_palette.pal | 19 + graphics/pokemon/palettes/kingdra_palette.pal | 19 + .../pokemon/palettes/kingdra_shiny_palette.pal | 19 + graphics/pokemon/palettes/kingler_palette.pal | 19 + .../pokemon/palettes/kingler_shiny_palette.pal | 19 + graphics/pokemon/palettes/kirlia_palette.pal | 19 + graphics/pokemon/palettes/kirlia_shiny_palette.pal | 19 + graphics/pokemon/palettes/koffing_palette.pal | 19 + .../pokemon/palettes/koffing_shiny_palette.pal | 19 + graphics/pokemon/palettes/krabby_palette.pal | 19 + graphics/pokemon/palettes/krabby_shiny_palette.pal | 19 + graphics/pokemon/palettes/kyogre_palette.pal | 19 + graphics/pokemon/palettes/kyogre_shiny_palette.pal | 19 + graphics/pokemon/palettes/lairon_palette.pal | 19 + graphics/pokemon/palettes/lairon_shiny_palette.pal | 19 + graphics/pokemon/palettes/lanturn_palette.pal | 19 + .../pokemon/palettes/lanturn_shiny_palette.pal | 19 + graphics/pokemon/palettes/lapras_palette.pal | 19 + graphics/pokemon/palettes/lapras_shiny_palette.pal | 19 + graphics/pokemon/palettes/larvitar_palette.pal | 19 + .../pokemon/palettes/larvitar_shiny_palette.pal | 19 + graphics/pokemon/palettes/latias_palette.pal | 19 + graphics/pokemon/palettes/latias_shiny_palette.pal | 19 + graphics/pokemon/palettes/latios_palette.pal | 19 + graphics/pokemon/palettes/latios_shiny_palette.pal | 19 + graphics/pokemon/palettes/ledian_palette.pal | 19 + graphics/pokemon/palettes/ledian_shiny_palette.pal | 19 + graphics/pokemon/palettes/ledyba_palette.pal | 19 + graphics/pokemon/palettes/ledyba_shiny_palette.pal | 19 + graphics/pokemon/palettes/lickitung_palette.pal | 19 + .../pokemon/palettes/lickitung_shiny_palette.pal | 19 + graphics/pokemon/palettes/lileep_palette.pal | 19 + graphics/pokemon/palettes/lileep_shiny_palette.pal | 19 + graphics/pokemon/palettes/linoone_palette.pal | 19 + .../pokemon/palettes/linoone_shiny_palette.pal | 19 + graphics/pokemon/palettes/lombre_palette.pal | 19 + graphics/pokemon/palettes/lombre_shiny_palette.pal | 19 + graphics/pokemon/palettes/lotad_palette.pal | 19 + graphics/pokemon/palettes/lotad_shiny_palette.pal | 19 + graphics/pokemon/palettes/loudred_palette.pal | 19 + .../pokemon/palettes/loudred_shiny_palette.pal | 19 + graphics/pokemon/palettes/ludicolo_palette.pal | 19 + .../pokemon/palettes/ludicolo_shiny_palette.pal | 19 + graphics/pokemon/palettes/lugia_palette.pal | 19 + graphics/pokemon/palettes/lugia_shiny_palette.pal | 19 + graphics/pokemon/palettes/lunatone_palette.pal | 19 + .../pokemon/palettes/lunatone_shiny_palette.pal | 19 + graphics/pokemon/palettes/luvdisc_palette.pal | 19 + .../pokemon/palettes/luvdisc_shiny_palette.pal | 19 + graphics/pokemon/palettes/machamp_palette.pal | 19 + .../pokemon/palettes/machamp_shiny_palette.pal | 19 + graphics/pokemon/palettes/machoke_palette.pal | 19 + .../pokemon/palettes/machoke_shiny_palette.pal | 19 + graphics/pokemon/palettes/machop_palette.pal | 19 + graphics/pokemon/palettes/machop_shiny_palette.pal | 19 + graphics/pokemon/palettes/magby_palette.pal | 19 + graphics/pokemon/palettes/magby_shiny_palette.pal | 19 + graphics/pokemon/palettes/magcargo_palette.pal | 19 + .../pokemon/palettes/magcargo_shiny_palette.pal | 19 + graphics/pokemon/palettes/magikarp_palette.pal | 19 + .../pokemon/palettes/magikarp_shiny_palette.pal | 19 + graphics/pokemon/palettes/magmar_palette.pal | 19 + graphics/pokemon/palettes/magmar_shiny_palette.pal | 19 + graphics/pokemon/palettes/magnemite_palette.pal | 19 + .../pokemon/palettes/magnemite_shiny_palette.pal | 19 + graphics/pokemon/palettes/magneton_palette.pal | 19 + .../pokemon/palettes/magneton_shiny_palette.pal | 19 + graphics/pokemon/palettes/makuhita_palette.pal | 19 + .../pokemon/palettes/makuhita_shiny_palette.pal | 19 + graphics/pokemon/palettes/manectric_palette.pal | 19 + .../pokemon/palettes/manectric_shiny_palette.pal | 19 + graphics/pokemon/palettes/mankey_palette.pal | 19 + graphics/pokemon/palettes/mankey_shiny_palette.pal | 19 + graphics/pokemon/palettes/mantine_palette.pal | 19 + .../pokemon/palettes/mantine_shiny_palette.pal | 19 + graphics/pokemon/palettes/mareep_palette.pal | 19 + graphics/pokemon/palettes/mareep_shiny_palette.pal | 19 + graphics/pokemon/palettes/marill_palette.pal | 19 + graphics/pokemon/palettes/marill_shiny_palette.pal | 19 + graphics/pokemon/palettes/marowak_palette.pal | 19 + .../pokemon/palettes/marowak_shiny_palette.pal | 19 + graphics/pokemon/palettes/marshtomp_palette.pal | 19 + .../pokemon/palettes/marshtomp_shiny_palette.pal | 19 + graphics/pokemon/palettes/masquerain_palette.pal | 19 + .../pokemon/palettes/masquerain_shiny_palette.pal | 19 + graphics/pokemon/palettes/mawile_palette.pal | 19 + graphics/pokemon/palettes/mawile_shiny_palette.pal | 19 + graphics/pokemon/palettes/medicham_palette.pal | 19 + .../pokemon/palettes/medicham_shiny_palette.pal | 19 + graphics/pokemon/palettes/meditite_palette.pal | 19 + .../pokemon/palettes/meditite_shiny_palette.pal | 19 + graphics/pokemon/palettes/meganium_palette.pal | 19 + .../pokemon/palettes/meganium_shiny_palette.pal | 19 + graphics/pokemon/palettes/meowth_palette.pal | 19 + graphics/pokemon/palettes/meowth_shiny_palette.pal | 19 + graphics/pokemon/palettes/metagross_palette.pal | 19 + .../pokemon/palettes/metagross_shiny_palette.pal | 19 + graphics/pokemon/palettes/metang_palette.pal | 19 + graphics/pokemon/palettes/metang_shiny_palette.pal | 19 + graphics/pokemon/palettes/metapod_palette.pal | 19 + .../pokemon/palettes/metapod_shiny_palette.pal | 19 + graphics/pokemon/palettes/mew_palette.pal | 19 + graphics/pokemon/palettes/mew_shiny_palette.pal | 19 + graphics/pokemon/palettes/mewtwo_palette.pal | 19 + graphics/pokemon/palettes/mewtwo_shiny_palette.pal | 19 + graphics/pokemon/palettes/mightyena_palette.pal | 19 + .../pokemon/palettes/mightyena_shiny_palette.pal | 19 + graphics/pokemon/palettes/milotic_palette.pal | 19 + .../pokemon/palettes/milotic_shiny_palette.pal | 19 + graphics/pokemon/palettes/miltank_palette.pal | 19 + .../pokemon/palettes/miltank_shiny_palette.pal | 19 + graphics/pokemon/palettes/minun_palette.pal | 19 + graphics/pokemon/palettes/minun_shiny_palette.pal | 19 + graphics/pokemon/palettes/misdreavus_palette.pal | 19 + .../pokemon/palettes/misdreavus_shiny_palette.pal | 19 + graphics/pokemon/palettes/moltres_palette.pal | 19 + .../pokemon/palettes/moltres_shiny_palette.pal | 19 + graphics/pokemon/palettes/mr_mime_palette.pal | 19 + .../pokemon/palettes/mr_mime_shiny_palette.pal | 19 + graphics/pokemon/palettes/mudkip_palette.pal | 19 + graphics/pokemon/palettes/mudkip_shiny_palette.pal | 19 + graphics/pokemon/palettes/muk_palette.pal | 19 + graphics/pokemon/palettes/muk_shiny_palette.pal | 19 + graphics/pokemon/palettes/murkrow_palette.pal | 19 + .../pokemon/palettes/murkrow_shiny_palette.pal | 19 + graphics/pokemon/palettes/natu_palette.pal | 19 + graphics/pokemon/palettes/natu_shiny_palette.pal | 19 + graphics/pokemon/palettes/nidoking_palette.pal | 19 + .../pokemon/palettes/nidoking_shiny_palette.pal | 19 + graphics/pokemon/palettes/nidoqueen_palette.pal | 19 + .../pokemon/palettes/nidoqueen_shiny_palette.pal | 19 + graphics/pokemon/palettes/nidoran_f_palette.pal | 19 + .../pokemon/palettes/nidoran_f_shiny_palette.pal | 19 + graphics/pokemon/palettes/nidoran_m_palette.pal | 19 + .../pokemon/palettes/nidoran_m_shiny_palette.pal | 19 + graphics/pokemon/palettes/nidorina_palette.pal | 19 + .../pokemon/palettes/nidorina_shiny_palette.pal | 19 + graphics/pokemon/palettes/nidorino_palette.pal | 19 + .../pokemon/palettes/nidorino_shiny_palette.pal | 19 + graphics/pokemon/palettes/nincada_palette.pal | 19 + .../pokemon/palettes/nincada_shiny_palette.pal | 19 + graphics/pokemon/palettes/ninetales_palette.pal | 19 + .../pokemon/palettes/ninetales_shiny_palette.pal | 19 + graphics/pokemon/palettes/ninjask_palette.pal | 19 + .../pokemon/palettes/ninjask_shiny_palette.pal | 19 + graphics/pokemon/palettes/noctowl_palette.pal | 19 + .../pokemon/palettes/noctowl_shiny_palette.pal | 19 + graphics/pokemon/palettes/nosepass_palette.pal | 19 + .../pokemon/palettes/nosepass_shiny_palette.pal | 19 + graphics/pokemon/palettes/numel_palette.pal | 19 + graphics/pokemon/palettes/numel_shiny_palette.pal | 19 + graphics/pokemon/palettes/nuzleaf_palette.pal | 19 + .../pokemon/palettes/nuzleaf_shiny_palette.pal | 19 + graphics/pokemon/palettes/octillery_palette.pal | 19 + .../pokemon/palettes/octillery_shiny_palette.pal | 19 + graphics/pokemon/palettes/oddish_palette.pal | 19 + graphics/pokemon/palettes/oddish_shiny_palette.pal | 19 + graphics/pokemon/palettes/omanyte_palette.pal | 19 + .../pokemon/palettes/omanyte_shiny_palette.pal | 19 + graphics/pokemon/palettes/omastar_palette.pal | 19 + .../pokemon/palettes/omastar_shiny_palette.pal | 19 + graphics/pokemon/palettes/onix_palette.pal | 19 + graphics/pokemon/palettes/onix_shiny_palette.pal | 19 + graphics/pokemon/palettes/paras_palette.pal | 19 + graphics/pokemon/palettes/paras_shiny_palette.pal | 19 + graphics/pokemon/palettes/parasect_palette.pal | 19 + .../pokemon/palettes/parasect_shiny_palette.pal | 19 + graphics/pokemon/palettes/pelipper_palette.pal | 19 + .../pokemon/palettes/pelipper_shiny_palette.pal | 19 + graphics/pokemon/palettes/persian_palette.pal | 19 + .../pokemon/palettes/persian_shiny_palette.pal | 19 + graphics/pokemon/palettes/phanpy_palette.pal | 19 + graphics/pokemon/palettes/phanpy_shiny_palette.pal | 19 + graphics/pokemon/palettes/pichu_palette.pal | 19 + graphics/pokemon/palettes/pichu_shiny_palette.pal | 19 + graphics/pokemon/palettes/pidgeot_palette.pal | 19 + .../pokemon/palettes/pidgeot_shiny_palette.pal | 19 + graphics/pokemon/palettes/pidgeotto_palette.pal | 19 + .../pokemon/palettes/pidgeotto_shiny_palette.pal | 19 + graphics/pokemon/palettes/pidgey_palette.pal | 19 + graphics/pokemon/palettes/pidgey_shiny_palette.pal | 19 + graphics/pokemon/palettes/pikachu_palette.pal | 19 + .../pokemon/palettes/pikachu_shiny_palette.pal | 19 + graphics/pokemon/palettes/piloswine_palette.pal | 19 + .../pokemon/palettes/piloswine_shiny_palette.pal | 19 + graphics/pokemon/palettes/pineco_palette.pal | 19 + graphics/pokemon/palettes/pineco_shiny_palette.pal | 19 + graphics/pokemon/palettes/pinsir_palette.pal | 19 + graphics/pokemon/palettes/pinsir_shiny_palette.pal | 19 + graphics/pokemon/palettes/plusle_palette.pal | 19 + graphics/pokemon/palettes/plusle_shiny_palette.pal | 19 + graphics/pokemon/palettes/politoed_palette.pal | 19 + .../pokemon/palettes/politoed_shiny_palette.pal | 19 + graphics/pokemon/palettes/poliwag_palette.pal | 19 + .../pokemon/palettes/poliwag_shiny_palette.pal | 19 + graphics/pokemon/palettes/poliwhirl_palette.pal | 19 + .../pokemon/palettes/poliwhirl_shiny_palette.pal | 19 + graphics/pokemon/palettes/poliwrath_palette.pal | 19 + .../pokemon/palettes/poliwrath_shiny_palette.pal | 19 + graphics/pokemon/palettes/ponyta_palette.pal | 19 + graphics/pokemon/palettes/ponyta_shiny_palette.pal | 19 + graphics/pokemon/palettes/poochyena_palette.pal | 19 + .../pokemon/palettes/poochyena_shiny_palette.pal | 19 + graphics/pokemon/palettes/porygon2_palette.pal | 19 + .../pokemon/palettes/porygon2_shiny_palette.pal | 19 + graphics/pokemon/palettes/porygon_palette.pal | 19 + .../pokemon/palettes/porygon_shiny_palette.pal | 19 + graphics/pokemon/palettes/primeape_palette.pal | 19 + .../pokemon/palettes/primeape_shiny_palette.pal | 19 + graphics/pokemon/palettes/psyduck_palette.pal | 19 + .../pokemon/palettes/psyduck_shiny_palette.pal | 19 + graphics/pokemon/palettes/pupitar_palette.pal | 19 + .../pokemon/palettes/pupitar_shiny_palette.pal | 19 + graphics/pokemon/palettes/quagsire_palette.pal | 19 + .../pokemon/palettes/quagsire_shiny_palette.pal | 19 + graphics/pokemon/palettes/quilava_palette.pal | 19 + .../pokemon/palettes/quilava_shiny_palette.pal | 19 + graphics/pokemon/palettes/qwilfish_palette.pal | 19 + .../pokemon/palettes/qwilfish_shiny_palette.pal | 19 + graphics/pokemon/palettes/raichu_palette.pal | 19 + graphics/pokemon/palettes/raichu_shiny_palette.pal | 19 + graphics/pokemon/palettes/raikou_palette.pal | 19 + graphics/pokemon/palettes/raikou_shiny_palette.pal | 19 + graphics/pokemon/palettes/ralts_palette.pal | 19 + graphics/pokemon/palettes/ralts_shiny_palette.pal | 19 + graphics/pokemon/palettes/rapidash_palette.pal | 19 + .../pokemon/palettes/rapidash_shiny_palette.pal | 19 + graphics/pokemon/palettes/raticate_palette.pal | 19 + .../pokemon/palettes/raticate_shiny_palette.pal | 19 + graphics/pokemon/palettes/rattata_palette.pal | 19 + .../pokemon/palettes/rattata_shiny_palette.pal | 19 + graphics/pokemon/palettes/rayquaza_palette.pal | 19 + .../pokemon/palettes/rayquaza_shiny_palette.pal | 19 + graphics/pokemon/palettes/regice_palette.pal | 19 + graphics/pokemon/palettes/regice_shiny_palette.pal | 19 + graphics/pokemon/palettes/regirock_palette.pal | 19 + .../pokemon/palettes/regirock_shiny_palette.pal | 19 + graphics/pokemon/palettes/registeel_palette.pal | 19 + .../pokemon/palettes/registeel_shiny_palette.pal | 19 + graphics/pokemon/palettes/relicanth_palette.pal | 19 + .../pokemon/palettes/relicanth_shiny_palette.pal | 19 + graphics/pokemon/palettes/remoraid_palette.pal | 19 + .../pokemon/palettes/remoraid_shiny_palette.pal | 19 + graphics/pokemon/palettes/rhydon_palette.pal | 19 + graphics/pokemon/palettes/rhydon_shiny_palette.pal | 19 + graphics/pokemon/palettes/rhyhorn_palette.pal | 19 + .../pokemon/palettes/rhyhorn_shiny_palette.pal | 19 + graphics/pokemon/palettes/roselia_palette.pal | 19 + .../pokemon/palettes/roselia_shiny_palette.pal | 19 + graphics/pokemon/palettes/sableye_palette.pal | 19 + .../pokemon/palettes/sableye_shiny_palette.pal | 19 + graphics/pokemon/palettes/salamence_palette.pal | 19 + .../pokemon/palettes/salamence_shiny_palette.pal | 19 + graphics/pokemon/palettes/sandshrew_palette.pal | 19 + .../pokemon/palettes/sandshrew_shiny_palette.pal | 19 + graphics/pokemon/palettes/sandslash_palette.pal | 19 + .../pokemon/palettes/sandslash_shiny_palette.pal | 19 + graphics/pokemon/palettes/sceptile_palette.pal | 19 + .../pokemon/palettes/sceptile_shiny_palette.pal | 19 + graphics/pokemon/palettes/scizor_palette.pal | 19 + graphics/pokemon/palettes/scizor_shiny_palette.pal | 19 + graphics/pokemon/palettes/scyther_palette.pal | 19 + .../pokemon/palettes/scyther_shiny_palette.pal | 19 + graphics/pokemon/palettes/seadra_palette.pal | 19 + graphics/pokemon/palettes/seadra_shiny_palette.pal | 19 + graphics/pokemon/palettes/seaking_palette.pal | 19 + .../pokemon/palettes/seaking_shiny_palette.pal | 19 + graphics/pokemon/palettes/sealeo_palette.pal | 19 + graphics/pokemon/palettes/sealeo_shiny_palette.pal | 19 + graphics/pokemon/palettes/seedot_palette.pal | 19 + graphics/pokemon/palettes/seedot_shiny_palette.pal | 19 + graphics/pokemon/palettes/seel_palette.pal | 19 + graphics/pokemon/palettes/seel_shiny_palette.pal | 19 + graphics/pokemon/palettes/sentret_palette.pal | 19 + .../pokemon/palettes/sentret_shiny_palette.pal | 19 + graphics/pokemon/palettes/seviper_palette.pal | 19 + .../pokemon/palettes/seviper_shiny_palette.pal | 19 + graphics/pokemon/palettes/sharpedo_palette.pal | 19 + .../pokemon/palettes/sharpedo_shiny_palette.pal | 19 + graphics/pokemon/palettes/shedinja_palette.pal | 19 + .../pokemon/palettes/shedinja_shiny_palette.pal | 19 + graphics/pokemon/palettes/shelgon_palette.pal | 19 + .../pokemon/palettes/shelgon_shiny_palette.pal | 19 + graphics/pokemon/palettes/shellder_palette.pal | 19 + .../pokemon/palettes/shellder_shiny_palette.pal | 19 + graphics/pokemon/palettes/shiftry_palette.pal | 19 + .../pokemon/palettes/shiftry_shiny_palette.pal | 19 + graphics/pokemon/palettes/shroomish_palette.pal | 19 + .../pokemon/palettes/shroomish_shiny_palette.pal | 19 + graphics/pokemon/palettes/shuckle_palette.pal | 19 + .../pokemon/palettes/shuckle_shiny_palette.pal | 19 + graphics/pokemon/palettes/shuppet_palette.pal | 19 + .../pokemon/palettes/shuppet_shiny_palette.pal | 19 + graphics/pokemon/palettes/silcoon_palette.pal | 19 + .../pokemon/palettes/silcoon_shiny_palette.pal | 19 + graphics/pokemon/palettes/skarmory_palette.pal | 19 + .../pokemon/palettes/skarmory_shiny_palette.pal | 19 + graphics/pokemon/palettes/skiploom_palette.pal | 19 + .../pokemon/palettes/skiploom_shiny_palette.pal | 19 + graphics/pokemon/palettes/skitty_palette.pal | 19 + graphics/pokemon/palettes/skitty_shiny_palette.pal | 19 + graphics/pokemon/palettes/slaking_palette.pal | 19 + .../pokemon/palettes/slaking_shiny_palette.pal | 19 + graphics/pokemon/palettes/slakoth_palette.pal | 19 + .../pokemon/palettes/slakoth_shiny_palette.pal | 19 + graphics/pokemon/palettes/slowbro_palette.pal | 19 + .../pokemon/palettes/slowbro_shiny_palette.pal | 19 + graphics/pokemon/palettes/slowking_palette.pal | 19 + .../pokemon/palettes/slowking_shiny_palette.pal | 19 + graphics/pokemon/palettes/slowpoke_palette.pal | 19 + .../pokemon/palettes/slowpoke_shiny_palette.pal | 19 + graphics/pokemon/palettes/slugma_palette.pal | 19 + graphics/pokemon/palettes/slugma_shiny_palette.pal | 19 + graphics/pokemon/palettes/smeargle_palette.pal | 19 + .../pokemon/palettes/smeargle_shiny_palette.pal | 19 + graphics/pokemon/palettes/smoochum_palette.pal | 19 + .../pokemon/palettes/smoochum_shiny_palette.pal | 19 + graphics/pokemon/palettes/sneasel_palette.pal | 19 + .../pokemon/palettes/sneasel_shiny_palette.pal | 19 + graphics/pokemon/palettes/snorlax_palette.pal | 19 + .../pokemon/palettes/snorlax_shiny_palette.pal | 19 + graphics/pokemon/palettes/snorunt_palette.pal | 19 + .../pokemon/palettes/snorunt_shiny_palette.pal | 19 + graphics/pokemon/palettes/snubbull_palette.pal | 19 + .../pokemon/palettes/snubbull_shiny_palette.pal | 19 + graphics/pokemon/palettes/solrock_palette.pal | 19 + .../pokemon/palettes/solrock_shiny_palette.pal | 19 + graphics/pokemon/palettes/spearow_palette.pal | 19 + .../pokemon/palettes/spearow_shiny_palette.pal | 19 + graphics/pokemon/palettes/spheal_palette.pal | 19 + graphics/pokemon/palettes/spheal_shiny_palette.pal | 19 + graphics/pokemon/palettes/spinarak_palette.pal | 19 + .../pokemon/palettes/spinarak_shiny_palette.pal | 19 + graphics/pokemon/palettes/spinda_palette.pal | 19 + graphics/pokemon/palettes/spinda_shiny_palette.pal | 19 + graphics/pokemon/palettes/spoink_palette.pal | 19 + graphics/pokemon/palettes/spoink_shiny_palette.pal | 19 + graphics/pokemon/palettes/squirtle_palette.pal | 19 + .../pokemon/palettes/squirtle_shiny_palette.pal | 19 + graphics/pokemon/palettes/stantler_palette.pal | 19 + .../pokemon/palettes/stantler_shiny_palette.pal | 19 + graphics/pokemon/palettes/starmie_palette.pal | 19 + .../pokemon/palettes/starmie_shiny_palette.pal | 19 + graphics/pokemon/palettes/staryu_palette.pal | 19 + graphics/pokemon/palettes/staryu_shiny_palette.pal | 19 + graphics/pokemon/palettes/steelix_palette.pal | 19 + .../pokemon/palettes/steelix_shiny_palette.pal | 19 + graphics/pokemon/palettes/sudowoodo_palette.pal | 19 + .../pokemon/palettes/sudowoodo_shiny_palette.pal | 19 + graphics/pokemon/palettes/suicune_palette.pal | 19 + .../pokemon/palettes/suicune_shiny_palette.pal | 19 + graphics/pokemon/palettes/sunflora_palette.pal | 19 + .../pokemon/palettes/sunflora_shiny_palette.pal | 19 + graphics/pokemon/palettes/sunkern_palette.pal | 19 + .../pokemon/palettes/sunkern_shiny_palette.pal | 19 + graphics/pokemon/palettes/surskit_palette.pal | 19 + .../pokemon/palettes/surskit_shiny_palette.pal | 19 + graphics/pokemon/palettes/swablu_palette.pal | 19 + graphics/pokemon/palettes/swablu_shiny_palette.pal | 19 + graphics/pokemon/palettes/swalot_palette.pal | 19 + graphics/pokemon/palettes/swalot_shiny_palette.pal | 19 + graphics/pokemon/palettes/swampert_palette.pal | 19 + .../pokemon/palettes/swampert_shiny_palette.pal | 19 + graphics/pokemon/palettes/swellow_palette.pal | 19 + .../pokemon/palettes/swellow_shiny_palette.pal | 19 + graphics/pokemon/palettes/swinub_palette.pal | 19 + graphics/pokemon/palettes/swinub_shiny_palette.pal | 19 + graphics/pokemon/palettes/taillow_palette.pal | 19 + .../pokemon/palettes/taillow_shiny_palette.pal | 19 + graphics/pokemon/palettes/tangela_palette.pal | 19 + .../pokemon/palettes/tangela_shiny_palette.pal | 19 + graphics/pokemon/palettes/tauros_palette.pal | 19 + graphics/pokemon/palettes/tauros_shiny_palette.pal | 19 + graphics/pokemon/palettes/teddiursa_palette.pal | 19 + .../pokemon/palettes/teddiursa_shiny_palette.pal | 19 + graphics/pokemon/palettes/tentacool_palette.pal | 19 + .../pokemon/palettes/tentacool_shiny_palette.pal | 19 + graphics/pokemon/palettes/tentacruel_palette.pal | 19 + .../pokemon/palettes/tentacruel_shiny_palette.pal | 19 + graphics/pokemon/palettes/togepi_palette.pal | 19 + graphics/pokemon/palettes/togepi_shiny_palette.pal | 19 + graphics/pokemon/palettes/togetic_palette.pal | 19 + .../pokemon/palettes/togetic_shiny_palette.pal | 19 + graphics/pokemon/palettes/torchic_palette.pal | 19 + .../pokemon/palettes/torchic_shiny_palette.pal | 19 + graphics/pokemon/palettes/torkoal_palette.pal | 19 + .../pokemon/palettes/torkoal_shiny_palette.pal | 19 + graphics/pokemon/palettes/totodile_palette.pal | 19 + .../pokemon/palettes/totodile_shiny_palette.pal | 19 + graphics/pokemon/palettes/trapinch_palette.pal | 19 + .../pokemon/palettes/trapinch_shiny_palette.pal | 19 + graphics/pokemon/palettes/treecko_palette.pal | 19 + .../pokemon/palettes/treecko_shiny_palette.pal | 19 + graphics/pokemon/palettes/tropius_palette.pal | 19 + .../pokemon/palettes/tropius_shiny_palette.pal | 19 + graphics/pokemon/palettes/typhlosion_palette.pal | 19 + .../pokemon/palettes/typhlosion_shiny_palette.pal | 19 + graphics/pokemon/palettes/tyranitar_palette.pal | 19 + .../pokemon/palettes/tyranitar_shiny_palette.pal | 19 + graphics/pokemon/palettes/tyrogue_palette.pal | 19 + .../pokemon/palettes/tyrogue_shiny_palette.pal | 19 + graphics/pokemon/palettes/umbreon_palette.pal | 19 + .../pokemon/palettes/umbreon_shiny_palette.pal | 19 + graphics/pokemon/palettes/unown_palette.pal | 19 + graphics/pokemon/palettes/unown_shiny_palette.pal | 19 + graphics/pokemon/palettes/ursaring_palette.pal | 19 + .../pokemon/palettes/ursaring_shiny_palette.pal | 19 + graphics/pokemon/palettes/vaporeon_palette.pal | 19 + .../pokemon/palettes/vaporeon_shiny_palette.pal | 19 + graphics/pokemon/palettes/venomoth_palette.pal | 19 + .../pokemon/palettes/venomoth_shiny_palette.pal | 19 + graphics/pokemon/palettes/venonat_palette.pal | 19 + .../pokemon/palettes/venonat_shiny_palette.pal | 19 + graphics/pokemon/palettes/venusaur_palette.pal | 19 + .../pokemon/palettes/venusaur_shiny_palette.pal | 19 + graphics/pokemon/palettes/vibrava_palette.pal | 19 + .../pokemon/palettes/vibrava_shiny_palette.pal | 19 + graphics/pokemon/palettes/victreebel_palette.pal | 19 + .../pokemon/palettes/victreebel_shiny_palette.pal | 19 + graphics/pokemon/palettes/vigoroth_palette.pal | 19 + .../pokemon/palettes/vigoroth_shiny_palette.pal | 19 + graphics/pokemon/palettes/vileplume_palette.pal | 19 + .../pokemon/palettes/vileplume_shiny_palette.pal | 19 + graphics/pokemon/palettes/volbeat_palette.pal | 19 + .../pokemon/palettes/volbeat_shiny_palette.pal | 19 + graphics/pokemon/palettes/voltorb_palette.pal | 19 + .../pokemon/palettes/voltorb_shiny_palette.pal | 19 + graphics/pokemon/palettes/vulpix_palette.pal | 19 + graphics/pokemon/palettes/vulpix_shiny_palette.pal | 19 + graphics/pokemon/palettes/wailmer_palette.pal | 19 + .../pokemon/palettes/wailmer_shiny_palette.pal | 19 + graphics/pokemon/palettes/wailord_palette.pal | 19 + .../pokemon/palettes/wailord_shiny_palette.pal | 19 + graphics/pokemon/palettes/walrein_palette.pal | 19 + .../pokemon/palettes/walrein_shiny_palette.pal | 19 + graphics/pokemon/palettes/wartortle_palette.pal | 19 + .../pokemon/palettes/wartortle_shiny_palette.pal | 19 + graphics/pokemon/palettes/weedle_palette.pal | 19 + graphics/pokemon/palettes/weedle_shiny_palette.pal | 19 + graphics/pokemon/palettes/weepinbell_palette.pal | 19 + .../pokemon/palettes/weepinbell_shiny_palette.pal | 19 + graphics/pokemon/palettes/weezing_palette.pal | 19 + .../pokemon/palettes/weezing_shiny_palette.pal | 19 + graphics/pokemon/palettes/whiscash_palette.pal | 19 + .../pokemon/palettes/whiscash_shiny_palette.pal | 19 + graphics/pokemon/palettes/whismur_palette.pal | 19 + .../pokemon/palettes/whismur_shiny_palette.pal | 19 + graphics/pokemon/palettes/wigglytuff_palette.pal | 19 + .../pokemon/palettes/wigglytuff_shiny_palette.pal | 19 + graphics/pokemon/palettes/wingull_palette.pal | 19 + .../pokemon/palettes/wingull_shiny_palette.pal | 19 + graphics/pokemon/palettes/wobbuffet_palette.pal | 19 + .../pokemon/palettes/wobbuffet_shiny_palette.pal | 19 + graphics/pokemon/palettes/wooper_palette.pal | 19 + graphics/pokemon/palettes/wooper_shiny_palette.pal | 19 + graphics/pokemon/palettes/wurmple_palette.pal | 19 + .../pokemon/palettes/wurmple_shiny_palette.pal | 19 + graphics/pokemon/palettes/wynaut_palette.pal | 19 + graphics/pokemon/palettes/wynaut_shiny_palette.pal | 19 + graphics/pokemon/palettes/xatu_palette.pal | 19 + graphics/pokemon/palettes/xatu_shiny_palette.pal | 19 + graphics/pokemon/palettes/yanma_palette.pal | 19 + graphics/pokemon/palettes/yanma_shiny_palette.pal | 19 + graphics/pokemon/palettes/zangoose_palette.pal | 19 + .../pokemon/palettes/zangoose_shiny_palette.pal | 19 + graphics/pokemon/palettes/zapdos_palette.pal | 19 + graphics/pokemon/palettes/zapdos_shiny_palette.pal | 19 + graphics/pokemon/palettes/zigzagoon_palette.pal | 19 + .../pokemon/palettes/zigzagoon_shiny_palette.pal | 19 + graphics/pokemon/palettes/zubat_palette.pal | 19 + graphics/pokemon/palettes/zubat_shiny_palette.pal | 19 + graphics/trainers/back_pics/leaf_back_pic.png | Bin 0 -> 2352 bytes graphics/trainers/back_pics/old_man_back_pic.png | Bin 0 -> 1739 bytes graphics/trainers/back_pics/pokedude_back_pic.png | Bin 0 -> 1921 bytes graphics/trainers/back_pics/red_back_pic.png | Bin 0 -> 2270 bytes .../back_pics/ruby_sapphire_brendan_back_pic.png | Bin 0 -> 2197 bytes .../back_pics/ruby_sapphire_may_back_pic.png | Bin 0 -> 2223 bytes .../trainers/front_pics/aqua_admin_f_front_pic.png | Bin 0 -> 838 bytes .../trainers/front_pics/aqua_admin_m_front_pic.png | Bin 0 -> 800 bytes .../trainers/front_pics/aqua_grunt_f_front_pic.png | Bin 0 -> 722 bytes .../trainers/front_pics/aqua_grunt_m_front_pic.png | Bin 0 -> 726 bytes .../front_pics/aqua_leader_archie_front_pic.png | Bin 0 -> 684 bytes .../front_pics/arena_tycoon_greta_front_pic.png | Bin 0 -> 702 bytes .../trainers/front_pics/aroma_lady_front_pic.png | Bin 0 -> 769 bytes .../trainers/front_pics/battle_girl_front_pic.png | Bin 0 -> 702 bytes graphics/trainers/front_pics/beauty_front_pic.png | Bin 0 -> 738 bytes graphics/trainers/front_pics/biker_front_pic.png | Bin 0 -> 1179 bytes .../trainers/front_pics/bird_keeper_front_pic.png | Bin 0 -> 829 bytes .../trainers/front_pics/black_belt_front_pic.png | Bin 0 -> 888 bytes graphics/trainers/front_pics/blue_1_front_pic.png | Bin 0 -> 598 bytes graphics/trainers/front_pics/blue_2_front_pic.png | Bin 0 -> 646 bytes graphics/trainers/front_pics/brendan_front_pic.png | Bin 0 -> 698 bytes .../trainers/front_pics/bug_catcher_front_pic.png | Bin 0 -> 747 bytes .../trainers/front_pics/bug_maniac_front_pic.png | Bin 0 -> 932 bytes graphics/trainers/front_pics/burglar_front_pic.png | Bin 0 -> 726 bytes graphics/trainers/front_pics/camper_front_pic.png | Bin 0 -> 614 bytes .../front_pics/champion_blue_front_pic.png | Bin 0 -> 644 bytes .../front_pics/champion_wallace_front_pic.png | Bin 0 -> 978 bytes .../trainers/front_pics/channeler_front_pic.png | Bin 0 -> 834 bytes .../trainers/front_pics/collector_front_pic.png | Bin 0 -> 852 bytes .../trainers/front_pics/cool_couple_front_pic.png | Bin 0 -> 1072 bytes .../front_pics/cool_trainer_f_front_pic.png | Bin 0 -> 715 bytes .../front_pics/cool_trainer_m_front_pic.png | Bin 0 -> 598 bytes .../trainers/front_pics/crush_girl_front_pic.png | Bin 0 -> 669 bytes .../trainers/front_pics/crush_kin_front_pic.png | Bin 0 -> 1227 bytes .../front_pics/cycling_triathlete_f_front_pic.png | Bin 0 -> 890 bytes .../front_pics/cycling_triathlete_m_front_pic.png | Bin 0 -> 900 bytes .../front_pics/dome_ace_tucker_front_pic.png | Bin 0 -> 906 bytes .../trainers/front_pics/dragon_tamer_front_pic.png | Bin 0 -> 710 bytes .../front_pics/elite_four_agatha_front_pic.png | Bin 0 -> 692 bytes .../front_pics/elite_four_bruno_front_pic.png | Bin 0 -> 916 bytes .../front_pics/elite_four_drake_front_pic.png | Bin 0 -> 828 bytes .../front_pics/elite_four_glacia_front_pic.png | Bin 0 -> 797 bytes .../front_pics/elite_four_lance_front_pic.png | Bin 0 -> 834 bytes .../front_pics/elite_four_lorelei_front_pic.png | Bin 0 -> 709 bytes .../front_pics/elite_four_phoebe_front_pic.png | Bin 0 -> 661 bytes .../front_pics/elite_four_sidney_front_pic.png | Bin 0 -> 696 bytes .../front_pics/emerald_aroma_lady_front_pic.png | Bin 0 -> 619 bytes .../front_pics/emerald_beauty_front_pic.png | Bin 0 -> 662 bytes .../front_pics/emerald_bird_keeper_front_pic.png | Bin 0 -> 698 bytes .../front_pics/emerald_black_belt_front_pic.png | Bin 0 -> 735 bytes .../front_pics/emerald_bug_catcher_front_pic.png | Bin 0 -> 682 bytes .../front_pics/emerald_camper_front_pic.png | Bin 0 -> 629 bytes .../emerald_cool_trainer_f_front_pic.png | Bin 0 -> 681 bytes .../emerald_cool_trainer_m_front_pic.png | Bin 0 -> 627 bytes .../front_pics/emerald_fisherman_front_pic.png | Bin 0 -> 889 bytes .../front_pics/emerald_gentleman_front_pic.png | Bin 0 -> 647 bytes .../front_pics/emerald_hiker_front_pic.png | Bin 0 -> 952 bytes .../trainers/front_pics/emerald_lady_front_pic.png | Bin 0 -> 825 bytes .../trainers/front_pics/emerald_lass_front_pic.png | Bin 0 -> 617 bytes .../front_pics/emerald_picnicker_front_pic.png | Bin 0 -> 633 bytes .../front_pics/emerald_pokemaniac_front_pic.png | Bin 0 -> 793 bytes .../emerald_pokemon_breeder_f_front_pic.png | Bin 0 -> 742 bytes .../emerald_pokemon_breeder_m_front_pic.png | Bin 0 -> 709 bytes .../emerald_pokemon_ranger_f_front_pic.png | Bin 0 -> 710 bytes .../emerald_pokemon_ranger_m_front_pic.png | Bin 0 -> 709 bytes .../front_pics/emerald_psychic_f_front_pic.png | Bin 0 -> 668 bytes .../front_pics/emerald_psychic_m_front_pic.png | Bin 0 -> 690 bytes .../front_pics/emerald_ruin_maniac_front_pic.png | Bin 0 -> 782 bytes .../front_pics/emerald_sailor_front_pic.png | Bin 0 -> 801 bytes .../front_pics/emerald_sis_and_bro_front_pic.png | Bin 0 -> 934 bytes .../front_pics/emerald_swimmer_f_front_pic.png | Bin 0 -> 617 bytes .../front_pics/emerald_swimmer_m_front_pic.png | Bin 0 -> 584 bytes .../front_pics/emerald_tuber_f_front_pic.png | Bin 0 -> 557 bytes .../front_pics/emerald_tuber_m_front_pic.png | Bin 0 -> 548 bytes .../front_pics/emerald_twins_front_pic.png | Bin 0 -> 829 bytes .../front_pics/emerald_young_couple_front_pic.png | Bin 0 -> 805 bytes .../front_pics/emerald_youngster_front_pic.png | Bin 0 -> 564 bytes .../trainers/front_pics/engineer_front_pic.png | Bin 0 -> 897 bytes .../trainers/front_pics/expert_f_front_pic.png | Bin 0 -> 670 bytes .../trainers/front_pics/expert_m_front_pic.png | Bin 0 -> 706 bytes .../front_pics/factory_head_noland_front_pic.png | Bin 0 -> 736 bytes .../trainers/front_pics/fisherman_front_pic.png | Bin 0 -> 841 bytes graphics/trainers/front_pics/gamer_front_pic.png | Bin 0 -> 754 bytes .../trainers/front_pics/gentleman_front_pic.png | Bin 0 -> 691 bytes .../trainers/front_pics/giovanni_front_pic.png | Bin 0 -> 653 bytes .../trainers/front_pics/guitarist_front_pic.png | Bin 0 -> 765 bytes .../trainers/front_pics/hex_maniac_front_pic.png | Bin 0 -> 719 bytes graphics/trainers/front_pics/hiker_front_pic.png | Bin 0 -> 939 bytes .../trainers/front_pics/interviewer_front_pic.png | Bin 0 -> 1032 bytes graphics/trainers/front_pics/juggler_front_pic.png | Bin 0 -> 921 bytes graphics/trainers/front_pics/kindler_front_pic.png | Bin 0 -> 745 bytes graphics/trainers/front_pics/lady_front_pic.png | Bin 0 -> 717 bytes graphics/trainers/front_pics/lass_front_pic.png | Bin 0 -> 662 bytes .../front_pics/leader_blaine_front_pic.png | Bin 0 -> 849 bytes .../front_pics/leader_brawly_front_pic.png | Bin 0 -> 799 bytes .../trainers/front_pics/leader_brock_front_pic.png | Bin 0 -> 713 bytes .../trainers/front_pics/leader_erika_front_pic.png | Bin 0 -> 645 bytes .../front_pics/leader_flannery_front_pic.png | Bin 0 -> 770 bytes .../trainers/front_pics/leader_juan_front_pic.png | Bin 0 -> 820 bytes .../trainers/front_pics/leader_koga_front_pic.png | Bin 0 -> 726 bytes .../front_pics/leader_lt_surge_front_pic.png | Bin 0 -> 770 bytes .../trainers/front_pics/leader_misty_front_pic.png | Bin 0 -> 659 bytes .../front_pics/leader_norman_front_pic.png | Bin 0 -> 692 bytes .../front_pics/leader_roxanne_front_pic.png | Bin 0 -> 631 bytes .../front_pics/leader_sabrina_front_pic.png | Bin 0 -> 703 bytes .../front_pics/leader_tate_and_liza_front_pic.png | Bin 0 -> 936 bytes .../front_pics/leader_wattson_front_pic.png | Bin 0 -> 720 bytes .../front_pics/leader_winona_front_pic.png | Bin 0 -> 784 bytes graphics/trainers/front_pics/leaf_front_pic.png | Bin 0 -> 722 bytes .../trainers/front_pics/magma_admin_front_pic.png | Bin 0 -> 841 bytes .../front_pics/magma_grunt_f_front_pic.png | Bin 0 -> 789 bytes .../front_pics/magma_grunt_m_front_pic.png | Bin 0 -> 751 bytes .../front_pics/magma_leader_maxie_front_pic.png | Bin 0 -> 649 bytes graphics/trainers/front_pics/may_front_pic.png | Bin 0 -> 689 bytes .../trainers/front_pics/ninja_boy_front_pic.png | Bin 0 -> 632 bytes graphics/trainers/front_pics/oak_front_pic.png | Bin 0 -> 761 bytes .../trainers/front_pics/old_couple_front_pic.png | Bin 0 -> 1097 bytes graphics/trainers/front_pics/painter_front_pic.png | Bin 0 -> 630 bytes .../front_pics/palace_maven_spenser_front_pic.png | Bin 0 -> 802 bytes .../trainers/front_pics/parasol_lady_front_pic.png | Bin 0 -> 710 bytes .../trainers/front_pics/picnicker_front_pic.png | Bin 0 -> 626 bytes .../front_pics/pike_queen_lucy_front_pic.png | Bin 0 -> 678 bytes .../trainers/front_pics/pokemaniac_front_pic.png | Bin 0 -> 821 bytes .../front_pics/pokemon_breeder_front_pic.png | Bin 0 -> 699 bytes .../front_pics/pokemon_ranger_f_front_pic.png | Bin 0 -> 709 bytes .../front_pics/pokemon_ranger_m_front_pic.png | Bin 0 -> 746 bytes .../trainers/front_pics/psychic_f_front_pic.png | Bin 0 -> 811 bytes .../trainers/front_pics/psychic_m_front_pic.png | Bin 0 -> 754 bytes .../front_pics/pyramid_king_brandon_front_pic.png | Bin 0 -> 721 bytes graphics/trainers/front_pics/red_front_pic.png | Bin 0 -> 691 bytes .../trainers/front_pics/rich_boy_front_pic.png | Bin 0 -> 580 bytes graphics/trainers/front_pics/rocker_front_pic.png | Bin 0 -> 953 bytes .../front_pics/rocket_grunt_f_front_pic.png | Bin 0 -> 675 bytes .../front_pics/rocket_grunt_m_front_pic.png | Bin 0 -> 673 bytes .../trainers/front_pics/roughneck_front_pic.png | Bin 0 -> 1225 bytes .../front_pics/ruby_magma_admin_f_front_pic.png | Bin 0 -> 782 bytes .../front_pics/ruby_sapphire_brendan_front_pic.png | Bin 0 -> 688 bytes .../ruby_sapphire_champion_wallace_front_pic.png | Bin 0 -> 791 bytes .../front_pics/ruby_sapphire_may_front_pic.png | Bin 0 -> 683 bytes .../trainers/front_pics/ruin_maniac_front_pic.png | Bin 0 -> 870 bytes .../front_pics/running_triathlete_f_front_pic.png | Bin 0 -> 585 bytes .../front_pics/running_triathlete_m_front_pic.png | Bin 0 -> 586 bytes graphics/trainers/front_pics/sailor_front_pic.png | Bin 0 -> 685 bytes .../front_pics/salon_maiden_anabel_front_pic.png | Bin 0 -> 667 bytes .../trainers/front_pics/school_kid_f_front_pic.png | Bin 0 -> 548 bytes .../trainers/front_pics/school_kid_m_front_pic.png | Bin 0 -> 606 bytes .../trainers/front_pics/scientist_front_pic.png | Bin 0 -> 866 bytes .../trainers/front_pics/sis_and_bro_front_pic.png | Bin 0 -> 958 bytes .../trainers/front_pics/sr_and_jr_front_pic.png | Bin 0 -> 1005 bytes graphics/trainers/front_pics/steven_front_pic.png | Bin 0 -> 703 bytes .../trainers/front_pics/super_nerd_front_pic.png | Bin 0 -> 672 bytes .../trainers/front_pics/swimmer_f_front_pic.png | Bin 0 -> 646 bytes .../trainers/front_pics/swimmer_m_front_pic.png | Bin 0 -> 602 bytes .../front_pics/swimming_triathlete_f_front_pic.png | Bin 0 -> 624 bytes .../front_pics/swimming_triathlete_m_front_pic.png | Bin 0 -> 675 bytes graphics/trainers/front_pics/tamer_front_pic.png | Bin 0 -> 848 bytes graphics/trainers/front_pics/tuber_front_pic.png | Bin 0 -> 651 bytes graphics/trainers/front_pics/twins_front_pic.png | Bin 0 -> 726 bytes graphics/trainers/front_pics/wally_front_pic.png | Bin 0 -> 616 bytes .../trainers/front_pics/winstrate_f_front_pic.png | Bin 0 -> 849 bytes .../trainers/front_pics/winstrate_m_front_pic.png | Bin 0 -> 786 bytes .../trainers/front_pics/young_couple_front_pic.png | Bin 0 -> 959 bytes .../trainers/front_pics/youngster_front_pic.png | Bin 0 -> 579 bytes graphics/trainers/palettes/aqua_admin_f.pal | 19 + graphics/trainers/palettes/aqua_admin_m.pal | 19 + graphics/trainers/palettes/aqua_grunt_f.pal | 19 + graphics/trainers/palettes/aqua_grunt_m.pal | 19 + graphics/trainers/palettes/aqua_leader_archie.pal | 19 + graphics/trainers/palettes/arena_tycoon_greta.pal | 19 + graphics/trainers/palettes/aroma_lady.pal | 19 + graphics/trainers/palettes/battle_girl.pal | 19 + graphics/trainers/palettes/beauty.pal | 19 + graphics/trainers/palettes/biker.pal | 19 + graphics/trainers/palettes/bird_keeper.pal | 19 + graphics/trainers/palettes/black_belt.pal | 19 + graphics/trainers/palettes/blue_1.pal | 19 + graphics/trainers/palettes/blue_2.pal | 19 + graphics/trainers/palettes/brendan.pal | 19 + graphics/trainers/palettes/bug_catcher.pal | 19 + graphics/trainers/palettes/bug_maniac.pal | 19 + graphics/trainers/palettes/burglar.pal | 19 + graphics/trainers/palettes/camper.pal | 19 + graphics/trainers/palettes/champion_blue.pal | 19 + graphics/trainers/palettes/champion_wallace.pal | 19 + graphics/trainers/palettes/channeler.pal | 19 + graphics/trainers/palettes/collector.pal | 19 + graphics/trainers/palettes/cool_couple.pal | 19 + graphics/trainers/palettes/cool_trainer_f.pal | 19 + graphics/trainers/palettes/cool_trainer_m.pal | 19 + graphics/trainers/palettes/crush_girl.pal | 19 + graphics/trainers/palettes/crush_kin.pal | 19 + .../trainers/palettes/cycling_triathlete_f.pal | 19 + .../trainers/palettes/cycling_triathlete_m.pal | 19 + graphics/trainers/palettes/dome_ace_tucker.pal | 19 + graphics/trainers/palettes/dragon_tamer.pal | 19 + graphics/trainers/palettes/elite_four_agatha.pal | 19 + graphics/trainers/palettes/elite_four_bruno.pal | 19 + graphics/trainers/palettes/elite_four_drake.pal | 19 + graphics/trainers/palettes/elite_four_glacia.pal | 19 + graphics/trainers/palettes/elite_four_lance.pal | 19 + graphics/trainers/palettes/elite_four_lorelei.pal | 19 + graphics/trainers/palettes/elite_four_phoebe.pal | 19 + graphics/trainers/palettes/elite_four_sidney.pal | 19 + graphics/trainers/palettes/emerald_aroma_lady.pal | 19 + graphics/trainers/palettes/emerald_beauty.pal | 19 + graphics/trainers/palettes/emerald_bird_keeper.pal | 19 + graphics/trainers/palettes/emerald_bug_catcher.pal | 19 + graphics/trainers/palettes/emerald_camper.pal | 19 + .../trainers/palettes/emerald_cool_trainer_f.pal | 19 + .../trainers/palettes/emerald_cool_trainer_m.pal | 19 + graphics/trainers/palettes/emerald_fisherman.pal | 19 + graphics/trainers/palettes/emerald_gentleman.pal | 19 + graphics/trainers/palettes/emerald_hiker.pal | 19 + graphics/trainers/palettes/emerald_lady.pal | 19 + graphics/trainers/palettes/emerald_lass.pal | 19 + .../trainers/palettes/emerald_leaf_back_pic.pal | 19 + graphics/trainers/palettes/emerald_picnicker.pal | 19 + graphics/trainers/palettes/emerald_pokemaniac.pal | 19 + .../palettes/emerald_pokemon_breeder_f.pal | 19 + .../palettes/emerald_pokemon_breeder_m.pal | 19 + .../trainers/palettes/emerald_pokemon_ranger_f.pal | 19 + .../trainers/palettes/emerald_pokemon_ranger_m.pal | 19 + graphics/trainers/palettes/emerald_psychic_f.pal | 19 + graphics/trainers/palettes/emerald_psychic_m.pal | 19 + .../trainers/palettes/emerald_red_back_pic.pal | 19 + graphics/trainers/palettes/emerald_ruin_maniac.pal | 19 + graphics/trainers/palettes/emerald_sailor.pal | 19 + graphics/trainers/palettes/emerald_sis_and_bro.pal | 19 + graphics/trainers/palettes/emerald_swimmer_f.pal | 19 + graphics/trainers/palettes/emerald_swimmer_m.pal | 19 + graphics/trainers/palettes/emerald_tuber_f.pal | 19 + graphics/trainers/palettes/emerald_tuber_m.pal | 19 + graphics/trainers/palettes/emerald_twins.pal | 19 + .../trainers/palettes/emerald_young_couple.pal | 19 + graphics/trainers/palettes/emerald_youngster.pal | 19 + graphics/trainers/palettes/engineer.pal | 19 + graphics/trainers/palettes/expert_f.pal | 19 + graphics/trainers/palettes/expert_m.pal | 19 + graphics/trainers/palettes/factory_head_noland.pal | 19 + graphics/trainers/palettes/fisherman.pal | 19 + graphics/trainers/palettes/gamer.pal | 19 + graphics/trainers/palettes/gentleman.pal | 19 + graphics/trainers/palettes/giovanni.pal | 19 + graphics/trainers/palettes/guitarist.pal | 19 + graphics/trainers/palettes/hex_maniac.pal | 19 + graphics/trainers/palettes/hiker.pal | 19 + graphics/trainers/palettes/interviewer.pal | 19 + graphics/trainers/palettes/juggler.pal | 19 + graphics/trainers/palettes/kindler.pal | 19 + graphics/trainers/palettes/lady.pal | 19 + graphics/trainers/palettes/lass.pal | 19 + graphics/trainers/palettes/leader_blaine.pal | 19 + graphics/trainers/palettes/leader_brawly.pal | 19 + graphics/trainers/palettes/leader_brock.pal | 19 + graphics/trainers/palettes/leader_erika.pal | 19 + graphics/trainers/palettes/leader_flannery.pal | 19 + graphics/trainers/palettes/leader_juan.pal | 19 + graphics/trainers/palettes/leader_koga.pal | 19 + graphics/trainers/palettes/leader_lt_surge.pal | 19 + graphics/trainers/palettes/leader_misty.pal | 19 + graphics/trainers/palettes/leader_norman.pal | 19 + graphics/trainers/palettes/leader_roxanne.pal | 19 + graphics/trainers/palettes/leader_sabrina.pal | 19 + .../trainers/palettes/leader_tate_and_liza.pal | 19 + graphics/trainers/palettes/leader_wattson.pal | 19 + graphics/trainers/palettes/leader_winona.pal | 19 + graphics/trainers/palettes/leaf.pal | 19 + graphics/trainers/palettes/leaf_back_pic.pal | 19 + graphics/trainers/palettes/magma_admin.pal | 19 + graphics/trainers/palettes/magma_grunt_f.pal | 19 + graphics/trainers/palettes/magma_grunt_m.pal | 19 + graphics/trainers/palettes/magma_leader_maxie.pal | 19 + graphics/trainers/palettes/may.pal | 19 + graphics/trainers/palettes/ninja_boy.pal | 19 + graphics/trainers/palettes/oak.pal | 19 + graphics/trainers/palettes/old_couple.pal | 19 + graphics/trainers/palettes/old_man_back_pic.pal | 19 + graphics/trainers/palettes/painter.pal | 19 + .../trainers/palettes/palace_maven_spenser.pal | 19 + graphics/trainers/palettes/parasol_lady.pal | 19 + graphics/trainers/palettes/picnicker.pal | 19 + graphics/trainers/palettes/pike_queen_lucy.pal | 19 + graphics/trainers/palettes/pokedude_back_pic.pal | 19 + graphics/trainers/palettes/pokemaniac.pal | 19 + graphics/trainers/palettes/pokemon_breeder.pal | 19 + graphics/trainers/palettes/pokemon_ranger_f.pal | 19 + graphics/trainers/palettes/pokemon_ranger_m.pal | 19 + graphics/trainers/palettes/psychic_f.pal | 19 + graphics/trainers/palettes/psychic_m.pal | 19 + .../trainers/palettes/pyramid_king_brandon.pal | 19 + graphics/trainers/palettes/red.pal | 19 + graphics/trainers/palettes/red_back_pic.pal | 19 + graphics/trainers/palettes/rich_boy.pal | 19 + graphics/trainers/palettes/rocker.pal | 19 + graphics/trainers/palettes/rocket_grunt_f.pal | 19 + graphics/trainers/palettes/rocket_grunt_m.pal | 19 + graphics/trainers/palettes/roughneck.pal | 19 + graphics/trainers/palettes/ruby_magma_admin_f.pal | 19 + .../trainers/palettes/ruby_sapphire_brendan.pal | 19 + graphics/trainers/palettes/ruby_sapphire_may.pal | 19 + graphics/trainers/palettes/ruin_maniac.pal | 19 + .../trainers/palettes/running_triathlete_f.pal | 19 + .../trainers/palettes/running_triathlete_m.pal | 19 + graphics/trainers/palettes/sailor.pal | 19 + graphics/trainers/palettes/salon_maiden_anabel.pal | 19 + graphics/trainers/palettes/school_kid_f.pal | 19 + graphics/trainers/palettes/school_kid_m.pal | 19 + graphics/trainers/palettes/scientist.pal | 19 + graphics/trainers/palettes/sis_and_bro.pal | 19 + graphics/trainers/palettes/sr_and_jr.pal | 19 + graphics/trainers/palettes/steven.pal | 19 + graphics/trainers/palettes/super_nerd.pal | 19 + graphics/trainers/palettes/swimmer_f.pal | 19 + graphics/trainers/palettes/swimmer_m.pal | 19 + .../trainers/palettes/swimming_triathlete_f.pal | 19 + .../trainers/palettes/swimming_triathlete_m.pal | 19 + graphics/trainers/palettes/tamer.pal | 19 + graphics/trainers/palettes/tuber.pal | 19 + graphics/trainers/palettes/twins.pal | 19 + graphics/trainers/palettes/wally.pal | 19 + graphics/trainers/palettes/winstrate_f.pal | 19 + graphics/trainers/palettes/winstrate_m.pal | 19 + graphics/trainers/palettes/young_couple.pal | 19 + graphics/trainers/palettes/youngster.pal | 19 + 2750 files changed, 31920 insertions(+), 13 deletions(-) create mode 100644 graphics/pokemon/back_pics/abra_back_pic.png create mode 100644 graphics/pokemon/back_pics/absol_back_pic.png create mode 100644 graphics/pokemon/back_pics/aerodactyl_back_pic.png create mode 100644 graphics/pokemon/back_pics/aggron_back_pic.png create mode 100644 graphics/pokemon/back_pics/aipom_back_pic.png create mode 100644 graphics/pokemon/back_pics/alakazam_back_pic.png create mode 100644 graphics/pokemon/back_pics/altaria_back_pic.png create mode 100644 graphics/pokemon/back_pics/ampharos_back_pic.png create mode 100644 graphics/pokemon/back_pics/anorith_back_pic.png create mode 100644 graphics/pokemon/back_pics/arbok_back_pic.png create mode 100644 graphics/pokemon/back_pics/arcanine_back_pic.png create mode 100644 graphics/pokemon/back_pics/ariados_back_pic.png create mode 100644 graphics/pokemon/back_pics/armaldo_back_pic.png create mode 100644 graphics/pokemon/back_pics/aron_back_pic.png create mode 100644 graphics/pokemon/back_pics/articuno_back_pic.png create mode 100644 graphics/pokemon/back_pics/azumarill_back_pic.png create mode 100644 graphics/pokemon/back_pics/azurill_back_pic.png create mode 100644 graphics/pokemon/back_pics/bagon_back_pic.png create mode 100644 graphics/pokemon/back_pics/baltoy_back_pic.png create mode 100644 graphics/pokemon/back_pics/banette_back_pic.png create mode 100644 graphics/pokemon/back_pics/barboach_back_pic.png create mode 100644 graphics/pokemon/back_pics/bayleef_back_pic.png create mode 100644 graphics/pokemon/back_pics/beautifly_back_pic.png create mode 100644 graphics/pokemon/back_pics/beedrill_back_pic.png create mode 100644 graphics/pokemon/back_pics/beldum_back_pic.png create mode 100644 graphics/pokemon/back_pics/bellossom_back_pic.png create mode 100644 graphics/pokemon/back_pics/bellsprout_back_pic.png create mode 100644 graphics/pokemon/back_pics/blastoise_back_pic.png create mode 100644 graphics/pokemon/back_pics/blaziken_back_pic.png create mode 100644 graphics/pokemon/back_pics/blissey_back_pic.png create mode 100644 graphics/pokemon/back_pics/breloom_back_pic.png create mode 100644 graphics/pokemon/back_pics/bulbasaur_back_pic.png create mode 100644 graphics/pokemon/back_pics/butterfree_back_pic.png create mode 100644 graphics/pokemon/back_pics/cacnea_back_pic.png create mode 100644 graphics/pokemon/back_pics/cacturne_back_pic.png create mode 100644 graphics/pokemon/back_pics/camerupt_back_pic.png create mode 100644 graphics/pokemon/back_pics/carvanha_back_pic.png create mode 100644 graphics/pokemon/back_pics/cascoon_back_pic.png create mode 100644 graphics/pokemon/back_pics/castform_normal_form_back_pic.png create mode 100644 graphics/pokemon/back_pics/castform_rainy_form_back_pic.png create mode 100644 graphics/pokemon/back_pics/castform_snowy_form_back_pic.png create mode 100644 graphics/pokemon/back_pics/castform_sunny_form_back_pic.png create mode 100644 graphics/pokemon/back_pics/caterpie_back_pic.png create mode 100644 graphics/pokemon/back_pics/celebi_back_pic.png create mode 100644 graphics/pokemon/back_pics/chansey_back_pic.png create mode 100644 graphics/pokemon/back_pics/charizard_back_pic.png create mode 100644 graphics/pokemon/back_pics/charmander_back_pic.png create mode 100644 graphics/pokemon/back_pics/charmeleon_back_pic.png create mode 100644 graphics/pokemon/back_pics/chikorita_back_pic.png create mode 100644 graphics/pokemon/back_pics/chimecho_back_pic.png create mode 100644 graphics/pokemon/back_pics/chinchou_back_pic.png create mode 100644 graphics/pokemon/back_pics/circled_question_mark_back_pic.png create mode 100644 graphics/pokemon/back_pics/clamperl_back_pic.png create mode 100644 graphics/pokemon/back_pics/claydol_back_pic.png create mode 100644 graphics/pokemon/back_pics/clefable_back_pic.png create mode 100644 graphics/pokemon/back_pics/clefairy_back_pic.png create mode 100644 graphics/pokemon/back_pics/cleffa_back_pic.png create mode 100644 graphics/pokemon/back_pics/cloyster_back_pic.png create mode 100644 graphics/pokemon/back_pics/combusken_back_pic.png create mode 100644 graphics/pokemon/back_pics/corphish_back_pic.png create mode 100644 graphics/pokemon/back_pics/corsola_back_pic.png create mode 100644 graphics/pokemon/back_pics/cradily_back_pic.png create mode 100644 graphics/pokemon/back_pics/crawdaunt_back_pic.png create mode 100644 graphics/pokemon/back_pics/crobat_back_pic.png create mode 100644 graphics/pokemon/back_pics/croconaw_back_pic.png create mode 100644 graphics/pokemon/back_pics/cubone_back_pic.png create mode 100644 graphics/pokemon/back_pics/cyndaquil_back_pic.png create mode 100644 graphics/pokemon/back_pics/delcatty_back_pic.png create mode 100644 graphics/pokemon/back_pics/delibird_back_pic.png create mode 100644 graphics/pokemon/back_pics/deoxys_back_pic.png create mode 100644 graphics/pokemon/back_pics/dewgong_back_pic.png create mode 100644 graphics/pokemon/back_pics/diglett_back_pic.png create mode 100644 graphics/pokemon/back_pics/ditto_back_pic.png create mode 100644 graphics/pokemon/back_pics/dodrio_back_pic.png create mode 100644 graphics/pokemon/back_pics/doduo_back_pic.png create mode 100644 graphics/pokemon/back_pics/donphan_back_pic.png create mode 100644 graphics/pokemon/back_pics/double_question_mark_back_pic.png create mode 100644 graphics/pokemon/back_pics/dragonair_back_pic.png create mode 100644 graphics/pokemon/back_pics/dragonite_back_pic.png create mode 100644 graphics/pokemon/back_pics/dratini_back_pic.png create mode 100644 graphics/pokemon/back_pics/drowzee_back_pic.png create mode 100644 graphics/pokemon/back_pics/dugtrio_back_pic.png create mode 100644 graphics/pokemon/back_pics/dunsparce_back_pic.png create mode 100644 graphics/pokemon/back_pics/dusclops_back_pic.png create mode 100644 graphics/pokemon/back_pics/duskull_back_pic.png create mode 100644 graphics/pokemon/back_pics/dustox_back_pic.png create mode 100644 graphics/pokemon/back_pics/eevee_back_pic.png create mode 100644 graphics/pokemon/back_pics/ekans_back_pic.png create mode 100644 graphics/pokemon/back_pics/electabuzz_back_pic.png create mode 100644 graphics/pokemon/back_pics/electrike_back_pic.png create mode 100644 graphics/pokemon/back_pics/electrode_back_pic.png create mode 100644 graphics/pokemon/back_pics/elekid_back_pic.png create mode 100644 graphics/pokemon/back_pics/entei_back_pic.png create mode 100644 graphics/pokemon/back_pics/espeon_back_pic.png create mode 100644 graphics/pokemon/back_pics/exeggcute_back_pic.png create mode 100644 graphics/pokemon/back_pics/exeggutor_back_pic.png create mode 100644 graphics/pokemon/back_pics/exploud_back_pic.png create mode 100644 graphics/pokemon/back_pics/farfetch_d_back_pic.png create mode 100644 graphics/pokemon/back_pics/fearow_back_pic.png create mode 100644 graphics/pokemon/back_pics/feebas_back_pic.png create mode 100644 graphics/pokemon/back_pics/feraligatr_back_pic.png create mode 100644 graphics/pokemon/back_pics/flaaffy_back_pic.png create mode 100644 graphics/pokemon/back_pics/flareon_back_pic.png create mode 100644 graphics/pokemon/back_pics/flygon_back_pic.png create mode 100644 graphics/pokemon/back_pics/forretress_back_pic.png create mode 100644 graphics/pokemon/back_pics/furret_back_pic.png create mode 100644 graphics/pokemon/back_pics/gardevoir_back_pic.png create mode 100644 graphics/pokemon/back_pics/gastly_back_pic.png create mode 100644 graphics/pokemon/back_pics/gengar_back_pic.png create mode 100644 graphics/pokemon/back_pics/geodude_back_pic.png create mode 100644 graphics/pokemon/back_pics/girafarig_back_pic.png create mode 100644 graphics/pokemon/back_pics/glalie_back_pic.png create mode 100644 graphics/pokemon/back_pics/gligar_back_pic.png create mode 100644 graphics/pokemon/back_pics/gloom_back_pic.png create mode 100644 graphics/pokemon/back_pics/golbat_back_pic.png create mode 100644 graphics/pokemon/back_pics/goldeen_back_pic.png create mode 100644 graphics/pokemon/back_pics/golduck_back_pic.png create mode 100644 graphics/pokemon/back_pics/golem_back_pic.png create mode 100644 graphics/pokemon/back_pics/gorebyss_back_pic.png create mode 100644 graphics/pokemon/back_pics/granbull_back_pic.png create mode 100644 graphics/pokemon/back_pics/graveler_back_pic.png create mode 100644 graphics/pokemon/back_pics/grimer_back_pic.png create mode 100644 graphics/pokemon/back_pics/groudon_back_pic.png create mode 100644 graphics/pokemon/back_pics/grovyle_back_pic.png create mode 100644 graphics/pokemon/back_pics/growlithe_back_pic.png create mode 100644 graphics/pokemon/back_pics/grumpig_back_pic.png create mode 100644 graphics/pokemon/back_pics/gulpin_back_pic.png create mode 100644 graphics/pokemon/back_pics/gyarados_back_pic.png create mode 100644 graphics/pokemon/back_pics/hariyama_back_pic.png create mode 100644 graphics/pokemon/back_pics/haunter_back_pic.png create mode 100644 graphics/pokemon/back_pics/heracross_back_pic.png create mode 100644 graphics/pokemon/back_pics/hitmonchan_back_pic.png create mode 100644 graphics/pokemon/back_pics/hitmonlee_back_pic.png create mode 100644 graphics/pokemon/back_pics/hitmontop_back_pic.png create mode 100644 graphics/pokemon/back_pics/ho_oh_back_pic.png create mode 100644 graphics/pokemon/back_pics/hoothoot_back_pic.png create mode 100644 graphics/pokemon/back_pics/hoppip_back_pic.png create mode 100644 graphics/pokemon/back_pics/horsea_back_pic.png create mode 100644 graphics/pokemon/back_pics/houndoom_back_pic.png create mode 100644 graphics/pokemon/back_pics/houndour_back_pic.png create mode 100644 graphics/pokemon/back_pics/huntail_back_pic.png create mode 100644 graphics/pokemon/back_pics/hypno_back_pic.png create mode 100644 graphics/pokemon/back_pics/igglybuff_back_pic.png create mode 100644 graphics/pokemon/back_pics/illumise_back_pic.png create mode 100644 graphics/pokemon/back_pics/ivysaur_back_pic.png create mode 100644 graphics/pokemon/back_pics/jigglypuff_back_pic.png create mode 100644 graphics/pokemon/back_pics/jirachi_back_pic.png create mode 100644 graphics/pokemon/back_pics/jolteon_back_pic.png create mode 100644 graphics/pokemon/back_pics/jumpluff_back_pic.png create mode 100644 graphics/pokemon/back_pics/jynx_back_pic.png create mode 100644 graphics/pokemon/back_pics/kabuto_back_pic.png create mode 100644 graphics/pokemon/back_pics/kabutops_back_pic.png create mode 100644 graphics/pokemon/back_pics/kadabra_back_pic.png create mode 100644 graphics/pokemon/back_pics/kakuna_back_pic.png create mode 100644 graphics/pokemon/back_pics/kangaskhan_back_pic.png create mode 100644 graphics/pokemon/back_pics/kecleon_back_pic.png create mode 100644 graphics/pokemon/back_pics/kingdra_back_pic.png create mode 100644 graphics/pokemon/back_pics/kingler_back_pic.png create mode 100644 graphics/pokemon/back_pics/kirlia_back_pic.png create mode 100644 graphics/pokemon/back_pics/koffing_back_pic.png create mode 100644 graphics/pokemon/back_pics/krabby_back_pic.png create mode 100644 graphics/pokemon/back_pics/kyogre_back_pic.png create mode 100644 graphics/pokemon/back_pics/lairon_back_pic.png create mode 100644 graphics/pokemon/back_pics/lanturn_back_pic.png create mode 100644 graphics/pokemon/back_pics/lapras_back_pic.png create mode 100644 graphics/pokemon/back_pics/larvitar_back_pic.png create mode 100644 graphics/pokemon/back_pics/latias_back_pic.png create mode 100644 graphics/pokemon/back_pics/latios_back_pic.png create mode 100644 graphics/pokemon/back_pics/ledian_back_pic.png create mode 100644 graphics/pokemon/back_pics/ledyba_back_pic.png create mode 100644 graphics/pokemon/back_pics/lickitung_back_pic.png create mode 100644 graphics/pokemon/back_pics/lileep_back_pic.png create mode 100644 graphics/pokemon/back_pics/linoone_back_pic.png create mode 100644 graphics/pokemon/back_pics/lombre_back_pic.png create mode 100644 graphics/pokemon/back_pics/lotad_back_pic.png create mode 100644 graphics/pokemon/back_pics/loudred_back_pic.png create mode 100644 graphics/pokemon/back_pics/ludicolo_back_pic.png create mode 100644 graphics/pokemon/back_pics/lugia_back_pic.png create mode 100644 graphics/pokemon/back_pics/lunatone_back_pic.png create mode 100644 graphics/pokemon/back_pics/luvdisc_back_pic.png create mode 100644 graphics/pokemon/back_pics/machamp_back_pic.png create mode 100644 graphics/pokemon/back_pics/machoke_back_pic.png create mode 100644 graphics/pokemon/back_pics/machop_back_pic.png create mode 100644 graphics/pokemon/back_pics/magby_back_pic.png create mode 100644 graphics/pokemon/back_pics/magcargo_back_pic.png create mode 100644 graphics/pokemon/back_pics/magikarp_back_pic.png create mode 100644 graphics/pokemon/back_pics/magmar_back_pic.png create mode 100644 graphics/pokemon/back_pics/magnemite_back_pic.png create mode 100644 graphics/pokemon/back_pics/magneton_back_pic.png create mode 100644 graphics/pokemon/back_pics/makuhita_back_pic.png create mode 100644 graphics/pokemon/back_pics/manectric_back_pic.png create mode 100644 graphics/pokemon/back_pics/mankey_back_pic.png create mode 100644 graphics/pokemon/back_pics/mantine_back_pic.png create mode 100644 graphics/pokemon/back_pics/mareep_back_pic.png create mode 100644 graphics/pokemon/back_pics/marill_back_pic.png create mode 100644 graphics/pokemon/back_pics/marowak_back_pic.png create mode 100644 graphics/pokemon/back_pics/marshtomp_back_pic.png create mode 100644 graphics/pokemon/back_pics/masquerain_back_pic.png create mode 100644 graphics/pokemon/back_pics/mawile_back_pic.png create mode 100644 graphics/pokemon/back_pics/medicham_back_pic.png create mode 100644 graphics/pokemon/back_pics/meditite_back_pic.png create mode 100644 graphics/pokemon/back_pics/meganium_back_pic.png create mode 100644 graphics/pokemon/back_pics/meowth_back_pic.png create mode 100644 graphics/pokemon/back_pics/metagross_back_pic.png create mode 100644 graphics/pokemon/back_pics/metang_back_pic.png create mode 100644 graphics/pokemon/back_pics/metapod_back_pic.png create mode 100644 graphics/pokemon/back_pics/mew_back_pic.png create mode 100644 graphics/pokemon/back_pics/mewtwo_back_pic.png create mode 100644 graphics/pokemon/back_pics/mightyena_back_pic.png create mode 100644 graphics/pokemon/back_pics/milotic_back_pic.png create mode 100644 graphics/pokemon/back_pics/miltank_back_pic.png create mode 100644 graphics/pokemon/back_pics/minun_back_pic.png create mode 100644 graphics/pokemon/back_pics/misdreavus_back_pic.png create mode 100644 graphics/pokemon/back_pics/moltres_back_pic.png create mode 100644 graphics/pokemon/back_pics/mr_mime_back_pic.png create mode 100644 graphics/pokemon/back_pics/mudkip_back_pic.png create mode 100644 graphics/pokemon/back_pics/muk_back_pic.png create mode 100644 graphics/pokemon/back_pics/murkrow_back_pic.png create mode 100644 graphics/pokemon/back_pics/natu_back_pic.png create mode 100644 graphics/pokemon/back_pics/nidoking_back_pic.png create mode 100644 graphics/pokemon/back_pics/nidoqueen_back_pic.png create mode 100644 graphics/pokemon/back_pics/nidoran_f_back_pic.png create mode 100644 graphics/pokemon/back_pics/nidoran_m_back_pic.png create mode 100644 graphics/pokemon/back_pics/nidorina_back_pic.png create mode 100644 graphics/pokemon/back_pics/nidorino_back_pic.png create mode 100644 graphics/pokemon/back_pics/nincada_back_pic.png create mode 100644 graphics/pokemon/back_pics/ninetales_back_pic.png create mode 100644 graphics/pokemon/back_pics/ninjask_back_pic.png create mode 100644 graphics/pokemon/back_pics/noctowl_back_pic.png create mode 100644 graphics/pokemon/back_pics/nosepass_back_pic.png create mode 100644 graphics/pokemon/back_pics/numel_back_pic.png create mode 100644 graphics/pokemon/back_pics/nuzleaf_back_pic.png create mode 100644 graphics/pokemon/back_pics/octillery_back_pic.png create mode 100644 graphics/pokemon/back_pics/oddish_back_pic.png create mode 100644 graphics/pokemon/back_pics/omanyte_back_pic.png create mode 100644 graphics/pokemon/back_pics/omastar_back_pic.png create mode 100644 graphics/pokemon/back_pics/onix_back_pic.png create mode 100644 graphics/pokemon/back_pics/paras_back_pic.png create mode 100644 graphics/pokemon/back_pics/parasect_back_pic.png create mode 100644 graphics/pokemon/back_pics/pelipper_back_pic.png create mode 100644 graphics/pokemon/back_pics/persian_back_pic.png create mode 100644 graphics/pokemon/back_pics/phanpy_back_pic.png create mode 100644 graphics/pokemon/back_pics/pichu_back_pic.png create mode 100644 graphics/pokemon/back_pics/pidgeot_back_pic.png create mode 100644 graphics/pokemon/back_pics/pidgeotto_back_pic.png create mode 100644 graphics/pokemon/back_pics/pidgey_back_pic.png create mode 100644 graphics/pokemon/back_pics/pikachu_back_pic.png create mode 100644 graphics/pokemon/back_pics/piloswine_back_pic.png create mode 100644 graphics/pokemon/back_pics/pineco_back_pic.png create mode 100644 graphics/pokemon/back_pics/pinsir_back_pic.png create mode 100644 graphics/pokemon/back_pics/plusle_back_pic.png create mode 100644 graphics/pokemon/back_pics/politoed_back_pic.png create mode 100644 graphics/pokemon/back_pics/poliwag_back_pic.png create mode 100644 graphics/pokemon/back_pics/poliwhirl_back_pic.png create mode 100644 graphics/pokemon/back_pics/poliwrath_back_pic.png create mode 100644 graphics/pokemon/back_pics/ponyta_back_pic.png create mode 100644 graphics/pokemon/back_pics/poochyena_back_pic.png create mode 100644 graphics/pokemon/back_pics/porygon2_back_pic.png create mode 100644 graphics/pokemon/back_pics/porygon_back_pic.png create mode 100644 graphics/pokemon/back_pics/primeape_back_pic.png create mode 100644 graphics/pokemon/back_pics/psyduck_back_pic.png create mode 100644 graphics/pokemon/back_pics/pupitar_back_pic.png create mode 100644 graphics/pokemon/back_pics/quagsire_back_pic.png create mode 100644 graphics/pokemon/back_pics/quilava_back_pic.png create mode 100644 graphics/pokemon/back_pics/qwilfish_back_pic.png create mode 100644 graphics/pokemon/back_pics/raichu_back_pic.png create mode 100644 graphics/pokemon/back_pics/raikou_back_pic.png create mode 100644 graphics/pokemon/back_pics/ralts_back_pic.png create mode 100644 graphics/pokemon/back_pics/rapidash_back_pic.png create mode 100644 graphics/pokemon/back_pics/raticate_back_pic.png create mode 100644 graphics/pokemon/back_pics/rattata_back_pic.png create mode 100644 graphics/pokemon/back_pics/rayquaza_back_pic.png create mode 100644 graphics/pokemon/back_pics/regice_back_pic.png create mode 100644 graphics/pokemon/back_pics/regirock_back_pic.png create mode 100644 graphics/pokemon/back_pics/registeel_back_pic.png create mode 100644 graphics/pokemon/back_pics/relicanth_back_pic.png create mode 100644 graphics/pokemon/back_pics/remoraid_back_pic.png create mode 100644 graphics/pokemon/back_pics/rhydon_back_pic.png create mode 100644 graphics/pokemon/back_pics/rhyhorn_back_pic.png create mode 100644 graphics/pokemon/back_pics/roselia_back_pic.png create mode 100644 graphics/pokemon/back_pics/sableye_back_pic.png create mode 100644 graphics/pokemon/back_pics/salamence_back_pic.png create mode 100644 graphics/pokemon/back_pics/sandshrew_back_pic.png create mode 100644 graphics/pokemon/back_pics/sandslash_back_pic.png create mode 100644 graphics/pokemon/back_pics/sceptile_back_pic.png create mode 100644 graphics/pokemon/back_pics/scizor_back_pic.png create mode 100644 graphics/pokemon/back_pics/scyther_back_pic.png create mode 100644 graphics/pokemon/back_pics/seadra_back_pic.png create mode 100644 graphics/pokemon/back_pics/seaking_back_pic.png create mode 100644 graphics/pokemon/back_pics/sealeo_back_pic.png create mode 100644 graphics/pokemon/back_pics/seedot_back_pic.png create mode 100644 graphics/pokemon/back_pics/seel_back_pic.png create mode 100644 graphics/pokemon/back_pics/sentret_back_pic.png create mode 100644 graphics/pokemon/back_pics/seviper_back_pic.png create mode 100644 graphics/pokemon/back_pics/sharpedo_back_pic.png create mode 100644 graphics/pokemon/back_pics/shedinja_back_pic.png create mode 100644 graphics/pokemon/back_pics/shelgon_back_pic.png create mode 100644 graphics/pokemon/back_pics/shellder_back_pic.png create mode 100644 graphics/pokemon/back_pics/shiftry_back_pic.png create mode 100644 graphics/pokemon/back_pics/shroomish_back_pic.png create mode 100644 graphics/pokemon/back_pics/shuckle_back_pic.png create mode 100644 graphics/pokemon/back_pics/shuppet_back_pic.png create mode 100644 graphics/pokemon/back_pics/silcoon_back_pic.png create mode 100644 graphics/pokemon/back_pics/skarmory_back_pic.png create mode 100644 graphics/pokemon/back_pics/skiploom_back_pic.png create mode 100644 graphics/pokemon/back_pics/skitty_back_pic.png create mode 100644 graphics/pokemon/back_pics/slaking_back_pic.png create mode 100644 graphics/pokemon/back_pics/slakoth_back_pic.png create mode 100644 graphics/pokemon/back_pics/slowbro_back_pic.png create mode 100644 graphics/pokemon/back_pics/slowking_back_pic.png create mode 100644 graphics/pokemon/back_pics/slowpoke_back_pic.png create mode 100644 graphics/pokemon/back_pics/slugma_back_pic.png create mode 100644 graphics/pokemon/back_pics/smeargle_back_pic.png create mode 100644 graphics/pokemon/back_pics/smoochum_back_pic.png create mode 100644 graphics/pokemon/back_pics/sneasel_back_pic.png create mode 100644 graphics/pokemon/back_pics/snorlax_back_pic.png create mode 100644 graphics/pokemon/back_pics/snorunt_back_pic.png create mode 100644 graphics/pokemon/back_pics/snubbull_back_pic.png create mode 100644 graphics/pokemon/back_pics/solrock_back_pic.png create mode 100644 graphics/pokemon/back_pics/spearow_back_pic.png create mode 100644 graphics/pokemon/back_pics/spheal_back_pic.png create mode 100644 graphics/pokemon/back_pics/spinarak_back_pic.png create mode 100644 graphics/pokemon/back_pics/spinda_back_pic.png create mode 100644 graphics/pokemon/back_pics/spoink_back_pic.png create mode 100644 graphics/pokemon/back_pics/squirtle_back_pic.png create mode 100644 graphics/pokemon/back_pics/stantler_back_pic.png create mode 100644 graphics/pokemon/back_pics/starmie_back_pic.png create mode 100644 graphics/pokemon/back_pics/staryu_back_pic.png create mode 100644 graphics/pokemon/back_pics/steelix_back_pic.png create mode 100644 graphics/pokemon/back_pics/sudowoodo_back_pic.png create mode 100644 graphics/pokemon/back_pics/suicune_back_pic.png create mode 100644 graphics/pokemon/back_pics/sunflora_back_pic.png create mode 100644 graphics/pokemon/back_pics/sunkern_back_pic.png create mode 100644 graphics/pokemon/back_pics/surskit_back_pic.png create mode 100644 graphics/pokemon/back_pics/swablu_back_pic.png create mode 100644 graphics/pokemon/back_pics/swalot_back_pic.png create mode 100644 graphics/pokemon/back_pics/swampert_back_pic.png create mode 100644 graphics/pokemon/back_pics/swellow_back_pic.png create mode 100644 graphics/pokemon/back_pics/swinub_back_pic.png create mode 100644 graphics/pokemon/back_pics/taillow_back_pic.png create mode 100644 graphics/pokemon/back_pics/tangela_back_pic.png create mode 100644 graphics/pokemon/back_pics/tauros_back_pic.png create mode 100644 graphics/pokemon/back_pics/teddiursa_back_pic.png create mode 100644 graphics/pokemon/back_pics/tentacool_back_pic.png create mode 100644 graphics/pokemon/back_pics/tentacruel_back_pic.png create mode 100644 graphics/pokemon/back_pics/togepi_back_pic.png create mode 100644 graphics/pokemon/back_pics/togetic_back_pic.png create mode 100644 graphics/pokemon/back_pics/torchic_back_pic.png create mode 100644 graphics/pokemon/back_pics/torkoal_back_pic.png create mode 100644 graphics/pokemon/back_pics/totodile_back_pic.png create mode 100644 graphics/pokemon/back_pics/trapinch_back_pic.png create mode 100644 graphics/pokemon/back_pics/treecko_back_pic.png create mode 100644 graphics/pokemon/back_pics/tropius_back_pic.png create mode 100644 graphics/pokemon/back_pics/typhlosion_back_pic.png create mode 100644 graphics/pokemon/back_pics/tyranitar_back_pic.png create mode 100644 graphics/pokemon/back_pics/tyrogue_back_pic.png create mode 100644 graphics/pokemon/back_pics/umbreon_back_pic.png create mode 100644 graphics/pokemon/back_pics/unown_a_back_pic.png create mode 100644 graphics/pokemon/back_pics/unown_b_back_pic.png create mode 100644 graphics/pokemon/back_pics/unown_c_back_pic.png create mode 100644 graphics/pokemon/back_pics/unown_d_back_pic.png create mode 100644 graphics/pokemon/back_pics/unown_e_back_pic.png create mode 100644 graphics/pokemon/back_pics/unown_exclamation_mark_back_pic.png create mode 100644 graphics/pokemon/back_pics/unown_f_back_pic.png create mode 100644 graphics/pokemon/back_pics/unown_g_back_pic.png create mode 100644 graphics/pokemon/back_pics/unown_h_back_pic.png create mode 100644 graphics/pokemon/back_pics/unown_i_back_pic.png create mode 100644 graphics/pokemon/back_pics/unown_j_back_pic.png create mode 100644 graphics/pokemon/back_pics/unown_k_back_pic.png create mode 100644 graphics/pokemon/back_pics/unown_l_back_pic.png create mode 100644 graphics/pokemon/back_pics/unown_m_back_pic.png create mode 100644 graphics/pokemon/back_pics/unown_n_back_pic.png create mode 100644 graphics/pokemon/back_pics/unown_o_back_pic.png create mode 100644 graphics/pokemon/back_pics/unown_p_back_pic.png create mode 100644 graphics/pokemon/back_pics/unown_q_back_pic.png create mode 100644 graphics/pokemon/back_pics/unown_question_mark_back_pic.png create mode 100644 graphics/pokemon/back_pics/unown_r_back_pic.png create mode 100644 graphics/pokemon/back_pics/unown_s_back_pic.png create mode 100644 graphics/pokemon/back_pics/unown_t_back_pic.png create mode 100644 graphics/pokemon/back_pics/unown_u_back_pic.png create mode 100644 graphics/pokemon/back_pics/unown_v_back_pic.png create mode 100644 graphics/pokemon/back_pics/unown_w_back_pic.png create mode 100644 graphics/pokemon/back_pics/unown_x_back_pic.png create mode 100644 graphics/pokemon/back_pics/unown_y_back_pic.png create mode 100644 graphics/pokemon/back_pics/unown_z_back_pic.png create mode 100644 graphics/pokemon/back_pics/ursaring_back_pic.png create mode 100644 graphics/pokemon/back_pics/vaporeon_back_pic.png create mode 100644 graphics/pokemon/back_pics/venomoth_back_pic.png create mode 100644 graphics/pokemon/back_pics/venonat_back_pic.png create mode 100644 graphics/pokemon/back_pics/venusaur_back_pic.png create mode 100644 graphics/pokemon/back_pics/vibrava_back_pic.png create mode 100644 graphics/pokemon/back_pics/victreebel_back_pic.png create mode 100644 graphics/pokemon/back_pics/vigoroth_back_pic.png create mode 100644 graphics/pokemon/back_pics/vileplume_back_pic.png create mode 100644 graphics/pokemon/back_pics/volbeat_back_pic.png create mode 100644 graphics/pokemon/back_pics/voltorb_back_pic.png create mode 100644 graphics/pokemon/back_pics/vulpix_back_pic.png create mode 100644 graphics/pokemon/back_pics/wailmer_back_pic.png create mode 100644 graphics/pokemon/back_pics/wailord_back_pic.png create mode 100644 graphics/pokemon/back_pics/walrein_back_pic.png create mode 100644 graphics/pokemon/back_pics/wartortle_back_pic.png create mode 100644 graphics/pokemon/back_pics/weedle_back_pic.png create mode 100644 graphics/pokemon/back_pics/weepinbell_back_pic.png create mode 100644 graphics/pokemon/back_pics/weezing_back_pic.png create mode 100644 graphics/pokemon/back_pics/whiscash_back_pic.png create mode 100644 graphics/pokemon/back_pics/whismur_back_pic.png create mode 100644 graphics/pokemon/back_pics/wigglytuff_back_pic.png create mode 100644 graphics/pokemon/back_pics/wingull_back_pic.png create mode 100644 graphics/pokemon/back_pics/wobbuffet_back_pic.png create mode 100644 graphics/pokemon/back_pics/wooper_back_pic.png create mode 100644 graphics/pokemon/back_pics/wurmple_back_pic.png create mode 100644 graphics/pokemon/back_pics/wynaut_back_pic.png create mode 100644 graphics/pokemon/back_pics/xatu_back_pic.png create mode 100644 graphics/pokemon/back_pics/yanma_back_pic.png create mode 100644 graphics/pokemon/back_pics/zangoose_back_pic.png create mode 100644 graphics/pokemon/back_pics/zapdos_back_pic.png create mode 100644 graphics/pokemon/back_pics/zigzagoon_back_pic.png create mode 100644 graphics/pokemon/back_pics/zubat_back_pic.png create mode 100644 graphics/pokemon/footprints/abra_footprint.png create mode 100644 graphics/pokemon/footprints/absol_footprint.png create mode 100644 graphics/pokemon/footprints/aerodactyl_footprint.png create mode 100644 graphics/pokemon/footprints/aggron_footprint.png create mode 100644 graphics/pokemon/footprints/aipom_footprint.png create mode 100644 graphics/pokemon/footprints/alakazam_footprint.png create mode 100644 graphics/pokemon/footprints/altaria_footprint.png create mode 100644 graphics/pokemon/footprints/ampharos_footprint.png create mode 100644 graphics/pokemon/footprints/anorith_footprint.png create mode 100644 graphics/pokemon/footprints/arbok_footprint.png create mode 100644 graphics/pokemon/footprints/arcanine_footprint.png create mode 100644 graphics/pokemon/footprints/ariados_footprint.png create mode 100644 graphics/pokemon/footprints/armaldo_footprint.png create mode 100644 graphics/pokemon/footprints/aron_footprint.png create mode 100644 graphics/pokemon/footprints/articuno_footprint.png create mode 100644 graphics/pokemon/footprints/azumarill_footprint.png create mode 100644 graphics/pokemon/footprints/azurill_footprint.png create mode 100644 graphics/pokemon/footprints/bagon_footprint.png create mode 100644 graphics/pokemon/footprints/baltoy_footprint.png create mode 100644 graphics/pokemon/footprints/banette_footprint.png create mode 100644 graphics/pokemon/footprints/barboach_footprint.png create mode 100644 graphics/pokemon/footprints/bayleef_footprint.png create mode 100644 graphics/pokemon/footprints/beautifly_footprint.png create mode 100644 graphics/pokemon/footprints/beedrill_footprint.png create mode 100644 graphics/pokemon/footprints/beldum_footprint.png create mode 100644 graphics/pokemon/footprints/bellossom_footprint.png create mode 100644 graphics/pokemon/footprints/bellsprout_footprint.png create mode 100644 graphics/pokemon/footprints/blastoise_footprint.png create mode 100644 graphics/pokemon/footprints/blaziken_footprint.png create mode 100644 graphics/pokemon/footprints/blissey_footprint.png create mode 100644 graphics/pokemon/footprints/breloom_footprint.png create mode 100644 graphics/pokemon/footprints/bulbasaur_footprint.png create mode 100644 graphics/pokemon/footprints/butterfree_footprint.png create mode 100644 graphics/pokemon/footprints/cacnea_footprint.png create mode 100644 graphics/pokemon/footprints/cacturne_footprint.png create mode 100644 graphics/pokemon/footprints/camerupt_footprint.png create mode 100644 graphics/pokemon/footprints/carvanha_footprint.png create mode 100644 graphics/pokemon/footprints/cascoon_footprint.png create mode 100644 graphics/pokemon/footprints/castform_footprint.png create mode 100644 graphics/pokemon/footprints/caterpie_footprint.png create mode 100644 graphics/pokemon/footprints/celebi_footprint.png create mode 100644 graphics/pokemon/footprints/chansey_footprint.png create mode 100644 graphics/pokemon/footprints/charizard_footprint.png create mode 100644 graphics/pokemon/footprints/charmander_footprint.png create mode 100644 graphics/pokemon/footprints/charmeleon_footprint.png create mode 100644 graphics/pokemon/footprints/chikorita_footprint.png create mode 100644 graphics/pokemon/footprints/chimecho_footprint.png create mode 100644 graphics/pokemon/footprints/chinchou_footprint.png create mode 100644 graphics/pokemon/footprints/clamperl_footprint.png create mode 100644 graphics/pokemon/footprints/claydol_footprint.png create mode 100644 graphics/pokemon/footprints/clefable_footprint.png create mode 100644 graphics/pokemon/footprints/clefairy_footprint.png create mode 100644 graphics/pokemon/footprints/cleffa_footprint.png create mode 100644 graphics/pokemon/footprints/cloyster_footprint.png create mode 100644 graphics/pokemon/footprints/combusken_footprint.png create mode 100644 graphics/pokemon/footprints/corphish_footprint.png create mode 100644 graphics/pokemon/footprints/corsola_footprint.png create mode 100644 graphics/pokemon/footprints/cradily_footprint.png create mode 100644 graphics/pokemon/footprints/crawdaunt_footprint.png create mode 100644 graphics/pokemon/footprints/crobat_footprint.png create mode 100644 graphics/pokemon/footprints/croconaw_footprint.png create mode 100644 graphics/pokemon/footprints/cubone_footprint.png create mode 100644 graphics/pokemon/footprints/cyndaquil_footprint.png create mode 100644 graphics/pokemon/footprints/delcatty_footprint.png create mode 100644 graphics/pokemon/footprints/delibird_footprint.png create mode 100644 graphics/pokemon/footprints/deoxys_footprint.png create mode 100644 graphics/pokemon/footprints/dewgong_footprint.png create mode 100644 graphics/pokemon/footprints/diglett_footprint.png create mode 100644 graphics/pokemon/footprints/ditto_footprint.png create mode 100644 graphics/pokemon/footprints/dodrio_footprint.png create mode 100644 graphics/pokemon/footprints/doduo_footprint.png create mode 100644 graphics/pokemon/footprints/donphan_footprint.png create mode 100644 graphics/pokemon/footprints/dragonair_footprint.png create mode 100644 graphics/pokemon/footprints/dragonite_footprint.png create mode 100644 graphics/pokemon/footprints/dratini_footprint.png create mode 100644 graphics/pokemon/footprints/drowzee_footprint.png create mode 100644 graphics/pokemon/footprints/dugtrio_footprint.png create mode 100644 graphics/pokemon/footprints/dunsparce_footprint.png create mode 100644 graphics/pokemon/footprints/dusclops_footprint.png create mode 100644 graphics/pokemon/footprints/duskull_footprint.png create mode 100644 graphics/pokemon/footprints/dustox_footprint.png create mode 100644 graphics/pokemon/footprints/eevee_footprint.png create mode 100644 graphics/pokemon/footprints/ekans_footprint.png create mode 100644 graphics/pokemon/footprints/electabuzz_footprint.png create mode 100644 graphics/pokemon/footprints/electrike_footprint.png create mode 100644 graphics/pokemon/footprints/electrode_footprint.png create mode 100644 graphics/pokemon/footprints/elekid_footprint.png create mode 100644 graphics/pokemon/footprints/entei_footprint.png create mode 100644 graphics/pokemon/footprints/espeon_footprint.png create mode 100644 graphics/pokemon/footprints/exeggcute_footprint.png create mode 100644 graphics/pokemon/footprints/exeggutor_footprint.png create mode 100644 graphics/pokemon/footprints/exploud_footprint.png create mode 100644 graphics/pokemon/footprints/farfetch_d_footprint.png create mode 100644 graphics/pokemon/footprints/fearow_footprint.png create mode 100644 graphics/pokemon/footprints/feebas_footprint.png create mode 100644 graphics/pokemon/footprints/feraligatr_footprint.png create mode 100644 graphics/pokemon/footprints/flaaffy_footprint.png create mode 100644 graphics/pokemon/footprints/flareon_footprint.png create mode 100644 graphics/pokemon/footprints/flygon_footprint.png create mode 100644 graphics/pokemon/footprints/forretress_footprint.png create mode 100644 graphics/pokemon/footprints/furret_footprint.png create mode 100644 graphics/pokemon/footprints/gardevoir_footprint.png create mode 100644 graphics/pokemon/footprints/gastly_footprint.png create mode 100644 graphics/pokemon/footprints/gengar_footprint.png create mode 100644 graphics/pokemon/footprints/geodude_footprint.png create mode 100644 graphics/pokemon/footprints/girafarig_footprint.png create mode 100644 graphics/pokemon/footprints/glalie_footprint.png create mode 100644 graphics/pokemon/footprints/gligar_footprint.png create mode 100644 graphics/pokemon/footprints/gloom_footprint.png create mode 100644 graphics/pokemon/footprints/golbat_footprint.png create mode 100644 graphics/pokemon/footprints/goldeen_footprint.png create mode 100644 graphics/pokemon/footprints/golduck_footprint.png create mode 100644 graphics/pokemon/footprints/golem_footprint.png create mode 100644 graphics/pokemon/footprints/gorebyss_footprint.png create mode 100644 graphics/pokemon/footprints/granbull_footprint.png create mode 100644 graphics/pokemon/footprints/graveler_footprint.png create mode 100644 graphics/pokemon/footprints/grimer_footprint.png create mode 100644 graphics/pokemon/footprints/groudon_footprint.png create mode 100644 graphics/pokemon/footprints/grovyle_footprint.png create mode 100644 graphics/pokemon/footprints/growlithe_footprint.png create mode 100644 graphics/pokemon/footprints/grumpig_footprint.png create mode 100644 graphics/pokemon/footprints/gulpin_footprint.png create mode 100644 graphics/pokemon/footprints/gyarados_footprint.png create mode 100644 graphics/pokemon/footprints/hariyama_footprint.png create mode 100644 graphics/pokemon/footprints/haunter_footprint.png create mode 100644 graphics/pokemon/footprints/heracross_footprint.png create mode 100644 graphics/pokemon/footprints/hitmonchan_footprint.png create mode 100644 graphics/pokemon/footprints/hitmonlee_footprint.png create mode 100644 graphics/pokemon/footprints/hitmontop_footprint.png create mode 100644 graphics/pokemon/footprints/ho_oh_footprint.png create mode 100644 graphics/pokemon/footprints/hoothoot_footprint.png create mode 100644 graphics/pokemon/footprints/hoppip_footprint.png create mode 100644 graphics/pokemon/footprints/horsea_footprint.png create mode 100644 graphics/pokemon/footprints/houndoom_footprint.png create mode 100644 graphics/pokemon/footprints/houndour_footprint.png create mode 100644 graphics/pokemon/footprints/huntail_footprint.png create mode 100644 graphics/pokemon/footprints/hypno_footprint.png create mode 100644 graphics/pokemon/footprints/igglybuff_footprint.png create mode 100644 graphics/pokemon/footprints/illumise_footprint.png create mode 100644 graphics/pokemon/footprints/ivysaur_footprint.png create mode 100644 graphics/pokemon/footprints/jigglypuff_footprint.png create mode 100644 graphics/pokemon/footprints/jirachi_footprint.png create mode 100644 graphics/pokemon/footprints/jolteon_footprint.png create mode 100644 graphics/pokemon/footprints/jumpluff_footprint.png create mode 100644 graphics/pokemon/footprints/jynx_footprint.png create mode 100644 graphics/pokemon/footprints/kabuto_footprint.png create mode 100644 graphics/pokemon/footprints/kabutops_footprint.png create mode 100644 graphics/pokemon/footprints/kadabra_footprint.png create mode 100644 graphics/pokemon/footprints/kakuna_footprint.png create mode 100644 graphics/pokemon/footprints/kangaskhan_footprint.png create mode 100644 graphics/pokemon/footprints/kecleon_footprint.png create mode 100644 graphics/pokemon/footprints/kingdra_footprint.png create mode 100644 graphics/pokemon/footprints/kingler_footprint.png create mode 100644 graphics/pokemon/footprints/kirlia_footprint.png create mode 100644 graphics/pokemon/footprints/koffing_footprint.png create mode 100644 graphics/pokemon/footprints/krabby_footprint.png create mode 100644 graphics/pokemon/footprints/kyogre_footprint.png create mode 100644 graphics/pokemon/footprints/lairon_footprint.png create mode 100644 graphics/pokemon/footprints/lanturn_footprint.png create mode 100644 graphics/pokemon/footprints/lapras_footprint.png create mode 100644 graphics/pokemon/footprints/larvitar_footprint.png create mode 100644 graphics/pokemon/footprints/latias_footprint.png create mode 100644 graphics/pokemon/footprints/latios_footprint.png create mode 100644 graphics/pokemon/footprints/ledian_footprint.png create mode 100644 graphics/pokemon/footprints/ledyba_footprint.png create mode 100644 graphics/pokemon/footprints/lickitung_footprint.png create mode 100644 graphics/pokemon/footprints/lileep_footprint.png create mode 100644 graphics/pokemon/footprints/linoone_footprint.png create mode 100644 graphics/pokemon/footprints/lombre_footprint.png create mode 100644 graphics/pokemon/footprints/lotad_footprint.png create mode 100644 graphics/pokemon/footprints/loudred_footprint.png create mode 100644 graphics/pokemon/footprints/ludicolo_footprint.png create mode 100644 graphics/pokemon/footprints/lugia_footprint.png create mode 100644 graphics/pokemon/footprints/lunatone_footprint.png create mode 100644 graphics/pokemon/footprints/luvdisc_footprint.png create mode 100644 graphics/pokemon/footprints/machamp_footprint.png create mode 100644 graphics/pokemon/footprints/machoke_footprint.png create mode 100644 graphics/pokemon/footprints/machop_footprint.png create mode 100644 graphics/pokemon/footprints/magby_footprint.png create mode 100644 graphics/pokemon/footprints/magcargo_footprint.png create mode 100644 graphics/pokemon/footprints/magikarp_footprint.png create mode 100644 graphics/pokemon/footprints/magmar_footprint.png create mode 100644 graphics/pokemon/footprints/magnemite_footprint.png create mode 100644 graphics/pokemon/footprints/magneton_footprint.png create mode 100644 graphics/pokemon/footprints/makuhita_footprint.png create mode 100644 graphics/pokemon/footprints/manectric_footprint.png create mode 100644 graphics/pokemon/footprints/mankey_footprint.png create mode 100644 graphics/pokemon/footprints/mantine_footprint.png create mode 100644 graphics/pokemon/footprints/mareep_footprint.png create mode 100644 graphics/pokemon/footprints/marill_footprint.png create mode 100644 graphics/pokemon/footprints/marowak_footprint.png create mode 100644 graphics/pokemon/footprints/marshtomp_footprint.png create mode 100644 graphics/pokemon/footprints/masquerain_footprint.png create mode 100644 graphics/pokemon/footprints/mawile_footprint.png create mode 100644 graphics/pokemon/footprints/medicham_footprint.png create mode 100644 graphics/pokemon/footprints/meditite_footprint.png create mode 100644 graphics/pokemon/footprints/meganium_footprint.png create mode 100644 graphics/pokemon/footprints/meowth_footprint.png create mode 100644 graphics/pokemon/footprints/metagross_footprint.png create mode 100644 graphics/pokemon/footprints/metang_footprint.png create mode 100644 graphics/pokemon/footprints/metapod_footprint.png create mode 100644 graphics/pokemon/footprints/mew_footprint.png create mode 100644 graphics/pokemon/footprints/mewtwo_footprint.png create mode 100644 graphics/pokemon/footprints/mightyena_footprint.png create mode 100644 graphics/pokemon/footprints/milotic_footprint.png create mode 100644 graphics/pokemon/footprints/miltank_footprint.png create mode 100644 graphics/pokemon/footprints/minun_footprint.png create mode 100644 graphics/pokemon/footprints/misdreavus_footprint.png create mode 100644 graphics/pokemon/footprints/moltres_footprint.png create mode 100644 graphics/pokemon/footprints/mr_mime_footprint.png create mode 100644 graphics/pokemon/footprints/mudkip_footprint.png create mode 100644 graphics/pokemon/footprints/muk_footprint.png create mode 100644 graphics/pokemon/footprints/murkrow_footprint.png create mode 100644 graphics/pokemon/footprints/natu_footprint.png create mode 100644 graphics/pokemon/footprints/nidoking_footprint.png create mode 100644 graphics/pokemon/footprints/nidoqueen_footprint.png create mode 100644 graphics/pokemon/footprints/nidoran_f_footprint.png create mode 100644 graphics/pokemon/footprints/nidoran_m_footprint.png create mode 100644 graphics/pokemon/footprints/nidorina_footprint.png create mode 100644 graphics/pokemon/footprints/nidorino_footprint.png create mode 100644 graphics/pokemon/footprints/nincada_footprint.png create mode 100644 graphics/pokemon/footprints/ninetales_footprint.png create mode 100644 graphics/pokemon/footprints/ninjask_footprint.png create mode 100644 graphics/pokemon/footprints/noctowl_footprint.png create mode 100644 graphics/pokemon/footprints/nosepass_footprint.png create mode 100644 graphics/pokemon/footprints/numel_footprint.png create mode 100644 graphics/pokemon/footprints/nuzleaf_footprint.png create mode 100644 graphics/pokemon/footprints/octillery_footprint.png create mode 100644 graphics/pokemon/footprints/oddish_footprint.png create mode 100644 graphics/pokemon/footprints/omanyte_footprint.png create mode 100644 graphics/pokemon/footprints/omastar_footprint.png create mode 100644 graphics/pokemon/footprints/onix_footprint.png create mode 100644 graphics/pokemon/footprints/paras_footprint.png create mode 100644 graphics/pokemon/footprints/parasect_footprint.png create mode 100644 graphics/pokemon/footprints/pelipper_footprint.png create mode 100644 graphics/pokemon/footprints/persian_footprint.png create mode 100644 graphics/pokemon/footprints/phanpy_footprint.png create mode 100644 graphics/pokemon/footprints/pichu_footprint.png create mode 100644 graphics/pokemon/footprints/pidgeot_footprint.png create mode 100644 graphics/pokemon/footprints/pidgeotto_footprint.png create mode 100644 graphics/pokemon/footprints/pidgey_footprint.png create mode 100644 graphics/pokemon/footprints/pikachu_footprint.png create mode 100644 graphics/pokemon/footprints/piloswine_footprint.png create mode 100644 graphics/pokemon/footprints/pineco_footprint.png create mode 100644 graphics/pokemon/footprints/pinsir_footprint.png create mode 100644 graphics/pokemon/footprints/plusle_footprint.png create mode 100644 graphics/pokemon/footprints/politoed_footprint.png create mode 100644 graphics/pokemon/footprints/poliwag_footprint.png create mode 100644 graphics/pokemon/footprints/poliwhirl_footprint.png create mode 100644 graphics/pokemon/footprints/poliwrath_footprint.png create mode 100644 graphics/pokemon/footprints/ponyta_footprint.png create mode 100644 graphics/pokemon/footprints/poochyena_footprint.png create mode 100644 graphics/pokemon/footprints/porygon2_footprint.png create mode 100644 graphics/pokemon/footprints/porygon_footprint.png create mode 100644 graphics/pokemon/footprints/primeape_footprint.png create mode 100644 graphics/pokemon/footprints/psyduck_footprint.png create mode 100644 graphics/pokemon/footprints/pupitar_footprint.png create mode 100644 graphics/pokemon/footprints/quagsire_footprint.png create mode 100644 graphics/pokemon/footprints/question_mark_footprint.png create mode 100644 graphics/pokemon/footprints/quilava_footprint.png create mode 100644 graphics/pokemon/footprints/qwilfish_footprint.png create mode 100644 graphics/pokemon/footprints/raichu_footprint.png create mode 100644 graphics/pokemon/footprints/raikou_footprint.png create mode 100644 graphics/pokemon/footprints/ralts_footprint.png create mode 100644 graphics/pokemon/footprints/rapidash_footprint.png create mode 100644 graphics/pokemon/footprints/raticate_footprint.png create mode 100644 graphics/pokemon/footprints/rattata_footprint.png create mode 100644 graphics/pokemon/footprints/rayquaza_footprint.png create mode 100644 graphics/pokemon/footprints/regice_footprint.png create mode 100644 graphics/pokemon/footprints/regirock_footprint.png create mode 100644 graphics/pokemon/footprints/registeel_footprint.png create mode 100644 graphics/pokemon/footprints/relicanth_footprint.png create mode 100644 graphics/pokemon/footprints/remoraid_footprint.png create mode 100644 graphics/pokemon/footprints/rhydon_footprint.png create mode 100644 graphics/pokemon/footprints/rhyhorn_footprint.png create mode 100644 graphics/pokemon/footprints/roselia_footprint.png create mode 100644 graphics/pokemon/footprints/sableye_footprint.png create mode 100644 graphics/pokemon/footprints/salamence_footprint.png create mode 100644 graphics/pokemon/footprints/sandshrew_footprint.png create mode 100644 graphics/pokemon/footprints/sandslash_footprint.png create mode 100644 graphics/pokemon/footprints/sceptile_footprint.png create mode 100644 graphics/pokemon/footprints/scizor_footprint.png create mode 100644 graphics/pokemon/footprints/scyther_footprint.png create mode 100644 graphics/pokemon/footprints/seadra_footprint.png create mode 100644 graphics/pokemon/footprints/seaking_footprint.png create mode 100644 graphics/pokemon/footprints/sealeo_footprint.png create mode 100644 graphics/pokemon/footprints/seedot_footprint.png create mode 100644 graphics/pokemon/footprints/seel_footprint.png create mode 100644 graphics/pokemon/footprints/sentret_footprint.png create mode 100644 graphics/pokemon/footprints/seviper_footprint.png create mode 100644 graphics/pokemon/footprints/sharpedo_footprint.png create mode 100644 graphics/pokemon/footprints/shedinja_footprint.png create mode 100644 graphics/pokemon/footprints/shelgon_footprint.png create mode 100644 graphics/pokemon/footprints/shellder_footprint.png create mode 100644 graphics/pokemon/footprints/shiftry_footprint.png create mode 100644 graphics/pokemon/footprints/shroomish_footprint.png create mode 100644 graphics/pokemon/footprints/shuckle_footprint.png create mode 100644 graphics/pokemon/footprints/shuppet_footprint.png create mode 100644 graphics/pokemon/footprints/silcoon_footprint.png create mode 100644 graphics/pokemon/footprints/skarmory_footprint.png create mode 100644 graphics/pokemon/footprints/skiploom_footprint.png create mode 100644 graphics/pokemon/footprints/skitty_footprint.png create mode 100644 graphics/pokemon/footprints/slaking_footprint.png create mode 100644 graphics/pokemon/footprints/slakoth_footprint.png create mode 100644 graphics/pokemon/footprints/slowbro_footprint.png create mode 100644 graphics/pokemon/footprints/slowking_footprint.png create mode 100644 graphics/pokemon/footprints/slowpoke_footprint.png create mode 100644 graphics/pokemon/footprints/slugma_footprint.png create mode 100644 graphics/pokemon/footprints/smeargle_footprint.png create mode 100644 graphics/pokemon/footprints/smoochum_footprint.png create mode 100644 graphics/pokemon/footprints/sneasel_footprint.png create mode 100644 graphics/pokemon/footprints/snorlax_footprint.png create mode 100644 graphics/pokemon/footprints/snorunt_footprint.png create mode 100644 graphics/pokemon/footprints/snubbull_footprint.png create mode 100644 graphics/pokemon/footprints/solrock_footprint.png create mode 100644 graphics/pokemon/footprints/spearow_footprint.png create mode 100644 graphics/pokemon/footprints/spheal_footprint.png create mode 100644 graphics/pokemon/footprints/spinarak_footprint.png create mode 100644 graphics/pokemon/footprints/spinda_footprint.png create mode 100644 graphics/pokemon/footprints/spoink_footprint.png create mode 100644 graphics/pokemon/footprints/squirtle_footprint.png create mode 100644 graphics/pokemon/footprints/stantler_footprint.png create mode 100644 graphics/pokemon/footprints/starmie_footprint.png create mode 100644 graphics/pokemon/footprints/staryu_footprint.png create mode 100644 graphics/pokemon/footprints/steelix_footprint.png create mode 100644 graphics/pokemon/footprints/sudowoodo_footprint.png create mode 100644 graphics/pokemon/footprints/suicune_footprint.png create mode 100644 graphics/pokemon/footprints/sunflora_footprint.png create mode 100644 graphics/pokemon/footprints/sunkern_footprint.png create mode 100644 graphics/pokemon/footprints/surskit_footprint.png create mode 100644 graphics/pokemon/footprints/swablu_footprint.png create mode 100644 graphics/pokemon/footprints/swalot_footprint.png create mode 100644 graphics/pokemon/footprints/swampert_footprint.png create mode 100644 graphics/pokemon/footprints/swellow_footprint.png create mode 100644 graphics/pokemon/footprints/swinub_footprint.png create mode 100644 graphics/pokemon/footprints/taillow_footprint.png create mode 100644 graphics/pokemon/footprints/tangela_footprint.png create mode 100644 graphics/pokemon/footprints/tauros_footprint.png create mode 100644 graphics/pokemon/footprints/teddiursa_footprint.png create mode 100644 graphics/pokemon/footprints/tentacool_footprint.png create mode 100644 graphics/pokemon/footprints/tentacruel_footprint.png create mode 100644 graphics/pokemon/footprints/togepi_footprint.png create mode 100644 graphics/pokemon/footprints/togetic_footprint.png create mode 100644 graphics/pokemon/footprints/torchic_footprint.png create mode 100644 graphics/pokemon/footprints/torkoal_footprint.png create mode 100644 graphics/pokemon/footprints/totodile_footprint.png create mode 100644 graphics/pokemon/footprints/trapinch_footprint.png create mode 100644 graphics/pokemon/footprints/treecko_footprint.png create mode 100644 graphics/pokemon/footprints/tropius_footprint.png create mode 100644 graphics/pokemon/footprints/typhlosion_footprint.png create mode 100644 graphics/pokemon/footprints/tyranitar_footprint.png create mode 100644 graphics/pokemon/footprints/tyrogue_footprint.png create mode 100644 graphics/pokemon/footprints/umbreon_footprint.png create mode 100644 graphics/pokemon/footprints/unown_footprint.png create mode 100644 graphics/pokemon/footprints/ursaring_footprint.png create mode 100644 graphics/pokemon/footprints/vaporeon_footprint.png create mode 100644 graphics/pokemon/footprints/venomoth_footprint.png create mode 100644 graphics/pokemon/footprints/venonat_footprint.png create mode 100644 graphics/pokemon/footprints/venusaur_footprint.png create mode 100644 graphics/pokemon/footprints/vibrava_footprint.png create mode 100644 graphics/pokemon/footprints/victreebel_footprint.png create mode 100644 graphics/pokemon/footprints/vigoroth_footprint.png create mode 100644 graphics/pokemon/footprints/vileplume_footprint.png create mode 100644 graphics/pokemon/footprints/volbeat_footprint.png create mode 100644 graphics/pokemon/footprints/voltorb_footprint.png create mode 100644 graphics/pokemon/footprints/vulpix_footprint.png create mode 100644 graphics/pokemon/footprints/wailmer_footprint.png create mode 100644 graphics/pokemon/footprints/wailord_footprint.png create mode 100644 graphics/pokemon/footprints/walrein_footprint.png create mode 100644 graphics/pokemon/footprints/wartortle_footprint.png create mode 100644 graphics/pokemon/footprints/weedle_footprint.png create mode 100644 graphics/pokemon/footprints/weepinbell_footprint.png create mode 100644 graphics/pokemon/footprints/weezing_footprint.png create mode 100644 graphics/pokemon/footprints/whiscash_footprint.png create mode 100644 graphics/pokemon/footprints/whismur_footprint.png create mode 100644 graphics/pokemon/footprints/wigglytuff_footprint.png create mode 100644 graphics/pokemon/footprints/wingull_footprint.png create mode 100644 graphics/pokemon/footprints/wobbuffet_footprint.png create mode 100644 graphics/pokemon/footprints/wooper_footprint.png create mode 100644 graphics/pokemon/footprints/wurmple_footprint.png create mode 100644 graphics/pokemon/footprints/wynaut_footprint.png create mode 100644 graphics/pokemon/footprints/xatu_footprint.png create mode 100644 graphics/pokemon/footprints/yanma_footprint.png create mode 100644 graphics/pokemon/footprints/zangoose_footprint.png create mode 100644 graphics/pokemon/footprints/zapdos_footprint.png create mode 100644 graphics/pokemon/footprints/zigzagoon_footprint.png create mode 100644 graphics/pokemon/footprints/zubat_footprint.png create mode 100644 graphics/pokemon/front_pics/abra_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/absol_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/aerodactyl_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/aggron_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/aipom_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/alakazam_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/altaria_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/ampharos_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/anorith_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/arbok_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/arcanine_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/ariados_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/armaldo_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/aron_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/articuno_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/azumarill_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/azurill_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/bagon_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/baltoy_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/banette_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/barboach_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/bayleef_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/beautifly_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/beedrill_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/beldum_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/bellossom_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/bellsprout_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/blastoise_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/blaziken_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/blissey_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/breloom_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/bulbasaur_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/butterfree_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/cacnea_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/cacturne_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/camerupt_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/carvanha_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/cascoon_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/castform_normal_form_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/castform_rainy_form_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/castform_snowy_form_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/castform_sunny_form_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/caterpie_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/celebi_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/chansey_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/charizard_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/charmander_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/charmeleon_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/chikorita_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/chimecho_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/chinchou_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/circled_question_mark_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/clamperl_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/claydol_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/clefable_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/clefairy_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/cleffa_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/cloyster_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/combusken_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/corphish_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/corsola_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/cradily_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/crawdaunt_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/crobat_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/croconaw_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/cubone_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/cyndaquil_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/delcatty_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/delibird_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/deoxys_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/dewgong_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/diglett_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/ditto_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/dodrio_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/doduo_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/donphan_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/double_question_mark_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/dragonair_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/dragonite_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/dratini_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/drowzee_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/dugtrio_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/dunsparce_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/dusclops_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/duskull_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/dustox_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/eevee_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/egg_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/ekans_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/electabuzz_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/electrike_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/electrode_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/elekid_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/entei_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/espeon_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/exeggcute_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/exeggutor_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/exploud_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/farfetch_d_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/fearow_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/feebas_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/feraligatr_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/flaaffy_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/flareon_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/flygon_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/forretress_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/furret_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/gardevoir_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/gastly_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/gengar_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/geodude_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/girafarig_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/glalie_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/gligar_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/gloom_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/golbat_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/goldeen_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/golduck_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/golem_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/gorebyss_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/granbull_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/graveler_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/grimer_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/groudon_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/grovyle_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/growlithe_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/grumpig_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/gulpin_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/gyarados_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/hariyama_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/haunter_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/heracross_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/hitmonchan_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/hitmonlee_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/hitmontop_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/ho_oh_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/hoothoot_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/hoppip_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/horsea_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/houndoom_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/houndour_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/huntail_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/hypno_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/igglybuff_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/illumise_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/ivysaur_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/jigglypuff_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/jirachi_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/jolteon_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/jumpluff_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/jynx_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/kabuto_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/kabutops_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/kadabra_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/kakuna_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/kangaskhan_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/kecleon_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/kingdra_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/kingler_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/kirlia_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/koffing_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/krabby_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/kyogre_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/lairon_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/lanturn_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/lapras_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/larvitar_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/latias_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/latios_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/ledian_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/ledyba_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/lickitung_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/lileep_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/linoone_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/lombre_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/lotad_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/loudred_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/ludicolo_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/lugia_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/lunatone_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/luvdisc_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/machamp_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/machoke_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/machop_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/magby_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/magcargo_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/magikarp_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/magmar_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/magnemite_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/magneton_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/makuhita_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/manectric_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/mankey_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/mantine_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/mareep_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/marill_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/marowak_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/marshtomp_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/masquerain_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/mawile_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/medicham_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/meditite_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/meganium_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/meowth_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/metagross_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/metang_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/metapod_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/mew_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/mewtwo_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/mightyena_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/milotic_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/miltank_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/minun_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/misdreavus_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/moltres_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/mr_mime_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/mudkip_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/muk_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/murkrow_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/natu_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/nidoking_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/nidoqueen_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/nidoran_f_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/nidoran_m_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/nidorina_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/nidorino_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/nincada_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/ninetales_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/ninjask_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/noctowl_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/nosepass_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/numel_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/nuzleaf_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/octillery_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/oddish_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/omanyte_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/omastar_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/onix_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/paras_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/parasect_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/pelipper_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/persian_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/phanpy_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/pichu_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/pidgeot_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/pidgeotto_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/pidgey_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/pikachu_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/piloswine_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/pineco_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/pinsir_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/plusle_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/politoed_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/poliwag_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/poliwhirl_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/poliwrath_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/ponyta_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/poochyena_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/porygon2_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/porygon_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/primeape_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/psyduck_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/pupitar_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/quagsire_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/quilava_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/qwilfish_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/raichu_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/raikou_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/ralts_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/rapidash_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/raticate_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/rattata_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/rayquaza_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/regice_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/regirock_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/registeel_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/relicanth_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/remoraid_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/rhydon_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/rhyhorn_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/roselia_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/sableye_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/salamence_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/sandshrew_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/sandslash_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/sceptile_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/scizor_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/scyther_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/seadra_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/seaking_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/sealeo_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/seedot_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/seel_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/sentret_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/seviper_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/sharpedo_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/shedinja_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/shelgon_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/shellder_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/shiftry_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/shroomish_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/shuckle_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/shuppet_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/silcoon_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/skarmory_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/skiploom_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/skitty_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/slaking_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/slakoth_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/slowbro_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/slowking_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/slowpoke_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/slugma_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/smeargle_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/smoochum_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/sneasel_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/snorlax_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/snorunt_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/snubbull_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/solrock_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/spearow_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/spheal_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/spinarak_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/spinda_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/spoink_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/squirtle_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/stantler_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/starmie_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/staryu_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/steelix_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/sudowoodo_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/suicune_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/sunflora_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/sunkern_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/surskit_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/swablu_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/swalot_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/swampert_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/swellow_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/swinub_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/taillow_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/tangela_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/tauros_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/teddiursa_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/tentacool_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/tentacruel_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/togepi_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/togetic_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/torchic_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/torkoal_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/totodile_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/trapinch_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/treecko_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/tropius_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/typhlosion_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/tyranitar_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/tyrogue_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/umbreon_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/unown_a_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/unown_b_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/unown_c_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/unown_d_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/unown_e_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/unown_exclamation_mark_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/unown_f_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/unown_g_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/unown_h_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/unown_i_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/unown_j_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/unown_k_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/unown_l_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/unown_m_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/unown_n_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/unown_o_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/unown_p_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/unown_q_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/unown_question_mark_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/unown_r_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/unown_s_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/unown_t_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/unown_u_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/unown_v_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/unown_w_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/unown_x_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/unown_y_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/unown_z_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/ursaring_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/vaporeon_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/venomoth_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/venonat_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/venusaur_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/vibrava_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/victreebel_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/vigoroth_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/vileplume_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/volbeat_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/voltorb_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/vulpix_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/wailmer_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/wailord_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/walrein_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/wartortle_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/weedle_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/weepinbell_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/weezing_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/whiscash_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/whismur_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/wigglytuff_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/wingull_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/wobbuffet_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/wooper_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/wurmple_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/wynaut_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/xatu_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/yanma_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/zangoose_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/zapdos_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/zigzagoon_still_front_pic.png create mode 100644 graphics/pokemon/front_pics/zubat_still_front_pic.png create mode 100644 graphics/pokemon/icon notes create mode 100644 graphics/pokemon/icon_palettes/icon_palette_0.pal create mode 100644 graphics/pokemon/icon_palettes/icon_palette_1.pal create mode 100644 graphics/pokemon/icon_palettes/icon_palette_2.pal create mode 100644 graphics/pokemon/icons/abra_icon.png create mode 100644 graphics/pokemon/icons/absol_icon.png create mode 100644 graphics/pokemon/icons/aerodactyl_icon.png create mode 100644 graphics/pokemon/icons/aggron_icon.png create mode 100644 graphics/pokemon/icons/aipom_icon.png create mode 100644 graphics/pokemon/icons/alakazam_icon.png create mode 100644 graphics/pokemon/icons/altaria_icon.png create mode 100644 graphics/pokemon/icons/ampharos_icon.png create mode 100644 graphics/pokemon/icons/anorith_icon.png create mode 100644 graphics/pokemon/icons/arbok_icon.png create mode 100644 graphics/pokemon/icons/arcanine_icon.png create mode 100644 graphics/pokemon/icons/ariados_icon.png create mode 100644 graphics/pokemon/icons/armaldo_icon.png create mode 100644 graphics/pokemon/icons/aron_icon.png create mode 100644 graphics/pokemon/icons/articuno_icon.png create mode 100644 graphics/pokemon/icons/azumarill_icon.png create mode 100644 graphics/pokemon/icons/azurill_icon.png create mode 100644 graphics/pokemon/icons/bagon_icon.png create mode 100644 graphics/pokemon/icons/baltoy_icon.png create mode 100644 graphics/pokemon/icons/banette_icon.png create mode 100644 graphics/pokemon/icons/barboach_icon.png create mode 100644 graphics/pokemon/icons/bayleef_icon.png create mode 100644 graphics/pokemon/icons/beautifly_icon.png create mode 100644 graphics/pokemon/icons/beedrill_icon.png create mode 100644 graphics/pokemon/icons/beldum_icon.png create mode 100644 graphics/pokemon/icons/bellossom_icon.png create mode 100644 graphics/pokemon/icons/bellsprout_icon.png create mode 100644 graphics/pokemon/icons/blastoise_icon.png create mode 100644 graphics/pokemon/icons/blaziken_icon.png create mode 100644 graphics/pokemon/icons/blissey_icon.png create mode 100644 graphics/pokemon/icons/breloom_icon.png create mode 100644 graphics/pokemon/icons/bulbasaur_icon.png create mode 100644 graphics/pokemon/icons/butterfree_icon.png create mode 100644 graphics/pokemon/icons/cacnea_icon.png create mode 100644 graphics/pokemon/icons/cacturne_icon.png create mode 100644 graphics/pokemon/icons/camerupt_icon.png create mode 100644 graphics/pokemon/icons/carvanha_icon.png create mode 100644 graphics/pokemon/icons/cascoon_icon.png create mode 100644 graphics/pokemon/icons/castform_icon.png create mode 100644 graphics/pokemon/icons/caterpie_icon.png create mode 100644 graphics/pokemon/icons/celebi_icon.png create mode 100644 graphics/pokemon/icons/chansey_icon.png create mode 100644 graphics/pokemon/icons/charizard_icon.png create mode 100644 graphics/pokemon/icons/charmander_icon.png create mode 100644 graphics/pokemon/icons/charmeleon_icon.png create mode 100644 graphics/pokemon/icons/chikorita_icon.png create mode 100644 graphics/pokemon/icons/chimecho_icon.png create mode 100644 graphics/pokemon/icons/chinchou_icon.png create mode 100644 graphics/pokemon/icons/clamperl_icon.png create mode 100644 graphics/pokemon/icons/claydol_icon.png create mode 100644 graphics/pokemon/icons/clefable_icon.png create mode 100644 graphics/pokemon/icons/clefairy_icon.png create mode 100644 graphics/pokemon/icons/cleffa_icon.png create mode 100644 graphics/pokemon/icons/cloyster_icon.png create mode 100644 graphics/pokemon/icons/combusken_icon.png create mode 100644 graphics/pokemon/icons/corphish_icon.png create mode 100644 graphics/pokemon/icons/corsola_icon.png create mode 100644 graphics/pokemon/icons/cradily_icon.png create mode 100644 graphics/pokemon/icons/crawdaunt_icon.png create mode 100644 graphics/pokemon/icons/crobat_icon.png create mode 100644 graphics/pokemon/icons/croconaw_icon.png create mode 100644 graphics/pokemon/icons/cubone_icon.png create mode 100644 graphics/pokemon/icons/cyndaquil_icon.png create mode 100644 graphics/pokemon/icons/delcatty_icon.png create mode 100644 graphics/pokemon/icons/delibird_icon.png create mode 100644 graphics/pokemon/icons/deoxys_icon.png create mode 100644 graphics/pokemon/icons/deoxys_speed_icon.png create mode 100644 graphics/pokemon/icons/dewgong_icon.png create mode 100644 graphics/pokemon/icons/diglett_icon.png create mode 100644 graphics/pokemon/icons/ditto_icon.png create mode 100644 graphics/pokemon/icons/dodrio_icon.png create mode 100644 graphics/pokemon/icons/doduo_icon.png create mode 100644 graphics/pokemon/icons/donphan_icon.png create mode 100644 graphics/pokemon/icons/dragonair_icon.png create mode 100644 graphics/pokemon/icons/dragonite_icon.png create mode 100644 graphics/pokemon/icons/dratini_icon.png create mode 100644 graphics/pokemon/icons/drowzee_icon.png create mode 100644 graphics/pokemon/icons/dugtrio_icon.png create mode 100644 graphics/pokemon/icons/dunsparce_icon.png create mode 100644 graphics/pokemon/icons/dusclops_icon.png create mode 100644 graphics/pokemon/icons/duskull_icon.png create mode 100644 graphics/pokemon/icons/dustox_icon.png create mode 100644 graphics/pokemon/icons/eevee_icon.png create mode 100644 graphics/pokemon/icons/egg_icon.png create mode 100644 graphics/pokemon/icons/ekans_icon.png create mode 100644 graphics/pokemon/icons/electabuzz_icon.png create mode 100644 graphics/pokemon/icons/electrike_icon.png create mode 100644 graphics/pokemon/icons/electrode_icon.png create mode 100644 graphics/pokemon/icons/elekid_icon.png create mode 100644 graphics/pokemon/icons/entei_icon.png create mode 100644 graphics/pokemon/icons/espeon_icon.png create mode 100644 graphics/pokemon/icons/exeggcute_icon.png create mode 100644 graphics/pokemon/icons/exeggutor_icon.png create mode 100644 graphics/pokemon/icons/exploud_icon.png create mode 100644 graphics/pokemon/icons/farfetch_d_icon.png create mode 100644 graphics/pokemon/icons/fearow_icon.png create mode 100644 graphics/pokemon/icons/feebas_icon.png create mode 100644 graphics/pokemon/icons/feraligatr_icon.png create mode 100644 graphics/pokemon/icons/flaaffy_icon.png create mode 100644 graphics/pokemon/icons/flareon_icon.png create mode 100644 graphics/pokemon/icons/flygon_icon.png create mode 100644 graphics/pokemon/icons/forretress_icon.png create mode 100644 graphics/pokemon/icons/furret_icon.png create mode 100644 graphics/pokemon/icons/gardevoir_icon.png create mode 100644 graphics/pokemon/icons/gastly_icon.png create mode 100644 graphics/pokemon/icons/gengar_icon.png create mode 100644 graphics/pokemon/icons/geodude_icon.png create mode 100644 graphics/pokemon/icons/girafarig_icon.png create mode 100644 graphics/pokemon/icons/glalie_icon.png create mode 100644 graphics/pokemon/icons/gligar_icon.png create mode 100644 graphics/pokemon/icons/gloom_icon.png create mode 100644 graphics/pokemon/icons/golbat_icon.png create mode 100644 graphics/pokemon/icons/goldeen_icon.png create mode 100644 graphics/pokemon/icons/golduck_icon.png create mode 100644 graphics/pokemon/icons/golem_icon.png create mode 100644 graphics/pokemon/icons/gorebyss_icon.png create mode 100644 graphics/pokemon/icons/granbull_icon.png create mode 100644 graphics/pokemon/icons/graveler_icon.png create mode 100644 graphics/pokemon/icons/grimer_icon.png create mode 100644 graphics/pokemon/icons/groudon_icon.png create mode 100644 graphics/pokemon/icons/grovyle_icon.png create mode 100644 graphics/pokemon/icons/growlithe_icon.png create mode 100644 graphics/pokemon/icons/grumpig_icon.png create mode 100644 graphics/pokemon/icons/gulpin_icon.png create mode 100644 graphics/pokemon/icons/gyarados_icon.png create mode 100644 graphics/pokemon/icons/hariyama_icon.png create mode 100644 graphics/pokemon/icons/haunter_icon.png create mode 100644 graphics/pokemon/icons/heracross_icon.png create mode 100644 graphics/pokemon/icons/hitmonchan_icon.png create mode 100644 graphics/pokemon/icons/hitmonlee_icon.png create mode 100644 graphics/pokemon/icons/hitmontop_icon.png create mode 100644 graphics/pokemon/icons/ho_oh_icon.png create mode 100644 graphics/pokemon/icons/hoothoot_icon.png create mode 100644 graphics/pokemon/icons/hoppip_icon.png create mode 100644 graphics/pokemon/icons/horsea_icon.png create mode 100644 graphics/pokemon/icons/houndoom_icon.png create mode 100644 graphics/pokemon/icons/houndour_icon.png create mode 100644 graphics/pokemon/icons/huntail_icon.png create mode 100644 graphics/pokemon/icons/hypno_icon.png create mode 100644 graphics/pokemon/icons/igglybuff_icon.png create mode 100644 graphics/pokemon/icons/illumise_icon.png create mode 100644 graphics/pokemon/icons/ivysaur_icon.png create mode 100644 graphics/pokemon/icons/jigglypuff_icon.png create mode 100644 graphics/pokemon/icons/jirachi_icon.png create mode 100644 graphics/pokemon/icons/jolteon_icon.png create mode 100644 graphics/pokemon/icons/jumpluff_icon.png create mode 100644 graphics/pokemon/icons/jynx_icon.png create mode 100644 graphics/pokemon/icons/kabuto_icon.png create mode 100644 graphics/pokemon/icons/kabutops_icon.png create mode 100644 graphics/pokemon/icons/kadabra_icon.png create mode 100644 graphics/pokemon/icons/kakuna_icon.png create mode 100644 graphics/pokemon/icons/kangaskhan_icon.png create mode 100644 graphics/pokemon/icons/kecleon_icon.png create mode 100644 graphics/pokemon/icons/kingdra_icon.png create mode 100644 graphics/pokemon/icons/kingler_icon.png create mode 100644 graphics/pokemon/icons/kirlia_icon.png create mode 100644 graphics/pokemon/icons/koffing_icon.png create mode 100644 graphics/pokemon/icons/krabby_icon.png create mode 100644 graphics/pokemon/icons/kyogre_icon.png create mode 100644 graphics/pokemon/icons/lairon_icon.png create mode 100644 graphics/pokemon/icons/lanturn_icon.png create mode 100644 graphics/pokemon/icons/lapras_icon.png create mode 100644 graphics/pokemon/icons/larvitar_icon.png create mode 100644 graphics/pokemon/icons/latias_icon.png create mode 100644 graphics/pokemon/icons/latios_icon.png create mode 100644 graphics/pokemon/icons/ledian_icon.png create mode 100644 graphics/pokemon/icons/ledyba_icon.png create mode 100644 graphics/pokemon/icons/lickitung_icon.png create mode 100644 graphics/pokemon/icons/lileep_icon.png create mode 100644 graphics/pokemon/icons/linoone_icon.png create mode 100644 graphics/pokemon/icons/lombre_icon.png create mode 100644 graphics/pokemon/icons/lotad_icon.png create mode 100644 graphics/pokemon/icons/loudred_icon.png create mode 100644 graphics/pokemon/icons/ludicolo_icon.png create mode 100644 graphics/pokemon/icons/lugia_icon.png create mode 100644 graphics/pokemon/icons/lunatone_icon.png create mode 100644 graphics/pokemon/icons/luvdisc_icon.png create mode 100644 graphics/pokemon/icons/machamp_icon.png create mode 100644 graphics/pokemon/icons/machoke_icon.png create mode 100644 graphics/pokemon/icons/machop_icon.png create mode 100644 graphics/pokemon/icons/magby_icon.png create mode 100644 graphics/pokemon/icons/magcargo_icon.png create mode 100644 graphics/pokemon/icons/magikarp_icon.png create mode 100644 graphics/pokemon/icons/magmar_icon.png create mode 100644 graphics/pokemon/icons/magnemite_icon.png create mode 100644 graphics/pokemon/icons/magneton_icon.png create mode 100644 graphics/pokemon/icons/makuhita_icon.png create mode 100644 graphics/pokemon/icons/manectric_icon.png create mode 100644 graphics/pokemon/icons/mankey_icon.png create mode 100644 graphics/pokemon/icons/mantine_icon.png create mode 100644 graphics/pokemon/icons/mareep_icon.png create mode 100644 graphics/pokemon/icons/marill_icon.png create mode 100644 graphics/pokemon/icons/marowak_icon.png create mode 100644 graphics/pokemon/icons/marshtomp_icon.png create mode 100644 graphics/pokemon/icons/masquerain_icon.png create mode 100644 graphics/pokemon/icons/mawile_icon.png create mode 100644 graphics/pokemon/icons/medicham_icon.png create mode 100644 graphics/pokemon/icons/meditite_icon.png create mode 100644 graphics/pokemon/icons/meganium_icon.png create mode 100644 graphics/pokemon/icons/meowth_icon.png create mode 100644 graphics/pokemon/icons/metagross_icon.png create mode 100644 graphics/pokemon/icons/metang_icon.png create mode 100644 graphics/pokemon/icons/metapod_icon.png create mode 100644 graphics/pokemon/icons/mew_icon.png create mode 100644 graphics/pokemon/icons/mewtwo_icon.png create mode 100644 graphics/pokemon/icons/mightyena_icon.png create mode 100644 graphics/pokemon/icons/milotic_icon.png create mode 100644 graphics/pokemon/icons/miltank_icon.png create mode 100644 graphics/pokemon/icons/minun_icon.png create mode 100644 graphics/pokemon/icons/misdreavus_icon.png create mode 100644 graphics/pokemon/icons/moltres_icon.png create mode 100644 graphics/pokemon/icons/mr_mime_icon.png create mode 100644 graphics/pokemon/icons/mudkip_icon.png create mode 100644 graphics/pokemon/icons/muk_icon.png create mode 100644 graphics/pokemon/icons/murkrow_icon.png create mode 100644 graphics/pokemon/icons/natu_icon.png create mode 100644 graphics/pokemon/icons/nidoking_icon.png create mode 100644 graphics/pokemon/icons/nidoqueen_icon.png create mode 100644 graphics/pokemon/icons/nidoran_f_icon.png create mode 100644 graphics/pokemon/icons/nidoran_m_icon.png create mode 100644 graphics/pokemon/icons/nidorina_icon.png create mode 100644 graphics/pokemon/icons/nidorino_icon.png create mode 100644 graphics/pokemon/icons/nincada_icon.png create mode 100644 graphics/pokemon/icons/ninetales_icon.png create mode 100644 graphics/pokemon/icons/ninjask_icon.png create mode 100644 graphics/pokemon/icons/noctowl_icon.png create mode 100644 graphics/pokemon/icons/nosepass_icon.png create mode 100644 graphics/pokemon/icons/numel_icon.png create mode 100644 graphics/pokemon/icons/nuzleaf_icon.png create mode 100644 graphics/pokemon/icons/octillery_icon.png create mode 100644 graphics/pokemon/icons/oddish_icon.png create mode 100644 graphics/pokemon/icons/omanyte_icon.png create mode 100644 graphics/pokemon/icons/omastar_icon.png create mode 100644 graphics/pokemon/icons/onix_icon.png create mode 100644 graphics/pokemon/icons/paras_icon.png create mode 100644 graphics/pokemon/icons/parasect_icon.png create mode 100644 graphics/pokemon/icons/pelipper_icon.png create mode 100644 graphics/pokemon/icons/persian_icon.png create mode 100644 graphics/pokemon/icons/phanpy_icon.png create mode 100644 graphics/pokemon/icons/pichu_icon.png create mode 100644 graphics/pokemon/icons/pidgeot_icon.png create mode 100644 graphics/pokemon/icons/pidgeotto_icon.png create mode 100644 graphics/pokemon/icons/pidgey_icon.png create mode 100644 graphics/pokemon/icons/pikachu_icon.png create mode 100644 graphics/pokemon/icons/piloswine_icon.png create mode 100644 graphics/pokemon/icons/pineco_icon.png create mode 100644 graphics/pokemon/icons/pinsir_icon.png create mode 100644 graphics/pokemon/icons/plusle_icon.png create mode 100644 graphics/pokemon/icons/politoed_icon.png create mode 100644 graphics/pokemon/icons/poliwag_icon.png create mode 100644 graphics/pokemon/icons/poliwhirl_icon.png create mode 100644 graphics/pokemon/icons/poliwrath_icon.png create mode 100644 graphics/pokemon/icons/ponyta_icon.png create mode 100644 graphics/pokemon/icons/poochyena_icon.png create mode 100644 graphics/pokemon/icons/porygon2_icon.png create mode 100644 graphics/pokemon/icons/porygon_icon.png create mode 100644 graphics/pokemon/icons/primeape_icon.png create mode 100644 graphics/pokemon/icons/psyduck_icon.png create mode 100644 graphics/pokemon/icons/pupitar_icon.png create mode 100644 graphics/pokemon/icons/quagsire_icon.png create mode 100644 graphics/pokemon/icons/question_mark_icon.png create mode 100644 graphics/pokemon/icons/quilava_icon.png create mode 100644 graphics/pokemon/icons/qwilfish_icon.png create mode 100644 graphics/pokemon/icons/raichu_icon.png create mode 100644 graphics/pokemon/icons/raikou_icon.png create mode 100644 graphics/pokemon/icons/ralts_icon.png create mode 100644 graphics/pokemon/icons/rapidash_icon.png create mode 100644 graphics/pokemon/icons/raticate_icon.png create mode 100644 graphics/pokemon/icons/rattata_icon.png create mode 100644 graphics/pokemon/icons/rayquaza_icon.png create mode 100644 graphics/pokemon/icons/regice_icon.png create mode 100644 graphics/pokemon/icons/regirock_icon.png create mode 100644 graphics/pokemon/icons/registeel_icon.png create mode 100644 graphics/pokemon/icons/relicanth_icon.png create mode 100644 graphics/pokemon/icons/remoraid_icon.png create mode 100644 graphics/pokemon/icons/rhydon_icon.png create mode 100644 graphics/pokemon/icons/rhyhorn_icon.png create mode 100644 graphics/pokemon/icons/roselia_icon.png create mode 100644 graphics/pokemon/icons/sableye_icon.png create mode 100644 graphics/pokemon/icons/salamence_icon.png create mode 100644 graphics/pokemon/icons/sandshrew_icon.png create mode 100644 graphics/pokemon/icons/sandslash_icon.png create mode 100644 graphics/pokemon/icons/sceptile_icon.png create mode 100644 graphics/pokemon/icons/scizor_icon.png create mode 100644 graphics/pokemon/icons/scyther_icon.png create mode 100644 graphics/pokemon/icons/seadra_icon.png create mode 100644 graphics/pokemon/icons/seaking_icon.png create mode 100644 graphics/pokemon/icons/sealeo_icon.png create mode 100644 graphics/pokemon/icons/seedot_icon.png create mode 100644 graphics/pokemon/icons/seel_icon.png create mode 100644 graphics/pokemon/icons/sentret_icon.png create mode 100644 graphics/pokemon/icons/seviper_icon.png create mode 100644 graphics/pokemon/icons/sharpedo_icon.png create mode 100644 graphics/pokemon/icons/shedinja_icon.png create mode 100644 graphics/pokemon/icons/shelgon_icon.png create mode 100644 graphics/pokemon/icons/shellder_icon.png create mode 100644 graphics/pokemon/icons/shiftry_icon.png create mode 100644 graphics/pokemon/icons/shroomish_icon.png create mode 100644 graphics/pokemon/icons/shuckle_icon.png create mode 100644 graphics/pokemon/icons/shuppet_icon.png create mode 100644 graphics/pokemon/icons/silcoon_icon.png create mode 100644 graphics/pokemon/icons/skarmory_icon.png create mode 100644 graphics/pokemon/icons/skiploom_icon.png create mode 100644 graphics/pokemon/icons/skitty_icon.png create mode 100644 graphics/pokemon/icons/slaking_icon.png create mode 100644 graphics/pokemon/icons/slakoth_icon.png create mode 100644 graphics/pokemon/icons/slowbro_icon.png create mode 100644 graphics/pokemon/icons/slowking_icon.png create mode 100644 graphics/pokemon/icons/slowpoke_icon.png create mode 100644 graphics/pokemon/icons/slugma_icon.png create mode 100644 graphics/pokemon/icons/smeargle_icon.png create mode 100644 graphics/pokemon/icons/smoochum_icon.png create mode 100644 graphics/pokemon/icons/sneasel_icon.png create mode 100644 graphics/pokemon/icons/snorlax_icon.png create mode 100644 graphics/pokemon/icons/snorunt_icon.png create mode 100644 graphics/pokemon/icons/snubbull_icon.png create mode 100644 graphics/pokemon/icons/solrock_icon.png create mode 100644 graphics/pokemon/icons/spearow_icon.png create mode 100644 graphics/pokemon/icons/spheal_icon.png create mode 100644 graphics/pokemon/icons/spinarak_icon.png create mode 100644 graphics/pokemon/icons/spinda_icon.png create mode 100644 graphics/pokemon/icons/spoink_icon.png create mode 100644 graphics/pokemon/icons/squirtle_icon.png create mode 100644 graphics/pokemon/icons/stantler_icon.png create mode 100644 graphics/pokemon/icons/starmie_icon.png create mode 100644 graphics/pokemon/icons/staryu_icon.png create mode 100644 graphics/pokemon/icons/steelix_icon.png create mode 100644 graphics/pokemon/icons/sudowoodo_icon.png create mode 100644 graphics/pokemon/icons/suicune_icon.png create mode 100644 graphics/pokemon/icons/sunflora_icon.png create mode 100644 graphics/pokemon/icons/sunkern_icon.png create mode 100644 graphics/pokemon/icons/surskit_icon.png create mode 100644 graphics/pokemon/icons/swablu_icon.png create mode 100644 graphics/pokemon/icons/swalot_icon.png create mode 100644 graphics/pokemon/icons/swampert_icon.png create mode 100644 graphics/pokemon/icons/swellow_icon.png create mode 100644 graphics/pokemon/icons/swinub_icon.png create mode 100644 graphics/pokemon/icons/taillow_icon.png create mode 100644 graphics/pokemon/icons/tangela_icon.png create mode 100644 graphics/pokemon/icons/tauros_icon.png create mode 100644 graphics/pokemon/icons/teddiursa_icon.png create mode 100644 graphics/pokemon/icons/tentacool_icon.png create mode 100644 graphics/pokemon/icons/tentacruel_icon.png create mode 100644 graphics/pokemon/icons/togepi_icon.png create mode 100644 graphics/pokemon/icons/togetic_icon.png create mode 100644 graphics/pokemon/icons/torchic_icon.png create mode 100644 graphics/pokemon/icons/torkoal_icon.png create mode 100644 graphics/pokemon/icons/totodile_icon.png create mode 100644 graphics/pokemon/icons/trapinch_icon.png create mode 100644 graphics/pokemon/icons/treecko_icon.png create mode 100644 graphics/pokemon/icons/tropius_icon.png create mode 100644 graphics/pokemon/icons/typhlosion_icon.png create mode 100644 graphics/pokemon/icons/tyranitar_icon.png create mode 100644 graphics/pokemon/icons/tyrogue_icon.png create mode 100644 graphics/pokemon/icons/umbreon_icon.png create mode 100644 graphics/pokemon/icons/unown_B_icon.png create mode 100644 graphics/pokemon/icons/unown_C_icon.png create mode 100644 graphics/pokemon/icons/unown_D_icon.png create mode 100644 graphics/pokemon/icons/unown_E_icon.png create mode 100644 graphics/pokemon/icons/unown_F_icon.png create mode 100644 graphics/pokemon/icons/unown_G_icon.png create mode 100644 graphics/pokemon/icons/unown_H_icon.png create mode 100644 graphics/pokemon/icons/unown_I_icon.png create mode 100644 graphics/pokemon/icons/unown_J_icon.png create mode 100644 graphics/pokemon/icons/unown_K_icon.png create mode 100644 graphics/pokemon/icons/unown_L_icon.png create mode 100644 graphics/pokemon/icons/unown_M_icon.png create mode 100644 graphics/pokemon/icons/unown_N_icon.png create mode 100644 graphics/pokemon/icons/unown_O_icon.png create mode 100644 graphics/pokemon/icons/unown_P_icon.png create mode 100644 graphics/pokemon/icons/unown_Q_icon.png create mode 100644 graphics/pokemon/icons/unown_R_icon.png create mode 100644 graphics/pokemon/icons/unown_S_icon.png create mode 100644 graphics/pokemon/icons/unown_T_icon.png create mode 100644 graphics/pokemon/icons/unown_U_icon.png create mode 100644 graphics/pokemon/icons/unown_V_icon.png create mode 100644 graphics/pokemon/icons/unown_W_icon.png create mode 100644 graphics/pokemon/icons/unown_X_icon.png create mode 100644 graphics/pokemon/icons/unown_Y_icon.png create mode 100644 graphics/pokemon/icons/unown_Z_icon.png create mode 100644 graphics/pokemon/icons/unown_a_icon.png create mode 100644 graphics/pokemon/icons/unown_exclamation_mark_icon.png create mode 100644 graphics/pokemon/icons/unown_question_mark_icon.png create mode 100644 graphics/pokemon/icons/ursaring_icon.png create mode 100644 graphics/pokemon/icons/vaporeon_icon.png create mode 100644 graphics/pokemon/icons/venomoth_icon.png create mode 100644 graphics/pokemon/icons/venonat_icon.png create mode 100644 graphics/pokemon/icons/venusaur_icon.png create mode 100644 graphics/pokemon/icons/vibrava_icon.png create mode 100644 graphics/pokemon/icons/victreebel_icon.png create mode 100644 graphics/pokemon/icons/vigoroth_icon.png create mode 100644 graphics/pokemon/icons/vileplume_icon.png create mode 100644 graphics/pokemon/icons/volbeat_icon.png create mode 100644 graphics/pokemon/icons/voltorb_icon.png create mode 100644 graphics/pokemon/icons/vulpix_icon.png create mode 100644 graphics/pokemon/icons/wailmer_icon.png create mode 100644 graphics/pokemon/icons/wailord_icon.png create mode 100644 graphics/pokemon/icons/walrein_icon.png create mode 100644 graphics/pokemon/icons/wartortle_icon.png create mode 100644 graphics/pokemon/icons/weedle_icon.png create mode 100644 graphics/pokemon/icons/weepinbell_icon.png create mode 100644 graphics/pokemon/icons/weezing_icon.png create mode 100644 graphics/pokemon/icons/whiscash_icon.png create mode 100644 graphics/pokemon/icons/whismur_icon.png create mode 100644 graphics/pokemon/icons/wigglytuff_icon.png create mode 100644 graphics/pokemon/icons/wingull_icon.png create mode 100644 graphics/pokemon/icons/wobbuffet_icon.png create mode 100644 graphics/pokemon/icons/wooper_icon.png create mode 100644 graphics/pokemon/icons/wurmple_icon.png create mode 100644 graphics/pokemon/icons/wynaut_icon.png create mode 100644 graphics/pokemon/icons/xatu_icon.png create mode 100644 graphics/pokemon/icons/yanma_icon.png create mode 100644 graphics/pokemon/icons/zangoose_icon.png create mode 100644 graphics/pokemon/icons/zapdos_icon.png create mode 100644 graphics/pokemon/icons/zigzagoon_icon.png create mode 100644 graphics/pokemon/icons/zubat_icon.png create mode 100644 graphics/pokemon/palettes/abra_palette.pal create mode 100644 graphics/pokemon/palettes/abra_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/absol_palette.pal create mode 100644 graphics/pokemon/palettes/absol_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/aerodactyl_palette.pal create mode 100644 graphics/pokemon/palettes/aerodactyl_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/aggron_palette.pal create mode 100644 graphics/pokemon/palettes/aggron_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/aipom_palette.pal create mode 100644 graphics/pokemon/palettes/aipom_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/alakazam_palette.pal create mode 100644 graphics/pokemon/palettes/alakazam_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/altaria_palette.pal create mode 100644 graphics/pokemon/palettes/altaria_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/ampharos_palette.pal create mode 100644 graphics/pokemon/palettes/ampharos_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/anorith_palette.pal create mode 100644 graphics/pokemon/palettes/anorith_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/arbok_palette.pal create mode 100644 graphics/pokemon/palettes/arbok_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/arcanine_palette.pal create mode 100644 graphics/pokemon/palettes/arcanine_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/ariados_palette.pal create mode 100644 graphics/pokemon/palettes/ariados_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/armaldo_palette.pal create mode 100644 graphics/pokemon/palettes/armaldo_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/aron_palette.pal create mode 100644 graphics/pokemon/palettes/aron_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/articuno_palette.pal create mode 100644 graphics/pokemon/palettes/articuno_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/azumarill_palette.pal create mode 100644 graphics/pokemon/palettes/azumarill_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/azurill_palette.pal create mode 100644 graphics/pokemon/palettes/azurill_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/bagon_palette.pal create mode 100644 graphics/pokemon/palettes/bagon_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/baltoy_palette.pal create mode 100644 graphics/pokemon/palettes/baltoy_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/banette_palette.pal create mode 100644 graphics/pokemon/palettes/banette_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/barboach_palette.pal create mode 100644 graphics/pokemon/palettes/barboach_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/bayleef_palette.pal create mode 100644 graphics/pokemon/palettes/bayleef_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/beautifly_palette.pal create mode 100644 graphics/pokemon/palettes/beautifly_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/beedrill_palette.pal create mode 100644 graphics/pokemon/palettes/beedrill_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/beldum_palette.pal create mode 100644 graphics/pokemon/palettes/beldum_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/bellossom_palette.pal create mode 100644 graphics/pokemon/palettes/bellossom_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/bellsprout_palette.pal create mode 100644 graphics/pokemon/palettes/bellsprout_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/blastoise_palette.pal create mode 100644 graphics/pokemon/palettes/blastoise_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/blaziken_palette.pal create mode 100644 graphics/pokemon/palettes/blaziken_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/blissey_palette.pal create mode 100644 graphics/pokemon/palettes/blissey_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/breloom_palette.pal create mode 100644 graphics/pokemon/palettes/breloom_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/bulbasaur_palette.pal create mode 100644 graphics/pokemon/palettes/bulbasaur_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/butterfree_palette.pal create mode 100644 graphics/pokemon/palettes/butterfree_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/cacnea_palette.pal create mode 100644 graphics/pokemon/palettes/cacnea_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/cacturne_palette.pal create mode 100644 graphics/pokemon/palettes/cacturne_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/camerupt_palette.pal create mode 100644 graphics/pokemon/palettes/camerupt_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/carvanha_palette.pal create mode 100644 graphics/pokemon/palettes/carvanha_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/cascoon_palette.pal create mode 100644 graphics/pokemon/palettes/cascoon_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/castform_normal_form_palette.pal create mode 100644 graphics/pokemon/palettes/castform_normal_form_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/castform_rainy_form_palette.pal create mode 100644 graphics/pokemon/palettes/castform_rainy_form_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/castform_snowy_form_palette.pal create mode 100644 graphics/pokemon/palettes/castform_snowy_form_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/castform_sunny_form_palette.pal create mode 100644 graphics/pokemon/palettes/castform_sunny_form_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/caterpie_palette.pal create mode 100644 graphics/pokemon/palettes/caterpie_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/celebi_palette.pal create mode 100644 graphics/pokemon/palettes/celebi_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/chansey_palette.pal create mode 100644 graphics/pokemon/palettes/chansey_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/charizard_palette.pal create mode 100644 graphics/pokemon/palettes/charizard_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/charmander_palette.pal create mode 100644 graphics/pokemon/palettes/charmander_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/charmeleon_palette.pal create mode 100644 graphics/pokemon/palettes/charmeleon_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/chikorita_palette.pal create mode 100644 graphics/pokemon/palettes/chikorita_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/chimecho_palette.pal create mode 100644 graphics/pokemon/palettes/chimecho_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/chinchou_palette.pal create mode 100644 graphics/pokemon/palettes/chinchou_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/clamperl_palette.pal create mode 100644 graphics/pokemon/palettes/clamperl_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/claydol_palette.pal create mode 100644 graphics/pokemon/palettes/claydol_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/clefable_palette.pal create mode 100644 graphics/pokemon/palettes/clefable_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/clefairy_palette.pal create mode 100644 graphics/pokemon/palettes/clefairy_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/cleffa_palette.pal create mode 100644 graphics/pokemon/palettes/cleffa_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/cloyster_palette.pal create mode 100644 graphics/pokemon/palettes/cloyster_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/combusken_palette.pal create mode 100644 graphics/pokemon/palettes/combusken_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/corphish_palette.pal create mode 100644 graphics/pokemon/palettes/corphish_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/corsola_palette.pal create mode 100644 graphics/pokemon/palettes/corsola_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/cradily_palette.pal create mode 100644 graphics/pokemon/palettes/cradily_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/crawdaunt_palette.pal create mode 100644 graphics/pokemon/palettes/crawdaunt_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/crobat_palette.pal create mode 100644 graphics/pokemon/palettes/crobat_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/croconaw_palette.pal create mode 100644 graphics/pokemon/palettes/croconaw_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/cubone_palette.pal create mode 100644 graphics/pokemon/palettes/cubone_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/cyndaquil_palette.pal create mode 100644 graphics/pokemon/palettes/cyndaquil_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/delcatty_palette.pal create mode 100644 graphics/pokemon/palettes/delcatty_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/delibird_palette.pal create mode 100644 graphics/pokemon/palettes/delibird_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/deoxys_palette.pal create mode 100644 graphics/pokemon/palettes/deoxys_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/dewgong_palette.pal create mode 100644 graphics/pokemon/palettes/dewgong_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/diglett_palette.pal create mode 100644 graphics/pokemon/palettes/diglett_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/ditto_palette.pal create mode 100644 graphics/pokemon/palettes/ditto_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/dodrio_palette.pal create mode 100644 graphics/pokemon/palettes/dodrio_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/doduo_palette.pal create mode 100644 graphics/pokemon/palettes/doduo_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/donphan_palette.pal create mode 100644 graphics/pokemon/palettes/donphan_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/double_question_mark_palette.pal create mode 100644 graphics/pokemon/palettes/double_question_mark_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/dragonair_palette.pal create mode 100644 graphics/pokemon/palettes/dragonair_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/dragonite_palette.pal create mode 100644 graphics/pokemon/palettes/dragonite_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/dratini_palette.pal create mode 100644 graphics/pokemon/palettes/dratini_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/drowzee_palette.pal create mode 100644 graphics/pokemon/palettes/drowzee_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/dugtrio_palette.pal create mode 100644 graphics/pokemon/palettes/dugtrio_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/dunsparce_palette.pal create mode 100644 graphics/pokemon/palettes/dunsparce_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/dusclops_palette.pal create mode 100644 graphics/pokemon/palettes/dusclops_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/duskull_palette.pal create mode 100644 graphics/pokemon/palettes/duskull_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/dustox_palette.pal create mode 100644 graphics/pokemon/palettes/dustox_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/eevee_palette.pal create mode 100644 graphics/pokemon/palettes/eevee_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/egg_palette.pal create mode 100644 graphics/pokemon/palettes/ekans_palette.pal create mode 100644 graphics/pokemon/palettes/ekans_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/electabuzz_palette.pal create mode 100644 graphics/pokemon/palettes/electabuzz_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/electrike_palette.pal create mode 100644 graphics/pokemon/palettes/electrike_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/electrode_palette.pal create mode 100644 graphics/pokemon/palettes/electrode_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/elekid_palette.pal create mode 100644 graphics/pokemon/palettes/elekid_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/entei_palette.pal create mode 100644 graphics/pokemon/palettes/entei_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/espeon_palette.pal create mode 100644 graphics/pokemon/palettes/espeon_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/exeggcute_palette.pal create mode 100644 graphics/pokemon/palettes/exeggcute_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/exeggutor_palette.pal create mode 100644 graphics/pokemon/palettes/exeggutor_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/exploud_palette.pal create mode 100644 graphics/pokemon/palettes/exploud_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/farfetch_d_palette.pal create mode 100644 graphics/pokemon/palettes/farfetch_d_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/fearow_palette.pal create mode 100644 graphics/pokemon/palettes/fearow_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/feebas_palette.pal create mode 100644 graphics/pokemon/palettes/feebas_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/feraligatr_palette.pal create mode 100644 graphics/pokemon/palettes/feraligatr_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/flaaffy_palette.pal create mode 100644 graphics/pokemon/palettes/flaaffy_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/flareon_palette.pal create mode 100644 graphics/pokemon/palettes/flareon_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/flygon_palette.pal create mode 100644 graphics/pokemon/palettes/flygon_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/forretress_palette.pal create mode 100644 graphics/pokemon/palettes/forretress_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/furret_palette.pal create mode 100644 graphics/pokemon/palettes/furret_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/gardevoir_palette.pal create mode 100644 graphics/pokemon/palettes/gardevoir_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/gastly_palette.pal create mode 100644 graphics/pokemon/palettes/gastly_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/gengar_palette.pal create mode 100644 graphics/pokemon/palettes/gengar_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/geodude_palette.pal create mode 100644 graphics/pokemon/palettes/geodude_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/girafarig_palette.pal create mode 100644 graphics/pokemon/palettes/girafarig_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/glalie_palette.pal create mode 100644 graphics/pokemon/palettes/glalie_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/gligar_palette.pal create mode 100644 graphics/pokemon/palettes/gligar_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/gloom_palette.pal create mode 100644 graphics/pokemon/palettes/gloom_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/golbat_palette.pal create mode 100644 graphics/pokemon/palettes/golbat_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/goldeen_palette.pal create mode 100644 graphics/pokemon/palettes/goldeen_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/golduck_palette.pal create mode 100644 graphics/pokemon/palettes/golduck_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/golem_palette.pal create mode 100644 graphics/pokemon/palettes/golem_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/gorebyss_palette.pal create mode 100644 graphics/pokemon/palettes/gorebyss_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/granbull_palette.pal create mode 100644 graphics/pokemon/palettes/granbull_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/graveler_palette.pal create mode 100644 graphics/pokemon/palettes/graveler_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/grimer_palette.pal create mode 100644 graphics/pokemon/palettes/grimer_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/groudon_palette.pal create mode 100644 graphics/pokemon/palettes/groudon_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/grovyle_palette.pal create mode 100644 graphics/pokemon/palettes/grovyle_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/growlithe_palette.pal create mode 100644 graphics/pokemon/palettes/growlithe_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/grumpig_palette.pal create mode 100644 graphics/pokemon/palettes/grumpig_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/gulpin_palette.pal create mode 100644 graphics/pokemon/palettes/gulpin_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/gyarados_palette.pal create mode 100644 graphics/pokemon/palettes/gyarados_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/hariyama_palette.pal create mode 100644 graphics/pokemon/palettes/hariyama_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/haunter_palette.pal create mode 100644 graphics/pokemon/palettes/haunter_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/heracross_palette.pal create mode 100644 graphics/pokemon/palettes/heracross_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/hitmonchan_palette.pal create mode 100644 graphics/pokemon/palettes/hitmonchan_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/hitmonlee_palette.pal create mode 100644 graphics/pokemon/palettes/hitmonlee_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/hitmontop_palette.pal create mode 100644 graphics/pokemon/palettes/hitmontop_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/ho_oh_palette.pal create mode 100644 graphics/pokemon/palettes/ho_oh_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/hoothoot_palette.pal create mode 100644 graphics/pokemon/palettes/hoothoot_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/hoppip_palette.pal create mode 100644 graphics/pokemon/palettes/hoppip_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/horsea_palette.pal create mode 100644 graphics/pokemon/palettes/horsea_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/houndoom_palette.pal create mode 100644 graphics/pokemon/palettes/houndoom_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/houndour_palette.pal create mode 100644 graphics/pokemon/palettes/houndour_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/huntail_palette.pal create mode 100644 graphics/pokemon/palettes/huntail_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/hypno_palette.pal create mode 100644 graphics/pokemon/palettes/hypno_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/igglybuff_palette.pal create mode 100644 graphics/pokemon/palettes/igglybuff_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/illumise_palette.pal create mode 100644 graphics/pokemon/palettes/illumise_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/ivysaur_palette.pal create mode 100644 graphics/pokemon/palettes/ivysaur_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/jigglypuff_palette.pal create mode 100644 graphics/pokemon/palettes/jigglypuff_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/jirachi_palette.pal create mode 100644 graphics/pokemon/palettes/jirachi_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/jolteon_palette.pal create mode 100644 graphics/pokemon/palettes/jolteon_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/jumpluff_palette.pal create mode 100644 graphics/pokemon/palettes/jumpluff_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/jynx_palette.pal create mode 100644 graphics/pokemon/palettes/jynx_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/kabuto_palette.pal create mode 100644 graphics/pokemon/palettes/kabuto_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/kabutops_palette.pal create mode 100644 graphics/pokemon/palettes/kabutops_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/kadabra_palette.pal create mode 100644 graphics/pokemon/palettes/kadabra_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/kakuna_palette.pal create mode 100644 graphics/pokemon/palettes/kakuna_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/kangaskhan_palette.pal create mode 100644 graphics/pokemon/palettes/kangaskhan_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/kecleon_palette.pal create mode 100644 graphics/pokemon/palettes/kecleon_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/kingdra_palette.pal create mode 100644 graphics/pokemon/palettes/kingdra_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/kingler_palette.pal create mode 100644 graphics/pokemon/palettes/kingler_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/kirlia_palette.pal create mode 100644 graphics/pokemon/palettes/kirlia_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/koffing_palette.pal create mode 100644 graphics/pokemon/palettes/koffing_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/krabby_palette.pal create mode 100644 graphics/pokemon/palettes/krabby_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/kyogre_palette.pal create mode 100644 graphics/pokemon/palettes/kyogre_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/lairon_palette.pal create mode 100644 graphics/pokemon/palettes/lairon_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/lanturn_palette.pal create mode 100644 graphics/pokemon/palettes/lanturn_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/lapras_palette.pal create mode 100644 graphics/pokemon/palettes/lapras_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/larvitar_palette.pal create mode 100644 graphics/pokemon/palettes/larvitar_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/latias_palette.pal create mode 100644 graphics/pokemon/palettes/latias_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/latios_palette.pal create mode 100644 graphics/pokemon/palettes/latios_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/ledian_palette.pal create mode 100644 graphics/pokemon/palettes/ledian_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/ledyba_palette.pal create mode 100644 graphics/pokemon/palettes/ledyba_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/lickitung_palette.pal create mode 100644 graphics/pokemon/palettes/lickitung_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/lileep_palette.pal create mode 100644 graphics/pokemon/palettes/lileep_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/linoone_palette.pal create mode 100644 graphics/pokemon/palettes/linoone_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/lombre_palette.pal create mode 100644 graphics/pokemon/palettes/lombre_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/lotad_palette.pal create mode 100644 graphics/pokemon/palettes/lotad_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/loudred_palette.pal create mode 100644 graphics/pokemon/palettes/loudred_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/ludicolo_palette.pal create mode 100644 graphics/pokemon/palettes/ludicolo_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/lugia_palette.pal create mode 100644 graphics/pokemon/palettes/lugia_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/lunatone_palette.pal create mode 100644 graphics/pokemon/palettes/lunatone_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/luvdisc_palette.pal create mode 100644 graphics/pokemon/palettes/luvdisc_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/machamp_palette.pal create mode 100644 graphics/pokemon/palettes/machamp_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/machoke_palette.pal create mode 100644 graphics/pokemon/palettes/machoke_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/machop_palette.pal create mode 100644 graphics/pokemon/palettes/machop_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/magby_palette.pal create mode 100644 graphics/pokemon/palettes/magby_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/magcargo_palette.pal create mode 100644 graphics/pokemon/palettes/magcargo_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/magikarp_palette.pal create mode 100644 graphics/pokemon/palettes/magikarp_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/magmar_palette.pal create mode 100644 graphics/pokemon/palettes/magmar_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/magnemite_palette.pal create mode 100644 graphics/pokemon/palettes/magnemite_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/magneton_palette.pal create mode 100644 graphics/pokemon/palettes/magneton_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/makuhita_palette.pal create mode 100644 graphics/pokemon/palettes/makuhita_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/manectric_palette.pal create mode 100644 graphics/pokemon/palettes/manectric_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/mankey_palette.pal create mode 100644 graphics/pokemon/palettes/mankey_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/mantine_palette.pal create mode 100644 graphics/pokemon/palettes/mantine_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/mareep_palette.pal create mode 100644 graphics/pokemon/palettes/mareep_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/marill_palette.pal create mode 100644 graphics/pokemon/palettes/marill_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/marowak_palette.pal create mode 100644 graphics/pokemon/palettes/marowak_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/marshtomp_palette.pal create mode 100644 graphics/pokemon/palettes/marshtomp_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/masquerain_palette.pal create mode 100644 graphics/pokemon/palettes/masquerain_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/mawile_palette.pal create mode 100644 graphics/pokemon/palettes/mawile_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/medicham_palette.pal create mode 100644 graphics/pokemon/palettes/medicham_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/meditite_palette.pal create mode 100644 graphics/pokemon/palettes/meditite_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/meganium_palette.pal create mode 100644 graphics/pokemon/palettes/meganium_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/meowth_palette.pal create mode 100644 graphics/pokemon/palettes/meowth_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/metagross_palette.pal create mode 100644 graphics/pokemon/palettes/metagross_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/metang_palette.pal create mode 100644 graphics/pokemon/palettes/metang_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/metapod_palette.pal create mode 100644 graphics/pokemon/palettes/metapod_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/mew_palette.pal create mode 100644 graphics/pokemon/palettes/mew_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/mewtwo_palette.pal create mode 100644 graphics/pokemon/palettes/mewtwo_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/mightyena_palette.pal create mode 100644 graphics/pokemon/palettes/mightyena_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/milotic_palette.pal create mode 100644 graphics/pokemon/palettes/milotic_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/miltank_palette.pal create mode 100644 graphics/pokemon/palettes/miltank_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/minun_palette.pal create mode 100644 graphics/pokemon/palettes/minun_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/misdreavus_palette.pal create mode 100644 graphics/pokemon/palettes/misdreavus_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/moltres_palette.pal create mode 100644 graphics/pokemon/palettes/moltres_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/mr_mime_palette.pal create mode 100644 graphics/pokemon/palettes/mr_mime_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/mudkip_palette.pal create mode 100644 graphics/pokemon/palettes/mudkip_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/muk_palette.pal create mode 100644 graphics/pokemon/palettes/muk_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/murkrow_palette.pal create mode 100644 graphics/pokemon/palettes/murkrow_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/natu_palette.pal create mode 100644 graphics/pokemon/palettes/natu_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/nidoking_palette.pal create mode 100644 graphics/pokemon/palettes/nidoking_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/nidoqueen_palette.pal create mode 100644 graphics/pokemon/palettes/nidoqueen_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/nidoran_f_palette.pal create mode 100644 graphics/pokemon/palettes/nidoran_f_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/nidoran_m_palette.pal create mode 100644 graphics/pokemon/palettes/nidoran_m_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/nidorina_palette.pal create mode 100644 graphics/pokemon/palettes/nidorina_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/nidorino_palette.pal create mode 100644 graphics/pokemon/palettes/nidorino_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/nincada_palette.pal create mode 100644 graphics/pokemon/palettes/nincada_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/ninetales_palette.pal create mode 100644 graphics/pokemon/palettes/ninetales_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/ninjask_palette.pal create mode 100644 graphics/pokemon/palettes/ninjask_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/noctowl_palette.pal create mode 100644 graphics/pokemon/palettes/noctowl_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/nosepass_palette.pal create mode 100644 graphics/pokemon/palettes/nosepass_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/numel_palette.pal create mode 100644 graphics/pokemon/palettes/numel_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/nuzleaf_palette.pal create mode 100644 graphics/pokemon/palettes/nuzleaf_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/octillery_palette.pal create mode 100644 graphics/pokemon/palettes/octillery_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/oddish_palette.pal create mode 100644 graphics/pokemon/palettes/oddish_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/omanyte_palette.pal create mode 100644 graphics/pokemon/palettes/omanyte_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/omastar_palette.pal create mode 100644 graphics/pokemon/palettes/omastar_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/onix_palette.pal create mode 100644 graphics/pokemon/palettes/onix_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/paras_palette.pal create mode 100644 graphics/pokemon/palettes/paras_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/parasect_palette.pal create mode 100644 graphics/pokemon/palettes/parasect_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/pelipper_palette.pal create mode 100644 graphics/pokemon/palettes/pelipper_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/persian_palette.pal create mode 100644 graphics/pokemon/palettes/persian_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/phanpy_palette.pal create mode 100644 graphics/pokemon/palettes/phanpy_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/pichu_palette.pal create mode 100644 graphics/pokemon/palettes/pichu_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/pidgeot_palette.pal create mode 100644 graphics/pokemon/palettes/pidgeot_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/pidgeotto_palette.pal create mode 100644 graphics/pokemon/palettes/pidgeotto_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/pidgey_palette.pal create mode 100644 graphics/pokemon/palettes/pidgey_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/pikachu_palette.pal create mode 100644 graphics/pokemon/palettes/pikachu_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/piloswine_palette.pal create mode 100644 graphics/pokemon/palettes/piloswine_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/pineco_palette.pal create mode 100644 graphics/pokemon/palettes/pineco_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/pinsir_palette.pal create mode 100644 graphics/pokemon/palettes/pinsir_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/plusle_palette.pal create mode 100644 graphics/pokemon/palettes/plusle_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/politoed_palette.pal create mode 100644 graphics/pokemon/palettes/politoed_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/poliwag_palette.pal create mode 100644 graphics/pokemon/palettes/poliwag_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/poliwhirl_palette.pal create mode 100644 graphics/pokemon/palettes/poliwhirl_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/poliwrath_palette.pal create mode 100644 graphics/pokemon/palettes/poliwrath_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/ponyta_palette.pal create mode 100644 graphics/pokemon/palettes/ponyta_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/poochyena_palette.pal create mode 100644 graphics/pokemon/palettes/poochyena_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/porygon2_palette.pal create mode 100644 graphics/pokemon/palettes/porygon2_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/porygon_palette.pal create mode 100644 graphics/pokemon/palettes/porygon_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/primeape_palette.pal create mode 100644 graphics/pokemon/palettes/primeape_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/psyduck_palette.pal create mode 100644 graphics/pokemon/palettes/psyduck_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/pupitar_palette.pal create mode 100644 graphics/pokemon/palettes/pupitar_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/quagsire_palette.pal create mode 100644 graphics/pokemon/palettes/quagsire_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/quilava_palette.pal create mode 100644 graphics/pokemon/palettes/quilava_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/qwilfish_palette.pal create mode 100644 graphics/pokemon/palettes/qwilfish_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/raichu_palette.pal create mode 100644 graphics/pokemon/palettes/raichu_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/raikou_palette.pal create mode 100644 graphics/pokemon/palettes/raikou_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/ralts_palette.pal create mode 100644 graphics/pokemon/palettes/ralts_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/rapidash_palette.pal create mode 100644 graphics/pokemon/palettes/rapidash_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/raticate_palette.pal create mode 100644 graphics/pokemon/palettes/raticate_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/rattata_palette.pal create mode 100644 graphics/pokemon/palettes/rattata_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/rayquaza_palette.pal create mode 100644 graphics/pokemon/palettes/rayquaza_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/regice_palette.pal create mode 100644 graphics/pokemon/palettes/regice_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/regirock_palette.pal create mode 100644 graphics/pokemon/palettes/regirock_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/registeel_palette.pal create mode 100644 graphics/pokemon/palettes/registeel_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/relicanth_palette.pal create mode 100644 graphics/pokemon/palettes/relicanth_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/remoraid_palette.pal create mode 100644 graphics/pokemon/palettes/remoraid_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/rhydon_palette.pal create mode 100644 graphics/pokemon/palettes/rhydon_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/rhyhorn_palette.pal create mode 100644 graphics/pokemon/palettes/rhyhorn_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/roselia_palette.pal create mode 100644 graphics/pokemon/palettes/roselia_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/sableye_palette.pal create mode 100644 graphics/pokemon/palettes/sableye_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/salamence_palette.pal create mode 100644 graphics/pokemon/palettes/salamence_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/sandshrew_palette.pal create mode 100644 graphics/pokemon/palettes/sandshrew_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/sandslash_palette.pal create mode 100644 graphics/pokemon/palettes/sandslash_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/sceptile_palette.pal create mode 100644 graphics/pokemon/palettes/sceptile_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/scizor_palette.pal create mode 100644 graphics/pokemon/palettes/scizor_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/scyther_palette.pal create mode 100644 graphics/pokemon/palettes/scyther_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/seadra_palette.pal create mode 100644 graphics/pokemon/palettes/seadra_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/seaking_palette.pal create mode 100644 graphics/pokemon/palettes/seaking_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/sealeo_palette.pal create mode 100644 graphics/pokemon/palettes/sealeo_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/seedot_palette.pal create mode 100644 graphics/pokemon/palettes/seedot_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/seel_palette.pal create mode 100644 graphics/pokemon/palettes/seel_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/sentret_palette.pal create mode 100644 graphics/pokemon/palettes/sentret_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/seviper_palette.pal create mode 100644 graphics/pokemon/palettes/seviper_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/sharpedo_palette.pal create mode 100644 graphics/pokemon/palettes/sharpedo_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/shedinja_palette.pal create mode 100644 graphics/pokemon/palettes/shedinja_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/shelgon_palette.pal create mode 100644 graphics/pokemon/palettes/shelgon_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/shellder_palette.pal create mode 100644 graphics/pokemon/palettes/shellder_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/shiftry_palette.pal create mode 100644 graphics/pokemon/palettes/shiftry_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/shroomish_palette.pal create mode 100644 graphics/pokemon/palettes/shroomish_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/shuckle_palette.pal create mode 100644 graphics/pokemon/palettes/shuckle_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/shuppet_palette.pal create mode 100644 graphics/pokemon/palettes/shuppet_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/silcoon_palette.pal create mode 100644 graphics/pokemon/palettes/silcoon_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/skarmory_palette.pal create mode 100644 graphics/pokemon/palettes/skarmory_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/skiploom_palette.pal create mode 100644 graphics/pokemon/palettes/skiploom_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/skitty_palette.pal create mode 100644 graphics/pokemon/palettes/skitty_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/slaking_palette.pal create mode 100644 graphics/pokemon/palettes/slaking_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/slakoth_palette.pal create mode 100644 graphics/pokemon/palettes/slakoth_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/slowbro_palette.pal create mode 100644 graphics/pokemon/palettes/slowbro_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/slowking_palette.pal create mode 100644 graphics/pokemon/palettes/slowking_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/slowpoke_palette.pal create mode 100644 graphics/pokemon/palettes/slowpoke_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/slugma_palette.pal create mode 100644 graphics/pokemon/palettes/slugma_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/smeargle_palette.pal create mode 100644 graphics/pokemon/palettes/smeargle_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/smoochum_palette.pal create mode 100644 graphics/pokemon/palettes/smoochum_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/sneasel_palette.pal create mode 100644 graphics/pokemon/palettes/sneasel_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/snorlax_palette.pal create mode 100644 graphics/pokemon/palettes/snorlax_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/snorunt_palette.pal create mode 100644 graphics/pokemon/palettes/snorunt_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/snubbull_palette.pal create mode 100644 graphics/pokemon/palettes/snubbull_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/solrock_palette.pal create mode 100644 graphics/pokemon/palettes/solrock_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/spearow_palette.pal create mode 100644 graphics/pokemon/palettes/spearow_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/spheal_palette.pal create mode 100644 graphics/pokemon/palettes/spheal_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/spinarak_palette.pal create mode 100644 graphics/pokemon/palettes/spinarak_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/spinda_palette.pal create mode 100644 graphics/pokemon/palettes/spinda_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/spoink_palette.pal create mode 100644 graphics/pokemon/palettes/spoink_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/squirtle_palette.pal create mode 100644 graphics/pokemon/palettes/squirtle_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/stantler_palette.pal create mode 100644 graphics/pokemon/palettes/stantler_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/starmie_palette.pal create mode 100644 graphics/pokemon/palettes/starmie_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/staryu_palette.pal create mode 100644 graphics/pokemon/palettes/staryu_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/steelix_palette.pal create mode 100644 graphics/pokemon/palettes/steelix_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/sudowoodo_palette.pal create mode 100644 graphics/pokemon/palettes/sudowoodo_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/suicune_palette.pal create mode 100644 graphics/pokemon/palettes/suicune_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/sunflora_palette.pal create mode 100644 graphics/pokemon/palettes/sunflora_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/sunkern_palette.pal create mode 100644 graphics/pokemon/palettes/sunkern_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/surskit_palette.pal create mode 100644 graphics/pokemon/palettes/surskit_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/swablu_palette.pal create mode 100644 graphics/pokemon/palettes/swablu_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/swalot_palette.pal create mode 100644 graphics/pokemon/palettes/swalot_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/swampert_palette.pal create mode 100644 graphics/pokemon/palettes/swampert_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/swellow_palette.pal create mode 100644 graphics/pokemon/palettes/swellow_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/swinub_palette.pal create mode 100644 graphics/pokemon/palettes/swinub_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/taillow_palette.pal create mode 100644 graphics/pokemon/palettes/taillow_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/tangela_palette.pal create mode 100644 graphics/pokemon/palettes/tangela_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/tauros_palette.pal create mode 100644 graphics/pokemon/palettes/tauros_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/teddiursa_palette.pal create mode 100644 graphics/pokemon/palettes/teddiursa_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/tentacool_palette.pal create mode 100644 graphics/pokemon/palettes/tentacool_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/tentacruel_palette.pal create mode 100644 graphics/pokemon/palettes/tentacruel_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/togepi_palette.pal create mode 100644 graphics/pokemon/palettes/togepi_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/togetic_palette.pal create mode 100644 graphics/pokemon/palettes/togetic_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/torchic_palette.pal create mode 100644 graphics/pokemon/palettes/torchic_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/torkoal_palette.pal create mode 100644 graphics/pokemon/palettes/torkoal_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/totodile_palette.pal create mode 100644 graphics/pokemon/palettes/totodile_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/trapinch_palette.pal create mode 100644 graphics/pokemon/palettes/trapinch_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/treecko_palette.pal create mode 100644 graphics/pokemon/palettes/treecko_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/tropius_palette.pal create mode 100644 graphics/pokemon/palettes/tropius_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/typhlosion_palette.pal create mode 100644 graphics/pokemon/palettes/typhlosion_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/tyranitar_palette.pal create mode 100644 graphics/pokemon/palettes/tyranitar_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/tyrogue_palette.pal create mode 100644 graphics/pokemon/palettes/tyrogue_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/umbreon_palette.pal create mode 100644 graphics/pokemon/palettes/umbreon_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/unown_palette.pal create mode 100644 graphics/pokemon/palettes/unown_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/ursaring_palette.pal create mode 100644 graphics/pokemon/palettes/ursaring_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/vaporeon_palette.pal create mode 100644 graphics/pokemon/palettes/vaporeon_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/venomoth_palette.pal create mode 100644 graphics/pokemon/palettes/venomoth_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/venonat_palette.pal create mode 100644 graphics/pokemon/palettes/venonat_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/venusaur_palette.pal create mode 100644 graphics/pokemon/palettes/venusaur_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/vibrava_palette.pal create mode 100644 graphics/pokemon/palettes/vibrava_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/victreebel_palette.pal create mode 100644 graphics/pokemon/palettes/victreebel_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/vigoroth_palette.pal create mode 100644 graphics/pokemon/palettes/vigoroth_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/vileplume_palette.pal create mode 100644 graphics/pokemon/palettes/vileplume_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/volbeat_palette.pal create mode 100644 graphics/pokemon/palettes/volbeat_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/voltorb_palette.pal create mode 100644 graphics/pokemon/palettes/voltorb_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/vulpix_palette.pal create mode 100644 graphics/pokemon/palettes/vulpix_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/wailmer_palette.pal create mode 100644 graphics/pokemon/palettes/wailmer_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/wailord_palette.pal create mode 100644 graphics/pokemon/palettes/wailord_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/walrein_palette.pal create mode 100644 graphics/pokemon/palettes/walrein_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/wartortle_palette.pal create mode 100644 graphics/pokemon/palettes/wartortle_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/weedle_palette.pal create mode 100644 graphics/pokemon/palettes/weedle_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/weepinbell_palette.pal create mode 100644 graphics/pokemon/palettes/weepinbell_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/weezing_palette.pal create mode 100644 graphics/pokemon/palettes/weezing_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/whiscash_palette.pal create mode 100644 graphics/pokemon/palettes/whiscash_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/whismur_palette.pal create mode 100644 graphics/pokemon/palettes/whismur_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/wigglytuff_palette.pal create mode 100644 graphics/pokemon/palettes/wigglytuff_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/wingull_palette.pal create mode 100644 graphics/pokemon/palettes/wingull_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/wobbuffet_palette.pal create mode 100644 graphics/pokemon/palettes/wobbuffet_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/wooper_palette.pal create mode 100644 graphics/pokemon/palettes/wooper_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/wurmple_palette.pal create mode 100644 graphics/pokemon/palettes/wurmple_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/wynaut_palette.pal create mode 100644 graphics/pokemon/palettes/wynaut_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/xatu_palette.pal create mode 100644 graphics/pokemon/palettes/xatu_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/yanma_palette.pal create mode 100644 graphics/pokemon/palettes/yanma_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/zangoose_palette.pal create mode 100644 graphics/pokemon/palettes/zangoose_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/zapdos_palette.pal create mode 100644 graphics/pokemon/palettes/zapdos_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/zigzagoon_palette.pal create mode 100644 graphics/pokemon/palettes/zigzagoon_shiny_palette.pal create mode 100644 graphics/pokemon/palettes/zubat_palette.pal create mode 100644 graphics/pokemon/palettes/zubat_shiny_palette.pal create mode 100644 graphics/trainers/back_pics/leaf_back_pic.png create mode 100644 graphics/trainers/back_pics/old_man_back_pic.png create mode 100644 graphics/trainers/back_pics/pokedude_back_pic.png create mode 100644 graphics/trainers/back_pics/red_back_pic.png create mode 100644 graphics/trainers/back_pics/ruby_sapphire_brendan_back_pic.png create mode 100644 graphics/trainers/back_pics/ruby_sapphire_may_back_pic.png create mode 100644 graphics/trainers/front_pics/aqua_admin_f_front_pic.png create mode 100644 graphics/trainers/front_pics/aqua_admin_m_front_pic.png create mode 100644 graphics/trainers/front_pics/aqua_grunt_f_front_pic.png create mode 100644 graphics/trainers/front_pics/aqua_grunt_m_front_pic.png create mode 100644 graphics/trainers/front_pics/aqua_leader_archie_front_pic.png create mode 100644 graphics/trainers/front_pics/arena_tycoon_greta_front_pic.png create mode 100644 graphics/trainers/front_pics/aroma_lady_front_pic.png create mode 100644 graphics/trainers/front_pics/battle_girl_front_pic.png create mode 100644 graphics/trainers/front_pics/beauty_front_pic.png create mode 100644 graphics/trainers/front_pics/biker_front_pic.png create mode 100644 graphics/trainers/front_pics/bird_keeper_front_pic.png create mode 100644 graphics/trainers/front_pics/black_belt_front_pic.png create mode 100644 graphics/trainers/front_pics/blue_1_front_pic.png create mode 100644 graphics/trainers/front_pics/blue_2_front_pic.png create mode 100644 graphics/trainers/front_pics/brendan_front_pic.png create mode 100644 graphics/trainers/front_pics/bug_catcher_front_pic.png create mode 100644 graphics/trainers/front_pics/bug_maniac_front_pic.png create mode 100644 graphics/trainers/front_pics/burglar_front_pic.png create mode 100644 graphics/trainers/front_pics/camper_front_pic.png create mode 100644 graphics/trainers/front_pics/champion_blue_front_pic.png create mode 100644 graphics/trainers/front_pics/champion_wallace_front_pic.png create mode 100644 graphics/trainers/front_pics/channeler_front_pic.png create mode 100644 graphics/trainers/front_pics/collector_front_pic.png create mode 100644 graphics/trainers/front_pics/cool_couple_front_pic.png create mode 100644 graphics/trainers/front_pics/cool_trainer_f_front_pic.png create mode 100644 graphics/trainers/front_pics/cool_trainer_m_front_pic.png create mode 100644 graphics/trainers/front_pics/crush_girl_front_pic.png create mode 100644 graphics/trainers/front_pics/crush_kin_front_pic.png create mode 100644 graphics/trainers/front_pics/cycling_triathlete_f_front_pic.png create mode 100644 graphics/trainers/front_pics/cycling_triathlete_m_front_pic.png create mode 100644 graphics/trainers/front_pics/dome_ace_tucker_front_pic.png create mode 100644 graphics/trainers/front_pics/dragon_tamer_front_pic.png create mode 100644 graphics/trainers/front_pics/elite_four_agatha_front_pic.png create mode 100644 graphics/trainers/front_pics/elite_four_bruno_front_pic.png create mode 100644 graphics/trainers/front_pics/elite_four_drake_front_pic.png create mode 100644 graphics/trainers/front_pics/elite_four_glacia_front_pic.png create mode 100644 graphics/trainers/front_pics/elite_four_lance_front_pic.png create mode 100644 graphics/trainers/front_pics/elite_four_lorelei_front_pic.png create mode 100644 graphics/trainers/front_pics/elite_four_phoebe_front_pic.png create mode 100644 graphics/trainers/front_pics/elite_four_sidney_front_pic.png create mode 100644 graphics/trainers/front_pics/emerald_aroma_lady_front_pic.png create mode 100644 graphics/trainers/front_pics/emerald_beauty_front_pic.png create mode 100644 graphics/trainers/front_pics/emerald_bird_keeper_front_pic.png create mode 100644 graphics/trainers/front_pics/emerald_black_belt_front_pic.png create mode 100644 graphics/trainers/front_pics/emerald_bug_catcher_front_pic.png create mode 100644 graphics/trainers/front_pics/emerald_camper_front_pic.png create mode 100644 graphics/trainers/front_pics/emerald_cool_trainer_f_front_pic.png create mode 100644 graphics/trainers/front_pics/emerald_cool_trainer_m_front_pic.png create mode 100644 graphics/trainers/front_pics/emerald_fisherman_front_pic.png create mode 100644 graphics/trainers/front_pics/emerald_gentleman_front_pic.png create mode 100644 graphics/trainers/front_pics/emerald_hiker_front_pic.png create mode 100644 graphics/trainers/front_pics/emerald_lady_front_pic.png create mode 100644 graphics/trainers/front_pics/emerald_lass_front_pic.png create mode 100644 graphics/trainers/front_pics/emerald_picnicker_front_pic.png create mode 100644 graphics/trainers/front_pics/emerald_pokemaniac_front_pic.png create mode 100644 graphics/trainers/front_pics/emerald_pokemon_breeder_f_front_pic.png create mode 100644 graphics/trainers/front_pics/emerald_pokemon_breeder_m_front_pic.png create mode 100644 graphics/trainers/front_pics/emerald_pokemon_ranger_f_front_pic.png create mode 100644 graphics/trainers/front_pics/emerald_pokemon_ranger_m_front_pic.png create mode 100644 graphics/trainers/front_pics/emerald_psychic_f_front_pic.png create mode 100644 graphics/trainers/front_pics/emerald_psychic_m_front_pic.png create mode 100644 graphics/trainers/front_pics/emerald_ruin_maniac_front_pic.png create mode 100644 graphics/trainers/front_pics/emerald_sailor_front_pic.png create mode 100644 graphics/trainers/front_pics/emerald_sis_and_bro_front_pic.png create mode 100644 graphics/trainers/front_pics/emerald_swimmer_f_front_pic.png create mode 100644 graphics/trainers/front_pics/emerald_swimmer_m_front_pic.png create mode 100644 graphics/trainers/front_pics/emerald_tuber_f_front_pic.png create mode 100644 graphics/trainers/front_pics/emerald_tuber_m_front_pic.png create mode 100644 graphics/trainers/front_pics/emerald_twins_front_pic.png create mode 100644 graphics/trainers/front_pics/emerald_young_couple_front_pic.png create mode 100644 graphics/trainers/front_pics/emerald_youngster_front_pic.png create mode 100644 graphics/trainers/front_pics/engineer_front_pic.png create mode 100644 graphics/trainers/front_pics/expert_f_front_pic.png create mode 100644 graphics/trainers/front_pics/expert_m_front_pic.png create mode 100644 graphics/trainers/front_pics/factory_head_noland_front_pic.png create mode 100644 graphics/trainers/front_pics/fisherman_front_pic.png create mode 100644 graphics/trainers/front_pics/gamer_front_pic.png create mode 100644 graphics/trainers/front_pics/gentleman_front_pic.png create mode 100644 graphics/trainers/front_pics/giovanni_front_pic.png create mode 100644 graphics/trainers/front_pics/guitarist_front_pic.png create mode 100644 graphics/trainers/front_pics/hex_maniac_front_pic.png create mode 100644 graphics/trainers/front_pics/hiker_front_pic.png create mode 100644 graphics/trainers/front_pics/interviewer_front_pic.png create mode 100644 graphics/trainers/front_pics/juggler_front_pic.png create mode 100644 graphics/trainers/front_pics/kindler_front_pic.png create mode 100644 graphics/trainers/front_pics/lady_front_pic.png create mode 100644 graphics/trainers/front_pics/lass_front_pic.png create mode 100644 graphics/trainers/front_pics/leader_blaine_front_pic.png create mode 100644 graphics/trainers/front_pics/leader_brawly_front_pic.png create mode 100644 graphics/trainers/front_pics/leader_brock_front_pic.png create mode 100644 graphics/trainers/front_pics/leader_erika_front_pic.png create mode 100644 graphics/trainers/front_pics/leader_flannery_front_pic.png create mode 100644 graphics/trainers/front_pics/leader_juan_front_pic.png create mode 100644 graphics/trainers/front_pics/leader_koga_front_pic.png create mode 100644 graphics/trainers/front_pics/leader_lt_surge_front_pic.png create mode 100644 graphics/trainers/front_pics/leader_misty_front_pic.png create mode 100644 graphics/trainers/front_pics/leader_norman_front_pic.png create mode 100644 graphics/trainers/front_pics/leader_roxanne_front_pic.png create mode 100644 graphics/trainers/front_pics/leader_sabrina_front_pic.png create mode 100644 graphics/trainers/front_pics/leader_tate_and_liza_front_pic.png create mode 100644 graphics/trainers/front_pics/leader_wattson_front_pic.png create mode 100644 graphics/trainers/front_pics/leader_winona_front_pic.png create mode 100644 graphics/trainers/front_pics/leaf_front_pic.png create mode 100644 graphics/trainers/front_pics/magma_admin_front_pic.png create mode 100644 graphics/trainers/front_pics/magma_grunt_f_front_pic.png create mode 100644 graphics/trainers/front_pics/magma_grunt_m_front_pic.png create mode 100644 graphics/trainers/front_pics/magma_leader_maxie_front_pic.png create mode 100644 graphics/trainers/front_pics/may_front_pic.png create mode 100644 graphics/trainers/front_pics/ninja_boy_front_pic.png create mode 100644 graphics/trainers/front_pics/oak_front_pic.png create mode 100644 graphics/trainers/front_pics/old_couple_front_pic.png create mode 100644 graphics/trainers/front_pics/painter_front_pic.png create mode 100644 graphics/trainers/front_pics/palace_maven_spenser_front_pic.png create mode 100644 graphics/trainers/front_pics/parasol_lady_front_pic.png create mode 100644 graphics/trainers/front_pics/picnicker_front_pic.png create mode 100644 graphics/trainers/front_pics/pike_queen_lucy_front_pic.png create mode 100644 graphics/trainers/front_pics/pokemaniac_front_pic.png create mode 100644 graphics/trainers/front_pics/pokemon_breeder_front_pic.png create mode 100644 graphics/trainers/front_pics/pokemon_ranger_f_front_pic.png create mode 100644 graphics/trainers/front_pics/pokemon_ranger_m_front_pic.png create mode 100644 graphics/trainers/front_pics/psychic_f_front_pic.png create mode 100644 graphics/trainers/front_pics/psychic_m_front_pic.png create mode 100644 graphics/trainers/front_pics/pyramid_king_brandon_front_pic.png create mode 100644 graphics/trainers/front_pics/red_front_pic.png create mode 100644 graphics/trainers/front_pics/rich_boy_front_pic.png create mode 100644 graphics/trainers/front_pics/rocker_front_pic.png create mode 100644 graphics/trainers/front_pics/rocket_grunt_f_front_pic.png create mode 100644 graphics/trainers/front_pics/rocket_grunt_m_front_pic.png create mode 100644 graphics/trainers/front_pics/roughneck_front_pic.png create mode 100644 graphics/trainers/front_pics/ruby_magma_admin_f_front_pic.png create mode 100644 graphics/trainers/front_pics/ruby_sapphire_brendan_front_pic.png create mode 100644 graphics/trainers/front_pics/ruby_sapphire_champion_wallace_front_pic.png create mode 100644 graphics/trainers/front_pics/ruby_sapphire_may_front_pic.png create mode 100644 graphics/trainers/front_pics/ruin_maniac_front_pic.png create mode 100644 graphics/trainers/front_pics/running_triathlete_f_front_pic.png create mode 100644 graphics/trainers/front_pics/running_triathlete_m_front_pic.png create mode 100644 graphics/trainers/front_pics/sailor_front_pic.png create mode 100644 graphics/trainers/front_pics/salon_maiden_anabel_front_pic.png create mode 100644 graphics/trainers/front_pics/school_kid_f_front_pic.png create mode 100644 graphics/trainers/front_pics/school_kid_m_front_pic.png create mode 100644 graphics/trainers/front_pics/scientist_front_pic.png create mode 100644 graphics/trainers/front_pics/sis_and_bro_front_pic.png create mode 100644 graphics/trainers/front_pics/sr_and_jr_front_pic.png create mode 100644 graphics/trainers/front_pics/steven_front_pic.png create mode 100644 graphics/trainers/front_pics/super_nerd_front_pic.png create mode 100644 graphics/trainers/front_pics/swimmer_f_front_pic.png create mode 100644 graphics/trainers/front_pics/swimmer_m_front_pic.png create mode 100644 graphics/trainers/front_pics/swimming_triathlete_f_front_pic.png create mode 100644 graphics/trainers/front_pics/swimming_triathlete_m_front_pic.png create mode 100644 graphics/trainers/front_pics/tamer_front_pic.png create mode 100644 graphics/trainers/front_pics/tuber_front_pic.png create mode 100644 graphics/trainers/front_pics/twins_front_pic.png create mode 100644 graphics/trainers/front_pics/wally_front_pic.png create mode 100644 graphics/trainers/front_pics/winstrate_f_front_pic.png create mode 100644 graphics/trainers/front_pics/winstrate_m_front_pic.png create mode 100644 graphics/trainers/front_pics/young_couple_front_pic.png create mode 100644 graphics/trainers/front_pics/youngster_front_pic.png create mode 100644 graphics/trainers/palettes/aqua_admin_f.pal create mode 100644 graphics/trainers/palettes/aqua_admin_m.pal create mode 100644 graphics/trainers/palettes/aqua_grunt_f.pal create mode 100644 graphics/trainers/palettes/aqua_grunt_m.pal create mode 100644 graphics/trainers/palettes/aqua_leader_archie.pal create mode 100644 graphics/trainers/palettes/arena_tycoon_greta.pal create mode 100644 graphics/trainers/palettes/aroma_lady.pal create mode 100644 graphics/trainers/palettes/battle_girl.pal create mode 100644 graphics/trainers/palettes/beauty.pal create mode 100644 graphics/trainers/palettes/biker.pal create mode 100644 graphics/trainers/palettes/bird_keeper.pal create mode 100644 graphics/trainers/palettes/black_belt.pal create mode 100644 graphics/trainers/palettes/blue_1.pal create mode 100644 graphics/trainers/palettes/blue_2.pal create mode 100644 graphics/trainers/palettes/brendan.pal create mode 100644 graphics/trainers/palettes/bug_catcher.pal create mode 100644 graphics/trainers/palettes/bug_maniac.pal create mode 100644 graphics/trainers/palettes/burglar.pal create mode 100644 graphics/trainers/palettes/camper.pal create mode 100644 graphics/trainers/palettes/champion_blue.pal create mode 100644 graphics/trainers/palettes/champion_wallace.pal create mode 100644 graphics/trainers/palettes/channeler.pal create mode 100644 graphics/trainers/palettes/collector.pal create mode 100644 graphics/trainers/palettes/cool_couple.pal create mode 100644 graphics/trainers/palettes/cool_trainer_f.pal create mode 100644 graphics/trainers/palettes/cool_trainer_m.pal create mode 100644 graphics/trainers/palettes/crush_girl.pal create mode 100644 graphics/trainers/palettes/crush_kin.pal create mode 100644 graphics/trainers/palettes/cycling_triathlete_f.pal create mode 100644 graphics/trainers/palettes/cycling_triathlete_m.pal create mode 100644 graphics/trainers/palettes/dome_ace_tucker.pal create mode 100644 graphics/trainers/palettes/dragon_tamer.pal create mode 100644 graphics/trainers/palettes/elite_four_agatha.pal create mode 100644 graphics/trainers/palettes/elite_four_bruno.pal create mode 100644 graphics/trainers/palettes/elite_four_drake.pal create mode 100644 graphics/trainers/palettes/elite_four_glacia.pal create mode 100644 graphics/trainers/palettes/elite_four_lance.pal create mode 100644 graphics/trainers/palettes/elite_four_lorelei.pal create mode 100644 graphics/trainers/palettes/elite_four_phoebe.pal create mode 100644 graphics/trainers/palettes/elite_four_sidney.pal create mode 100644 graphics/trainers/palettes/emerald_aroma_lady.pal create mode 100644 graphics/trainers/palettes/emerald_beauty.pal create mode 100644 graphics/trainers/palettes/emerald_bird_keeper.pal create mode 100644 graphics/trainers/palettes/emerald_bug_catcher.pal create mode 100644 graphics/trainers/palettes/emerald_camper.pal create mode 100644 graphics/trainers/palettes/emerald_cool_trainer_f.pal create mode 100644 graphics/trainers/palettes/emerald_cool_trainer_m.pal create mode 100644 graphics/trainers/palettes/emerald_fisherman.pal create mode 100644 graphics/trainers/palettes/emerald_gentleman.pal create mode 100644 graphics/trainers/palettes/emerald_hiker.pal create mode 100644 graphics/trainers/palettes/emerald_lady.pal create mode 100644 graphics/trainers/palettes/emerald_lass.pal create mode 100644 graphics/trainers/palettes/emerald_leaf_back_pic.pal create mode 100644 graphics/trainers/palettes/emerald_picnicker.pal create mode 100644 graphics/trainers/palettes/emerald_pokemaniac.pal create mode 100644 graphics/trainers/palettes/emerald_pokemon_breeder_f.pal create mode 100644 graphics/trainers/palettes/emerald_pokemon_breeder_m.pal create mode 100644 graphics/trainers/palettes/emerald_pokemon_ranger_f.pal create mode 100644 graphics/trainers/palettes/emerald_pokemon_ranger_m.pal create mode 100644 graphics/trainers/palettes/emerald_psychic_f.pal create mode 100644 graphics/trainers/palettes/emerald_psychic_m.pal create mode 100644 graphics/trainers/palettes/emerald_red_back_pic.pal create mode 100644 graphics/trainers/palettes/emerald_ruin_maniac.pal create mode 100644 graphics/trainers/palettes/emerald_sailor.pal create mode 100644 graphics/trainers/palettes/emerald_sis_and_bro.pal create mode 100644 graphics/trainers/palettes/emerald_swimmer_f.pal create mode 100644 graphics/trainers/palettes/emerald_swimmer_m.pal create mode 100644 graphics/trainers/palettes/emerald_tuber_f.pal create mode 100644 graphics/trainers/palettes/emerald_tuber_m.pal create mode 100644 graphics/trainers/palettes/emerald_twins.pal create mode 100644 graphics/trainers/palettes/emerald_young_couple.pal create mode 100644 graphics/trainers/palettes/emerald_youngster.pal create mode 100644 graphics/trainers/palettes/engineer.pal create mode 100644 graphics/trainers/palettes/expert_f.pal create mode 100644 graphics/trainers/palettes/expert_m.pal create mode 100644 graphics/trainers/palettes/factory_head_noland.pal create mode 100644 graphics/trainers/palettes/fisherman.pal create mode 100644 graphics/trainers/palettes/gamer.pal create mode 100644 graphics/trainers/palettes/gentleman.pal create mode 100644 graphics/trainers/palettes/giovanni.pal create mode 100644 graphics/trainers/palettes/guitarist.pal create mode 100644 graphics/trainers/palettes/hex_maniac.pal create mode 100644 graphics/trainers/palettes/hiker.pal create mode 100644 graphics/trainers/palettes/interviewer.pal create mode 100644 graphics/trainers/palettes/juggler.pal create mode 100644 graphics/trainers/palettes/kindler.pal create mode 100644 graphics/trainers/palettes/lady.pal create mode 100644 graphics/trainers/palettes/lass.pal create mode 100644 graphics/trainers/palettes/leader_blaine.pal create mode 100644 graphics/trainers/palettes/leader_brawly.pal create mode 100644 graphics/trainers/palettes/leader_brock.pal create mode 100644 graphics/trainers/palettes/leader_erika.pal create mode 100644 graphics/trainers/palettes/leader_flannery.pal create mode 100644 graphics/trainers/palettes/leader_juan.pal create mode 100644 graphics/trainers/palettes/leader_koga.pal create mode 100644 graphics/trainers/palettes/leader_lt_surge.pal create mode 100644 graphics/trainers/palettes/leader_misty.pal create mode 100644 graphics/trainers/palettes/leader_norman.pal create mode 100644 graphics/trainers/palettes/leader_roxanne.pal create mode 100644 graphics/trainers/palettes/leader_sabrina.pal create mode 100644 graphics/trainers/palettes/leader_tate_and_liza.pal create mode 100644 graphics/trainers/palettes/leader_wattson.pal create mode 100644 graphics/trainers/palettes/leader_winona.pal create mode 100644 graphics/trainers/palettes/leaf.pal create mode 100644 graphics/trainers/palettes/leaf_back_pic.pal create mode 100644 graphics/trainers/palettes/magma_admin.pal create mode 100644 graphics/trainers/palettes/magma_grunt_f.pal create mode 100644 graphics/trainers/palettes/magma_grunt_m.pal create mode 100644 graphics/trainers/palettes/magma_leader_maxie.pal create mode 100644 graphics/trainers/palettes/may.pal create mode 100644 graphics/trainers/palettes/ninja_boy.pal create mode 100644 graphics/trainers/palettes/oak.pal create mode 100644 graphics/trainers/palettes/old_couple.pal create mode 100644 graphics/trainers/palettes/old_man_back_pic.pal create mode 100644 graphics/trainers/palettes/painter.pal create mode 100644 graphics/trainers/palettes/palace_maven_spenser.pal create mode 100644 graphics/trainers/palettes/parasol_lady.pal create mode 100644 graphics/trainers/palettes/picnicker.pal create mode 100644 graphics/trainers/palettes/pike_queen_lucy.pal create mode 100644 graphics/trainers/palettes/pokedude_back_pic.pal create mode 100644 graphics/trainers/palettes/pokemaniac.pal create mode 100644 graphics/trainers/palettes/pokemon_breeder.pal create mode 100644 graphics/trainers/palettes/pokemon_ranger_f.pal create mode 100644 graphics/trainers/palettes/pokemon_ranger_m.pal create mode 100644 graphics/trainers/palettes/psychic_f.pal create mode 100644 graphics/trainers/palettes/psychic_m.pal create mode 100644 graphics/trainers/palettes/pyramid_king_brandon.pal create mode 100644 graphics/trainers/palettes/red.pal create mode 100644 graphics/trainers/palettes/red_back_pic.pal create mode 100644 graphics/trainers/palettes/rich_boy.pal create mode 100644 graphics/trainers/palettes/rocker.pal create mode 100644 graphics/trainers/palettes/rocket_grunt_f.pal create mode 100644 graphics/trainers/palettes/rocket_grunt_m.pal create mode 100644 graphics/trainers/palettes/roughneck.pal create mode 100644 graphics/trainers/palettes/ruby_magma_admin_f.pal create mode 100644 graphics/trainers/palettes/ruby_sapphire_brendan.pal create mode 100644 graphics/trainers/palettes/ruby_sapphire_may.pal create mode 100644 graphics/trainers/palettes/ruin_maniac.pal create mode 100644 graphics/trainers/palettes/running_triathlete_f.pal create mode 100644 graphics/trainers/palettes/running_triathlete_m.pal create mode 100644 graphics/trainers/palettes/sailor.pal create mode 100644 graphics/trainers/palettes/salon_maiden_anabel.pal create mode 100644 graphics/trainers/palettes/school_kid_f.pal create mode 100644 graphics/trainers/palettes/school_kid_m.pal create mode 100644 graphics/trainers/palettes/scientist.pal create mode 100644 graphics/trainers/palettes/sis_and_bro.pal create mode 100644 graphics/trainers/palettes/sr_and_jr.pal create mode 100644 graphics/trainers/palettes/steven.pal create mode 100644 graphics/trainers/palettes/super_nerd.pal create mode 100644 graphics/trainers/palettes/swimmer_f.pal create mode 100644 graphics/trainers/palettes/swimmer_m.pal create mode 100644 graphics/trainers/palettes/swimming_triathlete_f.pal create mode 100644 graphics/trainers/palettes/swimming_triathlete_m.pal create mode 100644 graphics/trainers/palettes/tamer.pal create mode 100644 graphics/trainers/palettes/tuber.pal create mode 100644 graphics/trainers/palettes/twins.pal create mode 100644 graphics/trainers/palettes/wally.pal create mode 100644 graphics/trainers/palettes/winstrate_f.pal create mode 100644 graphics/trainers/palettes/winstrate_m.pal create mode 100644 graphics/trainers/palettes/young_couple.pal create mode 100644 graphics/trainers/palettes/youngster.pal diff --git a/data/graphics.s b/data/graphics.s index 241b27bc3..64d7f94ec 100644 --- a/data/graphics.s +++ b/data/graphics.s @@ -647,20 +647,13969 @@ gUnknown_8D2EC70:: @ 8D2EC70 gUnknown_8D2FBB4:: @ 8D2FBB4 .incbin "baserom.gba", 0xD2FBB4, 0x20 - @ INSERT POKEMANS HERE -gUnknown_8D2FBD4:: @ 8D2FBD4 - .incbin "baserom.gba", 0xD2FBD4, 0x119184 - - @ INSERT TRAINERS HERE -gUnknown_8E48D58:: @ 8E48D58 - .incbin "baserom.gba", 0xE48D58, 0x21164 - -gUnknown_8E69EBC:: @ 8E69EBC - .incbin "baserom.gba", 0xE69EBC, 0xD0A0 - -gUnknown_8E76F5C:: @ 8E76F5C - .incbin "baserom.gba", 0xE76F5C, 0x420 + + .align 2 +gFile_graphics_pokemon_front_pics_bulbasaur_still_front_pic:: @ 8D2FBD4 + .incbin "graphics/pokemon/front_pics/bulbasaur_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xD2FBD4, 0x02A4 + + .align 2 +gFile_graphics_pokemon_palettes_bulbasaur_palette:: @ 8D2FE78 + .incbin "graphics/pokemon/palettes/bulbasaur_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xD2FE78, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_bulbasaur_back_pic:: @ 8D2FEA0 + .incbin "graphics/pokemon/back_pics/bulbasaur_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xD2FEA0, 0x02C4 + + .align 2 +gFile_graphics_pokemon_palettes_bulbasaur_shiny_palette:: @ 8D30164 + .incbin "graphics/pokemon/palettes/bulbasaur_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xD30164, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_bulbasaur_icon:: @ 8D3018C + .incbin "graphics/pokemon/icons/bulbasaur_icon.4bpp" + @ .incbin "baserom.gba", 0xD3018C, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_bulbasaur_footprint:: @ 8D3058C + .incbin "graphics/pokemon/footprints/bulbasaur_footprint.1bpp" + @ .incbin "baserom.gba", 0xD3058C, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_ivysaur_still_front_pic:: @ 8D305AC + .incbin "graphics/pokemon/front_pics/ivysaur_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xD305AC, 0x033C + + .align 2 +gFile_graphics_pokemon_palettes_ivysaur_palette:: @ 8D308E8 + .incbin "graphics/pokemon/palettes/ivysaur_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xD308E8, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_ivysaur_back_pic:: @ 8D30910 + .incbin "graphics/pokemon/back_pics/ivysaur_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xD30910, 0x0354 + + .align 2 +gFile_graphics_pokemon_palettes_ivysaur_shiny_palette:: @ 8D30C64 + .incbin "graphics/pokemon/palettes/ivysaur_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xD30C64, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_ivysaur_icon:: @ 8D30C8C + .incbin "graphics/pokemon/icons/ivysaur_icon.4bpp" + @ .incbin "baserom.gba", 0xD30C8C, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_ivysaur_footprint:: @ 8D3108C + .incbin "graphics/pokemon/footprints/ivysaur_footprint.1bpp" + @ .incbin "baserom.gba", 0xD3108C, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_venusaur_still_front_pic:: @ 8D310AC + .incbin "graphics/pokemon/front_pics/venusaur_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xD310AC, 0x0540 + + .align 2 +gFile_graphics_pokemon_palettes_venusaur_palette:: @ 8D315EC + .incbin "graphics/pokemon/palettes/venusaur_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xD315EC, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_venusaur_back_pic:: @ 8D31614 + .incbin "graphics/pokemon/back_pics/venusaur_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xD31614, 0x04C8 + + .align 2 +gFile_graphics_pokemon_palettes_venusaur_shiny_palette:: @ 8D31ADC + .incbin "graphics/pokemon/palettes/venusaur_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xD31ADC, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_venusaur_icon:: @ 8D31B04 + .incbin "graphics/pokemon/icons/venusaur_icon.4bpp" + @ .incbin "baserom.gba", 0xD31B04, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_venusaur_footprint:: @ 8D31F04 + .incbin "graphics/pokemon/footprints/venusaur_footprint.1bpp" + @ .incbin "baserom.gba", 0xD31F04, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_charmander_still_front_pic:: @ 8D31F24 + .incbin "graphics/pokemon/front_pics/charmander_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xD31F24, 0x02A0 + + .align 2 +gFile_graphics_pokemon_palettes_charmander_palette:: @ 8D321C4 + .incbin "graphics/pokemon/palettes/charmander_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xD321C4, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_charmander_back_pic:: @ 8D321EC + .incbin "graphics/pokemon/back_pics/charmander_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xD321EC, 0x0284 + + .align 2 +gFile_graphics_pokemon_palettes_charmander_shiny_palette:: @ 8D32470 + .incbin "graphics/pokemon/palettes/charmander_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xD32470, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_charmander_icon:: @ 8D32498 + .incbin "graphics/pokemon/icons/charmander_icon.4bpp" + @ .incbin "baserom.gba", 0xD32498, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_charmander_footprint:: @ 8D32898 + .incbin "graphics/pokemon/footprints/charmander_footprint.1bpp" + @ .incbin "baserom.gba", 0xD32898, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_charmeleon_still_front_pic:: @ 8D328B8 + .incbin "graphics/pokemon/front_pics/charmeleon_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xD328B8, 0x03AC + + .align 2 +gFile_graphics_pokemon_palettes_charmeleon_palette:: @ 8D32C64 + .incbin "graphics/pokemon/palettes/charmeleon_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xD32C64, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_charmeleon_back_pic:: @ 8D32C8C + .incbin "graphics/pokemon/back_pics/charmeleon_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xD32C8C, 0x02F4 + + .align 2 +gFile_graphics_pokemon_palettes_charmeleon_shiny_palette:: @ 8D32F80 + .incbin "graphics/pokemon/palettes/charmeleon_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xD32F80, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_charmeleon_icon:: @ 8D32FA8 + .incbin "graphics/pokemon/icons/charmeleon_icon.4bpp" + @ .incbin "baserom.gba", 0xD32FA8, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_charmeleon_footprint:: @ 8D333A8 + .incbin "graphics/pokemon/footprints/charmeleon_footprint.1bpp" + @ .incbin "baserom.gba", 0xD333A8, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_charizard_still_front_pic:: @ 8D333C8 + .incbin "graphics/pokemon/front_pics/charizard_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xD333C8, 0x04FC + + .align 2 +gFile_graphics_pokemon_palettes_charizard_palette:: @ 8D338C4 + .incbin "graphics/pokemon/palettes/charizard_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xD338C4, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_charizard_back_pic:: @ 8D338EC + .incbin "graphics/pokemon/back_pics/charizard_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xD338EC, 0x040C + + .align 2 +gFile_graphics_pokemon_palettes_charizard_shiny_palette:: @ 8D33CF8 + .incbin "graphics/pokemon/palettes/charizard_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xD33CF8, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_charizard_icon:: @ 8D33D20 + .incbin "graphics/pokemon/icons/charizard_icon.4bpp" + @ .incbin "baserom.gba", 0xD33D20, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_charizard_footprint:: @ 8D34120 + .incbin "graphics/pokemon/footprints/charizard_footprint.1bpp" + @ .incbin "baserom.gba", 0xD34120, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_squirtle_still_front_pic:: @ 8D34140 + .incbin "graphics/pokemon/front_pics/squirtle_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xD34140, 0x029C + + .align 2 +gFile_graphics_pokemon_palettes_squirtle_palette:: @ 8D343DC + .incbin "graphics/pokemon/palettes/squirtle_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xD343DC, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_squirtle_back_pic:: @ 8D34404 + .incbin "graphics/pokemon/back_pics/squirtle_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xD34404, 0x0288 + + .align 2 +gFile_graphics_pokemon_palettes_squirtle_shiny_palette:: @ 8D3468C + .incbin "graphics/pokemon/palettes/squirtle_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xD3468C, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_squirtle_icon:: @ 8D346B4 + .incbin "graphics/pokemon/icons/squirtle_icon.4bpp" + @ .incbin "baserom.gba", 0xD346B4, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_squirtle_footprint:: @ 8D34AB4 + .incbin "graphics/pokemon/footprints/squirtle_footprint.1bpp" + @ .incbin "baserom.gba", 0xD34AB4, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_wartortle_still_front_pic:: @ 8D34AD4 + .incbin "graphics/pokemon/front_pics/wartortle_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xD34AD4, 0x03AC + + .align 2 +gFile_graphics_pokemon_palettes_wartortle_palette:: @ 8D34E80 + .incbin "graphics/pokemon/palettes/wartortle_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xD34E80, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_wartortle_back_pic:: @ 8D34EA8 + .incbin "graphics/pokemon/back_pics/wartortle_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xD34EA8, 0x0348 + + .align 2 +gFile_graphics_pokemon_palettes_wartortle_shiny_palette:: @ 8D351F0 + .incbin "graphics/pokemon/palettes/wartortle_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xD351F0, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_wartortle_icon:: @ 8D35218 + .incbin "graphics/pokemon/icons/wartortle_icon.4bpp" + @ .incbin "baserom.gba", 0xD35218, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_wartortle_footprint:: @ 8D35618 + .incbin "graphics/pokemon/footprints/wartortle_footprint.1bpp" + @ .incbin "baserom.gba", 0xD35618, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_blastoise_still_front_pic:: @ 8D35638 + .incbin "graphics/pokemon/front_pics/blastoise_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xD35638, 0x0504 + + .align 2 +gFile_graphics_pokemon_palettes_blastoise_palette:: @ 8D35B3C + .incbin "graphics/pokemon/palettes/blastoise_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xD35B3C, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_blastoise_back_pic:: @ 8D35B64 + .incbin "graphics/pokemon/back_pics/blastoise_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xD35B64, 0x0414 + + .align 2 +gFile_graphics_pokemon_palettes_blastoise_shiny_palette:: @ 8D35F78 + .incbin "graphics/pokemon/palettes/blastoise_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xD35F78, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_blastoise_icon:: @ 8D35FA0 + .incbin "graphics/pokemon/icons/blastoise_icon.4bpp" + @ .incbin "baserom.gba", 0xD35FA0, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_blastoise_footprint:: @ 8D363A0 + .incbin "graphics/pokemon/footprints/blastoise_footprint.1bpp" + @ .incbin "baserom.gba", 0xD363A0, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_caterpie_still_front_pic:: @ 8D363C0 + .incbin "graphics/pokemon/front_pics/caterpie_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xD363C0, 0x0258 + + .align 2 +gFile_graphics_pokemon_palettes_caterpie_palette:: @ 8D36618 + .incbin "graphics/pokemon/palettes/caterpie_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xD36618, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_caterpie_back_pic:: @ 8D36640 + .incbin "graphics/pokemon/back_pics/caterpie_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xD36640, 0x0288 + + .align 2 +gFile_graphics_pokemon_palettes_caterpie_shiny_palette:: @ 8D368C8 + .incbin "graphics/pokemon/palettes/caterpie_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xD368C8, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_caterpie_icon:: @ 8D368F0 + .incbin "graphics/pokemon/icons/caterpie_icon.4bpp" + @ .incbin "baserom.gba", 0xD368F0, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_caterpie_footprint:: @ 8D36CF0 + .incbin "graphics/pokemon/footprints/caterpie_footprint.1bpp" + @ .incbin "baserom.gba", 0xD36CF0, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_metapod_still_front_pic:: @ 8D36D10 + .incbin "graphics/pokemon/front_pics/metapod_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xD36D10, 0x021C + + .align 2 +gFile_graphics_pokemon_palettes_metapod_palette:: @ 8D36F2C + .incbin "graphics/pokemon/palettes/metapod_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xD36F2C, 0x0020 + + .align 2 +gFile_graphics_pokemon_back_pics_metapod_back_pic:: @ 8D36F4C + .incbin "graphics/pokemon/back_pics/metapod_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xD36F4C, 0x021C + + .align 2 +gFile_graphics_pokemon_palettes_metapod_shiny_palette:: @ 8D37168 + .incbin "graphics/pokemon/palettes/metapod_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xD37168, 0x0020 + + .align 2 +gFile_graphics_pokemon_icons_metapod_icon:: @ 8D37188 + .incbin "graphics/pokemon/icons/metapod_icon.4bpp" + @ .incbin "baserom.gba", 0xD37188, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_metapod_footprint:: @ 8D37588 + .incbin "graphics/pokemon/footprints/metapod_footprint.1bpp" + @ .incbin "baserom.gba", 0xD37588, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_butterfree_still_front_pic:: @ 8D375A8 + .incbin "graphics/pokemon/front_pics/butterfree_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xD375A8, 0x0378 + + .align 2 +gFile_graphics_pokemon_palettes_butterfree_palette:: @ 8D37920 + .incbin "graphics/pokemon/palettes/butterfree_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xD37920, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_butterfree_back_pic:: @ 8D37948 + .incbin "graphics/pokemon/back_pics/butterfree_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xD37948, 0x0404 + + .align 2 +gFile_graphics_pokemon_palettes_butterfree_shiny_palette:: @ 8D37D4C + .incbin "graphics/pokemon/palettes/butterfree_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xD37D4C, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_butterfree_icon:: @ 8D37D74 + .incbin "graphics/pokemon/icons/butterfree_icon.4bpp" + @ .incbin "baserom.gba", 0xD37D74, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_butterfree_footprint:: @ 8D38174 + .incbin "graphics/pokemon/footprints/butterfree_footprint.1bpp" + @ .incbin "baserom.gba", 0xD38174, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_weedle_still_front_pic:: @ 8D38194 + .incbin "graphics/pokemon/front_pics/weedle_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xD38194, 0x023C + + .align 2 +gFile_graphics_pokemon_palettes_weedle_palette:: @ 8D383D0 + .incbin "graphics/pokemon/palettes/weedle_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xD383D0, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_weedle_back_pic:: @ 8D383F8 + .incbin "graphics/pokemon/back_pics/weedle_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xD383F8, 0x0268 + + .align 2 +gFile_graphics_pokemon_palettes_weedle_shiny_palette:: @ 8D38660 + .incbin "graphics/pokemon/palettes/weedle_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xD38660, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_weedle_icon:: @ 8D38688 + .incbin "graphics/pokemon/icons/weedle_icon.4bpp" + @ .incbin "baserom.gba", 0xD38688, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_weedle_footprint:: @ 8D38A88 + .incbin "graphics/pokemon/footprints/weedle_footprint.1bpp" + @ .incbin "baserom.gba", 0xD38A88, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_kakuna_still_front_pic:: @ 8D38AA8 + .incbin "graphics/pokemon/front_pics/kakuna_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xD38AA8, 0x0240 + + .align 2 +gFile_graphics_pokemon_palettes_kakuna_palette:: @ 8D38CE8 + .incbin "graphics/pokemon/palettes/kakuna_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xD38CE8, 0x0024 + + .align 2 +gFile_graphics_pokemon_back_pics_kakuna_back_pic:: @ 8D38D0C + .incbin "graphics/pokemon/back_pics/kakuna_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xD38D0C, 0x0284 + + .align 2 +gFile_graphics_pokemon_palettes_kakuna_shiny_palette:: @ 8D38F90 + .incbin "graphics/pokemon/palettes/kakuna_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xD38F90, 0x0024 + + .align 2 +gFile_graphics_pokemon_icons_kakuna_icon:: @ 8D38FB4 + .incbin "graphics/pokemon/icons/kakuna_icon.4bpp" + @ .incbin "baserom.gba", 0xD38FB4, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_kakuna_footprint:: @ 8D393B4 + .incbin "graphics/pokemon/footprints/kakuna_footprint.1bpp" + @ .incbin "baserom.gba", 0xD393B4, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_beedrill_still_front_pic:: @ 8D393D4 + .incbin "graphics/pokemon/front_pics/beedrill_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xD393D4, 0x0420 + + .align 2 +gFile_graphics_pokemon_palettes_beedrill_palette:: @ 8D397F4 + .incbin "graphics/pokemon/palettes/beedrill_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xD397F4, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_beedrill_back_pic:: @ 8D3981C + .incbin "graphics/pokemon/back_pics/beedrill_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xD3981C, 0x0374 + + .align 2 +gFile_graphics_pokemon_palettes_beedrill_shiny_palette:: @ 8D39B90 + .incbin "graphics/pokemon/palettes/beedrill_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xD39B90, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_beedrill_icon:: @ 8D39BB8 + .incbin "graphics/pokemon/icons/beedrill_icon.4bpp" + @ .incbin "baserom.gba", 0xD39BB8, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_beedrill_footprint:: @ 8D39FB8 + .incbin "graphics/pokemon/footprints/beedrill_footprint.1bpp" + @ .incbin "baserom.gba", 0xD39FB8, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_pidgey_still_front_pic:: @ 8D39FD8 + .incbin "graphics/pokemon/front_pics/pidgey_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xD39FD8, 0x0278 + + .align 2 +gFile_graphics_pokemon_palettes_pidgey_palette:: @ 8D3A250 + .incbin "graphics/pokemon/palettes/pidgey_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xD3A250, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_pidgey_back_pic:: @ 8D3A278 + .incbin "graphics/pokemon/back_pics/pidgey_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xD3A278, 0x0354 + + .align 2 +gFile_graphics_pokemon_palettes_pidgey_shiny_palette:: @ 8D3A5CC + .incbin "graphics/pokemon/palettes/pidgey_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xD3A5CC, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_pidgey_icon:: @ 8D3A5F4 + .incbin "graphics/pokemon/icons/pidgey_icon.4bpp" + @ .incbin "baserom.gba", 0xD3A5F4, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_pidgey_footprint:: @ 8D3A9F4 + .incbin "graphics/pokemon/footprints/pidgey_footprint.1bpp" + @ .incbin "baserom.gba", 0xD3A9F4, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_pidgeotto_still_front_pic:: @ 8D3AA14 + .incbin "graphics/pokemon/front_pics/pidgeotto_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xD3AA14, 0x0398 + + .align 2 +gFile_graphics_pokemon_palettes_pidgeotto_palette:: @ 8D3ADAC + .incbin "graphics/pokemon/palettes/pidgeotto_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xD3ADAC, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_pidgeotto_back_pic:: @ 8D3ADD4 + .incbin "graphics/pokemon/back_pics/pidgeotto_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xD3ADD4, 0x034C + + .align 2 +gFile_graphics_pokemon_palettes_pidgeotto_shiny_palette:: @ 8D3B120 + .incbin "graphics/pokemon/palettes/pidgeotto_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xD3B120, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_pidgeotto_icon:: @ 8D3B148 + .incbin "graphics/pokemon/icons/pidgeotto_icon.4bpp" + @ .incbin "baserom.gba", 0xD3B148, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_pidgeotto_footprint:: @ 8D3B548 + .incbin "graphics/pokemon/footprints/pidgeotto_footprint.1bpp" + @ .incbin "baserom.gba", 0xD3B548, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_pidgeot_still_front_pic:: @ 8D3B568 + .incbin "graphics/pokemon/front_pics/pidgeot_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xD3B568, 0x04EC + + .align 2 +gFile_graphics_pokemon_palettes_pidgeot_palette:: @ 8D3BA54 + .incbin "graphics/pokemon/palettes/pidgeot_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xD3BA54, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_pidgeot_back_pic:: @ 8D3BA7C + .incbin "graphics/pokemon/back_pics/pidgeot_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xD3BA7C, 0x03E8 + + .align 2 +gFile_graphics_pokemon_palettes_pidgeot_shiny_palette:: @ 8D3BE64 + .incbin "graphics/pokemon/palettes/pidgeot_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xD3BE64, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_pidgeot_icon:: @ 8D3BE8C + .incbin "graphics/pokemon/icons/pidgeot_icon.4bpp" + @ .incbin "baserom.gba", 0xD3BE8C, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_pidgeot_footprint:: @ 8D3C28C + .incbin "graphics/pokemon/footprints/pidgeot_footprint.1bpp" + @ .incbin "baserom.gba", 0xD3C28C, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_rattata_still_front_pic:: @ 8D3C2AC + .incbin "graphics/pokemon/front_pics/rattata_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xD3C2AC, 0x0258 + + .align 2 +gFile_graphics_pokemon_palettes_rattata_palette:: @ 8D3C504 + .incbin "graphics/pokemon/palettes/rattata_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xD3C504, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_rattata_back_pic:: @ 8D3C52C + .incbin "graphics/pokemon/back_pics/rattata_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xD3C52C, 0x02B8 + + .align 2 +gFile_graphics_pokemon_palettes_rattata_shiny_palette:: @ 8D3C7E4 + .incbin "graphics/pokemon/palettes/rattata_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xD3C7E4, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_rattata_icon:: @ 8D3C80C + .incbin "graphics/pokemon/icons/rattata_icon.4bpp" + @ .incbin "baserom.gba", 0xD3C80C, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_rattata_footprint:: @ 8D3CC0C + .incbin "graphics/pokemon/footprints/rattata_footprint.1bpp" + @ .incbin "baserom.gba", 0xD3CC0C, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_raticate_still_front_pic:: @ 8D3CC2C + .incbin "graphics/pokemon/front_pics/raticate_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xD3CC2C, 0x0390 + + .align 2 +gFile_graphics_pokemon_palettes_raticate_palette:: @ 8D3CFBC + .incbin "graphics/pokemon/palettes/raticate_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xD3CFBC, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_raticate_back_pic:: @ 8D3CFE4 + .incbin "graphics/pokemon/back_pics/raticate_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xD3CFE4, 0x0310 + + .align 2 +gFile_graphics_pokemon_palettes_raticate_shiny_palette:: @ 8D3D2F4 + .incbin "graphics/pokemon/palettes/raticate_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xD3D2F4, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_raticate_icon:: @ 8D3D31C + .incbin "graphics/pokemon/icons/raticate_icon.4bpp" + @ .incbin "baserom.gba", 0xD3D31C, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_raticate_footprint:: @ 8D3D71C + .incbin "graphics/pokemon/footprints/raticate_footprint.1bpp" + @ .incbin "baserom.gba", 0xD3D71C, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_spearow_still_front_pic:: @ 8D3D73C + .incbin "graphics/pokemon/front_pics/spearow_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xD3D73C, 0x02C0 + + .align 2 +gFile_graphics_pokemon_palettes_spearow_palette:: @ 8D3D9FC + .incbin "graphics/pokemon/palettes/spearow_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xD3D9FC, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_spearow_back_pic:: @ 8D3DA24 + .incbin "graphics/pokemon/back_pics/spearow_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xD3DA24, 0x02DC + + .align 2 +gFile_graphics_pokemon_palettes_spearow_shiny_palette:: @ 8D3DD00 + .incbin "graphics/pokemon/palettes/spearow_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xD3DD00, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_spearow_icon:: @ 8D3DD28 + .incbin "graphics/pokemon/icons/spearow_icon.4bpp" + @ .incbin "baserom.gba", 0xD3DD28, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_spearow_footprint:: @ 8D3E128 + .incbin "graphics/pokemon/footprints/spearow_footprint.1bpp" + @ .incbin "baserom.gba", 0xD3E128, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_fearow_still_front_pic:: @ 8D3E148 + .incbin "graphics/pokemon/front_pics/fearow_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xD3E148, 0x04BC + + .align 2 +gFile_graphics_pokemon_palettes_fearow_palette:: @ 8D3E604 + .incbin "graphics/pokemon/palettes/fearow_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xD3E604, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_fearow_back_pic:: @ 8D3E62C + .incbin "graphics/pokemon/back_pics/fearow_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xD3E62C, 0x02F8 + + .align 2 +gFile_graphics_pokemon_palettes_fearow_shiny_palette:: @ 8D3E924 + .incbin "graphics/pokemon/palettes/fearow_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xD3E924, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_fearow_icon:: @ 8D3E94C + .incbin "graphics/pokemon/icons/fearow_icon.4bpp" + @ .incbin "baserom.gba", 0xD3E94C, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_fearow_footprint:: @ 8D3ED4C + .incbin "graphics/pokemon/footprints/fearow_footprint.1bpp" + @ .incbin "baserom.gba", 0xD3ED4C, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_ekans_still_front_pic:: @ 8D3ED6C + .incbin "graphics/pokemon/front_pics/ekans_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xD3ED6C, 0x02C8 + + .align 2 +gFile_graphics_pokemon_palettes_ekans_palette:: @ 8D3F034 + .incbin "graphics/pokemon/palettes/ekans_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xD3F034, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_ekans_back_pic:: @ 8D3F05C + .incbin "graphics/pokemon/back_pics/ekans_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xD3F05C, 0x02F0 + + .align 2 +gFile_graphics_pokemon_palettes_ekans_shiny_palette:: @ 8D3F34C + .incbin "graphics/pokemon/palettes/ekans_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xD3F34C, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_ekans_icon:: @ 8D3F374 + .incbin "graphics/pokemon/icons/ekans_icon.4bpp" + @ .incbin "baserom.gba", 0xD3F374, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_ekans_footprint:: @ 8D3F774 + .incbin "graphics/pokemon/footprints/ekans_footprint.1bpp" + @ .incbin "baserom.gba", 0xD3F774, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_arbok_still_front_pic:: @ 8D3F794 + .incbin "graphics/pokemon/front_pics/arbok_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xD3F794, 0x0474 + + .align 2 +gFile_graphics_pokemon_palettes_arbok_palette:: @ 8D3FC08 + .incbin "graphics/pokemon/palettes/arbok_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xD3FC08, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_arbok_back_pic:: @ 8D3FC30 + .incbin "graphics/pokemon/back_pics/arbok_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xD3FC30, 0x0288 + + .align 2 +gFile_graphics_pokemon_palettes_arbok_shiny_palette:: @ 8D3FEB8 + .incbin "graphics/pokemon/palettes/arbok_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xD3FEB8, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_arbok_icon:: @ 8D3FEE0 + .incbin "graphics/pokemon/icons/arbok_icon.4bpp" + @ .incbin "baserom.gba", 0xD3FEE0, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_arbok_footprint:: @ 8D402E0 + .incbin "graphics/pokemon/footprints/arbok_footprint.1bpp" + @ .incbin "baserom.gba", 0xD402E0, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_pikachu_still_front_pic:: @ 8D40300 + .incbin "graphics/pokemon/front_pics/pikachu_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xD40300, 0x02D0 + + .align 2 +gFile_graphics_pokemon_palettes_pikachu_palette:: @ 8D405D0 + .incbin "graphics/pokemon/palettes/pikachu_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xD405D0, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_pikachu_back_pic:: @ 8D405F8 + .incbin "graphics/pokemon/back_pics/pikachu_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xD405F8, 0x02D8 + + .align 2 +gFile_graphics_pokemon_palettes_pikachu_shiny_palette:: @ 8D408D0 + .incbin "graphics/pokemon/palettes/pikachu_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xD408D0, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_pikachu_icon:: @ 8D408F8 + .incbin "graphics/pokemon/icons/pikachu_icon.4bpp" + @ .incbin "baserom.gba", 0xD408F8, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_pikachu_footprint:: @ 8D40CF8 + .incbin "graphics/pokemon/footprints/pikachu_footprint.1bpp" + @ .incbin "baserom.gba", 0xD40CF8, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_raichu_still_front_pic:: @ 8D40D18 + .incbin "graphics/pokemon/front_pics/raichu_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xD40D18, 0x03F8 + + .align 2 +gFile_graphics_pokemon_palettes_raichu_palette:: @ 8D41110 + .incbin "graphics/pokemon/palettes/raichu_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xD41110, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_raichu_back_pic:: @ 8D41138 + .incbin "graphics/pokemon/back_pics/raichu_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xD41138, 0x0320 + + .align 2 +gFile_graphics_pokemon_palettes_raichu_shiny_palette:: @ 8D41458 + .incbin "graphics/pokemon/palettes/raichu_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xD41458, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_raichu_icon:: @ 8D41480 + .incbin "graphics/pokemon/icons/raichu_icon.4bpp" + @ .incbin "baserom.gba", 0xD41480, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_raichu_footprint:: @ 8D41880 + .incbin "graphics/pokemon/footprints/raichu_footprint.1bpp" + @ .incbin "baserom.gba", 0xD41880, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_sandshrew_still_front_pic:: @ 8D418A0 + .incbin "graphics/pokemon/front_pics/sandshrew_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xD418A0, 0x02DC + + .align 2 +gFile_graphics_pokemon_palettes_sandshrew_palette:: @ 8D41B7C + .incbin "graphics/pokemon/palettes/sandshrew_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xD41B7C, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_sandshrew_back_pic:: @ 8D41BA4 + .incbin "graphics/pokemon/back_pics/sandshrew_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xD41BA4, 0x0328 + + .align 2 +gFile_graphics_pokemon_palettes_sandshrew_shiny_palette:: @ 8D41ECC + .incbin "graphics/pokemon/palettes/sandshrew_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xD41ECC, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_sandshrew_icon:: @ 8D41EF4 + .incbin "graphics/pokemon/icons/sandshrew_icon.4bpp" + @ .incbin "baserom.gba", 0xD41EF4, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_sandshrew_footprint:: @ 8D422F4 + .incbin "graphics/pokemon/footprints/sandshrew_footprint.1bpp" + @ .incbin "baserom.gba", 0xD422F4, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_sandslash_still_front_pic:: @ 8D42314 + .incbin "graphics/pokemon/front_pics/sandslash_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xD42314, 0x0418 + + .align 2 +gFile_graphics_pokemon_palettes_sandslash_palette:: @ 8D4272C + .incbin "graphics/pokemon/palettes/sandslash_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xD4272C, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_sandslash_back_pic:: @ 8D42754 + .incbin "graphics/pokemon/back_pics/sandslash_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xD42754, 0x041C + + .align 2 +gFile_graphics_pokemon_palettes_sandslash_shiny_palette:: @ 8D42B70 + .incbin "graphics/pokemon/palettes/sandslash_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xD42B70, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_sandslash_icon:: @ 8D42B98 + .incbin "graphics/pokemon/icons/sandslash_icon.4bpp" + @ .incbin "baserom.gba", 0xD42B98, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_sandslash_footprint:: @ 8D42F98 + .incbin "graphics/pokemon/footprints/sandslash_footprint.1bpp" + @ .incbin "baserom.gba", 0xD42F98, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_nidoran_f_still_front_pic:: @ 8D42FB8 + .incbin "graphics/pokemon/front_pics/nidoran_f_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xD42FB8, 0x0264 + + .align 2 +gFile_graphics_pokemon_palettes_nidoran_f_palette:: @ 8D4321C + .incbin "graphics/pokemon/palettes/nidoran_f_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xD4321C, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_nidoran_f_back_pic:: @ 8D43244 + .incbin "graphics/pokemon/back_pics/nidoran_f_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xD43244, 0x02E0 + + .align 2 +gFile_graphics_pokemon_palettes_nidoran_f_shiny_palette:: @ 8D43524 + .incbin "graphics/pokemon/palettes/nidoran_f_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xD43524, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_nidoran_f_icon:: @ 8D4354C + .incbin "graphics/pokemon/icons/nidoran_f_icon.4bpp" + @ .incbin "baserom.gba", 0xD4354C, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_nidoran_f_footprint:: @ 8D4394C + .incbin "graphics/pokemon/footprints/nidoran_f_footprint.1bpp" + @ .incbin "baserom.gba", 0xD4394C, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_nidorina_still_front_pic:: @ 8D4396C + .incbin "graphics/pokemon/front_pics/nidorina_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xD4396C, 0x0320 + + .align 2 +gFile_graphics_pokemon_palettes_nidorina_palette:: @ 8D43C8C + .incbin "graphics/pokemon/palettes/nidorina_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xD43C8C, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_nidorina_back_pic:: @ 8D43CB4 + .incbin "graphics/pokemon/back_pics/nidorina_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xD43CB4, 0x0394 + + .align 2 +gFile_graphics_pokemon_palettes_nidorina_shiny_palette:: @ 8D44048 + .incbin "graphics/pokemon/palettes/nidorina_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xD44048, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_nidorina_icon:: @ 8D44070 + .incbin "graphics/pokemon/icons/nidorina_icon.4bpp" + @ .incbin "baserom.gba", 0xD44070, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_nidorina_footprint:: @ 8D44470 + .incbin "graphics/pokemon/footprints/nidorina_footprint.1bpp" + @ .incbin "baserom.gba", 0xD44470, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_nidoqueen_still_front_pic:: @ 8D44490 + .incbin "graphics/pokemon/front_pics/nidoqueen_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xD44490, 0x042C + + .align 2 +gFile_graphics_pokemon_palettes_nidoqueen_palette:: @ 8D448BC + .incbin "graphics/pokemon/palettes/nidoqueen_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xD448BC, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_nidoqueen_back_pic:: @ 8D448E4 + .incbin "graphics/pokemon/back_pics/nidoqueen_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xD448E4, 0x03C4 + + .align 2 +gFile_graphics_pokemon_palettes_nidoqueen_shiny_palette:: @ 8D44CA8 + .incbin "graphics/pokemon/palettes/nidoqueen_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xD44CA8, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_nidoqueen_icon:: @ 8D44CD0 + .incbin "graphics/pokemon/icons/nidoqueen_icon.4bpp" + @ .incbin "baserom.gba", 0xD44CD0, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_nidoqueen_footprint:: @ 8D450D0 + .incbin "graphics/pokemon/footprints/nidoqueen_footprint.1bpp" + @ .incbin "baserom.gba", 0xD450D0, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_nidoran_m_still_front_pic:: @ 8D450F0 + .incbin "graphics/pokemon/front_pics/nidoran_m_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xD450F0, 0x028C + + .align 2 +gFile_graphics_pokemon_palettes_nidoran_m_palette:: @ 8D4537C + .incbin "graphics/pokemon/palettes/nidoran_m_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xD4537C, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_nidoran_m_back_pic:: @ 8D453A4 + .incbin "graphics/pokemon/back_pics/nidoran_m_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xD453A4, 0x0334 + + .align 2 +gFile_graphics_pokemon_palettes_nidoran_m_shiny_palette:: @ 8D456D8 + .incbin "graphics/pokemon/palettes/nidoran_m_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xD456D8, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_nidoran_m_icon:: @ 8D45700 + .incbin "graphics/pokemon/icons/nidoran_m_icon.4bpp" + @ .incbin "baserom.gba", 0xD45700, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_nidoran_m_footprint:: @ 8D45B00 + .incbin "graphics/pokemon/footprints/nidoran_m_footprint.1bpp" + @ .incbin "baserom.gba", 0xD45B00, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_nidorino_still_front_pic:: @ 8D45B20 + .incbin "graphics/pokemon/front_pics/nidorino_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xD45B20, 0x0384 + + .align 2 +gFile_graphics_pokemon_palettes_nidorino_palette:: @ 8D45EA4 + .incbin "graphics/pokemon/palettes/nidorino_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xD45EA4, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_nidorino_back_pic:: @ 8D45ECC + .incbin "graphics/pokemon/back_pics/nidorino_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xD45ECC, 0x03BC + + .align 2 +gFile_graphics_pokemon_palettes_nidorino_shiny_palette:: @ 8D46288 + .incbin "graphics/pokemon/palettes/nidorino_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xD46288, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_nidorino_icon:: @ 8D462B0 + .incbin "graphics/pokemon/icons/nidorino_icon.4bpp" + @ .incbin "baserom.gba", 0xD462B0, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_nidorino_footprint:: @ 8D466B0 + .incbin "graphics/pokemon/footprints/nidorino_footprint.1bpp" + @ .incbin "baserom.gba", 0xD466B0, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_nidoking_still_front_pic:: @ 8D466D0 + .incbin "graphics/pokemon/front_pics/nidoking_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xD466D0, 0x053C + + .align 2 +gFile_graphics_pokemon_palettes_nidoking_palette:: @ 8D46C0C + .incbin "graphics/pokemon/palettes/nidoking_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xD46C0C, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_nidoking_back_pic:: @ 8D46C34 + .incbin "graphics/pokemon/back_pics/nidoking_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xD46C34, 0x043C + + .align 2 +gFile_graphics_pokemon_palettes_nidoking_shiny_palette:: @ 8D47070 + .incbin "graphics/pokemon/palettes/nidoking_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xD47070, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_nidoking_icon:: @ 8D47098 + .incbin "graphics/pokemon/icons/nidoking_icon.4bpp" + @ .incbin "baserom.gba", 0xD47098, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_nidoking_footprint:: @ 8D47498 + .incbin "graphics/pokemon/footprints/nidoking_footprint.1bpp" + @ .incbin "baserom.gba", 0xD47498, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_clefairy_still_front_pic:: @ 8D474B8 + .incbin "graphics/pokemon/front_pics/clefairy_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xD474B8, 0x029C + + .align 2 +gFile_graphics_pokemon_palettes_clefairy_palette:: @ 8D47754 + .incbin "graphics/pokemon/palettes/clefairy_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xD47754, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_clefairy_back_pic:: @ 8D4777C + .incbin "graphics/pokemon/back_pics/clefairy_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xD4777C, 0x02D0 + + .align 2 +gFile_graphics_pokemon_palettes_clefairy_shiny_palette:: @ 8D47A4C + .incbin "graphics/pokemon/palettes/clefairy_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xD47A4C, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_clefairy_icon:: @ 8D47A74 + .incbin "graphics/pokemon/icons/clefairy_icon.4bpp" + @ .incbin "baserom.gba", 0xD47A74, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_clefairy_footprint:: @ 8D47E74 + .incbin "graphics/pokemon/footprints/clefairy_footprint.1bpp" + @ .incbin "baserom.gba", 0xD47E74, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_clefable_still_front_pic:: @ 8D47E94 + .incbin "graphics/pokemon/front_pics/clefable_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xD47E94, 0x0340 + + .align 2 +gFile_graphics_pokemon_palettes_clefable_palette:: @ 8D481D4 + .incbin "graphics/pokemon/palettes/clefable_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xD481D4, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_clefable_back_pic:: @ 8D481FC + .incbin "graphics/pokemon/back_pics/clefable_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xD481FC, 0x0338 + + .align 2 +gFile_graphics_pokemon_palettes_clefable_shiny_palette:: @ 8D48534 + .incbin "graphics/pokemon/palettes/clefable_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xD48534, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_clefable_icon:: @ 8D4855C + .incbin "graphics/pokemon/icons/clefable_icon.4bpp" + @ .incbin "baserom.gba", 0xD4855C, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_clefable_footprint:: @ 8D4895C + .incbin "graphics/pokemon/footprints/clefable_footprint.1bpp" + @ .incbin "baserom.gba", 0xD4895C, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_vulpix_still_front_pic:: @ 8D4897C + .incbin "graphics/pokemon/front_pics/vulpix_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xD4897C, 0x032C + + .align 2 +gFile_graphics_pokemon_palettes_vulpix_palette:: @ 8D48CA8 + .incbin "graphics/pokemon/palettes/vulpix_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xD48CA8, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_vulpix_back_pic:: @ 8D48CD0 + .incbin "graphics/pokemon/back_pics/vulpix_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xD48CD0, 0x0304 + + .align 2 +gFile_graphics_pokemon_palettes_vulpix_shiny_palette:: @ 8D48FD4 + .incbin "graphics/pokemon/palettes/vulpix_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xD48FD4, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_vulpix_icon:: @ 8D48FFC + .incbin "graphics/pokemon/icons/vulpix_icon.4bpp" + @ .incbin "baserom.gba", 0xD48FFC, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_vulpix_footprint:: @ 8D493FC + .incbin "graphics/pokemon/footprints/vulpix_footprint.1bpp" + @ .incbin "baserom.gba", 0xD493FC, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_ninetales_still_front_pic:: @ 8D4941C + .incbin "graphics/pokemon/front_pics/ninetales_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xD4941C, 0x0454 + + .align 2 +gFile_graphics_pokemon_palettes_ninetales_palette:: @ 8D49870 + .incbin "graphics/pokemon/palettes/ninetales_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xD49870, 0x0024 + + .align 2 +gFile_graphics_pokemon_back_pics_ninetales_back_pic:: @ 8D49894 + .incbin "graphics/pokemon/back_pics/ninetales_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xD49894, 0x03F0 + + .align 2 +gFile_graphics_pokemon_palettes_ninetales_shiny_palette:: @ 8D49C84 + .incbin "graphics/pokemon/palettes/ninetales_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xD49C84, 0x0024 + + .align 2 +gFile_graphics_pokemon_icons_ninetales_icon:: @ 8D49CA8 + .incbin "graphics/pokemon/icons/ninetales_icon.4bpp" + @ .incbin "baserom.gba", 0xD49CA8, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_ninetales_footprint:: @ 8D4A0A8 + .incbin "graphics/pokemon/footprints/ninetales_footprint.1bpp" + @ .incbin "baserom.gba", 0xD4A0A8, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_jigglypuff_still_front_pic:: @ 8D4A0C8 + .incbin "graphics/pokemon/front_pics/jigglypuff_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xD4A0C8, 0x0284 + + .align 2 +gFile_graphics_pokemon_palettes_jigglypuff_palette:: @ 8D4A34C + .incbin "graphics/pokemon/palettes/jigglypuff_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xD4A34C, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_jigglypuff_back_pic:: @ 8D4A374 + .incbin "graphics/pokemon/back_pics/jigglypuff_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xD4A374, 0x025C + + .align 2 +gFile_graphics_pokemon_palettes_jigglypuff_shiny_palette:: @ 8D4A5D0 + .incbin "graphics/pokemon/palettes/jigglypuff_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xD4A5D0, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_jigglypuff_icon:: @ 8D4A5F8 + .incbin "graphics/pokemon/icons/jigglypuff_icon.4bpp" + @ .incbin "baserom.gba", 0xD4A5F8, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_jigglypuff_footprint:: @ 8D4A9F8 + .incbin "graphics/pokemon/footprints/jigglypuff_footprint.1bpp" + @ .incbin "baserom.gba", 0xD4A9F8, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_wigglytuff_still_front_pic:: @ 8D4AA18 + .incbin "graphics/pokemon/front_pics/wigglytuff_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xD4AA18, 0x0374 + + .align 2 +gFile_graphics_pokemon_palettes_wigglytuff_palette:: @ 8D4AD8C + .incbin "graphics/pokemon/palettes/wigglytuff_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xD4AD8C, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_wigglytuff_back_pic:: @ 8D4ADB4 + .incbin "graphics/pokemon/back_pics/wigglytuff_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xD4ADB4, 0x0298 + + .align 2 +gFile_graphics_pokemon_palettes_wigglytuff_shiny_palette:: @ 8D4B04C + .incbin "graphics/pokemon/palettes/wigglytuff_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xD4B04C, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_wigglytuff_icon:: @ 8D4B074 + .incbin "graphics/pokemon/icons/wigglytuff_icon.4bpp" + @ .incbin "baserom.gba", 0xD4B074, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_wigglytuff_footprint:: @ 8D4B474 + .incbin "graphics/pokemon/footprints/wigglytuff_footprint.1bpp" + @ .incbin "baserom.gba", 0xD4B474, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_zubat_still_front_pic:: @ 8D4B494 + .incbin "graphics/pokemon/front_pics/zubat_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xD4B494, 0x02BC + + .align 2 +gFile_graphics_pokemon_palettes_zubat_palette:: @ 8D4B750 + .incbin "graphics/pokemon/palettes/zubat_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xD4B750, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_zubat_back_pic:: @ 8D4B778 + .incbin "graphics/pokemon/back_pics/zubat_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xD4B778, 0x02BC + + .align 2 +gFile_graphics_pokemon_palettes_zubat_shiny_palette:: @ 8D4BA34 + .incbin "graphics/pokemon/palettes/zubat_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xD4BA34, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_zubat_icon:: @ 8D4BA5C + .incbin "graphics/pokemon/icons/zubat_icon.4bpp" + @ .incbin "baserom.gba", 0xD4BA5C, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_zubat_footprint:: @ 8D4BE5C + .incbin "graphics/pokemon/footprints/zubat_footprint.1bpp" + @ .incbin "baserom.gba", 0xD4BE5C, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_golbat_still_front_pic:: @ 8D4BE7C + .incbin "graphics/pokemon/front_pics/golbat_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xD4BE7C, 0x03A0 + + .align 2 +gFile_graphics_pokemon_palettes_golbat_palette:: @ 8D4C21C + .incbin "graphics/pokemon/palettes/golbat_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xD4C21C, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_golbat_back_pic:: @ 8D4C244 + .incbin "graphics/pokemon/back_pics/golbat_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xD4C244, 0x02BC + + .align 2 +gFile_graphics_pokemon_palettes_golbat_shiny_palette:: @ 8D4C500 + .incbin "graphics/pokemon/palettes/golbat_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xD4C500, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_golbat_icon:: @ 8D4C528 + .incbin "graphics/pokemon/icons/golbat_icon.4bpp" + @ .incbin "baserom.gba", 0xD4C528, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_golbat_footprint:: @ 8D4C928 + .incbin "graphics/pokemon/footprints/golbat_footprint.1bpp" + @ .incbin "baserom.gba", 0xD4C928, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_oddish_still_front_pic:: @ 8D4C948 + .incbin "graphics/pokemon/front_pics/oddish_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xD4C948, 0x0240 + + .align 2 +gFile_graphics_pokemon_palettes_oddish_palette:: @ 8D4CB88 + .incbin "graphics/pokemon/palettes/oddish_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xD4CB88, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_oddish_back_pic:: @ 8D4CBB0 + .incbin "graphics/pokemon/back_pics/oddish_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xD4CBB0, 0x02C4 + + .align 2 +gFile_graphics_pokemon_palettes_oddish_shiny_palette:: @ 8D4CE74 + .incbin "graphics/pokemon/palettes/oddish_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xD4CE74, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_oddish_icon:: @ 8D4CE9C + .incbin "graphics/pokemon/icons/oddish_icon.4bpp" + @ .incbin "baserom.gba", 0xD4CE9C, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_oddish_footprint:: @ 8D4D29C + .incbin "graphics/pokemon/footprints/oddish_footprint.1bpp" + @ .incbin "baserom.gba", 0xD4D29C, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_gloom_still_front_pic:: @ 8D4D2BC + .incbin "graphics/pokemon/front_pics/gloom_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xD4D2BC, 0x0368 + + .align 2 +gFile_graphics_pokemon_palettes_gloom_palette:: @ 8D4D624 + .incbin "graphics/pokemon/palettes/gloom_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xD4D624, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_gloom_back_pic:: @ 8D4D64C + .incbin "graphics/pokemon/back_pics/gloom_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xD4D64C, 0x0380 + + .align 2 +gFile_graphics_pokemon_palettes_gloom_shiny_palette:: @ 8D4D9CC + .incbin "graphics/pokemon/palettes/gloom_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xD4D9CC, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_gloom_icon:: @ 8D4D9F4 + .incbin "graphics/pokemon/icons/gloom_icon.4bpp" + @ .incbin "baserom.gba", 0xD4D9F4, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_gloom_footprint:: @ 8D4DDF4 + .incbin "graphics/pokemon/footprints/gloom_footprint.1bpp" + @ .incbin "baserom.gba", 0xD4DDF4, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_vileplume_still_front_pic:: @ 8D4DE14 + .incbin "graphics/pokemon/front_pics/vileplume_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xD4DE14, 0x0354 + + .align 2 +gFile_graphics_pokemon_palettes_vileplume_palette:: @ 8D4E168 + .incbin "graphics/pokemon/palettes/vileplume_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xD4E168, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_vileplume_back_pic:: @ 8D4E190 + .incbin "graphics/pokemon/back_pics/vileplume_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xD4E190, 0x044C + + .align 2 +gFile_graphics_pokemon_palettes_vileplume_shiny_palette:: @ 8D4E5DC + .incbin "graphics/pokemon/palettes/vileplume_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xD4E5DC, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_vileplume_icon:: @ 8D4E604 + .incbin "graphics/pokemon/icons/vileplume_icon.4bpp" + @ .incbin "baserom.gba", 0xD4E604, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_vileplume_footprint:: @ 8D4EA04 + .incbin "graphics/pokemon/footprints/vileplume_footprint.1bpp" + @ .incbin "baserom.gba", 0xD4EA04, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_paras_still_front_pic:: @ 8D4EA24 + .incbin "graphics/pokemon/front_pics/paras_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xD4EA24, 0x026C + + .align 2 +gFile_graphics_pokemon_palettes_paras_palette:: @ 8D4EC90 + .incbin "graphics/pokemon/palettes/paras_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xD4EC90, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_paras_back_pic:: @ 8D4ECB8 + .incbin "graphics/pokemon/back_pics/paras_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xD4ECB8, 0x02A0 + + .align 2 +gFile_graphics_pokemon_palettes_paras_shiny_palette:: @ 8D4EF58 + .incbin "graphics/pokemon/palettes/paras_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xD4EF58, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_paras_icon:: @ 8D4EF80 + .incbin "graphics/pokemon/icons/paras_icon.4bpp" + @ .incbin "baserom.gba", 0xD4EF80, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_paras_footprint:: @ 8D4F380 + .incbin "graphics/pokemon/footprints/paras_footprint.1bpp" + @ .incbin "baserom.gba", 0xD4F380, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_parasect_still_front_pic:: @ 8D4F3A0 + .incbin "graphics/pokemon/front_pics/parasect_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xD4F3A0, 0x0390 + + .align 2 +gFile_graphics_pokemon_palettes_parasect_palette:: @ 8D4F730 + .incbin "graphics/pokemon/palettes/parasect_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xD4F730, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_parasect_back_pic:: @ 8D4F758 + .incbin "graphics/pokemon/back_pics/parasect_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xD4F758, 0x02FC + + .align 2 +gFile_graphics_pokemon_palettes_parasect_shiny_palette:: @ 8D4FA54 + .incbin "graphics/pokemon/palettes/parasect_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xD4FA54, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_parasect_icon:: @ 8D4FA7C + .incbin "graphics/pokemon/icons/parasect_icon.4bpp" + @ .incbin "baserom.gba", 0xD4FA7C, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_parasect_footprint:: @ 8D4FE7C + .incbin "graphics/pokemon/footprints/parasect_footprint.1bpp" + @ .incbin "baserom.gba", 0xD4FE7C, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_venonat_still_front_pic:: @ 8D4FE9C + .incbin "graphics/pokemon/front_pics/venonat_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xD4FE9C, 0x0320 + + .align 2 +gFile_graphics_pokemon_palettes_venonat_palette:: @ 8D501BC + .incbin "graphics/pokemon/palettes/venonat_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xD501BC, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_venonat_back_pic:: @ 8D501E4 + .incbin "graphics/pokemon/back_pics/venonat_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xD501E4, 0x0330 + + .align 2 +gFile_graphics_pokemon_palettes_venonat_shiny_palette:: @ 8D50514 + .incbin "graphics/pokemon/palettes/venonat_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xD50514, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_venonat_icon:: @ 8D5053C + .incbin "graphics/pokemon/icons/venonat_icon.4bpp" + @ .incbin "baserom.gba", 0xD5053C, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_venonat_footprint:: @ 8D5093C + .incbin "graphics/pokemon/footprints/venonat_footprint.1bpp" + @ .incbin "baserom.gba", 0xD5093C, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_venomoth_still_front_pic:: @ 8D5095C + .incbin "graphics/pokemon/front_pics/venomoth_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xD5095C, 0x0404 + + .align 2 +gFile_graphics_pokemon_palettes_venomoth_palette:: @ 8D50D60 + .incbin "graphics/pokemon/palettes/venomoth_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xD50D60, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_venomoth_back_pic:: @ 8D50D88 + .incbin "graphics/pokemon/back_pics/venomoth_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xD50D88, 0x03A4 + + .align 2 +gFile_graphics_pokemon_palettes_venomoth_shiny_palette:: @ 8D5112C + .incbin "graphics/pokemon/palettes/venomoth_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xD5112C, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_venomoth_icon:: @ 8D51154 + .incbin "graphics/pokemon/icons/venomoth_icon.4bpp" + @ .incbin "baserom.gba", 0xD51154, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_venomoth_footprint:: @ 8D51554 + .incbin "graphics/pokemon/footprints/venomoth_footprint.1bpp" + @ .incbin "baserom.gba", 0xD51554, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_diglett_still_front_pic:: @ 8D51574 + .incbin "graphics/pokemon/front_pics/diglett_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xD51574, 0x0210 + + .align 2 +gFile_graphics_pokemon_palettes_diglett_palette:: @ 8D51784 + .incbin "graphics/pokemon/palettes/diglett_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xD51784, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_diglett_back_pic:: @ 8D517AC + .incbin "graphics/pokemon/back_pics/diglett_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xD517AC, 0x020C + + .align 2 +gFile_graphics_pokemon_palettes_diglett_shiny_palette:: @ 8D519B8 + .incbin "graphics/pokemon/palettes/diglett_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xD519B8, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_diglett_icon:: @ 8D519E0 + .incbin "graphics/pokemon/icons/diglett_icon.4bpp" + @ .incbin "baserom.gba", 0xD519E0, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_diglett_footprint:: @ 8D51DE0 + .incbin "graphics/pokemon/footprints/diglett_footprint.1bpp" + @ .incbin "baserom.gba", 0xD51DE0, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_dugtrio_still_front_pic:: @ 8D51E00 + .incbin "graphics/pokemon/front_pics/dugtrio_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xD51E00, 0x032C + + .align 2 +gFile_graphics_pokemon_palettes_dugtrio_palette:: @ 8D5212C + .incbin "graphics/pokemon/palettes/dugtrio_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xD5212C, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_dugtrio_back_pic:: @ 8D52154 + .incbin "graphics/pokemon/back_pics/dugtrio_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xD52154, 0x02AC + + .align 2 +gFile_graphics_pokemon_palettes_dugtrio_shiny_palette:: @ 8D52400 + .incbin "graphics/pokemon/palettes/dugtrio_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xD52400, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_dugtrio_icon:: @ 8D52428 + .incbin "graphics/pokemon/icons/dugtrio_icon.4bpp" + @ .incbin "baserom.gba", 0xD52428, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_dugtrio_footprint:: @ 8D52828 + .incbin "graphics/pokemon/footprints/dugtrio_footprint.1bpp" + @ .incbin "baserom.gba", 0xD52828, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_meowth_still_front_pic:: @ 8D52848 + .incbin "graphics/pokemon/front_pics/meowth_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xD52848, 0x02EC + + .align 2 +gFile_graphics_pokemon_palettes_meowth_palette:: @ 8D52B34 + .incbin "graphics/pokemon/palettes/meowth_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xD52B34, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_meowth_back_pic:: @ 8D52B5C + .incbin "graphics/pokemon/back_pics/meowth_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xD52B5C, 0x02E4 + + .align 2 +gFile_graphics_pokemon_palettes_meowth_shiny_palette:: @ 8D52E40 + .incbin "graphics/pokemon/palettes/meowth_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xD52E40, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_meowth_icon:: @ 8D52E68 + .incbin "graphics/pokemon/icons/meowth_icon.4bpp" + @ .incbin "baserom.gba", 0xD52E68, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_meowth_footprint:: @ 8D53268 + .incbin "graphics/pokemon/footprints/meowth_footprint.1bpp" + @ .incbin "baserom.gba", 0xD53268, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_persian_still_front_pic:: @ 8D53288 + .incbin "graphics/pokemon/front_pics/persian_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xD53288, 0x0378 + + .align 2 +gFile_graphics_pokemon_palettes_persian_palette:: @ 8D53600 + .incbin "graphics/pokemon/palettes/persian_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xD53600, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_persian_back_pic:: @ 8D53628 + .incbin "graphics/pokemon/back_pics/persian_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xD53628, 0x0340 + + .align 2 +gFile_graphics_pokemon_palettes_persian_shiny_palette:: @ 8D53968 + .incbin "graphics/pokemon/palettes/persian_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xD53968, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_persian_icon:: @ 8D53990 + .incbin "graphics/pokemon/icons/persian_icon.4bpp" + @ .incbin "baserom.gba", 0xD53990, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_persian_footprint:: @ 8D53D90 + .incbin "graphics/pokemon/footprints/persian_footprint.1bpp" + @ .incbin "baserom.gba", 0xD53D90, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_psyduck_still_front_pic:: @ 8D53DB0 + .incbin "graphics/pokemon/front_pics/psyduck_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xD53DB0, 0x02E4 + + .align 2 +gFile_graphics_pokemon_palettes_psyduck_palette:: @ 8D54094 + .incbin "graphics/pokemon/palettes/psyduck_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xD54094, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_psyduck_back_pic:: @ 8D540BC + .incbin "graphics/pokemon/back_pics/psyduck_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xD540BC, 0x029C + + .align 2 +gFile_graphics_pokemon_palettes_psyduck_shiny_palette:: @ 8D54358 + .incbin "graphics/pokemon/palettes/psyduck_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xD54358, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_psyduck_icon:: @ 8D54380 + .incbin "graphics/pokemon/icons/psyduck_icon.4bpp" + @ .incbin "baserom.gba", 0xD54380, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_psyduck_footprint:: @ 8D54780 + .incbin "graphics/pokemon/footprints/psyduck_footprint.1bpp" + @ .incbin "baserom.gba", 0xD54780, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_golduck_still_front_pic:: @ 8D547A0 + .incbin "graphics/pokemon/front_pics/golduck_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xD547A0, 0x03B8 + + .align 2 +gFile_graphics_pokemon_palettes_golduck_palette:: @ 8D54B58 + .incbin "graphics/pokemon/palettes/golduck_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xD54B58, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_golduck_back_pic:: @ 8D54B80 + .incbin "graphics/pokemon/back_pics/golduck_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xD54B80, 0x032C + + .align 2 +gFile_graphics_pokemon_palettes_golduck_shiny_palette:: @ 8D54EAC + .incbin "graphics/pokemon/palettes/golduck_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xD54EAC, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_golduck_icon:: @ 8D54ED4 + .incbin "graphics/pokemon/icons/golduck_icon.4bpp" + @ .incbin "baserom.gba", 0xD54ED4, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_golduck_footprint:: @ 8D552D4 + .incbin "graphics/pokemon/footprints/golduck_footprint.1bpp" + @ .incbin "baserom.gba", 0xD552D4, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_mankey_still_front_pic:: @ 8D552F4 + .incbin "graphics/pokemon/front_pics/mankey_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xD552F4, 0x02F8 + + .align 2 +gFile_graphics_pokemon_palettes_mankey_palette:: @ 8D555EC + .incbin "graphics/pokemon/palettes/mankey_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xD555EC, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_mankey_back_pic:: @ 8D55614 + .incbin "graphics/pokemon/back_pics/mankey_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xD55614, 0x0368 + + .align 2 +gFile_graphics_pokemon_palettes_mankey_shiny_palette:: @ 8D5597C + .incbin "graphics/pokemon/palettes/mankey_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xD5597C, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_mankey_icon:: @ 8D559A4 + .incbin "graphics/pokemon/icons/mankey_icon.4bpp" + @ .incbin "baserom.gba", 0xD559A4, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_mankey_footprint:: @ 8D55DA4 + .incbin "graphics/pokemon/footprints/mankey_footprint.1bpp" + @ .incbin "baserom.gba", 0xD55DA4, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_primeape_still_front_pic:: @ 8D55DC4 + .incbin "graphics/pokemon/front_pics/primeape_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xD55DC4, 0x038C + + .align 2 +gFile_graphics_pokemon_palettes_primeape_palette:: @ 8D56150 + .incbin "graphics/pokemon/palettes/primeape_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xD56150, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_primeape_back_pic:: @ 8D56178 + .incbin "graphics/pokemon/back_pics/primeape_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xD56178, 0x0370 + + .align 2 +gFile_graphics_pokemon_palettes_primeape_shiny_palette:: @ 8D564E8 + .incbin "graphics/pokemon/palettes/primeape_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xD564E8, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_primeape_icon:: @ 8D56510 + .incbin "graphics/pokemon/icons/primeape_icon.4bpp" + @ .incbin "baserom.gba", 0xD56510, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_primeape_footprint:: @ 8D56910 + .incbin "graphics/pokemon/footprints/primeape_footprint.1bpp" + @ .incbin "baserom.gba", 0xD56910, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_growlithe_still_front_pic:: @ 8D56930 + .incbin "graphics/pokemon/front_pics/growlithe_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xD56930, 0x0328 + + .align 2 +gFile_graphics_pokemon_palettes_growlithe_palette:: @ 8D56C58 + .incbin "graphics/pokemon/palettes/growlithe_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xD56C58, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_growlithe_back_pic:: @ 8D56C80 + .incbin "graphics/pokemon/back_pics/growlithe_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xD56C80, 0x033C + + .align 2 +gFile_graphics_pokemon_palettes_growlithe_shiny_palette:: @ 8D56FBC + .incbin "graphics/pokemon/palettes/growlithe_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xD56FBC, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_growlithe_icon:: @ 8D56FE4 + .incbin "graphics/pokemon/icons/growlithe_icon.4bpp" + @ .incbin "baserom.gba", 0xD56FE4, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_growlithe_footprint:: @ 8D573E4 + .incbin "graphics/pokemon/footprints/growlithe_footprint.1bpp" + @ .incbin "baserom.gba", 0xD573E4, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_arcanine_still_front_pic:: @ 8D57404 + .incbin "graphics/pokemon/front_pics/arcanine_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xD57404, 0x04FC + + .align 2 +gFile_graphics_pokemon_palettes_arcanine_palette:: @ 8D57900 + .incbin "graphics/pokemon/palettes/arcanine_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xD57900, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_arcanine_back_pic:: @ 8D57928 + .incbin "graphics/pokemon/back_pics/arcanine_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xD57928, 0x03E0 + + .align 2 +gFile_graphics_pokemon_palettes_arcanine_shiny_palette:: @ 8D57D08 + .incbin "graphics/pokemon/palettes/arcanine_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xD57D08, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_arcanine_icon:: @ 8D57D30 + .incbin "graphics/pokemon/icons/arcanine_icon.4bpp" + @ .incbin "baserom.gba", 0xD57D30, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_arcanine_footprint:: @ 8D58130 + .incbin "graphics/pokemon/footprints/arcanine_footprint.1bpp" + @ .incbin "baserom.gba", 0xD58130, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_poliwag_still_front_pic:: @ 8D58150 + .incbin "graphics/pokemon/front_pics/poliwag_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xD58150, 0x029C + + .align 2 +gFile_graphics_pokemon_palettes_poliwag_palette:: @ 8D583EC + .incbin "graphics/pokemon/palettes/poliwag_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xD583EC, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_poliwag_back_pic:: @ 8D58414 + .incbin "graphics/pokemon/back_pics/poliwag_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xD58414, 0x0264 + + .align 2 +gFile_graphics_pokemon_palettes_poliwag_shiny_palette:: @ 8D58678 + .incbin "graphics/pokemon/palettes/poliwag_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xD58678, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_poliwag_icon:: @ 8D586A0 + .incbin "graphics/pokemon/icons/poliwag_icon.4bpp" + @ .incbin "baserom.gba", 0xD586A0, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_poliwag_footprint:: @ 8D58AA0 + .incbin "graphics/pokemon/footprints/poliwag_footprint.1bpp" + @ .incbin "baserom.gba", 0xD58AA0, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_poliwhirl_still_front_pic:: @ 8D58AC0 + .incbin "graphics/pokemon/front_pics/poliwhirl_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xD58AC0, 0x0380 + + .align 2 +gFile_graphics_pokemon_palettes_poliwhirl_palette:: @ 8D58E40 + .incbin "graphics/pokemon/palettes/poliwhirl_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xD58E40, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_poliwhirl_back_pic:: @ 8D58E68 + .incbin "graphics/pokemon/back_pics/poliwhirl_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xD58E68, 0x027C + + .align 2 +gFile_graphics_pokemon_palettes_poliwhirl_shiny_palette:: @ 8D590E4 + .incbin "graphics/pokemon/palettes/poliwhirl_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xD590E4, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_poliwhirl_icon:: @ 8D5910C + .incbin "graphics/pokemon/icons/poliwhirl_icon.4bpp" + @ .incbin "baserom.gba", 0xD5910C, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_poliwhirl_footprint:: @ 8D5950C + .incbin "graphics/pokemon/footprints/poliwhirl_footprint.1bpp" + @ .incbin "baserom.gba", 0xD5950C, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_poliwrath_still_front_pic:: @ 8D5952C + .incbin "graphics/pokemon/front_pics/poliwrath_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xD5952C, 0x03C4 + + .align 2 +gFile_graphics_pokemon_palettes_poliwrath_palette:: @ 8D598F0 + .incbin "graphics/pokemon/palettes/poliwrath_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xD598F0, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_poliwrath_back_pic:: @ 8D59918 + .incbin "graphics/pokemon/back_pics/poliwrath_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xD59918, 0x02F4 + + .align 2 +gFile_graphics_pokemon_palettes_poliwrath_shiny_palette:: @ 8D59C0C + .incbin "graphics/pokemon/palettes/poliwrath_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xD59C0C, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_poliwrath_icon:: @ 8D59C34 + .incbin "graphics/pokemon/icons/poliwrath_icon.4bpp" + @ .incbin "baserom.gba", 0xD59C34, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_poliwrath_footprint:: @ 8D5A034 + .incbin "graphics/pokemon/footprints/poliwrath_footprint.1bpp" + @ .incbin "baserom.gba", 0xD5A034, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_abra_still_front_pic:: @ 8D5A054 + .incbin "graphics/pokemon/front_pics/abra_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xD5A054, 0x02D4 + + .align 2 +gFile_graphics_pokemon_palettes_abra_palette:: @ 8D5A328 + .incbin "graphics/pokemon/palettes/abra_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xD5A328, 0x0024 + + .align 2 +gFile_graphics_pokemon_back_pics_abra_back_pic:: @ 8D5A34C + .incbin "graphics/pokemon/back_pics/abra_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xD5A34C, 0x02D4 + + .align 2 +gFile_graphics_pokemon_palettes_abra_shiny_palette:: @ 8D5A620 + .incbin "graphics/pokemon/palettes/abra_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xD5A620, 0x0024 + + .align 2 +gFile_graphics_pokemon_icons_abra_icon:: @ 8D5A644 + .incbin "graphics/pokemon/icons/abra_icon.4bpp" + @ .incbin "baserom.gba", 0xD5A644, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_abra_footprint:: @ 8D5AA44 + .incbin "graphics/pokemon/footprints/abra_footprint.1bpp" + @ .incbin "baserom.gba", 0xD5AA44, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_kadabra_still_front_pic:: @ 8D5AA64 + .incbin "graphics/pokemon/front_pics/kadabra_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xD5AA64, 0x04C8 + + .align 2 +gFile_graphics_pokemon_palettes_kadabra_palette:: @ 8D5AF2C + .incbin "graphics/pokemon/palettes/kadabra_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xD5AF2C, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_kadabra_back_pic:: @ 8D5AF54 + .incbin "graphics/pokemon/back_pics/kadabra_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xD5AF54, 0x03AC + + .align 2 +gFile_graphics_pokemon_palettes_kadabra_shiny_palette:: @ 8D5B300 + .incbin "graphics/pokemon/palettes/kadabra_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xD5B300, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_kadabra_icon:: @ 8D5B328 + .incbin "graphics/pokemon/icons/kadabra_icon.4bpp" + @ .incbin "baserom.gba", 0xD5B328, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_kadabra_footprint:: @ 8D5B728 + .incbin "graphics/pokemon/footprints/kadabra_footprint.1bpp" + @ .incbin "baserom.gba", 0xD5B728, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_alakazam_still_front_pic:: @ 8D5B748 + .incbin "graphics/pokemon/front_pics/alakazam_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xD5B748, 0x0498 + + .align 2 +gFile_graphics_pokemon_palettes_alakazam_palette:: @ 8D5BBE0 + .incbin "graphics/pokemon/palettes/alakazam_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xD5BBE0, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_alakazam_back_pic:: @ 8D5BC08 + .incbin "graphics/pokemon/back_pics/alakazam_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xD5BC08, 0x0380 + + .align 2 +gFile_graphics_pokemon_palettes_alakazam_shiny_palette:: @ 8D5BF88 + .incbin "graphics/pokemon/palettes/alakazam_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xD5BF88, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_alakazam_icon:: @ 8D5BFB0 + .incbin "graphics/pokemon/icons/alakazam_icon.4bpp" + @ .incbin "baserom.gba", 0xD5BFB0, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_alakazam_footprint:: @ 8D5C3B0 + .incbin "graphics/pokemon/footprints/alakazam_footprint.1bpp" + @ .incbin "baserom.gba", 0xD5C3B0, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_machop_still_front_pic:: @ 8D5C3D0 + .incbin "graphics/pokemon/front_pics/machop_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xD5C3D0, 0x028C + + .align 2 +gFile_graphics_pokemon_palettes_machop_palette:: @ 8D5C65C + .incbin "graphics/pokemon/palettes/machop_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xD5C65C, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_machop_back_pic:: @ 8D5C684 + .incbin "graphics/pokemon/back_pics/machop_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xD5C684, 0x02E0 + + .align 2 +gFile_graphics_pokemon_palettes_machop_shiny_palette:: @ 8D5C964 + .incbin "graphics/pokemon/palettes/machop_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xD5C964, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_machop_icon:: @ 8D5C98C + .incbin "graphics/pokemon/icons/machop_icon.4bpp" + @ .incbin "baserom.gba", 0xD5C98C, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_machop_footprint:: @ 8D5CD8C + .incbin "graphics/pokemon/footprints/machop_footprint.1bpp" + @ .incbin "baserom.gba", 0xD5CD8C, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_machoke_still_front_pic:: @ 8D5CDAC + .incbin "graphics/pokemon/front_pics/machoke_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xD5CDAC, 0x03CC + + .align 2 +gFile_graphics_pokemon_palettes_machoke_palette:: @ 8D5D178 + .incbin "graphics/pokemon/palettes/machoke_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xD5D178, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_machoke_back_pic:: @ 8D5D1A0 + .incbin "graphics/pokemon/back_pics/machoke_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xD5D1A0, 0x0350 + + .align 2 +gFile_graphics_pokemon_palettes_machoke_shiny_palette:: @ 8D5D4F0 + .incbin "graphics/pokemon/palettes/machoke_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xD5D4F0, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_machoke_icon:: @ 8D5D518 + .incbin "graphics/pokemon/icons/machoke_icon.4bpp" + @ .incbin "baserom.gba", 0xD5D518, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_machoke_footprint:: @ 8D5D918 + .incbin "graphics/pokemon/footprints/machoke_footprint.1bpp" + @ .incbin "baserom.gba", 0xD5D918, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_machamp_still_front_pic:: @ 8D5D938 + .incbin "graphics/pokemon/front_pics/machamp_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xD5D938, 0x04EC + + .align 2 +gFile_graphics_pokemon_palettes_machamp_palette:: @ 8D5DE24 + .incbin "graphics/pokemon/palettes/machamp_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xD5DE24, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_machamp_back_pic:: @ 8D5DE4C + .incbin "graphics/pokemon/back_pics/machamp_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xD5DE4C, 0x045C + + .align 2 +gFile_graphics_pokemon_palettes_machamp_shiny_palette:: @ 8D5E2A8 + .incbin "graphics/pokemon/palettes/machamp_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xD5E2A8, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_machamp_icon:: @ 8D5E2D0 + .incbin "graphics/pokemon/icons/machamp_icon.4bpp" + @ .incbin "baserom.gba", 0xD5E2D0, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_machamp_footprint:: @ 8D5E6D0 + .incbin "graphics/pokemon/footprints/machamp_footprint.1bpp" + @ .incbin "baserom.gba", 0xD5E6D0, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_bellsprout_still_front_pic:: @ 8D5E6F0 + .incbin "graphics/pokemon/front_pics/bellsprout_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xD5E6F0, 0x028C + + .align 2 +gFile_graphics_pokemon_palettes_bellsprout_palette:: @ 8D5E97C + .incbin "graphics/pokemon/palettes/bellsprout_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xD5E97C, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_bellsprout_back_pic:: @ 8D5E9A4 + .incbin "graphics/pokemon/back_pics/bellsprout_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xD5E9A4, 0x029C + + .align 2 +gFile_graphics_pokemon_palettes_bellsprout_shiny_palette:: @ 8D5EC40 + .incbin "graphics/pokemon/palettes/bellsprout_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xD5EC40, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_bellsprout_icon:: @ 8D5EC68 + .incbin "graphics/pokemon/icons/bellsprout_icon.4bpp" + @ .incbin "baserom.gba", 0xD5EC68, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_bellsprout_footprint:: @ 8D5F068 + .incbin "graphics/pokemon/footprints/bellsprout_footprint.1bpp" + @ .incbin "baserom.gba", 0xD5F068, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_weepinbell_still_front_pic:: @ 8D5F088 + .incbin "graphics/pokemon/front_pics/weepinbell_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xD5F088, 0x0324 + + .align 2 +gFile_graphics_pokemon_palettes_weepinbell_palette:: @ 8D5F3AC + .incbin "graphics/pokemon/palettes/weepinbell_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xD5F3AC, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_weepinbell_back_pic:: @ 8D5F3D4 + .incbin "graphics/pokemon/back_pics/weepinbell_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xD5F3D4, 0x02FC + + .align 2 +gFile_graphics_pokemon_palettes_weepinbell_shiny_palette:: @ 8D5F6D0 + .incbin "graphics/pokemon/palettes/weepinbell_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xD5F6D0, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_weepinbell_icon:: @ 8D5F6F8 + .incbin "graphics/pokemon/icons/weepinbell_icon.4bpp" + @ .incbin "baserom.gba", 0xD5F6F8, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_weepinbell_footprint:: @ 8D5FAF8 + .incbin "graphics/pokemon/footprints/weepinbell_footprint.1bpp" + @ .incbin "baserom.gba", 0xD5FAF8, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_victreebel_still_front_pic:: @ 8D5FB18 + .incbin "graphics/pokemon/front_pics/victreebel_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xD5FB18, 0x042C + + .align 2 +gFile_graphics_pokemon_palettes_victreebel_palette:: @ 8D5FF44 + .incbin "graphics/pokemon/palettes/victreebel_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xD5FF44, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_victreebel_back_pic:: @ 8D5FF6C + .incbin "graphics/pokemon/back_pics/victreebel_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xD5FF6C, 0x0398 + + .align 2 +gFile_graphics_pokemon_palettes_victreebel_shiny_palette:: @ 8D60304 + .incbin "graphics/pokemon/palettes/victreebel_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xD60304, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_victreebel_icon:: @ 8D6032C + .incbin "graphics/pokemon/icons/victreebel_icon.4bpp" + @ .incbin "baserom.gba", 0xD6032C, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_victreebel_footprint:: @ 8D6072C + .incbin "graphics/pokemon/footprints/victreebel_footprint.1bpp" + @ .incbin "baserom.gba", 0xD6072C, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_tentacool_still_front_pic:: @ 8D6074C + .incbin "graphics/pokemon/front_pics/tentacool_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xD6074C, 0x02A8 + + .align 2 +gFile_graphics_pokemon_palettes_tentacool_palette:: @ 8D609F4 + .incbin "graphics/pokemon/palettes/tentacool_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xD609F4, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_tentacool_back_pic:: @ 8D60A1C + .incbin "graphics/pokemon/back_pics/tentacool_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xD60A1C, 0x02CC + + .align 2 +gFile_graphics_pokemon_palettes_tentacool_shiny_palette:: @ 8D60CE8 + .incbin "graphics/pokemon/palettes/tentacool_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xD60CE8, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_tentacool_icon:: @ 8D60D10 + .incbin "graphics/pokemon/icons/tentacool_icon.4bpp" + @ .incbin "baserom.gba", 0xD60D10, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_tentacool_footprint:: @ 8D61110 + .incbin "graphics/pokemon/footprints/tentacool_footprint.1bpp" + @ .incbin "baserom.gba", 0xD61110, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_tentacruel_still_front_pic:: @ 8D61130 + .incbin "graphics/pokemon/front_pics/tentacruel_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xD61130, 0x04F4 + + .align 2 +gFile_graphics_pokemon_palettes_tentacruel_palette:: @ 8D61624 + .incbin "graphics/pokemon/palettes/tentacruel_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xD61624, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_tentacruel_back_pic:: @ 8D6164C + .incbin "graphics/pokemon/back_pics/tentacruel_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xD6164C, 0x039C + + .align 2 +gFile_graphics_pokemon_palettes_tentacruel_shiny_palette:: @ 8D619E8 + .incbin "graphics/pokemon/palettes/tentacruel_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xD619E8, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_tentacruel_icon:: @ 8D61A10 + .incbin "graphics/pokemon/icons/tentacruel_icon.4bpp" + @ .incbin "baserom.gba", 0xD61A10, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_tentacruel_footprint:: @ 8D61E10 + .incbin "graphics/pokemon/footprints/tentacruel_footprint.1bpp" + @ .incbin "baserom.gba", 0xD61E10, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_geodude_still_front_pic:: @ 8D61E30 + .incbin "graphics/pokemon/front_pics/geodude_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xD61E30, 0x0294 + + .align 2 +gFile_graphics_pokemon_palettes_geodude_palette:: @ 8D620C4 + .incbin "graphics/pokemon/palettes/geodude_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xD620C4, 0x001C + + .align 2 +gFile_graphics_pokemon_back_pics_geodude_back_pic:: @ 8D620E0 + .incbin "graphics/pokemon/back_pics/geodude_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xD620E0, 0x0294 + + .align 2 +gFile_graphics_pokemon_palettes_geodude_shiny_palette:: @ 8D62374 + .incbin "graphics/pokemon/palettes/geodude_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xD62374, 0x001C + + .align 2 +gFile_graphics_pokemon_icons_geodude_icon:: @ 8D62390 + .incbin "graphics/pokemon/icons/geodude_icon.4bpp" + @ .incbin "baserom.gba", 0xD62390, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_geodude_footprint:: @ 8D62790 + .incbin "graphics/pokemon/footprints/geodude_footprint.1bpp" + @ .incbin "baserom.gba", 0xD62790, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_graveler_still_front_pic:: @ 8D627B0 + .incbin "graphics/pokemon/front_pics/graveler_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xD627B0, 0x03FC + + .align 2 +gFile_graphics_pokemon_palettes_graveler_palette:: @ 8D62BAC + .incbin "graphics/pokemon/palettes/graveler_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xD62BAC, 0x0024 + + .align 2 +gFile_graphics_pokemon_back_pics_graveler_back_pic:: @ 8D62BD0 + .incbin "graphics/pokemon/back_pics/graveler_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xD62BD0, 0x027C + + .align 2 +gFile_graphics_pokemon_palettes_graveler_shiny_palette:: @ 8D62E4C + .incbin "graphics/pokemon/palettes/graveler_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xD62E4C, 0x0024 + + .align 2 +gFile_graphics_pokemon_icons_graveler_icon:: @ 8D62E70 + .incbin "graphics/pokemon/icons/graveler_icon.4bpp" + @ .incbin "baserom.gba", 0xD62E70, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_graveler_footprint:: @ 8D63270 + .incbin "graphics/pokemon/footprints/graveler_footprint.1bpp" + @ .incbin "baserom.gba", 0xD63270, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_golem_still_front_pic:: @ 8D63290 + .incbin "graphics/pokemon/front_pics/golem_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xD63290, 0x0430 + + .align 2 +gFile_graphics_pokemon_palettes_golem_palette:: @ 8D636C0 + .incbin "graphics/pokemon/palettes/golem_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xD636C0, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_golem_back_pic:: @ 8D636E8 + .incbin "graphics/pokemon/back_pics/golem_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xD636E8, 0x02C0 + + .align 2 +gFile_graphics_pokemon_palettes_golem_shiny_palette:: @ 8D639A8 + .incbin "graphics/pokemon/palettes/golem_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xD639A8, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_golem_icon:: @ 8D639D0 + .incbin "graphics/pokemon/icons/golem_icon.4bpp" + @ .incbin "baserom.gba", 0xD639D0, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_golem_footprint:: @ 8D63DD0 + .incbin "graphics/pokemon/footprints/golem_footprint.1bpp" + @ .incbin "baserom.gba", 0xD63DD0, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_ponyta_still_front_pic:: @ 8D63DF0 + .incbin "graphics/pokemon/front_pics/ponyta_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xD63DF0, 0x0390 + + .align 2 +gFile_graphics_pokemon_palettes_ponyta_palette:: @ 8D64180 + .incbin "graphics/pokemon/palettes/ponyta_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xD64180, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_ponyta_back_pic:: @ 8D641A8 + .incbin "graphics/pokemon/back_pics/ponyta_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xD641A8, 0x033C + + .align 2 +gFile_graphics_pokemon_palettes_ponyta_shiny_palette:: @ 8D644E4 + .incbin "graphics/pokemon/palettes/ponyta_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xD644E4, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_ponyta_icon:: @ 8D6450C + .incbin "graphics/pokemon/icons/ponyta_icon.4bpp" + @ .incbin "baserom.gba", 0xD6450C, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_ponyta_footprint:: @ 8D6490C + .incbin "graphics/pokemon/footprints/ponyta_footprint.1bpp" + @ .incbin "baserom.gba", 0xD6490C, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_rapidash_still_front_pic:: @ 8D6492C + .incbin "graphics/pokemon/front_pics/rapidash_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xD6492C, 0x0488 + + .align 2 +gFile_graphics_pokemon_palettes_rapidash_palette:: @ 8D64DB4 + .incbin "graphics/pokemon/palettes/rapidash_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xD64DB4, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_rapidash_back_pic:: @ 8D64DDC + .incbin "graphics/pokemon/back_pics/rapidash_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xD64DDC, 0x0410 + + .align 2 +gFile_graphics_pokemon_palettes_rapidash_shiny_palette:: @ 8D651EC + .incbin "graphics/pokemon/palettes/rapidash_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xD651EC, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_rapidash_icon:: @ 8D65214 + .incbin "graphics/pokemon/icons/rapidash_icon.4bpp" + @ .incbin "baserom.gba", 0xD65214, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_rapidash_footprint:: @ 8D65614 + .incbin "graphics/pokemon/footprints/rapidash_footprint.1bpp" + @ .incbin "baserom.gba", 0xD65614, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_slowpoke_still_front_pic:: @ 8D65634 + .incbin "graphics/pokemon/front_pics/slowpoke_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xD65634, 0x02D4 + + .align 2 +gFile_graphics_pokemon_palettes_slowpoke_palette:: @ 8D65908 + .incbin "graphics/pokemon/palettes/slowpoke_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xD65908, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_slowpoke_back_pic:: @ 8D65930 + .incbin "graphics/pokemon/back_pics/slowpoke_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xD65930, 0x0264 + + .align 2 +gFile_graphics_pokemon_palettes_slowpoke_shiny_palette:: @ 8D65B94 + .incbin "graphics/pokemon/palettes/slowpoke_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xD65B94, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_slowpoke_icon:: @ 8D65BBC + .incbin "graphics/pokemon/icons/slowpoke_icon.4bpp" + @ .incbin "baserom.gba", 0xD65BBC, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_slowpoke_footprint:: @ 8D65FBC + .incbin "graphics/pokemon/footprints/slowpoke_footprint.1bpp" + @ .incbin "baserom.gba", 0xD65FBC, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_slowbro_still_front_pic:: @ 8D65FDC + .incbin "graphics/pokemon/front_pics/slowbro_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xD65FDC, 0x04A0 + + .align 2 +gFile_graphics_pokemon_palettes_slowbro_palette:: @ 8D6647C + .incbin "graphics/pokemon/palettes/slowbro_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xD6647C, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_slowbro_back_pic:: @ 8D664A4 + .incbin "graphics/pokemon/back_pics/slowbro_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xD664A4, 0x039C + + .align 2 +gFile_graphics_pokemon_palettes_slowbro_shiny_palette:: @ 8D66840 + .incbin "graphics/pokemon/palettes/slowbro_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xD66840, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_slowbro_icon:: @ 8D66868 + .incbin "graphics/pokemon/icons/slowbro_icon.4bpp" + @ .incbin "baserom.gba", 0xD66868, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_slowbro_footprint:: @ 8D66C68 + .incbin "graphics/pokemon/footprints/slowbro_footprint.1bpp" + @ .incbin "baserom.gba", 0xD66C68, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_magnemite_still_front_pic:: @ 8D66C88 + .incbin "graphics/pokemon/front_pics/magnemite_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xD66C88, 0x01D8 + + .align 2 +gFile_graphics_pokemon_palettes_magnemite_palette:: @ 8D66E60 + .incbin "graphics/pokemon/palettes/magnemite_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xD66E60, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_magnemite_back_pic:: @ 8D66E88 + .incbin "graphics/pokemon/back_pics/magnemite_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xD66E88, 0x01E8 + + .align 2 +gFile_graphics_pokemon_palettes_magnemite_shiny_palette:: @ 8D67070 + .incbin "graphics/pokemon/palettes/magnemite_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xD67070, 0x0024 + + .align 2 +gFile_graphics_pokemon_icons_magnemite_icon:: @ 8D67094 + .incbin "graphics/pokemon/icons/magnemite_icon.4bpp" + @ .incbin "baserom.gba", 0xD67094, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_magnemite_footprint:: @ 8D67494 + .incbin "graphics/pokemon/footprints/magnemite_footprint.1bpp" + @ .incbin "baserom.gba", 0xD67494, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_magneton_still_front_pic:: @ 8D674B4 + .incbin "graphics/pokemon/front_pics/magneton_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xD674B4, 0x033C + + .align 2 +gFile_graphics_pokemon_palettes_magneton_palette:: @ 8D677F0 + .incbin "graphics/pokemon/palettes/magneton_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xD677F0, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_magneton_back_pic:: @ 8D67818 + .incbin "graphics/pokemon/back_pics/magneton_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xD67818, 0x0380 + + .align 2 +gFile_graphics_pokemon_palettes_magneton_shiny_palette:: @ 8D67B98 + .incbin "graphics/pokemon/palettes/magneton_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xD67B98, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_magneton_icon:: @ 8D67BC0 + .incbin "graphics/pokemon/icons/magneton_icon.4bpp" + @ .incbin "baserom.gba", 0xD67BC0, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_magneton_footprint:: @ 8D67FC0 + .incbin "graphics/pokemon/footprints/magneton_footprint.1bpp" + @ .incbin "baserom.gba", 0xD67FC0, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_farfetch_d_still_front_pic:: @ 8D67FE0 + .incbin "graphics/pokemon/front_pics/farfetch_d_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xD67FE0, 0x0354 + + .align 2 +gFile_graphics_pokemon_palettes_farfetch_d_palette:: @ 8D68334 + .incbin "graphics/pokemon/palettes/farfetch_d_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xD68334, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_farfetch_d_back_pic:: @ 8D6835C + .incbin "graphics/pokemon/back_pics/farfetch_d_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xD6835C, 0x036C + + .align 2 +gFile_graphics_pokemon_palettes_farfetch_d_shiny_palette:: @ 8D686C8 + .incbin "graphics/pokemon/palettes/farfetch_d_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xD686C8, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_farfetch_d_icon:: @ 8D686F0 + .incbin "graphics/pokemon/icons/farfetch_d_icon.4bpp" + @ .incbin "baserom.gba", 0xD686F0, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_farfetch_d_footprint:: @ 8D68AF0 + .incbin "graphics/pokemon/footprints/farfetch_d_footprint.1bpp" + @ .incbin "baserom.gba", 0xD68AF0, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_doduo_still_front_pic:: @ 8D68B10 + .incbin "graphics/pokemon/front_pics/doduo_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xD68B10, 0x02EC + + .align 2 +gFile_graphics_pokemon_palettes_doduo_palette:: @ 8D68DFC + .incbin "graphics/pokemon/palettes/doduo_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xD68DFC, 0x0024 + + .align 2 +gFile_graphics_pokemon_back_pics_doduo_back_pic:: @ 8D68E20 + .incbin "graphics/pokemon/back_pics/doduo_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xD68E20, 0x0318 + + .align 2 +gFile_graphics_pokemon_palettes_doduo_shiny_palette:: @ 8D69138 + .incbin "graphics/pokemon/palettes/doduo_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xD69138, 0x0024 + + .align 2 +gFile_graphics_pokemon_icons_doduo_icon:: @ 8D6915C + .incbin "graphics/pokemon/icons/doduo_icon.4bpp" + @ .incbin "baserom.gba", 0xD6915C, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_doduo_footprint:: @ 8D6955C + .incbin "graphics/pokemon/footprints/doduo_footprint.1bpp" + @ .incbin "baserom.gba", 0xD6955C, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_dodrio_still_front_pic:: @ 8D6957C + .incbin "graphics/pokemon/front_pics/dodrio_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xD6957C, 0x0440 + + .align 2 +gFile_graphics_pokemon_palettes_dodrio_palette:: @ 8D699BC + .incbin "graphics/pokemon/palettes/dodrio_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xD699BC, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_dodrio_back_pic:: @ 8D699E4 + .incbin "graphics/pokemon/back_pics/dodrio_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xD699E4, 0x0464 + + .align 2 +gFile_graphics_pokemon_palettes_dodrio_shiny_palette:: @ 8D69E48 + .incbin "graphics/pokemon/palettes/dodrio_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xD69E48, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_dodrio_icon:: @ 8D69E70 + .incbin "graphics/pokemon/icons/dodrio_icon.4bpp" + @ .incbin "baserom.gba", 0xD69E70, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_dodrio_footprint:: @ 8D6A270 + .incbin "graphics/pokemon/footprints/dodrio_footprint.1bpp" + @ .incbin "baserom.gba", 0xD6A270, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_seel_still_front_pic:: @ 8D6A290 + .incbin "graphics/pokemon/front_pics/seel_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xD6A290, 0x0324 + + .align 2 +gFile_graphics_pokemon_palettes_seel_palette:: @ 8D6A5B4 + .incbin "graphics/pokemon/palettes/seel_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xD6A5B4, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_seel_back_pic:: @ 8D6A5DC + .incbin "graphics/pokemon/back_pics/seel_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xD6A5DC, 0x02EC + + .align 2 +gFile_graphics_pokemon_palettes_seel_shiny_palette:: @ 8D6A8C8 + .incbin "graphics/pokemon/palettes/seel_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xD6A8C8, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_seel_icon:: @ 8D6A8F0 + .incbin "graphics/pokemon/icons/seel_icon.4bpp" + @ .incbin "baserom.gba", 0xD6A8F0, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_seel_footprint:: @ 8D6ACF0 + .incbin "graphics/pokemon/footprints/seel_footprint.1bpp" + @ .incbin "baserom.gba", 0xD6ACF0, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_dewgong_still_front_pic:: @ 8D6AD10 + .incbin "graphics/pokemon/front_pics/dewgong_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xD6AD10, 0x03D0 + + .align 2 +gFile_graphics_pokemon_palettes_dewgong_palette:: @ 8D6B0E0 + .incbin "graphics/pokemon/palettes/dewgong_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xD6B0E0, 0x0024 + + .align 2 +gFile_graphics_pokemon_back_pics_dewgong_back_pic:: @ 8D6B104 + .incbin "graphics/pokemon/back_pics/dewgong_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xD6B104, 0x0294 + + .align 2 +gFile_graphics_pokemon_palettes_dewgong_shiny_palette:: @ 8D6B398 + .incbin "graphics/pokemon/palettes/dewgong_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xD6B398, 0x0024 + + .align 2 +gFile_graphics_pokemon_icons_dewgong_icon:: @ 8D6B3BC + .incbin "graphics/pokemon/icons/dewgong_icon.4bpp" + @ .incbin "baserom.gba", 0xD6B3BC, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_dewgong_footprint:: @ 8D6B7BC + .incbin "graphics/pokemon/footprints/dewgong_footprint.1bpp" + @ .incbin "baserom.gba", 0xD6B7BC, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_grimer_still_front_pic:: @ 8D6B7DC + .incbin "graphics/pokemon/front_pics/grimer_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xD6B7DC, 0x0328 + + .align 2 +gFile_graphics_pokemon_palettes_grimer_palette:: @ 8D6BB04 + .incbin "graphics/pokemon/palettes/grimer_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xD6BB04, 0x0024 + + .align 2 +gFile_graphics_pokemon_back_pics_grimer_back_pic:: @ 8D6BB28 + .incbin "graphics/pokemon/back_pics/grimer_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xD6BB28, 0x02C4 + + .align 2 +gFile_graphics_pokemon_palettes_grimer_shiny_palette:: @ 8D6BDEC + .incbin "graphics/pokemon/palettes/grimer_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xD6BDEC, 0x0024 + + .align 2 +gFile_graphics_pokemon_icons_grimer_icon:: @ 8D6BE10 + .incbin "graphics/pokemon/icons/grimer_icon.4bpp" + @ .incbin "baserom.gba", 0xD6BE10, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_grimer_footprint:: @ 8D6C210 + .incbin "graphics/pokemon/footprints/grimer_footprint.1bpp" + @ .incbin "baserom.gba", 0xD6C210, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_muk_still_front_pic:: @ 8D6C230 + .incbin "graphics/pokemon/front_pics/muk_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xD6C230, 0x0390 + + .align 2 +gFile_graphics_pokemon_palettes_muk_palette:: @ 8D6C5C0 + .incbin "graphics/pokemon/palettes/muk_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xD6C5C0, 0x0024 + + .align 2 +gFile_graphics_pokemon_back_pics_muk_back_pic:: @ 8D6C5E4 + .incbin "graphics/pokemon/back_pics/muk_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xD6C5E4, 0x02F8 + + .align 2 +gFile_graphics_pokemon_palettes_muk_shiny_palette:: @ 8D6C8DC + .incbin "graphics/pokemon/palettes/muk_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xD6C8DC, 0x0024 + + .align 2 +gFile_graphics_pokemon_icons_muk_icon:: @ 8D6C900 + .incbin "graphics/pokemon/icons/muk_icon.4bpp" + @ .incbin "baserom.gba", 0xD6C900, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_muk_footprint:: @ 8D6CD00 + .incbin "graphics/pokemon/footprints/muk_footprint.1bpp" + @ .incbin "baserom.gba", 0xD6CD00, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_shellder_still_front_pic:: @ 8D6CD20 + .incbin "graphics/pokemon/front_pics/shellder_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xD6CD20, 0x0274 + + .align 2 +gFile_graphics_pokemon_palettes_shellder_palette:: @ 8D6CF94 + .incbin "graphics/pokemon/palettes/shellder_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xD6CF94, 0x0024 + + .align 2 +gFile_graphics_pokemon_back_pics_shellder_back_pic:: @ 8D6CFB8 + .incbin "graphics/pokemon/back_pics/shellder_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xD6CFB8, 0x0314 + + .align 2 +gFile_graphics_pokemon_palettes_shellder_shiny_palette:: @ 8D6D2CC + .incbin "graphics/pokemon/palettes/shellder_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xD6D2CC, 0x0024 + + .align 2 +gFile_graphics_pokemon_icons_shellder_icon:: @ 8D6D2F0 + .incbin "graphics/pokemon/icons/shellder_icon.4bpp" + @ .incbin "baserom.gba", 0xD6D2F0, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_shellder_footprint:: @ 8D6D6F0 + .incbin "graphics/pokemon/footprints/shellder_footprint.1bpp" + @ .incbin "baserom.gba", 0xD6D6F0, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_cloyster_still_front_pic:: @ 8D6D710 + .incbin "graphics/pokemon/front_pics/cloyster_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xD6D710, 0x043C + + .align 2 +gFile_graphics_pokemon_palettes_cloyster_palette:: @ 8D6DB4C + .incbin "graphics/pokemon/palettes/cloyster_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xD6DB4C, 0x0024 + + .align 2 +gFile_graphics_pokemon_back_pics_cloyster_back_pic:: @ 8D6DB70 + .incbin "graphics/pokemon/back_pics/cloyster_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xD6DB70, 0x040C + + .align 2 +gFile_graphics_pokemon_palettes_cloyster_shiny_palette:: @ 8D6DF7C + .incbin "graphics/pokemon/palettes/cloyster_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xD6DF7C, 0x0024 + + .align 2 +gFile_graphics_pokemon_icons_cloyster_icon:: @ 8D6DFA0 + .incbin "graphics/pokemon/icons/cloyster_icon.4bpp" + @ .incbin "baserom.gba", 0xD6DFA0, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_cloyster_footprint:: @ 8D6E3A0 + .incbin "graphics/pokemon/footprints/cloyster_footprint.1bpp" + @ .incbin "baserom.gba", 0xD6E3A0, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_gastly_still_front_pic:: @ 8D6E3C0 + .incbin "graphics/pokemon/front_pics/gastly_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xD6E3C0, 0x03B8 + + .align 2 +gFile_graphics_pokemon_palettes_gastly_palette:: @ 8D6E778 + .incbin "graphics/pokemon/palettes/gastly_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xD6E778, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_gastly_back_pic:: @ 8D6E7A0 + .incbin "graphics/pokemon/back_pics/gastly_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xD6E7A0, 0x0324 + + .align 2 +gFile_graphics_pokemon_palettes_gastly_shiny_palette:: @ 8D6EAC4 + .incbin "graphics/pokemon/palettes/gastly_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xD6EAC4, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_gastly_icon:: @ 8D6EAEC + .incbin "graphics/pokemon/icons/gastly_icon.4bpp" + @ .incbin "baserom.gba", 0xD6EAEC, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_gastly_footprint:: @ 8D6EEEC + .incbin "graphics/pokemon/footprints/gastly_footprint.1bpp" + @ .incbin "baserom.gba", 0xD6EEEC, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_haunter_still_front_pic:: @ 8D6EF0C + .incbin "graphics/pokemon/front_pics/haunter_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xD6EF0C, 0x03E8 + + .align 2 +gFile_graphics_pokemon_palettes_haunter_palette:: @ 8D6F2F4 + .incbin "graphics/pokemon/palettes/haunter_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xD6F2F4, 0x0024 + + .align 2 +gFile_graphics_pokemon_back_pics_haunter_back_pic:: @ 8D6F318 + .incbin "graphics/pokemon/back_pics/haunter_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xD6F318, 0x02E4 + + .align 2 +gFile_graphics_pokemon_palettes_haunter_shiny_palette:: @ 8D6F5FC + .incbin "graphics/pokemon/palettes/haunter_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xD6F5FC, 0x0024 + + .align 2 +gFile_graphics_pokemon_icons_haunter_icon:: @ 8D6F620 + .incbin "graphics/pokemon/icons/haunter_icon.4bpp" + @ .incbin "baserom.gba", 0xD6F620, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_haunter_footprint:: @ 8D6FA20 + .incbin "graphics/pokemon/footprints/haunter_footprint.1bpp" + @ .incbin "baserom.gba", 0xD6FA20, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_gengar_still_front_pic:: @ 8D6FA40 + .incbin "graphics/pokemon/front_pics/gengar_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xD6FA40, 0x035C + + .align 2 +gFile_graphics_pokemon_palettes_gengar_palette:: @ 8D6FD9C + .incbin "graphics/pokemon/palettes/gengar_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xD6FD9C, 0x0024 + + .align 2 +gFile_graphics_pokemon_back_pics_gengar_back_pic:: @ 8D6FDC0 + .incbin "graphics/pokemon/back_pics/gengar_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xD6FDC0, 0x0344 + + .align 2 +gFile_graphics_pokemon_palettes_gengar_shiny_palette:: @ 8D70104 + .incbin "graphics/pokemon/palettes/gengar_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xD70104, 0x0024 + + .align 2 +gFile_graphics_pokemon_icons_gengar_icon:: @ 8D70128 + .incbin "graphics/pokemon/icons/gengar_icon.4bpp" + @ .incbin "baserom.gba", 0xD70128, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_gengar_footprint:: @ 8D70528 + .incbin "graphics/pokemon/footprints/gengar_footprint.1bpp" + @ .incbin "baserom.gba", 0xD70528, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_onix_still_front_pic:: @ 8D70548 + .incbin "graphics/pokemon/front_pics/onix_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xD70548, 0x04D0 + + .align 2 +gFile_graphics_pokemon_palettes_onix_palette:: @ 8D70A18 + .incbin "graphics/pokemon/palettes/onix_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xD70A18, 0x001C + + .align 2 +gFile_graphics_pokemon_back_pics_onix_back_pic:: @ 8D70A34 + .incbin "graphics/pokemon/back_pics/onix_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xD70A34, 0x037C + + .align 2 +gFile_graphics_pokemon_palettes_onix_shiny_palette:: @ 8D70DB0 + .incbin "graphics/pokemon/palettes/onix_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xD70DB0, 0x001C + + .align 2 +gFile_graphics_pokemon_icons_onix_icon:: @ 8D70DCC + .incbin "graphics/pokemon/icons/onix_icon.4bpp" + @ .incbin "baserom.gba", 0xD70DCC, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_onix_footprint:: @ 8D711CC + .incbin "graphics/pokemon/footprints/onix_footprint.1bpp" + @ .incbin "baserom.gba", 0xD711CC, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_drowzee_still_front_pic:: @ 8D711EC + .incbin "graphics/pokemon/front_pics/drowzee_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xD711EC, 0x0340 + + .align 2 +gFile_graphics_pokemon_palettes_drowzee_palette:: @ 8D7152C + .incbin "graphics/pokemon/palettes/drowzee_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xD7152C, 0x0024 + + .align 2 +gFile_graphics_pokemon_back_pics_drowzee_back_pic:: @ 8D71550 + .incbin "graphics/pokemon/back_pics/drowzee_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xD71550, 0x023C + + .align 2 +gFile_graphics_pokemon_palettes_drowzee_shiny_palette:: @ 8D7178C + .incbin "graphics/pokemon/palettes/drowzee_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xD7178C, 0x0024 + + .align 2 +gFile_graphics_pokemon_icons_drowzee_icon:: @ 8D717B0 + .incbin "graphics/pokemon/icons/drowzee_icon.4bpp" + @ .incbin "baserom.gba", 0xD717B0, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_drowzee_footprint:: @ 8D71BB0 + .incbin "graphics/pokemon/footprints/drowzee_footprint.1bpp" + @ .incbin "baserom.gba", 0xD71BB0, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_hypno_still_front_pic:: @ 8D71BD0 + .incbin "graphics/pokemon/front_pics/hypno_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xD71BD0, 0x0438 + + .align 2 +gFile_graphics_pokemon_palettes_hypno_palette:: @ 8D72008 + .incbin "graphics/pokemon/palettes/hypno_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xD72008, 0x0024 + + .align 2 +gFile_graphics_pokemon_back_pics_hypno_back_pic:: @ 8D7202C + .incbin "graphics/pokemon/back_pics/hypno_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xD7202C, 0x0330 + + .align 2 +gFile_graphics_pokemon_palettes_hypno_shiny_palette:: @ 8D7235C + .incbin "graphics/pokemon/palettes/hypno_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xD7235C, 0x0024 + + .align 2 +gFile_graphics_pokemon_icons_hypno_icon:: @ 8D72380 + .incbin "graphics/pokemon/icons/hypno_icon.4bpp" + @ .incbin "baserom.gba", 0xD72380, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_hypno_footprint:: @ 8D72780 + .incbin "graphics/pokemon/footprints/hypno_footprint.1bpp" + @ .incbin "baserom.gba", 0xD72780, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_krabby_still_front_pic:: @ 8D727A0 + .incbin "graphics/pokemon/front_pics/krabby_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xD727A0, 0x0324 + + .align 2 +gFile_graphics_pokemon_palettes_krabby_palette:: @ 8D72AC4 + .incbin "graphics/pokemon/palettes/krabby_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xD72AC4, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_krabby_back_pic:: @ 8D72AEC + .incbin "graphics/pokemon/back_pics/krabby_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xD72AEC, 0x038C + + .align 2 +gFile_graphics_pokemon_palettes_krabby_shiny_palette:: @ 8D72E78 + .incbin "graphics/pokemon/palettes/krabby_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xD72E78, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_krabby_icon:: @ 8D72EA0 + .incbin "graphics/pokemon/icons/krabby_icon.4bpp" + @ .incbin "baserom.gba", 0xD72EA0, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_krabby_footprint:: @ 8D732A0 + .incbin "graphics/pokemon/footprints/krabby_footprint.1bpp" + @ .incbin "baserom.gba", 0xD732A0, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_kingler_still_front_pic:: @ 8D732C0 + .incbin "graphics/pokemon/front_pics/kingler_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xD732C0, 0x0480 + + .align 2 +gFile_graphics_pokemon_palettes_kingler_palette:: @ 8D73740 + .incbin "graphics/pokemon/palettes/kingler_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xD73740, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_kingler_back_pic:: @ 8D73768 + .incbin "graphics/pokemon/back_pics/kingler_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xD73768, 0x0384 + + .align 2 +gFile_graphics_pokemon_palettes_kingler_shiny_palette:: @ 8D73AEC + .incbin "graphics/pokemon/palettes/kingler_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xD73AEC, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_kingler_icon:: @ 8D73B14 + .incbin "graphics/pokemon/icons/kingler_icon.4bpp" + @ .incbin "baserom.gba", 0xD73B14, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_kingler_footprint:: @ 8D73F14 + .incbin "graphics/pokemon/footprints/kingler_footprint.1bpp" + @ .incbin "baserom.gba", 0xD73F14, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_voltorb_still_front_pic:: @ 8D73F34 + .incbin "graphics/pokemon/front_pics/voltorb_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xD73F34, 0x0208 + + .align 2 +gFile_graphics_pokemon_palettes_voltorb_palette:: @ 8D7413C + .incbin "graphics/pokemon/palettes/voltorb_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xD7413C, 0x0024 + + .align 2 +gFile_graphics_pokemon_back_pics_voltorb_back_pic:: @ 8D74160 + .incbin "graphics/pokemon/back_pics/voltorb_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xD74160, 0x0274 + + .align 2 +gFile_graphics_pokemon_palettes_voltorb_shiny_palette:: @ 8D743D4 + .incbin "graphics/pokemon/palettes/voltorb_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xD743D4, 0x0024 + + .align 2 +gFile_graphics_pokemon_icons_voltorb_icon:: @ 8D743F8 + .incbin "graphics/pokemon/icons/voltorb_icon.4bpp" + @ .incbin "baserom.gba", 0xD743F8, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_voltorb_footprint:: @ 8D747F8 + .incbin "graphics/pokemon/footprints/voltorb_footprint.1bpp" + @ .incbin "baserom.gba", 0xD747F8, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_electrode_still_front_pic:: @ 8D74818 + .incbin "graphics/pokemon/front_pics/electrode_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xD74818, 0x026C + + .align 2 +gFile_graphics_pokemon_palettes_electrode_palette:: @ 8D74A84 + .incbin "graphics/pokemon/palettes/electrode_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xD74A84, 0x0024 + + .align 2 +gFile_graphics_pokemon_back_pics_electrode_back_pic:: @ 8D74AA8 + .incbin "graphics/pokemon/back_pics/electrode_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xD74AA8, 0x0270 + + .align 2 +gFile_graphics_pokemon_palettes_electrode_shiny_palette:: @ 8D74D18 + .incbin "graphics/pokemon/palettes/electrode_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xD74D18, 0x0024 + + .align 2 +gFile_graphics_pokemon_icons_electrode_icon:: @ 8D74D3C + .incbin "graphics/pokemon/icons/electrode_icon.4bpp" + @ .incbin "baserom.gba", 0xD74D3C, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_electrode_footprint:: @ 8D7513C + .incbin "graphics/pokemon/footprints/electrode_footprint.1bpp" + @ .incbin "baserom.gba", 0xD7513C, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_exeggcute_still_front_pic:: @ 8D7515C + .incbin "graphics/pokemon/front_pics/exeggcute_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xD7515C, 0x0390 + + .align 2 +gFile_graphics_pokemon_palettes_exeggcute_palette:: @ 8D754EC + .incbin "graphics/pokemon/palettes/exeggcute_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xD754EC, 0x0024 + + .align 2 +gFile_graphics_pokemon_back_pics_exeggcute_back_pic:: @ 8D75510 + .incbin "graphics/pokemon/back_pics/exeggcute_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xD75510, 0x0308 + + .align 2 +gFile_graphics_pokemon_palettes_exeggcute_shiny_palette:: @ 8D75818 + .incbin "graphics/pokemon/palettes/exeggcute_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xD75818, 0x0024 + + .align 2 +gFile_graphics_pokemon_icons_exeggcute_icon:: @ 8D7583C + .incbin "graphics/pokemon/icons/exeggcute_icon.4bpp" + @ .incbin "baserom.gba", 0xD7583C, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_exeggcute_footprint:: @ 8D75C3C + .incbin "graphics/pokemon/footprints/exeggcute_footprint.1bpp" + @ .incbin "baserom.gba", 0xD75C3C, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_exeggutor_still_front_pic:: @ 8D75C5C + .incbin "graphics/pokemon/front_pics/exeggutor_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xD75C5C, 0x0450 + + .align 2 +gFile_graphics_pokemon_palettes_exeggutor_palette:: @ 8D760AC + .incbin "graphics/pokemon/palettes/exeggutor_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xD760AC, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_exeggutor_back_pic:: @ 8D760D4 + .incbin "graphics/pokemon/back_pics/exeggutor_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xD760D4, 0x03CC + + .align 2 +gFile_graphics_pokemon_palettes_exeggutor_shiny_palette:: @ 8D764A0 + .incbin "graphics/pokemon/palettes/exeggutor_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xD764A0, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_exeggutor_icon:: @ 8D764C8 + .incbin "graphics/pokemon/icons/exeggutor_icon.4bpp" + @ .incbin "baserom.gba", 0xD764C8, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_exeggutor_footprint:: @ 8D768C8 + .incbin "graphics/pokemon/footprints/exeggutor_footprint.1bpp" + @ .incbin "baserom.gba", 0xD768C8, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_cubone_still_front_pic:: @ 8D768E8 + .incbin "graphics/pokemon/front_pics/cubone_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xD768E8, 0x02BC + + .align 2 +gFile_graphics_pokemon_palettes_cubone_palette:: @ 8D76BA4 + .incbin "graphics/pokemon/palettes/cubone_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xD76BA4, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_cubone_back_pic:: @ 8D76BCC + .incbin "graphics/pokemon/back_pics/cubone_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xD76BCC, 0x0340 + + .align 2 +gFile_graphics_pokemon_palettes_cubone_shiny_palette:: @ 8D76F0C + .incbin "graphics/pokemon/palettes/cubone_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xD76F0C, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_cubone_icon:: @ 8D76F34 + .incbin "graphics/pokemon/icons/cubone_icon.4bpp" + @ .incbin "baserom.gba", 0xD76F34, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_cubone_footprint:: @ 8D77334 + .incbin "graphics/pokemon/footprints/cubone_footprint.1bpp" + @ .incbin "baserom.gba", 0xD77334, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_marowak_still_front_pic:: @ 8D77354 + .incbin "graphics/pokemon/front_pics/marowak_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xD77354, 0x0380 + + .align 2 +gFile_graphics_pokemon_palettes_marowak_palette:: @ 8D776D4 + .incbin "graphics/pokemon/palettes/marowak_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xD776D4, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_marowak_back_pic:: @ 8D776FC + .incbin "graphics/pokemon/back_pics/marowak_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xD776FC, 0x0314 + + .align 2 +gFile_graphics_pokemon_palettes_marowak_shiny_palette:: @ 8D77A10 + .incbin "graphics/pokemon/palettes/marowak_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xD77A10, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_marowak_icon:: @ 8D77A38 + .incbin "graphics/pokemon/icons/marowak_icon.4bpp" + @ .incbin "baserom.gba", 0xD77A38, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_marowak_footprint:: @ 8D77E38 + .incbin "graphics/pokemon/footprints/marowak_footprint.1bpp" + @ .incbin "baserom.gba", 0xD77E38, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_hitmonlee_still_front_pic:: @ 8D77E58 + .incbin "graphics/pokemon/front_pics/hitmonlee_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xD77E58, 0x0374 + + .align 2 +gFile_graphics_pokemon_palettes_hitmonlee_palette:: @ 8D781CC + .incbin "graphics/pokemon/palettes/hitmonlee_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xD781CC, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_hitmonlee_back_pic:: @ 8D781F4 + .incbin "graphics/pokemon/back_pics/hitmonlee_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xD781F4, 0x02A4 + + .align 2 +gFile_graphics_pokemon_palettes_hitmonlee_shiny_palette:: @ 8D78498 + .incbin "graphics/pokemon/palettes/hitmonlee_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xD78498, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_hitmonlee_icon:: @ 8D784C0 + .incbin "graphics/pokemon/icons/hitmonlee_icon.4bpp" + @ .incbin "baserom.gba", 0xD784C0, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_hitmonlee_footprint:: @ 8D788C0 + .incbin "graphics/pokemon/footprints/hitmonlee_footprint.1bpp" + @ .incbin "baserom.gba", 0xD788C0, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_hitmonchan_still_front_pic:: @ 8D788E0 + .incbin "graphics/pokemon/front_pics/hitmonchan_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xD788E0, 0x0340 + + .align 2 +gFile_graphics_pokemon_palettes_hitmonchan_palette:: @ 8D78C20 + .incbin "graphics/pokemon/palettes/hitmonchan_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xD78C20, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_hitmonchan_back_pic:: @ 8D78C48 + .incbin "graphics/pokemon/back_pics/hitmonchan_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xD78C48, 0x0344 + + .align 2 +gFile_graphics_pokemon_palettes_hitmonchan_shiny_palette:: @ 8D78F8C + .incbin "graphics/pokemon/palettes/hitmonchan_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xD78F8C, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_hitmonchan_icon:: @ 8D78FB4 + .incbin "graphics/pokemon/icons/hitmonchan_icon.4bpp" + @ .incbin "baserom.gba", 0xD78FB4, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_hitmonchan_footprint:: @ 8D793B4 + .incbin "graphics/pokemon/footprints/hitmonchan_footprint.1bpp" + @ .incbin "baserom.gba", 0xD793B4, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_lickitung_still_front_pic:: @ 8D793D4 + .incbin "graphics/pokemon/front_pics/lickitung_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xD793D4, 0x03D8 + + .align 2 +gFile_graphics_pokemon_palettes_lickitung_palette:: @ 8D797AC + .incbin "graphics/pokemon/palettes/lickitung_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xD797AC, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_lickitung_back_pic:: @ 8D797D4 + .incbin "graphics/pokemon/back_pics/lickitung_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xD797D4, 0x02A4 + + .align 2 +gFile_graphics_pokemon_palettes_lickitung_shiny_palette:: @ 8D79A78 + .incbin "graphics/pokemon/palettes/lickitung_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xD79A78, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_lickitung_icon:: @ 8D79AA0 + .incbin "graphics/pokemon/icons/lickitung_icon.4bpp" + @ .incbin "baserom.gba", 0xD79AA0, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_lickitung_footprint:: @ 8D79EA0 + .incbin "graphics/pokemon/footprints/lickitung_footprint.1bpp" + @ .incbin "baserom.gba", 0xD79EA0, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_koffing_still_front_pic:: @ 8D79EC0 + .incbin "graphics/pokemon/front_pics/koffing_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xD79EC0, 0x0300 + + .align 2 +gFile_graphics_pokemon_palettes_koffing_palette:: @ 8D7A1C0 + .incbin "graphics/pokemon/palettes/koffing_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xD7A1C0, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_koffing_back_pic:: @ 8D7A1E8 + .incbin "graphics/pokemon/back_pics/koffing_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xD7A1E8, 0x0300 + + .align 2 +gFile_graphics_pokemon_palettes_koffing_shiny_palette:: @ 8D7A4E8 + .incbin "graphics/pokemon/palettes/koffing_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xD7A4E8, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_koffing_icon:: @ 8D7A510 + .incbin "graphics/pokemon/icons/koffing_icon.4bpp" + @ .incbin "baserom.gba", 0xD7A510, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_koffing_footprint:: @ 8D7A910 + .incbin "graphics/pokemon/footprints/koffing_footprint.1bpp" + @ .incbin "baserom.gba", 0xD7A910, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_weezing_still_front_pic:: @ 8D7A930 + .incbin "graphics/pokemon/front_pics/weezing_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xD7A930, 0x04BC + + .align 2 +gFile_graphics_pokemon_palettes_weezing_palette:: @ 8D7ADEC + .incbin "graphics/pokemon/palettes/weezing_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xD7ADEC, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_weezing_back_pic:: @ 8D7AE14 + .incbin "graphics/pokemon/back_pics/weezing_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xD7AE14, 0x0384 + + .align 2 +gFile_graphics_pokemon_palettes_weezing_shiny_palette:: @ 8D7B198 + .incbin "graphics/pokemon/palettes/weezing_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xD7B198, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_weezing_icon:: @ 8D7B1C0 + .incbin "graphics/pokemon/icons/weezing_icon.4bpp" + @ .incbin "baserom.gba", 0xD7B1C0, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_weezing_footprint:: @ 8D7B5C0 + .incbin "graphics/pokemon/footprints/weezing_footprint.1bpp" + @ .incbin "baserom.gba", 0xD7B5C0, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_rhyhorn_still_front_pic:: @ 8D7B5E0 + .incbin "graphics/pokemon/front_pics/rhyhorn_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xD7B5E0, 0x03FC + + .align 2 +gFile_graphics_pokemon_palettes_rhyhorn_palette:: @ 8D7B9DC + .incbin "graphics/pokemon/palettes/rhyhorn_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xD7B9DC, 0x0020 + + .align 2 +gFile_graphics_pokemon_back_pics_rhyhorn_back_pic:: @ 8D7B9FC + .incbin "graphics/pokemon/back_pics/rhyhorn_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xD7B9FC, 0x0348 + + .align 2 +gFile_graphics_pokemon_palettes_rhyhorn_shiny_palette:: @ 8D7BD44 + .incbin "graphics/pokemon/palettes/rhyhorn_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xD7BD44, 0x0020 + + .align 2 +gFile_graphics_pokemon_icons_rhyhorn_icon:: @ 8D7BD64 + .incbin "graphics/pokemon/icons/rhyhorn_icon.4bpp" + @ .incbin "baserom.gba", 0xD7BD64, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_rhyhorn_footprint:: @ 8D7C164 + .incbin "graphics/pokemon/footprints/rhyhorn_footprint.1bpp" + @ .incbin "baserom.gba", 0xD7C164, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_rhydon_still_front_pic:: @ 8D7C184 + .incbin "graphics/pokemon/front_pics/rhydon_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xD7C184, 0x04F4 + + .align 2 +gFile_graphics_pokemon_palettes_rhydon_palette:: @ 8D7C678 + .incbin "graphics/pokemon/palettes/rhydon_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xD7C678, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_rhydon_back_pic:: @ 8D7C6A0 + .incbin "graphics/pokemon/back_pics/rhydon_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xD7C6A0, 0x0450 + + .align 2 +gFile_graphics_pokemon_palettes_rhydon_shiny_palette:: @ 8D7CAF0 + .incbin "graphics/pokemon/palettes/rhydon_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xD7CAF0, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_rhydon_icon:: @ 8D7CB18 + .incbin "graphics/pokemon/icons/rhydon_icon.4bpp" + @ .incbin "baserom.gba", 0xD7CB18, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_rhydon_footprint:: @ 8D7CF18 + .incbin "graphics/pokemon/footprints/rhydon_footprint.1bpp" + @ .incbin "baserom.gba", 0xD7CF18, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_chansey_still_front_pic:: @ 8D7CF38 + .incbin "graphics/pokemon/front_pics/chansey_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xD7CF38, 0x033C + + .align 2 +gFile_graphics_pokemon_palettes_chansey_palette:: @ 8D7D274 + .incbin "graphics/pokemon/palettes/chansey_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xD7D274, 0x0024 + + .align 2 +gFile_graphics_pokemon_back_pics_chansey_back_pic:: @ 8D7D298 + .incbin "graphics/pokemon/back_pics/chansey_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xD7D298, 0x0250 + + .align 2 +gFile_graphics_pokemon_palettes_chansey_shiny_palette:: @ 8D7D4E8 + .incbin "graphics/pokemon/palettes/chansey_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xD7D4E8, 0x0024 + + .align 2 +gFile_graphics_pokemon_icons_chansey_icon:: @ 8D7D50C + .incbin "graphics/pokemon/icons/chansey_icon.4bpp" + @ .incbin "baserom.gba", 0xD7D50C, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_chansey_footprint:: @ 8D7D90C + .incbin "graphics/pokemon/footprints/chansey_footprint.1bpp" + @ .incbin "baserom.gba", 0xD7D90C, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_tangela_still_front_pic:: @ 8D7D92C + .incbin "graphics/pokemon/front_pics/tangela_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xD7D92C, 0x03D4 + + .align 2 +gFile_graphics_pokemon_palettes_tangela_palette:: @ 8D7DD00 + .incbin "graphics/pokemon/palettes/tangela_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xD7DD00, 0x0024 + + .align 2 +gFile_graphics_pokemon_back_pics_tangela_back_pic:: @ 8D7DD24 + .incbin "graphics/pokemon/back_pics/tangela_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xD7DD24, 0x03AC + + .align 2 +gFile_graphics_pokemon_palettes_tangela_shiny_palette:: @ 8D7E0D0 + .incbin "graphics/pokemon/palettes/tangela_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xD7E0D0, 0x0024 + + .align 2 +gFile_graphics_pokemon_icons_tangela_icon:: @ 8D7E0F4 + .incbin "graphics/pokemon/icons/tangela_icon.4bpp" + @ .incbin "baserom.gba", 0xD7E0F4, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_tangela_footprint:: @ 8D7E4F4 + .incbin "graphics/pokemon/footprints/tangela_footprint.1bpp" + @ .incbin "baserom.gba", 0xD7E4F4, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_kangaskhan_still_front_pic:: @ 8D7E514 + .incbin "graphics/pokemon/front_pics/kangaskhan_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xD7E514, 0x04A8 + + .align 2 +gFile_graphics_pokemon_palettes_kangaskhan_palette:: @ 8D7E9BC + .incbin "graphics/pokemon/palettes/kangaskhan_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xD7E9BC, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_kangaskhan_back_pic:: @ 8D7E9E4 + .incbin "graphics/pokemon/back_pics/kangaskhan_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xD7E9E4, 0x0430 + + .align 2 +gFile_graphics_pokemon_palettes_kangaskhan_shiny_palette:: @ 8D7EE14 + .incbin "graphics/pokemon/palettes/kangaskhan_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xD7EE14, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_kangaskhan_icon:: @ 8D7EE3C + .incbin "graphics/pokemon/icons/kangaskhan_icon.4bpp" + @ .incbin "baserom.gba", 0xD7EE3C, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_kangaskhan_footprint:: @ 8D7F23C + .incbin "graphics/pokemon/footprints/kangaskhan_footprint.1bpp" + @ .incbin "baserom.gba", 0xD7F23C, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_horsea_still_front_pic:: @ 8D7F25C + .incbin "graphics/pokemon/front_pics/horsea_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xD7F25C, 0x026C + + .align 2 +gFile_graphics_pokemon_palettes_horsea_palette:: @ 8D7F4C8 + .incbin "graphics/pokemon/palettes/horsea_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xD7F4C8, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_horsea_back_pic:: @ 8D7F4F0 + .incbin "graphics/pokemon/back_pics/horsea_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xD7F4F0, 0x02E0 + + .align 2 +gFile_graphics_pokemon_palettes_horsea_shiny_palette:: @ 8D7F7D0 + .incbin "graphics/pokemon/palettes/horsea_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xD7F7D0, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_horsea_icon:: @ 8D7F7F8 + .incbin "graphics/pokemon/icons/horsea_icon.4bpp" + @ .incbin "baserom.gba", 0xD7F7F8, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_horsea_footprint:: @ 8D7FBF8 + .incbin "graphics/pokemon/footprints/horsea_footprint.1bpp" + @ .incbin "baserom.gba", 0xD7FBF8, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_seadra_still_front_pic:: @ 8D7FC18 + .incbin "graphics/pokemon/front_pics/seadra_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xD7FC18, 0x0388 + + .align 2 +gFile_graphics_pokemon_palettes_seadra_palette:: @ 8D7FFA0 + .incbin "graphics/pokemon/palettes/seadra_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xD7FFA0, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_seadra_back_pic:: @ 8D7FFC8 + .incbin "graphics/pokemon/back_pics/seadra_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xD7FFC8, 0x03A0 + + .align 2 +gFile_graphics_pokemon_palettes_seadra_shiny_palette:: @ 8D80368 + .incbin "graphics/pokemon/palettes/seadra_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xD80368, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_seadra_icon:: @ 8D80390 + .incbin "graphics/pokemon/icons/seadra_icon.4bpp" + @ .incbin "baserom.gba", 0xD80390, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_seadra_footprint:: @ 8D80790 + .incbin "graphics/pokemon/footprints/seadra_footprint.1bpp" + @ .incbin "baserom.gba", 0xD80790, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_goldeen_still_front_pic:: @ 8D807B0 + .incbin "graphics/pokemon/front_pics/goldeen_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xD807B0, 0x0368 + + .align 2 +gFile_graphics_pokemon_palettes_goldeen_palette:: @ 8D80B18 + .incbin "graphics/pokemon/palettes/goldeen_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xD80B18, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_goldeen_back_pic:: @ 8D80B40 + .incbin "graphics/pokemon/back_pics/goldeen_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xD80B40, 0x0370 + + .align 2 +gFile_graphics_pokemon_palettes_goldeen_shiny_palette:: @ 8D80EB0 + .incbin "graphics/pokemon/palettes/goldeen_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xD80EB0, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_goldeen_icon:: @ 8D80ED8 + .incbin "graphics/pokemon/icons/goldeen_icon.4bpp" + @ .incbin "baserom.gba", 0xD80ED8, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_goldeen_footprint:: @ 8D812D8 + .incbin "graphics/pokemon/footprints/goldeen_footprint.1bpp" + @ .incbin "baserom.gba", 0xD812D8, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_seaking_still_front_pic:: @ 8D812F8 + .incbin "graphics/pokemon/front_pics/seaking_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xD812F8, 0x0474 + + .align 2 +gFile_graphics_pokemon_palettes_seaking_palette:: @ 8D8176C + .incbin "graphics/pokemon/palettes/seaking_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xD8176C, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_seaking_back_pic:: @ 8D81794 + .incbin "graphics/pokemon/back_pics/seaking_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xD81794, 0x0350 + + .align 2 +gFile_graphics_pokemon_palettes_seaking_shiny_palette:: @ 8D81AE4 + .incbin "graphics/pokemon/palettes/seaking_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xD81AE4, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_seaking_icon:: @ 8D81B0C + .incbin "graphics/pokemon/icons/seaking_icon.4bpp" + @ .incbin "baserom.gba", 0xD81B0C, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_seaking_footprint:: @ 8D81F0C + .incbin "graphics/pokemon/footprints/seaking_footprint.1bpp" + @ .incbin "baserom.gba", 0xD81F0C, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_staryu_still_front_pic:: @ 8D81F2C + .incbin "graphics/pokemon/front_pics/staryu_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xD81F2C, 0x02B0 + + .align 2 +gFile_graphics_pokemon_palettes_staryu_palette:: @ 8D821DC + .incbin "graphics/pokemon/palettes/staryu_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xD821DC, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_staryu_back_pic:: @ 8D82204 + .incbin "graphics/pokemon/back_pics/staryu_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xD82204, 0x0268 + + .align 2 +gFile_graphics_pokemon_palettes_staryu_shiny_palette:: @ 8D8246C + .incbin "graphics/pokemon/palettes/staryu_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xD8246C, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_staryu_icon:: @ 8D82494 + .incbin "graphics/pokemon/icons/staryu_icon.4bpp" + @ .incbin "baserom.gba", 0xD82494, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_staryu_footprint:: @ 8D82894 + .incbin "graphics/pokemon/footprints/staryu_footprint.1bpp" + @ .incbin "baserom.gba", 0xD82894, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_starmie_still_front_pic:: @ 8D828B4 + .incbin "graphics/pokemon/front_pics/starmie_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xD828B4, 0x03A0 + + .align 2 +gFile_graphics_pokemon_palettes_starmie_palette:: @ 8D82C54 + .incbin "graphics/pokemon/palettes/starmie_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xD82C54, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_starmie_back_pic:: @ 8D82C7C + .incbin "graphics/pokemon/back_pics/starmie_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xD82C7C, 0x02A4 + + .align 2 +gFile_graphics_pokemon_palettes_starmie_shiny_palette:: @ 8D82F20 + .incbin "graphics/pokemon/palettes/starmie_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xD82F20, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_starmie_icon:: @ 8D82F48 + .incbin "graphics/pokemon/icons/starmie_icon.4bpp" + @ .incbin "baserom.gba", 0xD82F48, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_starmie_footprint:: @ 8D83348 + .incbin "graphics/pokemon/footprints/starmie_footprint.1bpp" + @ .incbin "baserom.gba", 0xD83348, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_mr_mime_still_front_pic:: @ 8D83368 + .incbin "graphics/pokemon/front_pics/mr_mime_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xD83368, 0x03BC + + .align 2 +gFile_graphics_pokemon_palettes_mr_mime_palette:: @ 8D83724 + .incbin "graphics/pokemon/palettes/mr_mime_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xD83724, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_mr_mime_back_pic:: @ 8D8374C + .incbin "graphics/pokemon/back_pics/mr_mime_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xD8374C, 0x0334 + + .align 2 +gFile_graphics_pokemon_palettes_mr_mime_shiny_palette:: @ 8D83A80 + .incbin "graphics/pokemon/palettes/mr_mime_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xD83A80, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_mr_mime_icon:: @ 8D83AA8 + .incbin "graphics/pokemon/icons/mr_mime_icon.4bpp" + @ .incbin "baserom.gba", 0xD83AA8, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_mr_mime_footprint:: @ 8D83EA8 + .incbin "graphics/pokemon/footprints/mr_mime_footprint.1bpp" + @ .incbin "baserom.gba", 0xD83EA8, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_scyther_still_front_pic:: @ 8D83EC8 + .incbin "graphics/pokemon/front_pics/scyther_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xD83EC8, 0x0428 + + .align 2 +gFile_graphics_pokemon_palettes_scyther_palette:: @ 8D842F0 + .incbin "graphics/pokemon/palettes/scyther_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xD842F0, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_scyther_back_pic:: @ 8D84318 + .incbin "graphics/pokemon/back_pics/scyther_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xD84318, 0x0418 + + .align 2 +gFile_graphics_pokemon_palettes_scyther_shiny_palette:: @ 8D84730 + .incbin "graphics/pokemon/palettes/scyther_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xD84730, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_scyther_icon:: @ 8D84758 + .incbin "graphics/pokemon/icons/scyther_icon.4bpp" + @ .incbin "baserom.gba", 0xD84758, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_scyther_footprint:: @ 8D84B58 + .incbin "graphics/pokemon/footprints/scyther_footprint.1bpp" + @ .incbin "baserom.gba", 0xD84B58, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_jynx_still_front_pic:: @ 8D84B78 + .incbin "graphics/pokemon/front_pics/jynx_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xD84B78, 0x03CC + + .align 2 +gFile_graphics_pokemon_palettes_jynx_palette:: @ 8D84F44 + .incbin "graphics/pokemon/palettes/jynx_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xD84F44, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_jynx_back_pic:: @ 8D84F6C + .incbin "graphics/pokemon/back_pics/jynx_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xD84F6C, 0x02EC + + .align 2 +gFile_graphics_pokemon_palettes_jynx_shiny_palette:: @ 8D85258 + .incbin "graphics/pokemon/palettes/jynx_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xD85258, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_jynx_icon:: @ 8D85280 + .incbin "graphics/pokemon/icons/jynx_icon.4bpp" + @ .incbin "baserom.gba", 0xD85280, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_jynx_footprint:: @ 8D85680 + .incbin "graphics/pokemon/footprints/jynx_footprint.1bpp" + @ .incbin "baserom.gba", 0xD85680, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_electabuzz_still_front_pic:: @ 8D856A0 + .incbin "graphics/pokemon/front_pics/electabuzz_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xD856A0, 0x0458 + + .align 2 +gFile_graphics_pokemon_palettes_electabuzz_palette:: @ 8D85AF8 + .incbin "graphics/pokemon/palettes/electabuzz_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xD85AF8, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_electabuzz_back_pic:: @ 8D85B20 + .incbin "graphics/pokemon/back_pics/electabuzz_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xD85B20, 0x0310 + + .align 2 +gFile_graphics_pokemon_palettes_electabuzz_shiny_palette:: @ 8D85E30 + .incbin "graphics/pokemon/palettes/electabuzz_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xD85E30, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_electabuzz_icon:: @ 8D85E58 + .incbin "graphics/pokemon/icons/electabuzz_icon.4bpp" + @ .incbin "baserom.gba", 0xD85E58, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_electabuzz_footprint:: @ 8D86258 + .incbin "graphics/pokemon/footprints/electabuzz_footprint.1bpp" + @ .incbin "baserom.gba", 0xD86258, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_magmar_still_front_pic:: @ 8D86278 + .incbin "graphics/pokemon/front_pics/magmar_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xD86278, 0x0430 + + .align 2 +gFile_graphics_pokemon_palettes_magmar_palette:: @ 8D866A8 + .incbin "graphics/pokemon/palettes/magmar_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xD866A8, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_magmar_back_pic:: @ 8D866D0 + .incbin "graphics/pokemon/back_pics/magmar_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xD866D0, 0x0338 + + .align 2 +gFile_graphics_pokemon_palettes_magmar_shiny_palette:: @ 8D86A08 + .incbin "graphics/pokemon/palettes/magmar_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xD86A08, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_magmar_icon:: @ 8D86A30 + .incbin "graphics/pokemon/icons/magmar_icon.4bpp" + @ .incbin "baserom.gba", 0xD86A30, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_magmar_footprint:: @ 8D86E30 + .incbin "graphics/pokemon/footprints/magmar_footprint.1bpp" + @ .incbin "baserom.gba", 0xD86E30, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_pinsir_still_front_pic:: @ 8D86E50 + .incbin "graphics/pokemon/front_pics/pinsir_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xD86E50, 0x0430 + + .align 2 +gFile_graphics_pokemon_palettes_pinsir_palette:: @ 8D87280 + .incbin "graphics/pokemon/palettes/pinsir_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xD87280, 0x0024 + + .align 2 +gFile_graphics_pokemon_back_pics_pinsir_back_pic:: @ 8D872A4 + .incbin "graphics/pokemon/back_pics/pinsir_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xD872A4, 0x0354 + + .align 2 +gFile_graphics_pokemon_palettes_pinsir_shiny_palette:: @ 8D875F8 + .incbin "graphics/pokemon/palettes/pinsir_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xD875F8, 0x0024 + + .align 2 +gFile_graphics_pokemon_icons_pinsir_icon:: @ 8D8761C + .incbin "graphics/pokemon/icons/pinsir_icon.4bpp" + @ .incbin "baserom.gba", 0xD8761C, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_pinsir_footprint:: @ 8D87A1C + .incbin "graphics/pokemon/footprints/pinsir_footprint.1bpp" + @ .incbin "baserom.gba", 0xD87A1C, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_tauros_still_front_pic:: @ 8D87A3C + .incbin "graphics/pokemon/front_pics/tauros_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xD87A3C, 0x0460 + + .align 2 +gFile_graphics_pokemon_palettes_tauros_palette:: @ 8D87E9C + .incbin "graphics/pokemon/palettes/tauros_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xD87E9C, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_tauros_back_pic:: @ 8D87EC4 + .incbin "graphics/pokemon/back_pics/tauros_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xD87EC4, 0x02B4 + + .align 2 +gFile_graphics_pokemon_palettes_tauros_shiny_palette:: @ 8D88178 + .incbin "graphics/pokemon/palettes/tauros_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xD88178, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_tauros_icon:: @ 8D881A0 + .incbin "graphics/pokemon/icons/tauros_icon.4bpp" + @ .incbin "baserom.gba", 0xD881A0, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_tauros_footprint:: @ 8D885A0 + .incbin "graphics/pokemon/footprints/tauros_footprint.1bpp" + @ .incbin "baserom.gba", 0xD885A0, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_magikarp_still_front_pic:: @ 8D885C0 + .incbin "graphics/pokemon/front_pics/magikarp_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xD885C0, 0x0348 + + .align 2 +gFile_graphics_pokemon_palettes_magikarp_palette:: @ 8D88908 + .incbin "graphics/pokemon/palettes/magikarp_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xD88908, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_magikarp_back_pic:: @ 8D88930 + .incbin "graphics/pokemon/back_pics/magikarp_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xD88930, 0x0330 + + .align 2 +gFile_graphics_pokemon_palettes_magikarp_shiny_palette:: @ 8D88C60 + .incbin "graphics/pokemon/palettes/magikarp_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xD88C60, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_magikarp_icon:: @ 8D88C88 + .incbin "graphics/pokemon/icons/magikarp_icon.4bpp" + @ .incbin "baserom.gba", 0xD88C88, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_magikarp_footprint:: @ 8D89088 + .incbin "graphics/pokemon/footprints/magikarp_footprint.1bpp" + @ .incbin "baserom.gba", 0xD89088, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_gyarados_still_front_pic:: @ 8D890A8 + .incbin "graphics/pokemon/front_pics/gyarados_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xD890A8, 0x05A4 + + .align 2 +gFile_graphics_pokemon_palettes_gyarados_palette:: @ 8D8964C + .incbin "graphics/pokemon/palettes/gyarados_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xD8964C, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_gyarados_back_pic:: @ 8D89674 + .incbin "graphics/pokemon/back_pics/gyarados_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xD89674, 0x04B8 + + .align 2 +gFile_graphics_pokemon_palettes_gyarados_shiny_palette:: @ 8D89B2C + .incbin "graphics/pokemon/palettes/gyarados_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xD89B2C, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_gyarados_icon:: @ 8D89B54 + .incbin "graphics/pokemon/icons/gyarados_icon.4bpp" + @ .incbin "baserom.gba", 0xD89B54, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_gyarados_footprint:: @ 8D89F54 + .incbin "graphics/pokemon/footprints/gyarados_footprint.1bpp" + @ .incbin "baserom.gba", 0xD89F54, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_lapras_still_front_pic:: @ 8D89F74 + .incbin "graphics/pokemon/front_pics/lapras_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xD89F74, 0x03E0 + + .align 2 +gFile_graphics_pokemon_palettes_lapras_palette:: @ 8D8A354 + .incbin "graphics/pokemon/palettes/lapras_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xD8A354, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_lapras_back_pic:: @ 8D8A37C + .incbin "graphics/pokemon/back_pics/lapras_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xD8A37C, 0x0344 + + .align 2 +gFile_graphics_pokemon_palettes_lapras_shiny_palette:: @ 8D8A6C0 + .incbin "graphics/pokemon/palettes/lapras_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xD8A6C0, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_lapras_icon:: @ 8D8A6E8 + .incbin "graphics/pokemon/icons/lapras_icon.4bpp" + @ .incbin "baserom.gba", 0xD8A6E8, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_lapras_footprint:: @ 8D8AAE8 + .incbin "graphics/pokemon/footprints/lapras_footprint.1bpp" + @ .incbin "baserom.gba", 0xD8AAE8, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_ditto_still_front_pic:: @ 8D8AB08 + .incbin "graphics/pokemon/front_pics/ditto_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xD8AB08, 0x01F0 + + .align 2 +gFile_graphics_pokemon_palettes_ditto_palette:: @ 8D8ACF8 + .incbin "graphics/pokemon/palettes/ditto_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xD8ACF8, 0x0020 + + .align 2 +gFile_graphics_pokemon_back_pics_ditto_back_pic:: @ 8D8AD18 + .incbin "graphics/pokemon/back_pics/ditto_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xD8AD18, 0x0200 + + .align 2 +gFile_graphics_pokemon_palettes_ditto_shiny_palette:: @ 8D8AF18 + .incbin "graphics/pokemon/palettes/ditto_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xD8AF18, 0x0020 + + .align 2 +gFile_graphics_pokemon_icons_ditto_icon:: @ 8D8AF38 + .incbin "graphics/pokemon/icons/ditto_icon.4bpp" + @ .incbin "baserom.gba", 0xD8AF38, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_ditto_footprint:: @ 8D8B338 + .incbin "graphics/pokemon/footprints/ditto_footprint.1bpp" + @ .incbin "baserom.gba", 0xD8B338, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_eevee_still_front_pic:: @ 8D8B358 + .incbin "graphics/pokemon/front_pics/eevee_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xD8B358, 0x02EC + + .align 2 +gFile_graphics_pokemon_palettes_eevee_palette:: @ 8D8B644 + .incbin "graphics/pokemon/palettes/eevee_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xD8B644, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_eevee_back_pic:: @ 8D8B66C + .incbin "graphics/pokemon/back_pics/eevee_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xD8B66C, 0x0328 + + .align 2 +gFile_graphics_pokemon_palettes_eevee_shiny_palette:: @ 8D8B994 + .incbin "graphics/pokemon/palettes/eevee_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xD8B994, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_eevee_icon:: @ 8D8B9BC + .incbin "graphics/pokemon/icons/eevee_icon.4bpp" + @ .incbin "baserom.gba", 0xD8B9BC, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_eevee_footprint:: @ 8D8BDBC + .incbin "graphics/pokemon/footprints/eevee_footprint.1bpp" + @ .incbin "baserom.gba", 0xD8BDBC, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_vaporeon_still_front_pic:: @ 8D8BDDC + .incbin "graphics/pokemon/front_pics/vaporeon_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xD8BDDC, 0x0394 + + .align 2 +gFile_graphics_pokemon_palettes_vaporeon_palette:: @ 8D8C170 + .incbin "graphics/pokemon/palettes/vaporeon_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xD8C170, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_vaporeon_back_pic:: @ 8D8C198 + .incbin "graphics/pokemon/back_pics/vaporeon_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xD8C198, 0x02C8 + + .align 2 +gFile_graphics_pokemon_palettes_vaporeon_shiny_palette:: @ 8D8C460 + .incbin "graphics/pokemon/palettes/vaporeon_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xD8C460, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_vaporeon_icon:: @ 8D8C488 + .incbin "graphics/pokemon/icons/vaporeon_icon.4bpp" + @ .incbin "baserom.gba", 0xD8C488, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_vaporeon_footprint:: @ 8D8C888 + .incbin "graphics/pokemon/footprints/vaporeon_footprint.1bpp" + @ .incbin "baserom.gba", 0xD8C888, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_jolteon_still_front_pic:: @ 8D8C8A8 + .incbin "graphics/pokemon/front_pics/jolteon_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xD8C8A8, 0x0350 + + .align 2 +gFile_graphics_pokemon_palettes_jolteon_palette:: @ 8D8CBF8 + .incbin "graphics/pokemon/palettes/jolteon_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xD8CBF8, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_jolteon_back_pic:: @ 8D8CC20 + .incbin "graphics/pokemon/back_pics/jolteon_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xD8CC20, 0x03AC + + .align 2 +gFile_graphics_pokemon_palettes_jolteon_shiny_palette:: @ 8D8CFCC + .incbin "graphics/pokemon/palettes/jolteon_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xD8CFCC, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_jolteon_icon:: @ 8D8CFF4 + .incbin "graphics/pokemon/icons/jolteon_icon.4bpp" + @ .incbin "baserom.gba", 0xD8CFF4, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_jolteon_footprint:: @ 8D8D3F4 + .incbin "graphics/pokemon/footprints/jolteon_footprint.1bpp" + @ .incbin "baserom.gba", 0xD8D3F4, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_flareon_still_front_pic:: @ 8D8D414 + .incbin "graphics/pokemon/front_pics/flareon_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xD8D414, 0x0384 + + .align 2 +gFile_graphics_pokemon_palettes_flareon_palette:: @ 8D8D798 + .incbin "graphics/pokemon/palettes/flareon_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xD8D798, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_flareon_back_pic:: @ 8D8D7C0 + .incbin "graphics/pokemon/back_pics/flareon_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xD8D7C0, 0x0390 + + .align 2 +gFile_graphics_pokemon_palettes_flareon_shiny_palette:: @ 8D8DB50 + .incbin "graphics/pokemon/palettes/flareon_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xD8DB50, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_flareon_icon:: @ 8D8DB78 + .incbin "graphics/pokemon/icons/flareon_icon.4bpp" + @ .incbin "baserom.gba", 0xD8DB78, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_flareon_footprint:: @ 8D8DF78 + .incbin "graphics/pokemon/footprints/flareon_footprint.1bpp" + @ .incbin "baserom.gba", 0xD8DF78, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_porygon_still_front_pic:: @ 8D8DF98 + .incbin "graphics/pokemon/front_pics/porygon_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xD8DF98, 0x02B8 + + .align 2 +gFile_graphics_pokemon_palettes_porygon_palette:: @ 8D8E250 + .incbin "graphics/pokemon/palettes/porygon_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xD8E250, 0x0024 + + .align 2 +gFile_graphics_pokemon_back_pics_porygon_back_pic:: @ 8D8E274 + .incbin "graphics/pokemon/back_pics/porygon_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xD8E274, 0x02B8 + + .align 2 +gFile_graphics_pokemon_palettes_porygon_shiny_palette:: @ 8D8E52C + .incbin "graphics/pokemon/palettes/porygon_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xD8E52C, 0x0024 + + .align 2 +gFile_graphics_pokemon_icons_porygon_icon:: @ 8D8E550 + .incbin "graphics/pokemon/icons/porygon_icon.4bpp" + @ .incbin "baserom.gba", 0xD8E550, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_porygon_footprint:: @ 8D8E950 + .incbin "graphics/pokemon/footprints/porygon_footprint.1bpp" + @ .incbin "baserom.gba", 0xD8E950, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_omanyte_still_front_pic:: @ 8D8E970 + .incbin "graphics/pokemon/front_pics/omanyte_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xD8E970, 0x0290 + + .align 2 +gFile_graphics_pokemon_palettes_omanyte_palette:: @ 8D8EC00 + .incbin "graphics/pokemon/palettes/omanyte_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xD8EC00, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_omanyte_back_pic:: @ 8D8EC28 + .incbin "graphics/pokemon/back_pics/omanyte_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xD8EC28, 0x034C + + .align 2 +gFile_graphics_pokemon_palettes_omanyte_shiny_palette:: @ 8D8EF74 + .incbin "graphics/pokemon/palettes/omanyte_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xD8EF74, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_omanyte_icon:: @ 8D8EF9C + .incbin "graphics/pokemon/icons/omanyte_icon.4bpp" + @ .incbin "baserom.gba", 0xD8EF9C, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_omanyte_footprint:: @ 8D8F39C + .incbin "graphics/pokemon/footprints/omanyte_footprint.1bpp" + @ .incbin "baserom.gba", 0xD8F39C, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_omastar_still_front_pic:: @ 8D8F3BC + .incbin "graphics/pokemon/front_pics/omastar_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xD8F3BC, 0x03C0 + + .align 2 +gFile_graphics_pokemon_palettes_omastar_palette:: @ 8D8F77C + .incbin "graphics/pokemon/palettes/omastar_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xD8F77C, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_omastar_back_pic:: @ 8D8F7A4 + .incbin "graphics/pokemon/back_pics/omastar_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xD8F7A4, 0x0340 + + .align 2 +gFile_graphics_pokemon_palettes_omastar_shiny_palette:: @ 8D8FAE4 + .incbin "graphics/pokemon/palettes/omastar_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xD8FAE4, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_omastar_icon:: @ 8D8FB0C + .incbin "graphics/pokemon/icons/omastar_icon.4bpp" + @ .incbin "baserom.gba", 0xD8FB0C, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_omastar_footprint:: @ 8D8FF0C + .incbin "graphics/pokemon/footprints/omastar_footprint.1bpp" + @ .incbin "baserom.gba", 0xD8FF0C, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_kabuto_still_front_pic:: @ 8D8FF2C + .incbin "graphics/pokemon/front_pics/kabuto_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xD8FF2C, 0x0228 + + .align 2 +gFile_graphics_pokemon_palettes_kabuto_palette:: @ 8D90154 + .incbin "graphics/pokemon/palettes/kabuto_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xD90154, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_kabuto_back_pic:: @ 8D9017C + .incbin "graphics/pokemon/back_pics/kabuto_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xD9017C, 0x0298 + + .align 2 +gFile_graphics_pokemon_palettes_kabuto_shiny_palette:: @ 8D90414 + .incbin "graphics/pokemon/palettes/kabuto_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xD90414, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_kabuto_icon:: @ 8D9043C + .incbin "graphics/pokemon/icons/kabuto_icon.4bpp" + @ .incbin "baserom.gba", 0xD9043C, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_kabuto_footprint:: @ 8D9083C + .incbin "graphics/pokemon/footprints/kabuto_footprint.1bpp" + @ .incbin "baserom.gba", 0xD9083C, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_kabutops_still_front_pic:: @ 8D9085C + .incbin "graphics/pokemon/front_pics/kabutops_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xD9085C, 0x0410 + + .align 2 +gFile_graphics_pokemon_palettes_kabutops_palette:: @ 8D90C6C + .incbin "graphics/pokemon/palettes/kabutops_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xD90C6C, 0x0024 + + .align 2 +gFile_graphics_pokemon_back_pics_kabutops_back_pic:: @ 8D90C90 + .incbin "graphics/pokemon/back_pics/kabutops_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xD90C90, 0x03A4 + + .align 2 +gFile_graphics_pokemon_palettes_kabutops_shiny_palette:: @ 8D91034 + .incbin "graphics/pokemon/palettes/kabutops_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xD91034, 0x0024 + + .align 2 +gFile_graphics_pokemon_icons_kabutops_icon:: @ 8D91058 + .incbin "graphics/pokemon/icons/kabutops_icon.4bpp" + @ .incbin "baserom.gba", 0xD91058, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_kabutops_footprint:: @ 8D91458 + .incbin "graphics/pokemon/footprints/kabutops_footprint.1bpp" + @ .incbin "baserom.gba", 0xD91458, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_aerodactyl_still_front_pic:: @ 8D91478 + .incbin "graphics/pokemon/front_pics/aerodactyl_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xD91478, 0x0450 + + .align 2 +gFile_graphics_pokemon_palettes_aerodactyl_palette:: @ 8D918C8 + .incbin "graphics/pokemon/palettes/aerodactyl_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xD918C8, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_aerodactyl_back_pic:: @ 8D918F0 + .incbin "graphics/pokemon/back_pics/aerodactyl_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xD918F0, 0x0304 + + .align 2 +gFile_graphics_pokemon_palettes_aerodactyl_shiny_palette:: @ 8D91BF4 + .incbin "graphics/pokemon/palettes/aerodactyl_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xD91BF4, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_aerodactyl_icon:: @ 8D91C1C + .incbin "graphics/pokemon/icons/aerodactyl_icon.4bpp" + @ .incbin "baserom.gba", 0xD91C1C, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_aerodactyl_footprint:: @ 8D9201C + .incbin "graphics/pokemon/footprints/aerodactyl_footprint.1bpp" + @ .incbin "baserom.gba", 0xD9201C, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_snorlax_still_front_pic:: @ 8D9203C + .incbin "graphics/pokemon/front_pics/snorlax_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xD9203C, 0x03D4 + + .align 2 +gFile_graphics_pokemon_palettes_snorlax_palette:: @ 8D92410 + .incbin "graphics/pokemon/palettes/snorlax_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xD92410, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_snorlax_back_pic:: @ 8D92438 + .incbin "graphics/pokemon/back_pics/snorlax_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xD92438, 0x021C + + .align 2 +gFile_graphics_pokemon_palettes_snorlax_shiny_palette:: @ 8D92654 + .incbin "graphics/pokemon/palettes/snorlax_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xD92654, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_snorlax_icon:: @ 8D9267C + .incbin "graphics/pokemon/icons/snorlax_icon.4bpp" + @ .incbin "baserom.gba", 0xD9267C, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_snorlax_footprint:: @ 8D92A7C + .incbin "graphics/pokemon/footprints/snorlax_footprint.1bpp" + @ .incbin "baserom.gba", 0xD92A7C, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_articuno_still_front_pic:: @ 8D92A9C + .incbin "graphics/pokemon/front_pics/articuno_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xD92A9C, 0x04F8 + + .align 2 +gFile_graphics_pokemon_palettes_articuno_palette:: @ 8D92F94 + .incbin "graphics/pokemon/palettes/articuno_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xD92F94, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_articuno_back_pic:: @ 8D92FBC + .incbin "graphics/pokemon/back_pics/articuno_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xD92FBC, 0x025C + + .align 2 +gFile_graphics_pokemon_palettes_articuno_shiny_palette:: @ 8D93218 + .incbin "graphics/pokemon/palettes/articuno_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xD93218, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_articuno_icon:: @ 8D93240 + .incbin "graphics/pokemon/icons/articuno_icon.4bpp" + @ .incbin "baserom.gba", 0xD93240, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_articuno_footprint:: @ 8D93640 + .incbin "graphics/pokemon/footprints/articuno_footprint.1bpp" + @ .incbin "baserom.gba", 0xD93640, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_zapdos_still_front_pic:: @ 8D93660 + .incbin "graphics/pokemon/front_pics/zapdos_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xD93660, 0x0450 + + .align 2 +gFile_graphics_pokemon_palettes_zapdos_palette:: @ 8D93AB0 + .incbin "graphics/pokemon/palettes/zapdos_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xD93AB0, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_zapdos_back_pic:: @ 8D93AD8 + .incbin "graphics/pokemon/back_pics/zapdos_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xD93AD8, 0x033C + + .align 2 +gFile_graphics_pokemon_palettes_zapdos_shiny_palette:: @ 8D93E14 + .incbin "graphics/pokemon/palettes/zapdos_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xD93E14, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_zapdos_icon:: @ 8D93E3C + .incbin "graphics/pokemon/icons/zapdos_icon.4bpp" + @ .incbin "baserom.gba", 0xD93E3C, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_zapdos_footprint:: @ 8D9423C + .incbin "graphics/pokemon/footprints/zapdos_footprint.1bpp" + @ .incbin "baserom.gba", 0xD9423C, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_moltres_still_front_pic:: @ 8D9425C + .incbin "graphics/pokemon/front_pics/moltres_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xD9425C, 0x04CC + + .align 2 +gFile_graphics_pokemon_palettes_moltres_palette:: @ 8D94728 + .incbin "graphics/pokemon/palettes/moltres_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xD94728, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_moltres_back_pic:: @ 8D94750 + .incbin "graphics/pokemon/back_pics/moltres_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xD94750, 0x033C + + .align 2 +gFile_graphics_pokemon_palettes_moltres_shiny_palette:: @ 8D94A8C + .incbin "graphics/pokemon/palettes/moltres_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xD94A8C, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_moltres_icon:: @ 8D94AB4 + .incbin "graphics/pokemon/icons/moltres_icon.4bpp" + @ .incbin "baserom.gba", 0xD94AB4, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_moltres_footprint:: @ 8D94EB4 + .incbin "graphics/pokemon/footprints/moltres_footprint.1bpp" + @ .incbin "baserom.gba", 0xD94EB4, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_dratini_still_front_pic:: @ 8D94ED4 + .incbin "graphics/pokemon/front_pics/dratini_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xD94ED4, 0x02BC + + .align 2 +gFile_graphics_pokemon_palettes_dratini_palette:: @ 8D95190 + .incbin "graphics/pokemon/palettes/dratini_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xD95190, 0x0024 + + .align 2 +gFile_graphics_pokemon_back_pics_dratini_back_pic:: @ 8D951B4 + .incbin "graphics/pokemon/back_pics/dratini_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xD951B4, 0x0290 + + .align 2 +gFile_graphics_pokemon_palettes_dratini_shiny_palette:: @ 8D95444 + .incbin "graphics/pokemon/palettes/dratini_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xD95444, 0x0024 + + .align 2 +gFile_graphics_pokemon_icons_dratini_icon:: @ 8D95468 + .incbin "graphics/pokemon/icons/dratini_icon.4bpp" + @ .incbin "baserom.gba", 0xD95468, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_dratini_footprint:: @ 8D95868 + .incbin "graphics/pokemon/footprints/dratini_footprint.1bpp" + @ .incbin "baserom.gba", 0xD95868, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_dragonair_still_front_pic:: @ 8D95888 + .incbin "graphics/pokemon/front_pics/dragonair_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xD95888, 0x0398 + + .align 2 +gFile_graphics_pokemon_palettes_dragonair_palette:: @ 8D95C20 + .incbin "graphics/pokemon/palettes/dragonair_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xD95C20, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_dragonair_back_pic:: @ 8D95C48 + .incbin "graphics/pokemon/back_pics/dragonair_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xD95C48, 0x0310 + + .align 2 +gFile_graphics_pokemon_palettes_dragonair_shiny_palette:: @ 8D95F58 + .incbin "graphics/pokemon/palettes/dragonair_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xD95F58, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_dragonair_icon:: @ 8D95F80 + .incbin "graphics/pokemon/icons/dragonair_icon.4bpp" + @ .incbin "baserom.gba", 0xD95F80, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_dragonair_footprint:: @ 8D96380 + .incbin "graphics/pokemon/footprints/dragonair_footprint.1bpp" + @ .incbin "baserom.gba", 0xD96380, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_dragonite_still_front_pic:: @ 8D963A0 + .incbin "graphics/pokemon/front_pics/dragonite_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xD963A0, 0x0550 + + .align 2 +gFile_graphics_pokemon_palettes_dragonite_palette:: @ 8D968F0 + .incbin "graphics/pokemon/palettes/dragonite_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xD968F0, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_dragonite_back_pic:: @ 8D96918 + .incbin "graphics/pokemon/back_pics/dragonite_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xD96918, 0x02F8 + + .align 2 +gFile_graphics_pokemon_palettes_dragonite_shiny_palette:: @ 8D96C10 + .incbin "graphics/pokemon/palettes/dragonite_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xD96C10, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_dragonite_icon:: @ 8D96C38 + .incbin "graphics/pokemon/icons/dragonite_icon.4bpp" + @ .incbin "baserom.gba", 0xD96C38, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_dragonite_footprint:: @ 8D97038 + .incbin "graphics/pokemon/footprints/dragonite_footprint.1bpp" + @ .incbin "baserom.gba", 0xD97038, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_mewtwo_still_front_pic:: @ 8D97058 + .incbin "graphics/pokemon/front_pics/mewtwo_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xD97058, 0x043C + + .align 2 +gFile_graphics_pokemon_palettes_mewtwo_palette:: @ 8D97494 + .incbin "graphics/pokemon/palettes/mewtwo_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xD97494, 0x0024 + + .align 2 +gFile_graphics_pokemon_back_pics_mewtwo_back_pic:: @ 8D974B8 + .incbin "graphics/pokemon/back_pics/mewtwo_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xD974B8, 0x03CC + + .align 2 +gFile_graphics_pokemon_palettes_mewtwo_shiny_palette:: @ 8D97884 + .incbin "graphics/pokemon/palettes/mewtwo_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xD97884, 0x0024 + + .align 2 +gFile_graphics_pokemon_icons_mewtwo_icon:: @ 8D978A8 + .incbin "graphics/pokemon/icons/mewtwo_icon.4bpp" + @ .incbin "baserom.gba", 0xD978A8, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_mewtwo_footprint:: @ 8D97CA8 + .incbin "graphics/pokemon/footprints/mewtwo_footprint.1bpp" + @ .incbin "baserom.gba", 0xD97CA8, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_mew_still_front_pic:: @ 8D97CC8 + .incbin "graphics/pokemon/front_pics/mew_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xD97CC8, 0x02C0 + + .align 2 +gFile_graphics_pokemon_palettes_mew_palette:: @ 8D97F88 + .incbin "graphics/pokemon/palettes/mew_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xD97F88, 0x0024 + + .align 2 +gFile_graphics_pokemon_back_pics_mew_back_pic:: @ 8D97FAC + .incbin "graphics/pokemon/back_pics/mew_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xD97FAC, 0x0350 + + .align 2 +gFile_graphics_pokemon_palettes_mew_shiny_palette:: @ 8D982FC + .incbin "graphics/pokemon/palettes/mew_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xD982FC, 0x0024 + + .align 2 +gFile_graphics_pokemon_icons_mew_icon:: @ 8D98320 + .incbin "graphics/pokemon/icons/mew_icon.4bpp" + @ .incbin "baserom.gba", 0xD98320, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_mew_footprint:: @ 8D98720 + .incbin "graphics/pokemon/footprints/mew_footprint.1bpp" + @ .incbin "baserom.gba", 0xD98720, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_chikorita_still_front_pic:: @ 8D98740 + .incbin "graphics/pokemon/front_pics/chikorita_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xD98740, 0x0268 + + .align 2 +gFile_graphics_pokemon_palettes_chikorita_palette:: @ 8D989A8 + .incbin "graphics/pokemon/palettes/chikorita_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xD989A8, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_chikorita_back_pic:: @ 8D989D0 + .incbin "graphics/pokemon/back_pics/chikorita_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xD989D0, 0x02C4 + + .align 2 +gFile_graphics_pokemon_palettes_chikorita_shiny_palette:: @ 8D98C94 + .incbin "graphics/pokemon/palettes/chikorita_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xD98C94, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_chikorita_icon:: @ 8D98CBC + .incbin "graphics/pokemon/icons/chikorita_icon.4bpp" + @ .incbin "baserom.gba", 0xD98CBC, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_chikorita_footprint:: @ 8D990BC + .incbin "graphics/pokemon/footprints/chikorita_footprint.1bpp" + @ .incbin "baserom.gba", 0xD990BC, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_bayleef_still_front_pic:: @ 8D990DC + .incbin "graphics/pokemon/front_pics/bayleef_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xD990DC, 0x03D4 + + .align 2 +gFile_graphics_pokemon_palettes_bayleef_palette:: @ 8D994B0 + .incbin "graphics/pokemon/palettes/bayleef_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xD994B0, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_bayleef_back_pic:: @ 8D994D8 + .incbin "graphics/pokemon/back_pics/bayleef_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xD994D8, 0x0390 + + .align 2 +gFile_graphics_pokemon_palettes_bayleef_shiny_palette:: @ 8D99868 + .incbin "graphics/pokemon/palettes/bayleef_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xD99868, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_bayleef_icon:: @ 8D99890 + .incbin "graphics/pokemon/icons/bayleef_icon.4bpp" + @ .incbin "baserom.gba", 0xD99890, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_bayleef_footprint:: @ 8D99C90 + .incbin "graphics/pokemon/footprints/bayleef_footprint.1bpp" + @ .incbin "baserom.gba", 0xD99C90, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_meganium_still_front_pic:: @ 8D99CB0 + .incbin "graphics/pokemon/front_pics/meganium_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xD99CB0, 0x055C + + .align 2 +gFile_graphics_pokemon_palettes_meganium_palette:: @ 8D9A20C + .incbin "graphics/pokemon/palettes/meganium_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xD9A20C, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_meganium_back_pic:: @ 8D9A234 + .incbin "graphics/pokemon/back_pics/meganium_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xD9A234, 0x0350 + + .align 2 +gFile_graphics_pokemon_palettes_meganium_shiny_palette:: @ 8D9A584 + .incbin "graphics/pokemon/palettes/meganium_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xD9A584, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_meganium_icon:: @ 8D9A5AC + .incbin "graphics/pokemon/icons/meganium_icon.4bpp" + @ .incbin "baserom.gba", 0xD9A5AC, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_meganium_footprint:: @ 8D9A9AC + .incbin "graphics/pokemon/footprints/meganium_footprint.1bpp" + @ .incbin "baserom.gba", 0xD9A9AC, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_cyndaquil_still_front_pic:: @ 8D9A9CC + .incbin "graphics/pokemon/front_pics/cyndaquil_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xD9A9CC, 0x028C + + .align 2 +gFile_graphics_pokemon_palettes_cyndaquil_palette:: @ 8D9AC58 + .incbin "graphics/pokemon/palettes/cyndaquil_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xD9AC58, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_cyndaquil_back_pic:: @ 8D9AC80 + .incbin "graphics/pokemon/back_pics/cyndaquil_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xD9AC80, 0x032C + + .align 2 +gFile_graphics_pokemon_palettes_cyndaquil_shiny_palette:: @ 8D9AFAC + .incbin "graphics/pokemon/palettes/cyndaquil_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xD9AFAC, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_cyndaquil_icon:: @ 8D9AFD4 + .incbin "graphics/pokemon/icons/cyndaquil_icon.4bpp" + @ .incbin "baserom.gba", 0xD9AFD4, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_cyndaquil_footprint:: @ 8D9B3D4 + .incbin "graphics/pokemon/footprints/cyndaquil_footprint.1bpp" + @ .incbin "baserom.gba", 0xD9B3D4, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_quilava_still_front_pic:: @ 8D9B3F4 + .incbin "graphics/pokemon/front_pics/quilava_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xD9B3F4, 0x031C + + .align 2 +gFile_graphics_pokemon_palettes_quilava_palette:: @ 8D9B710 + .incbin "graphics/pokemon/palettes/quilava_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xD9B710, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_quilava_back_pic:: @ 8D9B738 + .incbin "graphics/pokemon/back_pics/quilava_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xD9B738, 0x0374 + + .align 2 +gFile_graphics_pokemon_palettes_quilava_shiny_palette:: @ 8D9BAAC + .incbin "graphics/pokemon/palettes/quilava_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xD9BAAC, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_quilava_icon:: @ 8D9BAD4 + .incbin "graphics/pokemon/icons/quilava_icon.4bpp" + @ .incbin "baserom.gba", 0xD9BAD4, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_quilava_footprint:: @ 8D9BED4 + .incbin "graphics/pokemon/footprints/quilava_footprint.1bpp" + @ .incbin "baserom.gba", 0xD9BED4, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_typhlosion_still_front_pic:: @ 8D9BEF4 + .incbin "graphics/pokemon/front_pics/typhlosion_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xD9BEF4, 0x0428 + + .align 2 +gFile_graphics_pokemon_palettes_typhlosion_palette:: @ 8D9C31C + .incbin "graphics/pokemon/palettes/typhlosion_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xD9C31C, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_typhlosion_back_pic:: @ 8D9C344 + .incbin "graphics/pokemon/back_pics/typhlosion_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xD9C344, 0x0404 + + .align 2 +gFile_graphics_pokemon_palettes_typhlosion_shiny_palette:: @ 8D9C748 + .incbin "graphics/pokemon/palettes/typhlosion_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xD9C748, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_typhlosion_icon:: @ 8D9C770 + .incbin "graphics/pokemon/icons/typhlosion_icon.4bpp" + @ .incbin "baserom.gba", 0xD9C770, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_typhlosion_footprint:: @ 8D9CB70 + .incbin "graphics/pokemon/footprints/typhlosion_footprint.1bpp" + @ .incbin "baserom.gba", 0xD9CB70, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_totodile_still_front_pic:: @ 8D9CB90 + .incbin "graphics/pokemon/front_pics/totodile_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xD9CB90, 0x02A4 + + .align 2 +gFile_graphics_pokemon_palettes_totodile_palette:: @ 8D9CE34 + .incbin "graphics/pokemon/palettes/totodile_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xD9CE34, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_totodile_back_pic:: @ 8D9CE5C + .incbin "graphics/pokemon/back_pics/totodile_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xD9CE5C, 0x02E0 + + .align 2 +gFile_graphics_pokemon_palettes_totodile_shiny_palette:: @ 8D9D13C + .incbin "graphics/pokemon/palettes/totodile_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xD9D13C, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_totodile_icon:: @ 8D9D164 + .incbin "graphics/pokemon/icons/totodile_icon.4bpp" + @ .incbin "baserom.gba", 0xD9D164, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_totodile_footprint:: @ 8D9D564 + .incbin "graphics/pokemon/footprints/totodile_footprint.1bpp" + @ .incbin "baserom.gba", 0xD9D564, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_croconaw_still_front_pic:: @ 8D9D584 + .incbin "graphics/pokemon/front_pics/croconaw_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xD9D584, 0x0368 + + .align 2 +gFile_graphics_pokemon_palettes_croconaw_palette:: @ 8D9D8EC + .incbin "graphics/pokemon/palettes/croconaw_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xD9D8EC, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_croconaw_back_pic:: @ 8D9D914 + .incbin "graphics/pokemon/back_pics/croconaw_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xD9D914, 0x0350 + + .align 2 +gFile_graphics_pokemon_palettes_croconaw_shiny_palette:: @ 8D9DC64 + .incbin "graphics/pokemon/palettes/croconaw_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xD9DC64, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_croconaw_icon:: @ 8D9DC8C + .incbin "graphics/pokemon/icons/croconaw_icon.4bpp" + @ .incbin "baserom.gba", 0xD9DC8C, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_croconaw_footprint:: @ 8D9E08C + .incbin "graphics/pokemon/footprints/croconaw_footprint.1bpp" + @ .incbin "baserom.gba", 0xD9E08C, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_feraligatr_still_front_pic:: @ 8D9E0AC + .incbin "graphics/pokemon/front_pics/feraligatr_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xD9E0AC, 0x056C + + .align 2 +gFile_graphics_pokemon_palettes_feraligatr_palette:: @ 8D9E618 + .incbin "graphics/pokemon/palettes/feraligatr_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xD9E618, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_feraligatr_back_pic:: @ 8D9E640 + .incbin "graphics/pokemon/back_pics/feraligatr_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xD9E640, 0x04CC + + .align 2 +gFile_graphics_pokemon_palettes_feraligatr_shiny_palette:: @ 8D9EB0C + .incbin "graphics/pokemon/palettes/feraligatr_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xD9EB0C, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_feraligatr_icon:: @ 8D9EB34 + .incbin "graphics/pokemon/icons/feraligatr_icon.4bpp" + @ .incbin "baserom.gba", 0xD9EB34, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_feraligatr_footprint:: @ 8D9EF34 + .incbin "graphics/pokemon/footprints/feraligatr_footprint.1bpp" + @ .incbin "baserom.gba", 0xD9EF34, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_sentret_still_front_pic:: @ 8D9EF54 + .incbin "graphics/pokemon/front_pics/sentret_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xD9EF54, 0x02DC + + .align 2 +gFile_graphics_pokemon_palettes_sentret_palette:: @ 8D9F230 + .incbin "graphics/pokemon/palettes/sentret_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xD9F230, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_sentret_back_pic:: @ 8D9F258 + .incbin "graphics/pokemon/back_pics/sentret_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xD9F258, 0x02A4 + + .align 2 +gFile_graphics_pokemon_palettes_sentret_shiny_palette:: @ 8D9F4FC + .incbin "graphics/pokemon/palettes/sentret_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xD9F4FC, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_sentret_icon:: @ 8D9F524 + .incbin "graphics/pokemon/icons/sentret_icon.4bpp" + @ .incbin "baserom.gba", 0xD9F524, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_sentret_footprint:: @ 8D9F924 + .incbin "graphics/pokemon/footprints/sentret_footprint.1bpp" + @ .incbin "baserom.gba", 0xD9F924, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_furret_still_front_pic:: @ 8D9F944 + .incbin "graphics/pokemon/front_pics/furret_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xD9F944, 0x0334 + + .align 2 +gFile_graphics_pokemon_palettes_furret_palette:: @ 8D9FC78 + .incbin "graphics/pokemon/palettes/furret_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xD9FC78, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_furret_back_pic:: @ 8D9FCA0 + .incbin "graphics/pokemon/back_pics/furret_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xD9FCA0, 0x0328 + + .align 2 +gFile_graphics_pokemon_palettes_furret_shiny_palette:: @ 8D9FFC8 + .incbin "graphics/pokemon/palettes/furret_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xD9FFC8, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_furret_icon:: @ 8D9FFF0 + .incbin "graphics/pokemon/icons/furret_icon.4bpp" + @ .incbin "baserom.gba", 0xD9FFF0, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_furret_footprint:: @ 8DA03F0 + .incbin "graphics/pokemon/footprints/furret_footprint.1bpp" + @ .incbin "baserom.gba", 0xDA03F0, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_hoothoot_still_front_pic:: @ 8DA0410 + .incbin "graphics/pokemon/front_pics/hoothoot_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xDA0410, 0x0284 + + .align 2 +gFile_graphics_pokemon_palettes_hoothoot_palette:: @ 8DA0694 + .incbin "graphics/pokemon/palettes/hoothoot_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xDA0694, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_hoothoot_back_pic:: @ 8DA06BC + .incbin "graphics/pokemon/back_pics/hoothoot_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xDA06BC, 0x0308 + + .align 2 +gFile_graphics_pokemon_palettes_hoothoot_shiny_palette:: @ 8DA09C4 + .incbin "graphics/pokemon/palettes/hoothoot_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xDA09C4, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_hoothoot_icon:: @ 8DA09EC + .incbin "graphics/pokemon/icons/hoothoot_icon.4bpp" + @ .incbin "baserom.gba", 0xDA09EC, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_hoothoot_footprint:: @ 8DA0DEC + .incbin "graphics/pokemon/footprints/hoothoot_footprint.1bpp" + @ .incbin "baserom.gba", 0xDA0DEC, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_noctowl_still_front_pic:: @ 8DA0E0C + .incbin "graphics/pokemon/front_pics/noctowl_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xDA0E0C, 0x0354 + + .align 2 +gFile_graphics_pokemon_palettes_noctowl_palette:: @ 8DA1160 + .incbin "graphics/pokemon/palettes/noctowl_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xDA1160, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_noctowl_back_pic:: @ 8DA1188 + .incbin "graphics/pokemon/back_pics/noctowl_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xDA1188, 0x035C + + .align 2 +gFile_graphics_pokemon_palettes_noctowl_shiny_palette:: @ 8DA14E4 + .incbin "graphics/pokemon/palettes/noctowl_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xDA14E4, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_noctowl_icon:: @ 8DA150C + .incbin "graphics/pokemon/icons/noctowl_icon.4bpp" + @ .incbin "baserom.gba", 0xDA150C, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_noctowl_footprint:: @ 8DA190C + .incbin "graphics/pokemon/footprints/noctowl_footprint.1bpp" + @ .incbin "baserom.gba", 0xDA190C, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_ledyba_still_front_pic:: @ 8DA192C + .incbin "graphics/pokemon/front_pics/ledyba_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xDA192C, 0x02F4 + + .align 2 +gFile_graphics_pokemon_palettes_ledyba_palette:: @ 8DA1C20 + .incbin "graphics/pokemon/palettes/ledyba_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xDA1C20, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_ledyba_back_pic:: @ 8DA1C48 + .incbin "graphics/pokemon/back_pics/ledyba_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xDA1C48, 0x0330 + + .align 2 +gFile_graphics_pokemon_palettes_ledyba_shiny_palette:: @ 8DA1F78 + .incbin "graphics/pokemon/palettes/ledyba_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xDA1F78, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_ledyba_icon:: @ 8DA1FA0 + .incbin "graphics/pokemon/icons/ledyba_icon.4bpp" + @ .incbin "baserom.gba", 0xDA1FA0, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_ledyba_footprint:: @ 8DA23A0 + .incbin "graphics/pokemon/footprints/ledyba_footprint.1bpp" + @ .incbin "baserom.gba", 0xDA23A0, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_ledian_still_front_pic:: @ 8DA23C0 + .incbin "graphics/pokemon/front_pics/ledian_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xDA23C0, 0x0388 + + .align 2 +gFile_graphics_pokemon_palettes_ledian_palette:: @ 8DA2748 + .incbin "graphics/pokemon/palettes/ledian_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xDA2748, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_ledian_back_pic:: @ 8DA2770 + .incbin "graphics/pokemon/back_pics/ledian_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xDA2770, 0x0358 + + .align 2 +gFile_graphics_pokemon_palettes_ledian_shiny_palette:: @ 8DA2AC8 + .incbin "graphics/pokemon/palettes/ledian_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xDA2AC8, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_ledian_icon:: @ 8DA2AF0 + .incbin "graphics/pokemon/icons/ledian_icon.4bpp" + @ .incbin "baserom.gba", 0xDA2AF0, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_ledian_footprint:: @ 8DA2EF0 + .incbin "graphics/pokemon/footprints/ledian_footprint.1bpp" + @ .incbin "baserom.gba", 0xDA2EF0, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_spinarak_still_front_pic:: @ 8DA2F10 + .incbin "graphics/pokemon/front_pics/spinarak_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xDA2F10, 0x0274 + + .align 2 +gFile_graphics_pokemon_palettes_spinarak_palette:: @ 8DA3184 + .incbin "graphics/pokemon/palettes/spinarak_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xDA3184, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_spinarak_back_pic:: @ 8DA31AC + .incbin "graphics/pokemon/back_pics/spinarak_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xDA31AC, 0x0264 + + .align 2 +gFile_graphics_pokemon_palettes_spinarak_shiny_palette:: @ 8DA3410 + .incbin "graphics/pokemon/palettes/spinarak_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xDA3410, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_spinarak_icon:: @ 8DA3438 + .incbin "graphics/pokemon/icons/spinarak_icon.4bpp" + @ .incbin "baserom.gba", 0xDA3438, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_spinarak_footprint:: @ 8DA3838 + .incbin "graphics/pokemon/footprints/spinarak_footprint.1bpp" + @ .incbin "baserom.gba", 0xDA3838, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_ariados_still_front_pic:: @ 8DA3858 + .incbin "graphics/pokemon/front_pics/ariados_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xDA3858, 0x03C0 + + .align 2 +gFile_graphics_pokemon_palettes_ariados_palette:: @ 8DA3C18 + .incbin "graphics/pokemon/palettes/ariados_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xDA3C18, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_ariados_back_pic:: @ 8DA3C40 + .incbin "graphics/pokemon/back_pics/ariados_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xDA3C40, 0x0378 + + .align 2 +gFile_graphics_pokemon_palettes_ariados_shiny_palette:: @ 8DA3FB8 + .incbin "graphics/pokemon/palettes/ariados_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xDA3FB8, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_ariados_icon:: @ 8DA3FE0 + .incbin "graphics/pokemon/icons/ariados_icon.4bpp" + @ .incbin "baserom.gba", 0xDA3FE0, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_ariados_footprint:: @ 8DA43E0 + .incbin "graphics/pokemon/footprints/ariados_footprint.1bpp" + @ .incbin "baserom.gba", 0xDA43E0, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_crobat_still_front_pic:: @ 8DA4400 + .incbin "graphics/pokemon/front_pics/crobat_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xDA4400, 0x03B0 + + .align 2 +gFile_graphics_pokemon_palettes_crobat_palette:: @ 8DA47B0 + .incbin "graphics/pokemon/palettes/crobat_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xDA47B0, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_crobat_back_pic:: @ 8DA47D8 + .incbin "graphics/pokemon/back_pics/crobat_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xDA47D8, 0x0308 + + .align 2 +gFile_graphics_pokemon_palettes_crobat_shiny_palette:: @ 8DA4AE0 + .incbin "graphics/pokemon/palettes/crobat_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xDA4AE0, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_crobat_icon:: @ 8DA4B08 + .incbin "graphics/pokemon/icons/crobat_icon.4bpp" + @ .incbin "baserom.gba", 0xDA4B08, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_crobat_footprint:: @ 8DA4F08 + .incbin "graphics/pokemon/footprints/crobat_footprint.1bpp" + @ .incbin "baserom.gba", 0xDA4F08, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_chinchou_still_front_pic:: @ 8DA4F28 + .incbin "graphics/pokemon/front_pics/chinchou_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xDA4F28, 0x02D8 + + .align 2 +gFile_graphics_pokemon_palettes_chinchou_palette:: @ 8DA5200 + .incbin "graphics/pokemon/palettes/chinchou_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xDA5200, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_chinchou_back_pic:: @ 8DA5228 + .incbin "graphics/pokemon/back_pics/chinchou_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xDA5228, 0x02F8 + + .align 2 +gFile_graphics_pokemon_palettes_chinchou_shiny_palette:: @ 8DA5520 + .incbin "graphics/pokemon/palettes/chinchou_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xDA5520, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_chinchou_icon:: @ 8DA5548 + .incbin "graphics/pokemon/icons/chinchou_icon.4bpp" + @ .incbin "baserom.gba", 0xDA5548, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_chinchou_footprint:: @ 8DA5948 + .incbin "graphics/pokemon/footprints/chinchou_footprint.1bpp" + @ .incbin "baserom.gba", 0xDA5948, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_lanturn_still_front_pic:: @ 8DA5968 + .incbin "graphics/pokemon/front_pics/lanturn_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xDA5968, 0x0370 + + .align 2 +gFile_graphics_pokemon_palettes_lanturn_palette:: @ 8DA5CD8 + .incbin "graphics/pokemon/palettes/lanturn_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xDA5CD8, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_lanturn_back_pic:: @ 8DA5D00 + .incbin "graphics/pokemon/back_pics/lanturn_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xDA5D00, 0x0300 + + .align 2 +gFile_graphics_pokemon_palettes_lanturn_shiny_palette:: @ 8DA6000 + .incbin "graphics/pokemon/palettes/lanturn_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xDA6000, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_lanturn_icon:: @ 8DA6028 + .incbin "graphics/pokemon/icons/lanturn_icon.4bpp" + @ .incbin "baserom.gba", 0xDA6028, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_lanturn_footprint:: @ 8DA6428 + .incbin "graphics/pokemon/footprints/lanturn_footprint.1bpp" + @ .incbin "baserom.gba", 0xDA6428, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_pichu_still_front_pic:: @ 8DA6448 + .incbin "graphics/pokemon/front_pics/pichu_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xDA6448, 0x021C + + .align 2 +gFile_graphics_pokemon_palettes_pichu_palette:: @ 8DA6664 + .incbin "graphics/pokemon/palettes/pichu_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xDA6664, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_pichu_back_pic:: @ 8DA668C + .incbin "graphics/pokemon/back_pics/pichu_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xDA668C, 0x025C + + .align 2 +gFile_graphics_pokemon_palettes_pichu_shiny_palette:: @ 8DA68E8 + .incbin "graphics/pokemon/palettes/pichu_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xDA68E8, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_pichu_icon:: @ 8DA6910 + .incbin "graphics/pokemon/icons/pichu_icon.4bpp" + @ .incbin "baserom.gba", 0xDA6910, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_pichu_footprint:: @ 8DA6D10 + .incbin "graphics/pokemon/footprints/pichu_footprint.1bpp" + @ .incbin "baserom.gba", 0xDA6D10, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_cleffa_still_front_pic:: @ 8DA6D30 + .incbin "graphics/pokemon/front_pics/cleffa_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xDA6D30, 0x01E0 + + .align 2 +gFile_graphics_pokemon_palettes_cleffa_palette:: @ 8DA6F10 + .incbin "graphics/pokemon/palettes/cleffa_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xDA6F10, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_cleffa_back_pic:: @ 8DA6F38 + .incbin "graphics/pokemon/back_pics/cleffa_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xDA6F38, 0x023C + + .align 2 +gFile_graphics_pokemon_palettes_cleffa_shiny_palette:: @ 8DA7174 + .incbin "graphics/pokemon/palettes/cleffa_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xDA7174, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_cleffa_icon:: @ 8DA719C + .incbin "graphics/pokemon/icons/cleffa_icon.4bpp" + @ .incbin "baserom.gba", 0xDA719C, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_cleffa_footprint:: @ 8DA759C + .incbin "graphics/pokemon/footprints/cleffa_footprint.1bpp" + @ .incbin "baserom.gba", 0xDA759C, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_igglybuff_still_front_pic:: @ 8DA75BC + .incbin "graphics/pokemon/front_pics/igglybuff_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xDA75BC, 0x01E8 + + .align 2 +gFile_graphics_pokemon_palettes_igglybuff_palette:: @ 8DA77A4 + .incbin "graphics/pokemon/palettes/igglybuff_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xDA77A4, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_igglybuff_back_pic:: @ 8DA77CC + .incbin "graphics/pokemon/back_pics/igglybuff_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xDA77CC, 0x023C + + .align 2 +gFile_graphics_pokemon_palettes_igglybuff_shiny_palette:: @ 8DA7A08 + .incbin "graphics/pokemon/palettes/igglybuff_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xDA7A08, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_igglybuff_icon:: @ 8DA7A30 + .incbin "graphics/pokemon/icons/igglybuff_icon.4bpp" + @ .incbin "baserom.gba", 0xDA7A30, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_igglybuff_footprint:: @ 8DA7E30 + .incbin "graphics/pokemon/footprints/igglybuff_footprint.1bpp" + @ .incbin "baserom.gba", 0xDA7E30, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_togepi_still_front_pic:: @ 8DA7E50 + .incbin "graphics/pokemon/front_pics/togepi_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xDA7E50, 0x01D4 + + .align 2 +gFile_graphics_pokemon_palettes_togepi_palette:: @ 8DA8024 + .incbin "graphics/pokemon/palettes/togepi_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xDA8024, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_togepi_back_pic:: @ 8DA804C + .incbin "graphics/pokemon/back_pics/togepi_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xDA804C, 0x0274 + + .align 2 +gFile_graphics_pokemon_palettes_togepi_shiny_palette:: @ 8DA82C0 + .incbin "graphics/pokemon/palettes/togepi_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xDA82C0, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_togepi_icon:: @ 8DA82E8 + .incbin "graphics/pokemon/icons/togepi_icon.4bpp" + @ .incbin "baserom.gba", 0xDA82E8, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_togepi_footprint:: @ 8DA86E8 + .incbin "graphics/pokemon/footprints/togepi_footprint.1bpp" + @ .incbin "baserom.gba", 0xDA86E8, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_togetic_still_front_pic:: @ 8DA8708 + .incbin "graphics/pokemon/front_pics/togetic_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xDA8708, 0x0274 + + .align 2 +gFile_graphics_pokemon_palettes_togetic_palette:: @ 8DA897C + .incbin "graphics/pokemon/palettes/togetic_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xDA897C, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_togetic_back_pic:: @ 8DA89A4 + .incbin "graphics/pokemon/back_pics/togetic_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xDA89A4, 0x032C + + .align 2 +gFile_graphics_pokemon_palettes_togetic_shiny_palette:: @ 8DA8CD0 + .incbin "graphics/pokemon/palettes/togetic_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xDA8CD0, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_togetic_icon:: @ 8DA8CF8 + .incbin "graphics/pokemon/icons/togetic_icon.4bpp" + @ .incbin "baserom.gba", 0xDA8CF8, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_togetic_footprint:: @ 8DA90F8 + .incbin "graphics/pokemon/footprints/togetic_footprint.1bpp" + @ .incbin "baserom.gba", 0xDA90F8, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_natu_still_front_pic:: @ 8DA9118 + .incbin "graphics/pokemon/front_pics/natu_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xDA9118, 0x01CC + + .align 2 +gFile_graphics_pokemon_palettes_natu_palette:: @ 8DA92E4 + .incbin "graphics/pokemon/palettes/natu_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xDA92E4, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_natu_back_pic:: @ 8DA930C + .incbin "graphics/pokemon/back_pics/natu_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xDA930C, 0x0214 + + .align 2 +gFile_graphics_pokemon_palettes_natu_shiny_palette:: @ 8DA9520 + .incbin "graphics/pokemon/palettes/natu_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xDA9520, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_natu_icon:: @ 8DA9548 + .incbin "graphics/pokemon/icons/natu_icon.4bpp" + @ .incbin "baserom.gba", 0xDA9548, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_natu_footprint:: @ 8DA9948 + .incbin "graphics/pokemon/footprints/natu_footprint.1bpp" + @ .incbin "baserom.gba", 0xDA9948, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_xatu_still_front_pic:: @ 8DA9968 + .incbin "graphics/pokemon/front_pics/xatu_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xDA9968, 0x02DC + + .align 2 +gFile_graphics_pokemon_palettes_xatu_palette:: @ 8DA9C44 + .incbin "graphics/pokemon/palettes/xatu_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xDA9C44, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_xatu_back_pic:: @ 8DA9C6C + .incbin "graphics/pokemon/back_pics/xatu_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xDA9C6C, 0x0378 + + .align 2 +gFile_graphics_pokemon_palettes_xatu_shiny_palette:: @ 8DA9FE4 + .incbin "graphics/pokemon/palettes/xatu_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xDA9FE4, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_xatu_icon:: @ 8DAA00C + .incbin "graphics/pokemon/icons/xatu_icon.4bpp" + @ .incbin "baserom.gba", 0xDAA00C, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_xatu_footprint:: @ 8DAA40C + .incbin "graphics/pokemon/footprints/xatu_footprint.1bpp" + @ .incbin "baserom.gba", 0xDAA40C, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_mareep_still_front_pic:: @ 8DAA42C + .incbin "graphics/pokemon/front_pics/mareep_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xDAA42C, 0x02B4 + + .align 2 +gFile_graphics_pokemon_palettes_mareep_palette:: @ 8DAA6E0 + .incbin "graphics/pokemon/palettes/mareep_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xDAA6E0, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_mareep_back_pic:: @ 8DAA708 + .incbin "graphics/pokemon/back_pics/mareep_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xDAA708, 0x02F4 + + .align 2 +gFile_graphics_pokemon_palettes_mareep_shiny_palette:: @ 8DAA9FC + .incbin "graphics/pokemon/palettes/mareep_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xDAA9FC, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_mareep_icon:: @ 8DAAA24 + .incbin "graphics/pokemon/icons/mareep_icon.4bpp" + @ .incbin "baserom.gba", 0xDAAA24, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_mareep_footprint:: @ 8DAAE24 + .incbin "graphics/pokemon/footprints/mareep_footprint.1bpp" + @ .incbin "baserom.gba", 0xDAAE24, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_flaaffy_still_front_pic:: @ 8DAAE44 + .incbin "graphics/pokemon/front_pics/flaaffy_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xDAAE44, 0x0300 + + .align 2 +gFile_graphics_pokemon_palettes_flaaffy_palette:: @ 8DAB144 + .incbin "graphics/pokemon/palettes/flaaffy_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xDAB144, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_flaaffy_back_pic:: @ 8DAB16C + .incbin "graphics/pokemon/back_pics/flaaffy_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xDAB16C, 0x031C + + .align 2 +gFile_graphics_pokemon_palettes_flaaffy_shiny_palette:: @ 8DAB488 + .incbin "graphics/pokemon/palettes/flaaffy_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xDAB488, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_flaaffy_icon:: @ 8DAB4B0 + .incbin "graphics/pokemon/icons/flaaffy_icon.4bpp" + @ .incbin "baserom.gba", 0xDAB4B0, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_flaaffy_footprint:: @ 8DAB8B0 + .incbin "graphics/pokemon/footprints/flaaffy_footprint.1bpp" + @ .incbin "baserom.gba", 0xDAB8B0, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_ampharos_still_front_pic:: @ 8DAB8D0 + .incbin "graphics/pokemon/front_pics/ampharos_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xDAB8D0, 0x035C + + .align 2 +gFile_graphics_pokemon_palettes_ampharos_palette:: @ 8DABC2C + .incbin "graphics/pokemon/palettes/ampharos_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xDABC2C, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_ampharos_back_pic:: @ 8DABC54 + .incbin "graphics/pokemon/back_pics/ampharos_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xDABC54, 0x0378 + + .align 2 +gFile_graphics_pokemon_palettes_ampharos_shiny_palette:: @ 8DABFCC + .incbin "graphics/pokemon/palettes/ampharos_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xDABFCC, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_ampharos_icon:: @ 8DABFF4 + .incbin "graphics/pokemon/icons/ampharos_icon.4bpp" + @ .incbin "baserom.gba", 0xDABFF4, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_ampharos_footprint:: @ 8DAC3F4 + .incbin "graphics/pokemon/footprints/ampharos_footprint.1bpp" + @ .incbin "baserom.gba", 0xDAC3F4, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_bellossom_still_front_pic:: @ 8DAC414 + .incbin "graphics/pokemon/front_pics/bellossom_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xDAC414, 0x0270 + + .align 2 +gFile_graphics_pokemon_palettes_bellossom_palette:: @ 8DAC684 + .incbin "graphics/pokemon/palettes/bellossom_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xDAC684, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_bellossom_back_pic:: @ 8DAC6AC + .incbin "graphics/pokemon/back_pics/bellossom_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xDAC6AC, 0x0324 + + .align 2 +gFile_graphics_pokemon_palettes_bellossom_shiny_palette:: @ 8DAC9D0 + .incbin "graphics/pokemon/palettes/bellossom_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xDAC9D0, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_bellossom_icon:: @ 8DAC9F8 + .incbin "graphics/pokemon/icons/bellossom_icon.4bpp" + @ .incbin "baserom.gba", 0xDAC9F8, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_bellossom_footprint:: @ 8DACDF8 + .incbin "graphics/pokemon/footprints/bellossom_footprint.1bpp" + @ .incbin "baserom.gba", 0xDACDF8, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_marill_still_front_pic:: @ 8DACE18 + .incbin "graphics/pokemon/front_pics/marill_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xDACE18, 0x02C4 + + .align 2 +gFile_graphics_pokemon_palettes_marill_palette:: @ 8DAD0DC + .incbin "graphics/pokemon/palettes/marill_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xDAD0DC, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_marill_back_pic:: @ 8DAD104 + .incbin "graphics/pokemon/back_pics/marill_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xDAD104, 0x02AC + + .align 2 +gFile_graphics_pokemon_palettes_marill_shiny_palette:: @ 8DAD3B0 + .incbin "graphics/pokemon/palettes/marill_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xDAD3B0, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_marill_icon:: @ 8DAD3D8 + .incbin "graphics/pokemon/icons/marill_icon.4bpp" + @ .incbin "baserom.gba", 0xDAD3D8, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_marill_footprint:: @ 8DAD7D8 + .incbin "graphics/pokemon/footprints/marill_footprint.1bpp" + @ .incbin "baserom.gba", 0xDAD7D8, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_azumarill_still_front_pic:: @ 8DAD7F8 + .incbin "graphics/pokemon/front_pics/azumarill_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xDAD7F8, 0x0300 + + .align 2 +gFile_graphics_pokemon_palettes_azumarill_palette:: @ 8DADAF8 + .incbin "graphics/pokemon/palettes/azumarill_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xDADAF8, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_azumarill_back_pic:: @ 8DADB20 + .incbin "graphics/pokemon/back_pics/azumarill_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xDADB20, 0x02BC + + .align 2 +gFile_graphics_pokemon_palettes_azumarill_shiny_palette:: @ 8DADDDC + .incbin "graphics/pokemon/palettes/azumarill_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xDADDDC, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_azumarill_icon:: @ 8DADE04 + .incbin "graphics/pokemon/icons/azumarill_icon.4bpp" + @ .incbin "baserom.gba", 0xDADE04, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_azumarill_footprint:: @ 8DAE204 + .incbin "graphics/pokemon/footprints/azumarill_footprint.1bpp" + @ .incbin "baserom.gba", 0xDAE204, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_sudowoodo_still_front_pic:: @ 8DAE224 + .incbin "graphics/pokemon/front_pics/sudowoodo_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xDAE224, 0x0318 + + .align 2 +gFile_graphics_pokemon_palettes_sudowoodo_palette:: @ 8DAE53C + .incbin "graphics/pokemon/palettes/sudowoodo_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xDAE53C, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_sudowoodo_back_pic:: @ 8DAE564 + .incbin "graphics/pokemon/back_pics/sudowoodo_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xDAE564, 0x035C + + .align 2 +gFile_graphics_pokemon_palettes_sudowoodo_shiny_palette:: @ 8DAE8C0 + .incbin "graphics/pokemon/palettes/sudowoodo_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xDAE8C0, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_sudowoodo_icon:: @ 8DAE8E8 + .incbin "graphics/pokemon/icons/sudowoodo_icon.4bpp" + @ .incbin "baserom.gba", 0xDAE8E8, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_sudowoodo_footprint:: @ 8DAECE8 + .incbin "graphics/pokemon/footprints/sudowoodo_footprint.1bpp" + @ .incbin "baserom.gba", 0xDAECE8, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_politoed_still_front_pic:: @ 8DAED08 + .incbin "graphics/pokemon/front_pics/politoed_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xDAED08, 0x033C + + .align 2 +gFile_graphics_pokemon_palettes_politoed_palette:: @ 8DAF044 + .incbin "graphics/pokemon/palettes/politoed_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xDAF044, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_politoed_back_pic:: @ 8DAF06C + .incbin "graphics/pokemon/back_pics/politoed_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xDAF06C, 0x02BC + + .align 2 +gFile_graphics_pokemon_palettes_politoed_shiny_palette:: @ 8DAF328 + .incbin "graphics/pokemon/palettes/politoed_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xDAF328, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_politoed_icon:: @ 8DAF350 + .incbin "graphics/pokemon/icons/politoed_icon.4bpp" + @ .incbin "baserom.gba", 0xDAF350, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_politoed_footprint:: @ 8DAF750 + .incbin "graphics/pokemon/footprints/politoed_footprint.1bpp" + @ .incbin "baserom.gba", 0xDAF750, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_hoppip_still_front_pic:: @ 8DAF770 + .incbin "graphics/pokemon/front_pics/hoppip_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xDAF770, 0x02B4 + + .align 2 +gFile_graphics_pokemon_palettes_hoppip_palette:: @ 8DAFA24 + .incbin "graphics/pokemon/palettes/hoppip_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xDAFA24, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_hoppip_back_pic:: @ 8DAFA4C + .incbin "graphics/pokemon/back_pics/hoppip_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xDAFA4C, 0x02E0 + + .align 2 +gFile_graphics_pokemon_palettes_hoppip_shiny_palette:: @ 8DAFD2C + .incbin "graphics/pokemon/palettes/hoppip_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xDAFD2C, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_hoppip_icon:: @ 8DAFD54 + .incbin "graphics/pokemon/icons/hoppip_icon.4bpp" + @ .incbin "baserom.gba", 0xDAFD54, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_hoppip_footprint:: @ 8DB0154 + .incbin "graphics/pokemon/footprints/hoppip_footprint.1bpp" + @ .incbin "baserom.gba", 0xDB0154, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_skiploom_still_front_pic:: @ 8DB0174 + .incbin "graphics/pokemon/front_pics/skiploom_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xDB0174, 0x0288 + + .align 2 +gFile_graphics_pokemon_palettes_skiploom_palette:: @ 8DB03FC + .incbin "graphics/pokemon/palettes/skiploom_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xDB03FC, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_skiploom_back_pic:: @ 8DB0424 + .incbin "graphics/pokemon/back_pics/skiploom_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xDB0424, 0x02E0 + + .align 2 +gFile_graphics_pokemon_palettes_skiploom_shiny_palette:: @ 8DB0704 + .incbin "graphics/pokemon/palettes/skiploom_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xDB0704, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_skiploom_icon:: @ 8DB072C + .incbin "graphics/pokemon/icons/skiploom_icon.4bpp" + @ .incbin "baserom.gba", 0xDB072C, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_skiploom_footprint:: @ 8DB0B2C + .incbin "graphics/pokemon/footprints/skiploom_footprint.1bpp" + @ .incbin "baserom.gba", 0xDB0B2C, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_jumpluff_still_front_pic:: @ 8DB0B4C + .incbin "graphics/pokemon/front_pics/jumpluff_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xDB0B4C, 0x036C + + .align 2 +gFile_graphics_pokemon_palettes_jumpluff_palette:: @ 8DB0EB8 + .incbin "graphics/pokemon/palettes/jumpluff_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xDB0EB8, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_jumpluff_back_pic:: @ 8DB0EE0 + .incbin "graphics/pokemon/back_pics/jumpluff_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xDB0EE0, 0x03F8 + + .align 2 +gFile_graphics_pokemon_palettes_jumpluff_shiny_palette:: @ 8DB12D8 + .incbin "graphics/pokemon/palettes/jumpluff_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xDB12D8, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_jumpluff_icon:: @ 8DB1300 + .incbin "graphics/pokemon/icons/jumpluff_icon.4bpp" + @ .incbin "baserom.gba", 0xDB1300, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_jumpluff_footprint:: @ 8DB1700 + .incbin "graphics/pokemon/footprints/jumpluff_footprint.1bpp" + @ .incbin "baserom.gba", 0xDB1700, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_aipom_still_front_pic:: @ 8DB1720 + .incbin "graphics/pokemon/front_pics/aipom_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xDB1720, 0x02FC + + .align 2 +gFile_graphics_pokemon_palettes_aipom_palette:: @ 8DB1A1C + .incbin "graphics/pokemon/palettes/aipom_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xDB1A1C, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_aipom_back_pic:: @ 8DB1A44 + .incbin "graphics/pokemon/back_pics/aipom_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xDB1A44, 0x02F4 + + .align 2 +gFile_graphics_pokemon_palettes_aipom_shiny_palette:: @ 8DB1D38 + .incbin "graphics/pokemon/palettes/aipom_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xDB1D38, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_aipom_icon:: @ 8DB1D60 + .incbin "graphics/pokemon/icons/aipom_icon.4bpp" + @ .incbin "baserom.gba", 0xDB1D60, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_aipom_footprint:: @ 8DB2160 + .incbin "graphics/pokemon/footprints/aipom_footprint.1bpp" + @ .incbin "baserom.gba", 0xDB2160, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_sunkern_still_front_pic:: @ 8DB2180 + .incbin "graphics/pokemon/front_pics/sunkern_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xDB2180, 0x0238 + + .align 2 +gFile_graphics_pokemon_palettes_sunkern_palette:: @ 8DB23B8 + .incbin "graphics/pokemon/palettes/sunkern_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xDB23B8, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_sunkern_back_pic:: @ 8DB23E0 + .incbin "graphics/pokemon/back_pics/sunkern_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xDB23E0, 0x02C4 + + .align 2 +gFile_graphics_pokemon_palettes_sunkern_shiny_palette:: @ 8DB26A4 + .incbin "graphics/pokemon/palettes/sunkern_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xDB26A4, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_sunkern_icon:: @ 8DB26CC + .incbin "graphics/pokemon/icons/sunkern_icon.4bpp" + @ .incbin "baserom.gba", 0xDB26CC, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_sunkern_footprint:: @ 8DB2ACC + .incbin "graphics/pokemon/footprints/sunkern_footprint.1bpp" + @ .incbin "baserom.gba", 0xDB2ACC, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_sunflora_still_front_pic:: @ 8DB2AEC + .incbin "graphics/pokemon/front_pics/sunflora_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xDB2AEC, 0x0358 + + .align 2 +gFile_graphics_pokemon_palettes_sunflora_palette:: @ 8DB2E44 + .incbin "graphics/pokemon/palettes/sunflora_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xDB2E44, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_sunflora_back_pic:: @ 8DB2E6C + .incbin "graphics/pokemon/back_pics/sunflora_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xDB2E6C, 0x03A0 + + .align 2 +gFile_graphics_pokemon_palettes_sunflora_shiny_palette:: @ 8DB320C + .incbin "graphics/pokemon/palettes/sunflora_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xDB320C, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_sunflora_icon:: @ 8DB3234 + .incbin "graphics/pokemon/icons/sunflora_icon.4bpp" + @ .incbin "baserom.gba", 0xDB3234, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_sunflora_footprint:: @ 8DB3634 + .incbin "graphics/pokemon/footprints/sunflora_footprint.1bpp" + @ .incbin "baserom.gba", 0xDB3634, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_yanma_still_front_pic:: @ 8DB3654 + .incbin "graphics/pokemon/front_pics/yanma_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xDB3654, 0x0384 + + .align 2 +gFile_graphics_pokemon_palettes_yanma_palette:: @ 8DB39D8 + .incbin "graphics/pokemon/palettes/yanma_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xDB39D8, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_yanma_back_pic:: @ 8DB3A00 + .incbin "graphics/pokemon/back_pics/yanma_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xDB3A00, 0x03B4 + + .align 2 +gFile_graphics_pokemon_palettes_yanma_shiny_palette:: @ 8DB3DB4 + .incbin "graphics/pokemon/palettes/yanma_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xDB3DB4, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_yanma_icon:: @ 8DB3DDC + .incbin "graphics/pokemon/icons/yanma_icon.4bpp" + @ .incbin "baserom.gba", 0xDB3DDC, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_yanma_footprint:: @ 8DB41DC + .incbin "graphics/pokemon/footprints/yanma_footprint.1bpp" + @ .incbin "baserom.gba", 0xDB41DC, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_wooper_still_front_pic:: @ 8DB41FC + .incbin "graphics/pokemon/front_pics/wooper_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xDB41FC, 0x0240 + + .align 2 +gFile_graphics_pokemon_palettes_wooper_palette:: @ 8DB443C + .incbin "graphics/pokemon/palettes/wooper_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xDB443C, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_wooper_back_pic:: @ 8DB4464 + .incbin "graphics/pokemon/back_pics/wooper_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xDB4464, 0x028C + + .align 2 +gFile_graphics_pokemon_palettes_wooper_shiny_palette:: @ 8DB46F0 + .incbin "graphics/pokemon/palettes/wooper_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xDB46F0, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_wooper_icon:: @ 8DB4718 + .incbin "graphics/pokemon/icons/wooper_icon.4bpp" + @ .incbin "baserom.gba", 0xDB4718, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_wooper_footprint:: @ 8DB4B18 + .incbin "graphics/pokemon/footprints/wooper_footprint.1bpp" + @ .incbin "baserom.gba", 0xDB4B18, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_quagsire_still_front_pic:: @ 8DB4B38 + .incbin "graphics/pokemon/front_pics/quagsire_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xDB4B38, 0x0374 + + .align 2 +gFile_graphics_pokemon_palettes_quagsire_palette:: @ 8DB4EAC + .incbin "graphics/pokemon/palettes/quagsire_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xDB4EAC, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_quagsire_back_pic:: @ 8DB4ED4 + .incbin "graphics/pokemon/back_pics/quagsire_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xDB4ED4, 0x02FC + + .align 2 +gFile_graphics_pokemon_palettes_quagsire_shiny_palette:: @ 8DB51D0 + .incbin "graphics/pokemon/palettes/quagsire_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xDB51D0, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_quagsire_icon:: @ 8DB51F8 + .incbin "graphics/pokemon/icons/quagsire_icon.4bpp" + @ .incbin "baserom.gba", 0xDB51F8, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_quagsire_footprint:: @ 8DB55F8 + .incbin "graphics/pokemon/footprints/quagsire_footprint.1bpp" + @ .incbin "baserom.gba", 0xDB55F8, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_espeon_still_front_pic:: @ 8DB5618 + .incbin "graphics/pokemon/front_pics/espeon_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xDB5618, 0x0340 + + .align 2 +gFile_graphics_pokemon_palettes_espeon_palette:: @ 8DB5958 + .incbin "graphics/pokemon/palettes/espeon_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xDB5958, 0x0024 + + .align 2 +gFile_graphics_pokemon_back_pics_espeon_back_pic:: @ 8DB597C + .incbin "graphics/pokemon/back_pics/espeon_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xDB597C, 0x02DC + + .align 2 +gFile_graphics_pokemon_palettes_espeon_shiny_palette:: @ 8DB5C58 + .incbin "graphics/pokemon/palettes/espeon_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xDB5C58, 0x0024 + + .align 2 +gFile_graphics_pokemon_icons_espeon_icon:: @ 8DB5C7C + .incbin "graphics/pokemon/icons/espeon_icon.4bpp" + @ .incbin "baserom.gba", 0xDB5C7C, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_espeon_footprint:: @ 8DB607C + .incbin "graphics/pokemon/footprints/espeon_footprint.1bpp" + @ .incbin "baserom.gba", 0xDB607C, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_umbreon_still_front_pic:: @ 8DB609C + .incbin "graphics/pokemon/front_pics/umbreon_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xDB609C, 0x0314 + + .align 2 +gFile_graphics_pokemon_palettes_umbreon_palette:: @ 8DB63B0 + .incbin "graphics/pokemon/palettes/umbreon_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xDB63B0, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_umbreon_back_pic:: @ 8DB63D8 + .incbin "graphics/pokemon/back_pics/umbreon_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xDB63D8, 0x0314 + + .align 2 +gFile_graphics_pokemon_palettes_umbreon_shiny_palette:: @ 8DB66EC + .incbin "graphics/pokemon/palettes/umbreon_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xDB66EC, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_umbreon_icon:: @ 8DB6714 + .incbin "graphics/pokemon/icons/umbreon_icon.4bpp" + @ .incbin "baserom.gba", 0xDB6714, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_umbreon_footprint:: @ 8DB6B14 + .incbin "graphics/pokemon/footprints/umbreon_footprint.1bpp" + @ .incbin "baserom.gba", 0xDB6B14, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_murkrow_still_front_pic:: @ 8DB6B34 + .incbin "graphics/pokemon/front_pics/murkrow_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xDB6B34, 0x02E0 + + .align 2 +gFile_graphics_pokemon_palettes_murkrow_palette:: @ 8DB6E14 + .incbin "graphics/pokemon/palettes/murkrow_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xDB6E14, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_murkrow_back_pic:: @ 8DB6E3C + .incbin "graphics/pokemon/back_pics/murkrow_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xDB6E3C, 0x0318 + + .align 2 +gFile_graphics_pokemon_palettes_murkrow_shiny_palette:: @ 8DB7154 + .incbin "graphics/pokemon/palettes/murkrow_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xDB7154, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_murkrow_icon:: @ 8DB717C + .incbin "graphics/pokemon/icons/murkrow_icon.4bpp" + @ .incbin "baserom.gba", 0xDB717C, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_murkrow_footprint:: @ 8DB757C + .incbin "graphics/pokemon/footprints/murkrow_footprint.1bpp" + @ .incbin "baserom.gba", 0xDB757C, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_slowking_still_front_pic:: @ 8DB759C + .incbin "graphics/pokemon/front_pics/slowking_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xDB759C, 0x03B4 + + .align 2 +gFile_graphics_pokemon_palettes_slowking_palette:: @ 8DB7950 + .incbin "graphics/pokemon/palettes/slowking_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xDB7950, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_slowking_back_pic:: @ 8DB7978 + .incbin "graphics/pokemon/back_pics/slowking_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xDB7978, 0x038C + + .align 2 +gFile_graphics_pokemon_palettes_slowking_shiny_palette:: @ 8DB7D04 + .incbin "graphics/pokemon/palettes/slowking_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xDB7D04, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_slowking_icon:: @ 8DB7D2C + .incbin "graphics/pokemon/icons/slowking_icon.4bpp" + @ .incbin "baserom.gba", 0xDB7D2C, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_slowking_footprint:: @ 8DB812C + .incbin "graphics/pokemon/footprints/slowking_footprint.1bpp" + @ .incbin "baserom.gba", 0xDB812C, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_misdreavus_still_front_pic:: @ 8DB814C + .incbin "graphics/pokemon/front_pics/misdreavus_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xDB814C, 0x02C0 + + .align 2 +gFile_graphics_pokemon_palettes_misdreavus_palette:: @ 8DB840C + .incbin "graphics/pokemon/palettes/misdreavus_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xDB840C, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_misdreavus_back_pic:: @ 8DB8434 + .incbin "graphics/pokemon/back_pics/misdreavus_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xDB8434, 0x0324 + + .align 2 +gFile_graphics_pokemon_palettes_misdreavus_shiny_palette:: @ 8DB8758 + .incbin "graphics/pokemon/palettes/misdreavus_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xDB8758, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_misdreavus_icon:: @ 8DB8780 + .incbin "graphics/pokemon/icons/misdreavus_icon.4bpp" + @ .incbin "baserom.gba", 0xDB8780, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_misdreavus_footprint:: @ 8DB8B80 + .incbin "graphics/pokemon/footprints/misdreavus_footprint.1bpp" + @ .incbin "baserom.gba", 0xDB8B80, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_unown_a_still_front_pic:: @ 8DB8BA0 + .incbin "graphics/pokemon/front_pics/unown_a_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xDB8BA0, 0x01D4 + + .align 2 +gFile_graphics_pokemon_palettes_unown_palette:: @ 8DB8D74 + .incbin "graphics/pokemon/palettes/unown_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xDB8D74, 0x0020 + + .align 2 +gFile_graphics_pokemon_back_pics_unown_a_back_pic:: @ 8DB8D94 + .incbin "graphics/pokemon/back_pics/unown_a_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xDB8D94, 0x0200 + + .align 2 +gFile_graphics_pokemon_palettes_unown_shiny_palette:: @ 8DB8F94 + .incbin "graphics/pokemon/palettes/unown_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xDB8F94, 0x0020 + + .align 2 +gFile_graphics_pokemon_icons_unown_a_icon:: @ 8DB8FB4 + .incbin "graphics/pokemon/icons/unown_a_icon.4bpp" + @ .incbin "baserom.gba", 0xDB8FB4, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_unown_footprint:: @ 8DB93B4 + .incbin "graphics/pokemon/footprints/unown_footprint.1bpp" + @ .incbin "baserom.gba", 0xDB93B4, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_wobbuffet_still_front_pic:: @ 8DB93D4 + .incbin "graphics/pokemon/front_pics/wobbuffet_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xDB93D4, 0x0350 + + .align 2 +gFile_graphics_pokemon_palettes_wobbuffet_palette:: @ 8DB9724 + .incbin "graphics/pokemon/palettes/wobbuffet_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xDB9724, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_wobbuffet_back_pic:: @ 8DB974C + .incbin "graphics/pokemon/back_pics/wobbuffet_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xDB974C, 0x0244 + + .align 2 +gFile_graphics_pokemon_palettes_wobbuffet_shiny_palette:: @ 8DB9990 + .incbin "graphics/pokemon/palettes/wobbuffet_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xDB9990, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_wobbuffet_icon:: @ 8DB99B8 + .incbin "graphics/pokemon/icons/wobbuffet_icon.4bpp" + @ .incbin "baserom.gba", 0xDB99B8, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_wobbuffet_footprint:: @ 8DB9DB8 + .incbin "graphics/pokemon/footprints/wobbuffet_footprint.1bpp" + @ .incbin "baserom.gba", 0xDB9DB8, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_girafarig_still_front_pic:: @ 8DB9DD8 + .incbin "graphics/pokemon/front_pics/girafarig_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xDB9DD8, 0x0404 + + .align 2 +gFile_graphics_pokemon_palettes_girafarig_palette:: @ 8DBA1DC + .incbin "graphics/pokemon/palettes/girafarig_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xDBA1DC, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_girafarig_back_pic:: @ 8DBA204 + .incbin "graphics/pokemon/back_pics/girafarig_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xDBA204, 0x03AC + + .align 2 +gFile_graphics_pokemon_palettes_girafarig_shiny_palette:: @ 8DBA5B0 + .incbin "graphics/pokemon/palettes/girafarig_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xDBA5B0, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_girafarig_icon:: @ 8DBA5D8 + .incbin "graphics/pokemon/icons/girafarig_icon.4bpp" + @ .incbin "baserom.gba", 0xDBA5D8, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_girafarig_footprint:: @ 8DBA9D8 + .incbin "graphics/pokemon/footprints/girafarig_footprint.1bpp" + @ .incbin "baserom.gba", 0xDBA9D8, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_pineco_still_front_pic:: @ 8DBA9F8 + .incbin "graphics/pokemon/front_pics/pineco_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xDBA9F8, 0x0340 + + .align 2 +gFile_graphics_pokemon_palettes_pineco_palette:: @ 8DBAD38 + .incbin "graphics/pokemon/palettes/pineco_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xDBAD38, 0x0024 + + .align 2 +gFile_graphics_pokemon_back_pics_pineco_back_pic:: @ 8DBAD5C + .incbin "graphics/pokemon/back_pics/pineco_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xDBAD5C, 0x02D8 + + .align 2 +gFile_graphics_pokemon_palettes_pineco_shiny_palette:: @ 8DBB034 + .incbin "graphics/pokemon/palettes/pineco_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xDBB034, 0x0024 + + .align 2 +gFile_graphics_pokemon_icons_pineco_icon:: @ 8DBB058 + .incbin "graphics/pokemon/icons/pineco_icon.4bpp" + @ .incbin "baserom.gba", 0xDBB058, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_pineco_footprint:: @ 8DBB458 + .incbin "graphics/pokemon/footprints/pineco_footprint.1bpp" + @ .incbin "baserom.gba", 0xDBB458, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_forretress_still_front_pic:: @ 8DBB478 + .incbin "graphics/pokemon/front_pics/forretress_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xDBB478, 0x041C + + .align 2 +gFile_graphics_pokemon_palettes_forretress_palette:: @ 8DBB894 + .incbin "graphics/pokemon/palettes/forretress_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xDBB894, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_forretress_back_pic:: @ 8DBB8BC + .incbin "graphics/pokemon/back_pics/forretress_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xDBB8BC, 0x02C0 + + .align 2 +gFile_graphics_pokemon_palettes_forretress_shiny_palette:: @ 8DBBB7C + .incbin "graphics/pokemon/palettes/forretress_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xDBBB7C, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_forretress_icon:: @ 8DBBBA4 + .incbin "graphics/pokemon/icons/forretress_icon.4bpp" + @ .incbin "baserom.gba", 0xDBBBA4, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_forretress_footprint:: @ 8DBBFA4 + .incbin "graphics/pokemon/footprints/forretress_footprint.1bpp" + @ .incbin "baserom.gba", 0xDBBFA4, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_dunsparce_still_front_pic:: @ 8DBBFC4 + .incbin "graphics/pokemon/front_pics/dunsparce_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xDBBFC4, 0x0310 + + .align 2 +gFile_graphics_pokemon_palettes_dunsparce_palette:: @ 8DBC2D4 + .incbin "graphics/pokemon/palettes/dunsparce_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xDBC2D4, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_dunsparce_back_pic:: @ 8DBC2FC + .incbin "graphics/pokemon/back_pics/dunsparce_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xDBC2FC, 0x02FC + + .align 2 +gFile_graphics_pokemon_palettes_dunsparce_shiny_palette:: @ 8DBC5F8 + .incbin "graphics/pokemon/palettes/dunsparce_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xDBC5F8, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_dunsparce_icon:: @ 8DBC620 + .incbin "graphics/pokemon/icons/dunsparce_icon.4bpp" + @ .incbin "baserom.gba", 0xDBC620, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_dunsparce_footprint:: @ 8DBCA20 + .incbin "graphics/pokemon/footprints/dunsparce_footprint.1bpp" + @ .incbin "baserom.gba", 0xDBCA20, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_gligar_still_front_pic:: @ 8DBCA40 + .incbin "graphics/pokemon/front_pics/gligar_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xDBCA40, 0x0428 + + .align 2 +gFile_graphics_pokemon_palettes_gligar_palette:: @ 8DBCE68 + .incbin "graphics/pokemon/palettes/gligar_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xDBCE68, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_gligar_back_pic:: @ 8DBCE90 + .incbin "graphics/pokemon/back_pics/gligar_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xDBCE90, 0x03D8 + + .align 2 +gFile_graphics_pokemon_palettes_gligar_shiny_palette:: @ 8DBD268 + .incbin "graphics/pokemon/palettes/gligar_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xDBD268, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_gligar_icon:: @ 8DBD290 + .incbin "graphics/pokemon/icons/gligar_icon.4bpp" + @ .incbin "baserom.gba", 0xDBD290, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_gligar_footprint:: @ 8DBD690 + .incbin "graphics/pokemon/footprints/gligar_footprint.1bpp" + @ .incbin "baserom.gba", 0xDBD690, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_steelix_still_front_pic:: @ 8DBD6B0 + .incbin "graphics/pokemon/front_pics/steelix_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xDBD6B0, 0x04C8 + + .align 2 +gFile_graphics_pokemon_palettes_steelix_palette:: @ 8DBDB78 + .incbin "graphics/pokemon/palettes/steelix_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xDBDB78, 0x0024 + + .align 2 +gFile_graphics_pokemon_back_pics_steelix_back_pic:: @ 8DBDB9C + .incbin "graphics/pokemon/back_pics/steelix_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xDBDB9C, 0x040C + + .align 2 +gFile_graphics_pokemon_palettes_steelix_shiny_palette:: @ 8DBDFA8 + .incbin "graphics/pokemon/palettes/steelix_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xDBDFA8, 0x0024 + + .align 2 +gFile_graphics_pokemon_icons_steelix_icon:: @ 8DBDFCC + .incbin "graphics/pokemon/icons/steelix_icon.4bpp" + @ .incbin "baserom.gba", 0xDBDFCC, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_steelix_footprint:: @ 8DBE3CC + .incbin "graphics/pokemon/footprints/steelix_footprint.1bpp" + @ .incbin "baserom.gba", 0xDBE3CC, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_snubbull_still_front_pic:: @ 8DBE3EC + .incbin "graphics/pokemon/front_pics/snubbull_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xDBE3EC, 0x02D4 + + .align 2 +gFile_graphics_pokemon_palettes_snubbull_palette:: @ 8DBE6C0 + .incbin "graphics/pokemon/palettes/snubbull_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xDBE6C0, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_snubbull_back_pic:: @ 8DBE6E8 + .incbin "graphics/pokemon/back_pics/snubbull_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xDBE6E8, 0x0328 + + .align 2 +gFile_graphics_pokemon_palettes_snubbull_shiny_palette:: @ 8DBEA10 + .incbin "graphics/pokemon/palettes/snubbull_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xDBEA10, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_snubbull_icon:: @ 8DBEA38 + .incbin "graphics/pokemon/icons/snubbull_icon.4bpp" + @ .incbin "baserom.gba", 0xDBEA38, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_snubbull_footprint:: @ 8DBEE38 + .incbin "graphics/pokemon/footprints/snubbull_footprint.1bpp" + @ .incbin "baserom.gba", 0xDBEE38, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_granbull_still_front_pic:: @ 8DBEE58 + .incbin "graphics/pokemon/front_pics/granbull_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xDBEE58, 0x038C + + .align 2 +gFile_graphics_pokemon_palettes_granbull_palette:: @ 8DBF1E4 + .incbin "graphics/pokemon/palettes/granbull_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xDBF1E4, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_granbull_back_pic:: @ 8DBF20C + .incbin "graphics/pokemon/back_pics/granbull_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xDBF20C, 0x0324 + + .align 2 +gFile_graphics_pokemon_palettes_granbull_shiny_palette:: @ 8DBF530 + .incbin "graphics/pokemon/palettes/granbull_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xDBF530, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_granbull_icon:: @ 8DBF558 + .incbin "graphics/pokemon/icons/granbull_icon.4bpp" + @ .incbin "baserom.gba", 0xDBF558, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_granbull_footprint:: @ 8DBF958 + .incbin "graphics/pokemon/footprints/granbull_footprint.1bpp" + @ .incbin "baserom.gba", 0xDBF958, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_qwilfish_still_front_pic:: @ 8DBF978 + .incbin "graphics/pokemon/front_pics/qwilfish_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xDBF978, 0x02C0 + + .align 2 +gFile_graphics_pokemon_palettes_qwilfish_palette:: @ 8DBFC38 + .incbin "graphics/pokemon/palettes/qwilfish_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xDBFC38, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_qwilfish_back_pic:: @ 8DBFC60 + .incbin "graphics/pokemon/back_pics/qwilfish_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xDBFC60, 0x02E0 + + .align 2 +gFile_graphics_pokemon_palettes_qwilfish_shiny_palette:: @ 8DBFF40 + .incbin "graphics/pokemon/palettes/qwilfish_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xDBFF40, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_qwilfish_icon:: @ 8DBFF68 + .incbin "graphics/pokemon/icons/qwilfish_icon.4bpp" + @ .incbin "baserom.gba", 0xDBFF68, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_qwilfish_footprint:: @ 8DC0368 + .incbin "graphics/pokemon/footprints/qwilfish_footprint.1bpp" + @ .incbin "baserom.gba", 0xDC0368, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_scizor_still_front_pic:: @ 8DC0388 + .incbin "graphics/pokemon/front_pics/scizor_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xDC0388, 0x04E8 + + .align 2 +gFile_graphics_pokemon_palettes_scizor_palette:: @ 8DC0870 + .incbin "graphics/pokemon/palettes/scizor_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xDC0870, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_scizor_back_pic:: @ 8DC0898 + .incbin "graphics/pokemon/back_pics/scizor_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xDC0898, 0x0380 + + .align 2 +gFile_graphics_pokemon_palettes_scizor_shiny_palette:: @ 8DC0C18 + .incbin "graphics/pokemon/palettes/scizor_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xDC0C18, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_scizor_icon:: @ 8DC0C40 + .incbin "graphics/pokemon/icons/scizor_icon.4bpp" + @ .incbin "baserom.gba", 0xDC0C40, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_scizor_footprint:: @ 8DC1040 + .incbin "graphics/pokemon/footprints/scizor_footprint.1bpp" + @ .incbin "baserom.gba", 0xDC1040, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_shuckle_still_front_pic:: @ 8DC1060 + .incbin "graphics/pokemon/front_pics/shuckle_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xDC1060, 0x02C8 + + .align 2 +gFile_graphics_pokemon_palettes_shuckle_palette:: @ 8DC1328 + .incbin "graphics/pokemon/palettes/shuckle_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xDC1328, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_shuckle_back_pic:: @ 8DC1350 + .incbin "graphics/pokemon/back_pics/shuckle_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xDC1350, 0x0258 + + .align 2 +gFile_graphics_pokemon_palettes_shuckle_shiny_palette:: @ 8DC15A8 + .incbin "graphics/pokemon/palettes/shuckle_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xDC15A8, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_shuckle_icon:: @ 8DC15D0 + .incbin "graphics/pokemon/icons/shuckle_icon.4bpp" + @ .incbin "baserom.gba", 0xDC15D0, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_shuckle_footprint:: @ 8DC19D0 + .incbin "graphics/pokemon/footprints/shuckle_footprint.1bpp" + @ .incbin "baserom.gba", 0xDC19D0, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_heracross_still_front_pic:: @ 8DC19F0 + .incbin "graphics/pokemon/front_pics/heracross_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xDC19F0, 0x03F0 + + .align 2 +gFile_graphics_pokemon_palettes_heracross_palette:: @ 8DC1DE0 + .incbin "graphics/pokemon/palettes/heracross_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xDC1DE0, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_heracross_back_pic:: @ 8DC1E08 + .incbin "graphics/pokemon/back_pics/heracross_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xDC1E08, 0x0370 + + .align 2 +gFile_graphics_pokemon_palettes_heracross_shiny_palette:: @ 8DC2178 + .incbin "graphics/pokemon/palettes/heracross_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xDC2178, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_heracross_icon:: @ 8DC21A0 + .incbin "graphics/pokemon/icons/heracross_icon.4bpp" + @ .incbin "baserom.gba", 0xDC21A0, 0x0400 + +gUnknown_heracross_icon:: @ 8DC25A0 + .incbin "baserom.gba", 0xDC25A0, 0x400 + + .align 2 +gFile_graphics_pokemon_footprints_heracross_footprint:: @ 8DC29A0 + .incbin "graphics/pokemon/footprints/heracross_footprint.1bpp" + @ .incbin "baserom.gba", 0xDC29A0, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_sneasel_still_front_pic:: @ 8DC29C0 + .incbin "graphics/pokemon/front_pics/sneasel_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xDC29C0, 0x0344 + + .align 2 +gFile_graphics_pokemon_palettes_sneasel_palette:: @ 8DC2D04 + .incbin "graphics/pokemon/palettes/sneasel_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xDC2D04, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_sneasel_back_pic:: @ 8DC2D2C + .incbin "graphics/pokemon/back_pics/sneasel_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xDC2D2C, 0x0324 + + .align 2 +gFile_graphics_pokemon_palettes_sneasel_shiny_palette:: @ 8DC3050 + .incbin "graphics/pokemon/palettes/sneasel_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xDC3050, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_sneasel_icon:: @ 8DC3078 + .incbin "graphics/pokemon/icons/sneasel_icon.4bpp" + @ .incbin "baserom.gba", 0xDC3078, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_sneasel_footprint:: @ 8DC3478 + .incbin "graphics/pokemon/footprints/sneasel_footprint.1bpp" + @ .incbin "baserom.gba", 0xDC3478, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_teddiursa_still_front_pic:: @ 8DC3498 + .incbin "graphics/pokemon/front_pics/teddiursa_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xDC3498, 0x02A8 + + .align 2 +gFile_graphics_pokemon_palettes_teddiursa_palette:: @ 8DC3740 + .incbin "graphics/pokemon/palettes/teddiursa_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xDC3740, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_teddiursa_back_pic:: @ 8DC3768 + .incbin "graphics/pokemon/back_pics/teddiursa_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xDC3768, 0x0278 + + .align 2 +gFile_graphics_pokemon_palettes_teddiursa_shiny_palette:: @ 8DC39E0 + .incbin "graphics/pokemon/palettes/teddiursa_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xDC39E0, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_teddiursa_icon:: @ 8DC3A08 + .incbin "graphics/pokemon/icons/teddiursa_icon.4bpp" + @ .incbin "baserom.gba", 0xDC3A08, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_teddiursa_footprint:: @ 8DC3E08 + .incbin "graphics/pokemon/footprints/teddiursa_footprint.1bpp" + @ .incbin "baserom.gba", 0xDC3E08, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_ursaring_still_front_pic:: @ 8DC3E28 + .incbin "graphics/pokemon/front_pics/ursaring_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xDC3E28, 0x0438 + + .align 2 +gFile_graphics_pokemon_palettes_ursaring_palette:: @ 8DC4260 + .incbin "graphics/pokemon/palettes/ursaring_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xDC4260, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_ursaring_back_pic:: @ 8DC4288 + .incbin "graphics/pokemon/back_pics/ursaring_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xDC4288, 0x0388 + + .align 2 +gFile_graphics_pokemon_palettes_ursaring_shiny_palette:: @ 8DC4610 + .incbin "graphics/pokemon/palettes/ursaring_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xDC4610, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_ursaring_icon:: @ 8DC4638 + .incbin "graphics/pokemon/icons/ursaring_icon.4bpp" + @ .incbin "baserom.gba", 0xDC4638, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_ursaring_footprint:: @ 8DC4A38 + .incbin "graphics/pokemon/footprints/ursaring_footprint.1bpp" + @ .incbin "baserom.gba", 0xDC4A38, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_slugma_still_front_pic:: @ 8DC4A58 + .incbin "graphics/pokemon/front_pics/slugma_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xDC4A58, 0x0274 + + .align 2 +gFile_graphics_pokemon_palettes_slugma_palette:: @ 8DC4CCC + .incbin "graphics/pokemon/palettes/slugma_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xDC4CCC, 0x0024 + + .align 2 +gFile_graphics_pokemon_back_pics_slugma_back_pic:: @ 8DC4CF0 + .incbin "graphics/pokemon/back_pics/slugma_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xDC4CF0, 0x02E8 + + .align 2 +gFile_graphics_pokemon_palettes_slugma_shiny_palette:: @ 8DC4FD8 + .incbin "graphics/pokemon/palettes/slugma_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xDC4FD8, 0x0024 + + .align 2 +gFile_graphics_pokemon_icons_slugma_icon:: @ 8DC4FFC + .incbin "graphics/pokemon/icons/slugma_icon.4bpp" + @ .incbin "baserom.gba", 0xDC4FFC, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_slugma_footprint:: @ 8DC53FC + .incbin "graphics/pokemon/footprints/slugma_footprint.1bpp" + @ .incbin "baserom.gba", 0xDC53FC, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_magcargo_still_front_pic:: @ 8DC541C + .incbin "graphics/pokemon/front_pics/magcargo_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xDC541C, 0x0348 + + .align 2 +gFile_graphics_pokemon_palettes_magcargo_palette:: @ 8DC5764 + .incbin "graphics/pokemon/palettes/magcargo_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xDC5764, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_magcargo_back_pic:: @ 8DC578C + .incbin "graphics/pokemon/back_pics/magcargo_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xDC578C, 0x0418 + + .align 2 +gFile_graphics_pokemon_palettes_magcargo_shiny_palette:: @ 8DC5BA4 + .incbin "graphics/pokemon/palettes/magcargo_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xDC5BA4, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_magcargo_icon:: @ 8DC5BCC + .incbin "graphics/pokemon/icons/magcargo_icon.4bpp" + @ .incbin "baserom.gba", 0xDC5BCC, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_magcargo_footprint:: @ 8DC5FCC + .incbin "graphics/pokemon/footprints/magcargo_footprint.1bpp" + @ .incbin "baserom.gba", 0xDC5FCC, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_swinub_still_front_pic:: @ 8DC5FEC + .incbin "graphics/pokemon/front_pics/swinub_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xDC5FEC, 0x01FC + + .align 2 +gFile_graphics_pokemon_palettes_swinub_palette:: @ 8DC61E8 + .incbin "graphics/pokemon/palettes/swinub_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xDC61E8, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_swinub_back_pic:: @ 8DC6210 + .incbin "graphics/pokemon/back_pics/swinub_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xDC6210, 0x023C + + .align 2 +gFile_graphics_pokemon_palettes_swinub_shiny_palette:: @ 8DC644C + .incbin "graphics/pokemon/palettes/swinub_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xDC644C, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_swinub_icon:: @ 8DC6474 + .incbin "graphics/pokemon/icons/swinub_icon.4bpp" + @ .incbin "baserom.gba", 0xDC6474, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_swinub_footprint:: @ 8DC6874 + .incbin "graphics/pokemon/footprints/swinub_footprint.1bpp" + @ .incbin "baserom.gba", 0xDC6874, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_piloswine_still_front_pic:: @ 8DC6894 + .incbin "graphics/pokemon/front_pics/piloswine_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xDC6894, 0x0328 + + .align 2 +gFile_graphics_pokemon_palettes_piloswine_palette:: @ 8DC6BBC + .incbin "graphics/pokemon/palettes/piloswine_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xDC6BBC, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_piloswine_back_pic:: @ 8DC6BE4 + .incbin "graphics/pokemon/back_pics/piloswine_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xDC6BE4, 0x024C + + .align 2 +gFile_graphics_pokemon_palettes_piloswine_shiny_palette:: @ 8DC6E30 + .incbin "graphics/pokemon/palettes/piloswine_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xDC6E30, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_piloswine_icon:: @ 8DC6E58 + .incbin "graphics/pokemon/icons/piloswine_icon.4bpp" + @ .incbin "baserom.gba", 0xDC6E58, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_piloswine_footprint:: @ 8DC7258 + .incbin "graphics/pokemon/footprints/piloswine_footprint.1bpp" + @ .incbin "baserom.gba", 0xDC7258, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_corsola_still_front_pic:: @ 8DC7278 + .incbin "graphics/pokemon/front_pics/corsola_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xDC7278, 0x02E8 + + .align 2 +gFile_graphics_pokemon_palettes_corsola_palette:: @ 8DC7560 + .incbin "graphics/pokemon/palettes/corsola_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xDC7560, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_corsola_back_pic:: @ 8DC7588 + .incbin "graphics/pokemon/back_pics/corsola_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xDC7588, 0x02C0 + + .align 2 +gFile_graphics_pokemon_palettes_corsola_shiny_palette:: @ 8DC7848 + .incbin "graphics/pokemon/palettes/corsola_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xDC7848, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_corsola_icon:: @ 8DC7870 + .incbin "graphics/pokemon/icons/corsola_icon.4bpp" + @ .incbin "baserom.gba", 0xDC7870, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_corsola_footprint:: @ 8DC7C70 + .incbin "graphics/pokemon/footprints/corsola_footprint.1bpp" + @ .incbin "baserom.gba", 0xDC7C70, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_remoraid_still_front_pic:: @ 8DC7C90 + .incbin "graphics/pokemon/front_pics/remoraid_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xDC7C90, 0x0268 + + .align 2 +gFile_graphics_pokemon_palettes_remoraid_palette:: @ 8DC7EF8 + .incbin "graphics/pokemon/palettes/remoraid_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xDC7EF8, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_remoraid_back_pic:: @ 8DC7F20 + .incbin "graphics/pokemon/back_pics/remoraid_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xDC7F20, 0x0314 + + .align 2 +gFile_graphics_pokemon_palettes_remoraid_shiny_palette:: @ 8DC8234 + .incbin "graphics/pokemon/palettes/remoraid_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xDC8234, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_remoraid_icon:: @ 8DC825C + .incbin "graphics/pokemon/icons/remoraid_icon.4bpp" + @ .incbin "baserom.gba", 0xDC825C, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_remoraid_footprint:: @ 8DC865C + .incbin "graphics/pokemon/footprints/remoraid_footprint.1bpp" + @ .incbin "baserom.gba", 0xDC865C, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_octillery_still_front_pic:: @ 8DC867C + .incbin "graphics/pokemon/front_pics/octillery_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xDC867C, 0x0334 + + .align 2 +gFile_graphics_pokemon_palettes_octillery_palette:: @ 8DC89B0 + .incbin "graphics/pokemon/palettes/octillery_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xDC89B0, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_octillery_back_pic:: @ 8DC89D8 + .incbin "graphics/pokemon/back_pics/octillery_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xDC89D8, 0x02B8 + + .align 2 +gFile_graphics_pokemon_palettes_octillery_shiny_palette:: @ 8DC8C90 + .incbin "graphics/pokemon/palettes/octillery_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xDC8C90, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_octillery_icon:: @ 8DC8CB8 + .incbin "graphics/pokemon/icons/octillery_icon.4bpp" + @ .incbin "baserom.gba", 0xDC8CB8, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_octillery_footprint:: @ 8DC90B8 + .incbin "graphics/pokemon/footprints/octillery_footprint.1bpp" + @ .incbin "baserom.gba", 0xDC90B8, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_delibird_still_front_pic:: @ 8DC90D8 + .incbin "graphics/pokemon/front_pics/delibird_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xDC90D8, 0x0370 + + .align 2 +gFile_graphics_pokemon_palettes_delibird_palette:: @ 8DC9448 + .incbin "graphics/pokemon/palettes/delibird_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xDC9448, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_delibird_back_pic:: @ 8DC9470 + .incbin "graphics/pokemon/back_pics/delibird_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xDC9470, 0x03C0 + + .align 2 +gFile_graphics_pokemon_palettes_delibird_shiny_palette:: @ 8DC9830 + .incbin "graphics/pokemon/palettes/delibird_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xDC9830, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_delibird_icon:: @ 8DC9858 + .incbin "graphics/pokemon/icons/delibird_icon.4bpp" + @ .incbin "baserom.gba", 0xDC9858, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_delibird_footprint:: @ 8DC9C58 + .incbin "graphics/pokemon/footprints/delibird_footprint.1bpp" + @ .incbin "baserom.gba", 0xDC9C58, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_mantine_still_front_pic:: @ 8DC9C78 + .incbin "graphics/pokemon/front_pics/mantine_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xDC9C78, 0x049C + + .align 2 +gFile_graphics_pokemon_palettes_mantine_palette:: @ 8DCA114 + .incbin "graphics/pokemon/palettes/mantine_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xDCA114, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_mantine_back_pic:: @ 8DCA13C + .incbin "graphics/pokemon/back_pics/mantine_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xDCA13C, 0x02A0 + + .align 2 +gFile_graphics_pokemon_palettes_mantine_shiny_palette:: @ 8DCA3DC + .incbin "graphics/pokemon/palettes/mantine_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xDCA3DC, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_mantine_icon:: @ 8DCA404 + .incbin "graphics/pokemon/icons/mantine_icon.4bpp" + @ .incbin "baserom.gba", 0xDCA404, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_mantine_footprint:: @ 8DCA804 + .incbin "graphics/pokemon/footprints/mantine_footprint.1bpp" + @ .incbin "baserom.gba", 0xDCA804, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_skarmory_still_front_pic:: @ 8DCA824 + .incbin "graphics/pokemon/front_pics/skarmory_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xDCA824, 0x04E0 + + .align 2 +gFile_graphics_pokemon_palettes_skarmory_palette:: @ 8DCAD04 + .incbin "graphics/pokemon/palettes/skarmory_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xDCAD04, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_skarmory_back_pic:: @ 8DCAD2C + .incbin "graphics/pokemon/back_pics/skarmory_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xDCAD2C, 0x0304 + + .align 2 +gFile_graphics_pokemon_palettes_skarmory_shiny_palette:: @ 8DCB030 + .incbin "graphics/pokemon/palettes/skarmory_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xDCB030, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_skarmory_icon:: @ 8DCB058 + .incbin "graphics/pokemon/icons/skarmory_icon.4bpp" + @ .incbin "baserom.gba", 0xDCB058, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_skarmory_footprint:: @ 8DCB458 + .incbin "graphics/pokemon/footprints/skarmory_footprint.1bpp" + @ .incbin "baserom.gba", 0xDCB458, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_houndour_still_front_pic:: @ 8DCB478 + .incbin "graphics/pokemon/front_pics/houndour_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xDCB478, 0x02B8 + + .align 2 +gFile_graphics_pokemon_palettes_houndour_palette:: @ 8DCB730 + .incbin "graphics/pokemon/palettes/houndour_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xDCB730, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_houndour_back_pic:: @ 8DCB758 + .incbin "graphics/pokemon/back_pics/houndour_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xDCB758, 0x0280 + + .align 2 +gFile_graphics_pokemon_palettes_houndour_shiny_palette:: @ 8DCB9D8 + .incbin "graphics/pokemon/palettes/houndour_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xDCB9D8, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_houndour_icon:: @ 8DCBA00 + .incbin "graphics/pokemon/icons/houndour_icon.4bpp" + @ .incbin "baserom.gba", 0xDCBA00, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_houndour_footprint:: @ 8DCBE00 + .incbin "graphics/pokemon/footprints/houndour_footprint.1bpp" + @ .incbin "baserom.gba", 0xDCBE00, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_houndoom_still_front_pic:: @ 8DCBE20 + .incbin "graphics/pokemon/front_pics/houndoom_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xDCBE20, 0x0400 + + .align 2 +gFile_graphics_pokemon_palettes_houndoom_palette:: @ 8DCC220 + .incbin "graphics/pokemon/palettes/houndoom_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xDCC220, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_houndoom_back_pic:: @ 8DCC248 + .incbin "graphics/pokemon/back_pics/houndoom_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xDCC248, 0x0324 + + .align 2 +gFile_graphics_pokemon_palettes_houndoom_shiny_palette:: @ 8DCC56C + .incbin "graphics/pokemon/palettes/houndoom_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xDCC56C, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_houndoom_icon:: @ 8DCC594 + .incbin "graphics/pokemon/icons/houndoom_icon.4bpp" + @ .incbin "baserom.gba", 0xDCC594, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_houndoom_footprint:: @ 8DCC994 + .incbin "graphics/pokemon/footprints/houndoom_footprint.1bpp" + @ .incbin "baserom.gba", 0xDCC994, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_kingdra_still_front_pic:: @ 8DCC9B4 + .incbin "graphics/pokemon/front_pics/kingdra_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xDCC9B4, 0x0420 + + .align 2 +gFile_graphics_pokemon_palettes_kingdra_palette:: @ 8DCCDD4 + .incbin "graphics/pokemon/palettes/kingdra_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xDCCDD4, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_kingdra_back_pic:: @ 8DCCDFC + .incbin "graphics/pokemon/back_pics/kingdra_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xDCCDFC, 0x03B4 + + .align 2 +gFile_graphics_pokemon_palettes_kingdra_shiny_palette:: @ 8DCD1B0 + .incbin "graphics/pokemon/palettes/kingdra_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xDCD1B0, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_kingdra_icon:: @ 8DCD1D8 + .incbin "graphics/pokemon/icons/kingdra_icon.4bpp" + @ .incbin "baserom.gba", 0xDCD1D8, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_kingdra_footprint:: @ 8DCD5D8 + .incbin "graphics/pokemon/footprints/kingdra_footprint.1bpp" + @ .incbin "baserom.gba", 0xDCD5D8, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_phanpy_still_front_pic:: @ 8DCD5F8 + .incbin "graphics/pokemon/front_pics/phanpy_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xDCD5F8, 0x025C + + .align 2 +gFile_graphics_pokemon_palettes_phanpy_palette:: @ 8DCD854 + .incbin "graphics/pokemon/palettes/phanpy_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xDCD854, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_phanpy_back_pic:: @ 8DCD87C + .incbin "graphics/pokemon/back_pics/phanpy_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xDCD87C, 0x02C4 + + .align 2 +gFile_graphics_pokemon_palettes_phanpy_shiny_palette:: @ 8DCDB40 + .incbin "graphics/pokemon/palettes/phanpy_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xDCDB40, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_phanpy_icon:: @ 8DCDB68 + .incbin "graphics/pokemon/icons/phanpy_icon.4bpp" + @ .incbin "baserom.gba", 0xDCDB68, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_phanpy_footprint:: @ 8DCDF68 + .incbin "graphics/pokemon/footprints/phanpy_footprint.1bpp" + @ .incbin "baserom.gba", 0xDCDF68, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_donphan_still_front_pic:: @ 8DCDF88 + .incbin "graphics/pokemon/front_pics/donphan_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xDCDF88, 0x0474 + + .align 2 +gFile_graphics_pokemon_palettes_donphan_palette:: @ 8DCE3FC + .incbin "graphics/pokemon/palettes/donphan_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xDCE3FC, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_donphan_back_pic:: @ 8DCE424 + .incbin "graphics/pokemon/back_pics/donphan_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xDCE424, 0x02FC + + .align 2 +gFile_graphics_pokemon_palettes_donphan_shiny_palette:: @ 8DCE720 + .incbin "graphics/pokemon/palettes/donphan_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xDCE720, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_donphan_icon:: @ 8DCE748 + .incbin "graphics/pokemon/icons/donphan_icon.4bpp" + @ .incbin "baserom.gba", 0xDCE748, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_donphan_footprint:: @ 8DCEB48 + .incbin "graphics/pokemon/footprints/donphan_footprint.1bpp" + @ .incbin "baserom.gba", 0xDCEB48, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_porygon2_still_front_pic:: @ 8DCEB68 + .incbin "graphics/pokemon/front_pics/porygon2_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xDCEB68, 0x0288 + + .align 2 +gFile_graphics_pokemon_palettes_porygon2_palette:: @ 8DCEDF0 + .incbin "graphics/pokemon/palettes/porygon2_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xDCEDF0, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_porygon2_back_pic:: @ 8DCEE18 + .incbin "graphics/pokemon/back_pics/porygon2_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xDCEE18, 0x031C + + .align 2 +gFile_graphics_pokemon_palettes_porygon2_shiny_palette:: @ 8DCF134 + .incbin "graphics/pokemon/palettes/porygon2_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xDCF134, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_porygon2_icon:: @ 8DCF15C + .incbin "graphics/pokemon/icons/porygon2_icon.4bpp" + @ .incbin "baserom.gba", 0xDCF15C, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_porygon2_footprint:: @ 8DCF55C + .incbin "graphics/pokemon/footprints/porygon2_footprint.1bpp" + @ .incbin "baserom.gba", 0xDCF55C, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_stantler_still_front_pic:: @ 8DCF57C + .incbin "graphics/pokemon/front_pics/stantler_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xDCF57C, 0x0414 + + .align 2 +gFile_graphics_pokemon_palettes_stantler_palette:: @ 8DCF990 + .incbin "graphics/pokemon/palettes/stantler_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xDCF990, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_stantler_back_pic:: @ 8DCF9B8 + .incbin "graphics/pokemon/back_pics/stantler_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xDCF9B8, 0x034C + + .align 2 +gFile_graphics_pokemon_palettes_stantler_shiny_palette:: @ 8DCFD04 + .incbin "graphics/pokemon/palettes/stantler_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xDCFD04, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_stantler_icon:: @ 8DCFD2C + .incbin "graphics/pokemon/icons/stantler_icon.4bpp" + @ .incbin "baserom.gba", 0xDCFD2C, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_stantler_footprint:: @ 8DD012C + .incbin "graphics/pokemon/footprints/stantler_footprint.1bpp" + @ .incbin "baserom.gba", 0xDD012C, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_smeargle_still_front_pic:: @ 8DD014C + .incbin "graphics/pokemon/front_pics/smeargle_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xDD014C, 0x0394 + + .align 2 +gFile_graphics_pokemon_palettes_smeargle_palette:: @ 8DD04E0 + .incbin "graphics/pokemon/palettes/smeargle_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xDD04E0, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_smeargle_back_pic:: @ 8DD0508 + .incbin "graphics/pokemon/back_pics/smeargle_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xDD0508, 0x0324 + + .align 2 +gFile_graphics_pokemon_palettes_smeargle_shiny_palette:: @ 8DD082C + .incbin "graphics/pokemon/palettes/smeargle_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xDD082C, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_smeargle_icon:: @ 8DD0854 + .incbin "graphics/pokemon/icons/smeargle_icon.4bpp" + @ .incbin "baserom.gba", 0xDD0854, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_smeargle_footprint:: @ 8DD0C54 + .incbin "graphics/pokemon/footprints/smeargle_footprint.1bpp" + @ .incbin "baserom.gba", 0xDD0C54, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_tyrogue_still_front_pic:: @ 8DD0C74 + .incbin "graphics/pokemon/front_pics/tyrogue_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xDD0C74, 0x028C + + .align 2 +gFile_graphics_pokemon_palettes_tyrogue_palette:: @ 8DD0F00 + .incbin "graphics/pokemon/palettes/tyrogue_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xDD0F00, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_tyrogue_back_pic:: @ 8DD0F28 + .incbin "graphics/pokemon/back_pics/tyrogue_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xDD0F28, 0x031C + + .align 2 +gFile_graphics_pokemon_palettes_tyrogue_shiny_palette:: @ 8DD1244 + .incbin "graphics/pokemon/palettes/tyrogue_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xDD1244, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_tyrogue_icon:: @ 8DD126C + .incbin "graphics/pokemon/icons/tyrogue_icon.4bpp" + @ .incbin "baserom.gba", 0xDD126C, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_tyrogue_footprint:: @ 8DD166C + .incbin "graphics/pokemon/footprints/tyrogue_footprint.1bpp" + @ .incbin "baserom.gba", 0xDD166C, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_hitmontop_still_front_pic:: @ 8DD168C + .incbin "graphics/pokemon/front_pics/hitmontop_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xDD168C, 0x038C + + .align 2 +gFile_graphics_pokemon_palettes_hitmontop_palette:: @ 8DD1A18 + .incbin "graphics/pokemon/palettes/hitmontop_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xDD1A18, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_hitmontop_back_pic:: @ 8DD1A40 + .incbin "graphics/pokemon/back_pics/hitmontop_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xDD1A40, 0x0428 + + .align 2 +gFile_graphics_pokemon_palettes_hitmontop_shiny_palette:: @ 8DD1E68 + .incbin "graphics/pokemon/palettes/hitmontop_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xDD1E68, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_hitmontop_icon:: @ 8DD1E90 + .incbin "graphics/pokemon/icons/hitmontop_icon.4bpp" + @ .incbin "baserom.gba", 0xDD1E90, 0x0400 + +gUnknown_hitmontop_blank_space:: @ 8DD2290 + @.space 0x200 + .incbin "baserom.gba", 0xDD2290, 0x200 + + .align 2 +gFile_graphics_pokemon_footprints_hitmontop_footprint:: @ 8DD2490 + .incbin "graphics/pokemon/footprints/hitmontop_footprint.1bpp" + @ .incbin "baserom.gba", 0xDD2490, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_smoochum_still_front_pic:: @ 8DD24B0 + .incbin "graphics/pokemon/front_pics/smoochum_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xDD24B0, 0x0258 + + .align 2 +gFile_graphics_pokemon_palettes_smoochum_palette:: @ 8DD2708 + .incbin "graphics/pokemon/palettes/smoochum_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xDD2708, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_smoochum_back_pic:: @ 8DD2730 + .incbin "graphics/pokemon/back_pics/smoochum_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xDD2730, 0x0278 + + .align 2 +gFile_graphics_pokemon_palettes_smoochum_shiny_palette:: @ 8DD29A8 + .incbin "graphics/pokemon/palettes/smoochum_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xDD29A8, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_smoochum_icon:: @ 8DD29D0 + .incbin "graphics/pokemon/icons/smoochum_icon.4bpp" + @ .incbin "baserom.gba", 0xDD29D0, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_smoochum_footprint:: @ 8DD2DD0 + .incbin "graphics/pokemon/footprints/smoochum_footprint.1bpp" + @ .incbin "baserom.gba", 0xDD2DD0, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_elekid_still_front_pic:: @ 8DD2DF0 + .incbin "graphics/pokemon/front_pics/elekid_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xDD2DF0, 0x0308 + + .align 2 +gFile_graphics_pokemon_palettes_elekid_palette:: @ 8DD30F8 + .incbin "graphics/pokemon/palettes/elekid_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xDD30F8, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_elekid_back_pic:: @ 8DD3120 + .incbin "graphics/pokemon/back_pics/elekid_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xDD3120, 0x0358 + + .align 2 +gFile_graphics_pokemon_palettes_elekid_shiny_palette:: @ 8DD3478 + .incbin "graphics/pokemon/palettes/elekid_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xDD3478, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_elekid_icon:: @ 8DD34A0 + .incbin "graphics/pokemon/icons/elekid_icon.4bpp" + @ .incbin "baserom.gba", 0xDD34A0, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_elekid_footprint:: @ 8DD38A0 + .incbin "graphics/pokemon/footprints/elekid_footprint.1bpp" + @ .incbin "baserom.gba", 0xDD38A0, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_magby_still_front_pic:: @ 8DD38C0 + .incbin "graphics/pokemon/front_pics/magby_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xDD38C0, 0x0284 + + .align 2 +gFile_graphics_pokemon_palettes_magby_palette:: @ 8DD3B44 + .incbin "graphics/pokemon/palettes/magby_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xDD3B44, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_magby_back_pic:: @ 8DD3B6C + .incbin "graphics/pokemon/back_pics/magby_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xDD3B6C, 0x02AC + + .align 2 +gFile_graphics_pokemon_palettes_magby_shiny_palette:: @ 8DD3E18 + .incbin "graphics/pokemon/palettes/magby_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xDD3E18, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_magby_icon:: @ 8DD3E40 + .incbin "graphics/pokemon/icons/magby_icon.4bpp" + @ .incbin "baserom.gba", 0xDD3E40, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_magby_footprint:: @ 8DD4240 + .incbin "graphics/pokemon/footprints/magby_footprint.1bpp" + @ .incbin "baserom.gba", 0xDD4240, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_miltank_still_front_pic:: @ 8DD4260 + .incbin "graphics/pokemon/front_pics/miltank_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xDD4260, 0x03B0 + + .align 2 +gFile_graphics_pokemon_palettes_miltank_palette:: @ 8DD4610 + .incbin "graphics/pokemon/palettes/miltank_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xDD4610, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_miltank_back_pic:: @ 8DD4638 + .incbin "graphics/pokemon/back_pics/miltank_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xDD4638, 0x039C + + .align 2 +gFile_graphics_pokemon_palettes_miltank_shiny_palette:: @ 8DD49D4 + .incbin "graphics/pokemon/palettes/miltank_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xDD49D4, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_miltank_icon:: @ 8DD49FC + .incbin "graphics/pokemon/icons/miltank_icon.4bpp" + @ .incbin "baserom.gba", 0xDD49FC, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_miltank_footprint:: @ 8DD4DFC + .incbin "graphics/pokemon/footprints/miltank_footprint.1bpp" + @ .incbin "baserom.gba", 0xDD4DFC, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_blissey_still_front_pic:: @ 8DD4E1C + .incbin "graphics/pokemon/front_pics/blissey_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xDD4E1C, 0x03E8 + + .align 2 +gFile_graphics_pokemon_palettes_blissey_palette:: @ 8DD5204 + .incbin "graphics/pokemon/palettes/blissey_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xDD5204, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_blissey_back_pic:: @ 8DD522C + .incbin "graphics/pokemon/back_pics/blissey_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xDD522C, 0x02CC + + .align 2 +gFile_graphics_pokemon_palettes_blissey_shiny_palette:: @ 8DD54F8 + .incbin "graphics/pokemon/palettes/blissey_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xDD54F8, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_blissey_icon:: @ 8DD5520 + .incbin "graphics/pokemon/icons/blissey_icon.4bpp" + @ .incbin "baserom.gba", 0xDD5520, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_blissey_footprint:: @ 8DD5920 + .incbin "graphics/pokemon/footprints/blissey_footprint.1bpp" + @ .incbin "baserom.gba", 0xDD5920, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_raikou_still_front_pic:: @ 8DD5940 + .incbin "graphics/pokemon/front_pics/raikou_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xDD5940, 0x057C + + .align 2 +gFile_graphics_pokemon_palettes_raikou_palette:: @ 8DD5EBC + .incbin "graphics/pokemon/palettes/raikou_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xDD5EBC, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_raikou_back_pic:: @ 8DD5EE4 + .incbin "graphics/pokemon/back_pics/raikou_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xDD5EE4, 0x03A8 + + .align 2 +gFile_graphics_pokemon_palettes_raikou_shiny_palette:: @ 8DD628C + .incbin "graphics/pokemon/palettes/raikou_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xDD628C, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_raikou_icon:: @ 8DD62B4 + .incbin "graphics/pokemon/icons/raikou_icon.4bpp" + @ .incbin "baserom.gba", 0xDD62B4, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_raikou_footprint:: @ 8DD66B4 + .incbin "graphics/pokemon/footprints/raikou_footprint.1bpp" + @ .incbin "baserom.gba", 0xDD66B4, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_entei_still_front_pic:: @ 8DD66D4 + .incbin "graphics/pokemon/front_pics/entei_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xDD66D4, 0x05FC + + .align 2 +gFile_graphics_pokemon_palettes_entei_palette:: @ 8DD6CD0 + .incbin "graphics/pokemon/palettes/entei_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xDD6CD0, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_entei_back_pic:: @ 8DD6CF8 + .incbin "graphics/pokemon/back_pics/entei_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xDD6CF8, 0x0424 + + .align 2 +gFile_graphics_pokemon_palettes_entei_shiny_palette:: @ 8DD711C + .incbin "graphics/pokemon/palettes/entei_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xDD711C, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_entei_icon:: @ 8DD7144 + .incbin "graphics/pokemon/icons/entei_icon.4bpp" + @ .incbin "baserom.gba", 0xDD7144, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_entei_footprint:: @ 8DD7544 + .incbin "graphics/pokemon/footprints/entei_footprint.1bpp" + @ .incbin "baserom.gba", 0xDD7544, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_suicune_still_front_pic:: @ 8DD7564 + .incbin "graphics/pokemon/front_pics/suicune_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xDD7564, 0x0584 + + .align 2 +gFile_graphics_pokemon_palettes_suicune_palette:: @ 8DD7AE8 + .incbin "graphics/pokemon/palettes/suicune_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xDD7AE8, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_suicune_back_pic:: @ 8DD7B10 + .incbin "graphics/pokemon/back_pics/suicune_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xDD7B10, 0x04DC + + .align 2 +gFile_graphics_pokemon_palettes_suicune_shiny_palette:: @ 8DD7FEC + .incbin "graphics/pokemon/palettes/suicune_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xDD7FEC, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_suicune_icon:: @ 8DD8014 + .incbin "graphics/pokemon/icons/suicune_icon.4bpp" + @ .incbin "baserom.gba", 0xDD8014, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_suicune_footprint:: @ 8DD8414 + .incbin "graphics/pokemon/footprints/suicune_footprint.1bpp" + @ .incbin "baserom.gba", 0xDD8414, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_larvitar_still_front_pic:: @ 8DD8434 + .incbin "graphics/pokemon/front_pics/larvitar_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xDD8434, 0x025C + + .align 2 +gFile_graphics_pokemon_palettes_larvitar_palette:: @ 8DD8690 + .incbin "graphics/pokemon/palettes/larvitar_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xDD8690, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_larvitar_back_pic:: @ 8DD86B8 + .incbin "graphics/pokemon/back_pics/larvitar_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xDD86B8, 0x02AC + + .align 2 +gFile_graphics_pokemon_palettes_larvitar_shiny_palette:: @ 8DD8964 + .incbin "graphics/pokemon/palettes/larvitar_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xDD8964, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_larvitar_icon:: @ 8DD898C + .incbin "graphics/pokemon/icons/larvitar_icon.4bpp" + @ .incbin "baserom.gba", 0xDD898C, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_larvitar_footprint:: @ 8DD8D8C + .incbin "graphics/pokemon/footprints/larvitar_footprint.1bpp" + @ .incbin "baserom.gba", 0xDD8D8C, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_pupitar_still_front_pic:: @ 8DD8DAC + .incbin "graphics/pokemon/front_pics/pupitar_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xDD8DAC, 0x02F0 + + .align 2 +gFile_graphics_pokemon_palettes_pupitar_palette:: @ 8DD909C + .incbin "graphics/pokemon/palettes/pupitar_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xDD909C, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_pupitar_back_pic:: @ 8DD90C4 + .incbin "graphics/pokemon/back_pics/pupitar_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xDD90C4, 0x0338 + + .align 2 +gFile_graphics_pokemon_palettes_pupitar_shiny_palette:: @ 8DD93FC + .incbin "graphics/pokemon/palettes/pupitar_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xDD93FC, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_pupitar_icon:: @ 8DD9424 + .incbin "graphics/pokemon/icons/pupitar_icon.4bpp" + @ .incbin "baserom.gba", 0xDD9424, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_pupitar_footprint:: @ 8DD9824 + .incbin "graphics/pokemon/footprints/pupitar_footprint.1bpp" + @ .incbin "baserom.gba", 0xDD9824, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_tyranitar_still_front_pic:: @ 8DD9844 + .incbin "graphics/pokemon/front_pics/tyranitar_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xDD9844, 0x053C + + .align 2 +gFile_graphics_pokemon_palettes_tyranitar_palette:: @ 8DD9D80 + .incbin "graphics/pokemon/palettes/tyranitar_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xDD9D80, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_tyranitar_back_pic:: @ 8DD9DA8 + .incbin "graphics/pokemon/back_pics/tyranitar_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xDD9DA8, 0x03EC + + .align 2 +gFile_graphics_pokemon_palettes_tyranitar_shiny_palette:: @ 8DDA194 + .incbin "graphics/pokemon/palettes/tyranitar_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xDDA194, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_tyranitar_icon:: @ 8DDA1BC + .incbin "graphics/pokemon/icons/tyranitar_icon.4bpp" + @ .incbin "baserom.gba", 0xDDA1BC, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_tyranitar_footprint:: @ 8DDA5BC + .incbin "graphics/pokemon/footprints/tyranitar_footprint.1bpp" + @ .incbin "baserom.gba", 0xDDA5BC, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_lugia_still_front_pic:: @ 8DDA5DC + .incbin "graphics/pokemon/front_pics/lugia_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xDDA5DC, 0x04C4 + + .align 2 +gFile_graphics_pokemon_palettes_lugia_palette:: @ 8DDAAA0 + .incbin "graphics/pokemon/palettes/lugia_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xDDAAA0, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_lugia_back_pic:: @ 8DDAAC8 + .incbin "graphics/pokemon/back_pics/lugia_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xDDAAC8, 0x03D4 + + .align 2 +gFile_graphics_pokemon_palettes_lugia_shiny_palette:: @ 8DDAE9C + .incbin "graphics/pokemon/palettes/lugia_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xDDAE9C, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_lugia_icon:: @ 8DDAEC4 + .incbin "graphics/pokemon/icons/lugia_icon.4bpp" + @ .incbin "baserom.gba", 0xDDAEC4, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_lugia_footprint:: @ 8DDB2C4 + .incbin "graphics/pokemon/footprints/lugia_footprint.1bpp" + @ .incbin "baserom.gba", 0xDDB2C4, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_ho_oh_still_front_pic:: @ 8DDB2E4 + .incbin "graphics/pokemon/front_pics/ho_oh_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xDDB2E4, 0x0654 + + .align 2 +gFile_graphics_pokemon_palettes_ho_oh_palette:: @ 8DDB938 + .incbin "graphics/pokemon/palettes/ho_oh_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xDDB938, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_ho_oh_back_pic:: @ 8DDB960 + .incbin "graphics/pokemon/back_pics/ho_oh_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xDDB960, 0x0410 + + .align 2 +gFile_graphics_pokemon_palettes_ho_oh_shiny_palette:: @ 8DDBD70 + .incbin "graphics/pokemon/palettes/ho_oh_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xDDBD70, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_ho_oh_icon:: @ 8DDBD98 + .incbin "graphics/pokemon/icons/ho_oh_icon.4bpp" + @ .incbin "baserom.gba", 0xDDBD98, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_ho_oh_footprint:: @ 8DDC198 + .incbin "graphics/pokemon/footprints/ho_oh_footprint.1bpp" + @ .incbin "baserom.gba", 0xDDC198, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_celebi_still_front_pic:: @ 8DDC1B8 + .incbin "graphics/pokemon/front_pics/celebi_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xDDC1B8, 0x0278 + + .align 2 +gFile_graphics_pokemon_palettes_celebi_palette:: @ 8DDC430 + .incbin "graphics/pokemon/palettes/celebi_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xDDC430, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_celebi_back_pic:: @ 8DDC458 + .incbin "graphics/pokemon/back_pics/celebi_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xDDC458, 0x03AC + + .align 2 +gFile_graphics_pokemon_palettes_celebi_shiny_palette:: @ 8DDC804 + .incbin "graphics/pokemon/palettes/celebi_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xDDC804, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_celebi_icon:: @ 8DDC82C + .incbin "graphics/pokemon/icons/celebi_icon.4bpp" + @ .incbin "baserom.gba", 0xDDC82C, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_celebi_footprint:: @ 8DDCC2C + .incbin "graphics/pokemon/footprints/celebi_footprint.1bpp" + @ .incbin "baserom.gba", 0xDDCC2C, 0x0020 + + + .align 2 +gFile_graphics_pokemon_back_pics_double_question_mark_back_pic:: @ 8DDCC4C + .incbin "graphics/pokemon/back_pics/double_question_mark_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xDDCC4C, 0x0184 + + .align 2 +gFile_graphics_pokemon_palettes_double_question_mark_palette:: @ 8DDCDD0 + .incbin "graphics/pokemon/palettes/double_question_mark_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xDDCDD0, 0x0014 + + .align 2 +gFile_graphics_pokemon_back_pics_double_question_mark_back_pic2:: @ 8DDCDE4 + @ .incbin "graphics/pokemon/back_pics/double_question_mark_back_pic.4bpp.lz" + .incbin "baserom.gba", 0xDDCDE4, 0x0184 + + .align 2 +gFile_graphics_pokemon_palettes_double_question_mark_shiny_palette:: @ 8DDCF68 + .incbin "graphics/pokemon/palettes/double_question_mark_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xDDCF68, 0x0014 + + + .align 2 +gFile_graphics_pokemon_front_pics_treecko_still_front_pic:: @ 8DDCF7C + .incbin "graphics/pokemon/front_pics/treecko_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xDDCF7C, 0x0308 + + .align 2 +gFile_graphics_pokemon_palettes_treecko_palette:: @ 8DDD284 + .incbin "graphics/pokemon/palettes/treecko_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xDDD284, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_treecko_back_pic:: @ 8DDD2AC + .incbin "graphics/pokemon/back_pics/treecko_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xDDD2AC, 0x0300 + + .align 2 +gFile_graphics_pokemon_palettes_treecko_shiny_palette:: @ 8DDD5AC + .incbin "graphics/pokemon/palettes/treecko_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xDDD5AC, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_treecko_icon:: @ 8DDD5D4 + .incbin "graphics/pokemon/icons/treecko_icon.4bpp" + @ .incbin "baserom.gba", 0xDDD5D4, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_treecko_footprint:: @ 8DDD9D4 + .incbin "graphics/pokemon/footprints/treecko_footprint.1bpp" + @ .incbin "baserom.gba", 0xDDD9D4, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_grovyle_still_front_pic:: @ 8DDD9F4 + .incbin "graphics/pokemon/front_pics/grovyle_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xDDD9F4, 0x048C + + .align 2 +gFile_graphics_pokemon_palettes_grovyle_palette:: @ 8DDDE80 + .incbin "graphics/pokemon/palettes/grovyle_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xDDDE80, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_grovyle_back_pic:: @ 8DDDEA8 + .incbin "graphics/pokemon/back_pics/grovyle_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xDDDEA8, 0x033C + + .align 2 +gFile_graphics_pokemon_palettes_grovyle_shiny_palette:: @ 8DDE1E4 + .incbin "graphics/pokemon/palettes/grovyle_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xDDE1E4, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_grovyle_icon:: @ 8DDE20C + .incbin "graphics/pokemon/icons/grovyle_icon.4bpp" + @ .incbin "baserom.gba", 0xDDE20C, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_grovyle_footprint:: @ 8DDE60C + .incbin "graphics/pokemon/footprints/grovyle_footprint.1bpp" + @ .incbin "baserom.gba", 0xDDE60C, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_sceptile_still_front_pic:: @ 8DDE62C + .incbin "graphics/pokemon/front_pics/sceptile_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xDDE62C, 0x0504 + + .align 2 +gFile_graphics_pokemon_palettes_sceptile_palette:: @ 8DDEB30 + .incbin "graphics/pokemon/palettes/sceptile_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xDDEB30, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_sceptile_back_pic:: @ 8DDEB58 + .incbin "graphics/pokemon/back_pics/sceptile_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xDDEB58, 0x03FC + + .align 2 +gFile_graphics_pokemon_palettes_sceptile_shiny_palette:: @ 8DDEF54 + .incbin "graphics/pokemon/palettes/sceptile_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xDDEF54, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_sceptile_icon:: @ 8DDEF7C + .incbin "graphics/pokemon/icons/sceptile_icon.4bpp" + @ .incbin "baserom.gba", 0xDDEF7C, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_sceptile_footprint:: @ 8DDF37C + .incbin "graphics/pokemon/footprints/sceptile_footprint.1bpp" + @ .incbin "baserom.gba", 0xDDF37C, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_torchic_still_front_pic:: @ 8DDF39C + .incbin "graphics/pokemon/front_pics/torchic_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xDDF39C, 0x029C + + .align 2 +gFile_graphics_pokemon_palettes_torchic_palette:: @ 8DDF638 + .incbin "graphics/pokemon/palettes/torchic_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xDDF638, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_torchic_back_pic:: @ 8DDF660 + .incbin "graphics/pokemon/back_pics/torchic_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xDDF660, 0x02D8 + + .align 2 +gFile_graphics_pokemon_palettes_torchic_shiny_palette:: @ 8DDF938 + .incbin "graphics/pokemon/palettes/torchic_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xDDF938, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_torchic_icon:: @ 8DDF960 + .incbin "graphics/pokemon/icons/torchic_icon.4bpp" + @ .incbin "baserom.gba", 0xDDF960, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_torchic_footprint:: @ 8DDFD60 + .incbin "graphics/pokemon/footprints/torchic_footprint.1bpp" + @ .incbin "baserom.gba", 0xDDFD60, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_combusken_still_front_pic:: @ 8DDFD80 + .incbin "graphics/pokemon/front_pics/combusken_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xDDFD80, 0x03EC + + .align 2 +gFile_graphics_pokemon_palettes_combusken_palette:: @ 8DE016C + .incbin "graphics/pokemon/palettes/combusken_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xDE016C, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_combusken_back_pic:: @ 8DE0194 + .incbin "graphics/pokemon/back_pics/combusken_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xDE0194, 0x03D0 + + .align 2 +gFile_graphics_pokemon_palettes_combusken_shiny_palette:: @ 8DE0564 + .incbin "graphics/pokemon/palettes/combusken_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xDE0564, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_combusken_icon:: @ 8DE058C + .incbin "graphics/pokemon/icons/combusken_icon.4bpp" + @ .incbin "baserom.gba", 0xDE058C, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_combusken_footprint:: @ 8DE098C + .incbin "graphics/pokemon/footprints/combusken_footprint.1bpp" + @ .incbin "baserom.gba", 0xDE098C, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_blaziken_still_front_pic:: @ 8DE09AC + @ .incbin "graphics/pokemon/front_pics/blaziken_still_front_pic.4bpp.lz" + .incbin "baserom.gba", 0xDE09AC, 0x0478 + + .align 2 +gFile_graphics_pokemon_palettes_blaziken_palette:: @ 8DE0E24 + .incbin "graphics/pokemon/palettes/blaziken_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xDE0E24, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_blaziken_back_pic:: @ 8DE0E4C + .incbin "graphics/pokemon/back_pics/blaziken_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xDE0E4C, 0x03DC + + .align 2 +gFile_graphics_pokemon_palettes_blaziken_shiny_palette:: @ 8DE1228 + .incbin "graphics/pokemon/palettes/blaziken_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xDE1228, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_blaziken_icon:: @ 8DE1250 + .incbin "graphics/pokemon/icons/blaziken_icon.4bpp" + @ .incbin "baserom.gba", 0xDE1250, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_blaziken_footprint:: @ 8DE1650 + .incbin "graphics/pokemon/footprints/blaziken_footprint.1bpp" + @ .incbin "baserom.gba", 0xDE1650, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_mudkip_still_front_pic:: @ 8DE1670 + .incbin "graphics/pokemon/front_pics/mudkip_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xDE1670, 0x02B8 + + .align 2 +gFile_graphics_pokemon_palettes_mudkip_palette:: @ 8DE1928 + .incbin "graphics/pokemon/palettes/mudkip_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xDE1928, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_mudkip_back_pic:: @ 8DE1950 + .incbin "graphics/pokemon/back_pics/mudkip_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xDE1950, 0x02E0 + + .align 2 +gFile_graphics_pokemon_palettes_mudkip_shiny_palette:: @ 8DE1C30 + .incbin "graphics/pokemon/palettes/mudkip_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xDE1C30, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_mudkip_icon:: @ 8DE1C58 + .incbin "graphics/pokemon/icons/mudkip_icon.4bpp" + @ .incbin "baserom.gba", 0xDE1C58, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_mudkip_footprint:: @ 8DE2058 + .incbin "graphics/pokemon/footprints/mudkip_footprint.1bpp" + @ .incbin "baserom.gba", 0xDE2058, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_marshtomp_still_front_pic:: @ 8DE2078 + .incbin "graphics/pokemon/front_pics/marshtomp_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xDE2078, 0x0388 + + .align 2 +gFile_graphics_pokemon_palettes_marshtomp_palette:: @ 8DE2400 + .incbin "graphics/pokemon/palettes/marshtomp_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xDE2400, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_marshtomp_back_pic:: @ 8DE2428 + .incbin "graphics/pokemon/back_pics/marshtomp_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xDE2428, 0x03B0 + + .align 2 +gFile_graphics_pokemon_palettes_marshtomp_shiny_palette:: @ 8DE27D8 + .incbin "graphics/pokemon/palettes/marshtomp_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xDE27D8, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_marshtomp_icon:: @ 8DE2800 + .incbin "graphics/pokemon/icons/marshtomp_icon.4bpp" + @ .incbin "baserom.gba", 0xDE2800, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_marshtomp_footprint:: @ 8DE2C00 + .incbin "graphics/pokemon/footprints/marshtomp_footprint.1bpp" + @ .incbin "baserom.gba", 0xDE2C00, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_swampert_still_front_pic:: @ 8DE2C20 + .incbin "graphics/pokemon/front_pics/swampert_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xDE2C20, 0x057C + + .align 2 +gFile_graphics_pokemon_palettes_swampert_palette:: @ 8DE319C + .incbin "graphics/pokemon/palettes/swampert_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xDE319C, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_swampert_back_pic:: @ 8DE31C4 + .incbin "graphics/pokemon/back_pics/swampert_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xDE31C4, 0x03B4 + + .align 2 +gFile_graphics_pokemon_palettes_swampert_shiny_palette:: @ 8DE3578 + .incbin "graphics/pokemon/palettes/swampert_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xDE3578, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_swampert_icon:: @ 8DE35A0 + .incbin "graphics/pokemon/icons/swampert_icon.4bpp" + @ .incbin "baserom.gba", 0xDE35A0, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_swampert_footprint:: @ 8DE39A0 + .incbin "graphics/pokemon/footprints/swampert_footprint.1bpp" + @ .incbin "baserom.gba", 0xDE39A0, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_poochyena_still_front_pic:: @ 8DE39C0 + .incbin "graphics/pokemon/front_pics/poochyena_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xDE39C0, 0x02C8 + + .align 2 +gFile_graphics_pokemon_palettes_poochyena_palette:: @ 8DE3C88 + .incbin "graphics/pokemon/palettes/poochyena_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xDE3C88, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_poochyena_back_pic:: @ 8DE3CB0 + .incbin "graphics/pokemon/back_pics/poochyena_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xDE3CB0, 0x032C + + .align 2 +gFile_graphics_pokemon_palettes_poochyena_shiny_palette:: @ 8DE3FDC + .incbin "graphics/pokemon/palettes/poochyena_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xDE3FDC, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_poochyena_icon:: @ 8DE4004 + .incbin "graphics/pokemon/icons/poochyena_icon.4bpp" + @ .incbin "baserom.gba", 0xDE4004, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_poochyena_footprint:: @ 8DE4404 + .incbin "graphics/pokemon/footprints/poochyena_footprint.1bpp" + @ .incbin "baserom.gba", 0xDE4404, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_mightyena_still_front_pic:: @ 8DE4424 + .incbin "graphics/pokemon/front_pics/mightyena_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xDE4424, 0x0438 + + .align 2 +gFile_graphics_pokemon_palettes_mightyena_palette:: @ 8DE485C + .incbin "graphics/pokemon/palettes/mightyena_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xDE485C, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_mightyena_back_pic:: @ 8DE4884 + .incbin "graphics/pokemon/back_pics/mightyena_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xDE4884, 0x0378 + + .align 2 +gFile_graphics_pokemon_palettes_mightyena_shiny_palette:: @ 8DE4BFC + .incbin "graphics/pokemon/palettes/mightyena_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xDE4BFC, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_mightyena_icon:: @ 8DE4C24 + .incbin "graphics/pokemon/icons/mightyena_icon.4bpp" + @ .incbin "baserom.gba", 0xDE4C24, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_mightyena_footprint:: @ 8DE5024 + .incbin "graphics/pokemon/footprints/mightyena_footprint.1bpp" + @ .incbin "baserom.gba", 0xDE5024, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_zigzagoon_still_front_pic:: @ 8DE5044 + .incbin "graphics/pokemon/front_pics/zigzagoon_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xDE5044, 0x03D0 + + .align 2 +gFile_graphics_pokemon_palettes_zigzagoon_palette:: @ 8DE5414 + .incbin "graphics/pokemon/palettes/zigzagoon_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xDE5414, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_zigzagoon_back_pic:: @ 8DE543C + .incbin "graphics/pokemon/back_pics/zigzagoon_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xDE543C, 0x0340 + + .align 2 +gFile_graphics_pokemon_palettes_zigzagoon_shiny_palette:: @ 8DE577C + .incbin "graphics/pokemon/palettes/zigzagoon_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xDE577C, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_zigzagoon_icon:: @ 8DE57A4 + .incbin "graphics/pokemon/icons/zigzagoon_icon.4bpp" + @ .incbin "baserom.gba", 0xDE57A4, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_zigzagoon_footprint:: @ 8DE5BA4 + .incbin "graphics/pokemon/footprints/zigzagoon_footprint.1bpp" + @ .incbin "baserom.gba", 0xDE5BA4, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_linoone_still_front_pic:: @ 8DE5BC4 + .incbin "graphics/pokemon/front_pics/linoone_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xDE5BC4, 0x0370 + + .align 2 +gFile_graphics_pokemon_palettes_linoone_palette:: @ 8DE5F34 + .incbin "graphics/pokemon/palettes/linoone_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xDE5F34, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_linoone_back_pic:: @ 8DE5F5C + .incbin "graphics/pokemon/back_pics/linoone_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xDE5F5C, 0x02D4 + + .align 2 +gFile_graphics_pokemon_palettes_linoone_shiny_palette:: @ 8DE6230 + .incbin "graphics/pokemon/palettes/linoone_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xDE6230, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_linoone_icon:: @ 8DE6258 + .incbin "graphics/pokemon/icons/linoone_icon.4bpp" + @ .incbin "baserom.gba", 0xDE6258, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_linoone_footprint:: @ 8DE6658 + .incbin "graphics/pokemon/footprints/linoone_footprint.1bpp" + @ .incbin "baserom.gba", 0xDE6658, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_wurmple_still_front_pic:: @ 8DE6678 + .incbin "graphics/pokemon/front_pics/wurmple_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xDE6678, 0x0288 + + .align 2 +gFile_graphics_pokemon_palettes_wurmple_palette:: @ 8DE6900 + .incbin "graphics/pokemon/palettes/wurmple_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xDE6900, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_wurmple_back_pic:: @ 8DE6928 + .incbin "graphics/pokemon/back_pics/wurmple_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xDE6928, 0x024C + + .align 2 +gFile_graphics_pokemon_palettes_wurmple_shiny_palette:: @ 8DE6B74 + .incbin "graphics/pokemon/palettes/wurmple_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xDE6B74, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_wurmple_icon:: @ 8DE6B9C + .incbin "graphics/pokemon/icons/wurmple_icon.4bpp" + @ .incbin "baserom.gba", 0xDE6B9C, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_wurmple_footprint:: @ 8DE6F9C + .incbin "graphics/pokemon/footprints/wurmple_footprint.1bpp" + @ .incbin "baserom.gba", 0xDE6F9C, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_silcoon_still_front_pic:: @ 8DE6FBC + .incbin "graphics/pokemon/front_pics/silcoon_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xDE6FBC, 0x0280 + + .align 2 +gFile_graphics_pokemon_palettes_silcoon_palette:: @ 8DE723C + .incbin "graphics/pokemon/palettes/silcoon_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xDE723C, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_silcoon_back_pic:: @ 8DE7264 + .incbin "graphics/pokemon/back_pics/silcoon_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xDE7264, 0x021C + + .align 2 +gFile_graphics_pokemon_palettes_silcoon_shiny_palette:: @ 8DE7480 + .incbin "graphics/pokemon/palettes/silcoon_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xDE7480, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_silcoon_icon:: @ 8DE74A8 + .incbin "graphics/pokemon/icons/silcoon_icon.4bpp" + @ .incbin "baserom.gba", 0xDE74A8, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_silcoon_footprint:: @ 8DE78A8 + .incbin "graphics/pokemon/footprints/silcoon_footprint.1bpp" + @ .incbin "baserom.gba", 0xDE78A8, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_beautifly_still_front_pic:: @ 8DE78C8 + .incbin "graphics/pokemon/front_pics/beautifly_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xDE78C8, 0x0358 + + .align 2 +gFile_graphics_pokemon_palettes_beautifly_palette:: @ 8DE7C20 + .incbin "graphics/pokemon/palettes/beautifly_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xDE7C20, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_beautifly_back_pic:: @ 8DE7C48 + .incbin "graphics/pokemon/back_pics/beautifly_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xDE7C48, 0x03B0 + + .align 2 +gFile_graphics_pokemon_palettes_beautifly_shiny_palette:: @ 8DE7FF8 + .incbin "graphics/pokemon/palettes/beautifly_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xDE7FF8, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_beautifly_icon:: @ 8DE8020 + .incbin "graphics/pokemon/icons/beautifly_icon.4bpp" + @ .incbin "baserom.gba", 0xDE8020, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_beautifly_footprint:: @ 8DE8420 + .incbin "graphics/pokemon/footprints/beautifly_footprint.1bpp" + @ .incbin "baserom.gba", 0xDE8420, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_cascoon_still_front_pic:: @ 8DE8440 + .incbin "graphics/pokemon/front_pics/cascoon_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xDE8440, 0x026C + + .align 2 +gFile_graphics_pokemon_palettes_cascoon_palette:: @ 8DE86AC + .incbin "graphics/pokemon/palettes/cascoon_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xDE86AC, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_cascoon_back_pic:: @ 8DE86D4 + .incbin "graphics/pokemon/back_pics/cascoon_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xDE86D4, 0x0210 + + .align 2 +gFile_graphics_pokemon_palettes_cascoon_shiny_palette:: @ 8DE88E4 + .incbin "graphics/pokemon/palettes/cascoon_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xDE88E4, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_cascoon_icon:: @ 8DE890C + .incbin "graphics/pokemon/icons/cascoon_icon.4bpp" + @ .incbin "baserom.gba", 0xDE890C, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_cascoon_footprint:: @ 8DE8D0C + .incbin "graphics/pokemon/footprints/cascoon_footprint.1bpp" + @ .incbin "baserom.gba", 0xDE8D0C, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_dustox_still_front_pic:: @ 8DE8D2C + .incbin "graphics/pokemon/front_pics/dustox_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xDE8D2C, 0x0368 + + .align 2 +gFile_graphics_pokemon_palettes_dustox_palette:: @ 8DE9094 + .incbin "graphics/pokemon/palettes/dustox_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xDE9094, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_dustox_back_pic:: @ 8DE90BC + .incbin "graphics/pokemon/back_pics/dustox_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xDE90BC, 0x0258 + + .align 2 +gFile_graphics_pokemon_palettes_dustox_shiny_palette:: @ 8DE9314 + .incbin "graphics/pokemon/palettes/dustox_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xDE9314, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_dustox_icon:: @ 8DE933C + .incbin "graphics/pokemon/icons/dustox_icon.4bpp" + @ .incbin "baserom.gba", 0xDE933C, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_dustox_footprint:: @ 8DE973C + .incbin "graphics/pokemon/footprints/dustox_footprint.1bpp" + @ .incbin "baserom.gba", 0xDE973C, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_lotad_still_front_pic:: @ 8DE975C + .incbin "graphics/pokemon/front_pics/lotad_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xDE975C, 0x0260 + + .align 2 +gFile_graphics_pokemon_palettes_lotad_palette:: @ 8DE99BC + .incbin "graphics/pokemon/palettes/lotad_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xDE99BC, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_lotad_back_pic:: @ 8DE99E4 + .incbin "graphics/pokemon/back_pics/lotad_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xDE99E4, 0x02E8 + + .align 2 +gFile_graphics_pokemon_palettes_lotad_shiny_palette:: @ 8DE9CCC + .incbin "graphics/pokemon/palettes/lotad_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xDE9CCC, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_lotad_icon:: @ 8DE9CF4 + .incbin "graphics/pokemon/icons/lotad_icon.4bpp" + @ .incbin "baserom.gba", 0xDE9CF4, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_lotad_footprint:: @ 8DEA0F4 + .incbin "graphics/pokemon/footprints/lotad_footprint.1bpp" + @ .incbin "baserom.gba", 0xDEA0F4, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_lombre_still_front_pic:: @ 8DEA114 + .incbin "graphics/pokemon/front_pics/lombre_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xDEA114, 0x0318 + + .align 2 +gFile_graphics_pokemon_palettes_lombre_palette:: @ 8DEA42C + .incbin "graphics/pokemon/palettes/lombre_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xDEA42C, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_lombre_back_pic:: @ 8DEA454 + .incbin "graphics/pokemon/back_pics/lombre_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xDEA454, 0x02FC + + .align 2 +gFile_graphics_pokemon_palettes_lombre_shiny_palette:: @ 8DEA750 + .incbin "graphics/pokemon/palettes/lombre_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xDEA750, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_lombre_icon:: @ 8DEA778 + .incbin "graphics/pokemon/icons/lombre_icon.4bpp" + @ .incbin "baserom.gba", 0xDEA778, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_lombre_footprint:: @ 8DEAB78 + .incbin "graphics/pokemon/footprints/lombre_footprint.1bpp" + @ .incbin "baserom.gba", 0xDEAB78, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_ludicolo_still_front_pic:: @ 8DEAB98 + .incbin "graphics/pokemon/front_pics/ludicolo_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xDEAB98, 0x04E4 + + .align 2 +gFile_graphics_pokemon_palettes_ludicolo_palette:: @ 8DEB07C + .incbin "graphics/pokemon/palettes/ludicolo_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xDEB07C, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_ludicolo_back_pic:: @ 8DEB0A4 + .incbin "graphics/pokemon/back_pics/ludicolo_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xDEB0A4, 0x02FC + + .align 2 +gFile_graphics_pokemon_palettes_ludicolo_shiny_palette:: @ 8DEB3A0 + .incbin "graphics/pokemon/palettes/ludicolo_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xDEB3A0, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_ludicolo_icon:: @ 8DEB3C8 + .incbin "graphics/pokemon/icons/ludicolo_icon.4bpp" + @ .incbin "baserom.gba", 0xDEB3C8, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_ludicolo_footprint:: @ 8DEB7C8 + .incbin "graphics/pokemon/footprints/ludicolo_footprint.1bpp" + @ .incbin "baserom.gba", 0xDEB7C8, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_seedot_still_front_pic:: @ 8DEB7E8 + .incbin "graphics/pokemon/front_pics/seedot_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xDEB7E8, 0x0294 + + .align 2 +gFile_graphics_pokemon_palettes_seedot_palette:: @ 8DEBA7C + .incbin "graphics/pokemon/palettes/seedot_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xDEBA7C, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_seedot_back_pic:: @ 8DEBAA4 + .incbin "graphics/pokemon/back_pics/seedot_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xDEBAA4, 0x02E0 + + .align 2 +gFile_graphics_pokemon_palettes_seedot_shiny_palette:: @ 8DEBD84 + .incbin "graphics/pokemon/palettes/seedot_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xDEBD84, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_seedot_icon:: @ 8DEBDAC + .incbin "graphics/pokemon/icons/seedot_icon.4bpp" + @ .incbin "baserom.gba", 0xDEBDAC, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_seedot_footprint:: @ 8DEC1AC + .incbin "graphics/pokemon/footprints/seedot_footprint.1bpp" + @ .incbin "baserom.gba", 0xDEC1AC, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_nuzleaf_still_front_pic:: @ 8DEC1CC + .incbin "graphics/pokemon/front_pics/nuzleaf_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xDEC1CC, 0x02EC + + .align 2 +gFile_graphics_pokemon_palettes_nuzleaf_palette:: @ 8DEC4B8 + .incbin "graphics/pokemon/palettes/nuzleaf_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xDEC4B8, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_nuzleaf_back_pic:: @ 8DEC4E0 + .incbin "graphics/pokemon/back_pics/nuzleaf_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xDEC4E0, 0x02C8 + + .align 2 +gFile_graphics_pokemon_palettes_nuzleaf_shiny_palette:: @ 8DEC7A8 + .incbin "graphics/pokemon/palettes/nuzleaf_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xDEC7A8, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_nuzleaf_icon:: @ 8DEC7D0 + .incbin "graphics/pokemon/icons/nuzleaf_icon.4bpp" + @ .incbin "baserom.gba", 0xDEC7D0, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_nuzleaf_footprint:: @ 8DECBD0 + .incbin "graphics/pokemon/footprints/nuzleaf_footprint.1bpp" + @ .incbin "baserom.gba", 0xDECBD0, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_shiftry_still_front_pic:: @ 8DECBF0 + .incbin "graphics/pokemon/front_pics/shiftry_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xDECBF0, 0x04BC + + .align 2 +gFile_graphics_pokemon_palettes_shiftry_palette:: @ 8DED0AC + .incbin "graphics/pokemon/palettes/shiftry_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xDED0AC, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_shiftry_back_pic:: @ 8DED0D4 + .incbin "graphics/pokemon/back_pics/shiftry_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xDED0D4, 0x02C4 + + .align 2 +gFile_graphics_pokemon_palettes_shiftry_shiny_palette:: @ 8DED398 + .incbin "graphics/pokemon/palettes/shiftry_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xDED398, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_shiftry_icon:: @ 8DED3C0 + .incbin "graphics/pokemon/icons/shiftry_icon.4bpp" + @ .incbin "baserom.gba", 0xDED3C0, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_shiftry_footprint:: @ 8DED7C0 + .incbin "graphics/pokemon/footprints/shiftry_footprint.1bpp" + @ .incbin "baserom.gba", 0xDED7C0, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_nincada_still_front_pic:: @ 8DED7E0 + .incbin "graphics/pokemon/front_pics/nincada_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xDED7E0, 0x02A0 + + .align 2 +gFile_graphics_pokemon_palettes_nincada_palette:: @ 8DEDA80 + .incbin "graphics/pokemon/palettes/nincada_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xDEDA80, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_nincada_back_pic:: @ 8DEDAA8 + .incbin "graphics/pokemon/back_pics/nincada_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xDEDAA8, 0x02B8 + + .align 2 +gFile_graphics_pokemon_palettes_nincada_shiny_palette:: @ 8DEDD60 + .incbin "graphics/pokemon/palettes/nincada_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xDEDD60, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_nincada_icon:: @ 8DEDD88 + .incbin "graphics/pokemon/icons/nincada_icon.4bpp" + @ .incbin "baserom.gba", 0xDEDD88, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_nincada_footprint:: @ 8DEE188 + .incbin "graphics/pokemon/footprints/nincada_footprint.1bpp" + @ .incbin "baserom.gba", 0xDEE188, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_ninjask_still_front_pic:: @ 8DEE1A8 + .incbin "graphics/pokemon/front_pics/ninjask_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xDEE1A8, 0x0370 + + .align 2 +gFile_graphics_pokemon_palettes_ninjask_palette:: @ 8DEE518 + .incbin "graphics/pokemon/palettes/ninjask_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xDEE518, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_ninjask_back_pic:: @ 8DEE540 + .incbin "graphics/pokemon/back_pics/ninjask_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xDEE540, 0x03CC + + .align 2 +gFile_graphics_pokemon_palettes_ninjask_shiny_palette:: @ 8DEE90C + .incbin "graphics/pokemon/palettes/ninjask_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xDEE90C, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_ninjask_icon:: @ 8DEE934 + .incbin "graphics/pokemon/icons/ninjask_icon.4bpp" + @ .incbin "baserom.gba", 0xDEE934, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_ninjask_footprint:: @ 8DEED34 + .incbin "graphics/pokemon/footprints/ninjask_footprint.1bpp" + @ .incbin "baserom.gba", 0xDEED34, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_shedinja_still_front_pic:: @ 8DEED54 + .incbin "graphics/pokemon/front_pics/shedinja_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xDEED54, 0x0320 + + .align 2 +gFile_graphics_pokemon_palettes_shedinja_palette:: @ 8DEF074 + .incbin "graphics/pokemon/palettes/shedinja_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xDEF074, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_shedinja_back_pic:: @ 8DEF09C + .incbin "graphics/pokemon/back_pics/shedinja_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xDEF09C, 0x03A0 + + .align 2 +gFile_graphics_pokemon_palettes_shedinja_shiny_palette:: @ 8DEF43C + .incbin "graphics/pokemon/palettes/shedinja_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xDEF43C, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_shedinja_icon:: @ 8DEF464 + .incbin "graphics/pokemon/icons/shedinja_icon.4bpp" + @ .incbin "baserom.gba", 0xDEF464, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_shedinja_footprint:: @ 8DEF864 + .incbin "graphics/pokemon/footprints/shedinja_footprint.1bpp" + @ .incbin "baserom.gba", 0xDEF864, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_taillow_still_front_pic:: @ 8DEF884 + .incbin "graphics/pokemon/front_pics/taillow_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xDEF884, 0x0258 + + .align 2 +gFile_graphics_pokemon_palettes_taillow_palette:: @ 8DEFADC + .incbin "graphics/pokemon/palettes/taillow_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xDEFADC, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_taillow_back_pic:: @ 8DEFB04 + .incbin "graphics/pokemon/back_pics/taillow_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xDEFB04, 0x0220 + + .align 2 +gFile_graphics_pokemon_palettes_taillow_shiny_palette:: @ 8DEFD24 + .incbin "graphics/pokemon/palettes/taillow_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xDEFD24, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_taillow_icon:: @ 8DEFD4C + .incbin "graphics/pokemon/icons/taillow_icon.4bpp" + @ .incbin "baserom.gba", 0xDEFD4C, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_taillow_footprint:: @ 8DF014C + .incbin "graphics/pokemon/footprints/taillow_footprint.1bpp" + @ .incbin "baserom.gba", 0xDF014C, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_swellow_still_front_pic:: @ 8DF016C + .incbin "graphics/pokemon/front_pics/swellow_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xDF016C, 0x03C4 + + .align 2 +gFile_graphics_pokemon_palettes_swellow_palette:: @ 8DF0530 + .incbin "graphics/pokemon/palettes/swellow_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xDF0530, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_swellow_back_pic:: @ 8DF0558 + .incbin "graphics/pokemon/back_pics/swellow_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xDF0558, 0x0338 + + .align 2 +gFile_graphics_pokemon_palettes_swellow_shiny_palette:: @ 8DF0890 + .incbin "graphics/pokemon/palettes/swellow_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xDF0890, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_swellow_icon:: @ 8DF08B8 + .incbin "graphics/pokemon/icons/swellow_icon.4bpp" + @ .incbin "baserom.gba", 0xDF08B8, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_swellow_footprint:: @ 8DF0CB8 + .incbin "graphics/pokemon/footprints/swellow_footprint.1bpp" + @ .incbin "baserom.gba", 0xDF0CB8, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_shroomish_still_front_pic:: @ 8DF0CD8 + .incbin "graphics/pokemon/front_pics/shroomish_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xDF0CD8, 0x0268 + + .align 2 +gFile_graphics_pokemon_palettes_shroomish_palette:: @ 8DF0F40 + .incbin "graphics/pokemon/palettes/shroomish_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xDF0F40, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_shroomish_back_pic:: @ 8DF0F68 + .incbin "graphics/pokemon/back_pics/shroomish_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xDF0F68, 0x02E0 + + .align 2 +gFile_graphics_pokemon_palettes_shroomish_shiny_palette:: @ 8DF1248 + .incbin "graphics/pokemon/palettes/shroomish_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xDF1248, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_shroomish_icon:: @ 8DF1270 + .incbin "graphics/pokemon/icons/shroomish_icon.4bpp" + @ .incbin "baserom.gba", 0xDF1270, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_shroomish_footprint:: @ 8DF1670 + .incbin "graphics/pokemon/footprints/shroomish_footprint.1bpp" + @ .incbin "baserom.gba", 0xDF1670, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_breloom_still_front_pic:: @ 8DF1690 + .incbin "graphics/pokemon/front_pics/breloom_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xDF1690, 0x03E8 + + .align 2 +gFile_graphics_pokemon_palettes_breloom_palette:: @ 8DF1A78 + .incbin "graphics/pokemon/palettes/breloom_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xDF1A78, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_breloom_back_pic:: @ 8DF1AA0 + .incbin "graphics/pokemon/back_pics/breloom_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xDF1AA0, 0x03E0 + + .align 2 +gFile_graphics_pokemon_palettes_breloom_shiny_palette:: @ 8DF1E80 + .incbin "graphics/pokemon/palettes/breloom_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xDF1E80, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_breloom_icon:: @ 8DF1EA8 + .incbin "graphics/pokemon/icons/breloom_icon.4bpp" + @ .incbin "baserom.gba", 0xDF1EA8, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_breloom_footprint:: @ 8DF22A8 + .incbin "graphics/pokemon/footprints/breloom_footprint.1bpp" + @ .incbin "baserom.gba", 0xDF22A8, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_spinda_still_front_pic:: @ 8DF22C8 + .incbin "graphics/pokemon/front_pics/spinda_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xDF22C8, 0x0300 + + .align 2 +gFile_graphics_pokemon_palettes_spinda_palette:: @ 8DF25C8 + .incbin "graphics/pokemon/palettes/spinda_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xDF25C8, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_spinda_back_pic:: @ 8DF25F0 + .incbin "graphics/pokemon/back_pics/spinda_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xDF25F0, 0x033C + + .align 2 +gFile_graphics_pokemon_palettes_spinda_shiny_palette:: @ 8DF292C + .incbin "graphics/pokemon/palettes/spinda_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xDF292C, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_spinda_icon:: @ 8DF2954 + .incbin "graphics/pokemon/icons/spinda_icon.4bpp" + @ .incbin "baserom.gba", 0xDF2954, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_spinda_footprint:: @ 8DF2D54 + .incbin "graphics/pokemon/footprints/spinda_footprint.1bpp" + @ .incbin "baserom.gba", 0xDF2D54, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_wingull_still_front_pic:: @ 8DF2D74 + .incbin "graphics/pokemon/front_pics/wingull_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xDF2D74, 0x023C + + .align 2 +gFile_graphics_pokemon_palettes_wingull_palette:: @ 8DF2FB0 + .incbin "graphics/pokemon/palettes/wingull_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xDF2FB0, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_wingull_back_pic:: @ 8DF2FD8 + .incbin "graphics/pokemon/back_pics/wingull_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xDF2FD8, 0x0350 + + .align 2 +gFile_graphics_pokemon_palettes_wingull_shiny_palette:: @ 8DF3328 + .incbin "graphics/pokemon/palettes/wingull_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xDF3328, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_wingull_icon:: @ 8DF3350 + .incbin "graphics/pokemon/icons/wingull_icon.4bpp" + @ .incbin "baserom.gba", 0xDF3350, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_wingull_footprint:: @ 8DF3750 + .incbin "graphics/pokemon/footprints/wingull_footprint.1bpp" + @ .incbin "baserom.gba", 0xDF3750, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_pelipper_still_front_pic:: @ 8DF3770 + .incbin "graphics/pokemon/front_pics/pelipper_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xDF3770, 0x0398 + + .align 2 +gFile_graphics_pokemon_palettes_pelipper_palette:: @ 8DF3B08 + .incbin "graphics/pokemon/palettes/pelipper_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xDF3B08, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_pelipper_back_pic:: @ 8DF3B30 + .incbin "graphics/pokemon/back_pics/pelipper_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xDF3B30, 0x0380 + + .align 2 +gFile_graphics_pokemon_palettes_pelipper_shiny_palette:: @ 8DF3EB0 + .incbin "graphics/pokemon/palettes/pelipper_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xDF3EB0, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_pelipper_icon:: @ 8DF3ED8 + .incbin "graphics/pokemon/icons/pelipper_icon.4bpp" + @ .incbin "baserom.gba", 0xDF3ED8, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_pelipper_footprint:: @ 8DF42D8 + .incbin "graphics/pokemon/footprints/pelipper_footprint.1bpp" + @ .incbin "baserom.gba", 0xDF42D8, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_surskit_still_front_pic:: @ 8DF42F8 + .incbin "graphics/pokemon/front_pics/surskit_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xDF42F8, 0x020C + + .align 2 +gFile_graphics_pokemon_palettes_surskit_palette:: @ 8DF4504 + .incbin "graphics/pokemon/palettes/surskit_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xDF4504, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_surskit_back_pic:: @ 8DF452C + .incbin "graphics/pokemon/back_pics/surskit_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xDF452C, 0x0238 + + .align 2 +gFile_graphics_pokemon_palettes_surskit_shiny_palette:: @ 8DF4764 + .incbin "graphics/pokemon/palettes/surskit_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xDF4764, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_surskit_icon:: @ 8DF478C + .incbin "graphics/pokemon/icons/surskit_icon.4bpp" + @ .incbin "baserom.gba", 0xDF478C, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_surskit_footprint:: @ 8DF4B8C + .incbin "graphics/pokemon/footprints/surskit_footprint.1bpp" + @ .incbin "baserom.gba", 0xDF4B8C, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_masquerain_still_front_pic:: @ 8DF4BAC + .incbin "graphics/pokemon/front_pics/masquerain_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xDF4BAC, 0x039C + + .align 2 +gFile_graphics_pokemon_palettes_masquerain_palette:: @ 8DF4F48 + .incbin "graphics/pokemon/palettes/masquerain_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xDF4F48, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_masquerain_back_pic:: @ 8DF4F70 + .incbin "graphics/pokemon/back_pics/masquerain_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xDF4F70, 0x0358 + + .align 2 +gFile_graphics_pokemon_palettes_masquerain_shiny_palette:: @ 8DF52C8 + .incbin "graphics/pokemon/palettes/masquerain_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xDF52C8, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_masquerain_icon:: @ 8DF52F0 + .incbin "graphics/pokemon/icons/masquerain_icon.4bpp" + @ .incbin "baserom.gba", 0xDF52F0, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_masquerain_footprint:: @ 8DF56F0 + .incbin "graphics/pokemon/footprints/masquerain_footprint.1bpp" + @ .incbin "baserom.gba", 0xDF56F0, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_wailmer_still_front_pic:: @ 8DF5710 + .incbin "graphics/pokemon/front_pics/wailmer_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xDF5710, 0x02E0 + + .align 2 +gFile_graphics_pokemon_palettes_wailmer_palette:: @ 8DF59F0 + .incbin "graphics/pokemon/palettes/wailmer_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xDF59F0, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_wailmer_back_pic:: @ 8DF5A18 + .incbin "graphics/pokemon/back_pics/wailmer_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xDF5A18, 0x01E4 + + .align 2 +gFile_graphics_pokemon_palettes_wailmer_shiny_palette:: @ 8DF5BFC + .incbin "graphics/pokemon/palettes/wailmer_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xDF5BFC, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_wailmer_icon:: @ 8DF5C24 + .incbin "graphics/pokemon/icons/wailmer_icon.4bpp" + @ .incbin "baserom.gba", 0xDF5C24, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_wailmer_footprint:: @ 8DF6024 + .incbin "graphics/pokemon/footprints/wailmer_footprint.1bpp" + @ .incbin "baserom.gba", 0xDF6024, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_wailord_still_front_pic:: @ 8DF6044 + .incbin "graphics/pokemon/front_pics/wailord_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xDF6044, 0x03C4 + + .align 2 +gFile_graphics_pokemon_palettes_wailord_palette:: @ 8DF6408 + .incbin "graphics/pokemon/palettes/wailord_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xDF6408, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_wailord_back_pic:: @ 8DF6430 + .incbin "graphics/pokemon/back_pics/wailord_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xDF6430, 0x0218 + + .align 2 +gFile_graphics_pokemon_palettes_wailord_shiny_palette:: @ 8DF6648 + .incbin "graphics/pokemon/palettes/wailord_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xDF6648, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_wailord_icon:: @ 8DF6670 + .incbin "graphics/pokemon/icons/wailord_icon.4bpp" + @ .incbin "baserom.gba", 0xDF6670, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_wailord_footprint:: @ 8DF6A70 + .incbin "graphics/pokemon/footprints/wailord_footprint.1bpp" + @ .incbin "baserom.gba", 0xDF6A70, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_skitty_still_front_pic:: @ 8DF6A90 + .incbin "graphics/pokemon/front_pics/skitty_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xDF6A90, 0x0300 + + .align 2 +gFile_graphics_pokemon_palettes_skitty_palette:: @ 8DF6D90 + .incbin "graphics/pokemon/palettes/skitty_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xDF6D90, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_skitty_back_pic:: @ 8DF6DB8 + .incbin "graphics/pokemon/back_pics/skitty_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xDF6DB8, 0x0348 + + .align 2 +gFile_graphics_pokemon_palettes_skitty_shiny_palette:: @ 8DF7100 + .incbin "graphics/pokemon/palettes/skitty_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xDF7100, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_skitty_icon:: @ 8DF7128 + .incbin "graphics/pokemon/icons/skitty_icon.4bpp" + @ .incbin "baserom.gba", 0xDF7128, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_skitty_footprint:: @ 8DF7528 + .incbin "graphics/pokemon/footprints/skitty_footprint.1bpp" + @ .incbin "baserom.gba", 0xDF7528, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_delcatty_still_front_pic:: @ 8DF7548 + .incbin "graphics/pokemon/front_pics/delcatty_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xDF7548, 0x038C + + .align 2 +gFile_graphics_pokemon_palettes_delcatty_palette:: @ 8DF78D4 + .incbin "graphics/pokemon/palettes/delcatty_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xDF78D4, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_delcatty_back_pic:: @ 8DF78FC + .incbin "graphics/pokemon/back_pics/delcatty_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xDF78FC, 0x039C + + .align 2 +gFile_graphics_pokemon_palettes_delcatty_shiny_palette:: @ 8DF7C98 + .incbin "graphics/pokemon/palettes/delcatty_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xDF7C98, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_delcatty_icon:: @ 8DF7CC0 + .incbin "graphics/pokemon/icons/delcatty_icon.4bpp" + @ .incbin "baserom.gba", 0xDF7CC0, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_delcatty_footprint:: @ 8DF80C0 + .incbin "graphics/pokemon/footprints/delcatty_footprint.1bpp" + @ .incbin "baserom.gba", 0xDF80C0, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_kecleon_still_front_pic:: @ 8DF80E0 + .incbin "graphics/pokemon/front_pics/kecleon_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xDF80E0, 0x0380 + + .align 2 +gFile_graphics_pokemon_palettes_kecleon_palette:: @ 8DF8460 + .incbin "graphics/pokemon/palettes/kecleon_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xDF8460, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_kecleon_back_pic:: @ 8DF8488 + .incbin "graphics/pokemon/back_pics/kecleon_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xDF8488, 0x03D8 + + .align 2 +gFile_graphics_pokemon_palettes_kecleon_shiny_palette:: @ 8DF8860 + .incbin "graphics/pokemon/palettes/kecleon_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xDF8860, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_kecleon_icon:: @ 8DF8888 + .incbin "graphics/pokemon/icons/kecleon_icon.4bpp" + @ .incbin "baserom.gba", 0xDF8888, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_kecleon_footprint:: @ 8DF8C88 + .incbin "graphics/pokemon/footprints/kecleon_footprint.1bpp" + @ .incbin "baserom.gba", 0xDF8C88, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_baltoy_still_front_pic:: @ 8DF8CA8 + .incbin "graphics/pokemon/front_pics/baltoy_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xDF8CA8, 0x0224 + + .align 2 +gFile_graphics_pokemon_palettes_baltoy_palette:: @ 8DF8ECC + .incbin "graphics/pokemon/palettes/baltoy_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xDF8ECC, 0x0020 + + .align 2 +gFile_graphics_pokemon_back_pics_baltoy_back_pic:: @ 8DF8EEC + .incbin "graphics/pokemon/back_pics/baltoy_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xDF8EEC, 0x02A8 + + .align 2 +gFile_graphics_pokemon_palettes_baltoy_shiny_palette:: @ 8DF9194 + .incbin "graphics/pokemon/palettes/baltoy_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xDF9194, 0x0020 + + .align 2 +gFile_graphics_pokemon_icons_baltoy_icon:: @ 8DF91B4 + .incbin "graphics/pokemon/icons/baltoy_icon.4bpp" + @ .incbin "baserom.gba", 0xDF91B4, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_baltoy_footprint:: @ 8DF95B4 + .incbin "graphics/pokemon/footprints/baltoy_footprint.1bpp" + @ .incbin "baserom.gba", 0xDF95B4, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_claydol_still_front_pic:: @ 8DF95D4 + .incbin "graphics/pokemon/front_pics/claydol_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xDF95D4, 0x03B8 + + .align 2 +gFile_graphics_pokemon_palettes_claydol_palette:: @ 8DF998C + .incbin "graphics/pokemon/palettes/claydol_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xDF998C, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_claydol_back_pic:: @ 8DF99B4 + .incbin "graphics/pokemon/back_pics/claydol_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xDF99B4, 0x03D4 + + .align 2 +gFile_graphics_pokemon_palettes_claydol_shiny_palette:: @ 8DF9D88 + .incbin "graphics/pokemon/palettes/claydol_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xDF9D88, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_claydol_icon:: @ 8DF9DB0 + .incbin "graphics/pokemon/icons/claydol_icon.4bpp" + @ .incbin "baserom.gba", 0xDF9DB0, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_claydol_footprint:: @ 8DFA1B0 + .incbin "graphics/pokemon/footprints/claydol_footprint.1bpp" + @ .incbin "baserom.gba", 0xDFA1B0, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_nosepass_still_front_pic:: @ 8DFA1D0 + .incbin "graphics/pokemon/front_pics/nosepass_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xDFA1D0, 0x02CC + + .align 2 +gFile_graphics_pokemon_palettes_nosepass_palette:: @ 8DFA49C + .incbin "graphics/pokemon/palettes/nosepass_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xDFA49C, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_nosepass_back_pic:: @ 8DFA4C4 + .incbin "graphics/pokemon/back_pics/nosepass_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xDFA4C4, 0x02A0 + + .align 2 +gFile_graphics_pokemon_palettes_nosepass_shiny_palette:: @ 8DFA764 + .incbin "graphics/pokemon/palettes/nosepass_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xDFA764, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_nosepass_icon:: @ 8DFA78C + .incbin "graphics/pokemon/icons/nosepass_icon.4bpp" + @ .incbin "baserom.gba", 0xDFA78C, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_nosepass_footprint:: @ 8DFAB8C + .incbin "graphics/pokemon/footprints/nosepass_footprint.1bpp" + @ .incbin "baserom.gba", 0xDFAB8C, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_torkoal_still_front_pic:: @ 8DFABAC + .incbin "graphics/pokemon/front_pics/torkoal_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xDFABAC, 0x04AC + + .align 2 +gFile_graphics_pokemon_palettes_torkoal_palette:: @ 8DFB058 + .incbin "graphics/pokemon/palettes/torkoal_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xDFB058, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_torkoal_back_pic:: @ 8DFB080 + .incbin "graphics/pokemon/back_pics/torkoal_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xDFB080, 0x02C8 + + .align 2 +gFile_graphics_pokemon_palettes_torkoal_shiny_palette:: @ 8DFB348 + .incbin "graphics/pokemon/palettes/torkoal_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xDFB348, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_torkoal_icon:: @ 8DFB370 + .incbin "graphics/pokemon/icons/torkoal_icon.4bpp" + @ .incbin "baserom.gba", 0xDFB370, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_torkoal_footprint:: @ 8DFB770 + .incbin "graphics/pokemon/footprints/torkoal_footprint.1bpp" + @ .incbin "baserom.gba", 0xDFB770, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_sableye_still_front_pic:: @ 8DFB790 + .incbin "graphics/pokemon/front_pics/sableye_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xDFB790, 0x02D4 + + .align 2 +gFile_graphics_pokemon_palettes_sableye_palette:: @ 8DFBA64 + .incbin "graphics/pokemon/palettes/sableye_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xDFBA64, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_sableye_back_pic:: @ 8DFBA8C + .incbin "graphics/pokemon/back_pics/sableye_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xDFBA8C, 0x0328 + + .align 2 +gFile_graphics_pokemon_palettes_sableye_shiny_palette:: @ 8DFBDB4 + .incbin "graphics/pokemon/palettes/sableye_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xDFBDB4, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_sableye_icon:: @ 8DFBDDC + .incbin "graphics/pokemon/icons/sableye_icon.4bpp" + @ .incbin "baserom.gba", 0xDFBDDC, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_sableye_footprint:: @ 8DFC1DC + .incbin "graphics/pokemon/footprints/sableye_footprint.1bpp" + @ .incbin "baserom.gba", 0xDFC1DC, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_barboach_still_front_pic:: @ 8DFC1FC + .incbin "graphics/pokemon/front_pics/barboach_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xDFC1FC, 0x0290 + + .align 2 +gFile_graphics_pokemon_palettes_barboach_palette:: @ 8DFC48C + .incbin "graphics/pokemon/palettes/barboach_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xDFC48C, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_barboach_back_pic:: @ 8DFC4B4 + .incbin "graphics/pokemon/back_pics/barboach_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xDFC4B4, 0x0290 + + .align 2 +gFile_graphics_pokemon_palettes_barboach_shiny_palette:: @ 8DFC744 + .incbin "graphics/pokemon/palettes/barboach_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xDFC744, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_barboach_icon:: @ 8DFC76C + .incbin "graphics/pokemon/icons/barboach_icon.4bpp" + @ .incbin "baserom.gba", 0xDFC76C, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_barboach_footprint:: @ 8DFCB6C + .incbin "graphics/pokemon/footprints/barboach_footprint.1bpp" + @ .incbin "baserom.gba", 0xDFCB6C, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_whiscash_still_front_pic:: @ 8DFCB8C + .incbin "graphics/pokemon/front_pics/whiscash_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xDFCB8C, 0x0378 + + .align 2 +gFile_graphics_pokemon_palettes_whiscash_palette:: @ 8DFCF04 + .incbin "graphics/pokemon/palettes/whiscash_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xDFCF04, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_whiscash_back_pic:: @ 8DFCF2C + .incbin "graphics/pokemon/back_pics/whiscash_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xDFCF2C, 0x034C + + .align 2 +gFile_graphics_pokemon_palettes_whiscash_shiny_palette:: @ 8DFD278 + .incbin "graphics/pokemon/palettes/whiscash_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xDFD278, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_whiscash_icon:: @ 8DFD2A0 + .incbin "graphics/pokemon/icons/whiscash_icon.4bpp" + @ .incbin "baserom.gba", 0xDFD2A0, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_whiscash_footprint:: @ 8DFD6A0 + .incbin "graphics/pokemon/footprints/whiscash_footprint.1bpp" + @ .incbin "baserom.gba", 0xDFD6A0, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_luvdisc_still_front_pic:: @ 8DFD6C0 + .incbin "graphics/pokemon/front_pics/luvdisc_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xDFD6C0, 0x01C0 + + .align 2 +gFile_graphics_pokemon_palettes_luvdisc_palette:: @ 8DFD880 + .incbin "graphics/pokemon/palettes/luvdisc_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xDFD880, 0x0024 + + .align 2 +gFile_graphics_pokemon_back_pics_luvdisc_back_pic:: @ 8DFD8A4 + .incbin "graphics/pokemon/back_pics/luvdisc_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xDFD8A4, 0x01D4 + + .align 2 +gFile_graphics_pokemon_palettes_luvdisc_shiny_palette:: @ 8DFDA78 + .incbin "graphics/pokemon/palettes/luvdisc_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xDFDA78, 0x0024 + + .align 2 +gFile_graphics_pokemon_icons_luvdisc_icon:: @ 8DFDA9C + .incbin "graphics/pokemon/icons/luvdisc_icon.4bpp" + @ .incbin "baserom.gba", 0xDFDA9C, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_luvdisc_footprint:: @ 8DFDE9C + .incbin "graphics/pokemon/footprints/luvdisc_footprint.1bpp" + @ .incbin "baserom.gba", 0xDFDE9C, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_corphish_still_front_pic:: @ 8DFDEBC + .incbin "graphics/pokemon/front_pics/corphish_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xDFDEBC, 0x035C + + .align 2 +gFile_graphics_pokemon_palettes_corphish_palette:: @ 8DFE218 + .incbin "graphics/pokemon/palettes/corphish_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xDFE218, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_corphish_back_pic:: @ 8DFE240 + .incbin "graphics/pokemon/back_pics/corphish_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xDFE240, 0x031C + + .align 2 +gFile_graphics_pokemon_palettes_corphish_shiny_palette:: @ 8DFE55C + .incbin "graphics/pokemon/palettes/corphish_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xDFE55C, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_corphish_icon:: @ 8DFE584 + .incbin "graphics/pokemon/icons/corphish_icon.4bpp" + @ .incbin "baserom.gba", 0xDFE584, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_corphish_footprint:: @ 8DFE984 + .incbin "graphics/pokemon/footprints/corphish_footprint.1bpp" + @ .incbin "baserom.gba", 0xDFE984, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_crawdaunt_still_front_pic:: @ 8DFE9A4 + .incbin "graphics/pokemon/front_pics/crawdaunt_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xDFE9A4, 0x0490 + + .align 2 +gFile_graphics_pokemon_palettes_crawdaunt_palette:: @ 8DFEE34 + .incbin "graphics/pokemon/palettes/crawdaunt_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xDFEE34, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_crawdaunt_back_pic:: @ 8DFEE5C + .incbin "graphics/pokemon/back_pics/crawdaunt_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xDFEE5C, 0x03E4 + + .align 2 +gFile_graphics_pokemon_palettes_crawdaunt_shiny_palette:: @ 8DFF240 + .incbin "graphics/pokemon/palettes/crawdaunt_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xDFF240, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_crawdaunt_icon:: @ 8DFF268 + .incbin "graphics/pokemon/icons/crawdaunt_icon.4bpp" + @ .incbin "baserom.gba", 0xDFF268, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_crawdaunt_footprint:: @ 8DFF668 + .incbin "graphics/pokemon/footprints/crawdaunt_footprint.1bpp" + @ .incbin "baserom.gba", 0xDFF668, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_feebas_still_front_pic:: @ 8DFF688 + .incbin "graphics/pokemon/front_pics/feebas_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xDFF688, 0x028C + + .align 2 +gFile_graphics_pokemon_palettes_feebas_palette:: @ 8DFF914 + .incbin "graphics/pokemon/palettes/feebas_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xDFF914, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_feebas_back_pic:: @ 8DFF93C + .incbin "graphics/pokemon/back_pics/feebas_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xDFF93C, 0x0338 + + .align 2 +gFile_graphics_pokemon_palettes_feebas_shiny_palette:: @ 8DFFC74 + .incbin "graphics/pokemon/palettes/feebas_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xDFFC74, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_feebas_icon:: @ 8DFFC9C + .incbin "graphics/pokemon/icons/feebas_icon.4bpp" + @ .incbin "baserom.gba", 0xDFFC9C, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_feebas_footprint:: @ 8E0009C + .incbin "graphics/pokemon/footprints/feebas_footprint.1bpp" + @ .incbin "baserom.gba", 0xE0009C, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_milotic_still_front_pic:: @ 8E000BC + .incbin "graphics/pokemon/front_pics/milotic_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE000BC, 0x0490 + + .align 2 +gFile_graphics_pokemon_palettes_milotic_palette:: @ 8E0054C + .incbin "graphics/pokemon/palettes/milotic_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xE0054C, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_milotic_back_pic:: @ 8E00574 + .incbin "graphics/pokemon/back_pics/milotic_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE00574, 0x02F4 + + .align 2 +gFile_graphics_pokemon_palettes_milotic_shiny_palette:: @ 8E00868 + .incbin "graphics/pokemon/palettes/milotic_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xE00868, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_milotic_icon:: @ 8E00890 + .incbin "graphics/pokemon/icons/milotic_icon.4bpp" + @ .incbin "baserom.gba", 0xE00890, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_milotic_footprint:: @ 8E00C90 + .incbin "graphics/pokemon/footprints/milotic_footprint.1bpp" + @ .incbin "baserom.gba", 0xE00C90, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_carvanha_still_front_pic:: @ 8E00CB0 + .incbin "graphics/pokemon/front_pics/carvanha_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE00CB0, 0x032C + + .align 2 +gFile_graphics_pokemon_palettes_carvanha_palette:: @ 8E00FDC + .incbin "graphics/pokemon/palettes/carvanha_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xE00FDC, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_carvanha_back_pic:: @ 8E01004 + .incbin "graphics/pokemon/back_pics/carvanha_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE01004, 0x0310 + + .align 2 +gFile_graphics_pokemon_palettes_carvanha_shiny_palette:: @ 8E01314 + .incbin "graphics/pokemon/palettes/carvanha_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xE01314, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_carvanha_icon:: @ 8E0133C + .incbin "graphics/pokemon/icons/carvanha_icon.4bpp" + @ .incbin "baserom.gba", 0xE0133C, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_carvanha_footprint:: @ 8E0173C + .incbin "graphics/pokemon/footprints/carvanha_footprint.1bpp" + @ .incbin "baserom.gba", 0xE0173C, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_sharpedo_still_front_pic:: @ 8E0175C + .incbin "graphics/pokemon/front_pics/sharpedo_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE0175C, 0x0390 + + .align 2 +gFile_graphics_pokemon_palettes_sharpedo_palette:: @ 8E01AEC + .incbin "graphics/pokemon/palettes/sharpedo_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xE01AEC, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_sharpedo_back_pic:: @ 8E01B14 + .incbin "graphics/pokemon/back_pics/sharpedo_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE01B14, 0x0358 + + .align 2 +gFile_graphics_pokemon_palettes_sharpedo_shiny_palette:: @ 8E01E6C + .incbin "graphics/pokemon/palettes/sharpedo_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xE01E6C, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_sharpedo_icon:: @ 8E01E94 + .incbin "graphics/pokemon/icons/sharpedo_icon.4bpp" + @ .incbin "baserom.gba", 0xE01E94, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_sharpedo_footprint:: @ 8E02294 + .incbin "graphics/pokemon/footprints/sharpedo_footprint.1bpp" + @ .incbin "baserom.gba", 0xE02294, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_trapinch_still_front_pic:: @ 8E022B4 + .incbin "graphics/pokemon/front_pics/trapinch_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE022B4, 0x021C + + .align 2 +gFile_graphics_pokemon_palettes_trapinch_palette:: @ 8E024D0 + .incbin "graphics/pokemon/palettes/trapinch_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xE024D0, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_trapinch_back_pic:: @ 8E024F8 + .incbin "graphics/pokemon/back_pics/trapinch_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE024F8, 0x0220 + + .align 2 +gFile_graphics_pokemon_palettes_trapinch_shiny_palette:: @ 8E02718 + .incbin "graphics/pokemon/palettes/trapinch_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xE02718, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_trapinch_icon:: @ 8E02740 + .incbin "graphics/pokemon/icons/trapinch_icon.4bpp" + @ .incbin "baserom.gba", 0xE02740, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_trapinch_footprint:: @ 8E02B40 + .incbin "graphics/pokemon/footprints/trapinch_footprint.1bpp" + @ .incbin "baserom.gba", 0xE02B40, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_vibrava_still_front_pic:: @ 8E02B60 + .incbin "graphics/pokemon/front_pics/vibrava_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE02B60, 0x0370 + + .align 2 +gFile_graphics_pokemon_palettes_vibrava_palette:: @ 8E02ED0 + .incbin "graphics/pokemon/palettes/vibrava_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xE02ED0, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_vibrava_back_pic:: @ 8E02EF8 + .incbin "graphics/pokemon/back_pics/vibrava_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE02EF8, 0x0278 + + .align 2 +gFile_graphics_pokemon_palettes_vibrava_shiny_palette:: @ 8E03170 + .incbin "graphics/pokemon/palettes/vibrava_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xE03170, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_vibrava_icon:: @ 8E03198 + .incbin "graphics/pokemon/icons/vibrava_icon.4bpp" + @ .incbin "baserom.gba", 0xE03198, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_vibrava_footprint:: @ 8E03598 + .incbin "graphics/pokemon/footprints/vibrava_footprint.1bpp" + @ .incbin "baserom.gba", 0xE03598, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_flygon_still_front_pic:: @ 8E035B8 + .incbin "graphics/pokemon/front_pics/flygon_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE035B8, 0x04F0 + + .align 2 +gFile_graphics_pokemon_palettes_flygon_palette:: @ 8E03AA8 + .incbin "graphics/pokemon/palettes/flygon_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xE03AA8, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_flygon_back_pic:: @ 8E03AD0 + .incbin "graphics/pokemon/back_pics/flygon_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE03AD0, 0x043C + + .align 2 +gFile_graphics_pokemon_palettes_flygon_shiny_palette:: @ 8E03F0C + .incbin "graphics/pokemon/palettes/flygon_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xE03F0C, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_flygon_icon:: @ 8E03F34 + .incbin "graphics/pokemon/icons/flygon_icon.4bpp" + @ .incbin "baserom.gba", 0xE03F34, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_flygon_footprint:: @ 8E04334 + .incbin "graphics/pokemon/footprints/flygon_footprint.1bpp" + @ .incbin "baserom.gba", 0xE04334, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_makuhita_still_front_pic:: @ 8E04354 + .incbin "graphics/pokemon/front_pics/makuhita_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE04354, 0x0318 + + .align 2 +gFile_graphics_pokemon_palettes_makuhita_palette:: @ 8E0466C + .incbin "graphics/pokemon/palettes/makuhita_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xE0466C, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_makuhita_back_pic:: @ 8E04694 + .incbin "graphics/pokemon/back_pics/makuhita_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE04694, 0x02F0 + + .align 2 +gFile_graphics_pokemon_palettes_makuhita_shiny_palette:: @ 8E04984 + .incbin "graphics/pokemon/palettes/makuhita_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xE04984, 0x0024 + + .align 2 +gFile_graphics_pokemon_icons_makuhita_icon:: @ 8E049A8 + .incbin "graphics/pokemon/icons/makuhita_icon.4bpp" + @ .incbin "baserom.gba", 0xE049A8, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_makuhita_footprint:: @ 8E04DA8 + .incbin "graphics/pokemon/footprints/makuhita_footprint.1bpp" + @ .incbin "baserom.gba", 0xE04DA8, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_hariyama_still_front_pic:: @ 8E04DC8 + .incbin "graphics/pokemon/front_pics/hariyama_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE04DC8, 0x04B0 + + .align 2 +gFile_graphics_pokemon_palettes_hariyama_palette:: @ 8E05278 + .incbin "graphics/pokemon/palettes/hariyama_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xE05278, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_hariyama_back_pic:: @ 8E052A0 + .incbin "graphics/pokemon/back_pics/hariyama_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE052A0, 0x03E0 + + .align 2 +gFile_graphics_pokemon_palettes_hariyama_shiny_palette:: @ 8E05680 + .incbin "graphics/pokemon/palettes/hariyama_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xE05680, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_hariyama_icon:: @ 8E056A8 + .incbin "graphics/pokemon/icons/hariyama_icon.4bpp" + @ .incbin "baserom.gba", 0xE056A8, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_hariyama_footprint:: @ 8E05AA8 + .incbin "graphics/pokemon/footprints/hariyama_footprint.1bpp" + @ .incbin "baserom.gba", 0xE05AA8, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_electrike_still_front_pic:: @ 8E05AC8 + .incbin "graphics/pokemon/front_pics/electrike_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE05AC8, 0x0290 + + .align 2 +gFile_graphics_pokemon_palettes_electrike_palette:: @ 8E05D58 + .incbin "graphics/pokemon/palettes/electrike_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xE05D58, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_electrike_back_pic:: @ 8E05D80 + .incbin "graphics/pokemon/back_pics/electrike_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE05D80, 0x028C + + .align 2 +gFile_graphics_pokemon_palettes_electrike_shiny_palette:: @ 8E0600C + .incbin "graphics/pokemon/palettes/electrike_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xE0600C, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_electrike_icon:: @ 8E06034 + .incbin "graphics/pokemon/icons/electrike_icon.4bpp" + @ .incbin "baserom.gba", 0xE06034, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_electrike_footprint:: @ 8E06434 + .incbin "graphics/pokemon/footprints/electrike_footprint.1bpp" + @ .incbin "baserom.gba", 0xE06434, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_manectric_still_front_pic:: @ 8E06454 + .incbin "graphics/pokemon/front_pics/manectric_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE06454, 0x0330 + + .align 2 +gFile_graphics_pokemon_palettes_manectric_palette:: @ 8E06784 + .incbin "graphics/pokemon/palettes/manectric_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xE06784, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_manectric_back_pic:: @ 8E067AC + .incbin "graphics/pokemon/back_pics/manectric_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE067AC, 0x022C + + .align 2 +gFile_graphics_pokemon_palettes_manectric_shiny_palette:: @ 8E069D8 + .incbin "graphics/pokemon/palettes/manectric_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xE069D8, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_manectric_icon:: @ 8E06A00 + .incbin "graphics/pokemon/icons/manectric_icon.4bpp" + @ .incbin "baserom.gba", 0xE06A00, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_manectric_footprint:: @ 8E06E00 + .incbin "graphics/pokemon/footprints/manectric_footprint.1bpp" + @ .incbin "baserom.gba", 0xE06E00, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_numel_still_front_pic:: @ 8E06E20 + .incbin "graphics/pokemon/front_pics/numel_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE06E20, 0x02D0 + + .align 2 +gFile_graphics_pokemon_palettes_numel_palette:: @ 8E070F0 + .incbin "graphics/pokemon/palettes/numel_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xE070F0, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_numel_back_pic:: @ 8E07118 + .incbin "graphics/pokemon/back_pics/numel_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE07118, 0x02BC + + .align 2 +gFile_graphics_pokemon_palettes_numel_shiny_palette:: @ 8E073D4 + .incbin "graphics/pokemon/palettes/numel_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xE073D4, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_numel_icon:: @ 8E073FC + .incbin "graphics/pokemon/icons/numel_icon.4bpp" + @ .incbin "baserom.gba", 0xE073FC, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_numel_footprint:: @ 8E077FC + .incbin "graphics/pokemon/footprints/numel_footprint.1bpp" + @ .incbin "baserom.gba", 0xE077FC, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_camerupt_still_front_pic:: @ 8E0781C + .incbin "graphics/pokemon/front_pics/camerupt_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE0781C, 0x0418 + + .align 2 +gFile_graphics_pokemon_palettes_camerupt_palette:: @ 8E07C34 + .incbin "graphics/pokemon/palettes/camerupt_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xE07C34, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_camerupt_back_pic:: @ 8E07C5C + .incbin "graphics/pokemon/back_pics/camerupt_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE07C5C, 0x02C4 + + .align 2 +gFile_graphics_pokemon_palettes_camerupt_shiny_palette:: @ 8E07F20 + .incbin "graphics/pokemon/palettes/camerupt_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xE07F20, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_camerupt_icon:: @ 8E07F48 + .incbin "graphics/pokemon/icons/camerupt_icon.4bpp" + @ .incbin "baserom.gba", 0xE07F48, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_camerupt_footprint:: @ 8E08348 + .incbin "graphics/pokemon/footprints/camerupt_footprint.1bpp" + @ .incbin "baserom.gba", 0xE08348, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_spheal_still_front_pic:: @ 8E08368 + .incbin "graphics/pokemon/front_pics/spheal_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE08368, 0x0274 + + .align 2 +gFile_graphics_pokemon_palettes_spheal_palette:: @ 8E085DC + .incbin "graphics/pokemon/palettes/spheal_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xE085DC, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_spheal_back_pic:: @ 8E08604 + .incbin "graphics/pokemon/back_pics/spheal_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE08604, 0x01FC + + .align 2 +gFile_graphics_pokemon_palettes_spheal_shiny_palette:: @ 8E08800 + .incbin "graphics/pokemon/palettes/spheal_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xE08800, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_spheal_icon:: @ 8E08828 + .incbin "graphics/pokemon/icons/spheal_icon.4bpp" + @ .incbin "baserom.gba", 0xE08828, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_spheal_footprint:: @ 8E08C28 + .incbin "graphics/pokemon/footprints/spheal_footprint.1bpp" + @ .incbin "baserom.gba", 0xE08C28, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_sealeo_still_front_pic:: @ 8E08C48 + .incbin "graphics/pokemon/front_pics/sealeo_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE08C48, 0x0380 + + .align 2 +gFile_graphics_pokemon_palettes_sealeo_palette:: @ 8E08FC8 + .incbin "graphics/pokemon/palettes/sealeo_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xE08FC8, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_sealeo_back_pic:: @ 8E08FF0 + .incbin "graphics/pokemon/back_pics/sealeo_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE08FF0, 0x027C + + .align 2 +gFile_graphics_pokemon_palettes_sealeo_shiny_palette:: @ 8E0926C + .incbin "graphics/pokemon/palettes/sealeo_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xE0926C, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_sealeo_icon:: @ 8E09294 + .incbin "graphics/pokemon/icons/sealeo_icon.4bpp" + @ .incbin "baserom.gba", 0xE09294, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_sealeo_footprint:: @ 8E09694 + .incbin "graphics/pokemon/footprints/sealeo_footprint.1bpp" + @ .incbin "baserom.gba", 0xE09694, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_walrein_still_front_pic:: @ 8E096B4 + .incbin "graphics/pokemon/front_pics/walrein_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE096B4, 0x04A0 + + .align 2 +gFile_graphics_pokemon_palettes_walrein_palette:: @ 8E09B54 + .incbin "graphics/pokemon/palettes/walrein_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xE09B54, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_walrein_back_pic:: @ 8E09B7C + .incbin "graphics/pokemon/back_pics/walrein_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE09B7C, 0x0388 + + .align 2 +gFile_graphics_pokemon_palettes_walrein_shiny_palette:: @ 8E09F04 + .incbin "graphics/pokemon/palettes/walrein_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xE09F04, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_walrein_icon:: @ 8E09F2C + .incbin "graphics/pokemon/icons/walrein_icon.4bpp" + @ .incbin "baserom.gba", 0xE09F2C, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_walrein_footprint:: @ 8E0A32C + .incbin "graphics/pokemon/footprints/walrein_footprint.1bpp" + @ .incbin "baserom.gba", 0xE0A32C, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_cacnea_still_front_pic:: @ 8E0A34C + .incbin "graphics/pokemon/front_pics/cacnea_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE0A34C, 0x0310 + + .align 2 +gFile_graphics_pokemon_palettes_cacnea_palette:: @ 8E0A65C + .incbin "graphics/pokemon/palettes/cacnea_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xE0A65C, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_cacnea_back_pic:: @ 8E0A684 + .incbin "graphics/pokemon/back_pics/cacnea_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE0A684, 0x0360 + + .align 2 +gFile_graphics_pokemon_palettes_cacnea_shiny_palette:: @ 8E0A9E4 + .incbin "graphics/pokemon/palettes/cacnea_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xE0A9E4, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_cacnea_icon:: @ 8E0AA0C + .incbin "graphics/pokemon/icons/cacnea_icon.4bpp" + @ .incbin "baserom.gba", 0xE0AA0C, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_cacnea_footprint:: @ 8E0AE0C + .incbin "graphics/pokemon/footprints/cacnea_footprint.1bpp" + @ .incbin "baserom.gba", 0xE0AE0C, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_cacturne_still_front_pic:: @ 8E0AE2C + .incbin "graphics/pokemon/front_pics/cacturne_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE0AE2C, 0x0438 + + .align 2 +gFile_graphics_pokemon_palettes_cacturne_palette:: @ 8E0B264 + .incbin "graphics/pokemon/palettes/cacturne_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xE0B264, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_cacturne_back_pic:: @ 8E0B28C + .incbin "graphics/pokemon/back_pics/cacturne_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE0B28C, 0x0300 + + .align 2 +gFile_graphics_pokemon_palettes_cacturne_shiny_palette:: @ 8E0B58C + .incbin "graphics/pokemon/palettes/cacturne_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xE0B58C, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_cacturne_icon:: @ 8E0B5B4 + .incbin "graphics/pokemon/icons/cacturne_icon.4bpp" + @ .incbin "baserom.gba", 0xE0B5B4, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_cacturne_footprint:: @ 8E0B9B4 + .incbin "graphics/pokemon/footprints/cacturne_footprint.1bpp" + @ .incbin "baserom.gba", 0xE0B9B4, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_snorunt_still_front_pic:: @ 8E0B9D4 + .incbin "graphics/pokemon/front_pics/snorunt_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE0B9D4, 0x02C4 + + .align 2 +gFile_graphics_pokemon_palettes_snorunt_palette:: @ 8E0BC98 + .incbin "graphics/pokemon/palettes/snorunt_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xE0BC98, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_snorunt_back_pic:: @ 8E0BCC0 + .incbin "graphics/pokemon/back_pics/snorunt_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE0BCC0, 0x02E4 + + .align 2 +gFile_graphics_pokemon_palettes_snorunt_shiny_palette:: @ 8E0BFA4 + .incbin "graphics/pokemon/palettes/snorunt_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xE0BFA4, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_snorunt_icon:: @ 8E0BFCC + .incbin "graphics/pokemon/icons/snorunt_icon.4bpp" + @ .incbin "baserom.gba", 0xE0BFCC, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_snorunt_footprint:: @ 8E0C3CC + .incbin "graphics/pokemon/footprints/snorunt_footprint.1bpp" + @ .incbin "baserom.gba", 0xE0C3CC, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_glalie_still_front_pic:: @ 8E0C3EC + .incbin "graphics/pokemon/front_pics/glalie_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE0C3EC, 0x03C8 + + .align 2 +gFile_graphics_pokemon_palettes_glalie_palette:: @ 8E0C7B4 + .incbin "graphics/pokemon/palettes/glalie_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xE0C7B4, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_glalie_back_pic:: @ 8E0C7DC + .incbin "graphics/pokemon/back_pics/glalie_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE0C7DC, 0x03B0 + + .align 2 +gFile_graphics_pokemon_palettes_glalie_shiny_palette:: @ 8E0CB8C + .incbin "graphics/pokemon/palettes/glalie_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xE0CB8C, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_glalie_icon:: @ 8E0CBB4 + .incbin "graphics/pokemon/icons/glalie_icon.4bpp" + @ .incbin "baserom.gba", 0xE0CBB4, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_glalie_footprint:: @ 8E0CFB4 + .incbin "graphics/pokemon/footprints/glalie_footprint.1bpp" + @ .incbin "baserom.gba", 0xE0CFB4, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_lunatone_still_front_pic:: @ 8E0CFD4 + .incbin "graphics/pokemon/front_pics/lunatone_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE0CFD4, 0x0328 + + .align 2 +gFile_graphics_pokemon_palettes_lunatone_palette:: @ 8E0D2FC + .incbin "graphics/pokemon/palettes/lunatone_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xE0D2FC, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_lunatone_back_pic:: @ 8E0D324 + .incbin "graphics/pokemon/back_pics/lunatone_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE0D324, 0x0358 + + .align 2 +gFile_graphics_pokemon_palettes_lunatone_shiny_palette:: @ 8E0D67C + .incbin "graphics/pokemon/palettes/lunatone_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xE0D67C, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_lunatone_icon:: @ 8E0D6A4 + .incbin "graphics/pokemon/icons/lunatone_icon.4bpp" + @ .incbin "baserom.gba", 0xE0D6A4, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_lunatone_footprint:: @ 8E0DAA4 + .incbin "graphics/pokemon/footprints/lunatone_footprint.1bpp" + @ .incbin "baserom.gba", 0xE0DAA4, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_solrock_still_front_pic:: @ 8E0DAC4 + .incbin "graphics/pokemon/front_pics/solrock_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE0DAC4, 0x044C + + .align 2 +gFile_graphics_pokemon_palettes_solrock_palette:: @ 8E0DF10 + .incbin "graphics/pokemon/palettes/solrock_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xE0DF10, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_solrock_back_pic:: @ 8E0DF38 + .incbin "graphics/pokemon/back_pics/solrock_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE0DF38, 0x03EC + + .align 2 +gFile_graphics_pokemon_palettes_solrock_shiny_palette:: @ 8E0E324 + .incbin "graphics/pokemon/palettes/solrock_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xE0E324, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_solrock_icon:: @ 8E0E34C + .incbin "graphics/pokemon/icons/solrock_icon.4bpp" + @ .incbin "baserom.gba", 0xE0E34C, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_solrock_footprint:: @ 8E0E74C + .incbin "graphics/pokemon/footprints/solrock_footprint.1bpp" + @ .incbin "baserom.gba", 0xE0E74C, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_azurill_still_front_pic:: @ 8E0E76C + .incbin "graphics/pokemon/front_pics/azurill_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE0E76C, 0x02C8 + + .align 2 +gFile_graphics_pokemon_palettes_azurill_palette:: @ 8E0EA34 + .incbin "graphics/pokemon/palettes/azurill_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xE0EA34, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_azurill_back_pic:: @ 8E0EA5C + .incbin "graphics/pokemon/back_pics/azurill_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE0EA5C, 0x0318 + + .align 2 +gFile_graphics_pokemon_palettes_azurill_shiny_palette:: @ 8E0ED74 + .incbin "graphics/pokemon/palettes/azurill_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xE0ED74, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_azurill_icon:: @ 8E0ED9C + .incbin "graphics/pokemon/icons/azurill_icon.4bpp" + @ .incbin "baserom.gba", 0xE0ED9C, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_azurill_footprint:: @ 8E0F19C + .incbin "graphics/pokemon/footprints/azurill_footprint.1bpp" + @ .incbin "baserom.gba", 0xE0F19C, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_spoink_still_front_pic:: @ 8E0F1BC + .incbin "graphics/pokemon/front_pics/spoink_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE0F1BC, 0x026C + + .align 2 +gFile_graphics_pokemon_palettes_spoink_palette:: @ 8E0F428 + .incbin "graphics/pokemon/palettes/spoink_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xE0F428, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_spoink_back_pic:: @ 8E0F450 + .incbin "graphics/pokemon/back_pics/spoink_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE0F450, 0x0240 + + .align 2 +gFile_graphics_pokemon_palettes_spoink_shiny_palette:: @ 8E0F690 + .incbin "graphics/pokemon/palettes/spoink_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xE0F690, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_spoink_icon:: @ 8E0F6B8 + .incbin "graphics/pokemon/icons/spoink_icon.4bpp" + @ .incbin "baserom.gba", 0xE0F6B8, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_spoink_footprint:: @ 8E0FAB8 + .incbin "graphics/pokemon/footprints/spoink_footprint.1bpp" + @ .incbin "baserom.gba", 0xE0FAB8, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_grumpig_still_front_pic:: @ 8E0FAD8 + .incbin "graphics/pokemon/front_pics/grumpig_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE0FAD8, 0x03BC + + .align 2 +gFile_graphics_pokemon_palettes_grumpig_palette:: @ 8E0FE94 + .incbin "graphics/pokemon/palettes/grumpig_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xE0FE94, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_grumpig_back_pic:: @ 8E0FEBC + .incbin "graphics/pokemon/back_pics/grumpig_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE0FEBC, 0x0360 + + .align 2 +gFile_graphics_pokemon_palettes_grumpig_shiny_palette:: @ 8E1021C + .incbin "graphics/pokemon/palettes/grumpig_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xE1021C, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_grumpig_icon:: @ 8E10244 + .incbin "graphics/pokemon/icons/grumpig_icon.4bpp" + @ .incbin "baserom.gba", 0xE10244, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_grumpig_footprint:: @ 8E10644 + .incbin "graphics/pokemon/footprints/grumpig_footprint.1bpp" + @ .incbin "baserom.gba", 0xE10644, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_plusle_still_front_pic:: @ 8E10664 + .incbin "graphics/pokemon/front_pics/plusle_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE10664, 0x028C + + .align 2 +gFile_graphics_pokemon_palettes_plusle_palette:: @ 8E108F0 + .incbin "graphics/pokemon/palettes/plusle_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xE108F0, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_plusle_back_pic:: @ 8E10918 + .incbin "graphics/pokemon/back_pics/plusle_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE10918, 0x02B8 + + .align 2 +gFile_graphics_pokemon_palettes_plusle_shiny_palette:: @ 8E10BD0 + .incbin "graphics/pokemon/palettes/plusle_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xE10BD0, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_plusle_icon:: @ 8E10BF8 + .incbin "graphics/pokemon/icons/plusle_icon.4bpp" + @ .incbin "baserom.gba", 0xE10BF8, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_plusle_footprint:: @ 8E10FF8 + .incbin "graphics/pokemon/footprints/plusle_footprint.1bpp" + @ .incbin "baserom.gba", 0xE10FF8, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_minun_still_front_pic:: @ 8E11018 + .incbin "graphics/pokemon/front_pics/minun_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE11018, 0x0268 + + .align 2 +gFile_graphics_pokemon_palettes_minun_palette:: @ 8E11280 + .incbin "graphics/pokemon/palettes/minun_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xE11280, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_minun_back_pic:: @ 8E112A8 + .incbin "graphics/pokemon/back_pics/minun_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE112A8, 0x02C8 + + .align 2 +gFile_graphics_pokemon_palettes_minun_shiny_palette:: @ 8E11570 + .incbin "graphics/pokemon/palettes/minun_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xE11570, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_minun_icon:: @ 8E11598 + .incbin "graphics/pokemon/icons/minun_icon.4bpp" + @ .incbin "baserom.gba", 0xE11598, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_minun_footprint:: @ 8E11998 + .incbin "graphics/pokemon/footprints/minun_footprint.1bpp" + @ .incbin "baserom.gba", 0xE11998, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_mawile_still_front_pic:: @ 8E119B8 + .incbin "graphics/pokemon/front_pics/mawile_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE119B8, 0x03BC + + .align 2 +gFile_graphics_pokemon_palettes_mawile_palette:: @ 8E11D74 + .incbin "graphics/pokemon/palettes/mawile_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xE11D74, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_mawile_back_pic:: @ 8E11D9C + .incbin "graphics/pokemon/back_pics/mawile_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE11D9C, 0x0400 + + .align 2 +gFile_graphics_pokemon_palettes_mawile_shiny_palette:: @ 8E1219C + .incbin "graphics/pokemon/palettes/mawile_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xE1219C, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_mawile_icon:: @ 8E121C4 + .incbin "graphics/pokemon/icons/mawile_icon.4bpp" + @ .incbin "baserom.gba", 0xE121C4, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_mawile_footprint:: @ 8E125C4 + .incbin "graphics/pokemon/footprints/mawile_footprint.1bpp" + @ .incbin "baserom.gba", 0xE125C4, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_meditite_still_front_pic:: @ 8E125E4 + .incbin "graphics/pokemon/front_pics/meditite_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE125E4, 0x02B8 + + .align 2 +gFile_graphics_pokemon_palettes_meditite_palette:: @ 8E1289C + .incbin "graphics/pokemon/palettes/meditite_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xE1289C, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_meditite_back_pic:: @ 8E128C4 + .incbin "graphics/pokemon/back_pics/meditite_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE128C4, 0x02C8 + + .align 2 +gFile_graphics_pokemon_palettes_meditite_shiny_palette:: @ 8E12B8C + .incbin "graphics/pokemon/palettes/meditite_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xE12B8C, 0x0024 + + .align 2 +gFile_graphics_pokemon_icons_meditite_icon:: @ 8E12BB0 + .incbin "graphics/pokemon/icons/meditite_icon.4bpp" + @ .incbin "baserom.gba", 0xE12BB0, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_meditite_footprint:: @ 8E12FB0 + .incbin "graphics/pokemon/footprints/meditite_footprint.1bpp" + @ .incbin "baserom.gba", 0xE12FB0, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_medicham_still_front_pic:: @ 8E12FD0 + .incbin "graphics/pokemon/front_pics/medicham_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE12FD0, 0x0330 + + .align 2 +gFile_graphics_pokemon_palettes_medicham_palette:: @ 8E13300 + .incbin "graphics/pokemon/palettes/medicham_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xE13300, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_medicham_back_pic:: @ 8E13328 + .incbin "graphics/pokemon/back_pics/medicham_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE13328, 0x0338 + + .align 2 +gFile_graphics_pokemon_palettes_medicham_shiny_palette:: @ 8E13660 + .incbin "graphics/pokemon/palettes/medicham_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xE13660, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_medicham_icon:: @ 8E13688 + .incbin "graphics/pokemon/icons/medicham_icon.4bpp" + @ .incbin "baserom.gba", 0xE13688, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_medicham_footprint:: @ 8E13A88 + .incbin "graphics/pokemon/footprints/medicham_footprint.1bpp" + @ .incbin "baserom.gba", 0xE13A88, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_swablu_still_front_pic:: @ 8E13AA8 + .incbin "graphics/pokemon/front_pics/swablu_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE13AA8, 0x02D8 + + .align 2 +gFile_graphics_pokemon_palettes_swablu_palette:: @ 8E13D80 + .incbin "graphics/pokemon/palettes/swablu_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xE13D80, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_swablu_back_pic:: @ 8E13DA8 + .incbin "graphics/pokemon/back_pics/swablu_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE13DA8, 0x03B8 + + .align 2 +gFile_graphics_pokemon_palettes_swablu_shiny_palette:: @ 8E14160 + .incbin "graphics/pokemon/palettes/swablu_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xE14160, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_swablu_icon:: @ 8E14188 + .incbin "graphics/pokemon/icons/swablu_icon.4bpp" + @ .incbin "baserom.gba", 0xE14188, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_swablu_footprint:: @ 8E14588 + .incbin "graphics/pokemon/footprints/swablu_footprint.1bpp" + @ .incbin "baserom.gba", 0xE14588, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_altaria_still_front_pic:: @ 8E145A8 + .incbin "graphics/pokemon/front_pics/altaria_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE145A8, 0x03DC + + .align 2 +gFile_graphics_pokemon_palettes_altaria_palette:: @ 8E14984 + .incbin "graphics/pokemon/palettes/altaria_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xE14984, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_altaria_back_pic:: @ 8E149AC + .incbin "graphics/pokemon/back_pics/altaria_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE149AC, 0x0378 + + .align 2 +gFile_graphics_pokemon_palettes_altaria_shiny_palette:: @ 8E14D24 + .incbin "graphics/pokemon/palettes/altaria_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xE14D24, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_altaria_icon:: @ 8E14D4C + .incbin "graphics/pokemon/icons/altaria_icon.4bpp" + @ .incbin "baserom.gba", 0xE14D4C, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_altaria_footprint:: @ 8E1514C + .incbin "graphics/pokemon/footprints/altaria_footprint.1bpp" + @ .incbin "baserom.gba", 0xE1514C, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_wynaut_still_front_pic:: @ 8E1516C + .incbin "graphics/pokemon/front_pics/wynaut_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE1516C, 0x0298 + + .align 2 +gFile_graphics_pokemon_palettes_wynaut_palette:: @ 8E15404 + .incbin "graphics/pokemon/palettes/wynaut_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xE15404, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_wynaut_back_pic:: @ 8E1542C + .incbin "graphics/pokemon/back_pics/wynaut_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE1542C, 0x0290 + + .align 2 +gFile_graphics_pokemon_palettes_wynaut_shiny_palette:: @ 8E156BC + .incbin "graphics/pokemon/palettes/wynaut_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xE156BC, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_wynaut_icon:: @ 8E156E4 + .incbin "graphics/pokemon/icons/wynaut_icon.4bpp" + @ .incbin "baserom.gba", 0xE156E4, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_wynaut_footprint:: @ 8E15AE4 + .incbin "graphics/pokemon/footprints/wynaut_footprint.1bpp" + @ .incbin "baserom.gba", 0xE15AE4, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_duskull_still_front_pic:: @ 8E15B04 + .incbin "graphics/pokemon/front_pics/duskull_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE15B04, 0x02F0 + + .align 2 +gFile_graphics_pokemon_palettes_duskull_palette:: @ 8E15DF4 + .incbin "graphics/pokemon/palettes/duskull_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xE15DF4, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_duskull_back_pic:: @ 8E15E1C + .incbin "graphics/pokemon/back_pics/duskull_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE15E1C, 0x02B0 + + .align 2 +gFile_graphics_pokemon_palettes_duskull_shiny_palette:: @ 8E160CC + .incbin "graphics/pokemon/palettes/duskull_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xE160CC, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_duskull_icon:: @ 8E160F4 + .incbin "graphics/pokemon/icons/duskull_icon.4bpp" + @ .incbin "baserom.gba", 0xE160F4, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_duskull_footprint:: @ 8E164F4 + .incbin "graphics/pokemon/footprints/duskull_footprint.1bpp" + @ .incbin "baserom.gba", 0xE164F4, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_dusclops_still_front_pic:: @ 8E16514 + .incbin "graphics/pokemon/front_pics/dusclops_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE16514, 0x03A0 + + .align 2 +gFile_graphics_pokemon_palettes_dusclops_palette:: @ 8E168B4 + .incbin "graphics/pokemon/palettes/dusclops_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xE168B4, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_dusclops_back_pic:: @ 8E168DC + .incbin "graphics/pokemon/back_pics/dusclops_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE168DC, 0x02EC + + .align 2 +gFile_graphics_pokemon_palettes_dusclops_shiny_palette:: @ 8E16BC8 + .incbin "graphics/pokemon/palettes/dusclops_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xE16BC8, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_dusclops_icon:: @ 8E16BF0 + .incbin "graphics/pokemon/icons/dusclops_icon.4bpp" + @ .incbin "baserom.gba", 0xE16BF0, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_dusclops_footprint:: @ 8E16FF0 + .incbin "graphics/pokemon/footprints/dusclops_footprint.1bpp" + @ .incbin "baserom.gba", 0xE16FF0, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_roselia_still_front_pic:: @ 8E17010 + .incbin "graphics/pokemon/front_pics/roselia_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE17010, 0x036C + + .align 2 +gFile_graphics_pokemon_palettes_roselia_palette:: @ 8E1737C + .incbin "graphics/pokemon/palettes/roselia_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xE1737C, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_roselia_back_pic:: @ 8E173A4 + .incbin "graphics/pokemon/back_pics/roselia_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE173A4, 0x03C8 + + .align 2 +gFile_graphics_pokemon_palettes_roselia_shiny_palette:: @ 8E1776C + .incbin "graphics/pokemon/palettes/roselia_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xE1776C, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_roselia_icon:: @ 8E17794 + .incbin "graphics/pokemon/icons/roselia_icon.4bpp" + @ .incbin "baserom.gba", 0xE17794, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_roselia_footprint:: @ 8E17B94 + .incbin "graphics/pokemon/footprints/roselia_footprint.1bpp" + @ .incbin "baserom.gba", 0xE17B94, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_slakoth_still_front_pic:: @ 8E17BB4 + .incbin "graphics/pokemon/front_pics/slakoth_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE17BB4, 0x02E8 + + .align 2 +gFile_graphics_pokemon_palettes_slakoth_palette:: @ 8E17E9C + .incbin "graphics/pokemon/palettes/slakoth_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xE17E9C, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_slakoth_back_pic:: @ 8E17EC4 + .incbin "graphics/pokemon/back_pics/slakoth_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE17EC4, 0x02E8 + + .align 2 +gFile_graphics_pokemon_palettes_slakoth_shiny_palette:: @ 8E181AC + .incbin "graphics/pokemon/palettes/slakoth_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xE181AC, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_slakoth_icon:: @ 8E181D4 + .incbin "graphics/pokemon/icons/slakoth_icon.4bpp" + @ .incbin "baserom.gba", 0xE181D4, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_slakoth_footprint:: @ 8E185D4 + .incbin "graphics/pokemon/footprints/slakoth_footprint.1bpp" + @ .incbin "baserom.gba", 0xE185D4, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_vigoroth_still_front_pic:: @ 8E185F4 + .incbin "graphics/pokemon/front_pics/vigoroth_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE185F4, 0x03FC + + .align 2 +gFile_graphics_pokemon_palettes_vigoroth_palette:: @ 8E189F0 + .incbin "graphics/pokemon/palettes/vigoroth_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xE189F0, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_vigoroth_back_pic:: @ 8E18A18 + .incbin "graphics/pokemon/back_pics/vigoroth_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE18A18, 0x02C8 + + .align 2 +gFile_graphics_pokemon_palettes_vigoroth_shiny_palette:: @ 8E18CE0 + .incbin "graphics/pokemon/palettes/vigoroth_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xE18CE0, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_vigoroth_icon:: @ 8E18D08 + .incbin "graphics/pokemon/icons/vigoroth_icon.4bpp" + @ .incbin "baserom.gba", 0xE18D08, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_vigoroth_footprint:: @ 8E19108 + .incbin "graphics/pokemon/footprints/vigoroth_footprint.1bpp" + @ .incbin "baserom.gba", 0xE19108, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_slaking_still_front_pic:: @ 8E19128 + .incbin "graphics/pokemon/front_pics/slaking_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE19128, 0x04D4 + + .align 2 +gFile_graphics_pokemon_palettes_slaking_palette:: @ 8E195FC + .incbin "graphics/pokemon/palettes/slaking_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xE195FC, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_slaking_back_pic:: @ 8E19624 + .incbin "graphics/pokemon/back_pics/slaking_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE19624, 0x03C4 + + .align 2 +gFile_graphics_pokemon_palettes_slaking_shiny_palette:: @ 8E199E8 + .incbin "graphics/pokemon/palettes/slaking_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xE199E8, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_slaking_icon:: @ 8E19A10 + .incbin "graphics/pokemon/icons/slaking_icon.4bpp" + @ .incbin "baserom.gba", 0xE19A10, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_slaking_footprint:: @ 8E19E10 + .incbin "graphics/pokemon/footprints/slaking_footprint.1bpp" + @ .incbin "baserom.gba", 0xE19E10, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_gulpin_still_front_pic:: @ 8E19E30 + .incbin "graphics/pokemon/front_pics/gulpin_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE19E30, 0x0218 + + .align 2 +gFile_graphics_pokemon_palettes_gulpin_palette:: @ 8E1A048 + .incbin "graphics/pokemon/palettes/gulpin_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xE1A048, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_gulpin_back_pic:: @ 8E1A070 + .incbin "graphics/pokemon/back_pics/gulpin_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE1A070, 0x0284 + + .align 2 +gFile_graphics_pokemon_palettes_gulpin_shiny_palette:: @ 8E1A2F4 + .incbin "graphics/pokemon/palettes/gulpin_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xE1A2F4, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_gulpin_icon:: @ 8E1A31C + .incbin "graphics/pokemon/icons/gulpin_icon.4bpp" + @ .incbin "baserom.gba", 0xE1A31C, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_gulpin_footprint:: @ 8E1A71C + .incbin "graphics/pokemon/footprints/gulpin_footprint.1bpp" + @ .incbin "baserom.gba", 0xE1A71C, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_swalot_still_front_pic:: @ 8E1A73C + .incbin "graphics/pokemon/front_pics/swalot_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE1A73C, 0x0344 + + .align 2 +gFile_graphics_pokemon_palettes_swalot_palette:: @ 8E1AA80 + .incbin "graphics/pokemon/palettes/swalot_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xE1AA80, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_swalot_back_pic:: @ 8E1AAA8 + .incbin "graphics/pokemon/back_pics/swalot_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE1AAA8, 0x0348 + + .align 2 +gFile_graphics_pokemon_palettes_swalot_shiny_palette:: @ 8E1ADF0 + .incbin "graphics/pokemon/palettes/swalot_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xE1ADF0, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_swalot_icon:: @ 8E1AE18 + .incbin "graphics/pokemon/icons/swalot_icon.4bpp" + @ .incbin "baserom.gba", 0xE1AE18, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_swalot_footprint:: @ 8E1B218 + .incbin "graphics/pokemon/footprints/swalot_footprint.1bpp" + @ .incbin "baserom.gba", 0xE1B218, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_tropius_still_front_pic:: @ 8E1B238 + .incbin "graphics/pokemon/front_pics/tropius_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE1B238, 0x0578 + + .align 2 +gFile_graphics_pokemon_palettes_tropius_palette:: @ 8E1B7B0 + .incbin "graphics/pokemon/palettes/tropius_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xE1B7B0, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_tropius_back_pic:: @ 8E1B7D8 + .incbin "graphics/pokemon/back_pics/tropius_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE1B7D8, 0x0324 + + .align 2 +gFile_graphics_pokemon_palettes_tropius_shiny_palette:: @ 8E1BAFC + .incbin "graphics/pokemon/palettes/tropius_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xE1BAFC, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_tropius_icon:: @ 8E1BB24 + .incbin "graphics/pokemon/icons/tropius_icon.4bpp" + @ .incbin "baserom.gba", 0xE1BB24, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_tropius_footprint:: @ 8E1BF24 + .incbin "graphics/pokemon/footprints/tropius_footprint.1bpp" + @ .incbin "baserom.gba", 0xE1BF24, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_whismur_still_front_pic:: @ 8E1BF44 + .incbin "graphics/pokemon/front_pics/whismur_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE1BF44, 0x0294 + + .align 2 +gFile_graphics_pokemon_palettes_whismur_palette:: @ 8E1C1D8 + .incbin "graphics/pokemon/palettes/whismur_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xE1C1D8, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_whismur_back_pic:: @ 8E1C200 + .incbin "graphics/pokemon/back_pics/whismur_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE1C200, 0x0270 + + .align 2 +gFile_graphics_pokemon_palettes_whismur_shiny_palette:: @ 8E1C470 + .incbin "graphics/pokemon/palettes/whismur_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xE1C470, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_whismur_icon:: @ 8E1C498 + .incbin "graphics/pokemon/icons/whismur_icon.4bpp" + @ .incbin "baserom.gba", 0xE1C498, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_whismur_footprint:: @ 8E1C898 + .incbin "graphics/pokemon/footprints/whismur_footprint.1bpp" + @ .incbin "baserom.gba", 0xE1C898, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_loudred_still_front_pic:: @ 8E1C8B8 + .incbin "graphics/pokemon/front_pics/loudred_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE1C8B8, 0x0478 + + .align 2 +gFile_graphics_pokemon_palettes_loudred_palette:: @ 8E1CD30 + .incbin "graphics/pokemon/palettes/loudred_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xE1CD30, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_loudred_back_pic:: @ 8E1CD58 + .incbin "graphics/pokemon/back_pics/loudred_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE1CD58, 0x0370 + + .align 2 +gFile_graphics_pokemon_palettes_loudred_shiny_palette:: @ 8E1D0C8 + .incbin "graphics/pokemon/palettes/loudred_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xE1D0C8, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_loudred_icon:: @ 8E1D0F0 + .incbin "graphics/pokemon/icons/loudred_icon.4bpp" + @ .incbin "baserom.gba", 0xE1D0F0, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_loudred_footprint:: @ 8E1D4F0 + .incbin "graphics/pokemon/footprints/loudred_footprint.1bpp" + @ .incbin "baserom.gba", 0xE1D4F0, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_exploud_still_front_pic:: @ 8E1D510 + .incbin "graphics/pokemon/front_pics/exploud_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE1D510, 0x0568 + + .align 2 +gFile_graphics_pokemon_palettes_exploud_palette:: @ 8E1DA78 + .incbin "graphics/pokemon/palettes/exploud_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xE1DA78, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_exploud_back_pic:: @ 8E1DAA0 + .incbin "graphics/pokemon/back_pics/exploud_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE1DAA0, 0x040C + + .align 2 +gFile_graphics_pokemon_palettes_exploud_shiny_palette:: @ 8E1DEAC + .incbin "graphics/pokemon/palettes/exploud_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xE1DEAC, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_exploud_icon:: @ 8E1DED4 + .incbin "graphics/pokemon/icons/exploud_icon.4bpp" + @ .incbin "baserom.gba", 0xE1DED4, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_exploud_footprint:: @ 8E1E2D4 + .incbin "graphics/pokemon/footprints/exploud_footprint.1bpp" + @ .incbin "baserom.gba", 0xE1E2D4, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_clamperl_still_front_pic:: @ 8E1E2F4 + .incbin "graphics/pokemon/front_pics/clamperl_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE1E2F4, 0x02D8 + + .align 2 +gFile_graphics_pokemon_palettes_clamperl_palette:: @ 8E1E5CC + .incbin "graphics/pokemon/palettes/clamperl_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xE1E5CC, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_clamperl_back_pic:: @ 8E1E5F4 + .incbin "graphics/pokemon/back_pics/clamperl_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE1E5F4, 0x0294 + + .align 2 +gFile_graphics_pokemon_palettes_clamperl_shiny_palette:: @ 8E1E888 + .incbin "graphics/pokemon/palettes/clamperl_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xE1E888, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_clamperl_icon:: @ 8E1E8B0 + .incbin "graphics/pokemon/icons/clamperl_icon.4bpp" + @ .incbin "baserom.gba", 0xE1E8B0, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_clamperl_footprint:: @ 8E1ECB0 + .incbin "graphics/pokemon/footprints/clamperl_footprint.1bpp" + @ .incbin "baserom.gba", 0xE1ECB0, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_huntail_still_front_pic:: @ 8E1ECD0 + .incbin "graphics/pokemon/front_pics/huntail_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE1ECD0, 0x03CC + + .align 2 +gFile_graphics_pokemon_palettes_huntail_palette:: @ 8E1F09C + .incbin "graphics/pokemon/palettes/huntail_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xE1F09C, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_huntail_back_pic:: @ 8E1F0C4 + .incbin "graphics/pokemon/back_pics/huntail_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE1F0C4, 0x0354 + + .align 2 +gFile_graphics_pokemon_palettes_huntail_shiny_palette:: @ 8E1F418 + .incbin "graphics/pokemon/palettes/huntail_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xE1F418, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_huntail_icon:: @ 8E1F440 + .incbin "graphics/pokemon/icons/huntail_icon.4bpp" + @ .incbin "baserom.gba", 0xE1F440, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_huntail_footprint:: @ 8E1F840 + .incbin "graphics/pokemon/footprints/huntail_footprint.1bpp" + @ .incbin "baserom.gba", 0xE1F840, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_gorebyss_still_front_pic:: @ 8E1F860 + .incbin "graphics/pokemon/front_pics/gorebyss_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE1F860, 0x0310 + + .align 2 +gFile_graphics_pokemon_palettes_gorebyss_palette:: @ 8E1FB70 + .incbin "graphics/pokemon/palettes/gorebyss_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xE1FB70, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_gorebyss_back_pic:: @ 8E1FB98 + .incbin "graphics/pokemon/back_pics/gorebyss_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE1FB98, 0x02E8 + + .align 2 +gFile_graphics_pokemon_palettes_gorebyss_shiny_palette:: @ 8E1FE80 + .incbin "graphics/pokemon/palettes/gorebyss_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xE1FE80, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_gorebyss_icon:: @ 8E1FEA8 + .incbin "graphics/pokemon/icons/gorebyss_icon.4bpp" + @ .incbin "baserom.gba", 0xE1FEA8, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_gorebyss_footprint:: @ 8E202A8 + .incbin "graphics/pokemon/footprints/gorebyss_footprint.1bpp" + @ .incbin "baserom.gba", 0xE202A8, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_absol_still_front_pic:: @ 8E202C8 + .incbin "graphics/pokemon/front_pics/absol_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE202C8, 0x0430 + + .align 2 +gFile_graphics_pokemon_palettes_absol_palette:: @ 8E206F8 + .incbin "graphics/pokemon/palettes/absol_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xE206F8, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_absol_back_pic:: @ 8E20720 + .incbin "graphics/pokemon/back_pics/absol_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE20720, 0x0360 + + .align 2 +gFile_graphics_pokemon_palettes_absol_shiny_palette:: @ 8E20A80 + .incbin "graphics/pokemon/palettes/absol_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xE20A80, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_absol_icon:: @ 8E20AA8 + .incbin "graphics/pokemon/icons/absol_icon.4bpp" + @ .incbin "baserom.gba", 0xE20AA8, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_absol_footprint:: @ 8E20EA8 + .incbin "graphics/pokemon/footprints/absol_footprint.1bpp" + @ .incbin "baserom.gba", 0xE20EA8, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_shuppet_still_front_pic:: @ 8E20EC8 + .incbin "graphics/pokemon/front_pics/shuppet_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE20EC8, 0x0238 + + .align 2 +gFile_graphics_pokemon_palettes_shuppet_palette:: @ 8E21100 + .incbin "graphics/pokemon/palettes/shuppet_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xE21100, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_shuppet_back_pic:: @ 8E21128 + .incbin "graphics/pokemon/back_pics/shuppet_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE21128, 0x0298 + + .align 2 +gFile_graphics_pokemon_palettes_shuppet_shiny_palette:: @ 8E213C0 + .incbin "graphics/pokemon/palettes/shuppet_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xE213C0, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_shuppet_icon:: @ 8E213E8 + .incbin "graphics/pokemon/icons/shuppet_icon.4bpp" + @ .incbin "baserom.gba", 0xE213E8, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_shuppet_footprint:: @ 8E217E8 + .incbin "graphics/pokemon/footprints/shuppet_footprint.1bpp" + @ .incbin "baserom.gba", 0xE217E8, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_banette_still_front_pic:: @ 8E21808 + .incbin "graphics/pokemon/front_pics/banette_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE21808, 0x02B4 + + .align 2 +gFile_graphics_pokemon_palettes_banette_palette:: @ 8E21ABC + .incbin "graphics/pokemon/palettes/banette_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xE21ABC, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_banette_back_pic:: @ 8E21AE4 + .incbin "graphics/pokemon/back_pics/banette_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE21AE4, 0x027C + + .align 2 +gFile_graphics_pokemon_palettes_banette_shiny_palette:: @ 8E21D60 + .incbin "graphics/pokemon/palettes/banette_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xE21D60, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_banette_icon:: @ 8E21D88 + .incbin "graphics/pokemon/icons/banette_icon.4bpp" + @ .incbin "baserom.gba", 0xE21D88, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_banette_footprint:: @ 8E22188 + .incbin "graphics/pokemon/footprints/banette_footprint.1bpp" + @ .incbin "baserom.gba", 0xE22188, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_seviper_still_front_pic:: @ 8E221A8 + .incbin "graphics/pokemon/front_pics/seviper_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE221A8, 0x0420 + + .align 2 +gFile_graphics_pokemon_palettes_seviper_palette:: @ 8E225C8 + .incbin "graphics/pokemon/palettes/seviper_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xE225C8, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_seviper_back_pic:: @ 8E225F0 + .incbin "graphics/pokemon/back_pics/seviper_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE225F0, 0x048C + + .align 2 +gFile_graphics_pokemon_palettes_seviper_shiny_palette:: @ 8E22A7C + .incbin "graphics/pokemon/palettes/seviper_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xE22A7C, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_seviper_icon:: @ 8E22AA4 + .incbin "graphics/pokemon/icons/seviper_icon.4bpp" + @ .incbin "baserom.gba", 0xE22AA4, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_seviper_footprint:: @ 8E22EA4 + .incbin "graphics/pokemon/footprints/seviper_footprint.1bpp" + @ .incbin "baserom.gba", 0xE22EA4, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_zangoose_still_front_pic:: @ 8E22EC4 + .incbin "graphics/pokemon/front_pics/zangoose_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE22EC4, 0x03CC + + .align 2 +gFile_graphics_pokemon_palettes_zangoose_palette:: @ 8E23290 + .incbin "graphics/pokemon/palettes/zangoose_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xE23290, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_zangoose_back_pic:: @ 8E232B8 + .incbin "graphics/pokemon/back_pics/zangoose_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE232B8, 0x0374 + + .align 2 +gFile_graphics_pokemon_palettes_zangoose_shiny_palette:: @ 8E2362C + .incbin "graphics/pokemon/palettes/zangoose_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xE2362C, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_zangoose_icon:: @ 8E23654 + .incbin "graphics/pokemon/icons/zangoose_icon.4bpp" + @ .incbin "baserom.gba", 0xE23654, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_zangoose_footprint:: @ 8E23A54 + .incbin "graphics/pokemon/footprints/zangoose_footprint.1bpp" + @ .incbin "baserom.gba", 0xE23A54, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_relicanth_still_front_pic:: @ 8E23A74 + .incbin "graphics/pokemon/front_pics/relicanth_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE23A74, 0x0394 + + .align 2 +gFile_graphics_pokemon_palettes_relicanth_palette:: @ 8E23E08 + .incbin "graphics/pokemon/palettes/relicanth_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xE23E08, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_relicanth_back_pic:: @ 8E23E30 + .incbin "graphics/pokemon/back_pics/relicanth_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE23E30, 0x0358 + + .align 2 +gFile_graphics_pokemon_palettes_relicanth_shiny_palette:: @ 8E24188 + .incbin "graphics/pokemon/palettes/relicanth_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xE24188, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_relicanth_icon:: @ 8E241B0 + .incbin "graphics/pokemon/icons/relicanth_icon.4bpp" + @ .incbin "baserom.gba", 0xE241B0, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_relicanth_footprint:: @ 8E245B0 + .incbin "graphics/pokemon/footprints/relicanth_footprint.1bpp" + @ .incbin "baserom.gba", 0xE245B0, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_aron_still_front_pic:: @ 8E245D0 + .incbin "graphics/pokemon/front_pics/aron_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE245D0, 0x01E8 + + .align 2 +gFile_graphics_pokemon_palettes_aron_palette:: @ 8E247B8 + .incbin "graphics/pokemon/palettes/aron_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xE247B8, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_aron_back_pic:: @ 8E247E0 + .incbin "graphics/pokemon/back_pics/aron_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE247E0, 0x0228 + + .align 2 +gFile_graphics_pokemon_palettes_aron_shiny_palette:: @ 8E24A08 + .incbin "graphics/pokemon/palettes/aron_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xE24A08, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_aron_icon:: @ 8E24A30 + .incbin "graphics/pokemon/icons/aron_icon.4bpp" + @ .incbin "baserom.gba", 0xE24A30, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_aron_footprint:: @ 8E24E30 + .incbin "graphics/pokemon/footprints/aron_footprint.1bpp" + @ .incbin "baserom.gba", 0xE24E30, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_lairon_still_front_pic:: @ 8E24E50 + .incbin "graphics/pokemon/front_pics/lairon_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE24E50, 0x03CC + + .align 2 +gFile_graphics_pokemon_palettes_lairon_palette:: @ 8E2521C + .incbin "graphics/pokemon/palettes/lairon_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xE2521C, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_lairon_back_pic:: @ 8E25244 + .incbin "graphics/pokemon/back_pics/lairon_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE25244, 0x02EC + + .align 2 +gFile_graphics_pokemon_palettes_lairon_shiny_palette:: @ 8E25530 + .incbin "graphics/pokemon/palettes/lairon_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xE25530, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_lairon_icon:: @ 8E25558 + .incbin "graphics/pokemon/icons/lairon_icon.4bpp" + @ .incbin "baserom.gba", 0xE25558, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_lairon_footprint:: @ 8E25958 + .incbin "graphics/pokemon/footprints/lairon_footprint.1bpp" + @ .incbin "baserom.gba", 0xE25958, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_aggron_still_front_pic:: @ 8E25978 + .incbin "graphics/pokemon/front_pics/aggron_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE25978, 0x057C + + .align 2 +gFile_graphics_pokemon_palettes_aggron_palette:: @ 8E25EF4 + .incbin "graphics/pokemon/palettes/aggron_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xE25EF4, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_aggron_back_pic:: @ 8E25F1C + .incbin "graphics/pokemon/back_pics/aggron_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE25F1C, 0x0428 + + .align 2 +gFile_graphics_pokemon_palettes_aggron_shiny_palette:: @ 8E26344 + .incbin "graphics/pokemon/palettes/aggron_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xE26344, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_aggron_icon:: @ 8E2636C + .incbin "graphics/pokemon/icons/aggron_icon.4bpp" + @ .incbin "baserom.gba", 0xE2636C, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_aggron_footprint:: @ 8E2676C + .incbin "graphics/pokemon/footprints/aggron_footprint.1bpp" + @ .incbin "baserom.gba", 0xE2676C, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_castform_still_front_pic:: @ 8E2678C + .incbin "graphics/pokemon/front_pics/castform_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE2678C, 0x0A88 + + .align 2 +gFile_graphics_pokemon_palettes_castform_palette:: @ 8E27214 + .incbin "graphics/pokemon/palettes/castform_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xE27214, 0x0080 + + .align 2 +gFile_graphics_pokemon_back_pics_castform_back_pic:: @ 8E27294 + .incbin "graphics/pokemon/back_pics/castform_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE27294, 0x09BC + + .align 2 +gFile_graphics_pokemon_palettes_castform_shiny_palette:: @ 8E27C50 + .incbin "graphics/pokemon/palettes/castform_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xE27C50, 0x007C + + .align 2 +gFile_graphics_pokemon_icons_castform_icon:: @ 8E27CCC + .incbin "graphics/pokemon/icons/castform_icon.4bpp" + @ .incbin "baserom.gba", 0xE27CCC, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_castform_footprint:: @ 8E280CC + .incbin "graphics/pokemon/footprints/castform_footprint.1bpp" + @ .incbin "baserom.gba", 0xE280CC, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_volbeat_still_front_pic:: @ 8E280EC + .incbin "graphics/pokemon/front_pics/volbeat_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE280EC, 0x0390 + + .align 2 +gFile_graphics_pokemon_palettes_volbeat_palette:: @ 8E2847C + .incbin "graphics/pokemon/palettes/volbeat_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xE2847C, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_volbeat_back_pic:: @ 8E284A4 + .incbin "graphics/pokemon/back_pics/volbeat_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE284A4, 0x0360 + + .align 2 +gFile_graphics_pokemon_palettes_volbeat_shiny_palette:: @ 8E28804 + .incbin "graphics/pokemon/palettes/volbeat_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xE28804, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_volbeat_icon:: @ 8E2882C + .incbin "graphics/pokemon/icons/volbeat_icon.4bpp" + @ .incbin "baserom.gba", 0xE2882C, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_volbeat_footprint:: @ 8E28C2C + .incbin "graphics/pokemon/footprints/volbeat_footprint.1bpp" + @ .incbin "baserom.gba", 0xE28C2C, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_illumise_still_front_pic:: @ 8E28C4C + .incbin "graphics/pokemon/front_pics/illumise_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE28C4C, 0x0374 + + .align 2 +gFile_graphics_pokemon_palettes_illumise_palette:: @ 8E28FC0 + .incbin "graphics/pokemon/palettes/illumise_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xE28FC0, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_illumise_back_pic:: @ 8E28FE8 + .incbin "graphics/pokemon/back_pics/illumise_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE28FE8, 0x031C + + .align 2 +gFile_graphics_pokemon_palettes_illumise_shiny_palette:: @ 8E29304 + .incbin "graphics/pokemon/palettes/illumise_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xE29304, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_illumise_icon:: @ 8E2932C + .incbin "graphics/pokemon/icons/illumise_icon.4bpp" + @ .incbin "baserom.gba", 0xE2932C, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_illumise_footprint:: @ 8E2972C + .incbin "graphics/pokemon/footprints/illumise_footprint.1bpp" + @ .incbin "baserom.gba", 0xE2972C, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_lileep_still_front_pic:: @ 8E2974C + .incbin "graphics/pokemon/front_pics/lileep_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE2974C, 0x0344 + + .align 2 +gFile_graphics_pokemon_palettes_lileep_palette:: @ 8E29A90 + .incbin "graphics/pokemon/palettes/lileep_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xE29A90, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_lileep_back_pic:: @ 8E29AB8 + .incbin "graphics/pokemon/back_pics/lileep_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE29AB8, 0x0344 + + .align 2 +gFile_graphics_pokemon_palettes_lileep_shiny_palette:: @ 8E29DFC + .incbin "graphics/pokemon/palettes/lileep_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xE29DFC, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_lileep_icon:: @ 8E29E24 + .incbin "graphics/pokemon/icons/lileep_icon.4bpp" + @ .incbin "baserom.gba", 0xE29E24, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_lileep_footprint:: @ 8E2A224 + .incbin "graphics/pokemon/footprints/lileep_footprint.1bpp" + @ .incbin "baserom.gba", 0xE2A224, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_cradily_still_front_pic:: @ 8E2A244 + .incbin "graphics/pokemon/front_pics/cradily_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE2A244, 0x041C + + .align 2 +gFile_graphics_pokemon_palettes_cradily_palette:: @ 8E2A660 + .incbin "graphics/pokemon/palettes/cradily_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xE2A660, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_cradily_back_pic:: @ 8E2A688 + .incbin "graphics/pokemon/back_pics/cradily_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE2A688, 0x03FC + + .align 2 +gFile_graphics_pokemon_palettes_cradily_shiny_palette:: @ 8E2AA84 + .incbin "graphics/pokemon/palettes/cradily_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xE2AA84, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_cradily_icon:: @ 8E2AAAC + .incbin "graphics/pokemon/icons/cradily_icon.4bpp" + @ .incbin "baserom.gba", 0xE2AAAC, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_cradily_footprint:: @ 8E2AEAC + .incbin "graphics/pokemon/footprints/cradily_footprint.1bpp" + @ .incbin "baserom.gba", 0xE2AEAC, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_anorith_still_front_pic:: @ 8E2AECC + .incbin "graphics/pokemon/front_pics/anorith_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE2AECC, 0x0324 + + .align 2 +gFile_graphics_pokemon_palettes_anorith_palette:: @ 8E2B1F0 + .incbin "graphics/pokemon/palettes/anorith_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xE2B1F0, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_anorith_back_pic:: @ 8E2B218 + .incbin "graphics/pokemon/back_pics/anorith_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE2B218, 0x0248 + + .align 2 +gFile_graphics_pokemon_palettes_anorith_shiny_palette:: @ 8E2B460 + .incbin "graphics/pokemon/palettes/anorith_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xE2B460, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_anorith_icon:: @ 8E2B488 + .incbin "graphics/pokemon/icons/anorith_icon.4bpp" + @ .incbin "baserom.gba", 0xE2B488, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_anorith_footprint:: @ 8E2B888 + .incbin "graphics/pokemon/footprints/anorith_footprint.1bpp" + @ .incbin "baserom.gba", 0xE2B888, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_armaldo_still_front_pic:: @ 8E2B8A8 + .incbin "graphics/pokemon/front_pics/armaldo_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE2B8A8, 0x0580 + + .align 2 +gFile_graphics_pokemon_palettes_armaldo_palette:: @ 8E2BE28 + .incbin "graphics/pokemon/palettes/armaldo_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xE2BE28, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_armaldo_back_pic:: @ 8E2BE50 + .incbin "graphics/pokemon/back_pics/armaldo_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE2BE50, 0x0438 + + .align 2 +gFile_graphics_pokemon_palettes_armaldo_shiny_palette:: @ 8E2C288 + .incbin "graphics/pokemon/palettes/armaldo_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xE2C288, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_armaldo_icon:: @ 8E2C2B0 + .incbin "graphics/pokemon/icons/armaldo_icon.4bpp" + @ .incbin "baserom.gba", 0xE2C2B0, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_armaldo_footprint:: @ 8E2C6B0 + .incbin "graphics/pokemon/footprints/armaldo_footprint.1bpp" + @ .incbin "baserom.gba", 0xE2C6B0, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_ralts_still_front_pic:: @ 8E2C6D0 + .incbin "graphics/pokemon/front_pics/ralts_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE2C6D0, 0x0230 + + .align 2 +gFile_graphics_pokemon_palettes_ralts_palette:: @ 8E2C900 + .incbin "graphics/pokemon/palettes/ralts_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xE2C900, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_ralts_back_pic:: @ 8E2C928 + .incbin "graphics/pokemon/back_pics/ralts_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE2C928, 0x023C + + .align 2 +gFile_graphics_pokemon_palettes_ralts_shiny_palette:: @ 8E2CB64 + .incbin "graphics/pokemon/palettes/ralts_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xE2CB64, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_ralts_icon:: @ 8E2CB8C + .incbin "graphics/pokemon/icons/ralts_icon.4bpp" + @ .incbin "baserom.gba", 0xE2CB8C, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_ralts_footprint:: @ 8E2CF8C + .incbin "graphics/pokemon/footprints/ralts_footprint.1bpp" + @ .incbin "baserom.gba", 0xE2CF8C, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_kirlia_still_front_pic:: @ 8E2CFAC + .incbin "graphics/pokemon/front_pics/kirlia_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE2CFAC, 0x02FC + + .align 2 +gFile_graphics_pokemon_palettes_kirlia_palette:: @ 8E2D2A8 + .incbin "graphics/pokemon/palettes/kirlia_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xE2D2A8, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_kirlia_back_pic:: @ 8E2D2D0 + .incbin "graphics/pokemon/back_pics/kirlia_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE2D2D0, 0x0374 + + .align 2 +gFile_graphics_pokemon_palettes_kirlia_shiny_palette:: @ 8E2D644 + .incbin "graphics/pokemon/palettes/kirlia_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xE2D644, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_kirlia_icon:: @ 8E2D66C + .incbin "graphics/pokemon/icons/kirlia_icon.4bpp" + @ .incbin "baserom.gba", 0xE2D66C, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_kirlia_footprint:: @ 8E2DA6C + .incbin "graphics/pokemon/footprints/kirlia_footprint.1bpp" + @ .incbin "baserom.gba", 0xE2DA6C, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_gardevoir_still_front_pic:: @ 8E2DA8C + .incbin "graphics/pokemon/front_pics/gardevoir_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE2DA8C, 0x037C + + .align 2 +gFile_graphics_pokemon_palettes_gardevoir_palette:: @ 8E2DE08 + .incbin "graphics/pokemon/palettes/gardevoir_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xE2DE08, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_gardevoir_back_pic:: @ 8E2DE30 + .incbin "graphics/pokemon/back_pics/gardevoir_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE2DE30, 0x0334 + + .align 2 +gFile_graphics_pokemon_palettes_gardevoir_shiny_palette:: @ 8E2E164 + .incbin "graphics/pokemon/palettes/gardevoir_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xE2E164, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_gardevoir_icon:: @ 8E2E18C + .incbin "graphics/pokemon/icons/gardevoir_icon.4bpp" + @ .incbin "baserom.gba", 0xE2E18C, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_gardevoir_footprint:: @ 8E2E58C + .incbin "graphics/pokemon/footprints/gardevoir_footprint.1bpp" + @ .incbin "baserom.gba", 0xE2E58C, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_bagon_still_front_pic:: @ 8E2E5AC + .incbin "graphics/pokemon/front_pics/bagon_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE2E5AC, 0x0278 + + .align 2 +gFile_graphics_pokemon_palettes_bagon_palette:: @ 8E2E824 + .incbin "graphics/pokemon/palettes/bagon_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xE2E824, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_bagon_back_pic:: @ 8E2E84C + .incbin "graphics/pokemon/back_pics/bagon_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE2E84C, 0x02E8 + + .align 2 +gFile_graphics_pokemon_palettes_bagon_shiny_palette:: @ 8E2EB34 + .incbin "graphics/pokemon/palettes/bagon_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xE2EB34, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_bagon_icon:: @ 8E2EB5C + .incbin "graphics/pokemon/icons/bagon_icon.4bpp" + @ .incbin "baserom.gba", 0xE2EB5C, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_bagon_footprint:: @ 8E2EF5C + .incbin "graphics/pokemon/footprints/bagon_footprint.1bpp" + @ .incbin "baserom.gba", 0xE2EF5C, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_shelgon_still_front_pic:: @ 8E2EF7C + .incbin "graphics/pokemon/front_pics/shelgon_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE2EF7C, 0x0304 + + .align 2 +gFile_graphics_pokemon_palettes_shelgon_palette:: @ 8E2F280 + .incbin "graphics/pokemon/palettes/shelgon_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xE2F280, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_shelgon_back_pic:: @ 8E2F2A8 + .incbin "graphics/pokemon/back_pics/shelgon_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE2F2A8, 0x02E8 + + .align 2 +gFile_graphics_pokemon_palettes_shelgon_shiny_palette:: @ 8E2F590 + .incbin "graphics/pokemon/palettes/shelgon_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xE2F590, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_shelgon_icon:: @ 8E2F5B8 + .incbin "graphics/pokemon/icons/shelgon_icon.4bpp" + @ .incbin "baserom.gba", 0xE2F5B8, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_shelgon_footprint:: @ 8E2F9B8 + .incbin "graphics/pokemon/footprints/shelgon_footprint.1bpp" + @ .incbin "baserom.gba", 0xE2F9B8, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_salamence_still_front_pic:: @ 8E2F9D8 + .incbin "graphics/pokemon/front_pics/salamence_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE2F9D8, 0x0464 + + .align 2 +gFile_graphics_pokemon_palettes_salamence_palette:: @ 8E2FE3C + .incbin "graphics/pokemon/palettes/salamence_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xE2FE3C, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_salamence_back_pic:: @ 8E2FE64 + .incbin "graphics/pokemon/back_pics/salamence_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE2FE64, 0x02E4 + + .align 2 +gFile_graphics_pokemon_palettes_salamence_shiny_palette:: @ 8E30148 + .incbin "graphics/pokemon/palettes/salamence_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xE30148, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_salamence_icon:: @ 8E30170 + .incbin "graphics/pokemon/icons/salamence_icon.4bpp" + @ .incbin "baserom.gba", 0xE30170, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_salamence_footprint:: @ 8E30570 + .incbin "graphics/pokemon/footprints/salamence_footprint.1bpp" + @ .incbin "baserom.gba", 0xE30570, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_beldum_still_front_pic:: @ 8E30590 + .incbin "graphics/pokemon/front_pics/beldum_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE30590, 0x0270 + + .align 2 +gFile_graphics_pokemon_palettes_beldum_palette:: @ 8E30800 + .incbin "graphics/pokemon/palettes/beldum_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xE30800, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_beldum_back_pic:: @ 8E30828 + .incbin "graphics/pokemon/back_pics/beldum_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE30828, 0x02F0 + + .align 2 +gFile_graphics_pokemon_palettes_beldum_shiny_palette:: @ 8E30B18 + .incbin "graphics/pokemon/palettes/beldum_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xE30B18, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_beldum_icon:: @ 8E30B40 + .incbin "graphics/pokemon/icons/beldum_icon.4bpp" + @ .incbin "baserom.gba", 0xE30B40, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_beldum_footprint:: @ 8E30F40 + .incbin "graphics/pokemon/footprints/beldum_footprint.1bpp" + @ .incbin "baserom.gba", 0xE30F40, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_metang_still_front_pic:: @ 8E30F60 + .incbin "graphics/pokemon/front_pics/metang_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE30F60, 0x045C + + .align 2 +gFile_graphics_pokemon_palettes_metang_palette:: @ 8E313BC + .incbin "graphics/pokemon/palettes/metang_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xE313BC, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_metang_back_pic:: @ 8E313E4 + .incbin "graphics/pokemon/back_pics/metang_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE313E4, 0x0324 + + .align 2 +gFile_graphics_pokemon_palettes_metang_shiny_palette:: @ 8E31708 + .incbin "graphics/pokemon/palettes/metang_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xE31708, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_metang_icon:: @ 8E31730 + .incbin "graphics/pokemon/icons/metang_icon.4bpp" + @ .incbin "baserom.gba", 0xE31730, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_metang_footprint:: @ 8E31B30 + .incbin "graphics/pokemon/footprints/metang_footprint.1bpp" + @ .incbin "baserom.gba", 0xE31B30, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_metagross_still_front_pic:: @ 8E31B50 + .incbin "graphics/pokemon/front_pics/metagross_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE31B50, 0x0464 + + .align 2 +gFile_graphics_pokemon_palettes_metagross_palette:: @ 8E31FB4 + .incbin "graphics/pokemon/palettes/metagross_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xE31FB4, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_metagross_back_pic:: @ 8E31FDC + .incbin "graphics/pokemon/back_pics/metagross_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE31FDC, 0x02CC + + .align 2 +gFile_graphics_pokemon_palettes_metagross_shiny_palette:: @ 8E322A8 + .incbin "graphics/pokemon/palettes/metagross_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xE322A8, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_metagross_icon:: @ 8E322D0 + .incbin "graphics/pokemon/icons/metagross_icon.4bpp" + @ .incbin "baserom.gba", 0xE322D0, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_metagross_footprint:: @ 8E326D0 + .incbin "graphics/pokemon/footprints/metagross_footprint.1bpp" + @ .incbin "baserom.gba", 0xE326D0, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_regirock_still_front_pic:: @ 8E326F0 + .incbin "graphics/pokemon/front_pics/regirock_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE326F0, 0x04BC + + .align 2 +gFile_graphics_pokemon_palettes_regirock_palette:: @ 8E32BAC + .incbin "graphics/pokemon/palettes/regirock_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xE32BAC, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_regirock_back_pic:: @ 8E32BD4 + .incbin "graphics/pokemon/back_pics/regirock_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE32BD4, 0x044C + + .align 2 +gFile_graphics_pokemon_palettes_regirock_shiny_palette:: @ 8E33020 + .incbin "graphics/pokemon/palettes/regirock_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xE33020, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_regirock_icon:: @ 8E33048 + .incbin "graphics/pokemon/icons/regirock_icon.4bpp" + @ .incbin "baserom.gba", 0xE33048, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_regirock_footprint:: @ 8E33448 + .incbin "graphics/pokemon/footprints/regirock_footprint.1bpp" + @ .incbin "baserom.gba", 0xE33448, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_regice_still_front_pic:: @ 8E33468 + .incbin "graphics/pokemon/front_pics/regice_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE33468, 0x0448 + + .align 2 +gFile_graphics_pokemon_palettes_regice_palette:: @ 8E338B0 + .incbin "graphics/pokemon/palettes/regice_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xE338B0, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_regice_back_pic:: @ 8E338D8 + .incbin "graphics/pokemon/back_pics/regice_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE338D8, 0x02F0 + + .align 2 +gFile_graphics_pokemon_palettes_regice_shiny_palette:: @ 8E33BC8 + .incbin "graphics/pokemon/palettes/regice_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xE33BC8, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_regice_icon:: @ 8E33BF0 + .incbin "graphics/pokemon/icons/regice_icon.4bpp" + @ .incbin "baserom.gba", 0xE33BF0, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_regice_footprint:: @ 8E33FF0 + .incbin "graphics/pokemon/footprints/regice_footprint.1bpp" + @ .incbin "baserom.gba", 0xE33FF0, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_registeel_still_front_pic:: @ 8E34010 + .incbin "graphics/pokemon/front_pics/registeel_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE34010, 0x0488 + + .align 2 +gFile_graphics_pokemon_palettes_registeel_palette:: @ 8E34498 + .incbin "graphics/pokemon/palettes/registeel_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xE34498, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_registeel_back_pic:: @ 8E344C0 + .incbin "graphics/pokemon/back_pics/registeel_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE344C0, 0x0338 + + .align 2 +gFile_graphics_pokemon_palettes_registeel_shiny_palette:: @ 8E347F8 + .incbin "graphics/pokemon/palettes/registeel_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xE347F8, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_registeel_icon:: @ 8E34820 + .incbin "graphics/pokemon/icons/registeel_icon.4bpp" + @ .incbin "baserom.gba", 0xE34820, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_registeel_footprint:: @ 8E34C20 + .incbin "graphics/pokemon/footprints/registeel_footprint.1bpp" + @ .incbin "baserom.gba", 0xE34C20, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_kyogre_still_front_pic:: @ 8E34C40 + .incbin "graphics/pokemon/front_pics/kyogre_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE34C40, 0x0470 + + .align 2 +gFile_graphics_pokemon_palettes_kyogre_palette:: @ 8E350B0 + .incbin "graphics/pokemon/palettes/kyogre_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xE350B0, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_kyogre_back_pic:: @ 8E350D8 + .incbin "graphics/pokemon/back_pics/kyogre_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE350D8, 0x0278 + + .align 2 +gFile_graphics_pokemon_palettes_kyogre_shiny_palette:: @ 8E35350 + .incbin "graphics/pokemon/palettes/kyogre_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xE35350, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_kyogre_icon:: @ 8E35378 + .incbin "graphics/pokemon/icons/kyogre_icon.4bpp" + @ .incbin "baserom.gba", 0xE35378, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_kyogre_footprint:: @ 8E35778 + .incbin "graphics/pokemon/footprints/kyogre_footprint.1bpp" + @ .incbin "baserom.gba", 0xE35778, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_groudon_still_front_pic:: @ 8E35798 + .incbin "graphics/pokemon/front_pics/groudon_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE35798, 0x0594 + + .align 2 +gFile_graphics_pokemon_palettes_groudon_palette:: @ 8E35D2C + .incbin "graphics/pokemon/palettes/groudon_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xE35D2C, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_groudon_back_pic:: @ 8E35D54 + .incbin "graphics/pokemon/back_pics/groudon_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE35D54, 0x0468 + + .align 2 +gFile_graphics_pokemon_palettes_groudon_shiny_palette:: @ 8E361BC + .incbin "graphics/pokemon/palettes/groudon_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xE361BC, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_groudon_icon:: @ 8E361E4 + .incbin "graphics/pokemon/icons/groudon_icon.4bpp" + @ .incbin "baserom.gba", 0xE361E4, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_groudon_footprint:: @ 8E365E4 + .incbin "graphics/pokemon/footprints/groudon_footprint.1bpp" + @ .incbin "baserom.gba", 0xE365E4, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_rayquaza_still_front_pic:: @ 8E36604 + .incbin "graphics/pokemon/front_pics/rayquaza_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE36604, 0x0510 + + .align 2 +gFile_graphics_pokemon_palettes_rayquaza_palette:: @ 8E36B14 + .incbin "graphics/pokemon/palettes/rayquaza_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xE36B14, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_rayquaza_back_pic:: @ 8E36B3C + .incbin "graphics/pokemon/back_pics/rayquaza_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE36B3C, 0x0338 + + .align 2 +gFile_graphics_pokemon_palettes_rayquaza_shiny_palette:: @ 8E36E74 + .incbin "graphics/pokemon/palettes/rayquaza_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xE36E74, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_rayquaza_icon:: @ 8E36E9C + .incbin "graphics/pokemon/icons/rayquaza_icon.4bpp" + @ .incbin "baserom.gba", 0xE36E9C, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_rayquaza_footprint:: @ 8E3729C + .incbin "graphics/pokemon/footprints/rayquaza_footprint.1bpp" + @ .incbin "baserom.gba", 0xE3729C, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_latias_still_front_pic:: @ 8E372BC + .incbin "graphics/pokemon/front_pics/latias_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE372BC, 0x0424 + + .align 2 +gFile_graphics_pokemon_palettes_latias_palette:: @ 8E376E0 + .incbin "graphics/pokemon/palettes/latias_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xE376E0, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_latias_back_pic:: @ 8E37708 + .incbin "graphics/pokemon/back_pics/latias_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE37708, 0x02FC + + .align 2 +gFile_graphics_pokemon_palettes_latias_shiny_palette:: @ 8E37A04 + .incbin "graphics/pokemon/palettes/latias_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xE37A04, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_latias_icon:: @ 8E37A2C + .incbin "graphics/pokemon/icons/latias_icon.4bpp" + @ .incbin "baserom.gba", 0xE37A2C, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_latias_footprint:: @ 8E37E2C + .incbin "graphics/pokemon/footprints/latias_footprint.1bpp" + @ .incbin "baserom.gba", 0xE37E2C, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_latios_still_front_pic:: @ 8E37E4C + .incbin "graphics/pokemon/front_pics/latios_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE37E4C, 0x0454 + + .align 2 +gFile_graphics_pokemon_palettes_latios_palette:: @ 8E382A0 + .incbin "graphics/pokemon/palettes/latios_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xE382A0, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_latios_back_pic:: @ 8E382C8 + .incbin "graphics/pokemon/back_pics/latios_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE382C8, 0x0360 + + .align 2 +gFile_graphics_pokemon_palettes_latios_shiny_palette:: @ 8E38628 + .incbin "graphics/pokemon/palettes/latios_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xE38628, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_latios_icon:: @ 8E38650 + .incbin "graphics/pokemon/icons/latios_icon.4bpp" + @ .incbin "baserom.gba", 0xE38650, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_latios_footprint:: @ 8E38A50 + .incbin "graphics/pokemon/footprints/latios_footprint.1bpp" + @ .incbin "baserom.gba", 0xE38A50, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_jirachi_still_front_pic:: @ 8E38A70 + .incbin "graphics/pokemon/front_pics/jirachi_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE38A70, 0x030C + + .align 2 +gFile_graphics_pokemon_palettes_jirachi_palette:: @ 8E38D7C + .incbin "graphics/pokemon/palettes/jirachi_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xE38D7C, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_jirachi_back_pic:: @ 8E38DA4 + .incbin "graphics/pokemon/back_pics/jirachi_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE38DA4, 0x03A0 + + .align 2 +gFile_graphics_pokemon_palettes_jirachi_shiny_palette:: @ 8E39144 + .incbin "graphics/pokemon/palettes/jirachi_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xE39144, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_jirachi_icon:: @ 8E3916C + .incbin "graphics/pokemon/icons/jirachi_icon.4bpp" + @ .incbin "baserom.gba", 0xE3916C, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_jirachi_footprint:: @ 8E3956C + .incbin "graphics/pokemon/footprints/jirachi_footprint.1bpp" + @ .incbin "baserom.gba", 0xE3956C, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_deoxys_still_front_pic:: @ 8E3958C + .incbin "graphics/pokemon/front_pics/deoxys_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE3958C, 0x07BC + + .align 2 +gFile_graphics_pokemon_palettes_deoxys_palette:: @ 8E39D48 + .incbin "graphics/pokemon/palettes/deoxys_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xE39D48, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_deoxys_back_pic:: @ 8E39D70 + .incbin "graphics/pokemon/back_pics/deoxys_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE39D70, 0x05F0 + + .align 2 +gFile_graphics_pokemon_palettes_deoxys_shiny_palette:: @ 8E3A360 + .incbin "graphics/pokemon/palettes/deoxys_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xE3A360, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_deoxys_icon:: @ 8E3A388 + .incbin "graphics/pokemon/icons/deoxys_icon.4bpp" + @ .incbin "baserom.gba", 0xE3A388, 0x0400 + + .align 2 +gFile_graphics_pokemon_icons_deoxys_speed_icon:: @ 8E3A788 + .incbin "graphics/pokemon/icons/deoxys_speed_icon.4bpp" + @ .incbin "baserom.gba", 0xE3A788, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_deoxys_footprint:: @ 8E3AB88 + .incbin "graphics/pokemon/footprints/deoxys_footprint.1bpp" + @ .incbin "baserom.gba", 0xE3AB88, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_chimecho_still_front_pic:: @ 8E3ABA8 + .incbin "graphics/pokemon/front_pics/chimecho_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE3ABA8, 0x024C + + .align 2 +gFile_graphics_pokemon_palettes_chimecho_palette:: @ 8E3ADF4 + .incbin "graphics/pokemon/palettes/chimecho_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xE3ADF4, 0x0028 + + .align 2 +gFile_graphics_pokemon_back_pics_chimecho_back_pic:: @ 8E3AE1C + .incbin "graphics/pokemon/back_pics/chimecho_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE3AE1C, 0x0274 + + .align 2 +gFile_graphics_pokemon_palettes_chimecho_shiny_palette:: @ 8E3B090 + .incbin "graphics/pokemon/palettes/chimecho_shiny_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xE3B090, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_chimecho_icon:: @ 8E3B0B8 + .incbin "graphics/pokemon/icons/chimecho_icon.4bpp" + @ .incbin "baserom.gba", 0xE3B0B8, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_chimecho_footprint:: @ 8E3B4B8 + .incbin "graphics/pokemon/footprints/chimecho_footprint.1bpp" + @ .incbin "baserom.gba", 0xE3B4B8, 0x0020 + + + .align 2 +gFile_graphics_pokemon_front_pics_egg_still_front_pic:: @ 8E3B4D8 + .incbin "graphics/pokemon/front_pics/egg_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE3B4D8, 0x01B4 + + .align 2 +gFile_graphics_pokemon_palettes_egg_palette:: @ 8E3B68C + .incbin "graphics/pokemon/palettes/egg_palette.gbapal.lz" + @ .incbin "baserom.gba", 0xE3B68C, 0x0020 + + .align 2 +gFile_graphics_pokemon_front_pics_unown_b_still_front_pic:: @ 8E3B6AC + .incbin "graphics/pokemon/front_pics/unown_b_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE3B6AC, 0x01D8 + + .align 2 +gFile_graphics_pokemon_back_pics_unown_b_back_pic:: @ 8E3B884 + .incbin "graphics/pokemon/back_pics/unown_b_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE3B884, 0x0204 + + .align 2 +gFile_graphics_pokemon_icons_unown_B_icon:: @ 8E3BA88 + .incbin "graphics/pokemon/icons/unown_B_icon.4bpp" + @ .incbin "baserom.gba", 0xE3BA88, 0x0400 + + .align 2 +gFile_graphics_pokemon_front_pics_unown_c_still_front_pic:: @ 8E3BE88 + .incbin "graphics/pokemon/front_pics/unown_c_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE3BE88, 0x0214 + + .align 2 +gFile_graphics_pokemon_back_pics_unown_c_back_pic:: @ 8E3C09C + .incbin "graphics/pokemon/back_pics/unown_c_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE3C09C, 0x02AC + + .align 2 +gFile_graphics_pokemon_icons_unown_C_icon:: @ 8E3C348 + .incbin "graphics/pokemon/icons/unown_C_icon.4bpp" + @ .incbin "baserom.gba", 0xE3C348, 0x0400 + + .align 2 +gFile_graphics_pokemon_front_pics_unown_d_still_front_pic:: @ 8E3C748 + .incbin "graphics/pokemon/front_pics/unown_d_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE3C748, 0x01F8 + + .align 2 +gFile_graphics_pokemon_back_pics_unown_d_back_pic:: @ 8E3C940 + .incbin "graphics/pokemon/back_pics/unown_d_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE3C940, 0x0258 + + .align 2 +gFile_graphics_pokemon_icons_unown_D_icon:: @ 8E3CB98 + .incbin "graphics/pokemon/icons/unown_D_icon.4bpp" + @ .incbin "baserom.gba", 0xE3CB98, 0x0400 + + .align 2 +gFile_graphics_pokemon_front_pics_unown_e_still_front_pic:: @ 8E3CF98 + .incbin "graphics/pokemon/front_pics/unown_e_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE3CF98, 0x01B8 + + .align 2 +gFile_graphics_pokemon_back_pics_unown_e_back_pic:: @ 8E3D150 + .incbin "graphics/pokemon/back_pics/unown_e_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE3D150, 0x0200 + + .align 2 +gFile_graphics_pokemon_icons_unown_E_icon:: @ 8E3D350 + .incbin "graphics/pokemon/icons/unown_E_icon.4bpp" + @ .incbin "baserom.gba", 0xE3D350, 0x0400 + + .align 2 +gFile_graphics_pokemon_front_pics_unown_f_still_front_pic:: @ 8E3D750 + .incbin "graphics/pokemon/front_pics/unown_f_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE3D750, 0x01F4 + + .align 2 +gFile_graphics_pokemon_back_pics_unown_f_back_pic:: @ 8E3D944 + .incbin "graphics/pokemon/back_pics/unown_f_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE3D944, 0x021C + + .align 2 +gFile_graphics_pokemon_icons_unown_F_icon:: @ 8E3DB60 + .incbin "graphics/pokemon/icons/unown_F_icon.4bpp" + @ .incbin "baserom.gba", 0xE3DB60, 0x0400 + + .align 2 +gFile_graphics_pokemon_front_pics_unown_g_still_front_pic:: @ 8E3DF60 + .incbin "graphics/pokemon/front_pics/unown_g_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE3DF60, 0x01DC + + .align 2 +gFile_graphics_pokemon_back_pics_unown_g_back_pic:: @ 8E3E13C + .incbin "graphics/pokemon/back_pics/unown_g_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE3E13C, 0x024C + + .align 2 +gFile_graphics_pokemon_icons_unown_G_icon:: @ 8E3E388 + .incbin "graphics/pokemon/icons/unown_G_icon.4bpp" + @ .incbin "baserom.gba", 0xE3E388, 0x0400 + + .align 2 +gFile_graphics_pokemon_front_pics_unown_h_still_front_pic:: @ 8E3E788 + .incbin "graphics/pokemon/front_pics/unown_h_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE3E788, 0x0244 + + .align 2 +gFile_graphics_pokemon_back_pics_unown_h_back_pic:: @ 8E3E9CC + .incbin "graphics/pokemon/back_pics/unown_h_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE3E9CC, 0x02C4 + + .align 2 +gFile_graphics_pokemon_icons_unown_H_icon:: @ 8E3EC90 + .incbin "graphics/pokemon/icons/unown_H_icon.4bpp" + @ .incbin "baserom.gba", 0xE3EC90, 0x0400 + + .align 2 +gFile_graphics_pokemon_front_pics_unown_i_still_front_pic:: @ 8E3F090 + .incbin "graphics/pokemon/front_pics/unown_i_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE3F090, 0x0198 + + .align 2 +gFile_graphics_pokemon_back_pics_unown_i_back_pic:: @ 8E3F228 + .incbin "graphics/pokemon/back_pics/unown_i_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE3F228, 0x01A8 + + .align 2 +gFile_graphics_pokemon_icons_unown_I_icon:: @ 8E3F3D0 + .incbin "graphics/pokemon/icons/unown_I_icon.4bpp" + @ .incbin "baserom.gba", 0xE3F3D0, 0x0400 + + .align 2 +gFile_graphics_pokemon_front_pics_unown_j_still_front_pic:: @ 8E3F7D0 + .incbin "graphics/pokemon/front_pics/unown_j_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE3F7D0, 0x01C4 + + .align 2 +gFile_graphics_pokemon_back_pics_unown_j_back_pic:: @ 8E3F994 + .incbin "graphics/pokemon/back_pics/unown_j_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE3F994, 0x01E8 + + .align 2 +gFile_graphics_pokemon_icons_unown_J_icon:: @ 8E3FB7C + .incbin "graphics/pokemon/icons/unown_J_icon.4bpp" + @ .incbin "baserom.gba", 0xE3FB7C, 0x0400 + + .align 2 +gFile_graphics_pokemon_front_pics_unown_k_still_front_pic:: @ 8E3FF7C + .incbin "graphics/pokemon/front_pics/unown_k_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE3FF7C, 0x01D0 + + .align 2 +gFile_graphics_pokemon_back_pics_unown_k_back_pic:: @ 8E4014C + .incbin "graphics/pokemon/back_pics/unown_k_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE4014C, 0x01F8 + + .align 2 +gFile_graphics_pokemon_icons_unown_K_icon:: @ 8E40344 + .incbin "graphics/pokemon/icons/unown_K_icon.4bpp" + @ .incbin "baserom.gba", 0xE40344, 0x0400 + + .align 2 +gFile_graphics_pokemon_front_pics_unown_l_still_front_pic:: @ 8E40744 + .incbin "graphics/pokemon/front_pics/unown_l_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE40744, 0x01B0 + + .align 2 +gFile_graphics_pokemon_back_pics_unown_l_back_pic:: @ 8E408F4 + .incbin "graphics/pokemon/back_pics/unown_l_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE408F4, 0x01D4 + + .align 2 +gFile_graphics_pokemon_icons_unown_L_icon:: @ 8E40AC8 + .incbin "graphics/pokemon/icons/unown_L_icon.4bpp" + @ .incbin "baserom.gba", 0xE40AC8, 0x0400 + + .align 2 +gFile_graphics_pokemon_front_pics_unown_m_still_front_pic:: @ 8E40EC8 + .incbin "graphics/pokemon/front_pics/unown_m_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE40EC8, 0x0224 + + .align 2 +gFile_graphics_pokemon_back_pics_unown_m_back_pic:: @ 8E410EC + .incbin "graphics/pokemon/back_pics/unown_m_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE410EC, 0x02A8 + + .align 2 +gFile_graphics_pokemon_icons_unown_M_icon:: @ 8E41394 + .incbin "graphics/pokemon/icons/unown_M_icon.4bpp" + @ .incbin "baserom.gba", 0xE41394, 0x0400 + + .align 2 +gFile_graphics_pokemon_front_pics_unown_n_still_front_pic:: @ 8E41794 + .incbin "graphics/pokemon/front_pics/unown_n_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE41794, 0x01F8 + + .align 2 +gFile_graphics_pokemon_back_pics_unown_n_back_pic:: @ 8E4198C + .incbin "graphics/pokemon/back_pics/unown_n_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE4198C, 0x026C + + .align 2 +gFile_graphics_pokemon_icons_unown_N_icon:: @ 8E41BF8 + .incbin "graphics/pokemon/icons/unown_N_icon.4bpp" + @ .incbin "baserom.gba", 0xE41BF8, 0x0400 + + .align 2 +gFile_graphics_pokemon_front_pics_unown_o_still_front_pic:: @ 8E41FF8 + .incbin "graphics/pokemon/front_pics/unown_o_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE41FF8, 0x0238 + + .align 2 +gFile_graphics_pokemon_back_pics_unown_o_back_pic:: @ 8E42230 + .incbin "graphics/pokemon/back_pics/unown_o_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE42230, 0x02C0 + + .align 2 +gFile_graphics_pokemon_icons_unown_O_icon:: @ 8E424F0 + .incbin "graphics/pokemon/icons/unown_O_icon.4bpp" + @ .incbin "baserom.gba", 0xE424F0, 0x0400 + + .align 2 +gFile_graphics_pokemon_front_pics_unown_p_still_front_pic:: @ 8E428F0 + .incbin "graphics/pokemon/front_pics/unown_p_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE428F0, 0x01A0 + + .align 2 +gFile_graphics_pokemon_back_pics_unown_p_back_pic:: @ 8E42A90 + .incbin "graphics/pokemon/back_pics/unown_p_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE42A90, 0x01C4 + + .align 2 +gFile_graphics_pokemon_icons_unown_P_icon:: @ 8E42C54 + .incbin "graphics/pokemon/icons/unown_P_icon.4bpp" + @ .incbin "baserom.gba", 0xE42C54, 0x0400 + + .align 2 +gFile_graphics_pokemon_front_pics_unown_q_still_front_pic:: @ 8E43054 + .incbin "graphics/pokemon/front_pics/unown_q_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE43054, 0x01B4 + + .align 2 +gFile_graphics_pokemon_back_pics_unown_q_back_pic:: @ 8E43208 + .incbin "graphics/pokemon/back_pics/unown_q_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE43208, 0x01CC + + .align 2 +gFile_graphics_pokemon_icons_unown_Q_icon:: @ 8E433D4 + .incbin "graphics/pokemon/icons/unown_Q_icon.4bpp" + @ .incbin "baserom.gba", 0xE433D4, 0x0400 + + .align 2 +gFile_graphics_pokemon_front_pics_unown_r_still_front_pic:: @ 8E437D4 + .incbin "graphics/pokemon/front_pics/unown_r_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE437D4, 0x01A4 + + .align 2 +gFile_graphics_pokemon_back_pics_unown_r_back_pic:: @ 8E43978 + .incbin "graphics/pokemon/back_pics/unown_r_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE43978, 0x01C8 + + .align 2 +gFile_graphics_pokemon_icons_unown_R_icon:: @ 8E43B40 + .incbin "graphics/pokemon/icons/unown_R_icon.4bpp" + @ .incbin "baserom.gba", 0xE43B40, 0x0400 + + .align 2 +gFile_graphics_pokemon_front_pics_unown_s_still_front_pic:: @ 8E43F40 + .incbin "graphics/pokemon/front_pics/unown_s_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE43F40, 0x01E8 + + .align 2 +gFile_graphics_pokemon_back_pics_unown_s_back_pic:: @ 8E44128 + .incbin "graphics/pokemon/back_pics/unown_s_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE44128, 0x0254 + + .align 2 +gFile_graphics_pokemon_icons_unown_S_icon:: @ 8E4437C + .incbin "graphics/pokemon/icons/unown_S_icon.4bpp" + @ .incbin "baserom.gba", 0xE4437C, 0x0400 + + .align 2 +gFile_graphics_pokemon_front_pics_unown_t_still_front_pic:: @ 8E4477C + .incbin "graphics/pokemon/front_pics/unown_t_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE4477C, 0x01B0 + + .align 2 +gFile_graphics_pokemon_back_pics_unown_t_back_pic:: @ 8E4492C + .incbin "graphics/pokemon/back_pics/unown_t_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE4492C, 0x01B4 + + .align 2 +gFile_graphics_pokemon_icons_unown_T_icon:: @ 8E44AE0 + .incbin "graphics/pokemon/icons/unown_T_icon.4bpp" + @ .incbin "baserom.gba", 0xE44AE0, 0x0400 + + .align 2 +gFile_graphics_pokemon_front_pics_unown_u_still_front_pic:: @ 8E44EE0 + .incbin "graphics/pokemon/front_pics/unown_u_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE44EE0, 0x0218 + + .align 2 +gFile_graphics_pokemon_back_pics_unown_u_back_pic:: @ 8E450F8 + .incbin "graphics/pokemon/back_pics/unown_u_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE450F8, 0x0254 + + .align 2 +gFile_graphics_pokemon_icons_unown_U_icon:: @ 8E4534C + .incbin "graphics/pokemon/icons/unown_U_icon.4bpp" + @ .incbin "baserom.gba", 0xE4534C, 0x0400 + + .align 2 +gFile_graphics_pokemon_front_pics_unown_v_still_front_pic:: @ 8E4574C + .incbin "graphics/pokemon/front_pics/unown_v_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE4574C, 0x01E4 + + .align 2 +gFile_graphics_pokemon_back_pics_unown_v_back_pic:: @ 8E45930 + .incbin "graphics/pokemon/back_pics/unown_v_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE45930, 0x0230 + + .align 2 +gFile_graphics_pokemon_icons_unown_V_icon:: @ 8E45B60 + .incbin "graphics/pokemon/icons/unown_V_icon.4bpp" + @ .incbin "baserom.gba", 0xE45B60, 0x0400 + + .align 2 +gFile_graphics_pokemon_front_pics_unown_w_still_front_pic:: @ 8E45F60 + .incbin "graphics/pokemon/front_pics/unown_w_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE45F60, 0x01D4 + + .align 2 +gFile_graphics_pokemon_back_pics_unown_w_back_pic:: @ 8E46134 + .incbin "graphics/pokemon/back_pics/unown_w_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE46134, 0x0204 + + .align 2 +gFile_graphics_pokemon_icons_unown_W_icon:: @ 8E46338 + .incbin "graphics/pokemon/icons/unown_W_icon.4bpp" + @ .incbin "baserom.gba", 0xE46338, 0x0400 + + .align 2 +gFile_graphics_pokemon_front_pics_unown_x_still_front_pic:: @ 8E46738 + .incbin "graphics/pokemon/front_pics/unown_x_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE46738, 0x01C4 + + .align 2 +gFile_graphics_pokemon_back_pics_unown_x_back_pic:: @ 8E468FC + .incbin "graphics/pokemon/back_pics/unown_x_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE468FC, 0x01F0 + + .align 2 +gFile_graphics_pokemon_icons_unown_X_icon:: @ 8E46AEC + .incbin "graphics/pokemon/icons/unown_X_icon.4bpp" + @ .incbin "baserom.gba", 0xE46AEC, 0x0400 + + .align 2 +gFile_graphics_pokemon_front_pics_unown_y_still_front_pic:: @ 8E46EEC + .incbin "graphics/pokemon/front_pics/unown_y_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE46EEC, 0x01D8 + + .align 2 +gFile_graphics_pokemon_back_pics_unown_y_back_pic:: @ 8E470C4 + .incbin "graphics/pokemon/back_pics/unown_y_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE470C4, 0x01F4 + + .align 2 +gFile_graphics_pokemon_icons_unown_Y_icon:: @ 8E472B8 + .incbin "graphics/pokemon/icons/unown_Y_icon.4bpp" + @ .incbin "baserom.gba", 0xE472B8, 0x0400 + + .align 2 +gFile_graphics_pokemon_front_pics_unown_z_still_front_pic:: @ 8E476B8 + .incbin "graphics/pokemon/front_pics/unown_z_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE476B8, 0x01B0 + + .align 2 +gFile_graphics_pokemon_back_pics_unown_z_back_pic:: @ 8E47868 + .incbin "graphics/pokemon/back_pics/unown_z_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE47868, 0x01DC + + .align 2 +gFile_graphics_pokemon_icons_unown_Z_icon:: @ 8E47A44 + .incbin "graphics/pokemon/icons/unown_Z_icon.4bpp" + @ .incbin "baserom.gba", 0xE47A44, 0x0400 + + .align 2 +gFile_graphics_pokemon_front_pics_unown_exclamation_mark_still_front_pic:: @ 8E47E44 + .incbin "graphics/pokemon/front_pics/unown_exclamation_mark_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE47E44, 0x0190 + + .align 2 +gFile_graphics_pokemon_back_pics_unown_exclamation_mark_back_pic:: @ 8E47FD4 + .incbin "graphics/pokemon/back_pics/unown_exclamation_mark_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE47FD4, 0x01C8 + + .align 2 +gFile_graphics_pokemon_icons_unown_exclamation_mark_icon:: @ 8E4819C + .incbin "graphics/pokemon/icons/unown_exclamation_mark_icon.4bpp" + @ .incbin "baserom.gba", 0xE4819C, 0x0400 + + .align 2 +gFile_graphics_pokemon_front_pics_unown_question_mark_still_front_pic:: @ 8E4859C + .incbin "graphics/pokemon/front_pics/unown_question_mark_still_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE4859C, 0x01BC + + .align 2 +gFile_graphics_pokemon_back_pics_unown_question_mark_back_pic:: @ 8E48758 + .incbin "graphics/pokemon/back_pics/unown_question_mark_back_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE48758, 0x0200 + + .align 2 +gFile_graphics_pokemon_icons_unown_question_mark_icon:: @ 8E48958 + .incbin "graphics/pokemon/icons/unown_question_mark_icon.4bpp" + @ .incbin "baserom.gba", 0xE48958, 0x0400 + + + .align 2 +gFile_graphics_trainers_front_pics_aqua_leader_archie_front_pic:: @ 8E48D58 + .incbin "graphics/trainers/front_pics/aqua_leader_archie_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE48D58, 0x033C + + .align 2 +gFile_graphics_trainers_palettes_aqua_leader_archie:: @ 8E49094 + .incbin "graphics/trainers/palettes/aqua_leader_archie.gbapal.lz" + @ .incbin "baserom.gba", 0xE49094, 0x0028 + + .align 2 +gFile_graphics_trainers_front_pics_aqua_grunt_m_front_pic:: @ 8E490BC + .incbin "graphics/trainers/front_pics/aqua_grunt_m_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE490BC, 0x0360 + + .align 2 +gFile_graphics_trainers_palettes_aqua_grunt_m:: @ 8E4941C + .incbin "graphics/trainers/palettes/aqua_grunt_m.gbapal.lz" + @ .incbin "baserom.gba", 0xE4941C, 0x0028 + + .align 2 +gFile_graphics_trainers_front_pics_aqua_grunt_f_front_pic:: @ 8E49444 + .incbin "graphics/trainers/front_pics/aqua_grunt_f_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE49444, 0x033C + + .align 2 +gFile_graphics_trainers_palettes_aqua_grunt_f:: @ 8E49780 + .incbin "graphics/trainers/palettes/aqua_grunt_f.gbapal.lz" + @ .incbin "baserom.gba", 0xE49780, 0x0028 + + .align 2 +gFile_graphics_trainers_front_pics_emerald_aroma_lady_front_pic:: @ 8E497A8 + .incbin "graphics/trainers/front_pics/emerald_aroma_lady_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE497A8, 0x02C4 + + .align 2 +gFile_graphics_trainers_palettes_emerald_aroma_lady:: @ 8E49A6C + .incbin "graphics/trainers/palettes/emerald_aroma_lady.gbapal.lz" + @ .incbin "baserom.gba", 0xE49A6C, 0x0028 + + .align 2 +gFile_graphics_trainers_front_pics_emerald_ruin_maniac_front_pic:: @ 8E49A94 + .incbin "graphics/trainers/front_pics/emerald_ruin_maniac_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE49A94, 0x039C + + .align 2 +gFile_graphics_trainers_palettes_emerald_ruin_maniac:: @ 8E49E30 + .incbin "graphics/trainers/palettes/emerald_ruin_maniac.gbapal.lz" + @ .incbin "baserom.gba", 0xE49E30, 0x0028 + + .align 2 +gFile_graphics_trainers_front_pics_interviewer_front_pic:: @ 8E49E58 + .incbin "graphics/trainers/front_pics/interviewer_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE49E58, 0x04A4 + + .align 2 +gFile_graphics_trainers_palettes_interviewer:: @ 8E4A2FC + .incbin "graphics/trainers/palettes/interviewer.gbapal.lz" + @ .incbin "baserom.gba", 0xE4A2FC, 0x0028 + + .align 2 +gFile_graphics_trainers_front_pics_emerald_tuber_f_front_pic:: @ 8E4A324 + .incbin "graphics/trainers/front_pics/emerald_tuber_f_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE4A324, 0x02A4 + + .align 2 +gFile_graphics_trainers_palettes_emerald_tuber_f:: @ 8E4A5C8 + .incbin "graphics/trainers/palettes/emerald_tuber_f.gbapal.lz" + @ .incbin "baserom.gba", 0xE4A5C8, 0x0028 + + .align 2 +gFile_graphics_trainers_front_pics_emerald_tuber_m_front_pic:: @ 8E4A5F0 + .incbin "graphics/trainers/front_pics/emerald_tuber_m_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE4A5F0, 0x028C + + .align 2 +gFile_graphics_trainers_palettes_emerald_tuber_m:: @ 8E4A87C + .incbin "graphics/trainers/palettes/emerald_tuber_m.gbapal.lz" + @ .incbin "baserom.gba", 0xE4A87C, 0x0028 + + .align 2 +gFile_graphics_trainers_front_pics_emerald_cool_trainer_m_front_pic:: @ 8E4A8A4 + .incbin "graphics/trainers/front_pics/emerald_cool_trainer_m_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE4A8A4, 0x02E8 + + .align 2 +gFile_graphics_trainers_palettes_emerald_cool_trainer_m:: @ 8E4AB8C + .incbin "graphics/trainers/palettes/emerald_cool_trainer_m.gbapal.lz" + @ .incbin "baserom.gba", 0xE4AB8C, 0x0028 + + .align 2 +gFile_graphics_trainers_front_pics_emerald_cool_trainer_f_front_pic:: @ 8E4ABB4 + .incbin "graphics/trainers/front_pics/emerald_cool_trainer_f_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE4ABB4, 0x0314 + + .align 2 +gFile_graphics_trainers_palettes_emerald_cool_trainer_f:: @ 8E4AEC8 + .incbin "graphics/trainers/palettes/emerald_cool_trainer_f.gbapal.lz" + @ .incbin "baserom.gba", 0xE4AEC8, 0x0028 + + .align 2 +gFile_graphics_trainers_front_pics_hex_maniac_front_pic:: @ 8E4AEF0 + .incbin "graphics/trainers/front_pics/hex_maniac_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE4AEF0, 0x036C + + .align 2 +gFile_graphics_trainers_palettes_hex_maniac:: @ 8E4B25C + .incbin "graphics/trainers/palettes/hex_maniac.gbapal.lz" + @ .incbin "baserom.gba", 0xE4B25C, 0x0028 + + .align 2 +gFile_graphics_trainers_front_pics_emerald_lady_front_pic:: @ 8E4B284 + .incbin "graphics/trainers/front_pics/emerald_lady_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE4B284, 0x03B4 + + .align 2 +gFile_graphics_trainers_palettes_emerald_lady:: @ 8E4B638 + .incbin "graphics/trainers/palettes/emerald_lady.gbapal.lz" + @ .incbin "baserom.gba", 0xE4B638, 0x0028 + + .align 2 +gFile_graphics_trainers_front_pics_emerald_beauty_front_pic:: @ 8E4B660 + .incbin "graphics/trainers/front_pics/emerald_beauty_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE4B660, 0x02E8 + + .align 2 +gFile_graphics_trainers_palettes_emerald_beauty:: @ 8E4B948 + .incbin "graphics/trainers/palettes/emerald_beauty.gbapal.lz" + @ .incbin "baserom.gba", 0xE4B948, 0x0028 + + .align 2 +gFile_graphics_trainers_front_pics_rich_boy_front_pic:: @ 8E4B970 + .incbin "graphics/trainers/front_pics/rich_boy_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE4B970, 0x02B4 + + .align 2 +gFile_graphics_trainers_palettes_rich_boy:: @ 8E4BC24 + .incbin "graphics/trainers/palettes/rich_boy.gbapal.lz" + @ .incbin "baserom.gba", 0xE4BC24, 0x0028 + + .align 2 +gFile_graphics_trainers_front_pics_emerald_pokemaniac_front_pic:: @ 8E4BC4C + .incbin "graphics/trainers/front_pics/emerald_pokemaniac_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE4BC4C, 0x0370 + + .align 2 +gFile_graphics_trainers_palettes_emerald_pokemaniac:: @ 8E4BFBC + @ .incbin "graphics/trainers/palettes/emerald_pokemaniac.gbapal.lz" + .incbin "baserom.gba", 0xE4BFBC, 0x0028 + + .align 2 +gFile_graphics_trainers_front_pics_emerald_swimmer_m_front_pic:: @ 8E4BFE4 + .incbin "graphics/trainers/front_pics/emerald_swimmer_m_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE4BFE4, 0x02C0 + + .align 2 +gFile_graphics_trainers_palettes_emerald_swimmer_m:: @ 8E4C2A4 + .incbin "graphics/trainers/palettes/emerald_swimmer_m.gbapal.lz" + @ .incbin "baserom.gba", 0xE4C2A4, 0x0028 + + .align 2 +gFile_graphics_trainers_front_pics_emerald_black_belt_front_pic:: @ 8E4C2CC + .incbin "graphics/trainers/front_pics/emerald_black_belt_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE4C2CC, 0x0364 + + .align 2 +gFile_graphics_trainers_palettes_black_belt:: @ 8E4C630 + .incbin "graphics/trainers/palettes/black_belt.gbapal.lz" + @ .incbin "baserom.gba", 0xE4C630, 0x0028 + + .align 2 +gFile_graphics_trainers_front_pics_guitarist_front_pic:: @ 8E4C658 + .incbin "graphics/trainers/front_pics/guitarist_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE4C658, 0x0384 + + .align 2 +gFile_graphics_trainers_palettes_guitarist:: @ 8E4C9DC + .incbin "graphics/trainers/palettes/guitarist.gbapal.lz" + @ .incbin "baserom.gba", 0xE4C9DC, 0x0028 + + .align 2 +gFile_graphics_trainers_front_pics_kindler_front_pic:: @ 8E4CA04 + .incbin "graphics/trainers/front_pics/kindler_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE4CA04, 0x036C + + .align 2 +gFile_graphics_trainers_palettes_kindler:: @ 8E4CD70 + .incbin "graphics/trainers/palettes/kindler.gbapal.lz" + @ .incbin "baserom.gba", 0xE4CD70, 0x0028 + + .align 2 +gFile_graphics_trainers_front_pics_emerald_camper_front_pic:: @ 8E4CD98 + .incbin "graphics/trainers/front_pics/emerald_camper_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE4CD98, 0x02E8 + + .align 2 +gFile_graphics_trainers_palettes_emerald_camper:: @ 8E4D080 + .incbin "graphics/trainers/palettes/emerald_camper.gbapal.lz" + @ .incbin "baserom.gba", 0xE4D080, 0x0028 + + .align 2 +gFile_graphics_trainers_front_pics_bug_maniac_front_pic:: @ 8E4D0A8 + .incbin "graphics/trainers/front_pics/bug_maniac_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE4D0A8, 0x0450 + + .align 2 +gFile_graphics_trainers_palettes_bug_maniac:: @ 8E4D4F8 + .incbin "graphics/trainers/palettes/bug_maniac.gbapal.lz" + @ .incbin "baserom.gba", 0xE4D4F8, 0x0028 + + .align 2 +gFile_graphics_trainers_front_pics_emerald_psychic_m_front_pic:: @ 8E4D520 + .incbin "graphics/trainers/front_pics/emerald_psychic_m_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE4D520, 0x032C + + .align 2 +gFile_graphics_trainers_palettes_emerald_psychic_m:: @ 8E4D84C + .incbin "graphics/trainers/palettes/emerald_psychic_m.gbapal.lz" + @ .incbin "baserom.gba", 0xE4D84C, 0x0028 + + .align 2 +gFile_graphics_trainers_front_pics_emerald_psychic_f_front_pic:: @ 8E4D874 + .incbin "graphics/trainers/front_pics/emerald_psychic_f_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE4D874, 0x0328 + + .align 2 +gFile_graphics_trainers_palettes_emerald_psychic_f:: @ 8E4DB9C + .incbin "graphics/trainers/palettes/emerald_psychic_f.gbapal.lz" + @ .incbin "baserom.gba", 0xE4DB9C, 0x0028 + + .align 2 +gFile_graphics_trainers_front_pics_emerald_gentleman_front_pic:: @ 8E4DBC4 + .incbin "graphics/trainers/front_pics/emerald_gentleman_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE4DBC4, 0x0300 + + .align 2 +gFile_graphics_trainers_palettes_emerald_gentleman:: @ 8E4DEC4 + .incbin "graphics/trainers/palettes/emerald_gentleman.gbapal.lz" + @ .incbin "baserom.gba", 0xE4DEC4, 0x0028 + + .align 2 +gFile_graphics_trainers_front_pics_elite_four_sidney_front_pic:: @ 8E4DEEC + .incbin "graphics/trainers/front_pics/elite_four_sidney_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE4DEEC, 0x0334 + + .align 2 +gFile_graphics_trainers_palettes_elite_four_sidney:: @ 8E4E220 + .incbin "graphics/trainers/palettes/elite_four_sidney.gbapal.lz" + @ .incbin "baserom.gba", 0xE4E220, 0x0028 + + .align 2 +gFile_graphics_trainers_front_pics_elite_four_phoebe_front_pic:: @ 8E4E248 + .incbin "graphics/trainers/front_pics/elite_four_phoebe_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE4E248, 0x0300 + + .align 2 +gFile_graphics_trainers_palettes_elite_four_phoebe:: @ 8E4E548 + .incbin "graphics/trainers/palettes/elite_four_phoebe.gbapal.lz" + @ .incbin "baserom.gba", 0xE4E548, 0x0028 + + .align 2 +gFile_graphics_trainers_front_pics_leader_roxanne_front_pic:: @ 8E4E570 + .incbin "graphics/trainers/front_pics/leader_roxanne_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE4E570, 0x02EC + + .align 2 +gFile_graphics_trainers_palettes_leader_roxanne:: @ 8E4E85C + .incbin "graphics/trainers/palettes/leader_roxanne.gbapal.lz" + @ .incbin "baserom.gba", 0xE4E85C, 0x0028 + + .align 2 +gFile_graphics_trainers_front_pics_leader_brawly_front_pic:: @ 8E4E884 + .incbin "graphics/trainers/front_pics/leader_brawly_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE4E884, 0x0394 + + .align 2 +gFile_graphics_trainers_palettes_leader_brawly:: @ 8E4EC18 + .incbin "graphics/trainers/palettes/leader_brawly.gbapal.lz" + @ .incbin "baserom.gba", 0xE4EC18, 0x0028 + + .align 2 +gFile_graphics_trainers_front_pics_leader_tate_and_liza_front_pic:: @ 8E4EC40 + .incbin "graphics/trainers/front_pics/leader_tate_and_liza_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE4EC40, 0x0444 + + .align 2 +gFile_graphics_trainers_palettes_leader_tate_and_liza:: @ 8E4F084 + .incbin "graphics/trainers/palettes/leader_tate_and_liza.gbapal.lz" + @ .incbin "baserom.gba", 0xE4F084, 0x0028 + + .align 2 +gFile_graphics_trainers_front_pics_school_kid_m_front_pic:: @ 8E4F0AC + .incbin "graphics/trainers/front_pics/school_kid_m_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE4F0AC, 0x02C0 + + .align 2 +gFile_graphics_trainers_palettes_school_kid_m:: @ 8E4F36C + .incbin "graphics/trainers/palettes/school_kid_m.gbapal.lz" + @ .incbin "baserom.gba", 0xE4F36C, 0x0028 + + .align 2 +gFile_graphics_trainers_front_pics_school_kid_f_front_pic:: @ 8E4F394 + .incbin "graphics/trainers/front_pics/school_kid_f_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE4F394, 0x029C + + .align 2 +gFile_graphics_trainers_palettes_school_kid_f:: @ 8E4F630 + .incbin "graphics/trainers/palettes/school_kid_f.gbapal.lz" + @ .incbin "baserom.gba", 0xE4F630, 0x0028 + + .align 2 +gFile_graphics_trainers_front_pics_sr_and_jr_front_pic:: @ 8E4F658 + .incbin "graphics/trainers/front_pics/sr_and_jr_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE4F658, 0x0470 + + .align 2 +gFile_graphics_trainers_palettes_sr_and_jr:: @ 8E4FAC8 + .incbin "graphics/trainers/palettes/sr_and_jr.gbapal.lz" + @ .incbin "baserom.gba", 0xE4FAC8, 0x0028 + + .align 2 +gFile_graphics_trainers_front_pics_winstrate_m_front_pic:: @ 8E4FAF0 + .incbin "graphics/trainers/front_pics/winstrate_m_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE4FAF0, 0x03BC + + .align 2 +gFile_graphics_trainers_palettes_winstrate_m:: @ 8E4FEAC + .incbin "graphics/trainers/palettes/winstrate_m.gbapal.lz" + @ .incbin "baserom.gba", 0xE4FEAC, 0x0028 + + .align 2 +gFile_graphics_trainers_front_pics_winstrate_f_front_pic:: @ 8E4FED4 + .incbin "graphics/trainers/front_pics/winstrate_f_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE4FED4, 0x03CC + + .align 2 +gFile_graphics_trainers_palettes_winstrate_f:: @ 8E502A0 + .incbin "graphics/trainers/palettes/winstrate_f.gbapal.lz" + @ .incbin "baserom.gba", 0xE502A0, 0x0028 + + .align 2 +gFile_graphics_trainers_front_pics_expert_m_front_pic:: @ 8E502C8 + .incbin "graphics/trainers/front_pics/expert_m_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE502C8, 0x0340 + + .align 2 +gFile_graphics_trainers_palettes_expert_m:: @ 8E50608 + .incbin "graphics/trainers/palettes/expert_m.gbapal.lz" + @ .incbin "baserom.gba", 0xE50608, 0x0028 + + .align 2 +gFile_graphics_trainers_front_pics_expert_f_front_pic:: @ 8E50630 + .incbin "graphics/trainers/front_pics/expert_f_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE50630, 0x031C + + .align 2 +gFile_graphics_trainers_palettes_expert_f:: @ 8E5094C + .incbin "graphics/trainers/palettes/expert_f.gbapal.lz" + @ .incbin "baserom.gba", 0xE5094C, 0x0028 + + .align 2 +gFile_graphics_trainers_front_pics_emerald_youngster_front_pic:: @ 8E50974 + .incbin "graphics/trainers/front_pics/emerald_youngster_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE50974, 0x02A8 + + .align 2 +gFile_graphics_trainers_palettes_emerald_youngster:: @ 8E50C1C + .incbin "graphics/trainers/palettes/emerald_youngster.gbapal.lz" + @ .incbin "baserom.gba", 0xE50C1C, 0x0028 + + .align 2 +gFile_graphics_trainers_front_pics_steven_front_pic:: @ 8E50C44 + .incbin "graphics/trainers/front_pics/steven_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE50C44, 0x0338 + + .align 2 +gFile_graphics_trainers_palettes_steven:: @ 8E50F7C + .incbin "graphics/trainers/palettes/steven.gbapal.lz" + @ .incbin "baserom.gba", 0xE50F7C, 0x0028 + + .align 2 +gFile_graphics_trainers_front_pics_emerald_fisherman_front_pic:: @ 8E50FA4 + .incbin "graphics/trainers/front_pics/emerald_fisherman_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE50FA4, 0x03E4 + + .align 2 +gFile_graphics_trainers_palettes_emerald_fisherman:: @ 8E51388 + .incbin "graphics/trainers/palettes/emerald_fisherman.gbapal.lz" + @ .incbin "baserom.gba", 0xE51388, 0x0028 + + .align 2 +gFile_graphics_trainers_front_pics_cycling_triathlete_m_front_pic:: @ 8E513B0 + .incbin "graphics/trainers/front_pics/cycling_triathlete_m_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE513B0, 0x0410 + + .align 2 +gFile_graphics_trainers_palettes_cycling_triathlete_m:: @ 8E517C0 + .incbin "graphics/trainers/palettes/cycling_triathlete_m.gbapal.lz" + @ .incbin "baserom.gba", 0xE517C0, 0x0028 + + .align 2 +gFile_graphics_trainers_front_pics_cycling_triathlete_f_front_pic:: @ 8E517E8 + .incbin "graphics/trainers/front_pics/cycling_triathlete_f_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE517E8, 0x040C + + .align 2 +gFile_graphics_trainers_palettes_cycling_triathlete_f:: @ 8E51BF4 + .incbin "graphics/trainers/palettes/cycling_triathlete_f.gbapal.lz" + @ .incbin "baserom.gba", 0xE51BF4, 0x0028 + + .align 2 +gFile_graphics_trainers_front_pics_running_triathlete_m_front_pic:: @ 8E51C1C + .incbin "graphics/trainers/front_pics/running_triathlete_m_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE51C1C, 0x02B8 + + .align 2 +gFile_graphics_trainers_palettes_running_triathlete_m:: @ 8E51ED4 + .incbin "graphics/trainers/palettes/running_triathlete_m.gbapal.lz" + @ .incbin "baserom.gba", 0xE51ED4, 0x0028 + + .align 2 +gFile_graphics_trainers_front_pics_running_triathlete_f_front_pic:: @ 8E51EFC + .incbin "graphics/trainers/front_pics/running_triathlete_f_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE51EFC, 0x02A4 + + .align 2 +gFile_graphics_trainers_palettes_running_triathlete_f:: @ 8E521A0 + .incbin "graphics/trainers/palettes/running_triathlete_f.gbapal.lz" + @ .incbin "baserom.gba", 0xE521A0, 0x0028 + + .align 2 +gFile_graphics_trainers_front_pics_swimming_triathlete_m_front_pic:: @ 8E521C8 + .incbin "graphics/trainers/front_pics/swimming_triathlete_m_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE521C8, 0x032C + + .align 2 +gFile_graphics_trainers_palettes_swimming_triathlete_m:: @ 8E524F4 + .incbin "graphics/trainers/palettes/swimming_triathlete_m.gbapal.lz" + @ .incbin "baserom.gba", 0xE524F4, 0x0028 + + .align 2 +gFile_graphics_trainers_front_pics_swimming_triathlete_f_front_pic:: @ 8E5251C + .incbin "graphics/trainers/front_pics/swimming_triathlete_f_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE5251C, 0x02DC + + .align 2 +gFile_graphics_trainers_palettes_swimming_triathlete_f:: @ 8E527F8 + .incbin "graphics/trainers/palettes/swimming_triathlete_f.gbapal.lz" + @ .incbin "baserom.gba", 0xE527F8, 0x0028 + + .align 2 +gFile_graphics_trainers_front_pics_dragon_tamer_front_pic:: @ 8E52820 + .incbin "graphics/trainers/front_pics/dragon_tamer_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE52820, 0x0354 + + .align 2 +gFile_graphics_trainers_palettes_dragon_tamer:: @ 8E52B74 + .incbin "graphics/trainers/palettes/dragon_tamer.gbapal.lz" + @ .incbin "baserom.gba", 0xE52B74, 0x0028 + + .align 2 +gFile_graphics_trainers_front_pics_emerald_bird_keeper_front_pic:: @ 8E52B9C + .incbin "graphics/trainers/front_pics/emerald_bird_keeper_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE52B9C, 0x0338 + + .align 2 +gFile_graphics_trainers_palettes_emerald_bird_keeper:: @ 8E52ED4 + .incbin "graphics/trainers/palettes/emerald_bird_keeper.gbapal.lz" + @ .incbin "baserom.gba", 0xE52ED4, 0x0028 + + .align 2 +gFile_graphics_trainers_front_pics_ninja_boy_front_pic:: @ 8E52EFC + .incbin "graphics/trainers/front_pics/ninja_boy_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE52EFC, 0x02DC + + .align 2 +gFile_graphics_trainers_palettes_ninja_boy:: @ 8E531D8 + .incbin "graphics/trainers/palettes/ninja_boy.gbapal.lz" + @ .incbin "baserom.gba", 0xE531D8, 0x0028 + + .align 2 +gFile_graphics_trainers_front_pics_battle_girl_front_pic:: @ 8E53200 + .incbin "graphics/trainers/front_pics/battle_girl_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE53200, 0x0320 + + .align 2 +gFile_graphics_trainers_palettes_battle_girl:: @ 8E53520 + .incbin "graphics/trainers/palettes/battle_girl.gbapal.lz" + @ .incbin "baserom.gba", 0xE53520, 0x0028 + + .align 2 +gFile_graphics_trainers_front_pics_parasol_lady_front_pic:: @ 8E53548 + .incbin "graphics/trainers/front_pics/parasol_lady_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE53548, 0x0338 + + .align 2 +gFile_graphics_trainers_palettes_parasol_lady:: @ 8E53880 + .incbin "graphics/trainers/palettes/parasol_lady.gbapal.lz" + @ .incbin "baserom.gba", 0xE53880, 0x0028 + + .align 2 +gFile_graphics_trainers_front_pics_emerald_swimmer_f_front_pic:: @ 8E538A8 + .incbin "graphics/trainers/front_pics/emerald_swimmer_f_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE538A8, 0x02D0 + + .align 2 +gFile_graphics_trainers_palettes_emerald_swimmer_f:: @ 8E53B78 + .incbin "graphics/trainers/palettes/emerald_swimmer_f.gbapal.lz" + @ .incbin "baserom.gba", 0xE53B78, 0x0028 + + .align 2 +gFile_graphics_trainers_front_pics_emerald_picnicker_front_pic:: @ 8E53BA0 + .incbin "graphics/trainers/front_pics/emerald_picnicker_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE53BA0, 0x02E0 + + .align 2 +gFile_graphics_trainers_palettes_emerald_picnicker:: @ 8E53E80 + .incbin "graphics/trainers/palettes/emerald_picnicker.gbapal.lz" + @ .incbin "baserom.gba", 0xE53E80, 0x0028 + + .align 2 +gFile_graphics_trainers_front_pics_emerald_twins_front_pic:: @ 8E53EA8 + .incbin "graphics/trainers/front_pics/emerald_twins_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE53EA8, 0x03C4 + + .align 2 +gFile_graphics_trainers_palettes_emerald_twins:: @ 8E5426C + .incbin "graphics/trainers/palettes/emerald_twins.gbapal.lz" + @ .incbin "baserom.gba", 0xE5426C, 0x0028 + + .align 2 +gFile_graphics_trainers_front_pics_emerald_sailor_front_pic:: @ 8E54294 + .incbin "graphics/trainers/front_pics/emerald_sailor_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE54294, 0x03B0 + + .align 2 +gFile_graphics_trainers_palettes_emerald_sailor:: @ 8E54644 + .incbin "graphics/trainers/palettes/emerald_sailor.gbapal.lz" + @ .incbin "baserom.gba", 0xE54644, 0x0028 + + .align 2 +gFile_graphics_trainers_front_pics_collector_front_pic:: @ 8E5466C + .incbin "graphics/trainers/front_pics/collector_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE5466C, 0x0404 + + .align 2 +gFile_graphics_trainers_palettes_collector:: @ 8E54A70 + .incbin "graphics/trainers/palettes/collector.gbapal.lz" + @ .incbin "baserom.gba", 0xE54A70, 0x0028 + + .align 2 +gFile_graphics_trainers_front_pics_wally_front_pic:: @ 8E54A98 + .incbin "graphics/trainers/front_pics/wally_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE54A98, 0x02D0 + + .align 2 +gFile_graphics_trainers_palettes_wally:: @ 8E54D68 + .incbin "graphics/trainers/palettes/wally.gbapal.lz" + @ .incbin "baserom.gba", 0xE54D68, 0x0028 + + .align 2 +gFile_graphics_trainers_front_pics_ruby_sapphire_brendan_front_pic:: @ 8E54D90 + .incbin "graphics/trainers/front_pics/ruby_sapphire_brendan_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE54D90, 0x0314 + + .align 2 +gFile_graphics_trainers_palettes_ruby_sapphire_brendan:: @ 8E550A4 + .incbin "graphics/trainers/palettes/ruby_sapphire_brendan.gbapal.lz" + @ .incbin "baserom.gba", 0xE550A4, 0x0028 + + .align 2 +gFile_graphics_trainers_front_pics_ruby_sapphire_may_front_pic:: @ 8E550CC + .incbin "graphics/trainers/front_pics/ruby_sapphire_may_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE550CC, 0x0300 + + .align 2 +gFile_graphics_trainers_palettes_ruby_sapphire_may:: @ 8E553CC + .incbin "graphics/trainers/palettes/ruby_sapphire_may.gbapal.lz" + @ .incbin "baserom.gba", 0xE553CC, 0x0028 + + .align 2 +gFile_graphics_trainers_front_pics_emerald_pokemon_breeder_m_front_pic:: @ 8E553F4 + .incbin "graphics/trainers/front_pics/emerald_pokemon_breeder_m_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE553F4, 0x0330 + + .align 2 +gFile_graphics_trainers_palettes_emerald_pokemon_breeder_m:: @ 8E55724 + .incbin "graphics/trainers/palettes/emerald_pokemon_breeder_m.gbapal.lz" + @ .incbin "baserom.gba", 0xE55724, 0x0028 + + .align 2 +gFile_graphics_trainers_front_pics_emerald_pokemon_breeder_f_front_pic:: @ 8E5574C + .incbin "graphics/trainers/front_pics/emerald_pokemon_breeder_f_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE5574C, 0x0334 + + .align 2 +gFile_graphics_trainers_palettes_emerald_pokemon_breeder_f:: @ 8E55A80 + .incbin "graphics/trainers/palettes/emerald_pokemon_breeder_f.gbapal.lz" + @ .incbin "baserom.gba", 0xE55A80, 0x0028 + + .align 2 +gFile_graphics_trainers_front_pics_emerald_pokemon_ranger_m_front_pic:: @ 8E55AA8 + .incbin "graphics/trainers/front_pics/emerald_pokemon_ranger_m_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE55AA8, 0x0348 + + .align 2 +gFile_graphics_trainers_palettes_emerald_pokemon_ranger_m:: @ 8E55DF0 + .incbin "graphics/trainers/palettes/emerald_pokemon_ranger_m.gbapal.lz" + @ .incbin "baserom.gba", 0xE55DF0, 0x0028 + + .align 2 +gFile_graphics_trainers_front_pics_emerald_pokemon_ranger_f_front_pic:: @ 8E55E18 + .incbin "graphics/trainers/front_pics/emerald_pokemon_ranger_f_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE55E18, 0x0334 + + .align 2 +gFile_graphics_trainers_palettes_emerald_pokemon_ranger_f:: @ 8E5614C + .incbin "graphics/trainers/palettes/emerald_pokemon_ranger_f.gbapal.lz" + @ .incbin "baserom.gba", 0xE5614C, 0x0028 + + .align 2 +gFile_graphics_trainers_front_pics_magma_leader_maxie_front_pic:: @ 8E56174 + .incbin "graphics/trainers/front_pics/magma_leader_maxie_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE56174, 0x02F4 + + .align 2 +gFile_graphics_trainers_palettes_magma_leader_maxie:: @ 8E56468 + .incbin "graphics/trainers/palettes/magma_leader_maxie.gbapal.lz" + @ .incbin "baserom.gba", 0xE56468, 0x0028 + + .align 2 +gFile_graphics_trainers_front_pics_magma_grunt_m_front_pic:: @ 8E56490 + .incbin "graphics/trainers/front_pics/magma_grunt_m_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE56490, 0x0380 + + .align 2 +gFile_graphics_trainers_palettes_magma_grunt_m:: @ 8E56810 + .incbin "graphics/trainers/palettes/magma_grunt_m.gbapal.lz" + @ .incbin "baserom.gba", 0xE56810, 0x0028 + + .align 2 +gFile_graphics_trainers_front_pics_magma_grunt_f_front_pic:: @ 8E56838 + .incbin "graphics/trainers/front_pics/magma_grunt_f_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE56838, 0x038C + + .align 2 +gFile_graphics_trainers_palettes_magma_grunt_f:: @ 8E56BC4 + .incbin "graphics/trainers/palettes/magma_grunt_f.gbapal.lz" + @ .incbin "baserom.gba", 0xE56BC4, 0x0028 + + .align 2 +gFile_graphics_trainers_front_pics_emerald_lass_front_pic:: @ 8E56BEC + .incbin "graphics/trainers/front_pics/emerald_lass_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE56BEC, 0x02D8 + + .align 2 +gFile_graphics_trainers_palettes_emerald_lass:: @ 8E56EC4 + .incbin "graphics/trainers/palettes/emerald_lass.gbapal.lz" + @ .incbin "baserom.gba", 0xE56EC4, 0x0028 + + .align 2 +gFile_graphics_trainers_front_pics_emerald_bug_catcher_front_pic:: @ 8E56EEC + .incbin "graphics/trainers/front_pics/emerald_bug_catcher_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE56EEC, 0x032C + + .align 2 +gFile_graphics_trainers_palettes_emerald_bug_catcher:: @ 8E57218 + .incbin "graphics/trainers/palettes/emerald_bug_catcher.gbapal.lz" + @ .incbin "baserom.gba", 0xE57218, 0x0028 + + .align 2 +gFile_graphics_trainers_front_pics_emerald_hiker_front_pic:: @ 8E57240 + .incbin "graphics/trainers/front_pics/emerald_hiker_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE57240, 0x0480 + + .align 2 +gFile_graphics_trainers_palettes_emerald_hiker:: @ 8E576C0 + .incbin "graphics/trainers/palettes/emerald_hiker.gbapal.lz" + @ .incbin "baserom.gba", 0xE576C0, 0x0028 + + .align 2 +gFile_graphics_trainers_front_pics_emerald_young_couple_front_pic:: @ 8E576E8 + .incbin "graphics/trainers/front_pics/emerald_young_couple_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE576E8, 0x03C0 + + .align 2 +gFile_graphics_trainers_palettes_emerald_young_couple:: @ 8E57AA8 + .incbin "graphics/trainers/palettes/emerald_young_couple.gbapal.lz" + @ .incbin "baserom.gba", 0xE57AA8, 0x0028 + + .align 2 +gFile_graphics_trainers_front_pics_old_couple_front_pic:: @ 8E57AD0 + .incbin "graphics/trainers/front_pics/old_couple_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE57AD0, 0x0510 + + .align 2 +gFile_graphics_trainers_palettes_old_couple:: @ 8E57FE0 + .incbin "graphics/trainers/palettes/old_couple.gbapal.lz" + @ .incbin "baserom.gba", 0xE57FE0, 0x0028 + + .align 2 +gFile_graphics_trainers_front_pics_emerald_sis_and_bro_front_pic:: @ 8E58008 + .incbin "graphics/trainers/front_pics/emerald_sis_and_bro_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE58008, 0x044C + + .align 2 +gFile_graphics_trainers_palettes_emerald_sis_and_bro:: @ 8E58454 + .incbin "graphics/trainers/palettes/emerald_sis_and_bro.gbapal.lz" + @ .incbin "baserom.gba", 0xE58454, 0x0028 + + .align 2 +gFile_graphics_trainers_front_pics_aqua_admin_m_front_pic:: @ 8E5847C + .incbin "graphics/trainers/front_pics/aqua_admin_m_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE5847C, 0x03B4 + + .align 2 +gFile_graphics_trainers_palettes_aqua_admin_m:: @ 8E58830 + .incbin "graphics/trainers/palettes/aqua_admin_m.gbapal.lz" + @ .incbin "baserom.gba", 0xE58830, 0x0028 + + .align 2 +gFile_graphics_trainers_front_pics_aqua_admin_f_front_pic:: @ 8E58858 + .incbin "graphics/trainers/front_pics/aqua_admin_f_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE58858, 0x03C4 + + .align 2 +gFile_graphics_trainers_palettes_aqua_admin_f:: @ 8E58C1C + .incbin "graphics/trainers/palettes/aqua_admin_f.gbapal.lz" + @ .incbin "baserom.gba", 0xE58C1C, 0x0028 + + .align 2 +gFile_graphics_trainers_front_pics_magma_admin_front_pic:: @ 8E58C44 + .incbin "graphics/trainers/front_pics/magma_admin_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE58C44, 0x03D8 + + .align 2 +gFile_graphics_trainers_palettes_magma_admin:: @ 8E5901C + .incbin "graphics/trainers/palettes/magma_admin.gbapal.lz" + @ .incbin "baserom.gba", 0xE5901C, 0x0028 + + .align 2 +gFile_graphics_trainers_front_pics_ruby_magma_admin_f_front_pic:: @ 8E59044 + .incbin "graphics/trainers/front_pics/ruby_magma_admin_f_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE59044, 0x03B0 + + .align 2 +gFile_graphics_trainers_palettes_ruby_magma_admin_f:: @ 8E593F4 + .incbin "graphics/trainers/palettes/ruby_magma_admin_f.gbapal.lz" + @ .incbin "baserom.gba", 0xE593F4, 0x0028 + + .align 2 +gFile_graphics_trainers_front_pics_leader_wattson_front_pic:: @ 8E5941C + .incbin "graphics/trainers/front_pics/leader_wattson_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE5941C, 0x0348 + + .align 2 +gFile_graphics_trainers_palettes_leader_wattson:: @ 8E59764 + .incbin "graphics/trainers/palettes/leader_wattson.gbapal.lz" + @ .incbin "baserom.gba", 0xE59764, 0x0028 + + .align 2 +gFile_graphics_trainers_front_pics_leader_flannery_front_pic:: @ 8E5978C + .incbin "graphics/trainers/front_pics/leader_flannery_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE5978C, 0x0380 + + .align 2 +gFile_graphics_trainers_palettes_leader_flannery:: @ 8E59B0C + .incbin "graphics/trainers/palettes/leader_flannery.gbapal.lz" + @ .incbin "baserom.gba", 0xE59B0C, 0x0028 + + .align 2 +gFile_graphics_trainers_front_pics_leader_norman_front_pic:: @ 8E59B34 + .incbin "graphics/trainers/front_pics/leader_norman_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE59B34, 0x033C + + .align 2 +gFile_graphics_trainers_palettes_leader_norman:: @ 8E59E70 + .incbin "graphics/trainers/palettes/leader_norman.gbapal.lz" + @ .incbin "baserom.gba", 0xE59E70, 0x0028 + + .align 2 +gFile_graphics_trainers_front_pics_leader_winona_front_pic:: @ 8E59E98 + .incbin "graphics/trainers/front_pics/leader_winona_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE59E98, 0x0380 + + .align 2 +gFile_graphics_trainers_palettes_leader_winona:: @ 8E5A218 + .incbin "graphics/trainers/palettes/leader_winona.gbapal.lz" + @ .incbin "baserom.gba", 0xE5A218, 0x0028 + + .align 2 +gFile_graphics_trainers_front_pics_ruby_sapphire_champion_wallace_front_pic:: @ 8E5A240 + .incbin "graphics/trainers/front_pics/ruby_sapphire_champion_wallace_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE5A240, 0x0378 + + .align 2 +gFile_graphics_trainers_palettes_champion_wallace:: @ 8E5A5B8 + .incbin "graphics/trainers/palettes/champion_wallace.gbapal.lz" + @ .incbin "baserom.gba", 0xE5A5B8, 0x0028 + + .align 2 +gFile_graphics_trainers_front_pics_elite_four_glacia_front_pic:: @ 8E5A5E0 + .incbin "graphics/trainers/front_pics/elite_four_glacia_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE5A5E0, 0x0384 + + .align 2 +gFile_graphics_trainers_palettes_elite_four_glacia:: @ 8E5A964 + .incbin "graphics/trainers/palettes/elite_four_glacia.gbapal.lz" + @ .incbin "baserom.gba", 0xE5A964, 0x0028 + + .align 2 +gFile_graphics_trainers_front_pics_elite_four_drake_front_pic:: @ 8E5A98C + .incbin "graphics/trainers/front_pics/elite_four_drake_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE5A98C, 0x03A8 + + .align 2 +gFile_graphics_trainers_palettes_elite_four_drake:: @ 8E5AD34 + .incbin "graphics/trainers/palettes/elite_four_drake.gbapal.lz" + @ .incbin "baserom.gba", 0xE5AD34, 0x0028 + + + .align 2 +gFile_graphics_trainers_front_pics_youngster_front_pic:: @ 8E5AD5C + .incbin "graphics/trainers/front_pics/youngster_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE5AD5C, 0x02A0 + + .align 2 +gFile_graphics_trainers_palettes_youngster:: @ 8E5AFFC + .incbin "graphics/trainers/palettes/youngster.gbapal.lz" + @ .incbin "baserom.gba", 0xE5AFFC, 0x0028 + + .align 2 +gFile_graphics_trainers_front_pics_bug_catcher_front_pic:: @ 8E5B024 + .incbin "graphics/trainers/front_pics/bug_catcher_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE5B024, 0x0348 + + .align 2 +gFile_graphics_trainers_palettes_bug_catcher:: @ 8E5B36C + .incbin "graphics/trainers/palettes/bug_catcher.gbapal.lz" + @ .incbin "baserom.gba", 0xE5B36C, 0x0028 + + .align 2 +gFile_graphics_trainers_front_pics_lass_front_pic:: @ 8E5B394 + .incbin "graphics/trainers/front_pics/lass_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE5B394, 0x02EC + + .align 2 +gFile_graphics_trainers_palettes_lass:: @ 8E5B680 + .incbin "graphics/trainers/palettes/lass.gbapal.lz" + @ .incbin "baserom.gba", 0xE5B680, 0x0028 + + .align 2 +gFile_graphics_trainers_front_pics_sailor_front_pic:: @ 8E5B6A8 + .incbin "graphics/trainers/front_pics/sailor_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE5B6A8, 0x0320 + + .align 2 +gFile_graphics_trainers_palettes_sailor:: @ 8E5B9C8 + .incbin "graphics/trainers/palettes/sailor.gbapal.lz" + @ .incbin "baserom.gba", 0xE5B9C8, 0x0028 + + .align 2 +gFile_graphics_trainers_front_pics_camper_front_pic:: @ 8E5B9F0 + .incbin "graphics/trainers/front_pics/camper_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE5B9F0, 0x02E0 + + .align 2 +gFile_graphics_trainers_palettes_camper:: @ 8E5BCD0 + .incbin "graphics/trainers/palettes/camper.gbapal.lz" + @ .incbin "baserom.gba", 0xE5BCD0, 0x0028 + + .align 2 +gFile_graphics_trainers_front_pics_picnicker_front_pic:: @ 8E5BCF8 + .incbin "graphics/trainers/front_pics/picnicker_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE5BCF8, 0x02E8 + + .align 2 +gFile_graphics_trainers_palettes_picnicker:: @ 8E5BFE0 + .incbin "graphics/trainers/palettes/picnicker.gbapal.lz" + @ .incbin "baserom.gba", 0xE5BFE0, 0x0028 + + .align 2 +gFile_graphics_trainers_front_pics_pokemaniac_front_pic:: @ 8E5C008 + .incbin "graphics/trainers/front_pics/pokemaniac_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE5C008, 0x03BC + + .align 2 +gFile_graphics_trainers_palettes_pokemaniac:: @ 8E5C3C4 + @ .incbin "graphics/trainers/palettes/pokemaniac.gbapal.lz" + .incbin "baserom.gba", 0xE5C3C4, 0x0028 + + .align 2 +gFile_graphics_trainers_front_pics_super_nerd_front_pic:: @ 8E5C3EC + .incbin "graphics/trainers/front_pics/super_nerd_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE5C3EC, 0x0318 + + .align 2 +gFile_graphics_trainers_palettes_super_nerd:: @ 8E5C704 + .incbin "graphics/trainers/palettes/super_nerd.gbapal.lz" + @ .incbin "baserom.gba", 0xE5C704, 0x0028 + + .align 2 +gFile_graphics_trainers_front_pics_hiker_front_pic:: @ 8E5C72C + .incbin "graphics/trainers/front_pics/hiker_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE5C72C, 0x0470 + + .align 2 +gFile_graphics_trainers_palettes_hiker:: @ 8E5CB9C + .incbin "graphics/trainers/palettes/hiker.gbapal.lz" + @ .incbin "baserom.gba", 0xE5CB9C, 0x0028 + + .align 2 +gFile_graphics_trainers_front_pics_biker_front_pic:: @ 8E5CBC4 + .incbin "graphics/trainers/front_pics/biker_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE5CBC4, 0x0568 + + .align 2 +gFile_graphics_trainers_palettes_biker:: @ 8E5D12C + .incbin "graphics/trainers/palettes/biker.gbapal.lz" + @ .incbin "baserom.gba", 0xE5D12C, 0x0028 + + .align 2 +gFile_graphics_trainers_front_pics_burglar_front_pic:: @ 8E5D154 + .incbin "graphics/trainers/front_pics/burglar_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE5D154, 0x034C + + .align 2 +gFile_graphics_trainers_palettes_burglar:: @ 8E5D4A0 + .incbin "graphics/trainers/palettes/burglar.gbapal.lz" + @ .incbin "baserom.gba", 0xE5D4A0, 0x0028 + + .align 2 +gFile_graphics_trainers_front_pics_engineer_front_pic:: @ 8E5D4C8 + .incbin "graphics/trainers/front_pics/engineer_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE5D4C8, 0x040C + + .align 2 +gFile_graphics_trainers_palettes_engineer:: @ 8E5D8D4 + .incbin "graphics/trainers/palettes/engineer.gbapal.lz" + @ .incbin "baserom.gba", 0xE5D8D4, 0x0028 + + .align 2 +gFile_graphics_trainers_front_pics_fisherman_front_pic:: @ 8E5D8FC + .incbin "graphics/trainers/front_pics/fisherman_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE5D8FC, 0x03AC + + .align 2 +gFile_graphics_trainers_palettes_fisherman:: @ 8E5DCA8 + .incbin "graphics/trainers/palettes/fisherman.gbapal.lz" + @ .incbin "baserom.gba", 0xE5DCA8, 0x0028 + + .align 2 +gFile_graphics_trainers_front_pics_swimmer_m_front_pic:: @ 8E5DCD0 + .incbin "graphics/trainers/front_pics/swimmer_m_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE5DCD0, 0x02D8 + + .align 2 +gFile_graphics_trainers_palettes_swimmer_m:: @ 8E5DFA8 + .incbin "graphics/trainers/palettes/swimmer_m.gbapal.lz" + @ .incbin "baserom.gba", 0xE5DFA8, 0x0028 + + .align 2 +gFile_graphics_trainers_front_pics_roughneck_front_pic:: @ 8E5DFD0 + .incbin "graphics/trainers/front_pics/roughneck_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE5DFD0, 0x05C8 + + .align 2 +gFile_graphics_trainers_palettes_roughneck:: @ 8E5E598 + .incbin "graphics/trainers/palettes/roughneck.gbapal.lz" + @ .incbin "baserom.gba", 0xE5E598, 0x0028 + + .align 2 +gFile_graphics_trainers_front_pics_gamer_front_pic:: @ 8E5E5C0 + .incbin "graphics/trainers/front_pics/gamer_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE5E5C0, 0x0394 + + .align 2 +gFile_graphics_trainers_palettes_gamer:: @ 8E5E954 + .incbin "graphics/trainers/palettes/gamer.gbapal.lz" + @ .incbin "baserom.gba", 0xE5E954, 0x0028 + + .align 2 +gFile_graphics_trainers_front_pics_beauty_front_pic:: @ 8E5E97C + .incbin "graphics/trainers/front_pics/beauty_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE5E97C, 0x035C + + .align 2 +gFile_graphics_trainers_palettes_beauty:: @ 8E5ECD8 + .incbin "graphics/trainers/palettes/beauty.gbapal.lz" + @ .incbin "baserom.gba", 0xE5ECD8, 0x0028 + + .align 2 +gFile_graphics_trainers_front_pics_swimmer_f_front_pic:: @ 8E5ED00 + .incbin "graphics/trainers/front_pics/swimmer_f_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE5ED00, 0x02EC + + .align 2 +gFile_graphics_trainers_palettes_swimmer_f:: @ 8E5EFEC + .incbin "graphics/trainers/palettes/swimmer_f.gbapal.lz" + @ .incbin "baserom.gba", 0xE5EFEC, 0x0028 + + .align 2 +gFile_graphics_trainers_front_pics_psychic_m_front_pic:: @ 8E5F014 + .incbin "graphics/trainers/front_pics/psychic_m_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE5F014, 0x0360 + + .align 2 +gFile_graphics_trainers_palettes_psychic_m:: @ 8E5F374 + .incbin "graphics/trainers/palettes/psychic_m.gbapal.lz" + @ .incbin "baserom.gba", 0xE5F374, 0x0028 + + .align 2 +gFile_graphics_trainers_front_pics_rocker_front_pic:: @ 8E5F39C + .incbin "graphics/trainers/front_pics/rocker_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE5F39C, 0x045C + + .align 2 +gFile_graphics_trainers_palettes_rocker:: @ 8E5F7F8 + .incbin "graphics/trainers/palettes/rocker.gbapal.lz" + @ .incbin "baserom.gba", 0xE5F7F8, 0x0028 + + .align 2 +gFile_graphics_trainers_front_pics_juggler_front_pic:: @ 8E5F820 + .incbin "graphics/trainers/front_pics/juggler_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE5F820, 0x043C + + .align 2 +gFile_graphics_trainers_palettes_juggler:: @ 8E5FC5C + .incbin "graphics/trainers/palettes/juggler.gbapal.lz" + @ .incbin "baserom.gba", 0xE5FC5C, 0x0028 + + .align 2 +gFile_graphics_trainers_front_pics_tamer_front_pic:: @ 8E5FC84 + .incbin "graphics/trainers/front_pics/tamer_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE5FC84, 0x03B4 + + .align 2 +gFile_graphics_trainers_palettes_tamer:: @ 8E60038 + .incbin "graphics/trainers/palettes/tamer.gbapal.lz" + @ .incbin "baserom.gba", 0xE60038, 0x0028 + + .align 2 +gFile_graphics_trainers_front_pics_bird_keeper_front_pic:: @ 8E60060 + .incbin "graphics/trainers/front_pics/bird_keeper_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE60060, 0x03C4 + + .align 2 +gFile_graphics_trainers_palettes_bird_keeper:: @ 8E60424 + .incbin "graphics/trainers/palettes/bird_keeper.gbapal.lz" + @ .incbin "baserom.gba", 0xE60424, 0x0028 + + .align 2 +gFile_graphics_trainers_front_pics_black_belt_front_pic:: @ 8E6044C + .incbin "graphics/trainers/front_pics/black_belt_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE6044C, 0x0420 + + .align 2 +gFile_graphics_trainers_palettes_black_belt2:: @ 8E6086C + .incbin "graphics/trainers/palettes/black_belt.gbapal.lz" + @ .incbin "baserom.gba", 0xE6086C, 0x0028 + + .align 2 +gFile_graphics_trainers_front_pics_blue_1_front_pic:: @ 8E60894 + .incbin "graphics/trainers/front_pics/blue_1_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE60894, 0x02B8 + + .align 2 +gFile_graphics_trainers_palettes_blue_1:: @ 8E60B4C + .incbin "graphics/trainers/palettes/blue_1.gbapal.lz" + @ .incbin "baserom.gba", 0xE60B4C, 0x0028 + + .align 2 +gFile_graphics_trainers_front_pics_scientist_front_pic:: @ 8E60B74 + .incbin "graphics/trainers/front_pics/scientist_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE60B74, 0x03DC + + .align 2 +gFile_graphics_trainers_palettes_scientist:: @ 8E60F50 + .incbin "graphics/trainers/palettes/scientist.gbapal.lz" + @ .incbin "baserom.gba", 0xE60F50, 0x0028 + + .align 2 +gFile_graphics_trainers_front_pics_giovanni_front_pic:: @ 8E60F78 + .incbin "graphics/trainers/front_pics/giovanni_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE60F78, 0x0310 + + .align 2 +gFile_graphics_trainers_palettes_giovanni:: @ 8E61288 + .incbin "graphics/trainers/palettes/giovanni.gbapal.lz" + @ .incbin "baserom.gba", 0xE61288, 0x0028 + + .align 2 +gFile_graphics_trainers_front_pics_rocket_grunt_m_front_pic:: @ 8E612B0 + .incbin "graphics/trainers/front_pics/rocket_grunt_m_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE612B0, 0x0334 + + .align 2 +gFile_graphics_trainers_palettes_rocket_grunt_m:: @ 8E615E4 + .incbin "graphics/trainers/palettes/rocket_grunt_m.gbapal.lz" + @ .incbin "baserom.gba", 0xE615E4, 0x0028 + + .align 2 +gFile_graphics_trainers_front_pics_cool_trainer_m_front_pic:: @ 8E6160C + .incbin "graphics/trainers/front_pics/cool_trainer_m_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE6160C, 0x02D0 + + .align 2 +gFile_graphics_trainers_palettes_cool_trainer_m:: @ 8E618DC + .incbin "graphics/trainers/palettes/cool_trainer_m.gbapal.lz" + @ .incbin "baserom.gba", 0xE618DC, 0x0028 + + .align 2 +gFile_graphics_trainers_front_pics_cool_trainer_f_front_pic:: @ 8E61904 + .incbin "graphics/trainers/front_pics/cool_trainer_f_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE61904, 0x0318 + + .align 2 +gFile_graphics_trainers_palettes_cool_trainer_f:: @ 8E61C1C + .incbin "graphics/trainers/palettes/cool_trainer_f.gbapal.lz" + @ .incbin "baserom.gba", 0xE61C1C, 0x0028 + + .align 2 +gFile_graphics_trainers_front_pics_elite_four_lorelei_front_pic:: @ 8E61C44 + .incbin "graphics/trainers/front_pics/elite_four_lorelei_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE61C44, 0x032C + + .align 2 +gFile_graphics_trainers_palettes_elite_four_lorelei:: @ 8E61F70 + .incbin "graphics/trainers/palettes/elite_four_lorelei.gbapal.lz" + @ .incbin "baserom.gba", 0xE61F70, 0x0028 + + .align 2 +gFile_graphics_trainers_front_pics_elite_four_bruno_front_pic:: @ 8E61F98 + .incbin "graphics/trainers/front_pics/elite_four_bruno_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE61F98, 0x044C + + .align 2 +gFile_graphics_trainers_palettes_elite_four_bruno:: @ 8E623E4 + .incbin "graphics/trainers/palettes/elite_four_bruno.gbapal.lz" + @ .incbin "baserom.gba", 0xE623E4, 0x0028 + + .align 2 +gFile_graphics_trainers_front_pics_elite_four_agatha_front_pic:: @ 8E6240C + .incbin "graphics/trainers/front_pics/elite_four_agatha_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE6240C, 0x031C + + .align 2 +gFile_graphics_trainers_palettes_elite_four_agatha:: @ 8E62728 + .incbin "graphics/trainers/palettes/elite_four_agatha.gbapal.lz" + @ .incbin "baserom.gba", 0xE62728, 0x0028 + + .align 2 +gFile_graphics_trainers_front_pics_elite_four_lance_front_pic:: @ 8E62750 + .incbin "graphics/trainers/front_pics/elite_four_lance_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE62750, 0x03C8 + + .align 2 +gFile_graphics_trainers_palettes_elite_four_lance:: @ 8E62B18 + .incbin "graphics/trainers/palettes/elite_four_lance.gbapal.lz" + @ .incbin "baserom.gba", 0xE62B18, 0x0028 + + .align 2 +gFile_graphics_trainers_front_pics_leader_brock_front_pic:: @ 8E62B40 + .incbin "graphics/trainers/front_pics/leader_brock_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE62B40, 0x034C + + .align 2 +gFile_graphics_trainers_palettes_leader_brock:: @ 8E62E8C + .incbin "graphics/trainers/palettes/leader_brock.gbapal.lz" + @ .incbin "baserom.gba", 0xE62E8C, 0x0028 + + .align 2 +gFile_graphics_trainers_front_pics_leader_misty_front_pic:: @ 8E62EB4 + .incbin "graphics/trainers/front_pics/leader_misty_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE62EB4, 0x0300 + + .align 2 +gFile_graphics_trainers_palettes_leader_misty:: @ 8E631B4 + .incbin "graphics/trainers/palettes/leader_misty.gbapal.lz" + @ .incbin "baserom.gba", 0xE631B4, 0x0028 + + .align 2 +gFile_graphics_trainers_front_pics_leader_lt_surge_front_pic:: @ 8E631DC + .incbin "graphics/trainers/front_pics/leader_lt_surge_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE631DC, 0x0390 + + .align 2 +gFile_graphics_trainers_palettes_leader_lt_surge:: @ 8E6356C + .incbin "graphics/trainers/palettes/leader_lt_surge.gbapal.lz" + @ .incbin "baserom.gba", 0xE6356C, 0x0028 + + .align 2 +gFile_graphics_trainers_front_pics_leader_erika_front_pic:: @ 8E63594 + .incbin "graphics/trainers/front_pics/leader_erika_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE63594, 0x02F4 + + .align 2 +gFile_graphics_trainers_palettes_leader_erika:: @ 8E63888 + .incbin "graphics/trainers/palettes/leader_erika.gbapal.lz" + @ .incbin "baserom.gba", 0xE63888, 0x0028 + + .align 2 +gFile_graphics_trainers_front_pics_leader_koga_front_pic:: @ 8E638B0 + .incbin "graphics/trainers/front_pics/leader_koga_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE638B0, 0x0368 + + .align 2 +gFile_graphics_trainers_palettes_leader_koga:: @ 8E63C18 + .incbin "graphics/trainers/palettes/leader_koga.gbapal.lz" + @ .incbin "baserom.gba", 0xE63C18, 0x0028 + + .align 2 +gFile_graphics_trainers_front_pics_leader_blaine_front_pic:: @ 8E63C40 + .incbin "graphics/trainers/front_pics/leader_blaine_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE63C40, 0x040C + + .align 2 +gFile_graphics_trainers_palettes_leader_blaine:: @ 8E6404C + .incbin "graphics/trainers/palettes/leader_blaine.gbapal.lz" + @ .incbin "baserom.gba", 0xE6404C, 0x0028 + + .align 2 +gFile_graphics_trainers_front_pics_leader_sabrina_front_pic:: @ 8E64074 + .incbin "graphics/trainers/front_pics/leader_sabrina_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE64074, 0x0308 + + .align 2 +gFile_graphics_trainers_palettes_leader_sabrina:: @ 8E6437C + .incbin "graphics/trainers/palettes/leader_sabrina.gbapal.lz" + @ .incbin "baserom.gba", 0xE6437C, 0x0028 + + .align 2 +gFile_graphics_trainers_front_pics_gentleman_front_pic:: @ 8E643A4 + .incbin "graphics/trainers/front_pics/gentleman_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE643A4, 0x0338 + + .align 2 +gFile_graphics_trainers_palettes_gentleman:: @ 8E646DC + .incbin "graphics/trainers/palettes/gentleman.gbapal.lz" + @ .incbin "baserom.gba", 0xE646DC, 0x0028 + + .align 2 +gFile_graphics_trainers_front_pics_blue_2_front_pic:: @ 8E64704 + .incbin "graphics/trainers/front_pics/blue_2_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE64704, 0x02F4 + + .align 2 +gFile_graphics_trainers_palettes_blue_2:: @ 8E649F8 + .incbin "graphics/trainers/palettes/blue_2.gbapal.lz" + @ .incbin "baserom.gba", 0xE649F8, 0x0028 + + .align 2 +gFile_graphics_trainers_front_pics_champion_blue_front_pic:: @ 8E64A20 + .incbin "graphics/trainers/front_pics/champion_blue_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE64A20, 0x02FC + + .align 2 +gFile_graphics_trainers_palettes_champion_blue:: @ 8E64D1C + .incbin "graphics/trainers/palettes/champion_blue.gbapal.lz" + @ .incbin "baserom.gba", 0xE64D1C, 0x0028 + + .align 2 +gFile_graphics_trainers_front_pics_channeler_front_pic:: @ 8E64D44 + .incbin "graphics/trainers/front_pics/channeler_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE64D44, 0x03D8 + + .align 2 +gFile_graphics_trainers_palettes_channeler:: @ 8E6511C + .incbin "graphics/trainers/palettes/channeler.gbapal.lz" + @ .incbin "baserom.gba", 0xE6511C, 0x0028 + + .align 2 +gFile_graphics_trainers_front_pics_twins_front_pic:: @ 8E65144 + .incbin "graphics/trainers/front_pics/twins_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE65144, 0x0350 + + .align 2 +gFile_graphics_trainers_palettes_twins:: @ 8E65494 + .incbin "graphics/trainers/palettes/twins.gbapal.lz" + @ .incbin "baserom.gba", 0xE65494, 0x0028 + + .align 2 +gFile_graphics_trainers_front_pics_cool_couple_front_pic:: @ 8E654BC + .incbin "graphics/trainers/front_pics/cool_couple_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE654BC, 0x04E0 + + .align 2 +gFile_graphics_trainers_palettes_cool_couple:: @ 8E6599C + .incbin "graphics/trainers/palettes/cool_couple.gbapal.lz" + @ .incbin "baserom.gba", 0xE6599C, 0x0028 + + .align 2 +gFile_graphics_trainers_front_pics_young_couple_front_pic:: @ 8E659C4 + .incbin "graphics/trainers/front_pics/young_couple_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE659C4, 0x044C + + .align 2 +gFile_graphics_trainers_palettes_young_couple:: @ 8E65E10 + .incbin "graphics/trainers/palettes/young_couple.gbapal.lz" + @ .incbin "baserom.gba", 0xE65E10, 0x0028 + + .align 2 +gFile_graphics_trainers_front_pics_crush_kin_front_pic:: @ 8E65E38 + .incbin "graphics/trainers/front_pics/crush_kin_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE65E38, 0x05A0 + + .align 2 +gFile_graphics_trainers_palettes_crush_kin:: @ 8E663D8 + .incbin "graphics/trainers/palettes/crush_kin.gbapal.lz" + @ .incbin "baserom.gba", 0xE663D8, 0x0028 + + .align 2 +gFile_graphics_trainers_front_pics_sis_and_bro_front_pic:: @ 8E66400 + .incbin "graphics/trainers/front_pics/sis_and_bro_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE66400, 0x0460 + + .align 2 +gFile_graphics_trainers_palettes_sis_and_bro:: @ 8E66860 + .incbin "graphics/trainers/palettes/sis_and_bro.gbapal.lz" + @ .incbin "baserom.gba", 0xE66860, 0x0028 + + .align 2 +gFile_graphics_trainers_front_pics_oak_front_pic:: @ 8E66888 + .incbin "graphics/trainers/front_pics/oak_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE66888, 0x036C + + .align 2 +gFile_graphics_trainers_palettes_oak:: @ 8E66BF4 + .incbin "graphics/trainers/palettes/oak.gbapal.lz" + @ .incbin "baserom.gba", 0xE66BF4, 0x0028 + + + .align 2 +gFile_graphics_trainers_front_pics_ruby_sapphire_brendan_front_pic2:: @ 8E66C1C + .incbin "graphics/trainers/front_pics/ruby_sapphire_brendan_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE66C1C, 0x0314 + + .align 2 +gFile_graphics_trainers_palettes_ruby_sapphire_brendan2:: @ 8E66F30 + .incbin "graphics/trainers/palettes/ruby_sapphire_brendan.gbapal.lz" + @ .incbin "baserom.gba", 0xE66F30, 0x0028 + + .align 2 +gFile_graphics_trainers_front_pics_ruby_sapphire_may_front_pic2:: @ 8E66F58 + .incbin "graphics/trainers/front_pics/ruby_sapphire_may_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE66F58, 0x0300 + + .align 2 +gFile_graphics_trainers_palettes_ruby_sapphire_may2:: @ 8E67258 + .incbin "graphics/trainers/palettes/ruby_sapphire_may.gbapal.lz" + @ .incbin "baserom.gba", 0xE67258, 0x0028 + + .align 2 +gFile_graphics_trainers_front_pics_red_front_pic:: @ 8E67280 + .incbin "graphics/trainers/front_pics/red_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE67280, 0x030C + + .align 2 +gFile_graphics_trainers_palettes_red:: @ 8E6758C + .incbin "graphics/trainers/palettes/red.gbapal.lz" + @ .incbin "baserom.gba", 0xE6758C, 0x0028 + + .align 2 +gFile_graphics_trainers_front_pics_leaf_front_pic:: @ 8E675B4 + .incbin "graphics/trainers/front_pics/leaf_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE675B4, 0x033C + + .align 2 +gFile_graphics_trainers_palettes_leaf:: @ 8E678F0 + .incbin "graphics/trainers/palettes/leaf.gbapal.lz" + @ .incbin "baserom.gba", 0xE678F0, 0x0028 + + + .align 2 +gFile_graphics_trainers_front_pics_rocket_grunt_f_front_pic:: @ 8E67918 + .incbin "graphics/trainers/front_pics/rocket_grunt_f_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE67918, 0x0318 + + .align 2 +gFile_graphics_trainers_palettes_rocket_grunt_f:: @ 8E67C30 + .incbin "graphics/trainers/palettes/rocket_grunt_f.gbapal.lz" + @ .incbin "baserom.gba", 0xE67C30, 0x0028 + + .align 2 +gFile_graphics_trainers_front_pics_psychic_f_front_pic:: @ 8E67C58 + .incbin "graphics/trainers/front_pics/psychic_f_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE67C58, 0x03A0 + + .align 2 +gFile_graphics_trainers_palettes_psychic_f:: @ 8E67FF8 + .incbin "graphics/trainers/palettes/psychic_f.gbapal.lz" + @ .incbin "baserom.gba", 0xE67FF8, 0x0028 + + .align 2 +gFile_graphics_trainers_front_pics_crush_girl_front_pic:: @ 8E68020 + .incbin "graphics/trainers/front_pics/crush_girl_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE68020, 0x030C + + .align 2 +gFile_graphics_trainers_palettes_crush_girl:: @ 8E6832C + .incbin "graphics/trainers/palettes/crush_girl.gbapal.lz" + @ .incbin "baserom.gba", 0xE6832C, 0x0028 + + .align 2 +gFile_graphics_trainers_front_pics_tuber_front_pic:: @ 8E68354 + .incbin "graphics/trainers/front_pics/tuber_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE68354, 0x0304 + + .align 2 +gFile_graphics_trainers_palettes_tuber:: @ 8E68658 + .incbin "graphics/trainers/palettes/tuber.gbapal.lz" + @ .incbin "baserom.gba", 0xE68658, 0x0028 + + .align 2 +gFile_graphics_trainers_front_pics_pokemon_breeder_front_pic:: @ 8E68680 + .incbin "graphics/trainers/front_pics/pokemon_breeder_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE68680, 0x0340 + + .align 2 +gFile_graphics_trainers_palettes_pokemon_breeder:: @ 8E689C0 + .incbin "graphics/trainers/palettes/pokemon_breeder.gbapal.lz" + @ .incbin "baserom.gba", 0xE689C0, 0x0028 + + .align 2 +gFile_graphics_trainers_front_pics_pokemon_ranger_m_front_pic:: @ 8E689E8 + .incbin "graphics/trainers/front_pics/pokemon_ranger_m_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE689E8, 0x0360 + + .align 2 +gFile_graphics_trainers_palettes_pokemon_ranger_m:: @ 8E68D48 + .incbin "graphics/trainers/palettes/pokemon_ranger_m.gbapal.lz" + @ .incbin "baserom.gba", 0xE68D48, 0x0028 + + .align 2 +gFile_graphics_trainers_front_pics_pokemon_ranger_f_front_pic:: @ 8E68D70 + .incbin "graphics/trainers/front_pics/pokemon_ranger_f_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE68D70, 0x0334 + + .align 2 +gFile_graphics_trainers_palettes_pokemon_ranger_f:: @ 8E690A4 + .incbin "graphics/trainers/palettes/pokemon_ranger_f.gbapal.lz" + @ .incbin "baserom.gba", 0xE690A4, 0x0028 + + .align 2 +gFile_graphics_trainers_front_pics_aroma_lady_front_pic:: @ 8E690CC + .incbin "graphics/trainers/front_pics/aroma_lady_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE690CC, 0x0350 + + .align 2 +gFile_graphics_trainers_palettes_aroma_lady:: @ 8E6941C + .incbin "graphics/trainers/palettes/aroma_lady.gbapal.lz" + @ .incbin "baserom.gba", 0xE6941C, 0x0028 + + .align 2 +gFile_graphics_trainers_front_pics_ruin_maniac_front_pic:: @ 8E69444 + .incbin "graphics/trainers/front_pics/ruin_maniac_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE69444, 0x040C + + .align 2 +gFile_graphics_trainers_palettes_ruin_maniac:: @ 8E69850 + .incbin "graphics/trainers/palettes/ruin_maniac.gbapal.lz" + @ .incbin "baserom.gba", 0xE69850, 0x0028 + + .align 2 +gFile_graphics_trainers_front_pics_lady_front_pic:: @ 8E69878 + .incbin "graphics/trainers/front_pics/lady_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE69878, 0x0328 + + .align 2 +gFile_graphics_trainers_palettes_lady:: @ 8E69BA0 + .incbin "graphics/trainers/palettes/lady.gbapal.lz" + @ .incbin "baserom.gba", 0xE69BA0, 0x0028 + + .align 2 +gFile_graphics_trainers_front_pics_painter_front_pic:: @ 8E69BC8 + .incbin "graphics/trainers/front_pics/painter_front_pic.4bpp.lz" + @ .incbin "baserom.gba", 0xE69BC8, 0x02CC + + .align 2 +gFile_graphics_trainers_palettes_painter:: @ 8E69E94 + .incbin "graphics/trainers/palettes/painter.gbapal.lz" + @ .incbin "baserom.gba", 0xE69E94, 0x0028 + + .align 2 +gFile_graphics_trainers_back_pics_red_back_pic:: @ 8E69EBC + .incbin "graphics/trainers/back_pics/red_back_pic.4bpp" + @ .incbin "baserom.gba", 0xE69EBC, 0x2800 + + .align 2 +gFile_graphics_trainers_back_pics_leaf_back_pic:: @ 8E6C6BC + .incbin "graphics/trainers/back_pics/leaf_back_pic.4bpp" + @ .incbin "baserom.gba", 0xE6C6BC, 0x2800 + + .align 2 +gFile_graphics_trainers_back_pics_pokedude_back_pic:: @ 8E6EEBC + .incbin "graphics/trainers/back_pics/pokedude_back_pic.4bpp" + @ .incbin "baserom.gba", 0xE6EEBC, 0x2000 + + .align 2 +gFile_graphics_trainers_back_pics_old_man_back_pic:: @ 8E70EBC + .incbin "graphics/trainers/back_pics/old_man_back_pic.4bpp" + @ .incbin "baserom.gba", 0xE70EBC, 0x2000 + + .align 2 +gFile_graphics_trainers_back_pics_ruby_sapphire_brendan_back_pic:: @ 8E72EBC + .incbin "graphics/trainers/back_pics/ruby_sapphire_brendan_back_pic.4bpp" + @ .incbin "baserom.gba", 0xE72EBC, 0x2000 + + .align 2 +gFile_graphics_trainers_back_pics_ruby_sapphire_may_back_pic:: @ 8E74EBC + .incbin "graphics/trainers/back_pics/ruby_sapphire_may_back_pic.4bpp" + @ .incbin "baserom.gba", 0xE74EBC, 0x2000 + + + .align 2 +gFile_graphics_trainers_palettes_leaf_back_pic:: @ 8E76EBC + .incbin "graphics/trainers/palettes/leaf_back_pic.gbapal.lz" + @ .incbin "baserom.gba", 0xE76EBC, 0x0028 + + .align 2 +gFile_graphics_trainers_palettes_red_back_pic:: @ 8E76EE4 + .incbin "graphics/trainers/palettes/red_back_pic.gbapal.lz" + @ .incbin "baserom.gba", 0xE76EE4, 0x0028 + + .align 2 +gFile_graphics_trainers_palettes_pokedude_back_pic:: @ 8E76F0C + .incbin "graphics/trainers/palettes/pokedude_back_pic.gbapal.lz" + @ .incbin "baserom.gba", 0xE76F0C, 0x0028 + + .align 2 +gFile_graphics_trainers_palettes_old_man_back_pic:: @ 8E76F34 + .incbin "graphics/trainers/palettes/old_man_back_pic.gbapal.lz" + @ .incbin "baserom.gba", 0xE76F34, 0x0028 + + .align 2 +gFile_graphics_pokemon_icons_question_mark_icon:: @ 8E76F5C + .incbin "graphics/pokemon/icons/question_mark_icon.4bpp" + @ .incbin "baserom.gba", 0xE76F5C, 0x0400 + + .align 2 +gFile_graphics_pokemon_footprints_question_mark_footprint:: @ 8E7735C + .incbin "graphics/pokemon/footprints/question_mark_footprint.1bpp" + @ .incbin "baserom.gba", 0xE7735C, 0x0020 + + + .align 2 @ THIS IS ./graphics/battle_transitions/vs_frame.4bpp.lz gUnknown_8E7737C:: @ 8E7737C .incbin "baserom.gba", 0xE7737C, 0xE8 diff --git a/graphics/pokemon/back_pics/abra_back_pic.png b/graphics/pokemon/back_pics/abra_back_pic.png new file mode 100644 index 000000000..fd53dd1f6 Binary files /dev/null and b/graphics/pokemon/back_pics/abra_back_pic.png differ diff --git a/graphics/pokemon/back_pics/absol_back_pic.png b/graphics/pokemon/back_pics/absol_back_pic.png new file mode 100644 index 000000000..876ba48aa Binary files /dev/null and b/graphics/pokemon/back_pics/absol_back_pic.png differ diff --git a/graphics/pokemon/back_pics/aerodactyl_back_pic.png b/graphics/pokemon/back_pics/aerodactyl_back_pic.png new file mode 100644 index 000000000..8dfa76f57 Binary files /dev/null and b/graphics/pokemon/back_pics/aerodactyl_back_pic.png differ diff --git a/graphics/pokemon/back_pics/aggron_back_pic.png b/graphics/pokemon/back_pics/aggron_back_pic.png new file mode 100644 index 000000000..24ade1ff4 Binary files /dev/null and b/graphics/pokemon/back_pics/aggron_back_pic.png differ diff --git a/graphics/pokemon/back_pics/aipom_back_pic.png b/graphics/pokemon/back_pics/aipom_back_pic.png new file mode 100644 index 000000000..7e9594b6f Binary files /dev/null and b/graphics/pokemon/back_pics/aipom_back_pic.png differ diff --git a/graphics/pokemon/back_pics/alakazam_back_pic.png b/graphics/pokemon/back_pics/alakazam_back_pic.png new file mode 100644 index 000000000..fd4f4ab42 Binary files /dev/null and b/graphics/pokemon/back_pics/alakazam_back_pic.png differ diff --git a/graphics/pokemon/back_pics/altaria_back_pic.png b/graphics/pokemon/back_pics/altaria_back_pic.png new file mode 100644 index 000000000..b224676be Binary files /dev/null and b/graphics/pokemon/back_pics/altaria_back_pic.png differ diff --git a/graphics/pokemon/back_pics/ampharos_back_pic.png b/graphics/pokemon/back_pics/ampharos_back_pic.png new file mode 100644 index 000000000..2e7c2399e Binary files /dev/null and b/graphics/pokemon/back_pics/ampharos_back_pic.png differ diff --git a/graphics/pokemon/back_pics/anorith_back_pic.png b/graphics/pokemon/back_pics/anorith_back_pic.png new file mode 100644 index 000000000..0f9c0efc0 Binary files /dev/null and b/graphics/pokemon/back_pics/anorith_back_pic.png differ diff --git a/graphics/pokemon/back_pics/arbok_back_pic.png b/graphics/pokemon/back_pics/arbok_back_pic.png new file mode 100644 index 000000000..63004593c Binary files /dev/null and b/graphics/pokemon/back_pics/arbok_back_pic.png differ diff --git a/graphics/pokemon/back_pics/arcanine_back_pic.png b/graphics/pokemon/back_pics/arcanine_back_pic.png new file mode 100644 index 000000000..1b0840c8a Binary files /dev/null and b/graphics/pokemon/back_pics/arcanine_back_pic.png differ diff --git a/graphics/pokemon/back_pics/ariados_back_pic.png b/graphics/pokemon/back_pics/ariados_back_pic.png new file mode 100644 index 000000000..b677b7222 Binary files /dev/null and b/graphics/pokemon/back_pics/ariados_back_pic.png differ diff --git a/graphics/pokemon/back_pics/armaldo_back_pic.png b/graphics/pokemon/back_pics/armaldo_back_pic.png new file mode 100644 index 000000000..23c8c7113 Binary files /dev/null and b/graphics/pokemon/back_pics/armaldo_back_pic.png differ diff --git a/graphics/pokemon/back_pics/aron_back_pic.png b/graphics/pokemon/back_pics/aron_back_pic.png new file mode 100644 index 000000000..330d46c42 Binary files /dev/null and b/graphics/pokemon/back_pics/aron_back_pic.png differ diff --git a/graphics/pokemon/back_pics/articuno_back_pic.png b/graphics/pokemon/back_pics/articuno_back_pic.png new file mode 100644 index 000000000..7e06ba84e Binary files /dev/null and b/graphics/pokemon/back_pics/articuno_back_pic.png differ diff --git a/graphics/pokemon/back_pics/azumarill_back_pic.png b/graphics/pokemon/back_pics/azumarill_back_pic.png new file mode 100644 index 000000000..ca59011c6 Binary files /dev/null and b/graphics/pokemon/back_pics/azumarill_back_pic.png differ diff --git a/graphics/pokemon/back_pics/azurill_back_pic.png b/graphics/pokemon/back_pics/azurill_back_pic.png new file mode 100644 index 000000000..cf10bded4 Binary files /dev/null and b/graphics/pokemon/back_pics/azurill_back_pic.png differ diff --git a/graphics/pokemon/back_pics/bagon_back_pic.png b/graphics/pokemon/back_pics/bagon_back_pic.png new file mode 100644 index 000000000..0a058d768 Binary files /dev/null and b/graphics/pokemon/back_pics/bagon_back_pic.png differ diff --git a/graphics/pokemon/back_pics/baltoy_back_pic.png b/graphics/pokemon/back_pics/baltoy_back_pic.png new file mode 100644 index 000000000..a8d124481 Binary files /dev/null and b/graphics/pokemon/back_pics/baltoy_back_pic.png differ diff --git a/graphics/pokemon/back_pics/banette_back_pic.png b/graphics/pokemon/back_pics/banette_back_pic.png new file mode 100644 index 000000000..3ea5f30af Binary files /dev/null and b/graphics/pokemon/back_pics/banette_back_pic.png differ diff --git a/graphics/pokemon/back_pics/barboach_back_pic.png b/graphics/pokemon/back_pics/barboach_back_pic.png new file mode 100644 index 000000000..4fa892c53 Binary files /dev/null and b/graphics/pokemon/back_pics/barboach_back_pic.png differ diff --git a/graphics/pokemon/back_pics/bayleef_back_pic.png b/graphics/pokemon/back_pics/bayleef_back_pic.png new file mode 100644 index 000000000..63ba17c5e Binary files /dev/null and b/graphics/pokemon/back_pics/bayleef_back_pic.png differ diff --git a/graphics/pokemon/back_pics/beautifly_back_pic.png b/graphics/pokemon/back_pics/beautifly_back_pic.png new file mode 100644 index 000000000..1eca6edc9 Binary files /dev/null and b/graphics/pokemon/back_pics/beautifly_back_pic.png differ diff --git a/graphics/pokemon/back_pics/beedrill_back_pic.png b/graphics/pokemon/back_pics/beedrill_back_pic.png new file mode 100644 index 000000000..166c399e5 Binary files /dev/null and b/graphics/pokemon/back_pics/beedrill_back_pic.png differ diff --git a/graphics/pokemon/back_pics/beldum_back_pic.png b/graphics/pokemon/back_pics/beldum_back_pic.png new file mode 100644 index 000000000..7a2cab465 Binary files /dev/null and b/graphics/pokemon/back_pics/beldum_back_pic.png differ diff --git a/graphics/pokemon/back_pics/bellossom_back_pic.png b/graphics/pokemon/back_pics/bellossom_back_pic.png new file mode 100644 index 000000000..2bd8b176e Binary files /dev/null and b/graphics/pokemon/back_pics/bellossom_back_pic.png differ diff --git a/graphics/pokemon/back_pics/bellsprout_back_pic.png b/graphics/pokemon/back_pics/bellsprout_back_pic.png new file mode 100644 index 000000000..e2a336696 Binary files /dev/null and b/graphics/pokemon/back_pics/bellsprout_back_pic.png differ diff --git a/graphics/pokemon/back_pics/blastoise_back_pic.png b/graphics/pokemon/back_pics/blastoise_back_pic.png new file mode 100644 index 000000000..f380e1515 Binary files /dev/null and b/graphics/pokemon/back_pics/blastoise_back_pic.png differ diff --git a/graphics/pokemon/back_pics/blaziken_back_pic.png b/graphics/pokemon/back_pics/blaziken_back_pic.png new file mode 100644 index 000000000..cf89544c1 Binary files /dev/null and b/graphics/pokemon/back_pics/blaziken_back_pic.png differ diff --git a/graphics/pokemon/back_pics/blissey_back_pic.png b/graphics/pokemon/back_pics/blissey_back_pic.png new file mode 100644 index 000000000..9823bd994 Binary files /dev/null and b/graphics/pokemon/back_pics/blissey_back_pic.png differ diff --git a/graphics/pokemon/back_pics/breloom_back_pic.png b/graphics/pokemon/back_pics/breloom_back_pic.png new file mode 100644 index 000000000..85df08040 Binary files /dev/null and b/graphics/pokemon/back_pics/breloom_back_pic.png differ diff --git a/graphics/pokemon/back_pics/bulbasaur_back_pic.png b/graphics/pokemon/back_pics/bulbasaur_back_pic.png new file mode 100644 index 000000000..993352c32 Binary files /dev/null and b/graphics/pokemon/back_pics/bulbasaur_back_pic.png differ diff --git a/graphics/pokemon/back_pics/butterfree_back_pic.png b/graphics/pokemon/back_pics/butterfree_back_pic.png new file mode 100644 index 000000000..7dab08c7a Binary files /dev/null and b/graphics/pokemon/back_pics/butterfree_back_pic.png differ diff --git a/graphics/pokemon/back_pics/cacnea_back_pic.png b/graphics/pokemon/back_pics/cacnea_back_pic.png new file mode 100644 index 000000000..dbc804775 Binary files /dev/null and b/graphics/pokemon/back_pics/cacnea_back_pic.png differ diff --git a/graphics/pokemon/back_pics/cacturne_back_pic.png b/graphics/pokemon/back_pics/cacturne_back_pic.png new file mode 100644 index 000000000..9a67227d0 Binary files /dev/null and b/graphics/pokemon/back_pics/cacturne_back_pic.png differ diff --git a/graphics/pokemon/back_pics/camerupt_back_pic.png b/graphics/pokemon/back_pics/camerupt_back_pic.png new file mode 100644 index 000000000..3b1744755 Binary files /dev/null and b/graphics/pokemon/back_pics/camerupt_back_pic.png differ diff --git a/graphics/pokemon/back_pics/carvanha_back_pic.png b/graphics/pokemon/back_pics/carvanha_back_pic.png new file mode 100644 index 000000000..cef8c25dd Binary files /dev/null and b/graphics/pokemon/back_pics/carvanha_back_pic.png differ diff --git a/graphics/pokemon/back_pics/cascoon_back_pic.png b/graphics/pokemon/back_pics/cascoon_back_pic.png new file mode 100644 index 000000000..fb6bc2955 Binary files /dev/null and b/graphics/pokemon/back_pics/cascoon_back_pic.png differ diff --git a/graphics/pokemon/back_pics/castform_normal_form_back_pic.png b/graphics/pokemon/back_pics/castform_normal_form_back_pic.png new file mode 100644 index 000000000..6348a35e8 Binary files /dev/null and b/graphics/pokemon/back_pics/castform_normal_form_back_pic.png differ diff --git a/graphics/pokemon/back_pics/castform_rainy_form_back_pic.png b/graphics/pokemon/back_pics/castform_rainy_form_back_pic.png new file mode 100644 index 000000000..70bad9130 Binary files /dev/null and b/graphics/pokemon/back_pics/castform_rainy_form_back_pic.png differ diff --git a/graphics/pokemon/back_pics/castform_snowy_form_back_pic.png b/graphics/pokemon/back_pics/castform_snowy_form_back_pic.png new file mode 100644 index 000000000..b4f27cbe6 Binary files /dev/null and b/graphics/pokemon/back_pics/castform_snowy_form_back_pic.png differ diff --git a/graphics/pokemon/back_pics/castform_sunny_form_back_pic.png b/graphics/pokemon/back_pics/castform_sunny_form_back_pic.png new file mode 100644 index 000000000..83b27298a Binary files /dev/null and b/graphics/pokemon/back_pics/castform_sunny_form_back_pic.png differ diff --git a/graphics/pokemon/back_pics/caterpie_back_pic.png b/graphics/pokemon/back_pics/caterpie_back_pic.png new file mode 100644 index 000000000..801748d1c Binary files /dev/null and b/graphics/pokemon/back_pics/caterpie_back_pic.png differ diff --git a/graphics/pokemon/back_pics/celebi_back_pic.png b/graphics/pokemon/back_pics/celebi_back_pic.png new file mode 100644 index 000000000..c43e455dc Binary files /dev/null and b/graphics/pokemon/back_pics/celebi_back_pic.png differ diff --git a/graphics/pokemon/back_pics/chansey_back_pic.png b/graphics/pokemon/back_pics/chansey_back_pic.png new file mode 100644 index 000000000..bea131b45 Binary files /dev/null and b/graphics/pokemon/back_pics/chansey_back_pic.png differ diff --git a/graphics/pokemon/back_pics/charizard_back_pic.png b/graphics/pokemon/back_pics/charizard_back_pic.png new file mode 100644 index 000000000..183359501 Binary files /dev/null and b/graphics/pokemon/back_pics/charizard_back_pic.png differ diff --git a/graphics/pokemon/back_pics/charmander_back_pic.png b/graphics/pokemon/back_pics/charmander_back_pic.png new file mode 100644 index 000000000..c37155339 Binary files /dev/null and b/graphics/pokemon/back_pics/charmander_back_pic.png differ diff --git a/graphics/pokemon/back_pics/charmeleon_back_pic.png b/graphics/pokemon/back_pics/charmeleon_back_pic.png new file mode 100644 index 000000000..84f2ee1e3 Binary files /dev/null and b/graphics/pokemon/back_pics/charmeleon_back_pic.png differ diff --git a/graphics/pokemon/back_pics/chikorita_back_pic.png b/graphics/pokemon/back_pics/chikorita_back_pic.png new file mode 100644 index 000000000..18c3569bf Binary files /dev/null and b/graphics/pokemon/back_pics/chikorita_back_pic.png differ diff --git a/graphics/pokemon/back_pics/chimecho_back_pic.png b/graphics/pokemon/back_pics/chimecho_back_pic.png new file mode 100644 index 000000000..7a3fedacb Binary files /dev/null and b/graphics/pokemon/back_pics/chimecho_back_pic.png differ diff --git a/graphics/pokemon/back_pics/chinchou_back_pic.png b/graphics/pokemon/back_pics/chinchou_back_pic.png new file mode 100644 index 000000000..a3b11b2dc Binary files /dev/null and b/graphics/pokemon/back_pics/chinchou_back_pic.png differ diff --git a/graphics/pokemon/back_pics/circled_question_mark_back_pic.png b/graphics/pokemon/back_pics/circled_question_mark_back_pic.png new file mode 100644 index 000000000..3056402db Binary files /dev/null and b/graphics/pokemon/back_pics/circled_question_mark_back_pic.png differ diff --git a/graphics/pokemon/back_pics/clamperl_back_pic.png b/graphics/pokemon/back_pics/clamperl_back_pic.png new file mode 100644 index 000000000..5b1324473 Binary files /dev/null and b/graphics/pokemon/back_pics/clamperl_back_pic.png differ diff --git a/graphics/pokemon/back_pics/claydol_back_pic.png b/graphics/pokemon/back_pics/claydol_back_pic.png new file mode 100644 index 000000000..9fdd6e0c2 Binary files /dev/null and b/graphics/pokemon/back_pics/claydol_back_pic.png differ diff --git a/graphics/pokemon/back_pics/clefable_back_pic.png b/graphics/pokemon/back_pics/clefable_back_pic.png new file mode 100644 index 000000000..42592b8d7 Binary files /dev/null and b/graphics/pokemon/back_pics/clefable_back_pic.png differ diff --git a/graphics/pokemon/back_pics/clefairy_back_pic.png b/graphics/pokemon/back_pics/clefairy_back_pic.png new file mode 100644 index 000000000..6720a7865 Binary files /dev/null and b/graphics/pokemon/back_pics/clefairy_back_pic.png differ diff --git a/graphics/pokemon/back_pics/cleffa_back_pic.png b/graphics/pokemon/back_pics/cleffa_back_pic.png new file mode 100644 index 000000000..b110614e1 Binary files /dev/null and b/graphics/pokemon/back_pics/cleffa_back_pic.png differ diff --git a/graphics/pokemon/back_pics/cloyster_back_pic.png b/graphics/pokemon/back_pics/cloyster_back_pic.png new file mode 100644 index 000000000..fa69b7b59 Binary files /dev/null and b/graphics/pokemon/back_pics/cloyster_back_pic.png differ diff --git a/graphics/pokemon/back_pics/combusken_back_pic.png b/graphics/pokemon/back_pics/combusken_back_pic.png new file mode 100644 index 000000000..6c6d094dd Binary files /dev/null and b/graphics/pokemon/back_pics/combusken_back_pic.png differ diff --git a/graphics/pokemon/back_pics/corphish_back_pic.png b/graphics/pokemon/back_pics/corphish_back_pic.png new file mode 100644 index 000000000..01d603778 Binary files /dev/null and b/graphics/pokemon/back_pics/corphish_back_pic.png differ diff --git a/graphics/pokemon/back_pics/corsola_back_pic.png b/graphics/pokemon/back_pics/corsola_back_pic.png new file mode 100644 index 000000000..d15f330fc Binary files /dev/null and b/graphics/pokemon/back_pics/corsola_back_pic.png differ diff --git a/graphics/pokemon/back_pics/cradily_back_pic.png b/graphics/pokemon/back_pics/cradily_back_pic.png new file mode 100644 index 000000000..338c7f0ba Binary files /dev/null and b/graphics/pokemon/back_pics/cradily_back_pic.png differ diff --git a/graphics/pokemon/back_pics/crawdaunt_back_pic.png b/graphics/pokemon/back_pics/crawdaunt_back_pic.png new file mode 100644 index 000000000..f96f2c488 Binary files /dev/null and b/graphics/pokemon/back_pics/crawdaunt_back_pic.png differ diff --git a/graphics/pokemon/back_pics/crobat_back_pic.png b/graphics/pokemon/back_pics/crobat_back_pic.png new file mode 100644 index 000000000..d14ecec7b Binary files /dev/null and b/graphics/pokemon/back_pics/crobat_back_pic.png differ diff --git a/graphics/pokemon/back_pics/croconaw_back_pic.png b/graphics/pokemon/back_pics/croconaw_back_pic.png new file mode 100644 index 000000000..991be60bc Binary files /dev/null and b/graphics/pokemon/back_pics/croconaw_back_pic.png differ diff --git a/graphics/pokemon/back_pics/cubone_back_pic.png b/graphics/pokemon/back_pics/cubone_back_pic.png new file mode 100644 index 000000000..db4d31543 Binary files /dev/null and b/graphics/pokemon/back_pics/cubone_back_pic.png differ diff --git a/graphics/pokemon/back_pics/cyndaquil_back_pic.png b/graphics/pokemon/back_pics/cyndaquil_back_pic.png new file mode 100644 index 000000000..cfc64164e Binary files /dev/null and b/graphics/pokemon/back_pics/cyndaquil_back_pic.png differ diff --git a/graphics/pokemon/back_pics/delcatty_back_pic.png b/graphics/pokemon/back_pics/delcatty_back_pic.png new file mode 100644 index 000000000..38bcfd5a7 Binary files /dev/null and b/graphics/pokemon/back_pics/delcatty_back_pic.png differ diff --git a/graphics/pokemon/back_pics/delibird_back_pic.png b/graphics/pokemon/back_pics/delibird_back_pic.png new file mode 100644 index 000000000..b4dccb119 Binary files /dev/null and b/graphics/pokemon/back_pics/delibird_back_pic.png differ diff --git a/graphics/pokemon/back_pics/deoxys_back_pic.png b/graphics/pokemon/back_pics/deoxys_back_pic.png new file mode 100644 index 000000000..c6cf22288 Binary files /dev/null and b/graphics/pokemon/back_pics/deoxys_back_pic.png differ diff --git a/graphics/pokemon/back_pics/dewgong_back_pic.png b/graphics/pokemon/back_pics/dewgong_back_pic.png new file mode 100644 index 000000000..ba6c297ea Binary files /dev/null and b/graphics/pokemon/back_pics/dewgong_back_pic.png differ diff --git a/graphics/pokemon/back_pics/diglett_back_pic.png b/graphics/pokemon/back_pics/diglett_back_pic.png new file mode 100644 index 000000000..238432ddd Binary files /dev/null and b/graphics/pokemon/back_pics/diglett_back_pic.png differ diff --git a/graphics/pokemon/back_pics/ditto_back_pic.png b/graphics/pokemon/back_pics/ditto_back_pic.png new file mode 100644 index 000000000..002635423 Binary files /dev/null and b/graphics/pokemon/back_pics/ditto_back_pic.png differ diff --git a/graphics/pokemon/back_pics/dodrio_back_pic.png b/graphics/pokemon/back_pics/dodrio_back_pic.png new file mode 100644 index 000000000..090c189e4 Binary files /dev/null and b/graphics/pokemon/back_pics/dodrio_back_pic.png differ diff --git a/graphics/pokemon/back_pics/doduo_back_pic.png b/graphics/pokemon/back_pics/doduo_back_pic.png new file mode 100644 index 000000000..4589eff60 Binary files /dev/null and b/graphics/pokemon/back_pics/doduo_back_pic.png differ diff --git a/graphics/pokemon/back_pics/donphan_back_pic.png b/graphics/pokemon/back_pics/donphan_back_pic.png new file mode 100644 index 000000000..d50d467ee Binary files /dev/null and b/graphics/pokemon/back_pics/donphan_back_pic.png differ diff --git a/graphics/pokemon/back_pics/double_question_mark_back_pic.png b/graphics/pokemon/back_pics/double_question_mark_back_pic.png new file mode 100644 index 000000000..14eb6e139 Binary files /dev/null and b/graphics/pokemon/back_pics/double_question_mark_back_pic.png differ diff --git a/graphics/pokemon/back_pics/dragonair_back_pic.png b/graphics/pokemon/back_pics/dragonair_back_pic.png new file mode 100644 index 000000000..ee3cf04d1 Binary files /dev/null and b/graphics/pokemon/back_pics/dragonair_back_pic.png differ diff --git a/graphics/pokemon/back_pics/dragonite_back_pic.png b/graphics/pokemon/back_pics/dragonite_back_pic.png new file mode 100644 index 000000000..098b9fda7 Binary files /dev/null and b/graphics/pokemon/back_pics/dragonite_back_pic.png differ diff --git a/graphics/pokemon/back_pics/dratini_back_pic.png b/graphics/pokemon/back_pics/dratini_back_pic.png new file mode 100644 index 000000000..f87eb13cb Binary files /dev/null and b/graphics/pokemon/back_pics/dratini_back_pic.png differ diff --git a/graphics/pokemon/back_pics/drowzee_back_pic.png b/graphics/pokemon/back_pics/drowzee_back_pic.png new file mode 100644 index 000000000..6a5d98818 Binary files /dev/null and b/graphics/pokemon/back_pics/drowzee_back_pic.png differ diff --git a/graphics/pokemon/back_pics/dugtrio_back_pic.png b/graphics/pokemon/back_pics/dugtrio_back_pic.png new file mode 100644 index 000000000..84fd0b630 Binary files /dev/null and b/graphics/pokemon/back_pics/dugtrio_back_pic.png differ diff --git a/graphics/pokemon/back_pics/dunsparce_back_pic.png b/graphics/pokemon/back_pics/dunsparce_back_pic.png new file mode 100644 index 000000000..05f700ea7 Binary files /dev/null and b/graphics/pokemon/back_pics/dunsparce_back_pic.png differ diff --git a/graphics/pokemon/back_pics/dusclops_back_pic.png b/graphics/pokemon/back_pics/dusclops_back_pic.png new file mode 100644 index 000000000..9362e8421 Binary files /dev/null and b/graphics/pokemon/back_pics/dusclops_back_pic.png differ diff --git a/graphics/pokemon/back_pics/duskull_back_pic.png b/graphics/pokemon/back_pics/duskull_back_pic.png new file mode 100644 index 000000000..52a5c867d Binary files /dev/null and b/graphics/pokemon/back_pics/duskull_back_pic.png differ diff --git a/graphics/pokemon/back_pics/dustox_back_pic.png b/graphics/pokemon/back_pics/dustox_back_pic.png new file mode 100644 index 000000000..759b98ea2 Binary files /dev/null and b/graphics/pokemon/back_pics/dustox_back_pic.png differ diff --git a/graphics/pokemon/back_pics/eevee_back_pic.png b/graphics/pokemon/back_pics/eevee_back_pic.png new file mode 100644 index 000000000..79bd1129c Binary files /dev/null and b/graphics/pokemon/back_pics/eevee_back_pic.png differ diff --git a/graphics/pokemon/back_pics/ekans_back_pic.png b/graphics/pokemon/back_pics/ekans_back_pic.png new file mode 100644 index 000000000..e72a7a9ed Binary files /dev/null and b/graphics/pokemon/back_pics/ekans_back_pic.png differ diff --git a/graphics/pokemon/back_pics/electabuzz_back_pic.png b/graphics/pokemon/back_pics/electabuzz_back_pic.png new file mode 100644 index 000000000..8d84c2cb6 Binary files /dev/null and b/graphics/pokemon/back_pics/electabuzz_back_pic.png differ diff --git a/graphics/pokemon/back_pics/electrike_back_pic.png b/graphics/pokemon/back_pics/electrike_back_pic.png new file mode 100644 index 000000000..c6e9e83e5 Binary files /dev/null and b/graphics/pokemon/back_pics/electrike_back_pic.png differ diff --git a/graphics/pokemon/back_pics/electrode_back_pic.png b/graphics/pokemon/back_pics/electrode_back_pic.png new file mode 100644 index 000000000..74ca458d3 Binary files /dev/null and b/graphics/pokemon/back_pics/electrode_back_pic.png differ diff --git a/graphics/pokemon/back_pics/elekid_back_pic.png b/graphics/pokemon/back_pics/elekid_back_pic.png new file mode 100644 index 000000000..0d8d9428a Binary files /dev/null and b/graphics/pokemon/back_pics/elekid_back_pic.png differ diff --git a/graphics/pokemon/back_pics/entei_back_pic.png b/graphics/pokemon/back_pics/entei_back_pic.png new file mode 100644 index 000000000..902b4461a Binary files /dev/null and b/graphics/pokemon/back_pics/entei_back_pic.png differ diff --git a/graphics/pokemon/back_pics/espeon_back_pic.png b/graphics/pokemon/back_pics/espeon_back_pic.png new file mode 100644 index 000000000..c3e5d96de Binary files /dev/null and b/graphics/pokemon/back_pics/espeon_back_pic.png differ diff --git a/graphics/pokemon/back_pics/exeggcute_back_pic.png b/graphics/pokemon/back_pics/exeggcute_back_pic.png new file mode 100644 index 000000000..e340cd036 Binary files /dev/null and b/graphics/pokemon/back_pics/exeggcute_back_pic.png differ diff --git a/graphics/pokemon/back_pics/exeggutor_back_pic.png b/graphics/pokemon/back_pics/exeggutor_back_pic.png new file mode 100644 index 000000000..a44877f9c Binary files /dev/null and b/graphics/pokemon/back_pics/exeggutor_back_pic.png differ diff --git a/graphics/pokemon/back_pics/exploud_back_pic.png b/graphics/pokemon/back_pics/exploud_back_pic.png new file mode 100644 index 000000000..37132bf48 Binary files /dev/null and b/graphics/pokemon/back_pics/exploud_back_pic.png differ diff --git a/graphics/pokemon/back_pics/farfetch_d_back_pic.png b/graphics/pokemon/back_pics/farfetch_d_back_pic.png new file mode 100644 index 000000000..7f981b389 Binary files /dev/null and b/graphics/pokemon/back_pics/farfetch_d_back_pic.png differ diff --git a/graphics/pokemon/back_pics/fearow_back_pic.png b/graphics/pokemon/back_pics/fearow_back_pic.png new file mode 100644 index 000000000..ae54db9a7 Binary files /dev/null and b/graphics/pokemon/back_pics/fearow_back_pic.png differ diff --git a/graphics/pokemon/back_pics/feebas_back_pic.png b/graphics/pokemon/back_pics/feebas_back_pic.png new file mode 100644 index 000000000..3eabd6021 Binary files /dev/null and b/graphics/pokemon/back_pics/feebas_back_pic.png differ diff --git a/graphics/pokemon/back_pics/feraligatr_back_pic.png b/graphics/pokemon/back_pics/feraligatr_back_pic.png new file mode 100644 index 000000000..d996dd8ce Binary files /dev/null and b/graphics/pokemon/back_pics/feraligatr_back_pic.png differ diff --git a/graphics/pokemon/back_pics/flaaffy_back_pic.png b/graphics/pokemon/back_pics/flaaffy_back_pic.png new file mode 100644 index 000000000..e0ac771bf Binary files /dev/null and b/graphics/pokemon/back_pics/flaaffy_back_pic.png differ diff --git a/graphics/pokemon/back_pics/flareon_back_pic.png b/graphics/pokemon/back_pics/flareon_back_pic.png new file mode 100644 index 000000000..c1efa1306 Binary files /dev/null and b/graphics/pokemon/back_pics/flareon_back_pic.png differ diff --git a/graphics/pokemon/back_pics/flygon_back_pic.png b/graphics/pokemon/back_pics/flygon_back_pic.png new file mode 100644 index 000000000..576cff1c5 Binary files /dev/null and b/graphics/pokemon/back_pics/flygon_back_pic.png differ diff --git a/graphics/pokemon/back_pics/forretress_back_pic.png b/graphics/pokemon/back_pics/forretress_back_pic.png new file mode 100644 index 000000000..5761be137 Binary files /dev/null and b/graphics/pokemon/back_pics/forretress_back_pic.png differ diff --git a/graphics/pokemon/back_pics/furret_back_pic.png b/graphics/pokemon/back_pics/furret_back_pic.png new file mode 100644 index 000000000..0dd2873af Binary files /dev/null and b/graphics/pokemon/back_pics/furret_back_pic.png differ diff --git a/graphics/pokemon/back_pics/gardevoir_back_pic.png b/graphics/pokemon/back_pics/gardevoir_back_pic.png new file mode 100644 index 000000000..9f975a82c Binary files /dev/null and b/graphics/pokemon/back_pics/gardevoir_back_pic.png differ diff --git a/graphics/pokemon/back_pics/gastly_back_pic.png b/graphics/pokemon/back_pics/gastly_back_pic.png new file mode 100644 index 000000000..3ff1badde Binary files /dev/null and b/graphics/pokemon/back_pics/gastly_back_pic.png differ diff --git a/graphics/pokemon/back_pics/gengar_back_pic.png b/graphics/pokemon/back_pics/gengar_back_pic.png new file mode 100644 index 000000000..75278dc1f Binary files /dev/null and b/graphics/pokemon/back_pics/gengar_back_pic.png differ diff --git a/graphics/pokemon/back_pics/geodude_back_pic.png b/graphics/pokemon/back_pics/geodude_back_pic.png new file mode 100644 index 000000000..29a4e3f3d Binary files /dev/null and b/graphics/pokemon/back_pics/geodude_back_pic.png differ diff --git a/graphics/pokemon/back_pics/girafarig_back_pic.png b/graphics/pokemon/back_pics/girafarig_back_pic.png new file mode 100644 index 000000000..8d86e1f79 Binary files /dev/null and b/graphics/pokemon/back_pics/girafarig_back_pic.png differ diff --git a/graphics/pokemon/back_pics/glalie_back_pic.png b/graphics/pokemon/back_pics/glalie_back_pic.png new file mode 100644 index 000000000..9c73ee9b2 Binary files /dev/null and b/graphics/pokemon/back_pics/glalie_back_pic.png differ diff --git a/graphics/pokemon/back_pics/gligar_back_pic.png b/graphics/pokemon/back_pics/gligar_back_pic.png new file mode 100644 index 000000000..8179867e9 Binary files /dev/null and b/graphics/pokemon/back_pics/gligar_back_pic.png differ diff --git a/graphics/pokemon/back_pics/gloom_back_pic.png b/graphics/pokemon/back_pics/gloom_back_pic.png new file mode 100644 index 000000000..8b4d4221b Binary files /dev/null and b/graphics/pokemon/back_pics/gloom_back_pic.png differ diff --git a/graphics/pokemon/back_pics/golbat_back_pic.png b/graphics/pokemon/back_pics/golbat_back_pic.png new file mode 100644 index 000000000..caa196036 Binary files /dev/null and b/graphics/pokemon/back_pics/golbat_back_pic.png differ diff --git a/graphics/pokemon/back_pics/goldeen_back_pic.png b/graphics/pokemon/back_pics/goldeen_back_pic.png new file mode 100644 index 000000000..8ac7cb7bc Binary files /dev/null and b/graphics/pokemon/back_pics/goldeen_back_pic.png differ diff --git a/graphics/pokemon/back_pics/golduck_back_pic.png b/graphics/pokemon/back_pics/golduck_back_pic.png new file mode 100644 index 000000000..1422a73ae Binary files /dev/null and b/graphics/pokemon/back_pics/golduck_back_pic.png differ diff --git a/graphics/pokemon/back_pics/golem_back_pic.png b/graphics/pokemon/back_pics/golem_back_pic.png new file mode 100644 index 000000000..fb27ae43f Binary files /dev/null and b/graphics/pokemon/back_pics/golem_back_pic.png differ diff --git a/graphics/pokemon/back_pics/gorebyss_back_pic.png b/graphics/pokemon/back_pics/gorebyss_back_pic.png new file mode 100644 index 000000000..aaf24366b Binary files /dev/null and b/graphics/pokemon/back_pics/gorebyss_back_pic.png differ diff --git a/graphics/pokemon/back_pics/granbull_back_pic.png b/graphics/pokemon/back_pics/granbull_back_pic.png new file mode 100644 index 000000000..2ac044da6 Binary files /dev/null and b/graphics/pokemon/back_pics/granbull_back_pic.png differ diff --git a/graphics/pokemon/back_pics/graveler_back_pic.png b/graphics/pokemon/back_pics/graveler_back_pic.png new file mode 100644 index 000000000..79e87cee9 Binary files /dev/null and b/graphics/pokemon/back_pics/graveler_back_pic.png differ diff --git a/graphics/pokemon/back_pics/grimer_back_pic.png b/graphics/pokemon/back_pics/grimer_back_pic.png new file mode 100644 index 000000000..9df0a8bfb Binary files /dev/null and b/graphics/pokemon/back_pics/grimer_back_pic.png differ diff --git a/graphics/pokemon/back_pics/groudon_back_pic.png b/graphics/pokemon/back_pics/groudon_back_pic.png new file mode 100644 index 000000000..e2b711932 Binary files /dev/null and b/graphics/pokemon/back_pics/groudon_back_pic.png differ diff --git a/graphics/pokemon/back_pics/grovyle_back_pic.png b/graphics/pokemon/back_pics/grovyle_back_pic.png new file mode 100644 index 000000000..1ffed7b90 Binary files /dev/null and b/graphics/pokemon/back_pics/grovyle_back_pic.png differ diff --git a/graphics/pokemon/back_pics/growlithe_back_pic.png b/graphics/pokemon/back_pics/growlithe_back_pic.png new file mode 100644 index 000000000..2b89351a3 Binary files /dev/null and b/graphics/pokemon/back_pics/growlithe_back_pic.png differ diff --git a/graphics/pokemon/back_pics/grumpig_back_pic.png b/graphics/pokemon/back_pics/grumpig_back_pic.png new file mode 100644 index 000000000..08d476c29 Binary files /dev/null and b/graphics/pokemon/back_pics/grumpig_back_pic.png differ diff --git a/graphics/pokemon/back_pics/gulpin_back_pic.png b/graphics/pokemon/back_pics/gulpin_back_pic.png new file mode 100644 index 000000000..928f291d1 Binary files /dev/null and b/graphics/pokemon/back_pics/gulpin_back_pic.png differ diff --git a/graphics/pokemon/back_pics/gyarados_back_pic.png b/graphics/pokemon/back_pics/gyarados_back_pic.png new file mode 100644 index 000000000..3db55190d Binary files /dev/null and b/graphics/pokemon/back_pics/gyarados_back_pic.png differ diff --git a/graphics/pokemon/back_pics/hariyama_back_pic.png b/graphics/pokemon/back_pics/hariyama_back_pic.png new file mode 100644 index 000000000..09eba4b52 Binary files /dev/null and b/graphics/pokemon/back_pics/hariyama_back_pic.png differ diff --git a/graphics/pokemon/back_pics/haunter_back_pic.png b/graphics/pokemon/back_pics/haunter_back_pic.png new file mode 100644 index 000000000..ee4740636 Binary files /dev/null and b/graphics/pokemon/back_pics/haunter_back_pic.png differ diff --git a/graphics/pokemon/back_pics/heracross_back_pic.png b/graphics/pokemon/back_pics/heracross_back_pic.png new file mode 100644 index 000000000..df8202179 Binary files /dev/null and b/graphics/pokemon/back_pics/heracross_back_pic.png differ diff --git a/graphics/pokemon/back_pics/hitmonchan_back_pic.png b/graphics/pokemon/back_pics/hitmonchan_back_pic.png new file mode 100644 index 000000000..8d9423071 Binary files /dev/null and b/graphics/pokemon/back_pics/hitmonchan_back_pic.png differ diff --git a/graphics/pokemon/back_pics/hitmonlee_back_pic.png b/graphics/pokemon/back_pics/hitmonlee_back_pic.png new file mode 100644 index 000000000..9aa095a6a Binary files /dev/null and b/graphics/pokemon/back_pics/hitmonlee_back_pic.png differ diff --git a/graphics/pokemon/back_pics/hitmontop_back_pic.png b/graphics/pokemon/back_pics/hitmontop_back_pic.png new file mode 100644 index 000000000..09d16414c Binary files /dev/null and b/graphics/pokemon/back_pics/hitmontop_back_pic.png differ diff --git a/graphics/pokemon/back_pics/ho_oh_back_pic.png b/graphics/pokemon/back_pics/ho_oh_back_pic.png new file mode 100644 index 000000000..9acbdf0cc Binary files /dev/null and b/graphics/pokemon/back_pics/ho_oh_back_pic.png differ diff --git a/graphics/pokemon/back_pics/hoothoot_back_pic.png b/graphics/pokemon/back_pics/hoothoot_back_pic.png new file mode 100644 index 000000000..2ab2253bd Binary files /dev/null and b/graphics/pokemon/back_pics/hoothoot_back_pic.png differ diff --git a/graphics/pokemon/back_pics/hoppip_back_pic.png b/graphics/pokemon/back_pics/hoppip_back_pic.png new file mode 100644 index 000000000..a5d042909 Binary files /dev/null and b/graphics/pokemon/back_pics/hoppip_back_pic.png differ diff --git a/graphics/pokemon/back_pics/horsea_back_pic.png b/graphics/pokemon/back_pics/horsea_back_pic.png new file mode 100644 index 000000000..bd6cb3d2b Binary files /dev/null and b/graphics/pokemon/back_pics/horsea_back_pic.png differ diff --git a/graphics/pokemon/back_pics/houndoom_back_pic.png b/graphics/pokemon/back_pics/houndoom_back_pic.png new file mode 100644 index 000000000..6aae855c6 Binary files /dev/null and b/graphics/pokemon/back_pics/houndoom_back_pic.png differ diff --git a/graphics/pokemon/back_pics/houndour_back_pic.png b/graphics/pokemon/back_pics/houndour_back_pic.png new file mode 100644 index 000000000..64e104954 Binary files /dev/null and b/graphics/pokemon/back_pics/houndour_back_pic.png differ diff --git a/graphics/pokemon/back_pics/huntail_back_pic.png b/graphics/pokemon/back_pics/huntail_back_pic.png new file mode 100644 index 000000000..23ccaac12 Binary files /dev/null and b/graphics/pokemon/back_pics/huntail_back_pic.png differ diff --git a/graphics/pokemon/back_pics/hypno_back_pic.png b/graphics/pokemon/back_pics/hypno_back_pic.png new file mode 100644 index 000000000..12aec4f4d Binary files /dev/null and b/graphics/pokemon/back_pics/hypno_back_pic.png differ diff --git a/graphics/pokemon/back_pics/igglybuff_back_pic.png b/graphics/pokemon/back_pics/igglybuff_back_pic.png new file mode 100644 index 000000000..efc417ab5 Binary files /dev/null and b/graphics/pokemon/back_pics/igglybuff_back_pic.png differ diff --git a/graphics/pokemon/back_pics/illumise_back_pic.png b/graphics/pokemon/back_pics/illumise_back_pic.png new file mode 100644 index 000000000..a06de56a1 Binary files /dev/null and b/graphics/pokemon/back_pics/illumise_back_pic.png differ diff --git a/graphics/pokemon/back_pics/ivysaur_back_pic.png b/graphics/pokemon/back_pics/ivysaur_back_pic.png new file mode 100644 index 000000000..2a979d70c Binary files /dev/null and b/graphics/pokemon/back_pics/ivysaur_back_pic.png differ diff --git a/graphics/pokemon/back_pics/jigglypuff_back_pic.png b/graphics/pokemon/back_pics/jigglypuff_back_pic.png new file mode 100644 index 000000000..8055a79b0 Binary files /dev/null and b/graphics/pokemon/back_pics/jigglypuff_back_pic.png differ diff --git a/graphics/pokemon/back_pics/jirachi_back_pic.png b/graphics/pokemon/back_pics/jirachi_back_pic.png new file mode 100644 index 000000000..4fa283e0d Binary files /dev/null and b/graphics/pokemon/back_pics/jirachi_back_pic.png differ diff --git a/graphics/pokemon/back_pics/jolteon_back_pic.png b/graphics/pokemon/back_pics/jolteon_back_pic.png new file mode 100644 index 000000000..004131600 Binary files /dev/null and b/graphics/pokemon/back_pics/jolteon_back_pic.png differ diff --git a/graphics/pokemon/back_pics/jumpluff_back_pic.png b/graphics/pokemon/back_pics/jumpluff_back_pic.png new file mode 100644 index 000000000..1f822f850 Binary files /dev/null and b/graphics/pokemon/back_pics/jumpluff_back_pic.png differ diff --git a/graphics/pokemon/back_pics/jynx_back_pic.png b/graphics/pokemon/back_pics/jynx_back_pic.png new file mode 100644 index 000000000..4b6d97bed Binary files /dev/null and b/graphics/pokemon/back_pics/jynx_back_pic.png differ diff --git a/graphics/pokemon/back_pics/kabuto_back_pic.png b/graphics/pokemon/back_pics/kabuto_back_pic.png new file mode 100644 index 000000000..9664ead41 Binary files /dev/null and b/graphics/pokemon/back_pics/kabuto_back_pic.png differ diff --git a/graphics/pokemon/back_pics/kabutops_back_pic.png b/graphics/pokemon/back_pics/kabutops_back_pic.png new file mode 100644 index 000000000..e1aab4de2 Binary files /dev/null and b/graphics/pokemon/back_pics/kabutops_back_pic.png differ diff --git a/graphics/pokemon/back_pics/kadabra_back_pic.png b/graphics/pokemon/back_pics/kadabra_back_pic.png new file mode 100644 index 000000000..a219404c7 Binary files /dev/null and b/graphics/pokemon/back_pics/kadabra_back_pic.png differ diff --git a/graphics/pokemon/back_pics/kakuna_back_pic.png b/graphics/pokemon/back_pics/kakuna_back_pic.png new file mode 100644 index 000000000..2f5455238 Binary files /dev/null and b/graphics/pokemon/back_pics/kakuna_back_pic.png differ diff --git a/graphics/pokemon/back_pics/kangaskhan_back_pic.png b/graphics/pokemon/back_pics/kangaskhan_back_pic.png new file mode 100644 index 000000000..babb41fce Binary files /dev/null and b/graphics/pokemon/back_pics/kangaskhan_back_pic.png differ diff --git a/graphics/pokemon/back_pics/kecleon_back_pic.png b/graphics/pokemon/back_pics/kecleon_back_pic.png new file mode 100644 index 000000000..1baeeb58a Binary files /dev/null and b/graphics/pokemon/back_pics/kecleon_back_pic.png differ diff --git a/graphics/pokemon/back_pics/kingdra_back_pic.png b/graphics/pokemon/back_pics/kingdra_back_pic.png new file mode 100644 index 000000000..3e6ec7789 Binary files /dev/null and b/graphics/pokemon/back_pics/kingdra_back_pic.png differ diff --git a/graphics/pokemon/back_pics/kingler_back_pic.png b/graphics/pokemon/back_pics/kingler_back_pic.png new file mode 100644 index 000000000..11338630f Binary files /dev/null and b/graphics/pokemon/back_pics/kingler_back_pic.png differ diff --git a/graphics/pokemon/back_pics/kirlia_back_pic.png b/graphics/pokemon/back_pics/kirlia_back_pic.png new file mode 100644 index 000000000..5820cd068 Binary files /dev/null and b/graphics/pokemon/back_pics/kirlia_back_pic.png differ diff --git a/graphics/pokemon/back_pics/koffing_back_pic.png b/graphics/pokemon/back_pics/koffing_back_pic.png new file mode 100644 index 000000000..a76b27fae Binary files /dev/null and b/graphics/pokemon/back_pics/koffing_back_pic.png differ diff --git a/graphics/pokemon/back_pics/krabby_back_pic.png b/graphics/pokemon/back_pics/krabby_back_pic.png new file mode 100644 index 000000000..d0501e77a Binary files /dev/null and b/graphics/pokemon/back_pics/krabby_back_pic.png differ diff --git a/graphics/pokemon/back_pics/kyogre_back_pic.png b/graphics/pokemon/back_pics/kyogre_back_pic.png new file mode 100644 index 000000000..d0c4f55c1 Binary files /dev/null and b/graphics/pokemon/back_pics/kyogre_back_pic.png differ diff --git a/graphics/pokemon/back_pics/lairon_back_pic.png b/graphics/pokemon/back_pics/lairon_back_pic.png new file mode 100644 index 000000000..552c01356 Binary files /dev/null and b/graphics/pokemon/back_pics/lairon_back_pic.png differ diff --git a/graphics/pokemon/back_pics/lanturn_back_pic.png b/graphics/pokemon/back_pics/lanturn_back_pic.png new file mode 100644 index 000000000..1b9543d63 Binary files /dev/null and b/graphics/pokemon/back_pics/lanturn_back_pic.png differ diff --git a/graphics/pokemon/back_pics/lapras_back_pic.png b/graphics/pokemon/back_pics/lapras_back_pic.png new file mode 100644 index 000000000..3b5a18f17 Binary files /dev/null and b/graphics/pokemon/back_pics/lapras_back_pic.png differ diff --git a/graphics/pokemon/back_pics/larvitar_back_pic.png b/graphics/pokemon/back_pics/larvitar_back_pic.png new file mode 100644 index 000000000..1c28da425 Binary files /dev/null and b/graphics/pokemon/back_pics/larvitar_back_pic.png differ diff --git a/graphics/pokemon/back_pics/latias_back_pic.png b/graphics/pokemon/back_pics/latias_back_pic.png new file mode 100644 index 000000000..a4286579b Binary files /dev/null and b/graphics/pokemon/back_pics/latias_back_pic.png differ diff --git a/graphics/pokemon/back_pics/latios_back_pic.png b/graphics/pokemon/back_pics/latios_back_pic.png new file mode 100644 index 000000000..0f2b7f5d6 Binary files /dev/null and b/graphics/pokemon/back_pics/latios_back_pic.png differ diff --git a/graphics/pokemon/back_pics/ledian_back_pic.png b/graphics/pokemon/back_pics/ledian_back_pic.png new file mode 100644 index 000000000..577fd2d71 Binary files /dev/null and b/graphics/pokemon/back_pics/ledian_back_pic.png differ diff --git a/graphics/pokemon/back_pics/ledyba_back_pic.png b/graphics/pokemon/back_pics/ledyba_back_pic.png new file mode 100644 index 000000000..6a84f405d Binary files /dev/null and b/graphics/pokemon/back_pics/ledyba_back_pic.png differ diff --git a/graphics/pokemon/back_pics/lickitung_back_pic.png b/graphics/pokemon/back_pics/lickitung_back_pic.png new file mode 100644 index 000000000..f6524e2c0 Binary files /dev/null and b/graphics/pokemon/back_pics/lickitung_back_pic.png differ diff --git a/graphics/pokemon/back_pics/lileep_back_pic.png b/graphics/pokemon/back_pics/lileep_back_pic.png new file mode 100644 index 000000000..753602091 Binary files /dev/null and b/graphics/pokemon/back_pics/lileep_back_pic.png differ diff --git a/graphics/pokemon/back_pics/linoone_back_pic.png b/graphics/pokemon/back_pics/linoone_back_pic.png new file mode 100644 index 000000000..9fc8fad38 Binary files /dev/null and b/graphics/pokemon/back_pics/linoone_back_pic.png differ diff --git a/graphics/pokemon/back_pics/lombre_back_pic.png b/graphics/pokemon/back_pics/lombre_back_pic.png new file mode 100644 index 000000000..c87b4bcf3 Binary files /dev/null and b/graphics/pokemon/back_pics/lombre_back_pic.png differ diff --git a/graphics/pokemon/back_pics/lotad_back_pic.png b/graphics/pokemon/back_pics/lotad_back_pic.png new file mode 100644 index 000000000..d8ca7648d Binary files /dev/null and b/graphics/pokemon/back_pics/lotad_back_pic.png differ diff --git a/graphics/pokemon/back_pics/loudred_back_pic.png b/graphics/pokemon/back_pics/loudred_back_pic.png new file mode 100644 index 000000000..cb3d5d816 Binary files /dev/null and b/graphics/pokemon/back_pics/loudred_back_pic.png differ diff --git a/graphics/pokemon/back_pics/ludicolo_back_pic.png b/graphics/pokemon/back_pics/ludicolo_back_pic.png new file mode 100644 index 000000000..2bdc96c39 Binary files /dev/null and b/graphics/pokemon/back_pics/ludicolo_back_pic.png differ diff --git a/graphics/pokemon/back_pics/lugia_back_pic.png b/graphics/pokemon/back_pics/lugia_back_pic.png new file mode 100644 index 000000000..ece7def85 Binary files /dev/null and b/graphics/pokemon/back_pics/lugia_back_pic.png differ diff --git a/graphics/pokemon/back_pics/lunatone_back_pic.png b/graphics/pokemon/back_pics/lunatone_back_pic.png new file mode 100644 index 000000000..3f2247f8e Binary files /dev/null and b/graphics/pokemon/back_pics/lunatone_back_pic.png differ diff --git a/graphics/pokemon/back_pics/luvdisc_back_pic.png b/graphics/pokemon/back_pics/luvdisc_back_pic.png new file mode 100644 index 000000000..04895aa25 Binary files /dev/null and b/graphics/pokemon/back_pics/luvdisc_back_pic.png differ diff --git a/graphics/pokemon/back_pics/machamp_back_pic.png b/graphics/pokemon/back_pics/machamp_back_pic.png new file mode 100644 index 000000000..98f6f961b Binary files /dev/null and b/graphics/pokemon/back_pics/machamp_back_pic.png differ diff --git a/graphics/pokemon/back_pics/machoke_back_pic.png b/graphics/pokemon/back_pics/machoke_back_pic.png new file mode 100644 index 000000000..b3c84c77c Binary files /dev/null and b/graphics/pokemon/back_pics/machoke_back_pic.png differ diff --git a/graphics/pokemon/back_pics/machop_back_pic.png b/graphics/pokemon/back_pics/machop_back_pic.png new file mode 100644 index 000000000..6b0dda04c Binary files /dev/null and b/graphics/pokemon/back_pics/machop_back_pic.png differ diff --git a/graphics/pokemon/back_pics/magby_back_pic.png b/graphics/pokemon/back_pics/magby_back_pic.png new file mode 100644 index 000000000..f05f62283 Binary files /dev/null and b/graphics/pokemon/back_pics/magby_back_pic.png differ diff --git a/graphics/pokemon/back_pics/magcargo_back_pic.png b/graphics/pokemon/back_pics/magcargo_back_pic.png new file mode 100644 index 000000000..8d2221f0d Binary files /dev/null and b/graphics/pokemon/back_pics/magcargo_back_pic.png differ diff --git a/graphics/pokemon/back_pics/magikarp_back_pic.png b/graphics/pokemon/back_pics/magikarp_back_pic.png new file mode 100644 index 000000000..66e874bb9 Binary files /dev/null and b/graphics/pokemon/back_pics/magikarp_back_pic.png differ diff --git a/graphics/pokemon/back_pics/magmar_back_pic.png b/graphics/pokemon/back_pics/magmar_back_pic.png new file mode 100644 index 000000000..4d4f4e77a Binary files /dev/null and b/graphics/pokemon/back_pics/magmar_back_pic.png differ diff --git a/graphics/pokemon/back_pics/magnemite_back_pic.png b/graphics/pokemon/back_pics/magnemite_back_pic.png new file mode 100644 index 000000000..c1769ec51 Binary files /dev/null and b/graphics/pokemon/back_pics/magnemite_back_pic.png differ diff --git a/graphics/pokemon/back_pics/magneton_back_pic.png b/graphics/pokemon/back_pics/magneton_back_pic.png new file mode 100644 index 000000000..5fc357dfc Binary files /dev/null and b/graphics/pokemon/back_pics/magneton_back_pic.png differ diff --git a/graphics/pokemon/back_pics/makuhita_back_pic.png b/graphics/pokemon/back_pics/makuhita_back_pic.png new file mode 100644 index 000000000..45423f822 Binary files /dev/null and b/graphics/pokemon/back_pics/makuhita_back_pic.png differ diff --git a/graphics/pokemon/back_pics/manectric_back_pic.png b/graphics/pokemon/back_pics/manectric_back_pic.png new file mode 100644 index 000000000..9373757a0 Binary files /dev/null and b/graphics/pokemon/back_pics/manectric_back_pic.png differ diff --git a/graphics/pokemon/back_pics/mankey_back_pic.png b/graphics/pokemon/back_pics/mankey_back_pic.png new file mode 100644 index 000000000..00336d751 Binary files /dev/null and b/graphics/pokemon/back_pics/mankey_back_pic.png differ diff --git a/graphics/pokemon/back_pics/mantine_back_pic.png b/graphics/pokemon/back_pics/mantine_back_pic.png new file mode 100644 index 000000000..186e90e1e Binary files /dev/null and b/graphics/pokemon/back_pics/mantine_back_pic.png differ diff --git a/graphics/pokemon/back_pics/mareep_back_pic.png b/graphics/pokemon/back_pics/mareep_back_pic.png new file mode 100644 index 000000000..601d13c8d Binary files /dev/null and b/graphics/pokemon/back_pics/mareep_back_pic.png differ diff --git a/graphics/pokemon/back_pics/marill_back_pic.png b/graphics/pokemon/back_pics/marill_back_pic.png new file mode 100644 index 000000000..49bc29d97 Binary files /dev/null and b/graphics/pokemon/back_pics/marill_back_pic.png differ diff --git a/graphics/pokemon/back_pics/marowak_back_pic.png b/graphics/pokemon/back_pics/marowak_back_pic.png new file mode 100644 index 000000000..3af621821 Binary files /dev/null and b/graphics/pokemon/back_pics/marowak_back_pic.png differ diff --git a/graphics/pokemon/back_pics/marshtomp_back_pic.png b/graphics/pokemon/back_pics/marshtomp_back_pic.png new file mode 100644 index 000000000..6c530aaee Binary files /dev/null and b/graphics/pokemon/back_pics/marshtomp_back_pic.png differ diff --git a/graphics/pokemon/back_pics/masquerain_back_pic.png b/graphics/pokemon/back_pics/masquerain_back_pic.png new file mode 100644 index 000000000..0092c2ca6 Binary files /dev/null and b/graphics/pokemon/back_pics/masquerain_back_pic.png differ diff --git a/graphics/pokemon/back_pics/mawile_back_pic.png b/graphics/pokemon/back_pics/mawile_back_pic.png new file mode 100644 index 000000000..5bbf44ca9 Binary files /dev/null and b/graphics/pokemon/back_pics/mawile_back_pic.png differ diff --git a/graphics/pokemon/back_pics/medicham_back_pic.png b/graphics/pokemon/back_pics/medicham_back_pic.png new file mode 100644 index 000000000..f4f58839b Binary files /dev/null and b/graphics/pokemon/back_pics/medicham_back_pic.png differ diff --git a/graphics/pokemon/back_pics/meditite_back_pic.png b/graphics/pokemon/back_pics/meditite_back_pic.png new file mode 100644 index 000000000..8c00d8f6d Binary files /dev/null and b/graphics/pokemon/back_pics/meditite_back_pic.png differ diff --git a/graphics/pokemon/back_pics/meganium_back_pic.png b/graphics/pokemon/back_pics/meganium_back_pic.png new file mode 100644 index 000000000..be01710af Binary files /dev/null and b/graphics/pokemon/back_pics/meganium_back_pic.png differ diff --git a/graphics/pokemon/back_pics/meowth_back_pic.png b/graphics/pokemon/back_pics/meowth_back_pic.png new file mode 100644 index 000000000..d87e7aa14 Binary files /dev/null and b/graphics/pokemon/back_pics/meowth_back_pic.png differ diff --git a/graphics/pokemon/back_pics/metagross_back_pic.png b/graphics/pokemon/back_pics/metagross_back_pic.png new file mode 100644 index 000000000..2097f945d Binary files /dev/null and b/graphics/pokemon/back_pics/metagross_back_pic.png differ diff --git a/graphics/pokemon/back_pics/metang_back_pic.png b/graphics/pokemon/back_pics/metang_back_pic.png new file mode 100644 index 000000000..2ba18eb3d Binary files /dev/null and b/graphics/pokemon/back_pics/metang_back_pic.png differ diff --git a/graphics/pokemon/back_pics/metapod_back_pic.png b/graphics/pokemon/back_pics/metapod_back_pic.png new file mode 100644 index 000000000..825f6d504 Binary files /dev/null and b/graphics/pokemon/back_pics/metapod_back_pic.png differ diff --git a/graphics/pokemon/back_pics/mew_back_pic.png b/graphics/pokemon/back_pics/mew_back_pic.png new file mode 100644 index 000000000..85303cf70 Binary files /dev/null and b/graphics/pokemon/back_pics/mew_back_pic.png differ diff --git a/graphics/pokemon/back_pics/mewtwo_back_pic.png b/graphics/pokemon/back_pics/mewtwo_back_pic.png new file mode 100644 index 000000000..e466856e5 Binary files /dev/null and b/graphics/pokemon/back_pics/mewtwo_back_pic.png differ diff --git a/graphics/pokemon/back_pics/mightyena_back_pic.png b/graphics/pokemon/back_pics/mightyena_back_pic.png new file mode 100644 index 000000000..188562590 Binary files /dev/null and b/graphics/pokemon/back_pics/mightyena_back_pic.png differ diff --git a/graphics/pokemon/back_pics/milotic_back_pic.png b/graphics/pokemon/back_pics/milotic_back_pic.png new file mode 100644 index 000000000..5d91dfb63 Binary files /dev/null and b/graphics/pokemon/back_pics/milotic_back_pic.png differ diff --git a/graphics/pokemon/back_pics/miltank_back_pic.png b/graphics/pokemon/back_pics/miltank_back_pic.png new file mode 100644 index 000000000..0cf5b21e6 Binary files /dev/null and b/graphics/pokemon/back_pics/miltank_back_pic.png differ diff --git a/graphics/pokemon/back_pics/minun_back_pic.png b/graphics/pokemon/back_pics/minun_back_pic.png new file mode 100644 index 000000000..7c1377d59 Binary files /dev/null and b/graphics/pokemon/back_pics/minun_back_pic.png differ diff --git a/graphics/pokemon/back_pics/misdreavus_back_pic.png b/graphics/pokemon/back_pics/misdreavus_back_pic.png new file mode 100644 index 000000000..44b44a3ff Binary files /dev/null and b/graphics/pokemon/back_pics/misdreavus_back_pic.png differ diff --git a/graphics/pokemon/back_pics/moltres_back_pic.png b/graphics/pokemon/back_pics/moltres_back_pic.png new file mode 100644 index 000000000..11ed8ced8 Binary files /dev/null and b/graphics/pokemon/back_pics/moltres_back_pic.png differ diff --git a/graphics/pokemon/back_pics/mr_mime_back_pic.png b/graphics/pokemon/back_pics/mr_mime_back_pic.png new file mode 100644 index 000000000..129fbb4e2 Binary files /dev/null and b/graphics/pokemon/back_pics/mr_mime_back_pic.png differ diff --git a/graphics/pokemon/back_pics/mudkip_back_pic.png b/graphics/pokemon/back_pics/mudkip_back_pic.png new file mode 100644 index 000000000..1b1282d42 Binary files /dev/null and b/graphics/pokemon/back_pics/mudkip_back_pic.png differ diff --git a/graphics/pokemon/back_pics/muk_back_pic.png b/graphics/pokemon/back_pics/muk_back_pic.png new file mode 100644 index 000000000..07c18b350 Binary files /dev/null and b/graphics/pokemon/back_pics/muk_back_pic.png differ diff --git a/graphics/pokemon/back_pics/murkrow_back_pic.png b/graphics/pokemon/back_pics/murkrow_back_pic.png new file mode 100644 index 000000000..3007b7643 Binary files /dev/null and b/graphics/pokemon/back_pics/murkrow_back_pic.png differ diff --git a/graphics/pokemon/back_pics/natu_back_pic.png b/graphics/pokemon/back_pics/natu_back_pic.png new file mode 100644 index 000000000..0349877d5 Binary files /dev/null and b/graphics/pokemon/back_pics/natu_back_pic.png differ diff --git a/graphics/pokemon/back_pics/nidoking_back_pic.png b/graphics/pokemon/back_pics/nidoking_back_pic.png new file mode 100644 index 000000000..65a253b45 Binary files /dev/null and b/graphics/pokemon/back_pics/nidoking_back_pic.png differ diff --git a/graphics/pokemon/back_pics/nidoqueen_back_pic.png b/graphics/pokemon/back_pics/nidoqueen_back_pic.png new file mode 100644 index 000000000..339582c54 Binary files /dev/null and b/graphics/pokemon/back_pics/nidoqueen_back_pic.png differ diff --git a/graphics/pokemon/back_pics/nidoran_f_back_pic.png b/graphics/pokemon/back_pics/nidoran_f_back_pic.png new file mode 100644 index 000000000..acfc360cc Binary files /dev/null and b/graphics/pokemon/back_pics/nidoran_f_back_pic.png differ diff --git a/graphics/pokemon/back_pics/nidoran_m_back_pic.png b/graphics/pokemon/back_pics/nidoran_m_back_pic.png new file mode 100644 index 000000000..76c47d33e Binary files /dev/null and b/graphics/pokemon/back_pics/nidoran_m_back_pic.png differ diff --git a/graphics/pokemon/back_pics/nidorina_back_pic.png b/graphics/pokemon/back_pics/nidorina_back_pic.png new file mode 100644 index 000000000..14940d21f Binary files /dev/null and b/graphics/pokemon/back_pics/nidorina_back_pic.png differ diff --git a/graphics/pokemon/back_pics/nidorino_back_pic.png b/graphics/pokemon/back_pics/nidorino_back_pic.png new file mode 100644 index 000000000..01b866e00 Binary files /dev/null and b/graphics/pokemon/back_pics/nidorino_back_pic.png differ diff --git a/graphics/pokemon/back_pics/nincada_back_pic.png b/graphics/pokemon/back_pics/nincada_back_pic.png new file mode 100644 index 000000000..e35b19cc7 Binary files /dev/null and b/graphics/pokemon/back_pics/nincada_back_pic.png differ diff --git a/graphics/pokemon/back_pics/ninetales_back_pic.png b/graphics/pokemon/back_pics/ninetales_back_pic.png new file mode 100644 index 000000000..cb1919138 Binary files /dev/null and b/graphics/pokemon/back_pics/ninetales_back_pic.png differ diff --git a/graphics/pokemon/back_pics/ninjask_back_pic.png b/graphics/pokemon/back_pics/ninjask_back_pic.png new file mode 100644 index 000000000..fd2daf29a Binary files /dev/null and b/graphics/pokemon/back_pics/ninjask_back_pic.png differ diff --git a/graphics/pokemon/back_pics/noctowl_back_pic.png b/graphics/pokemon/back_pics/noctowl_back_pic.png new file mode 100644 index 000000000..e9984ea5e Binary files /dev/null and b/graphics/pokemon/back_pics/noctowl_back_pic.png differ diff --git a/graphics/pokemon/back_pics/nosepass_back_pic.png b/graphics/pokemon/back_pics/nosepass_back_pic.png new file mode 100644 index 000000000..21b41a3cd Binary files /dev/null and b/graphics/pokemon/back_pics/nosepass_back_pic.png differ diff --git a/graphics/pokemon/back_pics/numel_back_pic.png b/graphics/pokemon/back_pics/numel_back_pic.png new file mode 100644 index 000000000..9722ff438 Binary files /dev/null and b/graphics/pokemon/back_pics/numel_back_pic.png differ diff --git a/graphics/pokemon/back_pics/nuzleaf_back_pic.png b/graphics/pokemon/back_pics/nuzleaf_back_pic.png new file mode 100644 index 000000000..858377c11 Binary files /dev/null and b/graphics/pokemon/back_pics/nuzleaf_back_pic.png differ diff --git a/graphics/pokemon/back_pics/octillery_back_pic.png b/graphics/pokemon/back_pics/octillery_back_pic.png new file mode 100644 index 000000000..09a867881 Binary files /dev/null and b/graphics/pokemon/back_pics/octillery_back_pic.png differ diff --git a/graphics/pokemon/back_pics/oddish_back_pic.png b/graphics/pokemon/back_pics/oddish_back_pic.png new file mode 100644 index 000000000..a1919e4ea Binary files /dev/null and b/graphics/pokemon/back_pics/oddish_back_pic.png differ diff --git a/graphics/pokemon/back_pics/omanyte_back_pic.png b/graphics/pokemon/back_pics/omanyte_back_pic.png new file mode 100644 index 000000000..6cd77bffc Binary files /dev/null and b/graphics/pokemon/back_pics/omanyte_back_pic.png differ diff --git a/graphics/pokemon/back_pics/omastar_back_pic.png b/graphics/pokemon/back_pics/omastar_back_pic.png new file mode 100644 index 000000000..3f7467950 Binary files /dev/null and b/graphics/pokemon/back_pics/omastar_back_pic.png differ diff --git a/graphics/pokemon/back_pics/onix_back_pic.png b/graphics/pokemon/back_pics/onix_back_pic.png new file mode 100644 index 000000000..233e66d91 Binary files /dev/null and b/graphics/pokemon/back_pics/onix_back_pic.png differ diff --git a/graphics/pokemon/back_pics/paras_back_pic.png b/graphics/pokemon/back_pics/paras_back_pic.png new file mode 100644 index 000000000..cb77d2d77 Binary files /dev/null and b/graphics/pokemon/back_pics/paras_back_pic.png differ diff --git a/graphics/pokemon/back_pics/parasect_back_pic.png b/graphics/pokemon/back_pics/parasect_back_pic.png new file mode 100644 index 000000000..f313d5a91 Binary files /dev/null and b/graphics/pokemon/back_pics/parasect_back_pic.png differ diff --git a/graphics/pokemon/back_pics/pelipper_back_pic.png b/graphics/pokemon/back_pics/pelipper_back_pic.png new file mode 100644 index 000000000..4b155c28d Binary files /dev/null and b/graphics/pokemon/back_pics/pelipper_back_pic.png differ diff --git a/graphics/pokemon/back_pics/persian_back_pic.png b/graphics/pokemon/back_pics/persian_back_pic.png new file mode 100644 index 000000000..f9acc3c24 Binary files /dev/null and b/graphics/pokemon/back_pics/persian_back_pic.png differ diff --git a/graphics/pokemon/back_pics/phanpy_back_pic.png b/graphics/pokemon/back_pics/phanpy_back_pic.png new file mode 100644 index 000000000..b40fb8ddf Binary files /dev/null and b/graphics/pokemon/back_pics/phanpy_back_pic.png differ diff --git a/graphics/pokemon/back_pics/pichu_back_pic.png b/graphics/pokemon/back_pics/pichu_back_pic.png new file mode 100644 index 000000000..94d593632 Binary files /dev/null and b/graphics/pokemon/back_pics/pichu_back_pic.png differ diff --git a/graphics/pokemon/back_pics/pidgeot_back_pic.png b/graphics/pokemon/back_pics/pidgeot_back_pic.png new file mode 100644 index 000000000..a050dd31c Binary files /dev/null and b/graphics/pokemon/back_pics/pidgeot_back_pic.png differ diff --git a/graphics/pokemon/back_pics/pidgeotto_back_pic.png b/graphics/pokemon/back_pics/pidgeotto_back_pic.png new file mode 100644 index 000000000..4aeab2844 Binary files /dev/null and b/graphics/pokemon/back_pics/pidgeotto_back_pic.png differ diff --git a/graphics/pokemon/back_pics/pidgey_back_pic.png b/graphics/pokemon/back_pics/pidgey_back_pic.png new file mode 100644 index 000000000..ecb42e8f1 Binary files /dev/null and b/graphics/pokemon/back_pics/pidgey_back_pic.png differ diff --git a/graphics/pokemon/back_pics/pikachu_back_pic.png b/graphics/pokemon/back_pics/pikachu_back_pic.png new file mode 100644 index 000000000..0ea5ff592 Binary files /dev/null and b/graphics/pokemon/back_pics/pikachu_back_pic.png differ diff --git a/graphics/pokemon/back_pics/piloswine_back_pic.png b/graphics/pokemon/back_pics/piloswine_back_pic.png new file mode 100644 index 000000000..a9a3bfed8 Binary files /dev/null and b/graphics/pokemon/back_pics/piloswine_back_pic.png differ diff --git a/graphics/pokemon/back_pics/pineco_back_pic.png b/graphics/pokemon/back_pics/pineco_back_pic.png new file mode 100644 index 000000000..a92454bb3 Binary files /dev/null and b/graphics/pokemon/back_pics/pineco_back_pic.png differ diff --git a/graphics/pokemon/back_pics/pinsir_back_pic.png b/graphics/pokemon/back_pics/pinsir_back_pic.png new file mode 100644 index 000000000..95ee9784c Binary files /dev/null and b/graphics/pokemon/back_pics/pinsir_back_pic.png differ diff --git a/graphics/pokemon/back_pics/plusle_back_pic.png b/graphics/pokemon/back_pics/plusle_back_pic.png new file mode 100644 index 000000000..7365f9921 Binary files /dev/null and b/graphics/pokemon/back_pics/plusle_back_pic.png differ diff --git a/graphics/pokemon/back_pics/politoed_back_pic.png b/graphics/pokemon/back_pics/politoed_back_pic.png new file mode 100644 index 000000000..5337b6f27 Binary files /dev/null and b/graphics/pokemon/back_pics/politoed_back_pic.png differ diff --git a/graphics/pokemon/back_pics/poliwag_back_pic.png b/graphics/pokemon/back_pics/poliwag_back_pic.png new file mode 100644 index 000000000..11e30aef7 Binary files /dev/null and b/graphics/pokemon/back_pics/poliwag_back_pic.png differ diff --git a/graphics/pokemon/back_pics/poliwhirl_back_pic.png b/graphics/pokemon/back_pics/poliwhirl_back_pic.png new file mode 100644 index 000000000..31540c539 Binary files /dev/null and b/graphics/pokemon/back_pics/poliwhirl_back_pic.png differ diff --git a/graphics/pokemon/back_pics/poliwrath_back_pic.png b/graphics/pokemon/back_pics/poliwrath_back_pic.png new file mode 100644 index 000000000..b38239be7 Binary files /dev/null and b/graphics/pokemon/back_pics/poliwrath_back_pic.png differ diff --git a/graphics/pokemon/back_pics/ponyta_back_pic.png b/graphics/pokemon/back_pics/ponyta_back_pic.png new file mode 100644 index 000000000..cc4bf1189 Binary files /dev/null and b/graphics/pokemon/back_pics/ponyta_back_pic.png differ diff --git a/graphics/pokemon/back_pics/poochyena_back_pic.png b/graphics/pokemon/back_pics/poochyena_back_pic.png new file mode 100644 index 000000000..6d13ed43a Binary files /dev/null and b/graphics/pokemon/back_pics/poochyena_back_pic.png differ diff --git a/graphics/pokemon/back_pics/porygon2_back_pic.png b/graphics/pokemon/back_pics/porygon2_back_pic.png new file mode 100644 index 000000000..aad400b56 Binary files /dev/null and b/graphics/pokemon/back_pics/porygon2_back_pic.png differ diff --git a/graphics/pokemon/back_pics/porygon_back_pic.png b/graphics/pokemon/back_pics/porygon_back_pic.png new file mode 100644 index 000000000..f102465a8 Binary files /dev/null and b/graphics/pokemon/back_pics/porygon_back_pic.png differ diff --git a/graphics/pokemon/back_pics/primeape_back_pic.png b/graphics/pokemon/back_pics/primeape_back_pic.png new file mode 100644 index 000000000..02b326cd4 Binary files /dev/null and b/graphics/pokemon/back_pics/primeape_back_pic.png differ diff --git a/graphics/pokemon/back_pics/psyduck_back_pic.png b/graphics/pokemon/back_pics/psyduck_back_pic.png new file mode 100644 index 000000000..65f8032a7 Binary files /dev/null and b/graphics/pokemon/back_pics/psyduck_back_pic.png differ diff --git a/graphics/pokemon/back_pics/pupitar_back_pic.png b/graphics/pokemon/back_pics/pupitar_back_pic.png new file mode 100644 index 000000000..1f49a87f9 Binary files /dev/null and b/graphics/pokemon/back_pics/pupitar_back_pic.png differ diff --git a/graphics/pokemon/back_pics/quagsire_back_pic.png b/graphics/pokemon/back_pics/quagsire_back_pic.png new file mode 100644 index 000000000..9233569b8 Binary files /dev/null and b/graphics/pokemon/back_pics/quagsire_back_pic.png differ diff --git a/graphics/pokemon/back_pics/quilava_back_pic.png b/graphics/pokemon/back_pics/quilava_back_pic.png new file mode 100644 index 000000000..5a97c1b11 Binary files /dev/null and b/graphics/pokemon/back_pics/quilava_back_pic.png differ diff --git a/graphics/pokemon/back_pics/qwilfish_back_pic.png b/graphics/pokemon/back_pics/qwilfish_back_pic.png new file mode 100644 index 000000000..34fb6e12e Binary files /dev/null and b/graphics/pokemon/back_pics/qwilfish_back_pic.png differ diff --git a/graphics/pokemon/back_pics/raichu_back_pic.png b/graphics/pokemon/back_pics/raichu_back_pic.png new file mode 100644 index 000000000..6f8a0afcd Binary files /dev/null and b/graphics/pokemon/back_pics/raichu_back_pic.png differ diff --git a/graphics/pokemon/back_pics/raikou_back_pic.png b/graphics/pokemon/back_pics/raikou_back_pic.png new file mode 100644 index 000000000..e187eda52 Binary files /dev/null and b/graphics/pokemon/back_pics/raikou_back_pic.png differ diff --git a/graphics/pokemon/back_pics/ralts_back_pic.png b/graphics/pokemon/back_pics/ralts_back_pic.png new file mode 100644 index 000000000..926bdc0ab Binary files /dev/null and b/graphics/pokemon/back_pics/ralts_back_pic.png differ diff --git a/graphics/pokemon/back_pics/rapidash_back_pic.png b/graphics/pokemon/back_pics/rapidash_back_pic.png new file mode 100644 index 000000000..7d4b9667e Binary files /dev/null and b/graphics/pokemon/back_pics/rapidash_back_pic.png differ diff --git a/graphics/pokemon/back_pics/raticate_back_pic.png b/graphics/pokemon/back_pics/raticate_back_pic.png new file mode 100644 index 000000000..38935407e Binary files /dev/null and b/graphics/pokemon/back_pics/raticate_back_pic.png differ diff --git a/graphics/pokemon/back_pics/rattata_back_pic.png b/graphics/pokemon/back_pics/rattata_back_pic.png new file mode 100644 index 000000000..717be0bc6 Binary files /dev/null and b/graphics/pokemon/back_pics/rattata_back_pic.png differ diff --git a/graphics/pokemon/back_pics/rayquaza_back_pic.png b/graphics/pokemon/back_pics/rayquaza_back_pic.png new file mode 100644 index 000000000..e8b8704a8 Binary files /dev/null and b/graphics/pokemon/back_pics/rayquaza_back_pic.png differ diff --git a/graphics/pokemon/back_pics/regice_back_pic.png b/graphics/pokemon/back_pics/regice_back_pic.png new file mode 100644 index 000000000..69b091437 Binary files /dev/null and b/graphics/pokemon/back_pics/regice_back_pic.png differ diff --git a/graphics/pokemon/back_pics/regirock_back_pic.png b/graphics/pokemon/back_pics/regirock_back_pic.png new file mode 100644 index 000000000..7175fc90a Binary files /dev/null and b/graphics/pokemon/back_pics/regirock_back_pic.png differ diff --git a/graphics/pokemon/back_pics/registeel_back_pic.png b/graphics/pokemon/back_pics/registeel_back_pic.png new file mode 100644 index 000000000..233240d45 Binary files /dev/null and b/graphics/pokemon/back_pics/registeel_back_pic.png differ diff --git a/graphics/pokemon/back_pics/relicanth_back_pic.png b/graphics/pokemon/back_pics/relicanth_back_pic.png new file mode 100644 index 000000000..c9ae2e572 Binary files /dev/null and b/graphics/pokemon/back_pics/relicanth_back_pic.png differ diff --git a/graphics/pokemon/back_pics/remoraid_back_pic.png b/graphics/pokemon/back_pics/remoraid_back_pic.png new file mode 100644 index 000000000..22e48fa6d Binary files /dev/null and b/graphics/pokemon/back_pics/remoraid_back_pic.png differ diff --git a/graphics/pokemon/back_pics/rhydon_back_pic.png b/graphics/pokemon/back_pics/rhydon_back_pic.png new file mode 100644 index 000000000..4acc986ba Binary files /dev/null and b/graphics/pokemon/back_pics/rhydon_back_pic.png differ diff --git a/graphics/pokemon/back_pics/rhyhorn_back_pic.png b/graphics/pokemon/back_pics/rhyhorn_back_pic.png new file mode 100644 index 000000000..67d006205 Binary files /dev/null and b/graphics/pokemon/back_pics/rhyhorn_back_pic.png differ diff --git a/graphics/pokemon/back_pics/roselia_back_pic.png b/graphics/pokemon/back_pics/roselia_back_pic.png new file mode 100644 index 000000000..5275c801d Binary files /dev/null and b/graphics/pokemon/back_pics/roselia_back_pic.png differ diff --git a/graphics/pokemon/back_pics/sableye_back_pic.png b/graphics/pokemon/back_pics/sableye_back_pic.png new file mode 100644 index 000000000..75c12743c Binary files /dev/null and b/graphics/pokemon/back_pics/sableye_back_pic.png differ diff --git a/graphics/pokemon/back_pics/salamence_back_pic.png b/graphics/pokemon/back_pics/salamence_back_pic.png new file mode 100644 index 000000000..748147e77 Binary files /dev/null and b/graphics/pokemon/back_pics/salamence_back_pic.png differ diff --git a/graphics/pokemon/back_pics/sandshrew_back_pic.png b/graphics/pokemon/back_pics/sandshrew_back_pic.png new file mode 100644 index 000000000..86fa10ec8 Binary files /dev/null and b/graphics/pokemon/back_pics/sandshrew_back_pic.png differ diff --git a/graphics/pokemon/back_pics/sandslash_back_pic.png b/graphics/pokemon/back_pics/sandslash_back_pic.png new file mode 100644 index 000000000..64c305047 Binary files /dev/null and b/graphics/pokemon/back_pics/sandslash_back_pic.png differ diff --git a/graphics/pokemon/back_pics/sceptile_back_pic.png b/graphics/pokemon/back_pics/sceptile_back_pic.png new file mode 100644 index 000000000..5b7e8696e Binary files /dev/null and b/graphics/pokemon/back_pics/sceptile_back_pic.png differ diff --git a/graphics/pokemon/back_pics/scizor_back_pic.png b/graphics/pokemon/back_pics/scizor_back_pic.png new file mode 100644 index 000000000..b31f50da1 Binary files /dev/null and b/graphics/pokemon/back_pics/scizor_back_pic.png differ diff --git a/graphics/pokemon/back_pics/scyther_back_pic.png b/graphics/pokemon/back_pics/scyther_back_pic.png new file mode 100644 index 000000000..bf598ee88 Binary files /dev/null and b/graphics/pokemon/back_pics/scyther_back_pic.png differ diff --git a/graphics/pokemon/back_pics/seadra_back_pic.png b/graphics/pokemon/back_pics/seadra_back_pic.png new file mode 100644 index 000000000..526d7495c Binary files /dev/null and b/graphics/pokemon/back_pics/seadra_back_pic.png differ diff --git a/graphics/pokemon/back_pics/seaking_back_pic.png b/graphics/pokemon/back_pics/seaking_back_pic.png new file mode 100644 index 000000000..eb3fbd661 Binary files /dev/null and b/graphics/pokemon/back_pics/seaking_back_pic.png differ diff --git a/graphics/pokemon/back_pics/sealeo_back_pic.png b/graphics/pokemon/back_pics/sealeo_back_pic.png new file mode 100644 index 000000000..302ffb7f2 Binary files /dev/null and b/graphics/pokemon/back_pics/sealeo_back_pic.png differ diff --git a/graphics/pokemon/back_pics/seedot_back_pic.png b/graphics/pokemon/back_pics/seedot_back_pic.png new file mode 100644 index 000000000..ee4017cf5 Binary files /dev/null and b/graphics/pokemon/back_pics/seedot_back_pic.png differ diff --git a/graphics/pokemon/back_pics/seel_back_pic.png b/graphics/pokemon/back_pics/seel_back_pic.png new file mode 100644 index 000000000..5268657f5 Binary files /dev/null and b/graphics/pokemon/back_pics/seel_back_pic.png differ diff --git a/graphics/pokemon/back_pics/sentret_back_pic.png b/graphics/pokemon/back_pics/sentret_back_pic.png new file mode 100644 index 000000000..97ef90a8d Binary files /dev/null and b/graphics/pokemon/back_pics/sentret_back_pic.png differ diff --git a/graphics/pokemon/back_pics/seviper_back_pic.png b/graphics/pokemon/back_pics/seviper_back_pic.png new file mode 100644 index 000000000..b9849a6fa Binary files /dev/null and b/graphics/pokemon/back_pics/seviper_back_pic.png differ diff --git a/graphics/pokemon/back_pics/sharpedo_back_pic.png b/graphics/pokemon/back_pics/sharpedo_back_pic.png new file mode 100644 index 000000000..4e011968b Binary files /dev/null and b/graphics/pokemon/back_pics/sharpedo_back_pic.png differ diff --git a/graphics/pokemon/back_pics/shedinja_back_pic.png b/graphics/pokemon/back_pics/shedinja_back_pic.png new file mode 100644 index 000000000..bb3a5be7d Binary files /dev/null and b/graphics/pokemon/back_pics/shedinja_back_pic.png differ diff --git a/graphics/pokemon/back_pics/shelgon_back_pic.png b/graphics/pokemon/back_pics/shelgon_back_pic.png new file mode 100644 index 000000000..9c87ad57c Binary files /dev/null and b/graphics/pokemon/back_pics/shelgon_back_pic.png differ diff --git a/graphics/pokemon/back_pics/shellder_back_pic.png b/graphics/pokemon/back_pics/shellder_back_pic.png new file mode 100644 index 000000000..ee5374333 Binary files /dev/null and b/graphics/pokemon/back_pics/shellder_back_pic.png differ diff --git a/graphics/pokemon/back_pics/shiftry_back_pic.png b/graphics/pokemon/back_pics/shiftry_back_pic.png new file mode 100644 index 000000000..17ddb24ca Binary files /dev/null and b/graphics/pokemon/back_pics/shiftry_back_pic.png differ diff --git a/graphics/pokemon/back_pics/shroomish_back_pic.png b/graphics/pokemon/back_pics/shroomish_back_pic.png new file mode 100644 index 000000000..4812bcbcd Binary files /dev/null and b/graphics/pokemon/back_pics/shroomish_back_pic.png differ diff --git a/graphics/pokemon/back_pics/shuckle_back_pic.png b/graphics/pokemon/back_pics/shuckle_back_pic.png new file mode 100644 index 000000000..1b19db0e5 Binary files /dev/null and b/graphics/pokemon/back_pics/shuckle_back_pic.png differ diff --git a/graphics/pokemon/back_pics/shuppet_back_pic.png b/graphics/pokemon/back_pics/shuppet_back_pic.png new file mode 100644 index 000000000..2c6dbdb18 Binary files /dev/null and b/graphics/pokemon/back_pics/shuppet_back_pic.png differ diff --git a/graphics/pokemon/back_pics/silcoon_back_pic.png b/graphics/pokemon/back_pics/silcoon_back_pic.png new file mode 100644 index 000000000..26c8cfdaf Binary files /dev/null and b/graphics/pokemon/back_pics/silcoon_back_pic.png differ diff --git a/graphics/pokemon/back_pics/skarmory_back_pic.png b/graphics/pokemon/back_pics/skarmory_back_pic.png new file mode 100644 index 000000000..f3c8d95cc Binary files /dev/null and b/graphics/pokemon/back_pics/skarmory_back_pic.png differ diff --git a/graphics/pokemon/back_pics/skiploom_back_pic.png b/graphics/pokemon/back_pics/skiploom_back_pic.png new file mode 100644 index 000000000..8f010fb4f Binary files /dev/null and b/graphics/pokemon/back_pics/skiploom_back_pic.png differ diff --git a/graphics/pokemon/back_pics/skitty_back_pic.png b/graphics/pokemon/back_pics/skitty_back_pic.png new file mode 100644 index 000000000..e7f5ebb67 Binary files /dev/null and b/graphics/pokemon/back_pics/skitty_back_pic.png differ diff --git a/graphics/pokemon/back_pics/slaking_back_pic.png b/graphics/pokemon/back_pics/slaking_back_pic.png new file mode 100644 index 000000000..50d55a957 Binary files /dev/null and b/graphics/pokemon/back_pics/slaking_back_pic.png differ diff --git a/graphics/pokemon/back_pics/slakoth_back_pic.png b/graphics/pokemon/back_pics/slakoth_back_pic.png new file mode 100644 index 000000000..9f82930b0 Binary files /dev/null and b/graphics/pokemon/back_pics/slakoth_back_pic.png differ diff --git a/graphics/pokemon/back_pics/slowbro_back_pic.png b/graphics/pokemon/back_pics/slowbro_back_pic.png new file mode 100644 index 000000000..b62c5fcf4 Binary files /dev/null and b/graphics/pokemon/back_pics/slowbro_back_pic.png differ diff --git a/graphics/pokemon/back_pics/slowking_back_pic.png b/graphics/pokemon/back_pics/slowking_back_pic.png new file mode 100644 index 000000000..16a779506 Binary files /dev/null and b/graphics/pokemon/back_pics/slowking_back_pic.png differ diff --git a/graphics/pokemon/back_pics/slowpoke_back_pic.png b/graphics/pokemon/back_pics/slowpoke_back_pic.png new file mode 100644 index 000000000..62bf72f0e Binary files /dev/null and b/graphics/pokemon/back_pics/slowpoke_back_pic.png differ diff --git a/graphics/pokemon/back_pics/slugma_back_pic.png b/graphics/pokemon/back_pics/slugma_back_pic.png new file mode 100644 index 000000000..347d27ed1 Binary files /dev/null and b/graphics/pokemon/back_pics/slugma_back_pic.png differ diff --git a/graphics/pokemon/back_pics/smeargle_back_pic.png b/graphics/pokemon/back_pics/smeargle_back_pic.png new file mode 100644 index 000000000..fefbed16f Binary files /dev/null and b/graphics/pokemon/back_pics/smeargle_back_pic.png differ diff --git a/graphics/pokemon/back_pics/smoochum_back_pic.png b/graphics/pokemon/back_pics/smoochum_back_pic.png new file mode 100644 index 000000000..bad0422e5 Binary files /dev/null and b/graphics/pokemon/back_pics/smoochum_back_pic.png differ diff --git a/graphics/pokemon/back_pics/sneasel_back_pic.png b/graphics/pokemon/back_pics/sneasel_back_pic.png new file mode 100644 index 000000000..5a0765cb2 Binary files /dev/null and b/graphics/pokemon/back_pics/sneasel_back_pic.png differ diff --git a/graphics/pokemon/back_pics/snorlax_back_pic.png b/graphics/pokemon/back_pics/snorlax_back_pic.png new file mode 100644 index 000000000..da44b95aa Binary files /dev/null and b/graphics/pokemon/back_pics/snorlax_back_pic.png differ diff --git a/graphics/pokemon/back_pics/snorunt_back_pic.png b/graphics/pokemon/back_pics/snorunt_back_pic.png new file mode 100644 index 000000000..53ddf9fdc Binary files /dev/null and b/graphics/pokemon/back_pics/snorunt_back_pic.png differ diff --git a/graphics/pokemon/back_pics/snubbull_back_pic.png b/graphics/pokemon/back_pics/snubbull_back_pic.png new file mode 100644 index 000000000..2b212b708 Binary files /dev/null and b/graphics/pokemon/back_pics/snubbull_back_pic.png differ diff --git a/graphics/pokemon/back_pics/solrock_back_pic.png b/graphics/pokemon/back_pics/solrock_back_pic.png new file mode 100644 index 000000000..2f6e7cb99 Binary files /dev/null and b/graphics/pokemon/back_pics/solrock_back_pic.png differ diff --git a/graphics/pokemon/back_pics/spearow_back_pic.png b/graphics/pokemon/back_pics/spearow_back_pic.png new file mode 100644 index 000000000..b630f24e0 Binary files /dev/null and b/graphics/pokemon/back_pics/spearow_back_pic.png differ diff --git a/graphics/pokemon/back_pics/spheal_back_pic.png b/graphics/pokemon/back_pics/spheal_back_pic.png new file mode 100644 index 000000000..6fb9e9443 Binary files /dev/null and b/graphics/pokemon/back_pics/spheal_back_pic.png differ diff --git a/graphics/pokemon/back_pics/spinarak_back_pic.png b/graphics/pokemon/back_pics/spinarak_back_pic.png new file mode 100644 index 000000000..7c2144971 Binary files /dev/null and b/graphics/pokemon/back_pics/spinarak_back_pic.png differ diff --git a/graphics/pokemon/back_pics/spinda_back_pic.png b/graphics/pokemon/back_pics/spinda_back_pic.png new file mode 100644 index 000000000..c5f699e2c Binary files /dev/null and b/graphics/pokemon/back_pics/spinda_back_pic.png differ diff --git a/graphics/pokemon/back_pics/spoink_back_pic.png b/graphics/pokemon/back_pics/spoink_back_pic.png new file mode 100644 index 000000000..7872e240c Binary files /dev/null and b/graphics/pokemon/back_pics/spoink_back_pic.png differ diff --git a/graphics/pokemon/back_pics/squirtle_back_pic.png b/graphics/pokemon/back_pics/squirtle_back_pic.png new file mode 100644 index 000000000..36c9d2666 Binary files /dev/null and b/graphics/pokemon/back_pics/squirtle_back_pic.png differ diff --git a/graphics/pokemon/back_pics/stantler_back_pic.png b/graphics/pokemon/back_pics/stantler_back_pic.png new file mode 100644 index 000000000..9ddf7a40c Binary files /dev/null and b/graphics/pokemon/back_pics/stantler_back_pic.png differ diff --git a/graphics/pokemon/back_pics/starmie_back_pic.png b/graphics/pokemon/back_pics/starmie_back_pic.png new file mode 100644 index 000000000..62fdf3a41 Binary files /dev/null and b/graphics/pokemon/back_pics/starmie_back_pic.png differ diff --git a/graphics/pokemon/back_pics/staryu_back_pic.png b/graphics/pokemon/back_pics/staryu_back_pic.png new file mode 100644 index 000000000..b48a929ea Binary files /dev/null and b/graphics/pokemon/back_pics/staryu_back_pic.png differ diff --git a/graphics/pokemon/back_pics/steelix_back_pic.png b/graphics/pokemon/back_pics/steelix_back_pic.png new file mode 100644 index 000000000..74cb256d0 Binary files /dev/null and b/graphics/pokemon/back_pics/steelix_back_pic.png differ diff --git a/graphics/pokemon/back_pics/sudowoodo_back_pic.png b/graphics/pokemon/back_pics/sudowoodo_back_pic.png new file mode 100644 index 000000000..befda7efc Binary files /dev/null and b/graphics/pokemon/back_pics/sudowoodo_back_pic.png differ diff --git a/graphics/pokemon/back_pics/suicune_back_pic.png b/graphics/pokemon/back_pics/suicune_back_pic.png new file mode 100644 index 000000000..80eef8678 Binary files /dev/null and b/graphics/pokemon/back_pics/suicune_back_pic.png differ diff --git a/graphics/pokemon/back_pics/sunflora_back_pic.png b/graphics/pokemon/back_pics/sunflora_back_pic.png new file mode 100644 index 000000000..c048bebc2 Binary files /dev/null and b/graphics/pokemon/back_pics/sunflora_back_pic.png differ diff --git a/graphics/pokemon/back_pics/sunkern_back_pic.png b/graphics/pokemon/back_pics/sunkern_back_pic.png new file mode 100644 index 000000000..e6adde775 Binary files /dev/null and b/graphics/pokemon/back_pics/sunkern_back_pic.png differ diff --git a/graphics/pokemon/back_pics/surskit_back_pic.png b/graphics/pokemon/back_pics/surskit_back_pic.png new file mode 100644 index 000000000..85b8a8a4f Binary files /dev/null and b/graphics/pokemon/back_pics/surskit_back_pic.png differ diff --git a/graphics/pokemon/back_pics/swablu_back_pic.png b/graphics/pokemon/back_pics/swablu_back_pic.png new file mode 100644 index 000000000..802a9e37c Binary files /dev/null and b/graphics/pokemon/back_pics/swablu_back_pic.png differ diff --git a/graphics/pokemon/back_pics/swalot_back_pic.png b/graphics/pokemon/back_pics/swalot_back_pic.png new file mode 100644 index 000000000..acd59b1b9 Binary files /dev/null and b/graphics/pokemon/back_pics/swalot_back_pic.png differ diff --git a/graphics/pokemon/back_pics/swampert_back_pic.png b/graphics/pokemon/back_pics/swampert_back_pic.png new file mode 100644 index 000000000..bb795c65f Binary files /dev/null and b/graphics/pokemon/back_pics/swampert_back_pic.png differ diff --git a/graphics/pokemon/back_pics/swellow_back_pic.png b/graphics/pokemon/back_pics/swellow_back_pic.png new file mode 100644 index 000000000..c2c1c3ed3 Binary files /dev/null and b/graphics/pokemon/back_pics/swellow_back_pic.png differ diff --git a/graphics/pokemon/back_pics/swinub_back_pic.png b/graphics/pokemon/back_pics/swinub_back_pic.png new file mode 100644 index 000000000..66998faad Binary files /dev/null and b/graphics/pokemon/back_pics/swinub_back_pic.png differ diff --git a/graphics/pokemon/back_pics/taillow_back_pic.png b/graphics/pokemon/back_pics/taillow_back_pic.png new file mode 100644 index 000000000..997d6db45 Binary files /dev/null and b/graphics/pokemon/back_pics/taillow_back_pic.png differ diff --git a/graphics/pokemon/back_pics/tangela_back_pic.png b/graphics/pokemon/back_pics/tangela_back_pic.png new file mode 100644 index 000000000..5a15f1b91 Binary files /dev/null and b/graphics/pokemon/back_pics/tangela_back_pic.png differ diff --git a/graphics/pokemon/back_pics/tauros_back_pic.png b/graphics/pokemon/back_pics/tauros_back_pic.png new file mode 100644 index 000000000..2fac61283 Binary files /dev/null and b/graphics/pokemon/back_pics/tauros_back_pic.png differ diff --git a/graphics/pokemon/back_pics/teddiursa_back_pic.png b/graphics/pokemon/back_pics/teddiursa_back_pic.png new file mode 100644 index 000000000..d79f39a5b Binary files /dev/null and b/graphics/pokemon/back_pics/teddiursa_back_pic.png differ diff --git a/graphics/pokemon/back_pics/tentacool_back_pic.png b/graphics/pokemon/back_pics/tentacool_back_pic.png new file mode 100644 index 000000000..d603ca052 Binary files /dev/null and b/graphics/pokemon/back_pics/tentacool_back_pic.png differ diff --git a/graphics/pokemon/back_pics/tentacruel_back_pic.png b/graphics/pokemon/back_pics/tentacruel_back_pic.png new file mode 100644 index 000000000..232bc9259 Binary files /dev/null and b/graphics/pokemon/back_pics/tentacruel_back_pic.png differ diff --git a/graphics/pokemon/back_pics/togepi_back_pic.png b/graphics/pokemon/back_pics/togepi_back_pic.png new file mode 100644 index 000000000..24858fc22 Binary files /dev/null and b/graphics/pokemon/back_pics/togepi_back_pic.png differ diff --git a/graphics/pokemon/back_pics/togetic_back_pic.png b/graphics/pokemon/back_pics/togetic_back_pic.png new file mode 100644 index 000000000..f5125735a Binary files /dev/null and b/graphics/pokemon/back_pics/togetic_back_pic.png differ diff --git a/graphics/pokemon/back_pics/torchic_back_pic.png b/graphics/pokemon/back_pics/torchic_back_pic.png new file mode 100644 index 000000000..ed2c53879 Binary files /dev/null and b/graphics/pokemon/back_pics/torchic_back_pic.png differ diff --git a/graphics/pokemon/back_pics/torkoal_back_pic.png b/graphics/pokemon/back_pics/torkoal_back_pic.png new file mode 100644 index 000000000..4eb5c4f0e Binary files /dev/null and b/graphics/pokemon/back_pics/torkoal_back_pic.png differ diff --git a/graphics/pokemon/back_pics/totodile_back_pic.png b/graphics/pokemon/back_pics/totodile_back_pic.png new file mode 100644 index 000000000..1ac54c7bd Binary files /dev/null and b/graphics/pokemon/back_pics/totodile_back_pic.png differ diff --git a/graphics/pokemon/back_pics/trapinch_back_pic.png b/graphics/pokemon/back_pics/trapinch_back_pic.png new file mode 100644 index 000000000..61eec3c92 Binary files /dev/null and b/graphics/pokemon/back_pics/trapinch_back_pic.png differ diff --git a/graphics/pokemon/back_pics/treecko_back_pic.png b/graphics/pokemon/back_pics/treecko_back_pic.png new file mode 100644 index 000000000..89e53390d Binary files /dev/null and b/graphics/pokemon/back_pics/treecko_back_pic.png differ diff --git a/graphics/pokemon/back_pics/tropius_back_pic.png b/graphics/pokemon/back_pics/tropius_back_pic.png new file mode 100644 index 000000000..d948c3dc0 Binary files /dev/null and b/graphics/pokemon/back_pics/tropius_back_pic.png differ diff --git a/graphics/pokemon/back_pics/typhlosion_back_pic.png b/graphics/pokemon/back_pics/typhlosion_back_pic.png new file mode 100644 index 000000000..deb3ffb0d Binary files /dev/null and b/graphics/pokemon/back_pics/typhlosion_back_pic.png differ diff --git a/graphics/pokemon/back_pics/tyranitar_back_pic.png b/graphics/pokemon/back_pics/tyranitar_back_pic.png new file mode 100644 index 000000000..273318be0 Binary files /dev/null and b/graphics/pokemon/back_pics/tyranitar_back_pic.png differ diff --git a/graphics/pokemon/back_pics/tyrogue_back_pic.png b/graphics/pokemon/back_pics/tyrogue_back_pic.png new file mode 100644 index 000000000..1d6b2e198 Binary files /dev/null and b/graphics/pokemon/back_pics/tyrogue_back_pic.png differ diff --git a/graphics/pokemon/back_pics/umbreon_back_pic.png b/graphics/pokemon/back_pics/umbreon_back_pic.png new file mode 100644 index 000000000..d73508aed Binary files /dev/null and b/graphics/pokemon/back_pics/umbreon_back_pic.png differ diff --git a/graphics/pokemon/back_pics/unown_a_back_pic.png b/graphics/pokemon/back_pics/unown_a_back_pic.png new file mode 100644 index 000000000..b90973023 Binary files /dev/null and b/graphics/pokemon/back_pics/unown_a_back_pic.png differ diff --git a/graphics/pokemon/back_pics/unown_b_back_pic.png b/graphics/pokemon/back_pics/unown_b_back_pic.png new file mode 100644 index 000000000..b398754ca Binary files /dev/null and b/graphics/pokemon/back_pics/unown_b_back_pic.png differ diff --git a/graphics/pokemon/back_pics/unown_c_back_pic.png b/graphics/pokemon/back_pics/unown_c_back_pic.png new file mode 100644 index 000000000..b9bccf4c5 Binary files /dev/null and b/graphics/pokemon/back_pics/unown_c_back_pic.png differ diff --git a/graphics/pokemon/back_pics/unown_d_back_pic.png b/graphics/pokemon/back_pics/unown_d_back_pic.png new file mode 100644 index 000000000..1b3f19b09 Binary files /dev/null and b/graphics/pokemon/back_pics/unown_d_back_pic.png differ diff --git a/graphics/pokemon/back_pics/unown_e_back_pic.png b/graphics/pokemon/back_pics/unown_e_back_pic.png new file mode 100644 index 000000000..1baaf759f Binary files /dev/null and b/graphics/pokemon/back_pics/unown_e_back_pic.png differ diff --git a/graphics/pokemon/back_pics/unown_exclamation_mark_back_pic.png b/graphics/pokemon/back_pics/unown_exclamation_mark_back_pic.png new file mode 100644 index 000000000..cb05b906d Binary files /dev/null and b/graphics/pokemon/back_pics/unown_exclamation_mark_back_pic.png differ diff --git a/graphics/pokemon/back_pics/unown_f_back_pic.png b/graphics/pokemon/back_pics/unown_f_back_pic.png new file mode 100644 index 000000000..30be252f9 Binary files /dev/null and b/graphics/pokemon/back_pics/unown_f_back_pic.png differ diff --git a/graphics/pokemon/back_pics/unown_g_back_pic.png b/graphics/pokemon/back_pics/unown_g_back_pic.png new file mode 100644 index 000000000..ec5e708bf Binary files /dev/null and b/graphics/pokemon/back_pics/unown_g_back_pic.png differ diff --git a/graphics/pokemon/back_pics/unown_h_back_pic.png b/graphics/pokemon/back_pics/unown_h_back_pic.png new file mode 100644 index 000000000..992e34e21 Binary files /dev/null and b/graphics/pokemon/back_pics/unown_h_back_pic.png differ diff --git a/graphics/pokemon/back_pics/unown_i_back_pic.png b/graphics/pokemon/back_pics/unown_i_back_pic.png new file mode 100644 index 000000000..5640fd5e0 Binary files /dev/null and b/graphics/pokemon/back_pics/unown_i_back_pic.png differ diff --git a/graphics/pokemon/back_pics/unown_j_back_pic.png b/graphics/pokemon/back_pics/unown_j_back_pic.png new file mode 100644 index 000000000..619ebb75b Binary files /dev/null and b/graphics/pokemon/back_pics/unown_j_back_pic.png differ diff --git a/graphics/pokemon/back_pics/unown_k_back_pic.png b/graphics/pokemon/back_pics/unown_k_back_pic.png new file mode 100644 index 000000000..46ac175bc Binary files /dev/null and b/graphics/pokemon/back_pics/unown_k_back_pic.png differ diff --git a/graphics/pokemon/back_pics/unown_l_back_pic.png b/graphics/pokemon/back_pics/unown_l_back_pic.png new file mode 100644 index 000000000..da0c6c5f5 Binary files /dev/null and b/graphics/pokemon/back_pics/unown_l_back_pic.png differ diff --git a/graphics/pokemon/back_pics/unown_m_back_pic.png b/graphics/pokemon/back_pics/unown_m_back_pic.png new file mode 100644 index 000000000..37dd0a97f Binary files /dev/null and b/graphics/pokemon/back_pics/unown_m_back_pic.png differ diff --git a/graphics/pokemon/back_pics/unown_n_back_pic.png b/graphics/pokemon/back_pics/unown_n_back_pic.png new file mode 100644 index 000000000..17163be73 Binary files /dev/null and b/graphics/pokemon/back_pics/unown_n_back_pic.png differ diff --git a/graphics/pokemon/back_pics/unown_o_back_pic.png b/graphics/pokemon/back_pics/unown_o_back_pic.png new file mode 100644 index 000000000..7260da757 Binary files /dev/null and b/graphics/pokemon/back_pics/unown_o_back_pic.png differ diff --git a/graphics/pokemon/back_pics/unown_p_back_pic.png b/graphics/pokemon/back_pics/unown_p_back_pic.png new file mode 100644 index 000000000..e275a3a96 Binary files /dev/null and b/graphics/pokemon/back_pics/unown_p_back_pic.png differ diff --git a/graphics/pokemon/back_pics/unown_q_back_pic.png b/graphics/pokemon/back_pics/unown_q_back_pic.png new file mode 100644 index 000000000..08d5a0d0a Binary files /dev/null and b/graphics/pokemon/back_pics/unown_q_back_pic.png differ diff --git a/graphics/pokemon/back_pics/unown_question_mark_back_pic.png b/graphics/pokemon/back_pics/unown_question_mark_back_pic.png new file mode 100644 index 000000000..3d9ae3ee3 Binary files /dev/null and b/graphics/pokemon/back_pics/unown_question_mark_back_pic.png differ diff --git a/graphics/pokemon/back_pics/unown_r_back_pic.png b/graphics/pokemon/back_pics/unown_r_back_pic.png new file mode 100644 index 000000000..9ea2bd6f7 Binary files /dev/null and b/graphics/pokemon/back_pics/unown_r_back_pic.png differ diff --git a/graphics/pokemon/back_pics/unown_s_back_pic.png b/graphics/pokemon/back_pics/unown_s_back_pic.png new file mode 100644 index 000000000..c85571503 Binary files /dev/null and b/graphics/pokemon/back_pics/unown_s_back_pic.png differ diff --git a/graphics/pokemon/back_pics/unown_t_back_pic.png b/graphics/pokemon/back_pics/unown_t_back_pic.png new file mode 100644 index 000000000..f840953b8 Binary files /dev/null and b/graphics/pokemon/back_pics/unown_t_back_pic.png differ diff --git a/graphics/pokemon/back_pics/unown_u_back_pic.png b/graphics/pokemon/back_pics/unown_u_back_pic.png new file mode 100644 index 000000000..8d99bd088 Binary files /dev/null and b/graphics/pokemon/back_pics/unown_u_back_pic.png differ diff --git a/graphics/pokemon/back_pics/unown_v_back_pic.png b/graphics/pokemon/back_pics/unown_v_back_pic.png new file mode 100644 index 000000000..41e215720 Binary files /dev/null and b/graphics/pokemon/back_pics/unown_v_back_pic.png differ diff --git a/graphics/pokemon/back_pics/unown_w_back_pic.png b/graphics/pokemon/back_pics/unown_w_back_pic.png new file mode 100644 index 000000000..3d42e4eb2 Binary files /dev/null and b/graphics/pokemon/back_pics/unown_w_back_pic.png differ diff --git a/graphics/pokemon/back_pics/unown_x_back_pic.png b/graphics/pokemon/back_pics/unown_x_back_pic.png new file mode 100644 index 000000000..a21d5a9c3 Binary files /dev/null and b/graphics/pokemon/back_pics/unown_x_back_pic.png differ diff --git a/graphics/pokemon/back_pics/unown_y_back_pic.png b/graphics/pokemon/back_pics/unown_y_back_pic.png new file mode 100644 index 000000000..3ccca08e8 Binary files /dev/null and b/graphics/pokemon/back_pics/unown_y_back_pic.png differ diff --git a/graphics/pokemon/back_pics/unown_z_back_pic.png b/graphics/pokemon/back_pics/unown_z_back_pic.png new file mode 100644 index 000000000..e1f528a2b Binary files /dev/null and b/graphics/pokemon/back_pics/unown_z_back_pic.png differ diff --git a/graphics/pokemon/back_pics/ursaring_back_pic.png b/graphics/pokemon/back_pics/ursaring_back_pic.png new file mode 100644 index 000000000..4a546c055 Binary files /dev/null and b/graphics/pokemon/back_pics/ursaring_back_pic.png differ diff --git a/graphics/pokemon/back_pics/vaporeon_back_pic.png b/graphics/pokemon/back_pics/vaporeon_back_pic.png new file mode 100644 index 000000000..5ac5b94fb Binary files /dev/null and b/graphics/pokemon/back_pics/vaporeon_back_pic.png differ diff --git a/graphics/pokemon/back_pics/venomoth_back_pic.png b/graphics/pokemon/back_pics/venomoth_back_pic.png new file mode 100644 index 000000000..910608088 Binary files /dev/null and b/graphics/pokemon/back_pics/venomoth_back_pic.png differ diff --git a/graphics/pokemon/back_pics/venonat_back_pic.png b/graphics/pokemon/back_pics/venonat_back_pic.png new file mode 100644 index 000000000..44f7f45c5 Binary files /dev/null and b/graphics/pokemon/back_pics/venonat_back_pic.png differ diff --git a/graphics/pokemon/back_pics/venusaur_back_pic.png b/graphics/pokemon/back_pics/venusaur_back_pic.png new file mode 100644 index 000000000..e2d19152c Binary files /dev/null and b/graphics/pokemon/back_pics/venusaur_back_pic.png differ diff --git a/graphics/pokemon/back_pics/vibrava_back_pic.png b/graphics/pokemon/back_pics/vibrava_back_pic.png new file mode 100644 index 000000000..c5a0eb60b Binary files /dev/null and b/graphics/pokemon/back_pics/vibrava_back_pic.png differ diff --git a/graphics/pokemon/back_pics/victreebel_back_pic.png b/graphics/pokemon/back_pics/victreebel_back_pic.png new file mode 100644 index 000000000..a92b61f7a Binary files /dev/null and b/graphics/pokemon/back_pics/victreebel_back_pic.png differ diff --git a/graphics/pokemon/back_pics/vigoroth_back_pic.png b/graphics/pokemon/back_pics/vigoroth_back_pic.png new file mode 100644 index 000000000..7d806e703 Binary files /dev/null and b/graphics/pokemon/back_pics/vigoroth_back_pic.png differ diff --git a/graphics/pokemon/back_pics/vileplume_back_pic.png b/graphics/pokemon/back_pics/vileplume_back_pic.png new file mode 100644 index 000000000..8aa3006ee Binary files /dev/null and b/graphics/pokemon/back_pics/vileplume_back_pic.png differ diff --git a/graphics/pokemon/back_pics/volbeat_back_pic.png b/graphics/pokemon/back_pics/volbeat_back_pic.png new file mode 100644 index 000000000..217b966ed Binary files /dev/null and b/graphics/pokemon/back_pics/volbeat_back_pic.png differ diff --git a/graphics/pokemon/back_pics/voltorb_back_pic.png b/graphics/pokemon/back_pics/voltorb_back_pic.png new file mode 100644 index 000000000..c379b4a8b Binary files /dev/null and b/graphics/pokemon/back_pics/voltorb_back_pic.png differ diff --git a/graphics/pokemon/back_pics/vulpix_back_pic.png b/graphics/pokemon/back_pics/vulpix_back_pic.png new file mode 100644 index 000000000..2272a71dd Binary files /dev/null and b/graphics/pokemon/back_pics/vulpix_back_pic.png differ diff --git a/graphics/pokemon/back_pics/wailmer_back_pic.png b/graphics/pokemon/back_pics/wailmer_back_pic.png new file mode 100644 index 000000000..9ad9f21ea Binary files /dev/null and b/graphics/pokemon/back_pics/wailmer_back_pic.png differ diff --git a/graphics/pokemon/back_pics/wailord_back_pic.png b/graphics/pokemon/back_pics/wailord_back_pic.png new file mode 100644 index 000000000..7698ba500 Binary files /dev/null and b/graphics/pokemon/back_pics/wailord_back_pic.png differ diff --git a/graphics/pokemon/back_pics/walrein_back_pic.png b/graphics/pokemon/back_pics/walrein_back_pic.png new file mode 100644 index 000000000..c58df92b0 Binary files /dev/null and b/graphics/pokemon/back_pics/walrein_back_pic.png differ diff --git a/graphics/pokemon/back_pics/wartortle_back_pic.png b/graphics/pokemon/back_pics/wartortle_back_pic.png new file mode 100644 index 000000000..7a909f36d Binary files /dev/null and b/graphics/pokemon/back_pics/wartortle_back_pic.png differ diff --git a/graphics/pokemon/back_pics/weedle_back_pic.png b/graphics/pokemon/back_pics/weedle_back_pic.png new file mode 100644 index 000000000..3180bf513 Binary files /dev/null and b/graphics/pokemon/back_pics/weedle_back_pic.png differ diff --git a/graphics/pokemon/back_pics/weepinbell_back_pic.png b/graphics/pokemon/back_pics/weepinbell_back_pic.png new file mode 100644 index 000000000..aad38d1df Binary files /dev/null and b/graphics/pokemon/back_pics/weepinbell_back_pic.png differ diff --git a/graphics/pokemon/back_pics/weezing_back_pic.png b/graphics/pokemon/back_pics/weezing_back_pic.png new file mode 100644 index 000000000..beef9e8e4 Binary files /dev/null and b/graphics/pokemon/back_pics/weezing_back_pic.png differ diff --git a/graphics/pokemon/back_pics/whiscash_back_pic.png b/graphics/pokemon/back_pics/whiscash_back_pic.png new file mode 100644 index 000000000..6aad1817d Binary files /dev/null and b/graphics/pokemon/back_pics/whiscash_back_pic.png differ diff --git a/graphics/pokemon/back_pics/whismur_back_pic.png b/graphics/pokemon/back_pics/whismur_back_pic.png new file mode 100644 index 000000000..f13819f15 Binary files /dev/null and b/graphics/pokemon/back_pics/whismur_back_pic.png differ diff --git a/graphics/pokemon/back_pics/wigglytuff_back_pic.png b/graphics/pokemon/back_pics/wigglytuff_back_pic.png new file mode 100644 index 000000000..e63442a9d Binary files /dev/null and b/graphics/pokemon/back_pics/wigglytuff_back_pic.png differ diff --git a/graphics/pokemon/back_pics/wingull_back_pic.png b/graphics/pokemon/back_pics/wingull_back_pic.png new file mode 100644 index 000000000..3ea8c6474 Binary files /dev/null and b/graphics/pokemon/back_pics/wingull_back_pic.png differ diff --git a/graphics/pokemon/back_pics/wobbuffet_back_pic.png b/graphics/pokemon/back_pics/wobbuffet_back_pic.png new file mode 100644 index 000000000..3f22dd4a1 Binary files /dev/null and b/graphics/pokemon/back_pics/wobbuffet_back_pic.png differ diff --git a/graphics/pokemon/back_pics/wooper_back_pic.png b/graphics/pokemon/back_pics/wooper_back_pic.png new file mode 100644 index 000000000..13cb768c1 Binary files /dev/null and b/graphics/pokemon/back_pics/wooper_back_pic.png differ diff --git a/graphics/pokemon/back_pics/wurmple_back_pic.png b/graphics/pokemon/back_pics/wurmple_back_pic.png new file mode 100644 index 000000000..d6ef56dcd Binary files /dev/null and b/graphics/pokemon/back_pics/wurmple_back_pic.png differ diff --git a/graphics/pokemon/back_pics/wynaut_back_pic.png b/graphics/pokemon/back_pics/wynaut_back_pic.png new file mode 100644 index 000000000..388b1582b Binary files /dev/null and b/graphics/pokemon/back_pics/wynaut_back_pic.png differ diff --git a/graphics/pokemon/back_pics/xatu_back_pic.png b/graphics/pokemon/back_pics/xatu_back_pic.png new file mode 100644 index 000000000..b66774b13 Binary files /dev/null and b/graphics/pokemon/back_pics/xatu_back_pic.png differ diff --git a/graphics/pokemon/back_pics/yanma_back_pic.png b/graphics/pokemon/back_pics/yanma_back_pic.png new file mode 100644 index 000000000..980bc86f2 Binary files /dev/null and b/graphics/pokemon/back_pics/yanma_back_pic.png differ diff --git a/graphics/pokemon/back_pics/zangoose_back_pic.png b/graphics/pokemon/back_pics/zangoose_back_pic.png new file mode 100644 index 000000000..88357e182 Binary files /dev/null and b/graphics/pokemon/back_pics/zangoose_back_pic.png differ diff --git a/graphics/pokemon/back_pics/zapdos_back_pic.png b/graphics/pokemon/back_pics/zapdos_back_pic.png new file mode 100644 index 000000000..248366dc5 Binary files /dev/null and b/graphics/pokemon/back_pics/zapdos_back_pic.png differ diff --git a/graphics/pokemon/back_pics/zigzagoon_back_pic.png b/graphics/pokemon/back_pics/zigzagoon_back_pic.png new file mode 100644 index 000000000..cc56c5d67 Binary files /dev/null and b/graphics/pokemon/back_pics/zigzagoon_back_pic.png differ diff --git a/graphics/pokemon/back_pics/zubat_back_pic.png b/graphics/pokemon/back_pics/zubat_back_pic.png new file mode 100644 index 000000000..5589e5767 Binary files /dev/null and b/graphics/pokemon/back_pics/zubat_back_pic.png differ diff --git a/graphics/pokemon/footprints/abra_footprint.png b/graphics/pokemon/footprints/abra_footprint.png new file mode 100644 index 000000000..42b5e416f Binary files /dev/null and b/graphics/pokemon/footprints/abra_footprint.png differ diff --git a/graphics/pokemon/footprints/absol_footprint.png b/graphics/pokemon/footprints/absol_footprint.png new file mode 100644 index 000000000..da4076f78 Binary files /dev/null and b/graphics/pokemon/footprints/absol_footprint.png differ diff --git a/graphics/pokemon/footprints/aerodactyl_footprint.png b/graphics/pokemon/footprints/aerodactyl_footprint.png new file mode 100644 index 000000000..7c5d3e6c1 Binary files /dev/null and b/graphics/pokemon/footprints/aerodactyl_footprint.png differ diff --git a/graphics/pokemon/footprints/aggron_footprint.png b/graphics/pokemon/footprints/aggron_footprint.png new file mode 100644 index 000000000..3ba6d480b Binary files /dev/null and b/graphics/pokemon/footprints/aggron_footprint.png differ diff --git a/graphics/pokemon/footprints/aipom_footprint.png b/graphics/pokemon/footprints/aipom_footprint.png new file mode 100644 index 000000000..67f7f1188 Binary files /dev/null and b/graphics/pokemon/footprints/aipom_footprint.png differ diff --git a/graphics/pokemon/footprints/alakazam_footprint.png b/graphics/pokemon/footprints/alakazam_footprint.png new file mode 100644 index 000000000..e3c3795cf Binary files /dev/null and b/graphics/pokemon/footprints/alakazam_footprint.png differ diff --git a/graphics/pokemon/footprints/altaria_footprint.png b/graphics/pokemon/footprints/altaria_footprint.png new file mode 100644 index 000000000..6c65deae5 Binary files /dev/null and b/graphics/pokemon/footprints/altaria_footprint.png differ diff --git a/graphics/pokemon/footprints/ampharos_footprint.png b/graphics/pokemon/footprints/ampharos_footprint.png new file mode 100644 index 000000000..bfc2f8034 Binary files /dev/null and b/graphics/pokemon/footprints/ampharos_footprint.png differ diff --git a/graphics/pokemon/footprints/anorith_footprint.png b/graphics/pokemon/footprints/anorith_footprint.png new file mode 100644 index 000000000..c7ccf57f3 Binary files /dev/null and b/graphics/pokemon/footprints/anorith_footprint.png differ diff --git a/graphics/pokemon/footprints/arbok_footprint.png b/graphics/pokemon/footprints/arbok_footprint.png new file mode 100644 index 000000000..c7ccf57f3 Binary files /dev/null and b/graphics/pokemon/footprints/arbok_footprint.png differ diff --git a/graphics/pokemon/footprints/arcanine_footprint.png b/graphics/pokemon/footprints/arcanine_footprint.png new file mode 100644 index 000000000..96b7f93ae Binary files /dev/null and b/graphics/pokemon/footprints/arcanine_footprint.png differ diff --git a/graphics/pokemon/footprints/ariados_footprint.png b/graphics/pokemon/footprints/ariados_footprint.png new file mode 100644 index 000000000..cee3b1ba5 Binary files /dev/null and b/graphics/pokemon/footprints/ariados_footprint.png differ diff --git a/graphics/pokemon/footprints/armaldo_footprint.png b/graphics/pokemon/footprints/armaldo_footprint.png new file mode 100644 index 000000000..d12d2e42c Binary files /dev/null and b/graphics/pokemon/footprints/armaldo_footprint.png differ diff --git a/graphics/pokemon/footprints/aron_footprint.png b/graphics/pokemon/footprints/aron_footprint.png new file mode 100644 index 000000000..fe53cb5eb Binary files /dev/null and b/graphics/pokemon/footprints/aron_footprint.png differ diff --git a/graphics/pokemon/footprints/articuno_footprint.png b/graphics/pokemon/footprints/articuno_footprint.png new file mode 100644 index 000000000..e6e4fa9ef Binary files /dev/null and b/graphics/pokemon/footprints/articuno_footprint.png differ diff --git a/graphics/pokemon/footprints/azumarill_footprint.png b/graphics/pokemon/footprints/azumarill_footprint.png new file mode 100644 index 000000000..904bf941c Binary files /dev/null and b/graphics/pokemon/footprints/azumarill_footprint.png differ diff --git a/graphics/pokemon/footprints/azurill_footprint.png b/graphics/pokemon/footprints/azurill_footprint.png new file mode 100644 index 000000000..60db8e03b Binary files /dev/null and b/graphics/pokemon/footprints/azurill_footprint.png differ diff --git a/graphics/pokemon/footprints/bagon_footprint.png b/graphics/pokemon/footprints/bagon_footprint.png new file mode 100644 index 000000000..9a93a7564 Binary files /dev/null and b/graphics/pokemon/footprints/bagon_footprint.png differ diff --git a/graphics/pokemon/footprints/baltoy_footprint.png b/graphics/pokemon/footprints/baltoy_footprint.png new file mode 100644 index 000000000..6965dbe60 Binary files /dev/null and b/graphics/pokemon/footprints/baltoy_footprint.png differ diff --git a/graphics/pokemon/footprints/banette_footprint.png b/graphics/pokemon/footprints/banette_footprint.png new file mode 100644 index 000000000..a15814f2f Binary files /dev/null and b/graphics/pokemon/footprints/banette_footprint.png differ diff --git a/graphics/pokemon/footprints/barboach_footprint.png b/graphics/pokemon/footprints/barboach_footprint.png new file mode 100644 index 000000000..c7ccf57f3 Binary files /dev/null and b/graphics/pokemon/footprints/barboach_footprint.png differ diff --git a/graphics/pokemon/footprints/bayleef_footprint.png b/graphics/pokemon/footprints/bayleef_footprint.png new file mode 100644 index 000000000..04b375a7a Binary files /dev/null and b/graphics/pokemon/footprints/bayleef_footprint.png differ diff --git a/graphics/pokemon/footprints/beautifly_footprint.png b/graphics/pokemon/footprints/beautifly_footprint.png new file mode 100644 index 000000000..49175cb02 Binary files /dev/null and b/graphics/pokemon/footprints/beautifly_footprint.png differ diff --git a/graphics/pokemon/footprints/beedrill_footprint.png b/graphics/pokemon/footprints/beedrill_footprint.png new file mode 100644 index 000000000..5c3f21090 Binary files /dev/null and b/graphics/pokemon/footprints/beedrill_footprint.png differ diff --git a/graphics/pokemon/footprints/beldum_footprint.png b/graphics/pokemon/footprints/beldum_footprint.png new file mode 100644 index 000000000..0554eedfe Binary files /dev/null and b/graphics/pokemon/footprints/beldum_footprint.png differ diff --git a/graphics/pokemon/footprints/bellossom_footprint.png b/graphics/pokemon/footprints/bellossom_footprint.png new file mode 100644 index 000000000..c7ccf57f3 Binary files /dev/null and b/graphics/pokemon/footprints/bellossom_footprint.png differ diff --git a/graphics/pokemon/footprints/bellsprout_footprint.png b/graphics/pokemon/footprints/bellsprout_footprint.png new file mode 100644 index 000000000..8fcf4f4f4 Binary files /dev/null and b/graphics/pokemon/footprints/bellsprout_footprint.png differ diff --git a/graphics/pokemon/footprints/blastoise_footprint.png b/graphics/pokemon/footprints/blastoise_footprint.png new file mode 100644 index 000000000..b881f9270 Binary files /dev/null and b/graphics/pokemon/footprints/blastoise_footprint.png differ diff --git a/graphics/pokemon/footprints/blaziken_footprint.png b/graphics/pokemon/footprints/blaziken_footprint.png new file mode 100644 index 000000000..cf18a353a Binary files /dev/null and b/graphics/pokemon/footprints/blaziken_footprint.png differ diff --git a/graphics/pokemon/footprints/blissey_footprint.png b/graphics/pokemon/footprints/blissey_footprint.png new file mode 100644 index 000000000..3da3dbf93 Binary files /dev/null and b/graphics/pokemon/footprints/blissey_footprint.png differ diff --git a/graphics/pokemon/footprints/breloom_footprint.png b/graphics/pokemon/footprints/breloom_footprint.png new file mode 100644 index 000000000..98d920669 Binary files /dev/null and b/graphics/pokemon/footprints/breloom_footprint.png differ diff --git a/graphics/pokemon/footprints/bulbasaur_footprint.png b/graphics/pokemon/footprints/bulbasaur_footprint.png new file mode 100644 index 000000000..8e9ab9c6b Binary files /dev/null and b/graphics/pokemon/footprints/bulbasaur_footprint.png differ diff --git a/graphics/pokemon/footprints/butterfree_footprint.png b/graphics/pokemon/footprints/butterfree_footprint.png new file mode 100644 index 000000000..b2740e9cc Binary files /dev/null and b/graphics/pokemon/footprints/butterfree_footprint.png differ diff --git a/graphics/pokemon/footprints/cacnea_footprint.png b/graphics/pokemon/footprints/cacnea_footprint.png new file mode 100644 index 000000000..00b6a8a7e Binary files /dev/null and b/graphics/pokemon/footprints/cacnea_footprint.png differ diff --git a/graphics/pokemon/footprints/cacturne_footprint.png b/graphics/pokemon/footprints/cacturne_footprint.png new file mode 100644 index 000000000..5441f92d6 Binary files /dev/null and b/graphics/pokemon/footprints/cacturne_footprint.png differ diff --git a/graphics/pokemon/footprints/camerupt_footprint.png b/graphics/pokemon/footprints/camerupt_footprint.png new file mode 100644 index 000000000..40708b8a1 Binary files /dev/null and b/graphics/pokemon/footprints/camerupt_footprint.png differ diff --git a/graphics/pokemon/footprints/carvanha_footprint.png b/graphics/pokemon/footprints/carvanha_footprint.png new file mode 100644 index 000000000..c7ccf57f3 Binary files /dev/null and b/graphics/pokemon/footprints/carvanha_footprint.png differ diff --git a/graphics/pokemon/footprints/cascoon_footprint.png b/graphics/pokemon/footprints/cascoon_footprint.png new file mode 100644 index 000000000..c7ccf57f3 Binary files /dev/null and b/graphics/pokemon/footprints/cascoon_footprint.png differ diff --git a/graphics/pokemon/footprints/castform_footprint.png b/graphics/pokemon/footprints/castform_footprint.png new file mode 100644 index 000000000..c7ccf57f3 Binary files /dev/null and b/graphics/pokemon/footprints/castform_footprint.png differ diff --git a/graphics/pokemon/footprints/caterpie_footprint.png b/graphics/pokemon/footprints/caterpie_footprint.png new file mode 100644 index 000000000..c1c0058e7 Binary files /dev/null and b/graphics/pokemon/footprints/caterpie_footprint.png differ diff --git a/graphics/pokemon/footprints/celebi_footprint.png b/graphics/pokemon/footprints/celebi_footprint.png new file mode 100644 index 000000000..11aa4301c Binary files /dev/null and b/graphics/pokemon/footprints/celebi_footprint.png differ diff --git a/graphics/pokemon/footprints/chansey_footprint.png b/graphics/pokemon/footprints/chansey_footprint.png new file mode 100644 index 000000000..17893b9fb Binary files /dev/null and b/graphics/pokemon/footprints/chansey_footprint.png differ diff --git a/graphics/pokemon/footprints/charizard_footprint.png b/graphics/pokemon/footprints/charizard_footprint.png new file mode 100644 index 000000000..e69f38392 Binary files /dev/null and b/graphics/pokemon/footprints/charizard_footprint.png differ diff --git a/graphics/pokemon/footprints/charmander_footprint.png b/graphics/pokemon/footprints/charmander_footprint.png new file mode 100644 index 000000000..2f7723621 Binary files /dev/null and b/graphics/pokemon/footprints/charmander_footprint.png differ diff --git a/graphics/pokemon/footprints/charmeleon_footprint.png b/graphics/pokemon/footprints/charmeleon_footprint.png new file mode 100644 index 000000000..6ec15ee20 Binary files /dev/null and b/graphics/pokemon/footprints/charmeleon_footprint.png differ diff --git a/graphics/pokemon/footprints/chikorita_footprint.png b/graphics/pokemon/footprints/chikorita_footprint.png new file mode 100644 index 000000000..3ac4abd9f Binary files /dev/null and b/graphics/pokemon/footprints/chikorita_footprint.png differ diff --git a/graphics/pokemon/footprints/chimecho_footprint.png b/graphics/pokemon/footprints/chimecho_footprint.png new file mode 100644 index 000000000..c7ccf57f3 Binary files /dev/null and b/graphics/pokemon/footprints/chimecho_footprint.png differ diff --git a/graphics/pokemon/footprints/chinchou_footprint.png b/graphics/pokemon/footprints/chinchou_footprint.png new file mode 100644 index 000000000..c7ccf57f3 Binary files /dev/null and b/graphics/pokemon/footprints/chinchou_footprint.png differ diff --git a/graphics/pokemon/footprints/clamperl_footprint.png b/graphics/pokemon/footprints/clamperl_footprint.png new file mode 100644 index 000000000..c7ccf57f3 Binary files /dev/null and b/graphics/pokemon/footprints/clamperl_footprint.png differ diff --git a/graphics/pokemon/footprints/claydol_footprint.png b/graphics/pokemon/footprints/claydol_footprint.png new file mode 100644 index 000000000..2f0bca1ac Binary files /dev/null and b/graphics/pokemon/footprints/claydol_footprint.png differ diff --git a/graphics/pokemon/footprints/clefable_footprint.png b/graphics/pokemon/footprints/clefable_footprint.png new file mode 100644 index 000000000..5ff3e19a1 Binary files /dev/null and b/graphics/pokemon/footprints/clefable_footprint.png differ diff --git a/graphics/pokemon/footprints/clefairy_footprint.png b/graphics/pokemon/footprints/clefairy_footprint.png new file mode 100644 index 000000000..85c25a5dc Binary files /dev/null and b/graphics/pokemon/footprints/clefairy_footprint.png differ diff --git a/graphics/pokemon/footprints/cleffa_footprint.png b/graphics/pokemon/footprints/cleffa_footprint.png new file mode 100644 index 000000000..4bf9339ae Binary files /dev/null and b/graphics/pokemon/footprints/cleffa_footprint.png differ diff --git a/graphics/pokemon/footprints/cloyster_footprint.png b/graphics/pokemon/footprints/cloyster_footprint.png new file mode 100644 index 000000000..c7ccf57f3 Binary files /dev/null and b/graphics/pokemon/footprints/cloyster_footprint.png differ diff --git a/graphics/pokemon/footprints/combusken_footprint.png b/graphics/pokemon/footprints/combusken_footprint.png new file mode 100644 index 000000000..6b66429d8 Binary files /dev/null and b/graphics/pokemon/footprints/combusken_footprint.png differ diff --git a/graphics/pokemon/footprints/corphish_footprint.png b/graphics/pokemon/footprints/corphish_footprint.png new file mode 100644 index 000000000..f624724c7 Binary files /dev/null and b/graphics/pokemon/footprints/corphish_footprint.png differ diff --git a/graphics/pokemon/footprints/corsola_footprint.png b/graphics/pokemon/footprints/corsola_footprint.png new file mode 100644 index 000000000..bae0aaf92 Binary files /dev/null and b/graphics/pokemon/footprints/corsola_footprint.png differ diff --git a/graphics/pokemon/footprints/cradily_footprint.png b/graphics/pokemon/footprints/cradily_footprint.png new file mode 100644 index 000000000..998229dc7 Binary files /dev/null and b/graphics/pokemon/footprints/cradily_footprint.png differ diff --git a/graphics/pokemon/footprints/crawdaunt_footprint.png b/graphics/pokemon/footprints/crawdaunt_footprint.png new file mode 100644 index 000000000..9169e2807 Binary files /dev/null and b/graphics/pokemon/footprints/crawdaunt_footprint.png differ diff --git a/graphics/pokemon/footprints/crobat_footprint.png b/graphics/pokemon/footprints/crobat_footprint.png new file mode 100644 index 000000000..c7ccf57f3 Binary files /dev/null and b/graphics/pokemon/footprints/crobat_footprint.png differ diff --git a/graphics/pokemon/footprints/croconaw_footprint.png b/graphics/pokemon/footprints/croconaw_footprint.png new file mode 100644 index 000000000..43da8e68e Binary files /dev/null and b/graphics/pokemon/footprints/croconaw_footprint.png differ diff --git a/graphics/pokemon/footprints/cubone_footprint.png b/graphics/pokemon/footprints/cubone_footprint.png new file mode 100644 index 000000000..21deee1a6 Binary files /dev/null and b/graphics/pokemon/footprints/cubone_footprint.png differ diff --git a/graphics/pokemon/footprints/cyndaquil_footprint.png b/graphics/pokemon/footprints/cyndaquil_footprint.png new file mode 100644 index 000000000..6413cbaae Binary files /dev/null and b/graphics/pokemon/footprints/cyndaquil_footprint.png differ diff --git a/graphics/pokemon/footprints/delcatty_footprint.png b/graphics/pokemon/footprints/delcatty_footprint.png new file mode 100644 index 000000000..5ff40e5a0 Binary files /dev/null and b/graphics/pokemon/footprints/delcatty_footprint.png differ diff --git a/graphics/pokemon/footprints/delibird_footprint.png b/graphics/pokemon/footprints/delibird_footprint.png new file mode 100644 index 000000000..e7348586e Binary files /dev/null and b/graphics/pokemon/footprints/delibird_footprint.png differ diff --git a/graphics/pokemon/footprints/deoxys_footprint.png b/graphics/pokemon/footprints/deoxys_footprint.png new file mode 100644 index 000000000..ea97e4014 Binary files /dev/null and b/graphics/pokemon/footprints/deoxys_footprint.png differ diff --git a/graphics/pokemon/footprints/dewgong_footprint.png b/graphics/pokemon/footprints/dewgong_footprint.png new file mode 100644 index 000000000..c7ccf57f3 Binary files /dev/null and b/graphics/pokemon/footprints/dewgong_footprint.png differ diff --git a/graphics/pokemon/footprints/diglett_footprint.png b/graphics/pokemon/footprints/diglett_footprint.png new file mode 100644 index 000000000..c7ccf57f3 Binary files /dev/null and b/graphics/pokemon/footprints/diglett_footprint.png differ diff --git a/graphics/pokemon/footprints/ditto_footprint.png b/graphics/pokemon/footprints/ditto_footprint.png new file mode 100644 index 000000000..c7ccf57f3 Binary files /dev/null and b/graphics/pokemon/footprints/ditto_footprint.png differ diff --git a/graphics/pokemon/footprints/dodrio_footprint.png b/graphics/pokemon/footprints/dodrio_footprint.png new file mode 100644 index 000000000..34f85bfb3 Binary files /dev/null and b/graphics/pokemon/footprints/dodrio_footprint.png differ diff --git a/graphics/pokemon/footprints/doduo_footprint.png b/graphics/pokemon/footprints/doduo_footprint.png new file mode 100644 index 000000000..0710eca52 Binary files /dev/null and b/graphics/pokemon/footprints/doduo_footprint.png differ diff --git a/graphics/pokemon/footprints/donphan_footprint.png b/graphics/pokemon/footprints/donphan_footprint.png new file mode 100644 index 000000000..394cf6457 Binary files /dev/null and b/graphics/pokemon/footprints/donphan_footprint.png differ diff --git a/graphics/pokemon/footprints/dragonair_footprint.png b/graphics/pokemon/footprints/dragonair_footprint.png new file mode 100644 index 000000000..c7ccf57f3 Binary files /dev/null and b/graphics/pokemon/footprints/dragonair_footprint.png differ diff --git a/graphics/pokemon/footprints/dragonite_footprint.png b/graphics/pokemon/footprints/dragonite_footprint.png new file mode 100644 index 000000000..1f41296b0 Binary files /dev/null and b/graphics/pokemon/footprints/dragonite_footprint.png differ diff --git a/graphics/pokemon/footprints/dratini_footprint.png b/graphics/pokemon/footprints/dratini_footprint.png new file mode 100644 index 000000000..c7ccf57f3 Binary files /dev/null and b/graphics/pokemon/footprints/dratini_footprint.png differ diff --git a/graphics/pokemon/footprints/drowzee_footprint.png b/graphics/pokemon/footprints/drowzee_footprint.png new file mode 100644 index 000000000..23293423e Binary files /dev/null and b/graphics/pokemon/footprints/drowzee_footprint.png differ diff --git a/graphics/pokemon/footprints/dugtrio_footprint.png b/graphics/pokemon/footprints/dugtrio_footprint.png new file mode 100644 index 000000000..c7ccf57f3 Binary files /dev/null and b/graphics/pokemon/footprints/dugtrio_footprint.png differ diff --git a/graphics/pokemon/footprints/dunsparce_footprint.png b/graphics/pokemon/footprints/dunsparce_footprint.png new file mode 100644 index 000000000..c7ccf57f3 Binary files /dev/null and b/graphics/pokemon/footprints/dunsparce_footprint.png differ diff --git a/graphics/pokemon/footprints/dusclops_footprint.png b/graphics/pokemon/footprints/dusclops_footprint.png new file mode 100644 index 000000000..752ffa353 Binary files /dev/null and b/graphics/pokemon/footprints/dusclops_footprint.png differ diff --git a/graphics/pokemon/footprints/duskull_footprint.png b/graphics/pokemon/footprints/duskull_footprint.png new file mode 100644 index 000000000..c7ccf57f3 Binary files /dev/null and b/graphics/pokemon/footprints/duskull_footprint.png differ diff --git a/graphics/pokemon/footprints/dustox_footprint.png b/graphics/pokemon/footprints/dustox_footprint.png new file mode 100644 index 000000000..f7cc85bf9 Binary files /dev/null and b/graphics/pokemon/footprints/dustox_footprint.png differ diff --git a/graphics/pokemon/footprints/eevee_footprint.png b/graphics/pokemon/footprints/eevee_footprint.png new file mode 100644 index 000000000..4e4c01c9f Binary files /dev/null and b/graphics/pokemon/footprints/eevee_footprint.png differ diff --git a/graphics/pokemon/footprints/ekans_footprint.png b/graphics/pokemon/footprints/ekans_footprint.png new file mode 100644 index 000000000..c7ccf57f3 Binary files /dev/null and b/graphics/pokemon/footprints/ekans_footprint.png differ diff --git a/graphics/pokemon/footprints/electabuzz_footprint.png b/graphics/pokemon/footprints/electabuzz_footprint.png new file mode 100644 index 000000000..b2b4de625 Binary files /dev/null and b/graphics/pokemon/footprints/electabuzz_footprint.png differ diff --git a/graphics/pokemon/footprints/electrike_footprint.png b/graphics/pokemon/footprints/electrike_footprint.png new file mode 100644 index 000000000..8dd914b35 Binary files /dev/null and b/graphics/pokemon/footprints/electrike_footprint.png differ diff --git a/graphics/pokemon/footprints/electrode_footprint.png b/graphics/pokemon/footprints/electrode_footprint.png new file mode 100644 index 000000000..c7ccf57f3 Binary files /dev/null and b/graphics/pokemon/footprints/electrode_footprint.png differ diff --git a/graphics/pokemon/footprints/elekid_footprint.png b/graphics/pokemon/footprints/elekid_footprint.png new file mode 100644 index 000000000..15547931c Binary files /dev/null and b/graphics/pokemon/footprints/elekid_footprint.png differ diff --git a/graphics/pokemon/footprints/entei_footprint.png b/graphics/pokemon/footprints/entei_footprint.png new file mode 100644 index 000000000..7336df599 Binary files /dev/null and b/graphics/pokemon/footprints/entei_footprint.png differ diff --git a/graphics/pokemon/footprints/espeon_footprint.png b/graphics/pokemon/footprints/espeon_footprint.png new file mode 100644 index 000000000..c7b17a4ad Binary files /dev/null and b/graphics/pokemon/footprints/espeon_footprint.png differ diff --git a/graphics/pokemon/footprints/exeggcute_footprint.png b/graphics/pokemon/footprints/exeggcute_footprint.png new file mode 100644 index 000000000..c7ccf57f3 Binary files /dev/null and b/graphics/pokemon/footprints/exeggcute_footprint.png differ diff --git a/graphics/pokemon/footprints/exeggutor_footprint.png b/graphics/pokemon/footprints/exeggutor_footprint.png new file mode 100644 index 000000000..6df7122f8 Binary files /dev/null and b/graphics/pokemon/footprints/exeggutor_footprint.png differ diff --git a/graphics/pokemon/footprints/exploud_footprint.png b/graphics/pokemon/footprints/exploud_footprint.png new file mode 100644 index 000000000..b27283a14 Binary files /dev/null and b/graphics/pokemon/footprints/exploud_footprint.png differ diff --git a/graphics/pokemon/footprints/farfetch_d_footprint.png b/graphics/pokemon/footprints/farfetch_d_footprint.png new file mode 100644 index 000000000..2f08f732d Binary files /dev/null and b/graphics/pokemon/footprints/farfetch_d_footprint.png differ diff --git a/graphics/pokemon/footprints/fearow_footprint.png b/graphics/pokemon/footprints/fearow_footprint.png new file mode 100644 index 000000000..04ea7924d Binary files /dev/null and b/graphics/pokemon/footprints/fearow_footprint.png differ diff --git a/graphics/pokemon/footprints/feebas_footprint.png b/graphics/pokemon/footprints/feebas_footprint.png new file mode 100644 index 000000000..c7ccf57f3 Binary files /dev/null and b/graphics/pokemon/footprints/feebas_footprint.png differ diff --git a/graphics/pokemon/footprints/feraligatr_footprint.png b/graphics/pokemon/footprints/feraligatr_footprint.png new file mode 100644 index 000000000..efe894289 Binary files /dev/null and b/graphics/pokemon/footprints/feraligatr_footprint.png differ diff --git a/graphics/pokemon/footprints/flaaffy_footprint.png b/graphics/pokemon/footprints/flaaffy_footprint.png new file mode 100644 index 000000000..d1695ec80 Binary files /dev/null and b/graphics/pokemon/footprints/flaaffy_footprint.png differ diff --git a/graphics/pokemon/footprints/flareon_footprint.png b/graphics/pokemon/footprints/flareon_footprint.png new file mode 100644 index 000000000..db5d37ed4 Binary files /dev/null and b/graphics/pokemon/footprints/flareon_footprint.png differ diff --git a/graphics/pokemon/footprints/flygon_footprint.png b/graphics/pokemon/footprints/flygon_footprint.png new file mode 100644 index 000000000..5af877878 Binary files /dev/null and b/graphics/pokemon/footprints/flygon_footprint.png differ diff --git a/graphics/pokemon/footprints/forretress_footprint.png b/graphics/pokemon/footprints/forretress_footprint.png new file mode 100644 index 000000000..c7ccf57f3 Binary files /dev/null and b/graphics/pokemon/footprints/forretress_footprint.png differ diff --git a/graphics/pokemon/footprints/furret_footprint.png b/graphics/pokemon/footprints/furret_footprint.png new file mode 100644 index 000000000..225445fb3 Binary files /dev/null and b/graphics/pokemon/footprints/furret_footprint.png differ diff --git a/graphics/pokemon/footprints/gardevoir_footprint.png b/graphics/pokemon/footprints/gardevoir_footprint.png new file mode 100644 index 000000000..fd9f4755b Binary files /dev/null and b/graphics/pokemon/footprints/gardevoir_footprint.png differ diff --git a/graphics/pokemon/footprints/gastly_footprint.png b/graphics/pokemon/footprints/gastly_footprint.png new file mode 100644 index 000000000..c7ccf57f3 Binary files /dev/null and b/graphics/pokemon/footprints/gastly_footprint.png differ diff --git a/graphics/pokemon/footprints/gengar_footprint.png b/graphics/pokemon/footprints/gengar_footprint.png new file mode 100644 index 000000000..0eb8fcebf Binary files /dev/null and b/graphics/pokemon/footprints/gengar_footprint.png differ diff --git a/graphics/pokemon/footprints/geodude_footprint.png b/graphics/pokemon/footprints/geodude_footprint.png new file mode 100644 index 000000000..c7ccf57f3 Binary files /dev/null and b/graphics/pokemon/footprints/geodude_footprint.png differ diff --git a/graphics/pokemon/footprints/girafarig_footprint.png b/graphics/pokemon/footprints/girafarig_footprint.png new file mode 100644 index 000000000..f7af3f622 Binary files /dev/null and b/graphics/pokemon/footprints/girafarig_footprint.png differ diff --git a/graphics/pokemon/footprints/glalie_footprint.png b/graphics/pokemon/footprints/glalie_footprint.png new file mode 100644 index 000000000..c7ccf57f3 Binary files /dev/null and b/graphics/pokemon/footprints/glalie_footprint.png differ diff --git a/graphics/pokemon/footprints/gligar_footprint.png b/graphics/pokemon/footprints/gligar_footprint.png new file mode 100644 index 000000000..3ca9864f0 Binary files /dev/null and b/graphics/pokemon/footprints/gligar_footprint.png differ diff --git a/graphics/pokemon/footprints/gloom_footprint.png b/graphics/pokemon/footprints/gloom_footprint.png new file mode 100644 index 000000000..7e9c265e8 Binary files /dev/null and b/graphics/pokemon/footprints/gloom_footprint.png differ diff --git a/graphics/pokemon/footprints/golbat_footprint.png b/graphics/pokemon/footprints/golbat_footprint.png new file mode 100644 index 000000000..65c126fb3 Binary files /dev/null and b/graphics/pokemon/footprints/golbat_footprint.png differ diff --git a/graphics/pokemon/footprints/goldeen_footprint.png b/graphics/pokemon/footprints/goldeen_footprint.png new file mode 100644 index 000000000..c7ccf57f3 Binary files /dev/null and b/graphics/pokemon/footprints/goldeen_footprint.png differ diff --git a/graphics/pokemon/footprints/golduck_footprint.png b/graphics/pokemon/footprints/golduck_footprint.png new file mode 100644 index 000000000..63ba752e4 Binary files /dev/null and b/graphics/pokemon/footprints/golduck_footprint.png differ diff --git a/graphics/pokemon/footprints/golem_footprint.png b/graphics/pokemon/footprints/golem_footprint.png new file mode 100644 index 000000000..8ddc6345c Binary files /dev/null and b/graphics/pokemon/footprints/golem_footprint.png differ diff --git a/graphics/pokemon/footprints/gorebyss_footprint.png b/graphics/pokemon/footprints/gorebyss_footprint.png new file mode 100644 index 000000000..c7ccf57f3 Binary files /dev/null and b/graphics/pokemon/footprints/gorebyss_footprint.png differ diff --git a/graphics/pokemon/footprints/granbull_footprint.png b/graphics/pokemon/footprints/granbull_footprint.png new file mode 100644 index 000000000..010b5fb67 Binary files /dev/null and b/graphics/pokemon/footprints/granbull_footprint.png differ diff --git a/graphics/pokemon/footprints/graveler_footprint.png b/graphics/pokemon/footprints/graveler_footprint.png new file mode 100644 index 000000000..c836ad3f4 Binary files /dev/null and b/graphics/pokemon/footprints/graveler_footprint.png differ diff --git a/graphics/pokemon/footprints/grimer_footprint.png b/graphics/pokemon/footprints/grimer_footprint.png new file mode 100644 index 000000000..c7ccf57f3 Binary files /dev/null and b/graphics/pokemon/footprints/grimer_footprint.png differ diff --git a/graphics/pokemon/footprints/groudon_footprint.png b/graphics/pokemon/footprints/groudon_footprint.png new file mode 100644 index 000000000..cb80ba48d Binary files /dev/null and b/graphics/pokemon/footprints/groudon_footprint.png differ diff --git a/graphics/pokemon/footprints/grovyle_footprint.png b/graphics/pokemon/footprints/grovyle_footprint.png new file mode 100644 index 000000000..c78ea507c Binary files /dev/null and b/graphics/pokemon/footprints/grovyle_footprint.png differ diff --git a/graphics/pokemon/footprints/growlithe_footprint.png b/graphics/pokemon/footprints/growlithe_footprint.png new file mode 100644 index 000000000..2517cdcba Binary files /dev/null and b/graphics/pokemon/footprints/growlithe_footprint.png differ diff --git a/graphics/pokemon/footprints/grumpig_footprint.png b/graphics/pokemon/footprints/grumpig_footprint.png new file mode 100644 index 000000000..ddff0e500 Binary files /dev/null and b/graphics/pokemon/footprints/grumpig_footprint.png differ diff --git a/graphics/pokemon/footprints/gulpin_footprint.png b/graphics/pokemon/footprints/gulpin_footprint.png new file mode 100644 index 000000000..c7ccf57f3 Binary files /dev/null and b/graphics/pokemon/footprints/gulpin_footprint.png differ diff --git a/graphics/pokemon/footprints/gyarados_footprint.png b/graphics/pokemon/footprints/gyarados_footprint.png new file mode 100644 index 000000000..c7ccf57f3 Binary files /dev/null and b/graphics/pokemon/footprints/gyarados_footprint.png differ diff --git a/graphics/pokemon/footprints/hariyama_footprint.png b/graphics/pokemon/footprints/hariyama_footprint.png new file mode 100644 index 000000000..ab5d9f369 Binary files /dev/null and b/graphics/pokemon/footprints/hariyama_footprint.png differ diff --git a/graphics/pokemon/footprints/haunter_footprint.png b/graphics/pokemon/footprints/haunter_footprint.png new file mode 100644 index 000000000..c7ccf57f3 Binary files /dev/null and b/graphics/pokemon/footprints/haunter_footprint.png differ diff --git a/graphics/pokemon/footprints/heracross_footprint.png b/graphics/pokemon/footprints/heracross_footprint.png new file mode 100644 index 000000000..a740a17c9 Binary files /dev/null and b/graphics/pokemon/footprints/heracross_footprint.png differ diff --git a/graphics/pokemon/footprints/hitmonchan_footprint.png b/graphics/pokemon/footprints/hitmonchan_footprint.png new file mode 100644 index 000000000..cfd1efd54 Binary files /dev/null and b/graphics/pokemon/footprints/hitmonchan_footprint.png differ diff --git a/graphics/pokemon/footprints/hitmonlee_footprint.png b/graphics/pokemon/footprints/hitmonlee_footprint.png new file mode 100644 index 000000000..505120110 Binary files /dev/null and b/graphics/pokemon/footprints/hitmonlee_footprint.png differ diff --git a/graphics/pokemon/footprints/hitmontop_footprint.png b/graphics/pokemon/footprints/hitmontop_footprint.png new file mode 100644 index 000000000..ba8c1cca2 Binary files /dev/null and b/graphics/pokemon/footprints/hitmontop_footprint.png differ diff --git a/graphics/pokemon/footprints/ho_oh_footprint.png b/graphics/pokemon/footprints/ho_oh_footprint.png new file mode 100644 index 000000000..adceb3878 Binary files /dev/null and b/graphics/pokemon/footprints/ho_oh_footprint.png differ diff --git a/graphics/pokemon/footprints/hoothoot_footprint.png b/graphics/pokemon/footprints/hoothoot_footprint.png new file mode 100644 index 000000000..1eacf9116 Binary files /dev/null and b/graphics/pokemon/footprints/hoothoot_footprint.png differ diff --git a/graphics/pokemon/footprints/hoppip_footprint.png b/graphics/pokemon/footprints/hoppip_footprint.png new file mode 100644 index 000000000..0be22ed86 Binary files /dev/null and b/graphics/pokemon/footprints/hoppip_footprint.png differ diff --git a/graphics/pokemon/footprints/horsea_footprint.png b/graphics/pokemon/footprints/horsea_footprint.png new file mode 100644 index 000000000..c7ccf57f3 Binary files /dev/null and b/graphics/pokemon/footprints/horsea_footprint.png differ diff --git a/graphics/pokemon/footprints/houndoom_footprint.png b/graphics/pokemon/footprints/houndoom_footprint.png new file mode 100644 index 000000000..b1f2c80f4 Binary files /dev/null and b/graphics/pokemon/footprints/houndoom_footprint.png differ diff --git a/graphics/pokemon/footprints/houndour_footprint.png b/graphics/pokemon/footprints/houndour_footprint.png new file mode 100644 index 000000000..3f8161431 Binary files /dev/null and b/graphics/pokemon/footprints/houndour_footprint.png differ diff --git a/graphics/pokemon/footprints/huntail_footprint.png b/graphics/pokemon/footprints/huntail_footprint.png new file mode 100644 index 000000000..c7ccf57f3 Binary files /dev/null and b/graphics/pokemon/footprints/huntail_footprint.png differ diff --git a/graphics/pokemon/footprints/hypno_footprint.png b/graphics/pokemon/footprints/hypno_footprint.png new file mode 100644 index 000000000..51f734973 Binary files /dev/null and b/graphics/pokemon/footprints/hypno_footprint.png differ diff --git a/graphics/pokemon/footprints/igglybuff_footprint.png b/graphics/pokemon/footprints/igglybuff_footprint.png new file mode 100644 index 000000000..bbb7352a6 Binary files /dev/null and b/graphics/pokemon/footprints/igglybuff_footprint.png differ diff --git a/graphics/pokemon/footprints/illumise_footprint.png b/graphics/pokemon/footprints/illumise_footprint.png new file mode 100644 index 000000000..451d532b2 Binary files /dev/null and b/graphics/pokemon/footprints/illumise_footprint.png differ diff --git a/graphics/pokemon/footprints/ivysaur_footprint.png b/graphics/pokemon/footprints/ivysaur_footprint.png new file mode 100644 index 000000000..29206b935 Binary files /dev/null and b/graphics/pokemon/footprints/ivysaur_footprint.png differ diff --git a/graphics/pokemon/footprints/jigglypuff_footprint.png b/graphics/pokemon/footprints/jigglypuff_footprint.png new file mode 100644 index 000000000..59b5f1171 Binary files /dev/null and b/graphics/pokemon/footprints/jigglypuff_footprint.png differ diff --git a/graphics/pokemon/footprints/jirachi_footprint.png b/graphics/pokemon/footprints/jirachi_footprint.png new file mode 100644 index 000000000..856bb5faa Binary files /dev/null and b/graphics/pokemon/footprints/jirachi_footprint.png differ diff --git a/graphics/pokemon/footprints/jolteon_footprint.png b/graphics/pokemon/footprints/jolteon_footprint.png new file mode 100644 index 000000000..d1e9477b3 Binary files /dev/null and b/graphics/pokemon/footprints/jolteon_footprint.png differ diff --git a/graphics/pokemon/footprints/jumpluff_footprint.png b/graphics/pokemon/footprints/jumpluff_footprint.png new file mode 100644 index 000000000..9cd0f5938 Binary files /dev/null and b/graphics/pokemon/footprints/jumpluff_footprint.png differ diff --git a/graphics/pokemon/footprints/jynx_footprint.png b/graphics/pokemon/footprints/jynx_footprint.png new file mode 100644 index 000000000..c7ccf57f3 Binary files /dev/null and b/graphics/pokemon/footprints/jynx_footprint.png differ diff --git a/graphics/pokemon/footprints/kabuto_footprint.png b/graphics/pokemon/footprints/kabuto_footprint.png new file mode 100644 index 000000000..6965dbe60 Binary files /dev/null and b/graphics/pokemon/footprints/kabuto_footprint.png differ diff --git a/graphics/pokemon/footprints/kabutops_footprint.png b/graphics/pokemon/footprints/kabutops_footprint.png new file mode 100644 index 000000000..127b741d8 Binary files /dev/null and b/graphics/pokemon/footprints/kabutops_footprint.png differ diff --git a/graphics/pokemon/footprints/kadabra_footprint.png b/graphics/pokemon/footprints/kadabra_footprint.png new file mode 100644 index 000000000..a699f2987 Binary files /dev/null and b/graphics/pokemon/footprints/kadabra_footprint.png differ diff --git a/graphics/pokemon/footprints/kakuna_footprint.png b/graphics/pokemon/footprints/kakuna_footprint.png new file mode 100644 index 000000000..c7ccf57f3 Binary files /dev/null and b/graphics/pokemon/footprints/kakuna_footprint.png differ diff --git a/graphics/pokemon/footprints/kangaskhan_footprint.png b/graphics/pokemon/footprints/kangaskhan_footprint.png new file mode 100644 index 000000000..7753a4a71 Binary files /dev/null and b/graphics/pokemon/footprints/kangaskhan_footprint.png differ diff --git a/graphics/pokemon/footprints/kecleon_footprint.png b/graphics/pokemon/footprints/kecleon_footprint.png new file mode 100644 index 000000000..3c6968437 Binary files /dev/null and b/graphics/pokemon/footprints/kecleon_footprint.png differ diff --git a/graphics/pokemon/footprints/kingdra_footprint.png b/graphics/pokemon/footprints/kingdra_footprint.png new file mode 100644 index 000000000..c7ccf57f3 Binary files /dev/null and b/graphics/pokemon/footprints/kingdra_footprint.png differ diff --git a/graphics/pokemon/footprints/kingler_footprint.png b/graphics/pokemon/footprints/kingler_footprint.png new file mode 100644 index 000000000..b75db30dc Binary files /dev/null and b/graphics/pokemon/footprints/kingler_footprint.png differ diff --git a/graphics/pokemon/footprints/kirlia_footprint.png b/graphics/pokemon/footprints/kirlia_footprint.png new file mode 100644 index 000000000..c1c0058e7 Binary files /dev/null and b/graphics/pokemon/footprints/kirlia_footprint.png differ diff --git a/graphics/pokemon/footprints/koffing_footprint.png b/graphics/pokemon/footprints/koffing_footprint.png new file mode 100644 index 000000000..c7ccf57f3 Binary files /dev/null and b/graphics/pokemon/footprints/koffing_footprint.png differ diff --git a/graphics/pokemon/footprints/krabby_footprint.png b/graphics/pokemon/footprints/krabby_footprint.png new file mode 100644 index 000000000..eae28fe5e Binary files /dev/null and b/graphics/pokemon/footprints/krabby_footprint.png differ diff --git a/graphics/pokemon/footprints/kyogre_footprint.png b/graphics/pokemon/footprints/kyogre_footprint.png new file mode 100644 index 000000000..8d58ee462 Binary files /dev/null and b/graphics/pokemon/footprints/kyogre_footprint.png differ diff --git a/graphics/pokemon/footprints/lairon_footprint.png b/graphics/pokemon/footprints/lairon_footprint.png new file mode 100644 index 000000000..9a6527c1c Binary files /dev/null and b/graphics/pokemon/footprints/lairon_footprint.png differ diff --git a/graphics/pokemon/footprints/lanturn_footprint.png b/graphics/pokemon/footprints/lanturn_footprint.png new file mode 100644 index 000000000..c7ccf57f3 Binary files /dev/null and b/graphics/pokemon/footprints/lanturn_footprint.png differ diff --git a/graphics/pokemon/footprints/lapras_footprint.png b/graphics/pokemon/footprints/lapras_footprint.png new file mode 100644 index 000000000..c7ccf57f3 Binary files /dev/null and b/graphics/pokemon/footprints/lapras_footprint.png differ diff --git a/graphics/pokemon/footprints/larvitar_footprint.png b/graphics/pokemon/footprints/larvitar_footprint.png new file mode 100644 index 000000000..a31e8d7f3 Binary files /dev/null and b/graphics/pokemon/footprints/larvitar_footprint.png differ diff --git a/graphics/pokemon/footprints/latias_footprint.png b/graphics/pokemon/footprints/latias_footprint.png new file mode 100644 index 000000000..0419630c1 Binary files /dev/null and b/graphics/pokemon/footprints/latias_footprint.png differ diff --git a/graphics/pokemon/footprints/latios_footprint.png b/graphics/pokemon/footprints/latios_footprint.png new file mode 100644 index 000000000..f77d0fa86 Binary files /dev/null and b/graphics/pokemon/footprints/latios_footprint.png differ diff --git a/graphics/pokemon/footprints/ledian_footprint.png b/graphics/pokemon/footprints/ledian_footprint.png new file mode 100644 index 000000000..5c2d6221f Binary files /dev/null and b/graphics/pokemon/footprints/ledian_footprint.png differ diff --git a/graphics/pokemon/footprints/ledyba_footprint.png b/graphics/pokemon/footprints/ledyba_footprint.png new file mode 100644 index 000000000..a52ed2560 Binary files /dev/null and b/graphics/pokemon/footprints/ledyba_footprint.png differ diff --git a/graphics/pokemon/footprints/lickitung_footprint.png b/graphics/pokemon/footprints/lickitung_footprint.png new file mode 100644 index 000000000..1f88f23fc Binary files /dev/null and b/graphics/pokemon/footprints/lickitung_footprint.png differ diff --git a/graphics/pokemon/footprints/lileep_footprint.png b/graphics/pokemon/footprints/lileep_footprint.png new file mode 100644 index 000000000..ce6b2790e Binary files /dev/null and b/graphics/pokemon/footprints/lileep_footprint.png differ diff --git a/graphics/pokemon/footprints/linoone_footprint.png b/graphics/pokemon/footprints/linoone_footprint.png new file mode 100644 index 000000000..8d83166d3 Binary files /dev/null and b/graphics/pokemon/footprints/linoone_footprint.png differ diff --git a/graphics/pokemon/footprints/lombre_footprint.png b/graphics/pokemon/footprints/lombre_footprint.png new file mode 100644 index 000000000..051e5ab55 Binary files /dev/null and b/graphics/pokemon/footprints/lombre_footprint.png differ diff --git a/graphics/pokemon/footprints/lotad_footprint.png b/graphics/pokemon/footprints/lotad_footprint.png new file mode 100644 index 000000000..caac6945f Binary files /dev/null and b/graphics/pokemon/footprints/lotad_footprint.png differ diff --git a/graphics/pokemon/footprints/loudred_footprint.png b/graphics/pokemon/footprints/loudred_footprint.png new file mode 100644 index 000000000..604af9000 Binary files /dev/null and b/graphics/pokemon/footprints/loudred_footprint.png differ diff --git a/graphics/pokemon/footprints/ludicolo_footprint.png b/graphics/pokemon/footprints/ludicolo_footprint.png new file mode 100644 index 000000000..23163f358 Binary files /dev/null and b/graphics/pokemon/footprints/ludicolo_footprint.png differ diff --git a/graphics/pokemon/footprints/lugia_footprint.png b/graphics/pokemon/footprints/lugia_footprint.png new file mode 100644 index 000000000..e6642ed07 Binary files /dev/null and b/graphics/pokemon/footprints/lugia_footprint.png differ diff --git a/graphics/pokemon/footprints/lunatone_footprint.png b/graphics/pokemon/footprints/lunatone_footprint.png new file mode 100644 index 000000000..c7ccf57f3 Binary files /dev/null and b/graphics/pokemon/footprints/lunatone_footprint.png differ diff --git a/graphics/pokemon/footprints/luvdisc_footprint.png b/graphics/pokemon/footprints/luvdisc_footprint.png new file mode 100644 index 000000000..c7ccf57f3 Binary files /dev/null and b/graphics/pokemon/footprints/luvdisc_footprint.png differ diff --git a/graphics/pokemon/footprints/machamp_footprint.png b/graphics/pokemon/footprints/machamp_footprint.png new file mode 100644 index 000000000..e562fd08c Binary files /dev/null and b/graphics/pokemon/footprints/machamp_footprint.png differ diff --git a/graphics/pokemon/footprints/machoke_footprint.png b/graphics/pokemon/footprints/machoke_footprint.png new file mode 100644 index 000000000..d9009d3e1 Binary files /dev/null and b/graphics/pokemon/footprints/machoke_footprint.png differ diff --git a/graphics/pokemon/footprints/machop_footprint.png b/graphics/pokemon/footprints/machop_footprint.png new file mode 100644 index 000000000..8b2808553 Binary files /dev/null and b/graphics/pokemon/footprints/machop_footprint.png differ diff --git a/graphics/pokemon/footprints/magby_footprint.png b/graphics/pokemon/footprints/magby_footprint.png new file mode 100644 index 000000000..655d0ca2b Binary files /dev/null and b/graphics/pokemon/footprints/magby_footprint.png differ diff --git a/graphics/pokemon/footprints/magcargo_footprint.png b/graphics/pokemon/footprints/magcargo_footprint.png new file mode 100644 index 000000000..c7ccf57f3 Binary files /dev/null and b/graphics/pokemon/footprints/magcargo_footprint.png differ diff --git a/graphics/pokemon/footprints/magikarp_footprint.png b/graphics/pokemon/footprints/magikarp_footprint.png new file mode 100644 index 000000000..c7ccf57f3 Binary files /dev/null and b/graphics/pokemon/footprints/magikarp_footprint.png differ diff --git a/graphics/pokemon/footprints/magmar_footprint.png b/graphics/pokemon/footprints/magmar_footprint.png new file mode 100644 index 000000000..17de53a46 Binary files /dev/null and b/graphics/pokemon/footprints/magmar_footprint.png differ diff --git a/graphics/pokemon/footprints/magnemite_footprint.png b/graphics/pokemon/footprints/magnemite_footprint.png new file mode 100644 index 000000000..f710e5028 Binary files /dev/null and b/graphics/pokemon/footprints/magnemite_footprint.png differ diff --git a/graphics/pokemon/footprints/magneton_footprint.png b/graphics/pokemon/footprints/magneton_footprint.png new file mode 100644 index 000000000..00b8b0ebf Binary files /dev/null and b/graphics/pokemon/footprints/magneton_footprint.png differ diff --git a/graphics/pokemon/footprints/makuhita_footprint.png b/graphics/pokemon/footprints/makuhita_footprint.png new file mode 100644 index 000000000..3da20ccb3 Binary files /dev/null and b/graphics/pokemon/footprints/makuhita_footprint.png differ diff --git a/graphics/pokemon/footprints/manectric_footprint.png b/graphics/pokemon/footprints/manectric_footprint.png new file mode 100644 index 000000000..4f4903bf9 Binary files /dev/null and b/graphics/pokemon/footprints/manectric_footprint.png differ diff --git a/graphics/pokemon/footprints/mankey_footprint.png b/graphics/pokemon/footprints/mankey_footprint.png new file mode 100644 index 000000000..f02036af5 Binary files /dev/null and b/graphics/pokemon/footprints/mankey_footprint.png differ diff --git a/graphics/pokemon/footprints/mantine_footprint.png b/graphics/pokemon/footprints/mantine_footprint.png new file mode 100644 index 000000000..c7ccf57f3 Binary files /dev/null and b/graphics/pokemon/footprints/mantine_footprint.png differ diff --git a/graphics/pokemon/footprints/mareep_footprint.png b/graphics/pokemon/footprints/mareep_footprint.png new file mode 100644 index 000000000..2913a4c48 Binary files /dev/null and b/graphics/pokemon/footprints/mareep_footprint.png differ diff --git a/graphics/pokemon/footprints/marill_footprint.png b/graphics/pokemon/footprints/marill_footprint.png new file mode 100644 index 000000000..a09d8f2c0 Binary files /dev/null and b/graphics/pokemon/footprints/marill_footprint.png differ diff --git a/graphics/pokemon/footprints/marowak_footprint.png b/graphics/pokemon/footprints/marowak_footprint.png new file mode 100644 index 000000000..fbde41d04 Binary files /dev/null and b/graphics/pokemon/footprints/marowak_footprint.png differ diff --git a/graphics/pokemon/footprints/marshtomp_footprint.png b/graphics/pokemon/footprints/marshtomp_footprint.png new file mode 100644 index 000000000..3c232ccad Binary files /dev/null and b/graphics/pokemon/footprints/marshtomp_footprint.png differ diff --git a/graphics/pokemon/footprints/masquerain_footprint.png b/graphics/pokemon/footprints/masquerain_footprint.png new file mode 100644 index 000000000..c7ccf57f3 Binary files /dev/null and b/graphics/pokemon/footprints/masquerain_footprint.png differ diff --git a/graphics/pokemon/footprints/mawile_footprint.png b/graphics/pokemon/footprints/mawile_footprint.png new file mode 100644 index 000000000..5195fd4df Binary files /dev/null and b/graphics/pokemon/footprints/mawile_footprint.png differ diff --git a/graphics/pokemon/footprints/medicham_footprint.png b/graphics/pokemon/footprints/medicham_footprint.png new file mode 100644 index 000000000..804e8c1d8 Binary files /dev/null and b/graphics/pokemon/footprints/medicham_footprint.png differ diff --git a/graphics/pokemon/footprints/meditite_footprint.png b/graphics/pokemon/footprints/meditite_footprint.png new file mode 100644 index 000000000..034cb0df8 Binary files /dev/null and b/graphics/pokemon/footprints/meditite_footprint.png differ diff --git a/graphics/pokemon/footprints/meganium_footprint.png b/graphics/pokemon/footprints/meganium_footprint.png new file mode 100644 index 000000000..39303ac4f Binary files /dev/null and b/graphics/pokemon/footprints/meganium_footprint.png differ diff --git a/graphics/pokemon/footprints/meowth_footprint.png b/graphics/pokemon/footprints/meowth_footprint.png new file mode 100644 index 000000000..7dc20ada7 Binary files /dev/null and b/graphics/pokemon/footprints/meowth_footprint.png differ diff --git a/graphics/pokemon/footprints/metagross_footprint.png b/graphics/pokemon/footprints/metagross_footprint.png new file mode 100644 index 000000000..07f91d604 Binary files /dev/null and b/graphics/pokemon/footprints/metagross_footprint.png differ diff --git a/graphics/pokemon/footprints/metang_footprint.png b/graphics/pokemon/footprints/metang_footprint.png new file mode 100644 index 000000000..5b0f8f5b0 Binary files /dev/null and b/graphics/pokemon/footprints/metang_footprint.png differ diff --git a/graphics/pokemon/footprints/metapod_footprint.png b/graphics/pokemon/footprints/metapod_footprint.png new file mode 100644 index 000000000..c7ccf57f3 Binary files /dev/null and b/graphics/pokemon/footprints/metapod_footprint.png differ diff --git a/graphics/pokemon/footprints/mew_footprint.png b/graphics/pokemon/footprints/mew_footprint.png new file mode 100644 index 000000000..afbba43ac Binary files /dev/null and b/graphics/pokemon/footprints/mew_footprint.png differ diff --git a/graphics/pokemon/footprints/mewtwo_footprint.png b/graphics/pokemon/footprints/mewtwo_footprint.png new file mode 100644 index 000000000..0f7573dd3 Binary files /dev/null and b/graphics/pokemon/footprints/mewtwo_footprint.png differ diff --git a/graphics/pokemon/footprints/mightyena_footprint.png b/graphics/pokemon/footprints/mightyena_footprint.png new file mode 100644 index 000000000..b39af65bc Binary files /dev/null and b/graphics/pokemon/footprints/mightyena_footprint.png differ diff --git a/graphics/pokemon/footprints/milotic_footprint.png b/graphics/pokemon/footprints/milotic_footprint.png new file mode 100644 index 000000000..c7ccf57f3 Binary files /dev/null and b/graphics/pokemon/footprints/milotic_footprint.png differ diff --git a/graphics/pokemon/footprints/miltank_footprint.png b/graphics/pokemon/footprints/miltank_footprint.png new file mode 100644 index 000000000..a7162cd21 Binary files /dev/null and b/graphics/pokemon/footprints/miltank_footprint.png differ diff --git a/graphics/pokemon/footprints/minun_footprint.png b/graphics/pokemon/footprints/minun_footprint.png new file mode 100644 index 000000000..1071b8069 Binary files /dev/null and b/graphics/pokemon/footprints/minun_footprint.png differ diff --git a/graphics/pokemon/footprints/misdreavus_footprint.png b/graphics/pokemon/footprints/misdreavus_footprint.png new file mode 100644 index 000000000..c7ccf57f3 Binary files /dev/null and b/graphics/pokemon/footprints/misdreavus_footprint.png differ diff --git a/graphics/pokemon/footprints/moltres_footprint.png b/graphics/pokemon/footprints/moltres_footprint.png new file mode 100644 index 000000000..3900403bd Binary files /dev/null and b/graphics/pokemon/footprints/moltres_footprint.png differ diff --git a/graphics/pokemon/footprints/mr_mime_footprint.png b/graphics/pokemon/footprints/mr_mime_footprint.png new file mode 100644 index 000000000..cb0aff1a3 Binary files /dev/null and b/graphics/pokemon/footprints/mr_mime_footprint.png differ diff --git a/graphics/pokemon/footprints/mudkip_footprint.png b/graphics/pokemon/footprints/mudkip_footprint.png new file mode 100644 index 000000000..490db6e25 Binary files /dev/null and b/graphics/pokemon/footprints/mudkip_footprint.png differ diff --git a/graphics/pokemon/footprints/muk_footprint.png b/graphics/pokemon/footprints/muk_footprint.png new file mode 100644 index 000000000..c7ccf57f3 Binary files /dev/null and b/graphics/pokemon/footprints/muk_footprint.png differ diff --git a/graphics/pokemon/footprints/murkrow_footprint.png b/graphics/pokemon/footprints/murkrow_footprint.png new file mode 100644 index 000000000..0f0566834 Binary files /dev/null and b/graphics/pokemon/footprints/murkrow_footprint.png differ diff --git a/graphics/pokemon/footprints/natu_footprint.png b/graphics/pokemon/footprints/natu_footprint.png new file mode 100644 index 000000000..f17821fc0 Binary files /dev/null and b/graphics/pokemon/footprints/natu_footprint.png differ diff --git a/graphics/pokemon/footprints/nidoking_footprint.png b/graphics/pokemon/footprints/nidoking_footprint.png new file mode 100644 index 000000000..577e14f30 Binary files /dev/null and b/graphics/pokemon/footprints/nidoking_footprint.png differ diff --git a/graphics/pokemon/footprints/nidoqueen_footprint.png b/graphics/pokemon/footprints/nidoqueen_footprint.png new file mode 100644 index 000000000..c3156e621 Binary files /dev/null and b/graphics/pokemon/footprints/nidoqueen_footprint.png differ diff --git a/graphics/pokemon/footprints/nidoran_f_footprint.png b/graphics/pokemon/footprints/nidoran_f_footprint.png new file mode 100644 index 000000000..f673df112 Binary files /dev/null and b/graphics/pokemon/footprints/nidoran_f_footprint.png differ diff --git a/graphics/pokemon/footprints/nidoran_m_footprint.png b/graphics/pokemon/footprints/nidoran_m_footprint.png new file mode 100644 index 000000000..874c60781 Binary files /dev/null and b/graphics/pokemon/footprints/nidoran_m_footprint.png differ diff --git a/graphics/pokemon/footprints/nidorina_footprint.png b/graphics/pokemon/footprints/nidorina_footprint.png new file mode 100644 index 000000000..94553054a Binary files /dev/null and b/graphics/pokemon/footprints/nidorina_footprint.png differ diff --git a/graphics/pokemon/footprints/nidorino_footprint.png b/graphics/pokemon/footprints/nidorino_footprint.png new file mode 100644 index 000000000..eaa67b379 Binary files /dev/null and b/graphics/pokemon/footprints/nidorino_footprint.png differ diff --git a/graphics/pokemon/footprints/nincada_footprint.png b/graphics/pokemon/footprints/nincada_footprint.png new file mode 100644 index 000000000..deea05721 Binary files /dev/null and b/graphics/pokemon/footprints/nincada_footprint.png differ diff --git a/graphics/pokemon/footprints/ninetales_footprint.png b/graphics/pokemon/footprints/ninetales_footprint.png new file mode 100644 index 000000000..3f1f0247e Binary files /dev/null and b/graphics/pokemon/footprints/ninetales_footprint.png differ diff --git a/graphics/pokemon/footprints/ninjask_footprint.png b/graphics/pokemon/footprints/ninjask_footprint.png new file mode 100644 index 000000000..eacba16dc Binary files /dev/null and b/graphics/pokemon/footprints/ninjask_footprint.png differ diff --git a/graphics/pokemon/footprints/noctowl_footprint.png b/graphics/pokemon/footprints/noctowl_footprint.png new file mode 100644 index 000000000..89ed409e9 Binary files /dev/null and b/graphics/pokemon/footprints/noctowl_footprint.png differ diff --git a/graphics/pokemon/footprints/nosepass_footprint.png b/graphics/pokemon/footprints/nosepass_footprint.png new file mode 100644 index 000000000..9b9ad2708 Binary files /dev/null and b/graphics/pokemon/footprints/nosepass_footprint.png differ diff --git a/graphics/pokemon/footprints/numel_footprint.png b/graphics/pokemon/footprints/numel_footprint.png new file mode 100644 index 000000000..6238f9400 Binary files /dev/null and b/graphics/pokemon/footprints/numel_footprint.png differ diff --git a/graphics/pokemon/footprints/nuzleaf_footprint.png b/graphics/pokemon/footprints/nuzleaf_footprint.png new file mode 100644 index 000000000..b35288e05 Binary files /dev/null and b/graphics/pokemon/footprints/nuzleaf_footprint.png differ diff --git a/graphics/pokemon/footprints/octillery_footprint.png b/graphics/pokemon/footprints/octillery_footprint.png new file mode 100644 index 000000000..afa1f5433 Binary files /dev/null and b/graphics/pokemon/footprints/octillery_footprint.png differ diff --git a/graphics/pokemon/footprints/oddish_footprint.png b/graphics/pokemon/footprints/oddish_footprint.png new file mode 100644 index 000000000..d38175273 Binary files /dev/null and b/graphics/pokemon/footprints/oddish_footprint.png differ diff --git a/graphics/pokemon/footprints/omanyte_footprint.png b/graphics/pokemon/footprints/omanyte_footprint.png new file mode 100644 index 000000000..f5eb9fdba Binary files /dev/null and b/graphics/pokemon/footprints/omanyte_footprint.png differ diff --git a/graphics/pokemon/footprints/omastar_footprint.png b/graphics/pokemon/footprints/omastar_footprint.png new file mode 100644 index 000000000..fdd911ecf Binary files /dev/null and b/graphics/pokemon/footprints/omastar_footprint.png differ diff --git a/graphics/pokemon/footprints/onix_footprint.png b/graphics/pokemon/footprints/onix_footprint.png new file mode 100644 index 000000000..c7ccf57f3 Binary files /dev/null and b/graphics/pokemon/footprints/onix_footprint.png differ diff --git a/graphics/pokemon/footprints/paras_footprint.png b/graphics/pokemon/footprints/paras_footprint.png new file mode 100644 index 000000000..f8d7574d2 Binary files /dev/null and b/graphics/pokemon/footprints/paras_footprint.png differ diff --git a/graphics/pokemon/footprints/parasect_footprint.png b/graphics/pokemon/footprints/parasect_footprint.png new file mode 100644 index 000000000..e0f1715f2 Binary files /dev/null and b/graphics/pokemon/footprints/parasect_footprint.png differ diff --git a/graphics/pokemon/footprints/pelipper_footprint.png b/graphics/pokemon/footprints/pelipper_footprint.png new file mode 100644 index 000000000..54718d259 Binary files /dev/null and b/graphics/pokemon/footprints/pelipper_footprint.png differ diff --git a/graphics/pokemon/footprints/persian_footprint.png b/graphics/pokemon/footprints/persian_footprint.png new file mode 100644 index 000000000..33f25f0aa Binary files /dev/null and b/graphics/pokemon/footprints/persian_footprint.png differ diff --git a/graphics/pokemon/footprints/phanpy_footprint.png b/graphics/pokemon/footprints/phanpy_footprint.png new file mode 100644 index 000000000..70498b18f Binary files /dev/null and b/graphics/pokemon/footprints/phanpy_footprint.png differ diff --git a/graphics/pokemon/footprints/pichu_footprint.png b/graphics/pokemon/footprints/pichu_footprint.png new file mode 100644 index 000000000..823c7e32d Binary files /dev/null and b/graphics/pokemon/footprints/pichu_footprint.png differ diff --git a/graphics/pokemon/footprints/pidgeot_footprint.png b/graphics/pokemon/footprints/pidgeot_footprint.png new file mode 100644 index 000000000..025341554 Binary files /dev/null and b/graphics/pokemon/footprints/pidgeot_footprint.png differ diff --git a/graphics/pokemon/footprints/pidgeotto_footprint.png b/graphics/pokemon/footprints/pidgeotto_footprint.png new file mode 100644 index 000000000..c507f72b8 Binary files /dev/null and b/graphics/pokemon/footprints/pidgeotto_footprint.png differ diff --git a/graphics/pokemon/footprints/pidgey_footprint.png b/graphics/pokemon/footprints/pidgey_footprint.png new file mode 100644 index 000000000..6fe6e4282 Binary files /dev/null and b/graphics/pokemon/footprints/pidgey_footprint.png differ diff --git a/graphics/pokemon/footprints/pikachu_footprint.png b/graphics/pokemon/footprints/pikachu_footprint.png new file mode 100644 index 000000000..a8ee2e4ac Binary files /dev/null and b/graphics/pokemon/footprints/pikachu_footprint.png differ diff --git a/graphics/pokemon/footprints/piloswine_footprint.png b/graphics/pokemon/footprints/piloswine_footprint.png new file mode 100644 index 000000000..0b7405ece Binary files /dev/null and b/graphics/pokemon/footprints/piloswine_footprint.png differ diff --git a/graphics/pokemon/footprints/pineco_footprint.png b/graphics/pokemon/footprints/pineco_footprint.png new file mode 100644 index 000000000..c7ccf57f3 Binary files /dev/null and b/graphics/pokemon/footprints/pineco_footprint.png differ diff --git a/graphics/pokemon/footprints/pinsir_footprint.png b/graphics/pokemon/footprints/pinsir_footprint.png new file mode 100644 index 000000000..ebd22101e Binary files /dev/null and b/graphics/pokemon/footprints/pinsir_footprint.png differ diff --git a/graphics/pokemon/footprints/plusle_footprint.png b/graphics/pokemon/footprints/plusle_footprint.png new file mode 100644 index 000000000..1071b8069 Binary files /dev/null and b/graphics/pokemon/footprints/plusle_footprint.png differ diff --git a/graphics/pokemon/footprints/politoed_footprint.png b/graphics/pokemon/footprints/politoed_footprint.png new file mode 100644 index 000000000..f97b78994 Binary files /dev/null and b/graphics/pokemon/footprints/politoed_footprint.png differ diff --git a/graphics/pokemon/footprints/poliwag_footprint.png b/graphics/pokemon/footprints/poliwag_footprint.png new file mode 100644 index 000000000..04e411726 Binary files /dev/null and b/graphics/pokemon/footprints/poliwag_footprint.png differ diff --git a/graphics/pokemon/footprints/poliwhirl_footprint.png b/graphics/pokemon/footprints/poliwhirl_footprint.png new file mode 100644 index 000000000..14f6c2ea9 Binary files /dev/null and b/graphics/pokemon/footprints/poliwhirl_footprint.png differ diff --git a/graphics/pokemon/footprints/poliwrath_footprint.png b/graphics/pokemon/footprints/poliwrath_footprint.png new file mode 100644 index 000000000..8f562fcef Binary files /dev/null and b/graphics/pokemon/footprints/poliwrath_footprint.png differ diff --git a/graphics/pokemon/footprints/ponyta_footprint.png b/graphics/pokemon/footprints/ponyta_footprint.png new file mode 100644 index 000000000..906ee7a5b Binary files /dev/null and b/graphics/pokemon/footprints/ponyta_footprint.png differ diff --git a/graphics/pokemon/footprints/poochyena_footprint.png b/graphics/pokemon/footprints/poochyena_footprint.png new file mode 100644 index 000000000..c4afe995f Binary files /dev/null and b/graphics/pokemon/footprints/poochyena_footprint.png differ diff --git a/graphics/pokemon/footprints/porygon2_footprint.png b/graphics/pokemon/footprints/porygon2_footprint.png new file mode 100644 index 000000000..f92224af3 Binary files /dev/null and b/graphics/pokemon/footprints/porygon2_footprint.png differ diff --git a/graphics/pokemon/footprints/porygon_footprint.png b/graphics/pokemon/footprints/porygon_footprint.png new file mode 100644 index 000000000..02243e3bc Binary files /dev/null and b/graphics/pokemon/footprints/porygon_footprint.png differ diff --git a/graphics/pokemon/footprints/primeape_footprint.png b/graphics/pokemon/footprints/primeape_footprint.png new file mode 100644 index 000000000..f4c90ee17 Binary files /dev/null and b/graphics/pokemon/footprints/primeape_footprint.png differ diff --git a/graphics/pokemon/footprints/psyduck_footprint.png b/graphics/pokemon/footprints/psyduck_footprint.png new file mode 100644 index 000000000..4dff44800 Binary files /dev/null and b/graphics/pokemon/footprints/psyduck_footprint.png differ diff --git a/graphics/pokemon/footprints/pupitar_footprint.png b/graphics/pokemon/footprints/pupitar_footprint.png new file mode 100644 index 000000000..c7ccf57f3 Binary files /dev/null and b/graphics/pokemon/footprints/pupitar_footprint.png differ diff --git a/graphics/pokemon/footprints/quagsire_footprint.png b/graphics/pokemon/footprints/quagsire_footprint.png new file mode 100644 index 000000000..d04039763 Binary files /dev/null and b/graphics/pokemon/footprints/quagsire_footprint.png differ diff --git a/graphics/pokemon/footprints/question_mark_footprint.png b/graphics/pokemon/footprints/question_mark_footprint.png new file mode 100644 index 000000000..7c4f45eaa Binary files /dev/null and b/graphics/pokemon/footprints/question_mark_footprint.png differ diff --git a/graphics/pokemon/footprints/quilava_footprint.png b/graphics/pokemon/footprints/quilava_footprint.png new file mode 100644 index 000000000..28324dd7c Binary files /dev/null and b/graphics/pokemon/footprints/quilava_footprint.png differ diff --git a/graphics/pokemon/footprints/qwilfish_footprint.png b/graphics/pokemon/footprints/qwilfish_footprint.png new file mode 100644 index 000000000..c7ccf57f3 Binary files /dev/null and b/graphics/pokemon/footprints/qwilfish_footprint.png differ diff --git a/graphics/pokemon/footprints/raichu_footprint.png b/graphics/pokemon/footprints/raichu_footprint.png new file mode 100644 index 000000000..9f2ac3993 Binary files /dev/null and b/graphics/pokemon/footprints/raichu_footprint.png differ diff --git a/graphics/pokemon/footprints/raikou_footprint.png b/graphics/pokemon/footprints/raikou_footprint.png new file mode 100644 index 000000000..b7081dcd3 Binary files /dev/null and b/graphics/pokemon/footprints/raikou_footprint.png differ diff --git a/graphics/pokemon/footprints/ralts_footprint.png b/graphics/pokemon/footprints/ralts_footprint.png new file mode 100644 index 000000000..6965dbe60 Binary files /dev/null and b/graphics/pokemon/footprints/ralts_footprint.png differ diff --git a/graphics/pokemon/footprints/rapidash_footprint.png b/graphics/pokemon/footprints/rapidash_footprint.png new file mode 100644 index 000000000..3361489fd Binary files /dev/null and b/graphics/pokemon/footprints/rapidash_footprint.png differ diff --git a/graphics/pokemon/footprints/raticate_footprint.png b/graphics/pokemon/footprints/raticate_footprint.png new file mode 100644 index 000000000..6628cfdd7 Binary files /dev/null and b/graphics/pokemon/footprints/raticate_footprint.png differ diff --git a/graphics/pokemon/footprints/rattata_footprint.png b/graphics/pokemon/footprints/rattata_footprint.png new file mode 100644 index 000000000..008b1ddc0 Binary files /dev/null and b/graphics/pokemon/footprints/rattata_footprint.png differ diff --git a/graphics/pokemon/footprints/rayquaza_footprint.png b/graphics/pokemon/footprints/rayquaza_footprint.png new file mode 100644 index 000000000..c7ccf57f3 Binary files /dev/null and b/graphics/pokemon/footprints/rayquaza_footprint.png differ diff --git a/graphics/pokemon/footprints/regice_footprint.png b/graphics/pokemon/footprints/regice_footprint.png new file mode 100644 index 000000000..6965dbe60 Binary files /dev/null and b/graphics/pokemon/footprints/regice_footprint.png differ diff --git a/graphics/pokemon/footprints/regirock_footprint.png b/graphics/pokemon/footprints/regirock_footprint.png new file mode 100644 index 000000000..44da2a57f Binary files /dev/null and b/graphics/pokemon/footprints/regirock_footprint.png differ diff --git a/graphics/pokemon/footprints/registeel_footprint.png b/graphics/pokemon/footprints/registeel_footprint.png new file mode 100644 index 000000000..e191faabc Binary files /dev/null and b/graphics/pokemon/footprints/registeel_footprint.png differ diff --git a/graphics/pokemon/footprints/relicanth_footprint.png b/graphics/pokemon/footprints/relicanth_footprint.png new file mode 100644 index 000000000..c7ccf57f3 Binary files /dev/null and b/graphics/pokemon/footprints/relicanth_footprint.png differ diff --git a/graphics/pokemon/footprints/remoraid_footprint.png b/graphics/pokemon/footprints/remoraid_footprint.png new file mode 100644 index 000000000..c7ccf57f3 Binary files /dev/null and b/graphics/pokemon/footprints/remoraid_footprint.png differ diff --git a/graphics/pokemon/footprints/rhydon_footprint.png b/graphics/pokemon/footprints/rhydon_footprint.png new file mode 100644 index 000000000..df6d8fced Binary files /dev/null and b/graphics/pokemon/footprints/rhydon_footprint.png differ diff --git a/graphics/pokemon/footprints/rhyhorn_footprint.png b/graphics/pokemon/footprints/rhyhorn_footprint.png new file mode 100644 index 000000000..632b753c2 Binary files /dev/null and b/graphics/pokemon/footprints/rhyhorn_footprint.png differ diff --git a/graphics/pokemon/footprints/roselia_footprint.png b/graphics/pokemon/footprints/roselia_footprint.png new file mode 100644 index 000000000..bedf2ab69 Binary files /dev/null and b/graphics/pokemon/footprints/roselia_footprint.png differ diff --git a/graphics/pokemon/footprints/sableye_footprint.png b/graphics/pokemon/footprints/sableye_footprint.png new file mode 100644 index 000000000..204d8da54 Binary files /dev/null and b/graphics/pokemon/footprints/sableye_footprint.png differ diff --git a/graphics/pokemon/footprints/salamence_footprint.png b/graphics/pokemon/footprints/salamence_footprint.png new file mode 100644 index 000000000..2440a370f Binary files /dev/null and b/graphics/pokemon/footprints/salamence_footprint.png differ diff --git a/graphics/pokemon/footprints/sandshrew_footprint.png b/graphics/pokemon/footprints/sandshrew_footprint.png new file mode 100644 index 000000000..481de0993 Binary files /dev/null and b/graphics/pokemon/footprints/sandshrew_footprint.png differ diff --git a/graphics/pokemon/footprints/sandslash_footprint.png b/graphics/pokemon/footprints/sandslash_footprint.png new file mode 100644 index 000000000..431ca99be Binary files /dev/null and b/graphics/pokemon/footprints/sandslash_footprint.png differ diff --git a/graphics/pokemon/footprints/sceptile_footprint.png b/graphics/pokemon/footprints/sceptile_footprint.png new file mode 100644 index 000000000..1958a4778 Binary files /dev/null and b/graphics/pokemon/footprints/sceptile_footprint.png differ diff --git a/graphics/pokemon/footprints/scizor_footprint.png b/graphics/pokemon/footprints/scizor_footprint.png new file mode 100644 index 000000000..00824374a Binary files /dev/null and b/graphics/pokemon/footprints/scizor_footprint.png differ diff --git a/graphics/pokemon/footprints/scyther_footprint.png b/graphics/pokemon/footprints/scyther_footprint.png new file mode 100644 index 000000000..c6b773028 Binary files /dev/null and b/graphics/pokemon/footprints/scyther_footprint.png differ diff --git a/graphics/pokemon/footprints/seadra_footprint.png b/graphics/pokemon/footprints/seadra_footprint.png new file mode 100644 index 000000000..c7ccf57f3 Binary files /dev/null and b/graphics/pokemon/footprints/seadra_footprint.png differ diff --git a/graphics/pokemon/footprints/seaking_footprint.png b/graphics/pokemon/footprints/seaking_footprint.png new file mode 100644 index 000000000..c7ccf57f3 Binary files /dev/null and b/graphics/pokemon/footprints/seaking_footprint.png differ diff --git a/graphics/pokemon/footprints/sealeo_footprint.png b/graphics/pokemon/footprints/sealeo_footprint.png new file mode 100644 index 000000000..c7ccf57f3 Binary files /dev/null and b/graphics/pokemon/footprints/sealeo_footprint.png differ diff --git a/graphics/pokemon/footprints/seedot_footprint.png b/graphics/pokemon/footprints/seedot_footprint.png new file mode 100644 index 000000000..9b41f13ed Binary files /dev/null and b/graphics/pokemon/footprints/seedot_footprint.png differ diff --git a/graphics/pokemon/footprints/seel_footprint.png b/graphics/pokemon/footprints/seel_footprint.png new file mode 100644 index 000000000..c7ccf57f3 Binary files /dev/null and b/graphics/pokemon/footprints/seel_footprint.png differ diff --git a/graphics/pokemon/footprints/sentret_footprint.png b/graphics/pokemon/footprints/sentret_footprint.png new file mode 100644 index 000000000..49ab94c0b Binary files /dev/null and b/graphics/pokemon/footprints/sentret_footprint.png differ diff --git a/graphics/pokemon/footprints/seviper_footprint.png b/graphics/pokemon/footprints/seviper_footprint.png new file mode 100644 index 000000000..c7ccf57f3 Binary files /dev/null and b/graphics/pokemon/footprints/seviper_footprint.png differ diff --git a/graphics/pokemon/footprints/sharpedo_footprint.png b/graphics/pokemon/footprints/sharpedo_footprint.png new file mode 100644 index 000000000..c7ccf57f3 Binary files /dev/null and b/graphics/pokemon/footprints/sharpedo_footprint.png differ diff --git a/graphics/pokemon/footprints/shedinja_footprint.png b/graphics/pokemon/footprints/shedinja_footprint.png new file mode 100644 index 000000000..d4118d5e6 Binary files /dev/null and b/graphics/pokemon/footprints/shedinja_footprint.png differ diff --git a/graphics/pokemon/footprints/shelgon_footprint.png b/graphics/pokemon/footprints/shelgon_footprint.png new file mode 100644 index 000000000..e2d61b9bc Binary files /dev/null and b/graphics/pokemon/footprints/shelgon_footprint.png differ diff --git a/graphics/pokemon/footprints/shellder_footprint.png b/graphics/pokemon/footprints/shellder_footprint.png new file mode 100644 index 000000000..c7ccf57f3 Binary files /dev/null and b/graphics/pokemon/footprints/shellder_footprint.png differ diff --git a/graphics/pokemon/footprints/shiftry_footprint.png b/graphics/pokemon/footprints/shiftry_footprint.png new file mode 100644 index 000000000..3ea82a3da Binary files /dev/null and b/graphics/pokemon/footprints/shiftry_footprint.png differ diff --git a/graphics/pokemon/footprints/shroomish_footprint.png b/graphics/pokemon/footprints/shroomish_footprint.png new file mode 100644 index 000000000..d3a5986ce Binary files /dev/null and b/graphics/pokemon/footprints/shroomish_footprint.png differ diff --git a/graphics/pokemon/footprints/shuckle_footprint.png b/graphics/pokemon/footprints/shuckle_footprint.png new file mode 100644 index 000000000..e26b60bcd Binary files /dev/null and b/graphics/pokemon/footprints/shuckle_footprint.png differ diff --git a/graphics/pokemon/footprints/shuppet_footprint.png b/graphics/pokemon/footprints/shuppet_footprint.png new file mode 100644 index 000000000..c7ccf57f3 Binary files /dev/null and b/graphics/pokemon/footprints/shuppet_footprint.png differ diff --git a/graphics/pokemon/footprints/silcoon_footprint.png b/graphics/pokemon/footprints/silcoon_footprint.png new file mode 100644 index 000000000..c7ccf57f3 Binary files /dev/null and b/graphics/pokemon/footprints/silcoon_footprint.png differ diff --git a/graphics/pokemon/footprints/skarmory_footprint.png b/graphics/pokemon/footprints/skarmory_footprint.png new file mode 100644 index 000000000..1134fec29 Binary files /dev/null and b/graphics/pokemon/footprints/skarmory_footprint.png differ diff --git a/graphics/pokemon/footprints/skiploom_footprint.png b/graphics/pokemon/footprints/skiploom_footprint.png new file mode 100644 index 000000000..efa7f5034 Binary files /dev/null and b/graphics/pokemon/footprints/skiploom_footprint.png differ diff --git a/graphics/pokemon/footprints/skitty_footprint.png b/graphics/pokemon/footprints/skitty_footprint.png new file mode 100644 index 000000000..355153dcb Binary files /dev/null and b/graphics/pokemon/footprints/skitty_footprint.png differ diff --git a/graphics/pokemon/footprints/slaking_footprint.png b/graphics/pokemon/footprints/slaking_footprint.png new file mode 100644 index 000000000..c2c20413b Binary files /dev/null and b/graphics/pokemon/footprints/slaking_footprint.png differ diff --git a/graphics/pokemon/footprints/slakoth_footprint.png b/graphics/pokemon/footprints/slakoth_footprint.png new file mode 100644 index 000000000..ec258f41b Binary files /dev/null and b/graphics/pokemon/footprints/slakoth_footprint.png differ diff --git a/graphics/pokemon/footprints/slowbro_footprint.png b/graphics/pokemon/footprints/slowbro_footprint.png new file mode 100644 index 000000000..c4f82e405 Binary files /dev/null and b/graphics/pokemon/footprints/slowbro_footprint.png differ diff --git a/graphics/pokemon/footprints/slowking_footprint.png b/graphics/pokemon/footprints/slowking_footprint.png new file mode 100644 index 000000000..52593624a Binary files /dev/null and b/graphics/pokemon/footprints/slowking_footprint.png differ diff --git a/graphics/pokemon/footprints/slowpoke_footprint.png b/graphics/pokemon/footprints/slowpoke_footprint.png new file mode 100644 index 000000000..a66ebbc32 Binary files /dev/null and b/graphics/pokemon/footprints/slowpoke_footprint.png differ diff --git a/graphics/pokemon/footprints/slugma_footprint.png b/graphics/pokemon/footprints/slugma_footprint.png new file mode 100644 index 000000000..c7ccf57f3 Binary files /dev/null and b/graphics/pokemon/footprints/slugma_footprint.png differ diff --git a/graphics/pokemon/footprints/smeargle_footprint.png b/graphics/pokemon/footprints/smeargle_footprint.png new file mode 100644 index 000000000..b946130cd Binary files /dev/null and b/graphics/pokemon/footprints/smeargle_footprint.png differ diff --git a/graphics/pokemon/footprints/smoochum_footprint.png b/graphics/pokemon/footprints/smoochum_footprint.png new file mode 100644 index 000000000..e901d9334 Binary files /dev/null and b/graphics/pokemon/footprints/smoochum_footprint.png differ diff --git a/graphics/pokemon/footprints/sneasel_footprint.png b/graphics/pokemon/footprints/sneasel_footprint.png new file mode 100644 index 000000000..2159ef3dc Binary files /dev/null and b/graphics/pokemon/footprints/sneasel_footprint.png differ diff --git a/graphics/pokemon/footprints/snorlax_footprint.png b/graphics/pokemon/footprints/snorlax_footprint.png new file mode 100644 index 000000000..d3d25c4bc Binary files /dev/null and b/graphics/pokemon/footprints/snorlax_footprint.png differ diff --git a/graphics/pokemon/footprints/snorunt_footprint.png b/graphics/pokemon/footprints/snorunt_footprint.png new file mode 100644 index 000000000..14277b506 Binary files /dev/null and b/graphics/pokemon/footprints/snorunt_footprint.png differ diff --git a/graphics/pokemon/footprints/snubbull_footprint.png b/graphics/pokemon/footprints/snubbull_footprint.png new file mode 100644 index 000000000..443847cdd Binary files /dev/null and b/graphics/pokemon/footprints/snubbull_footprint.png differ diff --git a/graphics/pokemon/footprints/solrock_footprint.png b/graphics/pokemon/footprints/solrock_footprint.png new file mode 100644 index 000000000..c7ccf57f3 Binary files /dev/null and b/graphics/pokemon/footprints/solrock_footprint.png differ diff --git a/graphics/pokemon/footprints/spearow_footprint.png b/graphics/pokemon/footprints/spearow_footprint.png new file mode 100644 index 000000000..6fe6e4282 Binary files /dev/null and b/graphics/pokemon/footprints/spearow_footprint.png differ diff --git a/graphics/pokemon/footprints/spheal_footprint.png b/graphics/pokemon/footprints/spheal_footprint.png new file mode 100644 index 000000000..c7ccf57f3 Binary files /dev/null and b/graphics/pokemon/footprints/spheal_footprint.png differ diff --git a/graphics/pokemon/footprints/spinarak_footprint.png b/graphics/pokemon/footprints/spinarak_footprint.png new file mode 100644 index 000000000..6965dbe60 Binary files /dev/null and b/graphics/pokemon/footprints/spinarak_footprint.png differ diff --git a/graphics/pokemon/footprints/spinda_footprint.png b/graphics/pokemon/footprints/spinda_footprint.png new file mode 100644 index 000000000..7be943a89 Binary files /dev/null and b/graphics/pokemon/footprints/spinda_footprint.png differ diff --git a/graphics/pokemon/footprints/spoink_footprint.png b/graphics/pokemon/footprints/spoink_footprint.png new file mode 100644 index 000000000..c7ccf57f3 Binary files /dev/null and b/graphics/pokemon/footprints/spoink_footprint.png differ diff --git a/graphics/pokemon/footprints/squirtle_footprint.png b/graphics/pokemon/footprints/squirtle_footprint.png new file mode 100644 index 000000000..696cd6d42 Binary files /dev/null and b/graphics/pokemon/footprints/squirtle_footprint.png differ diff --git a/graphics/pokemon/footprints/stantler_footprint.png b/graphics/pokemon/footprints/stantler_footprint.png new file mode 100644 index 000000000..7f2b0f532 Binary files /dev/null and b/graphics/pokemon/footprints/stantler_footprint.png differ diff --git a/graphics/pokemon/footprints/starmie_footprint.png b/graphics/pokemon/footprints/starmie_footprint.png new file mode 100644 index 000000000..c1c0058e7 Binary files /dev/null and b/graphics/pokemon/footprints/starmie_footprint.png differ diff --git a/graphics/pokemon/footprints/staryu_footprint.png b/graphics/pokemon/footprints/staryu_footprint.png new file mode 100644 index 000000000..c1c0058e7 Binary files /dev/null and b/graphics/pokemon/footprints/staryu_footprint.png differ diff --git a/graphics/pokemon/footprints/steelix_footprint.png b/graphics/pokemon/footprints/steelix_footprint.png new file mode 100644 index 000000000..c7ccf57f3 Binary files /dev/null and b/graphics/pokemon/footprints/steelix_footprint.png differ diff --git a/graphics/pokemon/footprints/sudowoodo_footprint.png b/graphics/pokemon/footprints/sudowoodo_footprint.png new file mode 100644 index 000000000..4ed751a79 Binary files /dev/null and b/graphics/pokemon/footprints/sudowoodo_footprint.png differ diff --git a/graphics/pokemon/footprints/suicune_footprint.png b/graphics/pokemon/footprints/suicune_footprint.png new file mode 100644 index 000000000..946c35dd0 Binary files /dev/null and b/graphics/pokemon/footprints/suicune_footprint.png differ diff --git a/graphics/pokemon/footprints/sunflora_footprint.png b/graphics/pokemon/footprints/sunflora_footprint.png new file mode 100644 index 000000000..f6de3ca9f Binary files /dev/null and b/graphics/pokemon/footprints/sunflora_footprint.png differ diff --git a/graphics/pokemon/footprints/sunkern_footprint.png b/graphics/pokemon/footprints/sunkern_footprint.png new file mode 100644 index 000000000..c7ccf57f3 Binary files /dev/null and b/graphics/pokemon/footprints/sunkern_footprint.png differ diff --git a/graphics/pokemon/footprints/surskit_footprint.png b/graphics/pokemon/footprints/surskit_footprint.png new file mode 100644 index 000000000..e4945976f Binary files /dev/null and b/graphics/pokemon/footprints/surskit_footprint.png differ diff --git a/graphics/pokemon/footprints/swablu_footprint.png b/graphics/pokemon/footprints/swablu_footprint.png new file mode 100644 index 000000000..7e71113c3 Binary files /dev/null and b/graphics/pokemon/footprints/swablu_footprint.png differ diff --git a/graphics/pokemon/footprints/swalot_footprint.png b/graphics/pokemon/footprints/swalot_footprint.png new file mode 100644 index 000000000..c7ccf57f3 Binary files /dev/null and b/graphics/pokemon/footprints/swalot_footprint.png differ diff --git a/graphics/pokemon/footprints/swampert_footprint.png b/graphics/pokemon/footprints/swampert_footprint.png new file mode 100644 index 000000000..ed223e641 Binary files /dev/null and b/graphics/pokemon/footprints/swampert_footprint.png differ diff --git a/graphics/pokemon/footprints/swellow_footprint.png b/graphics/pokemon/footprints/swellow_footprint.png new file mode 100644 index 000000000..f44a71c29 Binary files /dev/null and b/graphics/pokemon/footprints/swellow_footprint.png differ diff --git a/graphics/pokemon/footprints/swinub_footprint.png b/graphics/pokemon/footprints/swinub_footprint.png new file mode 100644 index 000000000..fb56709ec Binary files /dev/null and b/graphics/pokemon/footprints/swinub_footprint.png differ diff --git a/graphics/pokemon/footprints/taillow_footprint.png b/graphics/pokemon/footprints/taillow_footprint.png new file mode 100644 index 000000000..dbf5c5c6b Binary files /dev/null and b/graphics/pokemon/footprints/taillow_footprint.png differ diff --git a/graphics/pokemon/footprints/tangela_footprint.png b/graphics/pokemon/footprints/tangela_footprint.png new file mode 100644 index 000000000..c05d3b437 Binary files /dev/null and b/graphics/pokemon/footprints/tangela_footprint.png differ diff --git a/graphics/pokemon/footprints/tauros_footprint.png b/graphics/pokemon/footprints/tauros_footprint.png new file mode 100644 index 000000000..602011c6d Binary files /dev/null and b/graphics/pokemon/footprints/tauros_footprint.png differ diff --git a/graphics/pokemon/footprints/teddiursa_footprint.png b/graphics/pokemon/footprints/teddiursa_footprint.png new file mode 100644 index 000000000..def88c323 Binary files /dev/null and b/graphics/pokemon/footprints/teddiursa_footprint.png differ diff --git a/graphics/pokemon/footprints/tentacool_footprint.png b/graphics/pokemon/footprints/tentacool_footprint.png new file mode 100644 index 000000000..c7ccf57f3 Binary files /dev/null and b/graphics/pokemon/footprints/tentacool_footprint.png differ diff --git a/graphics/pokemon/footprints/tentacruel_footprint.png b/graphics/pokemon/footprints/tentacruel_footprint.png new file mode 100644 index 000000000..c7ccf57f3 Binary files /dev/null and b/graphics/pokemon/footprints/tentacruel_footprint.png differ diff --git a/graphics/pokemon/footprints/togepi_footprint.png b/graphics/pokemon/footprints/togepi_footprint.png new file mode 100644 index 000000000..84e75101b Binary files /dev/null and b/graphics/pokemon/footprints/togepi_footprint.png differ diff --git a/graphics/pokemon/footprints/togetic_footprint.png b/graphics/pokemon/footprints/togetic_footprint.png new file mode 100644 index 000000000..b15913fa8 Binary files /dev/null and b/graphics/pokemon/footprints/togetic_footprint.png differ diff --git a/graphics/pokemon/footprints/torchic_footprint.png b/graphics/pokemon/footprints/torchic_footprint.png new file mode 100644 index 000000000..955afa82a Binary files /dev/null and b/graphics/pokemon/footprints/torchic_footprint.png differ diff --git a/graphics/pokemon/footprints/torkoal_footprint.png b/graphics/pokemon/footprints/torkoal_footprint.png new file mode 100644 index 000000000..208f3bb77 Binary files /dev/null and b/graphics/pokemon/footprints/torkoal_footprint.png differ diff --git a/graphics/pokemon/footprints/totodile_footprint.png b/graphics/pokemon/footprints/totodile_footprint.png new file mode 100644 index 000000000..210260273 Binary files /dev/null and b/graphics/pokemon/footprints/totodile_footprint.png differ diff --git a/graphics/pokemon/footprints/trapinch_footprint.png b/graphics/pokemon/footprints/trapinch_footprint.png new file mode 100644 index 000000000..c3e6e785b Binary files /dev/null and b/graphics/pokemon/footprints/trapinch_footprint.png differ diff --git a/graphics/pokemon/footprints/treecko_footprint.png b/graphics/pokemon/footprints/treecko_footprint.png new file mode 100644 index 000000000..ed3854702 Binary files /dev/null and b/graphics/pokemon/footprints/treecko_footprint.png differ diff --git a/graphics/pokemon/footprints/tropius_footprint.png b/graphics/pokemon/footprints/tropius_footprint.png new file mode 100644 index 000000000..e6e7e8795 Binary files /dev/null and b/graphics/pokemon/footprints/tropius_footprint.png differ diff --git a/graphics/pokemon/footprints/typhlosion_footprint.png b/graphics/pokemon/footprints/typhlosion_footprint.png new file mode 100644 index 000000000..1d4492cf1 Binary files /dev/null and b/graphics/pokemon/footprints/typhlosion_footprint.png differ diff --git a/graphics/pokemon/footprints/tyranitar_footprint.png b/graphics/pokemon/footprints/tyranitar_footprint.png new file mode 100644 index 000000000..ea12c75b0 Binary files /dev/null and b/graphics/pokemon/footprints/tyranitar_footprint.png differ diff --git a/graphics/pokemon/footprints/tyrogue_footprint.png b/graphics/pokemon/footprints/tyrogue_footprint.png new file mode 100644 index 000000000..0ef849eb8 Binary files /dev/null and b/graphics/pokemon/footprints/tyrogue_footprint.png differ diff --git a/graphics/pokemon/footprints/umbreon_footprint.png b/graphics/pokemon/footprints/umbreon_footprint.png new file mode 100644 index 000000000..a1d897dc3 Binary files /dev/null and b/graphics/pokemon/footprints/umbreon_footprint.png differ diff --git a/graphics/pokemon/footprints/unown_footprint.png b/graphics/pokemon/footprints/unown_footprint.png new file mode 100644 index 000000000..c7ccf57f3 Binary files /dev/null and b/graphics/pokemon/footprints/unown_footprint.png differ diff --git a/graphics/pokemon/footprints/ursaring_footprint.png b/graphics/pokemon/footprints/ursaring_footprint.png new file mode 100644 index 000000000..b1023bd3b Binary files /dev/null and b/graphics/pokemon/footprints/ursaring_footprint.png differ diff --git a/graphics/pokemon/footprints/vaporeon_footprint.png b/graphics/pokemon/footprints/vaporeon_footprint.png new file mode 100644 index 000000000..2b44d4b24 Binary files /dev/null and b/graphics/pokemon/footprints/vaporeon_footprint.png differ diff --git a/graphics/pokemon/footprints/venomoth_footprint.png b/graphics/pokemon/footprints/venomoth_footprint.png new file mode 100644 index 000000000..6965dbe60 Binary files /dev/null and b/graphics/pokemon/footprints/venomoth_footprint.png differ diff --git a/graphics/pokemon/footprints/venonat_footprint.png b/graphics/pokemon/footprints/venonat_footprint.png new file mode 100644 index 000000000..3675945c9 Binary files /dev/null and b/graphics/pokemon/footprints/venonat_footprint.png differ diff --git a/graphics/pokemon/footprints/venusaur_footprint.png b/graphics/pokemon/footprints/venusaur_footprint.png new file mode 100644 index 000000000..bdef2c818 Binary files /dev/null and b/graphics/pokemon/footprints/venusaur_footprint.png differ diff --git a/graphics/pokemon/footprints/vibrava_footprint.png b/graphics/pokemon/footprints/vibrava_footprint.png new file mode 100644 index 000000000..fdf76f9f2 Binary files /dev/null and b/graphics/pokemon/footprints/vibrava_footprint.png differ diff --git a/graphics/pokemon/footprints/victreebel_footprint.png b/graphics/pokemon/footprints/victreebel_footprint.png new file mode 100644 index 000000000..c7ccf57f3 Binary files /dev/null and b/graphics/pokemon/footprints/victreebel_footprint.png differ diff --git a/graphics/pokemon/footprints/vigoroth_footprint.png b/graphics/pokemon/footprints/vigoroth_footprint.png new file mode 100644 index 000000000..bc10a7230 Binary files /dev/null and b/graphics/pokemon/footprints/vigoroth_footprint.png differ diff --git a/graphics/pokemon/footprints/vileplume_footprint.png b/graphics/pokemon/footprints/vileplume_footprint.png new file mode 100644 index 000000000..8fd5bdf83 Binary files /dev/null and b/graphics/pokemon/footprints/vileplume_footprint.png differ diff --git a/graphics/pokemon/footprints/volbeat_footprint.png b/graphics/pokemon/footprints/volbeat_footprint.png new file mode 100644 index 000000000..916c59f60 Binary files /dev/null and b/graphics/pokemon/footprints/volbeat_footprint.png differ diff --git a/graphics/pokemon/footprints/voltorb_footprint.png b/graphics/pokemon/footprints/voltorb_footprint.png new file mode 100644 index 000000000..c7ccf57f3 Binary files /dev/null and b/graphics/pokemon/footprints/voltorb_footprint.png differ diff --git a/graphics/pokemon/footprints/vulpix_footprint.png b/graphics/pokemon/footprints/vulpix_footprint.png new file mode 100644 index 000000000..a0a655ca6 Binary files /dev/null and b/graphics/pokemon/footprints/vulpix_footprint.png differ diff --git a/graphics/pokemon/footprints/wailmer_footprint.png b/graphics/pokemon/footprints/wailmer_footprint.png new file mode 100644 index 000000000..c7ccf57f3 Binary files /dev/null and b/graphics/pokemon/footprints/wailmer_footprint.png differ diff --git a/graphics/pokemon/footprints/wailord_footprint.png b/graphics/pokemon/footprints/wailord_footprint.png new file mode 100644 index 000000000..c7ccf57f3 Binary files /dev/null and b/graphics/pokemon/footprints/wailord_footprint.png differ diff --git a/graphics/pokemon/footprints/walrein_footprint.png b/graphics/pokemon/footprints/walrein_footprint.png new file mode 100644 index 000000000..c7ccf57f3 Binary files /dev/null and b/graphics/pokemon/footprints/walrein_footprint.png differ diff --git a/graphics/pokemon/footprints/wartortle_footprint.png b/graphics/pokemon/footprints/wartortle_footprint.png new file mode 100644 index 000000000..4dd126496 Binary files /dev/null and b/graphics/pokemon/footprints/wartortle_footprint.png differ diff --git a/graphics/pokemon/footprints/weedle_footprint.png b/graphics/pokemon/footprints/weedle_footprint.png new file mode 100644 index 000000000..c1c0058e7 Binary files /dev/null and b/graphics/pokemon/footprints/weedle_footprint.png differ diff --git a/graphics/pokemon/footprints/weepinbell_footprint.png b/graphics/pokemon/footprints/weepinbell_footprint.png new file mode 100644 index 000000000..c7ccf57f3 Binary files /dev/null and b/graphics/pokemon/footprints/weepinbell_footprint.png differ diff --git a/graphics/pokemon/footprints/weezing_footprint.png b/graphics/pokemon/footprints/weezing_footprint.png new file mode 100644 index 000000000..c7ccf57f3 Binary files /dev/null and b/graphics/pokemon/footprints/weezing_footprint.png differ diff --git a/graphics/pokemon/footprints/whiscash_footprint.png b/graphics/pokemon/footprints/whiscash_footprint.png new file mode 100644 index 000000000..c7ccf57f3 Binary files /dev/null and b/graphics/pokemon/footprints/whiscash_footprint.png differ diff --git a/graphics/pokemon/footprints/whismur_footprint.png b/graphics/pokemon/footprints/whismur_footprint.png new file mode 100644 index 000000000..a2ad42b4c Binary files /dev/null and b/graphics/pokemon/footprints/whismur_footprint.png differ diff --git a/graphics/pokemon/footprints/wigglytuff_footprint.png b/graphics/pokemon/footprints/wigglytuff_footprint.png new file mode 100644 index 000000000..68ce8eda3 Binary files /dev/null and b/graphics/pokemon/footprints/wigglytuff_footprint.png differ diff --git a/graphics/pokemon/footprints/wingull_footprint.png b/graphics/pokemon/footprints/wingull_footprint.png new file mode 100644 index 000000000..057b2cefa Binary files /dev/null and b/graphics/pokemon/footprints/wingull_footprint.png differ diff --git a/graphics/pokemon/footprints/wobbuffet_footprint.png b/graphics/pokemon/footprints/wobbuffet_footprint.png new file mode 100644 index 000000000..49fa6818d Binary files /dev/null and b/graphics/pokemon/footprints/wobbuffet_footprint.png differ diff --git a/graphics/pokemon/footprints/wooper_footprint.png b/graphics/pokemon/footprints/wooper_footprint.png new file mode 100644 index 000000000..5e1ba56e6 Binary files /dev/null and b/graphics/pokemon/footprints/wooper_footprint.png differ diff --git a/graphics/pokemon/footprints/wurmple_footprint.png b/graphics/pokemon/footprints/wurmple_footprint.png new file mode 100644 index 000000000..3ac4abd9f Binary files /dev/null and b/graphics/pokemon/footprints/wurmple_footprint.png differ diff --git a/graphics/pokemon/footprints/wynaut_footprint.png b/graphics/pokemon/footprints/wynaut_footprint.png new file mode 100644 index 000000000..4fe4832c0 Binary files /dev/null and b/graphics/pokemon/footprints/wynaut_footprint.png differ diff --git a/graphics/pokemon/footprints/xatu_footprint.png b/graphics/pokemon/footprints/xatu_footprint.png new file mode 100644 index 000000000..44fcad1e3 Binary files /dev/null and b/graphics/pokemon/footprints/xatu_footprint.png differ diff --git a/graphics/pokemon/footprints/yanma_footprint.png b/graphics/pokemon/footprints/yanma_footprint.png new file mode 100644 index 000000000..20b4a00b0 Binary files /dev/null and b/graphics/pokemon/footprints/yanma_footprint.png differ diff --git a/graphics/pokemon/footprints/zangoose_footprint.png b/graphics/pokemon/footprints/zangoose_footprint.png new file mode 100644 index 000000000..e07e58cee Binary files /dev/null and b/graphics/pokemon/footprints/zangoose_footprint.png differ diff --git a/graphics/pokemon/footprints/zapdos_footprint.png b/graphics/pokemon/footprints/zapdos_footprint.png new file mode 100644 index 000000000..480063a88 Binary files /dev/null and b/graphics/pokemon/footprints/zapdos_footprint.png differ diff --git a/graphics/pokemon/footprints/zigzagoon_footprint.png b/graphics/pokemon/footprints/zigzagoon_footprint.png new file mode 100644 index 000000000..d7373e064 Binary files /dev/null and b/graphics/pokemon/footprints/zigzagoon_footprint.png differ diff --git a/graphics/pokemon/footprints/zubat_footprint.png b/graphics/pokemon/footprints/zubat_footprint.png new file mode 100644 index 000000000..c7ccf57f3 Binary files /dev/null and b/graphics/pokemon/footprints/zubat_footprint.png differ diff --git a/graphics/pokemon/front_pics/abra_still_front_pic.png b/graphics/pokemon/front_pics/abra_still_front_pic.png new file mode 100644 index 000000000..a3f2aa453 Binary files /dev/null and b/graphics/pokemon/front_pics/abra_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/absol_still_front_pic.png b/graphics/pokemon/front_pics/absol_still_front_pic.png new file mode 100644 index 000000000..17759b2e7 Binary files /dev/null and b/graphics/pokemon/front_pics/absol_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/aerodactyl_still_front_pic.png b/graphics/pokemon/front_pics/aerodactyl_still_front_pic.png new file mode 100644 index 000000000..dc4a521f9 Binary files /dev/null and b/graphics/pokemon/front_pics/aerodactyl_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/aggron_still_front_pic.png b/graphics/pokemon/front_pics/aggron_still_front_pic.png new file mode 100644 index 000000000..0c357efe4 Binary files /dev/null and b/graphics/pokemon/front_pics/aggron_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/aipom_still_front_pic.png b/graphics/pokemon/front_pics/aipom_still_front_pic.png new file mode 100644 index 000000000..25b20c739 Binary files /dev/null and b/graphics/pokemon/front_pics/aipom_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/alakazam_still_front_pic.png b/graphics/pokemon/front_pics/alakazam_still_front_pic.png new file mode 100644 index 000000000..bd6d57240 Binary files /dev/null and b/graphics/pokemon/front_pics/alakazam_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/altaria_still_front_pic.png b/graphics/pokemon/front_pics/altaria_still_front_pic.png new file mode 100644 index 000000000..8b45828a2 Binary files /dev/null and b/graphics/pokemon/front_pics/altaria_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/ampharos_still_front_pic.png b/graphics/pokemon/front_pics/ampharos_still_front_pic.png new file mode 100644 index 000000000..cc4956afb Binary files /dev/null and b/graphics/pokemon/front_pics/ampharos_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/anorith_still_front_pic.png b/graphics/pokemon/front_pics/anorith_still_front_pic.png new file mode 100644 index 000000000..425ff4c0d Binary files /dev/null and b/graphics/pokemon/front_pics/anorith_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/arbok_still_front_pic.png b/graphics/pokemon/front_pics/arbok_still_front_pic.png new file mode 100644 index 000000000..025f84b90 Binary files /dev/null and b/graphics/pokemon/front_pics/arbok_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/arcanine_still_front_pic.png b/graphics/pokemon/front_pics/arcanine_still_front_pic.png new file mode 100644 index 000000000..2ee31ddab Binary files /dev/null and b/graphics/pokemon/front_pics/arcanine_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/ariados_still_front_pic.png b/graphics/pokemon/front_pics/ariados_still_front_pic.png new file mode 100644 index 000000000..07bc4a4db Binary files /dev/null and b/graphics/pokemon/front_pics/ariados_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/armaldo_still_front_pic.png b/graphics/pokemon/front_pics/armaldo_still_front_pic.png new file mode 100644 index 000000000..01b7ee08b Binary files /dev/null and b/graphics/pokemon/front_pics/armaldo_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/aron_still_front_pic.png b/graphics/pokemon/front_pics/aron_still_front_pic.png new file mode 100644 index 000000000..f3764ec2b Binary files /dev/null and b/graphics/pokemon/front_pics/aron_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/articuno_still_front_pic.png b/graphics/pokemon/front_pics/articuno_still_front_pic.png new file mode 100644 index 000000000..a3203a190 Binary files /dev/null and b/graphics/pokemon/front_pics/articuno_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/azumarill_still_front_pic.png b/graphics/pokemon/front_pics/azumarill_still_front_pic.png new file mode 100644 index 000000000..feb172d52 Binary files /dev/null and b/graphics/pokemon/front_pics/azumarill_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/azurill_still_front_pic.png b/graphics/pokemon/front_pics/azurill_still_front_pic.png new file mode 100644 index 000000000..02cc79a6c Binary files /dev/null and b/graphics/pokemon/front_pics/azurill_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/bagon_still_front_pic.png b/graphics/pokemon/front_pics/bagon_still_front_pic.png new file mode 100644 index 000000000..259872b72 Binary files /dev/null and b/graphics/pokemon/front_pics/bagon_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/baltoy_still_front_pic.png b/graphics/pokemon/front_pics/baltoy_still_front_pic.png new file mode 100644 index 000000000..d161de265 Binary files /dev/null and b/graphics/pokemon/front_pics/baltoy_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/banette_still_front_pic.png b/graphics/pokemon/front_pics/banette_still_front_pic.png new file mode 100644 index 000000000..be02be897 Binary files /dev/null and b/graphics/pokemon/front_pics/banette_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/barboach_still_front_pic.png b/graphics/pokemon/front_pics/barboach_still_front_pic.png new file mode 100644 index 000000000..150e6c086 Binary files /dev/null and b/graphics/pokemon/front_pics/barboach_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/bayleef_still_front_pic.png b/graphics/pokemon/front_pics/bayleef_still_front_pic.png new file mode 100644 index 000000000..ad6713c61 Binary files /dev/null and b/graphics/pokemon/front_pics/bayleef_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/beautifly_still_front_pic.png b/graphics/pokemon/front_pics/beautifly_still_front_pic.png new file mode 100644 index 000000000..89020c63a Binary files /dev/null and b/graphics/pokemon/front_pics/beautifly_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/beedrill_still_front_pic.png b/graphics/pokemon/front_pics/beedrill_still_front_pic.png new file mode 100644 index 000000000..adb2894c6 Binary files /dev/null and b/graphics/pokemon/front_pics/beedrill_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/beldum_still_front_pic.png b/graphics/pokemon/front_pics/beldum_still_front_pic.png new file mode 100644 index 000000000..1c2a04e68 Binary files /dev/null and b/graphics/pokemon/front_pics/beldum_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/bellossom_still_front_pic.png b/graphics/pokemon/front_pics/bellossom_still_front_pic.png new file mode 100644 index 000000000..11ec4a08c Binary files /dev/null and b/graphics/pokemon/front_pics/bellossom_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/bellsprout_still_front_pic.png b/graphics/pokemon/front_pics/bellsprout_still_front_pic.png new file mode 100644 index 000000000..dba4f81bc Binary files /dev/null and b/graphics/pokemon/front_pics/bellsprout_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/blastoise_still_front_pic.png b/graphics/pokemon/front_pics/blastoise_still_front_pic.png new file mode 100644 index 000000000..1166b98ea Binary files /dev/null and b/graphics/pokemon/front_pics/blastoise_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/blaziken_still_front_pic.png b/graphics/pokemon/front_pics/blaziken_still_front_pic.png new file mode 100644 index 000000000..7c8721171 Binary files /dev/null and b/graphics/pokemon/front_pics/blaziken_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/blissey_still_front_pic.png b/graphics/pokemon/front_pics/blissey_still_front_pic.png new file mode 100644 index 000000000..3173f820c Binary files /dev/null and b/graphics/pokemon/front_pics/blissey_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/breloom_still_front_pic.png b/graphics/pokemon/front_pics/breloom_still_front_pic.png new file mode 100644 index 000000000..932fdbad8 Binary files /dev/null and b/graphics/pokemon/front_pics/breloom_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/bulbasaur_still_front_pic.png b/graphics/pokemon/front_pics/bulbasaur_still_front_pic.png new file mode 100644 index 000000000..e23eaeeb6 Binary files /dev/null and b/graphics/pokemon/front_pics/bulbasaur_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/butterfree_still_front_pic.png b/graphics/pokemon/front_pics/butterfree_still_front_pic.png new file mode 100644 index 000000000..b7746d8df Binary files /dev/null and b/graphics/pokemon/front_pics/butterfree_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/cacnea_still_front_pic.png b/graphics/pokemon/front_pics/cacnea_still_front_pic.png new file mode 100644 index 000000000..c57dce95f Binary files /dev/null and b/graphics/pokemon/front_pics/cacnea_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/cacturne_still_front_pic.png b/graphics/pokemon/front_pics/cacturne_still_front_pic.png new file mode 100644 index 000000000..80434c3c8 Binary files /dev/null and b/graphics/pokemon/front_pics/cacturne_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/camerupt_still_front_pic.png b/graphics/pokemon/front_pics/camerupt_still_front_pic.png new file mode 100644 index 000000000..ffd9ed0f2 Binary files /dev/null and b/graphics/pokemon/front_pics/camerupt_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/carvanha_still_front_pic.png b/graphics/pokemon/front_pics/carvanha_still_front_pic.png new file mode 100644 index 000000000..f67f56cc7 Binary files /dev/null and b/graphics/pokemon/front_pics/carvanha_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/cascoon_still_front_pic.png b/graphics/pokemon/front_pics/cascoon_still_front_pic.png new file mode 100644 index 000000000..474610aac Binary files /dev/null and b/graphics/pokemon/front_pics/cascoon_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/castform_normal_form_still_front_pic.png b/graphics/pokemon/front_pics/castform_normal_form_still_front_pic.png new file mode 100644 index 000000000..39bfaf426 Binary files /dev/null and b/graphics/pokemon/front_pics/castform_normal_form_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/castform_rainy_form_still_front_pic.png b/graphics/pokemon/front_pics/castform_rainy_form_still_front_pic.png new file mode 100644 index 000000000..155374035 Binary files /dev/null and b/graphics/pokemon/front_pics/castform_rainy_form_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/castform_snowy_form_still_front_pic.png b/graphics/pokemon/front_pics/castform_snowy_form_still_front_pic.png new file mode 100644 index 000000000..a75bf647e Binary files /dev/null and b/graphics/pokemon/front_pics/castform_snowy_form_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/castform_sunny_form_still_front_pic.png b/graphics/pokemon/front_pics/castform_sunny_form_still_front_pic.png new file mode 100644 index 000000000..7e14f9892 Binary files /dev/null and b/graphics/pokemon/front_pics/castform_sunny_form_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/caterpie_still_front_pic.png b/graphics/pokemon/front_pics/caterpie_still_front_pic.png new file mode 100644 index 000000000..b67875094 Binary files /dev/null and b/graphics/pokemon/front_pics/caterpie_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/celebi_still_front_pic.png b/graphics/pokemon/front_pics/celebi_still_front_pic.png new file mode 100644 index 000000000..1717f2561 Binary files /dev/null and b/graphics/pokemon/front_pics/celebi_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/chansey_still_front_pic.png b/graphics/pokemon/front_pics/chansey_still_front_pic.png new file mode 100644 index 000000000..0f9db97dc Binary files /dev/null and b/graphics/pokemon/front_pics/chansey_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/charizard_still_front_pic.png b/graphics/pokemon/front_pics/charizard_still_front_pic.png new file mode 100644 index 000000000..68653c55b Binary files /dev/null and b/graphics/pokemon/front_pics/charizard_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/charmander_still_front_pic.png b/graphics/pokemon/front_pics/charmander_still_front_pic.png new file mode 100644 index 000000000..7235c104f Binary files /dev/null and b/graphics/pokemon/front_pics/charmander_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/charmeleon_still_front_pic.png b/graphics/pokemon/front_pics/charmeleon_still_front_pic.png new file mode 100644 index 000000000..5cc6615a4 Binary files /dev/null and b/graphics/pokemon/front_pics/charmeleon_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/chikorita_still_front_pic.png b/graphics/pokemon/front_pics/chikorita_still_front_pic.png new file mode 100644 index 000000000..80f5dc9ab Binary files /dev/null and b/graphics/pokemon/front_pics/chikorita_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/chimecho_still_front_pic.png b/graphics/pokemon/front_pics/chimecho_still_front_pic.png new file mode 100644 index 000000000..534bec4d7 Binary files /dev/null and b/graphics/pokemon/front_pics/chimecho_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/chinchou_still_front_pic.png b/graphics/pokemon/front_pics/chinchou_still_front_pic.png new file mode 100644 index 000000000..7bb954382 Binary files /dev/null and b/graphics/pokemon/front_pics/chinchou_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/circled_question_mark_still_front_pic.png b/graphics/pokemon/front_pics/circled_question_mark_still_front_pic.png new file mode 100644 index 000000000..3056402db Binary files /dev/null and b/graphics/pokemon/front_pics/circled_question_mark_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/clamperl_still_front_pic.png b/graphics/pokemon/front_pics/clamperl_still_front_pic.png new file mode 100644 index 000000000..1cfe4d4f8 Binary files /dev/null and b/graphics/pokemon/front_pics/clamperl_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/claydol_still_front_pic.png b/graphics/pokemon/front_pics/claydol_still_front_pic.png new file mode 100644 index 000000000..ea8e2cf74 Binary files /dev/null and b/graphics/pokemon/front_pics/claydol_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/clefable_still_front_pic.png b/graphics/pokemon/front_pics/clefable_still_front_pic.png new file mode 100644 index 000000000..81d7456a1 Binary files /dev/null and b/graphics/pokemon/front_pics/clefable_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/clefairy_still_front_pic.png b/graphics/pokemon/front_pics/clefairy_still_front_pic.png new file mode 100644 index 000000000..4684b7df6 Binary files /dev/null and b/graphics/pokemon/front_pics/clefairy_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/cleffa_still_front_pic.png b/graphics/pokemon/front_pics/cleffa_still_front_pic.png new file mode 100644 index 000000000..82b6c103b Binary files /dev/null and b/graphics/pokemon/front_pics/cleffa_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/cloyster_still_front_pic.png b/graphics/pokemon/front_pics/cloyster_still_front_pic.png new file mode 100644 index 000000000..7568a23fc Binary files /dev/null and b/graphics/pokemon/front_pics/cloyster_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/combusken_still_front_pic.png b/graphics/pokemon/front_pics/combusken_still_front_pic.png new file mode 100644 index 000000000..5852709f3 Binary files /dev/null and b/graphics/pokemon/front_pics/combusken_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/corphish_still_front_pic.png b/graphics/pokemon/front_pics/corphish_still_front_pic.png new file mode 100644 index 000000000..f8a06a67c Binary files /dev/null and b/graphics/pokemon/front_pics/corphish_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/corsola_still_front_pic.png b/graphics/pokemon/front_pics/corsola_still_front_pic.png new file mode 100644 index 000000000..550ddbbe3 Binary files /dev/null and b/graphics/pokemon/front_pics/corsola_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/cradily_still_front_pic.png b/graphics/pokemon/front_pics/cradily_still_front_pic.png new file mode 100644 index 000000000..0bc94d6a3 Binary files /dev/null and b/graphics/pokemon/front_pics/cradily_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/crawdaunt_still_front_pic.png b/graphics/pokemon/front_pics/crawdaunt_still_front_pic.png new file mode 100644 index 000000000..88ee71100 Binary files /dev/null and b/graphics/pokemon/front_pics/crawdaunt_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/crobat_still_front_pic.png b/graphics/pokemon/front_pics/crobat_still_front_pic.png new file mode 100644 index 000000000..b61cdebe7 Binary files /dev/null and b/graphics/pokemon/front_pics/crobat_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/croconaw_still_front_pic.png b/graphics/pokemon/front_pics/croconaw_still_front_pic.png new file mode 100644 index 000000000..585be79f4 Binary files /dev/null and b/graphics/pokemon/front_pics/croconaw_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/cubone_still_front_pic.png b/graphics/pokemon/front_pics/cubone_still_front_pic.png new file mode 100644 index 000000000..a0e1a464e Binary files /dev/null and b/graphics/pokemon/front_pics/cubone_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/cyndaquil_still_front_pic.png b/graphics/pokemon/front_pics/cyndaquil_still_front_pic.png new file mode 100644 index 000000000..1a31da433 Binary files /dev/null and b/graphics/pokemon/front_pics/cyndaquil_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/delcatty_still_front_pic.png b/graphics/pokemon/front_pics/delcatty_still_front_pic.png new file mode 100644 index 000000000..bfb7f3894 Binary files /dev/null and b/graphics/pokemon/front_pics/delcatty_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/delibird_still_front_pic.png b/graphics/pokemon/front_pics/delibird_still_front_pic.png new file mode 100644 index 000000000..b31baa203 Binary files /dev/null and b/graphics/pokemon/front_pics/delibird_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/deoxys_still_front_pic.png b/graphics/pokemon/front_pics/deoxys_still_front_pic.png new file mode 100644 index 000000000..017eb84d3 Binary files /dev/null and b/graphics/pokemon/front_pics/deoxys_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/dewgong_still_front_pic.png b/graphics/pokemon/front_pics/dewgong_still_front_pic.png new file mode 100644 index 000000000..1ab15de43 Binary files /dev/null and b/graphics/pokemon/front_pics/dewgong_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/diglett_still_front_pic.png b/graphics/pokemon/front_pics/diglett_still_front_pic.png new file mode 100644 index 000000000..cb26e4a63 Binary files /dev/null and b/graphics/pokemon/front_pics/diglett_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/ditto_still_front_pic.png b/graphics/pokemon/front_pics/ditto_still_front_pic.png new file mode 100644 index 000000000..52eef0e60 Binary files /dev/null and b/graphics/pokemon/front_pics/ditto_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/dodrio_still_front_pic.png b/graphics/pokemon/front_pics/dodrio_still_front_pic.png new file mode 100644 index 000000000..563a89cf0 Binary files /dev/null and b/graphics/pokemon/front_pics/dodrio_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/doduo_still_front_pic.png b/graphics/pokemon/front_pics/doduo_still_front_pic.png new file mode 100644 index 000000000..3a30b75e4 Binary files /dev/null and b/graphics/pokemon/front_pics/doduo_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/donphan_still_front_pic.png b/graphics/pokemon/front_pics/donphan_still_front_pic.png new file mode 100644 index 000000000..c971f446a Binary files /dev/null and b/graphics/pokemon/front_pics/donphan_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/double_question_mark_still_front_pic.png b/graphics/pokemon/front_pics/double_question_mark_still_front_pic.png new file mode 100644 index 000000000..f23b08476 Binary files /dev/null and b/graphics/pokemon/front_pics/double_question_mark_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/dragonair_still_front_pic.png b/graphics/pokemon/front_pics/dragonair_still_front_pic.png new file mode 100644 index 000000000..b2a88698c Binary files /dev/null and b/graphics/pokemon/front_pics/dragonair_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/dragonite_still_front_pic.png b/graphics/pokemon/front_pics/dragonite_still_front_pic.png new file mode 100644 index 000000000..03688332c Binary files /dev/null and b/graphics/pokemon/front_pics/dragonite_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/dratini_still_front_pic.png b/graphics/pokemon/front_pics/dratini_still_front_pic.png new file mode 100644 index 000000000..b33883b5f Binary files /dev/null and b/graphics/pokemon/front_pics/dratini_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/drowzee_still_front_pic.png b/graphics/pokemon/front_pics/drowzee_still_front_pic.png new file mode 100644 index 000000000..3b5107c78 Binary files /dev/null and b/graphics/pokemon/front_pics/drowzee_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/dugtrio_still_front_pic.png b/graphics/pokemon/front_pics/dugtrio_still_front_pic.png new file mode 100644 index 000000000..7b1127a58 Binary files /dev/null and b/graphics/pokemon/front_pics/dugtrio_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/dunsparce_still_front_pic.png b/graphics/pokemon/front_pics/dunsparce_still_front_pic.png new file mode 100644 index 000000000..cf3c421af Binary files /dev/null and b/graphics/pokemon/front_pics/dunsparce_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/dusclops_still_front_pic.png b/graphics/pokemon/front_pics/dusclops_still_front_pic.png new file mode 100644 index 000000000..477423e62 Binary files /dev/null and b/graphics/pokemon/front_pics/dusclops_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/duskull_still_front_pic.png b/graphics/pokemon/front_pics/duskull_still_front_pic.png new file mode 100644 index 000000000..bf379af6d Binary files /dev/null and b/graphics/pokemon/front_pics/duskull_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/dustox_still_front_pic.png b/graphics/pokemon/front_pics/dustox_still_front_pic.png new file mode 100644 index 000000000..8866606d8 Binary files /dev/null and b/graphics/pokemon/front_pics/dustox_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/eevee_still_front_pic.png b/graphics/pokemon/front_pics/eevee_still_front_pic.png new file mode 100644 index 000000000..115dc3e0a Binary files /dev/null and b/graphics/pokemon/front_pics/eevee_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/egg_still_front_pic.png b/graphics/pokemon/front_pics/egg_still_front_pic.png new file mode 100644 index 000000000..d9680a899 Binary files /dev/null and b/graphics/pokemon/front_pics/egg_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/ekans_still_front_pic.png b/graphics/pokemon/front_pics/ekans_still_front_pic.png new file mode 100644 index 000000000..3e1d41ba1 Binary files /dev/null and b/graphics/pokemon/front_pics/ekans_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/electabuzz_still_front_pic.png b/graphics/pokemon/front_pics/electabuzz_still_front_pic.png new file mode 100644 index 000000000..1bed04c89 Binary files /dev/null and b/graphics/pokemon/front_pics/electabuzz_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/electrike_still_front_pic.png b/graphics/pokemon/front_pics/electrike_still_front_pic.png new file mode 100644 index 000000000..0a86b13af Binary files /dev/null and b/graphics/pokemon/front_pics/electrike_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/electrode_still_front_pic.png b/graphics/pokemon/front_pics/electrode_still_front_pic.png new file mode 100644 index 000000000..801c2cdb2 Binary files /dev/null and b/graphics/pokemon/front_pics/electrode_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/elekid_still_front_pic.png b/graphics/pokemon/front_pics/elekid_still_front_pic.png new file mode 100644 index 000000000..0c3d5325e Binary files /dev/null and b/graphics/pokemon/front_pics/elekid_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/entei_still_front_pic.png b/graphics/pokemon/front_pics/entei_still_front_pic.png new file mode 100644 index 000000000..1aa34cf4d Binary files /dev/null and b/graphics/pokemon/front_pics/entei_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/espeon_still_front_pic.png b/graphics/pokemon/front_pics/espeon_still_front_pic.png new file mode 100644 index 000000000..9e66b1626 Binary files /dev/null and b/graphics/pokemon/front_pics/espeon_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/exeggcute_still_front_pic.png b/graphics/pokemon/front_pics/exeggcute_still_front_pic.png new file mode 100644 index 000000000..500dd49fb Binary files /dev/null and b/graphics/pokemon/front_pics/exeggcute_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/exeggutor_still_front_pic.png b/graphics/pokemon/front_pics/exeggutor_still_front_pic.png new file mode 100644 index 000000000..4a61df884 Binary files /dev/null and b/graphics/pokemon/front_pics/exeggutor_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/exploud_still_front_pic.png b/graphics/pokemon/front_pics/exploud_still_front_pic.png new file mode 100644 index 000000000..48e86c610 Binary files /dev/null and b/graphics/pokemon/front_pics/exploud_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/farfetch_d_still_front_pic.png b/graphics/pokemon/front_pics/farfetch_d_still_front_pic.png new file mode 100644 index 000000000..5b3bb3664 Binary files /dev/null and b/graphics/pokemon/front_pics/farfetch_d_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/fearow_still_front_pic.png b/graphics/pokemon/front_pics/fearow_still_front_pic.png new file mode 100644 index 000000000..e4e420728 Binary files /dev/null and b/graphics/pokemon/front_pics/fearow_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/feebas_still_front_pic.png b/graphics/pokemon/front_pics/feebas_still_front_pic.png new file mode 100644 index 000000000..036e151e8 Binary files /dev/null and b/graphics/pokemon/front_pics/feebas_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/feraligatr_still_front_pic.png b/graphics/pokemon/front_pics/feraligatr_still_front_pic.png new file mode 100644 index 000000000..c44e7afc2 Binary files /dev/null and b/graphics/pokemon/front_pics/feraligatr_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/flaaffy_still_front_pic.png b/graphics/pokemon/front_pics/flaaffy_still_front_pic.png new file mode 100644 index 000000000..49f794128 Binary files /dev/null and b/graphics/pokemon/front_pics/flaaffy_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/flareon_still_front_pic.png b/graphics/pokemon/front_pics/flareon_still_front_pic.png new file mode 100644 index 000000000..c36448b18 Binary files /dev/null and b/graphics/pokemon/front_pics/flareon_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/flygon_still_front_pic.png b/graphics/pokemon/front_pics/flygon_still_front_pic.png new file mode 100644 index 000000000..310966c6e Binary files /dev/null and b/graphics/pokemon/front_pics/flygon_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/forretress_still_front_pic.png b/graphics/pokemon/front_pics/forretress_still_front_pic.png new file mode 100644 index 000000000..511ee5720 Binary files /dev/null and b/graphics/pokemon/front_pics/forretress_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/furret_still_front_pic.png b/graphics/pokemon/front_pics/furret_still_front_pic.png new file mode 100644 index 000000000..4f7ca56e1 Binary files /dev/null and b/graphics/pokemon/front_pics/furret_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/gardevoir_still_front_pic.png b/graphics/pokemon/front_pics/gardevoir_still_front_pic.png new file mode 100644 index 000000000..27de874ac Binary files /dev/null and b/graphics/pokemon/front_pics/gardevoir_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/gastly_still_front_pic.png b/graphics/pokemon/front_pics/gastly_still_front_pic.png new file mode 100644 index 000000000..444ac485a Binary files /dev/null and b/graphics/pokemon/front_pics/gastly_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/gengar_still_front_pic.png b/graphics/pokemon/front_pics/gengar_still_front_pic.png new file mode 100644 index 000000000..1bb2468e8 Binary files /dev/null and b/graphics/pokemon/front_pics/gengar_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/geodude_still_front_pic.png b/graphics/pokemon/front_pics/geodude_still_front_pic.png new file mode 100644 index 000000000..f6d2317d4 Binary files /dev/null and b/graphics/pokemon/front_pics/geodude_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/girafarig_still_front_pic.png b/graphics/pokemon/front_pics/girafarig_still_front_pic.png new file mode 100644 index 000000000..bcada08dd Binary files /dev/null and b/graphics/pokemon/front_pics/girafarig_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/glalie_still_front_pic.png b/graphics/pokemon/front_pics/glalie_still_front_pic.png new file mode 100644 index 000000000..c49ea517c Binary files /dev/null and b/graphics/pokemon/front_pics/glalie_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/gligar_still_front_pic.png b/graphics/pokemon/front_pics/gligar_still_front_pic.png new file mode 100644 index 000000000..b6bb68483 Binary files /dev/null and b/graphics/pokemon/front_pics/gligar_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/gloom_still_front_pic.png b/graphics/pokemon/front_pics/gloom_still_front_pic.png new file mode 100644 index 000000000..5bcb4fa46 Binary files /dev/null and b/graphics/pokemon/front_pics/gloom_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/golbat_still_front_pic.png b/graphics/pokemon/front_pics/golbat_still_front_pic.png new file mode 100644 index 000000000..1c25fe337 Binary files /dev/null and b/graphics/pokemon/front_pics/golbat_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/goldeen_still_front_pic.png b/graphics/pokemon/front_pics/goldeen_still_front_pic.png new file mode 100644 index 000000000..5908b3dda Binary files /dev/null and b/graphics/pokemon/front_pics/goldeen_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/golduck_still_front_pic.png b/graphics/pokemon/front_pics/golduck_still_front_pic.png new file mode 100644 index 000000000..be5eea3bc Binary files /dev/null and b/graphics/pokemon/front_pics/golduck_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/golem_still_front_pic.png b/graphics/pokemon/front_pics/golem_still_front_pic.png new file mode 100644 index 000000000..4901bf0a1 Binary files /dev/null and b/graphics/pokemon/front_pics/golem_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/gorebyss_still_front_pic.png b/graphics/pokemon/front_pics/gorebyss_still_front_pic.png new file mode 100644 index 000000000..ba017418c Binary files /dev/null and b/graphics/pokemon/front_pics/gorebyss_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/granbull_still_front_pic.png b/graphics/pokemon/front_pics/granbull_still_front_pic.png new file mode 100644 index 000000000..ee4c40b25 Binary files /dev/null and b/graphics/pokemon/front_pics/granbull_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/graveler_still_front_pic.png b/graphics/pokemon/front_pics/graveler_still_front_pic.png new file mode 100644 index 000000000..384ebacee Binary files /dev/null and b/graphics/pokemon/front_pics/graveler_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/grimer_still_front_pic.png b/graphics/pokemon/front_pics/grimer_still_front_pic.png new file mode 100644 index 000000000..a0c6b05ce Binary files /dev/null and b/graphics/pokemon/front_pics/grimer_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/groudon_still_front_pic.png b/graphics/pokemon/front_pics/groudon_still_front_pic.png new file mode 100644 index 000000000..2e768694f Binary files /dev/null and b/graphics/pokemon/front_pics/groudon_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/grovyle_still_front_pic.png b/graphics/pokemon/front_pics/grovyle_still_front_pic.png new file mode 100644 index 000000000..95a19a7ca Binary files /dev/null and b/graphics/pokemon/front_pics/grovyle_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/growlithe_still_front_pic.png b/graphics/pokemon/front_pics/growlithe_still_front_pic.png new file mode 100644 index 000000000..6a7f3f9a4 Binary files /dev/null and b/graphics/pokemon/front_pics/growlithe_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/grumpig_still_front_pic.png b/graphics/pokemon/front_pics/grumpig_still_front_pic.png new file mode 100644 index 000000000..42604aed2 Binary files /dev/null and b/graphics/pokemon/front_pics/grumpig_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/gulpin_still_front_pic.png b/graphics/pokemon/front_pics/gulpin_still_front_pic.png new file mode 100644 index 000000000..14809cf73 Binary files /dev/null and b/graphics/pokemon/front_pics/gulpin_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/gyarados_still_front_pic.png b/graphics/pokemon/front_pics/gyarados_still_front_pic.png new file mode 100644 index 000000000..7e24eac3b Binary files /dev/null and b/graphics/pokemon/front_pics/gyarados_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/hariyama_still_front_pic.png b/graphics/pokemon/front_pics/hariyama_still_front_pic.png new file mode 100644 index 000000000..abefe0de2 Binary files /dev/null and b/graphics/pokemon/front_pics/hariyama_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/haunter_still_front_pic.png b/graphics/pokemon/front_pics/haunter_still_front_pic.png new file mode 100644 index 000000000..db6c29439 Binary files /dev/null and b/graphics/pokemon/front_pics/haunter_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/heracross_still_front_pic.png b/graphics/pokemon/front_pics/heracross_still_front_pic.png new file mode 100644 index 000000000..f693a4c46 Binary files /dev/null and b/graphics/pokemon/front_pics/heracross_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/hitmonchan_still_front_pic.png b/graphics/pokemon/front_pics/hitmonchan_still_front_pic.png new file mode 100644 index 000000000..5a16c4070 Binary files /dev/null and b/graphics/pokemon/front_pics/hitmonchan_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/hitmonlee_still_front_pic.png b/graphics/pokemon/front_pics/hitmonlee_still_front_pic.png new file mode 100644 index 000000000..7cb5e4a2d Binary files /dev/null and b/graphics/pokemon/front_pics/hitmonlee_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/hitmontop_still_front_pic.png b/graphics/pokemon/front_pics/hitmontop_still_front_pic.png new file mode 100644 index 000000000..d2d7b5093 Binary files /dev/null and b/graphics/pokemon/front_pics/hitmontop_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/ho_oh_still_front_pic.png b/graphics/pokemon/front_pics/ho_oh_still_front_pic.png new file mode 100644 index 000000000..97a7c3e25 Binary files /dev/null and b/graphics/pokemon/front_pics/ho_oh_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/hoothoot_still_front_pic.png b/graphics/pokemon/front_pics/hoothoot_still_front_pic.png new file mode 100644 index 000000000..12e160d81 Binary files /dev/null and b/graphics/pokemon/front_pics/hoothoot_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/hoppip_still_front_pic.png b/graphics/pokemon/front_pics/hoppip_still_front_pic.png new file mode 100644 index 000000000..87110d09c Binary files /dev/null and b/graphics/pokemon/front_pics/hoppip_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/horsea_still_front_pic.png b/graphics/pokemon/front_pics/horsea_still_front_pic.png new file mode 100644 index 000000000..0ee92319e Binary files /dev/null and b/graphics/pokemon/front_pics/horsea_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/houndoom_still_front_pic.png b/graphics/pokemon/front_pics/houndoom_still_front_pic.png new file mode 100644 index 000000000..d5ab79d18 Binary files /dev/null and b/graphics/pokemon/front_pics/houndoom_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/houndour_still_front_pic.png b/graphics/pokemon/front_pics/houndour_still_front_pic.png new file mode 100644 index 000000000..87bbce73e Binary files /dev/null and b/graphics/pokemon/front_pics/houndour_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/huntail_still_front_pic.png b/graphics/pokemon/front_pics/huntail_still_front_pic.png new file mode 100644 index 000000000..647cdb8ca Binary files /dev/null and b/graphics/pokemon/front_pics/huntail_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/hypno_still_front_pic.png b/graphics/pokemon/front_pics/hypno_still_front_pic.png new file mode 100644 index 000000000..56687d4a4 Binary files /dev/null and b/graphics/pokemon/front_pics/hypno_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/igglybuff_still_front_pic.png b/graphics/pokemon/front_pics/igglybuff_still_front_pic.png new file mode 100644 index 000000000..b232daaac Binary files /dev/null and b/graphics/pokemon/front_pics/igglybuff_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/illumise_still_front_pic.png b/graphics/pokemon/front_pics/illumise_still_front_pic.png new file mode 100644 index 000000000..14513aee6 Binary files /dev/null and b/graphics/pokemon/front_pics/illumise_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/ivysaur_still_front_pic.png b/graphics/pokemon/front_pics/ivysaur_still_front_pic.png new file mode 100644 index 000000000..659c29fc5 Binary files /dev/null and b/graphics/pokemon/front_pics/ivysaur_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/jigglypuff_still_front_pic.png b/graphics/pokemon/front_pics/jigglypuff_still_front_pic.png new file mode 100644 index 000000000..1699d2e83 Binary files /dev/null and b/graphics/pokemon/front_pics/jigglypuff_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/jirachi_still_front_pic.png b/graphics/pokemon/front_pics/jirachi_still_front_pic.png new file mode 100644 index 000000000..91f5e3fad Binary files /dev/null and b/graphics/pokemon/front_pics/jirachi_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/jolteon_still_front_pic.png b/graphics/pokemon/front_pics/jolteon_still_front_pic.png new file mode 100644 index 000000000..be21a9d9e Binary files /dev/null and b/graphics/pokemon/front_pics/jolteon_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/jumpluff_still_front_pic.png b/graphics/pokemon/front_pics/jumpluff_still_front_pic.png new file mode 100644 index 000000000..6b7cbaf61 Binary files /dev/null and b/graphics/pokemon/front_pics/jumpluff_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/jynx_still_front_pic.png b/graphics/pokemon/front_pics/jynx_still_front_pic.png new file mode 100644 index 000000000..7af4ac93e Binary files /dev/null and b/graphics/pokemon/front_pics/jynx_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/kabuto_still_front_pic.png b/graphics/pokemon/front_pics/kabuto_still_front_pic.png new file mode 100644 index 000000000..76fd39d3d Binary files /dev/null and b/graphics/pokemon/front_pics/kabuto_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/kabutops_still_front_pic.png b/graphics/pokemon/front_pics/kabutops_still_front_pic.png new file mode 100644 index 000000000..6f47c841e Binary files /dev/null and b/graphics/pokemon/front_pics/kabutops_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/kadabra_still_front_pic.png b/graphics/pokemon/front_pics/kadabra_still_front_pic.png new file mode 100644 index 000000000..72645d55c Binary files /dev/null and b/graphics/pokemon/front_pics/kadabra_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/kakuna_still_front_pic.png b/graphics/pokemon/front_pics/kakuna_still_front_pic.png new file mode 100644 index 000000000..393c3b407 Binary files /dev/null and b/graphics/pokemon/front_pics/kakuna_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/kangaskhan_still_front_pic.png b/graphics/pokemon/front_pics/kangaskhan_still_front_pic.png new file mode 100644 index 000000000..fd513941b Binary files /dev/null and b/graphics/pokemon/front_pics/kangaskhan_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/kecleon_still_front_pic.png b/graphics/pokemon/front_pics/kecleon_still_front_pic.png new file mode 100644 index 000000000..e57431a06 Binary files /dev/null and b/graphics/pokemon/front_pics/kecleon_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/kingdra_still_front_pic.png b/graphics/pokemon/front_pics/kingdra_still_front_pic.png new file mode 100644 index 000000000..86fecb914 Binary files /dev/null and b/graphics/pokemon/front_pics/kingdra_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/kingler_still_front_pic.png b/graphics/pokemon/front_pics/kingler_still_front_pic.png new file mode 100644 index 000000000..596f37d97 Binary files /dev/null and b/graphics/pokemon/front_pics/kingler_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/kirlia_still_front_pic.png b/graphics/pokemon/front_pics/kirlia_still_front_pic.png new file mode 100644 index 000000000..84acc1494 Binary files /dev/null and b/graphics/pokemon/front_pics/kirlia_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/koffing_still_front_pic.png b/graphics/pokemon/front_pics/koffing_still_front_pic.png new file mode 100644 index 000000000..d3bd02eb7 Binary files /dev/null and b/graphics/pokemon/front_pics/koffing_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/krabby_still_front_pic.png b/graphics/pokemon/front_pics/krabby_still_front_pic.png new file mode 100644 index 000000000..9db2178be Binary files /dev/null and b/graphics/pokemon/front_pics/krabby_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/kyogre_still_front_pic.png b/graphics/pokemon/front_pics/kyogre_still_front_pic.png new file mode 100644 index 000000000..3b4b8e093 Binary files /dev/null and b/graphics/pokemon/front_pics/kyogre_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/lairon_still_front_pic.png b/graphics/pokemon/front_pics/lairon_still_front_pic.png new file mode 100644 index 000000000..50470dead Binary files /dev/null and b/graphics/pokemon/front_pics/lairon_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/lanturn_still_front_pic.png b/graphics/pokemon/front_pics/lanturn_still_front_pic.png new file mode 100644 index 000000000..a94ab7470 Binary files /dev/null and b/graphics/pokemon/front_pics/lanturn_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/lapras_still_front_pic.png b/graphics/pokemon/front_pics/lapras_still_front_pic.png new file mode 100644 index 000000000..063068e90 Binary files /dev/null and b/graphics/pokemon/front_pics/lapras_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/larvitar_still_front_pic.png b/graphics/pokemon/front_pics/larvitar_still_front_pic.png new file mode 100644 index 000000000..4183e29e1 Binary files /dev/null and b/graphics/pokemon/front_pics/larvitar_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/latias_still_front_pic.png b/graphics/pokemon/front_pics/latias_still_front_pic.png new file mode 100644 index 000000000..55e7e36b1 Binary files /dev/null and b/graphics/pokemon/front_pics/latias_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/latios_still_front_pic.png b/graphics/pokemon/front_pics/latios_still_front_pic.png new file mode 100644 index 000000000..a9c41e250 Binary files /dev/null and b/graphics/pokemon/front_pics/latios_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/ledian_still_front_pic.png b/graphics/pokemon/front_pics/ledian_still_front_pic.png new file mode 100644 index 000000000..ea58651cb Binary files /dev/null and b/graphics/pokemon/front_pics/ledian_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/ledyba_still_front_pic.png b/graphics/pokemon/front_pics/ledyba_still_front_pic.png new file mode 100644 index 000000000..210a16176 Binary files /dev/null and b/graphics/pokemon/front_pics/ledyba_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/lickitung_still_front_pic.png b/graphics/pokemon/front_pics/lickitung_still_front_pic.png new file mode 100644 index 000000000..445a7173e Binary files /dev/null and b/graphics/pokemon/front_pics/lickitung_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/lileep_still_front_pic.png b/graphics/pokemon/front_pics/lileep_still_front_pic.png new file mode 100644 index 000000000..5f85c25aa Binary files /dev/null and b/graphics/pokemon/front_pics/lileep_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/linoone_still_front_pic.png b/graphics/pokemon/front_pics/linoone_still_front_pic.png new file mode 100644 index 000000000..8b5baa699 Binary files /dev/null and b/graphics/pokemon/front_pics/linoone_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/lombre_still_front_pic.png b/graphics/pokemon/front_pics/lombre_still_front_pic.png new file mode 100644 index 000000000..3719098a9 Binary files /dev/null and b/graphics/pokemon/front_pics/lombre_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/lotad_still_front_pic.png b/graphics/pokemon/front_pics/lotad_still_front_pic.png new file mode 100644 index 000000000..0b7e0a0a6 Binary files /dev/null and b/graphics/pokemon/front_pics/lotad_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/loudred_still_front_pic.png b/graphics/pokemon/front_pics/loudred_still_front_pic.png new file mode 100644 index 000000000..2b87c0b29 Binary files /dev/null and b/graphics/pokemon/front_pics/loudred_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/ludicolo_still_front_pic.png b/graphics/pokemon/front_pics/ludicolo_still_front_pic.png new file mode 100644 index 000000000..df8e0091b Binary files /dev/null and b/graphics/pokemon/front_pics/ludicolo_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/lugia_still_front_pic.png b/graphics/pokemon/front_pics/lugia_still_front_pic.png new file mode 100644 index 000000000..44f6ce278 Binary files /dev/null and b/graphics/pokemon/front_pics/lugia_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/lunatone_still_front_pic.png b/graphics/pokemon/front_pics/lunatone_still_front_pic.png new file mode 100644 index 000000000..3458d32d5 Binary files /dev/null and b/graphics/pokemon/front_pics/lunatone_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/luvdisc_still_front_pic.png b/graphics/pokemon/front_pics/luvdisc_still_front_pic.png new file mode 100644 index 000000000..e85283e10 Binary files /dev/null and b/graphics/pokemon/front_pics/luvdisc_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/machamp_still_front_pic.png b/graphics/pokemon/front_pics/machamp_still_front_pic.png new file mode 100644 index 000000000..8096b4ddd Binary files /dev/null and b/graphics/pokemon/front_pics/machamp_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/machoke_still_front_pic.png b/graphics/pokemon/front_pics/machoke_still_front_pic.png new file mode 100644 index 000000000..a42831e68 Binary files /dev/null and b/graphics/pokemon/front_pics/machoke_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/machop_still_front_pic.png b/graphics/pokemon/front_pics/machop_still_front_pic.png new file mode 100644 index 000000000..4a9656314 Binary files /dev/null and b/graphics/pokemon/front_pics/machop_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/magby_still_front_pic.png b/graphics/pokemon/front_pics/magby_still_front_pic.png new file mode 100644 index 000000000..6994953b2 Binary files /dev/null and b/graphics/pokemon/front_pics/magby_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/magcargo_still_front_pic.png b/graphics/pokemon/front_pics/magcargo_still_front_pic.png new file mode 100644 index 000000000..b2e3679cd Binary files /dev/null and b/graphics/pokemon/front_pics/magcargo_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/magikarp_still_front_pic.png b/graphics/pokemon/front_pics/magikarp_still_front_pic.png new file mode 100644 index 000000000..a34e0e9cd Binary files /dev/null and b/graphics/pokemon/front_pics/magikarp_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/magmar_still_front_pic.png b/graphics/pokemon/front_pics/magmar_still_front_pic.png new file mode 100644 index 000000000..1414e4e04 Binary files /dev/null and b/graphics/pokemon/front_pics/magmar_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/magnemite_still_front_pic.png b/graphics/pokemon/front_pics/magnemite_still_front_pic.png new file mode 100644 index 000000000..4f1b8a04f Binary files /dev/null and b/graphics/pokemon/front_pics/magnemite_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/magneton_still_front_pic.png b/graphics/pokemon/front_pics/magneton_still_front_pic.png new file mode 100644 index 000000000..2589acbb4 Binary files /dev/null and b/graphics/pokemon/front_pics/magneton_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/makuhita_still_front_pic.png b/graphics/pokemon/front_pics/makuhita_still_front_pic.png new file mode 100644 index 000000000..76a11c069 Binary files /dev/null and b/graphics/pokemon/front_pics/makuhita_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/manectric_still_front_pic.png b/graphics/pokemon/front_pics/manectric_still_front_pic.png new file mode 100644 index 000000000..d4142301c Binary files /dev/null and b/graphics/pokemon/front_pics/manectric_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/mankey_still_front_pic.png b/graphics/pokemon/front_pics/mankey_still_front_pic.png new file mode 100644 index 000000000..47b9e9d93 Binary files /dev/null and b/graphics/pokemon/front_pics/mankey_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/mantine_still_front_pic.png b/graphics/pokemon/front_pics/mantine_still_front_pic.png new file mode 100644 index 000000000..b8a292d83 Binary files /dev/null and b/graphics/pokemon/front_pics/mantine_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/mareep_still_front_pic.png b/graphics/pokemon/front_pics/mareep_still_front_pic.png new file mode 100644 index 000000000..7f052faea Binary files /dev/null and b/graphics/pokemon/front_pics/mareep_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/marill_still_front_pic.png b/graphics/pokemon/front_pics/marill_still_front_pic.png new file mode 100644 index 000000000..91cdf233f Binary files /dev/null and b/graphics/pokemon/front_pics/marill_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/marowak_still_front_pic.png b/graphics/pokemon/front_pics/marowak_still_front_pic.png new file mode 100644 index 000000000..cc30ea0c6 Binary files /dev/null and b/graphics/pokemon/front_pics/marowak_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/marshtomp_still_front_pic.png b/graphics/pokemon/front_pics/marshtomp_still_front_pic.png new file mode 100644 index 000000000..92e043bbc Binary files /dev/null and b/graphics/pokemon/front_pics/marshtomp_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/masquerain_still_front_pic.png b/graphics/pokemon/front_pics/masquerain_still_front_pic.png new file mode 100644 index 000000000..b4c33dccc Binary files /dev/null and b/graphics/pokemon/front_pics/masquerain_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/mawile_still_front_pic.png b/graphics/pokemon/front_pics/mawile_still_front_pic.png new file mode 100644 index 000000000..49f38de14 Binary files /dev/null and b/graphics/pokemon/front_pics/mawile_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/medicham_still_front_pic.png b/graphics/pokemon/front_pics/medicham_still_front_pic.png new file mode 100644 index 000000000..1da67a1f2 Binary files /dev/null and b/graphics/pokemon/front_pics/medicham_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/meditite_still_front_pic.png b/graphics/pokemon/front_pics/meditite_still_front_pic.png new file mode 100644 index 000000000..e8717b13d Binary files /dev/null and b/graphics/pokemon/front_pics/meditite_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/meganium_still_front_pic.png b/graphics/pokemon/front_pics/meganium_still_front_pic.png new file mode 100644 index 000000000..5ecee5287 Binary files /dev/null and b/graphics/pokemon/front_pics/meganium_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/meowth_still_front_pic.png b/graphics/pokemon/front_pics/meowth_still_front_pic.png new file mode 100644 index 000000000..76299ea59 Binary files /dev/null and b/graphics/pokemon/front_pics/meowth_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/metagross_still_front_pic.png b/graphics/pokemon/front_pics/metagross_still_front_pic.png new file mode 100644 index 000000000..6349fe912 Binary files /dev/null and b/graphics/pokemon/front_pics/metagross_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/metang_still_front_pic.png b/graphics/pokemon/front_pics/metang_still_front_pic.png new file mode 100644 index 000000000..397bef3bf Binary files /dev/null and b/graphics/pokemon/front_pics/metang_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/metapod_still_front_pic.png b/graphics/pokemon/front_pics/metapod_still_front_pic.png new file mode 100644 index 000000000..5069c7202 Binary files /dev/null and b/graphics/pokemon/front_pics/metapod_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/mew_still_front_pic.png b/graphics/pokemon/front_pics/mew_still_front_pic.png new file mode 100644 index 000000000..a2b2dd573 Binary files /dev/null and b/graphics/pokemon/front_pics/mew_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/mewtwo_still_front_pic.png b/graphics/pokemon/front_pics/mewtwo_still_front_pic.png new file mode 100644 index 000000000..a35fd8dda Binary files /dev/null and b/graphics/pokemon/front_pics/mewtwo_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/mightyena_still_front_pic.png b/graphics/pokemon/front_pics/mightyena_still_front_pic.png new file mode 100644 index 000000000..16af4c021 Binary files /dev/null and b/graphics/pokemon/front_pics/mightyena_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/milotic_still_front_pic.png b/graphics/pokemon/front_pics/milotic_still_front_pic.png new file mode 100644 index 000000000..82d683449 Binary files /dev/null and b/graphics/pokemon/front_pics/milotic_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/miltank_still_front_pic.png b/graphics/pokemon/front_pics/miltank_still_front_pic.png new file mode 100644 index 000000000..394b56fab Binary files /dev/null and b/graphics/pokemon/front_pics/miltank_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/minun_still_front_pic.png b/graphics/pokemon/front_pics/minun_still_front_pic.png new file mode 100644 index 000000000..9b373c0a2 Binary files /dev/null and b/graphics/pokemon/front_pics/minun_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/misdreavus_still_front_pic.png b/graphics/pokemon/front_pics/misdreavus_still_front_pic.png new file mode 100644 index 000000000..135f6969b Binary files /dev/null and b/graphics/pokemon/front_pics/misdreavus_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/moltres_still_front_pic.png b/graphics/pokemon/front_pics/moltres_still_front_pic.png new file mode 100644 index 000000000..3ce75c7cc Binary files /dev/null and b/graphics/pokemon/front_pics/moltres_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/mr_mime_still_front_pic.png b/graphics/pokemon/front_pics/mr_mime_still_front_pic.png new file mode 100644 index 000000000..aac232c67 Binary files /dev/null and b/graphics/pokemon/front_pics/mr_mime_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/mudkip_still_front_pic.png b/graphics/pokemon/front_pics/mudkip_still_front_pic.png new file mode 100644 index 000000000..15405baf9 Binary files /dev/null and b/graphics/pokemon/front_pics/mudkip_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/muk_still_front_pic.png b/graphics/pokemon/front_pics/muk_still_front_pic.png new file mode 100644 index 000000000..f1ec93830 Binary files /dev/null and b/graphics/pokemon/front_pics/muk_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/murkrow_still_front_pic.png b/graphics/pokemon/front_pics/murkrow_still_front_pic.png new file mode 100644 index 000000000..77c11fef2 Binary files /dev/null and b/graphics/pokemon/front_pics/murkrow_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/natu_still_front_pic.png b/graphics/pokemon/front_pics/natu_still_front_pic.png new file mode 100644 index 000000000..b25742d8e Binary files /dev/null and b/graphics/pokemon/front_pics/natu_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/nidoking_still_front_pic.png b/graphics/pokemon/front_pics/nidoking_still_front_pic.png new file mode 100644 index 000000000..db7740e99 Binary files /dev/null and b/graphics/pokemon/front_pics/nidoking_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/nidoqueen_still_front_pic.png b/graphics/pokemon/front_pics/nidoqueen_still_front_pic.png new file mode 100644 index 000000000..3db1a20fd Binary files /dev/null and b/graphics/pokemon/front_pics/nidoqueen_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/nidoran_f_still_front_pic.png b/graphics/pokemon/front_pics/nidoran_f_still_front_pic.png new file mode 100644 index 000000000..8cfed4258 Binary files /dev/null and b/graphics/pokemon/front_pics/nidoran_f_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/nidoran_m_still_front_pic.png b/graphics/pokemon/front_pics/nidoran_m_still_front_pic.png new file mode 100644 index 000000000..b46c3d586 Binary files /dev/null and b/graphics/pokemon/front_pics/nidoran_m_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/nidorina_still_front_pic.png b/graphics/pokemon/front_pics/nidorina_still_front_pic.png new file mode 100644 index 000000000..0aa883505 Binary files /dev/null and b/graphics/pokemon/front_pics/nidorina_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/nidorino_still_front_pic.png b/graphics/pokemon/front_pics/nidorino_still_front_pic.png new file mode 100644 index 000000000..8acf1cc72 Binary files /dev/null and b/graphics/pokemon/front_pics/nidorino_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/nincada_still_front_pic.png b/graphics/pokemon/front_pics/nincada_still_front_pic.png new file mode 100644 index 000000000..576144c48 Binary files /dev/null and b/graphics/pokemon/front_pics/nincada_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/ninetales_still_front_pic.png b/graphics/pokemon/front_pics/ninetales_still_front_pic.png new file mode 100644 index 000000000..30b5d0d1f Binary files /dev/null and b/graphics/pokemon/front_pics/ninetales_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/ninjask_still_front_pic.png b/graphics/pokemon/front_pics/ninjask_still_front_pic.png new file mode 100644 index 000000000..c642dbad5 Binary files /dev/null and b/graphics/pokemon/front_pics/ninjask_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/noctowl_still_front_pic.png b/graphics/pokemon/front_pics/noctowl_still_front_pic.png new file mode 100644 index 000000000..56e148d94 Binary files /dev/null and b/graphics/pokemon/front_pics/noctowl_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/nosepass_still_front_pic.png b/graphics/pokemon/front_pics/nosepass_still_front_pic.png new file mode 100644 index 000000000..5ed3a851f Binary files /dev/null and b/graphics/pokemon/front_pics/nosepass_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/numel_still_front_pic.png b/graphics/pokemon/front_pics/numel_still_front_pic.png new file mode 100644 index 000000000..1aca480f7 Binary files /dev/null and b/graphics/pokemon/front_pics/numel_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/nuzleaf_still_front_pic.png b/graphics/pokemon/front_pics/nuzleaf_still_front_pic.png new file mode 100644 index 000000000..ecaf00f85 Binary files /dev/null and b/graphics/pokemon/front_pics/nuzleaf_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/octillery_still_front_pic.png b/graphics/pokemon/front_pics/octillery_still_front_pic.png new file mode 100644 index 000000000..99d3a166e Binary files /dev/null and b/graphics/pokemon/front_pics/octillery_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/oddish_still_front_pic.png b/graphics/pokemon/front_pics/oddish_still_front_pic.png new file mode 100644 index 000000000..6b43f1683 Binary files /dev/null and b/graphics/pokemon/front_pics/oddish_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/omanyte_still_front_pic.png b/graphics/pokemon/front_pics/omanyte_still_front_pic.png new file mode 100644 index 000000000..5c779d128 Binary files /dev/null and b/graphics/pokemon/front_pics/omanyte_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/omastar_still_front_pic.png b/graphics/pokemon/front_pics/omastar_still_front_pic.png new file mode 100644 index 000000000..2a1c58e38 Binary files /dev/null and b/graphics/pokemon/front_pics/omastar_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/onix_still_front_pic.png b/graphics/pokemon/front_pics/onix_still_front_pic.png new file mode 100644 index 000000000..4f9679d3f Binary files /dev/null and b/graphics/pokemon/front_pics/onix_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/paras_still_front_pic.png b/graphics/pokemon/front_pics/paras_still_front_pic.png new file mode 100644 index 000000000..6fceba2f2 Binary files /dev/null and b/graphics/pokemon/front_pics/paras_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/parasect_still_front_pic.png b/graphics/pokemon/front_pics/parasect_still_front_pic.png new file mode 100644 index 000000000..ebded40ab Binary files /dev/null and b/graphics/pokemon/front_pics/parasect_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/pelipper_still_front_pic.png b/graphics/pokemon/front_pics/pelipper_still_front_pic.png new file mode 100644 index 000000000..1bf3669ae Binary files /dev/null and b/graphics/pokemon/front_pics/pelipper_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/persian_still_front_pic.png b/graphics/pokemon/front_pics/persian_still_front_pic.png new file mode 100644 index 000000000..baf8a4eed Binary files /dev/null and b/graphics/pokemon/front_pics/persian_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/phanpy_still_front_pic.png b/graphics/pokemon/front_pics/phanpy_still_front_pic.png new file mode 100644 index 000000000..f9dc5fce6 Binary files /dev/null and b/graphics/pokemon/front_pics/phanpy_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/pichu_still_front_pic.png b/graphics/pokemon/front_pics/pichu_still_front_pic.png new file mode 100644 index 000000000..f061d578b Binary files /dev/null and b/graphics/pokemon/front_pics/pichu_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/pidgeot_still_front_pic.png b/graphics/pokemon/front_pics/pidgeot_still_front_pic.png new file mode 100644 index 000000000..314ea0e95 Binary files /dev/null and b/graphics/pokemon/front_pics/pidgeot_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/pidgeotto_still_front_pic.png b/graphics/pokemon/front_pics/pidgeotto_still_front_pic.png new file mode 100644 index 000000000..dc7f68df0 Binary files /dev/null and b/graphics/pokemon/front_pics/pidgeotto_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/pidgey_still_front_pic.png b/graphics/pokemon/front_pics/pidgey_still_front_pic.png new file mode 100644 index 000000000..081602716 Binary files /dev/null and b/graphics/pokemon/front_pics/pidgey_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/pikachu_still_front_pic.png b/graphics/pokemon/front_pics/pikachu_still_front_pic.png new file mode 100644 index 000000000..18f83cf02 Binary files /dev/null and b/graphics/pokemon/front_pics/pikachu_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/piloswine_still_front_pic.png b/graphics/pokemon/front_pics/piloswine_still_front_pic.png new file mode 100644 index 000000000..939fb3908 Binary files /dev/null and b/graphics/pokemon/front_pics/piloswine_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/pineco_still_front_pic.png b/graphics/pokemon/front_pics/pineco_still_front_pic.png new file mode 100644 index 000000000..eee32963a Binary files /dev/null and b/graphics/pokemon/front_pics/pineco_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/pinsir_still_front_pic.png b/graphics/pokemon/front_pics/pinsir_still_front_pic.png new file mode 100644 index 000000000..c14846d5b Binary files /dev/null and b/graphics/pokemon/front_pics/pinsir_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/plusle_still_front_pic.png b/graphics/pokemon/front_pics/plusle_still_front_pic.png new file mode 100644 index 000000000..dc38ca3d1 Binary files /dev/null and b/graphics/pokemon/front_pics/plusle_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/politoed_still_front_pic.png b/graphics/pokemon/front_pics/politoed_still_front_pic.png new file mode 100644 index 000000000..d07bf4013 Binary files /dev/null and b/graphics/pokemon/front_pics/politoed_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/poliwag_still_front_pic.png b/graphics/pokemon/front_pics/poliwag_still_front_pic.png new file mode 100644 index 000000000..47d5bb762 Binary files /dev/null and b/graphics/pokemon/front_pics/poliwag_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/poliwhirl_still_front_pic.png b/graphics/pokemon/front_pics/poliwhirl_still_front_pic.png new file mode 100644 index 000000000..ab7eb3a4b Binary files /dev/null and b/graphics/pokemon/front_pics/poliwhirl_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/poliwrath_still_front_pic.png b/graphics/pokemon/front_pics/poliwrath_still_front_pic.png new file mode 100644 index 000000000..84210c773 Binary files /dev/null and b/graphics/pokemon/front_pics/poliwrath_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/ponyta_still_front_pic.png b/graphics/pokemon/front_pics/ponyta_still_front_pic.png new file mode 100644 index 000000000..b2a4e903d Binary files /dev/null and b/graphics/pokemon/front_pics/ponyta_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/poochyena_still_front_pic.png b/graphics/pokemon/front_pics/poochyena_still_front_pic.png new file mode 100644 index 000000000..bfdc6e7e6 Binary files /dev/null and b/graphics/pokemon/front_pics/poochyena_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/porygon2_still_front_pic.png b/graphics/pokemon/front_pics/porygon2_still_front_pic.png new file mode 100644 index 000000000..ef08816d7 Binary files /dev/null and b/graphics/pokemon/front_pics/porygon2_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/porygon_still_front_pic.png b/graphics/pokemon/front_pics/porygon_still_front_pic.png new file mode 100644 index 000000000..c22e57d32 Binary files /dev/null and b/graphics/pokemon/front_pics/porygon_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/primeape_still_front_pic.png b/graphics/pokemon/front_pics/primeape_still_front_pic.png new file mode 100644 index 000000000..4d135e9f4 Binary files /dev/null and b/graphics/pokemon/front_pics/primeape_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/psyduck_still_front_pic.png b/graphics/pokemon/front_pics/psyduck_still_front_pic.png new file mode 100644 index 000000000..41e5202fc Binary files /dev/null and b/graphics/pokemon/front_pics/psyduck_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/pupitar_still_front_pic.png b/graphics/pokemon/front_pics/pupitar_still_front_pic.png new file mode 100644 index 000000000..9e48ec20a Binary files /dev/null and b/graphics/pokemon/front_pics/pupitar_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/quagsire_still_front_pic.png b/graphics/pokemon/front_pics/quagsire_still_front_pic.png new file mode 100644 index 000000000..d065f9fa1 Binary files /dev/null and b/graphics/pokemon/front_pics/quagsire_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/quilava_still_front_pic.png b/graphics/pokemon/front_pics/quilava_still_front_pic.png new file mode 100644 index 000000000..a5a0d34f6 Binary files /dev/null and b/graphics/pokemon/front_pics/quilava_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/qwilfish_still_front_pic.png b/graphics/pokemon/front_pics/qwilfish_still_front_pic.png new file mode 100644 index 000000000..67266d4af Binary files /dev/null and b/graphics/pokemon/front_pics/qwilfish_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/raichu_still_front_pic.png b/graphics/pokemon/front_pics/raichu_still_front_pic.png new file mode 100644 index 000000000..8c324b5e5 Binary files /dev/null and b/graphics/pokemon/front_pics/raichu_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/raikou_still_front_pic.png b/graphics/pokemon/front_pics/raikou_still_front_pic.png new file mode 100644 index 000000000..f9ee02ea9 Binary files /dev/null and b/graphics/pokemon/front_pics/raikou_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/ralts_still_front_pic.png b/graphics/pokemon/front_pics/ralts_still_front_pic.png new file mode 100644 index 000000000..dc4551880 Binary files /dev/null and b/graphics/pokemon/front_pics/ralts_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/rapidash_still_front_pic.png b/graphics/pokemon/front_pics/rapidash_still_front_pic.png new file mode 100644 index 000000000..156aa6a59 Binary files /dev/null and b/graphics/pokemon/front_pics/rapidash_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/raticate_still_front_pic.png b/graphics/pokemon/front_pics/raticate_still_front_pic.png new file mode 100644 index 000000000..ebbfeead1 Binary files /dev/null and b/graphics/pokemon/front_pics/raticate_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/rattata_still_front_pic.png b/graphics/pokemon/front_pics/rattata_still_front_pic.png new file mode 100644 index 000000000..28abd0e9a Binary files /dev/null and b/graphics/pokemon/front_pics/rattata_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/rayquaza_still_front_pic.png b/graphics/pokemon/front_pics/rayquaza_still_front_pic.png new file mode 100644 index 000000000..21d554ce3 Binary files /dev/null and b/graphics/pokemon/front_pics/rayquaza_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/regice_still_front_pic.png b/graphics/pokemon/front_pics/regice_still_front_pic.png new file mode 100644 index 000000000..022a3a855 Binary files /dev/null and b/graphics/pokemon/front_pics/regice_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/regirock_still_front_pic.png b/graphics/pokemon/front_pics/regirock_still_front_pic.png new file mode 100644 index 000000000..9e179079a Binary files /dev/null and b/graphics/pokemon/front_pics/regirock_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/registeel_still_front_pic.png b/graphics/pokemon/front_pics/registeel_still_front_pic.png new file mode 100644 index 000000000..d7fe7e101 Binary files /dev/null and b/graphics/pokemon/front_pics/registeel_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/relicanth_still_front_pic.png b/graphics/pokemon/front_pics/relicanth_still_front_pic.png new file mode 100644 index 000000000..41886e9e2 Binary files /dev/null and b/graphics/pokemon/front_pics/relicanth_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/remoraid_still_front_pic.png b/graphics/pokemon/front_pics/remoraid_still_front_pic.png new file mode 100644 index 000000000..b80e2af89 Binary files /dev/null and b/graphics/pokemon/front_pics/remoraid_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/rhydon_still_front_pic.png b/graphics/pokemon/front_pics/rhydon_still_front_pic.png new file mode 100644 index 000000000..1455d7010 Binary files /dev/null and b/graphics/pokemon/front_pics/rhydon_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/rhyhorn_still_front_pic.png b/graphics/pokemon/front_pics/rhyhorn_still_front_pic.png new file mode 100644 index 000000000..357977812 Binary files /dev/null and b/graphics/pokemon/front_pics/rhyhorn_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/roselia_still_front_pic.png b/graphics/pokemon/front_pics/roselia_still_front_pic.png new file mode 100644 index 000000000..d018ba658 Binary files /dev/null and b/graphics/pokemon/front_pics/roselia_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/sableye_still_front_pic.png b/graphics/pokemon/front_pics/sableye_still_front_pic.png new file mode 100644 index 000000000..5004a61ec Binary files /dev/null and b/graphics/pokemon/front_pics/sableye_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/salamence_still_front_pic.png b/graphics/pokemon/front_pics/salamence_still_front_pic.png new file mode 100644 index 000000000..97db0937c Binary files /dev/null and b/graphics/pokemon/front_pics/salamence_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/sandshrew_still_front_pic.png b/graphics/pokemon/front_pics/sandshrew_still_front_pic.png new file mode 100644 index 000000000..12c9cad5a Binary files /dev/null and b/graphics/pokemon/front_pics/sandshrew_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/sandslash_still_front_pic.png b/graphics/pokemon/front_pics/sandslash_still_front_pic.png new file mode 100644 index 000000000..86115f777 Binary files /dev/null and b/graphics/pokemon/front_pics/sandslash_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/sceptile_still_front_pic.png b/graphics/pokemon/front_pics/sceptile_still_front_pic.png new file mode 100644 index 000000000..f6ce3a054 Binary files /dev/null and b/graphics/pokemon/front_pics/sceptile_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/scizor_still_front_pic.png b/graphics/pokemon/front_pics/scizor_still_front_pic.png new file mode 100644 index 000000000..33bdef332 Binary files /dev/null and b/graphics/pokemon/front_pics/scizor_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/scyther_still_front_pic.png b/graphics/pokemon/front_pics/scyther_still_front_pic.png new file mode 100644 index 000000000..55c7a3de9 Binary files /dev/null and b/graphics/pokemon/front_pics/scyther_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/seadra_still_front_pic.png b/graphics/pokemon/front_pics/seadra_still_front_pic.png new file mode 100644 index 000000000..8f03a6736 Binary files /dev/null and b/graphics/pokemon/front_pics/seadra_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/seaking_still_front_pic.png b/graphics/pokemon/front_pics/seaking_still_front_pic.png new file mode 100644 index 000000000..155dc6172 Binary files /dev/null and b/graphics/pokemon/front_pics/seaking_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/sealeo_still_front_pic.png b/graphics/pokemon/front_pics/sealeo_still_front_pic.png new file mode 100644 index 000000000..920a190d0 Binary files /dev/null and b/graphics/pokemon/front_pics/sealeo_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/seedot_still_front_pic.png b/graphics/pokemon/front_pics/seedot_still_front_pic.png new file mode 100644 index 000000000..6be5868e6 Binary files /dev/null and b/graphics/pokemon/front_pics/seedot_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/seel_still_front_pic.png b/graphics/pokemon/front_pics/seel_still_front_pic.png new file mode 100644 index 000000000..e6bbb2580 Binary files /dev/null and b/graphics/pokemon/front_pics/seel_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/sentret_still_front_pic.png b/graphics/pokemon/front_pics/sentret_still_front_pic.png new file mode 100644 index 000000000..eb3032ade Binary files /dev/null and b/graphics/pokemon/front_pics/sentret_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/seviper_still_front_pic.png b/graphics/pokemon/front_pics/seviper_still_front_pic.png new file mode 100644 index 000000000..41635e5fb Binary files /dev/null and b/graphics/pokemon/front_pics/seviper_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/sharpedo_still_front_pic.png b/graphics/pokemon/front_pics/sharpedo_still_front_pic.png new file mode 100644 index 000000000..65d1182c0 Binary files /dev/null and b/graphics/pokemon/front_pics/sharpedo_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/shedinja_still_front_pic.png b/graphics/pokemon/front_pics/shedinja_still_front_pic.png new file mode 100644 index 000000000..06c47ea9c Binary files /dev/null and b/graphics/pokemon/front_pics/shedinja_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/shelgon_still_front_pic.png b/graphics/pokemon/front_pics/shelgon_still_front_pic.png new file mode 100644 index 000000000..c9474977e Binary files /dev/null and b/graphics/pokemon/front_pics/shelgon_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/shellder_still_front_pic.png b/graphics/pokemon/front_pics/shellder_still_front_pic.png new file mode 100644 index 000000000..0cb47ebf8 Binary files /dev/null and b/graphics/pokemon/front_pics/shellder_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/shiftry_still_front_pic.png b/graphics/pokemon/front_pics/shiftry_still_front_pic.png new file mode 100644 index 000000000..580c248b7 Binary files /dev/null and b/graphics/pokemon/front_pics/shiftry_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/shroomish_still_front_pic.png b/graphics/pokemon/front_pics/shroomish_still_front_pic.png new file mode 100644 index 000000000..0ebe8ca06 Binary files /dev/null and b/graphics/pokemon/front_pics/shroomish_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/shuckle_still_front_pic.png b/graphics/pokemon/front_pics/shuckle_still_front_pic.png new file mode 100644 index 000000000..1747fe5e7 Binary files /dev/null and b/graphics/pokemon/front_pics/shuckle_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/shuppet_still_front_pic.png b/graphics/pokemon/front_pics/shuppet_still_front_pic.png new file mode 100644 index 000000000..9b63e2640 Binary files /dev/null and b/graphics/pokemon/front_pics/shuppet_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/silcoon_still_front_pic.png b/graphics/pokemon/front_pics/silcoon_still_front_pic.png new file mode 100644 index 000000000..f416f074d Binary files /dev/null and b/graphics/pokemon/front_pics/silcoon_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/skarmory_still_front_pic.png b/graphics/pokemon/front_pics/skarmory_still_front_pic.png new file mode 100644 index 000000000..06ce4420f Binary files /dev/null and b/graphics/pokemon/front_pics/skarmory_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/skiploom_still_front_pic.png b/graphics/pokemon/front_pics/skiploom_still_front_pic.png new file mode 100644 index 000000000..0efc78f1d Binary files /dev/null and b/graphics/pokemon/front_pics/skiploom_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/skitty_still_front_pic.png b/graphics/pokemon/front_pics/skitty_still_front_pic.png new file mode 100644 index 000000000..b0b85cc95 Binary files /dev/null and b/graphics/pokemon/front_pics/skitty_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/slaking_still_front_pic.png b/graphics/pokemon/front_pics/slaking_still_front_pic.png new file mode 100644 index 000000000..3ff648701 Binary files /dev/null and b/graphics/pokemon/front_pics/slaking_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/slakoth_still_front_pic.png b/graphics/pokemon/front_pics/slakoth_still_front_pic.png new file mode 100644 index 000000000..5440669ae Binary files /dev/null and b/graphics/pokemon/front_pics/slakoth_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/slowbro_still_front_pic.png b/graphics/pokemon/front_pics/slowbro_still_front_pic.png new file mode 100644 index 000000000..36bd9e8c5 Binary files /dev/null and b/graphics/pokemon/front_pics/slowbro_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/slowking_still_front_pic.png b/graphics/pokemon/front_pics/slowking_still_front_pic.png new file mode 100644 index 000000000..11b16a952 Binary files /dev/null and b/graphics/pokemon/front_pics/slowking_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/slowpoke_still_front_pic.png b/graphics/pokemon/front_pics/slowpoke_still_front_pic.png new file mode 100644 index 000000000..5c6c87026 Binary files /dev/null and b/graphics/pokemon/front_pics/slowpoke_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/slugma_still_front_pic.png b/graphics/pokemon/front_pics/slugma_still_front_pic.png new file mode 100644 index 000000000..4b27af3fc Binary files /dev/null and b/graphics/pokemon/front_pics/slugma_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/smeargle_still_front_pic.png b/graphics/pokemon/front_pics/smeargle_still_front_pic.png new file mode 100644 index 000000000..91c400395 Binary files /dev/null and b/graphics/pokemon/front_pics/smeargle_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/smoochum_still_front_pic.png b/graphics/pokemon/front_pics/smoochum_still_front_pic.png new file mode 100644 index 000000000..608841600 Binary files /dev/null and b/graphics/pokemon/front_pics/smoochum_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/sneasel_still_front_pic.png b/graphics/pokemon/front_pics/sneasel_still_front_pic.png new file mode 100644 index 000000000..704489419 Binary files /dev/null and b/graphics/pokemon/front_pics/sneasel_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/snorlax_still_front_pic.png b/graphics/pokemon/front_pics/snorlax_still_front_pic.png new file mode 100644 index 000000000..e71642b2c Binary files /dev/null and b/graphics/pokemon/front_pics/snorlax_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/snorunt_still_front_pic.png b/graphics/pokemon/front_pics/snorunt_still_front_pic.png new file mode 100644 index 000000000..bf18fb9fa Binary files /dev/null and b/graphics/pokemon/front_pics/snorunt_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/snubbull_still_front_pic.png b/graphics/pokemon/front_pics/snubbull_still_front_pic.png new file mode 100644 index 000000000..86c602d49 Binary files /dev/null and b/graphics/pokemon/front_pics/snubbull_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/solrock_still_front_pic.png b/graphics/pokemon/front_pics/solrock_still_front_pic.png new file mode 100644 index 000000000..d0fe58533 Binary files /dev/null and b/graphics/pokemon/front_pics/solrock_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/spearow_still_front_pic.png b/graphics/pokemon/front_pics/spearow_still_front_pic.png new file mode 100644 index 000000000..f6408d7c0 Binary files /dev/null and b/graphics/pokemon/front_pics/spearow_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/spheal_still_front_pic.png b/graphics/pokemon/front_pics/spheal_still_front_pic.png new file mode 100644 index 000000000..f07cf67b5 Binary files /dev/null and b/graphics/pokemon/front_pics/spheal_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/spinarak_still_front_pic.png b/graphics/pokemon/front_pics/spinarak_still_front_pic.png new file mode 100644 index 000000000..cd525f1c4 Binary files /dev/null and b/graphics/pokemon/front_pics/spinarak_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/spinda_still_front_pic.png b/graphics/pokemon/front_pics/spinda_still_front_pic.png new file mode 100644 index 000000000..5976a87d1 Binary files /dev/null and b/graphics/pokemon/front_pics/spinda_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/spoink_still_front_pic.png b/graphics/pokemon/front_pics/spoink_still_front_pic.png new file mode 100644 index 000000000..ee4afc1ed Binary files /dev/null and b/graphics/pokemon/front_pics/spoink_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/squirtle_still_front_pic.png b/graphics/pokemon/front_pics/squirtle_still_front_pic.png new file mode 100644 index 000000000..c494d47e3 Binary files /dev/null and b/graphics/pokemon/front_pics/squirtle_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/stantler_still_front_pic.png b/graphics/pokemon/front_pics/stantler_still_front_pic.png new file mode 100644 index 000000000..aa3d80efc Binary files /dev/null and b/graphics/pokemon/front_pics/stantler_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/starmie_still_front_pic.png b/graphics/pokemon/front_pics/starmie_still_front_pic.png new file mode 100644 index 000000000..e695d83de Binary files /dev/null and b/graphics/pokemon/front_pics/starmie_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/staryu_still_front_pic.png b/graphics/pokemon/front_pics/staryu_still_front_pic.png new file mode 100644 index 000000000..c17a80418 Binary files /dev/null and b/graphics/pokemon/front_pics/staryu_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/steelix_still_front_pic.png b/graphics/pokemon/front_pics/steelix_still_front_pic.png new file mode 100644 index 000000000..e5b3a35d6 Binary files /dev/null and b/graphics/pokemon/front_pics/steelix_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/sudowoodo_still_front_pic.png b/graphics/pokemon/front_pics/sudowoodo_still_front_pic.png new file mode 100644 index 000000000..897516953 Binary files /dev/null and b/graphics/pokemon/front_pics/sudowoodo_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/suicune_still_front_pic.png b/graphics/pokemon/front_pics/suicune_still_front_pic.png new file mode 100644 index 000000000..3529d8fe1 Binary files /dev/null and b/graphics/pokemon/front_pics/suicune_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/sunflora_still_front_pic.png b/graphics/pokemon/front_pics/sunflora_still_front_pic.png new file mode 100644 index 000000000..9752bb9d4 Binary files /dev/null and b/graphics/pokemon/front_pics/sunflora_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/sunkern_still_front_pic.png b/graphics/pokemon/front_pics/sunkern_still_front_pic.png new file mode 100644 index 000000000..15a743cc3 Binary files /dev/null and b/graphics/pokemon/front_pics/sunkern_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/surskit_still_front_pic.png b/graphics/pokemon/front_pics/surskit_still_front_pic.png new file mode 100644 index 000000000..559e8e786 Binary files /dev/null and b/graphics/pokemon/front_pics/surskit_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/swablu_still_front_pic.png b/graphics/pokemon/front_pics/swablu_still_front_pic.png new file mode 100644 index 000000000..1992c2d06 Binary files /dev/null and b/graphics/pokemon/front_pics/swablu_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/swalot_still_front_pic.png b/graphics/pokemon/front_pics/swalot_still_front_pic.png new file mode 100644 index 000000000..7607b8c2e Binary files /dev/null and b/graphics/pokemon/front_pics/swalot_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/swampert_still_front_pic.png b/graphics/pokemon/front_pics/swampert_still_front_pic.png new file mode 100644 index 000000000..eea565e43 Binary files /dev/null and b/graphics/pokemon/front_pics/swampert_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/swellow_still_front_pic.png b/graphics/pokemon/front_pics/swellow_still_front_pic.png new file mode 100644 index 000000000..6a5dcb239 Binary files /dev/null and b/graphics/pokemon/front_pics/swellow_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/swinub_still_front_pic.png b/graphics/pokemon/front_pics/swinub_still_front_pic.png new file mode 100644 index 000000000..c92de5b5a Binary files /dev/null and b/graphics/pokemon/front_pics/swinub_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/taillow_still_front_pic.png b/graphics/pokemon/front_pics/taillow_still_front_pic.png new file mode 100644 index 000000000..6ff802ac6 Binary files /dev/null and b/graphics/pokemon/front_pics/taillow_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/tangela_still_front_pic.png b/graphics/pokemon/front_pics/tangela_still_front_pic.png new file mode 100644 index 000000000..2aec57c3a Binary files /dev/null and b/graphics/pokemon/front_pics/tangela_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/tauros_still_front_pic.png b/graphics/pokemon/front_pics/tauros_still_front_pic.png new file mode 100644 index 000000000..97498f415 Binary files /dev/null and b/graphics/pokemon/front_pics/tauros_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/teddiursa_still_front_pic.png b/graphics/pokemon/front_pics/teddiursa_still_front_pic.png new file mode 100644 index 000000000..27651cfc8 Binary files /dev/null and b/graphics/pokemon/front_pics/teddiursa_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/tentacool_still_front_pic.png b/graphics/pokemon/front_pics/tentacool_still_front_pic.png new file mode 100644 index 000000000..038f78f89 Binary files /dev/null and b/graphics/pokemon/front_pics/tentacool_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/tentacruel_still_front_pic.png b/graphics/pokemon/front_pics/tentacruel_still_front_pic.png new file mode 100644 index 000000000..6c9579573 Binary files /dev/null and b/graphics/pokemon/front_pics/tentacruel_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/togepi_still_front_pic.png b/graphics/pokemon/front_pics/togepi_still_front_pic.png new file mode 100644 index 000000000..2fd04df59 Binary files /dev/null and b/graphics/pokemon/front_pics/togepi_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/togetic_still_front_pic.png b/graphics/pokemon/front_pics/togetic_still_front_pic.png new file mode 100644 index 000000000..4f6fe9339 Binary files /dev/null and b/graphics/pokemon/front_pics/togetic_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/torchic_still_front_pic.png b/graphics/pokemon/front_pics/torchic_still_front_pic.png new file mode 100644 index 000000000..a8eeb2699 Binary files /dev/null and b/graphics/pokemon/front_pics/torchic_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/torkoal_still_front_pic.png b/graphics/pokemon/front_pics/torkoal_still_front_pic.png new file mode 100644 index 000000000..b19eea08b Binary files /dev/null and b/graphics/pokemon/front_pics/torkoal_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/totodile_still_front_pic.png b/graphics/pokemon/front_pics/totodile_still_front_pic.png new file mode 100644 index 000000000..d65863e81 Binary files /dev/null and b/graphics/pokemon/front_pics/totodile_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/trapinch_still_front_pic.png b/graphics/pokemon/front_pics/trapinch_still_front_pic.png new file mode 100644 index 000000000..48dd7951a Binary files /dev/null and b/graphics/pokemon/front_pics/trapinch_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/treecko_still_front_pic.png b/graphics/pokemon/front_pics/treecko_still_front_pic.png new file mode 100644 index 000000000..7cacddaae Binary files /dev/null and b/graphics/pokemon/front_pics/treecko_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/tropius_still_front_pic.png b/graphics/pokemon/front_pics/tropius_still_front_pic.png new file mode 100644 index 000000000..e2ae021cb Binary files /dev/null and b/graphics/pokemon/front_pics/tropius_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/typhlosion_still_front_pic.png b/graphics/pokemon/front_pics/typhlosion_still_front_pic.png new file mode 100644 index 000000000..22ab5cd90 Binary files /dev/null and b/graphics/pokemon/front_pics/typhlosion_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/tyranitar_still_front_pic.png b/graphics/pokemon/front_pics/tyranitar_still_front_pic.png new file mode 100644 index 000000000..a1035064b Binary files /dev/null and b/graphics/pokemon/front_pics/tyranitar_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/tyrogue_still_front_pic.png b/graphics/pokemon/front_pics/tyrogue_still_front_pic.png new file mode 100644 index 000000000..cd12978ae Binary files /dev/null and b/graphics/pokemon/front_pics/tyrogue_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/umbreon_still_front_pic.png b/graphics/pokemon/front_pics/umbreon_still_front_pic.png new file mode 100644 index 000000000..8fbc3b0f2 Binary files /dev/null and b/graphics/pokemon/front_pics/umbreon_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/unown_a_still_front_pic.png b/graphics/pokemon/front_pics/unown_a_still_front_pic.png new file mode 100644 index 000000000..697de36dc Binary files /dev/null and b/graphics/pokemon/front_pics/unown_a_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/unown_b_still_front_pic.png b/graphics/pokemon/front_pics/unown_b_still_front_pic.png new file mode 100644 index 000000000..fbe2e4623 Binary files /dev/null and b/graphics/pokemon/front_pics/unown_b_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/unown_c_still_front_pic.png b/graphics/pokemon/front_pics/unown_c_still_front_pic.png new file mode 100644 index 000000000..c5ef1c457 Binary files /dev/null and b/graphics/pokemon/front_pics/unown_c_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/unown_d_still_front_pic.png b/graphics/pokemon/front_pics/unown_d_still_front_pic.png new file mode 100644 index 000000000..c39b26120 Binary files /dev/null and b/graphics/pokemon/front_pics/unown_d_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/unown_e_still_front_pic.png b/graphics/pokemon/front_pics/unown_e_still_front_pic.png new file mode 100644 index 000000000..81e3f9c93 Binary files /dev/null and b/graphics/pokemon/front_pics/unown_e_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/unown_exclamation_mark_still_front_pic.png b/graphics/pokemon/front_pics/unown_exclamation_mark_still_front_pic.png new file mode 100644 index 000000000..86f329f92 Binary files /dev/null and b/graphics/pokemon/front_pics/unown_exclamation_mark_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/unown_f_still_front_pic.png b/graphics/pokemon/front_pics/unown_f_still_front_pic.png new file mode 100644 index 000000000..8e61eb768 Binary files /dev/null and b/graphics/pokemon/front_pics/unown_f_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/unown_g_still_front_pic.png b/graphics/pokemon/front_pics/unown_g_still_front_pic.png new file mode 100644 index 000000000..4f665124a Binary files /dev/null and b/graphics/pokemon/front_pics/unown_g_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/unown_h_still_front_pic.png b/graphics/pokemon/front_pics/unown_h_still_front_pic.png new file mode 100644 index 000000000..f8ab66963 Binary files /dev/null and b/graphics/pokemon/front_pics/unown_h_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/unown_i_still_front_pic.png b/graphics/pokemon/front_pics/unown_i_still_front_pic.png new file mode 100644 index 000000000..ebc8a51a9 Binary files /dev/null and b/graphics/pokemon/front_pics/unown_i_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/unown_j_still_front_pic.png b/graphics/pokemon/front_pics/unown_j_still_front_pic.png new file mode 100644 index 000000000..4c1f4ed2e Binary files /dev/null and b/graphics/pokemon/front_pics/unown_j_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/unown_k_still_front_pic.png b/graphics/pokemon/front_pics/unown_k_still_front_pic.png new file mode 100644 index 000000000..8ccce125e Binary files /dev/null and b/graphics/pokemon/front_pics/unown_k_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/unown_l_still_front_pic.png b/graphics/pokemon/front_pics/unown_l_still_front_pic.png new file mode 100644 index 000000000..6bb837167 Binary files /dev/null and b/graphics/pokemon/front_pics/unown_l_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/unown_m_still_front_pic.png b/graphics/pokemon/front_pics/unown_m_still_front_pic.png new file mode 100644 index 000000000..981c7f801 Binary files /dev/null and b/graphics/pokemon/front_pics/unown_m_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/unown_n_still_front_pic.png b/graphics/pokemon/front_pics/unown_n_still_front_pic.png new file mode 100644 index 000000000..cff797db4 Binary files /dev/null and b/graphics/pokemon/front_pics/unown_n_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/unown_o_still_front_pic.png b/graphics/pokemon/front_pics/unown_o_still_front_pic.png new file mode 100644 index 000000000..8b8e81295 Binary files /dev/null and b/graphics/pokemon/front_pics/unown_o_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/unown_p_still_front_pic.png b/graphics/pokemon/front_pics/unown_p_still_front_pic.png new file mode 100644 index 000000000..99a7c98e2 Binary files /dev/null and b/graphics/pokemon/front_pics/unown_p_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/unown_q_still_front_pic.png b/graphics/pokemon/front_pics/unown_q_still_front_pic.png new file mode 100644 index 000000000..fe94c27fa Binary files /dev/null and b/graphics/pokemon/front_pics/unown_q_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/unown_question_mark_still_front_pic.png b/graphics/pokemon/front_pics/unown_question_mark_still_front_pic.png new file mode 100644 index 000000000..ee0ad284c Binary files /dev/null and b/graphics/pokemon/front_pics/unown_question_mark_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/unown_r_still_front_pic.png b/graphics/pokemon/front_pics/unown_r_still_front_pic.png new file mode 100644 index 000000000..4e2a40007 Binary files /dev/null and b/graphics/pokemon/front_pics/unown_r_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/unown_s_still_front_pic.png b/graphics/pokemon/front_pics/unown_s_still_front_pic.png new file mode 100644 index 000000000..a144e27f5 Binary files /dev/null and b/graphics/pokemon/front_pics/unown_s_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/unown_t_still_front_pic.png b/graphics/pokemon/front_pics/unown_t_still_front_pic.png new file mode 100644 index 000000000..4d5fa8b98 Binary files /dev/null and b/graphics/pokemon/front_pics/unown_t_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/unown_u_still_front_pic.png b/graphics/pokemon/front_pics/unown_u_still_front_pic.png new file mode 100644 index 000000000..39503f01c Binary files /dev/null and b/graphics/pokemon/front_pics/unown_u_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/unown_v_still_front_pic.png b/graphics/pokemon/front_pics/unown_v_still_front_pic.png new file mode 100644 index 000000000..f014289bd Binary files /dev/null and b/graphics/pokemon/front_pics/unown_v_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/unown_w_still_front_pic.png b/graphics/pokemon/front_pics/unown_w_still_front_pic.png new file mode 100644 index 000000000..829804ebf Binary files /dev/null and b/graphics/pokemon/front_pics/unown_w_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/unown_x_still_front_pic.png b/graphics/pokemon/front_pics/unown_x_still_front_pic.png new file mode 100644 index 000000000..053e2ee08 Binary files /dev/null and b/graphics/pokemon/front_pics/unown_x_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/unown_y_still_front_pic.png b/graphics/pokemon/front_pics/unown_y_still_front_pic.png new file mode 100644 index 000000000..d8f40e27e Binary files /dev/null and b/graphics/pokemon/front_pics/unown_y_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/unown_z_still_front_pic.png b/graphics/pokemon/front_pics/unown_z_still_front_pic.png new file mode 100644 index 000000000..054eacb6d Binary files /dev/null and b/graphics/pokemon/front_pics/unown_z_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/ursaring_still_front_pic.png b/graphics/pokemon/front_pics/ursaring_still_front_pic.png new file mode 100644 index 000000000..8699738b5 Binary files /dev/null and b/graphics/pokemon/front_pics/ursaring_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/vaporeon_still_front_pic.png b/graphics/pokemon/front_pics/vaporeon_still_front_pic.png new file mode 100644 index 000000000..af9a0f999 Binary files /dev/null and b/graphics/pokemon/front_pics/vaporeon_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/venomoth_still_front_pic.png b/graphics/pokemon/front_pics/venomoth_still_front_pic.png new file mode 100644 index 000000000..3abc34f90 Binary files /dev/null and b/graphics/pokemon/front_pics/venomoth_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/venonat_still_front_pic.png b/graphics/pokemon/front_pics/venonat_still_front_pic.png new file mode 100644 index 000000000..7370b39c0 Binary files /dev/null and b/graphics/pokemon/front_pics/venonat_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/venusaur_still_front_pic.png b/graphics/pokemon/front_pics/venusaur_still_front_pic.png new file mode 100644 index 000000000..8f0521e26 Binary files /dev/null and b/graphics/pokemon/front_pics/venusaur_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/vibrava_still_front_pic.png b/graphics/pokemon/front_pics/vibrava_still_front_pic.png new file mode 100644 index 000000000..487ce4746 Binary files /dev/null and b/graphics/pokemon/front_pics/vibrava_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/victreebel_still_front_pic.png b/graphics/pokemon/front_pics/victreebel_still_front_pic.png new file mode 100644 index 000000000..4f2d7b8f4 Binary files /dev/null and b/graphics/pokemon/front_pics/victreebel_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/vigoroth_still_front_pic.png b/graphics/pokemon/front_pics/vigoroth_still_front_pic.png new file mode 100644 index 000000000..fe87041ee Binary files /dev/null and b/graphics/pokemon/front_pics/vigoroth_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/vileplume_still_front_pic.png b/graphics/pokemon/front_pics/vileplume_still_front_pic.png new file mode 100644 index 000000000..374cd4ddd Binary files /dev/null and b/graphics/pokemon/front_pics/vileplume_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/volbeat_still_front_pic.png b/graphics/pokemon/front_pics/volbeat_still_front_pic.png new file mode 100644 index 000000000..9daf199a3 Binary files /dev/null and b/graphics/pokemon/front_pics/volbeat_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/voltorb_still_front_pic.png b/graphics/pokemon/front_pics/voltorb_still_front_pic.png new file mode 100644 index 000000000..046e4f9c3 Binary files /dev/null and b/graphics/pokemon/front_pics/voltorb_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/vulpix_still_front_pic.png b/graphics/pokemon/front_pics/vulpix_still_front_pic.png new file mode 100644 index 000000000..38ec988fd Binary files /dev/null and b/graphics/pokemon/front_pics/vulpix_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/wailmer_still_front_pic.png b/graphics/pokemon/front_pics/wailmer_still_front_pic.png new file mode 100644 index 000000000..a17d48cdf Binary files /dev/null and b/graphics/pokemon/front_pics/wailmer_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/wailord_still_front_pic.png b/graphics/pokemon/front_pics/wailord_still_front_pic.png new file mode 100644 index 000000000..e542cbc64 Binary files /dev/null and b/graphics/pokemon/front_pics/wailord_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/walrein_still_front_pic.png b/graphics/pokemon/front_pics/walrein_still_front_pic.png new file mode 100644 index 000000000..b8458e11a Binary files /dev/null and b/graphics/pokemon/front_pics/walrein_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/wartortle_still_front_pic.png b/graphics/pokemon/front_pics/wartortle_still_front_pic.png new file mode 100644 index 000000000..067f21684 Binary files /dev/null and b/graphics/pokemon/front_pics/wartortle_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/weedle_still_front_pic.png b/graphics/pokemon/front_pics/weedle_still_front_pic.png new file mode 100644 index 000000000..db4bc28f2 Binary files /dev/null and b/graphics/pokemon/front_pics/weedle_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/weepinbell_still_front_pic.png b/graphics/pokemon/front_pics/weepinbell_still_front_pic.png new file mode 100644 index 000000000..19b821711 Binary files /dev/null and b/graphics/pokemon/front_pics/weepinbell_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/weezing_still_front_pic.png b/graphics/pokemon/front_pics/weezing_still_front_pic.png new file mode 100644 index 000000000..3c50aca9b Binary files /dev/null and b/graphics/pokemon/front_pics/weezing_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/whiscash_still_front_pic.png b/graphics/pokemon/front_pics/whiscash_still_front_pic.png new file mode 100644 index 000000000..1262d3af8 Binary files /dev/null and b/graphics/pokemon/front_pics/whiscash_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/whismur_still_front_pic.png b/graphics/pokemon/front_pics/whismur_still_front_pic.png new file mode 100644 index 000000000..d12369e26 Binary files /dev/null and b/graphics/pokemon/front_pics/whismur_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/wigglytuff_still_front_pic.png b/graphics/pokemon/front_pics/wigglytuff_still_front_pic.png new file mode 100644 index 000000000..045be7fe4 Binary files /dev/null and b/graphics/pokemon/front_pics/wigglytuff_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/wingull_still_front_pic.png b/graphics/pokemon/front_pics/wingull_still_front_pic.png new file mode 100644 index 000000000..4d1b16ece Binary files /dev/null and b/graphics/pokemon/front_pics/wingull_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/wobbuffet_still_front_pic.png b/graphics/pokemon/front_pics/wobbuffet_still_front_pic.png new file mode 100644 index 000000000..0e3f39ae1 Binary files /dev/null and b/graphics/pokemon/front_pics/wobbuffet_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/wooper_still_front_pic.png b/graphics/pokemon/front_pics/wooper_still_front_pic.png new file mode 100644 index 000000000..4562b0baa Binary files /dev/null and b/graphics/pokemon/front_pics/wooper_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/wurmple_still_front_pic.png b/graphics/pokemon/front_pics/wurmple_still_front_pic.png new file mode 100644 index 000000000..86d8bc06a Binary files /dev/null and b/graphics/pokemon/front_pics/wurmple_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/wynaut_still_front_pic.png b/graphics/pokemon/front_pics/wynaut_still_front_pic.png new file mode 100644 index 000000000..7b1be29f0 Binary files /dev/null and b/graphics/pokemon/front_pics/wynaut_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/xatu_still_front_pic.png b/graphics/pokemon/front_pics/xatu_still_front_pic.png new file mode 100644 index 000000000..138550b54 Binary files /dev/null and b/graphics/pokemon/front_pics/xatu_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/yanma_still_front_pic.png b/graphics/pokemon/front_pics/yanma_still_front_pic.png new file mode 100644 index 000000000..534e873a1 Binary files /dev/null and b/graphics/pokemon/front_pics/yanma_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/zangoose_still_front_pic.png b/graphics/pokemon/front_pics/zangoose_still_front_pic.png new file mode 100644 index 000000000..b95a412bf Binary files /dev/null and b/graphics/pokemon/front_pics/zangoose_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/zapdos_still_front_pic.png b/graphics/pokemon/front_pics/zapdos_still_front_pic.png new file mode 100644 index 000000000..2d9249027 Binary files /dev/null and b/graphics/pokemon/front_pics/zapdos_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/zigzagoon_still_front_pic.png b/graphics/pokemon/front_pics/zigzagoon_still_front_pic.png new file mode 100644 index 000000000..442a5c5aa Binary files /dev/null and b/graphics/pokemon/front_pics/zigzagoon_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/zubat_still_front_pic.png b/graphics/pokemon/front_pics/zubat_still_front_pic.png new file mode 100644 index 000000000..3b1e586b5 Binary files /dev/null and b/graphics/pokemon/front_pics/zubat_still_front_pic.png differ diff --git a/graphics/pokemon/icon notes b/graphics/pokemon/icon notes new file mode 100644 index 000000000..1af808968 --- /dev/null +++ b/graphics/pokemon/icon notes @@ -0,0 +1,3 @@ +deoxys_speed 0 +jynx 2 +poliwhirl 0 \ No newline at end of file diff --git a/graphics/pokemon/icon_palettes/icon_palette_0.pal b/graphics/pokemon/icon_palettes/icon_palette_0.pal new file mode 100644 index 000000000..48a835b0d --- /dev/null +++ b/graphics/pokemon/icon_palettes/icon_palette_0.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +98 156 131 +131 131 115 +189 189 189 +255 255 255 +189 164 65 +246 246 41 +213 98 65 +246 148 41 +139 123 255 +98 74 205 +238 115 156 +255 180 164 +164 197 255 +106 172 156 +98 98 90 +65 65 65 diff --git a/graphics/pokemon/icon_palettes/icon_palette_1.pal b/graphics/pokemon/icon_palettes/icon_palette_1.pal new file mode 100644 index 000000000..261ea164d --- /dev/null +++ b/graphics/pokemon/icon_palettes/icon_palette_1.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +98 156 131 +115 115 115 +189 189 189 +255 255 255 +123 156 74 +156 205 74 +148 246 74 +238 115 156 +246 148 246 +189 164 90 +246 230 41 +246 246 172 +213 213 106 +230 74 41 +98 98 90 +65 65 65 diff --git a/graphics/pokemon/icon_palettes/icon_palette_2.pal b/graphics/pokemon/icon_palettes/icon_palette_2.pal new file mode 100644 index 000000000..30463baeb --- /dev/null +++ b/graphics/pokemon/icon_palettes/icon_palette_2.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +98 156 131 +123 123 123 +189 189 180 +255 255 255 +115 115 205 +164 172 246 +180 131 90 +238 197 139 +197 172 41 +246 246 41 +246 98 82 +148 123 205 +197 164 205 +189 41 156 +98 98 90 +65 65 65 diff --git a/graphics/pokemon/icons/abra_icon.png b/graphics/pokemon/icons/abra_icon.png new file mode 100644 index 000000000..cf7d3d2f7 Binary files /dev/null and b/graphics/pokemon/icons/abra_icon.png differ diff --git a/graphics/pokemon/icons/absol_icon.png b/graphics/pokemon/icons/absol_icon.png new file mode 100644 index 000000000..3cc5e01b5 Binary files /dev/null and b/graphics/pokemon/icons/absol_icon.png differ diff --git a/graphics/pokemon/icons/aerodactyl_icon.png b/graphics/pokemon/icons/aerodactyl_icon.png new file mode 100644 index 000000000..f90e269b0 Binary files /dev/null and b/graphics/pokemon/icons/aerodactyl_icon.png differ diff --git a/graphics/pokemon/icons/aggron_icon.png b/graphics/pokemon/icons/aggron_icon.png new file mode 100644 index 000000000..ed7ae52e4 Binary files /dev/null and b/graphics/pokemon/icons/aggron_icon.png differ diff --git a/graphics/pokemon/icons/aipom_icon.png b/graphics/pokemon/icons/aipom_icon.png new file mode 100644 index 000000000..d5138f203 Binary files /dev/null and b/graphics/pokemon/icons/aipom_icon.png differ diff --git a/graphics/pokemon/icons/alakazam_icon.png b/graphics/pokemon/icons/alakazam_icon.png new file mode 100644 index 000000000..f15231469 Binary files /dev/null and b/graphics/pokemon/icons/alakazam_icon.png differ diff --git a/graphics/pokemon/icons/altaria_icon.png b/graphics/pokemon/icons/altaria_icon.png new file mode 100644 index 000000000..300dfec82 Binary files /dev/null and b/graphics/pokemon/icons/altaria_icon.png differ diff --git a/graphics/pokemon/icons/ampharos_icon.png b/graphics/pokemon/icons/ampharos_icon.png new file mode 100644 index 000000000..d7a3f9e70 Binary files /dev/null and b/graphics/pokemon/icons/ampharos_icon.png differ diff --git a/graphics/pokemon/icons/anorith_icon.png b/graphics/pokemon/icons/anorith_icon.png new file mode 100644 index 000000000..936355d61 Binary files /dev/null and b/graphics/pokemon/icons/anorith_icon.png differ diff --git a/graphics/pokemon/icons/arbok_icon.png b/graphics/pokemon/icons/arbok_icon.png new file mode 100644 index 000000000..8967d44a6 Binary files /dev/null and b/graphics/pokemon/icons/arbok_icon.png differ diff --git a/graphics/pokemon/icons/arcanine_icon.png b/graphics/pokemon/icons/arcanine_icon.png new file mode 100644 index 000000000..3fed9199a Binary files /dev/null and b/graphics/pokemon/icons/arcanine_icon.png differ diff --git a/graphics/pokemon/icons/ariados_icon.png b/graphics/pokemon/icons/ariados_icon.png new file mode 100644 index 000000000..4284968f2 Binary files /dev/null and b/graphics/pokemon/icons/ariados_icon.png differ diff --git a/graphics/pokemon/icons/armaldo_icon.png b/graphics/pokemon/icons/armaldo_icon.png new file mode 100644 index 000000000..ed3bb65f2 Binary files /dev/null and b/graphics/pokemon/icons/armaldo_icon.png differ diff --git a/graphics/pokemon/icons/aron_icon.png b/graphics/pokemon/icons/aron_icon.png new file mode 100644 index 000000000..547846374 Binary files /dev/null and b/graphics/pokemon/icons/aron_icon.png differ diff --git a/graphics/pokemon/icons/articuno_icon.png b/graphics/pokemon/icons/articuno_icon.png new file mode 100644 index 000000000..e2f19f133 Binary files /dev/null and b/graphics/pokemon/icons/articuno_icon.png differ diff --git a/graphics/pokemon/icons/azumarill_icon.png b/graphics/pokemon/icons/azumarill_icon.png new file mode 100644 index 000000000..f41d53d2c Binary files /dev/null and b/graphics/pokemon/icons/azumarill_icon.png differ diff --git a/graphics/pokemon/icons/azurill_icon.png b/graphics/pokemon/icons/azurill_icon.png new file mode 100644 index 000000000..b69acc7fd Binary files /dev/null and b/graphics/pokemon/icons/azurill_icon.png differ diff --git a/graphics/pokemon/icons/bagon_icon.png b/graphics/pokemon/icons/bagon_icon.png new file mode 100644 index 000000000..cc3af423f Binary files /dev/null and b/graphics/pokemon/icons/bagon_icon.png differ diff --git a/graphics/pokemon/icons/baltoy_icon.png b/graphics/pokemon/icons/baltoy_icon.png new file mode 100644 index 000000000..4ec3f35e9 Binary files /dev/null and b/graphics/pokemon/icons/baltoy_icon.png differ diff --git a/graphics/pokemon/icons/banette_icon.png b/graphics/pokemon/icons/banette_icon.png new file mode 100644 index 000000000..3b5cbaed1 Binary files /dev/null and b/graphics/pokemon/icons/banette_icon.png differ diff --git a/graphics/pokemon/icons/barboach_icon.png b/graphics/pokemon/icons/barboach_icon.png new file mode 100644 index 000000000..ad874daac Binary files /dev/null and b/graphics/pokemon/icons/barboach_icon.png differ diff --git a/graphics/pokemon/icons/bayleef_icon.png b/graphics/pokemon/icons/bayleef_icon.png new file mode 100644 index 000000000..47d2774d6 Binary files /dev/null and b/graphics/pokemon/icons/bayleef_icon.png differ diff --git a/graphics/pokemon/icons/beautifly_icon.png b/graphics/pokemon/icons/beautifly_icon.png new file mode 100644 index 000000000..346c5c906 Binary files /dev/null and b/graphics/pokemon/icons/beautifly_icon.png differ diff --git a/graphics/pokemon/icons/beedrill_icon.png b/graphics/pokemon/icons/beedrill_icon.png new file mode 100644 index 000000000..d5e6471ab Binary files /dev/null and b/graphics/pokemon/icons/beedrill_icon.png differ diff --git a/graphics/pokemon/icons/beldum_icon.png b/graphics/pokemon/icons/beldum_icon.png new file mode 100644 index 000000000..346a0469d Binary files /dev/null and b/graphics/pokemon/icons/beldum_icon.png differ diff --git a/graphics/pokemon/icons/bellossom_icon.png b/graphics/pokemon/icons/bellossom_icon.png new file mode 100644 index 000000000..443d7a98c Binary files /dev/null and b/graphics/pokemon/icons/bellossom_icon.png differ diff --git a/graphics/pokemon/icons/bellsprout_icon.png b/graphics/pokemon/icons/bellsprout_icon.png new file mode 100644 index 000000000..f67c94eec Binary files /dev/null and b/graphics/pokemon/icons/bellsprout_icon.png differ diff --git a/graphics/pokemon/icons/blastoise_icon.png b/graphics/pokemon/icons/blastoise_icon.png new file mode 100644 index 000000000..253d4f8da Binary files /dev/null and b/graphics/pokemon/icons/blastoise_icon.png differ diff --git a/graphics/pokemon/icons/blaziken_icon.png b/graphics/pokemon/icons/blaziken_icon.png new file mode 100644 index 000000000..6197cce23 Binary files /dev/null and b/graphics/pokemon/icons/blaziken_icon.png differ diff --git a/graphics/pokemon/icons/blissey_icon.png b/graphics/pokemon/icons/blissey_icon.png new file mode 100644 index 000000000..44af9704c Binary files /dev/null and b/graphics/pokemon/icons/blissey_icon.png differ diff --git a/graphics/pokemon/icons/breloom_icon.png b/graphics/pokemon/icons/breloom_icon.png new file mode 100644 index 000000000..314873a27 Binary files /dev/null and b/graphics/pokemon/icons/breloom_icon.png differ diff --git a/graphics/pokemon/icons/bulbasaur_icon.png b/graphics/pokemon/icons/bulbasaur_icon.png new file mode 100644 index 000000000..8d6fe1725 Binary files /dev/null and b/graphics/pokemon/icons/bulbasaur_icon.png differ diff --git a/graphics/pokemon/icons/butterfree_icon.png b/graphics/pokemon/icons/butterfree_icon.png new file mode 100644 index 000000000..11c4a379f Binary files /dev/null and b/graphics/pokemon/icons/butterfree_icon.png differ diff --git a/graphics/pokemon/icons/cacnea_icon.png b/graphics/pokemon/icons/cacnea_icon.png new file mode 100644 index 000000000..367f07668 Binary files /dev/null and b/graphics/pokemon/icons/cacnea_icon.png differ diff --git a/graphics/pokemon/icons/cacturne_icon.png b/graphics/pokemon/icons/cacturne_icon.png new file mode 100644 index 000000000..948bea2d8 Binary files /dev/null and b/graphics/pokemon/icons/cacturne_icon.png differ diff --git a/graphics/pokemon/icons/camerupt_icon.png b/graphics/pokemon/icons/camerupt_icon.png new file mode 100644 index 000000000..372fc7ce0 Binary files /dev/null and b/graphics/pokemon/icons/camerupt_icon.png differ diff --git a/graphics/pokemon/icons/carvanha_icon.png b/graphics/pokemon/icons/carvanha_icon.png new file mode 100644 index 000000000..6b0d48a8a Binary files /dev/null and b/graphics/pokemon/icons/carvanha_icon.png differ diff --git a/graphics/pokemon/icons/cascoon_icon.png b/graphics/pokemon/icons/cascoon_icon.png new file mode 100644 index 000000000..4d49506c0 Binary files /dev/null and b/graphics/pokemon/icons/cascoon_icon.png differ diff --git a/graphics/pokemon/icons/castform_icon.png b/graphics/pokemon/icons/castform_icon.png new file mode 100644 index 000000000..56c62ad07 Binary files /dev/null and b/graphics/pokemon/icons/castform_icon.png differ diff --git a/graphics/pokemon/icons/caterpie_icon.png b/graphics/pokemon/icons/caterpie_icon.png new file mode 100644 index 000000000..be20669c3 Binary files /dev/null and b/graphics/pokemon/icons/caterpie_icon.png differ diff --git a/graphics/pokemon/icons/celebi_icon.png b/graphics/pokemon/icons/celebi_icon.png new file mode 100644 index 000000000..245d580f7 Binary files /dev/null and b/graphics/pokemon/icons/celebi_icon.png differ diff --git a/graphics/pokemon/icons/chansey_icon.png b/graphics/pokemon/icons/chansey_icon.png new file mode 100644 index 000000000..4083185b0 Binary files /dev/null and b/graphics/pokemon/icons/chansey_icon.png differ diff --git a/graphics/pokemon/icons/charizard_icon.png b/graphics/pokemon/icons/charizard_icon.png new file mode 100644 index 000000000..9c8140887 Binary files /dev/null and b/graphics/pokemon/icons/charizard_icon.png differ diff --git a/graphics/pokemon/icons/charmander_icon.png b/graphics/pokemon/icons/charmander_icon.png new file mode 100644 index 000000000..c3fa4fde4 Binary files /dev/null and b/graphics/pokemon/icons/charmander_icon.png differ diff --git a/graphics/pokemon/icons/charmeleon_icon.png b/graphics/pokemon/icons/charmeleon_icon.png new file mode 100644 index 000000000..0f1550d0c Binary files /dev/null and b/graphics/pokemon/icons/charmeleon_icon.png differ diff --git a/graphics/pokemon/icons/chikorita_icon.png b/graphics/pokemon/icons/chikorita_icon.png new file mode 100644 index 000000000..f9bc40d0e Binary files /dev/null and b/graphics/pokemon/icons/chikorita_icon.png differ diff --git a/graphics/pokemon/icons/chimecho_icon.png b/graphics/pokemon/icons/chimecho_icon.png new file mode 100644 index 000000000..11b2d93b2 Binary files /dev/null and b/graphics/pokemon/icons/chimecho_icon.png differ diff --git a/graphics/pokemon/icons/chinchou_icon.png b/graphics/pokemon/icons/chinchou_icon.png new file mode 100644 index 000000000..1b585204b Binary files /dev/null and b/graphics/pokemon/icons/chinchou_icon.png differ diff --git a/graphics/pokemon/icons/clamperl_icon.png b/graphics/pokemon/icons/clamperl_icon.png new file mode 100644 index 000000000..fabcd9641 Binary files /dev/null and b/graphics/pokemon/icons/clamperl_icon.png differ diff --git a/graphics/pokemon/icons/claydol_icon.png b/graphics/pokemon/icons/claydol_icon.png new file mode 100644 index 000000000..3f3f04ead Binary files /dev/null and b/graphics/pokemon/icons/claydol_icon.png differ diff --git a/graphics/pokemon/icons/clefable_icon.png b/graphics/pokemon/icons/clefable_icon.png new file mode 100644 index 000000000..4078e2854 Binary files /dev/null and b/graphics/pokemon/icons/clefable_icon.png differ diff --git a/graphics/pokemon/icons/clefairy_icon.png b/graphics/pokemon/icons/clefairy_icon.png new file mode 100644 index 000000000..7895bb93c Binary files /dev/null and b/graphics/pokemon/icons/clefairy_icon.png differ diff --git a/graphics/pokemon/icons/cleffa_icon.png b/graphics/pokemon/icons/cleffa_icon.png new file mode 100644 index 000000000..e866394f0 Binary files /dev/null and b/graphics/pokemon/icons/cleffa_icon.png differ diff --git a/graphics/pokemon/icons/cloyster_icon.png b/graphics/pokemon/icons/cloyster_icon.png new file mode 100644 index 000000000..71ca401c4 Binary files /dev/null and b/graphics/pokemon/icons/cloyster_icon.png differ diff --git a/graphics/pokemon/icons/combusken_icon.png b/graphics/pokemon/icons/combusken_icon.png new file mode 100644 index 000000000..3cdd0f5c1 Binary files /dev/null and b/graphics/pokemon/icons/combusken_icon.png differ diff --git a/graphics/pokemon/icons/corphish_icon.png b/graphics/pokemon/icons/corphish_icon.png new file mode 100644 index 000000000..f14b262d2 Binary files /dev/null and b/graphics/pokemon/icons/corphish_icon.png differ diff --git a/graphics/pokemon/icons/corsola_icon.png b/graphics/pokemon/icons/corsola_icon.png new file mode 100644 index 000000000..dd2d2e82e Binary files /dev/null and b/graphics/pokemon/icons/corsola_icon.png differ diff --git a/graphics/pokemon/icons/cradily_icon.png b/graphics/pokemon/icons/cradily_icon.png new file mode 100644 index 000000000..ea57b45f1 Binary files /dev/null and b/graphics/pokemon/icons/cradily_icon.png differ diff --git a/graphics/pokemon/icons/crawdaunt_icon.png b/graphics/pokemon/icons/crawdaunt_icon.png new file mode 100644 index 000000000..605482d25 Binary files /dev/null and b/graphics/pokemon/icons/crawdaunt_icon.png differ diff --git a/graphics/pokemon/icons/crobat_icon.png b/graphics/pokemon/icons/crobat_icon.png new file mode 100644 index 000000000..817951dd0 Binary files /dev/null and b/graphics/pokemon/icons/crobat_icon.png differ diff --git a/graphics/pokemon/icons/croconaw_icon.png b/graphics/pokemon/icons/croconaw_icon.png new file mode 100644 index 000000000..6f57e5656 Binary files /dev/null and b/graphics/pokemon/icons/croconaw_icon.png differ diff --git a/graphics/pokemon/icons/cubone_icon.png b/graphics/pokemon/icons/cubone_icon.png new file mode 100644 index 000000000..679d8e7e5 Binary files /dev/null and b/graphics/pokemon/icons/cubone_icon.png differ diff --git a/graphics/pokemon/icons/cyndaquil_icon.png b/graphics/pokemon/icons/cyndaquil_icon.png new file mode 100644 index 000000000..5f174dcf1 Binary files /dev/null and b/graphics/pokemon/icons/cyndaquil_icon.png differ diff --git a/graphics/pokemon/icons/delcatty_icon.png b/graphics/pokemon/icons/delcatty_icon.png new file mode 100644 index 000000000..b5d874a88 Binary files /dev/null and b/graphics/pokemon/icons/delcatty_icon.png differ diff --git a/graphics/pokemon/icons/delibird_icon.png b/graphics/pokemon/icons/delibird_icon.png new file mode 100644 index 000000000..438f80863 Binary files /dev/null and b/graphics/pokemon/icons/delibird_icon.png differ diff --git a/graphics/pokemon/icons/deoxys_icon.png b/graphics/pokemon/icons/deoxys_icon.png new file mode 100644 index 000000000..18735fc72 Binary files /dev/null and b/graphics/pokemon/icons/deoxys_icon.png differ diff --git a/graphics/pokemon/icons/deoxys_speed_icon.png b/graphics/pokemon/icons/deoxys_speed_icon.png new file mode 100644 index 000000000..ae34130ee Binary files /dev/null and b/graphics/pokemon/icons/deoxys_speed_icon.png differ diff --git a/graphics/pokemon/icons/dewgong_icon.png b/graphics/pokemon/icons/dewgong_icon.png new file mode 100644 index 000000000..ea227df7c Binary files /dev/null and b/graphics/pokemon/icons/dewgong_icon.png differ diff --git a/graphics/pokemon/icons/diglett_icon.png b/graphics/pokemon/icons/diglett_icon.png new file mode 100644 index 000000000..43db9f62d Binary files /dev/null and b/graphics/pokemon/icons/diglett_icon.png differ diff --git a/graphics/pokemon/icons/ditto_icon.png b/graphics/pokemon/icons/ditto_icon.png new file mode 100644 index 000000000..e6328feb5 Binary files /dev/null and b/graphics/pokemon/icons/ditto_icon.png differ diff --git a/graphics/pokemon/icons/dodrio_icon.png b/graphics/pokemon/icons/dodrio_icon.png new file mode 100644 index 000000000..3d462999e Binary files /dev/null and b/graphics/pokemon/icons/dodrio_icon.png differ diff --git a/graphics/pokemon/icons/doduo_icon.png b/graphics/pokemon/icons/doduo_icon.png new file mode 100644 index 000000000..540834591 Binary files /dev/null and b/graphics/pokemon/icons/doduo_icon.png differ diff --git a/graphics/pokemon/icons/donphan_icon.png b/graphics/pokemon/icons/donphan_icon.png new file mode 100644 index 000000000..09000b166 Binary files /dev/null and b/graphics/pokemon/icons/donphan_icon.png differ diff --git a/graphics/pokemon/icons/dragonair_icon.png b/graphics/pokemon/icons/dragonair_icon.png new file mode 100644 index 000000000..f4b870a2a Binary files /dev/null and b/graphics/pokemon/icons/dragonair_icon.png differ diff --git a/graphics/pokemon/icons/dragonite_icon.png b/graphics/pokemon/icons/dragonite_icon.png new file mode 100644 index 000000000..efcbd8f11 Binary files /dev/null and b/graphics/pokemon/icons/dragonite_icon.png differ diff --git a/graphics/pokemon/icons/dratini_icon.png b/graphics/pokemon/icons/dratini_icon.png new file mode 100644 index 000000000..c26efee60 Binary files /dev/null and b/graphics/pokemon/icons/dratini_icon.png differ diff --git a/graphics/pokemon/icons/drowzee_icon.png b/graphics/pokemon/icons/drowzee_icon.png new file mode 100644 index 000000000..39b84c871 Binary files /dev/null and b/graphics/pokemon/icons/drowzee_icon.png differ diff --git a/graphics/pokemon/icons/dugtrio_icon.png b/graphics/pokemon/icons/dugtrio_icon.png new file mode 100644 index 000000000..a837c7f6f Binary files /dev/null and b/graphics/pokemon/icons/dugtrio_icon.png differ diff --git a/graphics/pokemon/icons/dunsparce_icon.png b/graphics/pokemon/icons/dunsparce_icon.png new file mode 100644 index 000000000..d2896e72b Binary files /dev/null and b/graphics/pokemon/icons/dunsparce_icon.png differ diff --git a/graphics/pokemon/icons/dusclops_icon.png b/graphics/pokemon/icons/dusclops_icon.png new file mode 100644 index 000000000..6ebc957da Binary files /dev/null and b/graphics/pokemon/icons/dusclops_icon.png differ diff --git a/graphics/pokemon/icons/duskull_icon.png b/graphics/pokemon/icons/duskull_icon.png new file mode 100644 index 000000000..22710a79f Binary files /dev/null and b/graphics/pokemon/icons/duskull_icon.png differ diff --git a/graphics/pokemon/icons/dustox_icon.png b/graphics/pokemon/icons/dustox_icon.png new file mode 100644 index 000000000..2f0d14001 Binary files /dev/null and b/graphics/pokemon/icons/dustox_icon.png differ diff --git a/graphics/pokemon/icons/eevee_icon.png b/graphics/pokemon/icons/eevee_icon.png new file mode 100644 index 000000000..13b90c2e2 Binary files /dev/null and b/graphics/pokemon/icons/eevee_icon.png differ diff --git a/graphics/pokemon/icons/egg_icon.png b/graphics/pokemon/icons/egg_icon.png new file mode 100644 index 000000000..8f6ca5dde Binary files /dev/null and b/graphics/pokemon/icons/egg_icon.png differ diff --git a/graphics/pokemon/icons/ekans_icon.png b/graphics/pokemon/icons/ekans_icon.png new file mode 100644 index 000000000..3c81efd69 Binary files /dev/null and b/graphics/pokemon/icons/ekans_icon.png differ diff --git a/graphics/pokemon/icons/electabuzz_icon.png b/graphics/pokemon/icons/electabuzz_icon.png new file mode 100644 index 000000000..4c9babe2a Binary files /dev/null and b/graphics/pokemon/icons/electabuzz_icon.png differ diff --git a/graphics/pokemon/icons/electrike_icon.png b/graphics/pokemon/icons/electrike_icon.png new file mode 100644 index 000000000..ebef61c49 Binary files /dev/null and b/graphics/pokemon/icons/electrike_icon.png differ diff --git a/graphics/pokemon/icons/electrode_icon.png b/graphics/pokemon/icons/electrode_icon.png new file mode 100644 index 000000000..e46c57974 Binary files /dev/null and b/graphics/pokemon/icons/electrode_icon.png differ diff --git a/graphics/pokemon/icons/elekid_icon.png b/graphics/pokemon/icons/elekid_icon.png new file mode 100644 index 000000000..d80ce6f0d Binary files /dev/null and b/graphics/pokemon/icons/elekid_icon.png differ diff --git a/graphics/pokemon/icons/entei_icon.png b/graphics/pokemon/icons/entei_icon.png new file mode 100644 index 000000000..4d2353a20 Binary files /dev/null and b/graphics/pokemon/icons/entei_icon.png differ diff --git a/graphics/pokemon/icons/espeon_icon.png b/graphics/pokemon/icons/espeon_icon.png new file mode 100644 index 000000000..bc63aa3f2 Binary files /dev/null and b/graphics/pokemon/icons/espeon_icon.png differ diff --git a/graphics/pokemon/icons/exeggcute_icon.png b/graphics/pokemon/icons/exeggcute_icon.png new file mode 100644 index 000000000..5d0306610 Binary files /dev/null and b/graphics/pokemon/icons/exeggcute_icon.png differ diff --git a/graphics/pokemon/icons/exeggutor_icon.png b/graphics/pokemon/icons/exeggutor_icon.png new file mode 100644 index 000000000..610c65a3d Binary files /dev/null and b/graphics/pokemon/icons/exeggutor_icon.png differ diff --git a/graphics/pokemon/icons/exploud_icon.png b/graphics/pokemon/icons/exploud_icon.png new file mode 100644 index 000000000..04ed7f13d Binary files /dev/null and b/graphics/pokemon/icons/exploud_icon.png differ diff --git a/graphics/pokemon/icons/farfetch_d_icon.png b/graphics/pokemon/icons/farfetch_d_icon.png new file mode 100644 index 000000000..cb3cd931b Binary files /dev/null and b/graphics/pokemon/icons/farfetch_d_icon.png differ diff --git a/graphics/pokemon/icons/fearow_icon.png b/graphics/pokemon/icons/fearow_icon.png new file mode 100644 index 000000000..9a3be9393 Binary files /dev/null and b/graphics/pokemon/icons/fearow_icon.png differ diff --git a/graphics/pokemon/icons/feebas_icon.png b/graphics/pokemon/icons/feebas_icon.png new file mode 100644 index 000000000..19e08797a Binary files /dev/null and b/graphics/pokemon/icons/feebas_icon.png differ diff --git a/graphics/pokemon/icons/feraligatr_icon.png b/graphics/pokemon/icons/feraligatr_icon.png new file mode 100644 index 000000000..fe3f4fca6 Binary files /dev/null and b/graphics/pokemon/icons/feraligatr_icon.png differ diff --git a/graphics/pokemon/icons/flaaffy_icon.png b/graphics/pokemon/icons/flaaffy_icon.png new file mode 100644 index 000000000..719ed69a3 Binary files /dev/null and b/graphics/pokemon/icons/flaaffy_icon.png differ diff --git a/graphics/pokemon/icons/flareon_icon.png b/graphics/pokemon/icons/flareon_icon.png new file mode 100644 index 000000000..317aa61d0 Binary files /dev/null and b/graphics/pokemon/icons/flareon_icon.png differ diff --git a/graphics/pokemon/icons/flygon_icon.png b/graphics/pokemon/icons/flygon_icon.png new file mode 100644 index 000000000..f033c9a88 Binary files /dev/null and b/graphics/pokemon/icons/flygon_icon.png differ diff --git a/graphics/pokemon/icons/forretress_icon.png b/graphics/pokemon/icons/forretress_icon.png new file mode 100644 index 000000000..056683bec Binary files /dev/null and b/graphics/pokemon/icons/forretress_icon.png differ diff --git a/graphics/pokemon/icons/furret_icon.png b/graphics/pokemon/icons/furret_icon.png new file mode 100644 index 000000000..6974ee9f3 Binary files /dev/null and b/graphics/pokemon/icons/furret_icon.png differ diff --git a/graphics/pokemon/icons/gardevoir_icon.png b/graphics/pokemon/icons/gardevoir_icon.png new file mode 100644 index 000000000..958ea7f62 Binary files /dev/null and b/graphics/pokemon/icons/gardevoir_icon.png differ diff --git a/graphics/pokemon/icons/gastly_icon.png b/graphics/pokemon/icons/gastly_icon.png new file mode 100644 index 000000000..6a33a8ab5 Binary files /dev/null and b/graphics/pokemon/icons/gastly_icon.png differ diff --git a/graphics/pokemon/icons/gengar_icon.png b/graphics/pokemon/icons/gengar_icon.png new file mode 100644 index 000000000..bbc3d758d Binary files /dev/null and b/graphics/pokemon/icons/gengar_icon.png differ diff --git a/graphics/pokemon/icons/geodude_icon.png b/graphics/pokemon/icons/geodude_icon.png new file mode 100644 index 000000000..da39c60f0 Binary files /dev/null and b/graphics/pokemon/icons/geodude_icon.png differ diff --git a/graphics/pokemon/icons/girafarig_icon.png b/graphics/pokemon/icons/girafarig_icon.png new file mode 100644 index 000000000..c8b79b132 Binary files /dev/null and b/graphics/pokemon/icons/girafarig_icon.png differ diff --git a/graphics/pokemon/icons/glalie_icon.png b/graphics/pokemon/icons/glalie_icon.png new file mode 100644 index 000000000..0fc66c900 Binary files /dev/null and b/graphics/pokemon/icons/glalie_icon.png differ diff --git a/graphics/pokemon/icons/gligar_icon.png b/graphics/pokemon/icons/gligar_icon.png new file mode 100644 index 000000000..baa8414a7 Binary files /dev/null and b/graphics/pokemon/icons/gligar_icon.png differ diff --git a/graphics/pokemon/icons/gloom_icon.png b/graphics/pokemon/icons/gloom_icon.png new file mode 100644 index 000000000..99c487dd2 Binary files /dev/null and b/graphics/pokemon/icons/gloom_icon.png differ diff --git a/graphics/pokemon/icons/golbat_icon.png b/graphics/pokemon/icons/golbat_icon.png new file mode 100644 index 000000000..25b3f6821 Binary files /dev/null and b/graphics/pokemon/icons/golbat_icon.png differ diff --git a/graphics/pokemon/icons/goldeen_icon.png b/graphics/pokemon/icons/goldeen_icon.png new file mode 100644 index 000000000..9dc3bff80 Binary files /dev/null and b/graphics/pokemon/icons/goldeen_icon.png differ diff --git a/graphics/pokemon/icons/golduck_icon.png b/graphics/pokemon/icons/golduck_icon.png new file mode 100644 index 000000000..c0c922834 Binary files /dev/null and b/graphics/pokemon/icons/golduck_icon.png differ diff --git a/graphics/pokemon/icons/golem_icon.png b/graphics/pokemon/icons/golem_icon.png new file mode 100644 index 000000000..480f8c0bb Binary files /dev/null and b/graphics/pokemon/icons/golem_icon.png differ diff --git a/graphics/pokemon/icons/gorebyss_icon.png b/graphics/pokemon/icons/gorebyss_icon.png new file mode 100644 index 000000000..7dc8bc476 Binary files /dev/null and b/graphics/pokemon/icons/gorebyss_icon.png differ diff --git a/graphics/pokemon/icons/granbull_icon.png b/graphics/pokemon/icons/granbull_icon.png new file mode 100644 index 000000000..89beb7a8c Binary files /dev/null and b/graphics/pokemon/icons/granbull_icon.png differ diff --git a/graphics/pokemon/icons/graveler_icon.png b/graphics/pokemon/icons/graveler_icon.png new file mode 100644 index 000000000..84e81dc10 Binary files /dev/null and b/graphics/pokemon/icons/graveler_icon.png differ diff --git a/graphics/pokemon/icons/grimer_icon.png b/graphics/pokemon/icons/grimer_icon.png new file mode 100644 index 000000000..c814df542 Binary files /dev/null and b/graphics/pokemon/icons/grimer_icon.png differ diff --git a/graphics/pokemon/icons/groudon_icon.png b/graphics/pokemon/icons/groudon_icon.png new file mode 100644 index 000000000..2b8707bb8 Binary files /dev/null and b/graphics/pokemon/icons/groudon_icon.png differ diff --git a/graphics/pokemon/icons/grovyle_icon.png b/graphics/pokemon/icons/grovyle_icon.png new file mode 100644 index 000000000..bed04dc98 Binary files /dev/null and b/graphics/pokemon/icons/grovyle_icon.png differ diff --git a/graphics/pokemon/icons/growlithe_icon.png b/graphics/pokemon/icons/growlithe_icon.png new file mode 100644 index 000000000..8870c8b4f Binary files /dev/null and b/graphics/pokemon/icons/growlithe_icon.png differ diff --git a/graphics/pokemon/icons/grumpig_icon.png b/graphics/pokemon/icons/grumpig_icon.png new file mode 100644 index 000000000..fb3cac59d Binary files /dev/null and b/graphics/pokemon/icons/grumpig_icon.png differ diff --git a/graphics/pokemon/icons/gulpin_icon.png b/graphics/pokemon/icons/gulpin_icon.png new file mode 100644 index 000000000..53eed645f Binary files /dev/null and b/graphics/pokemon/icons/gulpin_icon.png differ diff --git a/graphics/pokemon/icons/gyarados_icon.png b/graphics/pokemon/icons/gyarados_icon.png new file mode 100644 index 000000000..13e611d09 Binary files /dev/null and b/graphics/pokemon/icons/gyarados_icon.png differ diff --git a/graphics/pokemon/icons/hariyama_icon.png b/graphics/pokemon/icons/hariyama_icon.png new file mode 100644 index 000000000..b16b04907 Binary files /dev/null and b/graphics/pokemon/icons/hariyama_icon.png differ diff --git a/graphics/pokemon/icons/haunter_icon.png b/graphics/pokemon/icons/haunter_icon.png new file mode 100644 index 000000000..aac3e15f8 Binary files /dev/null and b/graphics/pokemon/icons/haunter_icon.png differ diff --git a/graphics/pokemon/icons/heracross_icon.png b/graphics/pokemon/icons/heracross_icon.png new file mode 100644 index 000000000..994fbe33f Binary files /dev/null and b/graphics/pokemon/icons/heracross_icon.png differ diff --git a/graphics/pokemon/icons/hitmonchan_icon.png b/graphics/pokemon/icons/hitmonchan_icon.png new file mode 100644 index 000000000..a657a6d74 Binary files /dev/null and b/graphics/pokemon/icons/hitmonchan_icon.png differ diff --git a/graphics/pokemon/icons/hitmonlee_icon.png b/graphics/pokemon/icons/hitmonlee_icon.png new file mode 100644 index 000000000..b45c93686 Binary files /dev/null and b/graphics/pokemon/icons/hitmonlee_icon.png differ diff --git a/graphics/pokemon/icons/hitmontop_icon.png b/graphics/pokemon/icons/hitmontop_icon.png new file mode 100644 index 000000000..c5b8ee564 Binary files /dev/null and b/graphics/pokemon/icons/hitmontop_icon.png differ diff --git a/graphics/pokemon/icons/ho_oh_icon.png b/graphics/pokemon/icons/ho_oh_icon.png new file mode 100644 index 000000000..4cd5ed871 Binary files /dev/null and b/graphics/pokemon/icons/ho_oh_icon.png differ diff --git a/graphics/pokemon/icons/hoothoot_icon.png b/graphics/pokemon/icons/hoothoot_icon.png new file mode 100644 index 000000000..c25065113 Binary files /dev/null and b/graphics/pokemon/icons/hoothoot_icon.png differ diff --git a/graphics/pokemon/icons/hoppip_icon.png b/graphics/pokemon/icons/hoppip_icon.png new file mode 100644 index 000000000..0692f69d7 Binary files /dev/null and b/graphics/pokemon/icons/hoppip_icon.png differ diff --git a/graphics/pokemon/icons/horsea_icon.png b/graphics/pokemon/icons/horsea_icon.png new file mode 100644 index 000000000..d57901f51 Binary files /dev/null and b/graphics/pokemon/icons/horsea_icon.png differ diff --git a/graphics/pokemon/icons/houndoom_icon.png b/graphics/pokemon/icons/houndoom_icon.png new file mode 100644 index 000000000..8ca4aec3c Binary files /dev/null and b/graphics/pokemon/icons/houndoom_icon.png differ diff --git a/graphics/pokemon/icons/houndour_icon.png b/graphics/pokemon/icons/houndour_icon.png new file mode 100644 index 000000000..1d397d9bf Binary files /dev/null and b/graphics/pokemon/icons/houndour_icon.png differ diff --git a/graphics/pokemon/icons/huntail_icon.png b/graphics/pokemon/icons/huntail_icon.png new file mode 100644 index 000000000..b70fca87e Binary files /dev/null and b/graphics/pokemon/icons/huntail_icon.png differ diff --git a/graphics/pokemon/icons/hypno_icon.png b/graphics/pokemon/icons/hypno_icon.png new file mode 100644 index 000000000..4015f2386 Binary files /dev/null and b/graphics/pokemon/icons/hypno_icon.png differ diff --git a/graphics/pokemon/icons/igglybuff_icon.png b/graphics/pokemon/icons/igglybuff_icon.png new file mode 100644 index 000000000..55d1a9eb1 Binary files /dev/null and b/graphics/pokemon/icons/igglybuff_icon.png differ diff --git a/graphics/pokemon/icons/illumise_icon.png b/graphics/pokemon/icons/illumise_icon.png new file mode 100644 index 000000000..ac812de37 Binary files /dev/null and b/graphics/pokemon/icons/illumise_icon.png differ diff --git a/graphics/pokemon/icons/ivysaur_icon.png b/graphics/pokemon/icons/ivysaur_icon.png new file mode 100644 index 000000000..2f1627506 Binary files /dev/null and b/graphics/pokemon/icons/ivysaur_icon.png differ diff --git a/graphics/pokemon/icons/jigglypuff_icon.png b/graphics/pokemon/icons/jigglypuff_icon.png new file mode 100644 index 000000000..4c5a33cb8 Binary files /dev/null and b/graphics/pokemon/icons/jigglypuff_icon.png differ diff --git a/graphics/pokemon/icons/jirachi_icon.png b/graphics/pokemon/icons/jirachi_icon.png new file mode 100644 index 000000000..15df4559b Binary files /dev/null and b/graphics/pokemon/icons/jirachi_icon.png differ diff --git a/graphics/pokemon/icons/jolteon_icon.png b/graphics/pokemon/icons/jolteon_icon.png new file mode 100644 index 000000000..b98fd78b2 Binary files /dev/null and b/graphics/pokemon/icons/jolteon_icon.png differ diff --git a/graphics/pokemon/icons/jumpluff_icon.png b/graphics/pokemon/icons/jumpluff_icon.png new file mode 100644 index 000000000..bf0cb64de Binary files /dev/null and b/graphics/pokemon/icons/jumpluff_icon.png differ diff --git a/graphics/pokemon/icons/jynx_icon.png b/graphics/pokemon/icons/jynx_icon.png new file mode 100644 index 000000000..be6522806 Binary files /dev/null and b/graphics/pokemon/icons/jynx_icon.png differ diff --git a/graphics/pokemon/icons/kabuto_icon.png b/graphics/pokemon/icons/kabuto_icon.png new file mode 100644 index 000000000..c0a140722 Binary files /dev/null and b/graphics/pokemon/icons/kabuto_icon.png differ diff --git a/graphics/pokemon/icons/kabutops_icon.png b/graphics/pokemon/icons/kabutops_icon.png new file mode 100644 index 000000000..1c23836e5 Binary files /dev/null and b/graphics/pokemon/icons/kabutops_icon.png differ diff --git a/graphics/pokemon/icons/kadabra_icon.png b/graphics/pokemon/icons/kadabra_icon.png new file mode 100644 index 000000000..8653f7524 Binary files /dev/null and b/graphics/pokemon/icons/kadabra_icon.png differ diff --git a/graphics/pokemon/icons/kakuna_icon.png b/graphics/pokemon/icons/kakuna_icon.png new file mode 100644 index 000000000..1c857d442 Binary files /dev/null and b/graphics/pokemon/icons/kakuna_icon.png differ diff --git a/graphics/pokemon/icons/kangaskhan_icon.png b/graphics/pokemon/icons/kangaskhan_icon.png new file mode 100644 index 000000000..177a688cd Binary files /dev/null and b/graphics/pokemon/icons/kangaskhan_icon.png differ diff --git a/graphics/pokemon/icons/kecleon_icon.png b/graphics/pokemon/icons/kecleon_icon.png new file mode 100644 index 000000000..98b108fd9 Binary files /dev/null and b/graphics/pokemon/icons/kecleon_icon.png differ diff --git a/graphics/pokemon/icons/kingdra_icon.png b/graphics/pokemon/icons/kingdra_icon.png new file mode 100644 index 000000000..c0fb5484a Binary files /dev/null and b/graphics/pokemon/icons/kingdra_icon.png differ diff --git a/graphics/pokemon/icons/kingler_icon.png b/graphics/pokemon/icons/kingler_icon.png new file mode 100644 index 000000000..dbf1af284 Binary files /dev/null and b/graphics/pokemon/icons/kingler_icon.png differ diff --git a/graphics/pokemon/icons/kirlia_icon.png b/graphics/pokemon/icons/kirlia_icon.png new file mode 100644 index 000000000..b99dfee25 Binary files /dev/null and b/graphics/pokemon/icons/kirlia_icon.png differ diff --git a/graphics/pokemon/icons/koffing_icon.png b/graphics/pokemon/icons/koffing_icon.png new file mode 100644 index 000000000..683df2b85 Binary files /dev/null and b/graphics/pokemon/icons/koffing_icon.png differ diff --git a/graphics/pokemon/icons/krabby_icon.png b/graphics/pokemon/icons/krabby_icon.png new file mode 100644 index 000000000..f9fdaa6d5 Binary files /dev/null and b/graphics/pokemon/icons/krabby_icon.png differ diff --git a/graphics/pokemon/icons/kyogre_icon.png b/graphics/pokemon/icons/kyogre_icon.png new file mode 100644 index 000000000..544ed9daf Binary files /dev/null and b/graphics/pokemon/icons/kyogre_icon.png differ diff --git a/graphics/pokemon/icons/lairon_icon.png b/graphics/pokemon/icons/lairon_icon.png new file mode 100644 index 000000000..6d450b08d Binary files /dev/null and b/graphics/pokemon/icons/lairon_icon.png differ diff --git a/graphics/pokemon/icons/lanturn_icon.png b/graphics/pokemon/icons/lanturn_icon.png new file mode 100644 index 000000000..d2b3d4348 Binary files /dev/null and b/graphics/pokemon/icons/lanturn_icon.png differ diff --git a/graphics/pokemon/icons/lapras_icon.png b/graphics/pokemon/icons/lapras_icon.png new file mode 100644 index 000000000..fa8035ada Binary files /dev/null and b/graphics/pokemon/icons/lapras_icon.png differ diff --git a/graphics/pokemon/icons/larvitar_icon.png b/graphics/pokemon/icons/larvitar_icon.png new file mode 100644 index 000000000..85a5504c3 Binary files /dev/null and b/graphics/pokemon/icons/larvitar_icon.png differ diff --git a/graphics/pokemon/icons/latias_icon.png b/graphics/pokemon/icons/latias_icon.png new file mode 100644 index 000000000..1727c0af6 Binary files /dev/null and b/graphics/pokemon/icons/latias_icon.png differ diff --git a/graphics/pokemon/icons/latios_icon.png b/graphics/pokemon/icons/latios_icon.png new file mode 100644 index 000000000..10a23ad47 Binary files /dev/null and b/graphics/pokemon/icons/latios_icon.png differ diff --git a/graphics/pokemon/icons/ledian_icon.png b/graphics/pokemon/icons/ledian_icon.png new file mode 100644 index 000000000..b82ef1306 Binary files /dev/null and b/graphics/pokemon/icons/ledian_icon.png differ diff --git a/graphics/pokemon/icons/ledyba_icon.png b/graphics/pokemon/icons/ledyba_icon.png new file mode 100644 index 000000000..f417e2d74 Binary files /dev/null and b/graphics/pokemon/icons/ledyba_icon.png differ diff --git a/graphics/pokemon/icons/lickitung_icon.png b/graphics/pokemon/icons/lickitung_icon.png new file mode 100644 index 000000000..5b7804afa Binary files /dev/null and b/graphics/pokemon/icons/lickitung_icon.png differ diff --git a/graphics/pokemon/icons/lileep_icon.png b/graphics/pokemon/icons/lileep_icon.png new file mode 100644 index 000000000..b875a53a7 Binary files /dev/null and b/graphics/pokemon/icons/lileep_icon.png differ diff --git a/graphics/pokemon/icons/linoone_icon.png b/graphics/pokemon/icons/linoone_icon.png new file mode 100644 index 000000000..bf0ea0cac Binary files /dev/null and b/graphics/pokemon/icons/linoone_icon.png differ diff --git a/graphics/pokemon/icons/lombre_icon.png b/graphics/pokemon/icons/lombre_icon.png new file mode 100644 index 000000000..b3e661cca Binary files /dev/null and b/graphics/pokemon/icons/lombre_icon.png differ diff --git a/graphics/pokemon/icons/lotad_icon.png b/graphics/pokemon/icons/lotad_icon.png new file mode 100644 index 000000000..74e37ceed Binary files /dev/null and b/graphics/pokemon/icons/lotad_icon.png differ diff --git a/graphics/pokemon/icons/loudred_icon.png b/graphics/pokemon/icons/loudred_icon.png new file mode 100644 index 000000000..cbb1859f8 Binary files /dev/null and b/graphics/pokemon/icons/loudred_icon.png differ diff --git a/graphics/pokemon/icons/ludicolo_icon.png b/graphics/pokemon/icons/ludicolo_icon.png new file mode 100644 index 000000000..47490411b Binary files /dev/null and b/graphics/pokemon/icons/ludicolo_icon.png differ diff --git a/graphics/pokemon/icons/lugia_icon.png b/graphics/pokemon/icons/lugia_icon.png new file mode 100644 index 000000000..5e581ee19 Binary files /dev/null and b/graphics/pokemon/icons/lugia_icon.png differ diff --git a/graphics/pokemon/icons/lunatone_icon.png b/graphics/pokemon/icons/lunatone_icon.png new file mode 100644 index 000000000..27a42ae41 Binary files /dev/null and b/graphics/pokemon/icons/lunatone_icon.png differ diff --git a/graphics/pokemon/icons/luvdisc_icon.png b/graphics/pokemon/icons/luvdisc_icon.png new file mode 100644 index 000000000..980b73492 Binary files /dev/null and b/graphics/pokemon/icons/luvdisc_icon.png differ diff --git a/graphics/pokemon/icons/machamp_icon.png b/graphics/pokemon/icons/machamp_icon.png new file mode 100644 index 000000000..f803845ab Binary files /dev/null and b/graphics/pokemon/icons/machamp_icon.png differ diff --git a/graphics/pokemon/icons/machoke_icon.png b/graphics/pokemon/icons/machoke_icon.png new file mode 100644 index 000000000..97d3a6bf0 Binary files /dev/null and b/graphics/pokemon/icons/machoke_icon.png differ diff --git a/graphics/pokemon/icons/machop_icon.png b/graphics/pokemon/icons/machop_icon.png new file mode 100644 index 000000000..53773ea8c Binary files /dev/null and b/graphics/pokemon/icons/machop_icon.png differ diff --git a/graphics/pokemon/icons/magby_icon.png b/graphics/pokemon/icons/magby_icon.png new file mode 100644 index 000000000..574274003 Binary files /dev/null and b/graphics/pokemon/icons/magby_icon.png differ diff --git a/graphics/pokemon/icons/magcargo_icon.png b/graphics/pokemon/icons/magcargo_icon.png new file mode 100644 index 000000000..46cbb8cb5 Binary files /dev/null and b/graphics/pokemon/icons/magcargo_icon.png differ diff --git a/graphics/pokemon/icons/magikarp_icon.png b/graphics/pokemon/icons/magikarp_icon.png new file mode 100644 index 000000000..004884582 Binary files /dev/null and b/graphics/pokemon/icons/magikarp_icon.png differ diff --git a/graphics/pokemon/icons/magmar_icon.png b/graphics/pokemon/icons/magmar_icon.png new file mode 100644 index 000000000..af5ece4f7 Binary files /dev/null and b/graphics/pokemon/icons/magmar_icon.png differ diff --git a/graphics/pokemon/icons/magnemite_icon.png b/graphics/pokemon/icons/magnemite_icon.png new file mode 100644 index 000000000..ba9561d21 Binary files /dev/null and b/graphics/pokemon/icons/magnemite_icon.png differ diff --git a/graphics/pokemon/icons/magneton_icon.png b/graphics/pokemon/icons/magneton_icon.png new file mode 100644 index 000000000..91a25f3ce Binary files /dev/null and b/graphics/pokemon/icons/magneton_icon.png differ diff --git a/graphics/pokemon/icons/makuhita_icon.png b/graphics/pokemon/icons/makuhita_icon.png new file mode 100644 index 000000000..d64f2c418 Binary files /dev/null and b/graphics/pokemon/icons/makuhita_icon.png differ diff --git a/graphics/pokemon/icons/manectric_icon.png b/graphics/pokemon/icons/manectric_icon.png new file mode 100644 index 000000000..0b8fe933d Binary files /dev/null and b/graphics/pokemon/icons/manectric_icon.png differ diff --git a/graphics/pokemon/icons/mankey_icon.png b/graphics/pokemon/icons/mankey_icon.png new file mode 100644 index 000000000..369221126 Binary files /dev/null and b/graphics/pokemon/icons/mankey_icon.png differ diff --git a/graphics/pokemon/icons/mantine_icon.png b/graphics/pokemon/icons/mantine_icon.png new file mode 100644 index 000000000..cf0bb2223 Binary files /dev/null and b/graphics/pokemon/icons/mantine_icon.png differ diff --git a/graphics/pokemon/icons/mareep_icon.png b/graphics/pokemon/icons/mareep_icon.png new file mode 100644 index 000000000..2bd5335b6 Binary files /dev/null and b/graphics/pokemon/icons/mareep_icon.png differ diff --git a/graphics/pokemon/icons/marill_icon.png b/graphics/pokemon/icons/marill_icon.png new file mode 100644 index 000000000..d91f9da86 Binary files /dev/null and b/graphics/pokemon/icons/marill_icon.png differ diff --git a/graphics/pokemon/icons/marowak_icon.png b/graphics/pokemon/icons/marowak_icon.png new file mode 100644 index 000000000..7efbb1779 Binary files /dev/null and b/graphics/pokemon/icons/marowak_icon.png differ diff --git a/graphics/pokemon/icons/marshtomp_icon.png b/graphics/pokemon/icons/marshtomp_icon.png new file mode 100644 index 000000000..170e82851 Binary files /dev/null and b/graphics/pokemon/icons/marshtomp_icon.png differ diff --git a/graphics/pokemon/icons/masquerain_icon.png b/graphics/pokemon/icons/masquerain_icon.png new file mode 100644 index 000000000..5487241e2 Binary files /dev/null and b/graphics/pokemon/icons/masquerain_icon.png differ diff --git a/graphics/pokemon/icons/mawile_icon.png b/graphics/pokemon/icons/mawile_icon.png new file mode 100644 index 000000000..cf7363277 Binary files /dev/null and b/graphics/pokemon/icons/mawile_icon.png differ diff --git a/graphics/pokemon/icons/medicham_icon.png b/graphics/pokemon/icons/medicham_icon.png new file mode 100644 index 000000000..ed287fb28 Binary files /dev/null and b/graphics/pokemon/icons/medicham_icon.png differ diff --git a/graphics/pokemon/icons/meditite_icon.png b/graphics/pokemon/icons/meditite_icon.png new file mode 100644 index 000000000..05a02f077 Binary files /dev/null and b/graphics/pokemon/icons/meditite_icon.png differ diff --git a/graphics/pokemon/icons/meganium_icon.png b/graphics/pokemon/icons/meganium_icon.png new file mode 100644 index 000000000..ce4592272 Binary files /dev/null and b/graphics/pokemon/icons/meganium_icon.png differ diff --git a/graphics/pokemon/icons/meowth_icon.png b/graphics/pokemon/icons/meowth_icon.png new file mode 100644 index 000000000..146c69093 Binary files /dev/null and b/graphics/pokemon/icons/meowth_icon.png differ diff --git a/graphics/pokemon/icons/metagross_icon.png b/graphics/pokemon/icons/metagross_icon.png new file mode 100644 index 000000000..e9cf14ab1 Binary files /dev/null and b/graphics/pokemon/icons/metagross_icon.png differ diff --git a/graphics/pokemon/icons/metang_icon.png b/graphics/pokemon/icons/metang_icon.png new file mode 100644 index 000000000..cc095e935 Binary files /dev/null and b/graphics/pokemon/icons/metang_icon.png differ diff --git a/graphics/pokemon/icons/metapod_icon.png b/graphics/pokemon/icons/metapod_icon.png new file mode 100644 index 000000000..2316b2408 Binary files /dev/null and b/graphics/pokemon/icons/metapod_icon.png differ diff --git a/graphics/pokemon/icons/mew_icon.png b/graphics/pokemon/icons/mew_icon.png new file mode 100644 index 000000000..cffd1dacc Binary files /dev/null and b/graphics/pokemon/icons/mew_icon.png differ diff --git a/graphics/pokemon/icons/mewtwo_icon.png b/graphics/pokemon/icons/mewtwo_icon.png new file mode 100644 index 000000000..65f2aeec2 Binary files /dev/null and b/graphics/pokemon/icons/mewtwo_icon.png differ diff --git a/graphics/pokemon/icons/mightyena_icon.png b/graphics/pokemon/icons/mightyena_icon.png new file mode 100644 index 000000000..3f9e61763 Binary files /dev/null and b/graphics/pokemon/icons/mightyena_icon.png differ diff --git a/graphics/pokemon/icons/milotic_icon.png b/graphics/pokemon/icons/milotic_icon.png new file mode 100644 index 000000000..c1aa2ec8a Binary files /dev/null and b/graphics/pokemon/icons/milotic_icon.png differ diff --git a/graphics/pokemon/icons/miltank_icon.png b/graphics/pokemon/icons/miltank_icon.png new file mode 100644 index 000000000..ade9cad90 Binary files /dev/null and b/graphics/pokemon/icons/miltank_icon.png differ diff --git a/graphics/pokemon/icons/minun_icon.png b/graphics/pokemon/icons/minun_icon.png new file mode 100644 index 000000000..1aacd776a Binary files /dev/null and b/graphics/pokemon/icons/minun_icon.png differ diff --git a/graphics/pokemon/icons/misdreavus_icon.png b/graphics/pokemon/icons/misdreavus_icon.png new file mode 100644 index 000000000..bbe121b91 Binary files /dev/null and b/graphics/pokemon/icons/misdreavus_icon.png differ diff --git a/graphics/pokemon/icons/moltres_icon.png b/graphics/pokemon/icons/moltres_icon.png new file mode 100644 index 000000000..e15d2164a Binary files /dev/null and b/graphics/pokemon/icons/moltres_icon.png differ diff --git a/graphics/pokemon/icons/mr_mime_icon.png b/graphics/pokemon/icons/mr_mime_icon.png new file mode 100644 index 000000000..b1e3b2bfb Binary files /dev/null and b/graphics/pokemon/icons/mr_mime_icon.png differ diff --git a/graphics/pokemon/icons/mudkip_icon.png b/graphics/pokemon/icons/mudkip_icon.png new file mode 100644 index 000000000..5a657aa91 Binary files /dev/null and b/graphics/pokemon/icons/mudkip_icon.png differ diff --git a/graphics/pokemon/icons/muk_icon.png b/graphics/pokemon/icons/muk_icon.png new file mode 100644 index 000000000..6d8d09350 Binary files /dev/null and b/graphics/pokemon/icons/muk_icon.png differ diff --git a/graphics/pokemon/icons/murkrow_icon.png b/graphics/pokemon/icons/murkrow_icon.png new file mode 100644 index 000000000..eac91aa18 Binary files /dev/null and b/graphics/pokemon/icons/murkrow_icon.png differ diff --git a/graphics/pokemon/icons/natu_icon.png b/graphics/pokemon/icons/natu_icon.png new file mode 100644 index 000000000..7188fb7f3 Binary files /dev/null and b/graphics/pokemon/icons/natu_icon.png differ diff --git a/graphics/pokemon/icons/nidoking_icon.png b/graphics/pokemon/icons/nidoking_icon.png new file mode 100644 index 000000000..baa05c6a0 Binary files /dev/null and b/graphics/pokemon/icons/nidoking_icon.png differ diff --git a/graphics/pokemon/icons/nidoqueen_icon.png b/graphics/pokemon/icons/nidoqueen_icon.png new file mode 100644 index 000000000..2d3cdc477 Binary files /dev/null and b/graphics/pokemon/icons/nidoqueen_icon.png differ diff --git a/graphics/pokemon/icons/nidoran_f_icon.png b/graphics/pokemon/icons/nidoran_f_icon.png new file mode 100644 index 000000000..a2483ae63 Binary files /dev/null and b/graphics/pokemon/icons/nidoran_f_icon.png differ diff --git a/graphics/pokemon/icons/nidoran_m_icon.png b/graphics/pokemon/icons/nidoran_m_icon.png new file mode 100644 index 000000000..4467c5192 Binary files /dev/null and b/graphics/pokemon/icons/nidoran_m_icon.png differ diff --git a/graphics/pokemon/icons/nidorina_icon.png b/graphics/pokemon/icons/nidorina_icon.png new file mode 100644 index 000000000..ad90d02ba Binary files /dev/null and b/graphics/pokemon/icons/nidorina_icon.png differ diff --git a/graphics/pokemon/icons/nidorino_icon.png b/graphics/pokemon/icons/nidorino_icon.png new file mode 100644 index 000000000..5edc103c1 Binary files /dev/null and b/graphics/pokemon/icons/nidorino_icon.png differ diff --git a/graphics/pokemon/icons/nincada_icon.png b/graphics/pokemon/icons/nincada_icon.png new file mode 100644 index 000000000..003ddb992 Binary files /dev/null and b/graphics/pokemon/icons/nincada_icon.png differ diff --git a/graphics/pokemon/icons/ninetales_icon.png b/graphics/pokemon/icons/ninetales_icon.png new file mode 100644 index 000000000..1a74d34eb Binary files /dev/null and b/graphics/pokemon/icons/ninetales_icon.png differ diff --git a/graphics/pokemon/icons/ninjask_icon.png b/graphics/pokemon/icons/ninjask_icon.png new file mode 100644 index 000000000..c51533c67 Binary files /dev/null and b/graphics/pokemon/icons/ninjask_icon.png differ diff --git a/graphics/pokemon/icons/noctowl_icon.png b/graphics/pokemon/icons/noctowl_icon.png new file mode 100644 index 000000000..eafbea37e Binary files /dev/null and b/graphics/pokemon/icons/noctowl_icon.png differ diff --git a/graphics/pokemon/icons/nosepass_icon.png b/graphics/pokemon/icons/nosepass_icon.png new file mode 100644 index 000000000..718fed8fa Binary files /dev/null and b/graphics/pokemon/icons/nosepass_icon.png differ diff --git a/graphics/pokemon/icons/numel_icon.png b/graphics/pokemon/icons/numel_icon.png new file mode 100644 index 000000000..62281e8bf Binary files /dev/null and b/graphics/pokemon/icons/numel_icon.png differ diff --git a/graphics/pokemon/icons/nuzleaf_icon.png b/graphics/pokemon/icons/nuzleaf_icon.png new file mode 100644 index 000000000..8c9f4038f Binary files /dev/null and b/graphics/pokemon/icons/nuzleaf_icon.png differ diff --git a/graphics/pokemon/icons/octillery_icon.png b/graphics/pokemon/icons/octillery_icon.png new file mode 100644 index 000000000..a21e60327 Binary files /dev/null and b/graphics/pokemon/icons/octillery_icon.png differ diff --git a/graphics/pokemon/icons/oddish_icon.png b/graphics/pokemon/icons/oddish_icon.png new file mode 100644 index 000000000..7c46ae7e7 Binary files /dev/null and b/graphics/pokemon/icons/oddish_icon.png differ diff --git a/graphics/pokemon/icons/omanyte_icon.png b/graphics/pokemon/icons/omanyte_icon.png new file mode 100644 index 000000000..94684f5c3 Binary files /dev/null and b/graphics/pokemon/icons/omanyte_icon.png differ diff --git a/graphics/pokemon/icons/omastar_icon.png b/graphics/pokemon/icons/omastar_icon.png new file mode 100644 index 000000000..b72bd6aec Binary files /dev/null and b/graphics/pokemon/icons/omastar_icon.png differ diff --git a/graphics/pokemon/icons/onix_icon.png b/graphics/pokemon/icons/onix_icon.png new file mode 100644 index 000000000..ddd7ee4f9 Binary files /dev/null and b/graphics/pokemon/icons/onix_icon.png differ diff --git a/graphics/pokemon/icons/paras_icon.png b/graphics/pokemon/icons/paras_icon.png new file mode 100644 index 000000000..6b828b058 Binary files /dev/null and b/graphics/pokemon/icons/paras_icon.png differ diff --git a/graphics/pokemon/icons/parasect_icon.png b/graphics/pokemon/icons/parasect_icon.png new file mode 100644 index 000000000..907cbf5ca Binary files /dev/null and b/graphics/pokemon/icons/parasect_icon.png differ diff --git a/graphics/pokemon/icons/pelipper_icon.png b/graphics/pokemon/icons/pelipper_icon.png new file mode 100644 index 000000000..55a16bc5f Binary files /dev/null and b/graphics/pokemon/icons/pelipper_icon.png differ diff --git a/graphics/pokemon/icons/persian_icon.png b/graphics/pokemon/icons/persian_icon.png new file mode 100644 index 000000000..3d6f72fee Binary files /dev/null and b/graphics/pokemon/icons/persian_icon.png differ diff --git a/graphics/pokemon/icons/phanpy_icon.png b/graphics/pokemon/icons/phanpy_icon.png new file mode 100644 index 000000000..341724973 Binary files /dev/null and b/graphics/pokemon/icons/phanpy_icon.png differ diff --git a/graphics/pokemon/icons/pichu_icon.png b/graphics/pokemon/icons/pichu_icon.png new file mode 100644 index 000000000..dd696ac10 Binary files /dev/null and b/graphics/pokemon/icons/pichu_icon.png differ diff --git a/graphics/pokemon/icons/pidgeot_icon.png b/graphics/pokemon/icons/pidgeot_icon.png new file mode 100644 index 000000000..472c0640c Binary files /dev/null and b/graphics/pokemon/icons/pidgeot_icon.png differ diff --git a/graphics/pokemon/icons/pidgeotto_icon.png b/graphics/pokemon/icons/pidgeotto_icon.png new file mode 100644 index 000000000..bb134533e Binary files /dev/null and b/graphics/pokemon/icons/pidgeotto_icon.png differ diff --git a/graphics/pokemon/icons/pidgey_icon.png b/graphics/pokemon/icons/pidgey_icon.png new file mode 100644 index 000000000..44ff94311 Binary files /dev/null and b/graphics/pokemon/icons/pidgey_icon.png differ diff --git a/graphics/pokemon/icons/pikachu_icon.png b/graphics/pokemon/icons/pikachu_icon.png new file mode 100644 index 000000000..feb77f7db Binary files /dev/null and b/graphics/pokemon/icons/pikachu_icon.png differ diff --git a/graphics/pokemon/icons/piloswine_icon.png b/graphics/pokemon/icons/piloswine_icon.png new file mode 100644 index 000000000..974e9ea6a Binary files /dev/null and b/graphics/pokemon/icons/piloswine_icon.png differ diff --git a/graphics/pokemon/icons/pineco_icon.png b/graphics/pokemon/icons/pineco_icon.png new file mode 100644 index 000000000..3c12df5a2 Binary files /dev/null and b/graphics/pokemon/icons/pineco_icon.png differ diff --git a/graphics/pokemon/icons/pinsir_icon.png b/graphics/pokemon/icons/pinsir_icon.png new file mode 100644 index 000000000..b05b075b9 Binary files /dev/null and b/graphics/pokemon/icons/pinsir_icon.png differ diff --git a/graphics/pokemon/icons/plusle_icon.png b/graphics/pokemon/icons/plusle_icon.png new file mode 100644 index 000000000..97f10d56f Binary files /dev/null and b/graphics/pokemon/icons/plusle_icon.png differ diff --git a/graphics/pokemon/icons/politoed_icon.png b/graphics/pokemon/icons/politoed_icon.png new file mode 100644 index 000000000..a5e5d699b Binary files /dev/null and b/graphics/pokemon/icons/politoed_icon.png differ diff --git a/graphics/pokemon/icons/poliwag_icon.png b/graphics/pokemon/icons/poliwag_icon.png new file mode 100644 index 000000000..d4cd95f1c Binary files /dev/null and b/graphics/pokemon/icons/poliwag_icon.png differ diff --git a/graphics/pokemon/icons/poliwhirl_icon.png b/graphics/pokemon/icons/poliwhirl_icon.png new file mode 100644 index 000000000..bb90740ac Binary files /dev/null and b/graphics/pokemon/icons/poliwhirl_icon.png differ diff --git a/graphics/pokemon/icons/poliwrath_icon.png b/graphics/pokemon/icons/poliwrath_icon.png new file mode 100644 index 000000000..d1afb4511 Binary files /dev/null and b/graphics/pokemon/icons/poliwrath_icon.png differ diff --git a/graphics/pokemon/icons/ponyta_icon.png b/graphics/pokemon/icons/ponyta_icon.png new file mode 100644 index 000000000..05ac87a44 Binary files /dev/null and b/graphics/pokemon/icons/ponyta_icon.png differ diff --git a/graphics/pokemon/icons/poochyena_icon.png b/graphics/pokemon/icons/poochyena_icon.png new file mode 100644 index 000000000..7e6be6a17 Binary files /dev/null and b/graphics/pokemon/icons/poochyena_icon.png differ diff --git a/graphics/pokemon/icons/porygon2_icon.png b/graphics/pokemon/icons/porygon2_icon.png new file mode 100644 index 000000000..312640b40 Binary files /dev/null and b/graphics/pokemon/icons/porygon2_icon.png differ diff --git a/graphics/pokemon/icons/porygon_icon.png b/graphics/pokemon/icons/porygon_icon.png new file mode 100644 index 000000000..306ea8d31 Binary files /dev/null and b/graphics/pokemon/icons/porygon_icon.png differ diff --git a/graphics/pokemon/icons/primeape_icon.png b/graphics/pokemon/icons/primeape_icon.png new file mode 100644 index 000000000..d2d42f7dc Binary files /dev/null and b/graphics/pokemon/icons/primeape_icon.png differ diff --git a/graphics/pokemon/icons/psyduck_icon.png b/graphics/pokemon/icons/psyduck_icon.png new file mode 100644 index 000000000..f3ebc9f96 Binary files /dev/null and b/graphics/pokemon/icons/psyduck_icon.png differ diff --git a/graphics/pokemon/icons/pupitar_icon.png b/graphics/pokemon/icons/pupitar_icon.png new file mode 100644 index 000000000..3491849d1 Binary files /dev/null and b/graphics/pokemon/icons/pupitar_icon.png differ diff --git a/graphics/pokemon/icons/quagsire_icon.png b/graphics/pokemon/icons/quagsire_icon.png new file mode 100644 index 000000000..62c7f2e46 Binary files /dev/null and b/graphics/pokemon/icons/quagsire_icon.png differ diff --git a/graphics/pokemon/icons/question_mark_icon.png b/graphics/pokemon/icons/question_mark_icon.png new file mode 100644 index 000000000..b31ebacf7 Binary files /dev/null and b/graphics/pokemon/icons/question_mark_icon.png differ diff --git a/graphics/pokemon/icons/quilava_icon.png b/graphics/pokemon/icons/quilava_icon.png new file mode 100644 index 000000000..62d0608dd Binary files /dev/null and b/graphics/pokemon/icons/quilava_icon.png differ diff --git a/graphics/pokemon/icons/qwilfish_icon.png b/graphics/pokemon/icons/qwilfish_icon.png new file mode 100644 index 000000000..b0fc12302 Binary files /dev/null and b/graphics/pokemon/icons/qwilfish_icon.png differ diff --git a/graphics/pokemon/icons/raichu_icon.png b/graphics/pokemon/icons/raichu_icon.png new file mode 100644 index 000000000..a34997b47 Binary files /dev/null and b/graphics/pokemon/icons/raichu_icon.png differ diff --git a/graphics/pokemon/icons/raikou_icon.png b/graphics/pokemon/icons/raikou_icon.png new file mode 100644 index 000000000..7847a6f16 Binary files /dev/null and b/graphics/pokemon/icons/raikou_icon.png differ diff --git a/graphics/pokemon/icons/ralts_icon.png b/graphics/pokemon/icons/ralts_icon.png new file mode 100644 index 000000000..ed99d3427 Binary files /dev/null and b/graphics/pokemon/icons/ralts_icon.png differ diff --git a/graphics/pokemon/icons/rapidash_icon.png b/graphics/pokemon/icons/rapidash_icon.png new file mode 100644 index 000000000..c0af0dd08 Binary files /dev/null and b/graphics/pokemon/icons/rapidash_icon.png differ diff --git a/graphics/pokemon/icons/raticate_icon.png b/graphics/pokemon/icons/raticate_icon.png new file mode 100644 index 000000000..40fbd79c5 Binary files /dev/null and b/graphics/pokemon/icons/raticate_icon.png differ diff --git a/graphics/pokemon/icons/rattata_icon.png b/graphics/pokemon/icons/rattata_icon.png new file mode 100644 index 000000000..ae7b22258 Binary files /dev/null and b/graphics/pokemon/icons/rattata_icon.png differ diff --git a/graphics/pokemon/icons/rayquaza_icon.png b/graphics/pokemon/icons/rayquaza_icon.png new file mode 100644 index 000000000..65844ebf7 Binary files /dev/null and b/graphics/pokemon/icons/rayquaza_icon.png differ diff --git a/graphics/pokemon/icons/regice_icon.png b/graphics/pokemon/icons/regice_icon.png new file mode 100644 index 000000000..46b07b3aa Binary files /dev/null and b/graphics/pokemon/icons/regice_icon.png differ diff --git a/graphics/pokemon/icons/regirock_icon.png b/graphics/pokemon/icons/regirock_icon.png new file mode 100644 index 000000000..e69836744 Binary files /dev/null and b/graphics/pokemon/icons/regirock_icon.png differ diff --git a/graphics/pokemon/icons/registeel_icon.png b/graphics/pokemon/icons/registeel_icon.png new file mode 100644 index 000000000..5a8cd3d19 Binary files /dev/null and b/graphics/pokemon/icons/registeel_icon.png differ diff --git a/graphics/pokemon/icons/relicanth_icon.png b/graphics/pokemon/icons/relicanth_icon.png new file mode 100644 index 000000000..da17eec33 Binary files /dev/null and b/graphics/pokemon/icons/relicanth_icon.png differ diff --git a/graphics/pokemon/icons/remoraid_icon.png b/graphics/pokemon/icons/remoraid_icon.png new file mode 100644 index 000000000..efbe4ace3 Binary files /dev/null and b/graphics/pokemon/icons/remoraid_icon.png differ diff --git a/graphics/pokemon/icons/rhydon_icon.png b/graphics/pokemon/icons/rhydon_icon.png new file mode 100644 index 000000000..3bf633680 Binary files /dev/null and b/graphics/pokemon/icons/rhydon_icon.png differ diff --git a/graphics/pokemon/icons/rhyhorn_icon.png b/graphics/pokemon/icons/rhyhorn_icon.png new file mode 100644 index 000000000..03bb348e7 Binary files /dev/null and b/graphics/pokemon/icons/rhyhorn_icon.png differ diff --git a/graphics/pokemon/icons/roselia_icon.png b/graphics/pokemon/icons/roselia_icon.png new file mode 100644 index 000000000..fc63c9644 Binary files /dev/null and b/graphics/pokemon/icons/roselia_icon.png differ diff --git a/graphics/pokemon/icons/sableye_icon.png b/graphics/pokemon/icons/sableye_icon.png new file mode 100644 index 000000000..e8ac1307e Binary files /dev/null and b/graphics/pokemon/icons/sableye_icon.png differ diff --git a/graphics/pokemon/icons/salamence_icon.png b/graphics/pokemon/icons/salamence_icon.png new file mode 100644 index 000000000..b4c925502 Binary files /dev/null and b/graphics/pokemon/icons/salamence_icon.png differ diff --git a/graphics/pokemon/icons/sandshrew_icon.png b/graphics/pokemon/icons/sandshrew_icon.png new file mode 100644 index 000000000..5919f1095 Binary files /dev/null and b/graphics/pokemon/icons/sandshrew_icon.png differ diff --git a/graphics/pokemon/icons/sandslash_icon.png b/graphics/pokemon/icons/sandslash_icon.png new file mode 100644 index 000000000..08198e6b2 Binary files /dev/null and b/graphics/pokemon/icons/sandslash_icon.png differ diff --git a/graphics/pokemon/icons/sceptile_icon.png b/graphics/pokemon/icons/sceptile_icon.png new file mode 100644 index 000000000..d144941e0 Binary files /dev/null and b/graphics/pokemon/icons/sceptile_icon.png differ diff --git a/graphics/pokemon/icons/scizor_icon.png b/graphics/pokemon/icons/scizor_icon.png new file mode 100644 index 000000000..0a8667832 Binary files /dev/null and b/graphics/pokemon/icons/scizor_icon.png differ diff --git a/graphics/pokemon/icons/scyther_icon.png b/graphics/pokemon/icons/scyther_icon.png new file mode 100644 index 000000000..62f94bba6 Binary files /dev/null and b/graphics/pokemon/icons/scyther_icon.png differ diff --git a/graphics/pokemon/icons/seadra_icon.png b/graphics/pokemon/icons/seadra_icon.png new file mode 100644 index 000000000..f85ea2f32 Binary files /dev/null and b/graphics/pokemon/icons/seadra_icon.png differ diff --git a/graphics/pokemon/icons/seaking_icon.png b/graphics/pokemon/icons/seaking_icon.png new file mode 100644 index 000000000..7c3bcaec1 Binary files /dev/null and b/graphics/pokemon/icons/seaking_icon.png differ diff --git a/graphics/pokemon/icons/sealeo_icon.png b/graphics/pokemon/icons/sealeo_icon.png new file mode 100644 index 000000000..2d21e8837 Binary files /dev/null and b/graphics/pokemon/icons/sealeo_icon.png differ diff --git a/graphics/pokemon/icons/seedot_icon.png b/graphics/pokemon/icons/seedot_icon.png new file mode 100644 index 000000000..500a49d47 Binary files /dev/null and b/graphics/pokemon/icons/seedot_icon.png differ diff --git a/graphics/pokemon/icons/seel_icon.png b/graphics/pokemon/icons/seel_icon.png new file mode 100644 index 000000000..9000021e9 Binary files /dev/null and b/graphics/pokemon/icons/seel_icon.png differ diff --git a/graphics/pokemon/icons/sentret_icon.png b/graphics/pokemon/icons/sentret_icon.png new file mode 100644 index 000000000..560b38d44 Binary files /dev/null and b/graphics/pokemon/icons/sentret_icon.png differ diff --git a/graphics/pokemon/icons/seviper_icon.png b/graphics/pokemon/icons/seviper_icon.png new file mode 100644 index 000000000..ce751ce33 Binary files /dev/null and b/graphics/pokemon/icons/seviper_icon.png differ diff --git a/graphics/pokemon/icons/sharpedo_icon.png b/graphics/pokemon/icons/sharpedo_icon.png new file mode 100644 index 000000000..d8dbc26b2 Binary files /dev/null and b/graphics/pokemon/icons/sharpedo_icon.png differ diff --git a/graphics/pokemon/icons/shedinja_icon.png b/graphics/pokemon/icons/shedinja_icon.png new file mode 100644 index 000000000..9f400e338 Binary files /dev/null and b/graphics/pokemon/icons/shedinja_icon.png differ diff --git a/graphics/pokemon/icons/shelgon_icon.png b/graphics/pokemon/icons/shelgon_icon.png new file mode 100644 index 000000000..76e0c6a1f Binary files /dev/null and b/graphics/pokemon/icons/shelgon_icon.png differ diff --git a/graphics/pokemon/icons/shellder_icon.png b/graphics/pokemon/icons/shellder_icon.png new file mode 100644 index 000000000..36ad59dfa Binary files /dev/null and b/graphics/pokemon/icons/shellder_icon.png differ diff --git a/graphics/pokemon/icons/shiftry_icon.png b/graphics/pokemon/icons/shiftry_icon.png new file mode 100644 index 000000000..c10fa772d Binary files /dev/null and b/graphics/pokemon/icons/shiftry_icon.png differ diff --git a/graphics/pokemon/icons/shroomish_icon.png b/graphics/pokemon/icons/shroomish_icon.png new file mode 100644 index 000000000..87dd12060 Binary files /dev/null and b/graphics/pokemon/icons/shroomish_icon.png differ diff --git a/graphics/pokemon/icons/shuckle_icon.png b/graphics/pokemon/icons/shuckle_icon.png new file mode 100644 index 000000000..aaf49345a Binary files /dev/null and b/graphics/pokemon/icons/shuckle_icon.png differ diff --git a/graphics/pokemon/icons/shuppet_icon.png b/graphics/pokemon/icons/shuppet_icon.png new file mode 100644 index 000000000..6e7087efd Binary files /dev/null and b/graphics/pokemon/icons/shuppet_icon.png differ diff --git a/graphics/pokemon/icons/silcoon_icon.png b/graphics/pokemon/icons/silcoon_icon.png new file mode 100644 index 000000000..0b572a20c Binary files /dev/null and b/graphics/pokemon/icons/silcoon_icon.png differ diff --git a/graphics/pokemon/icons/skarmory_icon.png b/graphics/pokemon/icons/skarmory_icon.png new file mode 100644 index 000000000..1eb310654 Binary files /dev/null and b/graphics/pokemon/icons/skarmory_icon.png differ diff --git a/graphics/pokemon/icons/skiploom_icon.png b/graphics/pokemon/icons/skiploom_icon.png new file mode 100644 index 000000000..90c0c8e7c Binary files /dev/null and b/graphics/pokemon/icons/skiploom_icon.png differ diff --git a/graphics/pokemon/icons/skitty_icon.png b/graphics/pokemon/icons/skitty_icon.png new file mode 100644 index 000000000..fb41f1c07 Binary files /dev/null and b/graphics/pokemon/icons/skitty_icon.png differ diff --git a/graphics/pokemon/icons/slaking_icon.png b/graphics/pokemon/icons/slaking_icon.png new file mode 100644 index 000000000..71b6c7537 Binary files /dev/null and b/graphics/pokemon/icons/slaking_icon.png differ diff --git a/graphics/pokemon/icons/slakoth_icon.png b/graphics/pokemon/icons/slakoth_icon.png new file mode 100644 index 000000000..c04ff08a0 Binary files /dev/null and b/graphics/pokemon/icons/slakoth_icon.png differ diff --git a/graphics/pokemon/icons/slowbro_icon.png b/graphics/pokemon/icons/slowbro_icon.png new file mode 100644 index 000000000..bf7ee6a32 Binary files /dev/null and b/graphics/pokemon/icons/slowbro_icon.png differ diff --git a/graphics/pokemon/icons/slowking_icon.png b/graphics/pokemon/icons/slowking_icon.png new file mode 100644 index 000000000..04bd1a155 Binary files /dev/null and b/graphics/pokemon/icons/slowking_icon.png differ diff --git a/graphics/pokemon/icons/slowpoke_icon.png b/graphics/pokemon/icons/slowpoke_icon.png new file mode 100644 index 000000000..cc3123e14 Binary files /dev/null and b/graphics/pokemon/icons/slowpoke_icon.png differ diff --git a/graphics/pokemon/icons/slugma_icon.png b/graphics/pokemon/icons/slugma_icon.png new file mode 100644 index 000000000..d954c6f68 Binary files /dev/null and b/graphics/pokemon/icons/slugma_icon.png differ diff --git a/graphics/pokemon/icons/smeargle_icon.png b/graphics/pokemon/icons/smeargle_icon.png new file mode 100644 index 000000000..54b387b05 Binary files /dev/null and b/graphics/pokemon/icons/smeargle_icon.png differ diff --git a/graphics/pokemon/icons/smoochum_icon.png b/graphics/pokemon/icons/smoochum_icon.png new file mode 100644 index 000000000..11f1e6fe7 Binary files /dev/null and b/graphics/pokemon/icons/smoochum_icon.png differ diff --git a/graphics/pokemon/icons/sneasel_icon.png b/graphics/pokemon/icons/sneasel_icon.png new file mode 100644 index 000000000..95eb3e66d Binary files /dev/null and b/graphics/pokemon/icons/sneasel_icon.png differ diff --git a/graphics/pokemon/icons/snorlax_icon.png b/graphics/pokemon/icons/snorlax_icon.png new file mode 100644 index 000000000..00a74b6ac Binary files /dev/null and b/graphics/pokemon/icons/snorlax_icon.png differ diff --git a/graphics/pokemon/icons/snorunt_icon.png b/graphics/pokemon/icons/snorunt_icon.png new file mode 100644 index 000000000..2710b9a0a Binary files /dev/null and b/graphics/pokemon/icons/snorunt_icon.png differ diff --git a/graphics/pokemon/icons/snubbull_icon.png b/graphics/pokemon/icons/snubbull_icon.png new file mode 100644 index 000000000..80f9b1288 Binary files /dev/null and b/graphics/pokemon/icons/snubbull_icon.png differ diff --git a/graphics/pokemon/icons/solrock_icon.png b/graphics/pokemon/icons/solrock_icon.png new file mode 100644 index 000000000..f9e689424 Binary files /dev/null and b/graphics/pokemon/icons/solrock_icon.png differ diff --git a/graphics/pokemon/icons/spearow_icon.png b/graphics/pokemon/icons/spearow_icon.png new file mode 100644 index 000000000..a88db9927 Binary files /dev/null and b/graphics/pokemon/icons/spearow_icon.png differ diff --git a/graphics/pokemon/icons/spheal_icon.png b/graphics/pokemon/icons/spheal_icon.png new file mode 100644 index 000000000..fd392e196 Binary files /dev/null and b/graphics/pokemon/icons/spheal_icon.png differ diff --git a/graphics/pokemon/icons/spinarak_icon.png b/graphics/pokemon/icons/spinarak_icon.png new file mode 100644 index 000000000..54ec8e0fe Binary files /dev/null and b/graphics/pokemon/icons/spinarak_icon.png differ diff --git a/graphics/pokemon/icons/spinda_icon.png b/graphics/pokemon/icons/spinda_icon.png new file mode 100644 index 000000000..75699c7cb Binary files /dev/null and b/graphics/pokemon/icons/spinda_icon.png differ diff --git a/graphics/pokemon/icons/spoink_icon.png b/graphics/pokemon/icons/spoink_icon.png new file mode 100644 index 000000000..387d0ed00 Binary files /dev/null and b/graphics/pokemon/icons/spoink_icon.png differ diff --git a/graphics/pokemon/icons/squirtle_icon.png b/graphics/pokemon/icons/squirtle_icon.png new file mode 100644 index 000000000..75a58770f Binary files /dev/null and b/graphics/pokemon/icons/squirtle_icon.png differ diff --git a/graphics/pokemon/icons/stantler_icon.png b/graphics/pokemon/icons/stantler_icon.png new file mode 100644 index 000000000..da9e6da99 Binary files /dev/null and b/graphics/pokemon/icons/stantler_icon.png differ diff --git a/graphics/pokemon/icons/starmie_icon.png b/graphics/pokemon/icons/starmie_icon.png new file mode 100644 index 000000000..844cae0c7 Binary files /dev/null and b/graphics/pokemon/icons/starmie_icon.png differ diff --git a/graphics/pokemon/icons/staryu_icon.png b/graphics/pokemon/icons/staryu_icon.png new file mode 100644 index 000000000..b90c0b9c3 Binary files /dev/null and b/graphics/pokemon/icons/staryu_icon.png differ diff --git a/graphics/pokemon/icons/steelix_icon.png b/graphics/pokemon/icons/steelix_icon.png new file mode 100644 index 000000000..c99e17581 Binary files /dev/null and b/graphics/pokemon/icons/steelix_icon.png differ diff --git a/graphics/pokemon/icons/sudowoodo_icon.png b/graphics/pokemon/icons/sudowoodo_icon.png new file mode 100644 index 000000000..4cc4afadf Binary files /dev/null and b/graphics/pokemon/icons/sudowoodo_icon.png differ diff --git a/graphics/pokemon/icons/suicune_icon.png b/graphics/pokemon/icons/suicune_icon.png new file mode 100644 index 000000000..3e4b3c695 Binary files /dev/null and b/graphics/pokemon/icons/suicune_icon.png differ diff --git a/graphics/pokemon/icons/sunflora_icon.png b/graphics/pokemon/icons/sunflora_icon.png new file mode 100644 index 000000000..6493eb510 Binary files /dev/null and b/graphics/pokemon/icons/sunflora_icon.png differ diff --git a/graphics/pokemon/icons/sunkern_icon.png b/graphics/pokemon/icons/sunkern_icon.png new file mode 100644 index 000000000..60d7ea91b Binary files /dev/null and b/graphics/pokemon/icons/sunkern_icon.png differ diff --git a/graphics/pokemon/icons/surskit_icon.png b/graphics/pokemon/icons/surskit_icon.png new file mode 100644 index 000000000..a7267c21a Binary files /dev/null and b/graphics/pokemon/icons/surskit_icon.png differ diff --git a/graphics/pokemon/icons/swablu_icon.png b/graphics/pokemon/icons/swablu_icon.png new file mode 100644 index 000000000..fa269d741 Binary files /dev/null and b/graphics/pokemon/icons/swablu_icon.png differ diff --git a/graphics/pokemon/icons/swalot_icon.png b/graphics/pokemon/icons/swalot_icon.png new file mode 100644 index 000000000..9868d73d3 Binary files /dev/null and b/graphics/pokemon/icons/swalot_icon.png differ diff --git a/graphics/pokemon/icons/swampert_icon.png b/graphics/pokemon/icons/swampert_icon.png new file mode 100644 index 000000000..5b2f04ca9 Binary files /dev/null and b/graphics/pokemon/icons/swampert_icon.png differ diff --git a/graphics/pokemon/icons/swellow_icon.png b/graphics/pokemon/icons/swellow_icon.png new file mode 100644 index 000000000..47a2ea74d Binary files /dev/null and b/graphics/pokemon/icons/swellow_icon.png differ diff --git a/graphics/pokemon/icons/swinub_icon.png b/graphics/pokemon/icons/swinub_icon.png new file mode 100644 index 000000000..f33656a0c Binary files /dev/null and b/graphics/pokemon/icons/swinub_icon.png differ diff --git a/graphics/pokemon/icons/taillow_icon.png b/graphics/pokemon/icons/taillow_icon.png new file mode 100644 index 000000000..a0668865b Binary files /dev/null and b/graphics/pokemon/icons/taillow_icon.png differ diff --git a/graphics/pokemon/icons/tangela_icon.png b/graphics/pokemon/icons/tangela_icon.png new file mode 100644 index 000000000..c2a8ee33f Binary files /dev/null and b/graphics/pokemon/icons/tangela_icon.png differ diff --git a/graphics/pokemon/icons/tauros_icon.png b/graphics/pokemon/icons/tauros_icon.png new file mode 100644 index 000000000..fc432dab9 Binary files /dev/null and b/graphics/pokemon/icons/tauros_icon.png differ diff --git a/graphics/pokemon/icons/teddiursa_icon.png b/graphics/pokemon/icons/teddiursa_icon.png new file mode 100644 index 000000000..94994c86d Binary files /dev/null and b/graphics/pokemon/icons/teddiursa_icon.png differ diff --git a/graphics/pokemon/icons/tentacool_icon.png b/graphics/pokemon/icons/tentacool_icon.png new file mode 100644 index 000000000..d29ca1938 Binary files /dev/null and b/graphics/pokemon/icons/tentacool_icon.png differ diff --git a/graphics/pokemon/icons/tentacruel_icon.png b/graphics/pokemon/icons/tentacruel_icon.png new file mode 100644 index 000000000..72b6da9b9 Binary files /dev/null and b/graphics/pokemon/icons/tentacruel_icon.png differ diff --git a/graphics/pokemon/icons/togepi_icon.png b/graphics/pokemon/icons/togepi_icon.png new file mode 100644 index 000000000..ded646fa1 Binary files /dev/null and b/graphics/pokemon/icons/togepi_icon.png differ diff --git a/graphics/pokemon/icons/togetic_icon.png b/graphics/pokemon/icons/togetic_icon.png new file mode 100644 index 000000000..61e73ab3e Binary files /dev/null and b/graphics/pokemon/icons/togetic_icon.png differ diff --git a/graphics/pokemon/icons/torchic_icon.png b/graphics/pokemon/icons/torchic_icon.png new file mode 100644 index 000000000..6346e2272 Binary files /dev/null and b/graphics/pokemon/icons/torchic_icon.png differ diff --git a/graphics/pokemon/icons/torkoal_icon.png b/graphics/pokemon/icons/torkoal_icon.png new file mode 100644 index 000000000..077ce4026 Binary files /dev/null and b/graphics/pokemon/icons/torkoal_icon.png differ diff --git a/graphics/pokemon/icons/totodile_icon.png b/graphics/pokemon/icons/totodile_icon.png new file mode 100644 index 000000000..c2bc68521 Binary files /dev/null and b/graphics/pokemon/icons/totodile_icon.png differ diff --git a/graphics/pokemon/icons/trapinch_icon.png b/graphics/pokemon/icons/trapinch_icon.png new file mode 100644 index 000000000..731dbf569 Binary files /dev/null and b/graphics/pokemon/icons/trapinch_icon.png differ diff --git a/graphics/pokemon/icons/treecko_icon.png b/graphics/pokemon/icons/treecko_icon.png new file mode 100644 index 000000000..f51358adf Binary files /dev/null and b/graphics/pokemon/icons/treecko_icon.png differ diff --git a/graphics/pokemon/icons/tropius_icon.png b/graphics/pokemon/icons/tropius_icon.png new file mode 100644 index 000000000..dabfcd295 Binary files /dev/null and b/graphics/pokemon/icons/tropius_icon.png differ diff --git a/graphics/pokemon/icons/typhlosion_icon.png b/graphics/pokemon/icons/typhlosion_icon.png new file mode 100644 index 000000000..e15d7b683 Binary files /dev/null and b/graphics/pokemon/icons/typhlosion_icon.png differ diff --git a/graphics/pokemon/icons/tyranitar_icon.png b/graphics/pokemon/icons/tyranitar_icon.png new file mode 100644 index 000000000..76113bc68 Binary files /dev/null and b/graphics/pokemon/icons/tyranitar_icon.png differ diff --git a/graphics/pokemon/icons/tyrogue_icon.png b/graphics/pokemon/icons/tyrogue_icon.png new file mode 100644 index 000000000..10099d5cf Binary files /dev/null and b/graphics/pokemon/icons/tyrogue_icon.png differ diff --git a/graphics/pokemon/icons/umbreon_icon.png b/graphics/pokemon/icons/umbreon_icon.png new file mode 100644 index 000000000..8d8d867c2 Binary files /dev/null and b/graphics/pokemon/icons/umbreon_icon.png differ diff --git a/graphics/pokemon/icons/unown_B_icon.png b/graphics/pokemon/icons/unown_B_icon.png new file mode 100644 index 000000000..47654aba5 Binary files /dev/null and b/graphics/pokemon/icons/unown_B_icon.png differ diff --git a/graphics/pokemon/icons/unown_C_icon.png b/graphics/pokemon/icons/unown_C_icon.png new file mode 100644 index 000000000..7b8721a7d Binary files /dev/null and b/graphics/pokemon/icons/unown_C_icon.png differ diff --git a/graphics/pokemon/icons/unown_D_icon.png b/graphics/pokemon/icons/unown_D_icon.png new file mode 100644 index 000000000..db6b0cf8a Binary files /dev/null and b/graphics/pokemon/icons/unown_D_icon.png differ diff --git a/graphics/pokemon/icons/unown_E_icon.png b/graphics/pokemon/icons/unown_E_icon.png new file mode 100644 index 000000000..6addb828e Binary files /dev/null and b/graphics/pokemon/icons/unown_E_icon.png differ diff --git a/graphics/pokemon/icons/unown_F_icon.png b/graphics/pokemon/icons/unown_F_icon.png new file mode 100644 index 000000000..3c45017b1 Binary files /dev/null and b/graphics/pokemon/icons/unown_F_icon.png differ diff --git a/graphics/pokemon/icons/unown_G_icon.png b/graphics/pokemon/icons/unown_G_icon.png new file mode 100644 index 000000000..ab00f8ad2 Binary files /dev/null and b/graphics/pokemon/icons/unown_G_icon.png differ diff --git a/graphics/pokemon/icons/unown_H_icon.png b/graphics/pokemon/icons/unown_H_icon.png new file mode 100644 index 000000000..bd4fd96bf Binary files /dev/null and b/graphics/pokemon/icons/unown_H_icon.png differ diff --git a/graphics/pokemon/icons/unown_I_icon.png b/graphics/pokemon/icons/unown_I_icon.png new file mode 100644 index 000000000..6973196bb Binary files /dev/null and b/graphics/pokemon/icons/unown_I_icon.png differ diff --git a/graphics/pokemon/icons/unown_J_icon.png b/graphics/pokemon/icons/unown_J_icon.png new file mode 100644 index 000000000..b85a45a71 Binary files /dev/null and b/graphics/pokemon/icons/unown_J_icon.png differ diff --git a/graphics/pokemon/icons/unown_K_icon.png b/graphics/pokemon/icons/unown_K_icon.png new file mode 100644 index 000000000..81bcb385e Binary files /dev/null and b/graphics/pokemon/icons/unown_K_icon.png differ diff --git a/graphics/pokemon/icons/unown_L_icon.png b/graphics/pokemon/icons/unown_L_icon.png new file mode 100644 index 000000000..5f6fb9db8 Binary files /dev/null and b/graphics/pokemon/icons/unown_L_icon.png differ diff --git a/graphics/pokemon/icons/unown_M_icon.png b/graphics/pokemon/icons/unown_M_icon.png new file mode 100644 index 000000000..c9b8d0fb4 Binary files /dev/null and b/graphics/pokemon/icons/unown_M_icon.png differ diff --git a/graphics/pokemon/icons/unown_N_icon.png b/graphics/pokemon/icons/unown_N_icon.png new file mode 100644 index 000000000..b1e5c5abb Binary files /dev/null and b/graphics/pokemon/icons/unown_N_icon.png differ diff --git a/graphics/pokemon/icons/unown_O_icon.png b/graphics/pokemon/icons/unown_O_icon.png new file mode 100644 index 000000000..14a88d062 Binary files /dev/null and b/graphics/pokemon/icons/unown_O_icon.png differ diff --git a/graphics/pokemon/icons/unown_P_icon.png b/graphics/pokemon/icons/unown_P_icon.png new file mode 100644 index 000000000..7a7afb8de Binary files /dev/null and b/graphics/pokemon/icons/unown_P_icon.png differ diff --git a/graphics/pokemon/icons/unown_Q_icon.png b/graphics/pokemon/icons/unown_Q_icon.png new file mode 100644 index 000000000..2270f8373 Binary files /dev/null and b/graphics/pokemon/icons/unown_Q_icon.png differ diff --git a/graphics/pokemon/icons/unown_R_icon.png b/graphics/pokemon/icons/unown_R_icon.png new file mode 100644 index 000000000..6ba4d5764 Binary files /dev/null and b/graphics/pokemon/icons/unown_R_icon.png differ diff --git a/graphics/pokemon/icons/unown_S_icon.png b/graphics/pokemon/icons/unown_S_icon.png new file mode 100644 index 000000000..44f17718b Binary files /dev/null and b/graphics/pokemon/icons/unown_S_icon.png differ diff --git a/graphics/pokemon/icons/unown_T_icon.png b/graphics/pokemon/icons/unown_T_icon.png new file mode 100644 index 000000000..9023b7366 Binary files /dev/null and b/graphics/pokemon/icons/unown_T_icon.png differ diff --git a/graphics/pokemon/icons/unown_U_icon.png b/graphics/pokemon/icons/unown_U_icon.png new file mode 100644 index 000000000..3d315ebf2 Binary files /dev/null and b/graphics/pokemon/icons/unown_U_icon.png differ diff --git a/graphics/pokemon/icons/unown_V_icon.png b/graphics/pokemon/icons/unown_V_icon.png new file mode 100644 index 000000000..f973a3d85 Binary files /dev/null and b/graphics/pokemon/icons/unown_V_icon.png differ diff --git a/graphics/pokemon/icons/unown_W_icon.png b/graphics/pokemon/icons/unown_W_icon.png new file mode 100644 index 000000000..aabb0663e Binary files /dev/null and b/graphics/pokemon/icons/unown_W_icon.png differ diff --git a/graphics/pokemon/icons/unown_X_icon.png b/graphics/pokemon/icons/unown_X_icon.png new file mode 100644 index 000000000..b5be9e10b Binary files /dev/null and b/graphics/pokemon/icons/unown_X_icon.png differ diff --git a/graphics/pokemon/icons/unown_Y_icon.png b/graphics/pokemon/icons/unown_Y_icon.png new file mode 100644 index 000000000..8923810aa Binary files /dev/null and b/graphics/pokemon/icons/unown_Y_icon.png differ diff --git a/graphics/pokemon/icons/unown_Z_icon.png b/graphics/pokemon/icons/unown_Z_icon.png new file mode 100644 index 000000000..a14f73696 Binary files /dev/null and b/graphics/pokemon/icons/unown_Z_icon.png differ diff --git a/graphics/pokemon/icons/unown_a_icon.png b/graphics/pokemon/icons/unown_a_icon.png new file mode 100644 index 000000000..cd9056ab2 Binary files /dev/null and b/graphics/pokemon/icons/unown_a_icon.png differ diff --git a/graphics/pokemon/icons/unown_exclamation_mark_icon.png b/graphics/pokemon/icons/unown_exclamation_mark_icon.png new file mode 100644 index 000000000..beeea4ae1 Binary files /dev/null and b/graphics/pokemon/icons/unown_exclamation_mark_icon.png differ diff --git a/graphics/pokemon/icons/unown_question_mark_icon.png b/graphics/pokemon/icons/unown_question_mark_icon.png new file mode 100644 index 000000000..a9bb50930 Binary files /dev/null and b/graphics/pokemon/icons/unown_question_mark_icon.png differ diff --git a/graphics/pokemon/icons/ursaring_icon.png b/graphics/pokemon/icons/ursaring_icon.png new file mode 100644 index 000000000..143353f31 Binary files /dev/null and b/graphics/pokemon/icons/ursaring_icon.png differ diff --git a/graphics/pokemon/icons/vaporeon_icon.png b/graphics/pokemon/icons/vaporeon_icon.png new file mode 100644 index 000000000..d4003c2a8 Binary files /dev/null and b/graphics/pokemon/icons/vaporeon_icon.png differ diff --git a/graphics/pokemon/icons/venomoth_icon.png b/graphics/pokemon/icons/venomoth_icon.png new file mode 100644 index 000000000..d77b6dce8 Binary files /dev/null and b/graphics/pokemon/icons/venomoth_icon.png differ diff --git a/graphics/pokemon/icons/venonat_icon.png b/graphics/pokemon/icons/venonat_icon.png new file mode 100644 index 000000000..a2ed54b71 Binary files /dev/null and b/graphics/pokemon/icons/venonat_icon.png differ diff --git a/graphics/pokemon/icons/venusaur_icon.png b/graphics/pokemon/icons/venusaur_icon.png new file mode 100644 index 000000000..fbd5380f5 Binary files /dev/null and b/graphics/pokemon/icons/venusaur_icon.png differ diff --git a/graphics/pokemon/icons/vibrava_icon.png b/graphics/pokemon/icons/vibrava_icon.png new file mode 100644 index 000000000..422ea2359 Binary files /dev/null and b/graphics/pokemon/icons/vibrava_icon.png differ diff --git a/graphics/pokemon/icons/victreebel_icon.png b/graphics/pokemon/icons/victreebel_icon.png new file mode 100644 index 000000000..49298177e Binary files /dev/null and b/graphics/pokemon/icons/victreebel_icon.png differ diff --git a/graphics/pokemon/icons/vigoroth_icon.png b/graphics/pokemon/icons/vigoroth_icon.png new file mode 100644 index 000000000..f8808cde3 Binary files /dev/null and b/graphics/pokemon/icons/vigoroth_icon.png differ diff --git a/graphics/pokemon/icons/vileplume_icon.png b/graphics/pokemon/icons/vileplume_icon.png new file mode 100644 index 000000000..7009048c5 Binary files /dev/null and b/graphics/pokemon/icons/vileplume_icon.png differ diff --git a/graphics/pokemon/icons/volbeat_icon.png b/graphics/pokemon/icons/volbeat_icon.png new file mode 100644 index 000000000..849715d33 Binary files /dev/null and b/graphics/pokemon/icons/volbeat_icon.png differ diff --git a/graphics/pokemon/icons/voltorb_icon.png b/graphics/pokemon/icons/voltorb_icon.png new file mode 100644 index 000000000..53d318fdb Binary files /dev/null and b/graphics/pokemon/icons/voltorb_icon.png differ diff --git a/graphics/pokemon/icons/vulpix_icon.png b/graphics/pokemon/icons/vulpix_icon.png new file mode 100644 index 000000000..d998362d1 Binary files /dev/null and b/graphics/pokemon/icons/vulpix_icon.png differ diff --git a/graphics/pokemon/icons/wailmer_icon.png b/graphics/pokemon/icons/wailmer_icon.png new file mode 100644 index 000000000..16ba6d4b9 Binary files /dev/null and b/graphics/pokemon/icons/wailmer_icon.png differ diff --git a/graphics/pokemon/icons/wailord_icon.png b/graphics/pokemon/icons/wailord_icon.png new file mode 100644 index 000000000..f84a7ea70 Binary files /dev/null and b/graphics/pokemon/icons/wailord_icon.png differ diff --git a/graphics/pokemon/icons/walrein_icon.png b/graphics/pokemon/icons/walrein_icon.png new file mode 100644 index 000000000..f98348a54 Binary files /dev/null and b/graphics/pokemon/icons/walrein_icon.png differ diff --git a/graphics/pokemon/icons/wartortle_icon.png b/graphics/pokemon/icons/wartortle_icon.png new file mode 100644 index 000000000..2cdfca2d9 Binary files /dev/null and b/graphics/pokemon/icons/wartortle_icon.png differ diff --git a/graphics/pokemon/icons/weedle_icon.png b/graphics/pokemon/icons/weedle_icon.png new file mode 100644 index 000000000..3a36001c6 Binary files /dev/null and b/graphics/pokemon/icons/weedle_icon.png differ diff --git a/graphics/pokemon/icons/weepinbell_icon.png b/graphics/pokemon/icons/weepinbell_icon.png new file mode 100644 index 000000000..eda2fd29a Binary files /dev/null and b/graphics/pokemon/icons/weepinbell_icon.png differ diff --git a/graphics/pokemon/icons/weezing_icon.png b/graphics/pokemon/icons/weezing_icon.png new file mode 100644 index 000000000..4ef2404a9 Binary files /dev/null and b/graphics/pokemon/icons/weezing_icon.png differ diff --git a/graphics/pokemon/icons/whiscash_icon.png b/graphics/pokemon/icons/whiscash_icon.png new file mode 100644 index 000000000..dcd79a540 Binary files /dev/null and b/graphics/pokemon/icons/whiscash_icon.png differ diff --git a/graphics/pokemon/icons/whismur_icon.png b/graphics/pokemon/icons/whismur_icon.png new file mode 100644 index 000000000..573dfa531 Binary files /dev/null and b/graphics/pokemon/icons/whismur_icon.png differ diff --git a/graphics/pokemon/icons/wigglytuff_icon.png b/graphics/pokemon/icons/wigglytuff_icon.png new file mode 100644 index 000000000..adb921150 Binary files /dev/null and b/graphics/pokemon/icons/wigglytuff_icon.png differ diff --git a/graphics/pokemon/icons/wingull_icon.png b/graphics/pokemon/icons/wingull_icon.png new file mode 100644 index 000000000..524ecda23 Binary files /dev/null and b/graphics/pokemon/icons/wingull_icon.png differ diff --git a/graphics/pokemon/icons/wobbuffet_icon.png b/graphics/pokemon/icons/wobbuffet_icon.png new file mode 100644 index 000000000..14cddd184 Binary files /dev/null and b/graphics/pokemon/icons/wobbuffet_icon.png differ diff --git a/graphics/pokemon/icons/wooper_icon.png b/graphics/pokemon/icons/wooper_icon.png new file mode 100644 index 000000000..26e617d33 Binary files /dev/null and b/graphics/pokemon/icons/wooper_icon.png differ diff --git a/graphics/pokemon/icons/wurmple_icon.png b/graphics/pokemon/icons/wurmple_icon.png new file mode 100644 index 000000000..52b46b490 Binary files /dev/null and b/graphics/pokemon/icons/wurmple_icon.png differ diff --git a/graphics/pokemon/icons/wynaut_icon.png b/graphics/pokemon/icons/wynaut_icon.png new file mode 100644 index 000000000..cca26e1bb Binary files /dev/null and b/graphics/pokemon/icons/wynaut_icon.png differ diff --git a/graphics/pokemon/icons/xatu_icon.png b/graphics/pokemon/icons/xatu_icon.png new file mode 100644 index 000000000..a0e6d6fc9 Binary files /dev/null and b/graphics/pokemon/icons/xatu_icon.png differ diff --git a/graphics/pokemon/icons/yanma_icon.png b/graphics/pokemon/icons/yanma_icon.png new file mode 100644 index 000000000..336841a00 Binary files /dev/null and b/graphics/pokemon/icons/yanma_icon.png differ diff --git a/graphics/pokemon/icons/zangoose_icon.png b/graphics/pokemon/icons/zangoose_icon.png new file mode 100644 index 000000000..e0485b0b0 Binary files /dev/null and b/graphics/pokemon/icons/zangoose_icon.png differ diff --git a/graphics/pokemon/icons/zapdos_icon.png b/graphics/pokemon/icons/zapdos_icon.png new file mode 100644 index 000000000..26fc73427 Binary files /dev/null and b/graphics/pokemon/icons/zapdos_icon.png differ diff --git a/graphics/pokemon/icons/zigzagoon_icon.png b/graphics/pokemon/icons/zigzagoon_icon.png new file mode 100644 index 000000000..acd0ecc8c Binary files /dev/null and b/graphics/pokemon/icons/zigzagoon_icon.png differ diff --git a/graphics/pokemon/icons/zubat_icon.png b/graphics/pokemon/icons/zubat_icon.png new file mode 100644 index 000000000..696c097e1 Binary files /dev/null and b/graphics/pokemon/icons/zubat_icon.png differ diff --git a/graphics/pokemon/palettes/abra_palette.pal b/graphics/pokemon/palettes/abra_palette.pal new file mode 100644 index 000000000..b66db0279 --- /dev/null +++ b/graphics/pokemon/palettes/abra_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +246 246 246 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +213 180 82 +172 131 41 +148 106 16 +98 49 0 +255 0 255 +255 0 255 +246 246 164 +255 238 41 +222 205 32 +131 90 16 +16 16 16 diff --git a/graphics/pokemon/palettes/abra_shiny_palette.pal b/graphics/pokemon/palettes/abra_shiny_palette.pal new file mode 100644 index 000000000..9b3ebe682 --- /dev/null +++ b/graphics/pokemon/palettes/abra_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 197 148 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +230 139 164 +205 115 148 +131 82 98 +98 65 82 +255 0 255 +255 0 255 +255 246 115 +255 222 90 +238 180 49 +115 74 49 +16 16 16 diff --git a/graphics/pokemon/palettes/absol_palette.pal b/graphics/pokemon/palettes/absol_palette.pal new file mode 100644 index 000000000..990038917 --- /dev/null +++ b/graphics/pokemon/palettes/absol_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +123 156 180 +255 255 255 +222 222 238 +197 197 213 +148 148 172 +255 123 115 +205 41 32 +123 41 49 +172 172 205 +131 131 172 +90 90 131 +41 57 57 +148 164 164 +115 131 131 +82 98 98 +0 0 0 diff --git a/graphics/pokemon/palettes/absol_shiny_palette.pal b/graphics/pokemon/palettes/absol_shiny_palette.pal new file mode 100644 index 000000000..4b86195a7 --- /dev/null +++ b/graphics/pokemon/palettes/absol_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +123 156 180 +255 255 255 +238 222 230 +222 189 213 +197 156 189 +49 180 255 +0 115 189 +123 41 49 +172 172 205 +131 131 172 +90 90 131 +41 57 57 +205 115 98 +172 82 65 +131 41 24 +0 0 0 diff --git a/graphics/pokemon/palettes/aerodactyl_palette.pal b/graphics/pokemon/palettes/aerodactyl_palette.pal new file mode 100644 index 000000000..9f7de3d61 --- /dev/null +++ b/graphics/pokemon/palettes/aerodactyl_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +156 213 180 +255 0 255 +255 0 255 +255 0 255 +189 131 197 +148 98 180 +98 74 148 +74 49 98 +222 98 98 +139 49 49 +16 16 16 +230 222 238 +205 205 222 +148 172 180 +74 98 82 +255 255 255 diff --git a/graphics/pokemon/palettes/aerodactyl_shiny_palette.pal b/graphics/pokemon/palettes/aerodactyl_shiny_palette.pal new file mode 100644 index 000000000..d661e6154 --- /dev/null +++ b/graphics/pokemon/palettes/aerodactyl_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +213 213 189 +255 0 255 +255 0 255 +255 0 255 +98 148 255 +65 115 230 +16 82 180 +24 24 106 +222 98 98 +139 49 49 +16 16 16 +246 197 238 +230 164 222 +180 123 180 +123 57 131 +255 255 255 diff --git a/graphics/pokemon/palettes/aggron_palette.pal b/graphics/pokemon/palettes/aggron_palette.pal new file mode 100644 index 000000000..b5711fdad --- /dev/null +++ b/graphics/pokemon/palettes/aggron_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +148 172 156 +74 74 65 +106 106 106 +139 139 139 +172 172 172 +57 57 65 +123 106 106 +156 139 139 +189 172 172 +222 205 205 +255 255 255 +172 57 74 +222 106 106 +255 131 131 +106 189 255 +0 0 0 diff --git a/graphics/pokemon/palettes/aggron_shiny_palette.pal b/graphics/pokemon/palettes/aggron_shiny_palette.pal new file mode 100644 index 000000000..eadb9aa81 --- /dev/null +++ b/graphics/pokemon/palettes/aggron_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +148 172 156 +32 90 90 +65 123 115 +90 156 148 +148 197 205 +74 41 24 +123 123 90 +156 156 123 +189 189 156 +222 222 197 +255 255 255 +172 57 74 +222 106 106 +255 131 131 +255 123 82 +0 0 0 diff --git a/graphics/pokemon/palettes/aipom_palette.pal b/graphics/pokemon/palettes/aipom_palette.pal new file mode 100644 index 000000000..bc79b2a2a --- /dev/null +++ b/graphics/pokemon/palettes/aipom_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +205 205 172 +255 255 255 +213 131 255 +180 98 230 +139 57 180 +82 32 106 +255 246 197 +255 238 164 +238 197 90 +197 156 82 +139 106 65 +255 0 255 +213 213 213 +123 123 123 +90 90 90 +0 0 0 diff --git a/graphics/pokemon/palettes/aipom_shiny_palette.pal b/graphics/pokemon/palettes/aipom_shiny_palette.pal new file mode 100644 index 000000000..785e324ab --- /dev/null +++ b/graphics/pokemon/palettes/aipom_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +205 205 172 +255 255 255 +255 131 164 +230 98 139 +189 57 106 +115 32 65 +255 238 230 +255 222 213 +238 189 180 +222 123 131 +189 82 90 +255 0 255 +213 213 213 +123 123 123 +90 90 90 +16 16 16 diff --git a/graphics/pokemon/palettes/alakazam_palette.pal b/graphics/pokemon/palettes/alakazam_palette.pal new file mode 100644 index 000000000..a02bea0db --- /dev/null +++ b/graphics/pokemon/palettes/alakazam_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +230 230 230 +255 255 255 +222 222 222 +180 180 180 +90 90 90 +213 180 82 +180 131 41 +131 90 8 +82 49 8 +255 0 255 +255 0 255 +255 246 172 +255 238 41 +222 197 24 +123 106 16 +16 16 16 diff --git a/graphics/pokemon/palettes/alakazam_shiny_palette.pal b/graphics/pokemon/palettes/alakazam_shiny_palette.pal new file mode 100644 index 000000000..083ce6897 --- /dev/null +++ b/graphics/pokemon/palettes/alakazam_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +230 230 230 +255 255 255 +222 222 222 +180 180 180 +90 90 90 +230 123 189 +189 82 148 +131 41 106 +82 0 41 +255 0 255 +255 0 255 +255 205 74 +213 172 0 +172 115 0 +123 32 0 +16 16 16 diff --git a/graphics/pokemon/palettes/altaria_palette.pal b/graphics/pokemon/palettes/altaria_palette.pal new file mode 100644 index 000000000..d7af0b531 --- /dev/null +++ b/graphics/pokemon/palettes/altaria_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 205 139 +255 255 255 +131 131 148 +197 197 213 +255 164 131 +255 98 65 +131 32 8 +172 213 255 +115 180 238 +98 139 197 +65 106 156 +238 246 255 +222 222 238 +172 180 197 +41 57 90 +0 0 0 diff --git a/graphics/pokemon/palettes/altaria_shiny_palette.pal b/graphics/pokemon/palettes/altaria_shiny_palette.pal new file mode 100644 index 000000000..0ebea146a --- /dev/null +++ b/graphics/pokemon/palettes/altaria_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 205 139 +255 255 255 +131 131 148 +197 197 213 +255 164 131 +255 98 65 +131 32 8 +255 238 131 +255 205 98 +222 172 65 +156 106 0 +238 246 255 +222 222 238 +172 180 197 +123 74 0 +0 0 0 diff --git a/graphics/pokemon/palettes/ampharos_palette.pal b/graphics/pokemon/palettes/ampharos_palette.pal new file mode 100644 index 000000000..f7fdd3683 --- /dev/null +++ b/graphics/pokemon/palettes/ampharos_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +205 205 172 +255 255 255 +255 238 74 +255 197 16 +213 148 0 +148 74 0 +255 0 255 +230 230 230 +172 172 172 +98 106 106 +16 16 16 +255 98 0 +197 65 0 +139 32 0 +90 0 0 +255 0 255 diff --git a/graphics/pokemon/palettes/ampharos_shiny_palette.pal b/graphics/pokemon/palettes/ampharos_shiny_palette.pal new file mode 100644 index 000000000..f29dc710f --- /dev/null +++ b/graphics/pokemon/palettes/ampharos_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +205 205 172 +255 255 255 +246 180 213 +213 148 180 +189 115 156 +139 82 106 +255 0 255 +230 230 230 +172 172 172 +98 106 106 +16 16 16 +131 205 246 +65 106 205 +32 65 156 +49 74 139 +255 0 255 diff --git a/graphics/pokemon/palettes/anorith_palette.pal b/graphics/pokemon/palettes/anorith_palette.pal new file mode 100644 index 000000000..01bb5c13f --- /dev/null +++ b/graphics/pokemon/palettes/anorith_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +205 205 172 +255 255 255 +172 205 172 +139 172 139 +115 139 115 +90 115 90 +246 238 197 +230 205 148 +197 164 98 +148 82 74 +255 123 82 +222 82 32 +222 222 222 +180 180 189 +106 106 123 +0 0 0 diff --git a/graphics/pokemon/palettes/anorith_shiny_palette.pal b/graphics/pokemon/palettes/anorith_shiny_palette.pal new file mode 100644 index 000000000..dc1fe0374 --- /dev/null +++ b/graphics/pokemon/palettes/anorith_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +205 205 172 +255 255 255 +255 213 172 +230 180 139 +197 148 106 +164 115 74 +246 238 197 +230 205 148 +197 164 98 +131 90 32 +255 82 74 +222 82 32 +222 222 222 +180 180 189 +106 106 123 +41 41 57 diff --git a/graphics/pokemon/palettes/arbok_palette.pal b/graphics/pokemon/palettes/arbok_palette.pal new file mode 100644 index 000000000..bd25500f3 --- /dev/null +++ b/graphics/pokemon/palettes/arbok_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +213 213 180 +255 230 16 +230 197 24 +222 156 65 +255 172 131 +230 106 65 +197 65 24 +156 32 65 +16 16 16 +222 164 197 +189 131 172 +148 90 131 +98 57 90 +255 0 255 +205 205 205 +255 255 255 diff --git a/graphics/pokemon/palettes/arbok_shiny_palette.pal b/graphics/pokemon/palettes/arbok_shiny_palette.pal new file mode 100644 index 000000000..6c88ffb42 --- /dev/null +++ b/graphics/pokemon/palettes/arbok_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +213 213 180 +255 255 74 +238 222 24 +189 172 16 +180 197 230 +148 164 197 +106 123 156 +49 65 98 +16 16 16 +222 180 65 +180 139 24 +139 98 24 +98 57 0 +255 0 255 +205 205 205 +255 255 255 diff --git a/graphics/pokemon/palettes/arcanine_palette.pal b/graphics/pokemon/palettes/arcanine_palette.pal new file mode 100644 index 000000000..b6d54296e --- /dev/null +++ b/graphics/pokemon/palettes/arcanine_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +230 230 230 +255 255 246 +222 222 213 +131 106 98 +255 98 65 +197 49 32 +82 16 16 +255 255 197 +255 246 148 +238 197 115 +172 98 32 +255 156 106 +238 115 49 +197 82 74 +98 16 0 +16 16 16 diff --git a/graphics/pokemon/palettes/arcanine_shiny_palette.pal b/graphics/pokemon/palettes/arcanine_shiny_palette.pal new file mode 100644 index 000000000..99edcb435 --- /dev/null +++ b/graphics/pokemon/palettes/arcanine_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +230 230 230 +255 255 246 +222 222 213 +90 90 90 +255 98 65 +197 49 32 +82 16 16 +255 246 238 +255 238 197 +230 197 156 +148 115 82 +255 230 115 +222 189 74 +180 148 32 +115 82 0 +16 16 16 diff --git a/graphics/pokemon/palettes/ariados_palette.pal b/graphics/pokemon/palettes/ariados_palette.pal new file mode 100644 index 000000000..ccf5f7fe7 --- /dev/null +++ b/graphics/pokemon/palettes/ariados_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +205 205 172 +255 255 255 +255 172 57 +255 123 41 +205 82 0 +139 32 0 +74 0 0 +255 238 90 +222 180 74 +148 115 49 +189 148 255 +148 90 238 +106 49 172 +189 189 189 +106 106 106 +16 16 16 diff --git a/graphics/pokemon/palettes/ariados_shiny_palette.pal b/graphics/pokemon/palettes/ariados_shiny_palette.pal new file mode 100644 index 000000000..c2557b589 --- /dev/null +++ b/graphics/pokemon/palettes/ariados_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +205 205 172 +255 255 255 +238 139 189 +205 106 164 +139 65 123 +115 16 82 +82 8 49 +255 238 90 +222 180 74 +148 115 49 +148 213 255 +98 164 230 +32 82 180 +189 189 189 +106 106 106 +16 16 16 diff --git a/graphics/pokemon/palettes/armaldo_palette.pal b/graphics/pokemon/palettes/armaldo_palette.pal new file mode 100644 index 000000000..a6fc406b3 --- /dev/null +++ b/graphics/pokemon/palettes/armaldo_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +205 205 172 +255 255 255 +189 189 222 +139 139 189 +115 115 172 +90 90 139 +246 238 197 +255 222 106 +222 180 98 +57 65 82 +255 98 74 +189 57 0 +222 222 222 +180 180 189 +106 106 123 +0 0 0 diff --git a/graphics/pokemon/palettes/armaldo_shiny_palette.pal b/graphics/pokemon/palettes/armaldo_shiny_palette.pal new file mode 100644 index 000000000..e6d09d611 --- /dev/null +++ b/graphics/pokemon/palettes/armaldo_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +205 205 172 +255 255 255 +246 197 189 +213 164 156 +180 131 123 +148 98 90 +246 238 197 +255 222 106 +222 180 98 +115 65 57 +255 98 74 +189 57 0 +222 222 222 +222 98 82 +180 57 41 +0 0 0 diff --git a/graphics/pokemon/palettes/aron_palette.pal b/graphics/pokemon/palettes/aron_palette.pal new file mode 100644 index 000000000..b5711fdad --- /dev/null +++ b/graphics/pokemon/palettes/aron_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +148 172 156 +74 74 65 +106 106 106 +139 139 139 +172 172 172 +57 57 65 +123 106 106 +156 139 139 +189 172 172 +222 205 205 +255 255 255 +172 57 74 +222 106 106 +255 131 131 +106 189 255 +0 0 0 diff --git a/graphics/pokemon/palettes/aron_shiny_palette.pal b/graphics/pokemon/palettes/aron_shiny_palette.pal new file mode 100644 index 000000000..eadb9aa81 --- /dev/null +++ b/graphics/pokemon/palettes/aron_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +148 172 156 +32 90 90 +65 123 115 +90 156 148 +148 197 205 +74 41 24 +123 123 90 +156 156 123 +189 189 156 +222 222 197 +255 255 255 +172 57 74 +222 106 106 +255 131 131 +255 123 82 +0 0 0 diff --git a/graphics/pokemon/palettes/articuno_palette.pal b/graphics/pokemon/palettes/articuno_palette.pal new file mode 100644 index 000000000..a4cba7de4 --- /dev/null +++ b/graphics/pokemon/palettes/articuno_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +213 213 189 +213 238 255 +197 205 255 +139 180 230 +98 148 205 +57 106 164 +74 74 106 +255 0 255 +255 0 255 +156 172 197 +123 139 164 +98 115 131 +189 41 57 +230 98 115 +16 16 16 +255 255 255 diff --git a/graphics/pokemon/palettes/articuno_shiny_palette.pal b/graphics/pokemon/palettes/articuno_shiny_palette.pal new file mode 100644 index 000000000..bda666847 --- /dev/null +++ b/graphics/pokemon/palettes/articuno_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +213 213 189 +255 255 255 +238 246 255 +205 230 255 +156 189 246 +98 148 213 +82 106 156 +255 0 255 +255 0 255 +139 164 213 +90 115 164 +74 74 106 +189 41 57 +230 98 115 +16 16 16 +255 255 255 diff --git a/graphics/pokemon/palettes/azumarill_palette.pal b/graphics/pokemon/palettes/azumarill_palette.pal new file mode 100644 index 000000000..429d3fecc --- /dev/null +++ b/graphics/pokemon/palettes/azumarill_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +205 205 172 +255 255 255 +205 205 205 +156 156 156 +106 106 106 +16 16 16 +131 205 255 +90 172 230 +49 131 197 +74 74 131 +255 0 255 +255 0 255 +230 82 0 +197 41 0 +123 0 0 +255 0 255 diff --git a/graphics/pokemon/palettes/azumarill_shiny_palette.pal b/graphics/pokemon/palettes/azumarill_shiny_palette.pal new file mode 100644 index 000000000..5f185cecb --- /dev/null +++ b/graphics/pokemon/palettes/azumarill_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +205 205 172 +255 255 255 +205 205 205 +156 156 156 +106 106 106 +16 16 16 +255 238 82 +255 213 57 +213 172 24 +131 90 41 +255 0 255 +255 0 255 +238 74 65 +197 24 57 +123 0 0 +255 0 255 diff --git a/graphics/pokemon/palettes/azurill_palette.pal b/graphics/pokemon/palettes/azurill_palette.pal new file mode 100644 index 000000000..44214498f --- /dev/null +++ b/graphics/pokemon/palettes/azurill_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 255 255 +49 65 90 +106 148 255 +74 115 255 +156 189 255 +123 123 148 +238 123 115 +189 74 65 +57 90 189 +222 98 90 +222 238 255 +90 131 246 +57 90 148 +255 255 255 +255 255 255 +0 0 0 diff --git a/graphics/pokemon/palettes/azurill_shiny_palette.pal b/graphics/pokemon/palettes/azurill_shiny_palette.pal new file mode 100644 index 000000000..bbc8d2f29 --- /dev/null +++ b/graphics/pokemon/palettes/azurill_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +156 189 255 +32 106 82 +148 230 148 +90 180 123 +205 255 172 +255 0 255 +222 98 49 +180 65 49 +65 156 98 +222 98 90 +222 238 255 +123 205 131 +255 0 255 +255 255 255 +255 255 255 +0 0 0 diff --git a/graphics/pokemon/palettes/bagon_palette.pal b/graphics/pokemon/palettes/bagon_palette.pal new file mode 100644 index 000000000..c71cdb94b --- /dev/null +++ b/graphics/pokemon/palettes/bagon_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +197 197 98 +74 74 98 +123 115 148 +123 123 222 +172 172 255 +197 131 98 +255 148 98 +255 148 98 +131 148 148 +172 164 189 +222 213 238 +255 255 255 +0 0 0 +0 0 0 +255 255 255 +24 24 24 diff --git a/graphics/pokemon/palettes/bagon_shiny_palette.pal b/graphics/pokemon/palettes/bagon_shiny_palette.pal new file mode 100644 index 000000000..6cd8ce5ea --- /dev/null +++ b/graphics/pokemon/palettes/bagon_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +197 197 98 +16 98 32 +98 156 106 +98 197 98 +148 230 148 +197 131 98 +255 148 98 +255 148 98 +131 148 148 +172 164 189 +222 213 238 +255 255 255 +0 0 0 +0 0 0 +255 255 255 +41 41 41 diff --git a/graphics/pokemon/palettes/baltoy_palette.pal b/graphics/pokemon/palettes/baltoy_palette.pal new file mode 100644 index 000000000..335657267 --- /dev/null +++ b/graphics/pokemon/palettes/baltoy_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 255 255 +98 82 82 +131 131 98 +255 255 255 +156 164 65 +197 197 98 +230 230 172 +222 65 98 +246 148 82 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 255 0 diff --git a/graphics/pokemon/palettes/baltoy_shiny_palette.pal b/graphics/pokemon/palettes/baltoy_shiny_palette.pal new file mode 100644 index 000000000..39cfa55ad --- /dev/null +++ b/graphics/pokemon/palettes/baltoy_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 255 255 +98 82 82 +131 131 98 +255 255 255 +205 180 57 +246 222 98 +230 230 172 +90 172 106 +115 189 172 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 255 0 diff --git a/graphics/pokemon/palettes/banette_palette.pal b/graphics/pokemon/palettes/banette_palette.pal new file mode 100644 index 000000000..cebcb7757 --- /dev/null +++ b/graphics/pokemon/palettes/banette_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +213 230 213 +255 255 255 +255 255 49 +230 164 24 +255 189 49 +230 49 49 +222 123 49 +189 90 16 +131 65 41 +255 255 49 +255 255 49 +189 189 205 +148 148 172 +115 115 139 +74 74 98 +0 0 0 diff --git a/graphics/pokemon/palettes/banette_shiny_palette.pal b/graphics/pokemon/palettes/banette_shiny_palette.pal new file mode 100644 index 000000000..b6df68803 --- /dev/null +++ b/graphics/pokemon/palettes/banette_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +213 230 213 +255 255 255 +255 255 49 +230 164 24 +255 189 49 +230 49 49 +222 123 49 +189 90 16 +131 65 41 +255 255 49 +255 255 49 +189 205 238 +139 172 205 +90 148 172 +32 82 123 +0 0 0 diff --git a/graphics/pokemon/palettes/barboach_palette.pal b/graphics/pokemon/palettes/barboach_palette.pal new file mode 100644 index 000000000..20167a557 --- /dev/null +++ b/graphics/pokemon/palettes/barboach_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +164 156 90 +57 65 82 +115 115 131 +164 164 172 +189 189 197 +213 213 222 +238 246 246 +0 0 0 +197 222 238 +255 189 41 +74 90 156 +90 106 180 +90 115 205 +139 164 222 +164 197 255 +255 255 255 diff --git a/graphics/pokemon/palettes/barboach_shiny_palette.pal b/graphics/pokemon/palettes/barboach_shiny_palette.pal new file mode 100644 index 000000000..e29a02099 --- /dev/null +++ b/graphics/pokemon/palettes/barboach_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +164 156 90 +57 65 82 +115 115 131 +164 164 172 +189 189 197 +213 213 222 +238 246 246 +0 0 0 +255 246 123 +255 189 41 +131 82 0 +164 115 0 +197 148 24 +230 180 57 +255 213 90 +255 255 255 diff --git a/graphics/pokemon/palettes/bayleef_palette.pal b/graphics/pokemon/palettes/bayleef_palette.pal new file mode 100644 index 000000000..9fce32009 --- /dev/null +++ b/graphics/pokemon/palettes/bayleef_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +205 205 172 +255 255 255 +255 255 172 +246 238 106 +222 189 41 +164 131 24 +106 82 0 +106 197 49 +74 164 16 +49 123 8 +16 82 16 +197 197 197 +98 98 98 +16 16 16 +213 139 82 +172 49 0 diff --git a/graphics/pokemon/palettes/bayleef_shiny_palette.pal b/graphics/pokemon/palettes/bayleef_shiny_palette.pal new file mode 100644 index 000000000..573c02e75 --- /dev/null +++ b/graphics/pokemon/palettes/bayleef_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +205 205 172 +255 255 255 +255 238 197 +255 213 180 +230 156 123 +189 98 65 +123 74 57 +230 189 49 +189 148 24 +123 98 8 +82 65 16 +197 197 197 +98 98 98 +16 16 16 +222 156 115 +172 57 57 diff --git a/graphics/pokemon/palettes/beautifly_palette.pal b/graphics/pokemon/palettes/beautifly_palette.pal new file mode 100644 index 000000000..65a02145f --- /dev/null +++ b/graphics/pokemon/palettes/beautifly_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +148 197 246 +90 90 82 +139 139 123 +255 255 255 +172 172 106 +230 222 115 +255 255 49 +255 255 197 +156 156 115 +197 197 115 +238 238 180 +255 255 238 +0 0 0 +255 148 41 +156 131 255 +24 24 0 diff --git a/graphics/pokemon/palettes/beautifly_shiny_palette.pal b/graphics/pokemon/palettes/beautifly_shiny_palette.pal new file mode 100644 index 000000000..9f0418187 --- /dev/null +++ b/graphics/pokemon/palettes/beautifly_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +148 197 246 +90 24 65 +156 65 131 +255 255 255 +172 148 106 +246 238 148 +255 255 213 +255 255 197 +197 156 115 +230 197 115 +255 238 180 +255 255 238 +0 0 0 +255 148 41 +156 131 255 +24 24 0 diff --git a/graphics/pokemon/palettes/beedrill_palette.pal b/graphics/pokemon/palettes/beedrill_palette.pal new file mode 100644 index 000000000..52fe8ac7a --- /dev/null +++ b/graphics/pokemon/palettes/beedrill_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +205 205 172 +255 255 255 +255 246 164 +255 222 74 +222 180 57 +139 115 0 +238 230 255 +222 205 246 +189 172 197 +164 148 172 +255 148 106 +205 49 82 +156 0 8 +98 98 98 +24 24 24 +255 0 255 diff --git a/graphics/pokemon/palettes/beedrill_shiny_palette.pal b/graphics/pokemon/palettes/beedrill_shiny_palette.pal new file mode 100644 index 000000000..f35f264de --- /dev/null +++ b/graphics/pokemon/palettes/beedrill_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +205 205 172 +255 255 255 +230 246 106 +189 205 65 +148 164 24 +74 90 0 +238 230 255 +222 205 246 +189 172 197 +164 148 172 +90 139 222 +49 98 180 +0 0 115 +98 98 98 +24 24 24 +255 0 255 diff --git a/graphics/pokemon/palettes/beldum_palette.pal b/graphics/pokemon/palettes/beldum_palette.pal new file mode 100644 index 000000000..41b48bc08 --- /dev/null +++ b/graphics/pokemon/palettes/beldum_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +49 164 82 +205 205 205 +172 172 172 +148 139 148 +115 106 115 +222 222 222 +131 74 74 +255 106 106 +213 74 82 +131 205 255 +255 255 255 +90 164 255 +74 131 213 +57 98 180 +49 57 115 +16 16 16 diff --git a/graphics/pokemon/palettes/beldum_shiny_palette.pal b/graphics/pokemon/palettes/beldum_shiny_palette.pal new file mode 100644 index 000000000..8fc3bc4be --- /dev/null +++ b/graphics/pokemon/palettes/beldum_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +49 164 82 +238 172 82 +205 139 49 +172 106 16 +139 74 0 +255 205 115 +156 65 65 +255 106 106 +255 74 82 +238 238 246 +255 255 255 +213 213 222 +164 164 172 +115 106 115 +82 74 82 +16 16 16 diff --git a/graphics/pokemon/palettes/bellossom_palette.pal b/graphics/pokemon/palettes/bellossom_palette.pal new file mode 100644 index 000000000..7b0591a62 --- /dev/null +++ b/graphics/pokemon/palettes/bellossom_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +205 205 172 +255 255 255 +156 213 74 +115 172 49 +82 98 41 +230 230 106 +180 180 57 +131 131 24 +82 197 49 +57 139 0 +16 90 16 +246 106 0 +213 32 0 +131 0 0 +164 164 164 +16 16 16 diff --git a/graphics/pokemon/palettes/bellossom_shiny_palette.pal b/graphics/pokemon/palettes/bellossom_shiny_palette.pal new file mode 100644 index 000000000..1f10af6fb --- /dev/null +++ b/graphics/pokemon/palettes/bellossom_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +205 205 172 +255 255 255 +222 156 255 +189 123 230 +123 65 180 +213 246 90 +164 197 41 +98 139 8 +90 205 131 +49 148 98 +32 82 74 +255 131 172 +205 49 106 +148 24 82 +164 164 164 +16 16 16 diff --git a/graphics/pokemon/palettes/bellsprout_palette.pal b/graphics/pokemon/palettes/bellsprout_palette.pal new file mode 100644 index 000000000..8a91d8f8e --- /dev/null +++ b/graphics/pokemon/palettes/bellsprout_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +213 213 180 +246 255 189 +82 98 41 +255 172 131 +238 115 65 +189 65 32 +255 238 115 +222 197 115 +197 148 41 +189 238 131 +156 213 74 +115 172 49 +205 156 41 +156 115 32 +106 65 0 +16 16 16 diff --git a/graphics/pokemon/palettes/bellsprout_shiny_palette.pal b/graphics/pokemon/palettes/bellsprout_shiny_palette.pal new file mode 100644 index 000000000..6a813078f --- /dev/null +++ b/graphics/pokemon/palettes/bellsprout_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +213 213 180 +255 255 255 +82 98 41 +222 189 189 +180 148 148 +139 106 106 +255 246 98 +222 205 57 +180 164 16 +246 213 82 +205 172 41 +164 131 0 +205 156 41 +156 115 32 +106 65 0 +16 16 16 diff --git a/graphics/pokemon/palettes/blastoise_palette.pal b/graphics/pokemon/palettes/blastoise_palette.pal new file mode 100644 index 000000000..694eb3675 --- /dev/null +++ b/graphics/pokemon/palettes/blastoise_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +139 205 164 +255 255 255 +222 213 213 +148 164 164 +106 74 49 +172 49 57 +222 164 115 +255 213 106 +238 172 65 +189 139 57 +156 115 65 +156 197 238 +115 148 230 +74 131 148 +74 74 115 +16 16 16 diff --git a/graphics/pokemon/palettes/blastoise_shiny_palette.pal b/graphics/pokemon/palettes/blastoise_shiny_palette.pal new file mode 100644 index 000000000..d96b5ffee --- /dev/null +++ b/graphics/pokemon/palettes/blastoise_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +205 205 172 +255 255 255 +213 205 205 +148 164 164 +32 65 32 +172 49 57 +180 172 65 +213 189 57 +238 205 74 +115 139 8 +65 90 8 +222 205 246 +213 180 255 +156 148 197 +57 57 106 +16 16 16 diff --git a/graphics/pokemon/palettes/blaziken_palette.pal b/graphics/pokemon/palettes/blaziken_palette.pal new file mode 100644 index 000000000..64aaed794 --- /dev/null +++ b/graphics/pokemon/palettes/blaziken_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +148 197 148 +255 246 246 +205 180 180 +172 148 148 +148 115 123 +255 123 82 +222 98 49 +180 65 49 +74 41 65 +238 213 172 +205 180 156 +148 123 90 +255 230 156 +255 213 106 +230 172 90 +0 0 0 diff --git a/graphics/pokemon/palettes/blaziken_shiny_palette.pal b/graphics/pokemon/palettes/blaziken_shiny_palette.pal new file mode 100644 index 000000000..fea29cce8 --- /dev/null +++ b/graphics/pokemon/palettes/blaziken_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +148 197 148 +255 246 246 +205 180 180 +172 148 148 +148 115 123 +197 82 49 +131 49 32 +106 24 8 +74 0 0 +238 230 222 +222 213 205 +180 65 49 +255 255 255 +255 180 82 +222 123 49 +0 0 0 diff --git a/graphics/pokemon/palettes/blissey_palette.pal b/graphics/pokemon/palettes/blissey_palette.pal new file mode 100644 index 000000000..edeacbdaa --- /dev/null +++ b/graphics/pokemon/palettes/blissey_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +205 205 172 +255 255 255 +222 222 222 +180 180 180 +106 106 106 +0 255 0 +255 213 222 +255 172 197 +238 123 156 +213 74 98 +189 32 49 +0 255 0 +0 255 0 +213 74 98 +172 16 32 +16 16 16 diff --git a/graphics/pokemon/palettes/blissey_shiny_palette.pal b/graphics/pokemon/palettes/blissey_shiny_palette.pal new file mode 100644 index 000000000..d6d75db9e --- /dev/null +++ b/graphics/pokemon/palettes/blissey_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +205 205 172 +255 255 255 +222 238 255 +180 197 222 +90 106 131 +0 255 0 +255 238 246 +255 213 230 +246 172 197 +222 115 139 +180 74 82 +0 255 0 +238 123 156 +222 90 98 +172 49 65 +16 16 16 diff --git a/graphics/pokemon/palettes/breloom_palette.pal b/graphics/pokemon/palettes/breloom_palette.pal new file mode 100644 index 000000000..f01f5d947 --- /dev/null +++ b/graphics/pokemon/palettes/breloom_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +238 238 238 +255 255 255 +255 238 156 +246 213 123 +213 172 106 +82 24 16 +98 74 57 +57 82 24 +164 131 82 +172 213 98 +148 189 74 +115 148 49 +238 123 74 +172 49 16 +0 0 0 +222 74 41 diff --git a/graphics/pokemon/palettes/breloom_shiny_palette.pal b/graphics/pokemon/palettes/breloom_shiny_palette.pal new file mode 100644 index 000000000..ad89e65f2 --- /dev/null +++ b/graphics/pokemon/palettes/breloom_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +148 148 139 +255 255 255 +255 238 180 +255 230 148 +230 189 106 +82 24 16 +98 74 57 +57 82 24 +189 148 82 +255 115 74 +222 98 49 +180 65 49 +255 222 139 +238 139 49 +0 0 0 +255 180 90 diff --git a/graphics/pokemon/palettes/bulbasaur_palette.pal b/graphics/pokemon/palettes/bulbasaur_palette.pal new file mode 100644 index 000000000..cc333bed3 --- /dev/null +++ b/graphics/pokemon/palettes/bulbasaur_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +205 205 172 +255 255 255 +131 238 197 +98 213 164 +98 148 156 +41 90 98 +255 106 98 +222 74 65 +189 41 32 +205 205 205 +16 16 16 +189 255 115 +156 213 74 +123 172 65 +90 115 65 +255 0 255 diff --git a/graphics/pokemon/palettes/bulbasaur_shiny_palette.pal b/graphics/pokemon/palettes/bulbasaur_shiny_palette.pal new file mode 100644 index 000000000..86a535831 --- /dev/null +++ b/graphics/pokemon/palettes/bulbasaur_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +205 205 172 +255 255 255 +205 255 41 +164 230 0 +106 172 0 +24 90 0 +255 106 98 +222 74 65 +189 41 32 +205 205 205 +16 16 16 +57 197 90 +16 156 49 +0 115 8 +0 57 0 +255 0 255 diff --git a/graphics/pokemon/palettes/butterfree_palette.pal b/graphics/pokemon/palettes/butterfree_palette.pal new file mode 100644 index 000000000..c0eb72213 --- /dev/null +++ b/graphics/pokemon/palettes/butterfree_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +205 205 172 +255 255 255 +16 16 16 +255 0 255 +180 180 197 +123 123 156 +82 82 115 +65 65 90 +255 189 180 +255 123 82 +205 98 106 +148 32 16 +230 230 230 +197 197 197 +156 205 197 +90 180 139 diff --git a/graphics/pokemon/palettes/butterfree_shiny_palette.pal b/graphics/pokemon/palettes/butterfree_shiny_palette.pal new file mode 100644 index 000000000..a0cb8fa39 --- /dev/null +++ b/graphics/pokemon/palettes/butterfree_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +205 205 172 +255 246 213 +16 16 16 +255 0 255 +189 189 205 +123 123 156 +106 90 131 +98 65 98 +98 246 106 +82 222 106 +65 180 90 +41 98 82 +255 222 180 +246 180 156 +246 180 123 +213 131 123 diff --git a/graphics/pokemon/palettes/cacnea_palette.pal b/graphics/pokemon/palettes/cacnea_palette.pal new file mode 100644 index 000000000..2bfc05a1e --- /dev/null +++ b/graphics/pokemon/palettes/cacnea_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 172 98 +205 238 115 +172 205 98 +139 172 82 +106 139 65 +230 255 156 +123 205 106 +74 156 57 +65 115 41 +131 131 131 +49 82 41 +255 238 255 +255 213 74 +189 156 65 +255 238 148 +16 16 16 diff --git a/graphics/pokemon/palettes/cacnea_shiny_palette.pal b/graphics/pokemon/palettes/cacnea_shiny_palette.pal new file mode 100644 index 000000000..67e730f61 --- /dev/null +++ b/graphics/pokemon/palettes/cacnea_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 172 98 +238 189 90 +205 156 57 +172 123 24 +139 90 0 +255 222 123 +205 106 57 +172 74 24 +139 41 0 +131 131 131 +74 24 0 +255 238 255 +255 213 74 +189 156 65 +255 238 148 +16 16 16 diff --git a/graphics/pokemon/palettes/cacturne_palette.pal b/graphics/pokemon/palettes/cacturne_palette.pal new file mode 100644 index 000000000..cd8281641 --- /dev/null +++ b/graphics/pokemon/palettes/cacturne_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 172 98 +180 213 115 +156 189 98 +131 164 82 +106 139 65 +98 197 106 +82 172 98 +65 164 90 +49 131 74 +98 115 74 +57 82 41 +205 238 115 +255 230 74 +139 115 115 +82 82 90 +16 16 16 diff --git a/graphics/pokemon/palettes/cacturne_shiny_palette.pal b/graphics/pokemon/palettes/cacturne_shiny_palette.pal new file mode 100644 index 000000000..11914015b --- /dev/null +++ b/graphics/pokemon/palettes/cacturne_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 172 98 +238 189 90 +205 156 57 +172 123 24 +139 90 0 +205 106 57 +172 74 24 +139 41 0 +106 8 0 +106 57 0 +74 24 0 +255 222 123 +255 230 74 +139 115 115 +82 82 90 +16 16 16 diff --git a/graphics/pokemon/palettes/camerupt_palette.pal b/graphics/pokemon/palettes/camerupt_palette.pal new file mode 100644 index 000000000..bd1096ff6 --- /dev/null +++ b/graphics/pokemon/palettes/camerupt_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +106 106 156 +24 24 24 +82 49 24 +189 82 41 +230 106 24 +238 172 74 +74 74 139 +131 131 189 +189 180 189 +0 0 0 +189 123 106 +238 238 205 +213 213 131 +172 172 90 +74 74 32 +255 255 255 diff --git a/graphics/pokemon/palettes/camerupt_shiny_palette.pal b/graphics/pokemon/palettes/camerupt_shiny_palette.pal new file mode 100644 index 000000000..c402d68dd --- /dev/null +++ b/graphics/pokemon/palettes/camerupt_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +106 106 156 +41 41 24 +41 41 57 +57 65 82 +115 106 123 +148 139 156 +222 172 74 +255 246 115 +222 213 222 +0 0 0 +197 139 57 +255 255 255 +238 189 156 +197 148 115 +115 74 49 +255 255 255 diff --git a/graphics/pokemon/palettes/carvanha_palette.pal b/graphics/pokemon/palettes/carvanha_palette.pal new file mode 100644 index 000000000..fbe24d28b --- /dev/null +++ b/graphics/pokemon/palettes/carvanha_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +156 131 213 +41 41 90 +172 197 255 +98 74 57 +49 74 156 +65 123 189 +98 164 222 +189 57 57 +246 57 57 +255 131 131 +205 148 41 +238 189 41 +255 205 82 +123 57 57 +0 0 0 +255 255 255 diff --git a/graphics/pokemon/palettes/carvanha_shiny_palette.pal b/graphics/pokemon/palettes/carvanha_shiny_palette.pal new file mode 100644 index 000000000..0e0cb9268 --- /dev/null +++ b/graphics/pokemon/palettes/carvanha_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +156 131 213 +41 41 90 +172 197 255 +98 74 57 +123 156 24 +156 189 57 +189 222 90 +49 148 131 +82 180 164 +115 213 197 +205 148 41 +238 189 41 +255 205 82 +0 98 82 +0 0 0 +255 255 255 diff --git a/graphics/pokemon/palettes/cascoon_palette.pal b/graphics/pokemon/palettes/cascoon_palette.pal new file mode 100644 index 000000000..05dceb931 --- /dev/null +++ b/graphics/pokemon/palettes/cascoon_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +197 246 197 +106 98 115 +139 139 148 +172 172 180 +0 0 0 +172 156 189 +222 180 230 +238 213 230 +238 230 255 +115 0 0 +246 197 0 +189 49 0 +148 148 0 +246 255 197 +0 0 0 +24 24 24 diff --git a/graphics/pokemon/palettes/cascoon_shiny_palette.pal b/graphics/pokemon/palettes/cascoon_shiny_palette.pal new file mode 100644 index 000000000..e8b230ed1 --- /dev/null +++ b/graphics/pokemon/palettes/cascoon_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +197 246 197 +49 98 16 +82 148 24 +115 180 57 +0 0 0 +139 205 74 +172 230 98 +213 255 148 +238 255 172 +115 0 0 +246 197 0 +189 49 0 +148 148 0 +246 255 197 +0 0 0 +24 24 24 diff --git a/graphics/pokemon/palettes/castform_normal_form_palette.pal b/graphics/pokemon/palettes/castform_normal_form_palette.pal new file mode 100644 index 000000000..3fe2b7692 --- /dev/null +++ b/graphics/pokemon/palettes/castform_normal_form_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +197 197 148 +90 82 82 +205 189 189 +230 222 222 +246 246 238 +0 0 0 +255 255 255 +222 222 246 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +148 148 148 +74 82 74 +255 255 255 +24 24 24 diff --git a/graphics/pokemon/palettes/castform_normal_form_shiny_palette.pal b/graphics/pokemon/palettes/castform_normal_form_shiny_palette.pal new file mode 100644 index 000000000..2fa401dd6 --- /dev/null +++ b/graphics/pokemon/palettes/castform_normal_form_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +197 197 148 +98 90 90 +205 164 189 +230 197 222 +255 222 255 +0 0 0 +255 246 65 +230 180 32 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +148 148 148 +74 82 74 +255 255 255 +24 24 24 diff --git a/graphics/pokemon/palettes/castform_rainy_form_palette.pal b/graphics/pokemon/palettes/castform_rainy_form_palette.pal new file mode 100644 index 000000000..914cdac62 --- /dev/null +++ b/graphics/pokemon/palettes/castform_rainy_form_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +197 197 148 +57 65 90 +98 115 189 +115 139 213 +148 180 205 +0 0 0 +205 238 246 +180 197 222 +139 205 222 +131 180 197 +82 98 131 +197 197 197 +148 139 148 +90 90 82 +255 255 255 +24 24 24 diff --git a/graphics/pokemon/palettes/castform_rainy_form_shiny_palette.pal b/graphics/pokemon/palettes/castform_rainy_form_shiny_palette.pal new file mode 100644 index 000000000..914cdac62 --- /dev/null +++ b/graphics/pokemon/palettes/castform_rainy_form_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +197 197 148 +57 65 90 +98 115 189 +115 139 213 +148 180 205 +0 0 0 +205 238 246 +180 197 222 +139 205 222 +131 180 197 +82 98 131 +197 197 197 +148 139 148 +90 90 82 +255 255 255 +24 24 24 diff --git a/graphics/pokemon/palettes/castform_snowy_form_palette.pal b/graphics/pokemon/palettes/castform_snowy_form_palette.pal new file mode 100644 index 000000000..d1c64ac75 --- /dev/null +++ b/graphics/pokemon/palettes/castform_snowy_form_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +197 197 148 +41 82 57 +123 82 189 +139 115 213 +148 180 205 +0 0 0 +197 180 255 +156 156 197 +139 205 172 +115 164 139 +98 74 115 +189 230 230 +82 115 106 +74 82 74 +255 255 255 +24 24 24 diff --git a/graphics/pokemon/palettes/castform_snowy_form_shiny_palette.pal b/graphics/pokemon/palettes/castform_snowy_form_shiny_palette.pal new file mode 100644 index 000000000..d1c64ac75 --- /dev/null +++ b/graphics/pokemon/palettes/castform_snowy_form_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +197 197 148 +41 82 57 +123 82 189 +139 115 213 +148 180 205 +0 0 0 +197 180 255 +156 156 197 +139 205 172 +115 164 139 +98 74 115 +189 230 230 +82 115 106 +74 82 74 +255 255 255 +24 24 24 diff --git a/graphics/pokemon/palettes/castform_sunny_form_palette.pal b/graphics/pokemon/palettes/castform_sunny_form_palette.pal new file mode 100644 index 000000000..af0cfbb93 --- /dev/null +++ b/graphics/pokemon/palettes/castform_sunny_form_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +197 197 148 +98 49 41 +205 90 74 +238 123 74 +255 156 65 +0 0 0 +255 246 106 +230 213 106 +255 156 98 +213 131 74 +148 90 65 +213 205 230 +0 0 0 +90 90 82 +255 255 255 +24 24 24 diff --git a/graphics/pokemon/palettes/castform_sunny_form_shiny_palette.pal b/graphics/pokemon/palettes/castform_sunny_form_shiny_palette.pal new file mode 100644 index 000000000..af0cfbb93 --- /dev/null +++ b/graphics/pokemon/palettes/castform_sunny_form_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +197 197 148 +98 49 41 +205 90 74 +238 123 74 +255 156 65 +0 0 0 +255 246 106 +230 213 106 +255 156 98 +213 131 74 +148 90 65 +213 205 230 +0 0 0 +90 90 82 +255 255 255 +24 24 24 diff --git a/graphics/pokemon/palettes/caterpie_palette.pal b/graphics/pokemon/palettes/caterpie_palette.pal new file mode 100644 index 000000000..f01008218 --- /dev/null +++ b/graphics/pokemon/palettes/caterpie_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +205 205 172 +255 255 255 +238 222 255 +238 238 123 +213 205 98 +255 172 115 +238 123 49 +197 65 65 +123 98 57 +189 255 115 +156 213 74 +123 156 98 +82 98 41 +255 0 255 +115 115 115 +16 16 16 diff --git a/graphics/pokemon/palettes/caterpie_shiny_palette.pal b/graphics/pokemon/palettes/caterpie_shiny_palette.pal new file mode 100644 index 000000000..604283c2c --- /dev/null +++ b/graphics/pokemon/palettes/caterpie_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +205 205 172 +255 255 255 +246 238 115 +230 238 123 +213 205 98 +255 172 115 +238 123 49 +197 98 98 +172 98 57 +255 255 123 +246 222 115 +222 180 57 +139 106 41 +255 0 255 +131 131 131 +16 16 16 diff --git a/graphics/pokemon/palettes/celebi_palette.pal b/graphics/pokemon/palettes/celebi_palette.pal new file mode 100644 index 000000000..aed1b3ec2 --- /dev/null +++ b/graphics/pokemon/palettes/celebi_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +205 205 172 +255 255 255 +238 255 213 +197 238 164 +123 213 115 +65 189 65 +32 139 32 +255 255 255 +172 238 255 +115 189 230 +57 139 205 +0 98 180 +255 0 255 +180 180 189 +106 115 131 +16 16 16 diff --git a/graphics/pokemon/palettes/celebi_shiny_palette.pal b/graphics/pokemon/palettes/celebi_shiny_palette.pal new file mode 100644 index 000000000..b90d6ed43 --- /dev/null +++ b/graphics/pokemon/palettes/celebi_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +205 205 172 +255 255 230 +255 238 230 +255 205 197 +238 164 156 +222 106 131 +172 57 65 +255 255 255 +189 222 238 +106 213 90 +74 180 65 +41 148 41 +222 32 222 +180 180 189 +106 115 131 +49 49 49 diff --git a/graphics/pokemon/palettes/chansey_palette.pal b/graphics/pokemon/palettes/chansey_palette.pal new file mode 100644 index 000000000..3a740dba0 --- /dev/null +++ b/graphics/pokemon/palettes/chansey_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +213 213 213 +255 255 255 +246 238 164 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +16 16 16 +255 172 172 +255 131 90 +230 82 49 +255 230 230 +255 213 213 +238 172 189 +246 115 115 +164 57 41 diff --git a/graphics/pokemon/palettes/chansey_shiny_palette.pal b/graphics/pokemon/palettes/chansey_shiny_palette.pal new file mode 100644 index 000000000..e8107f8d5 --- /dev/null +++ b/graphics/pokemon/palettes/chansey_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +213 213 213 +255 255 255 +246 238 164 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +16 16 16 +180 238 106 +148 213 82 +106 189 49 +255 255 230 +255 238 205 +246 205 139 +230 172 98 +123 90 16 diff --git a/graphics/pokemon/palettes/charizard_palette.pal b/graphics/pokemon/palettes/charizard_palette.pal new file mode 100644 index 000000000..3823f2f28 --- /dev/null +++ b/graphics/pokemon/palettes/charizard_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +123 213 156 +246 106 65 +222 197 131 +41 172 189 +32 123 148 +24 82 115 +255 230 156 +246 213 139 +246 189 32 +16 16 16 +255 197 98 +255 148 65 +213 106 82 +172 65 0 +213 213 213 +255 255 255 diff --git a/graphics/pokemon/palettes/charizard_shiny_palette.pal b/graphics/pokemon/palettes/charizard_shiny_palette.pal new file mode 100644 index 000000000..6a7a91f87 --- /dev/null +++ b/graphics/pokemon/palettes/charizard_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +205 205 172 +230 98 49 +189 189 106 +230 98 106 +197 65 74 +156 32 41 +0 0 0 +222 213 131 +255 164 82 +16 16 16 +131 164 156 +98 131 131 +65 90 90 +32 57 57 +213 213 213 +255 255 255 diff --git a/graphics/pokemon/palettes/charmander_palette.pal b/graphics/pokemon/palettes/charmander_palette.pal new file mode 100644 index 000000000..223adef4c --- /dev/null +++ b/graphics/pokemon/palettes/charmander_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +205 205 172 +16 16 16 +180 180 180 +255 255 255 +255 230 156 +255 213 106 +230 172 90 +246 98 0 +255 164 8 +255 197 98 +255 148 65 +222 74 74 +156 65 24 +24 74 49 +65 164 123 +148 205 222 diff --git a/graphics/pokemon/palettes/charmander_shiny_palette.pal b/graphics/pokemon/palettes/charmander_shiny_palette.pal new file mode 100644 index 000000000..aea29571f --- /dev/null +++ b/graphics/pokemon/palettes/charmander_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +205 205 172 +16 16 16 +180 180 180 +255 255 255 +255 255 180 +255 230 148 +246 197 115 +213 82 8 +246 123 8 +255 246 90 +255 213 49 +222 164 8 +131 82 16 +24 74 49 +65 164 123 +148 205 222 diff --git a/graphics/pokemon/palettes/charmeleon_palette.pal b/graphics/pokemon/palettes/charmeleon_palette.pal new file mode 100644 index 000000000..f79c4cd97 --- /dev/null +++ b/graphics/pokemon/palettes/charmeleon_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +205 205 172 +255 255 255 +131 131 131 +8 98 197 +255 230 156 +255 213 106 +230 172 90 +246 115 0 +255 164 24 +255 197 74 +255 172 115 +255 106 74 +213 74 74 +148 49 16 +197 205 205 +16 16 16 diff --git a/graphics/pokemon/palettes/charmeleon_shiny_palette.pal b/graphics/pokemon/palettes/charmeleon_shiny_palette.pal new file mode 100644 index 000000000..6fa23cf00 --- /dev/null +++ b/graphics/pokemon/palettes/charmeleon_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +205 205 172 +255 255 255 +106 106 106 +8 98 197 +255 246 180 +246 230 139 +222 197 106 +222 74 49 +238 115 49 +255 172 57 +255 238 82 +255 213 74 +230 156 16 +148 82 24 +197 205 205 +16 16 16 diff --git a/graphics/pokemon/palettes/chikorita_palette.pal b/graphics/pokemon/palettes/chikorita_palette.pal new file mode 100644 index 000000000..9bca4c3eb --- /dev/null +++ b/graphics/pokemon/palettes/chikorita_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +205 205 172 +255 255 255 +222 255 131 +205 238 98 +156 197 8 +74 115 0 +98 172 74 +57 131 41 +0 90 0 +0 57 0 +205 205 205 +156 156 156 +98 98 98 +16 16 16 +213 131 82 +148 0 0 diff --git a/graphics/pokemon/palettes/chikorita_shiny_palette.pal b/graphics/pokemon/palettes/chikorita_shiny_palette.pal new file mode 100644 index 000000000..d7ecae6fb --- /dev/null +++ b/graphics/pokemon/palettes/chikorita_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +205 205 172 +255 255 255 +255 255 148 +246 238 90 +205 197 57 +131 106 16 +246 189 106 +213 156 74 +164 98 24 +90 65 41 +205 205 205 +156 156 156 +156 131 74 +16 16 16 +222 156 115 +172 57 57 diff --git a/graphics/pokemon/palettes/chimecho_palette.pal b/graphics/pokemon/palettes/chimecho_palette.pal new file mode 100644 index 000000000..9dd34b7c4 --- /dev/null +++ b/graphics/pokemon/palettes/chimecho_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +148 197 148 +0 0 0 +255 123 148 +156 197 230 +197 230 255 +115 148 180 +255 255 255 +164 164 164 +255 230 148 +255 213 90 +65 74 106 +197 74 98 +123 41 65 +246 90 115 +246 189 90 +172 115 74 diff --git a/graphics/pokemon/palettes/chimecho_shiny_palette.pal b/graphics/pokemon/palettes/chimecho_shiny_palette.pal new file mode 100644 index 000000000..44983802b --- /dev/null +++ b/graphics/pokemon/palettes/chimecho_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +148 197 148 +0 0 0 +255 189 90 +148 230 148 +205 255 172 +98 189 98 +255 255 255 +164 164 164 +255 230 148 +255 213 90 +49 123 74 +197 106 24 +148 74 0 +255 148 24 +246 189 90 +172 115 74 diff --git a/graphics/pokemon/palettes/chinchou_palette.pal b/graphics/pokemon/palettes/chinchou_palette.pal new file mode 100644 index 000000000..fc382ddbb --- /dev/null +++ b/graphics/pokemon/palettes/chinchou_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +205 205 172 +255 255 255 +205 230 255 +164 205 255 +139 156 255 +98 123 213 +65 90 172 +0 57 115 +255 246 172 +255 222 123 +213 180 90 +180 139 57 +106 57 0 +139 98 24 +164 0 0 +16 16 16 diff --git a/graphics/pokemon/palettes/chinchou_shiny_palette.pal b/graphics/pokemon/palettes/chinchou_shiny_palette.pal new file mode 100644 index 000000000..babb78178 --- /dev/null +++ b/graphics/pokemon/palettes/chinchou_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +205 205 172 +255 255 255 +148 238 255 +123 222 255 +82 180 255 +41 139 222 +8 90 180 +24 57 131 +213 255 115 +164 246 65 +123 205 74 +90 172 49 +57 139 24 +32 82 24 +148 57 0 +16 16 16 diff --git a/graphics/pokemon/palettes/clamperl_palette.pal b/graphics/pokemon/palettes/clamperl_palette.pal new file mode 100644 index 000000000..84d730399 --- /dev/null +++ b/graphics/pokemon/palettes/clamperl_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +148 246 156 +255 255 255 +205 213 213 +139 164 148 +197 213 246 +139 189 205 +74 139 131 +41 65 131 +98 139 246 +49 90 205 +0 41 82 +123 189 255 +0 0 0 +255 123 213 +213 115 131 +115 74 90 diff --git a/graphics/pokemon/palettes/clamperl_shiny_palette.pal b/graphics/pokemon/palettes/clamperl_shiny_palette.pal new file mode 100644 index 000000000..d479da971 --- /dev/null +++ b/graphics/pokemon/palettes/clamperl_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +148 246 156 +255 255 255 +205 213 213 +139 164 148 +197 213 246 +139 189 205 +74 139 131 +41 65 131 +197 65 180 +148 8 123 +0 41 82 +222 131 205 +0 0 0 +255 230 156 +230 172 90 +115 74 90 diff --git a/graphics/pokemon/palettes/claydol_palette.pal b/graphics/pokemon/palettes/claydol_palette.pal new file mode 100644 index 000000000..cd7f876c5 --- /dev/null +++ b/graphics/pokemon/palettes/claydol_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 255 255 +82 82 41 +106 106 65 +148 156 123 +98 98 24 +156 148 189 +197 197 213 +255 255 255 +255 197 164 +246 123 90 +172 90 0 +255 213 115 +180 164 123 +255 255 255 +255 255 255 +106 255 106 diff --git a/graphics/pokemon/palettes/claydol_shiny_palette.pal b/graphics/pokemon/palettes/claydol_shiny_palette.pal new file mode 100644 index 000000000..e4203b19b --- /dev/null +++ b/graphics/pokemon/palettes/claydol_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 255 255 +82 82 41 +106 106 65 +148 156 123 +98 98 24 +156 148 189 +197 197 213 +255 255 255 +246 238 90 +246 205 57 +197 156 16 +255 213 115 +180 164 123 +255 255 255 +255 255 255 +106 255 106 diff --git a/graphics/pokemon/palettes/clefable_palette.pal b/graphics/pokemon/palettes/clefable_palette.pal new file mode 100644 index 000000000..46e74099c --- /dev/null +++ b/graphics/pokemon/palettes/clefable_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +222 222 222 +255 255 255 +197 197 197 +148 148 148 +255 172 172 +255 197 180 +238 148 148 +222 98 98 +156 90 90 +16 16 16 +255 106 41 +222 57 90 +123 106 98 +82 65 57 +74 65 65 +255 0 255 diff --git a/graphics/pokemon/palettes/clefable_shiny_palette.pal b/graphics/pokemon/palettes/clefable_shiny_palette.pal new file mode 100644 index 000000000..106d78ed4 --- /dev/null +++ b/graphics/pokemon/palettes/clefable_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +222 222 222 +255 255 255 +197 197 197 +148 148 148 +255 213 189 +255 222 246 +246 189 180 +230 156 131 +172 106 98 +16 16 16 +255 106 41 +222 32 16 +123 222 90 +82 180 49 +41 139 8 +255 0 255 diff --git a/graphics/pokemon/palettes/clefairy_palette.pal b/graphics/pokemon/palettes/clefairy_palette.pal new file mode 100644 index 000000000..78c34d19c --- /dev/null +++ b/graphics/pokemon/palettes/clefairy_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +213 213 189 +255 255 255 +197 197 197 +131 131 131 +238 90 74 +180 57 41 +205 131 82 +172 98 49 +156 82 32 +115 41 8 +255 0 255 +255 197 164 +255 156 131 +230 131 123 +156 90 82 +16 16 16 diff --git a/graphics/pokemon/palettes/clefairy_shiny_palette.pal b/graphics/pokemon/palettes/clefairy_shiny_palette.pal new file mode 100644 index 000000000..e61e335f8 --- /dev/null +++ b/graphics/pokemon/palettes/clefairy_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +213 213 189 +255 255 255 +197 197 197 +148 148 148 +238 90 74 +180 57 41 +123 222 90 +82 180 49 +41 139 8 +0 98 0 +255 0 255 +255 222 246 +246 189 180 +230 156 131 +172 106 98 +16 16 16 diff --git a/graphics/pokemon/palettes/cleffa_palette.pal b/graphics/pokemon/palettes/cleffa_palette.pal new file mode 100644 index 000000000..757446357 --- /dev/null +++ b/graphics/pokemon/palettes/cleffa_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +205 205 172 +255 255 255 +255 205 156 +255 164 131 +222 115 65 +197 74 0 +98 49 32 +213 164 41 +164 106 0 +123 74 0 +90 49 0 +255 0 255 +205 0 0 +156 0 0 +82 82 82 +16 16 16 diff --git a/graphics/pokemon/palettes/cleffa_shiny_palette.pal b/graphics/pokemon/palettes/cleffa_shiny_palette.pal new file mode 100644 index 000000000..1af070d66 --- /dev/null +++ b/graphics/pokemon/palettes/cleffa_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +205 205 172 +255 255 255 +255 222 222 +255 189 197 +238 123 148 +180 82 82 +32 98 0 +123 222 90 +82 180 49 +41 139 8 +0 98 0 +255 0 255 +205 0 0 +156 0 0 +82 82 82 +16 16 16 diff --git a/graphics/pokemon/palettes/cloyster_palette.pal b/graphics/pokemon/palettes/cloyster_palette.pal new file mode 100644 index 000000000..7eeb9f47e --- /dev/null +++ b/graphics/pokemon/palettes/cloyster_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +213 213 189 +255 0 255 +213 172 230 +172 123 189 +98 123 115 +74 32 82 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +213 222 197 +180 189 156 +131 139 106 +74 82 65 +16 16 16 +255 255 255 diff --git a/graphics/pokemon/palettes/cloyster_shiny_palette.pal b/graphics/pokemon/palettes/cloyster_shiny_palette.pal new file mode 100644 index 000000000..8a0d5bd4b --- /dev/null +++ b/graphics/pokemon/palettes/cloyster_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +213 213 189 +255 0 255 +115 164 213 +74 123 172 +32 82 131 +0 41 90 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +197 197 197 +148 148 148 +98 98 98 +65 65 65 +16 16 16 +255 255 255 diff --git a/graphics/pokemon/palettes/combusken_palette.pal b/graphics/pokemon/palettes/combusken_palette.pal new file mode 100644 index 000000000..7327dbece --- /dev/null +++ b/graphics/pokemon/palettes/combusken_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +49 164 82 +255 222 156 +213 189 148 +180 148 123 +156 123 57 +255 213 98 +246 180 82 +197 148 57 +123 106 90 +139 57 49 +255 255 255 +255 164 57 +255 106 57 +213 90 57 +90 57 49 +16 16 16 diff --git a/graphics/pokemon/palettes/combusken_shiny_palette.pal b/graphics/pokemon/palettes/combusken_shiny_palette.pal new file mode 100644 index 000000000..6fbb74b08 --- /dev/null +++ b/graphics/pokemon/palettes/combusken_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +49 164 82 +255 255 255 +222 180 131 +172 123 90 +123 90 74 +255 238 172 +255 213 98 +238 156 49 +123 106 90 +106 41 32 +255 255 255 +230 106 49 +197 74 49 +139 57 49 +90 57 49 +16 16 16 diff --git a/graphics/pokemon/palettes/corphish_palette.pal b/graphics/pokemon/palettes/corphish_palette.pal new file mode 100644 index 000000000..0fd4ea330 --- /dev/null +++ b/graphics/pokemon/palettes/corphish_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +205 205 172 +255 255 255 +255 123 16 +213 90 8 +172 82 8 +98 65 49 +246 238 197 +230 205 148 +205 172 106 +148 115 65 +255 213 90 +238 180 65 +255 197 65 +205 205 205 +131 131 131 +0 0 0 diff --git a/graphics/pokemon/palettes/corphish_shiny_palette.pal b/graphics/pokemon/palettes/corphish_shiny_palette.pal new file mode 100644 index 000000000..a3eb45805 --- /dev/null +++ b/graphics/pokemon/palettes/corphish_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +205 205 172 +255 255 255 +255 148 148 +213 106 106 +180 74 74 +139 41 41 +255 255 238 +255 222 148 +255 189 90 +213 148 65 +255 213 90 +255 205 205 +255 197 197 +205 205 205 +131 131 131 +0 0 0 diff --git a/graphics/pokemon/palettes/corsola_palette.pal b/graphics/pokemon/palettes/corsola_palette.pal new file mode 100644 index 000000000..95c7616fe --- /dev/null +++ b/graphics/pokemon/palettes/corsola_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +205 205 172 +255 255 255 +222 222 222 +172 172 172 +131 131 139 +90 90 98 +255 213 222 +255 172 197 +230 106 139 +189 57 90 +139 16 16 +255 0 255 +255 0 255 +255 0 255 +189 57 90 +16 16 16 diff --git a/graphics/pokemon/palettes/corsola_shiny_palette.pal b/graphics/pokemon/palettes/corsola_shiny_palette.pal new file mode 100644 index 000000000..13daa4e26 --- /dev/null +++ b/graphics/pokemon/palettes/corsola_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +205 205 172 +255 255 255 +205 230 255 +164 189 222 +123 148 189 +74 98 156 +156 238 255 +123 205 255 +74 156 230 +41 106 197 +8 65 148 +255 0 255 +255 0 255 +255 0 255 +238 98 98 +16 16 16 diff --git a/graphics/pokemon/palettes/cradily_palette.pal b/graphics/pokemon/palettes/cradily_palette.pal new file mode 100644 index 000000000..9167eb879 --- /dev/null +++ b/graphics/pokemon/palettes/cradily_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +205 205 172 +255 255 255 +148 230 123 +115 180 106 +82 131 90 +57 90 74 +255 213 172 +255 172 115 +246 106 32 +255 246 123 +255 222 41 +230 172 0 +213 213 213 +172 172 180 +180 82 74 +0 0 0 diff --git a/graphics/pokemon/palettes/cradily_shiny_palette.pal b/graphics/pokemon/palettes/cradily_shiny_palette.pal new file mode 100644 index 000000000..32a3b9e8f --- /dev/null +++ b/graphics/pokemon/palettes/cradily_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +205 205 172 +255 255 255 +255 180 189 +222 123 156 +189 90 123 +139 65 65 +255 213 172 +255 172 115 +246 106 32 +255 246 156 +255 230 41 +230 172 0 +213 213 213 +172 172 180 +180 82 74 +0 0 0 diff --git a/graphics/pokemon/palettes/crawdaunt_palette.pal b/graphics/pokemon/palettes/crawdaunt_palette.pal new file mode 100644 index 000000000..7fe04e329 --- /dev/null +++ b/graphics/pokemon/palettes/crawdaunt_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +205 205 172 +255 255 255 +230 106 0 +189 65 0 +139 57 32 +246 238 197 +230 205 148 +197 164 98 +148 115 65 +255 230 90 +246 172 49 +82 156 246 +65 115 172 +197 197 230 +24 65 106 +0 0 0 diff --git a/graphics/pokemon/palettes/crawdaunt_shiny_palette.pal b/graphics/pokemon/palettes/crawdaunt_shiny_palette.pal new file mode 100644 index 000000000..21b58b2a0 --- /dev/null +++ b/graphics/pokemon/palettes/crawdaunt_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +205 205 172 +255 255 255 +238 148 0 +205 106 0 +156 74 32 +238 238 238 +222 222 222 +180 189 180 +131 139 131 +255 238 139 +246 197 41 +222 156 238 +164 90 189 +222 156 238 +123 65 139 +0 0 0 diff --git a/graphics/pokemon/palettes/crobat_palette.pal b/graphics/pokemon/palettes/crobat_palette.pal new file mode 100644 index 000000000..9c466e9e8 --- /dev/null +++ b/graphics/pokemon/palettes/crobat_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +205 205 172 +255 255 255 +230 139 246 +197 90 205 +156 57 180 +115 24 148 +255 0 255 +255 0 255 +74 156 189 +32 106 148 +16 74 115 +255 213 0 +213 148 0 +164 164 164 +106 106 106 +16 16 16 diff --git a/graphics/pokemon/palettes/crobat_shiny_palette.pal b/graphics/pokemon/palettes/crobat_shiny_palette.pal new file mode 100644 index 000000000..8f22fd4b0 --- /dev/null +++ b/graphics/pokemon/palettes/crobat_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +205 205 172 +255 255 255 +255 213 238 +246 180 197 +222 131 148 +164 74 106 +255 0 255 +255 0 255 +139 189 32 +74 139 0 +41 82 0 +255 213 0 +213 148 0 +164 164 164 +106 106 106 +16 16 16 diff --git a/graphics/pokemon/palettes/croconaw_palette.pal b/graphics/pokemon/palettes/croconaw_palette.pal new file mode 100644 index 000000000..2e64441a4 --- /dev/null +++ b/graphics/pokemon/palettes/croconaw_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +205 205 172 +255 255 255 +131 205 255 +90 172 230 +49 131 197 +74 74 131 +230 65 32 +123 0 0 +255 172 90 +255 90 32 +205 41 24 +123 0 0 +255 230 98 +230 180 82 +156 115 8 +16 16 16 diff --git a/graphics/pokemon/palettes/croconaw_shiny_palette.pal b/graphics/pokemon/palettes/croconaw_shiny_palette.pal new file mode 100644 index 000000000..847f2ed29 --- /dev/null +++ b/graphics/pokemon/palettes/croconaw_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +205 205 172 +255 255 255 +164 246 222 +115 213 205 +74 164 180 +49 106 139 +230 65 32 +123 0 0 +98 180 230 +57 98 197 +49 90 156 +32 65 106 +255 230 98 +230 180 82 +156 115 8 +16 16 16 diff --git a/graphics/pokemon/palettes/cubone_palette.pal b/graphics/pokemon/palettes/cubone_palette.pal new file mode 100644 index 000000000..3576a449e --- /dev/null +++ b/graphics/pokemon/palettes/cubone_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +74 205 139 +222 189 106 +197 156 74 +148 106 49 +82 49 24 +238 238 238 +205 205 180 +139 139 106 +90 90 49 +246 230 205 +255 213 164 +230 180 139 +255 0 255 +255 0 255 +41 41 41 +255 255 255 diff --git a/graphics/pokemon/palettes/cubone_shiny_palette.pal b/graphics/pokemon/palettes/cubone_shiny_palette.pal new file mode 100644 index 000000000..51b6bc8ba --- /dev/null +++ b/graphics/pokemon/palettes/cubone_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +213 213 189 +172 180 115 +131 131 74 +74 82 24 +49 57 0 +230 230 213 +197 197 172 +139 139 106 +90 90 49 +255 238 197 +238 213 148 +205 164 90 +255 0 255 +255 0 255 +41 41 41 +255 255 255 diff --git a/graphics/pokemon/palettes/cyndaquil_palette.pal b/graphics/pokemon/palettes/cyndaquil_palette.pal new file mode 100644 index 000000000..46fb06347 --- /dev/null +++ b/graphics/pokemon/palettes/cyndaquil_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +205 205 172 +255 255 255 +98 131 189 +65 82 139 +41 65 98 +24 41 82 +255 238 164 +230 205 106 +180 156 82 +139 98 32 +255 222 0 +255 156 0 +255 98 0 +238 0 0 +139 139 139 +16 16 16 diff --git a/graphics/pokemon/palettes/cyndaquil_shiny_palette.pal b/graphics/pokemon/palettes/cyndaquil_shiny_palette.pal new file mode 100644 index 000000000..14e35dbc5 --- /dev/null +++ b/graphics/pokemon/palettes/cyndaquil_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +205 205 172 +255 255 255 +230 156 106 +189 98 65 +139 65 57 +98 57 41 +255 230 115 +222 197 82 +172 139 49 +139 82 24 +255 222 0 +255 156 0 +255 98 0 +238 0 0 +139 139 139 +16 16 16 diff --git a/graphics/pokemon/palettes/delcatty_palette.pal b/graphics/pokemon/palettes/delcatty_palette.pal new file mode 100644 index 000000000..7d7d44e12 --- /dev/null +++ b/graphics/pokemon/palettes/delcatty_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +172 205 139 +255 255 255 +255 255 156 +255 222 98 +255 189 65 +222 156 65 +115 74 82 +246 180 197 +189 131 90 +106 74 156 +74 41 123 +0 0 0 +222 148 164 +197 123 139 +164 90 106 +131 57 74 diff --git a/graphics/pokemon/palettes/delcatty_shiny_palette.pal b/graphics/pokemon/palettes/delcatty_shiny_palette.pal new file mode 100644 index 000000000..caf7d7be8 --- /dev/null +++ b/graphics/pokemon/palettes/delcatty_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +172 205 139 +255 255 255 +255 255 189 +255 255 156 +255 222 98 +246 172 65 +139 82 65 +255 180 98 +205 123 57 +139 106 172 +98 65 156 +0 0 0 +255 123 82 +238 82 49 +189 65 32 +164 49 32 diff --git a/graphics/pokemon/palettes/delibird_palette.pal b/graphics/pokemon/palettes/delibird_palette.pal new file mode 100644 index 000000000..a975e93d3 --- /dev/null +++ b/graphics/pokemon/palettes/delibird_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +205 205 172 +255 255 255 +255 189 106 +255 115 16 +213 65 0 +148 49 0 +255 0 255 +255 246 139 +255 205 65 +205 139 41 +123 65 0 +90 90 90 +213 213 213 +172 172 180 +131 131 131 +16 16 16 diff --git a/graphics/pokemon/palettes/delibird_shiny_palette.pal b/graphics/pokemon/palettes/delibird_shiny_palette.pal new file mode 100644 index 000000000..f94267729 --- /dev/null +++ b/graphics/pokemon/palettes/delibird_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +205 205 172 +255 255 255 +238 131 197 +205 90 164 +148 65 115 +90 41 82 +255 0 255 +255 246 139 +255 205 65 +205 139 41 +123 65 0 +139 123 82 +238 238 197 +213 205 139 +148 139 90 +49 49 49 diff --git a/graphics/pokemon/palettes/deoxys_palette.pal b/graphics/pokemon/palettes/deoxys_palette.pal new file mode 100644 index 000000000..e8921dd3d --- /dev/null +++ b/graphics/pokemon/palettes/deoxys_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +205 205 255 +115 74 49 +213 106 106 +255 131 74 +255 172 131 +115 213 172 +82 172 123 +57 98 90 +0 0 0 +156 156 131 +106 8 156 +0 98 230 +115 115 106 +197 197 213 +255 255 255 +24 24 24 diff --git a/graphics/pokemon/palettes/deoxys_shiny_palette.pal b/graphics/pokemon/palettes/deoxys_shiny_palette.pal new file mode 100644 index 000000000..666acaa3a --- /dev/null +++ b/graphics/pokemon/palettes/deoxys_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +205 205 255 +106 90 24 +197 189 65 +255 222 74 +255 246 139 +115 213 172 +82 172 123 +57 98 90 +0 0 0 +156 156 131 +106 8 156 +0 98 230 +115 115 106 +197 197 213 +255 255 255 +24 24 24 diff --git a/graphics/pokemon/palettes/dewgong_palette.pal b/graphics/pokemon/palettes/dewgong_palette.pal new file mode 100644 index 000000000..b9d0bdfed --- /dev/null +++ b/graphics/pokemon/palettes/dewgong_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +213 213 189 +230 246 238 +197 205 238 +172 180 205 +65 82 131 +238 90 57 +197 57 65 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +213 205 205 +123 115 115 +16 16 16 +255 255 255 diff --git a/graphics/pokemon/palettes/dewgong_shiny_palette.pal b/graphics/pokemon/palettes/dewgong_shiny_palette.pal new file mode 100644 index 000000000..8949d4fa8 --- /dev/null +++ b/graphics/pokemon/palettes/dewgong_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +213 213 189 +238 238 213 +213 205 189 +180 172 156 +139 131 115 +238 90 57 +197 57 65 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +213 205 205 +131 123 123 +16 16 16 +255 255 255 diff --git a/graphics/pokemon/palettes/diglett_palette.pal b/graphics/pokemon/palettes/diglett_palette.pal new file mode 100644 index 000000000..7417ef7ff --- /dev/null +++ b/graphics/pokemon/palettes/diglett_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +222 222 222 +255 255 255 +255 172 148 +255 106 90 +213 57 74 +230 230 180 +180 172 115 +131 123 74 +90 82 32 +123 123 123 +16 16 16 +222 156 90 +197 123 65 +164 90 65 +106 32 0 +255 0 255 diff --git a/graphics/pokemon/palettes/diglett_shiny_palette.pal b/graphics/pokemon/palettes/diglett_shiny_palette.pal new file mode 100644 index 000000000..c7c26b7e5 --- /dev/null +++ b/graphics/pokemon/palettes/diglett_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +222 222 222 +255 255 255 +123 156 197 +82 115 156 +41 74 115 +230 230 180 +180 172 115 +131 123 74 +90 82 32 +123 123 123 +16 16 16 +230 164 98 +197 123 65 +164 90 32 +106 32 0 +255 0 255 diff --git a/graphics/pokemon/palettes/ditto_palette.pal b/graphics/pokemon/palettes/ditto_palette.pal new file mode 100644 index 000000000..262742c15 --- /dev/null +++ b/graphics/pokemon/palettes/ditto_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +213 213 189 +0 255 255 +0 255 255 +0 255 255 +0 255 255 +246 197 238 +238 156 213 +213 115 164 +180 82 131 +115 41 90 +0 255 255 +0 255 255 +0 255 255 +0 255 255 +49 49 49 +255 255 255 diff --git a/graphics/pokemon/palettes/ditto_shiny_palette.pal b/graphics/pokemon/palettes/ditto_shiny_palette.pal new file mode 100644 index 000000000..987958312 --- /dev/null +++ b/graphics/pokemon/palettes/ditto_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +213 213 189 +0 255 255 +0 255 255 +0 255 255 +0 255 255 +139 230 255 +106 205 246 +74 164 230 +32 123 197 +24 74 139 +0 255 255 +0 255 255 +0 255 255 +0 255 255 +49 49 49 +255 255 255 diff --git a/graphics/pokemon/palettes/dodrio_palette.pal b/graphics/pokemon/palettes/dodrio_palette.pal new file mode 100644 index 000000000..1d5fd2ea4 --- /dev/null +++ b/graphics/pokemon/palettes/dodrio_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +213 213 197 +238 180 98 +213 148 57 +164 123 74 +98 74 49 +238 222 172 +197 180 131 +98 90 65 +255 205 230 +246 131 164 +156 57 57 +213 205 205 +131 131 131 +90 82 74 +0 0 0 +255 255 255 diff --git a/graphics/pokemon/palettes/dodrio_shiny_palette.pal b/graphics/pokemon/palettes/dodrio_shiny_palette.pal new file mode 100644 index 000000000..e7c27940f --- /dev/null +++ b/graphics/pokemon/palettes/dodrio_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +213 213 197 +197 205 74 +156 164 32 +115 123 0 +74 82 0 +255 246 139 +238 189 82 +123 90 0 +255 213 230 +246 131 164 +180 65 65 +213 205 205 +131 131 131 +65 65 65 +0 0 0 +255 255 255 diff --git a/graphics/pokemon/palettes/doduo_palette.pal b/graphics/pokemon/palettes/doduo_palette.pal new file mode 100644 index 000000000..b82c77be5 --- /dev/null +++ b/graphics/pokemon/palettes/doduo_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +213 213 205 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +213 164 106 +189 139 82 +148 98 65 +90 65 32 +238 222 172 +205 180 131 +115 106 49 +255 0 255 +98 98 98 +16 16 16 +255 255 255 diff --git a/graphics/pokemon/palettes/doduo_shiny_palette.pal b/graphics/pokemon/palettes/doduo_shiny_palette.pal new file mode 100644 index 000000000..fa2c1c8fb --- /dev/null +++ b/graphics/pokemon/palettes/doduo_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +213 213 205 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +197 205 74 +156 164 32 +115 123 0 +74 82 0 +255 246 164 +230 205 123 +131 106 24 +255 0 255 +98 98 98 +16 16 16 +255 255 255 diff --git a/graphics/pokemon/palettes/donphan_palette.pal b/graphics/pokemon/palettes/donphan_palette.pal new file mode 100644 index 000000000..4e0393757 --- /dev/null +++ b/graphics/pokemon/palettes/donphan_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +230 230 205 +255 255 255 +164 197 197 +123 156 156 +82 115 115 +49 82 82 +230 222 213 +213 205 205 +172 164 164 +131 123 123 +197 123 90 +148 57 41 +222 222 222 +189 189 189 +90 90 90 +16 16 16 diff --git a/graphics/pokemon/palettes/donphan_shiny_palette.pal b/graphics/pokemon/palettes/donphan_shiny_palette.pal new file mode 100644 index 000000000..55a6da008 --- /dev/null +++ b/graphics/pokemon/palettes/donphan_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +230 230 205 +255 255 255 +246 189 106 +213 148 82 +156 82 57 +106 74 49 +222 222 180 +205 205 156 +156 156 115 +115 115 82 +197 123 90 +148 57 41 +222 222 222 +189 189 189 +90 90 90 +16 16 16 diff --git a/graphics/pokemon/palettes/double_question_mark_palette.pal b/graphics/pokemon/palettes/double_question_mark_palette.pal new file mode 100644 index 000000000..67be6bbf4 --- /dev/null +++ b/graphics/pokemon/palettes/double_question_mark_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 255 0 +255 255 255 +0 0 0 +255 255 255 +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 diff --git a/graphics/pokemon/palettes/double_question_mark_shiny_palette.pal b/graphics/pokemon/palettes/double_question_mark_shiny_palette.pal new file mode 100644 index 000000000..67be6bbf4 --- /dev/null +++ b/graphics/pokemon/palettes/double_question_mark_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 255 0 +255 255 255 +0 0 0 +255 255 255 +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 diff --git a/graphics/pokemon/palettes/dragonair_palette.pal b/graphics/pokemon/palettes/dragonair_palette.pal new file mode 100644 index 000000000..011d2e583 --- /dev/null +++ b/graphics/pokemon/palettes/dragonair_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +131 222 131 +255 255 255 +230 246 246 +213 213 230 +106 106 123 +123 197 246 +82 131 205 +32 65 139 +24 49 90 +16 16 16 +123 49 123 +123 189 246 +82 164 213 +98 131 164 +32 74 115 +255 0 255 diff --git a/graphics/pokemon/palettes/dragonair_shiny_palette.pal b/graphics/pokemon/palettes/dragonair_shiny_palette.pal new file mode 100644 index 000000000..1eedd8ef7 --- /dev/null +++ b/graphics/pokemon/palettes/dragonair_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +222 222 222 +255 255 255 +222 222 230 +180 180 197 +106 106 123 +255 246 164 +246 189 74 +213 139 16 +131 82 41 +16 16 16 +123 49 123 +230 148 213 +205 115 197 +156 65 156 +90 57 98 +255 0 255 diff --git a/graphics/pokemon/palettes/dragonite_palette.pal b/graphics/pokemon/palettes/dragonite_palette.pal new file mode 100644 index 000000000..420f870cf --- /dev/null +++ b/graphics/pokemon/palettes/dragonite_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +222 189 213 +172 148 82 +255 230 123 +255 205 82 +213 180 90 +115 98 57 +123 197 197 +82 164 164 +49 115 106 +255 246 205 +213 213 164 +156 156 106 +213 213 222 +115 115 115 +16 16 16 +255 255 255 diff --git a/graphics/pokemon/palettes/dragonite_shiny_palette.pal b/graphics/pokemon/palettes/dragonite_shiny_palette.pal new file mode 100644 index 000000000..6204273b3 --- /dev/null +++ b/graphics/pokemon/palettes/dragonite_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +222 222 222 +98 115 82 +156 180 123 +123 156 98 +90 106 65 +49 57 49 +222 156 213 +180 115 180 +115 74 123 +255 246 205 +213 213 164 +156 156 106 +213 213 222 +115 115 115 +16 16 16 +255 255 255 diff --git a/graphics/pokemon/palettes/dratini_palette.pal b/graphics/pokemon/palettes/dratini_palette.pal new file mode 100644 index 000000000..22ba0544e --- /dev/null +++ b/graphics/pokemon/palettes/dratini_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +213 213 213 +255 255 255 +238 238 197 +205 205 156 +123 123 82 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +139 115 172 +139 16 180 +197 164 230 +164 131 197 +115 82 148 +57 24 90 +16 16 16 diff --git a/graphics/pokemon/palettes/dratini_shiny_palette.pal b/graphics/pokemon/palettes/dratini_shiny_palette.pal new file mode 100644 index 000000000..a6861e455 --- /dev/null +++ b/graphics/pokemon/palettes/dratini_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +213 213 213 +255 255 255 +238 238 197 +197 197 156 +123 123 82 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +189 90 131 +139 16 180 +238 148 197 +205 106 164 +164 65 131 +123 32 90 +16 16 16 diff --git a/graphics/pokemon/palettes/drowzee_palette.pal b/graphics/pokemon/palettes/drowzee_palette.pal new file mode 100644 index 000000000..8013633f9 --- /dev/null +++ b/graphics/pokemon/palettes/drowzee_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +205 205 213 +255 255 255 +222 205 238 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +189 139 82 +148 106 65 +106 82 41 +74 49 16 +255 238 148 +255 222 65 +222 189 41 +148 106 0 +16 16 16 diff --git a/graphics/pokemon/palettes/drowzee_shiny_palette.pal b/graphics/pokemon/palettes/drowzee_shiny_palette.pal new file mode 100644 index 000000000..9c01eb20d --- /dev/null +++ b/graphics/pokemon/palettes/drowzee_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +222 222 205 +255 255 255 +222 205 238 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +189 98 106 +148 57 65 +106 16 24 +65 0 8 +246 222 213 +230 189 205 +189 148 164 +123 82 98 +16 16 16 diff --git a/graphics/pokemon/palettes/dugtrio_palette.pal b/graphics/pokemon/palettes/dugtrio_palette.pal new file mode 100644 index 000000000..ed81b96fe --- /dev/null +++ b/graphics/pokemon/palettes/dugtrio_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +213 213 180 +255 255 255 +255 189 172 +255 106 90 +222 74 98 +230 230 180 +180 172 115 +131 123 74 +90 82 32 +106 106 106 +16 16 16 +230 164 98 +197 123 65 +164 82 65 +106 65 24 +255 0 255 diff --git a/graphics/pokemon/palettes/dugtrio_shiny_palette.pal b/graphics/pokemon/palettes/dugtrio_shiny_palette.pal new file mode 100644 index 000000000..77345a714 --- /dev/null +++ b/graphics/pokemon/palettes/dugtrio_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +213 213 180 +255 255 255 +123 156 197 +82 115 156 +41 74 115 +230 230 180 +180 172 115 +131 123 74 +90 82 32 +123 123 123 +16 16 16 +230 164 98 +197 123 65 +164 90 32 +106 32 0 +255 0 255 diff --git a/graphics/pokemon/palettes/dunsparce_palette.pal b/graphics/pokemon/palettes/dunsparce_palette.pal new file mode 100644 index 000000000..e0440cdc1 --- /dev/null +++ b/graphics/pokemon/palettes/dunsparce_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +205 205 172 +16 16 16 +255 0 255 +32 82 139 +74 172 189 +131 205 213 +189 222 230 +90 90 90 +139 139 139 +197 205 213 +106 90 41 +189 139 32 +222 189 57 +230 230 131 +246 246 197 +255 255 255 diff --git a/graphics/pokemon/palettes/dunsparce_shiny_palette.pal b/graphics/pokemon/palettes/dunsparce_shiny_palette.pal new file mode 100644 index 000000000..425dc8b36 --- /dev/null +++ b/graphics/pokemon/palettes/dunsparce_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +205 205 172 +16 16 16 +255 0 255 +164 65 74 +222 106 123 +238 164 164 +238 213 197 +90 90 90 +139 139 139 +238 213 197 +106 90 41 +189 139 32 +222 189 57 +230 230 131 +246 246 197 +255 255 255 diff --git a/graphics/pokemon/palettes/dusclops_palette.pal b/graphics/pokemon/palettes/dusclops_palette.pal new file mode 100644 index 000000000..f82d7f82e --- /dev/null +++ b/graphics/pokemon/palettes/dusclops_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 255 255 +82 57 49 +90 90 106 +255 255 255 +106 98 90 +139 139 115 +180 180 164 +148 131 123 +213 197 180 +172 172 148 +0 0 0 +0 0 0 +0 0 0 +255 255 0 +255 0 0 +24 24 24 diff --git a/graphics/pokemon/palettes/dusclops_shiny_palette.pal b/graphics/pokemon/palettes/dusclops_shiny_palette.pal new file mode 100644 index 000000000..f07d7112f --- /dev/null +++ b/graphics/pokemon/palettes/dusclops_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 255 255 +90 65 57 +139 32 0 +255 255 255 +156 41 16 +189 74 49 +222 106 82 +148 131 123 +213 197 180 +172 172 148 +0 0 0 +0 0 0 +0 0 0 +255 255 0 +255 0 0 +24 24 24 diff --git a/graphics/pokemon/palettes/duskull_palette.pal b/graphics/pokemon/palettes/duskull_palette.pal new file mode 100644 index 000000000..aa1fb6ba4 --- /dev/null +++ b/graphics/pokemon/palettes/duskull_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +123 164 172 +57 57 49 +106 106 90 +139 139 123 +180 180 148 +238 230 189 +222 213 172 +255 255 230 +74 65 65 +172 164 123 +255 164 172 +90 90 82 +0 0 0 +139 74 90 +238 82 24 +255 255 255 diff --git a/graphics/pokemon/palettes/duskull_shiny_palette.pal b/graphics/pokemon/palettes/duskull_shiny_palette.pal new file mode 100644 index 000000000..2ec13fb1d --- /dev/null +++ b/graphics/pokemon/palettes/duskull_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +123 164 172 +90 0 0 +156 41 16 +189 74 49 +222 106 82 +238 230 189 +222 213 172 +255 255 230 +74 65 65 +172 164 123 +255 164 172 +123 8 0 +0 0 0 +139 74 90 +238 82 24 +255 255 255 diff --git a/graphics/pokemon/palettes/dustox_palette.pal b/graphics/pokemon/palettes/dustox_palette.pal new file mode 100644 index 000000000..262b7d1ba --- /dev/null +++ b/graphics/pokemon/palettes/dustox_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +148 148 255 +90 74 74 +131 148 131 +156 180 156 +0 0 0 +180 106 148 +213 148 197 +230 197 213 +180 213 115 +197 255 148 +189 148 82 +238 238 49 +205 197 49 +246 82 49 +197 82 49 +24 24 24 diff --git a/graphics/pokemon/palettes/dustox_shiny_palette.pal b/graphics/pokemon/palettes/dustox_shiny_palette.pal new file mode 100644 index 000000000..c1c43725b --- /dev/null +++ b/graphics/pokemon/palettes/dustox_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +148 148 255 +90 74 74 +148 98 65 +172 123 90 +0 0 0 +180 106 148 +213 148 197 +230 197 213 +230 172 90 +255 230 156 +189 148 82 +238 238 49 +205 197 49 +246 82 49 +197 82 49 +24 24 24 diff --git a/graphics/pokemon/palettes/eevee_palette.pal b/graphics/pokemon/palettes/eevee_palette.pal new file mode 100644 index 000000000..f6bec2522 --- /dev/null +++ b/graphics/pokemon/palettes/eevee_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +139 205 164 +255 255 255 +255 246 205 +213 205 156 +189 172 106 +131 115 74 +230 0 0 +255 0 255 +255 0 255 +255 0 255 +16 16 16 +230 180 115 +213 156 90 +164 115 49 +90 74 32 +255 0 255 diff --git a/graphics/pokemon/palettes/eevee_shiny_palette.pal b/graphics/pokemon/palettes/eevee_shiny_palette.pal new file mode 100644 index 000000000..0d4aca238 --- /dev/null +++ b/graphics/pokemon/palettes/eevee_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +205 205 205 +255 255 255 +246 255 255 +222 230 246 +172 180 213 +106 123 148 +230 98 41 +255 0 255 +255 0 255 +255 0 255 +16 16 16 +238 238 213 +222 222 205 +172 172 172 +82 82 82 +255 0 255 diff --git a/graphics/pokemon/palettes/egg_palette.pal b/graphics/pokemon/palettes/egg_palette.pal new file mode 100644 index 000000000..cadeacee0 --- /dev/null +++ b/graphics/pokemon/palettes/egg_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +164 255 148 +65 74 74 +148 156 156 +246 246 213 +238 230 164 +205 197 131 +123 205 74 +106 148 82 +230 0 0 +230 0 0 +230 0 0 +230 0 0 +230 0 0 +230 0 0 +230 0 0 +131 230 230 diff --git a/graphics/pokemon/palettes/ekans_palette.pal b/graphics/pokemon/palettes/ekans_palette.pal new file mode 100644 index 000000000..748d88fbc --- /dev/null +++ b/graphics/pokemon/palettes/ekans_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +205 205 189 +255 255 255 +246 115 74 +197 65 24 +156 41 41 +255 0 255 +255 230 156 +255 213 106 +230 164 115 +131 82 16 +255 0 255 +16 16 16 +222 164 197 +189 115 164 +156 74 131 +106 32 90 diff --git a/graphics/pokemon/palettes/ekans_shiny_palette.pal b/graphics/pokemon/palettes/ekans_shiny_palette.pal new file mode 100644 index 000000000..529864430 --- /dev/null +++ b/graphics/pokemon/palettes/ekans_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +205 205 189 +255 255 255 +246 115 74 +197 65 24 +156 16 0 +255 0 255 +255 230 156 +255 213 106 +230 172 90 +131 82 16 +255 0 255 +16 16 16 +213 197 98 +172 156 57 +131 115 16 +90 74 0 diff --git a/graphics/pokemon/palettes/electabuzz_palette.pal b/graphics/pokemon/palettes/electabuzz_palette.pal new file mode 100644 index 000000000..75bfcbabe --- /dev/null +++ b/graphics/pokemon/palettes/electabuzz_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +222 222 222 +255 255 255 +222 222 222 +115 106 90 +16 16 16 +255 0 255 +255 0 255 +255 172 123 +255 82 32 +189 49 8 +255 0 255 +255 255 213 +255 255 172 +255 230 57 +222 189 82 +115 90 16 diff --git a/graphics/pokemon/palettes/electabuzz_shiny_palette.pal b/graphics/pokemon/palettes/electabuzz_shiny_palette.pal new file mode 100644 index 000000000..df9fa23e8 --- /dev/null +++ b/graphics/pokemon/palettes/electabuzz_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +222 222 222 +255 255 255 +222 222 222 +115 115 115 +16 16 16 +255 0 255 +255 0 255 +255 172 123 +255 82 32 +189 49 8 +255 0 255 +255 230 148 +255 205 41 +238 131 0 +205 98 0 +164 41 0 diff --git a/graphics/pokemon/palettes/electrike_palette.pal b/graphics/pokemon/palettes/electrike_palette.pal new file mode 100644 index 000000000..5ee96cb84 --- /dev/null +++ b/graphics/pokemon/palettes/electrike_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +197 197 246 +65 82 65 +82 139 90 +106 180 123 +156 222 131 +255 238 32 +213 213 24 +172 197 65 +148 49 57 +213 57 49 +0 0 0 +0 0 0 +0 0 0 +255 255 255 +197 205 222 +24 24 24 diff --git a/graphics/pokemon/palettes/electrike_shiny_palette.pal b/graphics/pokemon/palettes/electrike_shiny_palette.pal new file mode 100644 index 000000000..c7f51a2b1 --- /dev/null +++ b/graphics/pokemon/palettes/electrike_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +197 197 246 +74 74 131 +49 123 189 +90 156 213 +123 197 255 +255 238 32 +197 213 98 +172 197 65 +148 49 57 +213 57 49 +0 0 0 +0 0 0 +0 0 0 +255 255 255 +197 205 222 +24 24 24 diff --git a/graphics/pokemon/palettes/electrode_palette.pal b/graphics/pokemon/palettes/electrode_palette.pal new file mode 100644 index 000000000..1848bf716 --- /dev/null +++ b/graphics/pokemon/palettes/electrode_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +148 189 230 +255 255 255 +238 238 238 +205 205 205 +164 156 156 +90 82 82 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 180 156 +255 123 74 +230 65 0 +180 49 0 +131 16 16 +16 16 16 diff --git a/graphics/pokemon/palettes/electrode_shiny_palette.pal b/graphics/pokemon/palettes/electrode_shiny_palette.pal new file mode 100644 index 000000000..d651b064f --- /dev/null +++ b/graphics/pokemon/palettes/electrode_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +230 230 230 +255 255 255 +238 238 238 +222 222 230 +180 172 172 +90 82 82 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +115 197 255 +74 156 213 +32 115 172 +32 74 131 +32 32 90 +16 16 16 diff --git a/graphics/pokemon/palettes/elekid_palette.pal b/graphics/pokemon/palettes/elekid_palette.pal new file mode 100644 index 000000000..522f7de84 --- /dev/null +++ b/graphics/pokemon/palettes/elekid_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +148 205 172 +255 255 255 +255 230 156 +246 197 74 +230 172 0 +180 106 0 +123 82 0 +246 148 16 +156 49 0 +115 16 0 +255 0 255 +205 205 205 +164 164 164 +106 106 106 +49 49 65 +16 16 16 diff --git a/graphics/pokemon/palettes/elekid_shiny_palette.pal b/graphics/pokemon/palettes/elekid_shiny_palette.pal new file mode 100644 index 000000000..59ff6b2cf --- /dev/null +++ b/graphics/pokemon/palettes/elekid_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +205 205 172 +255 255 255 +255 230 82 +238 205 65 +189 156 24 +148 115 0 +123 82 0 +246 148 16 +156 49 0 +115 16 0 +255 0 255 +205 205 205 +164 164 164 +115 98 49 +57 49 32 +16 16 16 diff --git a/graphics/pokemon/palettes/entei_palette.pal b/graphics/pokemon/palettes/entei_palette.pal new file mode 100644 index 000000000..27cad95ea --- /dev/null +++ b/graphics/pokemon/palettes/entei_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +205 205 172 +255 255 255 +222 189 98 +180 148 74 +131 98 32 +82 57 0 +255 123 41 +230 41 0 +156 0 0 +255 230 148 +255 205 0 +213 148 0 +213 213 213 +172 172 172 +98 98 98 +16 16 16 diff --git a/graphics/pokemon/palettes/entei_shiny_palette.pal b/graphics/pokemon/palettes/entei_shiny_palette.pal new file mode 100644 index 000000000..e3f22acdd --- /dev/null +++ b/graphics/pokemon/palettes/entei_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +205 205 172 +255 255 255 +238 164 115 +213 123 82 +156 74 49 +115 49 41 +164 172 189 +115 123 139 +65 65 74 +255 213 172 +255 205 0 +213 148 0 +213 213 213 +172 172 172 +98 98 98 +16 16 16 diff --git a/graphics/pokemon/palettes/espeon_palette.pal b/graphics/pokemon/palettes/espeon_palette.pal new file mode 100644 index 000000000..b001102c1 --- /dev/null +++ b/graphics/pokemon/palettes/espeon_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +205 205 172 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +131 57 65 +213 57 65 +49 49 49 +82 57 106 +123 82 180 +180 115 230 +213 172 230 +238 222 238 +16 16 16 +0 24 148 +255 255 255 diff --git a/graphics/pokemon/palettes/espeon_shiny_palette.pal b/graphics/pokemon/palettes/espeon_shiny_palette.pal new file mode 100644 index 000000000..22222e2c7 --- /dev/null +++ b/graphics/pokemon/palettes/espeon_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +205 205 172 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +131 90 0 +255 164 65 +49 49 49 +41 98 41 +74 156 65 +106 205 74 +164 230 90 +213 255 156 +16 16 16 +82 41 90 +255 255 255 diff --git a/graphics/pokemon/palettes/exeggcute_palette.pal b/graphics/pokemon/palettes/exeggcute_palette.pal new file mode 100644 index 000000000..8b180c09c --- /dev/null +++ b/graphics/pokemon/palettes/exeggcute_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +205 205 205 +255 255 255 +222 222 222 +255 205 74 +230 156 0 +16 16 16 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 222 197 +255 189 164 +238 156 131 +197 131 98 +148 49 16 diff --git a/graphics/pokemon/palettes/exeggcute_shiny_palette.pal b/graphics/pokemon/palettes/exeggcute_shiny_palette.pal new file mode 100644 index 000000000..2358a2621 --- /dev/null +++ b/graphics/pokemon/palettes/exeggcute_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +205 205 205 +255 255 255 +222 222 222 +255 205 74 +230 156 0 +16 16 16 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 255 164 +246 238 98 +230 197 65 +213 164 57 +123 90 41 diff --git a/graphics/pokemon/palettes/exeggutor_palette.pal b/graphics/pokemon/palettes/exeggutor_palette.pal new file mode 100644 index 000000000..24702f6fa --- /dev/null +++ b/graphics/pokemon/palettes/exeggutor_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +213 213 189 +255 238 164 +255 222 106 +230 172 90 +131 82 24 +180 156 74 +139 115 65 +90 57 8 +189 255 115 +156 213 74 +115 172 49 +82 98 41 +222 222 222 +98 98 98 +16 16 16 +255 255 255 diff --git a/graphics/pokemon/palettes/exeggutor_shiny_palette.pal b/graphics/pokemon/palettes/exeggutor_shiny_palette.pal new file mode 100644 index 000000000..c06646a6c --- /dev/null +++ b/graphics/pokemon/palettes/exeggutor_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +213 213 189 +255 238 164 +255 222 106 +230 172 90 +164 106 32 +222 189 82 +180 148 32 +106 82 0 +255 189 123 +222 148 82 +180 106 41 +115 41 0 +222 222 222 +98 98 98 +16 16 16 +255 255 255 diff --git a/graphics/pokemon/palettes/exploud_palette.pal b/graphics/pokemon/palettes/exploud_palette.pal new file mode 100644 index 000000000..074305af3 --- /dev/null +++ b/graphics/pokemon/palettes/exploud_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +205 205 172 +255 255 255 +189 189 238 +164 156 222 +123 115 180 +82 74 139 +255 222 90 +222 180 74 +156 115 24 +255 115 82 +213 74 49 +156 57 24 +106 49 24 +213 222 255 +131 131 131 +0 0 0 diff --git a/graphics/pokemon/palettes/exploud_shiny_palette.pal b/graphics/pokemon/palettes/exploud_shiny_palette.pal new file mode 100644 index 000000000..cfde98dc2 --- /dev/null +++ b/graphics/pokemon/palettes/exploud_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +205 205 172 +255 255 255 +213 172 189 +189 156 164 +139 106 123 +115 82 90 +255 238 172 +246 197 82 +238 172 24 +255 139 82 +213 82 49 +164 49 24 +115 74 0 +222 197 222 +131 131 131 +57 49 74 diff --git a/graphics/pokemon/palettes/farfetch_d_palette.pal b/graphics/pokemon/palettes/farfetch_d_palette.pal new file mode 100644 index 000000000..2a2dfd6aa --- /dev/null +++ b/graphics/pokemon/palettes/farfetch_d_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +213 213 213 +255 255 255 +213 213 213 +230 230 164 +197 197 131 +255 222 90 +230 172 90 +156 115 41 +205 255 139 +123 205 65 +74 131 24 +205 189 123 +180 148 82 +139 90 41 +98 65 0 +16 16 16 diff --git a/graphics/pokemon/palettes/farfetch_d_shiny_palette.pal b/graphics/pokemon/palettes/farfetch_d_shiny_palette.pal new file mode 100644 index 000000000..5537612ce --- /dev/null +++ b/graphics/pokemon/palettes/farfetch_d_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +213 213 213 +255 255 255 +213 213 213 +230 230 164 +197 197 131 +255 230 106 +230 172 90 +189 106 41 +205 255 139 +139 189 57 +98 148 16 +246 189 180 +213 148 139 +172 106 98 +131 65 57 +16 16 16 diff --git a/graphics/pokemon/palettes/fearow_palette.pal b/graphics/pokemon/palettes/fearow_palette.pal new file mode 100644 index 000000000..231165e59 --- /dev/null +++ b/graphics/pokemon/palettes/fearow_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +205 205 172 +255 0 255 +238 213 172 +197 189 164 +98 82 49 +16 16 16 +255 139 148 +246 90 90 +205 57 74 +255 205 123 +246 180 90 +213 156 57 +172 115 82 +123 65 0 +246 180 90 +255 255 255 diff --git a/graphics/pokemon/palettes/fearow_shiny_palette.pal b/graphics/pokemon/palettes/fearow_shiny_palette.pal new file mode 100644 index 000000000..686e65a9c --- /dev/null +++ b/graphics/pokemon/palettes/fearow_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +205 205 172 +255 0 255 +222 205 164 +197 180 139 +98 82 49 +16 16 16 +255 205 74 +255 164 0 +197 123 0 +255 246 131 +255 230 90 +213 197 49 +180 164 8 +115 98 0 +246 180 90 +255 255 255 diff --git a/graphics/pokemon/palettes/feebas_palette.pal b/graphics/pokemon/palettes/feebas_palette.pal new file mode 100644 index 000000000..c66deb1e0 --- /dev/null +++ b/graphics/pokemon/palettes/feebas_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +49 148 98 +90 74 57 +180 164 115 +213 213 131 +238 238 156 +115 164 41 +164 205 98 +148 131 82 +180 106 106 +230 123 98 +82 82 115 +164 172 197 +205 222 255 +230 222 230 +255 255 255 +24 24 24 diff --git a/graphics/pokemon/palettes/feebas_shiny_palette.pal b/graphics/pokemon/palettes/feebas_shiny_palette.pal new file mode 100644 index 000000000..6d85b2866 --- /dev/null +++ b/graphics/pokemon/palettes/feebas_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +49 148 98 +98 65 74 +172 139 148 +205 172 180 +238 205 213 +115 164 41 +164 205 98 +139 106 115 +180 106 106 +230 123 98 +82 82 115 +164 172 197 +205 222 255 +230 222 230 +255 255 255 +41 41 41 diff --git a/graphics/pokemon/palettes/feraligatr_palette.pal b/graphics/pokemon/palettes/feraligatr_palette.pal new file mode 100644 index 000000000..7fc0a9eb8 --- /dev/null +++ b/graphics/pokemon/palettes/feraligatr_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +205 205 172 +255 255 255 +131 205 255 +90 172 230 +49 131 197 +74 74 131 +197 197 197 +255 172 90 +255 90 32 +205 41 24 +123 0 0 +255 255 156 +255 213 82 +205 172 65 +156 115 8 +16 16 16 diff --git a/graphics/pokemon/palettes/feraligatr_shiny_palette.pal b/graphics/pokemon/palettes/feraligatr_shiny_palette.pal new file mode 100644 index 000000000..81c5ebc2a --- /dev/null +++ b/graphics/pokemon/palettes/feraligatr_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +205 205 172 +255 255 255 +115 238 222 +82 205 197 +74 156 164 +41 98 123 +197 197 197 +106 156 246 +49 98 213 +41 65 156 +0 49 90 +255 255 156 +246 222 115 +213 180 74 +156 115 8 +16 16 16 diff --git a/graphics/pokemon/palettes/flaaffy_palette.pal b/graphics/pokemon/palettes/flaaffy_palette.pal new file mode 100644 index 000000000..4efbb5bda --- /dev/null +++ b/graphics/pokemon/palettes/flaaffy_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +205 205 172 +255 255 255 +205 205 222 +156 156 180 +115 115 139 +74 74 74 +255 197 164 +255 148 123 +238 90 65 +205 57 24 +172 0 0 +131 197 255 +82 131 197 +41 65 139 +255 0 255 +16 16 16 diff --git a/graphics/pokemon/palettes/flaaffy_shiny_palette.pal b/graphics/pokemon/palettes/flaaffy_shiny_palette.pal new file mode 100644 index 000000000..b99745d84 --- /dev/null +++ b/graphics/pokemon/palettes/flaaffy_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +205 205 172 +255 255 255 +230 222 205 +189 180 148 +148 131 82 +106 82 49 +255 222 238 +255 197 213 +230 139 156 +180 98 106 +148 65 74 +98 230 16 +49 180 0 +32 106 0 +255 0 255 +16 16 16 diff --git a/graphics/pokemon/palettes/flareon_palette.pal b/graphics/pokemon/palettes/flareon_palette.pal new file mode 100644 index 000000000..a39e1e1f7 --- /dev/null +++ b/graphics/pokemon/palettes/flareon_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +205 205 205 +255 255 255 +255 238 106 +255 230 41 +222 197 32 +148 115 8 +255 0 255 +255 0 255 +255 0 255 +115 115 123 +16 16 16 +255 0 255 +255 172 49 +255 123 0 +230 65 0 +131 32 32 diff --git a/graphics/pokemon/palettes/flareon_shiny_palette.pal b/graphics/pokemon/palettes/flareon_shiny_palette.pal new file mode 100644 index 000000000..60c1b337c --- /dev/null +++ b/graphics/pokemon/palettes/flareon_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +205 205 205 +255 255 255 +255 255 197 +255 255 57 +238 205 8 +164 106 0 +255 0 255 +255 0 255 +255 0 255 +115 115 123 +16 16 16 +255 0 255 +246 189 65 +222 164 41 +172 115 8 +98 57 24 diff --git a/graphics/pokemon/palettes/flygon_palette.pal b/graphics/pokemon/palettes/flygon_palette.pal new file mode 100644 index 000000000..33888cd1a --- /dev/null +++ b/graphics/pokemon/palettes/flygon_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +148 197 148 +74 106 24 +156 49 49 +123 156 65 +49 90 90 +213 255 131 +172 222 115 +156 189 98 +148 213 156 +106 164 115 +90 131 90 +255 180 180 +230 115 115 +205 49 49 +0 0 0 +255 255 255 diff --git a/graphics/pokemon/palettes/flygon_shiny_palette.pal b/graphics/pokemon/palettes/flygon_shiny_palette.pal new file mode 100644 index 000000000..772834b38 --- /dev/null +++ b/graphics/pokemon/palettes/flygon_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +148 197 148 +74 106 24 +139 82 0 +123 156 65 +8 90 139 +213 255 131 +172 222 115 +156 189 98 +106 189 238 +74 156 205 +41 123 172 +255 197 82 +222 164 49 +189 131 16 +0 0 0 +255 255 255 diff --git a/graphics/pokemon/palettes/forretress_palette.pal b/graphics/pokemon/palettes/forretress_palette.pal new file mode 100644 index 000000000..285c56291 --- /dev/null +++ b/graphics/pokemon/palettes/forretress_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +205 205 172 +16 16 16 +255 0 255 +98 41 90 +172 74 139 +197 131 189 +230 180 230 +246 222 238 +255 0 255 +255 0 255 +131 16 49 +189 41 65 +246 98 115 +255 189 205 +255 0 255 +255 255 255 diff --git a/graphics/pokemon/palettes/forretress_shiny_palette.pal b/graphics/pokemon/palettes/forretress_shiny_palette.pal new file mode 100644 index 000000000..7b894a11a --- /dev/null +++ b/graphics/pokemon/palettes/forretress_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +205 205 172 +16 16 16 +255 0 255 +115 82 49 +180 156 74 +222 197 106 +246 230 139 +255 246 156 +255 0 255 +255 0 255 +82 65 32 +106 74 49 +180 139 65 +222 197 98 +255 0 255 +255 255 255 diff --git a/graphics/pokemon/palettes/furret_palette.pal b/graphics/pokemon/palettes/furret_palette.pal new file mode 100644 index 000000000..5996436be --- /dev/null +++ b/graphics/pokemon/palettes/furret_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +222 222 222 +255 255 255 +255 255 197 +255 238 148 +230 197 74 +197 156 65 +172 131 41 +156 98 74 +123 65 57 +74 24 24 +197 49 24 +156 0 0 +255 148 98 +115 115 115 +65 65 65 +32 32 41 diff --git a/graphics/pokemon/palettes/furret_shiny_palette.pal b/graphics/pokemon/palettes/furret_shiny_palette.pal new file mode 100644 index 000000000..24ebc5bd6 --- /dev/null +++ b/graphics/pokemon/palettes/furret_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +205 205 172 +255 255 255 +255 246 230 +255 230 222 +222 189 172 +230 98 139 +148 123 90 +197 65 115 +164 32 90 +131 0 65 +197 49 24 +156 0 0 +255 148 98 +115 115 115 +65 65 65 +32 32 41 diff --git a/graphics/pokemon/palettes/gardevoir_palette.pal b/graphics/pokemon/palettes/gardevoir_palette.pal new file mode 100644 index 000000000..1e513ae87 --- /dev/null +++ b/graphics/pokemon/palettes/gardevoir_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +156 164 82 +238 238 255 +197 205 222 +164 180 205 +131 148 180 +123 82 82 +115 41 57 +255 156 131 +230 82 57 +131 205 255 +255 255 255 +205 255 172 +148 230 148 +115 189 115 +49 123 74 +16 16 16 diff --git a/graphics/pokemon/palettes/gardevoir_shiny_palette.pal b/graphics/pokemon/palettes/gardevoir_shiny_palette.pal new file mode 100644 index 000000000..b588f6eea --- /dev/null +++ b/graphics/pokemon/palettes/gardevoir_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +156 164 82 +238 238 255 +213 189 222 +180 164 205 +156 131 180 +123 82 82 +115 41 57 +255 197 90 +230 131 32 +131 205 255 +197 238 246 +189 230 255 +123 197 238 +82 172 213 +32 115 123 +16 16 16 diff --git a/graphics/pokemon/palettes/gastly_palette.pal b/graphics/pokemon/palettes/gastly_palette.pal new file mode 100644 index 000000000..6098ec195 --- /dev/null +++ b/graphics/pokemon/palettes/gastly_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 255 255 +255 255 255 +222 222 222 +222 82 57 +180 41 16 +255 0 255 +189 148 180 +139 98 131 +115 74 106 +82 49 90 +213 172 205 +189 148 180 +139 98 131 +255 0 255 +255 0 255 +16 16 16 diff --git a/graphics/pokemon/palettes/gastly_shiny_palette.pal b/graphics/pokemon/palettes/gastly_shiny_palette.pal new file mode 100644 index 000000000..350cb8abf --- /dev/null +++ b/graphics/pokemon/palettes/gastly_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 255 255 +255 255 255 +222 222 222 +222 82 57 +180 41 16 +255 0 255 +172 131 230 +148 115 197 +90 57 148 +82 41 98 +156 222 255 +115 180 213 +74 139 172 +255 0 255 +255 0 255 +16 16 16 diff --git a/graphics/pokemon/palettes/gengar_palette.pal b/graphics/pokemon/palettes/gengar_palette.pal new file mode 100644 index 000000000..6fe99805e --- /dev/null +++ b/graphics/pokemon/palettes/gengar_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +213 213 213 +255 255 255 +222 222 222 +123 123 123 +255 180 123 +238 98 74 +205 57 32 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +197 131 180 +156 106 131 +106 90 98 +90 49 90 +16 16 16 diff --git a/graphics/pokemon/palettes/gengar_shiny_palette.pal b/graphics/pokemon/palettes/gengar_shiny_palette.pal new file mode 100644 index 000000000..d3f61f7d5 --- /dev/null +++ b/graphics/pokemon/palettes/gengar_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +213 213 213 +255 255 255 +222 222 222 +123 123 123 +255 172 213 +238 131 172 +197 90 131 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +164 164 189 +123 123 148 +82 82 106 +41 41 65 +16 16 16 diff --git a/graphics/pokemon/palettes/geodude_palette.pal b/graphics/pokemon/palettes/geodude_palette.pal new file mode 100644 index 000000000..fd6264307 --- /dev/null +++ b/graphics/pokemon/palettes/geodude_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +222 222 222 +255 255 255 +205 205 205 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +205 213 131 +172 180 98 +123 131 90 +65 74 16 +16 16 16 diff --git a/graphics/pokemon/palettes/geodude_shiny_palette.pal b/graphics/pokemon/palettes/geodude_shiny_palette.pal new file mode 100644 index 000000000..3ea7069c9 --- /dev/null +++ b/graphics/pokemon/palettes/geodude_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +222 222 222 +255 255 255 +205 205 205 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +238 189 49 +205 164 24 +164 123 0 +106 65 0 +16 16 16 diff --git a/graphics/pokemon/palettes/girafarig_palette.pal b/graphics/pokemon/palettes/girafarig_palette.pal new file mode 100644 index 000000000..03e09de81 --- /dev/null +++ b/graphics/pokemon/palettes/girafarig_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +205 205 172 +255 255 255 +65 49 32 +90 82 57 +123 106 57 +164 148 82 +213 205 139 +189 139 16 +238 180 49 +255 222 65 +255 246 123 +16 16 16 +238 106 115 +255 172 189 +180 213 230 +255 0 255 diff --git a/graphics/pokemon/palettes/girafarig_shiny_palette.pal b/graphics/pokemon/palettes/girafarig_shiny_palette.pal new file mode 100644 index 000000000..d720557a7 --- /dev/null +++ b/graphics/pokemon/palettes/girafarig_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +205 205 172 +255 255 255 +65 49 32 +90 65 41 +123 90 49 +156 123 65 +205 172 106 +189 139 16 +230 156 41 +246 197 57 +255 230 82 +16 16 16 +82 164 230 +164 213 255 +180 213 230 +255 0 255 diff --git a/graphics/pokemon/palettes/glalie_palette.pal b/graphics/pokemon/palettes/glalie_palette.pal new file mode 100644 index 000000000..aeadcf782 --- /dev/null +++ b/graphics/pokemon/palettes/glalie_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +205 205 172 +255 255 255 +230 230 246 +205 205 222 +164 164 189 +123 123 148 +82 82 106 +164 205 255 +123 164 230 +74 139 197 +255 0 255 +205 205 213 +164 164 172 +123 123 131 +82 82 90 +41 41 57 diff --git a/graphics/pokemon/palettes/glalie_shiny_palette.pal b/graphics/pokemon/palettes/glalie_shiny_palette.pal new file mode 100644 index 000000000..c45ff937f --- /dev/null +++ b/graphics/pokemon/palettes/glalie_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +205 205 172 +255 255 255 +238 246 255 +213 230 238 +180 197 205 +148 164 172 +74 98 106 +255 148 90 +230 74 65 +205 8 41 +255 0 255 +205 205 213 +164 164 172 +123 123 131 +82 82 90 +0 0 0 diff --git a/graphics/pokemon/palettes/gligar_palette.pal b/graphics/pokemon/palettes/gligar_palette.pal new file mode 100644 index 000000000..2f5ba7645 --- /dev/null +++ b/graphics/pokemon/palettes/gligar_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +205 205 172 +90 90 90 +148 148 148 +90 65 123 +115 90 164 +180 131 213 +222 189 255 +246 222 255 +24 49 115 +16 90 148 +74 139 189 +98 197 238 +213 90 57 +255 148 106 +16 16 16 +255 255 255 diff --git a/graphics/pokemon/palettes/gligar_shiny_palette.pal b/graphics/pokemon/palettes/gligar_shiny_palette.pal new file mode 100644 index 000000000..9b1d7d308 --- /dev/null +++ b/graphics/pokemon/palettes/gligar_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +205 205 172 +90 90 90 +148 148 148 +57 65 123 +82 98 172 +131 156 213 +180 197 255 +222 238 246 +24 49 98 +32 65 139 +65 90 180 +82 156 222 +213 90 57 +255 148 106 +16 16 16 +255 255 255 diff --git a/graphics/pokemon/palettes/gloom_palette.pal b/graphics/pokemon/palettes/gloom_palette.pal new file mode 100644 index 000000000..9a3ea471b --- /dev/null +++ b/graphics/pokemon/palettes/gloom_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +222 222 222 +246 238 189 +255 189 65 +255 115 0 +197 106 41 +180 90 197 +213 205 180 +205 115 74 +172 82 57 +131 57 24 +98 49 0 +156 164 205 +123 131 164 +74 90 123 +16 49 74 +16 16 16 diff --git a/graphics/pokemon/palettes/gloom_shiny_palette.pal b/graphics/pokemon/palettes/gloom_shiny_palette.pal new file mode 100644 index 000000000..c5e913980 --- /dev/null +++ b/graphics/pokemon/palettes/gloom_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +222 222 222 +246 246 246 +255 213 131 +255 172 90 +213 131 49 +156 49 0 +213 213 213 +238 180 98 +197 139 57 +156 98 16 +115 57 16 +180 189 131 +139 148 90 +98 106 49 +57 65 8 +16 16 16 diff --git a/graphics/pokemon/palettes/golbat_palette.pal b/graphics/pokemon/palettes/golbat_palette.pal new file mode 100644 index 000000000..8c78d7375 --- /dev/null +++ b/graphics/pokemon/palettes/golbat_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +230 230 230 +255 255 255 +213 213 213 +98 98 98 +0 0 0 +172 205 255 +139 180 238 +98 131 205 +57 57 123 +205 106 180 +172 82 156 +148 57 123 +98 16 82 +255 0 255 +255 0 255 +255 0 255 diff --git a/graphics/pokemon/palettes/golbat_shiny_palette.pal b/graphics/pokemon/palettes/golbat_shiny_palette.pal new file mode 100644 index 000000000..7255f93b7 --- /dev/null +++ b/graphics/pokemon/palettes/golbat_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +230 230 230 +255 255 255 +213 213 213 +98 98 98 +0 0 0 +164 189 57 +123 148 0 +82 106 0 +41 65 0 +255 180 172 +238 139 131 +197 98 90 +139 41 32 +255 0 255 +255 0 255 +255 0 255 diff --git a/graphics/pokemon/palettes/goldeen_palette.pal b/graphics/pokemon/palettes/goldeen_palette.pal new file mode 100644 index 000000000..d88f14932 --- /dev/null +++ b/graphics/pokemon/palettes/goldeen_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +213 213 189 +222 222 230 +189 189 197 +139 139 148 +98 98 106 +255 197 123 +238 123 65 +213 65 16 +180 49 0 +131 16 0 +238 123 65 +213 65 16 +65 172 164 +0 106 98 +16 16 16 +255 255 255 diff --git a/graphics/pokemon/palettes/goldeen_shiny_palette.pal b/graphics/pokemon/palettes/goldeen_shiny_palette.pal new file mode 100644 index 000000000..d2a881523 --- /dev/null +++ b/graphics/pokemon/palettes/goldeen_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +213 213 189 +222 222 230 +189 189 197 +139 139 148 +98 98 106 +255 222 24 +255 156 8 +213 115 0 +172 74 0 +131 32 0 +255 180 139 +213 139 98 +65 172 164 +0 106 98 +16 16 16 +255 255 255 diff --git a/graphics/pokemon/palettes/golduck_palette.pal b/graphics/pokemon/palettes/golduck_palette.pal new file mode 100644 index 000000000..ca01ee358 --- /dev/null +++ b/graphics/pokemon/palettes/golduck_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +98 213 131 +255 255 255 +213 213 213 +255 172 172 +222 24 24 +139 0 0 +255 255 164 +213 213 106 +164 164 57 +115 115 16 +255 0 255 +164 197 255 +139 172 213 +123 123 180 +49 82 106 +16 16 16 diff --git a/graphics/pokemon/palettes/golduck_shiny_palette.pal b/graphics/pokemon/palettes/golduck_shiny_palette.pal new file mode 100644 index 000000000..858fc677c --- /dev/null +++ b/graphics/pokemon/palettes/golduck_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +238 238 238 +255 255 255 +197 197 197 +238 49 74 +222 24 24 +139 0 0 +246 189 197 +222 123 148 +189 98 106 +123 74 90 +255 0 255 +115 205 255 +74 164 230 +32 123 189 +0 49 106 +16 16 16 diff --git a/graphics/pokemon/palettes/golem_palette.pal b/graphics/pokemon/palettes/golem_palette.pal new file mode 100644 index 000000000..e373f3ade --- /dev/null +++ b/graphics/pokemon/palettes/golem_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 197 164 +255 255 255 +222 222 222 +180 0 0 +255 82 82 +180 189 98 +148 164 98 +106 123 65 +74 82 16 +238 205 115 +213 180 90 +156 139 57 +82 65 8 +255 0 255 +115 115 115 +16 16 16 diff --git a/graphics/pokemon/palettes/golem_shiny_palette.pal b/graphics/pokemon/palettes/golem_shiny_palette.pal new file mode 100644 index 000000000..41b80863c --- /dev/null +++ b/graphics/pokemon/palettes/golem_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +222 222 222 +255 255 255 +205 205 205 +180 0 0 +255 82 82 +213 148 82 +172 106 41 +131 65 0 +98 32 0 +255 213 180 +230 172 139 +189 131 98 +131 74 41 +255 0 255 +131 131 131 +16 16 16 diff --git a/graphics/pokemon/palettes/gorebyss_palette.pal b/graphics/pokemon/palettes/gorebyss_palette.pal new file mode 100644 index 000000000..432c0eccc --- /dev/null +++ b/graphics/pokemon/palettes/gorebyss_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +148 197 197 +255 255 255 +230 222 213 +205 189 172 +255 205 205 +246 172 189 +238 131 172 +213 98 148 +148 74 90 +131 90 131 +98 57 106 +123 106 98 +0 0 0 +205 115 255 +172 106 213 +148 90 172 diff --git a/graphics/pokemon/palettes/gorebyss_shiny_palette.pal b/graphics/pokemon/palettes/gorebyss_shiny_palette.pal new file mode 100644 index 000000000..693375005 --- /dev/null +++ b/graphics/pokemon/palettes/gorebyss_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +148 197 197 +255 255 255 +230 222 213 +205 189 172 +255 246 180 +255 222 98 +246 189 74 +213 156 41 +148 106 32 +131 90 131 +98 57 106 +123 106 98 +0 0 0 +205 115 255 +172 106 213 +148 90 172 diff --git a/graphics/pokemon/palettes/granbull_palette.pal b/graphics/pokemon/palettes/granbull_palette.pal new file mode 100644 index 000000000..b83b14d16 --- /dev/null +++ b/graphics/pokemon/palettes/granbull_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +205 205 172 +255 0 255 +255 0 255 +90 57 82 +156 98 148 +213 115 213 +230 156 238 +238 189 255 +255 0 255 +131 57 0 +230 197 131 +16 16 16 +49 57 65 +82 90 90 +164 164 156 +255 255 255 diff --git a/graphics/pokemon/palettes/granbull_shiny_palette.pal b/graphics/pokemon/palettes/granbull_shiny_palette.pal new file mode 100644 index 000000000..a8dfec728 --- /dev/null +++ b/graphics/pokemon/palettes/granbull_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +205 205 172 +255 0 255 +255 0 255 +98 82 65 +148 115 90 +205 172 131 +230 205 172 +246 222 189 +255 0 255 +90 82 0 +205 189 106 +16 16 16 +49 57 65 +82 90 90 +164 164 156 +255 255 255 diff --git a/graphics/pokemon/palettes/graveler_palette.pal b/graphics/pokemon/palettes/graveler_palette.pal new file mode 100644 index 000000000..766d69f41 --- /dev/null +++ b/graphics/pokemon/palettes/graveler_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +222 222 222 +255 255 255 +205 205 205 +148 148 148 +16 16 16 +238 49 49 +189 32 57 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +197 213 131 +164 180 115 +115 131 82 +82 74 16 diff --git a/graphics/pokemon/palettes/graveler_shiny_palette.pal b/graphics/pokemon/palettes/graveler_shiny_palette.pal new file mode 100644 index 000000000..42027a8db --- /dev/null +++ b/graphics/pokemon/palettes/graveler_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +222 222 222 +255 255 255 +205 205 205 +148 148 148 +16 16 16 +238 49 49 +189 32 57 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +205 148 41 +164 106 0 +123 65 0 +82 24 0 diff --git a/graphics/pokemon/palettes/grimer_palette.pal b/graphics/pokemon/palettes/grimer_palette.pal new file mode 100644 index 000000000..0aacf859a --- /dev/null +++ b/graphics/pokemon/palettes/grimer_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +238 238 238 +213 213 222 +172 180 189 +131 139 156 +65 74 90 +230 189 222 +197 156 180 +148 106 156 +90 49 115 +238 222 238 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +16 16 16 +255 255 255 diff --git a/graphics/pokemon/palettes/grimer_shiny_palette.pal b/graphics/pokemon/palettes/grimer_shiny_palette.pal new file mode 100644 index 000000000..546d2e753 --- /dev/null +++ b/graphics/pokemon/palettes/grimer_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +238 238 238 +213 213 222 +172 180 189 +131 139 156 +65 74 90 +197 238 156 +180 213 139 +139 172 98 +82 115 41 +222 246 180 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +16 16 16 +255 255 255 diff --git a/graphics/pokemon/palettes/groudon_palette.pal b/graphics/pokemon/palettes/groudon_palette.pal new file mode 100644 index 000000000..24c99e510 --- /dev/null +++ b/graphics/pokemon/palettes/groudon_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +49 164 82 +205 57 74 +172 148 164 +156 123 139 +123 90 98 +255 123 131 +123 32 41 +255 32 41 +172 41 57 +255 205 49 +197 197 205 +255 255 255 +255 189 189 +156 106 49 +57 57 57 +16 16 16 diff --git a/graphics/pokemon/palettes/groudon_shiny_palette.pal b/graphics/pokemon/palettes/groudon_shiny_palette.pal new file mode 100644 index 000000000..6c0a16585 --- /dev/null +++ b/graphics/pokemon/palettes/groudon_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +49 164 82 +131 131 8 +172 148 164 +156 123 139 +123 90 98 +230 230 106 +98 98 0 +197 197 74 +164 164 41 +255 205 49 +197 197 205 +255 255 255 +255 255 139 +156 106 49 +57 57 57 +16 16 16 diff --git a/graphics/pokemon/palettes/grovyle_palette.pal b/graphics/pokemon/palettes/grovyle_palette.pal new file mode 100644 index 000000000..a1e6181fc --- /dev/null +++ b/graphics/pokemon/palettes/grovyle_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +197 148 131 +16 82 74 +90 180 106 +139 230 148 +189 255 180 +57 131 65 +131 41 49 +230 65 41 +255 115 82 +255 222 82 +57 131 148 +189 65 65 +213 139 82 +82 164 189 +0 0 0 +255 238 255 diff --git a/graphics/pokemon/palettes/grovyle_shiny_palette.pal b/graphics/pokemon/palettes/grovyle_shiny_palette.pal new file mode 100644 index 000000000..c61afa4a3 --- /dev/null +++ b/graphics/pokemon/palettes/grovyle_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +197 148 131 +148 74 49 +74 164 148 +148 205 213 +180 230 238 +65 123 115 +205 156 123 +238 189 156 +255 238 197 +255 222 82 +213 82 57 +180 131 98 +213 139 82 +255 106 82 +0 0 0 +255 238 255 diff --git a/graphics/pokemon/palettes/growlithe_palette.pal b/graphics/pokemon/palettes/growlithe_palette.pal new file mode 100644 index 000000000..bd55be2a7 --- /dev/null +++ b/graphics/pokemon/palettes/growlithe_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +230 230 230 +255 255 246 +222 222 213 +106 106 106 +255 0 255 +255 0 255 +255 0 255 +255 246 180 +230 213 148 +205 180 115 +115 98 32 +255 197 82 +238 139 74 +197 82 32 +115 57 16 +16 16 16 diff --git a/graphics/pokemon/palettes/growlithe_shiny_palette.pal b/graphics/pokemon/palettes/growlithe_shiny_palette.pal new file mode 100644 index 000000000..0604c9c25 --- /dev/null +++ b/graphics/pokemon/palettes/growlithe_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +230 230 230 +255 255 246 +222 222 213 +82 82 82 +255 0 255 +255 0 255 +255 0 255 +255 246 180 +230 213 148 +180 164 106 +115 98 32 +255 238 82 +230 197 41 +189 156 0 +123 90 0 +16 16 16 diff --git a/graphics/pokemon/palettes/grumpig_palette.pal b/graphics/pokemon/palettes/grumpig_palette.pal new file mode 100644 index 000000000..c49601f91 --- /dev/null +++ b/graphics/pokemon/palettes/grumpig_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +148 197 148 +148 148 148 +123 123 123 +98 98 98 +74 74 74 +255 180 213 +238 139 172 +213 106 131 +230 172 238 +205 139 213 +180 115 189 +123 82 139 +156 74 98 +246 205 255 +0 0 0 +255 255 255 diff --git a/graphics/pokemon/palettes/grumpig_shiny_palette.pal b/graphics/pokemon/palettes/grumpig_shiny_palette.pal new file mode 100644 index 000000000..b9c88ae3d --- /dev/null +++ b/graphics/pokemon/palettes/grumpig_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +148 197 148 +172 172 172 +131 131 131 +82 82 82 +57 57 57 +255 180 213 +238 139 172 +213 106 131 +246 222 106 +213 189 65 +189 164 41 +131 123 0 +156 74 98 +255 238 172 +0 0 0 +255 255 255 diff --git a/graphics/pokemon/palettes/gulpin_palette.pal b/graphics/pokemon/palettes/gulpin_palette.pal new file mode 100644 index 000000000..588be1e4a --- /dev/null +++ b/graphics/pokemon/palettes/gulpin_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +98 189 131 +74 106 57 +131 164 115 +164 222 148 +197 238 180 +156 189 139 +65 65 65 +106 106 106 +156 156 156 +172 148 74 +205 172 16 +246 222 90 +255 238 164 +255 148 123 +0 0 0 +0 0 0 diff --git a/graphics/pokemon/palettes/gulpin_shiny_palette.pal b/graphics/pokemon/palettes/gulpin_shiny_palette.pal new file mode 100644 index 000000000..83373f072 --- /dev/null +++ b/graphics/pokemon/palettes/gulpin_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +98 189 131 +74 106 57 +98 123 164 +131 180 238 +156 213 255 +98 148 197 +65 65 65 +106 106 106 +156 156 156 +164 49 32 +180 65 49 +222 98 49 +255 139 82 +255 148 123 +0 0 0 +0 0 0 diff --git a/graphics/pokemon/palettes/gyarados_palette.pal b/graphics/pokemon/palettes/gyarados_palette.pal new file mode 100644 index 000000000..2a74de808 --- /dev/null +++ b/graphics/pokemon/palettes/gyarados_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +139 213 180 +222 230 246 +172 180 197 +106 123 148 +139 189 255 +115 156 230 +123 131 164 +57 57 98 +255 230 156 +197 197 123 +98 106 57 +255 131 123 +205 49 49 +148 32 0 +0 0 0 +255 255 255 diff --git a/graphics/pokemon/palettes/gyarados_shiny_palette.pal b/graphics/pokemon/palettes/gyarados_shiny_palette.pal new file mode 100644 index 000000000..d9f55f451 --- /dev/null +++ b/graphics/pokemon/palettes/gyarados_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +205 205 172 +222 230 246 +172 180 197 +106 123 148 +255 197 90 +255 139 65 +213 90 49 +123 57 57 +255 255 148 +205 205 131 +106 106 90 +255 98 57 +205 49 49 +148 32 0 +0 0 0 +255 255 255 diff --git a/graphics/pokemon/palettes/hariyama_palette.pal b/graphics/pokemon/palettes/hariyama_palette.pal new file mode 100644 index 000000000..99b5902d9 --- /dev/null +++ b/graphics/pokemon/palettes/hariyama_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 164 115 +246 230 197 +230 213 164 +197 172 115 +139 106 82 +238 164 106 +213 131 90 +172 98 65 +131 74 49 +98 98 148 +49 49 98 +246 213 115 +238 189 82 +205 156 65 +24 24 24 +255 255 255 diff --git a/graphics/pokemon/palettes/hariyama_shiny_palette.pal b/graphics/pokemon/palettes/hariyama_shiny_palette.pal new file mode 100644 index 000000000..14281f812 --- /dev/null +++ b/graphics/pokemon/palettes/hariyama_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 164 115 +255 238 172 +246 205 131 +246 189 82 +205 139 57 +222 189 197 +189 156 164 +156 106 131 +115 82 90 +98 98 148 +49 49 98 +255 90 74 +205 82 65 +156 82 65 +24 24 24 +255 255 255 diff --git a/graphics/pokemon/palettes/haunter_palette.pal b/graphics/pokemon/palettes/haunter_palette.pal new file mode 100644 index 000000000..5f1f2573b --- /dev/null +++ b/graphics/pokemon/palettes/haunter_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +213 213 189 +197 148 222 +148 106 180 +98 82 131 +90 57 115 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +222 49 49 +180 24 24 +98 16 16 +222 222 222 +115 115 115 +16 16 16 +255 255 255 diff --git a/graphics/pokemon/palettes/haunter_shiny_palette.pal b/graphics/pokemon/palettes/haunter_shiny_palette.pal new file mode 100644 index 000000000..d6cab2588 --- /dev/null +++ b/graphics/pokemon/palettes/haunter_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +213 213 189 +213 164 222 +197 131 205 +131 90 164 +82 49 98 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +74 156 197 +32 115 156 +0 65 106 +213 213 213 +115 115 115 +16 16 16 +255 255 255 diff --git a/graphics/pokemon/palettes/heracross_palette.pal b/graphics/pokemon/palettes/heracross_palette.pal new file mode 100644 index 000000000..06fe289a5 --- /dev/null +++ b/graphics/pokemon/palettes/heracross_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +205 205 172 +255 255 255 +156 180 255 +123 139 222 +98 106 180 +49 57 98 +255 0 255 +255 255 139 +255 222 90 +197 164 41 +139 106 0 +255 0 255 +213 213 213 +156 156 156 +106 106 106 +16 16 16 diff --git a/graphics/pokemon/palettes/heracross_shiny_palette.pal b/graphics/pokemon/palettes/heracross_shiny_palette.pal new file mode 100644 index 000000000..c85ace38b --- /dev/null +++ b/graphics/pokemon/palettes/heracross_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +205 205 172 +255 255 255 +238 156 213 +205 123 189 +164 82 156 +98 57 98 +255 0 255 +255 255 139 +255 222 90 +197 164 41 +139 106 0 +255 0 255 +213 213 213 +156 156 156 +106 106 106 +16 16 16 diff --git a/graphics/pokemon/palettes/hitmonchan_palette.pal b/graphics/pokemon/palettes/hitmonchan_palette.pal new file mode 100644 index 000000000..77c20d85a --- /dev/null +++ b/graphics/pokemon/palettes/hitmonchan_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +213 213 213 +255 255 255 +222 205 222 +197 180 197 +164 148 164 +115 98 115 +255 148 90 +230 98 57 +189 49 16 +139 32 0 +255 0 255 +238 213 156 +205 180 123 +164 139 82 +106 82 16 +16 16 16 diff --git a/graphics/pokemon/palettes/hitmonchan_shiny_palette.pal b/graphics/pokemon/palettes/hitmonchan_shiny_palette.pal new file mode 100644 index 000000000..2e4a28f0c --- /dev/null +++ b/graphics/pokemon/palettes/hitmonchan_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +213 213 213 +255 255 255 +222 205 222 +197 180 197 +164 148 164 +115 98 115 +90 148 213 +49 106 172 +8 65 131 +0 24 90 +255 0 255 +238 230 139 +197 189 98 +156 148 57 +98 90 0 +16 16 16 diff --git a/graphics/pokemon/palettes/hitmonlee_palette.pal b/graphics/pokemon/palettes/hitmonlee_palette.pal new file mode 100644 index 000000000..36a7a03a4 --- /dev/null +++ b/graphics/pokemon/palettes/hitmonlee_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +213 213 189 +230 180 148 +205 164 131 +164 123 90 +131 90 57 +98 57 24 +255 0 255 +255 0 255 +230 230 189 +197 189 164 +115 98 98 +255 238 139 +238 205 115 +115 123 32 +41 41 41 +255 255 255 diff --git a/graphics/pokemon/palettes/hitmonlee_shiny_palette.pal b/graphics/pokemon/palettes/hitmonlee_shiny_palette.pal new file mode 100644 index 000000000..74e6c6452 --- /dev/null +++ b/graphics/pokemon/palettes/hitmonlee_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +213 213 189 +172 180 74 +131 139 32 +90 98 0 +49 57 0 +32 41 0 +255 0 255 +255 0 255 +189 164 139 +148 123 98 +106 82 57 +238 255 148 +197 205 115 +115 123 32 +41 41 41 +255 255 255 diff --git a/graphics/pokemon/palettes/hitmontop_palette.pal b/graphics/pokemon/palettes/hitmontop_palette.pal new file mode 100644 index 000000000..b49c96760 --- /dev/null +++ b/graphics/pokemon/palettes/hitmontop_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +205 205 172 +255 255 255 +255 238 156 +230 205 123 +189 164 82 +131 98 16 +255 0 255 +139 213 255 +98 172 238 +74 131 205 +82 90 148 +255 0 255 +205 205 205 +148 148 156 +98 98 106 +16 16 16 diff --git a/graphics/pokemon/palettes/hitmontop_shiny_palette.pal b/graphics/pokemon/palettes/hitmontop_shiny_palette.pal new file mode 100644 index 000000000..8c6bbd31f --- /dev/null +++ b/graphics/pokemon/palettes/hitmontop_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +205 205 172 +255 255 255 +255 246 205 +230 222 180 +180 172 148 +131 90 65 +255 0 255 +246 148 222 +205 106 189 +172 74 164 +115 49 123 +255 0 255 +205 205 205 +148 148 156 +98 98 106 +16 16 16 diff --git a/graphics/pokemon/palettes/ho_oh_palette.pal b/graphics/pokemon/palettes/ho_oh_palette.pal new file mode 100644 index 000000000..f4b583541 --- /dev/null +++ b/graphics/pokemon/palettes/ho_oh_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +205 205 164 +255 255 255 +255 172 0 +255 90 0 +205 65 0 +156 16 0 +255 238 131 +255 230 0 +230 172 0 +164 106 0 +156 246 172 +65 213 82 +16 148 16 +197 197 197 +106 106 106 +16 16 16 diff --git a/graphics/pokemon/palettes/ho_oh_shiny_palette.pal b/graphics/pokemon/palettes/ho_oh_shiny_palette.pal new file mode 100644 index 000000000..2c14ff9e4 --- /dev/null +++ b/graphics/pokemon/palettes/ho_oh_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +205 205 164 +255 255 255 +255 230 57 +255 172 24 +205 123 24 +148 74 49 +238 238 238 +222 222 222 +180 180 189 +123 123 139 +255 172 0 +255 74 0 +156 41 24 +213 213 222 +123 106 65 +16 16 16 diff --git a/graphics/pokemon/palettes/hoothoot_palette.pal b/graphics/pokemon/palettes/hoothoot_palette.pal new file mode 100644 index 000000000..f1a3ee54e --- /dev/null +++ b/graphics/pokemon/palettes/hoothoot_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +205 205 172 +255 255 255 +246 255 189 +230 246 164 +222 213 90 +205 189 41 +172 156 32 +148 131 24 +123 106 16 +90 74 0 +255 230 172 +255 180 106 +230 123 41 +123 123 123 +82 82 82 +16 16 16 diff --git a/graphics/pokemon/palettes/hoothoot_shiny_palette.pal b/graphics/pokemon/palettes/hoothoot_shiny_palette.pal new file mode 100644 index 000000000..3b951e004 --- /dev/null +++ b/graphics/pokemon/palettes/hoothoot_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +205 205 172 +255 255 255 +255 255 189 +238 238 106 +255 238 115 +246 222 57 +230 189 49 +213 148 41 +197 131 32 +139 82 32 +255 230 172 +255 180 106 +230 123 41 +123 123 123 +82 82 82 +16 16 16 diff --git a/graphics/pokemon/palettes/hoppip_palette.pal b/graphics/pokemon/palettes/hoppip_palette.pal new file mode 100644 index 000000000..578494117 --- /dev/null +++ b/graphics/pokemon/palettes/hoppip_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +222 222 222 +255 255 255 +255 156 115 +255 98 82 +213 65 16 +164 16 0 +255 0 255 +131 230 57 +98 205 57 +65 164 32 +32 98 16 +255 0 255 +255 255 82 +246 197 0 +255 0 255 +16 16 16 diff --git a/graphics/pokemon/palettes/hoppip_shiny_palette.pal b/graphics/pokemon/palettes/hoppip_shiny_palette.pal new file mode 100644 index 000000000..c70c55c99 --- /dev/null +++ b/graphics/pokemon/palettes/hoppip_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +205 205 172 +255 255 255 +148 205 32 +106 180 8 +90 139 41 +57 90 16 +255 0 255 +189 246 57 +131 222 57 +82 172 24 +32 98 16 +255 0 255 +255 255 82 +246 197 0 +255 0 255 +16 16 16 diff --git a/graphics/pokemon/palettes/horsea_palette.pal b/graphics/pokemon/palettes/horsea_palette.pal new file mode 100644 index 000000000..d0924f3ac --- /dev/null +++ b/graphics/pokemon/palettes/horsea_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +213 213 213 +255 0 255 +255 0 255 +98 82 41 +156 131 74 +189 222 255 +164 197 238 +131 148 180 +57 82 98 +255 255 172 +230 205 74 +255 115 115 +197 41 41 +255 0 255 +16 16 16 +255 255 255 diff --git a/graphics/pokemon/palettes/horsea_shiny_palette.pal b/graphics/pokemon/palettes/horsea_shiny_palette.pal new file mode 100644 index 000000000..73eec42ef --- /dev/null +++ b/graphics/pokemon/palettes/horsea_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +213 213 213 +255 0 255 +255 0 255 +123 82 41 +172 123 82 +115 205 213 +74 164 172 +32 123 131 +16 74 82 +255 197 172 +238 172 139 +255 115 115 +197 41 41 +255 0 255 +16 16 16 +255 255 255 diff --git a/graphics/pokemon/palettes/houndoom_palette.pal b/graphics/pokemon/palettes/houndoom_palette.pal new file mode 100644 index 000000000..676369d07 --- /dev/null +++ b/graphics/pokemon/palettes/houndoom_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +205 205 172 +255 255 255 +139 123 123 +82 74 74 +57 49 49 +41 32 32 +255 213 139 +238 164 82 +189 123 57 +148 82 24 +255 106 49 +180 49 8 +255 0 255 +255 0 255 +180 164 164 +16 16 16 diff --git a/graphics/pokemon/palettes/houndoom_shiny_palette.pal b/graphics/pokemon/palettes/houndoom_shiny_palette.pal new file mode 100644 index 000000000..7e7aa56bf --- /dev/null +++ b/graphics/pokemon/palettes/houndoom_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +205 205 172 +255 255 255 +123 156 230 +74 98 180 +49 65 139 +65 74 90 +255 230 197 +213 172 148 +172 131 90 +123 82 65 +255 106 49 +180 49 8 +255 0 255 +255 0 255 +222 197 213 +16 16 16 diff --git a/graphics/pokemon/palettes/houndour_palette.pal b/graphics/pokemon/palettes/houndour_palette.pal new file mode 100644 index 000000000..676369d07 --- /dev/null +++ b/graphics/pokemon/palettes/houndour_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +205 205 172 +255 255 255 +139 123 123 +82 74 74 +57 49 49 +41 32 32 +255 213 139 +238 164 82 +189 123 57 +148 82 24 +255 106 49 +180 49 8 +255 0 255 +255 0 255 +180 164 164 +16 16 16 diff --git a/graphics/pokemon/palettes/houndour_shiny_palette.pal b/graphics/pokemon/palettes/houndour_shiny_palette.pal new file mode 100644 index 000000000..4197f8de7 --- /dev/null +++ b/graphics/pokemon/palettes/houndour_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +205 205 172 +255 255 255 +123 164 197 +82 123 164 +57 82 115 +49 65 82 +255 230 197 +213 172 148 +172 131 90 +123 82 65 +255 106 49 +180 49 8 +255 0 255 +255 0 255 +222 189 197 +16 16 16 diff --git a/graphics/pokemon/palettes/huntail_palette.pal b/graphics/pokemon/palettes/huntail_palette.pal new file mode 100644 index 000000000..192061e01 --- /dev/null +++ b/graphics/pokemon/palettes/huntail_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +49 106 189 +255 255 255 +238 180 98 +222 148 0 +156 106 65 +180 238 238 +156 222 246 +123 197 222 +74 156 180 +49 98 123 +0 0 0 +255 131 148 +205 115 148 +148 57 90 +213 197 213 +164 131 148 diff --git a/graphics/pokemon/palettes/huntail_shiny_palette.pal b/graphics/pokemon/palettes/huntail_shiny_palette.pal new file mode 100644 index 000000000..713c54adf --- /dev/null +++ b/graphics/pokemon/palettes/huntail_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +49 106 189 +255 255 255 +255 222 115 +230 156 0 +164 115 65 +172 255 172 +148 230 148 +115 197 115 +57 148 82 +32 106 57 +0 0 0 +255 131 148 +205 115 148 +148 57 90 +213 197 213 +164 131 148 diff --git a/graphics/pokemon/palettes/hypno_palette.pal b/graphics/pokemon/palettes/hypno_palette.pal new file mode 100644 index 000000000..a91224353 --- /dev/null +++ b/graphics/pokemon/palettes/hypno_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +213 213 189 +255 238 156 +255 222 98 +205 180 106 +98 74 32 +189 156 82 +213 197 222 +115 106 131 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +156 156 156 +98 98 98 +16 16 16 +255 255 255 diff --git a/graphics/pokemon/palettes/hypno_shiny_palette.pal b/graphics/pokemon/palettes/hypno_shiny_palette.pal new file mode 100644 index 000000000..bf99b49c7 --- /dev/null +++ b/graphics/pokemon/palettes/hypno_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +213 213 189 +255 180 213 +238 139 172 +197 98 131 +123 57 57 +172 98 106 +213 213 222 +115 106 131 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +156 156 156 +98 98 98 +16 16 16 +255 255 255 diff --git a/graphics/pokemon/palettes/igglybuff_palette.pal b/graphics/pokemon/palettes/igglybuff_palette.pal new file mode 100644 index 000000000..9b5beb079 --- /dev/null +++ b/graphics/pokemon/palettes/igglybuff_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +205 205 172 +255 255 255 +255 205 156 +255 148 115 +222 115 65 +197 74 0 +148 32 16 +255 230 180 +255 0 255 +205 0 0 +156 0 0 +205 0 0 +156 0 0 +98 0 0 +106 106 106 +16 16 16 diff --git a/graphics/pokemon/palettes/igglybuff_shiny_palette.pal b/graphics/pokemon/palettes/igglybuff_shiny_palette.pal new file mode 100644 index 000000000..fd1f6fbf8 --- /dev/null +++ b/graphics/pokemon/palettes/igglybuff_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +205 205 172 +255 255 255 +255 213 238 +246 172 197 +222 115 139 +180 57 90 +156 24 49 +255 238 238 +255 0 255 +205 0 0 +156 0 0 +90 197 24 +74 172 24 +41 82 0 +106 106 106 +16 16 16 diff --git a/graphics/pokemon/palettes/illumise_palette.pal b/graphics/pokemon/palettes/illumise_palette.pal new file mode 100644 index 000000000..63c55bbc0 --- /dev/null +++ b/graphics/pokemon/palettes/illumise_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +49 164 82 +0 90 213 +123 123 123 +74 74 74 +0 0 0 +205 139 222 +180 98 205 +139 82 156 +49 41 49 +255 230 115 +230 180 74 +156 131 82 +172 197 238 +139 172 205 +90 106 139 +255 255 255 diff --git a/graphics/pokemon/palettes/illumise_shiny_palette.pal b/graphics/pokemon/palettes/illumise_shiny_palette.pal new file mode 100644 index 000000000..78bdbdc22 --- /dev/null +++ b/graphics/pokemon/palettes/illumise_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +49 164 82 +0 90 213 +123 123 123 +74 74 74 +0 0 0 +255 230 115 +230 180 74 +189 139 82 +49 41 49 +255 148 82 +222 90 32 +164 49 32 +131 205 255 +90 172 230 +32 115 189 +255 255 255 diff --git a/graphics/pokemon/palettes/ivysaur_palette.pal b/graphics/pokemon/palettes/ivysaur_palette.pal new file mode 100644 index 000000000..82c2ec525 --- /dev/null +++ b/graphics/pokemon/palettes/ivysaur_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +205 205 172 +255 255 255 +98 139 49 +255 189 180 +255 123 123 +213 90 139 +139 230 222 +123 205 189 +131 230 90 +115 189 41 +82 139 148 +16 16 16 +24 90 82 +205 123 57 +139 90 57 +189 41 65 diff --git a/graphics/pokemon/palettes/ivysaur_shiny_palette.pal b/graphics/pokemon/palettes/ivysaur_shiny_palette.pal new file mode 100644 index 000000000..75baf6a46 --- /dev/null +++ b/graphics/pokemon/palettes/ivysaur_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +205 205 172 +255 255 255 +90 139 49 +255 255 82 +255 222 8 +222 180 0 +205 238 65 +164 213 49 +123 222 32 +82 180 0 +123 172 8 +16 16 16 +74 90 24 +222 139 65 +180 131 16 +139 115 16 diff --git a/graphics/pokemon/palettes/jigglypuff_palette.pal b/graphics/pokemon/palettes/jigglypuff_palette.pal new file mode 100644 index 000000000..8f97b28b9 --- /dev/null +++ b/graphics/pokemon/palettes/jigglypuff_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +213 213 180 +255 255 255 +205 189 255 +148 131 255 +115 98 222 +65 49 156 +156 106 32 +115 65 24 +230 230 230 +164 49 0 +213 57 49 +16 16 16 +255 205 197 +255 172 164 +230 115 115 +164 74 74 diff --git a/graphics/pokemon/palettes/jigglypuff_shiny_palette.pal b/graphics/pokemon/palettes/jigglypuff_shiny_palette.pal new file mode 100644 index 000000000..c6c39e2dd --- /dev/null +++ b/graphics/pokemon/palettes/jigglypuff_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +213 213 180 +255 255 255 +164 230 148 +98 230 131 +90 197 106 +57 156 65 +156 106 32 +115 65 24 +230 230 230 +164 49 0 +213 57 49 +16 16 16 +255 222 238 +246 189 230 +222 156 189 +131 82 106 diff --git a/graphics/pokemon/palettes/jirachi_palette.pal b/graphics/pokemon/palettes/jirachi_palette.pal new file mode 100644 index 000000000..ba0b7a6b1 --- /dev/null +++ b/graphics/pokemon/palettes/jirachi_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 197 164 +205 213 222 +156 164 172 +41 65 115 +230 238 246 +82 115 255 +131 164 255 +106 115 115 +197 0 0 +238 82 82 +180 139 49 +230 197 82 +255 230 90 +255 246 148 +255 255 255 +0 0 0 diff --git a/graphics/pokemon/palettes/jirachi_shiny_palette.pal b/graphics/pokemon/palettes/jirachi_shiny_palette.pal new file mode 100644 index 000000000..219b9ac57 --- /dev/null +++ b/graphics/pokemon/palettes/jirachi_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 197 164 +255 180 164 +156 164 172 +41 65 115 +255 230 230 +230 74 49 +255 123 106 +123 98 90 +197 0 0 +238 82 82 +180 139 49 +230 197 82 +255 230 90 +255 246 148 +255 255 255 +0 0 0 diff --git a/graphics/pokemon/palettes/jolteon_palette.pal b/graphics/pokemon/palettes/jolteon_palette.pal new file mode 100644 index 000000000..c4f6d9021 --- /dev/null +++ b/graphics/pokemon/palettes/jolteon_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +213 213 189 +246 238 115 +255 222 49 +213 189 49 +156 139 57 +106 82 32 +255 0 255 +189 49 49 +106 0 0 +255 0 255 +255 0 255 +222 230 222 +139 148 164 +98 98 98 +41 41 41 +255 255 255 diff --git a/graphics/pokemon/palettes/jolteon_shiny_palette.pal b/graphics/pokemon/palettes/jolteon_shiny_palette.pal new file mode 100644 index 000000000..ece1425c3 --- /dev/null +++ b/graphics/pokemon/palettes/jolteon_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +213 213 189 +222 255 131 +197 238 32 +156 197 0 +123 164 0 +74 115 0 +255 0 255 +189 49 49 +106 0 0 +255 0 255 +255 0 255 +222 222 230 +139 148 164 +98 98 98 +41 41 41 +255 255 255 diff --git a/graphics/pokemon/palettes/jumpluff_palette.pal b/graphics/pokemon/palettes/jumpluff_palette.pal new file mode 100644 index 000000000..422184976 --- /dev/null +++ b/graphics/pokemon/palettes/jumpluff_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +205 205 172 +98 65 8 +123 164 255 +90 131 213 +65 106 197 +57 82 148 +16 16 16 +255 255 222 +246 238 180 +238 222 148 +205 189 115 +156 139 82 +255 139 41 +213 65 0 +65 230 57 +49 156 49 diff --git a/graphics/pokemon/palettes/jumpluff_shiny_palette.pal b/graphics/pokemon/palettes/jumpluff_shiny_palette.pal new file mode 100644 index 000000000..4885690b6 --- /dev/null +++ b/graphics/pokemon/palettes/jumpluff_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +205 205 172 +115 57 98 +255 205 172 +246 164 164 +222 123 156 +164 74 106 +16 16 16 +255 238 246 +246 213 238 +222 172 213 +205 139 172 +164 98 164 +255 139 41 +213 65 0 +65 230 57 +49 156 49 diff --git a/graphics/pokemon/palettes/jynx_palette.pal b/graphics/pokemon/palettes/jynx_palette.pal new file mode 100644 index 000000000..71a25303e --- /dev/null +++ b/graphics/pokemon/palettes/jynx_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +213 213 180 +213 213 213 +98 98 115 +213 139 238 +172 106 197 +148 74 172 +255 164 156 +238 65 65 +180 74 74 +106 8 0 +255 246 172 +255 238 82 +213 197 57 +123 106 24 +0 0 0 +255 255 255 diff --git a/graphics/pokemon/palettes/jynx_shiny_palette.pal b/graphics/pokemon/palettes/jynx_shiny_palette.pal new file mode 100644 index 000000000..b6838c13d --- /dev/null +++ b/graphics/pokemon/palettes/jynx_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +213 213 180 +213 213 213 +98 98 115 +213 139 238 +172 106 197 +148 74 172 +255 172 230 +255 131 189 +213 90 148 +148 24 82 +255 230 222 +213 189 180 +172 148 139 +115 90 82 +0 0 0 +255 255 255 diff --git a/graphics/pokemon/palettes/kabuto_palette.pal b/graphics/pokemon/palettes/kabuto_palette.pal new file mode 100644 index 000000000..4264dd8a3 --- /dev/null +++ b/graphics/pokemon/palettes/kabuto_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +205 205 205 +255 255 255 +180 180 180 +255 197 197 +238 74 65 +255 0 255 +255 255 139 +255 213 49 +222 180 41 +164 106 0 +255 0 255 +230 172 65 +189 139 41 +156 98 24 +106 57 8 +16 16 16 diff --git a/graphics/pokemon/palettes/kabuto_shiny_palette.pal b/graphics/pokemon/palettes/kabuto_shiny_palette.pal new file mode 100644 index 000000000..8e3eaad12 --- /dev/null +++ b/graphics/pokemon/palettes/kabuto_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +205 205 205 +255 255 255 +180 180 180 +255 172 164 +238 74 65 +255 0 255 +255 255 139 +255 213 49 +238 180 32 +164 106 0 +255 0 255 +180 230 74 +156 205 57 +115 164 32 +82 123 16 +16 16 16 diff --git a/graphics/pokemon/palettes/kabutops_palette.pal b/graphics/pokemon/palettes/kabutops_palette.pal new file mode 100644 index 000000000..0aa390135 --- /dev/null +++ b/graphics/pokemon/palettes/kabutops_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +213 213 213 +255 255 255 +230 222 197 +189 189 180 +156 156 148 +106 106 106 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +246 222 148 +222 189 115 +172 148 90 +90 74 24 +16 16 16 diff --git a/graphics/pokemon/palettes/kabutops_shiny_palette.pal b/graphics/pokemon/palettes/kabutops_shiny_palette.pal new file mode 100644 index 000000000..9217ab55d --- /dev/null +++ b/graphics/pokemon/palettes/kabutops_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +213 213 213 +255 255 255 +222 222 213 +189 189 180 +156 156 148 +106 106 106 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +222 255 90 +189 222 74 +148 180 41 +82 115 0 +16 16 16 diff --git a/graphics/pokemon/palettes/kadabra_palette.pal b/graphics/pokemon/palettes/kadabra_palette.pal new file mode 100644 index 000000000..aedab9d53 --- /dev/null +++ b/graphics/pokemon/palettes/kadabra_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +230 230 230 +255 255 255 +90 90 90 +246 139 139 +230 57 41 +213 180 82 +172 131 41 +139 82 16 +106 65 8 +222 222 222 +180 180 180 +255 255 189 +255 238 41 +222 189 16 +131 106 16 +16 16 16 diff --git a/graphics/pokemon/palettes/kadabra_shiny_palette.pal b/graphics/pokemon/palettes/kadabra_shiny_palette.pal new file mode 100644 index 000000000..f19dbf469 --- /dev/null +++ b/graphics/pokemon/palettes/kadabra_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +106 205 148 +255 255 255 +90 90 90 +246 139 139 +246 65 49 +230 164 180 +205 123 172 +156 82 115 +90 49 49 +222 222 222 +180 180 180 +255 255 197 +255 238 139 +246 189 82 +123 98 0 +16 16 16 diff --git a/graphics/pokemon/palettes/kakuna_palette.pal b/graphics/pokemon/palettes/kakuna_palette.pal new file mode 100644 index 000000000..fe51d0fbf --- /dev/null +++ b/graphics/pokemon/palettes/kakuna_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +222 222 222 +255 255 255 +255 230 156 +246 222 90 +205 189 82 +164 139 24 +139 123 0 +255 0 255 +255 0 255 +255 0 255 +115 115 115 +57 57 57 +16 16 16 +255 0 255 +255 0 255 +255 0 255 diff --git a/graphics/pokemon/palettes/kakuna_shiny_palette.pal b/graphics/pokemon/palettes/kakuna_shiny_palette.pal new file mode 100644 index 000000000..0a45b029a --- /dev/null +++ b/graphics/pokemon/palettes/kakuna_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +205 205 172 +255 255 255 +222 238 90 +197 230 49 +156 189 8 +115 148 0 +74 106 0 +255 0 255 +255 0 255 +255 0 255 +106 106 106 +57 57 57 +16 16 16 +255 0 255 +255 0 255 +255 0 255 diff --git a/graphics/pokemon/palettes/kangaskhan_palette.pal b/graphics/pokemon/palettes/kangaskhan_palette.pal new file mode 100644 index 000000000..ff63a7ac3 --- /dev/null +++ b/graphics/pokemon/palettes/kangaskhan_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +213 213 213 +255 255 255 +213 213 213 +255 246 139 +222 213 106 +189 24 24 +16 16 16 +222 180 213 +164 115 156 +180 189 131 +139 148 98 +106 106 82 +213 189 131 +189 164 106 +156 115 90 +82 65 16 diff --git a/graphics/pokemon/palettes/kangaskhan_shiny_palette.pal b/graphics/pokemon/palettes/kangaskhan_shiny_palette.pal new file mode 100644 index 000000000..b2405925f --- /dev/null +++ b/graphics/pokemon/palettes/kangaskhan_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +213 213 213 +255 255 255 +213 213 213 +255 255 148 +238 205 106 +189 24 24 +16 16 16 +238 205 180 +189 156 139 +139 156 82 +98 115 41 +57 74 0 +238 222 180 +213 205 156 +172 164 115 +98 90 49 diff --git a/graphics/pokemon/palettes/kecleon_palette.pal b/graphics/pokemon/palettes/kecleon_palette.pal new file mode 100644 index 000000000..36d6be7d7 --- /dev/null +++ b/graphics/pokemon/palettes/kecleon_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +156 255 255 +65 98 65 +82 139 90 +98 180 131 +123 213 139 +164 238 156 +255 255 255 +139 74 57 +189 90 65 +238 106 74 +197 172 74 +222 197 90 +246 238 123 +139 123 90 +172 197 123 +0 0 0 diff --git a/graphics/pokemon/palettes/kecleon_shiny_palette.pal b/graphics/pokemon/palettes/kecleon_shiny_palette.pal new file mode 100644 index 000000000..e056b670f --- /dev/null +++ b/graphics/pokemon/palettes/kecleon_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +156 255 255 +65 98 65 +82 139 90 +98 180 131 +123 213 139 +164 238 156 +255 255 255 +49 131 197 +90 172 230 +123 197 255 +238 156 74 +255 180 74 +255 255 180 +139 123 90 +172 197 123 +0 0 0 diff --git a/graphics/pokemon/palettes/kingdra_palette.pal b/graphics/pokemon/palettes/kingdra_palette.pal new file mode 100644 index 000000000..9dcb7ab85 --- /dev/null +++ b/graphics/pokemon/palettes/kingdra_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +205 205 172 +255 255 255 +189 222 246 +156 189 246 +74 156 189 +74 74 131 +255 0 255 +246 106 82 +189 57 49 +255 255 156 +246 230 74 +230 172 57 +172 106 0 +213 213 213 +123 123 123 +16 16 16 diff --git a/graphics/pokemon/palettes/kingdra_shiny_palette.pal b/graphics/pokemon/palettes/kingdra_shiny_palette.pal new file mode 100644 index 000000000..c45869283 --- /dev/null +++ b/graphics/pokemon/palettes/kingdra_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +205 205 172 +255 255 255 +238 197 238 +213 172 230 +156 115 180 +106 65 123 +255 0 255 +131 205 24 +82 156 24 +255 255 156 +246 230 74 +230 172 57 +172 106 0 +213 213 213 +123 123 123 +16 16 16 diff --git a/graphics/pokemon/palettes/kingler_palette.pal b/graphics/pokemon/palettes/kingler_palette.pal new file mode 100644 index 000000000..ef05864d1 --- /dev/null +++ b/graphics/pokemon/palettes/kingler_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +213 213 189 +255 156 98 +238 106 41 +180 98 57 +139 49 32 +246 213 156 +230 189 139 +189 139 82 +98 74 16 +213 164 106 +255 16 255 +255 16 255 +255 16 255 +222 222 246 +16 16 16 +255 255 255 diff --git a/graphics/pokemon/palettes/kingler_shiny_palette.pal b/graphics/pokemon/palettes/kingler_shiny_palette.pal new file mode 100644 index 000000000..faa3b01af --- /dev/null +++ b/graphics/pokemon/palettes/kingler_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +213 213 189 +180 189 123 +139 148 82 +98 106 41 +57 65 41 +222 230 65 +197 189 32 +156 148 0 +115 106 0 +180 164 16 +255 16 255 +255 16 255 +255 16 255 +222 222 246 +16 16 16 +255 255 255 diff --git a/graphics/pokemon/palettes/kirlia_palette.pal b/graphics/pokemon/palettes/kirlia_palette.pal new file mode 100644 index 000000000..91b428af2 --- /dev/null +++ b/graphics/pokemon/palettes/kirlia_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +156 164 82 +238 238 255 +197 205 222 +164 180 205 +131 148 180 +123 82 82 +115 41 57 +255 156 131 +230 82 57 +106 123 148 +255 255 255 +205 255 172 +148 230 148 +115 189 115 +49 123 74 +16 16 16 diff --git a/graphics/pokemon/palettes/kirlia_shiny_palette.pal b/graphics/pokemon/palettes/kirlia_shiny_palette.pal new file mode 100644 index 000000000..ff944e551 --- /dev/null +++ b/graphics/pokemon/palettes/kirlia_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +156 164 82 +238 238 255 +213 189 222 +180 164 205 +156 131 180 +123 82 82 +115 41 57 +255 197 90 +230 131 32 +106 123 148 +197 238 246 +189 230 255 +123 197 238 +82 172 213 +32 115 123 +16 16 16 diff --git a/graphics/pokemon/palettes/koffing_palette.pal b/graphics/pokemon/palettes/koffing_palette.pal new file mode 100644 index 000000000..4565aa527 --- /dev/null +++ b/graphics/pokemon/palettes/koffing_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +164 205 197 +255 255 255 +222 222 222 +246 238 148 +213 205 106 +238 65 65 +197 24 32 +255 0 255 +255 0 255 +238 213 106 +197 180 41 +222 139 213 +189 123 180 +156 82 148 +106 49 98 +16 16 16 diff --git a/graphics/pokemon/palettes/koffing_shiny_palette.pal b/graphics/pokemon/palettes/koffing_shiny_palette.pal new file mode 100644 index 000000000..164cdfb0b --- /dev/null +++ b/graphics/pokemon/palettes/koffing_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +205 205 205 +255 255 255 +222 222 222 +246 238 148 +213 205 106 +255 98 74 +213 57 32 +255 0 255 +255 0 255 +205 139 164 +148 82 123 +164 222 205 +148 189 189 +106 148 148 +41 82 82 +16 16 16 diff --git a/graphics/pokemon/palettes/krabby_palette.pal b/graphics/pokemon/palettes/krabby_palette.pal new file mode 100644 index 000000000..e54552ad9 --- /dev/null +++ b/graphics/pokemon/palettes/krabby_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +213 213 197 +255 255 255 +222 222 222 +255 0 255 +238 205 148 +230 189 123 +180 148 65 +115 82 16 +255 0 255 +255 0 255 +255 0 255 +255 156 115 +238 82 32 +189 82 24 +139 32 24 +16 16 16 diff --git a/graphics/pokemon/palettes/krabby_shiny_palette.pal b/graphics/pokemon/palettes/krabby_shiny_palette.pal new file mode 100644 index 000000000..d1318f36c --- /dev/null +++ b/graphics/pokemon/palettes/krabby_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +213 213 197 +255 255 255 +222 222 222 +255 0 255 +255 246 205 +222 205 164 +180 164 123 +115 98 57 +255 0 255 +255 0 255 +255 0 255 +255 222 74 +213 180 32 +172 139 0 +131 98 0 +16 16 16 diff --git a/graphics/pokemon/palettes/kyogre_palette.pal b/graphics/pokemon/palettes/kyogre_palette.pal new file mode 100644 index 000000000..d598595cb --- /dev/null +++ b/graphics/pokemon/palettes/kyogre_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +49 164 82 +255 205 49 +205 189 205 +156 139 148 +90 82 106 +41 82 148 +115 41 57 +255 8 16 +189 32 41 +131 205 255 +222 222 222 +90 164 255 +74 131 213 +57 98 180 +49 57 115 +16 16 16 diff --git a/graphics/pokemon/palettes/kyogre_shiny_palette.pal b/graphics/pokemon/palettes/kyogre_shiny_palette.pal new file mode 100644 index 000000000..392162401 --- /dev/null +++ b/graphics/pokemon/palettes/kyogre_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +49 164 82 +255 205 49 +222 205 222 +156 139 148 +90 82 106 +164 24 156 +115 41 57 +255 8 16 +189 32 41 +255 156 255 +246 246 246 +255 123 255 +230 90 222 +197 57 189 +131 0 123 +16 16 16 diff --git a/graphics/pokemon/palettes/lairon_palette.pal b/graphics/pokemon/palettes/lairon_palette.pal new file mode 100644 index 000000000..b5711fdad --- /dev/null +++ b/graphics/pokemon/palettes/lairon_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +148 172 156 +74 74 65 +106 106 106 +139 139 139 +172 172 172 +57 57 65 +123 106 106 +156 139 139 +189 172 172 +222 205 205 +255 255 255 +172 57 74 +222 106 106 +255 131 131 +106 189 255 +0 0 0 diff --git a/graphics/pokemon/palettes/lairon_shiny_palette.pal b/graphics/pokemon/palettes/lairon_shiny_palette.pal new file mode 100644 index 000000000..eadb9aa81 --- /dev/null +++ b/graphics/pokemon/palettes/lairon_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +148 172 156 +32 90 90 +65 123 115 +90 156 148 +148 197 205 +74 41 24 +123 123 90 +156 156 123 +189 189 156 +222 222 197 +255 255 255 +172 57 74 +222 106 106 +255 131 131 +255 123 82 +0 0 0 diff --git a/graphics/pokemon/palettes/lanturn_palette.pal b/graphics/pokemon/palettes/lanturn_palette.pal new file mode 100644 index 000000000..7baa22c6e --- /dev/null +++ b/graphics/pokemon/palettes/lanturn_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +205 205 172 +255 255 255 +172 172 172 +164 205 255 +139 172 255 +98 139 230 +57 106 205 +0 82 139 +255 238 123 +255 230 82 +213 180 90 +180 139 57 +131 82 8 +16 16 16 +255 115 0 +180 0 0 diff --git a/graphics/pokemon/palettes/lanturn_shiny_palette.pal b/graphics/pokemon/palettes/lanturn_shiny_palette.pal new file mode 100644 index 000000000..70360c029 --- /dev/null +++ b/graphics/pokemon/palettes/lanturn_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +205 205 172 +255 255 255 +172 172 172 +230 156 255 +205 131 246 +164 98 222 +131 65 197 +106 41 139 +255 255 106 +238 238 65 +180 180 41 +139 139 8 +90 90 8 +16 16 16 +255 115 0 +205 49 0 diff --git a/graphics/pokemon/palettes/lapras_palette.pal b/graphics/pokemon/palettes/lapras_palette.pal new file mode 100644 index 000000000..094f8fec8 --- /dev/null +++ b/graphics/pokemon/palettes/lapras_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +148 213 172 +255 255 255 +230 90 41 +164 0 0 +255 238 148 +230 197 106 +131 106 49 +238 222 213 +213 197 189 +164 148 139 +98 82 90 +156 205 246 +115 180 230 +115 139 197 +49 74 106 +41 41 41 diff --git a/graphics/pokemon/palettes/lapras_shiny_palette.pal b/graphics/pokemon/palettes/lapras_shiny_palette.pal new file mode 100644 index 000000000..5090527aa --- /dev/null +++ b/graphics/pokemon/palettes/lapras_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +213 213 189 +255 255 255 +230 90 41 +164 0 0 +238 205 213 +222 172 180 +139 82 106 +238 222 213 +213 197 189 +164 148 139 +98 82 90 +205 189 246 +172 156 230 +131 98 189 +82 65 139 +41 41 41 diff --git a/graphics/pokemon/palettes/larvitar_palette.pal b/graphics/pokemon/palettes/larvitar_palette.pal new file mode 100644 index 000000000..3bcc1f133 --- /dev/null +++ b/graphics/pokemon/palettes/larvitar_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +205 205 172 +255 255 255 +197 238 197 +180 222 180 +123 172 123 +74 98 74 +255 0 255 +255 164 90 +238 82 41 +189 57 32 +106 32 0 +255 0 255 +255 0 255 +197 197 197 +98 98 98 +16 16 16 diff --git a/graphics/pokemon/palettes/larvitar_shiny_palette.pal b/graphics/pokemon/palettes/larvitar_shiny_palette.pal new file mode 100644 index 000000000..aa6a59c36 --- /dev/null +++ b/graphics/pokemon/palettes/larvitar_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +205 205 172 +255 255 255 +230 246 82 +205 222 74 +156 172 41 +90 115 0 +255 0 255 +230 156 172 +189 98 131 +148 57 98 +90 41 65 +255 0 255 +255 0 255 +197 197 197 +98 98 98 +16 16 16 diff --git a/graphics/pokemon/palettes/latias_palette.pal b/graphics/pokemon/palettes/latias_palette.pal new file mode 100644 index 000000000..6f831271f --- /dev/null +++ b/graphics/pokemon/palettes/latias_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +49 164 82 +238 238 255 +213 213 238 +172 164 205 +123 115 148 +255 205 90 +205 164 74 +115 172 238 +90 106 180 +255 164 115 +255 255 255 +255 106 106 +222 90 90 +205 74 82 +139 49 65 +16 16 16 diff --git a/graphics/pokemon/palettes/latias_shiny_palette.pal b/graphics/pokemon/palettes/latias_shiny_palette.pal new file mode 100644 index 000000000..a701dc933 --- /dev/null +++ b/graphics/pokemon/palettes/latias_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +49 164 82 +238 238 255 +213 213 238 +172 164 205 +123 115 148 +131 246 65 +49 123 24 +115 189 255 +90 139 180 +255 255 90 +255 255 255 +255 205 41 +238 172 0 +238 131 0 +189 57 0 +16 16 16 diff --git a/graphics/pokemon/palettes/latios_palette.pal b/graphics/pokemon/palettes/latios_palette.pal new file mode 100644 index 000000000..6a3d8bead --- /dev/null +++ b/graphics/pokemon/palettes/latios_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +49 164 82 +205 205 205 +172 172 172 +148 139 148 +115 106 115 +222 222 222 +131 74 74 +255 106 106 +213 74 82 +156 205 255 +255 255 255 +90 164 255 +74 131 213 +57 98 180 +49 57 115 +16 16 16 diff --git a/graphics/pokemon/palettes/latios_shiny_palette.pal b/graphics/pokemon/palettes/latios_shiny_palette.pal new file mode 100644 index 000000000..2b539fd9c --- /dev/null +++ b/graphics/pokemon/palettes/latios_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +49 164 82 +246 246 246 +213 213 213 +180 172 172 +148 139 148 +246 246 246 +180 82 0 +230 123 41 +255 164 65 +189 255 255 +255 255 255 +172 238 222 +74 205 164 +32 164 123 +0 98 65 +16 16 16 diff --git a/graphics/pokemon/palettes/ledian_palette.pal b/graphics/pokemon/palettes/ledian_palette.pal new file mode 100644 index 000000000..dc9acc426 --- /dev/null +++ b/graphics/pokemon/palettes/ledian_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +205 205 172 +255 255 255 +255 197 131 +255 90 32 +197 57 16 +131 49 16 +255 255 189 +246 230 115 +205 180 57 +164 123 0 +0 74 164 +0 24 115 +213 213 213 +180 180 180 +106 106 106 +16 16 16 diff --git a/graphics/pokemon/palettes/ledian_shiny_palette.pal b/graphics/pokemon/palettes/ledian_shiny_palette.pal new file mode 100644 index 000000000..472f0974d --- /dev/null +++ b/graphics/pokemon/palettes/ledian_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +205 205 172 +255 255 255 +255 222 41 +255 164 0 +205 123 0 +131 74 16 +255 255 205 +246 238 131 +205 189 74 +164 131 16 +0 74 164 +0 24 115 +213 213 213 +180 180 180 +106 106 106 +16 16 16 diff --git a/graphics/pokemon/palettes/ledyba_palette.pal b/graphics/pokemon/palettes/ledyba_palette.pal new file mode 100644 index 000000000..2cc003adf --- /dev/null +++ b/graphics/pokemon/palettes/ledyba_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +205 205 172 +255 255 255 +246 156 49 +238 82 24 +180 65 41 +123 49 24 +255 255 189 +246 230 115 +205 180 57 +164 123 0 +0 74 164 +0 24 115 +205 205 205 +180 180 180 +115 115 115 +16 16 16 diff --git a/graphics/pokemon/palettes/ledyba_shiny_palette.pal b/graphics/pokemon/palettes/ledyba_shiny_palette.pal new file mode 100644 index 000000000..472f0974d --- /dev/null +++ b/graphics/pokemon/palettes/ledyba_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +205 205 172 +255 255 255 +255 222 41 +255 164 0 +205 123 0 +131 74 16 +255 255 205 +246 238 131 +205 189 74 +164 131 16 +0 74 164 +0 24 115 +213 213 213 +180 180 180 +106 106 106 +16 16 16 diff --git a/graphics/pokemon/palettes/lickitung_palette.pal b/graphics/pokemon/palettes/lickitung_palette.pal new file mode 100644 index 000000000..602ac2724 --- /dev/null +++ b/graphics/pokemon/palettes/lickitung_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +205 205 205 +255 255 255 +255 255 164 +230 213 115 +131 123 32 +255 164 148 +255 131 82 +230 74 24 +197 32 16 +255 0 255 +255 205 180 +255 164 131 +238 106 82 +205 82 49 +148 16 0 +16 16 16 diff --git a/graphics/pokemon/palettes/lickitung_shiny_palette.pal b/graphics/pokemon/palettes/lickitung_shiny_palette.pal new file mode 100644 index 000000000..5d01bf06c --- /dev/null +++ b/graphics/pokemon/palettes/lickitung_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +205 205 205 +255 255 255 +255 255 164 +230 213 115 +131 123 32 +255 222 148 +255 123 131 +213 82 90 +172 41 49 +255 0 255 +255 238 123 +246 222 106 +205 180 65 +172 139 24 +131 90 0 +16 16 16 diff --git a/graphics/pokemon/palettes/lileep_palette.pal b/graphics/pokemon/palettes/lileep_palette.pal new file mode 100644 index 000000000..a739bf847 --- /dev/null +++ b/graphics/pokemon/palettes/lileep_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +205 205 172 +255 213 139 +230 164 222 +180 115 172 +139 65 123 +98 24 74 +255 172 106 +238 123 57 +189 98 16 +255 246 123 +255 222 41 +230 172 0 +213 213 213 +172 172 180 +115 115 115 +0 0 0 diff --git a/graphics/pokemon/palettes/lileep_shiny_palette.pal b/graphics/pokemon/palettes/lileep_shiny_palette.pal new file mode 100644 index 000000000..6402a8688 --- /dev/null +++ b/graphics/pokemon/palettes/lileep_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +205 205 172 +255 213 139 +148 238 205 +115 205 172 +82 172 139 +32 123 90 +255 172 106 +238 123 57 +189 98 16 +255 246 123 +255 222 41 +230 172 0 +213 213 213 +172 172 180 +115 115 115 +41 41 57 diff --git a/graphics/pokemon/palettes/linoone_palette.pal b/graphics/pokemon/palettes/linoone_palette.pal new file mode 100644 index 000000000..368b6ac6f --- /dev/null +++ b/graphics/pokemon/palettes/linoone_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 172 115 +65 57 32 +139 98 65 +172 139 115 +205 172 139 +230 213 197 +0 0 0 +131 115 90 +197 180 148 +222 213 180 +255 246 246 +57 82 131 +123 139 222 +255 172 180 +255 197 205 +255 238 255 diff --git a/graphics/pokemon/palettes/linoone_shiny_palette.pal b/graphics/pokemon/palettes/linoone_shiny_palette.pal new file mode 100644 index 000000000..7988bb21c --- /dev/null +++ b/graphics/pokemon/palettes/linoone_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 172 115 +65 57 32 +197 98 65 +222 131 74 +238 164 74 +255 238 197 +0 0 0 +131 115 90 +197 180 148 +222 213 180 +255 246 246 +189 139 49 +255 205 106 +255 172 180 +255 197 205 +255 238 255 diff --git a/graphics/pokemon/palettes/lombre_palette.pal b/graphics/pokemon/palettes/lombre_palette.pal new file mode 100644 index 000000000..69f944a22 --- /dev/null +++ b/graphics/pokemon/palettes/lombre_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 255 255 +98 106 65 +90 148 106 +148 74 57 +131 197 148 +189 230 180 +222 255 197 +205 74 49 +131 148 65 +139 180 49 +172 213 57 +255 115 65 +205 246 82 +255 255 255 +197 197 205 +255 8 57 diff --git a/graphics/pokemon/palettes/lombre_shiny_palette.pal b/graphics/pokemon/palettes/lombre_shiny_palette.pal new file mode 100644 index 000000000..d4458373a --- /dev/null +++ b/graphics/pokemon/palettes/lombre_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +197 197 205 +98 106 65 +90 148 106 +172 90 41 +172 213 57 +205 246 82 +222 255 197 +213 106 57 +65 131 139 +90 156 164 +106 172 180 +255 172 90 +148 197 205 +255 255 255 +197 197 205 +255 8 57 diff --git a/graphics/pokemon/palettes/lotad_palette.pal b/graphics/pokemon/palettes/lotad_palette.pal new file mode 100644 index 000000000..efb988ea0 --- /dev/null +++ b/graphics/pokemon/palettes/lotad_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +49 164 82 +255 213 74 +213 172 57 +139 115 49 +49 65 90 +123 213 74 +98 189 49 +74 172 41 +74 139 41 +49 74 32 +172 255 123 +148 180 222 +82 139 205 +49 115 148 +255 255 255 +16 16 16 diff --git a/graphics/pokemon/palettes/lotad_shiny_palette.pal b/graphics/pokemon/palettes/lotad_shiny_palette.pal new file mode 100644 index 000000000..36f271590 --- /dev/null +++ b/graphics/pokemon/palettes/lotad_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +49 164 82 +255 213 74 +213 172 57 +139 115 49 +49 65 90 +148 197 205 +106 172 180 +90 156 164 +65 131 139 +24 82 98 +172 255 123 +213 139 156 +180 106 123 +148 74 90 +255 255 255 +16 16 16 diff --git a/graphics/pokemon/palettes/loudred_palette.pal b/graphics/pokemon/palettes/loudred_palette.pal new file mode 100644 index 000000000..27c8ed1e7 --- /dev/null +++ b/graphics/pokemon/palettes/loudred_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +205 205 172 +255 255 255 +164 156 222 +123 115 180 +90 82 139 +57 57 106 +255 222 90 +213 164 24 +156 115 24 +255 115 82 +213 74 49 +156 57 24 +106 49 24 +205 205 205 +115 115 115 +0 0 0 diff --git a/graphics/pokemon/palettes/loudred_shiny_palette.pal b/graphics/pokemon/palettes/loudred_shiny_palette.pal new file mode 100644 index 000000000..b905b269c --- /dev/null +++ b/graphics/pokemon/palettes/loudred_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +205 205 172 +255 255 255 +222 180 197 +189 131 164 +156 90 139 +131 65 106 +255 246 131 +255 197 49 +213 131 16 +255 115 82 +197 65 49 +156 41 24 +123 57 0 +238 205 213 +115 115 115 +49 49 65 diff --git a/graphics/pokemon/palettes/ludicolo_palette.pal b/graphics/pokemon/palettes/ludicolo_palette.pal new file mode 100644 index 000000000..618414394 --- /dev/null +++ b/graphics/pokemon/palettes/ludicolo_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +98 148 197 +74 106 74 +106 139 90 +156 197 98 +164 238 90 +205 255 139 +246 246 148 +213 213 123 +180 180 115 +255 255 255 +205 205 222 +197 131 115 +246 164 98 +139 106 82 +213 180 74 +41 41 41 diff --git a/graphics/pokemon/palettes/ludicolo_shiny_palette.pal b/graphics/pokemon/palettes/ludicolo_shiny_palette.pal new file mode 100644 index 000000000..442eda95e --- /dev/null +++ b/graphics/pokemon/palettes/ludicolo_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +98 148 197 +49 115 106 +82 139 131 +90 156 148 +148 197 205 +164 222 222 +255 230 156 +255 213 106 +230 172 90 +255 255 255 +205 205 222 +197 131 115 +246 164 98 +164 106 82 +213 180 74 +41 41 41 diff --git a/graphics/pokemon/palettes/lugia_palette.pal b/graphics/pokemon/palettes/lugia_palette.pal new file mode 100644 index 000000000..483157770 --- /dev/null +++ b/graphics/pokemon/palettes/lugia_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +222 222 197 +255 255 255 +222 222 230 +189 189 197 +156 156 180 +98 98 98 +123 164 246 +90 115 255 +0 98 189 +0 65 131 +238 90 0 +156 65 0 +156 156 180 +98 98 98 +16 16 16 +16 16 16 diff --git a/graphics/pokemon/palettes/lugia_shiny_palette.pal b/graphics/pokemon/palettes/lugia_shiny_palette.pal new file mode 100644 index 000000000..42db26696 --- /dev/null +++ b/graphics/pokemon/palettes/lugia_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +222 222 197 +255 255 255 +213 230 255 +172 197 230 +131 156 197 +74 90 139 +255 139 172 +246 106 148 +205 74 123 +106 65 82 +238 90 0 +156 65 0 +246 139 139 +222 90 98 +148 32 41 +16 16 16 diff --git a/graphics/pokemon/palettes/lunatone_palette.pal b/graphics/pokemon/palettes/lunatone_palette.pal new file mode 100644 index 000000000..9a0a5885f --- /dev/null +++ b/graphics/pokemon/palettes/lunatone_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +49 164 82 +255 238 164 +230 213 148 +213 197 131 +197 172 123 +172 156 106 +156 131 98 +139 115 82 +123 98 74 +98 74 57 +82 57 41 +238 90 90 +213 74 82 +189 57 74 +164 49 74 +16 16 16 diff --git a/graphics/pokemon/palettes/lunatone_shiny_palette.pal b/graphics/pokemon/palettes/lunatone_shiny_palette.pal new file mode 100644 index 000000000..e0f5eb308 --- /dev/null +++ b/graphics/pokemon/palettes/lunatone_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +49 164 82 +255 238 164 +230 213 148 +213 197 131 +197 172 123 +172 156 106 +156 131 98 +139 115 82 +123 98 74 +98 74 57 +82 57 41 +98 148 255 +65 115 222 +32 82 189 +0 49 156 +16 16 16 diff --git a/graphics/pokemon/palettes/luvdisc_palette.pal b/graphics/pokemon/palettes/luvdisc_palette.pal new file mode 100644 index 000000000..c443e0633 --- /dev/null +++ b/graphics/pokemon/palettes/luvdisc_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +98 205 148 +115 57 49 +164 106 82 +255 255 255 +222 205 230 +230 156 131 +205 148 148 +255 164 123 +246 213 148 +90 98 189 +90 98 139 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +24 24 24 diff --git a/graphics/pokemon/palettes/luvdisc_shiny_palette.pal b/graphics/pokemon/palettes/luvdisc_shiny_palette.pal new file mode 100644 index 000000000..b1df53235 --- /dev/null +++ b/graphics/pokemon/palettes/luvdisc_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +98 205 148 +115 57 49 +164 106 82 +255 255 255 +222 205 230 +246 197 49 +246 172 16 +255 230 82 +255 255 131 +90 98 189 +90 98 139 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +24 24 24 diff --git a/graphics/pokemon/palettes/machamp_palette.pal b/graphics/pokemon/palettes/machamp_palette.pal new file mode 100644 index 000000000..ceb43fc3c --- /dev/null +++ b/graphics/pokemon/palettes/machamp_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +230 230 230 +255 255 255 +238 246 115 +205 213 74 +164 172 41 +115 98 0 +255 57 57 +189 49 65 +82 82 82 +255 0 255 +230 230 230 +197 238 205 +172 213 180 +131 172 131 +57 90 65 +16 16 16 diff --git a/graphics/pokemon/palettes/machamp_shiny_palette.pal b/graphics/pokemon/palettes/machamp_shiny_palette.pal new file mode 100644 index 000000000..6e7cc549c --- /dev/null +++ b/graphics/pokemon/palettes/machamp_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +230 230 230 +255 255 255 +238 246 115 +197 205 74 +164 172 41 +115 98 0 +255 57 57 +156 0 0 +82 82 82 +255 0 255 +213 213 213 +180 197 131 +139 156 90 +98 115 49 +57 74 8 +16 16 16 diff --git a/graphics/pokemon/palettes/machoke_palette.pal b/graphics/pokemon/palettes/machoke_palette.pal new file mode 100644 index 000000000..937fd5d77 --- /dev/null +++ b/graphics/pokemon/palettes/machoke_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +230 230 230 +255 255 255 +238 246 115 +205 189 74 +180 164 65 +98 74 8 +255 0 255 +238 49 49 +197 0 0 +156 0 0 +222 222 222 +205 197 246 +172 164 213 +131 123 156 +65 65 106 +16 16 16 diff --git a/graphics/pokemon/palettes/machoke_shiny_palette.pal b/graphics/pokemon/palettes/machoke_shiny_palette.pal new file mode 100644 index 000000000..5d5cb321b --- /dev/null +++ b/graphics/pokemon/palettes/machoke_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +230 230 230 +255 255 255 +238 246 115 +197 205 74 +164 172 41 +115 98 0 +255 0 255 +115 156 222 +74 115 180 +16 57 123 +222 230 172 +180 189 131 +139 148 90 +98 106 49 +57 65 8 +16 16 16 diff --git a/graphics/pokemon/palettes/machop_palette.pal b/graphics/pokemon/palettes/machop_palette.pal new file mode 100644 index 000000000..6914cd822 --- /dev/null +++ b/graphics/pokemon/palettes/machop_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +213 213 180 +255 255 255 +230 197 115 +197 180 57 +189 172 57 +98 106 16 +255 0 255 +255 57 57 +197 0 0 +156 0 0 +213 213 213 +189 222 197 +164 197 172 +123 148 131 +49 74 57 +16 16 16 diff --git a/graphics/pokemon/palettes/machop_shiny_palette.pal b/graphics/pokemon/palettes/machop_shiny_palette.pal new file mode 100644 index 000000000..2ceeb3c56 --- /dev/null +++ b/graphics/pokemon/palettes/machop_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +213 213 180 +255 255 255 +238 246 115 +197 205 74 +164 172 41 +98 106 16 +255 0 255 +255 57 57 +197 0 0 +156 0 0 +255 246 189 +222 205 148 +180 164 106 +139 123 65 +98 82 24 +16 16 16 diff --git a/graphics/pokemon/palettes/magby_palette.pal b/graphics/pokemon/palettes/magby_palette.pal new file mode 100644 index 000000000..42daceeb8 --- /dev/null +++ b/graphics/pokemon/palettes/magby_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +205 205 172 +255 255 255 +255 197 131 +255 123 98 +213 82 57 +148 49 32 +255 0 255 +255 255 180 +246 213 57 +213 172 0 +172 131 0 +255 0 255 +255 0 255 +197 197 197 +115 115 123 +16 16 16 diff --git a/graphics/pokemon/palettes/magby_shiny_palette.pal b/graphics/pokemon/palettes/magby_shiny_palette.pal new file mode 100644 index 000000000..97a19115c --- /dev/null +++ b/graphics/pokemon/palettes/magby_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +205 205 172 +255 255 255 +255 246 115 +255 213 41 +230 131 49 +148 65 32 +255 0 255 +255 255 238 +255 246 148 +238 205 90 +197 123 65 +255 0 255 +255 0 255 +197 197 197 +115 115 123 +16 16 16 diff --git a/graphics/pokemon/palettes/magcargo_palette.pal b/graphics/pokemon/palettes/magcargo_palette.pal new file mode 100644 index 000000000..71f6dce5b --- /dev/null +++ b/graphics/pokemon/palettes/magcargo_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +205 205 172 +255 255 255 +255 189 106 +255 131 74 +222 90 32 +148 32 0 +255 213 115 +255 238 156 +255 213 115 +255 197 0 +164 106 90 +172 172 172 +131 131 131 +98 98 98 +65 65 65 +16 16 16 diff --git a/graphics/pokemon/palettes/magcargo_shiny_palette.pal b/graphics/pokemon/palettes/magcargo_shiny_palette.pal new file mode 100644 index 000000000..ff0c9dd40 --- /dev/null +++ b/graphics/pokemon/palettes/magcargo_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +205 205 172 +255 255 255 +238 180 238 +205 148 197 +172 98 172 +106 65 139 +255 180 238 +255 230 255 +255 180 238 +255 180 238 +139 74 106 +213 98 74 +156 82 57 +106 49 41 +74 41 16 +16 16 16 diff --git a/graphics/pokemon/palettes/magikarp_palette.pal b/graphics/pokemon/palettes/magikarp_palette.pal new file mode 100644 index 000000000..48f4b2d0d --- /dev/null +++ b/graphics/pokemon/palettes/magikarp_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +90 123 197 +255 255 255 +222 222 230 +172 172 189 +115 115 139 +16 16 16 +238 255 131 +238 213 98 +131 106 16 +255 180 148 +255 123 90 +197 49 49 +255 172 115 +255 106 32 +222 74 74 +139 8 0 diff --git a/graphics/pokemon/palettes/magikarp_shiny_palette.pal b/graphics/pokemon/palettes/magikarp_shiny_palette.pal new file mode 100644 index 000000000..d6eec780a --- /dev/null +++ b/graphics/pokemon/palettes/magikarp_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +213 213 189 +255 255 255 +222 222 230 +172 172 189 +115 115 139 +16 16 16 +238 255 131 +222 197 90 +131 106 16 +255 255 172 +255 230 49 +246 189 82 +255 255 98 +255 222 32 +230 164 41 +156 82 41 diff --git a/graphics/pokemon/palettes/magmar_palette.pal b/graphics/pokemon/palettes/magmar_palette.pal new file mode 100644 index 000000000..be4ac826e --- /dev/null +++ b/graphics/pokemon/palettes/magmar_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +213 213 213 +255 255 255 +213 213 213 +106 106 106 +41 41 41 +255 0 255 +255 0 255 +255 246 98 +255 213 0 +222 164 32 +139 98 8 +255 164 65 +255 74 8 +205 41 65 +139 8 0 +255 0 255 diff --git a/graphics/pokemon/palettes/magmar_shiny_palette.pal b/graphics/pokemon/palettes/magmar_shiny_palette.pal new file mode 100644 index 000000000..f4da957cb --- /dev/null +++ b/graphics/pokemon/palettes/magmar_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +213 213 213 +255 255 255 +213 213 213 +106 106 106 +41 41 41 +255 0 255 +255 0 255 +255 238 255 +255 197 213 +205 156 172 +123 74 90 +255 164 172 +238 123 131 +213 82 90 +164 41 49 +255 0 255 diff --git a/graphics/pokemon/palettes/magnemite_palette.pal b/graphics/pokemon/palettes/magnemite_palette.pal new file mode 100644 index 000000000..efcd33f3e --- /dev/null +++ b/graphics/pokemon/palettes/magnemite_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +213 213 213 +255 255 255 +230 230 230 +255 98 65 +205 49 49 +82 205 246 +41 131 172 +180 180 180 +139 139 139 +98 82 82 +57 49 49 +213 246 222 +180 213 189 +148 189 156 +90 131 98 +16 16 16 diff --git a/graphics/pokemon/palettes/magnemite_shiny_palette.pal b/graphics/pokemon/palettes/magnemite_shiny_palette.pal new file mode 100644 index 000000000..50bb00b88 --- /dev/null +++ b/graphics/pokemon/palettes/magnemite_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +213 213 213 +255 255 255 +213 213 213 +82 74 74 +57 49 49 +82 74 74 +57 49 49 +180 180 180 +139 139 139 +82 74 74 +57 49 49 +238 238 189 +197 197 148 +156 156 106 +115 115 65 +16 16 16 diff --git a/graphics/pokemon/palettes/magneton_palette.pal b/graphics/pokemon/palettes/magneton_palette.pal new file mode 100644 index 000000000..00f6da9b2 --- /dev/null +++ b/graphics/pokemon/palettes/magneton_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +213 213 213 +255 255 255 +222 222 222 +255 98 57 +213 41 49 +82 205 246 +57 148 172 +180 180 180 +139 139 139 +82 74 74 +57 49 49 +213 246 222 +180 213 189 +148 189 156 +90 131 98 +16 16 16 diff --git a/graphics/pokemon/palettes/magneton_shiny_palette.pal b/graphics/pokemon/palettes/magneton_shiny_palette.pal new file mode 100644 index 000000000..1777fbd2a --- /dev/null +++ b/graphics/pokemon/palettes/magneton_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +213 213 213 +255 255 255 +213 213 213 +106 98 98 +57 49 49 +106 98 98 +57 49 49 +180 180 180 +139 139 139 +82 74 74 +57 49 49 +255 246 230 +238 222 197 +197 180 156 +156 139 115 +16 16 16 diff --git a/graphics/pokemon/palettes/makuhita_palette.pal b/graphics/pokemon/palettes/makuhita_palette.pal new file mode 100644 index 000000000..7fc578bb1 --- /dev/null +++ b/graphics/pokemon/palettes/makuhita_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +148 197 148 +156 156 164 +131 131 148 +90 90 115 +49 57 90 +255 213 82 +238 189 49 +205 156 82 +255 90 74 +205 82 65 +156 82 65 +0 0 0 +255 230 123 +123 90 57 +0 0 0 +255 255 255 diff --git a/graphics/pokemon/palettes/makuhita_shiny_palette.pal b/graphics/pokemon/palettes/makuhita_shiny_palette.pal new file mode 100644 index 000000000..2f3aa75fc --- /dev/null +++ b/graphics/pokemon/palettes/makuhita_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +148 197 148 +255 90 74 +205 82 65 +156 82 65 +123 49 32 +255 230 156 +255 205 98 +230 164 82 +255 90 74 +205 82 65 +156 82 65 +0 0 0 +255 246 189 +123 90 57 +0 0 0 +255 255 255 diff --git a/graphics/pokemon/palettes/manectric_palette.pal b/graphics/pokemon/palettes/manectric_palette.pal new file mode 100644 index 000000000..05ec20919 --- /dev/null +++ b/graphics/pokemon/palettes/manectric_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +197 197 197 +57 65 74 +82 90 131 +115 131 197 +139 172 238 +255 255 74 +222 230 106 +180 197 106 +139 123 65 +172 32 16 +0 0 0 +0 0 0 +0 0 0 +255 255 255 +197 197 230 +24 24 24 diff --git a/graphics/pokemon/palettes/manectric_shiny_palette.pal b/graphics/pokemon/palettes/manectric_shiny_palette.pal new file mode 100644 index 000000000..52285031d --- /dev/null +++ b/graphics/pokemon/palettes/manectric_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +197 197 197 +41 41 57 +57 65 82 +115 106 123 +148 139 156 +255 222 131 +230 197 98 +197 156 90 +164 123 57 +82 106 197 +0 0 0 +0 0 0 +0 0 0 +255 255 255 +197 197 230 +24 24 24 diff --git a/graphics/pokemon/palettes/mankey_palette.pal b/graphics/pokemon/palettes/mankey_palette.pal new file mode 100644 index 000000000..0f80883fc --- /dev/null +++ b/graphics/pokemon/palettes/mankey_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +222 222 222 +255 255 255 +222 222 222 +255 230 189 +238 180 139 +238 115 98 +189 74 49 +16 16 16 +255 197 131 +222 164 115 +197 123 74 +115 65 0 +255 246 205 +246 222 180 +213 189 156 +106 74 41 diff --git a/graphics/pokemon/palettes/mankey_shiny_palette.pal b/graphics/pokemon/palettes/mankey_shiny_palette.pal new file mode 100644 index 000000000..55703c37b --- /dev/null +++ b/graphics/pokemon/palettes/mankey_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +222 222 222 +255 255 255 +222 222 222 +255 230 189 +238 180 139 +230 139 98 +189 74 49 +16 16 16 +238 197 139 +197 156 98 +156 115 57 +98 57 0 +213 230 148 +180 197 115 +139 156 74 +82 98 16 diff --git a/graphics/pokemon/palettes/mantine_palette.pal b/graphics/pokemon/palettes/mantine_palette.pal new file mode 100644 index 000000000..36e0777c4 --- /dev/null +++ b/graphics/pokemon/palettes/mantine_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +222 222 222 +255 255 255 +148 164 213 +90 106 139 +41 65 98 +24 41 74 +255 0 255 +205 230 255 +180 205 255 +156 164 197 +246 230 246 +230 205 230 +213 189 205 +164 148 164 +106 106 106 +16 16 16 diff --git a/graphics/pokemon/palettes/mantine_shiny_palette.pal b/graphics/pokemon/palettes/mantine_shiny_palette.pal new file mode 100644 index 000000000..5427dc275 --- /dev/null +++ b/graphics/pokemon/palettes/mantine_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +222 222 222 +255 255 255 +164 205 238 +123 156 238 +74 98 197 +16 49 148 +255 0 255 +205 230 255 +180 205 255 +156 189 213 +230 246 255 +205 230 255 +172 205 238 +139 164 205 +74 82 115 +16 16 16 diff --git a/graphics/pokemon/palettes/mareep_palette.pal b/graphics/pokemon/palettes/mareep_palette.pal new file mode 100644 index 000000000..bd24bfe72 --- /dev/null +++ b/graphics/pokemon/palettes/mareep_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +205 205 172 +255 255 255 +255 238 131 +230 197 98 +197 148 41 +139 90 24 +74 180 230 +32 148 189 +0 74 148 +0 32 106 +255 222 0 +230 172 0 +180 123 0 +164 164 164 +82 82 82 +16 16 16 diff --git a/graphics/pokemon/palettes/mareep_shiny_palette.pal b/graphics/pokemon/palettes/mareep_shiny_palette.pal new file mode 100644 index 000000000..587f7493f --- /dev/null +++ b/graphics/pokemon/palettes/mareep_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +205 205 172 +255 255 255 +255 213 205 +238 148 180 +222 90 131 +172 65 90 +74 180 230 +32 148 189 +0 74 148 +0 32 106 +255 222 0 +230 172 0 +180 123 0 +164 164 164 +82 82 82 +16 16 16 diff --git a/graphics/pokemon/palettes/marill_palette.pal b/graphics/pokemon/palettes/marill_palette.pal new file mode 100644 index 000000000..77ed6b4b6 --- /dev/null +++ b/graphics/pokemon/palettes/marill_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +222 222 222 +255 255 255 +222 230 222 +156 156 156 +98 98 98 +16 16 16 +156 189 255 +106 148 255 +74 115 255 +49 65 90 +57 90 189 +255 0 255 +246 131 0 +213 74 0 +148 24 0 +255 0 255 diff --git a/graphics/pokemon/palettes/marill_shiny_palette.pal b/graphics/pokemon/palettes/marill_shiny_palette.pal new file mode 100644 index 000000000..7bd492c65 --- /dev/null +++ b/graphics/pokemon/palettes/marill_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +222 222 222 +255 255 255 +222 230 222 +156 156 156 +98 98 98 +16 16 16 +156 255 156 +123 230 131 +90 205 106 +49 123 65 +49 164 74 +255 0 255 +255 115 148 +213 74 115 +164 41 57 +255 0 255 diff --git a/graphics/pokemon/palettes/marowak_palette.pal b/graphics/pokemon/palettes/marowak_palette.pal new file mode 100644 index 000000000..467682472 --- /dev/null +++ b/graphics/pokemon/palettes/marowak_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +205 205 205 +255 255 255 +230 230 213 +197 197 172 +139 139 106 +82 82 57 +16 16 16 +197 57 16 +255 222 180 +246 197 148 +238 164 106 +164 106 65 +222 189 106 +197 156 74 +164 115 49 +98 57 24 diff --git a/graphics/pokemon/palettes/marowak_shiny_palette.pal b/graphics/pokemon/palettes/marowak_shiny_palette.pal new file mode 100644 index 000000000..569ccc082 --- /dev/null +++ b/graphics/pokemon/palettes/marowak_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +205 205 205 +255 255 255 +230 230 213 +197 197 172 +139 139 106 +82 82 57 +16 16 16 +197 57 16 +255 222 180 +246 197 148 +230 148 82 +189 115 57 +213 222 139 +172 180 98 +131 139 57 +65 74 0 diff --git a/graphics/pokemon/palettes/marshtomp_palette.pal b/graphics/pokemon/palettes/marshtomp_palette.pal new file mode 100644 index 000000000..b21cb52db --- /dev/null +++ b/graphics/pokemon/palettes/marshtomp_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +49 164 82 +222 222 255 +197 197 238 +172 172 213 +131 131 156 +255 164 82 +246 123 57 +205 98 32 +164 123 90 +255 255 255 +172 238 238 +148 213 213 +106 189 189 +98 148 156 +90 90 115 +16 16 16 diff --git a/graphics/pokemon/palettes/marshtomp_shiny_palette.pal b/graphics/pokemon/palettes/marshtomp_shiny_palette.pal new file mode 100644 index 000000000..f47e2751d --- /dev/null +++ b/graphics/pokemon/palettes/marshtomp_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +49 164 82 +238 238 255 +213 213 238 +189 189 213 +148 148 156 +255 230 156 +255 180 65 +205 131 24 +164 123 90 +255 255 255 +246 205 246 +230 172 246 +205 123 230 +156 106 172 +106 49 123 +16 16 16 diff --git a/graphics/pokemon/palettes/masquerain_palette.pal b/graphics/pokemon/palettes/masquerain_palette.pal new file mode 100644 index 000000000..54690d35b --- /dev/null +++ b/graphics/pokemon/palettes/masquerain_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 255 255 +65 65 90 +148 164 197 +180 205 238 +197 238 238 +106 74 32 +205 139 49 +255 156 74 +222 222 205 +255 255 255 +90 16 8 +131 65 32 +172 16 8 +222 57 32 +255 255 255 +24 24 24 diff --git a/graphics/pokemon/palettes/masquerain_shiny_palette.pal b/graphics/pokemon/palettes/masquerain_shiny_palette.pal new file mode 100644 index 000000000..09ed3ccf5 --- /dev/null +++ b/graphics/pokemon/palettes/masquerain_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 255 255 +49 123 74 +98 180 98 +148 230 148 +205 255 172 +82 74 32 +106 106 49 +164 148 115 +222 222 41 +255 255 41 +90 16 8 +131 65 32 +172 16 8 +222 57 32 +255 255 255 +24 24 24 diff --git a/graphics/pokemon/palettes/mawile_palette.pal b/graphics/pokemon/palettes/mawile_palette.pal new file mode 100644 index 000000000..ebb40809c --- /dev/null +++ b/graphics/pokemon/palettes/mawile_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +213 213 213 +255 255 255 +205 205 205 +213 131 172 +189 98 139 +156 74 106 +0 0 0 +255 222 139 +255 197 90 +213 156 74 +156 123 57 +0 0 0 +197 197 197 +164 164 164 +131 131 131 +82 82 82 diff --git a/graphics/pokemon/palettes/mawile_shiny_palette.pal b/graphics/pokemon/palettes/mawile_shiny_palette.pal new file mode 100644 index 000000000..ceadfc93e --- /dev/null +++ b/graphics/pokemon/palettes/mawile_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +213 213 213 +255 255 255 +205 205 205 +255 123 82 +222 98 49 +180 65 49 +0 0 0 +255 222 139 +255 197 90 +213 156 74 +156 123 57 +0 0 0 +238 156 197 +205 123 164 +164 90 131 +131 49 90 diff --git a/graphics/pokemon/palettes/medicham_palette.pal b/graphics/pokemon/palettes/medicham_palette.pal new file mode 100644 index 000000000..ffc38ab86 --- /dev/null +++ b/graphics/pokemon/palettes/medicham_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +139 213 139 +255 255 255 +255 156 148 +230 123 123 +205 90 82 +123 82 74 +0 0 0 +164 139 106 +164 164 164 +131 131 131 +255 230 131 +255 205 90 +238 238 213 +213 213 197 +189 189 172 +139 139 123 diff --git a/graphics/pokemon/palettes/medicham_shiny_palette.pal b/graphics/pokemon/palettes/medicham_shiny_palette.pal new file mode 100644 index 000000000..9a1d82aa7 --- /dev/null +++ b/graphics/pokemon/palettes/medicham_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +139 213 139 +255 255 255 +139 189 246 +98 148 205 +74 115 172 +74 90 115 +0 0 0 +164 139 106 +164 164 164 +131 131 131 +255 230 131 +255 205 90 +238 205 164 +230 172 139 +205 148 115 +123 90 74 diff --git a/graphics/pokemon/palettes/meditite_palette.pal b/graphics/pokemon/palettes/meditite_palette.pal new file mode 100644 index 000000000..a60729a6a --- /dev/null +++ b/graphics/pokemon/palettes/meditite_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +139 189 139 +255 255 255 +238 230 230 +205 197 197 +148 123 123 +255 131 106 +230 90 57 +180 65 49 +180 57 90 +115 41 65 +0 0 0 +197 222 255 +139 189 246 +98 148 205 +74 115 172 +74 90 115 diff --git a/graphics/pokemon/palettes/meditite_shiny_palette.pal b/graphics/pokemon/palettes/meditite_shiny_palette.pal new file mode 100644 index 000000000..de7c38f5a --- /dev/null +++ b/graphics/pokemon/palettes/meditite_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +139 189 139 +255 255 255 +246 230 238 +213 189 205 +164 115 123 +255 131 106 +255 139 57 +180 65 49 +180 57 90 +115 41 65 +0 0 0 +255 131 106 +230 90 57 +180 65 49 +180 57 90 +115 41 65 diff --git a/graphics/pokemon/palettes/meganium_palette.pal b/graphics/pokemon/palettes/meganium_palette.pal new file mode 100644 index 000000000..6a4bca91c --- /dev/null +++ b/graphics/pokemon/palettes/meganium_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +222 222 222 +255 255 255 +189 255 123 +156 230 82 +106 189 49 +32 139 16 +98 74 0 +246 164 156 +255 57 90 +205 32 57 +123 16 57 +205 205 205 +106 106 106 +16 16 16 +255 222 32 +230 172 0 diff --git a/graphics/pokemon/palettes/meganium_shiny_palette.pal b/graphics/pokemon/palettes/meganium_shiny_palette.pal new file mode 100644 index 000000000..0b03b419d --- /dev/null +++ b/graphics/pokemon/palettes/meganium_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +205 205 172 +255 255 255 +255 255 98 +246 230 41 +213 197 16 +131 115 8 +74 57 0 +255 180 65 +255 123 16 +205 74 0 +139 74 0 +205 205 205 +106 106 106 +16 16 16 +255 222 32 +230 172 0 diff --git a/graphics/pokemon/palettes/meowth_palette.pal b/graphics/pokemon/palettes/meowth_palette.pal new file mode 100644 index 000000000..034249ad5 --- /dev/null +++ b/graphics/pokemon/palettes/meowth_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +205 205 172 +255 255 255 +255 255 148 +255 213 0 +205 164 0 +255 115 82 +213 90 57 +16 16 16 +230 230 230 +238 156 49 +205 123 16 +148 65 0 +255 255 180 +255 230 131 +230 180 65 +156 106 0 diff --git a/graphics/pokemon/palettes/meowth_shiny_palette.pal b/graphics/pokemon/palettes/meowth_shiny_palette.pal new file mode 100644 index 000000000..68f386ca6 --- /dev/null +++ b/graphics/pokemon/palettes/meowth_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +205 205 172 +255 255 255 +255 255 148 +255 213 0 +205 164 0 +255 115 82 +213 90 57 +16 16 16 +230 230 230 +255 123 139 +222 82 98 +139 41 57 +255 238 148 +255 197 106 +213 156 65 +131 74 0 diff --git a/graphics/pokemon/palettes/metagross_palette.pal b/graphics/pokemon/palettes/metagross_palette.pal new file mode 100644 index 000000000..265dadb67 --- /dev/null +++ b/graphics/pokemon/palettes/metagross_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +49 164 82 +205 205 205 +172 172 172 +148 139 148 +115 106 115 +222 222 222 +131 74 74 +255 106 106 +213 74 82 +131 205 255 +197 222 255 +90 164 255 +74 131 213 +57 98 180 +49 57 115 +16 16 16 diff --git a/graphics/pokemon/palettes/metagross_shiny_palette.pal b/graphics/pokemon/palettes/metagross_shiny_palette.pal new file mode 100644 index 000000000..4ff89d816 --- /dev/null +++ b/graphics/pokemon/palettes/metagross_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +49 164 82 +238 172 82 +205 139 49 +172 106 16 +139 74 0 +255 205 115 +131 74 74 +255 106 106 +213 74 82 +238 238 246 +255 255 255 +213 213 222 +172 172 180 +139 131 139 +98 90 98 +16 16 16 diff --git a/graphics/pokemon/palettes/metang_palette.pal b/graphics/pokemon/palettes/metang_palette.pal new file mode 100644 index 000000000..41b48bc08 --- /dev/null +++ b/graphics/pokemon/palettes/metang_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +49 164 82 +205 205 205 +172 172 172 +148 139 148 +115 106 115 +222 222 222 +131 74 74 +255 106 106 +213 74 82 +131 205 255 +255 255 255 +90 164 255 +74 131 213 +57 98 180 +49 57 115 +16 16 16 diff --git a/graphics/pokemon/palettes/metang_shiny_palette.pal b/graphics/pokemon/palettes/metang_shiny_palette.pal new file mode 100644 index 000000000..56c14cd75 --- /dev/null +++ b/graphics/pokemon/palettes/metang_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +49 164 82 +238 172 82 +205 139 49 +172 106 16 +139 74 0 +255 205 115 +156 65 65 +255 106 106 +255 74 82 +238 238 246 +255 255 255 +213 213 222 +172 172 180 +123 115 123 +82 74 82 +16 16 16 diff --git a/graphics/pokemon/palettes/metapod_palette.pal b/graphics/pokemon/palettes/metapod_palette.pal new file mode 100644 index 000000000..747522889 --- /dev/null +++ b/graphics/pokemon/palettes/metapod_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +205 205 172 +255 255 255 +189 255 115 +156 213 74 +115 172 49 +82 98 41 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +197 197 197 +16 16 16 +255 255 255 +255 255 255 +255 255 255 +255 255 255 diff --git a/graphics/pokemon/palettes/metapod_shiny_palette.pal b/graphics/pokemon/palettes/metapod_shiny_palette.pal new file mode 100644 index 000000000..ed6240fb0 --- /dev/null +++ b/graphics/pokemon/palettes/metapod_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +205 205 172 +255 255 255 +255 197 139 +255 148 106 +230 98 74 +131 65 32 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +197 197 197 +16 16 16 +255 255 255 +255 255 255 +255 255 255 +255 255 255 diff --git a/graphics/pokemon/palettes/mew_palette.pal b/graphics/pokemon/palettes/mew_palette.pal new file mode 100644 index 000000000..2d1c73fbc --- /dev/null +++ b/graphics/pokemon/palettes/mew_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +222 222 222 +255 255 255 +213 213 213 +24 90 164 +82 180 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +222 148 131 +246 213 230 +255 197 205 +255 164 148 +213 74 82 +156 57 57 +41 41 41 diff --git a/graphics/pokemon/palettes/mew_shiny_palette.pal b/graphics/pokemon/palettes/mew_shiny_palette.pal new file mode 100644 index 000000000..6fd333100 --- /dev/null +++ b/graphics/pokemon/palettes/mew_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +222 222 222 +255 255 255 +213 213 213 +24 90 164 +74 148 213 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +139 180 246 +230 246 255 +197 238 255 +164 213 246 +82 139 205 +74 115 180 +41 41 41 diff --git a/graphics/pokemon/palettes/mewtwo_palette.pal b/graphics/pokemon/palettes/mewtwo_palette.pal new file mode 100644 index 000000000..4afd3567e --- /dev/null +++ b/graphics/pokemon/palettes/mewtwo_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +230 213 213 +230 230 246 +189 189 213 +139 139 180 +82 82 106 +230 180 255 +180 131 213 +139 90 172 +115 49 148 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +16 16 16 +255 255 255 diff --git a/graphics/pokemon/palettes/mewtwo_shiny_palette.pal b/graphics/pokemon/palettes/mewtwo_shiny_palette.pal new file mode 100644 index 000000000..c65c6c83e --- /dev/null +++ b/graphics/pokemon/palettes/mewtwo_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +230 213 213 +230 230 230 +180 180 180 +148 148 148 +74 74 57 +189 238 90 +148 205 65 +90 148 32 +65 90 41 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +16 16 16 +255 255 255 diff --git a/graphics/pokemon/palettes/mightyena_palette.pal b/graphics/pokemon/palettes/mightyena_palette.pal new file mode 100644 index 000000000..42cdc8fc1 --- /dev/null +++ b/graphics/pokemon/palettes/mightyena_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +57 164 164 +0 0 0 +0 0 0 +172 172 180 +148 139 156 +74 82 106 +49 49 65 +32 32 41 +222 230 238 +197 205 213 +255 197 90 +172 123 90 +222 57 57 +164 16 16 +255 255 255 +0 0 0 diff --git a/graphics/pokemon/palettes/mightyena_shiny_palette.pal b/graphics/pokemon/palettes/mightyena_shiny_palette.pal new file mode 100644 index 000000000..7881952af --- /dev/null +++ b/graphics/pokemon/palettes/mightyena_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +57 164 164 +0 0 0 +0 0 0 +255 205 106 +213 172 74 +164 123 82 +131 90 57 +98 57 16 +255 238 172 +255 222 123 +255 255 255 +172 123 90 +74 98 172 +49 57 115 +255 255 255 +0 0 0 diff --git a/graphics/pokemon/palettes/milotic_palette.pal b/graphics/pokemon/palettes/milotic_palette.pal new file mode 100644 index 000000000..df5cab01a --- /dev/null +++ b/graphics/pokemon/palettes/milotic_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +246 246 148 +115 57 49 +164 106 82 +222 189 156 +255 213 180 +255 230 213 +148 172 197 +139 197 255 +213 98 65 +238 131 90 +180 82 65 +230 131 139 +255 164 131 +106 98 123 +246 246 238 +0 0 0 diff --git a/graphics/pokemon/palettes/milotic_shiny_palette.pal b/graphics/pokemon/palettes/milotic_shiny_palette.pal new file mode 100644 index 000000000..8a57b80b2 --- /dev/null +++ b/graphics/pokemon/palettes/milotic_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +246 246 148 +115 57 49 +164 106 82 +222 189 156 +255 213 180 +255 238 222 +222 197 0 +255 230 32 +148 156 205 +180 189 238 +90 98 148 +230 131 139 +255 164 131 +106 98 123 +246 246 238 +0 0 0 diff --git a/graphics/pokemon/palettes/miltank_palette.pal b/graphics/pokemon/palettes/miltank_palette.pal new file mode 100644 index 000000000..105c67283 --- /dev/null +++ b/graphics/pokemon/palettes/miltank_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +205 205 172 +255 255 255 +255 213 222 +255 172 164 +213 123 115 +139 74 74 +255 230 156 +238 197 123 +197 156 82 +148 106 32 +0 82 255 +164 164 164 +90 90 90 +49 49 49 +24 24 32 +180 57 98 diff --git a/graphics/pokemon/palettes/miltank_shiny_palette.pal b/graphics/pokemon/palettes/miltank_shiny_palette.pal new file mode 100644 index 000000000..7dcb6f2ee --- /dev/null +++ b/graphics/pokemon/palettes/miltank_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +205 205 172 +255 255 255 +246 246 238 +230 238 238 +156 172 189 +90 98 131 +255 255 255 +222 213 197 +172 156 115 +139 106 74 +0 82 255 +213 74 49 +139 57 32 +90 24 16 +41 24 24 +238 106 115 diff --git a/graphics/pokemon/palettes/minun_palette.pal b/graphics/pokemon/palettes/minun_palette.pal new file mode 100644 index 000000000..3ed8a19ee --- /dev/null +++ b/graphics/pokemon/palettes/minun_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +49 164 82 +255 246 222 +255 238 197 +238 213 131 +189 172 131 +123 115 82 +98 156 255 +90 123 230 +49 90 131 +238 82 57 +41 49 65 +98 98 115 +65 65 98 +148 148 148 +0 0 0 +255 255 255 diff --git a/graphics/pokemon/palettes/minun_shiny_palette.pal b/graphics/pokemon/palettes/minun_shiny_palette.pal new file mode 100644 index 000000000..db9c93534 --- /dev/null +++ b/graphics/pokemon/palettes/minun_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +49 164 82 +255 246 222 +255 238 164 +255 213 106 +205 148 82 +139 82 16 +148 197 205 +82 139 131 +49 115 106 +238 82 57 +41 49 65 +98 98 115 +65 65 98 +148 148 148 +0 0 0 +255 255 255 diff --git a/graphics/pokemon/palettes/misdreavus_palette.pal b/graphics/pokemon/palettes/misdreavus_palette.pal new file mode 100644 index 000000000..c57ab5ea7 --- /dev/null +++ b/graphics/pokemon/palettes/misdreavus_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +222 222 222 +16 16 16 +41 74 65 +74 106 115 +115 156 148 +148 189 180 +255 0 246 +255 246 82 +172 16 74 +238 90 148 +255 213 197 +123 32 0 +189 32 24 +255 90 41 +255 148 189 +255 255 255 diff --git a/graphics/pokemon/palettes/misdreavus_shiny_palette.pal b/graphics/pokemon/palettes/misdreavus_shiny_palette.pal new file mode 100644 index 000000000..8814515be --- /dev/null +++ b/graphics/pokemon/palettes/misdreavus_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +222 222 222 +16 16 16 +98 82 16 +156 139 49 +213 197 98 +246 230 123 +255 0 255 +255 246 82 +82 65 32 +230 189 65 +255 230 106 +123 41 8 +172 57 24 +255 90 41 +255 197 49 +255 255 255 diff --git a/graphics/pokemon/palettes/moltres_palette.pal b/graphics/pokemon/palettes/moltres_palette.pal new file mode 100644 index 000000000..b27f7cdac --- /dev/null +++ b/graphics/pokemon/palettes/moltres_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +213 213 189 +255 255 255 +222 222 222 +180 0 0 +255 213 156 +255 148 74 +255 98 0 +238 0 0 +238 172 74 +205 123 32 +131 49 0 +255 246 65 +255 222 16 +255 172 0 +189 82 0 +16 16 16 diff --git a/graphics/pokemon/palettes/moltres_shiny_palette.pal b/graphics/pokemon/palettes/moltres_shiny_palette.pal new file mode 100644 index 000000000..b289551aa --- /dev/null +++ b/graphics/pokemon/palettes/moltres_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +213 213 189 +255 255 255 +222 222 222 +180 0 0 +255 213 156 +255 148 74 +255 98 0 +189 49 41 +255 115 90 +205 49 32 +164 16 32 +255 222 205 +255 172 164 +230 115 106 +172 57 57 +16 16 16 diff --git a/graphics/pokemon/palettes/mr_mime_palette.pal b/graphics/pokemon/palettes/mr_mime_palette.pal new file mode 100644 index 000000000..e878e42c4 --- /dev/null +++ b/graphics/pokemon/palettes/mr_mime_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +205 205 180 +205 213 222 +131 131 172 +65 74 123 +41 49 74 +255 148 139 +238 74 57 +189 74 57 +123 41 41 +255 230 222 +255 205 197 +230 164 156 +106 65 57 +189 123 106 +16 16 16 +255 255 255 diff --git a/graphics/pokemon/palettes/mr_mime_shiny_palette.pal b/graphics/pokemon/palettes/mr_mime_shiny_palette.pal new file mode 100644 index 000000000..95c8d6ff3 --- /dev/null +++ b/graphics/pokemon/palettes/mr_mime_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +205 205 180 +205 213 222 +131 131 172 +65 74 123 +41 49 74 +180 230 82 +139 189 41 +98 148 0 +41 90 0 +255 238 238 +255 205 205 +230 172 172 +139 90 82 +189 123 106 +16 16 16 +255 255 255 diff --git a/graphics/pokemon/palettes/mudkip_palette.pal b/graphics/pokemon/palettes/mudkip_palette.pal new file mode 100644 index 000000000..bc3cc1b65 --- /dev/null +++ b/graphics/pokemon/palettes/mudkip_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +49 164 82 +180 189 246 +156 172 222 +139 156 180 +123 115 123 +255 180 82 +246 156 65 +205 131 65 +164 123 90 +197 205 255 +255 255 255 +123 197 255 +90 172 230 +49 131 197 +74 74 131 +16 16 16 diff --git a/graphics/pokemon/palettes/mudkip_shiny_palette.pal b/graphics/pokemon/palettes/mudkip_shiny_palette.pal new file mode 100644 index 000000000..ef5447b60 --- /dev/null +++ b/graphics/pokemon/palettes/mudkip_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +49 164 82 +255 238 156 +255 205 106 +230 172 90 +213 156 74 +255 180 82 +246 156 65 +205 131 65 +164 123 90 +255 246 197 +255 255 255 +222 156 238 +197 115 222 +139 82 156 +106 49 123 +16 16 16 diff --git a/graphics/pokemon/palettes/muk_palette.pal b/graphics/pokemon/palettes/muk_palette.pal new file mode 100644 index 000000000..be7aba3a8 --- /dev/null +++ b/graphics/pokemon/palettes/muk_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +197 238 222 +238 222 238 +230 189 222 +197 156 180 +148 106 156 +90 49 115 +213 213 222 +172 180 189 +131 139 156 +65 74 90 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +16 16 16 +255 255 255 diff --git a/graphics/pokemon/palettes/muk_shiny_palette.pal b/graphics/pokemon/palettes/muk_shiny_palette.pal new file mode 100644 index 000000000..5ed5ae280 --- /dev/null +++ b/graphics/pokemon/palettes/muk_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +238 238 238 +197 246 156 +180 230 148 +139 189 106 +98 148 65 +57 106 24 +213 213 222 +172 180 189 +131 139 156 +65 74 90 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +16 16 16 +255 255 255 diff --git a/graphics/pokemon/palettes/murkrow_palette.pal b/graphics/pokemon/palettes/murkrow_palette.pal new file mode 100644 index 000000000..1d8b5f991 --- /dev/null +++ b/graphics/pokemon/palettes/murkrow_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +222 222 222 +255 172 139 +238 57 65 +172 16 32 +41 65 65 +57 82 82 +82 106 106 +139 164 164 +255 0 255 +106 74 16 +156 123 32 +213 180 41 +255 255 82 +255 0 255 +16 16 16 +255 255 255 diff --git a/graphics/pokemon/palettes/murkrow_shiny_palette.pal b/graphics/pokemon/palettes/murkrow_shiny_palette.pal new file mode 100644 index 000000000..4524256e4 --- /dev/null +++ b/graphics/pokemon/palettes/murkrow_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +222 222 222 +255 172 139 +238 57 65 +172 16 32 +98 41 90 +156 57 139 +197 90 164 +238 131 197 +255 0 255 +106 74 16 +156 123 32 +213 180 41 +255 255 82 +255 0 255 +16 16 16 +255 255 255 diff --git a/graphics/pokemon/palettes/natu_palette.pal b/graphics/pokemon/palettes/natu_palette.pal new file mode 100644 index 000000000..c1712ee1e --- /dev/null +++ b/graphics/pokemon/palettes/natu_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +205 205 172 +255 255 255 +156 230 74 +82 197 74 +74 148 65 +49 98 41 +255 222 65 +205 172 57 +131 98 32 +255 74 0 +205 57 0 +131 41 0 +205 205 205 +148 148 148 +82 82 82 +41 41 41 diff --git a/graphics/pokemon/palettes/natu_shiny_palette.pal b/graphics/pokemon/palettes/natu_shiny_palette.pal new file mode 100644 index 000000000..2dcf957e9 --- /dev/null +++ b/graphics/pokemon/palettes/natu_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +205 205 172 +255 255 255 +189 255 65 +164 230 49 +115 189 8 +65 106 0 +255 222 65 +189 148 32 +139 90 0 +255 164 57 +213 106 16 +115 74 0 +205 205 205 +148 148 148 +82 82 82 +41 41 41 diff --git a/graphics/pokemon/palettes/nidoking_palette.pal b/graphics/pokemon/palettes/nidoking_palette.pal new file mode 100644 index 000000000..4de13c9ca --- /dev/null +++ b/graphics/pokemon/palettes/nidoking_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +123 180 213 +255 255 255 +230 230 213 +197 197 164 +115 115 90 +255 0 255 +255 0 255 +197 115 189 +65 197 180 +41 148 123 +0 98 74 +230 180 238 +213 123 230 +164 90 156 +106 49 123 +16 16 16 diff --git a/graphics/pokemon/palettes/nidoking_shiny_palette.pal b/graphics/pokemon/palettes/nidoking_shiny_palette.pal new file mode 100644 index 000000000..ec9702076 --- /dev/null +++ b/graphics/pokemon/palettes/nidoking_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +180 164 115 +255 255 255 +230 230 213 +197 197 164 +115 115 90 +255 0 255 +255 0 255 +74 164 222 +189 139 172 +123 98 115 +74 49 65 +139 222 255 +98 180 255 +57 123 213 +57 82 131 +16 16 16 diff --git a/graphics/pokemon/palettes/nidoqueen_palette.pal b/graphics/pokemon/palettes/nidoqueen_palette.pal new file mode 100644 index 000000000..4b5ab5aa3 --- /dev/null +++ b/graphics/pokemon/palettes/nidoqueen_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +213 213 180 +255 255 255 +213 213 213 +238 230 164 +230 205 139 +189 172 90 +115 90 41 +255 156 139 +230 65 49 +172 16 0 +222 255 255 +156 213 222 +90 180 205 +106 139 172 +57 82 90 +16 16 16 diff --git a/graphics/pokemon/palettes/nidoqueen_shiny_palette.pal b/graphics/pokemon/palettes/nidoqueen_shiny_palette.pal new file mode 100644 index 000000000..3b08f01ac --- /dev/null +++ b/graphics/pokemon/palettes/nidoqueen_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +213 213 180 +255 255 255 +213 213 213 +255 213 230 +238 180 205 +197 148 172 +139 98 115 +255 156 139 +238 74 57 +172 16 0 +205 205 139 +172 172 106 +139 139 74 +106 98 41 +65 57 8 +16 16 16 diff --git a/graphics/pokemon/palettes/nidoran_f_palette.pal b/graphics/pokemon/palettes/nidoran_f_palette.pal new file mode 100644 index 000000000..7f26f6277 --- /dev/null +++ b/graphics/pokemon/palettes/nidoran_f_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +222 222 189 +222 255 255 +197 230 238 +148 205 189 +90 164 148 +74 98 98 +255 82 65 +189 49 74 +65 139 230 +82 139 180 +57 106 148 +255 0 255 +255 0 255 +255 0 255 +255 255 255 +16 16 16 diff --git a/graphics/pokemon/palettes/nidoran_f_shiny_palette.pal b/graphics/pokemon/palettes/nidoran_f_shiny_palette.pal new file mode 100644 index 000000000..5b6e230fe --- /dev/null +++ b/graphics/pokemon/palettes/nidoran_f_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +222 222 189 +246 213 255 +213 180 238 +180 148 205 +148 115 172 +98 65 123 +238 74 57 +197 32 16 +98 139 65 +65 106 32 +32 74 0 +255 0 255 +255 0 255 +255 0 255 +255 255 255 +16 16 16 diff --git a/graphics/pokemon/palettes/nidoran_m_palette.pal b/graphics/pokemon/palettes/nidoran_m_palette.pal new file mode 100644 index 000000000..fb4e29f10 --- /dev/null +++ b/graphics/pokemon/palettes/nidoran_m_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +213 213 180 +255 255 255 +16 16 16 +255 106 82 +222 65 41 +180 24 0 +24 205 156 +0 164 115 +0 98 65 +255 0 255 +238 189 238 +230 156 213 +189 98 189 +98 65 106 +205 205 205 +131 131 131 diff --git a/graphics/pokemon/palettes/nidoran_m_shiny_palette.pal b/graphics/pokemon/palettes/nidoran_m_shiny_palette.pal new file mode 100644 index 000000000..dfbf08893 --- /dev/null +++ b/graphics/pokemon/palettes/nidoran_m_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +213 213 180 +255 255 255 +16 16 16 +255 106 82 +222 65 41 +180 24 0 +180 131 131 +148 90 98 +106 49 57 +255 0 255 +172 222 255 +164 189 255 +115 156 213 +57 90 156 +197 197 197 +131 131 131 diff --git a/graphics/pokemon/palettes/nidorina_palette.pal b/graphics/pokemon/palettes/nidorina_palette.pal new file mode 100644 index 000000000..396733a06 --- /dev/null +++ b/graphics/pokemon/palettes/nidorina_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +213 213 180 +255 255 255 +213 213 213 +131 131 131 +74 131 246 +16 98 180 +24 57 115 +255 156 139 +238 74 57 +197 32 16 +222 255 255 +197 230 238 +139 197 205 +90 148 180 +57 90 98 +16 16 16 diff --git a/graphics/pokemon/palettes/nidorina_shiny_palette.pal b/graphics/pokemon/palettes/nidorina_shiny_palette.pal new file mode 100644 index 000000000..2d04c4b5c --- /dev/null +++ b/graphics/pokemon/palettes/nidorina_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +213 213 180 +255 255 255 +197 197 197 +131 131 131 +115 139 90 +82 106 57 +41 65 16 +255 156 139 +238 74 57 +197 32 16 +255 213 255 +246 180 238 +213 148 205 +164 90 131 +106 49 74 +16 16 16 diff --git a/graphics/pokemon/palettes/nidorino_palette.pal b/graphics/pokemon/palettes/nidorino_palette.pal new file mode 100644 index 000000000..f495113d5 --- /dev/null +++ b/graphics/pokemon/palettes/nidorino_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +213 213 180 +255 255 255 +255 106 82 +222 65 41 +180 24 0 +57 238 189 +74 205 164 +0 164 115 +255 0 255 +16 16 16 +230 172 238 +222 148 205 +172 123 189 +106 65 123 +197 197 197 +131 131 131 diff --git a/graphics/pokemon/palettes/nidorino_shiny_palette.pal b/graphics/pokemon/palettes/nidorino_shiny_palette.pal new file mode 100644 index 000000000..e8ca02aeb --- /dev/null +++ b/graphics/pokemon/palettes/nidorino_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +213 213 180 +255 255 255 +255 106 82 +222 65 41 +180 24 0 +180 131 131 +148 90 98 +106 49 57 +255 0 255 +16 16 16 +172 222 255 +164 189 255 +115 156 213 +57 90 156 +197 197 197 +131 131 131 diff --git a/graphics/pokemon/palettes/nincada_palette.pal b/graphics/pokemon/palettes/nincada_palette.pal new file mode 100644 index 000000000..22184bbbd --- /dev/null +++ b/graphics/pokemon/palettes/nincada_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +131 180 115 +230 213 213 +205 164 106 +172 139 98 +156 115 82 +131 197 106 +98 164 106 +115 74 57 +246 238 230 +74 123 90 +205 189 180 +180 172 148 +156 139 123 +123 115 98 +90 82 82 +41 41 41 diff --git a/graphics/pokemon/palettes/nincada_shiny_palette.pal b/graphics/pokemon/palettes/nincada_shiny_palette.pal new file mode 100644 index 000000000..08e4c9575 --- /dev/null +++ b/graphics/pokemon/palettes/nincada_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +131 180 115 +255 238 164 +205 164 106 +172 139 98 +156 115 82 +156 213 74 +115 172 49 +115 74 57 +246 238 230 +82 98 41 +255 213 106 +230 172 90 +205 148 65 +180 123 41 +131 90 8 +41 41 41 diff --git a/graphics/pokemon/palettes/ninetales_palette.pal b/graphics/pokemon/palettes/ninetales_palette.pal new file mode 100644 index 000000000..59affc534 --- /dev/null +++ b/graphics/pokemon/palettes/ninetales_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +222 222 222 +255 255 255 +255 106 41 +222 32 16 +180 16 0 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +238 222 115 +205 156 98 +255 238 180 +246 230 115 +230 197 106 +131 106 41 +16 16 16 diff --git a/graphics/pokemon/palettes/ninetales_shiny_palette.pal b/graphics/pokemon/palettes/ninetales_shiny_palette.pal new file mode 100644 index 000000000..b7007523a --- /dev/null +++ b/graphics/pokemon/palettes/ninetales_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +222 222 222 +255 255 255 +255 106 41 +222 32 16 +180 16 0 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +205 180 180 +156 131 123 +246 230 222 +230 205 213 +189 164 172 +131 106 115 +16 16 16 diff --git a/graphics/pokemon/palettes/ninjask_palette.pal b/graphics/pokemon/palettes/ninjask_palette.pal new file mode 100644 index 000000000..ec7c1daa7 --- /dev/null +++ b/graphics/pokemon/palettes/ninjask_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +131 180 115 +255 255 255 +246 213 82 +222 172 82 +139 106 65 +246 106 16 +180 57 32 +131 57 57 +222 74 16 +213 213 205 +172 180 180 +139 148 148 +123 123 123 +90 90 123 +65 65 90 +0 0 0 diff --git a/graphics/pokemon/palettes/ninjask_shiny_palette.pal b/graphics/pokemon/palettes/ninjask_shiny_palette.pal new file mode 100644 index 000000000..bd2fbbda9 --- /dev/null +++ b/graphics/pokemon/palettes/ninjask_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +131 180 115 +255 255 255 +246 213 82 +222 172 82 +139 106 65 +246 106 16 +180 57 32 +131 57 57 +222 74 16 +255 213 106 +255 213 106 +230 172 90 +205 148 65 +180 123 41 +131 90 8 +0 0 0 diff --git a/graphics/pokemon/palettes/noctowl_palette.pal b/graphics/pokemon/palettes/noctowl_palette.pal new file mode 100644 index 000000000..710759236 --- /dev/null +++ b/graphics/pokemon/palettes/noctowl_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +205 205 172 +255 255 255 +255 255 172 +230 205 98 +205 164 65 +156 115 57 +156 123 106 +123 90 74 +98 65 49 +74 41 24 +197 49 24 +156 0 0 +197 197 197 +115 115 115 +255 238 115 +16 16 16 diff --git a/graphics/pokemon/palettes/noctowl_shiny_palette.pal b/graphics/pokemon/palettes/noctowl_shiny_palette.pal new file mode 100644 index 000000000..859222f59 --- /dev/null +++ b/graphics/pokemon/palettes/noctowl_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +205 205 172 +255 255 255 +246 255 172 +213 222 90 +189 189 57 +156 148 32 +213 164 74 +180 115 0 +123 82 0 +82 57 0 +197 49 24 +156 0 0 +197 197 197 +115 115 115 +238 246 115 +16 16 16 diff --git a/graphics/pokemon/palettes/nosepass_palette.pal b/graphics/pokemon/palettes/nosepass_palette.pal new file mode 100644 index 000000000..ec3681288 --- /dev/null +++ b/graphics/pokemon/palettes/nosepass_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 255 255 +57 57 82 +197 197 197 +98 115 123 +131 148 164 +148 189 180 +189 213 222 +139 57 24 +205 90 24 +246 139 41 +255 197 164 +255 255 255 +74 82 82 +0 0 0 +0 0 0 +24 24 24 diff --git a/graphics/pokemon/palettes/nosepass_shiny_palette.pal b/graphics/pokemon/palettes/nosepass_shiny_palette.pal new file mode 100644 index 000000000..b17260e5a --- /dev/null +++ b/graphics/pokemon/palettes/nosepass_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +180 172 213 +106 74 57 +197 197 197 +106 82 49 +172 139 65 +222 180 74 +246 213 115 +189 57 24 +230 90 24 +246 139 41 +255 197 164 +255 255 255 +82 57 24 +0 0 0 +0 0 0 +24 24 24 diff --git a/graphics/pokemon/palettes/numel_palette.pal b/graphics/pokemon/palettes/numel_palette.pal new file mode 100644 index 000000000..74388d36b --- /dev/null +++ b/graphics/pokemon/palettes/numel_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +148 148 246 +106 98 32 +246 222 0 +205 180 57 +222 205 32 +246 246 164 +213 213 148 +255 238 106 +148 222 24 +180 246 49 +115 164 57 +90 115 106 +148 148 82 +230 222 238 +255 255 255 +24 24 24 diff --git a/graphics/pokemon/palettes/numel_shiny_palette.pal b/graphics/pokemon/palettes/numel_shiny_palette.pal new file mode 100644 index 000000000..2162c155c --- /dev/null +++ b/graphics/pokemon/palettes/numel_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +205 197 180 +131 98 74 +238 197 156 +197 156 98 +205 164 123 +246 246 213 +213 213 172 +255 222 172 +90 172 230 +123 197 255 +49 131 197 +74 98 90 +131 131 65 +230 222 238 +255 255 255 +24 24 24 diff --git a/graphics/pokemon/palettes/nuzleaf_palette.pal b/graphics/pokemon/palettes/nuzleaf_palette.pal new file mode 100644 index 000000000..fd8ec8bff --- /dev/null +++ b/graphics/pokemon/palettes/nuzleaf_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +49 148 246 +74 57 65 +205 205 238 +255 255 255 +123 148 82 +180 205 131 +230 238 180 +156 123 156 +205 156 98 +230 197 148 +98 197 131 +148 238 131 +65 115 57 +106 82 98 +0 0 0 +24 24 24 diff --git a/graphics/pokemon/palettes/nuzleaf_shiny_palette.pal b/graphics/pokemon/palettes/nuzleaf_shiny_palette.pal new file mode 100644 index 000000000..1706d316b --- /dev/null +++ b/graphics/pokemon/palettes/nuzleaf_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +180 213 156 +74 57 65 +205 205 238 +255 255 255 +180 65 49 +222 98 49 +255 123 82 +115 90 90 +156 123 123 +189 164 156 +98 197 131 +148 238 131 +65 115 57 +106 82 98 +0 0 0 +24 24 24 diff --git a/graphics/pokemon/palettes/octillery_palette.pal b/graphics/pokemon/palettes/octillery_palette.pal new file mode 100644 index 000000000..2a32e5f6d --- /dev/null +++ b/graphics/pokemon/palettes/octillery_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +205 205 172 +255 255 255 +255 180 106 +246 106 49 +213 57 16 +131 0 0 +255 0 255 +255 255 172 +255 213 82 +213 156 41 +148 90 0 +213 213 213 +172 172 180 +123 123 131 +90 90 90 +16 16 16 diff --git a/graphics/pokemon/palettes/octillery_shiny_palette.pal b/graphics/pokemon/palettes/octillery_shiny_palette.pal new file mode 100644 index 000000000..fcbdd5cda --- /dev/null +++ b/graphics/pokemon/palettes/octillery_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +205 205 172 +255 255 255 +230 189 90 +197 156 65 +148 106 24 +82 65 49 +255 0 255 +230 255 172 +205 230 82 +164 172 41 +98 98 0 +213 213 213 +172 172 180 +123 123 131 +90 90 90 +16 16 16 diff --git a/graphics/pokemon/palettes/oddish_palette.pal b/graphics/pokemon/palettes/oddish_palette.pal new file mode 100644 index 000000000..7583f6592 --- /dev/null +++ b/graphics/pokemon/palettes/oddish_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +222 222 222 +255 255 255 +180 41 49 +230 74 65 +197 230 123 +156 213 74 +115 172 49 +74 90 32 +255 0 255 +255 0 255 +255 0 255 +148 180 197 +115 148 164 +74 106 131 +41 57 74 +16 16 16 diff --git a/graphics/pokemon/palettes/oddish_shiny_palette.pal b/graphics/pokemon/palettes/oddish_shiny_palette.pal new file mode 100644 index 000000000..c37765a09 --- /dev/null +++ b/graphics/pokemon/palettes/oddish_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +222 222 222 +255 255 255 +180 41 49 +230 74 65 +197 238 16 +172 222 16 +156 189 16 +98 131 49 +255 0 255 +255 0 255 +255 0 255 +139 222 57 +115 197 32 +65 164 32 +0 74 0 +16 16 16 diff --git a/graphics/pokemon/palettes/omanyte_palette.pal b/graphics/pokemon/palettes/omanyte_palette.pal new file mode 100644 index 000000000..09d257a66 --- /dev/null +++ b/graphics/pokemon/palettes/omanyte_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +222 222 189 +255 255 255 +230 230 230 +255 0 255 +255 0 255 +98 98 98 +16 16 16 +255 255 172 +238 230 139 +205 197 106 +172 164 74 +98 90 16 +131 205 197 +98 172 164 +57 131 123 +16 90 82 diff --git a/graphics/pokemon/palettes/omanyte_shiny_palette.pal b/graphics/pokemon/palettes/omanyte_shiny_palette.pal new file mode 100644 index 000000000..af72dc30d --- /dev/null +++ b/graphics/pokemon/palettes/omanyte_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +222 222 189 +255 255 255 +230 230 230 +255 0 255 +255 0 255 +98 98 98 +16 16 16 +255 246 156 +246 222 139 +213 189 115 +172 148 82 +123 98 41 +213 156 238 +172 115 205 +131 74 172 +90 41 148 diff --git a/graphics/pokemon/palettes/omastar_palette.pal b/graphics/pokemon/palettes/omastar_palette.pal new file mode 100644 index 000000000..f63530b4e --- /dev/null +++ b/graphics/pokemon/palettes/omastar_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +222 222 197 +255 238 180 +246 213 98 +180 156 65 +16 16 16 +255 0 255 +255 0 255 +255 255 172 +238 230 139 +205 197 106 +172 164 74 +106 98 16 +156 230 222 +131 205 197 +98 172 164 +16 98 90 diff --git a/graphics/pokemon/palettes/omastar_shiny_palette.pal b/graphics/pokemon/palettes/omastar_shiny_palette.pal new file mode 100644 index 000000000..b17facc09 --- /dev/null +++ b/graphics/pokemon/palettes/omastar_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +222 222 197 +255 238 180 +246 213 98 +180 156 65 +16 16 16 +255 0 255 +255 0 255 +255 255 222 +238 246 90 +213 222 74 +172 180 57 +98 106 24 +222 172 255 +189 139 238 +148 98 205 +98 49 164 diff --git a/graphics/pokemon/palettes/onix_palette.pal b/graphics/pokemon/palettes/onix_palette.pal new file mode 100644 index 000000000..d0820bdc6 --- /dev/null +++ b/graphics/pokemon/palettes/onix_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +172 222 205 +255 255 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +238 230 230 +222 213 213 +189 180 180 +123 131 106 +82 74 74 +16 16 16 diff --git a/graphics/pokemon/palettes/onix_shiny_palette.pal b/graphics/pokemon/palettes/onix_shiny_palette.pal new file mode 100644 index 000000000..fc100a9cf --- /dev/null +++ b/graphics/pokemon/palettes/onix_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +222 222 222 +255 255 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +230 230 156 +205 205 131 +164 164 90 +123 123 49 +82 82 8 +16 16 16 diff --git a/graphics/pokemon/palettes/paras_palette.pal b/graphics/pokemon/palettes/paras_palette.pal new file mode 100644 index 000000000..9dc798375 --- /dev/null +++ b/graphics/pokemon/palettes/paras_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +213 213 180 +255 246 255 +230 230 230 +164 164 164 +255 246 90 +222 213 57 +255 123 123 +230 57 57 +180 8 8 +255 0 255 +255 172 98 +238 139 49 +189 131 49 +131 82 32 +255 0 255 +16 16 16 diff --git a/graphics/pokemon/palettes/paras_shiny_palette.pal b/graphics/pokemon/palettes/paras_shiny_palette.pal new file mode 100644 index 000000000..9174d9168 --- /dev/null +++ b/graphics/pokemon/palettes/paras_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +213 213 180 +255 246 255 +230 230 230 +164 164 164 +255 255 205 +246 238 115 +255 213 65 +238 156 49 +139 115 16 +255 0 255 +230 139 32 +197 106 32 +148 74 32 +106 41 0 +255 0 255 +16 16 16 diff --git a/graphics/pokemon/palettes/parasect_palette.pal b/graphics/pokemon/palettes/parasect_palette.pal new file mode 100644 index 000000000..3350e5c48 --- /dev/null +++ b/graphics/pokemon/palettes/parasect_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +213 213 180 +255 246 255 +213 213 213 +156 139 164 +255 213 82 +213 205 49 +255 106 106 +238 49 49 +197 49 57 +139 8 8 +255 0 255 +255 131 82 +222 106 49 +180 65 49 +106 24 8 +16 16 16 diff --git a/graphics/pokemon/palettes/parasect_shiny_palette.pal b/graphics/pokemon/palettes/parasect_shiny_palette.pal new file mode 100644 index 000000000..3574c408f --- /dev/null +++ b/graphics/pokemon/palettes/parasect_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +213 213 180 +255 246 255 +230 230 230 +164 164 164 +255 246 90 +213 205 49 +255 213 90 +255 172 49 +213 131 8 +156 74 0 +255 0 255 +255 189 82 +213 148 41 +172 106 0 +131 65 0 +16 16 16 diff --git a/graphics/pokemon/palettes/pelipper_palette.pal b/graphics/pokemon/palettes/pelipper_palette.pal new file mode 100644 index 000000000..c78d73c37 --- /dev/null +++ b/graphics/pokemon/palettes/pelipper_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +131 189 139 +131 90 65 +230 172 90 +255 213 98 +255 238 156 +82 82 90 +148 213 230 +57 156 180 +115 189 213 +222 222 238 +246 246 255 +139 65 90 +189 139 57 +0 0 0 +156 156 172 +32 98 123 diff --git a/graphics/pokemon/palettes/pelipper_shiny_palette.pal b/graphics/pokemon/palettes/pelipper_shiny_palette.pal new file mode 100644 index 000000000..41686ffed --- /dev/null +++ b/graphics/pokemon/palettes/pelipper_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +131 189 139 +131 90 65 +238 189 90 +255 230 106 +255 238 189 +82 82 90 +156 238 123 +90 156 57 +123 205 90 +230 205 255 +246 246 255 +139 65 90 +189 139 57 +0 0 0 +156 156 172 +32 98 123 diff --git a/graphics/pokemon/palettes/persian_palette.pal b/graphics/pokemon/palettes/persian_palette.pal new file mode 100644 index 000000000..694d1a0f6 --- /dev/null +++ b/graphics/pokemon/palettes/persian_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +213 213 180 +255 255 255 +222 222 222 +16 16 16 +255 189 156 +246 82 65 +164 16 0 +189 164 74 +148 123 32 +115 90 16 +255 0 255 +255 0 255 +255 255 172 +255 230 131 +222 180 82 +131 82 0 diff --git a/graphics/pokemon/palettes/persian_shiny_palette.pal b/graphics/pokemon/palettes/persian_shiny_palette.pal new file mode 100644 index 000000000..4e4a92e32 --- /dev/null +++ b/graphics/pokemon/palettes/persian_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +213 213 180 +255 255 255 +222 222 222 +16 16 16 +255 123 82 +222 98 49 +180 65 49 +255 189 205 +230 123 180 +148 57 98 +255 0 255 +255 0 255 +255 255 238 +255 246 197 +222 213 131 +164 131 41 diff --git a/graphics/pokemon/palettes/phanpy_palette.pal b/graphics/pokemon/palettes/phanpy_palette.pal new file mode 100644 index 000000000..57ca810fa --- /dev/null +++ b/graphics/pokemon/palettes/phanpy_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +205 205 172 +255 255 255 +172 213 238 +156 189 238 +98 148 197 +82 82 148 +255 0 255 +255 172 139 +246 106 82 +189 57 49 +131 0 0 +255 0 255 +255 0 255 +213 213 213 +139 139 139 +16 16 16 diff --git a/graphics/pokemon/palettes/phanpy_shiny_palette.pal b/graphics/pokemon/palettes/phanpy_shiny_palette.pal new file mode 100644 index 000000000..a09fc1dcc --- /dev/null +++ b/graphics/pokemon/palettes/phanpy_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +205 205 172 +255 255 255 +222 246 255 +189 230 255 +106 180 230 +65 98 180 +255 0 255 +255 164 123 +255 82 65 +197 49 57 +131 0 0 +255 0 255 +255 0 255 +213 213 213 +139 139 139 +16 16 16 diff --git a/graphics/pokemon/palettes/pichu_palette.pal b/graphics/pokemon/palettes/pichu_palette.pal new file mode 100644 index 000000000..50d614dae --- /dev/null +++ b/graphics/pokemon/palettes/pichu_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +205 205 172 +255 255 255 +255 255 197 +255 238 131 +230 180 65 +197 139 0 +131 82 0 +255 0 255 +255 0 255 +255 115 74 +197 65 41 +115 32 8 +205 205 205 +115 115 115 +82 82 82 +16 16 16 diff --git a/graphics/pokemon/palettes/pichu_shiny_palette.pal b/graphics/pokemon/palettes/pichu_shiny_palette.pal new file mode 100644 index 000000000..dd17d7fe0 --- /dev/null +++ b/graphics/pokemon/palettes/pichu_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +205 205 172 +255 255 255 +255 255 90 +255 222 41 +222 180 0 +172 131 0 +131 82 0 +255 0 255 +255 0 255 +255 82 0 +197 0 0 +115 0 0 +205 205 205 +115 115 115 +82 82 82 +16 16 16 diff --git a/graphics/pokemon/palettes/pidgeot_palette.pal b/graphics/pokemon/palettes/pidgeot_palette.pal new file mode 100644 index 000000000..4f7242c65 --- /dev/null +++ b/graphics/pokemon/palettes/pidgeot_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +139 222 213 +255 255 255 +213 197 213 +255 246 189 +246 238 156 +213 205 115 +255 172 115 +238 98 65 +197 65 65 +255 213 180 +255 230 49 +205 156 123 +172 123 90 +123 90 74 +98 65 49 +16 16 16 diff --git a/graphics/pokemon/palettes/pidgeot_shiny_palette.pal b/graphics/pokemon/palettes/pidgeot_shiny_palette.pal new file mode 100644 index 000000000..8f6518b6b --- /dev/null +++ b/graphics/pokemon/palettes/pidgeot_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +205 197 172 +255 255 255 +164 164 164 +255 255 148 +255 230 115 +246 205 90 +255 205 24 +246 172 8 +238 156 0 +255 238 49 +238 205 16 +205 172 16 +180 131 0 +148 90 0 +98 41 0 +16 16 16 diff --git a/graphics/pokemon/palettes/pidgeotto_palette.pal b/graphics/pokemon/palettes/pidgeotto_palette.pal new file mode 100644 index 000000000..26fc191ec --- /dev/null +++ b/graphics/pokemon/palettes/pidgeotto_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +205 197 172 +255 255 255 +205 189 213 +246 246 164 +246 230 106 +230 197 106 +255 172 115 +238 98 65 +197 65 65 +205 156 123 +172 123 90 +123 90 74 +90 57 41 +255 0 255 +32 32 32 +255 0 255 diff --git a/graphics/pokemon/palettes/pidgeotto_shiny_palette.pal b/graphics/pokemon/palettes/pidgeotto_shiny_palette.pal new file mode 100644 index 000000000..09a5b5cd3 --- /dev/null +++ b/graphics/pokemon/palettes/pidgeotto_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +205 197 172 +255 255 255 +164 164 164 +255 255 205 +246 238 172 +222 197 131 +255 255 65 +255 213 24 +246 172 0 +197 180 123 +164 148 90 +131 115 57 +82 65 16 +255 0 255 +32 32 32 +255 0 255 diff --git a/graphics/pokemon/palettes/pidgey_palette.pal b/graphics/pokemon/palettes/pidgey_palette.pal new file mode 100644 index 000000000..2d9f8708f --- /dev/null +++ b/graphics/pokemon/palettes/pidgey_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +222 222 222 +255 255 255 +197 197 197 +255 246 189 +255 230 139 +222 197 98 +255 180 172 +230 123 115 +180 74 65 +205 139 98 +172 98 57 +123 90 74 +90 57 41 +255 0 255 +16 16 16 +255 0 255 diff --git a/graphics/pokemon/palettes/pidgey_shiny_palette.pal b/graphics/pokemon/palettes/pidgey_shiny_palette.pal new file mode 100644 index 000000000..5723ea075 --- /dev/null +++ b/graphics/pokemon/palettes/pidgey_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +205 205 172 +255 255 255 +189 189 189 +255 255 197 +255 255 139 +213 213 90 +255 255 32 +255 197 0 +189 148 65 +230 222 0 +189 180 0 +148 139 0 +106 98 0 +255 0 255 +16 16 16 +255 0 255 diff --git a/graphics/pokemon/palettes/pikachu_palette.pal b/graphics/pokemon/palettes/pikachu_palette.pal new file mode 100644 index 000000000..bb60c24a9 --- /dev/null +++ b/graphics/pokemon/palettes/pikachu_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +205 205 180 +255 255 255 +255 255 123 +255 238 0 +238 189 0 +197 139 0 +131 82 0 +255 0 255 +255 0 255 +255 0 255 +255 74 74 +230 0 0 +180 0 0 +106 106 106 +16 16 16 +255 0 255 diff --git a/graphics/pokemon/palettes/pikachu_shiny_palette.pal b/graphics/pokemon/palettes/pikachu_shiny_palette.pal new file mode 100644 index 000000000..ee905559c --- /dev/null +++ b/graphics/pokemon/palettes/pikachu_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +205 205 180 +255 255 255 +255 230 49 +246 205 32 +238 156 0 +205 98 0 +131 82 24 +255 0 255 +255 0 255 +255 0 255 +255 49 0 +205 57 0 +180 32 0 +106 106 106 +16 16 16 +255 0 255 diff --git a/graphics/pokemon/palettes/piloswine_palette.pal b/graphics/pokemon/palettes/piloswine_palette.pal new file mode 100644 index 000000000..287cfcd0d --- /dev/null +++ b/graphics/pokemon/palettes/piloswine_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +205 205 172 +255 255 255 +222 197 115 +197 164 82 +164 131 57 +123 98 24 +82 57 0 +255 0 255 +255 189 131 +222 139 82 +180 98 41 +255 0 255 +222 222 222 +180 180 189 +123 123 139 +16 16 16 diff --git a/graphics/pokemon/palettes/piloswine_shiny_palette.pal b/graphics/pokemon/palettes/piloswine_shiny_palette.pal new file mode 100644 index 000000000..ff56a634a --- /dev/null +++ b/graphics/pokemon/palettes/piloswine_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +205 205 172 +255 255 255 +246 238 156 +222 213 115 +189 180 90 +148 139 57 +82 57 0 +255 0 255 +255 189 131 +222 139 82 +180 98 41 +255 0 255 +222 222 222 +180 180 189 +123 123 139 +16 16 16 diff --git a/graphics/pokemon/palettes/pineco_palette.pal b/graphics/pokemon/palettes/pineco_palette.pal new file mode 100644 index 000000000..91acee124 --- /dev/null +++ b/graphics/pokemon/palettes/pineco_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +205 205 172 +16 16 16 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +41 74 123 +57 115 164 +82 172 180 +131 213 213 +180 238 246 +156 164 164 +255 74 57 +255 0 255 +255 0 255 +255 255 255 diff --git a/graphics/pokemon/palettes/pineco_shiny_palette.pal b/graphics/pokemon/palettes/pineco_shiny_palette.pal new file mode 100644 index 000000000..a474cc3e8 --- /dev/null +++ b/graphics/pokemon/palettes/pineco_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +205 205 172 +16 16 16 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +90 65 65 +148 90 82 +172 139 82 +230 197 106 +255 230 131 +156 164 164 +255 74 57 +255 0 255 +255 0 255 +255 255 255 diff --git a/graphics/pokemon/palettes/pinsir_palette.pal b/graphics/pokemon/palettes/pinsir_palette.pal new file mode 100644 index 000000000..d4fd44e8f --- /dev/null +++ b/graphics/pokemon/palettes/pinsir_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +213 213 213 +255 255 255 +238 238 205 +213 213 180 +172 172 131 +90 90 74 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +172 139 115 +230 197 156 +205 164 131 +139 115 90 +90 65 41 +16 16 16 diff --git a/graphics/pokemon/palettes/pinsir_shiny_palette.pal b/graphics/pokemon/palettes/pinsir_shiny_palette.pal new file mode 100644 index 000000000..597e7a335 --- /dev/null +++ b/graphics/pokemon/palettes/pinsir_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +213 213 213 +255 255 255 +255 238 189 +230 197 156 +180 156 106 +98 74 57 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +82 82 148 +123 139 222 +98 106 180 +57 65 106 +32 41 82 +16 16 16 diff --git a/graphics/pokemon/palettes/plusle_palette.pal b/graphics/pokemon/palettes/plusle_palette.pal new file mode 100644 index 000000000..e225ab56a --- /dev/null +++ b/graphics/pokemon/palettes/plusle_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +49 164 82 +255 246 222 +255 238 197 +238 213 131 +189 172 131 +123 115 82 +238 156 115 +222 98 74 +139 90 49 +238 82 57 +41 49 65 +98 98 115 +65 65 98 +148 148 148 +0 0 0 +255 255 255 diff --git a/graphics/pokemon/palettes/plusle_shiny_palette.pal b/graphics/pokemon/palettes/plusle_shiny_palette.pal new file mode 100644 index 000000000..f1305ea50 --- /dev/null +++ b/graphics/pokemon/palettes/plusle_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +49 164 82 +255 246 222 +255 238 164 +255 213 106 +205 148 82 +139 82 16 +238 90 49 +205 49 8 +148 16 0 +164 32 16 +41 49 65 +98 98 115 +65 65 98 +148 148 148 +0 0 0 +255 255 255 diff --git a/graphics/pokemon/palettes/politoed_palette.pal b/graphics/pokemon/palettes/politoed_palette.pal new file mode 100644 index 000000000..31177861d --- /dev/null +++ b/graphics/pokemon/palettes/politoed_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +205 205 172 +255 255 255 +255 255 164 +255 230 82 +230 180 41 +156 98 0 +205 255 131 +156 238 49 +123 189 24 +49 123 0 +255 180 106 +230 106 49 +180 57 0 +205 205 205 +131 131 131 +16 16 16 diff --git a/graphics/pokemon/palettes/politoed_shiny_palette.pal b/graphics/pokemon/palettes/politoed_shiny_palette.pal new file mode 100644 index 000000000..1d25291bf --- /dev/null +++ b/graphics/pokemon/palettes/politoed_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +205 205 172 +255 255 255 +255 230 238 +246 205 238 +213 164 205 +123 82 123 +156 230 255 +115 197 255 +74 148 205 +49 90 148 +255 172 90 +230 106 49 +164 57 32 +205 205 205 +131 131 131 +16 16 16 diff --git a/graphics/pokemon/palettes/poliwag_palette.pal b/graphics/pokemon/palettes/poliwag_palette.pal new file mode 100644 index 000000000..fa7a79543 --- /dev/null +++ b/graphics/pokemon/palettes/poliwag_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +230 230 230 +255 255 255 +222 222 222 +180 172 189 +98 98 98 +255 0 255 +255 0 255 +255 0 255 +255 189 172 +255 139 123 +238 90 74 +172 180 222 +131 139 180 +82 90 148 +41 57 82 +16 16 16 diff --git a/graphics/pokemon/palettes/poliwag_shiny_palette.pal b/graphics/pokemon/palettes/poliwag_shiny_palette.pal new file mode 100644 index 000000000..1789edc4a --- /dev/null +++ b/graphics/pokemon/palettes/poliwag_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +230 230 230 +255 255 255 +222 222 222 +189 189 189 +98 98 98 +255 0 255 +255 0 255 +255 0 255 +255 189 172 +255 139 123 +238 90 74 +123 205 255 +82 164 222 +41 123 180 +0 65 123 +16 16 16 diff --git a/graphics/pokemon/palettes/poliwhirl_palette.pal b/graphics/pokemon/palettes/poliwhirl_palette.pal new file mode 100644 index 000000000..50de4d631 --- /dev/null +++ b/graphics/pokemon/palettes/poliwhirl_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +230 230 230 +255 255 255 +222 222 222 +189 189 189 +164 164 164 +255 0 255 +255 0 255 +255 0 255 +123 123 123 +82 82 82 +255 0 255 +180 189 230 +131 148 197 +98 106 148 +32 57 98 +16 16 16 diff --git a/graphics/pokemon/palettes/poliwhirl_shiny_palette.pal b/graphics/pokemon/palettes/poliwhirl_shiny_palette.pal new file mode 100644 index 000000000..b6aa45616 --- /dev/null +++ b/graphics/pokemon/palettes/poliwhirl_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +230 230 230 +255 255 255 +222 222 222 +189 189 189 +164 164 164 +255 0 255 +255 0 255 +255 0 255 +123 123 123 +82 82 82 +255 0 255 +106 213 255 +65 172 222 +24 131 180 +0 65 115 +16 16 16 diff --git a/graphics/pokemon/palettes/poliwrath_palette.pal b/graphics/pokemon/palettes/poliwrath_palette.pal new file mode 100644 index 000000000..0f2a6a88b --- /dev/null +++ b/graphics/pokemon/palettes/poliwrath_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +230 230 230 +255 255 255 +230 230 230 +189 189 189 +164 164 164 +255 0 255 +255 0 255 +255 0 255 +123 123 123 +82 82 82 +16 16 16 +156 189 213 +131 156 172 +82 106 148 +49 49 106 +255 0 255 diff --git a/graphics/pokemon/palettes/poliwrath_shiny_palette.pal b/graphics/pokemon/palettes/poliwrath_shiny_palette.pal new file mode 100644 index 000000000..64aab4039 --- /dev/null +++ b/graphics/pokemon/palettes/poliwrath_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +230 230 230 +255 255 255 +222 222 222 +189 189 189 +164 164 164 +255 0 255 +255 0 255 +255 0 255 +123 123 123 +82 82 82 +16 16 16 +148 189 131 +106 148 90 +65 106 49 +24 65 8 +255 0 255 diff --git a/graphics/pokemon/palettes/ponyta_palette.pal b/graphics/pokemon/palettes/ponyta_palette.pal new file mode 100644 index 000000000..af1b95044 --- /dev/null +++ b/graphics/pokemon/palettes/ponyta_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +230 230 230 +255 255 255 +255 246 180 +255 238 123 +238 205 106 +139 82 24 +255 0 255 +255 0 255 +255 0 255 +255 230 32 +255 172 16 +255 98 0 +213 0 0 +172 172 172 +90 90 90 +16 16 16 diff --git a/graphics/pokemon/palettes/ponyta_shiny_palette.pal b/graphics/pokemon/palettes/ponyta_shiny_palette.pal new file mode 100644 index 000000000..eef11581b --- /dev/null +++ b/graphics/pokemon/palettes/ponyta_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +230 230 230 +255 255 255 +255 255 222 +255 246 189 +246 213 156 +131 98 41 +255 0 255 +255 0 255 +255 0 255 +139 230 255 +98 197 255 +57 131 255 +49 90 197 +156 156 156 +90 90 90 +16 16 16 diff --git a/graphics/pokemon/palettes/poochyena_palette.pal b/graphics/pokemon/palettes/poochyena_palette.pal new file mode 100644 index 000000000..4c386e261 --- /dev/null +++ b/graphics/pokemon/palettes/poochyena_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 197 164 +213 205 222 +255 230 131 +255 164 123 +123 90 82 +164 156 172 +131 123 139 +74 82 98 +49 49 65 +197 189 205 +255 213 90 +180 139 90 +222 74 65 +172 57 65 +255 255 255 +0 0 0 diff --git a/graphics/pokemon/palettes/poochyena_shiny_palette.pal b/graphics/pokemon/palettes/poochyena_shiny_palette.pal new file mode 100644 index 000000000..c30dcec93 --- /dev/null +++ b/graphics/pokemon/palettes/poochyena_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 197 164 +255 230 180 +139 197 213 +255 164 123 +123 90 82 +213 172 74 +148 106 65 +115 74 41 +82 41 0 +255 205 106 +123 172 238 +57 74 131 +222 74 65 +172 57 65 +255 255 255 +0 0 0 diff --git a/graphics/pokemon/palettes/porygon2_palette.pal b/graphics/pokemon/palettes/porygon2_palette.pal new file mode 100644 index 000000000..a9de00549 --- /dev/null +++ b/graphics/pokemon/palettes/porygon2_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +205 205 172 +255 255 255 +255 213 172 +255 148 139 +222 98 82 +180 32 16 +255 0 255 +148 238 255 +106 205 255 +65 164 222 +32 123 197 +0 49 156 +213 213 213 +180 180 189 +106 106 123 +16 16 16 diff --git a/graphics/pokemon/palettes/porygon2_shiny_palette.pal b/graphics/pokemon/palettes/porygon2_shiny_palette.pal new file mode 100644 index 000000000..4c0d2054c --- /dev/null +++ b/graphics/pokemon/palettes/porygon2_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +205 205 172 +255 255 255 +123 180 255 +65 123 246 +24 82 205 +0 49 156 +255 0 255 +255 238 238 +238 205 238 +197 164 197 +139 106 148 +98 65 115 +213 213 213 +180 180 189 +106 106 123 +16 16 16 diff --git a/graphics/pokemon/palettes/porygon_palette.pal b/graphics/pokemon/palettes/porygon_palette.pal new file mode 100644 index 000000000..4de40a0c3 --- /dev/null +++ b/graphics/pokemon/palettes/porygon_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +213 213 189 +115 213 255 +57 189 213 +41 156 139 +8 90 106 +255 197 164 +255 148 139 +222 98 82 +148 16 24 +222 222 230 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +41 41 41 +255 255 255 diff --git a/graphics/pokemon/palettes/porygon_shiny_palette.pal b/graphics/pokemon/palettes/porygon_shiny_palette.pal new file mode 100644 index 000000000..19178b1b8 --- /dev/null +++ b/graphics/pokemon/palettes/porygon_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +213 213 189 +255 238 238 +238 205 238 +205 172 205 +98 65 115 +131 189 255 +57 115 246 +24 82 205 +0 49 156 +222 222 230 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +41 41 41 +255 255 255 diff --git a/graphics/pokemon/palettes/primeape_palette.pal b/graphics/pokemon/palettes/primeape_palette.pal new file mode 100644 index 000000000..5515043b2 --- /dev/null +++ b/graphics/pokemon/palettes/primeape_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +222 222 222 +255 255 255 +222 222 222 +123 123 123 +65 65 65 +255 148 90 +189 74 49 +230 180 139 +205 139 90 +156 106 65 +90 49 0 +0 0 0 +255 255 213 +255 230 180 +230 189 139 +123 90 41 diff --git a/graphics/pokemon/palettes/primeape_shiny_palette.pal b/graphics/pokemon/palettes/primeape_shiny_palette.pal new file mode 100644 index 000000000..02b4f4e16 --- /dev/null +++ b/graphics/pokemon/palettes/primeape_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +222 222 222 +255 255 255 +222 222 222 +123 123 123 +65 65 65 +255 148 90 +189 74 49 +205 197 106 +164 156 65 +123 115 24 +82 74 8 +0 0 0 +255 222 156 +238 180 115 +197 139 74 +115 49 0 diff --git a/graphics/pokemon/palettes/psyduck_palette.pal b/graphics/pokemon/palettes/psyduck_palette.pal new file mode 100644 index 000000000..546dddd9f --- /dev/null +++ b/graphics/pokemon/palettes/psyduck_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +238 238 238 +255 238 189 +246 222 139 +222 180 82 +131 90 0 +255 255 255 +222 222 222 +148 148 148 +255 0 255 +255 0 255 +255 0 255 +255 230 164 +255 213 74 +230 164 49 +148 90 16 +16 16 16 diff --git a/graphics/pokemon/palettes/psyduck_shiny_palette.pal b/graphics/pokemon/palettes/psyduck_shiny_palette.pal new file mode 100644 index 000000000..49b953b0d --- /dev/null +++ b/graphics/pokemon/palettes/psyduck_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +238 238 238 +238 255 255 +213 246 246 +172 205 205 +49 82 82 +255 255 255 +222 222 222 +148 148 148 +255 0 255 +255 0 255 +255 0 255 +156 238 238 +148 213 222 +106 172 180 +24 98 106 +16 16 16 diff --git a/graphics/pokemon/palettes/pupitar_palette.pal b/graphics/pokemon/palettes/pupitar_palette.pal new file mode 100644 index 000000000..bd8385e29 --- /dev/null +++ b/graphics/pokemon/palettes/pupitar_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +205 205 172 +255 255 255 +189 230 255 +139 197 238 +115 156 197 +41 90 131 +255 0 255 +180 65 0 +205 205 213 +172 172 172 +123 123 131 +255 0 255 +255 0 255 +255 0 255 +65 65 98 +16 16 16 diff --git a/graphics/pokemon/palettes/pupitar_shiny_palette.pal b/graphics/pokemon/palettes/pupitar_shiny_palette.pal new file mode 100644 index 000000000..58371ba01 --- /dev/null +++ b/graphics/pokemon/palettes/pupitar_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +205 205 172 +255 255 255 +246 189 255 +213 156 230 +156 106 189 +98 65 115 +255 0 255 +180 65 0 +205 205 213 +172 172 172 +123 123 131 +255 0 255 +255 0 255 +255 0 255 +65 65 98 +16 16 16 diff --git a/graphics/pokemon/palettes/quagsire_palette.pal b/graphics/pokemon/palettes/quagsire_palette.pal new file mode 100644 index 000000000..5a74c8c08 --- /dev/null +++ b/graphics/pokemon/palettes/quagsire_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +205 205 172 +16 49 65 +32 65 98 +57 90 156 +255 0 255 +74 139 205 +98 164 230 +172 205 238 +197 238 246 +255 0 255 +255 0 255 +98 82 123 +148 98 148 +255 115 180 +255 0 255 +16 16 16 diff --git a/graphics/pokemon/palettes/quagsire_shiny_palette.pal b/graphics/pokemon/palettes/quagsire_shiny_palette.pal new file mode 100644 index 000000000..cb5bd7922 --- /dev/null +++ b/graphics/pokemon/palettes/quagsire_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +205 205 172 +74 57 65 +98 74 98 +90 65 90 +255 0 255 +148 98 164 +189 123 205 +230 164 230 +255 189 238 +255 0 255 +255 0 255 +98 82 123 +148 98 148 +255 115 180 +255 0 255 +16 16 16 diff --git a/graphics/pokemon/palettes/quilava_palette.pal b/graphics/pokemon/palettes/quilava_palette.pal new file mode 100644 index 000000000..0b37faf22 --- /dev/null +++ b/graphics/pokemon/palettes/quilava_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +205 205 172 +255 255 255 +98 131 189 +65 82 139 +41 65 98 +24 41 82 +255 238 164 +230 205 106 +180 156 82 +139 98 32 +255 222 0 +255 156 0 +255 98 0 +238 0 0 +180 180 180 +16 16 16 diff --git a/graphics/pokemon/palettes/quilava_shiny_palette.pal b/graphics/pokemon/palettes/quilava_shiny_palette.pal new file mode 100644 index 000000000..e1baba127 --- /dev/null +++ b/graphics/pokemon/palettes/quilava_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +205 205 172 +255 255 255 +230 156 106 +189 98 65 +139 65 57 +98 57 41 +255 230 115 +222 197 82 +172 139 49 +139 82 24 +255 222 0 +255 156 0 +255 98 0 +238 0 0 +180 180 180 +16 16 16 diff --git a/graphics/pokemon/palettes/qwilfish_palette.pal b/graphics/pokemon/palettes/qwilfish_palette.pal new file mode 100644 index 000000000..1956e57c4 --- /dev/null +++ b/graphics/pokemon/palettes/qwilfish_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +205 205 172 +16 16 16 +255 0 255 +255 0 255 +148 0 0 +57 74 98 +74 90 164 +90 131 197 +115 172 238 +106 82 49 +197 180 82 +230 222 115 +238 255 164 +213 82 98 +255 164 148 +255 255 255 diff --git a/graphics/pokemon/palettes/qwilfish_shiny_palette.pal b/graphics/pokemon/palettes/qwilfish_shiny_palette.pal new file mode 100644 index 000000000..d548d12e9 --- /dev/null +++ b/graphics/pokemon/palettes/qwilfish_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +205 205 172 +16 16 16 +255 0 255 +255 0 255 +148 0 0 +98 57 90 +148 41 131 +189 82 164 +222 115 189 +115 65 98 +189 139 180 +230 189 222 +255 222 246 +213 82 98 +255 164 148 +255 255 255 diff --git a/graphics/pokemon/palettes/raichu_palette.pal b/graphics/pokemon/palettes/raichu_palette.pal new file mode 100644 index 000000000..f221efbab --- /dev/null +++ b/graphics/pokemon/palettes/raichu_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +222 222 222 +255 255 255 +255 222 123 +255 197 32 +222 164 90 +156 106 49 +246 230 205 +255 222 41 +222 205 82 +189 131 65 +148 98 49 +139 82 49 +98 65 24 +106 106 106 +16 16 16 +205 41 41 diff --git a/graphics/pokemon/palettes/raichu_shiny_palette.pal b/graphics/pokemon/palettes/raichu_shiny_palette.pal new file mode 100644 index 000000000..8b6a3fe37 --- /dev/null +++ b/graphics/pokemon/palettes/raichu_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +222 222 222 +255 255 255 +255 189 57 +255 148 41 +230 115 24 +123 57 32 +222 222 156 +205 180 115 +164 139 74 +172 115 49 +131 82 49 +123 65 32 +115 74 8 +106 106 106 +16 16 16 +230 0 0 diff --git a/graphics/pokemon/palettes/raikou_palette.pal b/graphics/pokemon/palettes/raikou_palette.pal new file mode 100644 index 000000000..975f92b23 --- /dev/null +++ b/graphics/pokemon/palettes/raikou_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +205 205 172 +255 255 255 +255 238 148 +255 205 65 +213 156 41 +139 98 16 +213 180 255 +180 115 255 +123 41 222 +65 16 148 +197 0 0 +255 0 255 +213 213 213 +164 164 164 +106 106 106 +16 16 16 diff --git a/graphics/pokemon/palettes/raikou_shiny_palette.pal b/graphics/pokemon/palettes/raikou_shiny_palette.pal new file mode 100644 index 000000000..73bbcb405 --- /dev/null +++ b/graphics/pokemon/palettes/raikou_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +205 205 172 +255 255 255 +255 213 82 +246 156 49 +197 106 8 +82 74 16 +255 255 148 +238 230 74 +189 180 41 +106 98 0 +197 0 0 +255 0 255 +222 222 197 +180 189 164 +123 131 106 +16 16 16 diff --git a/graphics/pokemon/palettes/ralts_palette.pal b/graphics/pokemon/palettes/ralts_palette.pal new file mode 100644 index 000000000..1e513ae87 --- /dev/null +++ b/graphics/pokemon/palettes/ralts_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +156 164 82 +238 238 255 +197 205 222 +164 180 205 +131 148 180 +123 82 82 +115 41 57 +255 156 131 +230 82 57 +131 205 255 +255 255 255 +205 255 172 +148 230 148 +115 189 115 +49 123 74 +16 16 16 diff --git a/graphics/pokemon/palettes/ralts_shiny_palette.pal b/graphics/pokemon/palettes/ralts_shiny_palette.pal new file mode 100644 index 000000000..b588f6eea --- /dev/null +++ b/graphics/pokemon/palettes/ralts_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +156 164 82 +238 238 255 +213 189 222 +180 164 205 +156 131 180 +123 82 82 +115 41 57 +255 197 90 +230 131 32 +131 205 255 +197 238 246 +189 230 255 +123 197 238 +82 172 213 +32 115 123 +16 16 16 diff --git a/graphics/pokemon/palettes/rapidash_palette.pal b/graphics/pokemon/palettes/rapidash_palette.pal new file mode 100644 index 000000000..181b4f58a --- /dev/null +++ b/graphics/pokemon/palettes/rapidash_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +213 213 189 +255 255 255 +255 246 180 +255 238 123 +230 205 82 +197 164 49 +148 106 24 +255 0 255 +255 0 255 +255 230 32 +255 197 16 +255 98 0 +205 0 0 +156 156 156 +90 90 90 +16 16 16 diff --git a/graphics/pokemon/palettes/rapidash_shiny_palette.pal b/graphics/pokemon/palettes/rapidash_shiny_palette.pal new file mode 100644 index 000000000..6297b0e4e --- /dev/null +++ b/graphics/pokemon/palettes/rapidash_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +213 213 189 +255 255 255 +246 246 197 +238 230 189 +205 197 156 +156 148 65 +123 106 32 +255 0 255 +255 0 255 +197 205 230 +156 164 189 +115 123 148 +74 82 106 +156 156 156 +90 90 90 +16 16 16 diff --git a/graphics/pokemon/palettes/raticate_palette.pal b/graphics/pokemon/palettes/raticate_palette.pal new file mode 100644 index 000000000..c82a9117e --- /dev/null +++ b/graphics/pokemon/palettes/raticate_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +205 205 172 +255 255 255 +246 197 148 +222 131 98 +246 246 164 +238 222 139 +213 189 131 +180 156 115 +222 189 82 +197 156 65 +164 123 49 +115 74 0 +213 213 213 +180 180 180 +115 115 115 +16 16 16 diff --git a/graphics/pokemon/palettes/raticate_shiny_palette.pal b/graphics/pokemon/palettes/raticate_shiny_palette.pal new file mode 100644 index 000000000..c15414d53 --- /dev/null +++ b/graphics/pokemon/palettes/raticate_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +205 205 172 +255 255 255 +255 205 156 +222 131 98 +255 255 197 +230 230 156 +205 205 131 +131 131 49 +246 156 106 +230 106 65 +189 90 49 +131 74 49 +213 213 213 +180 180 180 +115 115 115 +16 16 16 diff --git a/graphics/pokemon/palettes/rattata_palette.pal b/graphics/pokemon/palettes/rattata_palette.pal new file mode 100644 index 000000000..a71005b50 --- /dev/null +++ b/graphics/pokemon/palettes/rattata_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +205 205 172 +255 255 255 +0 0 0 +230 205 115 +205 172 148 +238 74 90 +164 24 57 +213 148 213 +180 115 180 +131 98 139 +98 49 82 +222 222 197 +205 205 180 +180 180 148 +90 98 98 +16 16 16 diff --git a/graphics/pokemon/palettes/rattata_shiny_palette.pal b/graphics/pokemon/palettes/rattata_shiny_palette.pal new file mode 100644 index 000000000..532f2948f --- /dev/null +++ b/graphics/pokemon/palettes/rattata_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +205 205 172 +255 255 255 +0 0 0 +238 156 115 +205 131 98 +189 115 180 +123 82 131 +238 222 156 +205 189 123 +172 156 90 +115 106 49 +222 222 222 +197 197 197 +164 164 164 +90 98 98 +16 16 16 diff --git a/graphics/pokemon/palettes/rayquaza_palette.pal b/graphics/pokemon/palettes/rayquaza_palette.pal new file mode 100644 index 000000000..651b1b9b1 --- /dev/null +++ b/graphics/pokemon/palettes/rayquaza_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +156 156 255 +57 82 57 +65 131 65 +74 131 115 +90 189 139 +148 222 180 +0 0 0 +49 82 172 +74 156 189 +246 98 98 +197 148 98 +222 213 238 +255 255 255 +222 205 0 +255 238 0 +24 24 24 diff --git a/graphics/pokemon/palettes/rayquaza_shiny_palette.pal b/graphics/pokemon/palettes/rayquaza_shiny_palette.pal new file mode 100644 index 000000000..c294fa7ca --- /dev/null +++ b/graphics/pokemon/palettes/rayquaza_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +156 156 255 +57 57 57 +57 57 57 +82 82 82 +123 123 123 +164 164 164 +0 0 0 +49 82 148 +74 156 172 +246 98 98 +197 148 98 +230 222 255 +255 255 255 +222 205 0 +255 238 0 +0 0 0 diff --git a/graphics/pokemon/palettes/regice_palette.pal b/graphics/pokemon/palettes/regice_palette.pal new file mode 100644 index 000000000..2d599438d --- /dev/null +++ b/graphics/pokemon/palettes/regice_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +197 246 148 +49 57 90 +90 98 123 +156 164 222 +189 213 238 +222 255 255 +131 115 180 +255 255 255 +238 255 255 +0 0 0 +0 0 0 +0 0 0 +205 180 32 +255 255 172 +255 230 0 +24 24 24 diff --git a/graphics/pokemon/palettes/regice_shiny_palette.pal b/graphics/pokemon/palettes/regice_shiny_palette.pal new file mode 100644 index 000000000..0c3dc8a37 --- /dev/null +++ b/graphics/pokemon/palettes/regice_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +197 246 148 +0 98 197 +0 148 189 +74 213 255 +172 238 255 +230 255 255 +65 164 255 +255 255 255 +213 255 255 +0 0 0 +0 0 0 +0 0 0 +180 123 32 +255 230 98 +255 189 0 +24 24 24 diff --git a/graphics/pokemon/palettes/regirock_palette.pal b/graphics/pokemon/palettes/regirock_palette.pal new file mode 100644 index 000000000..f577420cb --- /dev/null +++ b/graphics/pokemon/palettes/regirock_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +98 197 148 +82 74 41 +148 139 115 +205 197 172 +230 222 172 +238 230 222 +180 172 148 +139 90 57 +189 131 57 +238 131 57 +238 172 106 +0 0 0 +0 0 0 +180 65 0 +238 115 57 +24 24 24 diff --git a/graphics/pokemon/palettes/regirock_shiny_palette.pal b/graphics/pokemon/palettes/regirock_shiny_palette.pal new file mode 100644 index 000000000..b997589cc --- /dev/null +++ b/graphics/pokemon/palettes/regirock_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +98 197 148 +98 24 0 +148 74 32 +180 106 65 +205 139 98 +238 164 131 +131 65 24 +139 90 57 +189 131 57 +238 131 57 +238 172 106 +0 0 0 +0 0 0 +180 65 0 +238 115 57 +24 24 24 diff --git a/graphics/pokemon/palettes/registeel_palette.pal b/graphics/pokemon/palettes/registeel_palette.pal new file mode 100644 index 000000000..9d7d328f4 --- /dev/null +++ b/graphics/pokemon/palettes/registeel_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +148 197 98 +90 82 82 +131 131 123 +189 189 180 +222 213 230 +238 238 238 +115 115 90 +139 131 106 +172 172 123 +0 0 0 +0 0 0 +255 255 255 +213 106 131 +255 180 164 +246 90 172 +24 24 24 diff --git a/graphics/pokemon/palettes/registeel_shiny_palette.pal b/graphics/pokemon/palettes/registeel_shiny_palette.pal new file mode 100644 index 000000000..e0489363a --- /dev/null +++ b/graphics/pokemon/palettes/registeel_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +148 197 98 +90 82 82 +90 123 106 +115 180 164 +172 222 197 +213 238 238 +115 115 90 +139 131 106 +172 172 123 +0 0 0 +0 0 0 +255 255 255 +180 65 49 +255 123 82 +222 98 49 +24 24 24 diff --git a/graphics/pokemon/palettes/relicanth_palette.pal b/graphics/pokemon/palettes/relicanth_palette.pal new file mode 100644 index 000000000..2a95fb3cb --- /dev/null +++ b/graphics/pokemon/palettes/relicanth_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +98 246 255 +246 222 180 +213 189 148 +180 148 106 +139 115 74 +106 82 65 +189 164 164 +0 0 0 +164 139 131 +139 115 106 +123 98 90 +82 65 57 +246 90 65 +205 65 49 +255 246 222 +139 123 82 diff --git a/graphics/pokemon/palettes/relicanth_shiny_palette.pal b/graphics/pokemon/palettes/relicanth_shiny_palette.pal new file mode 100644 index 000000000..3c3780470 --- /dev/null +++ b/graphics/pokemon/palettes/relicanth_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +98 246 255 +246 222 180 +213 189 148 +180 148 106 +139 115 74 +106 82 65 +172 230 246 +0 0 0 +139 197 213 +106 164 180 +74 131 148 +24 82 98 +246 90 65 +205 65 49 +255 246 222 +139 123 82 diff --git a/graphics/pokemon/palettes/remoraid_palette.pal b/graphics/pokemon/palettes/remoraid_palette.pal new file mode 100644 index 000000000..4d8f3326c --- /dev/null +++ b/graphics/pokemon/palettes/remoraid_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +205 205 172 +255 255 255 +213 246 246 +180 222 213 +139 172 189 +98 139 164 +57 74 123 +139 0 0 +255 0 255 +255 0 255 +255 0 255 +213 213 213 +172 172 180 +123 123 131 +90 90 90 +41 41 57 diff --git a/graphics/pokemon/palettes/remoraid_shiny_palette.pal b/graphics/pokemon/palettes/remoraid_shiny_palette.pal new file mode 100644 index 000000000..b9fd05014 --- /dev/null +++ b/graphics/pokemon/palettes/remoraid_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +205 205 172 +255 255 255 +246 213 246 +222 180 230 +172 123 180 +131 82 139 +98 57 106 +139 0 0 +255 0 255 +255 0 255 +255 0 255 +213 213 213 +172 172 180 +123 123 131 +90 90 90 +41 41 57 diff --git a/graphics/pokemon/palettes/rhydon_palette.pal b/graphics/pokemon/palettes/rhydon_palette.pal new file mode 100644 index 000000000..b4cf375f4 --- /dev/null +++ b/graphics/pokemon/palettes/rhydon_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +164 213 213 +255 255 255 +255 238 197 +230 213 172 +180 164 115 +123 106 57 +230 82 57 +164 49 16 +115 32 16 +255 0 255 +255 0 255 +222 222 213 +197 197 189 +139 139 148 +90 90 98 +16 16 16 diff --git a/graphics/pokemon/palettes/rhydon_shiny_palette.pal b/graphics/pokemon/palettes/rhydon_shiny_palette.pal new file mode 100644 index 000000000..b7076b1ca --- /dev/null +++ b/graphics/pokemon/palettes/rhydon_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +213 213 213 +255 255 255 +255 238 197 +230 213 172 +180 164 115 +123 106 57 +230 82 57 +164 49 16 +115 32 16 +255 0 255 +255 0 255 +255 238 197 +230 213 180 +189 172 139 +131 115 82 +16 16 16 diff --git a/graphics/pokemon/palettes/rhyhorn_palette.pal b/graphics/pokemon/palettes/rhyhorn_palette.pal new file mode 100644 index 000000000..bf720235e --- /dev/null +++ b/graphics/pokemon/palettes/rhyhorn_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +213 213 189 +230 230 238 +189 189 205 +131 131 172 +90 90 123 +65 65 90 +172 57 41 +90 8 0 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +16 16 16 +255 255 255 diff --git a/graphics/pokemon/palettes/rhyhorn_shiny_palette.pal b/graphics/pokemon/palettes/rhyhorn_shiny_palette.pal new file mode 100644 index 000000000..64280c939 --- /dev/null +++ b/graphics/pokemon/palettes/rhyhorn_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +213 213 189 +238 180 156 +197 139 115 +156 98 74 +115 57 32 +74 16 0 +172 57 41 +90 8 0 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +16 16 16 +255 255 255 diff --git a/graphics/pokemon/palettes/roselia_palette.pal b/graphics/pokemon/palettes/roselia_palette.pal new file mode 100644 index 000000000..a96e5081c --- /dev/null +++ b/graphics/pokemon/palettes/roselia_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +148 197 148 +0 0 0 +180 238 115 +246 213 74 +205 222 213 +65 98 49 +131 156 164 +98 148 74 +123 205 98 +172 197 197 +164 49 74 +246 90 131 +255 164 189 +41 90 148 +82 148 213 +98 180 255 diff --git a/graphics/pokemon/palettes/roselia_shiny_palette.pal b/graphics/pokemon/palettes/roselia_shiny_palette.pal new file mode 100644 index 000000000..eebb104af --- /dev/null +++ b/graphics/pokemon/palettes/roselia_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +148 197 148 +0 0 0 +189 255 115 +246 213 74 +255 238 172 +82 98 41 +213 172 90 +115 172 49 +156 213 74 +255 213 106 +123 65 139 +180 98 205 +205 139 222 +41 49 65 +115 106 123 +148 139 156 diff --git a/graphics/pokemon/palettes/sableye_palette.pal b/graphics/pokemon/palettes/sableye_palette.pal new file mode 100644 index 000000000..89a2bed0a --- /dev/null +++ b/graphics/pokemon/palettes/sableye_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +98 205 205 +74 49 74 +139 98 139 +197 123 189 +213 148 213 +148 131 213 +197 222 255 +255 255 255 +197 41 32 +106 74 115 +172 180 205 +82 205 65 +32 222 255 +164 115 164 +0 0 0 +255 82 74 diff --git a/graphics/pokemon/palettes/sableye_shiny_palette.pal b/graphics/pokemon/palettes/sableye_shiny_palette.pal new file mode 100644 index 000000000..8b03a2efe --- /dev/null +++ b/graphics/pokemon/palettes/sableye_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +98 205 205 +115 82 65 +131 82 57 +213 164 123 +246 197 164 +230 148 90 +255 230 156 +255 255 255 +82 213 74 +106 74 57 +230 164 90 +32 222 255 +255 230 106 +180 123 90 +0 0 0 +148 255 148 diff --git a/graphics/pokemon/palettes/salamence_palette.pal b/graphics/pokemon/palettes/salamence_palette.pal new file mode 100644 index 000000000..8ee78691f --- /dev/null +++ b/graphics/pokemon/palettes/salamence_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +172 222 98 +57 65 98 +82 98 148 +123 123 222 +172 172 255 +123 74 49 +189 115 74 +222 123 82 +255 148 98 +131 148 148 +172 164 189 +222 213 238 +255 255 255 +0 0 0 +255 255 41 +24 24 24 diff --git a/graphics/pokemon/palettes/salamence_shiny_palette.pal b/graphics/pokemon/palettes/salamence_shiny_palette.pal new file mode 100644 index 000000000..bf2da08f2 --- /dev/null +++ b/graphics/pokemon/palettes/salamence_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +172 222 98 +16 98 32 +98 156 106 +106 197 106 +148 230 148 +123 74 49 +189 115 74 +222 123 82 +255 148 98 +131 148 148 +172 164 189 +222 213 238 +255 255 255 +0 0 0 +255 255 41 +24 24 24 diff --git a/graphics/pokemon/palettes/sandshrew_palette.pal b/graphics/pokemon/palettes/sandshrew_palette.pal new file mode 100644 index 000000000..952ff6231 --- /dev/null +++ b/graphics/pokemon/palettes/sandshrew_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +213 213 180 +255 255 255 +255 0 255 +230 222 16 +205 180 0 +172 131 16 +115 74 24 +131 98 16 +255 0 255 +255 0 255 +205 189 180 +230 213 197 +238 238 222 +131 131 131 +82 82 82 +16 16 16 diff --git a/graphics/pokemon/palettes/sandshrew_shiny_palette.pal b/graphics/pokemon/palettes/sandshrew_shiny_palette.pal new file mode 100644 index 000000000..4f4ac7be6 --- /dev/null +++ b/graphics/pokemon/palettes/sandshrew_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +213 213 180 +255 255 255 +255 0 255 +213 222 98 +172 197 82 +131 156 41 +65 90 0 +98 115 41 +255 0 255 +255 0 255 +180 180 164 +205 205 189 +238 238 222 +139 139 139 +82 82 82 +16 16 16 diff --git a/graphics/pokemon/palettes/sandslash_palette.pal b/graphics/pokemon/palettes/sandslash_palette.pal new file mode 100644 index 000000000..384676a30 --- /dev/null +++ b/graphics/pokemon/palettes/sandslash_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +213 213 180 +246 230 213 +238 222 106 +222 197 32 +197 164 57 +131 98 0 +255 255 255 +222 213 180 +139 139 139 +82 82 82 +205 164 74 +172 131 49 +139 98 24 +90 65 16 +16 16 16 +255 0 255 diff --git a/graphics/pokemon/palettes/sandslash_shiny_palette.pal b/graphics/pokemon/palettes/sandslash_shiny_palette.pal new file mode 100644 index 000000000..092846e12 --- /dev/null +++ b/graphics/pokemon/palettes/sandslash_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +213 213 180 +246 238 156 +222 197 115 +189 164 74 +164 148 65 +98 82 0 +238 238 222 +205 205 189 +139 139 139 +74 74 74 +246 98 98 +213 90 74 +180 74 49 +106 82 32 +65 49 32 +255 0 255 diff --git a/graphics/pokemon/palettes/sceptile_palette.pal b/graphics/pokemon/palettes/sceptile_palette.pal new file mode 100644 index 000000000..31f822b0c --- /dev/null +++ b/graphics/pokemon/palettes/sceptile_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +123 106 156 +255 230 106 +255 197 82 +197 131 57 +255 238 180 +255 106 82 +213 82 57 +164 74 49 +57 98 32 +123 98 90 +255 255 255 +189 255 115 +156 213 74 +115 172 49 +90 123 32 +16 16 16 diff --git a/graphics/pokemon/palettes/sceptile_shiny_palette.pal b/graphics/pokemon/palettes/sceptile_shiny_palette.pal new file mode 100644 index 000000000..9a6882bf4 --- /dev/null +++ b/graphics/pokemon/palettes/sceptile_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +123 106 156 +255 106 82 +213 82 57 +164 74 49 +255 238 180 +255 230 106 +255 180 82 +197 131 57 +57 98 32 +123 98 90 +255 255 255 +189 246 255 +164 222 230 +90 180 164 +82 139 131 +16 16 16 diff --git a/graphics/pokemon/palettes/scizor_palette.pal b/graphics/pokemon/palettes/scizor_palette.pal new file mode 100644 index 000000000..a9310feae --- /dev/null +++ b/graphics/pokemon/palettes/scizor_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +205 205 172 +255 255 255 +255 197 115 +255 98 16 +205 57 0 +123 32 0 +255 0 255 +255 205 16 +255 139 41 +189 139 41 +255 0 255 +255 0 255 +197 197 205 +148 148 156 +90 90 106 +16 16 16 diff --git a/graphics/pokemon/palettes/scizor_shiny_palette.pal b/graphics/pokemon/palettes/scizor_shiny_palette.pal new file mode 100644 index 000000000..93e8e479b --- /dev/null +++ b/graphics/pokemon/palettes/scizor_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +205 205 172 +255 255 255 +222 230 98 +180 189 65 +106 115 65 +74 82 16 +255 0 255 +255 205 16 +255 139 41 +189 139 41 +255 0 255 +255 0 255 +197 197 205 +98 197 82 +49 123 32 +16 16 16 diff --git a/graphics/pokemon/palettes/scyther_palette.pal b/graphics/pokemon/palettes/scyther_palette.pal new file mode 100644 index 000000000..1367f8a23 --- /dev/null +++ b/graphics/pokemon/palettes/scyther_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +213 213 197 +255 255 255 +222 222 222 +189 189 189 +115 115 115 +246 230 123 +205 197 90 +255 255 172 +246 230 123 +205 57 57 +156 139 49 +189 255 115 +156 222 74 +115 172 65 +65 98 32 +16 16 16 diff --git a/graphics/pokemon/palettes/scyther_shiny_palette.pal b/graphics/pokemon/palettes/scyther_shiny_palette.pal new file mode 100644 index 000000000..fd0a63924 --- /dev/null +++ b/graphics/pokemon/palettes/scyther_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +213 213 197 +255 255 255 +222 222 222 +189 189 189 +115 115 115 +255 123 90 +205 123 90 +255 255 189 +238 238 148 +205 57 57 +156 139 49 +139 222 49 +98 189 49 +65 148 8 +57 90 8 +16 16 16 diff --git a/graphics/pokemon/palettes/seadra_palette.pal b/graphics/pokemon/palettes/seadra_palette.pal new file mode 100644 index 000000000..3e4751707 --- /dev/null +++ b/graphics/pokemon/palettes/seadra_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +213 213 189 +213 238 197 +164 222 230 +131 189 205 +106 131 156 +74 106 131 +32 65 90 +255 255 172 +222 197 82 +148 123 65 +106 82 41 +255 0 255 +222 222 222 +156 156 156 +0 0 0 +255 255 255 diff --git a/graphics/pokemon/palettes/seadra_shiny_palette.pal b/graphics/pokemon/palettes/seadra_shiny_palette.pal new file mode 100644 index 000000000..ae99ccc22 --- /dev/null +++ b/graphics/pokemon/palettes/seadra_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +213 213 189 +106 180 172 +106 164 205 +65 115 164 +57 82 123 +49 41 65 +0 0 82 +255 213 148 +238 180 131 +172 82 123 +106 82 41 +255 0 255 +222 222 222 +156 156 156 +0 0 0 +255 255 255 diff --git a/graphics/pokemon/palettes/seaking_palette.pal b/graphics/pokemon/palettes/seaking_palette.pal new file mode 100644 index 000000000..1ffe314f4 --- /dev/null +++ b/graphics/pokemon/palettes/seaking_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +213 213 189 +213 213 222 +172 180 189 +131 139 156 +90 90 98 +255 197 205 +246 123 90 +164 57 65 +255 0 255 +255 164 123 +246 123 90 +222 65 32 +164 49 32 +82 82 82 +16 16 16 +255 255 255 diff --git a/graphics/pokemon/palettes/seaking_shiny_palette.pal b/graphics/pokemon/palettes/seaking_shiny_palette.pal new file mode 100644 index 000000000..2a4acb23d --- /dev/null +++ b/graphics/pokemon/palettes/seaking_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +213 213 189 +230 246 164 +213 246 139 +131 164 57 +90 115 8 +255 197 205 +246 123 90 +164 57 65 +255 0 255 +255 246 131 +255 205 90 +213 164 49 +156 106 0 +82 82 82 +16 16 16 +255 255 255 diff --git a/graphics/pokemon/palettes/sealeo_palette.pal b/graphics/pokemon/palettes/sealeo_palette.pal new file mode 100644 index 000000000..6644440c0 --- /dev/null +++ b/graphics/pokemon/palettes/sealeo_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +82 139 82 +57 82 115 +65 106 164 +106 148 213 +139 172 255 +0 0 0 +156 156 180 +189 189 213 +222 222 255 +189 156 123 +213 180 148 +238 205 172 +90 123 148 +189 205 255 +255 230 189 +255 255 255 diff --git a/graphics/pokemon/palettes/sealeo_shiny_palette.pal b/graphics/pokemon/palettes/sealeo_shiny_palette.pal new file mode 100644 index 000000000..df4474877 --- /dev/null +++ b/graphics/pokemon/palettes/sealeo_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +82 139 82 +90 49 139 +180 98 205 +213 148 238 +246 197 255 +0 0 0 +156 156 180 +189 189 213 +222 222 255 +189 148 82 +230 189 106 +255 222 164 +156 74 180 +255 238 255 +255 246 197 +255 255 255 diff --git a/graphics/pokemon/palettes/seedot_palette.pal b/graphics/pokemon/palettes/seedot_palette.pal new file mode 100644 index 000000000..0fc33bf9b --- /dev/null +++ b/graphics/pokemon/palettes/seedot_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 255 255 +82 82 32 +131 123 115 +255 255 255 +156 90 49 +213 148 49 +213 180 82 +123 148 82 +180 205 131 +230 238 180 +246 197 98 +255 238 172 +0 0 0 +0 0 0 +0 0 0 +246 57 0 diff --git a/graphics/pokemon/palettes/seedot_shiny_palette.pal b/graphics/pokemon/palettes/seedot_shiny_palette.pal new file mode 100644 index 000000000..0cd33d0c1 --- /dev/null +++ b/graphics/pokemon/palettes/seedot_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 255 255 +82 82 32 +131 123 115 +255 255 255 +197 57 41 +230 82 32 +255 139 82 +148 139 139 +180 172 172 +222 213 213 +246 197 98 +255 238 172 +0 0 0 +0 0 0 +0 0 0 +246 57 0 diff --git a/graphics/pokemon/palettes/seel_palette.pal b/graphics/pokemon/palettes/seel_palette.pal new file mode 100644 index 000000000..2a1a75900 --- /dev/null +++ b/graphics/pokemon/palettes/seel_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +123 213 148 +230 230 246 +197 197 230 +156 164 189 +82 82 106 +255 230 180 +205 189 139 +131 106 65 +255 123 106 +197 115 123 +148 65 24 +255 0 255 +255 0 255 +255 0 255 +16 16 16 +255 255 255 diff --git a/graphics/pokemon/palettes/seel_shiny_palette.pal b/graphics/pokemon/palettes/seel_shiny_palette.pal new file mode 100644 index 000000000..952eec318 --- /dev/null +++ b/graphics/pokemon/palettes/seel_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +213 213 180 +238 238 213 +213 205 189 +180 172 156 +139 131 115 +255 255 197 +213 180 131 +115 106 49 +255 156 123 +238 115 82 +148 57 41 +255 0 255 +255 0 255 +255 0 255 +16 16 16 +255 255 255 diff --git a/graphics/pokemon/palettes/sentret_palette.pal b/graphics/pokemon/palettes/sentret_palette.pal new file mode 100644 index 000000000..5591d8f1b --- /dev/null +++ b/graphics/pokemon/palettes/sentret_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +222 222 222 +255 255 255 +238 222 139 +230 197 82 +205 164 65 +180 139 57 +148 106 32 +115 65 16 +90 41 8 +57 8 0 +222 65 24 +180 32 16 +255 131 115 +115 115 115 +65 65 65 +16 16 16 diff --git a/graphics/pokemon/palettes/sentret_shiny_palette.pal b/graphics/pokemon/palettes/sentret_shiny_palette.pal new file mode 100644 index 000000000..05c9da6f7 --- /dev/null +++ b/graphics/pokemon/palettes/sentret_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +205 205 172 +255 255 255 +255 246 172 +238 222 123 +205 164 65 +205 172 74 +197 82 115 +148 41 82 +82 16 65 +57 8 0 +222 65 24 +180 32 16 +255 131 115 +115 115 115 +65 65 65 +16 16 16 diff --git a/graphics/pokemon/palettes/seviper_palette.pal b/graphics/pokemon/palettes/seviper_palette.pal new file mode 100644 index 000000000..bdcc5e761 --- /dev/null +++ b/graphics/pokemon/palettes/seviper_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +148 197 197 +255 255 255 +57 49 49 +255 230 90 +222 189 65 +139 41 180 +255 189 172 +238 90 82 +205 65 57 +131 123 65 +41 32 32 +139 123 123 +82 74 74 +0 0 0 +164 49 255 +90 49 65 diff --git a/graphics/pokemon/palettes/seviper_shiny_palette.pal b/graphics/pokemon/palettes/seviper_shiny_palette.pal new file mode 100644 index 000000000..7296a030a --- /dev/null +++ b/graphics/pokemon/palettes/seviper_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +148 197 197 +255 255 255 +57 49 49 +205 255 115 +172 222 82 +180 49 106 +255 189 172 +90 131 180 +57 90 139 +82 123 16 +41 32 32 +139 123 123 +82 74 74 +0 0 0 +213 82 139 +90 49 65 diff --git a/graphics/pokemon/palettes/sharpedo_palette.pal b/graphics/pokemon/palettes/sharpedo_palette.pal new file mode 100644 index 000000000..3db40a601 --- /dev/null +++ b/graphics/pokemon/palettes/sharpedo_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +156 255 156 +57 65 74 +65 98 123 +65 139 148 +148 189 189 +213 123 131 +222 189 65 +255 222 98 +172 156 180 +222 205 246 +238 230 255 +156 74 90 +238 49 24 +255 255 255 +0 0 0 +106 57 74 diff --git a/graphics/pokemon/palettes/sharpedo_shiny_palette.pal b/graphics/pokemon/palettes/sharpedo_shiny_palette.pal new file mode 100644 index 000000000..11b98e3bd --- /dev/null +++ b/graphics/pokemon/palettes/sharpedo_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +156 255 156 +98 0 82 +131 0 115 +164 16 148 +197 49 180 +213 123 131 +222 189 65 +255 222 98 +172 156 180 +222 205 246 +238 230 255 +156 74 90 +238 49 24 +255 255 255 +0 0 0 +106 57 74 diff --git a/graphics/pokemon/palettes/shedinja_palette.pal b/graphics/pokemon/palettes/shedinja_palette.pal new file mode 100644 index 000000000..1e1eefe6b --- /dev/null +++ b/graphics/pokemon/palettes/shedinja_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +49 164 82 +213 197 65 +180 164 57 +164 131 49 +139 115 41 +82 74 41 +0 0 0 +0 0 0 +0 0 0 +115 90 41 +246 230 98 +255 255 255 +222 222 222 +189 189 189 +123 123 123 +16 16 16 diff --git a/graphics/pokemon/palettes/shedinja_shiny_palette.pal b/graphics/pokemon/palettes/shedinja_shiny_palette.pal new file mode 100644 index 000000000..7e7ae66bd --- /dev/null +++ b/graphics/pokemon/palettes/shedinja_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +49 164 82 +255 230 189 +246 197 156 +213 164 123 +180 131 90 +139 106 74 +0 0 0 +255 0 255 +255 0 255 +123 82 57 +255 246 230 +255 255 255 +238 222 238 +213 180 197 +131 106 131 +16 16 16 diff --git a/graphics/pokemon/palettes/shelgon_palette.pal b/graphics/pokemon/palettes/shelgon_palette.pal new file mode 100644 index 000000000..a5abe063e --- /dev/null +++ b/graphics/pokemon/palettes/shelgon_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +148 246 148 +74 65 57 +98 90 74 +123 123 98 +0 0 0 +106 57 57 +189 90 32 +246 115 74 +82 82 115 +148 139 180 +205 205 205 +238 238 205 +246 246 0 +197 197 0 +180 180 189 +24 24 24 diff --git a/graphics/pokemon/palettes/shelgon_shiny_palette.pal b/graphics/pokemon/palettes/shelgon_shiny_palette.pal new file mode 100644 index 000000000..3d1e1a361 --- /dev/null +++ b/graphics/pokemon/palettes/shelgon_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +148 246 148 +57 49 41 +82 74 57 +106 106 82 +0 0 0 +106 57 57 +172 32 0 +246 82 32 +0 115 65 +74 148 57 +189 205 180 +222 238 205 +246 246 0 +197 197 0 +156 180 164 +24 24 24 diff --git a/graphics/pokemon/palettes/shellder_palette.pal b/graphics/pokemon/palettes/shellder_palette.pal new file mode 100644 index 000000000..681ebf8d1 --- /dev/null +++ b/graphics/pokemon/palettes/shellder_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +213 213 180 +222 205 238 +213 180 230 +180 139 189 +115 123 139 +90 57 98 +255 98 41 +197 65 74 +123 32 16 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +106 106 106 +16 16 16 +255 255 255 diff --git a/graphics/pokemon/palettes/shellder_shiny_palette.pal b/graphics/pokemon/palettes/shellder_shiny_palette.pal new file mode 100644 index 000000000..e01229644 --- /dev/null +++ b/graphics/pokemon/palettes/shellder_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +213 213 180 +213 213 238 +255 180 65 +255 139 24 +213 98 0 +148 32 0 +255 98 41 +197 65 74 +123 32 16 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +106 106 106 +16 16 16 +255 255 255 diff --git a/graphics/pokemon/palettes/shiftry_palette.pal b/graphics/pokemon/palettes/shiftry_palette.pal new file mode 100644 index 000000000..3a91e677c --- /dev/null +++ b/graphics/pokemon/palettes/shiftry_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +49 148 197 +82 49 49 +131 131 115 +255 255 255 +115 65 74 +156 90 98 +222 123 82 +246 197 131 +230 222 255 +189 180 197 +0 0 0 +74 123 41 +98 172 98 +131 213 98 +255 213 98 +0 0 0 diff --git a/graphics/pokemon/palettes/shiftry_shiny_palette.pal b/graphics/pokemon/palettes/shiftry_shiny_palette.pal new file mode 100644 index 000000000..35aca99d4 --- /dev/null +++ b/graphics/pokemon/palettes/shiftry_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +49 148 197 +82 49 49 +172 106 82 +255 255 255 +115 16 0 +180 49 32 +222 98 49 +255 139 98 +255 238 156 +222 172 74 +0 0 0 +90 131 49 +139 205 82 +189 255 115 +255 156 82 +0 0 0 diff --git a/graphics/pokemon/palettes/shroomish_palette.pal b/graphics/pokemon/palettes/shroomish_palette.pal new file mode 100644 index 000000000..97f25bdf6 --- /dev/null +++ b/graphics/pokemon/palettes/shroomish_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +148 148 139 +98 74 49 +148 106 49 +213 164 90 +238 197 139 +255 230 172 +255 255 213 +90 131 74 +123 172 106 +139 197 131 +164 213 148 +65 82 49 +172 197 131 +0 0 0 +0 0 0 +255 255 255 diff --git a/graphics/pokemon/palettes/shroomish_shiny_palette.pal b/graphics/pokemon/palettes/shroomish_shiny_palette.pal new file mode 100644 index 000000000..a0bd12821 --- /dev/null +++ b/graphics/pokemon/palettes/shroomish_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +148 148 139 +123 98 74 +172 123 65 +222 189 123 +246 213 164 +255 238 189 +255 255 230 +180 65 49 +222 98 49 +255 115 74 +255 189 106 +164 49 32 +255 172 98 +0 0 0 +0 0 0 +255 255 255 diff --git a/graphics/pokemon/palettes/shuckle_palette.pal b/graphics/pokemon/palettes/shuckle_palette.pal new file mode 100644 index 000000000..ea40c0be4 --- /dev/null +++ b/graphics/pokemon/palettes/shuckle_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +205 205 172 +16 16 16 +148 131 115 +115 82 16 +189 139 41 +238 197 74 +255 255 90 +255 0 255 +230 156 131 +246 205 180 +255 0 255 +131 32 0 +197 57 16 +246 115 57 +255 180 123 +255 255 255 diff --git a/graphics/pokemon/palettes/shuckle_shiny_palette.pal b/graphics/pokemon/palettes/shuckle_shiny_palette.pal new file mode 100644 index 000000000..30126f57c --- /dev/null +++ b/graphics/pokemon/palettes/shuckle_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +205 205 172 +16 16 16 +148 131 115 +115 82 16 +189 139 41 +238 197 74 +255 255 90 +255 0 255 +164 189 189 +189 213 213 +255 0 255 +24 65 115 +49 98 189 +65 156 238 +139 205 246 +255 255 255 diff --git a/graphics/pokemon/palettes/shuppet_palette.pal b/graphics/pokemon/palettes/shuppet_palette.pal new file mode 100644 index 000000000..7dafb6a01 --- /dev/null +++ b/graphics/pokemon/palettes/shuppet_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +98 197 197 +74 65 74 +148 131 139 +164 164 172 +172 189 197 +123 115 123 +106 213 246 +82 189 213 +246 213 49 +189 180 0 +123 180 65 +106 148 65 +0 0 0 +0 0 0 +0 0 0 +24 24 24 diff --git a/graphics/pokemon/palettes/shuppet_shiny_palette.pal b/graphics/pokemon/palettes/shuppet_shiny_palette.pal new file mode 100644 index 000000000..9d5557a71 --- /dev/null +++ b/graphics/pokemon/palettes/shuppet_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +98 197 197 +49 74 82 +57 123 131 +98 172 180 +139 205 213 +49 115 123 +106 213 246 +82 189 213 +246 213 49 +189 180 0 +123 180 65 +106 148 65 +0 0 0 +0 0 0 +0 0 0 +24 24 24 diff --git a/graphics/pokemon/palettes/silcoon_palette.pal b/graphics/pokemon/palettes/silcoon_palette.pal new file mode 100644 index 000000000..2a48849f8 --- /dev/null +++ b/graphics/pokemon/palettes/silcoon_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +197 246 197 +106 106 115 +139 139 148 +172 172 180 +0 0 0 +189 189 205 +222 213 230 +238 238 230 +255 255 255 +16 16 24 +246 164 0 +197 123 0 +0 0 0 +246 255 197 +0 0 0 +24 24 24 diff --git a/graphics/pokemon/palettes/silcoon_shiny_palette.pal b/graphics/pokemon/palettes/silcoon_shiny_palette.pal new file mode 100644 index 000000000..db9e98b7a --- /dev/null +++ b/graphics/pokemon/palettes/silcoon_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +197 246 197 +164 106 24 +205 148 65 +230 164 90 +0 0 0 +255 189 90 +255 222 148 +255 246 197 +255 255 255 +16 16 24 +90 131 189 +65 90 139 +0 0 0 +246 255 197 +0 0 0 +24 24 24 diff --git a/graphics/pokemon/palettes/skarmory_palette.pal b/graphics/pokemon/palettes/skarmory_palette.pal new file mode 100644 index 000000000..d4662ab92 --- /dev/null +++ b/graphics/pokemon/palettes/skarmory_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +205 205 172 +255 255 255 +230 230 238 +197 197 205 +164 164 172 +123 123 131 +82 82 82 +255 156 123 +246 98 82 +197 57 49 +148 32 0 +255 222 0 +205 148 0 +255 0 255 +255 0 255 +16 16 16 diff --git a/graphics/pokemon/palettes/skarmory_shiny_palette.pal b/graphics/pokemon/palettes/skarmory_shiny_palette.pal new file mode 100644 index 000000000..561324c82 --- /dev/null +++ b/graphics/pokemon/palettes/skarmory_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +205 205 172 +255 255 255 +238 230 197 +197 189 164 +148 139 123 +115 115 98 +82 90 74 +115 213 74 +74 172 41 +41 106 32 +49 74 32 +255 222 0 +205 148 0 +255 0 255 +255 0 255 +16 16 16 diff --git a/graphics/pokemon/palettes/skiploom_palette.pal b/graphics/pokemon/palettes/skiploom_palette.pal new file mode 100644 index 000000000..15fcce8e5 --- /dev/null +++ b/graphics/pokemon/palettes/skiploom_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +205 205 172 +255 255 255 +139 238 57 +98 205 57 +65 172 32 +24 98 0 +255 0 255 +255 238 115 +255 213 0 +246 164 0 +172 90 0 +255 0 255 +255 0 255 +213 213 213 +164 164 164 +16 16 16 diff --git a/graphics/pokemon/palettes/skiploom_shiny_palette.pal b/graphics/pokemon/palettes/skiploom_shiny_palette.pal new file mode 100644 index 000000000..2dedaa30e --- /dev/null +++ b/graphics/pokemon/palettes/skiploom_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +205 205 172 +255 255 255 +255 148 213 +222 106 189 +172 90 148 +98 49 82 +255 0 255 +255 238 115 +255 213 0 +238 156 16 +156 90 16 +255 0 255 +255 0 255 +213 213 213 +164 164 164 +16 16 16 diff --git a/graphics/pokemon/palettes/skitty_palette.pal b/graphics/pokemon/palettes/skitty_palette.pal new file mode 100644 index 000000000..0a1228191 --- /dev/null +++ b/graphics/pokemon/palettes/skitty_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +213 213 213 +255 255 255 +255 246 148 +255 205 98 +205 156 65 +131 106 65 +0 0 0 +0 0 0 +255 205 189 +197 106 180 +123 0 106 +0 0 0 +255 172 148 +255 131 106 +197 82 57 +131 41 49 diff --git a/graphics/pokemon/palettes/skitty_shiny_palette.pal b/graphics/pokemon/palettes/skitty_shiny_palette.pal new file mode 100644 index 000000000..d3e9130f3 --- /dev/null +++ b/graphics/pokemon/palettes/skitty_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +213 213 213 +255 255 255 +255 246 164 +255 222 115 +213 164 65 +131 106 65 +0 0 0 +0 0 0 +255 180 98 +255 106 74 +115 24 32 +0 0 0 +255 123 82 +238 82 49 +189 65 32 +164 49 32 diff --git a/graphics/pokemon/palettes/slaking_palette.pal b/graphics/pokemon/palettes/slaking_palette.pal new file mode 100644 index 000000000..84cf081cf --- /dev/null +++ b/graphics/pokemon/palettes/slaking_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 156 164 +90 65 49 +139 106 82 +172 139 106 +197 172 148 +213 205 180 +246 238 213 +90 98 123 +205 205 238 +238 238 255 +255 255 255 +139 49 65 +197 82 115 +222 131 148 +16 0 0 +255 255 255 diff --git a/graphics/pokemon/palettes/slaking_shiny_palette.pal b/graphics/pokemon/palettes/slaking_shiny_palette.pal new file mode 100644 index 000000000..1ec404cf6 --- /dev/null +++ b/graphics/pokemon/palettes/slaking_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 156 164 +74 65 49 +106 98 74 +139 123 106 +197 172 148 +213 205 180 +246 238 213 +189 131 65 +255 197 106 +255 238 148 +255 255 255 +164 49 32 +213 82 41 +255 123 82 +16 0 0 +255 255 255 diff --git a/graphics/pokemon/palettes/slakoth_palette.pal b/graphics/pokemon/palettes/slakoth_palette.pal new file mode 100644 index 000000000..934fc9ae9 --- /dev/null +++ b/graphics/pokemon/palettes/slakoth_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +139 148 205 +0 0 0 +82 57 41 +115 82 41 +139 106 65 +65 65 65 +156 156 156 +205 205 205 +255 255 255 +139 49 65 +189 90 74 +213 123 106 +255 164 139 +180 148 106 +205 180 139 +230 205 164 diff --git a/graphics/pokemon/palettes/slakoth_shiny_palette.pal b/graphics/pokemon/palettes/slakoth_shiny_palette.pal new file mode 100644 index 000000000..4f65ae8e4 --- /dev/null +++ b/graphics/pokemon/palettes/slakoth_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +139 148 205 +41 32 32 +57 49 49 +82 74 74 +156 106 139 +65 65 65 +156 156 156 +205 205 205 +255 255 255 +156 41 24 +180 65 49 +222 98 49 +255 123 82 +156 90 131 +197 123 172 +230 189 205 diff --git a/graphics/pokemon/palettes/slowbro_palette.pal b/graphics/pokemon/palettes/slowbro_palette.pal new file mode 100644 index 000000000..8088b21e4 --- /dev/null +++ b/graphics/pokemon/palettes/slowbro_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +164 213 213 +255 255 255 +255 238 156 +255 222 123 +222 189 90 +139 98 24 +230 246 189 +197 213 156 +156 172 98 +82 98 49 +230 82 41 +255 189 148 +255 139 106 +230 106 106 +148 57 57 +16 16 16 diff --git a/graphics/pokemon/palettes/slowbro_shiny_palette.pal b/graphics/pokemon/palettes/slowbro_shiny_palette.pal new file mode 100644 index 000000000..c635dbe64 --- /dev/null +++ b/graphics/pokemon/palettes/slowbro_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +213 213 205 +255 255 255 +255 238 156 +255 205 98 +230 172 90 +164 115 32 +230 197 106 +189 156 65 +148 115 24 +98 65 0 +230 82 41 +197 180 222 +164 156 213 +123 115 172 +74 65 123 +16 16 16 diff --git a/graphics/pokemon/palettes/slowking_palette.pal b/graphics/pokemon/palettes/slowking_palette.pal new file mode 100644 index 000000000..c3e452f0d --- /dev/null +++ b/graphics/pokemon/palettes/slowking_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +205 205 172 +16 16 16 +255 123 57 +205 74 32 +156 32 0 +205 74 32 +230 106 49 +255 180 115 +148 106 0 +255 189 49 +255 255 139 +82 82 65 +148 148 123 +180 180 172 +222 222 205 +255 255 255 diff --git a/graphics/pokemon/palettes/slowking_shiny_palette.pal b/graphics/pokemon/palettes/slowking_shiny_palette.pal new file mode 100644 index 000000000..55ae2a1ee --- /dev/null +++ b/graphics/pokemon/palettes/slowking_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +205 205 172 +16 16 16 +98 164 246 +49 90 189 +131 32 74 +180 90 115 +213 123 148 +255 180 197 +148 106 0 +238 189 65 +255 255 139 +82 82 65 +148 148 123 +180 180 172 +222 222 205 +255 255 255 diff --git a/graphics/pokemon/palettes/slowpoke_palette.pal b/graphics/pokemon/palettes/slowpoke_palette.pal new file mode 100644 index 000000000..19966396c --- /dev/null +++ b/graphics/pokemon/palettes/slowpoke_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +213 213 213 +255 255 255 +222 213 213 +255 255 189 +255 246 131 +230 197 90 +131 82 8 +255 0 255 +246 65 32 +180 41 41 +106 98 98 +255 180 148 +255 131 98 +230 90 106 +156 49 49 +16 16 16 diff --git a/graphics/pokemon/palettes/slowpoke_shiny_palette.pal b/graphics/pokemon/palettes/slowpoke_shiny_palette.pal new file mode 100644 index 000000000..7dbc76ed3 --- /dev/null +++ b/graphics/pokemon/palettes/slowpoke_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +213 213 213 +255 255 255 +213 205 205 +255 255 189 +255 255 148 +238 213 106 +156 74 32 +255 0 255 +246 65 32 +139 32 32 +106 98 98 +255 205 205 +238 180 197 +197 139 156 +139 74 90 +16 16 16 diff --git a/graphics/pokemon/palettes/slugma_palette.pal b/graphics/pokemon/palettes/slugma_palette.pal new file mode 100644 index 000000000..081ae47dc --- /dev/null +++ b/graphics/pokemon/palettes/slugma_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +205 205 172 +255 255 255 +255 189 106 +255 131 74 +222 90 32 +148 32 0 +255 213 115 +255 238 156 +255 213 115 +246 164 0 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +106 106 106 +16 16 16 diff --git a/graphics/pokemon/palettes/slugma_shiny_palette.pal b/graphics/pokemon/palettes/slugma_shiny_palette.pal new file mode 100644 index 000000000..85babdbe1 --- /dev/null +++ b/graphics/pokemon/palettes/slugma_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +205 205 172 +255 255 255 +213 213 213 +180 180 180 +123 123 123 +74 74 74 +230 230 230 +255 238 156 +255 213 115 +246 164 0 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +106 106 106 +16 16 16 diff --git a/graphics/pokemon/palettes/smeargle_palette.pal b/graphics/pokemon/palettes/smeargle_palette.pal new file mode 100644 index 000000000..068322e3e --- /dev/null +++ b/graphics/pokemon/palettes/smeargle_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +189 213 213 +255 255 255 +24 156 0 +222 222 189 +172 172 139 +139 131 82 +246 131 0 +180 0 0 +106 90 49 +74 57 16 +106 222 65 +65 197 24 +0 98 0 +197 197 197 +148 148 156 +16 16 16 diff --git a/graphics/pokemon/palettes/smeargle_shiny_palette.pal b/graphics/pokemon/palettes/smeargle_shiny_palette.pal new file mode 100644 index 000000000..f5f50de2d --- /dev/null +++ b/graphics/pokemon/palettes/smeargle_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +189 213 213 +255 255 255 +197 74 65 +238 222 156 +205 172 98 +180 115 74 +246 131 0 +180 0 0 +106 65 32 +74 57 16 +255 156 131 +238 106 82 +172 49 41 +197 197 197 +148 148 156 +16 16 16 diff --git a/graphics/pokemon/palettes/smoochum_palette.pal b/graphics/pokemon/palettes/smoochum_palette.pal new file mode 100644 index 000000000..722cd4206 --- /dev/null +++ b/graphics/pokemon/palettes/smoochum_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +205 205 172 +255 255 255 +189 172 41 +255 148 164 +222 74 123 +139 16 90 +255 230 82 +222 205 49 +148 131 24 +255 197 164 +246 230 172 +222 197 131 +139 131 74 +213 213 213 +180 180 180 +0 0 0 diff --git a/graphics/pokemon/palettes/smoochum_shiny_palette.pal b/graphics/pokemon/palettes/smoochum_shiny_palette.pal new file mode 100644 index 000000000..00a439312 --- /dev/null +++ b/graphics/pokemon/palettes/smoochum_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +205 205 172 +255 255 255 +213 189 24 +255 189 213 +230 139 123 +164 65 57 +255 255 172 +255 230 74 +172 148 16 +255 222 230 +246 246 205 +213 197 139 +139 131 74 +197 197 197 +131 131 131 +41 41 57 diff --git a/graphics/pokemon/palettes/sneasel_palette.pal b/graphics/pokemon/palettes/sneasel_palette.pal new file mode 100644 index 000000000..076fa7300 --- /dev/null +++ b/graphics/pokemon/palettes/sneasel_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +205 205 172 +255 255 255 +139 172 156 +82 123 106 +57 90 74 +41 57 41 +255 205 213 +255 115 106 +197 74 74 +131 16 32 +230 74 74 +106 98 123 +189 180 197 +255 230 90 +205 131 0 +16 16 16 diff --git a/graphics/pokemon/palettes/sneasel_shiny_palette.pal b/graphics/pokemon/palettes/sneasel_shiny_palette.pal new file mode 100644 index 000000000..64a502ce6 --- /dev/null +++ b/graphics/pokemon/palettes/sneasel_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +205 205 172 +255 255 255 +255 172 205 +238 139 180 +197 98 131 +90 49 65 +255 255 164 +255 230 74 +222 180 98 +156 98 57 +230 74 74 +106 98 123 +189 180 197 +255 255 255 +205 222 238 +16 16 16 diff --git a/graphics/pokemon/palettes/snorlax_palette.pal b/graphics/pokemon/palettes/snorlax_palette.pal new file mode 100644 index 000000000..2310b2b3f --- /dev/null +++ b/graphics/pokemon/palettes/snorlax_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +213 213 189 +123 164 148 +98 131 115 +57 98 82 +57 82 65 +255 255 197 +246 246 156 +238 222 156 +139 139 74 +213 164 106 +197 139 82 +189 24 24 +213 213 222 +106 106 115 +16 16 16 +255 255 255 diff --git a/graphics/pokemon/palettes/snorlax_shiny_palette.pal b/graphics/pokemon/palettes/snorlax_shiny_palette.pal new file mode 100644 index 000000000..8fcbe5988 --- /dev/null +++ b/graphics/pokemon/palettes/snorlax_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +213 213 189 +74 156 205 +65 115 189 +41 90 131 +41 90 98 +246 238 189 +246 230 180 +238 213 164 +156 156 82 +222 156 98 +180 123 57 +148 90 24 +213 213 222 +106 106 115 +16 16 16 +255 255 255 diff --git a/graphics/pokemon/palettes/snorunt_palette.pal b/graphics/pokemon/palettes/snorunt_palette.pal new file mode 100644 index 000000000..25d137458 --- /dev/null +++ b/graphics/pokemon/palettes/snorunt_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +222 222 222 +222 222 222 +255 123 82 +180 65 49 +180 115 49 +255 238 164 +255 213 106 +230 172 90 +139 213 255 +156 139 139 +65 148 213 +139 123 123 +82 74 74 +57 49 49 +41 32 32 +255 255 255 diff --git a/graphics/pokemon/palettes/snorunt_shiny_palette.pal b/graphics/pokemon/palettes/snorunt_shiny_palette.pal new file mode 100644 index 000000000..b483a219f --- /dev/null +++ b/graphics/pokemon/palettes/snorunt_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +222 222 222 +222 222 222 +255 205 82 +180 131 49 +148 98 16 +172 246 255 +139 213 255 +106 180 222 +255 197 180 +156 139 139 +255 57 41 +139 123 123 +82 74 74 +57 49 49 +41 32 32 +255 255 255 diff --git a/graphics/pokemon/palettes/snubbull_palette.pal b/graphics/pokemon/palettes/snubbull_palette.pal new file mode 100644 index 000000000..dea1ea530 --- /dev/null +++ b/graphics/pokemon/palettes/snubbull_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +222 222 222 +164 41 41 +255 0 255 +148 41 57 +230 98 106 +238 180 164 +255 205 197 +255 131 41 +16 16 16 +65 65 82 +98 115 115 +148 164 164 +65 139 172 +172 222 246 +222 222 222 +255 255 255 diff --git a/graphics/pokemon/palettes/snubbull_shiny_palette.pal b/graphics/pokemon/palettes/snubbull_shiny_palette.pal new file mode 100644 index 000000000..5dcc2957d --- /dev/null +++ b/graphics/pokemon/palettes/snubbull_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +222 222 222 +197 49 65 +255 0 255 +90 90 139 +148 156 164 +197 205 197 +222 222 222 +255 148 74 +16 16 16 +123 49 65 +156 74 98 +205 106 139 +65 139 172 +255 197 180 +238 213 197 +255 255 255 diff --git a/graphics/pokemon/palettes/solrock_palette.pal b/graphics/pokemon/palettes/solrock_palette.pal new file mode 100644 index 000000000..315f49dd3 --- /dev/null +++ b/graphics/pokemon/palettes/solrock_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +49 164 82 +255 238 164 +238 213 115 +222 180 74 +180 148 82 +238 148 57 +205 123 49 +172 98 41 +139 82 32 +123 98 74 +57 41 24 +255 172 98 +213 74 82 +139 115 115 +82 82 90 +16 16 16 diff --git a/graphics/pokemon/palettes/solrock_shiny_palette.pal b/graphics/pokemon/palettes/solrock_shiny_palette.pal new file mode 100644 index 000000000..9de01aa0b --- /dev/null +++ b/graphics/pokemon/palettes/solrock_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +49 164 82 +255 238 164 +238 213 115 +222 180 74 +180 148 82 +255 115 106 +255 65 57 +222 32 24 +189 0 0 +123 98 74 +57 41 24 +255 172 98 +0 205 255 +139 115 115 +82 82 90 +16 16 16 diff --git a/graphics/pokemon/palettes/spearow_palette.pal b/graphics/pokemon/palettes/spearow_palette.pal new file mode 100644 index 000000000..8cf97399d --- /dev/null +++ b/graphics/pokemon/palettes/spearow_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +205 205 172 +255 255 255 +238 222 197 +213 197 156 +172 156 115 +106 98 82 +255 131 115 +246 82 90 +197 65 82 +123 24 0 +246 180 90 +213 156 57 +172 115 16 +123 65 0 +255 213 172 +24 24 24 diff --git a/graphics/pokemon/palettes/spearow_shiny_palette.pal b/graphics/pokemon/palettes/spearow_shiny_palette.pal new file mode 100644 index 000000000..fd2223485 --- /dev/null +++ b/graphics/pokemon/palettes/spearow_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +205 205 172 +255 255 255 +238 222 172 +213 197 156 +172 156 115 +106 98 82 +255 255 82 +255 222 0 +238 164 0 +131 57 0 +238 222 115 +197 180 74 +156 139 32 +98 82 0 +255 255 148 +24 24 24 diff --git a/graphics/pokemon/palettes/spheal_palette.pal b/graphics/pokemon/palettes/spheal_palette.pal new file mode 100644 index 000000000..1fa035c32 --- /dev/null +++ b/graphics/pokemon/palettes/spheal_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +98 197 98 +16 16 57 +74 82 139 +106 123 213 +156 164 255 +197 197 255 +255 255 255 +106 90 49 +164 148 106 +213 197 148 +230 213 172 +246 230 189 +222 222 255 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/pokemon/palettes/spheal_shiny_palette.pal b/graphics/pokemon/palettes/spheal_shiny_palette.pal new file mode 100644 index 000000000..14f207301 --- /dev/null +++ b/graphics/pokemon/palettes/spheal_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +98 197 98 +16 16 57 +90 49 139 +180 98 205 +213 148 238 +246 197 255 +255 255 255 +106 90 49 +164 148 106 +230 205 148 +238 222 172 +255 238 189 +255 222 255 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/pokemon/palettes/spinarak_palette.pal b/graphics/pokemon/palettes/spinarak_palette.pal new file mode 100644 index 000000000..0a09982d6 --- /dev/null +++ b/graphics/pokemon/palettes/spinarak_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +205 205 172 +255 255 255 +205 255 115 +148 230 65 +98 189 32 +82 123 41 +49 82 16 +255 255 90 +180 164 49 +148 123 49 +255 156 82 +238 49 0 +148 49 0 +189 189 189 +123 123 123 +16 16 16 diff --git a/graphics/pokemon/palettes/spinarak_shiny_palette.pal b/graphics/pokemon/palettes/spinarak_shiny_palette.pal new file mode 100644 index 000000000..f2aed8e9f --- /dev/null +++ b/graphics/pokemon/palettes/spinarak_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +205 205 172 +255 255 255 +180 213 222 +139 172 189 +82 106 156 +57 74 90 +32 49 74 +230 172 205 +172 90 123 +106 65 82 +255 156 82 +238 49 0 +148 49 0 +189 189 189 +123 123 123 +16 16 16 diff --git a/graphics/pokemon/palettes/spinda_palette.pal b/graphics/pokemon/palettes/spinda_palette.pal new file mode 100644 index 000000000..9b0ad5bfc --- /dev/null +++ b/graphics/pokemon/palettes/spinda_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +49 164 82 +246 230 172 +230 213 164 +197 180 131 +172 148 106 +222 139 74 +222 106 57 +180 90 41 +156 57 24 +115 65 16 +172 65 90 +255 255 0 +255 255 0 +123 98 74 +90 65 49 +16 16 16 diff --git a/graphics/pokemon/palettes/spinda_shiny_palette.pal b/graphics/pokemon/palettes/spinda_shiny_palette.pal new file mode 100644 index 000000000..6aa748129 --- /dev/null +++ b/graphics/pokemon/palettes/spinda_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +49 164 82 +246 230 172 +230 213 164 +197 180 131 +172 148 106 +180 197 90 +148 164 57 +115 131 24 +82 98 0 +49 65 0 +172 65 90 +255 255 0 +255 255 0 +123 98 74 +90 65 49 +16 16 16 diff --git a/graphics/pokemon/palettes/spoink_palette.pal b/graphics/pokemon/palettes/spoink_palette.pal new file mode 100644 index 000000000..c1891323c --- /dev/null +++ b/graphics/pokemon/palettes/spoink_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +213 255 255 +172 172 164 +139 139 148 +106 115 123 +49 49 41 +255 230 255 +255 205 189 +230 172 131 +148 74 74 +197 139 90 +24 24 24 +0 0 0 +74 74 74 +255 255 255 +98 82 82 +0 0 0 diff --git a/graphics/pokemon/palettes/spoink_shiny_palette.pal b/graphics/pokemon/palettes/spoink_shiny_palette.pal new file mode 100644 index 000000000..c8edfafd7 --- /dev/null +++ b/graphics/pokemon/palettes/spoink_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +213 255 255 +255 205 172 +246 180 139 +205 164 123 +98 74 57 +172 172 172 +139 139 139 +82 82 82 +49 49 49 +106 106 106 +0 0 0 +0 0 0 +172 123 106 +255 255 255 +98 82 82 +0 0 0 diff --git a/graphics/pokemon/palettes/squirtle_palette.pal b/graphics/pokemon/palettes/squirtle_palette.pal new file mode 100644 index 000000000..4cc9f28e8 --- /dev/null +++ b/graphics/pokemon/palettes/squirtle_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +205 205 172 +255 255 255 +213 148 82 +189 106 0 +98 41 0 +213 205 205 +255 230 156 +255 213 106 +230 172 90 +213 131 57 +205 49 24 +180 222 238 +139 197 213 +131 148 172 +65 115 98 +16 16 16 diff --git a/graphics/pokemon/palettes/squirtle_shiny_palette.pal b/graphics/pokemon/palettes/squirtle_shiny_palette.pal new file mode 100644 index 000000000..9ca78b24d --- /dev/null +++ b/graphics/pokemon/palettes/squirtle_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +205 205 172 +255 255 255 +148 205 41 +106 156 24 +74 115 32 +213 205 205 +255 230 156 +255 213 106 +230 172 90 +213 131 57 +148 32 0 +189 238 246 +148 230 246 +82 197 213 +65 106 139 +16 16 16 diff --git a/graphics/pokemon/palettes/stantler_palette.pal b/graphics/pokemon/palettes/stantler_palette.pal new file mode 100644 index 000000000..29eeabc43 --- /dev/null +++ b/graphics/pokemon/palettes/stantler_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +205 205 172 +255 255 255 +255 213 115 +230 180 90 +180 131 49 +123 65 0 +255 0 255 +255 255 172 +255 222 131 +255 222 82 +230 164 32 +213 0 255 +180 180 180 +123 123 123 +74 74 74 +16 16 16 diff --git a/graphics/pokemon/palettes/stantler_shiny_palette.pal b/graphics/pokemon/palettes/stantler_shiny_palette.pal new file mode 100644 index 000000000..18b43b330 --- /dev/null +++ b/graphics/pokemon/palettes/stantler_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +230 230 230 +255 255 255 +222 255 106 +197 230 90 +148 180 49 +65 90 0 +255 0 255 +255 255 172 +230 230 139 +255 222 82 +197 148 65 +213 0 255 +255 189 106 +230 115 41 +131 65 41 +16 16 16 diff --git a/graphics/pokemon/palettes/starmie_palette.pal b/graphics/pokemon/palettes/starmie_palette.pal new file mode 100644 index 000000000..82435deec --- /dev/null +++ b/graphics/pokemon/palettes/starmie_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +213 213 189 +189 148 205 +148 98 164 +131 65 131 +82 32 98 +255 246 148 +246 213 82 +197 164 16 +106 82 0 +255 0 255 +255 189 164 +246 65 82 +205 49 90 +123 16 0 +16 16 16 +255 255 255 diff --git a/graphics/pokemon/palettes/starmie_shiny_palette.pal b/graphics/pokemon/palettes/starmie_shiny_palette.pal new file mode 100644 index 000000000..1f68c3476 --- /dev/null +++ b/graphics/pokemon/palettes/starmie_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +213 213 189 +148 205 246 +106 164 213 +65 123 172 +0 57 106 +255 139 156 +255 98 115 +197 57 74 +131 16 32 +255 0 255 +115 189 246 +74 148 205 +8 82 139 +8 41 98 +16 16 16 +255 255 255 diff --git a/graphics/pokemon/palettes/staryu_palette.pal b/graphics/pokemon/palettes/staryu_palette.pal new file mode 100644 index 000000000..19ea03347 --- /dev/null +++ b/graphics/pokemon/palettes/staryu_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +213 213 189 +16 16 16 +255 255 180 +246 213 82 +197 172 16 +115 90 0 +238 213 172 +213 180 115 +164 115 49 +106 65 32 +255 213 213 +238 156 139 +230 98 65 +172 65 32 +197 156 82 +255 255 255 diff --git a/graphics/pokemon/palettes/staryu_shiny_palette.pal b/graphics/pokemon/palettes/staryu_shiny_palette.pal new file mode 100644 index 000000000..9285cb48c --- /dev/null +++ b/graphics/pokemon/palettes/staryu_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +213 213 189 +16 16 16 +255 255 180 +246 213 82 +197 172 16 +115 90 0 +230 230 205 +189 189 164 +148 148 123 +98 98 74 +156 255 255 +106 213 255 +65 172 222 +8 115 164 +172 164 139 +255 255 255 diff --git a/graphics/pokemon/palettes/steelix_palette.pal b/graphics/pokemon/palettes/steelix_palette.pal new file mode 100644 index 000000000..e18ae398c --- /dev/null +++ b/graphics/pokemon/palettes/steelix_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +205 205 172 +255 0 255 +255 0 255 +255 0 255 +57 57 82 +74 90 123 +131 156 172 +189 205 197 +222 230 222 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +213 82 65 +16 16 16 +255 255 255 diff --git a/graphics/pokemon/palettes/steelix_shiny_palette.pal b/graphics/pokemon/palettes/steelix_shiny_palette.pal new file mode 100644 index 000000000..02b21c7ac --- /dev/null +++ b/graphics/pokemon/palettes/steelix_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +205 205 172 +255 0 255 +255 0 255 +255 0 255 +98 82 57 +139 106 82 +189 156 90 +230 197 115 +255 230 139 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +213 82 65 +16 16 16 +255 255 255 diff --git a/graphics/pokemon/palettes/sudowoodo_palette.pal b/graphics/pokemon/palettes/sudowoodo_palette.pal new file mode 100644 index 000000000..3d589fc9d --- /dev/null +++ b/graphics/pokemon/palettes/sudowoodo_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +205 205 172 +255 255 255 +230 197 106 +189 156 82 +148 115 49 +98 74 16 +255 0 255 +139 255 139 +41 222 49 +41 172 49 +24 106 32 +255 205 0 +222 148 0 +156 106 0 +180 180 180 +16 16 16 diff --git a/graphics/pokemon/palettes/sudowoodo_shiny_palette.pal b/graphics/pokemon/palettes/sudowoodo_shiny_palette.pal new file mode 100644 index 000000000..6344dcc53 --- /dev/null +++ b/graphics/pokemon/palettes/sudowoodo_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +205 205 172 +255 255 255 +222 222 57 +180 189 24 +123 139 24 +82 90 24 +255 0 255 +255 205 172 +255 115 74 +205 74 49 +131 57 41 +255 205 0 +222 148 0 +156 106 0 +180 180 180 +16 16 16 diff --git a/graphics/pokemon/palettes/suicune_palette.pal b/graphics/pokemon/palettes/suicune_palette.pal new file mode 100644 index 000000000..3a21dbd4d --- /dev/null +++ b/graphics/pokemon/palettes/suicune_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +205 205 180 +255 255 255 +189 238 255 +123 189 255 +90 115 213 +57 74 148 +213 180 255 +172 106 255 +139 49 230 +82 57 139 +164 0 0 +213 213 213 +180 180 180 +148 148 148 +106 106 106 +16 16 16 diff --git a/graphics/pokemon/palettes/suicune_shiny_palette.pal b/graphics/pokemon/palettes/suicune_shiny_palette.pal new file mode 100644 index 000000000..2ee8b7a0f --- /dev/null +++ b/graphics/pokemon/palettes/suicune_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +205 205 180 +255 255 255 +238 255 255 +197 230 255 +106 164 230 +49 82 156 +106 189 255 +57 139 222 +8 90 180 +32 57 98 +164 0 0 +213 205 230 +189 172 197 +139 123 148 +98 82 106 +16 16 16 diff --git a/graphics/pokemon/palettes/sunflora_palette.pal b/graphics/pokemon/palettes/sunflora_palette.pal new file mode 100644 index 000000000..a22ed3fe7 --- /dev/null +++ b/graphics/pokemon/palettes/sunflora_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +205 205 172 +16 16 16 +255 0 255 +131 90 16 +197 123 32 +222 164 24 +238 205 8 +230 222 90 +255 255 164 +255 246 16 +222 57 0 +255 0 255 +82 98 41 +115 172 49 +156 213 74 +189 255 115 diff --git a/graphics/pokemon/palettes/sunflora_shiny_palette.pal b/graphics/pokemon/palettes/sunflora_shiny_palette.pal new file mode 100644 index 000000000..ea8de6e05 --- /dev/null +++ b/graphics/pokemon/palettes/sunflora_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +205 205 172 +16 16 16 +255 0 255 +98 82 0 +148 123 0 +205 172 32 +238 222 82 +230 222 90 +255 255 164 +255 255 164 +222 57 0 +255 0 255 +82 74 0 +123 115 0 +180 172 41 +230 222 74 diff --git a/graphics/pokemon/palettes/sunkern_palette.pal b/graphics/pokemon/palettes/sunkern_palette.pal new file mode 100644 index 000000000..7dab1246d --- /dev/null +++ b/graphics/pokemon/palettes/sunkern_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +205 205 172 +74 57 41 +82 74 41 +106 98 49 +180 164 49 +180 164 57 +213 205 49 +255 255 0 +255 0 255 +32 98 16 +82 164 57 +115 213 41 +164 246 57 +16 16 16 +115 115 139 +255 255 255 diff --git a/graphics/pokemon/palettes/sunkern_shiny_palette.pal b/graphics/pokemon/palettes/sunkern_shiny_palette.pal new file mode 100644 index 000000000..84a106f65 --- /dev/null +++ b/graphics/pokemon/palettes/sunkern_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +205 205 172 +74 57 41 +82 57 41 +106 74 49 +164 106 32 +172 115 49 +213 164 49 +255 213 90 +255 0 255 +32 98 16 +82 164 57 +156 230 49 +205 255 98 +16 16 16 +115 115 139 +255 255 255 diff --git a/graphics/pokemon/palettes/surskit_palette.pal b/graphics/pokemon/palettes/surskit_palette.pal new file mode 100644 index 000000000..7aa7f389d --- /dev/null +++ b/graphics/pokemon/palettes/surskit_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 255 255 +49 90 90 +90 164 213 +90 139 180 +123 197 213 +255 213 90 +205 172 49 +123 106 16 +255 255 255 +238 123 139 +230 106 90 +172 139 16 +32 115 148 +255 255 255 +255 255 255 +205 255 156 diff --git a/graphics/pokemon/palettes/surskit_shiny_palette.pal b/graphics/pokemon/palettes/surskit_shiny_palette.pal new file mode 100644 index 000000000..71624ff69 --- /dev/null +++ b/graphics/pokemon/palettes/surskit_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +189 205 255 +41 49 65 +115 106 123 +74 82 98 +148 139 156 +255 213 90 +205 172 49 +123 106 16 +255 255 255 +255 180 82 +255 115 24 +172 139 16 +74 82 98 +255 255 255 +255 255 255 +205 255 156 diff --git a/graphics/pokemon/palettes/swablu_palette.pal b/graphics/pokemon/palettes/swablu_palette.pal new file mode 100644 index 000000000..180dac0df --- /dev/null +++ b/graphics/pokemon/palettes/swablu_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +123 172 123 +180 180 222 +131 131 148 +90 90 115 +57 106 131 +213 213 230 +0 0 0 +156 156 197 +123 205 255 +98 172 230 +90 148 205 +213 255 255 +148 197 197 +172 230 255 +238 238 246 +255 255 255 diff --git a/graphics/pokemon/palettes/swablu_shiny_palette.pal b/graphics/pokemon/palettes/swablu_shiny_palette.pal new file mode 100644 index 000000000..392d5a8bb --- /dev/null +++ b/graphics/pokemon/palettes/swablu_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +123 172 123 +180 180 222 +131 131 148 +90 90 115 +156 106 0 +213 213 230 +0 0 0 +156 156 197 +255 238 131 +255 205 98 +222 172 65 +213 255 255 +148 197 197 +255 238 131 +238 238 246 +255 255 255 diff --git a/graphics/pokemon/palettes/swalot_palette.pal b/graphics/pokemon/palettes/swalot_palette.pal new file mode 100644 index 000000000..fcd80af0b --- /dev/null +++ b/graphics/pokemon/palettes/swalot_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +65 156 123 +115 90 148 +156 106 213 +189 139 255 +213 172 255 +255 255 255 +49 49 49 +82 82 82 +106 106 106 +205 205 205 +131 123 65 +255 213 90 +255 41 0 +255 238 148 +90 57 106 +0 0 0 diff --git a/graphics/pokemon/palettes/swalot_shiny_palette.pal b/graphics/pokemon/palettes/swalot_shiny_palette.pal new file mode 100644 index 000000000..109d19022 --- /dev/null +++ b/graphics/pokemon/palettes/swalot_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +98 189 131 +65 74 115 +90 115 156 +98 148 197 +131 180 238 +255 255 255 +49 49 49 +82 82 82 +106 106 106 +205 205 205 +180 65 49 +222 98 49 +255 139 82 +255 148 123 +0 0 0 +0 0 0 diff --git a/graphics/pokemon/palettes/swampert_palette.pal b/graphics/pokemon/palettes/swampert_palette.pal new file mode 100644 index 000000000..149557aa4 --- /dev/null +++ b/graphics/pokemon/palettes/swampert_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +49 164 82 +197 230 255 +172 189 230 +131 164 197 +41 49 98 +255 213 74 +246 156 65 +205 131 65 +139 98 74 +156 74 90 +57 82 131 +139 205 255 +90 172 230 +49 131 197 +82 106 164 +16 16 16 diff --git a/graphics/pokemon/palettes/swampert_shiny_palette.pal b/graphics/pokemon/palettes/swampert_shiny_palette.pal new file mode 100644 index 000000000..284a31508 --- /dev/null +++ b/graphics/pokemon/palettes/swampert_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +49 164 82 +230 246 255 +205 213 230 +180 139 230 +74 65 106 +255 197 74 +246 106 82 +222 98 49 +180 65 49 +139 65 24 +106 49 123 +246 205 246 +230 172 246 +197 115 222 +139 82 156 +16 16 16 diff --git a/graphics/pokemon/palettes/swellow_palette.pal b/graphics/pokemon/palettes/swellow_palette.pal new file mode 100644 index 000000000..cf8e9f794 --- /dev/null +++ b/graphics/pokemon/palettes/swellow_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +131 172 98 +41 49 90 +65 82 123 +90 106 172 +123 139 205 +123 90 90 +148 148 148 +205 213 213 +255 255 255 +197 49 49 +230 106 98 +255 148 139 +230 172 74 +255 238 82 +131 57 82 +0 0 0 diff --git a/graphics/pokemon/palettes/swellow_shiny_palette.pal b/graphics/pokemon/palettes/swellow_shiny_palette.pal new file mode 100644 index 000000000..388f2b220 --- /dev/null +++ b/graphics/pokemon/palettes/swellow_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +131 172 98 +16 82 57 +49 148 98 +90 172 148 +148 213 205 +123 90 90 +148 148 148 +205 213 213 +255 255 255 +213 123 16 +246 180 57 +255 197 115 +230 189 74 +255 238 82 +131 57 82 +0 0 0 diff --git a/graphics/pokemon/palettes/swinub_palette.pal b/graphics/pokemon/palettes/swinub_palette.pal new file mode 100644 index 000000000..b014d69d6 --- /dev/null +++ b/graphics/pokemon/palettes/swinub_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +205 205 172 +255 255 255 +222 197 115 +197 164 82 +164 131 57 +123 98 24 +90 65 0 +57 41 0 +255 189 131 +222 139 82 +180 98 41 +255 0 255 +222 222 222 +180 180 189 +123 123 139 +16 16 16 diff --git a/graphics/pokemon/palettes/swinub_shiny_palette.pal b/graphics/pokemon/palettes/swinub_shiny_palette.pal new file mode 100644 index 000000000..9482e2d46 --- /dev/null +++ b/graphics/pokemon/palettes/swinub_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +205 205 172 +255 255 255 +222 230 230 +189 205 197 +148 164 164 +106 123 131 +57 65 90 +49 49 57 +246 213 131 +222 164 65 +205 123 32 +255 0 255 +222 222 222 +180 180 189 +123 123 139 +16 16 16 diff --git a/graphics/pokemon/palettes/taillow_palette.pal b/graphics/pokemon/palettes/taillow_palette.pal new file mode 100644 index 000000000..b1777b5be --- /dev/null +++ b/graphics/pokemon/palettes/taillow_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +131 172 98 +41 49 90 +74 90 148 +90 106 172 +123 139 205 +123 90 90 +148 148 148 +205 213 213 +255 255 255 +197 49 49 +230 106 98 +255 148 139 +230 189 74 +255 238 82 +131 57 82 +0 0 0 diff --git a/graphics/pokemon/palettes/taillow_shiny_palette.pal b/graphics/pokemon/palettes/taillow_shiny_palette.pal new file mode 100644 index 000000000..388f2b220 --- /dev/null +++ b/graphics/pokemon/palettes/taillow_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +131 172 98 +16 82 57 +49 148 98 +90 172 148 +148 213 205 +123 90 90 +148 148 148 +205 213 213 +255 255 255 +213 123 16 +246 180 57 +255 197 115 +230 189 74 +255 238 82 +131 57 82 +0 0 0 diff --git a/graphics/pokemon/palettes/tangela_palette.pal b/graphics/pokemon/palettes/tangela_palette.pal new file mode 100644 index 000000000..3de914144 --- /dev/null +++ b/graphics/pokemon/palettes/tangela_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +213 213 189 +172 222 246 +131 189 213 +65 123 148 +32 65 82 +255 131 131 +213 65 82 +148 41 41 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +180 180 180 +82 82 82 +16 16 16 +255 255 255 diff --git a/graphics/pokemon/palettes/tangela_shiny_palette.pal b/graphics/pokemon/palettes/tangela_shiny_palette.pal new file mode 100644 index 000000000..6c8c7fad5 --- /dev/null +++ b/graphics/pokemon/palettes/tangela_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +213 213 189 +123 222 57 +82 180 16 +41 139 0 +0 74 0 +255 131 131 +222 90 90 +148 41 41 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +180 180 180 +82 82 82 +16 16 16 +255 255 255 diff --git a/graphics/pokemon/palettes/tauros_palette.pal b/graphics/pokemon/palettes/tauros_palette.pal new file mode 100644 index 000000000..598262ca7 --- /dev/null +++ b/graphics/pokemon/palettes/tauros_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +131 213 172 +255 255 255 +230 230 238 +205 197 255 +148 180 172 +90 82 106 +255 0 255 +189 156 82 +156 131 65 +115 90 32 +74 49 0 +246 197 98 +230 164 74 +189 123 49 +115 82 24 +16 16 16 diff --git a/graphics/pokemon/palettes/tauros_shiny_palette.pal b/graphics/pokemon/palettes/tauros_shiny_palette.pal new file mode 100644 index 000000000..3f2d46d67 --- /dev/null +++ b/graphics/pokemon/palettes/tauros_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +213 213 213 +255 255 255 +238 222 255 +205 197 255 +164 148 205 +90 74 106 +255 0 255 +123 205 49 +82 180 24 +24 123 0 +49 74 24 +255 255 98 +255 230 82 +213 189 57 +131 106 49 +16 16 16 diff --git a/graphics/pokemon/palettes/teddiursa_palette.pal b/graphics/pokemon/palettes/teddiursa_palette.pal new file mode 100644 index 000000000..a044a8e9c --- /dev/null +++ b/graphics/pokemon/palettes/teddiursa_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +205 205 172 +255 255 255 +238 180 106 +213 156 90 +164 131 57 +123 98 24 +90 65 0 +255 246 164 +238 213 156 +213 172 82 +255 0 255 +255 0 255 +222 222 222 +180 180 189 +106 106 123 +16 16 16 diff --git a/graphics/pokemon/palettes/teddiursa_shiny_palette.pal b/graphics/pokemon/palettes/teddiursa_shiny_palette.pal new file mode 100644 index 000000000..0be332569 --- /dev/null +++ b/graphics/pokemon/palettes/teddiursa_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +205 205 172 +255 255 255 +189 246 123 +164 222 106 +123 180 74 +90 148 49 +57 98 32 +255 246 164 +238 222 123 +172 197 90 +255 0 255 +255 0 255 +222 222 222 +180 180 189 +106 106 123 +16 16 16 diff --git a/graphics/pokemon/palettes/tentacool_palette.pal b/graphics/pokemon/palettes/tentacool_palette.pal new file mode 100644 index 000000000..530c0a4d6 --- /dev/null +++ b/graphics/pokemon/palettes/tentacool_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +213 213 189 +255 255 255 +255 197 189 +255 82 74 +180 41 32 +131 16 16 +213 197 148 +180 172 115 +131 131 65 +82 82 32 +213 213 213 +148 213 246 +106 180 230 +65 164 148 +32 82 131 +16 16 16 diff --git a/graphics/pokemon/palettes/tentacool_shiny_palette.pal b/graphics/pokemon/palettes/tentacool_shiny_palette.pal new file mode 100644 index 000000000..d90b7d4a0 --- /dev/null +++ b/graphics/pokemon/palettes/tentacool_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +213 213 189 +255 255 255 +115 197 139 +74 156 98 +32 115 57 +16 74 16 +213 197 148 +180 172 115 +131 131 65 +82 82 32 +213 213 213 +213 213 255 +172 172 230 +131 131 189 +74 74 131 +16 16 16 diff --git a/graphics/pokemon/palettes/tentacruel_palette.pal b/graphics/pokemon/palettes/tentacruel_palette.pal new file mode 100644 index 000000000..1a4cf74c2 --- /dev/null +++ b/graphics/pokemon/palettes/tentacruel_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +189 213 197 +255 255 255 +255 197 189 +255 82 74 +180 41 32 +131 16 16 +222 205 156 +180 172 115 +139 139 65 +90 90 32 +213 213 213 +148 205 246 +106 180 230 +65 164 156 +32 82 131 +16 16 16 diff --git a/graphics/pokemon/palettes/tentacruel_shiny_palette.pal b/graphics/pokemon/palettes/tentacruel_shiny_palette.pal new file mode 100644 index 000000000..b53f96599 --- /dev/null +++ b/graphics/pokemon/palettes/tentacruel_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +213 213 189 +255 255 255 +148 189 82 +106 148 41 +65 106 0 +8 49 0 +230 213 164 +180 172 115 +131 131 65 +82 82 32 +222 255 255 +180 222 255 +139 180 213 +98 139 172 +24 65 98 +16 16 16 diff --git a/graphics/pokemon/palettes/togepi_palette.pal b/graphics/pokemon/palettes/togepi_palette.pal new file mode 100644 index 000000000..6e9355508 --- /dev/null +++ b/graphics/pokemon/palettes/togepi_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +205 205 172 +246 246 255 +180 180 197 +106 106 123 +16 16 16 +197 24 0 +255 255 205 +255 246 172 +222 197 115 +172 148 74 +106 57 0 +222 115 115 +197 24 0 +106 131 222 +0 74 213 +205 205 205 diff --git a/graphics/pokemon/palettes/togepi_shiny_palette.pal b/graphics/pokemon/palettes/togepi_shiny_palette.pal new file mode 100644 index 000000000..6ce2e1be7 --- /dev/null +++ b/graphics/pokemon/palettes/togepi_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +205 205 172 +246 246 255 +180 180 197 +106 106 123 +16 16 16 +197 24 0 +255 255 205 +255 230 172 +213 180 115 +172 131 57 +106 57 0 +106 131 222 +0 74 213 +222 115 115 +197 24 0 +205 205 205 diff --git a/graphics/pokemon/palettes/togetic_palette.pal b/graphics/pokemon/palettes/togetic_palette.pal new file mode 100644 index 000000000..c07ecff88 --- /dev/null +++ b/graphics/pokemon/palettes/togetic_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +131 197 139 +230 230 238 +205 205 205 +172 172 189 +131 131 148 +90 90 115 +16 16 16 +255 0 255 +255 0 255 +255 0 255 +139 0 0 +222 115 115 +180 0 0 +106 131 222 +0 41 197 +255 255 255 diff --git a/graphics/pokemon/palettes/togetic_shiny_palette.pal b/graphics/pokemon/palettes/togetic_shiny_palette.pal new file mode 100644 index 000000000..6d37ce70d --- /dev/null +++ b/graphics/pokemon/palettes/togetic_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +205 205 172 +255 255 246 +230 222 172 +189 180 139 +148 139 32 +106 90 57 +16 16 16 +255 0 255 +255 0 255 +255 0 255 +139 0 0 +106 131 222 +0 41 197 +222 115 115 +180 0 0 +255 255 230 diff --git a/graphics/pokemon/palettes/torchic_palette.pal b/graphics/pokemon/palettes/torchic_palette.pal new file mode 100644 index 000000000..373cb59b7 --- /dev/null +++ b/graphics/pokemon/palettes/torchic_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +49 164 82 +255 222 148 +213 189 148 +180 148 123 +123 115 123 +255 213 98 +255 197 82 +213 156 57 +139 123 90 +156 205 255 +255 255 255 +255 164 57 +255 106 57 +213 90 57 +90 57 49 +16 16 16 diff --git a/graphics/pokemon/palettes/torchic_shiny_palette.pal b/graphics/pokemon/palettes/torchic_shiny_palette.pal new file mode 100644 index 000000000..368d18494 --- /dev/null +++ b/graphics/pokemon/palettes/torchic_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +49 164 82 +222 180 131 +172 123 90 +123 90 74 +123 115 123 +255 164 57 +238 90 41 +189 57 24 +123 90 74 +156 205 255 +255 255 255 +255 238 172 +255 222 115 +230 164 74 +90 57 49 +16 16 16 diff --git a/graphics/pokemon/palettes/torkoal_palette.pal b/graphics/pokemon/palettes/torkoal_palette.pal new file mode 100644 index 000000000..85caef491 --- /dev/null +++ b/graphics/pokemon/palettes/torkoal_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +148 197 197 +238 222 213 +213 205 197 +189 172 164 +255 156 106 +230 123 74 +197 82 57 +148 74 49 +131 131 131 +90 90 90 +49 49 49 +255 156 0 +197 131 8 +255 57 0 +90 49 57 +0 0 0 diff --git a/graphics/pokemon/palettes/torkoal_shiny_palette.pal b/graphics/pokemon/palettes/torkoal_shiny_palette.pal new file mode 100644 index 000000000..70194b9f1 --- /dev/null +++ b/graphics/pokemon/palettes/torkoal_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +148 197 197 +255 238 230 +222 213 205 +205 189 180 +255 230 156 +255 213 106 +222 156 74 +148 90 0 +213 123 123 +180 90 90 +123 32 32 +255 156 0 +197 131 8 +255 57 0 +82 0 0 +0 0 0 diff --git a/graphics/pokemon/palettes/totodile_palette.pal b/graphics/pokemon/palettes/totodile_palette.pal new file mode 100644 index 000000000..8a68271f6 --- /dev/null +++ b/graphics/pokemon/palettes/totodile_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +205 197 164 +255 255 255 +148 213 255 +106 180 230 +49 131 197 +74 74 131 +180 180 180 +255 197 115 +255 90 32 +205 41 16 +123 0 0 +255 90 32 +205 41 16 +255 197 82 +172 131 41 +16 16 16 diff --git a/graphics/pokemon/palettes/totodile_shiny_palette.pal b/graphics/pokemon/palettes/totodile_shiny_palette.pal new file mode 100644 index 000000000..609f22253 --- /dev/null +++ b/graphics/pokemon/palettes/totodile_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +205 197 164 +255 255 255 +156 246 189 +106 222 180 +65 172 148 +32 106 90 +180 180 180 +131 180 255 +74 106 197 +49 74 164 +49 65 106 +255 123 74 +197 74 57 +255 197 82 +172 131 41 +16 16 16 diff --git a/graphics/pokemon/palettes/trapinch_palette.pal b/graphics/pokemon/palettes/trapinch_palette.pal new file mode 100644 index 000000000..2344a7eca --- /dev/null +++ b/graphics/pokemon/palettes/trapinch_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +189 205 156 +115 65 65 +205 123 115 +238 156 74 +255 189 123 +197 74 49 +172 197 98 +222 246 115 +123 148 74 +0 0 0 +0 0 0 +0 0 0 +65 65 49 +255 255 255 +0 0 0 +32 32 32 diff --git a/graphics/pokemon/palettes/trapinch_shiny_palette.pal b/graphics/pokemon/palettes/trapinch_shiny_palette.pal new file mode 100644 index 000000000..87ce33ef0 --- /dev/null +++ b/graphics/pokemon/palettes/trapinch_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +189 205 156 +24 49 41 +90 131 123 +123 164 156 +156 197 189 +197 74 49 +172 197 98 +222 246 115 +123 148 74 +0 0 0 +0 0 0 +0 0 0 +65 65 49 +255 255 255 +0 0 0 +32 32 32 diff --git a/graphics/pokemon/palettes/treecko_palette.pal b/graphics/pokemon/palettes/treecko_palette.pal new file mode 100644 index 000000000..987a3a5b9 --- /dev/null +++ b/graphics/pokemon/palettes/treecko_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +123 106 156 +255 213 123 +255 197 82 +230 156 74 +74 189 131 +255 106 82 +213 82 57 +164 74 49 +24 65 57 +74 139 90 +255 255 255 +189 255 115 +156 213 74 +115 172 49 +82 98 41 +16 16 16 diff --git a/graphics/pokemon/palettes/treecko_shiny_palette.pal b/graphics/pokemon/palettes/treecko_shiny_palette.pal new file mode 100644 index 000000000..da5dda0e4 --- /dev/null +++ b/graphics/pokemon/palettes/treecko_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +123 106 156 +255 213 123 +255 197 82 +230 156 74 +255 106 82 +255 238 197 +238 189 156 +205 156 123 +156 65 41 +213 82 57 +255 255 255 +172 230 238 +148 205 213 +74 164 148 +82 139 131 +16 16 16 diff --git a/graphics/pokemon/palettes/tropius_palette.pal b/graphics/pokemon/palettes/tropius_palette.pal new file mode 100644 index 000000000..efe3d75ab --- /dev/null +++ b/graphics/pokemon/palettes/tropius_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +16 123 189 +32 98 32 +57 172 65 +123 222 139 +189 246 156 +106 74 41 +164 115 49 +189 139 82 +205 164 106 +238 189 57 +255 255 106 +255 255 255 +0 0 0 +230 106 139 +164 82 106 +82 197 90 diff --git a/graphics/pokemon/palettes/tropius_shiny_palette.pal b/graphics/pokemon/palettes/tropius_shiny_palette.pal new file mode 100644 index 000000000..cb02cf449 --- /dev/null +++ b/graphics/pokemon/palettes/tropius_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +16 123 189 +49 90 0 +106 148 0 +172 213 32 +205 246 65 +106 74 41 +222 156 8 +246 189 41 +255 222 74 +238 189 57 +255 255 106 +255 255 255 +0 0 0 +230 106 139 +164 82 106 +139 180 0 diff --git a/graphics/pokemon/palettes/typhlosion_palette.pal b/graphics/pokemon/palettes/typhlosion_palette.pal new file mode 100644 index 000000000..72f0c9c8c --- /dev/null +++ b/graphics/pokemon/palettes/typhlosion_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +205 205 172 +255 255 255 +98 139 180 +65 82 123 +41 57 98 +0 8 74 +255 238 148 +213 197 106 +164 139 74 +98 74 16 +255 222 0 +255 156 0 +255 98 0 +238 8 0 +16 16 16 +255 255 197 diff --git a/graphics/pokemon/palettes/typhlosion_shiny_palette.pal b/graphics/pokemon/palettes/typhlosion_shiny_palette.pal new file mode 100644 index 000000000..42fb4ee9c --- /dev/null +++ b/graphics/pokemon/palettes/typhlosion_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +205 205 172 +255 255 255 +213 106 90 +172 65 74 +131 41 65 +106 32 41 +255 230 115 +222 197 82 +172 139 49 +139 82 24 +255 222 0 +255 156 0 +255 98 0 +238 0 0 +16 16 16 +255 246 156 diff --git a/graphics/pokemon/palettes/tyranitar_palette.pal b/graphics/pokemon/palettes/tyranitar_palette.pal new file mode 100644 index 000000000..6c5e2941c --- /dev/null +++ b/graphics/pokemon/palettes/tyranitar_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +205 205 172 +255 255 255 +197 238 197 +164 213 164 +115 164 115 +57 82 57 +255 0 255 +98 180 255 +74 156 230 +32 123 189 +0 74 139 +213 82 0 +148 41 0 +197 197 197 +115 115 115 +16 16 16 diff --git a/graphics/pokemon/palettes/tyranitar_shiny_palette.pal b/graphics/pokemon/palettes/tyranitar_shiny_palette.pal new file mode 100644 index 000000000..3090536a9 --- /dev/null +++ b/graphics/pokemon/palettes/tyranitar_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +205 205 172 +255 255 255 +246 213 148 +222 189 123 +172 139 82 +106 74 41 +255 0 255 +238 172 213 +213 148 197 +164 98 156 +106 49 98 +213 82 0 +148 41 0 +197 197 197 +115 115 115 +16 16 16 diff --git a/graphics/pokemon/palettes/tyrogue_palette.pal b/graphics/pokemon/palettes/tyrogue_palette.pal new file mode 100644 index 000000000..97bff0783 --- /dev/null +++ b/graphics/pokemon/palettes/tyrogue_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +205 205 172 +255 255 255 +255 222 255 +238 172 255 +205 131 205 +172 98 156 +131 49 90 +230 139 65 +205 98 41 +180 49 0 +115 0 0 +230 139 65 +180 49 0 +213 213 213 +172 172 172 +16 16 16 diff --git a/graphics/pokemon/palettes/tyrogue_shiny_palette.pal b/graphics/pokemon/palettes/tyrogue_shiny_palette.pal new file mode 100644 index 000000000..e8fef8a16 --- /dev/null +++ b/graphics/pokemon/palettes/tyrogue_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +205 205 172 +255 255 255 +238 230 205 +205 197 172 +156 148 131 +106 98 90 +90 82 65 +82 180 255 +65 139 230 +49 82 180 +32 65 131 +230 139 65 +180 49 0 +213 213 213 +172 172 172 +16 16 16 diff --git a/graphics/pokemon/palettes/umbreon_palette.pal b/graphics/pokemon/palettes/umbreon_palette.pal new file mode 100644 index 000000000..dc6ec68e6 --- /dev/null +++ b/graphics/pokemon/palettes/umbreon_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +205 205 172 +255 0 255 +255 0 255 +49 41 41 +65 57 57 +90 82 82 +148 131 131 +180 164 164 +139 98 0 +205 148 41 +255 197 0 +255 238 139 +255 0 255 +16 16 16 +255 90 57 +255 255 255 diff --git a/graphics/pokemon/palettes/umbreon_shiny_palette.pal b/graphics/pokemon/palettes/umbreon_shiny_palette.pal new file mode 100644 index 000000000..82c71e1ae --- /dev/null +++ b/graphics/pokemon/palettes/umbreon_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +205 205 172 +255 0 255 +255 0 255 +49 41 41 +65 57 57 +90 82 82 +148 131 131 +180 164 164 +32 74 148 +41 106 230 +98 180 255 +148 230 255 +255 0 255 +16 16 16 +255 213 16 +255 255 255 diff --git a/graphics/pokemon/palettes/unown_palette.pal b/graphics/pokemon/palettes/unown_palette.pal new file mode 100644 index 000000000..6babb2d90 --- /dev/null +++ b/graphics/pokemon/palettes/unown_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +205 205 172 +255 0 255 +255 0 255 +255 0 255 +222 222 222 +255 255 255 +16 16 16 +164 164 164 +115 115 115 +82 82 82 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 diff --git a/graphics/pokemon/palettes/unown_shiny_palette.pal b/graphics/pokemon/palettes/unown_shiny_palette.pal new file mode 100644 index 000000000..016a93548 --- /dev/null +++ b/graphics/pokemon/palettes/unown_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +205 205 172 +255 0 255 +255 0 255 +255 0 255 +98 205 255 +255 255 255 +16 16 16 +41 115 255 +32 65 156 +49 57 106 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 diff --git a/graphics/pokemon/palettes/ursaring_palette.pal b/graphics/pokemon/palettes/ursaring_palette.pal new file mode 100644 index 000000000..e77c0b345 --- /dev/null +++ b/graphics/pokemon/palettes/ursaring_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +205 205 172 +255 255 255 +222 197 115 +197 164 82 +164 131 57 +123 98 24 +74 49 0 +255 246 164 +255 213 123 +213 172 82 +180 131 41 +255 0 255 +222 222 222 +180 180 189 +123 123 139 +16 16 16 diff --git a/graphics/pokemon/palettes/ursaring_shiny_palette.pal b/graphics/pokemon/palettes/ursaring_shiny_palette.pal new file mode 100644 index 000000000..7bb95b380 --- /dev/null +++ b/graphics/pokemon/palettes/ursaring_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +205 205 172 +255 255 255 +164 230 65 +131 205 41 +98 172 16 +65 139 0 +57 82 0 +255 246 164 +255 213 123 +213 172 82 +180 131 41 +255 0 255 +222 222 222 +180 180 189 +123 123 139 +16 16 16 diff --git a/graphics/pokemon/palettes/vaporeon_palette.pal b/graphics/pokemon/palettes/vaporeon_palette.pal new file mode 100644 index 000000000..e6a4024f1 --- /dev/null +++ b/graphics/pokemon/palettes/vaporeon_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +213 213 213 +255 255 255 +230 230 230 +172 172 205 +255 238 123 +230 189 74 +139 123 41 +115 139 180 +90 115 156 +49 65 123 +90 90 115 +131 238 213 +98 205 180 +57 164 139 +16 106 82 +41 41 41 diff --git a/graphics/pokemon/palettes/vaporeon_shiny_palette.pal b/graphics/pokemon/palettes/vaporeon_shiny_palette.pal new file mode 100644 index 000000000..1cfaae92b --- /dev/null +++ b/graphics/pokemon/palettes/vaporeon_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +213 213 213 +255 255 255 +230 230 230 +172 172 205 +255 255 156 +230 197 74 +139 139 16 +172 90 115 +180 115 156 +131 57 90 +90 90 115 +255 197 246 +230 172 230 +189 131 197 +123 65 139 +41 41 41 diff --git a/graphics/pokemon/palettes/venomoth_palette.pal b/graphics/pokemon/palettes/venomoth_palette.pal new file mode 100644 index 000000000..4ebc1f953 --- /dev/null +++ b/graphics/pokemon/palettes/venomoth_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +98 205 139 +255 255 255 +230 230 230 +172 197 197 +230 213 172 +197 172 139 +164 131 106 +98 82 57 +238 230 98 +246 213 82 +16 16 16 +246 222 255 +238 197 255 +213 172 222 +172 139 205 +98 74 115 diff --git a/graphics/pokemon/palettes/venomoth_shiny_palette.pal b/graphics/pokemon/palettes/venomoth_shiny_palette.pal new file mode 100644 index 000000000..89ad92feb --- /dev/null +++ b/graphics/pokemon/palettes/venomoth_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +197 197 148 +255 255 255 +230 230 230 +172 197 197 +230 213 172 +197 172 139 +164 131 106 +98 82 57 +238 230 98 +246 213 82 +16 16 16 +156 213 255 +139 189 238 +139 172 230 +98 131 197 +49 74 115 diff --git a/graphics/pokemon/palettes/venonat_palette.pal b/graphics/pokemon/palettes/venonat_palette.pal new file mode 100644 index 000000000..26db14b2d --- /dev/null +++ b/graphics/pokemon/palettes/venonat_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +148 213 156 +255 255 255 +148 115 164 +213 213 213 +123 123 123 +255 180 172 +255 123 82 +197 82 32 +238 189 156 +189 139 106 +131 82 49 +164 139 189 +139 106 156 +106 82 115 +65 57 82 +16 16 16 diff --git a/graphics/pokemon/palettes/venonat_shiny_palette.pal b/graphics/pokemon/palettes/venonat_shiny_palette.pal new file mode 100644 index 000000000..88c346a27 --- /dev/null +++ b/graphics/pokemon/palettes/venonat_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +213 213 180 +255 255 255 +148 115 164 +213 213 213 +131 131 131 +156 230 255 +106 180 255 +57 131 197 +238 189 156 +189 139 106 +139 90 57 +180 123 197 +148 82 164 +106 65 115 +65 16 82 +16 16 16 diff --git a/graphics/pokemon/palettes/venusaur_palette.pal b/graphics/pokemon/palettes/venusaur_palette.pal new file mode 100644 index 000000000..f88c8375d --- /dev/null +++ b/graphics/pokemon/palettes/venusaur_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +238 238 238 +32 98 49 +98 156 115 +90 205 148 +139 238 189 +139 57 0 +189 106 49 +16 16 16 +230 74 65 +255 131 115 +156 246 139 +222 205 49 +255 238 82 +65 164 24 +106 205 65 +255 255 255 diff --git a/graphics/pokemon/palettes/venusaur_shiny_palette.pal b/graphics/pokemon/palettes/venusaur_shiny_palette.pal new file mode 100644 index 000000000..b00e69629 --- /dev/null +++ b/graphics/pokemon/palettes/venusaur_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +205 205 172 +16 82 32 +131 164 0 +180 213 16 +213 246 49 +131 49 0 +189 106 49 +16 16 16 +246 123 0 +255 197 41 +156 246 139 +255 238 82 +255 255 255 +41 164 16 +82 205 57 +255 255 255 diff --git a/graphics/pokemon/palettes/vibrava_palette.pal b/graphics/pokemon/palettes/vibrava_palette.pal new file mode 100644 index 000000000..7f40d2316 --- /dev/null +++ b/graphics/pokemon/palettes/vibrava_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +148 197 148 +139 238 180 +98 197 148 +49 139 98 +255 255 164 +230 213 139 +189 180 123 +222 222 255 +189 189 222 +205 205 205 +123 115 57 +0 0 0 +164 164 164 +131 131 131 +82 82 82 +255 255 255 diff --git a/graphics/pokemon/palettes/vibrava_shiny_palette.pal b/graphics/pokemon/palettes/vibrava_shiny_palette.pal new file mode 100644 index 000000000..8da128d69 --- /dev/null +++ b/graphics/pokemon/palettes/vibrava_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +148 197 148 +255 180 123 +246 123 74 +197 82 24 +255 255 164 +230 213 139 +189 180 123 +222 222 255 +189 189 222 +205 205 205 +123 115 57 +0 0 0 +164 164 164 +131 131 131 +106 106 106 +255 255 255 diff --git a/graphics/pokemon/palettes/victreebel_palette.pal b/graphics/pokemon/palettes/victreebel_palette.pal new file mode 100644 index 000000000..635eae0ab --- /dev/null +++ b/graphics/pokemon/palettes/victreebel_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +213 213 180 +255 255 255 +180 131 41 +213 213 213 +255 164 115 +213 74 32 +255 230 156 +255 213 106 +230 172 90 +189 255 115 +156 213 74 +115 172 49 +82 98 41 +180 123 49 +106 65 0 +16 16 16 diff --git a/graphics/pokemon/palettes/victreebel_shiny_palette.pal b/graphics/pokemon/palettes/victreebel_shiny_palette.pal new file mode 100644 index 000000000..2542072f3 --- /dev/null +++ b/graphics/pokemon/palettes/victreebel_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +213 213 180 +255 255 255 +131 148 8 +213 213 213 +90 156 222 +49 115 180 +255 255 156 +230 255 106 +189 213 65 +238 213 115 +197 172 74 +156 131 32 +106 82 16 +180 123 49 +106 65 0 +16 16 16 diff --git a/graphics/pokemon/palettes/vigoroth_palette.pal b/graphics/pokemon/palettes/vigoroth_palette.pal new file mode 100644 index 000000000..824efe711 --- /dev/null +++ b/graphics/pokemon/palettes/vigoroth_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +74 123 164 +82 65 32 +115 49 49 +115 82 41 +139 106 65 +65 65 65 +131 131 131 +205 205 205 +255 255 255 +139 65 90 +213 57 49 +255 98 98 +230 230 230 +172 131 98 +90 90 82 +0 0 0 diff --git a/graphics/pokemon/palettes/vigoroth_shiny_palette.pal b/graphics/pokemon/palettes/vigoroth_shiny_palette.pal new file mode 100644 index 000000000..adc647979 --- /dev/null +++ b/graphics/pokemon/palettes/vigoroth_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +74 123 164 +82 65 32 +115 49 49 +115 82 41 +139 106 65 +65 65 65 +205 148 82 +246 213 115 +255 255 255 +172 74 0 +230 82 24 +255 164 98 +255 238 156 +172 131 98 +90 90 82 +0 0 0 diff --git a/graphics/pokemon/palettes/vileplume_palette.pal b/graphics/pokemon/palettes/vileplume_palette.pal new file mode 100644 index 000000000..56a9e2e64 --- /dev/null +++ b/graphics/pokemon/palettes/vileplume_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +222 222 222 +255 255 255 +255 164 41 +197 156 41 +180 106 32 +255 98 98 +238 49 49 +197 65 82 +139 32 24 +255 205 213 +246 172 180 +115 131 164 +90 98 131 +65 74 98 +24 41 74 +16 16 16 diff --git a/graphics/pokemon/palettes/vileplume_shiny_palette.pal b/graphics/pokemon/palettes/vileplume_shiny_palette.pal new file mode 100644 index 000000000..6def71be1 --- /dev/null +++ b/graphics/pokemon/palettes/vileplume_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +222 222 222 +255 255 255 +255 230 156 +230 172 90 +189 131 49 +255 238 123 +246 205 90 +230 164 41 +172 90 24 +255 255 238 +255 246 205 +98 180 74 +90 148 74 +74 115 65 +32 74 24 +16 16 16 diff --git a/graphics/pokemon/palettes/volbeat_palette.pal b/graphics/pokemon/palettes/volbeat_palette.pal new file mode 100644 index 000000000..8d2cedfa8 --- /dev/null +++ b/graphics/pokemon/palettes/volbeat_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +148 197 148 +222 222 222 +139 139 148 +74 74 82 +0 0 0 +246 131 115 +230 82 98 +205 57 82 +139 49 74 +255 230 82 +222 189 82 +98 74 49 +164 180 197 +123 139 164 +74 82 106 +255 255 255 diff --git a/graphics/pokemon/palettes/volbeat_shiny_palette.pal b/graphics/pokemon/palettes/volbeat_shiny_palette.pal new file mode 100644 index 000000000..106d373cf --- /dev/null +++ b/graphics/pokemon/palettes/volbeat_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +148 197 148 +222 222 222 +139 139 148 +74 74 82 +0 0 0 +123 197 255 +90 172 230 +49 131 197 +74 74 131 +255 230 82 +222 189 82 +98 74 49 +205 139 222 +164 82 189 +65 32 82 +255 255 255 diff --git a/graphics/pokemon/palettes/voltorb_palette.pal b/graphics/pokemon/palettes/voltorb_palette.pal new file mode 100644 index 000000000..96cf0dd7e --- /dev/null +++ b/graphics/pokemon/palettes/voltorb_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +230 230 230 +255 255 255 +222 213 213 +180 172 172 +90 82 82 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 131 131 +255 172 156 +255 82 32 +230 65 0 +205 65 65 +131 16 16 +16 16 16 diff --git a/graphics/pokemon/palettes/voltorb_shiny_palette.pal b/graphics/pokemon/palettes/voltorb_shiny_palette.pal new file mode 100644 index 000000000..20cb4fbfa --- /dev/null +++ b/graphics/pokemon/palettes/voltorb_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +230 230 230 +255 255 255 +222 213 213 +180 172 172 +90 82 82 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +49 90 205 +82 106 238 +41 65 197 +0 24 156 +0 0 115 +0 0 74 +16 16 16 diff --git a/graphics/pokemon/palettes/vulpix_palette.pal b/graphics/pokemon/palettes/vulpix_palette.pal new file mode 100644 index 000000000..1e7a92f57 --- /dev/null +++ b/graphics/pokemon/palettes/vulpix_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +213 213 180 +255 255 255 +255 230 180 +255 222 148 +16 16 16 +238 156 74 +205 123 41 +172 90 8 +255 131 74 +222 106 41 +189 65 41 +148 49 0 +246 189 123 +230 148 106 +197 115 74 +131 57 0 diff --git a/graphics/pokemon/palettes/vulpix_shiny_palette.pal b/graphics/pokemon/palettes/vulpix_shiny_palette.pal new file mode 100644 index 000000000..ba3fa06a8 --- /dev/null +++ b/graphics/pokemon/palettes/vulpix_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +213 213 180 +255 255 255 +246 255 230 +213 222 189 +16 16 16 +197 180 41 +156 139 0 +115 98 0 +246 205 8 +222 180 0 +180 139 0 +123 82 0 +246 238 82 +222 213 0 +197 180 0 +90 74 0 diff --git a/graphics/pokemon/palettes/wailmer_palette.pal b/graphics/pokemon/palettes/wailmer_palette.pal new file mode 100644 index 000000000..4e56fb42a --- /dev/null +++ b/graphics/pokemon/palettes/wailmer_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +131 172 90 +32 49 74 +49 106 156 +74 131 180 +98 156 205 +255 238 205 +238 213 164 +205 180 131 +0 0 0 +156 139 98 +148 197 238 +57 82 123 +106 98 74 +131 139 156 +180 189 197 +255 255 255 diff --git a/graphics/pokemon/palettes/wailmer_shiny_palette.pal b/graphics/pokemon/palettes/wailmer_shiny_palette.pal new file mode 100644 index 000000000..296519dbd --- /dev/null +++ b/graphics/pokemon/palettes/wailmer_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +131 172 90 +82 41 123 +148 106 189 +180 139 222 +213 172 255 +255 238 205 +238 213 164 +205 180 131 +0 0 0 +156 139 98 +246 205 255 +115 74 156 +106 98 74 +131 139 156 +180 189 197 +255 255 255 diff --git a/graphics/pokemon/palettes/wailord_palette.pal b/graphics/pokemon/palettes/wailord_palette.pal new file mode 100644 index 000000000..55fdf02f6 --- /dev/null +++ b/graphics/pokemon/palettes/wailord_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +148 197 197 +238 230 255 +213 205 222 +180 172 180 +180 156 172 +131 115 131 +148 172 255 +82 131 255 +49 98 255 +41 82 197 +49 57 90 +123 106 98 +82 74 74 +0 0 0 +180 205 255 +41 82 123 diff --git a/graphics/pokemon/palettes/wailord_shiny_palette.pal b/graphics/pokemon/palettes/wailord_shiny_palette.pal new file mode 100644 index 000000000..31a687fb9 --- /dev/null +++ b/graphics/pokemon/palettes/wailord_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +148 197 197 +238 230 255 +213 205 222 +180 172 180 +180 156 172 +131 115 131 +230 197 255 +213 172 255 +172 131 213 +131 90 172 +82 41 123 +123 106 98 +82 74 74 +0 0 0 +246 222 255 +115 74 156 diff --git a/graphics/pokemon/palettes/walrein_palette.pal b/graphics/pokemon/palettes/walrein_palette.pal new file mode 100644 index 000000000..2b4fb8ad4 --- /dev/null +++ b/graphics/pokemon/palettes/walrein_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +98 115 148 +49 82 123 +57 115 172 +90 139 197 +131 180 230 +164 131 90 +255 197 98 +255 222 131 +255 255 164 +197 49 49 +238 131 131 +123 180 255 +197 205 222 +0 0 0 +222 230 255 +255 255 255 diff --git a/graphics/pokemon/palettes/walrein_shiny_palette.pal b/graphics/pokemon/palettes/walrein_shiny_palette.pal new file mode 100644 index 000000000..0d93d3e7d --- /dev/null +++ b/graphics/pokemon/palettes/walrein_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +98 115 148 +82 74 123 +164 90 189 +197 131 222 +230 180 238 +164 131 90 +255 197 98 +255 222 131 +255 255 164 +197 49 49 +238 131 131 +123 180 255 +197 205 222 +0 0 0 +222 230 255 +255 255 255 diff --git a/graphics/pokemon/palettes/wartortle_palette.pal b/graphics/pokemon/palettes/wartortle_palette.pal new file mode 100644 index 000000000..b497d87b3 --- /dev/null +++ b/graphics/pokemon/palettes/wartortle_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 238 230 +255 255 255 +230 238 230 +197 213 222 +197 49 0 +205 131 32 +148 98 98 +106 74 24 +246 238 139 +222 197 139 +189 139 57 +213 189 255 +172 139 238 +123 106 197 +82 65 123 +16 16 16 diff --git a/graphics/pokemon/palettes/wartortle_shiny_palette.pal b/graphics/pokemon/palettes/wartortle_shiny_palette.pal new file mode 100644 index 000000000..081f832f8 --- /dev/null +++ b/graphics/pokemon/palettes/wartortle_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +205 205 172 +255 255 255 +197 238 197 +156 213 164 +197 49 0 +164 148 65 +98 115 32 +65 82 0 +255 222 115 +230 172 90 +189 139 57 +230 205 238 +205 172 230 +164 139 180 +82 65 106 +16 16 16 diff --git a/graphics/pokemon/palettes/weedle_palette.pal b/graphics/pokemon/palettes/weedle_palette.pal new file mode 100644 index 000000000..32a4c1222 --- /dev/null +++ b/graphics/pokemon/palettes/weedle_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +205 205 172 +255 255 255 +205 205 205 +131 131 148 +255 205 115 +238 172 65 +213 139 106 +139 41 16 +255 205 180 +230 106 106 +205 41 0 +139 41 16 +255 238 180 +238 172 115 +255 0 255 +24 24 24 diff --git a/graphics/pokemon/palettes/weedle_shiny_palette.pal b/graphics/pokemon/palettes/weedle_shiny_palette.pal new file mode 100644 index 000000000..8d572dc19 --- /dev/null +++ b/graphics/pokemon/palettes/weedle_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +205 205 172 +255 255 255 +205 205 205 +131 131 148 +255 246 106 +255 222 65 +230 180 49 +156 98 24 +246 197 213 +230 164 205 +180 115 148 +115 65 98 +255 238 180 +213 197 106 +255 0 255 +24 24 24 diff --git a/graphics/pokemon/palettes/weepinbell_palette.pal b/graphics/pokemon/palettes/weepinbell_palette.pal new file mode 100644 index 000000000..162f84084 --- /dev/null +++ b/graphics/pokemon/palettes/weepinbell_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +246 246 246 +255 255 255 +180 131 41 +255 164 115 +238 115 65 +189 65 16 +255 230 156 +255 213 106 +238 180 0 +189 255 115 +156 213 74 +115 172 49 +82 98 41 +172 123 41 +115 82 16 +16 16 16 diff --git a/graphics/pokemon/palettes/weepinbell_shiny_palette.pal b/graphics/pokemon/palettes/weepinbell_shiny_palette.pal new file mode 100644 index 000000000..2c7c777e6 --- /dev/null +++ b/graphics/pokemon/palettes/weepinbell_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +246 246 246 +255 255 255 +106 139 16 +197 172 180 +156 131 139 +115 90 98 +255 255 115 +222 230 74 +180 189 32 +246 255 123 +205 238 82 +164 197 41 +74 106 0 +172 123 41 +115 82 16 +16 16 16 diff --git a/graphics/pokemon/palettes/weezing_palette.pal b/graphics/pokemon/palettes/weezing_palette.pal new file mode 100644 index 000000000..d3d46dd7a --- /dev/null +++ b/graphics/pokemon/palettes/weezing_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +139 205 156 +255 255 255 +230 230 230 +230 205 57 +255 230 0 +222 98 32 +164 32 0 +255 255 123 +230 213 115 +197 180 41 +238 172 197 +213 148 172 +180 106 139 +139 65 98 +98 41 65 +16 16 16 diff --git a/graphics/pokemon/palettes/weezing_shiny_palette.pal b/graphics/pokemon/palettes/weezing_shiny_palette.pal new file mode 100644 index 000000000..3ba9720b5 --- /dev/null +++ b/graphics/pokemon/palettes/weezing_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +205 205 205 +255 255 255 +222 222 222 +172 90 156 +205 123 172 +222 98 32 +164 32 0 +213 139 197 +180 106 164 +139 65 123 +172 222 213 +148 189 189 +106 148 148 +41 82 82 +8 49 49 +16 16 16 diff --git a/graphics/pokemon/palettes/whiscash_palette.pal b/graphics/pokemon/palettes/whiscash_palette.pal new file mode 100644 index 000000000..c6b70659b --- /dev/null +++ b/graphics/pokemon/palettes/whiscash_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +164 156 90 +0 0 0 +82 98 148 +98 115 164 +115 139 180 +148 180 222 +222 164 57 +255 213 74 +172 238 255 +57 74 115 +139 106 49 +131 148 172 +131 197 230 +106 189 222 +131 222 255 +255 255 255 diff --git a/graphics/pokemon/palettes/whiscash_shiny_palette.pal b/graphics/pokemon/palettes/whiscash_shiny_palette.pal new file mode 100644 index 000000000..12554c568 --- /dev/null +++ b/graphics/pokemon/palettes/whiscash_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +164 156 90 +0 0 0 +57 65 82 +74 82 98 +115 106 123 +148 139 156 +222 98 49 +255 123 82 +172 238 255 +57 74 115 +180 65 49 +131 148 172 +131 197 230 +106 189 222 +131 222 255 +255 255 255 diff --git a/graphics/pokemon/palettes/whismur_palette.pal b/graphics/pokemon/palettes/whismur_palette.pal new file mode 100644 index 000000000..e57bb7b39 --- /dev/null +++ b/graphics/pokemon/palettes/whismur_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +205 205 172 +255 255 255 +255 164 238 +238 148 213 +222 106 189 +189 82 139 +139 57 98 +115 8 24 +255 213 123 +246 172 57 +213 156 0 +164 115 24 +213 213 222 +156 156 164 +90 90 106 +0 0 0 diff --git a/graphics/pokemon/palettes/whismur_shiny_palette.pal b/graphics/pokemon/palettes/whismur_shiny_palette.pal new file mode 100644 index 000000000..395867cad --- /dev/null +++ b/graphics/pokemon/palettes/whismur_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +205 205 172 +255 255 255 +255 205 205 +255 172 197 +238 123 156 +222 90 115 +189 49 65 +115 8 24 +205 255 172 +148 230 148 +115 189 115 +65 139 90 +213 213 222 +156 156 164 +90 90 106 +41 41 57 diff --git a/graphics/pokemon/palettes/wigglytuff_palette.pal b/graphics/pokemon/palettes/wigglytuff_palette.pal new file mode 100644 index 000000000..8751c488e --- /dev/null +++ b/graphics/pokemon/palettes/wigglytuff_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +230 230 230 +255 255 255 +148 222 205 +230 49 49 +82 164 139 +32 90 98 +156 106 32 +115 65 24 +230 230 230 +205 205 205 +16 16 16 +255 222 205 +255 197 172 +246 148 148 +205 106 98 +156 74 74 diff --git a/graphics/pokemon/palettes/wigglytuff_shiny_palette.pal b/graphics/pokemon/palettes/wigglytuff_shiny_palette.pal new file mode 100644 index 000000000..e05e38f24 --- /dev/null +++ b/graphics/pokemon/palettes/wigglytuff_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +230 230 230 +255 255 255 +98 230 131 +230 49 49 +90 197 106 +57 156 65 +156 106 32 +115 65 24 +230 230 230 +205 205 205 +16 16 16 +255 222 238 +246 197 230 +230 172 213 +180 115 164 +74 24 74 diff --git a/graphics/pokemon/palettes/wingull_palette.pal b/graphics/pokemon/palettes/wingull_palette.pal new file mode 100644 index 000000000..ce5820061 --- /dev/null +++ b/graphics/pokemon/palettes/wingull_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +156 205 255 +57 57 57 +139 139 139 +222 213 255 +197 189 230 +246 238 255 +49 82 139 +222 131 0 +255 172 49 +139 90 16 +82 115 230 +115 164 255 +98 98 98 +0 0 0 +0 0 0 +255 205 106 diff --git a/graphics/pokemon/palettes/wingull_shiny_palette.pal b/graphics/pokemon/palettes/wingull_shiny_palette.pal new file mode 100644 index 000000000..59785b7cb --- /dev/null +++ b/graphics/pokemon/palettes/wingull_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +156 205 255 +57 57 57 +131 156 164 +222 197 246 +205 172 230 +246 238 255 +41 106 41 +222 131 0 +255 172 49 +139 90 16 +90 156 57 +123 205 90 +98 98 98 +0 0 0 +0 0 0 +255 205 106 diff --git a/graphics/pokemon/palettes/wobbuffet_palette.pal b/graphics/pokemon/palettes/wobbuffet_palette.pal new file mode 100644 index 000000000..e83cdc8c2 --- /dev/null +++ b/graphics/pokemon/palettes/wobbuffet_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +222 222 222 +255 0 255 +164 16 0 +197 57 0 +222 82 0 +255 139 0 +41 74 82 +32 115 148 +74 156 189 +106 189 222 +156 213 238 +255 0 255 +16 16 16 +82 82 82 +131 131 131 +255 255 255 diff --git a/graphics/pokemon/palettes/wobbuffet_shiny_palette.pal b/graphics/pokemon/palettes/wobbuffet_shiny_palette.pal new file mode 100644 index 000000000..0fa077555 --- /dev/null +++ b/graphics/pokemon/palettes/wobbuffet_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +222 222 222 +255 0 255 +164 16 0 +197 57 0 +222 82 0 +255 139 0 +106 57 90 +156 65 139 +205 90 189 +238 123 205 +255 164 213 +255 0 255 +16 16 16 +82 82 82 +131 131 131 +255 255 255 diff --git a/graphics/pokemon/palettes/wooper_palette.pal b/graphics/pokemon/palettes/wooper_palette.pal new file mode 100644 index 000000000..f364d6c71 --- /dev/null +++ b/graphics/pokemon/palettes/wooper_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +205 205 172 +148 131 164 +16 41 115 +49 74 131 +74 156 213 +139 197 246 +197 230 230 +238 172 255 +197 123 197 +148 98 164 +98 57 106 +255 0 255 +255 0 255 +255 0 255 +16 16 16 +255 255 255 diff --git a/graphics/pokemon/palettes/wooper_shiny_palette.pal b/graphics/pokemon/palettes/wooper_shiny_palette.pal new file mode 100644 index 000000000..cf0a3ce59 --- /dev/null +++ b/graphics/pokemon/palettes/wooper_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +205 205 172 +180 90 98 +123 57 49 +156 90 90 +213 156 164 +246 197 205 +255 230 213 +255 213 172 +230 148 98 +197 98 82 +131 74 74 +255 0 255 +255 0 255 +255 0 255 +16 16 16 +255 255 255 diff --git a/graphics/pokemon/palettes/wurmple_palette.pal b/graphics/pokemon/palettes/wurmple_palette.pal new file mode 100644 index 000000000..2fe1fd189 --- /dev/null +++ b/graphics/pokemon/palettes/wurmple_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +197 197 197 +98 82 82 +180 164 156 +255 255 255 +230 213 238 +205 82 90 +246 123 98 +246 189 139 +230 213 238 +222 213 164 +255 255 213 +148 148 0 +246 246 0 +197 197 90 +0 0 0 +24 24 24 diff --git a/graphics/pokemon/palettes/wurmple_shiny_palette.pal b/graphics/pokemon/palettes/wurmple_shiny_palette.pal new file mode 100644 index 000000000..3217ddc57 --- /dev/null +++ b/graphics/pokemon/palettes/wurmple_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +197 197 197 +98 82 82 +180 164 156 +255 255 255 +230 213 238 +164 82 139 +189 131 164 +222 164 197 +230 213 238 +222 213 164 +255 255 213 +148 148 0 +246 246 0 +197 197 90 +0 0 0 +24 24 24 diff --git a/graphics/pokemon/palettes/wynaut_palette.pal b/graphics/pokemon/palettes/wynaut_palette.pal new file mode 100644 index 000000000..c37046634 --- /dev/null +++ b/graphics/pokemon/palettes/wynaut_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +197 148 98 +41 74 82 +74 156 189 +106 189 222 +156 213 238 +164 49 65 +222 90 98 +65 57 57 +131 123 123 +106 98 98 +205 205 197 +255 255 255 +57 123 164 +123 41 57 +0 0 0 +205 246 164 diff --git a/graphics/pokemon/palettes/wynaut_shiny_palette.pal b/graphics/pokemon/palettes/wynaut_shiny_palette.pal new file mode 100644 index 000000000..7a5032aa6 --- /dev/null +++ b/graphics/pokemon/palettes/wynaut_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +197 148 98 +106 57 90 +197 82 189 +238 123 205 +255 164 213 +164 49 65 +222 90 98 +65 57 57 +131 123 123 +106 98 98 +205 205 197 +255 255 255 +180 115 90 +123 41 57 +0 0 0 +205 246 164 diff --git a/graphics/pokemon/palettes/xatu_palette.pal b/graphics/pokemon/palettes/xatu_palette.pal new file mode 100644 index 000000000..b6ab27604 --- /dev/null +++ b/graphics/pokemon/palettes/xatu_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +205 205 172 +255 255 255 +156 230 74 +82 205 74 +74 148 65 +49 98 41 +255 222 65 +189 148 32 +139 90 0 +238 57 0 +180 49 0 +131 41 0 +205 205 205 +148 148 148 +82 82 82 +41 41 41 diff --git a/graphics/pokemon/palettes/xatu_shiny_palette.pal b/graphics/pokemon/palettes/xatu_shiny_palette.pal new file mode 100644 index 000000000..2dcf957e9 --- /dev/null +++ b/graphics/pokemon/palettes/xatu_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +205 205 172 +255 255 255 +189 255 65 +164 230 49 +115 189 8 +65 106 0 +255 222 65 +189 148 32 +139 90 0 +255 164 57 +213 106 16 +115 74 0 +205 205 205 +148 148 148 +82 82 82 +41 41 41 diff --git a/graphics/pokemon/palettes/yanma_palette.pal b/graphics/pokemon/palettes/yanma_palette.pal new file mode 100644 index 000000000..a53cd19e3 --- /dev/null +++ b/graphics/pokemon/palettes/yanma_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +205 205 172 +148 49 0 +255 0 255 +213 65 0 +255 123 65 +255 222 148 +16 16 16 +49 106 0 +82 180 32 +131 238 32 +74 74 82 +255 0 255 +115 131 139 +164 180 213 +230 255 255 +255 0 255 diff --git a/graphics/pokemon/palettes/yanma_shiny_palette.pal b/graphics/pokemon/palettes/yanma_shiny_palette.pal new file mode 100644 index 000000000..08b7c0cce --- /dev/null +++ b/graphics/pokemon/palettes/yanma_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +205 205 172 +0 65 148 +255 0 255 +41 115 230 +74 180 255 +115 230 255 +16 16 16 +49 106 0 +82 180 32 +131 238 32 +74 74 82 +255 0 255 +115 131 139 +164 180 213 +230 255 255 +255 0 255 diff --git a/graphics/pokemon/palettes/zangoose_palette.pal b/graphics/pokemon/palettes/zangoose_palette.pal new file mode 100644 index 000000000..eb0ef7068 --- /dev/null +++ b/graphics/pokemon/palettes/zangoose_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +148 197 197 +255 255 255 +230 222 230 +189 172 180 +148 131 139 +106 90 98 +255 98 106 +205 90 106 +139 65 82 +255 164 148 +213 139 230 +123 106 98 +213 197 205 +0 0 0 +180 98 205 +123 57 131 diff --git a/graphics/pokemon/palettes/zangoose_shiny_palette.pal b/graphics/pokemon/palettes/zangoose_shiny_palette.pal new file mode 100644 index 000000000..82487aa4f --- /dev/null +++ b/graphics/pokemon/palettes/zangoose_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +148 197 197 +255 255 255 +230 222 230 +189 172 180 +148 131 139 +106 90 98 +49 131 197 +74 74 131 +57 57 115 +90 172 230 +255 123 82 +123 106 98 +213 197 205 +0 0 0 +222 98 49 +180 49 32 diff --git a/graphics/pokemon/palettes/zapdos_palette.pal b/graphics/pokemon/palettes/zapdos_palette.pal new file mode 100644 index 000000000..88e36bd7f --- /dev/null +++ b/graphics/pokemon/palettes/zapdos_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +131 213 123 +255 255 255 +222 222 222 +156 156 156 +65 65 65 +16 16 16 +255 0 255 +255 0 255 +255 189 57 +222 164 49 +148 90 32 +255 255 139 +255 238 0 +230 205 16 +172 139 65 +123 90 41 diff --git a/graphics/pokemon/palettes/zapdos_shiny_palette.pal b/graphics/pokemon/palettes/zapdos_shiny_palette.pal new file mode 100644 index 000000000..fb7840ebc --- /dev/null +++ b/graphics/pokemon/palettes/zapdos_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +213 213 189 +255 255 255 +222 222 222 +156 156 156 +90 90 90 +16 16 16 +255 0 255 +255 0 255 +255 106 65 +213 65 32 +156 57 41 +255 238 32 +255 197 0 +205 148 0 +156 98 0 +115 57 0 diff --git a/graphics/pokemon/palettes/zigzagoon_palette.pal b/graphics/pokemon/palettes/zigzagoon_palette.pal new file mode 100644 index 000000000..55f6178cb --- /dev/null +++ b/graphics/pokemon/palettes/zigzagoon_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +156 189 131 +74 65 41 +172 123 90 +205 156 123 +238 189 156 +255 238 197 +65 57 49 +106 90 74 +197 172 139 +230 213 172 +255 255 255 +164 32 0 +205 57 32 +164 148 123 +123 90 74 +16 0 0 diff --git a/graphics/pokemon/palettes/zigzagoon_shiny_palette.pal b/graphics/pokemon/palettes/zigzagoon_shiny_palette.pal new file mode 100644 index 000000000..fe2d3cbc9 --- /dev/null +++ b/graphics/pokemon/palettes/zigzagoon_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +156 189 131 +74 65 41 +197 98 65 +222 131 74 +238 164 74 +255 238 197 +49 49 41 +98 57 41 +197 172 139 +230 213 172 +255 255 255 +164 32 0 +205 57 32 +164 148 123 +131 82 57 +16 0 0 diff --git a/graphics/pokemon/palettes/zubat_palette.pal b/graphics/pokemon/palettes/zubat_palette.pal new file mode 100644 index 000000000..e9b2a3018 --- /dev/null +++ b/graphics/pokemon/palettes/zubat_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +230 230 230 +255 255 255 +213 213 213 +98 98 98 +16 16 16 +255 0 255 +189 205 255 +139 180 238 +106 139 189 +74 65 123 +246 131 222 +213 115 189 +180 82 156 +115 32 90 +255 0 255 +255 0 255 diff --git a/graphics/pokemon/palettes/zubat_shiny_palette.pal b/graphics/pokemon/palettes/zubat_shiny_palette.pal new file mode 100644 index 000000000..ab2540e88 --- /dev/null +++ b/graphics/pokemon/palettes/zubat_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +230 230 230 +255 255 255 +213 213 213 +98 98 98 +16 16 16 +255 0 255 +148 180 98 +106 139 57 +65 98 16 +24 57 0 +238 222 213 +205 180 172 +164 139 131 +106 82 74 +255 0 255 +255 0 255 diff --git a/graphics/trainers/back_pics/leaf_back_pic.png b/graphics/trainers/back_pics/leaf_back_pic.png new file mode 100644 index 000000000..66effb468 Binary files /dev/null and b/graphics/trainers/back_pics/leaf_back_pic.png differ diff --git a/graphics/trainers/back_pics/old_man_back_pic.png b/graphics/trainers/back_pics/old_man_back_pic.png new file mode 100644 index 000000000..07793a1be Binary files /dev/null and b/graphics/trainers/back_pics/old_man_back_pic.png differ diff --git a/graphics/trainers/back_pics/pokedude_back_pic.png b/graphics/trainers/back_pics/pokedude_back_pic.png new file mode 100644 index 000000000..6f2f543a4 Binary files /dev/null and b/graphics/trainers/back_pics/pokedude_back_pic.png differ diff --git a/graphics/trainers/back_pics/red_back_pic.png b/graphics/trainers/back_pics/red_back_pic.png new file mode 100644 index 000000000..a1aa1d302 Binary files /dev/null and b/graphics/trainers/back_pics/red_back_pic.png differ diff --git a/graphics/trainers/back_pics/ruby_sapphire_brendan_back_pic.png b/graphics/trainers/back_pics/ruby_sapphire_brendan_back_pic.png new file mode 100644 index 000000000..51b360637 Binary files /dev/null and b/graphics/trainers/back_pics/ruby_sapphire_brendan_back_pic.png differ diff --git a/graphics/trainers/back_pics/ruby_sapphire_may_back_pic.png b/graphics/trainers/back_pics/ruby_sapphire_may_back_pic.png new file mode 100644 index 000000000..a6930037f Binary files /dev/null and b/graphics/trainers/back_pics/ruby_sapphire_may_back_pic.png differ diff --git a/graphics/trainers/front_pics/aqua_admin_f_front_pic.png b/graphics/trainers/front_pics/aqua_admin_f_front_pic.png new file mode 100644 index 000000000..3428944b6 Binary files /dev/null and b/graphics/trainers/front_pics/aqua_admin_f_front_pic.png differ diff --git a/graphics/trainers/front_pics/aqua_admin_m_front_pic.png b/graphics/trainers/front_pics/aqua_admin_m_front_pic.png new file mode 100644 index 000000000..91a434ec8 Binary files /dev/null and b/graphics/trainers/front_pics/aqua_admin_m_front_pic.png differ diff --git a/graphics/trainers/front_pics/aqua_grunt_f_front_pic.png b/graphics/trainers/front_pics/aqua_grunt_f_front_pic.png new file mode 100644 index 000000000..5455700db Binary files /dev/null and b/graphics/trainers/front_pics/aqua_grunt_f_front_pic.png differ diff --git a/graphics/trainers/front_pics/aqua_grunt_m_front_pic.png b/graphics/trainers/front_pics/aqua_grunt_m_front_pic.png new file mode 100644 index 000000000..77ead55fd Binary files /dev/null and b/graphics/trainers/front_pics/aqua_grunt_m_front_pic.png differ diff --git a/graphics/trainers/front_pics/aqua_leader_archie_front_pic.png b/graphics/trainers/front_pics/aqua_leader_archie_front_pic.png new file mode 100644 index 000000000..e7593b0f0 Binary files /dev/null and b/graphics/trainers/front_pics/aqua_leader_archie_front_pic.png differ diff --git a/graphics/trainers/front_pics/arena_tycoon_greta_front_pic.png b/graphics/trainers/front_pics/arena_tycoon_greta_front_pic.png new file mode 100644 index 000000000..a15872c61 Binary files /dev/null and b/graphics/trainers/front_pics/arena_tycoon_greta_front_pic.png differ diff --git a/graphics/trainers/front_pics/aroma_lady_front_pic.png b/graphics/trainers/front_pics/aroma_lady_front_pic.png new file mode 100644 index 000000000..3bb53e991 Binary files /dev/null and b/graphics/trainers/front_pics/aroma_lady_front_pic.png differ diff --git a/graphics/trainers/front_pics/battle_girl_front_pic.png b/graphics/trainers/front_pics/battle_girl_front_pic.png new file mode 100644 index 000000000..fbce1299e Binary files /dev/null and b/graphics/trainers/front_pics/battle_girl_front_pic.png differ diff --git a/graphics/trainers/front_pics/beauty_front_pic.png b/graphics/trainers/front_pics/beauty_front_pic.png new file mode 100644 index 000000000..595d0bf1e Binary files /dev/null and b/graphics/trainers/front_pics/beauty_front_pic.png differ diff --git a/graphics/trainers/front_pics/biker_front_pic.png b/graphics/trainers/front_pics/biker_front_pic.png new file mode 100644 index 000000000..e8c23dfc7 Binary files /dev/null and b/graphics/trainers/front_pics/biker_front_pic.png differ diff --git a/graphics/trainers/front_pics/bird_keeper_front_pic.png b/graphics/trainers/front_pics/bird_keeper_front_pic.png new file mode 100644 index 000000000..2e29f2446 Binary files /dev/null and b/graphics/trainers/front_pics/bird_keeper_front_pic.png differ diff --git a/graphics/trainers/front_pics/black_belt_front_pic.png b/graphics/trainers/front_pics/black_belt_front_pic.png new file mode 100644 index 000000000..a433cb406 Binary files /dev/null and b/graphics/trainers/front_pics/black_belt_front_pic.png differ diff --git a/graphics/trainers/front_pics/blue_1_front_pic.png b/graphics/trainers/front_pics/blue_1_front_pic.png new file mode 100644 index 000000000..75022cef7 Binary files /dev/null and b/graphics/trainers/front_pics/blue_1_front_pic.png differ diff --git a/graphics/trainers/front_pics/blue_2_front_pic.png b/graphics/trainers/front_pics/blue_2_front_pic.png new file mode 100644 index 000000000..822ac12c4 Binary files /dev/null and b/graphics/trainers/front_pics/blue_2_front_pic.png differ diff --git a/graphics/trainers/front_pics/brendan_front_pic.png b/graphics/trainers/front_pics/brendan_front_pic.png new file mode 100644 index 000000000..b0c65b4be Binary files /dev/null and b/graphics/trainers/front_pics/brendan_front_pic.png differ diff --git a/graphics/trainers/front_pics/bug_catcher_front_pic.png b/graphics/trainers/front_pics/bug_catcher_front_pic.png new file mode 100644 index 000000000..3bb8f8d8a Binary files /dev/null and b/graphics/trainers/front_pics/bug_catcher_front_pic.png differ diff --git a/graphics/trainers/front_pics/bug_maniac_front_pic.png b/graphics/trainers/front_pics/bug_maniac_front_pic.png new file mode 100644 index 000000000..239bba039 Binary files /dev/null and b/graphics/trainers/front_pics/bug_maniac_front_pic.png differ diff --git a/graphics/trainers/front_pics/burglar_front_pic.png b/graphics/trainers/front_pics/burglar_front_pic.png new file mode 100644 index 000000000..5b68df0ee Binary files /dev/null and b/graphics/trainers/front_pics/burglar_front_pic.png differ diff --git a/graphics/trainers/front_pics/camper_front_pic.png b/graphics/trainers/front_pics/camper_front_pic.png new file mode 100644 index 000000000..d150b02f6 Binary files /dev/null and b/graphics/trainers/front_pics/camper_front_pic.png differ diff --git a/graphics/trainers/front_pics/champion_blue_front_pic.png b/graphics/trainers/front_pics/champion_blue_front_pic.png new file mode 100644 index 000000000..18f166dd5 Binary files /dev/null and b/graphics/trainers/front_pics/champion_blue_front_pic.png differ diff --git a/graphics/trainers/front_pics/champion_wallace_front_pic.png b/graphics/trainers/front_pics/champion_wallace_front_pic.png new file mode 100644 index 000000000..24c43eca8 Binary files /dev/null and b/graphics/trainers/front_pics/champion_wallace_front_pic.png differ diff --git a/graphics/trainers/front_pics/channeler_front_pic.png b/graphics/trainers/front_pics/channeler_front_pic.png new file mode 100644 index 000000000..79ba41f8a Binary files /dev/null and b/graphics/trainers/front_pics/channeler_front_pic.png differ diff --git a/graphics/trainers/front_pics/collector_front_pic.png b/graphics/trainers/front_pics/collector_front_pic.png new file mode 100644 index 000000000..15187ce1c Binary files /dev/null and b/graphics/trainers/front_pics/collector_front_pic.png differ diff --git a/graphics/trainers/front_pics/cool_couple_front_pic.png b/graphics/trainers/front_pics/cool_couple_front_pic.png new file mode 100644 index 000000000..735d22fc7 Binary files /dev/null and b/graphics/trainers/front_pics/cool_couple_front_pic.png differ diff --git a/graphics/trainers/front_pics/cool_trainer_f_front_pic.png b/graphics/trainers/front_pics/cool_trainer_f_front_pic.png new file mode 100644 index 000000000..ca5d24f60 Binary files /dev/null and b/graphics/trainers/front_pics/cool_trainer_f_front_pic.png differ diff --git a/graphics/trainers/front_pics/cool_trainer_m_front_pic.png b/graphics/trainers/front_pics/cool_trainer_m_front_pic.png new file mode 100644 index 000000000..509f37fcb Binary files /dev/null and b/graphics/trainers/front_pics/cool_trainer_m_front_pic.png differ diff --git a/graphics/trainers/front_pics/crush_girl_front_pic.png b/graphics/trainers/front_pics/crush_girl_front_pic.png new file mode 100644 index 000000000..b35dea83d Binary files /dev/null and b/graphics/trainers/front_pics/crush_girl_front_pic.png differ diff --git a/graphics/trainers/front_pics/crush_kin_front_pic.png b/graphics/trainers/front_pics/crush_kin_front_pic.png new file mode 100644 index 000000000..062ac4a75 Binary files /dev/null and b/graphics/trainers/front_pics/crush_kin_front_pic.png differ diff --git a/graphics/trainers/front_pics/cycling_triathlete_f_front_pic.png b/graphics/trainers/front_pics/cycling_triathlete_f_front_pic.png new file mode 100644 index 000000000..b5c2662b3 Binary files /dev/null and b/graphics/trainers/front_pics/cycling_triathlete_f_front_pic.png differ diff --git a/graphics/trainers/front_pics/cycling_triathlete_m_front_pic.png b/graphics/trainers/front_pics/cycling_triathlete_m_front_pic.png new file mode 100644 index 000000000..b2f55f0fc Binary files /dev/null and b/graphics/trainers/front_pics/cycling_triathlete_m_front_pic.png differ diff --git a/graphics/trainers/front_pics/dome_ace_tucker_front_pic.png b/graphics/trainers/front_pics/dome_ace_tucker_front_pic.png new file mode 100644 index 000000000..78b92b0c9 Binary files /dev/null and b/graphics/trainers/front_pics/dome_ace_tucker_front_pic.png differ diff --git a/graphics/trainers/front_pics/dragon_tamer_front_pic.png b/graphics/trainers/front_pics/dragon_tamer_front_pic.png new file mode 100644 index 000000000..285f2207c Binary files /dev/null and b/graphics/trainers/front_pics/dragon_tamer_front_pic.png differ diff --git a/graphics/trainers/front_pics/elite_four_agatha_front_pic.png b/graphics/trainers/front_pics/elite_four_agatha_front_pic.png new file mode 100644 index 000000000..b647b4fc4 Binary files /dev/null and b/graphics/trainers/front_pics/elite_four_agatha_front_pic.png differ diff --git a/graphics/trainers/front_pics/elite_four_bruno_front_pic.png b/graphics/trainers/front_pics/elite_four_bruno_front_pic.png new file mode 100644 index 000000000..9902bcb4b Binary files /dev/null and b/graphics/trainers/front_pics/elite_four_bruno_front_pic.png differ diff --git a/graphics/trainers/front_pics/elite_four_drake_front_pic.png b/graphics/trainers/front_pics/elite_four_drake_front_pic.png new file mode 100644 index 000000000..b27716719 Binary files /dev/null and b/graphics/trainers/front_pics/elite_four_drake_front_pic.png differ diff --git a/graphics/trainers/front_pics/elite_four_glacia_front_pic.png b/graphics/trainers/front_pics/elite_four_glacia_front_pic.png new file mode 100644 index 000000000..7f135ff4b Binary files /dev/null and b/graphics/trainers/front_pics/elite_four_glacia_front_pic.png differ diff --git a/graphics/trainers/front_pics/elite_four_lance_front_pic.png b/graphics/trainers/front_pics/elite_four_lance_front_pic.png new file mode 100644 index 000000000..ff55baed9 Binary files /dev/null and b/graphics/trainers/front_pics/elite_four_lance_front_pic.png differ diff --git a/graphics/trainers/front_pics/elite_four_lorelei_front_pic.png b/graphics/trainers/front_pics/elite_four_lorelei_front_pic.png new file mode 100644 index 000000000..c8109d61a Binary files /dev/null and b/graphics/trainers/front_pics/elite_four_lorelei_front_pic.png differ diff --git a/graphics/trainers/front_pics/elite_four_phoebe_front_pic.png b/graphics/trainers/front_pics/elite_four_phoebe_front_pic.png new file mode 100644 index 000000000..788908c6c Binary files /dev/null and b/graphics/trainers/front_pics/elite_four_phoebe_front_pic.png differ diff --git a/graphics/trainers/front_pics/elite_four_sidney_front_pic.png b/graphics/trainers/front_pics/elite_four_sidney_front_pic.png new file mode 100644 index 000000000..d43ab5cc3 Binary files /dev/null and b/graphics/trainers/front_pics/elite_four_sidney_front_pic.png differ diff --git a/graphics/trainers/front_pics/emerald_aroma_lady_front_pic.png b/graphics/trainers/front_pics/emerald_aroma_lady_front_pic.png new file mode 100644 index 000000000..9f6eb814c Binary files /dev/null and b/graphics/trainers/front_pics/emerald_aroma_lady_front_pic.png differ diff --git a/graphics/trainers/front_pics/emerald_beauty_front_pic.png b/graphics/trainers/front_pics/emerald_beauty_front_pic.png new file mode 100644 index 000000000..aea688176 Binary files /dev/null and b/graphics/trainers/front_pics/emerald_beauty_front_pic.png differ diff --git a/graphics/trainers/front_pics/emerald_bird_keeper_front_pic.png b/graphics/trainers/front_pics/emerald_bird_keeper_front_pic.png new file mode 100644 index 000000000..7ad67c5d7 Binary files /dev/null and b/graphics/trainers/front_pics/emerald_bird_keeper_front_pic.png differ diff --git a/graphics/trainers/front_pics/emerald_black_belt_front_pic.png b/graphics/trainers/front_pics/emerald_black_belt_front_pic.png new file mode 100644 index 000000000..fd3b51c66 Binary files /dev/null and b/graphics/trainers/front_pics/emerald_black_belt_front_pic.png differ diff --git a/graphics/trainers/front_pics/emerald_bug_catcher_front_pic.png b/graphics/trainers/front_pics/emerald_bug_catcher_front_pic.png new file mode 100644 index 000000000..8fe86d40e Binary files /dev/null and b/graphics/trainers/front_pics/emerald_bug_catcher_front_pic.png differ diff --git a/graphics/trainers/front_pics/emerald_camper_front_pic.png b/graphics/trainers/front_pics/emerald_camper_front_pic.png new file mode 100644 index 000000000..24d173dee Binary files /dev/null and b/graphics/trainers/front_pics/emerald_camper_front_pic.png differ diff --git a/graphics/trainers/front_pics/emerald_cool_trainer_f_front_pic.png b/graphics/trainers/front_pics/emerald_cool_trainer_f_front_pic.png new file mode 100644 index 000000000..572aa811a Binary files /dev/null and b/graphics/trainers/front_pics/emerald_cool_trainer_f_front_pic.png differ diff --git a/graphics/trainers/front_pics/emerald_cool_trainer_m_front_pic.png b/graphics/trainers/front_pics/emerald_cool_trainer_m_front_pic.png new file mode 100644 index 000000000..6b998992e Binary files /dev/null and b/graphics/trainers/front_pics/emerald_cool_trainer_m_front_pic.png differ diff --git a/graphics/trainers/front_pics/emerald_fisherman_front_pic.png b/graphics/trainers/front_pics/emerald_fisherman_front_pic.png new file mode 100644 index 000000000..8e90ccb17 Binary files /dev/null and b/graphics/trainers/front_pics/emerald_fisherman_front_pic.png differ diff --git a/graphics/trainers/front_pics/emerald_gentleman_front_pic.png b/graphics/trainers/front_pics/emerald_gentleman_front_pic.png new file mode 100644 index 000000000..85e4b024b Binary files /dev/null and b/graphics/trainers/front_pics/emerald_gentleman_front_pic.png differ diff --git a/graphics/trainers/front_pics/emerald_hiker_front_pic.png b/graphics/trainers/front_pics/emerald_hiker_front_pic.png new file mode 100644 index 000000000..6112a5f1e Binary files /dev/null and b/graphics/trainers/front_pics/emerald_hiker_front_pic.png differ diff --git a/graphics/trainers/front_pics/emerald_lady_front_pic.png b/graphics/trainers/front_pics/emerald_lady_front_pic.png new file mode 100644 index 000000000..4914eb433 Binary files /dev/null and b/graphics/trainers/front_pics/emerald_lady_front_pic.png differ diff --git a/graphics/trainers/front_pics/emerald_lass_front_pic.png b/graphics/trainers/front_pics/emerald_lass_front_pic.png new file mode 100644 index 000000000..5ccf1afcd Binary files /dev/null and b/graphics/trainers/front_pics/emerald_lass_front_pic.png differ diff --git a/graphics/trainers/front_pics/emerald_picnicker_front_pic.png b/graphics/trainers/front_pics/emerald_picnicker_front_pic.png new file mode 100644 index 000000000..06d4d3dea Binary files /dev/null and b/graphics/trainers/front_pics/emerald_picnicker_front_pic.png differ diff --git a/graphics/trainers/front_pics/emerald_pokemaniac_front_pic.png b/graphics/trainers/front_pics/emerald_pokemaniac_front_pic.png new file mode 100644 index 000000000..f35de383d Binary files /dev/null and b/graphics/trainers/front_pics/emerald_pokemaniac_front_pic.png differ diff --git a/graphics/trainers/front_pics/emerald_pokemon_breeder_f_front_pic.png b/graphics/trainers/front_pics/emerald_pokemon_breeder_f_front_pic.png new file mode 100644 index 000000000..d20122a7b Binary files /dev/null and b/graphics/trainers/front_pics/emerald_pokemon_breeder_f_front_pic.png differ diff --git a/graphics/trainers/front_pics/emerald_pokemon_breeder_m_front_pic.png b/graphics/trainers/front_pics/emerald_pokemon_breeder_m_front_pic.png new file mode 100644 index 000000000..da37f87dd Binary files /dev/null and b/graphics/trainers/front_pics/emerald_pokemon_breeder_m_front_pic.png differ diff --git a/graphics/trainers/front_pics/emerald_pokemon_ranger_f_front_pic.png b/graphics/trainers/front_pics/emerald_pokemon_ranger_f_front_pic.png new file mode 100644 index 000000000..a5e00d751 Binary files /dev/null and b/graphics/trainers/front_pics/emerald_pokemon_ranger_f_front_pic.png differ diff --git a/graphics/trainers/front_pics/emerald_pokemon_ranger_m_front_pic.png b/graphics/trainers/front_pics/emerald_pokemon_ranger_m_front_pic.png new file mode 100644 index 000000000..84f17dab1 Binary files /dev/null and b/graphics/trainers/front_pics/emerald_pokemon_ranger_m_front_pic.png differ diff --git a/graphics/trainers/front_pics/emerald_psychic_f_front_pic.png b/graphics/trainers/front_pics/emerald_psychic_f_front_pic.png new file mode 100644 index 000000000..b7e3ac406 Binary files /dev/null and b/graphics/trainers/front_pics/emerald_psychic_f_front_pic.png differ diff --git a/graphics/trainers/front_pics/emerald_psychic_m_front_pic.png b/graphics/trainers/front_pics/emerald_psychic_m_front_pic.png new file mode 100644 index 000000000..a0272a3a2 Binary files /dev/null and b/graphics/trainers/front_pics/emerald_psychic_m_front_pic.png differ diff --git a/graphics/trainers/front_pics/emerald_ruin_maniac_front_pic.png b/graphics/trainers/front_pics/emerald_ruin_maniac_front_pic.png new file mode 100644 index 000000000..b234aabd5 Binary files /dev/null and b/graphics/trainers/front_pics/emerald_ruin_maniac_front_pic.png differ diff --git a/graphics/trainers/front_pics/emerald_sailor_front_pic.png b/graphics/trainers/front_pics/emerald_sailor_front_pic.png new file mode 100644 index 000000000..298c2c6e1 Binary files /dev/null and b/graphics/trainers/front_pics/emerald_sailor_front_pic.png differ diff --git a/graphics/trainers/front_pics/emerald_sis_and_bro_front_pic.png b/graphics/trainers/front_pics/emerald_sis_and_bro_front_pic.png new file mode 100644 index 000000000..ba32a26c3 Binary files /dev/null and b/graphics/trainers/front_pics/emerald_sis_and_bro_front_pic.png differ diff --git a/graphics/trainers/front_pics/emerald_swimmer_f_front_pic.png b/graphics/trainers/front_pics/emerald_swimmer_f_front_pic.png new file mode 100644 index 000000000..7018c85b8 Binary files /dev/null and b/graphics/trainers/front_pics/emerald_swimmer_f_front_pic.png differ diff --git a/graphics/trainers/front_pics/emerald_swimmer_m_front_pic.png b/graphics/trainers/front_pics/emerald_swimmer_m_front_pic.png new file mode 100644 index 000000000..da4909deb Binary files /dev/null and b/graphics/trainers/front_pics/emerald_swimmer_m_front_pic.png differ diff --git a/graphics/trainers/front_pics/emerald_tuber_f_front_pic.png b/graphics/trainers/front_pics/emerald_tuber_f_front_pic.png new file mode 100644 index 000000000..93dc6eea2 Binary files /dev/null and b/graphics/trainers/front_pics/emerald_tuber_f_front_pic.png differ diff --git a/graphics/trainers/front_pics/emerald_tuber_m_front_pic.png b/graphics/trainers/front_pics/emerald_tuber_m_front_pic.png new file mode 100644 index 000000000..19182aa59 Binary files /dev/null and b/graphics/trainers/front_pics/emerald_tuber_m_front_pic.png differ diff --git a/graphics/trainers/front_pics/emerald_twins_front_pic.png b/graphics/trainers/front_pics/emerald_twins_front_pic.png new file mode 100644 index 000000000..f0c0e034e Binary files /dev/null and b/graphics/trainers/front_pics/emerald_twins_front_pic.png differ diff --git a/graphics/trainers/front_pics/emerald_young_couple_front_pic.png b/graphics/trainers/front_pics/emerald_young_couple_front_pic.png new file mode 100644 index 000000000..6be8b73d8 Binary files /dev/null and b/graphics/trainers/front_pics/emerald_young_couple_front_pic.png differ diff --git a/graphics/trainers/front_pics/emerald_youngster_front_pic.png b/graphics/trainers/front_pics/emerald_youngster_front_pic.png new file mode 100644 index 000000000..311c49572 Binary files /dev/null and b/graphics/trainers/front_pics/emerald_youngster_front_pic.png differ diff --git a/graphics/trainers/front_pics/engineer_front_pic.png b/graphics/trainers/front_pics/engineer_front_pic.png new file mode 100644 index 000000000..82e51e006 Binary files /dev/null and b/graphics/trainers/front_pics/engineer_front_pic.png differ diff --git a/graphics/trainers/front_pics/expert_f_front_pic.png b/graphics/trainers/front_pics/expert_f_front_pic.png new file mode 100644 index 000000000..5f69c2de6 Binary files /dev/null and b/graphics/trainers/front_pics/expert_f_front_pic.png differ diff --git a/graphics/trainers/front_pics/expert_m_front_pic.png b/graphics/trainers/front_pics/expert_m_front_pic.png new file mode 100644 index 000000000..1c53bf71f Binary files /dev/null and b/graphics/trainers/front_pics/expert_m_front_pic.png differ diff --git a/graphics/trainers/front_pics/factory_head_noland_front_pic.png b/graphics/trainers/front_pics/factory_head_noland_front_pic.png new file mode 100644 index 000000000..df420adf3 Binary files /dev/null and b/graphics/trainers/front_pics/factory_head_noland_front_pic.png differ diff --git a/graphics/trainers/front_pics/fisherman_front_pic.png b/graphics/trainers/front_pics/fisherman_front_pic.png new file mode 100644 index 000000000..5aa6d4aa3 Binary files /dev/null and b/graphics/trainers/front_pics/fisherman_front_pic.png differ diff --git a/graphics/trainers/front_pics/gamer_front_pic.png b/graphics/trainers/front_pics/gamer_front_pic.png new file mode 100644 index 000000000..74c24a9ad Binary files /dev/null and b/graphics/trainers/front_pics/gamer_front_pic.png differ diff --git a/graphics/trainers/front_pics/gentleman_front_pic.png b/graphics/trainers/front_pics/gentleman_front_pic.png new file mode 100644 index 000000000..c62aadb16 Binary files /dev/null and b/graphics/trainers/front_pics/gentleman_front_pic.png differ diff --git a/graphics/trainers/front_pics/giovanni_front_pic.png b/graphics/trainers/front_pics/giovanni_front_pic.png new file mode 100644 index 000000000..09f8dd334 Binary files /dev/null and b/graphics/trainers/front_pics/giovanni_front_pic.png differ diff --git a/graphics/trainers/front_pics/guitarist_front_pic.png b/graphics/trainers/front_pics/guitarist_front_pic.png new file mode 100644 index 000000000..477f76bdc Binary files /dev/null and b/graphics/trainers/front_pics/guitarist_front_pic.png differ diff --git a/graphics/trainers/front_pics/hex_maniac_front_pic.png b/graphics/trainers/front_pics/hex_maniac_front_pic.png new file mode 100644 index 000000000..8d66b4794 Binary files /dev/null and b/graphics/trainers/front_pics/hex_maniac_front_pic.png differ diff --git a/graphics/trainers/front_pics/hiker_front_pic.png b/graphics/trainers/front_pics/hiker_front_pic.png new file mode 100644 index 000000000..41deedf8a Binary files /dev/null and b/graphics/trainers/front_pics/hiker_front_pic.png differ diff --git a/graphics/trainers/front_pics/interviewer_front_pic.png b/graphics/trainers/front_pics/interviewer_front_pic.png new file mode 100644 index 000000000..ff2f9ca54 Binary files /dev/null and b/graphics/trainers/front_pics/interviewer_front_pic.png differ diff --git a/graphics/trainers/front_pics/juggler_front_pic.png b/graphics/trainers/front_pics/juggler_front_pic.png new file mode 100644 index 000000000..745e76dd4 Binary files /dev/null and b/graphics/trainers/front_pics/juggler_front_pic.png differ diff --git a/graphics/trainers/front_pics/kindler_front_pic.png b/graphics/trainers/front_pics/kindler_front_pic.png new file mode 100644 index 000000000..01deeb1d9 Binary files /dev/null and b/graphics/trainers/front_pics/kindler_front_pic.png differ diff --git a/graphics/trainers/front_pics/lady_front_pic.png b/graphics/trainers/front_pics/lady_front_pic.png new file mode 100644 index 000000000..2f3d2be03 Binary files /dev/null and b/graphics/trainers/front_pics/lady_front_pic.png differ diff --git a/graphics/trainers/front_pics/lass_front_pic.png b/graphics/trainers/front_pics/lass_front_pic.png new file mode 100644 index 000000000..888d62740 Binary files /dev/null and b/graphics/trainers/front_pics/lass_front_pic.png differ diff --git a/graphics/trainers/front_pics/leader_blaine_front_pic.png b/graphics/trainers/front_pics/leader_blaine_front_pic.png new file mode 100644 index 000000000..05d71edfc Binary files /dev/null and b/graphics/trainers/front_pics/leader_blaine_front_pic.png differ diff --git a/graphics/trainers/front_pics/leader_brawly_front_pic.png b/graphics/trainers/front_pics/leader_brawly_front_pic.png new file mode 100644 index 000000000..a8d05b25d Binary files /dev/null and b/graphics/trainers/front_pics/leader_brawly_front_pic.png differ diff --git a/graphics/trainers/front_pics/leader_brock_front_pic.png b/graphics/trainers/front_pics/leader_brock_front_pic.png new file mode 100644 index 000000000..2eeaf2d6d Binary files /dev/null and b/graphics/trainers/front_pics/leader_brock_front_pic.png differ diff --git a/graphics/trainers/front_pics/leader_erika_front_pic.png b/graphics/trainers/front_pics/leader_erika_front_pic.png new file mode 100644 index 000000000..210ec51c9 Binary files /dev/null and b/graphics/trainers/front_pics/leader_erika_front_pic.png differ diff --git a/graphics/trainers/front_pics/leader_flannery_front_pic.png b/graphics/trainers/front_pics/leader_flannery_front_pic.png new file mode 100644 index 000000000..942dc5b6b Binary files /dev/null and b/graphics/trainers/front_pics/leader_flannery_front_pic.png differ diff --git a/graphics/trainers/front_pics/leader_juan_front_pic.png b/graphics/trainers/front_pics/leader_juan_front_pic.png new file mode 100644 index 000000000..ecd9f087b Binary files /dev/null and b/graphics/trainers/front_pics/leader_juan_front_pic.png differ diff --git a/graphics/trainers/front_pics/leader_koga_front_pic.png b/graphics/trainers/front_pics/leader_koga_front_pic.png new file mode 100644 index 000000000..790f56f4a Binary files /dev/null and b/graphics/trainers/front_pics/leader_koga_front_pic.png differ diff --git a/graphics/trainers/front_pics/leader_lt_surge_front_pic.png b/graphics/trainers/front_pics/leader_lt_surge_front_pic.png new file mode 100644 index 000000000..87940b30d Binary files /dev/null and b/graphics/trainers/front_pics/leader_lt_surge_front_pic.png differ diff --git a/graphics/trainers/front_pics/leader_misty_front_pic.png b/graphics/trainers/front_pics/leader_misty_front_pic.png new file mode 100644 index 000000000..22ca5aaa5 Binary files /dev/null and b/graphics/trainers/front_pics/leader_misty_front_pic.png differ diff --git a/graphics/trainers/front_pics/leader_norman_front_pic.png b/graphics/trainers/front_pics/leader_norman_front_pic.png new file mode 100644 index 000000000..ce9998b09 Binary files /dev/null and b/graphics/trainers/front_pics/leader_norman_front_pic.png differ diff --git a/graphics/trainers/front_pics/leader_roxanne_front_pic.png b/graphics/trainers/front_pics/leader_roxanne_front_pic.png new file mode 100644 index 000000000..b996ee790 Binary files /dev/null and b/graphics/trainers/front_pics/leader_roxanne_front_pic.png differ diff --git a/graphics/trainers/front_pics/leader_sabrina_front_pic.png b/graphics/trainers/front_pics/leader_sabrina_front_pic.png new file mode 100644 index 000000000..81a491fe9 Binary files /dev/null and b/graphics/trainers/front_pics/leader_sabrina_front_pic.png differ diff --git a/graphics/trainers/front_pics/leader_tate_and_liza_front_pic.png b/graphics/trainers/front_pics/leader_tate_and_liza_front_pic.png new file mode 100644 index 000000000..a4930e3f1 Binary files /dev/null and b/graphics/trainers/front_pics/leader_tate_and_liza_front_pic.png differ diff --git a/graphics/trainers/front_pics/leader_wattson_front_pic.png b/graphics/trainers/front_pics/leader_wattson_front_pic.png new file mode 100644 index 000000000..7b9438a25 Binary files /dev/null and b/graphics/trainers/front_pics/leader_wattson_front_pic.png differ diff --git a/graphics/trainers/front_pics/leader_winona_front_pic.png b/graphics/trainers/front_pics/leader_winona_front_pic.png new file mode 100644 index 000000000..fc0e4a6dd Binary files /dev/null and b/graphics/trainers/front_pics/leader_winona_front_pic.png differ diff --git a/graphics/trainers/front_pics/leaf_front_pic.png b/graphics/trainers/front_pics/leaf_front_pic.png new file mode 100644 index 000000000..b20b0906e Binary files /dev/null and b/graphics/trainers/front_pics/leaf_front_pic.png differ diff --git a/graphics/trainers/front_pics/magma_admin_front_pic.png b/graphics/trainers/front_pics/magma_admin_front_pic.png new file mode 100644 index 000000000..d7b5e4fb1 Binary files /dev/null and b/graphics/trainers/front_pics/magma_admin_front_pic.png differ diff --git a/graphics/trainers/front_pics/magma_grunt_f_front_pic.png b/graphics/trainers/front_pics/magma_grunt_f_front_pic.png new file mode 100644 index 000000000..6fa81a6a7 Binary files /dev/null and b/graphics/trainers/front_pics/magma_grunt_f_front_pic.png differ diff --git a/graphics/trainers/front_pics/magma_grunt_m_front_pic.png b/graphics/trainers/front_pics/magma_grunt_m_front_pic.png new file mode 100644 index 000000000..4c7fa355a Binary files /dev/null and b/graphics/trainers/front_pics/magma_grunt_m_front_pic.png differ diff --git a/graphics/trainers/front_pics/magma_leader_maxie_front_pic.png b/graphics/trainers/front_pics/magma_leader_maxie_front_pic.png new file mode 100644 index 000000000..679f62367 Binary files /dev/null and b/graphics/trainers/front_pics/magma_leader_maxie_front_pic.png differ diff --git a/graphics/trainers/front_pics/may_front_pic.png b/graphics/trainers/front_pics/may_front_pic.png new file mode 100644 index 000000000..47ebca40f Binary files /dev/null and b/graphics/trainers/front_pics/may_front_pic.png differ diff --git a/graphics/trainers/front_pics/ninja_boy_front_pic.png b/graphics/trainers/front_pics/ninja_boy_front_pic.png new file mode 100644 index 000000000..f36849ca3 Binary files /dev/null and b/graphics/trainers/front_pics/ninja_boy_front_pic.png differ diff --git a/graphics/trainers/front_pics/oak_front_pic.png b/graphics/trainers/front_pics/oak_front_pic.png new file mode 100644 index 000000000..5e2a19aed Binary files /dev/null and b/graphics/trainers/front_pics/oak_front_pic.png differ diff --git a/graphics/trainers/front_pics/old_couple_front_pic.png b/graphics/trainers/front_pics/old_couple_front_pic.png new file mode 100644 index 000000000..71c527b72 Binary files /dev/null and b/graphics/trainers/front_pics/old_couple_front_pic.png differ diff --git a/graphics/trainers/front_pics/painter_front_pic.png b/graphics/trainers/front_pics/painter_front_pic.png new file mode 100644 index 000000000..e8dfa555f Binary files /dev/null and b/graphics/trainers/front_pics/painter_front_pic.png differ diff --git a/graphics/trainers/front_pics/palace_maven_spenser_front_pic.png b/graphics/trainers/front_pics/palace_maven_spenser_front_pic.png new file mode 100644 index 000000000..0b33649a2 Binary files /dev/null and b/graphics/trainers/front_pics/palace_maven_spenser_front_pic.png differ diff --git a/graphics/trainers/front_pics/parasol_lady_front_pic.png b/graphics/trainers/front_pics/parasol_lady_front_pic.png new file mode 100644 index 000000000..088d4d76e Binary files /dev/null and b/graphics/trainers/front_pics/parasol_lady_front_pic.png differ diff --git a/graphics/trainers/front_pics/picnicker_front_pic.png b/graphics/trainers/front_pics/picnicker_front_pic.png new file mode 100644 index 000000000..7d87be9ad Binary files /dev/null and b/graphics/trainers/front_pics/picnicker_front_pic.png differ diff --git a/graphics/trainers/front_pics/pike_queen_lucy_front_pic.png b/graphics/trainers/front_pics/pike_queen_lucy_front_pic.png new file mode 100644 index 000000000..e57260e28 Binary files /dev/null and b/graphics/trainers/front_pics/pike_queen_lucy_front_pic.png differ diff --git a/graphics/trainers/front_pics/pokemaniac_front_pic.png b/graphics/trainers/front_pics/pokemaniac_front_pic.png new file mode 100644 index 000000000..61422329c Binary files /dev/null and b/graphics/trainers/front_pics/pokemaniac_front_pic.png differ diff --git a/graphics/trainers/front_pics/pokemon_breeder_front_pic.png b/graphics/trainers/front_pics/pokemon_breeder_front_pic.png new file mode 100644 index 000000000..35ff34854 Binary files /dev/null and b/graphics/trainers/front_pics/pokemon_breeder_front_pic.png differ diff --git a/graphics/trainers/front_pics/pokemon_ranger_f_front_pic.png b/graphics/trainers/front_pics/pokemon_ranger_f_front_pic.png new file mode 100644 index 000000000..382fb2a14 Binary files /dev/null and b/graphics/trainers/front_pics/pokemon_ranger_f_front_pic.png differ diff --git a/graphics/trainers/front_pics/pokemon_ranger_m_front_pic.png b/graphics/trainers/front_pics/pokemon_ranger_m_front_pic.png new file mode 100644 index 000000000..a85efa3d3 Binary files /dev/null and b/graphics/trainers/front_pics/pokemon_ranger_m_front_pic.png differ diff --git a/graphics/trainers/front_pics/psychic_f_front_pic.png b/graphics/trainers/front_pics/psychic_f_front_pic.png new file mode 100644 index 000000000..328028ea7 Binary files /dev/null and b/graphics/trainers/front_pics/psychic_f_front_pic.png differ diff --git a/graphics/trainers/front_pics/psychic_m_front_pic.png b/graphics/trainers/front_pics/psychic_m_front_pic.png new file mode 100644 index 000000000..a0a6b5ad8 Binary files /dev/null and b/graphics/trainers/front_pics/psychic_m_front_pic.png differ diff --git a/graphics/trainers/front_pics/pyramid_king_brandon_front_pic.png b/graphics/trainers/front_pics/pyramid_king_brandon_front_pic.png new file mode 100644 index 000000000..2f936092a Binary files /dev/null and b/graphics/trainers/front_pics/pyramid_king_brandon_front_pic.png differ diff --git a/graphics/trainers/front_pics/red_front_pic.png b/graphics/trainers/front_pics/red_front_pic.png new file mode 100644 index 000000000..45bb17f9b Binary files /dev/null and b/graphics/trainers/front_pics/red_front_pic.png differ diff --git a/graphics/trainers/front_pics/rich_boy_front_pic.png b/graphics/trainers/front_pics/rich_boy_front_pic.png new file mode 100644 index 000000000..c0404a44e Binary files /dev/null and b/graphics/trainers/front_pics/rich_boy_front_pic.png differ diff --git a/graphics/trainers/front_pics/rocker_front_pic.png b/graphics/trainers/front_pics/rocker_front_pic.png new file mode 100644 index 000000000..9fa734520 Binary files /dev/null and b/graphics/trainers/front_pics/rocker_front_pic.png differ diff --git a/graphics/trainers/front_pics/rocket_grunt_f_front_pic.png b/graphics/trainers/front_pics/rocket_grunt_f_front_pic.png new file mode 100644 index 000000000..3593ef115 Binary files /dev/null and b/graphics/trainers/front_pics/rocket_grunt_f_front_pic.png differ diff --git a/graphics/trainers/front_pics/rocket_grunt_m_front_pic.png b/graphics/trainers/front_pics/rocket_grunt_m_front_pic.png new file mode 100644 index 000000000..de95d378d Binary files /dev/null and b/graphics/trainers/front_pics/rocket_grunt_m_front_pic.png differ diff --git a/graphics/trainers/front_pics/roughneck_front_pic.png b/graphics/trainers/front_pics/roughneck_front_pic.png new file mode 100644 index 000000000..98a6eebaa Binary files /dev/null and b/graphics/trainers/front_pics/roughneck_front_pic.png differ diff --git a/graphics/trainers/front_pics/ruby_magma_admin_f_front_pic.png b/graphics/trainers/front_pics/ruby_magma_admin_f_front_pic.png new file mode 100644 index 000000000..c5890b11f Binary files /dev/null and b/graphics/trainers/front_pics/ruby_magma_admin_f_front_pic.png differ diff --git a/graphics/trainers/front_pics/ruby_sapphire_brendan_front_pic.png b/graphics/trainers/front_pics/ruby_sapphire_brendan_front_pic.png new file mode 100644 index 000000000..c1110bf28 Binary files /dev/null and b/graphics/trainers/front_pics/ruby_sapphire_brendan_front_pic.png differ diff --git a/graphics/trainers/front_pics/ruby_sapphire_champion_wallace_front_pic.png b/graphics/trainers/front_pics/ruby_sapphire_champion_wallace_front_pic.png new file mode 100644 index 000000000..3f0159cdb Binary files /dev/null and b/graphics/trainers/front_pics/ruby_sapphire_champion_wallace_front_pic.png differ diff --git a/graphics/trainers/front_pics/ruby_sapphire_may_front_pic.png b/graphics/trainers/front_pics/ruby_sapphire_may_front_pic.png new file mode 100644 index 000000000..b795b4586 Binary files /dev/null and b/graphics/trainers/front_pics/ruby_sapphire_may_front_pic.png differ diff --git a/graphics/trainers/front_pics/ruin_maniac_front_pic.png b/graphics/trainers/front_pics/ruin_maniac_front_pic.png new file mode 100644 index 000000000..ad9d0492c Binary files /dev/null and b/graphics/trainers/front_pics/ruin_maniac_front_pic.png differ diff --git a/graphics/trainers/front_pics/running_triathlete_f_front_pic.png b/graphics/trainers/front_pics/running_triathlete_f_front_pic.png new file mode 100644 index 000000000..29297cc82 Binary files /dev/null and b/graphics/trainers/front_pics/running_triathlete_f_front_pic.png differ diff --git a/graphics/trainers/front_pics/running_triathlete_m_front_pic.png b/graphics/trainers/front_pics/running_triathlete_m_front_pic.png new file mode 100644 index 000000000..7fe34330f Binary files /dev/null and b/graphics/trainers/front_pics/running_triathlete_m_front_pic.png differ diff --git a/graphics/trainers/front_pics/sailor_front_pic.png b/graphics/trainers/front_pics/sailor_front_pic.png new file mode 100644 index 000000000..2ef90d0a2 Binary files /dev/null and b/graphics/trainers/front_pics/sailor_front_pic.png differ diff --git a/graphics/trainers/front_pics/salon_maiden_anabel_front_pic.png b/graphics/trainers/front_pics/salon_maiden_anabel_front_pic.png new file mode 100644 index 000000000..28fedca38 Binary files /dev/null and b/graphics/trainers/front_pics/salon_maiden_anabel_front_pic.png differ diff --git a/graphics/trainers/front_pics/school_kid_f_front_pic.png b/graphics/trainers/front_pics/school_kid_f_front_pic.png new file mode 100644 index 000000000..9107a4373 Binary files /dev/null and b/graphics/trainers/front_pics/school_kid_f_front_pic.png differ diff --git a/graphics/trainers/front_pics/school_kid_m_front_pic.png b/graphics/trainers/front_pics/school_kid_m_front_pic.png new file mode 100644 index 000000000..614f99ae1 Binary files /dev/null and b/graphics/trainers/front_pics/school_kid_m_front_pic.png differ diff --git a/graphics/trainers/front_pics/scientist_front_pic.png b/graphics/trainers/front_pics/scientist_front_pic.png new file mode 100644 index 000000000..78f7e6e82 Binary files /dev/null and b/graphics/trainers/front_pics/scientist_front_pic.png differ diff --git a/graphics/trainers/front_pics/sis_and_bro_front_pic.png b/graphics/trainers/front_pics/sis_and_bro_front_pic.png new file mode 100644 index 000000000..1477547d3 Binary files /dev/null and b/graphics/trainers/front_pics/sis_and_bro_front_pic.png differ diff --git a/graphics/trainers/front_pics/sr_and_jr_front_pic.png b/graphics/trainers/front_pics/sr_and_jr_front_pic.png new file mode 100644 index 000000000..124637452 Binary files /dev/null and b/graphics/trainers/front_pics/sr_and_jr_front_pic.png differ diff --git a/graphics/trainers/front_pics/steven_front_pic.png b/graphics/trainers/front_pics/steven_front_pic.png new file mode 100644 index 000000000..a322cbe5a Binary files /dev/null and b/graphics/trainers/front_pics/steven_front_pic.png differ diff --git a/graphics/trainers/front_pics/super_nerd_front_pic.png b/graphics/trainers/front_pics/super_nerd_front_pic.png new file mode 100644 index 000000000..ed22b6bfa Binary files /dev/null and b/graphics/trainers/front_pics/super_nerd_front_pic.png differ diff --git a/graphics/trainers/front_pics/swimmer_f_front_pic.png b/graphics/trainers/front_pics/swimmer_f_front_pic.png new file mode 100644 index 000000000..a0fdb7d1e Binary files /dev/null and b/graphics/trainers/front_pics/swimmer_f_front_pic.png differ diff --git a/graphics/trainers/front_pics/swimmer_m_front_pic.png b/graphics/trainers/front_pics/swimmer_m_front_pic.png new file mode 100644 index 000000000..af545f09c Binary files /dev/null and b/graphics/trainers/front_pics/swimmer_m_front_pic.png differ diff --git a/graphics/trainers/front_pics/swimming_triathlete_f_front_pic.png b/graphics/trainers/front_pics/swimming_triathlete_f_front_pic.png new file mode 100644 index 000000000..808c1c1c7 Binary files /dev/null and b/graphics/trainers/front_pics/swimming_triathlete_f_front_pic.png differ diff --git a/graphics/trainers/front_pics/swimming_triathlete_m_front_pic.png b/graphics/trainers/front_pics/swimming_triathlete_m_front_pic.png new file mode 100644 index 000000000..f649d0045 Binary files /dev/null and b/graphics/trainers/front_pics/swimming_triathlete_m_front_pic.png differ diff --git a/graphics/trainers/front_pics/tamer_front_pic.png b/graphics/trainers/front_pics/tamer_front_pic.png new file mode 100644 index 000000000..b26a2ec78 Binary files /dev/null and b/graphics/trainers/front_pics/tamer_front_pic.png differ diff --git a/graphics/trainers/front_pics/tuber_front_pic.png b/graphics/trainers/front_pics/tuber_front_pic.png new file mode 100644 index 000000000..3ecd0ced3 Binary files /dev/null and b/graphics/trainers/front_pics/tuber_front_pic.png differ diff --git a/graphics/trainers/front_pics/twins_front_pic.png b/graphics/trainers/front_pics/twins_front_pic.png new file mode 100644 index 000000000..6e513e79a Binary files /dev/null and b/graphics/trainers/front_pics/twins_front_pic.png differ diff --git a/graphics/trainers/front_pics/wally_front_pic.png b/graphics/trainers/front_pics/wally_front_pic.png new file mode 100644 index 000000000..76338eb4d Binary files /dev/null and b/graphics/trainers/front_pics/wally_front_pic.png differ diff --git a/graphics/trainers/front_pics/winstrate_f_front_pic.png b/graphics/trainers/front_pics/winstrate_f_front_pic.png new file mode 100644 index 000000000..4d4f9cffe Binary files /dev/null and b/graphics/trainers/front_pics/winstrate_f_front_pic.png differ diff --git a/graphics/trainers/front_pics/winstrate_m_front_pic.png b/graphics/trainers/front_pics/winstrate_m_front_pic.png new file mode 100644 index 000000000..a6dc4a18e Binary files /dev/null and b/graphics/trainers/front_pics/winstrate_m_front_pic.png differ diff --git a/graphics/trainers/front_pics/young_couple_front_pic.png b/graphics/trainers/front_pics/young_couple_front_pic.png new file mode 100644 index 000000000..be9fc5d2c Binary files /dev/null and b/graphics/trainers/front_pics/young_couple_front_pic.png differ diff --git a/graphics/trainers/front_pics/youngster_front_pic.png b/graphics/trainers/front_pics/youngster_front_pic.png new file mode 100644 index 000000000..6971259cc Binary files /dev/null and b/graphics/trainers/front_pics/youngster_front_pic.png differ diff --git a/graphics/trainers/palettes/aqua_admin_f.pal b/graphics/trainers/palettes/aqua_admin_f.pal new file mode 100644 index 000000000..4bad68770 --- /dev/null +++ b/graphics/trainers/palettes/aqua_admin_f.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 197 164 +255 222 205 +238 180 148 +197 139 106 +106 74 74 +139 172 213 +90 131 189 +65 90 139 +57 57 57 +213 222 230 +255 131 41 +189 156 90 +238 98 41 +180 65 41 +255 255 255 +0 0 0 diff --git a/graphics/trainers/palettes/aqua_admin_m.pal b/graphics/trainers/palettes/aqua_admin_m.pal new file mode 100644 index 000000000..2a7a46d46 --- /dev/null +++ b/graphics/trainers/palettes/aqua_admin_m.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 197 164 +255 222 205 +238 180 148 +197 139 106 +106 74 74 +139 172 213 +90 131 189 +65 90 139 +57 57 57 +213 222 230 +255 131 41 +189 156 90 +222 82 24 +164 49 24 +255 255 255 +0 0 0 diff --git a/graphics/trainers/palettes/aqua_grunt_f.pal b/graphics/trainers/palettes/aqua_grunt_f.pal new file mode 100644 index 000000000..4563eba48 --- /dev/null +++ b/graphics/trainers/palettes/aqua_grunt_f.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 197 164 +255 222 205 +238 180 148 +197 139 106 +106 74 74 +139 172 213 +90 131 189 +65 90 139 +57 57 57 +213 222 230 +164 74 65 +189 156 90 +255 106 98 +205 82 74 +255 255 255 +0 0 0 diff --git a/graphics/trainers/palettes/aqua_grunt_m.pal b/graphics/trainers/palettes/aqua_grunt_m.pal new file mode 100644 index 000000000..c2b28ead9 --- /dev/null +++ b/graphics/trainers/palettes/aqua_grunt_m.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 197 164 +255 222 205 +238 180 148 +197 139 106 +106 74 74 +139 172 213 +90 131 189 +65 90 139 +57 57 57 +213 222 230 +255 164 197 +189 156 90 +255 115 148 +213 82 115 +255 255 255 +0 0 0 diff --git a/graphics/trainers/palettes/aqua_leader_archie.pal b/graphics/trainers/palettes/aqua_leader_archie.pal new file mode 100644 index 000000000..a778ea6bb --- /dev/null +++ b/graphics/trainers/palettes/aqua_leader_archie.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 197 164 +255 222 205 +238 180 148 +197 139 106 +106 74 74 +131 156 180 +106 123 148 +82 90 115 +57 65 98 +213 213 222 +82 90 156 +24 32 49 +148 156 222 +106 115 213 +255 255 255 +0 0 0 diff --git a/graphics/trainers/palettes/arena_tycoon_greta.pal b/graphics/trainers/palettes/arena_tycoon_greta.pal new file mode 100644 index 000000000..60c45e8e9 --- /dev/null +++ b/graphics/trainers/palettes/arena_tycoon_greta.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 197 164 +255 222 205 +238 180 148 +197 139 106 +106 74 74 +139 172 213 +90 131 189 +255 230 106 +213 189 90 +213 222 230 +65 82 123 +189 156 90 +255 115 148 +213 82 115 +255 255 255 +0 0 0 diff --git a/graphics/trainers/palettes/aroma_lady.pal b/graphics/trainers/palettes/aroma_lady.pal new file mode 100644 index 000000000..416c9763f --- /dev/null +++ b/graphics/trainers/palettes/aroma_lady.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +172 230 148 +16 16 16 +255 230 205 +238 189 148 +197 148 106 +106 74 74 +246 189 197 +222 131 148 +189 106 131 +246 246 255 +230 230 255 +197 197 230 +156 148 180 +98 90 123 +148 106 106 +156 197 197 diff --git a/graphics/trainers/palettes/battle_girl.pal b/graphics/trainers/palettes/battle_girl.pal new file mode 100644 index 000000000..7f172b169 --- /dev/null +++ b/graphics/trainers/palettes/battle_girl.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 197 164 +255 222 205 +238 180 148 +197 139 106 +98 65 57 +90 131 189 +65 90 139 +41 65 98 +49 41 65 +205 213 222 +255 164 82 +230 106 0 +197 65 65 +156 106 65 +255 255 255 +0 0 0 diff --git a/graphics/trainers/palettes/beauty.pal b/graphics/trainers/palettes/beauty.pal new file mode 100644 index 000000000..3578daf5e --- /dev/null +++ b/graphics/trainers/palettes/beauty.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 197 164 +255 222 205 +238 180 148 +197 139 106 +106 74 74 +230 222 148 +197 180 98 +139 123 57 +230 123 115 +213 74 65 +74 74 90 +131 131 197 +156 156 222 +213 222 246 +255 255 255 +0 0 0 diff --git a/graphics/trainers/palettes/biker.pal b/graphics/trainers/palettes/biker.pal new file mode 100644 index 000000000..90b2a3388 --- /dev/null +++ b/graphics/trainers/palettes/biker.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 197 164 +255 222 205 +230 180 148 +205 139 115 +123 90 82 +222 222 230 +180 197 213 +139 156 172 +74 98 123 +49 65 82 +156 131 82 +82 57 41 +230 106 90 +180 115 106 +255 255 255 +0 0 0 diff --git a/graphics/trainers/palettes/bird_keeper.pal b/graphics/trainers/palettes/bird_keeper.pal new file mode 100644 index 000000000..d25b70636 --- /dev/null +++ b/graphics/trainers/palettes/bird_keeper.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 197 164 +255 222 205 +230 180 148 +205 148 115 +123 90 82 +49 90 139 +106 164 222 +74 131 180 +32 74 82 +246 131 115 +222 98 98 +222 189 131 +172 139 106 +205 222 255 +255 255 255 +0 0 0 diff --git a/graphics/trainers/palettes/black_belt.pal b/graphics/trainers/palettes/black_belt.pal new file mode 100644 index 000000000..869e5d8df --- /dev/null +++ b/graphics/trainers/palettes/black_belt.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 197 164 +246 205 189 +222 172 148 +172 131 106 +90 65 49 +148 131 123 +106 90 82 +82 90 115 +49 57 82 +205 189 189 +189 164 164 +156 139 139 +255 98 90 +197 65 65 +246 230 230 +0 0 0 diff --git a/graphics/trainers/palettes/blue_1.pal b/graphics/trainers/palettes/blue_1.pal new file mode 100644 index 000000000..fa9ae905b --- /dev/null +++ b/graphics/trainers/palettes/blue_1.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 197 164 +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 +213 82 90 +255 255 255 +0 0 0 diff --git a/graphics/trainers/palettes/blue_2.pal b/graphics/trainers/palettes/blue_2.pal new file mode 100644 index 000000000..fa9ae905b --- /dev/null +++ b/graphics/trainers/palettes/blue_2.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 197 164 +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 +213 82 90 +255 255 255 +0 0 0 diff --git a/graphics/trainers/palettes/brendan.pal b/graphics/trainers/palettes/brendan.pal new file mode 100644 index 000000000..7274e303e --- /dev/null +++ b/graphics/trainers/palettes/brendan.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 197 164 +255 222 205 +222 164 148 +205 131 115 +123 90 82 +98 123 156 +74 90 131 +49 65 106 +24 41 82 +222 230 238 +139 222 115 +98 156 90 +255 98 90 +197 65 65 +255 255 255 +0 0 0 diff --git a/graphics/trainers/palettes/bug_catcher.pal b/graphics/trainers/palettes/bug_catcher.pal new file mode 100644 index 000000000..5c47db2d6 --- /dev/null +++ b/graphics/trainers/palettes/bug_catcher.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 197 164 +255 222 205 +238 180 148 +197 139 106 +106 74 74 +189 49 57 +238 222 148 +189 172 115 +65 82 131 +98 164 222 +49 123 156 +131 139 164 +180 189 213 +213 222 230 +255 255 255 +0 0 0 diff --git a/graphics/trainers/palettes/bug_maniac.pal b/graphics/trainers/palettes/bug_maniac.pal new file mode 100644 index 000000000..2aa329179 --- /dev/null +++ b/graphics/trainers/palettes/bug_maniac.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 197 164 +255 222 205 +238 180 148 +197 139 106 +98 65 57 +49 123 156 +49 65 131 +65 74 74 +222 222 164 +197 197 139 +205 213 213 +156 139 74 +98 164 222 +106 115 115 +255 255 255 +0 0 0 diff --git a/graphics/trainers/palettes/burglar.pal b/graphics/trainers/palettes/burglar.pal new file mode 100644 index 000000000..9a9a7d8a6 --- /dev/null +++ b/graphics/trainers/palettes/burglar.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +139 230 156 +16 16 16 +255 222 205 +238 180 148 +197 139 106 +106 90 90 +230 230 246 +205 205 230 +180 180 213 +131 131 164 +65 82 98 +189 172 98 +156 139 90 +197 197 156 +156 156 115 +115 115 74 diff --git a/graphics/trainers/palettes/camper.pal b/graphics/trainers/palettes/camper.pal new file mode 100644 index 000000000..29120f6f7 --- /dev/null +++ b/graphics/trainers/palettes/camper.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 197 164 +255 222 205 +238 180 148 +197 139 106 +106 74 74 +164 238 156 +139 205 106 +106 164 65 +32 82 32 +205 205 213 +115 115 148 +41 57 90 +230 106 139 +189 65 57 +255 255 255 +0 0 0 diff --git a/graphics/trainers/palettes/champion_blue.pal b/graphics/trainers/palettes/champion_blue.pal new file mode 100644 index 000000000..fa9ae905b --- /dev/null +++ b/graphics/trainers/palettes/champion_blue.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 197 164 +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 +213 82 90 +255 255 255 +0 0 0 diff --git a/graphics/trainers/palettes/champion_wallace.pal b/graphics/trainers/palettes/champion_wallace.pal new file mode 100644 index 000000000..eaaed070f --- /dev/null +++ b/graphics/trainers/palettes/champion_wallace.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 197 164 +255 222 205 +222 180 148 +189 139 106 +98 57 65 +189 131 255 +148 106 172 +115 131 255 +82 106 180 +197 197 213 +57 74 115 +139 139 164 +57 41 57 +98 57 98 +255 255 255 +0 0 0 diff --git a/graphics/trainers/palettes/channeler.pal b/graphics/trainers/palettes/channeler.pal new file mode 100644 index 000000000..97e0eaf11 --- /dev/null +++ b/graphics/trainers/palettes/channeler.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 197 164 +255 222 205 +238 180 148 +197 139 106 +106 74 74 +98 131 123 +49 82 74 +222 205 238 +115 115 148 +41 57 90 +180 172 205 +197 65 82 +148 32 49 +98 0 16 +255 255 255 +0 0 0 diff --git a/graphics/trainers/palettes/collector.pal b/graphics/trainers/palettes/collector.pal new file mode 100644 index 000000000..d4d9221e2 --- /dev/null +++ b/graphics/trainers/palettes/collector.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 197 164 +255 222 205 +230 180 148 +197 139 115 +123 90 82 +106 139 189 +65 98 148 +32 74 123 +255 98 90 +197 65 65 +213 222 230 +131 74 65 +115 123 131 +164 172 180 +255 255 255 +0 0 0 diff --git a/graphics/trainers/palettes/cool_couple.pal b/graphics/trainers/palettes/cool_couple.pal new file mode 100644 index 000000000..71ec5e47a --- /dev/null +++ b/graphics/trainers/palettes/cool_couple.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 197 164 +255 222 205 +238 180 148 +205 139 115 +123 90 82 +222 222 230 +164 180 189 +74 98 123 +205 164 255 +156 115 205 +115 74 164 +238 131 98 +205 57 82 +172 32 57 +255 255 255 +0 0 0 diff --git a/graphics/trainers/palettes/cool_trainer_f.pal b/graphics/trainers/palettes/cool_trainer_f.pal new file mode 100644 index 000000000..71ec5e47a --- /dev/null +++ b/graphics/trainers/palettes/cool_trainer_f.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 197 164 +255 222 205 +238 180 148 +205 139 115 +123 90 82 +222 222 230 +164 180 189 +74 98 123 +205 164 255 +156 115 205 +115 74 164 +238 131 98 +205 57 82 +172 32 57 +255 255 255 +0 0 0 diff --git a/graphics/trainers/palettes/cool_trainer_m.pal b/graphics/trainers/palettes/cool_trainer_m.pal new file mode 100644 index 000000000..71ec5e47a --- /dev/null +++ b/graphics/trainers/palettes/cool_trainer_m.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 197 164 +255 222 205 +238 180 148 +205 139 115 +123 90 82 +222 222 230 +164 180 189 +74 98 123 +205 164 255 +156 115 205 +115 74 164 +238 131 98 +205 57 82 +172 32 57 +255 255 255 +0 0 0 diff --git a/graphics/trainers/palettes/crush_girl.pal b/graphics/trainers/palettes/crush_girl.pal new file mode 100644 index 000000000..0374dfdda --- /dev/null +++ b/graphics/trainers/palettes/crush_girl.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 197 164 +255 222 205 +238 180 148 +197 139 106 +98 65 57 +115 164 106 +57 90 65 +90 123 156 +65 74 98 +205 189 189 +148 197 131 +255 164 82 +230 106 0 +180 57 57 +246 230 230 +0 0 0 diff --git a/graphics/trainers/palettes/crush_kin.pal b/graphics/trainers/palettes/crush_kin.pal new file mode 100644 index 000000000..e68e19944 --- /dev/null +++ b/graphics/trainers/palettes/crush_kin.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 197 164 +255 222 205 +238 180 148 +197 139 106 +98 65 57 +148 131 123 +106 90 82 +90 123 156 +65 74 98 +205 189 189 +189 164 164 +255 164 82 +230 106 0 +180 57 57 +246 230 230 +0 0 0 diff --git a/graphics/trainers/palettes/cycling_triathlete_f.pal b/graphics/trainers/palettes/cycling_triathlete_f.pal new file mode 100644 index 000000000..b72bb3011 --- /dev/null +++ b/graphics/trainers/palettes/cycling_triathlete_f.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 197 164 +255 222 205 +238 180 148 +197 139 106 +57 41 57 +57 74 106 +131 131 156 +139 156 238 +115 131 205 +98 106 172 +205 197 255 +230 90 65 +189 74 41 +139 74 82 +255 255 255 +0 0 24 diff --git a/graphics/trainers/palettes/cycling_triathlete_m.pal b/graphics/trainers/palettes/cycling_triathlete_m.pal new file mode 100644 index 000000000..9255a4a94 --- /dev/null +++ b/graphics/trainers/palettes/cycling_triathlete_m.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 197 164 +238 189 139 +189 148 115 +139 106 82 +57 41 57 +115 90 106 +156 131 156 +156 213 255 +106 164 222 +82 131 197 +205 197 255 +230 90 65 +189 74 41 +139 74 82 +255 255 255 +0 0 24 diff --git a/graphics/trainers/palettes/dome_ace_tucker.pal b/graphics/trainers/palettes/dome_ace_tucker.pal new file mode 100644 index 000000000..33bb1aa68 --- /dev/null +++ b/graphics/trainers/palettes/dome_ace_tucker.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 197 164 +255 222 205 +238 180 148 +197 139 106 +106 74 74 +246 148 230 +230 115 213 +189 90 172 +139 74 115 +213 205 246 +230 213 106 +156 148 197 +238 238 139 +213 180 98 +255 255 255 +0 0 0 diff --git a/graphics/trainers/palettes/dragon_tamer.pal b/graphics/trainers/palettes/dragon_tamer.pal new file mode 100644 index 000000000..545c55b74 --- /dev/null +++ b/graphics/trainers/palettes/dragon_tamer.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 197 164 +255 222 205 +238 180 148 +197 139 106 +74 57 49 +164 57 246 +123 49 172 +131 139 148 +255 98 90 +197 65 65 +213 222 230 +74 74 65 +255 205 106 +213 172 74 +255 255 255 +0 0 0 diff --git a/graphics/trainers/palettes/elite_four_agatha.pal b/graphics/trainers/palettes/elite_four_agatha.pal new file mode 100644 index 000000000..fd631fc25 --- /dev/null +++ b/graphics/trainers/palettes/elite_four_agatha.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +213 222 238 +246 230 205 +230 189 156 +189 148 123 +115 90 82 +115 65 82 +164 74 90 +213 106 131 +90 82 65 +139 123 90 +189 197 139 +230 230 189 +156 164 156 +205 205 222 +255 255 255 +0 0 0 diff --git a/graphics/trainers/palettes/elite_four_bruno.pal b/graphics/trainers/palettes/elite_four_bruno.pal new file mode 100644 index 000000000..cc85be7ca --- /dev/null +++ b/graphics/trainers/palettes/elite_four_bruno.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 197 164 +238 213 189 +213 172 148 +164 131 106 +90 65 49 +115 123 139 +106 90 82 +82 90 115 +49 57 82 +205 189 189 +180 164 164 +139 131 131 +255 139 90 +197 65 65 +246 230 230 +0 0 0 diff --git a/graphics/trainers/palettes/elite_four_drake.pal b/graphics/trainers/palettes/elite_four_drake.pal new file mode 100644 index 000000000..6ab0bae73 --- /dev/null +++ b/graphics/trainers/palettes/elite_four_drake.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 197 164 +255 222 205 +222 172 148 +164 131 106 +98 57 65 +139 131 164 +106 98 123 +41 49 57 +57 65 82 +197 197 213 +255 222 106 +189 156 90 +106 131 238 +65 106 172 +255 255 255 +0 0 0 diff --git a/graphics/trainers/palettes/elite_four_glacia.pal b/graphics/trainers/palettes/elite_four_glacia.pal new file mode 100644 index 000000000..75b5eb108 --- /dev/null +++ b/graphics/trainers/palettes/elite_four_glacia.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 197 164 +255 222 205 +238 180 148 +197 139 106 +115 82 65 +148 148 164 +148 90 164 +115 65 123 +82 41 82 +255 255 164 +213 197 90 +156 148 90 +222 230 238 +189 197 205 +255 255 255 +0 0 0 diff --git a/graphics/trainers/palettes/elite_four_lance.pal b/graphics/trainers/palettes/elite_four_lance.pal new file mode 100644 index 000000000..7240c86c8 --- /dev/null +++ b/graphics/trainers/palettes/elite_four_lance.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +213 222 238 +255 230 205 +230 189 148 +205 156 123 +106 74 74 +57 57 90 +90 90 131 +123 123 164 +172 74 65 +197 90 74 +230 106 90 +139 106 90 +246 148 123 +172 172 180 +255 255 255 +0 0 0 diff --git a/graphics/trainers/palettes/elite_four_lorelei.pal b/graphics/trainers/palettes/elite_four_lorelei.pal new file mode 100644 index 000000000..5ddc42510 --- /dev/null +++ b/graphics/trainers/palettes/elite_four_lorelei.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 197 164 +255 222 205 +230 180 148 +205 139 115 +123 90 82 +213 213 222 +65 74 82 +205 164 255 +156 115 205 +238 172 90 +148 148 164 +90 98 115 +230 115 90 +180 41 57 +255 255 255 +0 0 0 diff --git a/graphics/trainers/palettes/elite_four_phoebe.pal b/graphics/trainers/palettes/elite_four_phoebe.pal new file mode 100644 index 000000000..8c07c0d5b --- /dev/null +++ b/graphics/trainers/palettes/elite_four_phoebe.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 197 164 +255 222 205 +238 180 148 +197 139 106 +115 82 65 +57 131 255 +32 106 230 +16 82 205 +41 49 123 +164 205 255 +115 98 106 +74 57 65 +255 82 156 +197 65 90 +255 255 255 +0 0 0 diff --git a/graphics/trainers/palettes/elite_four_sidney.pal b/graphics/trainers/palettes/elite_four_sidney.pal new file mode 100644 index 000000000..d778e0ed6 --- /dev/null +++ b/graphics/trainers/palettes/elite_four_sidney.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 197 164 +255 222 205 +222 180 148 +189 139 106 +98 57 65 +131 106 74 +106 98 123 +41 49 57 +57 65 82 +197 197 213 +238 213 139 +197 164 106 +255 98 90 +197 65 65 +255 255 255 +0 0 0 diff --git a/graphics/trainers/palettes/emerald_aroma_lady.pal b/graphics/trainers/palettes/emerald_aroma_lady.pal new file mode 100644 index 000000000..eb9f3dfd4 --- /dev/null +++ b/graphics/trainers/palettes/emerald_aroma_lady.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 197 164 +255 213 172 +238 197 148 +205 156 115 +115 82 65 +238 230 255 +205 197 213 +156 164 205 +106 98 148 +74 222 148 +172 115 41 +115 65 24 +238 90 131 +189 65 90 +106 255 156 +0 0 0 diff --git a/graphics/trainers/palettes/emerald_beauty.pal b/graphics/trainers/palettes/emerald_beauty.pal new file mode 100644 index 000000000..ab549df20 --- /dev/null +++ b/graphics/trainers/palettes/emerald_beauty.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 197 164 +255 222 205 +230 172 131 +205 131 115 +123 82 74 +148 131 139 +255 205 106 +213 172 74 +164 123 82 +115 90 115 +74 49 74 +255 82 57 +180 82 74 +131 74 65 +255 255 255 +0 0 24 diff --git a/graphics/trainers/palettes/emerald_bird_keeper.pal b/graphics/trainers/palettes/emerald_bird_keeper.pal new file mode 100644 index 000000000..87194c84a --- /dev/null +++ b/graphics/trainers/palettes/emerald_bird_keeper.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 197 164 +255 222 205 +238 180 148 +197 139 106 +106 74 74 +164 180 197 +131 139 156 +90 98 115 +57 65 82 +213 213 222 +131 16 41 +24 32 49 +213 82 90 +180 41 57 +255 255 255 +0 0 0 diff --git a/graphics/trainers/palettes/emerald_bug_catcher.pal b/graphics/trainers/palettes/emerald_bug_catcher.pal new file mode 100644 index 000000000..c68f56690 --- /dev/null +++ b/graphics/trainers/palettes/emerald_bug_catcher.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 197 164 +255 222 205 +230 180 148 +213 148 115 +123 90 82 +222 222 164 +197 197 139 +156 139 74 +41 57 98 +197 197 238 +246 238 213 +189 49 57 +98 164 222 +49 123 156 +255 255 255 +0 0 0 diff --git a/graphics/trainers/palettes/emerald_camper.pal b/graphics/trainers/palettes/emerald_camper.pal new file mode 100644 index 000000000..e5c224fd2 --- /dev/null +++ b/graphics/trainers/palettes/emerald_camper.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 197 164 +255 230 205 +230 189 156 +205 156 115 +115 82 65 +131 213 205 +82 164 148 +180 189 222 +57 90 74 +24 49 90 +98 115 230 +57 82 131 +255 98 41 +189 74 41 +255 255 255 +0 0 0 diff --git a/graphics/trainers/palettes/emerald_cool_trainer_f.pal b/graphics/trainers/palettes/emerald_cool_trainer_f.pal new file mode 100644 index 000000000..292d0fc78 --- /dev/null +++ b/graphics/trainers/palettes/emerald_cool_trainer_f.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 197 164 +255 230 205 +238 197 156 +205 156 115 +115 82 65 +238 156 115 +205 90 74 +0 189 222 +123 41 24 +180 230 139 +139 180 57 +74 90 32 +255 246 189 +213 205 131 +255 255 255 +0 0 0 diff --git a/graphics/trainers/palettes/emerald_cool_trainer_m.pal b/graphics/trainers/palettes/emerald_cool_trainer_m.pal new file mode 100644 index 000000000..52a32e925 --- /dev/null +++ b/graphics/trainers/palettes/emerald_cool_trainer_m.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 197 164 +255 230 205 +246 205 156 +205 156 115 +115 82 65 +238 156 115 +230 98 82 +180 90 74 +131 49 32 +57 90 41 +164 180 106 +98 123 57 +255 246 189 +213 205 131 +255 255 255 +0 0 0 diff --git a/graphics/trainers/palettes/emerald_fisherman.pal b/graphics/trainers/palettes/emerald_fisherman.pal new file mode 100644 index 000000000..3c18e8f1f --- /dev/null +++ b/graphics/trainers/palettes/emerald_fisherman.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 197 164 +255 213 189 +222 172 148 +180 131 115 +82 57 57 +123 98 106 +82 82 123 +213 172 82 +180 139 82 +205 205 222 +123 82 49 +49 49 74 +246 123 49 +189 106 49 +238 238 255 +0 0 24 diff --git a/graphics/trainers/palettes/emerald_gentleman.pal b/graphics/trainers/palettes/emerald_gentleman.pal new file mode 100644 index 000000000..ef021d026 --- /dev/null +++ b/graphics/trainers/palettes/emerald_gentleman.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 197 164 +255 222 205 +238 180 148 +197 139 106 +98 65 57 +180 148 115 +148 115 82 +123 90 57 +65 49 41 +255 238 156 +213 213 205 +180 180 172 +90 106 172 +57 74 123 +255 255 255 +0 0 0 diff --git a/graphics/trainers/palettes/emerald_hiker.pal b/graphics/trainers/palettes/emerald_hiker.pal new file mode 100644 index 000000000..cb8fce7f6 --- /dev/null +++ b/graphics/trainers/palettes/emerald_hiker.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 197 164 +255 222 205 +222 164 148 +205 131 115 +74 65 57 +123 189 90 +115 148 90 +213 180 98 +172 148 98 +205 205 222 +148 148 148 +123 115 74 +230 98 90 +164 74 74 +255 255 255 +0 0 24 diff --git a/graphics/trainers/palettes/emerald_lady.pal b/graphics/trainers/palettes/emerald_lady.pal new file mode 100644 index 000000000..b70873111 --- /dev/null +++ b/graphics/trainers/palettes/emerald_lady.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 197 164 +255 230 222 +238 180 180 +156 123 106 +172 106 74 +82 82 32 +213 222 230 +255 230 106 +213 172 90 +222 98 123 +148 164 180 +180 238 106 +148 213 82 +123 189 65 +255 255 255 +0 0 24 diff --git a/graphics/trainers/palettes/emerald_lass.pal b/graphics/trainers/palettes/emerald_lass.pal new file mode 100644 index 000000000..89e78d683 --- /dev/null +++ b/graphics/trainers/palettes/emerald_lass.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 197 164 +255 222 205 +238 180 148 +222 148 115 +123 90 82 +164 172 197 +90 98 148 +49 57 82 +41 57 98 +222 230 238 +255 197 90 +189 156 90 +255 98 90 +197 65 65 +255 255 255 +0 0 0 diff --git a/graphics/trainers/palettes/emerald_leaf_back_pic.pal b/graphics/trainers/palettes/emerald_leaf_back_pic.pal new file mode 100644 index 000000000..27436be92 --- /dev/null +++ b/graphics/trainers/palettes/emerald_leaf_back_pic.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 197 164 +172 123 65 +255 197 148 +222 148 115 +123 65 65 +65 65 213 +57 57 123 +115 164 197 +106 41 41 +238 238 255 +180 180 213 +255 106 74 +197 57 57 +255 222 90 +189 156 57 +0 0 0 diff --git a/graphics/trainers/palettes/emerald_picnicker.pal b/graphics/trainers/palettes/emerald_picnicker.pal new file mode 100644 index 000000000..acd90e943 --- /dev/null +++ b/graphics/trainers/palettes/emerald_picnicker.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 197 164 +255 230 205 +246 205 156 +205 156 115 +115 82 65 +131 213 205 +82 164 148 +180 189 222 +57 90 74 +24 49 90 +98 115 230 +57 82 131 +255 98 41 +189 74 41 +255 255 255 +0 0 0 diff --git a/graphics/trainers/palettes/emerald_pokemaniac.pal b/graphics/trainers/palettes/emerald_pokemaniac.pal new file mode 100644 index 000000000..2a41e2be4 --- /dev/null +++ b/graphics/trainers/palettes/emerald_pokemaniac.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 197 164 +246 213 197 +222 172 139 +197 139 115 +123 90 82 +222 222 230 +180 197 213 +139 156 172 +74 98 123 +49 65 90 +106 49 24 +255 180 106 +238 131 65 +180 106 49 +255 255 255 +0 0 0 diff --git a/graphics/trainers/palettes/emerald_pokemon_breeder_f.pal b/graphics/trainers/palettes/emerald_pokemon_breeder_f.pal new file mode 100644 index 000000000..b15f5db8a --- /dev/null +++ b/graphics/trainers/palettes/emerald_pokemon_breeder_f.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 197 164 +255 222 205 +238 180 148 +197 139 106 +106 74 74 +255 98 90 +164 49 65 +255 148 131 +49 49 74 +213 222 230 +205 74 74 +115 148 197 +49 74 123 +57 115 164 +255 255 255 +0 0 0 diff --git a/graphics/trainers/palettes/emerald_pokemon_breeder_m.pal b/graphics/trainers/palettes/emerald_pokemon_breeder_m.pal new file mode 100644 index 000000000..6551f8482 --- /dev/null +++ b/graphics/trainers/palettes/emerald_pokemon_breeder_m.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 197 164 +255 222 205 +238 180 148 +197 139 106 +131 90 74 +255 98 90 +156 65 74 +255 148 131 +49 49 74 +213 222 230 +205 74 74 +115 148 197 +49 74 123 +57 115 164 +255 255 255 +0 0 0 diff --git a/graphics/trainers/palettes/emerald_pokemon_ranger_f.pal b/graphics/trainers/palettes/emerald_pokemon_ranger_f.pal new file mode 100644 index 000000000..93220f5cb --- /dev/null +++ b/graphics/trainers/palettes/emerald_pokemon_ranger_f.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 197 164 +255 222 205 +238 180 148 +197 139 106 +131 90 65 +82 49 49 +131 139 156 +82 90 115 +49 57 82 +213 213 222 +255 205 65 +255 131 74 +205 98 74 +156 65 65 +255 255 255 +0 0 0 diff --git a/graphics/trainers/palettes/emerald_pokemon_ranger_m.pal b/graphics/trainers/palettes/emerald_pokemon_ranger_m.pal new file mode 100644 index 000000000..2f16ca0cb --- /dev/null +++ b/graphics/trainers/palettes/emerald_pokemon_ranger_m.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 197 164 +255 222 205 +238 180 148 +197 139 106 +139 106 82 +82 49 49 +131 139 156 +90 98 115 +49 57 82 +213 213 222 +255 205 65 +238 139 82 +197 82 74 +115 57 49 +255 255 255 +0 0 0 diff --git a/graphics/trainers/palettes/emerald_psychic_f.pal b/graphics/trainers/palettes/emerald_psychic_f.pal new file mode 100644 index 000000000..232cfd755 --- /dev/null +++ b/graphics/trainers/palettes/emerald_psychic_f.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 197 164 +255 230 205 +246 205 156 +205 156 115 +115 82 65 +98 123 180 +32 98 131 +255 0 246 +41 57 90 +213 131 255 +156 115 180 +115 82 148 +246 139 90 +197 90 74 +255 255 255 +0 0 0 diff --git a/graphics/trainers/palettes/emerald_psychic_m.pal b/graphics/trainers/palettes/emerald_psychic_m.pal new file mode 100644 index 000000000..0ddd2894b --- /dev/null +++ b/graphics/trainers/palettes/emerald_psychic_m.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 197 164 +255 230 205 +230 189 148 +205 156 115 +115 82 65 +98 123 180 +32 98 131 +0 255 0 +41 57 90 +213 131 255 +131 106 172 +90 74 131 +246 139 90 +197 90 74 +255 255 255 +0 0 0 diff --git a/graphics/trainers/palettes/emerald_red_back_pic.pal b/graphics/trainers/palettes/emerald_red_back_pic.pal new file mode 100644 index 000000000..3097a6556 --- /dev/null +++ b/graphics/trainers/palettes/emerald_red_back_pic.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +131 123 164 +172 123 65 +255 197 148 +222 148 115 +123 65 65 +65 65 213 +57 57 123 +115 164 197 +106 41 41 +238 238 255 +180 180 213 +255 106 74 +197 57 57 +255 222 90 +189 156 57 +0 0 0 diff --git a/graphics/trainers/palettes/emerald_ruin_maniac.pal b/graphics/trainers/palettes/emerald_ruin_maniac.pal new file mode 100644 index 000000000..bbc342a06 --- /dev/null +++ b/graphics/trainers/palettes/emerald_ruin_maniac.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 197 164 +255 222 205 +238 180 148 +197 139 106 +255 238 106 +246 246 230 +222 222 189 +180 180 139 +115 106 65 +222 213 246 +115 131 205 +222 189 8 +213 115 139 +172 74 90 +255 255 255 +0 0 0 diff --git a/graphics/trainers/palettes/emerald_sailor.pal b/graphics/trainers/palettes/emerald_sailor.pal new file mode 100644 index 000000000..3b6248576 --- /dev/null +++ b/graphics/trainers/palettes/emerald_sailor.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 197 164 +255 222 205 +238 180 148 +197 139 106 +106 74 74 +180 180 172 +90 131 189 +65 90 139 +57 57 57 +213 222 230 +139 139 131 +131 180 230 +255 98 90 +197 65 65 +255 255 255 +0 0 0 diff --git a/graphics/trainers/palettes/emerald_sis_and_bro.pal b/graphics/trainers/palettes/emerald_sis_and_bro.pal new file mode 100644 index 000000000..823ef66ef --- /dev/null +++ b/graphics/trainers/palettes/emerald_sis_and_bro.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 197 164 +246 205 189 +222 164 148 +164 123 98 +74 57 49 +255 139 90 +230 82 74 +180 65 65 +90 65 82 +197 65 65 +213 222 230 +255 230 205 +139 172 213 +90 131 189 +255 255 255 +0 0 0 diff --git a/graphics/trainers/palettes/emerald_swimmer_f.pal b/graphics/trainers/palettes/emerald_swimmer_f.pal new file mode 100644 index 000000000..823ef66ef --- /dev/null +++ b/graphics/trainers/palettes/emerald_swimmer_f.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 197 164 +246 205 189 +222 164 148 +164 123 98 +74 57 49 +255 139 90 +230 82 74 +180 65 65 +90 65 82 +197 65 65 +213 222 230 +255 230 205 +139 172 213 +90 131 189 +255 255 255 +0 0 0 diff --git a/graphics/trainers/palettes/emerald_swimmer_m.pal b/graphics/trainers/palettes/emerald_swimmer_m.pal new file mode 100644 index 000000000..259a53b9a --- /dev/null +++ b/graphics/trainers/palettes/emerald_swimmer_m.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 197 164 +230 197 172 +213 172 148 +172 123 106 +115 82 65 +90 131 189 +65 90 139 +41 65 98 +49 41 65 +205 213 222 +172 172 180 +139 65 65 +222 238 238 +197 65 65 +255 255 255 +0 0 0 diff --git a/graphics/trainers/palettes/emerald_tuber_f.pal b/graphics/trainers/palettes/emerald_tuber_f.pal new file mode 100644 index 000000000..b5cb0047a --- /dev/null +++ b/graphics/trainers/palettes/emerald_tuber_f.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 197 164 +255 222 205 +238 180 148 +197 139 106 +106 74 74 +139 172 213 +90 131 189 +65 90 139 +57 57 57 +213 222 230 +255 230 74 +205 57 82 +238 180 57 +189 131 74 +255 255 255 +0 0 0 diff --git a/graphics/trainers/palettes/emerald_tuber_m.pal b/graphics/trainers/palettes/emerald_tuber_m.pal new file mode 100644 index 000000000..b5cb0047a --- /dev/null +++ b/graphics/trainers/palettes/emerald_tuber_m.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 197 164 +255 222 205 +238 180 148 +197 139 106 +106 74 74 +139 172 213 +90 131 189 +65 90 139 +57 57 57 +213 222 230 +255 230 74 +205 57 82 +238 180 57 +189 131 74 +255 255 255 +0 0 0 diff --git a/graphics/trainers/palettes/emerald_twins.pal b/graphics/trainers/palettes/emerald_twins.pal new file mode 100644 index 000000000..3b162de25 --- /dev/null +++ b/graphics/trainers/palettes/emerald_twins.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 197 164 +255 222 205 +238 180 148 +197 139 106 +106 74 74 +139 172 213 +90 131 189 +65 90 139 +57 57 57 +213 222 230 +255 230 74 +180 82 98 +238 180 57 +189 131 74 +255 255 255 +0 0 0 diff --git a/graphics/trainers/palettes/emerald_young_couple.pal b/graphics/trainers/palettes/emerald_young_couple.pal new file mode 100644 index 000000000..bba95c19a --- /dev/null +++ b/graphics/trainers/palettes/emerald_young_couple.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 197 164 +255 222 205 +238 180 148 +197 139 106 +98 65 57 +148 164 172 +82 123 164 +57 82 106 +32 49 74 +205 213 222 +123 197 156 +90 164 131 +255 98 90 +197 65 65 +106 106 139 +0 0 0 diff --git a/graphics/trainers/palettes/emerald_youngster.pal b/graphics/trainers/palettes/emerald_youngster.pal new file mode 100644 index 000000000..f91520d9b --- /dev/null +++ b/graphics/trainers/palettes/emerald_youngster.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 197 164 +255 222 205 +230 180 148 +213 148 115 +123 90 82 +139 197 222 +65 90 148 +49 57 82 +41 57 98 +197 197 238 +255 222 65 +222 172 90 +98 164 222 +49 123 156 +255 255 255 +0 0 0 diff --git a/graphics/trainers/palettes/engineer.pal b/graphics/trainers/palettes/engineer.pal new file mode 100644 index 000000000..3cfd1a3f0 --- /dev/null +++ b/graphics/trainers/palettes/engineer.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +172 238 164 +16 16 16 +255 222 205 +238 180 148 +197 139 106 +106 74 74 +74 74 115 +255 255 255 +172 180 197 +115 123 172 +197 148 65 +230 98 98 +197 57 57 +255 222 82 +222 180 74 +139 115 57 diff --git a/graphics/trainers/palettes/expert_f.pal b/graphics/trainers/palettes/expert_f.pal new file mode 100644 index 000000000..2fa5f5202 --- /dev/null +++ b/graphics/trainers/palettes/expert_f.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 197 164 +255 222 205 +238 180 148 +197 139 106 +106 74 74 +180 180 172 +90 131 189 +65 90 139 +57 57 57 +213 222 230 +139 139 131 +189 156 90 +255 98 90 +197 65 65 +255 255 255 +0 0 0 diff --git a/graphics/trainers/palettes/expert_m.pal b/graphics/trainers/palettes/expert_m.pal new file mode 100644 index 000000000..2fa5f5202 --- /dev/null +++ b/graphics/trainers/palettes/expert_m.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 197 164 +255 222 205 +238 180 148 +197 139 106 +106 74 74 +180 180 172 +90 131 189 +65 90 139 +57 57 57 +213 222 230 +139 139 131 +189 156 90 +255 98 90 +197 65 65 +255 255 255 +0 0 0 diff --git a/graphics/trainers/palettes/factory_head_noland.pal b/graphics/trainers/palettes/factory_head_noland.pal new file mode 100644 index 000000000..03bce8c77 --- /dev/null +++ b/graphics/trainers/palettes/factory_head_noland.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 197 164 +255 222 205 +238 180 148 +197 139 106 +106 74 74 +172 172 189 +131 131 164 +98 98 123 +65 65 90 +222 213 246 +238 213 106 +246 131 123 +213 90 90 +180 57 65 +255 255 255 +0 0 0 diff --git a/graphics/trainers/palettes/fisherman.pal b/graphics/trainers/palettes/fisherman.pal new file mode 100644 index 000000000..c3140cabe --- /dev/null +++ b/graphics/trainers/palettes/fisherman.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 197 164 +255 222 205 +238 180 148 +197 139 106 +106 74 74 +65 65 106 +98 98 131 +213 172 82 +172 131 74 +205 205 222 +164 164 189 +49 49 74 +246 123 49 +189 106 49 +238 238 255 +0 0 24 diff --git a/graphics/trainers/palettes/gamer.pal b/graphics/trainers/palettes/gamer.pal new file mode 100644 index 000000000..a65a7a331 --- /dev/null +++ b/graphics/trainers/palettes/gamer.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 197 164 +255 222 205 +222 180 148 +189 139 106 +98 57 65 +156 172 230 +123 139 205 +82 98 164 +49 65 98 +230 213 131 +189 172 106 +156 131 82 +131 123 148 +205 205 222 +255 255 255 +0 0 0 diff --git a/graphics/trainers/palettes/gentleman.pal b/graphics/trainers/palettes/gentleman.pal new file mode 100644 index 000000000..1205b3e2f --- /dev/null +++ b/graphics/trainers/palettes/gentleman.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 197 164 +255 222 205 +230 180 148 +189 139 106 +98 65 57 +164 148 131 +123 106 98 +82 74 65 +41 41 32 +213 213 205 +180 180 172 +148 148 139 +197 156 49 +139 115 24 +255 255 255 +0 0 0 diff --git a/graphics/trainers/palettes/giovanni.pal b/graphics/trainers/palettes/giovanni.pal new file mode 100644 index 000000000..3ed4f87b8 --- /dev/null +++ b/graphics/trainers/palettes/giovanni.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 197 164 +246 222 205 +205 180 148 +172 131 98 +123 90 82 +205 115 205 +164 82 115 +222 172 90 +213 213 222 +49 57 57 +164 180 189 +98 115 123 +74 82 82 +148 164 172 +255 255 255 +0 0 0 diff --git a/graphics/trainers/palettes/guitarist.pal b/graphics/trainers/palettes/guitarist.pal new file mode 100644 index 000000000..74e59e819 --- /dev/null +++ b/graphics/trainers/palettes/guitarist.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 197 164 +255 222 205 +238 180 148 +197 139 106 +98 65 57 +172 172 164 +139 131 131 +106 98 98 +65 57 57 +255 238 156 +255 197 90 +205 180 148 +255 98 90 +189 65 65 +255 255 255 +0 0 0 diff --git a/graphics/trainers/palettes/hex_maniac.pal b/graphics/trainers/palettes/hex_maniac.pal new file mode 100644 index 000000000..549d7fac9 --- /dev/null +++ b/graphics/trainers/palettes/hex_maniac.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 197 164 +255 222 205 +238 180 148 +197 139 106 +106 74 74 +164 123 156 +139 90 131 +106 65 106 +74 41 74 +213 222 230 +189 205 213 +205 57 82 +115 41 65 +180 49 74 +255 255 255 +0 0 0 diff --git a/graphics/trainers/palettes/hiker.pal b/graphics/trainers/palettes/hiker.pal new file mode 100644 index 000000000..a56358884 --- /dev/null +++ b/graphics/trainers/palettes/hiker.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 197 164 +255 222 205 +238 180 148 +197 139 106 +106 74 74 +148 148 148 +98 98 98 +131 197 205 +98 164 172 +172 131 49 +131 98 41 +131 123 82 +205 189 123 +172 164 115 +213 205 213 +0 0 24 diff --git a/graphics/trainers/palettes/interviewer.pal b/graphics/trainers/palettes/interviewer.pal new file mode 100644 index 000000000..61ace1935 --- /dev/null +++ b/graphics/trainers/palettes/interviewer.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 197 164 +255 222 205 +238 180 148 +197 139 106 +98 65 57 +148 148 172 +65 90 139 +41 65 98 +49 41 65 +205 213 222 +98 197 255 +90 156 189 +255 98 90 +197 65 65 +255 255 255 +0 0 0 diff --git a/graphics/trainers/palettes/juggler.pal b/graphics/trainers/palettes/juggler.pal new file mode 100644 index 000000000..4e620be6b --- /dev/null +++ b/graphics/trainers/palettes/juggler.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +213 222 238 +255 222 205 +238 180 148 +197 139 106 +106 74 74 +74 74 98 +106 90 164 +156 123 205 +98 123 57 +123 180 90 +172 213 90 +205 106 65 +123 123 148 +189 197 205 +255 255 255 +0 0 0 diff --git a/graphics/trainers/palettes/kindler.pal b/graphics/trainers/palettes/kindler.pal new file mode 100644 index 000000000..af6adf7e8 --- /dev/null +++ b/graphics/trainers/palettes/kindler.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 197 164 +255 222 205 +238 180 148 +197 139 106 +115 82 65 +246 246 230 +222 222 189 +180 180 139 +123 115 74 +172 213 246 +115 180 205 +57 123 139 +255 82 57 +255 156 90 +255 255 255 +0 0 0 diff --git a/graphics/trainers/palettes/lady.pal b/graphics/trainers/palettes/lady.pal new file mode 100644 index 000000000..aebf744e9 --- /dev/null +++ b/graphics/trainers/palettes/lady.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 197 164 +255 230 222 +238 197 180 +172 115 115 +98 90 74 +74 82 131 +213 222 230 +246 180 74 +205 131 74 +222 98 123 +148 164 180 +131 197 238 +82 164 205 +74 131 189 +255 255 255 +0 0 24 diff --git a/graphics/trainers/palettes/lass.pal b/graphics/trainers/palettes/lass.pal new file mode 100644 index 000000000..8494030c5 --- /dev/null +++ b/graphics/trainers/palettes/lass.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +213 222 238 +255 222 205 +238 180 148 +197 139 106 +123 90 82 +205 98 82 +65 74 115 +65 106 164 +65 172 213 +90 65 57 +156 98 57 +213 139 74 +172 180 197 +213 222 238 +255 255 255 +0 0 0 diff --git a/graphics/trainers/palettes/leader_blaine.pal b/graphics/trainers/palettes/leader_blaine.pal new file mode 100644 index 000000000..27f6e173c --- /dev/null +++ b/graphics/trainers/palettes/leader_blaine.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +139 189 106 +255 222 205 +238 180 148 +197 139 106 +106 74 74 +82 74 74 +148 139 74 +205 189 65 +213 106 74 +255 156 106 +74 74 90 +115 123 156 +156 164 189 +213 213 238 +255 255 255 +0 0 0 diff --git a/graphics/trainers/palettes/leader_brawly.pal b/graphics/trainers/palettes/leader_brawly.pal new file mode 100644 index 000000000..5a5a482f2 --- /dev/null +++ b/graphics/trainers/palettes/leader_brawly.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 197 164 +255 222 205 +238 180 148 +197 139 106 +106 74 74 +139 172 213 +90 131 189 +65 90 139 +49 49 74 +213 213 222 +255 164 197 +115 115 115 +255 139 65 +213 98 24 +255 255 255 +0 0 0 diff --git a/graphics/trainers/palettes/leader_brock.pal b/graphics/trainers/palettes/leader_brock.pal new file mode 100644 index 000000000..ae8076a24 --- /dev/null +++ b/graphics/trainers/palettes/leader_brock.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 197 164 +255 222 205 +230 180 148 +213 148 115 +123 90 82 +123 156 98 +90 115 74 +230 164 82 +172 106 24 +197 148 115 +172 197 139 +74 74 82 +213 213 222 +123 131 131 +255 255 255 +0 0 0 diff --git a/graphics/trainers/palettes/leader_erika.pal b/graphics/trainers/palettes/leader_erika.pal new file mode 100644 index 000000000..c503b2180 --- /dev/null +++ b/graphics/trainers/palettes/leader_erika.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 197 164 +255 230 205 +238 189 156 +197 148 123 +106 74 74 +255 255 197 +222 222 115 +189 197 205 +115 131 156 +82 82 82 +156 156 49 +180 90 90 +246 123 115 +205 106 98 +255 255 255 +0 0 0 diff --git a/graphics/trainers/palettes/leader_flannery.pal b/graphics/trainers/palettes/leader_flannery.pal new file mode 100644 index 000000000..20f2f8579 --- /dev/null +++ b/graphics/trainers/palettes/leader_flannery.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 197 164 +255 222 205 +238 180 148 +197 139 106 +106 74 74 +180 197 230 +90 156 213 +65 115 164 +49 49 74 +213 213 222 +131 74 16 +115 115 115 +255 139 65 +197 98 32 +255 255 255 +0 0 0 diff --git a/graphics/trainers/palettes/leader_juan.pal b/graphics/trainers/palettes/leader_juan.pal new file mode 100644 index 000000000..96467bdc3 --- /dev/null +++ b/graphics/trainers/palettes/leader_juan.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 197 164 +255 222 205 +222 180 148 +180 131 98 +123 90 82 +213 115 222 +148 65 180 +106 148 255 +82 106 189 +74 74 148 +164 180 189 +98 115 123 +98 49 90 +213 213 222 +255 255 255 +0 0 0 diff --git a/graphics/trainers/palettes/leader_koga.pal b/graphics/trainers/palettes/leader_koga.pal new file mode 100644 index 000000000..1844a131c --- /dev/null +++ b/graphics/trainers/palettes/leader_koga.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 197 164 +255 222 205 +230 180 148 +205 139 115 +123 90 82 +180 197 230 +115 131 115 +74 90 65 +139 156 172 +74 98 123 +49 65 57 +255 156 106 +230 115 90 +180 41 57 +255 255 255 +0 0 0 diff --git a/graphics/trainers/palettes/leader_lt_surge.pal b/graphics/trainers/palettes/leader_lt_surge.pal new file mode 100644 index 000000000..e125b40d3 --- /dev/null +++ b/graphics/trainers/palettes/leader_lt_surge.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 197 164 +255 222 205 +238 180 148 +197 139 106 +106 74 74 +255 213 123 +197 164 90 +164 222 106 +106 164 49 +65 123 8 +16 74 0 +82 106 156 +131 131 131 +82 82 82 +255 255 255 +0 0 0 diff --git a/graphics/trainers/palettes/leader_misty.pal b/graphics/trainers/palettes/leader_misty.pal new file mode 100644 index 000000000..86853c95c --- /dev/null +++ b/graphics/trainers/palettes/leader_misty.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +213 222 238 +255 222 205 +238 180 148 +213 148 115 +123 90 82 +164 106 82 +205 115 82 +255 189 115 +74 82 156 +98 115 246 +74 65 106 +222 222 246 +255 0 255 +197 65 65 +255 255 255 +0 0 0 diff --git a/graphics/trainers/palettes/leader_norman.pal b/graphics/trainers/palettes/leader_norman.pal new file mode 100644 index 000000000..e53c16837 --- /dev/null +++ b/graphics/trainers/palettes/leader_norman.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 197 164 +255 222 205 +238 180 148 +197 139 106 +106 74 74 +180 197 230 +139 156 172 +74 98 123 +49 65 82 +213 213 222 +131 16 41 +115 115 115 +213 82 90 +180 41 57 +255 255 255 +0 0 0 diff --git a/graphics/trainers/palettes/leader_roxanne.pal b/graphics/trainers/palettes/leader_roxanne.pal new file mode 100644 index 000000000..c2b28ead9 --- /dev/null +++ b/graphics/trainers/palettes/leader_roxanne.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 197 164 +255 222 205 +238 180 148 +197 139 106 +106 74 74 +139 172 213 +90 131 189 +65 90 139 +57 57 57 +213 222 230 +255 164 197 +189 156 90 +255 115 148 +213 82 115 +255 255 255 +0 0 0 diff --git a/graphics/trainers/palettes/leader_sabrina.pal b/graphics/trainers/palettes/leader_sabrina.pal new file mode 100644 index 000000000..01901952b --- /dev/null +++ b/graphics/trainers/palettes/leader_sabrina.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +148 189 156 +16 16 16 +255 255 255 +238 164 156 +205 106 98 +172 65 57 +156 180 205 +123 139 180 +82 98 139 +205 205 205 +255 222 205 +123 90 82 +222 148 115 +213 180 131 +238 180 148 +255 230 131 diff --git a/graphics/trainers/palettes/leader_tate_and_liza.pal b/graphics/trainers/palettes/leader_tate_and_liza.pal new file mode 100644 index 000000000..ab64e9bea --- /dev/null +++ b/graphics/trainers/palettes/leader_tate_and_liza.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 172 65 +255 222 205 +238 180 148 +180 131 106 +106 74 74 +189 189 197 +123 123 131 +74 82 98 +41 49 65 +255 98 90 +164 49 57 +255 197 90 +106 189 255 +90 139 197 +255 255 255 +0 0 0 diff --git a/graphics/trainers/palettes/leader_wattson.pal b/graphics/trainers/palettes/leader_wattson.pal new file mode 100644 index 000000000..c8a4e1420 --- /dev/null +++ b/graphics/trainers/palettes/leader_wattson.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 197 164 +255 222 205 +238 180 148 +197 139 106 +123 90 82 +164 139 90 +131 106 74 +139 131 106 +82 65 74 +213 213 222 +255 197 90 +189 156 90 +57 41 49 +222 115 131 +255 255 255 +0 0 0 diff --git a/graphics/trainers/palettes/leader_winona.pal b/graphics/trainers/palettes/leader_winona.pal new file mode 100644 index 000000000..62783523b --- /dev/null +++ b/graphics/trainers/palettes/leader_winona.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 197 164 +255 222 205 +238 180 148 +197 139 106 +106 74 74 +172 189 213 +139 156 205 +74 98 148 +49 65 82 +205 213 222 +115 57 123 +255 197 90 +189 123 222 +148 90 172 +255 255 255 +0 0 0 diff --git a/graphics/trainers/palettes/leaf.pal b/graphics/trainers/palettes/leaf.pal new file mode 100644 index 000000000..30e2cdde0 --- /dev/null +++ b/graphics/trainers/palettes/leaf.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 197 164 +255 230 180 +230 189 156 +205 148 115 +123 90 82 +123 189 222 +82 139 180 +49 106 139 +24 41 82 +213 213 222 +255 197 90 +189 156 90 +255 98 90 +197 65 65 +255 255 255 +0 0 0 diff --git a/graphics/trainers/palettes/leaf_back_pic.pal b/graphics/trainers/palettes/leaf_back_pic.pal new file mode 100644 index 000000000..dec7bed22 --- /dev/null +++ b/graphics/trainers/palettes/leaf_back_pic.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +131 123 164 +180 131 65 +255 230 180 +222 189 156 +139 98 74 +90 98 189 +57 57 123 +115 164 197 +90 65 41 +238 238 255 +197 197 222 +255 115 90 +205 98 74 +255 222 106 +222 180 106 +0 0 0 diff --git a/graphics/trainers/palettes/magma_admin.pal b/graphics/trainers/palettes/magma_admin.pal new file mode 100644 index 000000000..a987cdbc1 --- /dev/null +++ b/graphics/trainers/palettes/magma_admin.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 197 164 +255 222 205 +238 180 148 +197 139 106 +106 74 74 +123 123 123 +90 90 90 +82 98 148 +57 57 65 +65 74 115 +139 49 65 +189 189 180 +222 82 98 +189 57 74 +255 255 255 +0 0 0 diff --git a/graphics/trainers/palettes/magma_grunt_f.pal b/graphics/trainers/palettes/magma_grunt_f.pal new file mode 100644 index 000000000..a987cdbc1 --- /dev/null +++ b/graphics/trainers/palettes/magma_grunt_f.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 197 164 +255 222 205 +238 180 148 +197 139 106 +106 74 74 +123 123 123 +90 90 90 +82 98 148 +57 57 65 +65 74 115 +139 49 65 +189 189 180 +222 82 98 +189 57 74 +255 255 255 +0 0 0 diff --git a/graphics/trainers/palettes/magma_grunt_m.pal b/graphics/trainers/palettes/magma_grunt_m.pal new file mode 100644 index 000000000..a987cdbc1 --- /dev/null +++ b/graphics/trainers/palettes/magma_grunt_m.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 197 164 +255 222 205 +238 180 148 +197 139 106 +106 74 74 +123 123 123 +90 90 90 +82 98 148 +57 57 65 +65 74 115 +139 49 65 +189 189 180 +222 82 98 +189 57 74 +255 255 255 +0 0 0 diff --git a/graphics/trainers/palettes/magma_leader_maxie.pal b/graphics/trainers/palettes/magma_leader_maxie.pal new file mode 100644 index 000000000..151bf6d5b --- /dev/null +++ b/graphics/trainers/palettes/magma_leader_maxie.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 197 164 +255 222 205 +238 180 148 +197 139 106 +106 74 74 +164 180 197 +115 123 139 +74 82 98 +49 57 82 +213 213 222 +131 16 41 +24 32 49 +213 82 90 +180 41 57 +255 255 255 +0 0 0 diff --git a/graphics/trainers/palettes/may.pal b/graphics/trainers/palettes/may.pal new file mode 100644 index 000000000..fd706c07f --- /dev/null +++ b/graphics/trainers/palettes/may.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 197 164 +255 222 205 +222 164 148 +205 131 115 +123 90 82 +98 98 115 +41 57 65 +164 106 82 +74 49 57 +205 205 222 +139 222 115 +98 156 90 +255 98 90 +197 65 65 +255 255 255 +0 0 0 diff --git a/graphics/trainers/palettes/ninja_boy.pal b/graphics/trainers/palettes/ninja_boy.pal new file mode 100644 index 000000000..524d3f4ba --- /dev/null +++ b/graphics/trainers/palettes/ninja_boy.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 197 164 +255 222 205 +230 180 148 +213 148 115 +123 90 82 +164 180 197 +131 139 156 +82 98 115 +49 57 82 +213 213 222 +131 16 41 +255 172 32 +213 82 90 +180 41 57 +255 255 255 +0 0 0 diff --git a/graphics/trainers/palettes/oak.pal b/graphics/trainers/palettes/oak.pal new file mode 100644 index 000000000..eb6f2f18b --- /dev/null +++ b/graphics/trainers/palettes/oak.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 197 164 +255 222 205 +238 180 148 +197 139 106 +106 74 74 +139 156 164 +205 164 205 +164 123 164 +82 82 57 +213 213 222 +123 123 82 +115 115 115 +197 189 131 +156 156 90 +255 255 255 +0 0 0 diff --git a/graphics/trainers/palettes/old_couple.pal b/graphics/trainers/palettes/old_couple.pal new file mode 100644 index 000000000..2fa5f5202 --- /dev/null +++ b/graphics/trainers/palettes/old_couple.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 197 164 +255 222 205 +238 180 148 +197 139 106 +106 74 74 +180 180 172 +90 131 189 +65 90 139 +57 57 57 +213 222 230 +139 139 131 +189 156 90 +255 98 90 +197 65 65 +255 255 255 +0 0 0 diff --git a/graphics/trainers/palettes/old_man_back_pic.pal b/graphics/trainers/palettes/old_man_back_pic.pal new file mode 100644 index 000000000..85cf9ff8d --- /dev/null +++ b/graphics/trainers/palettes/old_man_back_pic.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 197 164 +255 238 213 +230 197 164 +189 148 115 +106 90 65 +222 213 238 +156 148 172 +115 106 131 +189 180 205 +197 139 57 +148 106 32 +156 131 106 +222 205 156 +189 172 139 +238 230 246 +0 0 0 diff --git a/graphics/trainers/palettes/painter.pal b/graphics/trainers/palettes/painter.pal new file mode 100644 index 000000000..31246f7cd --- /dev/null +++ b/graphics/trainers/palettes/painter.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 197 164 +255 222 205 +238 180 148 +205 148 115 +123 90 82 +164 172 197 +90 98 148 +49 57 82 +41 57 98 +222 230 238 +255 164 123 +106 197 90 +255 98 90 +197 65 65 +255 255 255 +0 0 0 diff --git a/graphics/trainers/palettes/palace_maven_spenser.pal b/graphics/trainers/palettes/palace_maven_spenser.pal new file mode 100644 index 000000000..40a634974 --- /dev/null +++ b/graphics/trainers/palettes/palace_maven_spenser.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 197 164 +230 205 156 +189 164 115 +164 131 82 +106 74 74 +172 172 213 +123 131 189 +90 98 148 +57 65 90 +222 213 246 +238 213 106 +246 230 180 +230 115 74 +222 180 98 +255 255 255 +0 0 0 diff --git a/graphics/trainers/palettes/parasol_lady.pal b/graphics/trainers/palettes/parasol_lady.pal new file mode 100644 index 000000000..dc5c6f67f --- /dev/null +++ b/graphics/trainers/palettes/parasol_lady.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 197 164 +255 222 205 +238 180 148 +197 139 106 +123 82 65 +90 131 189 +65 90 139 +41 65 98 +255 98 90 +197 65 65 +255 156 106 +131 74 65 +255 205 106 +213 172 74 +255 255 255 +0 0 0 diff --git a/graphics/trainers/palettes/picnicker.pal b/graphics/trainers/palettes/picnicker.pal new file mode 100644 index 000000000..476bcfaf6 --- /dev/null +++ b/graphics/trainers/palettes/picnicker.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 197 164 +255 222 205 +230 180 148 +197 139 106 +106 74 74 +164 238 156 +139 205 106 +106 164 65 +32 82 32 +205 205 213 +115 115 148 +41 57 90 +230 106 139 +189 65 57 +255 255 255 +0 0 0 diff --git a/graphics/trainers/palettes/pike_queen_lucy.pal b/graphics/trainers/palettes/pike_queen_lucy.pal new file mode 100644 index 000000000..fd3b46b8b --- /dev/null +++ b/graphics/trainers/palettes/pike_queen_lucy.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 197 164 +255 222 205 +238 180 148 +197 139 106 +106 74 74 +205 123 213 +148 90 148 +115 57 106 +57 57 57 +213 222 230 +172 65 65 +255 197 90 +115 106 123 +213 82 115 +255 255 255 +0 0 0 diff --git a/graphics/trainers/palettes/pokedude_back_pic.pal b/graphics/trainers/palettes/pokedude_back_pic.pal new file mode 100644 index 000000000..56a86d980 --- /dev/null +++ b/graphics/trainers/palettes/pokedude_back_pic.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 197 164 +246 222 197 +213 180 156 +189 148 123 +123 98 82 +222 213 238 +156 148 172 +115 106 131 +189 180 205 +106 148 205 +65 115 164 +41 57 123 +82 74 98 +172 106 98 +255 255 255 +0 0 0 diff --git a/graphics/trainers/palettes/pokemaniac.pal b/graphics/trainers/palettes/pokemaniac.pal new file mode 100644 index 000000000..3ede03b14 --- /dev/null +++ b/graphics/trainers/palettes/pokemaniac.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 197 164 +255 230 205 +246 205 156 +205 156 115 +115 82 65 +246 189 115 +213 123 74 +180 82 74 +139 57 41 +74 74 49 +255 230 57 +98 123 106 +230 82 24 +213 205 230 +255 255 255 +0 0 0 diff --git a/graphics/trainers/palettes/pokemon_breeder.pal b/graphics/trainers/palettes/pokemon_breeder.pal new file mode 100644 index 000000000..bfc59e3af --- /dev/null +++ b/graphics/trainers/palettes/pokemon_breeder.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 197 164 +255 222 205 +230 189 148 +189 148 106 +123 98 82 +123 205 106 +32 98 65 +197 90 74 +131 148 172 +213 222 230 +74 164 82 +238 172 82 +222 148 123 +189 148 57 +255 255 255 +0 0 0 diff --git a/graphics/trainers/palettes/pokemon_ranger_f.pal b/graphics/trainers/palettes/pokemon_ranger_f.pal new file mode 100644 index 000000000..4134bfc22 --- /dev/null +++ b/graphics/trainers/palettes/pokemon_ranger_f.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 197 164 +255 230 205 +230 189 148 +189 139 106 +139 106 82 +82 49 49 +131 139 172 +98 106 131 +49 57 82 +189 189 197 +255 205 65 +246 148 82 +205 106 74 +131 74 49 +255 255 255 +0 0 0 diff --git a/graphics/trainers/palettes/pokemon_ranger_m.pal b/graphics/trainers/palettes/pokemon_ranger_m.pal new file mode 100644 index 000000000..4134bfc22 --- /dev/null +++ b/graphics/trainers/palettes/pokemon_ranger_m.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 197 164 +255 230 205 +230 189 148 +189 139 106 +139 106 82 +82 49 49 +131 139 172 +98 106 131 +49 57 82 +189 189 197 +255 205 65 +246 148 82 +205 106 74 +131 74 49 +255 255 255 +0 0 0 diff --git a/graphics/trainers/palettes/psychic_f.pal b/graphics/trainers/palettes/psychic_f.pal new file mode 100644 index 000000000..101d2285e --- /dev/null +++ b/graphics/trainers/palettes/psychic_f.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 197 164 +255 222 205 +230 189 172 +197 148 131 +123 90 82 +57 82 106 +57 123 164 +98 172 205 +106 57 115 +156 98 148 +205 139 180 +205 172 98 +238 213 90 +255 172 213 +255 255 255 +0 0 0 diff --git a/graphics/trainers/palettes/psychic_m.pal b/graphics/trainers/palettes/psychic_m.pal new file mode 100644 index 000000000..101d2285e --- /dev/null +++ b/graphics/trainers/palettes/psychic_m.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 197 164 +255 222 205 +230 189 172 +197 148 131 +123 90 82 +57 82 106 +57 123 164 +98 172 205 +106 57 115 +156 98 148 +205 139 180 +205 172 98 +238 213 90 +255 172 213 +255 255 255 +0 0 0 diff --git a/graphics/trainers/palettes/pyramid_king_brandon.pal b/graphics/trainers/palettes/pyramid_king_brandon.pal new file mode 100644 index 000000000..77b5483b8 --- /dev/null +++ b/graphics/trainers/palettes/pyramid_king_brandon.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 197 164 +255 222 205 +238 180 148 +197 139 106 +106 74 74 +164 213 90 +123 172 65 +82 115 41 +57 82 41 +213 205 213 +172 123 90 +139 139 123 +131 98 65 +213 106 74 +255 255 255 +0 0 0 diff --git a/graphics/trainers/palettes/red.pal b/graphics/trainers/palettes/red.pal new file mode 100644 index 000000000..30e2cdde0 --- /dev/null +++ b/graphics/trainers/palettes/red.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 197 164 +255 230 180 +230 189 156 +205 148 115 +123 90 82 +123 189 222 +82 139 180 +49 106 139 +24 41 82 +213 213 222 +255 197 90 +189 156 90 +255 98 90 +197 65 65 +255 255 255 +0 0 0 diff --git a/graphics/trainers/palettes/red_back_pic.pal b/graphics/trainers/palettes/red_back_pic.pal new file mode 100644 index 000000000..dec7bed22 --- /dev/null +++ b/graphics/trainers/palettes/red_back_pic.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +131 123 164 +180 131 65 +255 230 180 +222 189 156 +139 98 74 +90 98 189 +57 57 123 +115 164 197 +90 65 41 +238 238 255 +197 197 222 +255 115 90 +205 98 74 +255 222 106 +222 180 106 +0 0 0 diff --git a/graphics/trainers/palettes/rich_boy.pal b/graphics/trainers/palettes/rich_boy.pal new file mode 100644 index 000000000..1ebb77204 --- /dev/null +++ b/graphics/trainers/palettes/rich_boy.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 197 164 +255 222 205 +238 180 148 +197 139 106 +106 74 74 +90 131 189 +65 90 139 +41 65 98 +49 41 65 +213 222 230 +255 230 98 +222 180 90 +156 123 115 +115 82 90 +255 255 255 +0 0 0 diff --git a/graphics/trainers/palettes/rocker.pal b/graphics/trainers/palettes/rocker.pal new file mode 100644 index 000000000..fa2321fab --- /dev/null +++ b/graphics/trainers/palettes/rocker.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 197 164 +255 230 205 +230 197 156 +197 156 115 +123 98 82 +123 164 189 +82 123 148 +205 222 205 +139 65 49 +172 172 197 +65 82 90 +189 213 255 +255 131 98 +197 131 82 +255 255 255 +0 0 0 diff --git a/graphics/trainers/palettes/rocket_grunt_f.pal b/graphics/trainers/palettes/rocket_grunt_f.pal new file mode 100644 index 000000000..18a2b433e --- /dev/null +++ b/graphics/trainers/palettes/rocket_grunt_f.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 197 164 +255 222 222 +230 180 164 +197 148 139 +115 90 74 +205 205 222 +156 156 172 +123 123 148 +164 74 65 +213 98 90 +246 106 98 +0 0 0 +57 57 74 +82 82 106 +180 180 197 +255 255 255 diff --git a/graphics/trainers/palettes/rocket_grunt_m.pal b/graphics/trainers/palettes/rocket_grunt_m.pal new file mode 100644 index 000000000..18a2b433e --- /dev/null +++ b/graphics/trainers/palettes/rocket_grunt_m.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 197 164 +255 222 222 +230 180 164 +197 148 139 +115 90 74 +205 205 222 +156 156 172 +123 123 148 +164 74 65 +213 98 90 +246 106 98 +0 0 0 +57 57 74 +82 82 106 +180 180 197 +255 255 255 diff --git a/graphics/trainers/palettes/roughneck.pal b/graphics/trainers/palettes/roughneck.pal new file mode 100644 index 000000000..ac22488a9 --- /dev/null +++ b/graphics/trainers/palettes/roughneck.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 197 164 +255 222 205 +230 180 148 +205 139 115 +148 98 82 +222 222 230 +180 197 213 +139 172 213 +98 139 180 +57 82 115 +205 180 180 +98 82 65 +180 156 156 +148 115 106 +255 255 255 +0 0 0 diff --git a/graphics/trainers/palettes/ruby_magma_admin_f.pal b/graphics/trainers/palettes/ruby_magma_admin_f.pal new file mode 100644 index 000000000..a987cdbc1 --- /dev/null +++ b/graphics/trainers/palettes/ruby_magma_admin_f.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 197 164 +255 222 205 +238 180 148 +197 139 106 +106 74 74 +123 123 123 +90 90 90 +82 98 148 +57 57 65 +65 74 115 +139 49 65 +189 189 180 +222 82 98 +189 57 74 +255 255 255 +0 0 0 diff --git a/graphics/trainers/palettes/ruby_sapphire_brendan.pal b/graphics/trainers/palettes/ruby_sapphire_brendan.pal new file mode 100644 index 000000000..b5d3791c3 --- /dev/null +++ b/graphics/trainers/palettes/ruby_sapphire_brendan.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 197 164 +255 222 205 +222 164 148 +205 131 115 +123 90 82 +98 123 156 +74 90 131 +49 65 106 +24 41 82 +222 230 238 +255 197 90 +189 156 90 +255 98 90 +197 65 65 +255 255 255 +0 0 0 diff --git a/graphics/trainers/palettes/ruby_sapphire_may.pal b/graphics/trainers/palettes/ruby_sapphire_may.pal new file mode 100644 index 000000000..e106ce693 --- /dev/null +++ b/graphics/trainers/palettes/ruby_sapphire_may.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 197 164 +255 222 205 +222 164 148 +205 131 115 +123 90 82 +98 98 115 +41 57 65 +164 106 82 +74 49 57 +205 205 222 +255 197 90 +189 156 90 +255 98 90 +197 65 65 +255 255 255 +0 0 0 diff --git a/graphics/trainers/palettes/ruin_maniac.pal b/graphics/trainers/palettes/ruin_maniac.pal new file mode 100644 index 000000000..05eb78e93 --- /dev/null +++ b/graphics/trainers/palettes/ruin_maniac.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 197 164 +255 222 205 +238 180 148 +197 139 106 +106 74 74 +213 213 148 +180 180 98 +139 131 49 +90 82 16 +180 172 131 +156 156 156 +205 205 205 +139 131 106 +82 65 74 +255 255 255 +0 0 0 diff --git a/graphics/trainers/palettes/running_triathlete_f.pal b/graphics/trainers/palettes/running_triathlete_f.pal new file mode 100644 index 000000000..671c1593f --- /dev/null +++ b/graphics/trainers/palettes/running_triathlete_f.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 197 164 +255 222 205 +238 180 148 +197 139 106 +98 65 57 +90 131 189 +65 90 139 +41 65 98 +49 41 65 +205 213 222 +180 139 90 +139 65 65 +255 98 90 +197 65 65 +255 255 255 +0 0 0 diff --git a/graphics/trainers/palettes/running_triathlete_m.pal b/graphics/trainers/palettes/running_triathlete_m.pal new file mode 100644 index 000000000..13a56a556 --- /dev/null +++ b/graphics/trainers/palettes/running_triathlete_m.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 197 164 +246 205 180 +230 180 148 +180 139 106 +115 82 65 +90 131 189 +65 90 139 +41 65 98 +49 41 65 +205 213 222 +180 139 90 +139 65 65 +255 98 90 +197 65 65 +255 255 255 +0 0 0 diff --git a/graphics/trainers/palettes/sailor.pal b/graphics/trainers/palettes/sailor.pal new file mode 100644 index 000000000..c0b0b81bd --- /dev/null +++ b/graphics/trainers/palettes/sailor.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +156 180 106 +0 0 0 +246 246 255 +230 230 255 +197 197 230 +123 123 156 +106 123 172 +65 82 123 +41 57 82 +65 65 16 +222 123 74 +172 74 57 +123 90 82 +189 139 106 +222 180 148 +246 222 205 diff --git a/graphics/trainers/palettes/salon_maiden_anabel.pal b/graphics/trainers/palettes/salon_maiden_anabel.pal new file mode 100644 index 000000000..91776562f --- /dev/null +++ b/graphics/trainers/palettes/salon_maiden_anabel.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 197 164 +255 222 205 +238 180 148 +197 139 106 +106 74 74 +230 139 255 +189 115 213 +148 90 172 +123 74 139 +213 205 246 +255 197 90 +156 148 197 +255 222 115 +213 106 74 +255 255 255 +0 0 0 diff --git a/graphics/trainers/palettes/school_kid_f.pal b/graphics/trainers/palettes/school_kid_f.pal new file mode 100644 index 000000000..ce758377a --- /dev/null +++ b/graphics/trainers/palettes/school_kid_f.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 197 164 +255 230 205 +238 189 156 +205 148 115 +106 74 57 +255 139 164 +213 82 131 +131 139 255 +98 115 180 +57 74 131 +246 189 123 +197 131 65 +230 82 41 +139 90 32 +255 255 255 +0 0 0 diff --git a/graphics/trainers/palettes/school_kid_m.pal b/graphics/trainers/palettes/school_kid_m.pal new file mode 100644 index 000000000..dc4298ea0 --- /dev/null +++ b/graphics/trainers/palettes/school_kid_m.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 197 164 +255 222 205 +230 180 148 +213 148 115 +123 90 82 +172 164 115 +65 90 148 +49 57 82 +131 123 82 +197 197 238 +255 222 65 +205 189 123 +98 164 222 +49 123 156 +255 255 255 +0 0 0 diff --git a/graphics/trainers/palettes/scientist.pal b/graphics/trainers/palettes/scientist.pal new file mode 100644 index 000000000..46228fb2b --- /dev/null +++ b/graphics/trainers/palettes/scientist.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 197 164 +255 222 205 +238 180 148 +197 139 106 +106 74 74 +238 82 57 +131 139 172 +90 98 139 +230 172 222 +172 123 172 +57 65 98 +131 139 148 +180 189 197 +213 222 213 +255 255 255 +0 0 0 diff --git a/graphics/trainers/palettes/sis_and_bro.pal b/graphics/trainers/palettes/sis_and_bro.pal new file mode 100644 index 000000000..d44893fb8 --- /dev/null +++ b/graphics/trainers/palettes/sis_and_bro.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 197 164 +255 222 205 +222 180 148 +189 139 106 +98 57 65 +255 230 131 +213 180 90 +172 106 49 +255 164 164 +222 106 115 +172 74 74 +189 197 230 +123 148 205 +65 74 115 +255 255 255 +0 0 0 diff --git a/graphics/trainers/palettes/sr_and_jr.pal b/graphics/trainers/palettes/sr_and_jr.pal new file mode 100644 index 000000000..72238881f --- /dev/null +++ b/graphics/trainers/palettes/sr_and_jr.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 197 164 +255 222 205 +238 180 148 +197 139 106 +98 65 57 +90 131 189 +65 90 139 +41 65 98 +49 41 65 +205 213 222 +180 139 90 +131 90 41 +255 98 90 +197 65 65 +255 255 255 +0 0 0 diff --git a/graphics/trainers/palettes/steven.pal b/graphics/trainers/palettes/steven.pal new file mode 100644 index 000000000..bb2fedd5f --- /dev/null +++ b/graphics/trainers/palettes/steven.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 197 164 +255 222 205 +222 180 148 +189 148 115 +123 90 82 +189 115 205 +164 82 172 +82 82 90 +49 49 57 +213 222 238 +172 189 213 +123 148 164 +255 98 90 +197 65 65 +255 255 255 +0 0 0 diff --git a/graphics/trainers/palettes/super_nerd.pal b/graphics/trainers/palettes/super_nerd.pal new file mode 100644 index 000000000..7525c047e --- /dev/null +++ b/graphics/trainers/palettes/super_nerd.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 197 164 +255 230 205 +222 189 148 +197 148 115 +106 74 65 +255 98 90 +197 65 65 +123 123 148 +82 82 98 +205 205 222 +164 164 180 +189 156 90 +49 49 65 +74 49 24 +255 255 255 +0 0 24 diff --git a/graphics/trainers/palettes/swimmer_f.pal b/graphics/trainers/palettes/swimmer_f.pal new file mode 100644 index 000000000..f2693e5c7 --- /dev/null +++ b/graphics/trainers/palettes/swimmer_f.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 197 164 +255 222 205 +222 180 148 +189 139 106 +98 57 65 +255 230 131 +213 180 90 +172 106 49 +255 164 164 +222 106 115 +172 74 74 +205 205 255 +164 172 238 +106 106 205 +255 255 255 +0 0 0 diff --git a/graphics/trainers/palettes/swimmer_m.pal b/graphics/trainers/palettes/swimmer_m.pal new file mode 100644 index 000000000..206f62692 --- /dev/null +++ b/graphics/trainers/palettes/swimmer_m.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 197 164 +238 205 189 +213 164 131 +180 115 98 +115 82 74 +164 189 238 +98 164 222 +49 115 172 +139 156 172 +222 222 230 +106 123 139 +180 205 255 +213 82 90 +238 238 246 +255 255 255 +16 16 16 diff --git a/graphics/trainers/palettes/swimming_triathlete_f.pal b/graphics/trainers/palettes/swimming_triathlete_f.pal new file mode 100644 index 000000000..671c1593f --- /dev/null +++ b/graphics/trainers/palettes/swimming_triathlete_f.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 197 164 +255 222 205 +238 180 148 +197 139 106 +98 65 57 +90 131 189 +65 90 139 +41 65 98 +49 41 65 +205 213 222 +180 139 90 +139 65 65 +255 98 90 +197 65 65 +255 255 255 +0 0 0 diff --git a/graphics/trainers/palettes/swimming_triathlete_m.pal b/graphics/trainers/palettes/swimming_triathlete_m.pal new file mode 100644 index 000000000..671c1593f --- /dev/null +++ b/graphics/trainers/palettes/swimming_triathlete_m.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 197 164 +255 222 205 +238 180 148 +197 139 106 +98 65 57 +90 131 189 +65 90 139 +41 65 98 +49 41 65 +205 213 222 +180 139 90 +139 65 65 +255 98 90 +197 65 65 +255 255 255 +0 0 0 diff --git a/graphics/trainers/palettes/tamer.pal b/graphics/trainers/palettes/tamer.pal new file mode 100644 index 000000000..cce289e23 --- /dev/null +++ b/graphics/trainers/palettes/tamer.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +172 213 172 +255 222 205 +238 180 148 +197 139 106 +106 74 74 +90 90 98 +115 123 139 +139 148 164 +156 172 180 +74 49 41 +180 123 65 +156 65 65 +238 148 90 +197 205 213 +255 255 255 +0 0 0 diff --git a/graphics/trainers/palettes/tuber.pal b/graphics/trainers/palettes/tuber.pal new file mode 100644 index 000000000..1c1c1e3c2 --- /dev/null +++ b/graphics/trainers/palettes/tuber.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 197 164 +255 222 189 +222 189 148 +180 148 106 +98 57 65 +230 164 98 +197 131 57 +148 90 57 +255 139 156 +213 74 90 +139 41 57 +205 205 255 +164 172 238 +106 106 205 +255 255 255 +0 0 0 diff --git a/graphics/trainers/palettes/twins.pal b/graphics/trainers/palettes/twins.pal new file mode 100644 index 000000000..6e2ff8846 --- /dev/null +++ b/graphics/trainers/palettes/twins.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 197 164 +255 222 205 +238 180 148 +197 139 106 +106 74 74 +238 164 82 +205 115 65 +139 57 65 +57 41 41 +213 222 230 +156 189 246 +180 82 98 +90 139 189 +65 90 131 +255 255 255 +0 0 0 diff --git a/graphics/trainers/palettes/wally.pal b/graphics/trainers/palettes/wally.pal new file mode 100644 index 000000000..30e2e2a6c --- /dev/null +++ b/graphics/trainers/palettes/wally.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 197 164 +255 238 213 +222 180 164 +189 148 115 +123 90 82 +156 148 172 +115 106 131 +189 205 98 +148 172 74 +222 222 230 +98 148 49 +65 106 24 +98 156 222 +180 180 205 +255 255 255 +0 0 0 diff --git a/graphics/trainers/palettes/winstrate_f.pal b/graphics/trainers/palettes/winstrate_f.pal new file mode 100644 index 000000000..09728f005 --- /dev/null +++ b/graphics/trainers/palettes/winstrate_f.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 197 164 +255 222 205 +238 180 148 +197 139 106 +98 65 57 +90 172 189 +65 123 180 +255 0 255 +32 57 82 +197 205 213 +180 139 90 +131 90 41 +255 98 90 +197 65 65 +255 255 255 +0 0 0 diff --git a/graphics/trainers/palettes/winstrate_m.pal b/graphics/trainers/palettes/winstrate_m.pal new file mode 100644 index 000000000..1d1f48875 --- /dev/null +++ b/graphics/trainers/palettes/winstrate_m.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 197 164 +255 230 205 +222 189 148 +197 156 115 +156 123 82 +49 57 49 +230 90 41 +131 172 222 +172 49 32 +82 123 172 +255 238 74 +213 189 41 +205 205 213 +98 98 74 +255 255 255 +0 0 0 diff --git a/graphics/trainers/palettes/young_couple.pal b/graphics/trainers/palettes/young_couple.pal new file mode 100644 index 000000000..c31ab3b4f --- /dev/null +++ b/graphics/trainers/palettes/young_couple.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 197 164 +255 222 205 +238 180 148 +197 139 106 +98 65 57 +255 255 255 +139 180 230 +106 131 180 +82 74 115 +0 0 24 +255 115 90 +197 82 65 +222 230 238 +189 197 213 +123 131 148 +0 0 0 diff --git a/graphics/trainers/palettes/youngster.pal b/graphics/trainers/palettes/youngster.pal new file mode 100644 index 000000000..e4e1c5c20 --- /dev/null +++ b/graphics/trainers/palettes/youngster.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 197 164 +255 222 205 +230 197 156 +197 148 115 +123 90 82 +213 213 222 +98 164 222 +49 123 156 +230 98 90 +172 74 57 +41 90 131 +246 205 123 +205 172 82 +180 148 90 +255 255 255 +0 0 0 -- cgit v1.2.3 From d0c63f0f5971e94dc3607feb9e8e7d995ebcacb4 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Thu, 11 Oct 2018 18:47:20 -0400 Subject: through sub_8111984 --- asm/quest_log.s | 101 ---------------------------------------------------- include/overworld.h | 1 + include/palette.h | 2 ++ include/save.h | 1 + src/quest_log.c | 43 +++++++++++++++++++++- 5 files changed, 46 insertions(+), 102 deletions(-) diff --git a/asm/quest_log.s b/asm/quest_log.s index 82816d861..b9ac6668c 100644 --- a/asm/quest_log.s +++ b/asm/quest_log.s @@ -5,107 +5,6 @@ .text - thumb_func_start sub_81118F4 -sub_81118F4: @ 81118F4 - push {lr} - adds r1, r0, 0 - lsls r1, 24 - asrs r1, 24 - movs r0, 0x1 - bl fade_screen - ldr r1, _0811190C @ =gUnknown_203AE8C - ldr r0, _08111910 @ =sub_8111914 - str r0, [r1] - pop {r0} - bx r0 - .align 2, 0 -_0811190C: .4byte gUnknown_203AE8C -_08111910: .4byte sub_8111914 - thumb_func_end sub_81118F4 - - thumb_func_start sub_8111914 -sub_8111914: @ 8111914 - push {lr} - ldr r0, _08111960 @ =gUnknown_2037AB8 - ldrb r1, [r0, 0x7] - movs r0, 0x80 - ands r0, r1 - cmp r0, 0 - bne _0811197A - bl ScriptContext2_Enable - ldr r1, _08111964 @ =gUnknown_203ADF8 - ldrb r0, [r1] - adds r0, 0x1 - strb r0, [r1] - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x3 - bhi _08111970 - ldr r0, _08111968 @ =gSaveBlock1Ptr - ldr r0, [r0] - ldrb r2, [r1] - movs r1, 0xCD - lsls r1, 3 - muls r1, r2 - adds r0, r1 - movs r1, 0x98 - lsls r1, 5 - adds r0, r1 - ldrb r0, [r0] - cmp r0, 0 - beq _08111970 - ldr r1, _0811196C @ =gUnknown_203ADF9 - ldrb r0, [r1] - subs r0, 0x1 - strb r0, [r1] - bl sub_8111368 - b _0811197A - .align 2, 0 -_08111960: .4byte gUnknown_2037AB8 -_08111964: .4byte gUnknown_203ADF8 -_08111968: .4byte gSaveBlock1Ptr -_0811196C: .4byte gUnknown_203ADF9 -_08111970: - ldr r1, _08111980 @ =gUnknown_3005E88 - movs r0, 0 - strb r0, [r1] - bl sub_8111984 -_0811197A: - pop {r0} - bx r0 - .align 2, 0 -_08111980: .4byte gUnknown_3005E88 - thumb_func_end sub_8111914 - - thumb_func_start sub_8111984 -sub_8111984: @ 8111984 - push {lr} - bl sub_806E6FC - bl ResetSaveCounters - movs r0, 0 - bl sub_80DA4FC - ldr r0, _081119B4 @ =sub_8057430 - bl SetMainCallback2 - ldr r1, _081119B8 @ =gUnknown_3005024 - ldr r0, _081119BC @ =sub_8111F60 - str r0, [r1] - bl FreeAllWindowBuffers - ldr r1, _081119C0 @ =gUnknown_203ADFA - movs r0, 0x3 - strb r0, [r1] - ldr r1, _081119C4 @ =gUnknown_203AE8C - movs r0, 0 - str r0, [r1] - pop {r0} - bx r0 - .align 2, 0 -_081119B4: .4byte sub_8057430 -_081119B8: .4byte gUnknown_3005024 -_081119BC: .4byte sub_8111F60 -_081119C0: .4byte gUnknown_203ADFA -_081119C4: .4byte gUnknown_203AE8C - thumb_func_end sub_8111984 - thumb_func_start sub_81119C8 sub_81119C8: @ 81119C8 push {lr} diff --git a/include/overworld.h b/include/overworld.h index ab9e114ef..ab3554137 100644 --- a/include/overworld.h +++ b/include/overworld.h @@ -75,6 +75,7 @@ void sub_8056938(void); void sub_8055D5C(struct WarpData *); void sub_80572A8(void); void sub_805726C(void); +void sub_8057430(void); extern u8 gUnknown_2031DD8; diff --git a/include/palette.h b/include/palette.h index d3bcd2271..ffdc0496d 100644 --- a/include/palette.h +++ b/include/palette.h @@ -68,4 +68,6 @@ void BeginHardwarePaletteFade(u8, u8, u8, u8, u8); void BlendPalettes(u32, u8, u16); void BlendPalettesUnfaded(u32, u8, u16); +extern struct PaletteFadeControl gUnknown_2037AB8; + #endif // GUARD_PALETTE_H diff --git a/include/save.h b/include/save.h index 3bd1ff8cf..80c2bf804 100644 --- a/include/save.h +++ b/include/save.h @@ -93,5 +93,6 @@ u16 sub_815355C(void); u32 TryCopySpecialSaveSection(u8 sector, u8* dst); u32 sub_8153634(u8 sector, u8* src); void sub_8153688(u8 taskId); +void sub_80DA4FC(u8); #endif // GUARD_SAVE_H diff --git a/src/quest_log.c b/src/quest_log.c index da918be79..b7e38ef40 100644 --- a/src/quest_log.c +++ b/src/quest_log.c @@ -12,11 +12,13 @@ #include "script.h" #include "overworld.h" #include "field_fadetransition.h" +#include "field_weather.h" #include "item.h" #include "wild_encounter.h" #include "help_system.h" #include "unk_8159F40.h" #include "pokemon_storage_system.h" +#include "save.h" #include "quest_log.h" u8 gUnknown_3005E88; @@ -65,6 +67,10 @@ u16 sub_8111618(void); u16 sub_811164C(void); void sub_8111688(void); void sub_811175C(u8, struct UnkStruct_203AE98 *); +void sub_81118F4(s8); +void sub_8111914(void); +void sub_8111984(void); +bool8 sub_8111F60(void); void * sub_8113D08(void *, struct UnkStruct_203AE98 *); void * sub_8113D94(void *, struct UnkStruct_203AE98 *); void * sub_8113C20(void *, struct UnkStruct_203AE98 *); @@ -80,7 +86,6 @@ void sub_8113BD8(void); void * sub_8113BF4(void *); void * sub_8113D48(void *, struct UnkStruct_203AE98 *); void * sub_8113CC8(void *, struct UnkStruct_203AE98 *); -void sub_81118F4(s8); extern const u8 gUnknown_841A155[]; @@ -883,3 +888,39 @@ void sub_811175C(u8 a0, struct UnkStruct_203AE98 * a1) break; } } + +void sub_81118F4(s8 a0) +{ + fade_screen(1, a0); + gUnknown_203AE8C = sub_8111914; +} + +void sub_8111914(void) +{ + if (!gUnknown_2037AB8.active) + { + ScriptContext2_Enable(); + if (++gUnknown_203ADF8 < 4 && gSaveBlock1Ptr->questLog[gUnknown_203ADF8].unk_000) + { + gUnknown_203ADF9--; + sub_8111368(); + } + else + { + gUnknown_3005E88 = 0; + sub_8111984(); + } + } +} + +void sub_8111984(void) +{ + sub_806E6FC(); + ResetSaveCounters(); + sub_80DA4FC(0); + SetMainCallback2(sub_8057430); + gUnknown_3005024 = sub_8111F60; + FreeAllWindowBuffers(); + gUnknown_203ADFA = 3; + gUnknown_203AE8C = NULL; +} -- cgit v1.2.3 From 1125d6627eaf23d66c09bc6cc2a548bbad10c789 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Fri, 12 Oct 2018 07:59:08 -0400 Subject: through sub_8111A34 --- asm/quest_log.s | 141 -------------------------------------------------------- src/quest_log.c | 56 ++++++++++++++++++++++ 2 files changed, 56 insertions(+), 141 deletions(-) diff --git a/asm/quest_log.s b/asm/quest_log.s index b9ac6668c..553a50ace 100644 --- a/asm/quest_log.s +++ b/asm/quest_log.s @@ -5,147 +5,6 @@ .text - thumb_func_start sub_81119C8 -sub_81119C8: @ 81119C8 - push {lr} - bl sub_8111914 - pop {r0} - bx r0 - thumb_func_end sub_81119C8 - - thumb_func_start sub_81119D4 -sub_81119D4: @ 81119D4 - push {r4,lr} - adds r4, r0, 0 - ldr r0, _081119E8 @ =gUnknown_203ADFA - ldrb r0, [r0] - cmp r0, 0x1 - beq _081119EC - cmp r0, 0x2 - beq _081119F2 - b _08111A2C - .align 2, 0 -_081119E8: .4byte gUnknown_203ADFA -_081119EC: - bl sub_8112364 - b _08111A2C -_081119F2: - ldr r1, _08111A20 @ =gUnknown_3005E88 - movs r0, 0x3 - strb r0, [r1] - ldr r0, _08111A24 @ =sub_8111A34 - movs r1, 0x50 - bl CreateTask - lsls r0, 24 - lsrs r0, 24 - ldr r2, _08111A28 @ =gTasks - lsls r1, r0, 2 - adds r1, r0 - lsls r1, 3 - adds r1, r2 - movs r2, 0 - strh r2, [r1, 0x8] - strh r2, [r1, 0xA] - movs r1, 0xE - adds r2, r4, 0 - bl SetWordTaskArg - movs r0, 0x1 - b _08111A2E - .align 2, 0 -_08111A20: .4byte gUnknown_3005E88 -_08111A24: .4byte sub_8111A34 -_08111A28: .4byte gTasks -_08111A2C: - movs r0, 0 -_08111A2E: - pop {r4} - pop {r1} - bx r1 - thumb_func_end sub_81119D4 - - thumb_func_start sub_8111A34 -sub_8111A34: @ 8111A34 - push {r4,r5,lr} - sub sp, 0x4 - lsls r0, 24 - lsrs r5, r0, 24 - lsls r0, r5, 2 - adds r0, r5 - lsls r0, 3 - ldr r1, _08111A54 @ =gTasks+0x8 - adds r4, r0, r1 - movs r0, 0x2 - ldrsh r1, [r4, r0] - cmp r1, 0 - beq _08111A58 - cmp r1, 0x1 - beq _08111A90 - b _08111AC0 - .align 2, 0 -_08111A54: .4byte gTasks+0x8 -_08111A58: - ldrh r0, [r4] - adds r0, 0x1 - strh r0, [r4] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0x7F - bne _08111AC0 - movs r0, 0x1 - negs r0, r0 - str r1, [sp] - movs r1, 0 - movs r2, 0 - movs r3, 0x10 - bl BeginNormalPaletteFade - ldr r2, _08111A8C @ =gUnknown_203AE94 - ldrb r1, [r2] - movs r0, 0x3F - ands r0, r1 - movs r1, 0x80 - orrs r0, r1 - strb r0, [r2] - ldrh r0, [r4, 0x2] - adds r0, 0x1 - strh r0, [r4, 0x2] - b _08111AC0 - .align 2, 0 -_08111A8C: .4byte gUnknown_203AE94 -_08111A90: - ldr r0, _08111AC8 @ =gUnknown_2037AB8 - ldrb r1, [r0, 0x7] - movs r0, 0x80 - ands r0, r1 - lsls r0, 24 - lsrs r1, r0, 24 - cmp r1, 0 - bne _08111AC0 - ldr r0, _08111ACC @ =gUnknown_3005E88 - strb r1, [r0] - adds r0, r5, 0 - movs r1, 0xE - bl GetWordTaskArg - cmp r0, 0 - beq _08111AB4 - bl _call_via_r0 -_08111AB4: - adds r0, r5, 0 - bl DestroyTask - ldr r1, _08111AD0 @ =gUnknown_203AE8C - ldr r0, _08111AD4 @ =sub_8111914 - str r0, [r1] -_08111AC0: - add sp, 0x4 - pop {r4,r5} - pop {r0} - bx r0 - .align 2, 0 -_08111AC8: .4byte gUnknown_2037AB8 -_08111ACC: .4byte gUnknown_3005E88 -_08111AD0: .4byte gUnknown_203AE8C -_08111AD4: .4byte sub_8111914 - thumb_func_end sub_8111A34 - thumb_func_start sub_8111AD8 sub_8111AD8: @ 8111AD8 push {r4,r5,lr} diff --git a/src/quest_log.c b/src/quest_log.c index b7e38ef40..c50771491 100644 --- a/src/quest_log.c +++ b/src/quest_log.c @@ -70,6 +70,8 @@ void sub_811175C(u8, struct UnkStruct_203AE98 *); void sub_81118F4(s8); void sub_8111914(void); void sub_8111984(void); +void sub_8112364(void); +void sub_8111A34(u8); bool8 sub_8111F60(void); void * sub_8113D08(void *, struct UnkStruct_203AE98 *); void * sub_8113D94(void *, struct UnkStruct_203AE98 *); @@ -924,3 +926,57 @@ void sub_8111984(void) gUnknown_203ADFA = 3; gUnknown_203AE8C = NULL; } + +void sub_81119C8(void) +{ + sub_8111914(); +} + +bool8 sub_81119D4(void (*a0)(void)) +{ + u8 taskId; + + switch (gUnknown_203ADFA) + { + case 1: + sub_8112364(); + break; + case 2: + gUnknown_3005E88 = 3; + taskId = CreateTask(sub_8111A34, 80); + gTasks[taskId].data[0] = 0; + gTasks[taskId].data[1] = 0; + SetWordTaskArg(taskId, 14, (u32)a0); + return TRUE; + } + return FALSE; +} + +void sub_8111A34(u8 taskId) +{ + void (*routine)(void); + s16 * data = gTasks[taskId].data; + + switch (data[1]) + { + case 0: + if (++data[0] == 0x7F) + { + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, 0); + gUnknown_203AE94.unk_0_6 = 2; + data[1]++; + } + break; + case 1: + if (!gUnknown_2037AB8.active) + { + gUnknown_3005E88 = 0; + routine = (void (*)(void)) GetWordTaskArg(taskId, 14); + if (routine != NULL) + routine(); + DestroyTask(taskId); + gUnknown_203AE8C = sub_8111914; + } + break; + } +} -- cgit v1.2.3 From 6b0f3451b89dddbb05279281d598ccda65824c9b Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Fri, 12 Oct 2018 08:47:12 -0400 Subject: sub_8111AD8 --- asm/quest_log.s | 83 --------------------------------------------------------- src/quest_log.c | 56 +++++++++++++++++++++++++++++++------- 2 files changed, 46 insertions(+), 93 deletions(-) diff --git a/asm/quest_log.s b/asm/quest_log.s index 553a50ace..e779da3f6 100644 --- a/asm/quest_log.s +++ b/asm/quest_log.s @@ -5,89 +5,6 @@ .text - thumb_func_start sub_8111AD8 -sub_8111AD8: @ 8111AD8 - push {r4,r5,lr} - ldr r4, _08111B58 @ =gUnknown_203AE94 - ldrb r1, [r4] - movs r0, 0xF - ands r0, r1 - cmp r0, 0x1 - bne _08111B0A - ldrb r0, [r4, 0x2] - subs r0, 0x1 - strb r0, [r4, 0x2] - lsls r0, 24 - cmp r0, 0 - bne _08111B78 - movs r0, 0x10 - negs r0, r0 - ands r0, r1 - movs r1, 0x31 - negs r1, r1 - ands r0, r1 - movs r1, 0x10 - orrs r0, r1 - strb r0, [r4] - movs r0, 0x2 - bl sub_8112888 -_08111B0A: - ldrb r1, [r4] - movs r0, 0x30 - ands r0, r1 - cmp r0, 0x10 - bne _08111B34 - ldrb r0, [r4, 0x3] - adds r0, 0x1 - strb r0, [r4, 0x3] - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0xF - bls _08111B34 - bl sub_8111E20 - ldrb r0, [r4] - movs r1, 0x31 - negs r1, r1 - ands r1, r0 - strb r1, [r4] - movs r0, 0 - strb r0, [r4, 0x3] -_08111B34: - ldr r4, _08111B58 @ =gUnknown_203AE94 - ldrb r0, [r4, 0x1] - cmp r0, 0x1F - bhi _08111B78 - ldr r5, _08111B5C @ =gUnknown_203AE0C - lsls r0, 2 - adds r0, r5 - ldr r0, [r0] - bl sub_8113B44 - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x1 - bne _08111B60 - bl sub_8111B80 - b _08111B78 - .align 2, 0 -_08111B58: .4byte gUnknown_203AE94 -_08111B5C: .4byte gUnknown_203AE0C -_08111B60: - ldrb r0, [r4, 0x1] - lsls r0, 2 - adds r0, r5 - ldr r0, [r0] - bl sub_8113AE8 - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x1 - bne _08111B78 - bl sub_8111B80 -_08111B78: - pop {r4,r5} - pop {r0} - bx r0 - thumb_func_end sub_8111AD8 - thumb_func_start sub_8111B80 sub_8111B80: @ 8111B80 push {r4,lr} diff --git a/src/quest_log.c b/src/quest_log.c index c50771491..d1d0d341e 100644 --- a/src/quest_log.c +++ b/src/quest_log.c @@ -29,6 +29,8 @@ struct UnkStruct_203AE94 u8 unk_0_4:2; u8 unk_0_6:2; u8 unk_1; + u8 unk_2; + u8 unk_3; }; struct UnkStruct_203AE98 @@ -70,24 +72,29 @@ void sub_811175C(u8, struct UnkStruct_203AE98 *); void sub_81118F4(s8); void sub_8111914(void); void sub_8111984(void); -void sub_8112364(void); void sub_8111A34(u8); -bool8 sub_8111F60(void); -void * sub_8113D08(void *, struct UnkStruct_203AE98 *); -void * sub_8113D94(void *, struct UnkStruct_203AE98 *); -void * sub_8113C20(void *, struct UnkStruct_203AE98 *); -void * sub_8113C8C(void *, struct UnkStruct_203AE98 *); -void * sub_8113A78(void *, void **); -void sub_8113ABC(void *); -void sub_81138F8(void); void sub_8111AD8(void); +void sub_8111B80(void); +void sub_8111E20(void); +bool8 sub_8111F60(void); +void sub_8112364(void); +void sub_8112888(u8); void sub_8112940(u8, struct UnkStruct_203AE98 *, u16); void sub_811381C(void); +void sub_81138F8(void); +void * sub_8113A78(void *, void **); +void sub_8113ABC(void *); +bool8 sub_8113AE8(void *); +bool8 sub_8113B44(void *); void sub_8113B88(void); void sub_8113BD8(void); void * sub_8113BF4(void *); -void * sub_8113D48(void *, struct UnkStruct_203AE98 *); +void * sub_8113C20(void *, struct UnkStruct_203AE98 *); +void * sub_8113C8C(void *, struct UnkStruct_203AE98 *); void * sub_8113CC8(void *, struct UnkStruct_203AE98 *); +void * sub_8113D08(void *, struct UnkStruct_203AE98 *); +void * sub_8113D48(void *, struct UnkStruct_203AE98 *); +void * sub_8113D94(void *, struct UnkStruct_203AE98 *); extern const u8 gUnknown_841A155[]; @@ -980,3 +987,32 @@ void sub_8111A34(u8 taskId) break; } } + +void sub_8111AD8(void) +{ + if (gUnknown_203AE94.unk_0_0 == 1) + { + if (--gUnknown_203AE94.unk_2 != 0) + return; + gUnknown_203AE94.unk_0_0 = 0; + gUnknown_203AE94.unk_0_4 = 1; + sub_8112888(2); + } + + if (gUnknown_203AE94.unk_0_4 == 1) + { + if (++gUnknown_203AE94.unk_3 > 15) + { + sub_8111E20(); + gUnknown_203AE94.unk_0_4 = 0; + gUnknown_203AE94.unk_3 = 0; + } + } + if (gUnknown_203AE94.unk_1 < 32) + { + if (sub_8113B44(gUnknown_203AE0C[gUnknown_203AE94.unk_1]) == 1) + sub_8111B80(); + else if (sub_8113AE8(gUnknown_203AE0C[gUnknown_203AE94.unk_1]) == 1) + sub_8111B80(); + } +} -- cgit v1.2.3 From cd3594802cd6ca1d460d89d3e2a007192c1d7bfa Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Fri, 12 Oct 2018 09:48:04 -0400 Subject: through sub_8111CF0 --- asm/quest_log.s | 223 -------------------------------------------------------- src/quest_log.c | 83 +++++++++++++++++++++ 2 files changed, 83 insertions(+), 223 deletions(-) diff --git a/asm/quest_log.s b/asm/quest_log.s index e779da3f6..bed681f5b 100644 --- a/asm/quest_log.s +++ b/asm/quest_log.s @@ -5,229 +5,6 @@ .text - thumb_func_start sub_8111B80 -sub_8111B80: @ 8111B80 - push {r4,lr} - ldr r4, _08111BCC @ =gUnknown_203AE94 - ldrb r1, [r4] - movs r2, 0xF - ands r2, r1 - cmp r2, 0 - bne _08111BC0 - movs r0, 0x10 - negs r0, r0 - ands r0, r1 - movs r1, 0x1 - orrs r0, r1 - movs r1, 0x31 - negs r1, r1 - ands r0, r1 - strb r0, [r4] - strb r2, [r4, 0x3] - bl sub_8111BD4 - strb r0, [r4, 0x2] - ldr r0, _08111BD0 @ =gUnknown_203B044 - ldrh r0, [r0, 0x2] - cmp r0, 0 - bne _08111BB6 - ldrb r0, [r4, 0x1] - adds r0, 0x1 - strb r0, [r4, 0x1] -_08111BB6: - ldrb r0, [r4, 0x1] - cmp r0, 0x20 - bhi _08111BC6 - bl sub_8111D10 -_08111BC0: - movs r0, 0x1 - bl sub_8112888 -_08111BC6: - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_08111BCC: .4byte gUnknown_203AE94 -_08111BD0: .4byte gUnknown_203B044 - thumb_func_end sub_8111B80 - - thumb_func_start sub_8111BD4 -sub_8111BD4: @ 8111BD4 - push {r4,lr} - movs r2, 0 - movs r1, 0 - ldr r3, _08111C0C @ =gStringVar4 - ldrb r0, [r3] - cmp r0, 0xFF - beq _08111C04 - ldr r4, _08111C10 @ =0x000003ff -_08111BE4: - adds r0, r1, r3 - ldrb r0, [r0] - cmp r0, 0xFE - beq _08111BF2 - adds r0, r2, 0x1 - lsls r0, 16 - lsrs r2, r0, 16 -_08111BF2: - adds r0, r1, 0x1 - lsls r0, 16 - lsrs r1, r0, 16 - cmp r1, r4 - bhi _08111C04 - adds r0, r1, r3 - ldrb r0, [r0] - cmp r0, 0xFF - bne _08111BE4 -_08111C04: - cmp r2, 0x13 - bhi _08111C14 - movs r0, 0x5F - b _08111C26 - .align 2, 0 -_08111C0C: .4byte gStringVar4 -_08111C10: .4byte 0x000003ff -_08111C14: - cmp r2, 0x23 - bhi _08111C1C - movs r0, 0x7F - b _08111C26 -_08111C1C: - cmp r2, 0x2D - bls _08111C24 - movs r0, 0xFF - b _08111C26 -_08111C24: - movs r0, 0xBF -_08111C26: - pop {r4} - pop {r1} - bx r1 - thumb_func_end sub_8111BD4 - - thumb_func_start sub_8111C2C -sub_8111C2C: @ 8111C2C - push {lr} - ldr r0, _08111C54 @ =gUnknown_203ADFA - ldrb r0, [r0] - cmp r0, 0x2 - bne _08111C60 - ldr r0, _08111C58 @ =gUnknown_3005E88 - ldrb r0, [r0] - cmp r0, 0 - beq _08111C4E - ldr r0, _08111C5C @ =gUnknown_203AE94 - ldrb r0, [r0] - movs r1, 0xF - ands r1, r0 - cmp r1, 0x1 - beq _08111C4E - cmp r1, 0x2 - bne _08111C60 -_08111C4E: - movs r0, 0x1 - b _08111C62 - .align 2, 0 -_08111C54: .4byte gUnknown_203ADFA -_08111C58: .4byte gUnknown_3005E88 -_08111C5C: .4byte gUnknown_203AE94 -_08111C60: - movs r0, 0 -_08111C62: - pop {r1} - bx r1 - thumb_func_end sub_8111C2C - - thumb_func_start sub_8111C68 -sub_8111C68: @ 8111C68 - push {r4,r5,lr} - ldr r5, _08111C9C @ =gUnknown_203AE94 - ldrb r2, [r5] - movs r4, 0xC0 - ands r4, r2 - cmp r4, 0 - bne _08111CC6 - ldr r0, _08111CA0 @ =gMain - ldrh r1, [r0, 0x2E] - movs r3, 0x1 - ands r3, r1 - cmp r3, 0 - beq _08111CA8 - movs r0, 0x3F - ands r0, r2 - movs r1, 0x80 - orrs r0, r1 - strb r0, [r5] - ldr r0, _08111CA4 @ =gUnknown_3005E88 - strb r4, [r0] - movs r0, 0x3 - negs r0, r0 - bl sub_81118F4 - b _08111CC6 - .align 2, 0 -_08111C9C: .4byte gUnknown_203AE94 -_08111CA0: .4byte gMain -_08111CA4: .4byte gUnknown_3005E88 -_08111CA8: - movs r0, 0x2 - ands r0, r1 - cmp r0, 0 - beq _08111CC6 - movs r0, 0x3F - ands r0, r2 - movs r1, 0x40 - orrs r0, r1 - strb r0, [r5] - ldr r0, _08111CCC @ =gUnknown_3005E88 - strb r3, [r0] - movs r0, 0x3 - negs r0, r0 - bl sub_8111E64 -_08111CC6: - pop {r4,r5} - pop {r0} - bx r0 - .align 2, 0 -_08111CCC: .4byte gUnknown_3005E88 - thumb_func_end sub_8111C68 - - thumb_func_start sub_8111CD0 -sub_8111CD0: @ 8111CD0 - push {lr} - ldr r0, _08111CE4 @ =gUnknown_203AE94 - ldrb r1, [r0] - movs r0, 0xC0 - ands r0, r1 - cmp r0, 0 - bne _08111CE8 - movs r0, 0 - b _08111CEA - .align 2, 0 -_08111CE4: .4byte gUnknown_203AE94 -_08111CE8: - movs r0, 0x1 -_08111CEA: - pop {r1} - bx r1 - thumb_func_end sub_8111CD0 - - thumb_func_start sub_8111CF0 -sub_8111CF0: @ 8111CF0 - push {lr} - ldr r0, _08111D08 @ =gUnknown_203ADFA - ldrb r0, [r0] - cmp r0, 0x2 - bne _08111D02 - ldr r0, _08111D0C @ =gUnknown_203ADF9 - ldrb r0, [r0] - bl sub_8111070 -_08111D02: - pop {r0} - bx r0 - .align 2, 0 -_08111D08: .4byte gUnknown_203ADFA -_08111D0C: .4byte gUnknown_203ADF9 - thumb_func_end sub_8111CF0 - thumb_func_start sub_8111D10 sub_8111D10: @ 8111D10 push {r4,r5,lr} diff --git a/src/quest_log.c b/src/quest_log.c index d1d0d341e..8131d0573 100644 --- a/src/quest_log.c +++ b/src/quest_log.c @@ -52,6 +52,8 @@ EWRAM_DATA struct UnkStruct_203AE94 gUnknown_203AE94 = {0}; EWRAM_DATA struct UnkStruct_203AE98 gUnknown_203AE98[32] = {0}; EWRAM_DATA u16 gUnknown_203AF98 = 0; +EWRAM_DATA u16 gUnknown_203B044[2] = {0}; + void sub_8110A00(void); void sub_8110A3C(void); void sub_8110BB0(u8); @@ -75,7 +77,10 @@ void sub_8111984(void); void sub_8111A34(u8); void sub_8111AD8(void); void sub_8111B80(void); +u8 sub_8111BD4(void); +void sub_8111D10(void); void sub_8111E20(void); +void sub_8111E64(s8); bool8 sub_8111F60(void); void sub_8112364(void); void sub_8112888(u8); @@ -1016,3 +1021,81 @@ void sub_8111AD8(void) sub_8111B80(); } } + +void sub_8111B80(void) +{ + if (gUnknown_203AE94.unk_0_0 == 0) + { + gUnknown_203AE94.unk_0_0 = 1; + gUnknown_203AE94.unk_0_4 = 0; + gUnknown_203AE94.unk_3 = 0; + gUnknown_203AE94.unk_2 = sub_8111BD4(); + if (gUnknown_203B044[1] == 0) + gUnknown_203AE94.unk_1++; + if (gUnknown_203AE94.unk_1 > 32) + return; + sub_8111D10(); + } + sub_8112888(1); +} + +u8 sub_8111BD4(void) +{ + u16 i; + u16 count = 0; + + for (i = 0; i < 0x400 && gStringVar4[i] != EOS; i++) + { + if (gStringVar4[i] != CHAR_NEWLINE) + count++; + } + + if (count < 20) + return 0x5F; + if (count < 36) + return 0x7F; + if (count < 46) + return 0xBF; + return 0xFF; +} + +bool8 sub_8111C2C(void) +{ + if (gUnknown_203ADFA != 2) + return FALSE; + if (gUnknown_3005E88 == 0 || gUnknown_203AE94.unk_0_0 == 1 || gUnknown_203AE94.unk_0_0 == 2) + return TRUE; + return FALSE; +} + +void sub_8111C68(void) +{ + if (gUnknown_203AE94.unk_0_6 == 0) + { + if (gMain.newKeys & A_BUTTON) + { + gUnknown_203AE94.unk_0_6 = 2; + gUnknown_3005E88 = 0; + sub_81118F4(-3); + } + else if (gMain.newKeys & B_BUTTON) + { + gUnknown_203AE94.unk_0_6 = 1; + gUnknown_3005E88 = 0; + sub_8111E64(-3); + } + } +} + +bool8 sub_8111CD0(void) +{ + if (gUnknown_203AE94.unk_0_6 != 0) + return TRUE; + return FALSE; +} + +void sub_8111CF0(void) +{ + if (gUnknown_203ADFA == 2) + sub_8111070(gUnknown_203ADF9); +} -- cgit v1.2.3 From 714d387cbd8e3a9a9e5b522eed42c8132d41e0b0 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Fri, 12 Oct 2018 10:09:38 -0400 Subject: through sub_8111D90 --- asm/quest_log.s | 140 -------------------------------------- data/graphics/unknown_8456638.bin | 1 + data/quest_log.s | 6 -- src/quest_log.c | 59 ++++++++++++++++ 4 files changed, 60 insertions(+), 146 deletions(-) create mode 100644 data/graphics/unknown_8456638.bin diff --git a/asm/quest_log.s b/asm/quest_log.s index bed681f5b..fd78239ff 100644 --- a/asm/quest_log.s +++ b/asm/quest_log.s @@ -5,146 +5,6 @@ .text - thumb_func_start sub_8111D10 -sub_8111D10: @ 8111D10 - push {r4,r5,lr} - sub sp, 0x14 - movs r4, 0 - movs r1, 0 - ldr r2, _08111D80 @ =gStringVar4 - ldrb r0, [r2] - ldr r5, _08111D84 @ =gUnknown_203ADFE - cmp r0, 0xFF - beq _08111D42 -_08111D22: - adds r0, r1, r2 - ldrb r0, [r0] - cmp r0, 0xFE - bne _08111D30 - adds r0, r4, 0x1 - lsls r0, 24 - lsrs r4, r0, 24 -_08111D30: - adds r0, r1, 0x1 - lsls r0, 16 - lsrs r1, r0, 16 - cmp r1, 0xFF - bhi _08111D42 - adds r0, r1, r2 - ldrb r0, [r0] - cmp r0, 0xFF - bne _08111D22 -_08111D42: - ldrb r0, [r5, 0x2] - bl PutWindowTilemap - ldrb r0, [r5, 0x2] - bl sub_8111D90 - ldrb r0, [r5, 0x2] - ldr r1, _08111D88 @ =gUnknown_8456698 - adds r1, r4, r1 - ldrb r3, [r1] - movs r1, 0x1 - str r1, [sp] - movs r2, 0 - str r2, [sp, 0x4] - ldr r1, _08111D8C @ =gUnknown_8456634 - str r1, [sp, 0x8] - str r2, [sp, 0xC] - ldr r1, _08111D80 @ =gStringVar4 - str r1, [sp, 0x10] - movs r1, 0x2 - movs r2, 0x2 - bl AddTextPrinterParametrized2 - movs r0, 0 - bl schedule_bg_copy_tilemap_to_vram - add sp, 0x14 - pop {r4,r5} - pop {r0} - bx r0 - .align 2, 0 -_08111D80: .4byte gStringVar4 -_08111D84: .4byte gUnknown_203ADFE -_08111D88: .4byte gUnknown_8456698 -_08111D8C: .4byte gUnknown_8456634 - thumb_func_end sub_8111D10 - - thumb_func_start sub_8111D90 -sub_8111D90: @ 8111D90 - push {r4-r7,lr} - mov r7, r10 - mov r6, r9 - mov r5, r8 - push {r5-r7} - lsls r0, 24 - lsrs r0, 24 - mov r10, r0 - ldr r0, _08111DC0 @ =gUnknown_8456638 - mov r9, r0 - movs r0, 0xB4 - lsls r0, 5 - bl Alloc - mov r8, r0 - cmp r0, 0 - beq _08111E0C - movs r1, 0 -_08111DB4: - cmp r1, 0 - beq _08111DC4 - cmp r1, 0x5 - beq _08111DC8 - movs r0, 0x1 - b _08111DCA - .align 2, 0 -_08111DC0: .4byte gUnknown_8456638 -_08111DC4: - movs r0, 0 - b _08111DCA -_08111DC8: - movs r0, 0x2 -_08111DCA: - movs r4, 0 - lsls r6, r0, 5 - lsls r0, r1, 4 - adds r7, r1, 0x1 - subs r0, r1 - lsls r5, r0, 1 -_08111DD6: - adds r1, r5, r4 - lsls r1, 5 - add r1, r8 - mov r2, r9 - adds r0, r2, r6 - ldr r2, _08111E1C @ =0x04000008 - bl CpuSet - adds r0, r4, 0x1 - lsls r0, 24 - lsrs r4, r0, 24 - cmp r4, 0x1D - bls _08111DD6 - lsls r0, r7, 24 - lsrs r1, r0, 24 - cmp r1, 0x5 - bls _08111DB4 - movs r2, 0xB4 - lsls r2, 5 - mov r0, r10 - mov r1, r8 - movs r3, 0 - bl CopyToWindowPixelBuffer - mov r0, r8 - bl Free -_08111E0C: - pop {r3-r5} - mov r8, r3 - mov r9, r4 - mov r10, r5 - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_08111E1C: .4byte 0x04000008 - thumb_func_end sub_8111D90 - thumb_func_start sub_8111E20 sub_8111E20: @ 8111E20 push {r4,lr} diff --git a/data/graphics/unknown_8456638.bin b/data/graphics/unknown_8456638.bin new file mode 100644 index 000000000..53ea8cfb8 --- /dev/null +++ b/data/graphics/unknown_8456638.bin @@ -0,0 +1 @@ +»»»»ÌÌÌÌÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÌÌÌÌ»»»» \ No newline at end of file diff --git a/data/quest_log.s b/data/quest_log.s index c2e776414..c7956f82d 100644 --- a/data/quest_log.s +++ b/data/quest_log.s @@ -1,12 +1,6 @@ .section .rodata .align 2, 0 -gUnknown_8456638:: @ 8456638 - .incbin "baserom.gba", 0x456638, 0x60 - -gUnknown_8456698:: @ 8456698 - .incbin "baserom.gba", 0x456698, 0x4 - gUnknown_845669C:: @ 845669C .incbin "baserom.gba", 0x45669C, 0x8 diff --git a/src/quest_log.c b/src/quest_log.c index 8131d0573..4cf7e6c95 100644 --- a/src/quest_log.c +++ b/src/quest_log.c @@ -79,6 +79,7 @@ void sub_8111AD8(void); void sub_8111B80(void); u8 sub_8111BD4(void); void sub_8111D10(void); +void sub_8111D90(u8); void sub_8111E20(void); void sub_8111E64(s8); bool8 sub_8111F60(void); @@ -111,6 +112,10 @@ const struct WindowTemplate gUnknown_845661C[3] = { const struct TextColor gUnknown_8456634 = {15, 1, 12}; +const u16 gUnknown_8456638[] = INCBIN_U16("data/graphics/unknown_8456638.bin"); + +const u8 gUnknown_8456698[] = {17, 10, 3}; + void sub_8110840(void * a0) { size_t r1 = (void *)gSaveBlock1Ptr - a0; @@ -1099,3 +1104,57 @@ void sub_8111CF0(void) if (gUnknown_203ADFA == 2) sub_8111070(gUnknown_203ADF9); } + +void sub_8111D10(void) +{ + u16 i; + u8 count = 0; + + for (i = 0; i < 0x100 && gStringVar4[i] != EOS; i++) + { + if (gStringVar4[i] == CHAR_NEWLINE) + count++; + } + + PutWindowTilemap(gUnknown_203ADFE[2]); + sub_8111D90(gUnknown_203ADFE[2]); + AddTextPrinterParametrized2(gUnknown_203ADFE[2], 2, 2, gUnknown_8456698[count], 1, 0, &gUnknown_8456634, 0, gStringVar4); + schedule_bg_copy_tilemap_to_vram(0); +} + +void sub_8111D90(u8 a0) +{ + const u16 * src = gUnknown_8456638; + u16 * buffer = Alloc(0x1680); + u8 i, j, y; + + if (buffer) + { + for (i = 0; i < 6; i++) + { + switch (i) + { + default: + y = 1; + break; + case 0: + y = 0; + break; + case 5: + y = 2; + break; + } + + // r6 = y * 32 + // r5 = 2 * (i % 16) + // r4 = j + for (j = 0; j < 30; j++) + { + CpuCopy32(src + 16 * y, buffer + 16 * (2 * (15 * i) + j), 32); + } + } + + CopyToWindowPixelBuffer(a0, (const u8 *)buffer, 0x1680, 0); + Free(buffer); + } +} -- cgit v1.2.3 From 9377dc23e2dcb8a293d8c0d1193c4d708045e08d Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Fri, 12 Oct 2018 12:18:17 -0400 Subject: through sub_8111F8C --- asm/battle_2.s | 16 +-- asm/battle_anim.s | 4 +- asm/battle_anim_80A22E8.s | 48 +++---- asm/battle_anim_80EEC0C.s | 12 +- asm/battle_controller_oak.s | 68 ++++----- asm/battle_controller_player.s | 20 +-- asm/battle_controller_pokedude.s | 52 +++---- asm/battle_controller_safari.s | 12 +- asm/battle_records.s | 8 +- asm/battle_script_commands.s | 28 ++-- asm/battle_transition.s | 16 +-- asm/berry_pouch.s | 12 +- asm/cable_club.s | 16 +-- asm/clear_save_data_screen.s | 8 +- asm/credits.s | 36 ++--- asm/diploma.s | 8 +- asm/egg_hatch.s | 16 +-- asm/evolution_graphics.s | 4 +- asm/evolution_scene.s | 48 +++---- asm/fame_checker.s | 8 +- asm/field_effect.s | 36 ++--- asm/field_fadetransition.s | 4 +- asm/field_specials.s | 8 +- asm/field_weather.s | 8 +- asm/fldeff_sweetscent.s | 8 +- asm/hall_of_fame.s | 8 +- asm/hof_pc.s | 8 +- asm/intro.s | 16 +-- asm/item_menu.s | 44 +++--- asm/item_pc.s | 12 +- asm/item_use.s | 20 +-- asm/learn_move.s | 20 +-- asm/link_rfu.s | 4 +- asm/link_rfu_3.s | 8 +- asm/mail.s | 8 +- asm/main_menu.s | 32 ++--- asm/mevent_8145654.s | 16 +-- asm/naming_screen.s | 8 +- asm/oak_speech.s | 52 +++---- asm/option_menu.s | 4 +- asm/overworld.s | 28 ++-- asm/palette.s | 100 ++++++------- asm/party_menu.s | 92 ++++++------ asm/player_pc.s | 20 +-- asm/pokedex_screen.s | 28 ++-- asm/pokemon_special_anim.s | 28 ++-- asm/pokemon_storage_system.s | 4 +- asm/pokemon_summary_screen.s | 16 +-- asm/quest_log.s | 219 +---------------------------- asm/region_map.s | 20 +-- asm/reshow_battle_screen.s | 8 +- asm/roulette_util.s | 4 +- asm/scrcmd.s | 4 +- asm/script_menu.s | 4 +- asm/script_pokemon_util_80BF8FC.s | 4 +- asm/seagallop.s | 4 +- asm/shop.s | 12 +- asm/slot_machine.s | 8 +- asm/start_menu.s | 28 ++-- asm/teachy_tv.s | 12 +- asm/title_screen.s | 34 ++--- asm/tm_case.s | 24 ++-- asm/trade.s | 128 ++++++++--------- asm/union_room_chat.s | 8 +- asm/unk_8147AA8.s | 8 +- asm/unk_814BB4C.s | 4 +- asm/unk_814D5C8.s | 8 +- asm/unk_81507FC.s | 12 +- asm/wireless_communication_status_screen.s | 8 +- include/field_player_avatar.h | 2 + include/map_obj_80688E4.h | 6 + include/palette.h | 2 +- src/bg.c | 13 +- src/quest_log.c | 77 +++++++++- sym_ewram.txt | 2 +- 75 files changed, 806 insertions(+), 937 deletions(-) create mode 100644 include/map_obj_80688E4.h diff --git a/asm/battle_2.s b/asm/battle_2.s index 086603fe1..92cbd66b4 100644 --- a/asm/battle_2.s +++ b/asm/battle_2.s @@ -1620,7 +1620,7 @@ _08010AF0: .4byte gMain _08010AF4: .4byte gBattleTypeFlags _08010AF8: .4byte sub_80109C8 _08010AFC: - ldr r0, _08010B1C @ =gUnknown_2037AB8 + ldr r0, _08010B1C @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -1635,7 +1635,7 @@ _08010AFC: bl sub_800AB9C b _08010B82 .align 2, 0 -_08010B1C: .4byte gUnknown_2037AB8 +_08010B1C: .4byte gPaletteFade _08010B20: .4byte gUnknown_3003F3C _08010B24: bl sub_800AAC0 @@ -2439,7 +2439,7 @@ _080111B8: .4byte 0x00000439 CB2_QuitRecordedBattle: @ 80111BC push {lr} bl UpdatePaletteFade - ldr r0, _080111E4 @ =gUnknown_2037AB8 + ldr r0, _080111E4 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -2454,7 +2454,7 @@ _080111DE: pop {r0} bx r0 .align 2, 0 -_080111E4: .4byte gUnknown_2037AB8 +_080111E4: .4byte gPaletteFade _080111E8: .4byte gMain thumb_func_end CB2_QuitRecordedBattle @@ -3726,7 +3726,7 @@ _08011C08: strb r0, [r4] b _08011C34 _08011C10: - ldr r0, _08011C3C @ =gUnknown_2037AB8 + ldr r0, _08011C3C @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -3745,7 +3745,7 @@ _08011C34: pop {r0} bx r0 .align 2, 0 -_08011C3C: .4byte gUnknown_2037AB8 +_08011C3C: .4byte gPaletteFade _08011C40: .4byte gMain thumb_func_end sub_8011BB0 @@ -11485,7 +11485,7 @@ _08015A2C: .4byte gUnknown_2023D74 thumb_func_start sub_8015A30 sub_8015A30: @ 8015A30 push {lr} - ldr r0, _08015A58 @ =gUnknown_2037AB8 + ldr r0, _08015A58 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -11505,7 +11505,7 @@ _08015A52: ldr r0, _08015A68 @ =ReturnFromBattleToOverworld b _08015A70 .align 2, 0 -_08015A58: .4byte gUnknown_2037AB8 +_08015A58: .4byte gPaletteFade _08015A5C: .4byte gUnknown_3004FD4 _08015A60: .4byte gUnknown_2023E8A _08015A64: .4byte gUnknown_3004F84 diff --git a/asm/battle_anim.s b/asm/battle_anim.s index c258fa7b1..f15200700 100644 --- a/asm/battle_anim.s +++ b/asm/battle_anim.s @@ -2536,7 +2536,7 @@ sub_8073850: @ 8073850 .align 2, 0 _08073884: .4byte gTasks _08073888: - ldr r2, _080738A4 @ =gUnknown_2037AB8 + ldr r2, _080738A4 @ =gPaletteFade ldrb r1, [r2, 0x7] movs r0, 0x80 ands r0, r1 @@ -2551,7 +2551,7 @@ _08073888: strb r0, [r1] b _080738F0 .align 2, 0 -_080738A4: .4byte gUnknown_2037AB8 +_080738A4: .4byte gPaletteFade _080738A8: .4byte gUnknown_2037F17 _080738AC: cmp r3, 0x2 diff --git a/asm/battle_anim_80A22E8.s b/asm/battle_anim_80A22E8.s index 90b0c8c86..e38fc6501 100644 --- a/asm/battle_anim_80A22E8.s +++ b/asm/battle_anim_80A22E8.s @@ -8218,7 +8218,7 @@ _080A6178: _080A618C: .4byte 0x00007fbb _080A6190: .4byte gUnknown_20375F8 _080A6194: - ldr r0, _080A61DC @ =gUnknown_2037AB8 + ldr r0, _080A61DC @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -8257,7 +8257,7 @@ _080A61CA: strh r0, [r4, 0xA] b _080A6214 .align 2, 0 -_080A61DC: .4byte gUnknown_2037AB8 +_080A61DC: .4byte gPaletteFade _080A61E0: .4byte gSprites _080A61E4: .4byte gUnknown_83E3734 _080A61E8: .4byte gUnknown_83E3764 @@ -8288,7 +8288,7 @@ _080A6214: .align 2, 0 _080A621C: .4byte 0x00007fbb _080A6220: - ldr r0, _080A6240 @ =gUnknown_2037AB8 + ldr r0, _080A6240 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -8304,7 +8304,7 @@ _080A6232: pop {r0} bx r0 .align 2, 0 -_080A6240: .4byte gUnknown_2037AB8 +_080A6240: .4byte gPaletteFade thumb_func_end sub_80A60A8 thumb_func_start sub_80A6244 @@ -41851,7 +41851,7 @@ sub_80B65F0: @ 80B65F0 push {r4,r5,lr} lsls r0, 24 lsrs r5, r0, 24 - ldr r0, _080B663C @ =gUnknown_2037AB8 + ldr r0, _080B663C @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -41883,7 +41883,7 @@ _080B6636: pop {r0} bx r0 .align 2, 0 -_080B663C: .4byte gUnknown_2037AB8 +_080B663C: .4byte gPaletteFade _080B6640: .4byte gUnknown_2022984 _080B6644: .4byte gUnknown_2022986 _080B6648: .4byte 0x00003f3f @@ -48522,7 +48522,7 @@ sub_80B9A14: @ 80B9A14 sub_80B9A5C: @ 80B9A5C push {lr} adds r2, r0, 0 - ldr r0, _080B9A78 @ =gUnknown_2037AB8 + ldr r0, _080B9A78 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -48534,7 +48534,7 @@ _080B9A72: pop {r0} bx r0 .align 2, 0 -_080B9A78: .4byte gUnknown_2037AB8 +_080B9A78: .4byte gPaletteFade thumb_func_end sub_80B9A5C thumb_func_start sub_80B9A7C @@ -48592,7 +48592,7 @@ sub_80B9AD0: @ 80B9AD0 strh r0, [r4, 0x2E] b _080B9B54 _080B9AE4: - ldr r0, _080B9B00 @ =gUnknown_2037AB8 + ldr r0, _080B9B00 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -48606,7 +48606,7 @@ _080B9AE4: str r0, [r4, 0x1C] b _080B9B54 .align 2, 0 -_080B9B00: .4byte gUnknown_2037AB8 +_080B9B00: .4byte gPaletteFade _080B9B04: .4byte sub_80B9B5C _080B9B08: movs r2, 0x3C @@ -48656,7 +48656,7 @@ _080B9B54: sub_80B9B5C: @ 80B9B5C push {r4,lr} adds r4, r0, 0 - ldr r0, _080B9B88 @ =gUnknown_2037AB8 + ldr r0, _080B9B88 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -48675,7 +48675,7 @@ _080B9B82: pop {r0} bx r0 .align 2, 0 -_080B9B88: .4byte gUnknown_2037AB8 +_080B9B88: .4byte gPaletteFade thumb_func_end sub_80B9B5C thumb_func_start sub_80B9B8C @@ -48806,7 +48806,7 @@ sub_80B9C7C: @ 80B9C7C lsls r0, 24 lsrs r3, r0, 24 adds r4, r3, 0 - ldr r0, _080B9CB4 @ =gUnknown_2037AB8 + ldr r0, _080B9CB4 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -48831,7 +48831,7 @@ sub_80B9C7C: @ 80B9C7C ldrb r2, [r3, 0x10] b _080B9CC0 .align 2, 0 -_080B9CB4: .4byte gUnknown_2037AB8 +_080B9CB4: .4byte gPaletteFade _080B9CB8: .4byte gTasks _080B9CBC: ldrb r1, [r3, 0x10] @@ -49001,7 +49001,7 @@ sub_80B9DF0: @ 80B9DF0 lsls r0, 24 lsrs r3, r0, 24 adds r4, r3, 0 - ldr r0, _080B9E28 @ =gUnknown_2037AB8 + ldr r0, _080B9E28 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -49026,7 +49026,7 @@ sub_80B9DF0: @ 80B9DF0 ldrb r2, [r3, 0x10] b _080B9E34 .align 2, 0 -_080B9E28: .4byte gUnknown_2037AB8 +_080B9E28: .4byte gPaletteFade _080B9E2C: .4byte gTasks _080B9E30: ldrb r1, [r3, 0x10] @@ -49146,7 +49146,7 @@ sub_80B9F04: @ 80B9F04 lsls r0, 24 lsrs r3, r0, 24 adds r4, r3, 0 - ldr r0, _080B9F3C @ =gUnknown_2037AB8 + ldr r0, _080B9F3C @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -49171,7 +49171,7 @@ sub_80B9F04: @ 80B9F04 ldrb r2, [r3, 0x10] b _080B9F48 .align 2, 0 -_080B9F3C: .4byte gUnknown_2037AB8 +_080B9F3C: .4byte gPaletteFade _080B9F40: .4byte gTasks _080B9F44: ldrb r1, [r3, 0x10] @@ -49274,7 +49274,7 @@ sub_80B9FD8: @ 80B9FD8 .align 2, 0 _080B9FFC: .4byte gTasks _080BA000: - ldr r0, _080BA01C @ =gUnknown_2037AB8 + ldr r0, _080BA01C @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -49288,7 +49288,7 @@ _080BA000: str r0, [r4] b _080BA084 .align 2, 0 -_080BA01C: .4byte gUnknown_2037AB8 +_080BA01C: .4byte gPaletteFade _080BA020: .4byte sub_80BA090 _080BA024: ldrh r0, [r4, 0x16] @@ -49353,7 +49353,7 @@ sub_80BA090: @ 80BA090 sub sp, 0x4 lsls r0, 24 lsrs r4, r0, 24 - ldr r0, _080BA0E0 @ =gUnknown_2037AB8 + ldr r0, _080BA0E0 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -49387,7 +49387,7 @@ _080BA0D6: pop {r0} bx r0 .align 2, 0 -_080BA0E0: .4byte gUnknown_2037AB8 +_080BA0E0: .4byte gPaletteFade _080BA0E4: .4byte gTasks thumb_func_end sub_80BA090 @@ -50765,7 +50765,7 @@ sub_80BAB78: @ 80BAB78 push {lr} lsls r0, 24 lsrs r2, r0, 24 - ldr r0, _080BAB94 @ =gUnknown_2037AB8 + ldr r0, _080BAB94 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -50777,7 +50777,7 @@ _080BAB90: pop {r0} bx r0 .align 2, 0 -_080BAB94: .4byte gUnknown_2037AB8 +_080BAB94: .4byte gPaletteFade thumb_func_end sub_80BAB78 thumb_func_start sub_80BAB98 diff --git a/asm/battle_anim_80EEC0C.s b/asm/battle_anim_80EEC0C.s index 84c8c93e2..f79c453b6 100644 --- a/asm/battle_anim_80EEC0C.s +++ b/asm/battle_anim_80EEC0C.s @@ -2684,7 +2684,7 @@ _080F014E: strh r0, [r4, 0x2E] b _080F017C _080F0156: - ldr r0, _080F0184 @ =gUnknown_2037AB8 + ldr r0, _080F0184 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -2707,7 +2707,7 @@ _080F017C: pop {r0} bx r0 .align 2, 0 -_080F0184: .4byte gUnknown_2037AB8 +_080F0184: .4byte gPaletteFade _080F0188: .4byte sub_80F018C thumb_func_end sub_80F00A4 @@ -4953,7 +4953,7 @@ sub_80F12E0: @ 80F12E0 _080F1330: .4byte gTasks _080F1334: .4byte gUnknown_840C1C4 _080F1338: - ldr r0, _080F1368 @ =gUnknown_2037AB8 + ldr r0, _080F1368 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -4977,7 +4977,7 @@ _080F1360: pop {r0} bx r0 .align 2, 0 -_080F1368: .4byte gUnknown_2037AB8 +_080F1368: .4byte gPaletteFade _080F136C: .4byte 0x00007fff thumb_func_end sub_80F12E0 @@ -4987,7 +4987,7 @@ sub_80F1370: @ 80F1370 sub sp, 0x4 lsls r0, 24 lsrs r2, r0, 24 - ldr r0, _080F13B0 @ =gUnknown_2037AB8 + ldr r0, _080F13B0 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -5016,7 +5016,7 @@ _080F13A8: pop {r0} bx r0 .align 2, 0 -_080F13B0: .4byte gUnknown_2037AB8 +_080F13B0: .4byte gPaletteFade _080F13B4: .4byte gTasks _080F13B8: .4byte 0x00007fff _080F13BC: .4byte sub_80F13C0 diff --git a/asm/battle_controller_oak.s b/asm/battle_controller_oak.s index b5905ade8..c1488e453 100644 --- a/asm/battle_controller_oak.s +++ b/asm/battle_controller_oak.s @@ -464,7 +464,7 @@ _080E792A: thumb_func_start sub_80E7930 sub_80E7930: @ 80E7930 push {lr} - ldr r0, _080E7960 @ =gUnknown_2037AB8 + ldr r0, _080E7960 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -487,7 +487,7 @@ _080E795A: pop {r0} bx r0 .align 2, 0 -_080E7960: .4byte gUnknown_2037AB8 +_080E7960: .4byte gPaletteFade _080E7964: .4byte gMain _080E7968: .4byte 0x00000439 _080E796C: .4byte gUnknown_3004F80 @@ -536,7 +536,7 @@ _080E79B4: .4byte gActiveBattler thumb_func_start sub_80E79B8 sub_80E79B8: @ 80E79B8 push {r4,lr} - ldr r0, _080E79FC @ =gUnknown_2037AB8 + ldr r0, _080E79FC @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -568,7 +568,7 @@ _080E79F6: pop {r0} bx r0 .align 2, 0 -_080E79FC: .4byte gUnknown_2037AB8 +_080E79FC: .4byte gPaletteFade _080E7A00: .4byte gUnknown_3004FE0 _080E7A04: .4byte gActiveBattler _080E7A08: .4byte sub_80E7A14 @@ -584,7 +584,7 @@ sub_80E7A14: @ 80E7A14 ldr r0, _080E7A48 @ =sub_8011100 cmp r1, r0 bne _080E7A6A - ldr r0, _080E7A4C @ =gUnknown_2037AB8 + ldr r0, _080E7A4C @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -603,7 +603,7 @@ sub_80E7A14: @ 80E7A14 .align 2, 0 _080E7A44: .4byte gMain _080E7A48: .4byte sub_8011100 -_080E7A4C: .4byte gUnknown_2037AB8 +_080E7A4C: .4byte gPaletteFade _080E7A50: .4byte gUnknown_203B0C0 _080E7A54: .4byte gUnknown_203B0C1 _080E7A58: .4byte gUnknown_203B0DC @@ -622,7 +622,7 @@ _080E7A6A: thumb_func_start sub_80E7A70 sub_80E7A70: @ 80E7A70 push {lr} - ldr r0, _080E7AA8 @ =gUnknown_2037AB8 + ldr r0, _080E7AA8 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -646,7 +646,7 @@ sub_80E7A70: @ 80E7A70 bl sub_8107ECC b _080E7AC0 .align 2, 0 -_080E7AA8: .4byte gUnknown_2037AB8 +_080E7AA8: .4byte gPaletteFade _080E7AAC: .4byte gUnknown_3004FE0 _080E7AB0: .4byte gActiveBattler _080E7AB4: .4byte sub_80E7AC4 @@ -666,7 +666,7 @@ sub_80E7AC4: @ 80E7AC4 ldr r0, _080E7B18 @ =sub_8011100 cmp r1, r0 bne _080E7B42 - ldr r0, _080E7B1C @ =gUnknown_2037AB8 + ldr r0, _080E7B1C @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -700,7 +700,7 @@ sub_80E7AC4: @ 80E7AC4 .align 2, 0 _080E7B14: .4byte gMain _080E7B18: .4byte sub_8011100 -_080E7B1C: .4byte gUnknown_2037AB8 +_080E7B1C: .4byte gPaletteFade _080E7B20: .4byte gUnknown_203AD30 _080E7B24: .4byte gBattleTypeFlags _080E7B28: .4byte gUnknown_3004FE0 @@ -1731,7 +1731,7 @@ _080E8384: .4byte _080E8500 .4byte _080E8530 _080E83A8: - ldr r0, _080E83EC @ =gUnknown_2037AB8 + ldr r0, _080E83EC @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -1763,9 +1763,9 @@ _080E83BA: ldr r1, [r7] b _080E8522 .align 2, 0 -_080E83EC: .4byte gUnknown_2037AB8 +_080E83EC: .4byte gPaletteFade _080E83F0: - ldr r0, _080E8404 @ =gUnknown_2037AB8 + ldr r0, _080E8404 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -1776,7 +1776,7 @@ _080E83FE: bl sub_80EB30C b _080E851E .align 2, 0 -_080E8404: .4byte gUnknown_2037AB8 +_080E8404: .4byte gPaletteFade _080E8408: ldr r0, _080E8418 @ =gUnknown_83FDAE2 bl BattleStringExpandPlaceholdersToDisplayedString @@ -1823,7 +1823,7 @@ _080E8430: _080E8460: .4byte gBitTable _080E8464: .4byte gBattleStruct _080E8468: - ldr r0, _080E8484 @ =gUnknown_2037AB8 + ldr r0, _080E8484 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -1836,7 +1836,7 @@ _080E8468: bl sub_80D87BC b _080E851E .align 2, 0 -_080E8484: .4byte gUnknown_2037AB8 +_080E8484: .4byte gPaletteFade _080E8488: .4byte gUnknown_83FDB92 _080E848C: .4byte gUnknown_202298C _080E8490: @@ -1873,7 +1873,7 @@ _080E8490: _080E84D0: .4byte gBitTable _080E84D4: .4byte gBattleStruct _080E84D8: - ldr r0, _080E84F4 @ =gUnknown_2037AB8 + ldr r0, _080E84F4 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -1886,7 +1886,7 @@ _080E84D8: bl sub_80D87BC b _080E851E .align 2, 0 -_080E84F4: .4byte gUnknown_2037AB8 +_080E84F4: .4byte gPaletteFade _080E84F8: .4byte gUnknown_83FDBEF _080E84FC: .4byte gUnknown_202298C _080E8500: @@ -1915,7 +1915,7 @@ _080E8522: .align 2, 0 _080E852C: .4byte gBattleStruct _080E8530: - ldr r0, _080E8568 @ =gUnknown_2037AB8 + ldr r0, _080E8568 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -1940,7 +1940,7 @@ _080E855E: pop {r0} bx r0 .align 2, 0 -_080E8568: .4byte gUnknown_2037AB8 +_080E8568: .4byte gPaletteFade _080E856C: .4byte gBattleStruct thumb_func_end sub_80E835C @@ -2070,7 +2070,7 @@ _080E8634: ldr r1, [r5] b _080E86A6 _080E865A: - ldr r0, _080E866C @ =gUnknown_2037AB8 + ldr r0, _080E866C @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -2079,7 +2079,7 @@ _080E865A: bl sub_80EB30C b _080E86A2 .align 2, 0 -_080E866C: .4byte gUnknown_2037AB8 +_080E866C: .4byte gPaletteFade _080E8670: adds r0, r2, 0 bl BattleStringExpandPlaceholdersToDisplayedString @@ -2115,7 +2115,7 @@ _080E86A6: .align 2, 0 _080E86B0: .4byte gBattleStruct _080E86B4: - ldr r0, _080E86D8 @ =gUnknown_2037AB8 + ldr r0, _080E86D8 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -2131,7 +2131,7 @@ _080E86B4: bl WallyBufferExecCompleted b _080E86E4 .align 2, 0 -_080E86D8: .4byte gUnknown_2037AB8 +_080E86D8: .4byte gPaletteFade _080E86DC: .4byte gActiveBattler _080E86E0: bl OpponentBufferExecCompleted @@ -2184,7 +2184,7 @@ _080E872C: .4byte _080E8848 .4byte _080E8880 _080E8748: - ldr r0, _080E8780 @ =gUnknown_2037AB8 + ldr r0, _080E8780 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -2211,10 +2211,10 @@ _080E875A: ldr r1, [r5] b _080E886C .align 2, 0 -_080E8780: .4byte gUnknown_2037AB8 +_080E8780: .4byte gPaletteFade _080E8784: .4byte gActiveBattler _080E8788: - ldr r0, _080E87C8 @ =gUnknown_2037AB8 + ldr r0, _080E87C8 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -2247,10 +2247,10 @@ _080E879A: ldr r1, [r5] b _080E886C .align 2, 0 -_080E87C8: .4byte gUnknown_2037AB8 +_080E87C8: .4byte gPaletteFade _080E87CC: .4byte gBitTable _080E87D0: - ldr r0, _080E87E4 @ =gUnknown_2037AB8 + ldr r0, _080E87E4 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -2259,7 +2259,7 @@ _080E87D0: bl sub_80EB30C b _080E8868 .align 2, 0 -_080E87E4: .4byte gUnknown_2037AB8 +_080E87E4: .4byte gPaletteFade _080E87E8: ldr r0, _080E87F8 @ =gUnknown_83FDCD2 bl BattleStringExpandPlaceholdersToDisplayedString @@ -2304,7 +2304,7 @@ _080E8800: _080E8840: .4byte gBitTable _080E8844: .4byte gBattleStruct _080E8848: - ldr r0, _080E8878 @ =gUnknown_2037AB8 + ldr r0, _080E8878 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -2329,10 +2329,10 @@ _080E886C: strb r0, [r1] b _080E88AA .align 2, 0 -_080E8878: .4byte gUnknown_2037AB8 +_080E8878: .4byte gPaletteFade _080E887C: .4byte gBattleStruct _080E8880: - ldr r0, _080E88B4 @ =gUnknown_2037AB8 + ldr r0, _080E88B4 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -2356,7 +2356,7 @@ _080E88AA: pop {r0} bx r0 .align 2, 0 -_080E88B4: .4byte gUnknown_2037AB8 +_080E88B4: .4byte gPaletteFade _080E88B8: .4byte gUnknown_203AD30 _080E88BC: .4byte gBattleStruct thumb_func_end sub_80E8704 diff --git a/asm/battle_controller_player.s b/asm/battle_controller_player.s index 6c6587e9c..38d4081d3 100644 --- a/asm/battle_controller_player.s +++ b/asm/battle_controller_player.s @@ -2396,7 +2396,7 @@ _0802F6A4: .4byte sub_8011A1C thumb_func_start sub_802F6A8 sub_802F6A8: @ 802F6A8 push {lr} - ldr r0, _0802F6D0 @ =gUnknown_2037AB8 + ldr r0, _0802F6D0 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -2415,7 +2415,7 @@ sub_802F6A8: @ 802F6A8 bl sub_800AAC0 b _0802F6E0 .align 2, 0 -_0802F6D0: .4byte gUnknown_2037AB8 +_0802F6D0: .4byte gPaletteFade _0802F6D4: .4byte gBattleTypeFlags _0802F6D8: .4byte gUnknown_3003F3C _0802F6DC: @@ -4293,7 +4293,7 @@ _08030622: thumb_func_start sub_8030628 sub_8030628: @ 8030628 push {r4,lr} - ldr r0, _0803066C @ =gUnknown_2037AB8 + ldr r0, _0803066C @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -4325,7 +4325,7 @@ _08030666: pop {r0} bx r0 .align 2, 0 -_0803066C: .4byte gUnknown_2037AB8 +_0803066C: .4byte gPaletteFade _08030670: .4byte gUnknown_3004FE0 _08030674: .4byte gActiveBattler _08030678: .4byte sub_8030684 @@ -4341,7 +4341,7 @@ sub_8030684: @ 8030684 ldr r0, _080306B8 @ =sub_8011100 cmp r1, r0 bne _080306F4 - ldr r0, _080306BC @ =gUnknown_2037AB8 + ldr r0, _080306BC @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -4360,7 +4360,7 @@ sub_8030684: @ 8030684 .align 2, 0 _080306B4: .4byte gMain _080306B8: .4byte sub_8011100 -_080306BC: .4byte gUnknown_2037AB8 +_080306BC: .4byte gPaletteFade _080306C0: .4byte gUnknown_203B0C0 _080306C4: .4byte gUnknown_203B0C1 _080306C8: .4byte gUnknown_203B0DC @@ -4395,7 +4395,7 @@ _080306FC: .4byte gActiveBattler thumb_func_start sub_8030700 sub_8030700: @ 8030700 push {lr} - ldr r0, _0803072C @ =gUnknown_2037AB8 + ldr r0, _0803072C @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -4415,7 +4415,7 @@ _08030728: pop {r0} bx r0 .align 2, 0 -_0803072C: .4byte gUnknown_2037AB8 +_0803072C: .4byte gPaletteFade _08030730: .4byte gUnknown_3004FE0 _08030734: .4byte gActiveBattler _08030738: .4byte CompleteWhenChoseItem @@ -4429,7 +4429,7 @@ CompleteWhenChoseItem: @ 803073C ldr r0, _0803076C @ =sub_8011100 cmp r1, r0 bne _08030762 - ldr r0, _08030770 @ =gUnknown_2037AB8 + ldr r0, _08030770 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -4446,7 +4446,7 @@ _08030762: .align 2, 0 _08030768: .4byte gMain _0803076C: .4byte sub_8011100 -_08030770: .4byte gUnknown_2037AB8 +_08030770: .4byte gPaletteFade _08030774: .4byte gUnknown_203AD30 thumb_func_end CompleteWhenChoseItem diff --git a/asm/battle_controller_pokedude.s b/asm/battle_controller_pokedude.s index fcfa5d275..9e18ea91c 100644 --- a/asm/battle_controller_pokedude.s +++ b/asm/battle_controller_pokedude.s @@ -227,7 +227,7 @@ _0815624E: thumb_func_start sub_8156254 sub_8156254: @ 8156254 push {lr} - ldr r0, _08156284 @ =gUnknown_2037AB8 + ldr r0, _08156284 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -250,7 +250,7 @@ _0815627E: pop {r0} bx r0 .align 2, 0 -_08156284: .4byte gUnknown_2037AB8 +_08156284: .4byte gPaletteFade _08156288: .4byte gMain _0815628C: .4byte 0x00000439 _08156290: .4byte gUnknown_3004F80 @@ -550,7 +550,7 @@ sub_81564E4: @ 81564E4 thumb_func_start sub_81564F0 sub_81564F0: @ 81564F0 push {lr} - ldr r0, _08156524 @ =gUnknown_2037AB8 + ldr r0, _08156524 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -574,7 +574,7 @@ _08156520: pop {r0} bx r0 .align 2, 0 -_08156524: .4byte gUnknown_2037AB8 +_08156524: .4byte gPaletteFade _08156528: .4byte gUnknown_3004FE0 _0815652C: .4byte gActiveBattler _08156530: .4byte sub_8156538 @@ -589,7 +589,7 @@ sub_8156538: @ 8156538 ldr r0, _0815656C @ =sub_8011100 cmp r1, r0 bne _0815658E - ldr r0, _08156570 @ =gUnknown_2037AB8 + ldr r0, _08156570 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -608,7 +608,7 @@ sub_8156538: @ 8156538 .align 2, 0 _08156568: .4byte gMain _0815656C: .4byte sub_8011100 -_08156570: .4byte gUnknown_2037AB8 +_08156570: .4byte gPaletteFade _08156574: .4byte gUnknown_203B0C0 _08156578: .4byte gUnknown_203B0C1 _0815657C: .4byte gUnknown_203B0DC @@ -627,7 +627,7 @@ _0815658E: thumb_func_start sub_8156594 sub_8156594: @ 8156594 push {lr} - ldr r0, _081565C8 @ =gUnknown_2037AB8 + ldr r0, _081565C8 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -652,7 +652,7 @@ _081565C4: movs r0, 0x7 b _081565DE .align 2, 0 -_081565C8: .4byte gUnknown_2037AB8 +_081565C8: .4byte gPaletteFade _081565CC: .4byte gUnknown_3004FE0 _081565D0: .4byte gActiveBattler _081565D4: .4byte sub_81565E8 @@ -674,7 +674,7 @@ sub_81565E8: @ 81565E8 ldr r0, _08156618 @ =sub_8011100 cmp r1, r0 bne _0815660E - ldr r0, _0815661C @ =gUnknown_2037AB8 + ldr r0, _0815661C @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -691,7 +691,7 @@ _0815660E: .align 2, 0 _08156614: .4byte gMain _08156618: .4byte sub_8011100 -_0815661C: .4byte gUnknown_2037AB8 +_0815661C: .4byte gPaletteFade _08156620: .4byte gUnknown_203AD30 thumb_func_end sub_81565E8 @@ -7222,7 +7222,7 @@ _08159BDC: .4byte _08159C64 .4byte _08159CB4 _08159BF0: - ldr r0, _08159C10 @ =gUnknown_2037AB8 + ldr r0, _08159C10 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -7238,9 +7238,9 @@ _08159BF0: movs r3, 0x8 b _08159C90 .align 2, 0 -_08159C10: .4byte gUnknown_2037AB8 +_08159C10: .4byte gPaletteFade _08159C14: - ldr r0, _08159C3C @ =gUnknown_2037AB8 + ldr r0, _08159C3C @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -7259,7 +7259,7 @@ _08159C14: adds r0, r5 b _08159C9E .align 2, 0 -_08159C3C: .4byte gUnknown_2037AB8 +_08159C3C: .4byte gPaletteFade _08159C40: .4byte gUnknown_2022976 _08159C44: ldr r1, _08159C5C @ =gUnknown_2022976 @@ -7314,7 +7314,7 @@ _08159CA8: .4byte gMain _08159CAC: .4byte gUnknown_3005EE0 _08159CB0: .4byte gActiveBattler _08159CB4: - ldr r0, _08159CF8 @ =gUnknown_2037AB8 + ldr r0, _08159CF8 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -7346,7 +7346,7 @@ _08159CEE: pop {r0} bx r0 .align 2, 0 -_08159CF8: .4byte gUnknown_2037AB8 +_08159CF8: .4byte gPaletteFade _08159CFC: .4byte 0x00000137 _08159D00: .4byte gUnknown_2022976 thumb_func_end sub_8159BA8 @@ -7386,7 +7386,7 @@ _08159D34: .4byte _08159E64 .4byte _08159EA4 _08159D50: - ldr r0, _08159D90 @ =gUnknown_2037AB8 + ldr r0, _08159D90 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -7417,10 +7417,10 @@ _08159D62: movs r3, 0x8 b _08159E80 .align 2, 0 -_08159D90: .4byte gUnknown_2037AB8 +_08159D90: .4byte gPaletteFade _08159D94: .4byte gBattleStruct _08159D98: - ldr r0, _08159DD0 @ =gUnknown_2037AB8 + ldr r0, _08159DD0 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -7449,11 +7449,11 @@ _08159DAA: str r3, [sp] b _08159E7A .align 2, 0 -_08159DD0: .4byte gUnknown_2037AB8 +_08159DD0: .4byte gPaletteFade _08159DD4: .4byte gBitTable _08159DD8: .4byte gBattleStruct _08159DDC: - ldr r0, _08159DF0 @ =gUnknown_2037AB8 + ldr r0, _08159DF0 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -7464,7 +7464,7 @@ _08159DEA: bl sub_80EB30C b _08159E84 .align 2, 0 -_08159DF0: .4byte gUnknown_2037AB8 +_08159DF0: .4byte gPaletteFade _08159DF4: bl sub_8159EF0 bl BattleStringExpandPlaceholdersToDisplayedString @@ -7515,7 +7515,7 @@ _08159E58: .4byte gMain _08159E5C: .4byte gBitTable _08159E60: .4byte gBattleStruct _08159E64: - ldr r0, _08159E98 @ =gUnknown_2037AB8 + ldr r0, _08159E98 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -7544,11 +7544,11 @@ _08159E84: strb r0, [r1, 0x2] b _08159EDE .align 2, 0 -_08159E98: .4byte gUnknown_2037AB8 +_08159E98: .4byte gPaletteFade _08159E9C: .4byte gUnknown_3005EE0 _08159EA0: .4byte gActiveBattler _08159EA4: - ldr r0, _08159EE8 @ =gUnknown_2037AB8 + ldr r0, _08159EE8 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -7578,7 +7578,7 @@ _08159EDE: pop {r0} bx r0 .align 2, 0 -_08159EE8: .4byte gUnknown_2037AB8 +_08159EE8: .4byte gPaletteFade _08159EEC: .4byte 0x00000137 thumb_func_end sub_8159D04 diff --git a/asm/battle_controller_safari.s b/asm/battle_controller_safari.s index a4e877dcb..9c91aa6c7 100644 --- a/asm/battle_controller_safari.s +++ b/asm/battle_controller_safari.s @@ -330,7 +330,7 @@ _080DD7AC: .4byte SpriteCallbackDummy thumb_func_start sub_80DD7B0 sub_80DD7B0: @ 80DD7B0 push {lr} - ldr r0, _080DD7E0 @ =gUnknown_2037AB8 + ldr r0, _080DD7E0 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -353,7 +353,7 @@ _080DD7DA: pop {r0} bx r0 .align 2, 0 -_080DD7E0: .4byte gUnknown_2037AB8 +_080DD7E0: .4byte gPaletteFade _080DD7E4: .4byte gMain _080DD7E8: .4byte 0x00000439 _080DD7EC: .4byte gUnknown_3004F80 @@ -394,7 +394,7 @@ _080DD828: .4byte gActiveBattler thumb_func_start sub_80DD82C sub_80DD82C: @ 80DD82C push {lr} - ldr r0, _080DD84C @ =gUnknown_2037AB8 + ldr r0, _080DD84C @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -411,7 +411,7 @@ _080DD848: pop {r0} bx r0 .align 2, 0 -_080DD84C: .4byte gUnknown_2037AB8 +_080DD84C: .4byte gPaletteFade _080DD850: .4byte gUnknown_3004FE0 _080DD854: .4byte gActiveBattler _080DD858: .4byte CompleteWhenChosePokeblock @@ -425,7 +425,7 @@ CompleteWhenChosePokeblock: @ 80DD85C ldr r0, _080DD88C @ =sub_8011100 cmp r1, r0 bne _080DD882 - ldr r0, _080DD890 @ =gUnknown_2037AB8 + ldr r0, _080DD890 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -442,7 +442,7 @@ _080DD882: .align 2, 0 _080DD888: .4byte gMain _080DD88C: .4byte sub_8011100 -_080DD890: .4byte gUnknown_2037AB8 +_080DD890: .4byte gPaletteFade _080DD894: .4byte gUnknown_203AD30 thumb_func_end CompleteWhenChosePokeblock diff --git a/asm/battle_records.s b/asm/battle_records.s index 797830e95..dc7ecb94f 100644 --- a/asm/battle_records.s +++ b/asm/battle_records.s @@ -189,7 +189,7 @@ sub_80CD3B8: @ 80CD3B8 push {lr} lsls r0, 24 lsrs r2, r0, 24 - ldr r0, _080CD3DC @ =gUnknown_2037AB8 + ldr r0, _080CD3DC @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -206,7 +206,7 @@ _080CD3D8: pop {r0} bx r0 .align 2, 0 -_080CD3DC: .4byte gUnknown_2037AB8 +_080CD3DC: .4byte gPaletteFade _080CD3E0: .4byte gTasks _080CD3E4: .4byte sub_80CD3E8 thumb_func_end sub_80CD3B8 @@ -281,7 +281,7 @@ sub_80CD460: @ 80CD460 push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r0, _080CD498 @ =gUnknown_2037AB8 + ldr r0, _080CD498 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -302,7 +302,7 @@ _080CD490: pop {r0} bx r0 .align 2, 0 -_080CD498: .4byte gUnknown_2037AB8 +_080CD498: .4byte gPaletteFade _080CD49C: .4byte c2_exit_to_overworld_1_continue_scripts_restart_music _080CD4A0: .4byte gUnknown_2039A1C thumb_func_end sub_80CD460 diff --git a/asm/battle_script_commands.s b/asm/battle_script_commands.s index 9d165dd4c..58e7a405b 100644 --- a/asm/battle_script_commands.s +++ b/asm/battle_script_commands.s @@ -15654,7 +15654,7 @@ _0802549C: .align 2, 0 _080254A4: .4byte gBattleScripting _080254A8: - ldr r0, _080254E4 @ =gUnknown_2037AB8 + ldr r0, _080254E4 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -15684,7 +15684,7 @@ _080254D8: strb r0, [r1, 0x1F] b _080256D0 .align 2, 0 -_080254E4: .4byte gUnknown_2037AB8 +_080254E4: .4byte gPaletteFade _080254E8: .4byte gPlayerParty _080254EC: .4byte gBattleStruct _080254F0: .4byte gUnknown_2024029 @@ -15692,7 +15692,7 @@ _080254F4: .4byte sub_8077764 _080254F8: .4byte gUnknown_2024022 _080254FC: .4byte gBattleScripting _08025500: - ldr r0, _0802552C @ =gUnknown_2037AB8 + ldr r0, _0802552C @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -15716,7 +15716,7 @@ _0802551A: strb r5, [r0, 0x1F] b _080256D0 .align 2, 0 -_0802552C: .4byte gUnknown_2037AB8 +_0802552C: .4byte gPaletteFade _08025530: .4byte gMain _08025534: .4byte sub_8011100 _08025538: .4byte gBattleScripting @@ -32443,7 +32443,7 @@ _0802DA24: .align 2, 0 _0802DA38: .4byte 0x00007fff _0802DA3C: - ldr r0, _0802DA5C @ =gUnknown_2037AB8 + ldr r0, _0802DA5C @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -32458,10 +32458,10 @@ _0802DA4A: strb r0, [r1, 0x1] b _0802DB36 .align 2, 0 -_0802DA5C: .4byte gUnknown_2037AB8 +_0802DA5C: .4byte gPaletteFade _0802DA60: .4byte gUnknown_2023E82 _0802DA64: - ldr r0, _0802DAAC @ =gUnknown_2037AB8 + ldr r0, _0802DAAC @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -32497,7 +32497,7 @@ _0802DA72: strb r0, [r4] b _0802DB6C .align 2, 0 -_0802DAAC: .4byte gUnknown_2037AB8 +_0802DAAC: .4byte gPaletteFade _0802DAB0: .4byte gMain _0802DAB4: .4byte sub_8011100 _0802DAB8: .4byte gTasks @@ -32567,7 +32567,7 @@ _0802DB4C: .4byte 0x05000080 _0802DB50: .4byte 0x0001ffff _0802DB54: .4byte gUnknown_2023E82 _0802DB58: - ldr r0, _0802DB74 @ =gUnknown_2037AB8 + ldr r0, _0802DB74 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -32583,7 +32583,7 @@ _0802DB6C: pop {r0} bx r0 .align 2, 0 -_0802DB74: .4byte gUnknown_2037AB8 +_0802DB74: .4byte gPaletteFade _0802DB78: .4byte gUnknown_2023D74 thumb_func_end sub_802D9D8 @@ -32946,7 +32946,7 @@ _0802DE36: .align 2, 0 _0802DE3C: .4byte gUnknown_2023E82 _0802DE40: - ldr r0, _0802DEFC @ =gUnknown_2037AB8 + ldr r0, _0802DEFC @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -33035,7 +33035,7 @@ _0802DE4E: strb r0, [r1] b _0802DFA6 .align 2, 0 -_0802DEFC: .4byte gUnknown_2037AB8 +_0802DEFC: .4byte gPaletteFade _0802DF00: .4byte gBattlerPartyIndexes _0802DF04: .4byte sBattler_AI _0802DF08: .4byte gEnemyParty @@ -33048,7 +33048,7 @@ _0802DF18: ldr r0, _0802DF58 @ =sub_8011100 cmp r1, r0 bne _0802DFA6 - ldr r0, _0802DF5C @ =gUnknown_2037AB8 + ldr r0, _0802DF5C @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -33075,7 +33075,7 @@ _0802DF18: .align 2, 0 _0802DF54: .4byte gMain _0802DF58: .4byte sub_8011100 -_0802DF5C: .4byte gUnknown_2037AB8 +_0802DF5C: .4byte gPaletteFade _0802DF60: .4byte gBattlerPartyIndexes _0802DF64: .4byte sBattler_AI _0802DF68: .4byte gEnemyParty diff --git a/asm/battle_transition.s b/asm/battle_transition.s index 70453eb32..d3128f656 100644 --- a/asm/battle_transition.s +++ b/asm/battle_transition.s @@ -407,7 +407,7 @@ _080D0B9E: thumb_func_start sub_80D0BA8 sub_80D0BA8: @ 80D0BA8 push {lr} - ldr r0, _080D0BCC @ =gUnknown_2037AB8 + ldr r0, _080D0BCC @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -423,7 +423,7 @@ _080D0BC4: pop {r1} bx r1 .align 2, 0 -_080D0BCC: .4byte gUnknown_2037AB8 +_080D0BCC: .4byte gPaletteFade _080D0BD0: .4byte sub_80D0ADC thumb_func_end sub_80D0BA8 @@ -533,7 +533,7 @@ sub_80D0C78: @ 80D0C78 adds r0, r3, 0 movs r3, 0x2 bl sub_80D3E74 - ldr r0, _080D0CE8 @ =gUnknown_2037AB8 + ldr r0, _080D0CE8 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -558,7 +558,7 @@ _080D0CCA: .align 2, 0 _080D0CE0: .4byte gUnknown_2039A2C _080D0CE4: .4byte gUnknown_2038700 -_080D0CE8: .4byte gUnknown_2037AB8 +_080D0CE8: .4byte gPaletteFade _080D0CEC: .4byte sub_80D0BD4 thumb_func_end sub_80D0C78 @@ -733,7 +733,7 @@ _080D0E18: lsrs r4, r0, 16 cmp r5, 0x9F bls _080D0E18 - ldr r0, _080D0E78 @ =gUnknown_2037AB8 + ldr r0, _080D0E78 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -757,7 +757,7 @@ _080D0E5E: .align 2, 0 _080D0E70: .4byte gUnknown_2039A2C _080D0E74: .4byte gUnknown_2038700 -_080D0E78: .4byte gUnknown_2037AB8 +_080D0E78: .4byte gPaletteFade _080D0E7C: .4byte sub_80D0D54 thumb_func_end sub_80D0DF0 @@ -2559,7 +2559,7 @@ _080D1C78: ldrsh r0, [r6, r5] cmp r0, 0 beq _080D1C9A - ldr r0, _080D1CC0 @ =gUnknown_2037AB8 + ldr r0, _080D1CC0 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -2588,7 +2588,7 @@ _080D1C9A: _080D1CB4: .4byte gUnknown_2039A2C _080D1CB8: .4byte 0x1fff0000 _080D1CBC: .4byte gUnknown_2038700 -_080D1CC0: .4byte gUnknown_2037AB8 +_080D1CC0: .4byte gPaletteFade _080D1CC4: .4byte sub_80D1B58 thumb_func_end sub_80D1BE8 diff --git a/asm/berry_pouch.s b/asm/berry_pouch.s index a9523846e..d4d16e15e 100644 --- a/asm/berry_pouch.s +++ b/asm/berry_pouch.s @@ -362,7 +362,7 @@ sub_813D048: @ 813D048 push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r0, _0813D074 @ =gUnknown_2037AB8 + ldr r0, _0813D074 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -379,7 +379,7 @@ _0813D06C: pop {r0} bx r0 .align 2, 0 -_0813D074: .4byte gUnknown_2037AB8 +_0813D074: .4byte gPaletteFade _0813D078: .4byte gUnknown_203F370 thumb_func_end sub_813D048 @@ -1399,7 +1399,7 @@ sub_813D844: @ 813D844 lsls r0, 3 ldr r1, _0813D87C @ =gTasks+0x8 adds r2, r0, r1 - ldr r0, _0813D880 @ =gUnknown_2037AB8 + ldr r0, _0813D880 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -1419,7 +1419,7 @@ sub_813D844: @ 813D844 b _0813D896 .align 2, 0 _0813D87C: .4byte gTasks+0x8 -_0813D880: .4byte gUnknown_2037AB8 +_0813D880: .4byte gPaletteFade _0813D884: .4byte gUnknown_203F37A _0813D888: .4byte gUnknown_203F36C _0813D88C: @@ -1669,7 +1669,7 @@ sub_813DA68: @ 813DA68 lsls r0, 3 ldr r1, _0813DAD8 @ =gTasks+0x8 adds r7, r0, r1 - ldr r0, _0813DADC @ =gUnknown_2037AB8 + ldr r0, _0813DADC @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -1714,7 +1714,7 @@ _0813DA9E: b _0813DB48 .align 2, 0 _0813DAD8: .4byte gTasks+0x8 -_0813DADC: .4byte gUnknown_2037AB8 +_0813DADC: .4byte gPaletteFade _0813DAE0: .4byte gUnknown_203F37A _0813DAE4: .4byte gMain _0813DAE8: .4byte gUnknown_203AD30 diff --git a/asm/cable_club.s b/asm/cable_club.s index eeb9471db..f481a12cd 100644 --- a/asm/cable_club.s +++ b/asm/cable_club.s @@ -1547,13 +1547,13 @@ _0808135C: _08081374: .4byte gUnknown_202271A _08081378: .4byte 0x00002211 _0808137C: - ldr r0, _08081388 @ =gUnknown_2037AB8 + ldr r0, _08081388 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 b _080813A6 .align 2, 0 -_08081388: .4byte gUnknown_2037AB8 +_08081388: .4byte gPaletteFade _0808138C: ldrh r0, [r4, 0xA] adds r0, 0x1 @@ -1706,7 +1706,7 @@ _080814A0: _080814BC: .4byte gUnknown_202271A _080814C0: .4byte 0x00002211 _080814C4: - ldr r0, _080814D8 @ =gUnknown_2037AB8 + ldr r0, _080814D8 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -1718,7 +1718,7 @@ _080814D2: strh r0, [r6] b _0808160A .align 2, 0 -_080814D8: .4byte gUnknown_2037AB8 +_080814D8: .4byte gPaletteFade _080814DC: ldr r1, _080814EC @ =gUnknown_2022720 movs r0, 0 @@ -2183,7 +2183,7 @@ _08081882: bl sub_800A068 b _080818B8 _08081894: - ldr r0, _080818A4 @ =gUnknown_2037AB8 + ldr r0, _080818A4 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -2191,7 +2191,7 @@ _08081894: bne _080818D8 b _080818B8 .align 2, 0 -_080818A4: .4byte gUnknown_2037AB8 +_080818A4: .4byte gPaletteFade _080818A8: ldr r1, _080818C0 @ =gUnknown_2031DA4 movs r0, 0 @@ -2259,7 +2259,7 @@ _0808191A: bl sub_80F985C b _08081950 _0808192C: - ldr r0, _0808193C @ =gUnknown_2037AB8 + ldr r0, _0808193C @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -2267,7 +2267,7 @@ _0808192C: bne _08081970 b _08081950 .align 2, 0 -_0808193C: .4byte gUnknown_2037AB8 +_0808193C: .4byte gPaletteFade _08081940: ldr r1, _08081958 @ =gUnknown_2031DA4 movs r0, 0 diff --git a/asm/clear_save_data_screen.s b/asm/clear_save_data_screen.s index c5381bbf2..84dd082f6 100644 --- a/asm/clear_save_data_screen.s +++ b/asm/clear_save_data_screen.s @@ -91,7 +91,7 @@ _080F5618: bl BeginNormalPaletteFade b _080F56E2 _080F562A: - ldr r0, _080F5640 @ =gUnknown_2037AB8 + ldr r0, _080F5640 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -101,7 +101,7 @@ _080F562A: bl SetVBlankCallback b _080F56E2 .align 2, 0 -_080F5640: .4byte gUnknown_2037AB8 +_080F5640: .4byte gPaletteFade _080F5644: bl sub_80F5820 b _080F56E2 @@ -296,7 +296,7 @@ _080F57B8: .align 2, 0 _080F57D0: .4byte 0x0000ffff _080F57D4: - ldr r0, _080F5808 @ =gUnknown_2037AB8 + ldr r0, _080F5808 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -318,7 +318,7 @@ _080F57FE: pop {r0} bx r0 .align 2, 0 -_080F5808: .4byte gUnknown_2037AB8 +_080F5808: .4byte gPaletteFade thumb_func_end sub_80F579C thumb_func_start sub_80F580C diff --git a/asm/credits.s b/asm/credits.s index 6d9921366..af08d608f 100644 --- a/asm/credits.s +++ b/asm/credits.s @@ -606,7 +606,7 @@ _080F3E94: _080F3EAC: .4byte gUnknown_203AB40 _080F3EB0: .4byte gUnknown_8410CF4 _080F3EB4: - ldr r0, _080F3F14 @ =gUnknown_2037AB8 + ldr r0, _080F3F14 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -654,7 +654,7 @@ _080F3EB4: movs r0, 0x8 b _080F3FB8 .align 2, 0 -_080F3F14: .4byte gUnknown_2037AB8 +_080F3F14: .4byte gPaletteFade _080F3F18: .4byte gUnknown_84145BC _080F3F1C: .4byte gUnknown_8410CF4 _080F3F20: .4byte gUnknown_8410E00 @@ -738,7 +738,7 @@ _080F3FBA: .align 2, 0 _080F3FC0: .4byte gUnknown_8410CF4 _080F3FC4: - ldr r0, _080F3FE8 @ =gUnknown_2037AB8 + ldr r0, _080F3FE8 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -756,7 +756,7 @@ _080F3FD6: movs r0, 0xB b _080F413C .align 2, 0 -_080F3FE8: .4byte gUnknown_2037AB8 +_080F3FE8: .4byte gPaletteFade _080F3FEC: .4byte gUnknown_203AB40 _080F3FF0: ldr r0, [r7] @@ -773,7 +773,7 @@ _080F3FFE: movs r0, 0x6 b _080F413C _080F400A: - ldr r0, _080F4050 @ =gUnknown_2037AB8 + ldr r0, _080F4050 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -810,7 +810,7 @@ _080F404A: movs r0, 0x1 b _080F4068 .align 2, 0 -_080F4050: .4byte gUnknown_2037AB8 +_080F4050: .4byte gPaletteFade _080F4054: .4byte gUnknown_203AB40 _080F4058: add r1, sp, 0x14 @@ -838,7 +838,7 @@ _080F4068: .align 2, 0 _080F4080: .4byte gUnknown_203AB40 _080F4084: - ldr r0, _080F40B0 @ =gUnknown_2037AB8 + ldr r0, _080F40B0 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -859,7 +859,7 @@ _080F4096: movs r0, 0xE b _080F413C .align 2, 0 -_080F40B0: .4byte gUnknown_2037AB8 +_080F40B0: .4byte gPaletteFade _080F40B4: .4byte gUnknown_203AB40 _080F40B8: bl sub_80F4328 @@ -874,7 +874,7 @@ _080F40C2: .align 2, 0 _080F40CC: .4byte gUnknown_203AB40 _080F40D0: - ldr r0, _080F40F8 @ =gUnknown_2037AB8 + ldr r0, _080F40F8 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -894,7 +894,7 @@ _080F40E2: movs r0, 0x10 b _080F413C .align 2, 0 -_080F40F8: .4byte gUnknown_2037AB8 +_080F40F8: .4byte gPaletteFade _080F40FC: .4byte gUnknown_203AB40 _080F4100: bl sub_80F4674 @@ -953,7 +953,7 @@ _080F4156: .align 2, 0 _080F416C: .4byte 0x00007fff _080F4170: - ldr r0, _080F418C @ =gUnknown_2037AB8 + ldr r0, _080F418C @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -968,7 +968,7 @@ _080F4182: pop {r1} bx r1 .align 2, 0 -_080F418C: .4byte gUnknown_2037AB8 +_080F418C: .4byte gPaletteFade thumb_func_end sub_80F3BD0 thumb_func_start sub_80F4190 @@ -1382,7 +1382,7 @@ _080F4530: bne _080F45DE b _080F4630 _080F453A: - ldr r0, _080F4554 @ =gUnknown_2037AB8 + ldr r0, _080F4554 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -1397,7 +1397,7 @@ _080F4548: strh r0, [r1, 0xE] b _080F4630 .align 2, 0 -_080F4554: .4byte gUnknown_2037AB8 +_080F4554: .4byte gPaletteFade _080F4558: ldr r1, [r4] ldrh r0, [r1, 0xC] @@ -1511,7 +1511,7 @@ _080F4630: strb r0, [r1, 0x1] b _080F4668 _080F4638: - ldr r0, _080F4660 @ =gUnknown_2037AB8 + ldr r0, _080F4660 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -1529,7 +1529,7 @@ _080F4638: movs r0, 0x1 b _080F466A .align 2, 0 -_080F4660: .4byte gUnknown_2037AB8 +_080F4660: .4byte gPaletteFade _080F4664: .4byte gUnknown_203AB40 _080F4668: movs r0, 0 @@ -1697,7 +1697,7 @@ _080F47C2: .align 2, 0 _080F47CC: .4byte gUnknown_203AB40 _080F47D0: - ldr r0, _080F47E8 @ =gUnknown_2037AB8 + ldr r0, _080F47E8 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -1709,7 +1709,7 @@ _080F47D0: movs r0, 0x1 b _080F47EE .align 2, 0 -_080F47E8: .4byte gUnknown_2037AB8 +_080F47E8: .4byte gPaletteFade _080F47EC: movs r0, 0 _080F47EE: diff --git a/asm/diploma.s b/asm/diploma.s index 4ff605295..d0b652619 100644 --- a/asm/diploma.s +++ b/asm/diploma.s @@ -147,7 +147,7 @@ _080F4D22: .align 2, 0 _080F4D2C: .4byte sub_80F4BFC _080F4D30: - ldr r0, _080F4D64 @ =gUnknown_2037AB8 + ldr r0, _080F4D64 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -174,7 +174,7 @@ _080F4D5A: pop {r0} bx r0 .align 2, 0 -_080F4D64: .4byte gUnknown_2037AB8 +_080F4D64: .4byte gPaletteFade _080F4D68: .4byte gTasks _080F4D6C: .4byte sub_80F4D74 _080F4D70: .4byte gUnknown_203AB48 @@ -245,7 +245,7 @@ sub_80F4DE0: @ 80F4DE0 push {r4,r5,lr} lsls r0, 24 lsrs r2, r0, 24 - ldr r0, _080F4E18 @ =gUnknown_2037AB8 + ldr r0, _080F4E18 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -267,7 +267,7 @@ _080F4E10: pop {r0} bx r0 .align 2, 0 -_080F4E18: .4byte gUnknown_2037AB8 +_080F4E18: .4byte gPaletteFade _080F4E1C: .4byte gUnknown_203AB48 _080F4E20: .4byte sub_80568FC thumb_func_end sub_80F4DE0 diff --git a/asm/egg_hatch.s b/asm/egg_hatch.s index 16732a4d3..b12a9d76c 100644 --- a/asm/egg_hatch.s +++ b/asm/egg_hatch.s @@ -499,7 +499,7 @@ sub_8047004: @ 8047004 push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r0, _08047034 @ =gUnknown_2037AB8 + ldr r0, _08047034 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -518,7 +518,7 @@ _0804702C: pop {r0} bx r0 .align 2, 0 -_08047034: .4byte gUnknown_2037AB8 +_08047034: .4byte gPaletteFade _08047038: .4byte CB2_EggHatch_0 _0804703C: .4byte gUnknown_3005020 _08047040: .4byte sub_807DD24 @@ -912,7 +912,7 @@ _080473D8: .4byte gUnknown_8260134 _080473DC: .4byte gUnknown_3000E74 _080473E0: .4byte sub_80472E4 _080473E4: - ldr r0, _08047408 @ =gUnknown_2037AB8 + ldr r0, _08047408 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -931,7 +931,7 @@ _080473F6: ldr r1, [r5] b _08047648 .align 2, 0 -_08047408: .4byte gUnknown_2037AB8 +_08047408: .4byte gPaletteFade _0804740C: ldr r1, [r5] ldrb r0, [r1, 0x3] @@ -1205,7 +1205,7 @@ _08047648: .align 2, 0 _08047650: .4byte gUnknown_3000E74 _08047654: - ldr r0, _080476A8 @ =gUnknown_2037AB8 + ldr r0, _080476A8 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -1238,7 +1238,7 @@ _08047684: pop {r0} bx r0 .align 2, 0 -_080476A8: .4byte gUnknown_2037AB8 +_080476A8: .4byte gPaletteFade _080476AC: .4byte c2_exit_to_overworld_2_switch thumb_func_end sub_8047338 @@ -1489,7 +1489,7 @@ _0804788C: ldrh r0, [r5, 0x2E] adds r0, 0x1 strh r0, [r5, 0x2E] - ldr r0, _080478C8 @ =gUnknown_2037AB8 + ldr r0, _080478C8 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -1515,7 +1515,7 @@ _080478BA: bx r0 .align 2, 0 _080478C4: .4byte 0x0000ffff -_080478C8: .4byte gUnknown_2037AB8 +_080478C8: .4byte gPaletteFade _080478CC: .4byte SpriteCB_Egg_5 thumb_func_end SpriteCB_Egg_4 diff --git a/asm/evolution_graphics.s b/asm/evolution_graphics.s index 671d52e6c..dd268128f 100644 --- a/asm/evolution_graphics.s +++ b/asm/evolution_graphics.s @@ -1103,7 +1103,7 @@ sub_80F6170: @ 80F6170 push {lr} lsls r0, 24 lsrs r2, r0, 24 - ldr r0, _080F618C @ =gUnknown_2037AB8 + ldr r0, _080F618C @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -1115,7 +1115,7 @@ _080F6188: pop {r0} bx r0 .align 2, 0 -_080F618C: .4byte gUnknown_2037AB8 +_080F618C: .4byte gPaletteFade thumb_func_end sub_80F6170 thumb_func_start sub_80F6190 diff --git a/asm/evolution_scene.s b/asm/evolution_scene.s index 1966dcaca..6e5466ca2 100644 --- a/asm/evolution_scene.s +++ b/asm/evolution_scene.s @@ -48,7 +48,7 @@ _080CDD50: strh r0, [r6, 0x8] b _080CDD98 _080CDD68: - ldr r0, _080CDDA0 @ =gUnknown_2037AB8 + ldr r0, _080CDDA0 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -76,7 +76,7 @@ _080CDD98: pop {r0} bx r0 .align 2, 0 -_080CDDA0: .4byte gUnknown_2037AB8 +_080CDDA0: .4byte gPaletteFade _080CDDA4: .4byte gPlayerParty thumb_func_end Task_BeginEvolutionScene @@ -1483,7 +1483,7 @@ _080CEA84: .4byte gSprites _080CEA88: .4byte gUnknown_2039A20 _080CEA8C: .4byte gTasks _080CEA90: - ldr r0, _080CEAC0 @ =gUnknown_2037AB8 + ldr r0, _080CEAC0 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -1505,7 +1505,7 @@ _080CEAA0: adds r1, r0 b _080CEFDE .align 2, 0 -_080CEAC0: .4byte gUnknown_2037AB8 +_080CEAC0: .4byte gPaletteFade _080CEAC4: .4byte gStringVar4 _080CEAC8: .4byte gUnknown_83FE672 _080CEACC: .4byte gTasks @@ -1572,7 +1572,7 @@ _080CEB28: .align 2, 0 _080CEB54: .4byte gTasks _080CEB58: - ldr r0, _080CEB84 @ =gUnknown_2037AB8 + ldr r0, _080CEB84 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -1593,7 +1593,7 @@ _080CEB68: adds r1, r0 b _080CEFDE .align 2, 0 -_080CEB84: .4byte gUnknown_2037AB8 +_080CEB84: .4byte gPaletteFade _080CEB88: .4byte gUnknown_2023E82 _080CEB8C: .4byte gTasks _080CEB90: @@ -1773,7 +1773,7 @@ _080CED00: .4byte gUnknown_2037238 _080CED04: .4byte gUnknown_2039A20 _080CED08: .4byte gTasks _080CED0C: - ldr r0, _080CED28 @ =gUnknown_2037AB8 + ldr r0, _080CED28 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -1788,7 +1788,7 @@ _080CED1C: ldrh r0, [r4, 0xC] b _080CEF28 .align 2, 0 -_080CED28: .4byte gUnknown_2037AB8 +_080CED28: .4byte gPaletteFade _080CED2C: bl IsCryFinished lsls r0, 24 @@ -1922,7 +1922,7 @@ _080CEE40: .align 2, 0 _080CEE5C: .4byte gTasks _080CEE60: - ldr r0, _080CEEC4 @ =gUnknown_2037AB8 + ldr r0, _080CEEC4 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r2, 0x80 adds r0, r2, 0 @@ -1967,7 +1967,7 @@ _080CEEA0: bl SetMainCallback2 b _080CF528 .align 2, 0 -_080CEEC4: .4byte gUnknown_2037AB8 +_080CEEC4: .4byte gPaletteFade _080CEEC8: .4byte gUnknown_2039A20 _080CEECC: .4byte gUnknown_300537C _080CEED0: @@ -2000,7 +2000,7 @@ _080CEF04: .4byte gUnknown_2023E82 _080CEF08: .4byte 0x0006001c _080CEF0C: .4byte 0x00007fff _080CEF10: - ldr r0, _080CEF38 @ =gUnknown_2037AB8 + ldr r0, _080CEF38 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -2023,7 +2023,7 @@ _080CEF2E: strh r0, [r4, 0x8] b _080CF528 .align 2, 0 -_080CEF38: .4byte gUnknown_2037AB8 +_080CEF38: .4byte gPaletteFade _080CEF3C: bl IsCryFinished lsls r0, 24 @@ -2424,7 +2424,7 @@ _080CF284: _080CF2AC: .4byte gTasks _080CF2B0: .4byte gMain _080CF2B4: - ldr r0, _080CF2F4 @ =gUnknown_2037AB8 + ldr r0, _080CF2F4 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -2455,14 +2455,14 @@ _080CF2C2: strh r0, [r5, 0x14] b _080CF528 .align 2, 0 -_080CF2F4: .4byte gUnknown_2037AB8 +_080CF2F4: .4byte gPaletteFade _080CF2F8: .4byte gPlayerParty _080CF2FC: .4byte gTasks _080CF300: .4byte gUnknown_2024029 _080CF304: .4byte CB2_EvolutionSceneLoadGraphics _080CF308: .4byte gUnknown_2024022 _080CF30C: - ldr r0, _080CF340 @ =gUnknown_2037AB8 + ldr r0, _080CF340 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -2489,7 +2489,7 @@ _080CF324: movs r0, 0xA b _080CF526 .align 2, 0 -_080CF340: .4byte gUnknown_2037AB8 +_080CF340: .4byte gPaletteFade _080CF344: .4byte sub_80CE710 _080CF348: .4byte gTasks _080CF34C: @@ -2887,7 +2887,7 @@ _080CF6AC: .align 2, 0 _080CF6CC: .4byte gTasks _080CF6D0: - ldr r0, _080CF724 @ =gUnknown_2037AB8 + ldr r0, _080CF724 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -2925,7 +2925,7 @@ _080CF6E0: bl SetGpuReg bl _080D003A .align 2, 0 -_080CF724: .4byte gUnknown_2037AB8 +_080CF724: .4byte gPaletteFade _080CF728: .4byte gSprites _080CF72C: .4byte gUnknown_2039A20 _080CF730: .4byte gUnknown_2023E82 @@ -3305,7 +3305,7 @@ _080CFA68: .4byte gUnknown_2039A20 _080CFA6C: .4byte 0x0004001c _080CFA70: .4byte 0x00007fff _080CFA74: - ldr r0, _080CFA98 @ =gUnknown_2037AB8 + ldr r0, _080CFA98 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -3326,7 +3326,7 @@ _080CFA90: strh r0, [r4, 0x8] b _080D003A .align 2, 0 -_080CFA98: .4byte gUnknown_2037AB8 +_080CFA98: .4byte gPaletteFade _080CFA9C: bl IsCryFinished lsls r0, 24 @@ -3679,7 +3679,7 @@ _080CFDA0: .4byte gUnknown_83FDF3C _080CFDA4: .4byte gUnknown_202298C _080CFDA8: .4byte gTasks _080CFDAC: - ldr r0, _080CFE14 @ =gUnknown_2037AB8 + ldr r0, _080CFE14 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -3724,7 +3724,7 @@ _080CFDC6: strh r0, [r5, 0x14] b _080D003A .align 2, 0 -_080CFE14: .4byte gUnknown_2037AB8 +_080CFE14: .4byte gPaletteFade _080CFE18: .4byte gUnknown_3003F3C _080CFE1C: .4byte gPlayerParty _080CFE20: .4byte gTasks @@ -3732,7 +3732,7 @@ _080CFE24: .4byte gUnknown_2024029 _080CFE28: .4byte CB2_TradeEvolutionSceneLoadGraphics _080CFE2C: .4byte gUnknown_2024022 _080CFE30: - ldr r0, _080CFE64 @ =gUnknown_2037AB8 + ldr r0, _080CFE64 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -3759,7 +3759,7 @@ _080CFE4A: movs r0, 0x9 b _080D0038 .align 2, 0 -_080CFE64: .4byte gUnknown_2037AB8 +_080CFE64: .4byte gPaletteFade _080CFE68: .4byte gMain _080CFE6C: .4byte sub_80CE72C _080CFE70: .4byte gTasks diff --git a/asm/fame_checker.s b/asm/fame_checker.s index d86263801..b6fbea82f 100644 --- a/asm/fame_checker.s +++ b/asm/fame_checker.s @@ -322,7 +322,7 @@ sub_812C664: @ 812C664 push {lr} lsls r0, 24 lsrs r2, r0, 24 - ldr r0, _0812C688 @ =gUnknown_2037AB8 + ldr r0, _0812C688 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -339,7 +339,7 @@ _0812C684: pop {r0} bx r0 .align 2, 0 -_0812C688: .4byte gUnknown_2037AB8 +_0812C688: .4byte gPaletteFade _0812C68C: .4byte gTasks _0812C690: .4byte sub_812C694 thumb_func_end sub_812C664 @@ -1455,7 +1455,7 @@ sub_812CF7C: @ 812CF7C push {r4-r6,lr} lsls r0, 24 lsrs r6, r0, 24 - ldr r0, _0812D074 @ =gUnknown_2037AB8 + ldr r0, _0812D074 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -1556,7 +1556,7 @@ _0812D06C: pop {r0} bx r0 .align 2, 0 -_0812D074: .4byte gUnknown_2037AB8 +_0812D074: .4byte gPaletteFade _0812D078: .4byte gUnknown_203B0FC _0812D07C: .4byte gTasks _0812D080: .4byte gSprites diff --git a/asm/field_effect.s b/asm/field_effect.s index 1382a6dae..de1776e9d 100644 --- a/asm/field_effect.s +++ b/asm/field_effect.s @@ -2121,7 +2121,7 @@ c3_080843F8: @ 80843F8 ldrsh r0, [r4, r1] cmp r0, 0 bne _0808442A - ldr r0, _08084450 @ =gUnknown_2037AB8 + ldr r0, _08084450 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -2148,7 +2148,7 @@ _08084444: bx r0 .align 2, 0 _0808444C: .4byte gTasks -_08084450: .4byte gUnknown_2037AB8 +_08084450: .4byte gPaletteFade thumb_func_end c3_080843F8 thumb_func_start sub_8084454 @@ -2848,7 +2848,7 @@ sub_8084990: @ 8084990 thumb_func_start sub_80849A0 sub_80849A0: @ 80849A0 push {lr} - ldr r0, _080849E0 @ =gUnknown_2037AB8 + ldr r0, _080849E0 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -2875,7 +2875,7 @@ _080849DC: pop {r0} bx r0 .align 2, 0 -_080849E0: .4byte gUnknown_2037AB8 +_080849E0: .4byte gPaletteFade _080849E4: .4byte gUnknown_3005020 _080849E8: .4byte sub_80849F4 _080849EC: .4byte sub_805671C @@ -3872,7 +3872,7 @@ sub_808514C: @ 808514C thumb_func_start sub_8085168 sub_8085168: @ 8085168 push {lr} - ldr r0, _080851A8 @ =gUnknown_2037AB8 + ldr r0, _080851A8 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -3899,7 +3899,7 @@ _080851A0: pop {r1} bx r1 .align 2, 0 -_080851A8: .4byte gUnknown_2037AB8 +_080851A8: .4byte gPaletteFade _080851AC: .4byte gUnknown_3005020 _080851B0: .4byte mapldr_080851BC _080851B4: .4byte sub_805671C @@ -4377,7 +4377,7 @@ _08085542: thumb_func_start sub_808554C sub_808554C: @ 808554C push {lr} - ldr r0, _0808558C @ =gUnknown_2037AB8 + ldr r0, _0808558C @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -4404,7 +4404,7 @@ _08085584: pop {r1} bx r1 .align 2, 0 -_0808558C: .4byte gUnknown_2037AB8 +_0808558C: .4byte gPaletteFade _08085590: .4byte gUnknown_3005020 _08085594: .4byte sub_8084454 _08085598: .4byte sub_805671C @@ -4595,7 +4595,7 @@ _08085702: ldrsh r0, [r4, r2] cmp r0, 0x1 bne _08085750 - ldr r0, _08085758 @ =gUnknown_2037AB8 + ldr r0, _08085758 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -4628,7 +4628,7 @@ _08085750: pop {r0} bx r0 .align 2, 0 -_08085758: .4byte gUnknown_2037AB8 +_08085758: .4byte gPaletteFade _0808575C: .4byte gUnknown_3005020 _08085760: .4byte sub_80859D4 _08085764: .4byte sub_805671C @@ -5394,7 +5394,7 @@ _08085D30: .4byte gSprites thumb_func_start sub_8085D34 sub_8085D34: @ 8085D34 push {lr} - ldr r0, _08085D74 @ =gUnknown_2037AB8 + ldr r0, _08085D74 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -5421,7 +5421,7 @@ _08085D70: pop {r0} bx r0 .align 2, 0 -_08085D74: .4byte gUnknown_2037AB8 +_08085D74: .4byte gPaletteFade _08085D78: .4byte sub_805671C _08085D7C: .4byte gUnknown_3005020 _08085D80: .4byte mapldr_08085D88 @@ -7943,7 +7943,7 @@ _08087132: thumb_func_start sub_8087138 sub_8087138: @ 8087138 push {lr} - ldr r0, _08087160 @ =gUnknown_2037AB8 + ldr r0, _08087160 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -7960,7 +7960,7 @@ _0808715A: pop {r0} bx r0 .align 2, 0 -_08087160: .4byte gUnknown_2037AB8 +_08087160: .4byte gPaletteFade _08087164: .4byte sub_8086E40 thumb_func_end sub_8087138 @@ -9439,7 +9439,7 @@ sub_8087CB4: @ 8087CB4 adds r4, r0, 0 lsls r1, 24 lsrs r5, r1, 24 - ldr r0, _08087CF4 @ =gUnknown_2037AB8 + ldr r0, _08087CF4 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -9464,7 +9464,7 @@ _08087CEE: pop {r0} bx r0 .align 2, 0 -_08087CF4: .4byte gUnknown_2037AB8 +_08087CF4: .4byte gPaletteFade _08087CF8: .4byte sub_8087B14 thumb_func_end sub_8087CB4 @@ -9616,7 +9616,7 @@ sub_8087E00: @ 8087E00 push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r0, _08087E24 @ =gUnknown_2037AB8 + ldr r0, _08087E24 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -9631,7 +9631,7 @@ _08087E1E: pop {r0} bx r0 .align 2, 0 -_08087E24: .4byte gUnknown_2037AB8 +_08087E24: .4byte gPaletteFade thumb_func_end sub_8087E00 thumb_func_start sub_8087E28 diff --git a/asm/field_fadetransition.s b/asm/field_fadetransition.s index 1b3aaf9d3..b9a31bee4 100644 --- a/asm/field_fadetransition.s +++ b/asm/field_fadetransition.s @@ -1125,12 +1125,12 @@ _0807E408: .4byte task_mpl_807E3C8 thumb_func_start sub_807E40C sub_807E40C: @ 807E40C - ldr r0, _0807E414 @ =gUnknown_2037AB8 + ldr r0, _0807E414 @ =gPaletteFade ldrb r0, [r0, 0x7] lsrs r0, 7 bx lr .align 2, 0 -_0807E414: .4byte gUnknown_2037AB8 +_0807E414: .4byte gPaletteFade thumb_func_end sub_807E40C thumb_func_start sub_807E418 diff --git a/asm/field_specials.s b/asm/field_specials.s index 5132df30e..93971a0b7 100644 --- a/asm/field_specials.s +++ b/asm/field_specials.s @@ -4717,7 +4717,7 @@ sub_80CCA18: @ 80CCA18 lsls r1, 3 ldr r0, _080CCAA4 @ =gTasks+0x8 adds r4, r1, r0 - ldr r0, _080CCAA8 @ =gUnknown_2037AB8 + ldr r0, _080CCAA8 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -4779,7 +4779,7 @@ _080CCA78: b _080CCADE .align 2, 0 _080CCAA4: .4byte gTasks+0x8 -_080CCAA8: .4byte gUnknown_2037AB8 +_080CCAA8: .4byte gPaletteFade _080CCAAC: .4byte gUnknown_2036E28 _080CCAB0: .4byte gSaveBlock1Ptr _080CCAB4: .4byte 0x00004f01 @@ -4847,7 +4847,7 @@ _080CCB36: movs r0, 0x7 movs r1, 0x1 bl sub_8059948 - ldr r0, _080CCB64 @ =gUnknown_2037AB8 + ldr r0, _080CCB64 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -4866,7 +4866,7 @@ _080CCB5A: bx r0 .align 2, 0 _080CCB60: .4byte gUnknown_83F60B0 -_080CCB64: .4byte gUnknown_2037AB8 +_080CCB64: .4byte gPaletteFade thumb_func_end sub_80CCAF4 thumb_func_start sub_80CCB68 diff --git a/asm/field_weather.s b/asm/field_weather.s index 8a3208f55..608f03109 100644 --- a/asm/field_weather.s +++ b/asm/field_weather.s @@ -690,7 +690,7 @@ _0807A144: _0807A164: .4byte gUnknown_2037F34 _0807A168: .4byte 0x000006c6 _0807A16C: - ldr r0, _0807A190 @ =gUnknown_2037AB8 + ldr r0, _0807A190 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -711,7 +711,7 @@ _0807A18C: pop {r0} bx r0 .align 2, 0 -_0807A190: .4byte gUnknown_2037AB8 +_0807A190: .4byte gPaletteFade _0807A194: .4byte 0x000006c1 _0807A198: .4byte 0x000006c6 thumb_func_end sub_807A084 @@ -1988,7 +1988,7 @@ _0807AB20: adds r1, r2 movs r2, 0x8 bl CpuFastSet - ldr r0, _0807AB54 @ =gUnknown_2037AB8 + ldr r0, _0807AB54 @ =gPaletteFade ldrh r2, [r0, 0x4] lsls r2, 21 lsrs r2, 27 @@ -2002,7 +2002,7 @@ _0807AB20: .align 2, 0 _0807AB4C: .4byte gUnknown_20375F8 _0807AB50: .4byte gUnknown_20371F8 -_0807AB54: .4byte gUnknown_2037AB8 +_0807AB54: .4byte gPaletteFade _0807AB58: lsls r0, r4, 20 lsrs r4, r0, 16 diff --git a/asm/fldeff_sweetscent.s b/asm/fldeff_sweetscent.s index dfa734b91..6783e1bbb 100644 --- a/asm/fldeff_sweetscent.s +++ b/asm/fldeff_sweetscent.s @@ -155,7 +155,7 @@ sub_80DE1D0: @ 80DE1D0 lsls r5, r0, 3 ldr r6, _080DE21C @ =gTasks+0x8 adds r2, r5, r6 - ldr r0, _080DE220 @ =gUnknown_2037AB8 + ldr r0, _080DE220 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -182,7 +182,7 @@ sub_80DE1D0: @ 80DE1D0 b _080DE26C .align 2, 0 _080DE21C: .4byte gTasks+0x8 -_080DE220: .4byte gUnknown_2037AB8 +_080DE220: .4byte gPaletteFade _080DE224: .4byte gUnknown_203AAB0 _080DE228: adds r0, r6, 0 @@ -229,7 +229,7 @@ sub_80DE274: @ 80DE274 push {r4,r5,lr} lsls r0, 24 lsrs r5, r0, 24 - ldr r0, _080DE2B0 @ =gUnknown_2037AB8 + ldr r0, _080DE2B0 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -253,7 +253,7 @@ _080DE2AA: pop {r0} bx r0 .align 2, 0 -_080DE2B0: .4byte gUnknown_2037AB8 +_080DE2B0: .4byte gPaletteFade _080DE2B4: .4byte gUnknown_203AAB0 _080DE2B8: .4byte gUnknown_20371F8 _080DE2BC: .4byte gUnknown_81BE564 diff --git a/asm/hall_of_fame.s b/asm/hall_of_fame.s index 0f66e62de..1ad8d6f98 100644 --- a/asm/hall_of_fame.s +++ b/asm/hall_of_fame.s @@ -130,7 +130,7 @@ _080F1EBC: .4byte sub_80F1DAC _080F1EC0: .4byte gMain _080F1EC4: bl UpdatePaletteFade - ldr r0, _080F1EE8 @ =gUnknown_2037AB8 + ldr r0, _080F1EE8 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -144,7 +144,7 @@ _080F1EC4: movs r0, 0 b _080F1EF2 .align 2, 0 -_080F1EE8: .4byte gUnknown_2037AB8 +_080F1EE8: .4byte gPaletteFade _080F1EEC: .4byte sub_80F1DC0 _080F1EF0: movs r0, 0x1 @@ -1366,7 +1366,7 @@ Task_Hof_HandleExit: @ 80F288C push {r4-r7,lr} lsls r0, 24 lsrs r6, r0, 24 - ldr r0, _080F2924 @ =gUnknown_2037AB8 + ldr r0, _080F2924 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -1432,7 +1432,7 @@ _080F291E: pop {r0} bx r0 .align 2, 0 -_080F2924: .4byte gUnknown_2037AB8 +_080F2924: .4byte gPaletteFade _080F2928: .4byte gTasks _080F292C: .4byte gUnknown_203AB3C _080F2930: .4byte gUnknown_203AB38 diff --git a/asm/hof_pc.s b/asm/hof_pc.s index 48085bbd8..b5a437662 100644 --- a/asm/hof_pc.s +++ b/asm/hof_pc.s @@ -10,7 +10,7 @@ sub_80CA53C: @ 80CA53C push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r0, _080CA56C @ =gUnknown_2037AB8 + ldr r0, _080CA56C @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -28,7 +28,7 @@ _080CA564: pop {r0} bx r0 .align 2, 0 -_080CA56C: .4byte gUnknown_2037AB8 +_080CA56C: .4byte gPaletteFade _080CA570: .4byte sub_80F2978 thumb_func_end sub_80CA53C @@ -100,7 +100,7 @@ sub_80CA5F8: @ 80CA5F8 push {lr} lsls r0, 24 lsrs r2, r0, 24 - ldr r0, _080CA614 @ =gUnknown_2037AB8 + ldr r0, _080CA614 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -112,7 +112,7 @@ _080CA610: pop {r0} bx r0 .align 2, 0 -_080CA614: .4byte gUnknown_2037AB8 +_080CA614: .4byte gPaletteFade thumb_func_end sub_80CA5F8 .align 2, 0 @ Don't pad with nop. diff --git a/asm/intro.s b/asm/intro.s index 2d8a626b4..45f4c6e1d 100644 --- a/asm/intro.s +++ b/asm/intro.s @@ -1222,7 +1222,7 @@ _080ECFA4: _080ECFD0: .4byte sub_80ED0AC _080ECFD4: .4byte 0x00007fff _080ECFD8: - ldr r0, _080ECFF8 @ =gUnknown_2037AB8 + ldr r0, _080ECFF8 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -1239,7 +1239,7 @@ _080ECFF0: strb r0, [r5, 0x4] b _080ED094 .align 2, 0 -_080ECFF8: .4byte gUnknown_2037AB8 +_080ECFF8: .4byte gPaletteFade _080ECFFC: .4byte 0x00000115 _080ED000: ldrh r0, [r5, 0x12] @@ -1282,7 +1282,7 @@ _080ED058: .4byte 0x00007fff _080ED05C: .4byte sub_80ED0AC _080ED060: .4byte sub_80ED188 _080ED064: - ldr r0, _080ED09C @ =gUnknown_2037AB8 + ldr r0, _080ED09C @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -1307,7 +1307,7 @@ _080ED094: pop {r0} bx r0 .align 2, 0 -_080ED09C: .4byte gUnknown_2037AB8 +_080ED09C: .4byte gPaletteFade _080ED0A0: .4byte sub_80ED0AC _080ED0A4: .4byte sub_80ED140 _080ED0A8: .4byte sub_80ED188 @@ -1618,13 +1618,13 @@ _080ED32C: .align 2, 0 _080ED34C: .4byte 0x00007fff _080ED350: - ldr r0, _080ED35C @ =gUnknown_2037AB8 + ldr r0, _080ED35C @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 b _080ED3C0 .align 2, 0 -_080ED35C: .4byte gUnknown_2037AB8 +_080ED35C: .4byte gPaletteFade _080ED360: ldrh r0, [r7, 0x12] adds r0, 0x1 @@ -2495,7 +2495,7 @@ _080EDA50: .4byte 0x00007fff _080EDA54: .4byte gUnknown_2037218 _080EDA58: .4byte 0x01000020 _080EDA5C: - ldr r0, _080EDA78 @ =gUnknown_2037AB8 + ldr r0, _080EDA78 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -2512,7 +2512,7 @@ _080EDA6E: strb r0, [r4, 0x4] b _080EDAC4 .align 2, 0 -_080EDA78: .4byte gUnknown_2037AB8 +_080EDA78: .4byte gPaletteFade _080EDA7C: ldrh r0, [r4, 0x12] adds r0, 0x1 diff --git a/asm/item_menu.s b/asm/item_menu.s index 07fefddfe..d9aa3dd95 100644 --- a/asm/item_menu.s +++ b/asm/item_menu.s @@ -264,13 +264,13 @@ _08107FC0: b _08108104 _08107FC6: bl ResetPaletteFade - ldr r2, _08107FD4 @ =gUnknown_2037AB8 + ldr r2, _08107FD4 @ =gPaletteFade ldrb r0, [r2, 0x8] movs r1, 0x80 orrs r0, r1 b _08108102 .align 2, 0 -_08107FD4: .4byte gUnknown_2037AB8 +_08107FD4: .4byte gPaletteFade _08107FD8: bl ResetSpriteData b _08108104 @@ -408,7 +408,7 @@ _081080F4: movs r0, 0x9 bl sub_812B1F0 _081080FA: - ldr r2, _08108114 @ =gUnknown_2037AB8 + ldr r2, _08108114 @ =gPaletteFade ldrb r1, [r2, 0x8] movs r0, 0x7F ands r0, r1 @@ -424,7 +424,7 @@ _08108104: strb r0, [r1] b _08108134 .align 2, 0 -_08108114: .4byte gUnknown_2037AB8 +_08108114: .4byte gPaletteFade _08108118: .4byte gMain _0810811C: ldr r0, _0810812C @ =sub_8107EFC @@ -477,7 +477,7 @@ sub_8108178: @ 8108178 push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r0, _081081A4 @ =gUnknown_2037AB8 + ldr r0, _081081A4 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -494,7 +494,7 @@ _0810819C: pop {r0} bx r0 .align 2, 0 -_081081A4: .4byte gUnknown_2037AB8 +_081081A4: .4byte gPaletteFade _081081A8: .4byte gUnknown_203ACFC thumb_func_end sub_8108178 @@ -1780,7 +1780,7 @@ sub_8108B8C: @ 8108B8C lsls r0, 3 ldr r1, _08108BE0 @ =gTasks+0x8 adds r4, r0, r1 - ldr r0, _08108BE4 @ =gUnknown_2037AB8 + ldr r0, _08108BE4 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -1812,7 +1812,7 @@ sub_8108B8C: @ 8108B8C b _08108BFA .align 2, 0 _08108BE0: .4byte gTasks+0x8 -_08108BE4: .4byte gUnknown_2037AB8 +_08108BE4: .4byte gPaletteFade _08108BE8: .4byte sub_8108CFC _08108BEC: .4byte gUnknown_203ACFC _08108BF0: .4byte gUnknown_203AD10 @@ -2245,7 +2245,7 @@ sub_8108F0C: @ 8108F0C lsls r0, 3 ldr r1, _08108F78 @ =gTasks+0x8 adds r7, r0, r1 - ldr r0, _08108F7C @ =gUnknown_2037AB8 + ldr r0, _08108F7C @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -2291,7 +2291,7 @@ _08108F4A: b _08108FA0 .align 2, 0 _08108F78: .4byte gTasks+0x8 -_08108F7C: .4byte gUnknown_2037AB8 +_08108F7C: .4byte gPaletteFade _08108F80: .4byte sub_8108CFC _08108F84: .4byte gUnknown_203ACFC _08108F88: .4byte gMain @@ -6144,7 +6144,7 @@ sub_810AF9C: @ 810AF9C lsls r6, r0, 3 ldr r7, _0810AFCC @ =gTasks+0x8 adds r5, r6, r7 - ldr r0, _0810AFD0 @ =gUnknown_2037AB8 + ldr r0, _0810AFD0 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -6161,7 +6161,7 @@ sub_810AF9C: @ 810AF9C b _0810B064 .align 2, 0 _0810AFCC: .4byte gTasks+0x8 -_0810AFD0: .4byte gUnknown_2037AB8 +_0810AFD0: .4byte gPaletteFade _0810AFD4: movs r0, 0x99 lsls r0, 1 @@ -6269,7 +6269,7 @@ sub_810B0AC: @ 810B0AC push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r0, _0810B0DC @ =gUnknown_2037AB8 + ldr r0, _0810B0DC @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -6289,7 +6289,7 @@ sub_810B0AC: @ 810B0AC bl SetMainCallback2 b _0810B0F0 .align 2, 0 -_0810B0DC: .4byte gUnknown_2037AB8 +_0810B0DC: .4byte gPaletteFade _0810B0E0: .4byte sub_8108CFC _0810B0E4: .4byte gUnknown_203AD10 _0810B0E8: @@ -6417,7 +6417,7 @@ sub_810B1D4: @ 810B1D4 lsls r5, r0, 3 ldr r6, _0810B220 @ =gTasks+0x8 adds r7, r5, r6 - ldr r0, _0810B224 @ =gUnknown_2037AB8 + ldr r0, _0810B224 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -6450,7 +6450,7 @@ _0810B202: b _0810B36C .align 2, 0 _0810B220: .4byte gTasks+0x8 -_0810B224: .4byte gUnknown_2037AB8 +_0810B224: .4byte gPaletteFade _0810B228: movs r0, 0x99 lsls r0, 1 @@ -6614,7 +6614,7 @@ sub_810B378: @ 810B378 lsls r6, r0, 3 ldr r7, _0810B3B0 @ =gTasks+0x8 adds r4, r6, r7 - ldr r0, _0810B3B4 @ =gUnknown_2037AB8 + ldr r0, _0810B3B4 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -6633,7 +6633,7 @@ _0810B396: b _0810B4B6 .align 2, 0 _0810B3B0: .4byte gTasks+0x8 -_0810B3B4: .4byte gUnknown_2037AB8 +_0810B3B4: .4byte gPaletteFade _0810B3B8: movs r0, 0x10 ldrsh r1, [r4, r0] @@ -6775,7 +6775,7 @@ sub_810B4BC: @ 810B4BC mov r9, r0 mov r5, r8 add r5, r9 - ldr r0, _0810B508 @ =gUnknown_2037AB8 + ldr r0, _0810B508 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r7, 0x80 adds r0, r7, 0 @@ -6795,7 +6795,7 @@ sub_810B4BC: @ 810B4BC b _0810B5C6 .align 2, 0 _0810B504: .4byte gTasks+0x8 -_0810B508: .4byte gUnknown_2037AB8 +_0810B508: .4byte gPaletteFade _0810B50C: movs r0, 0x10 ldrsh r1, [r5, r0] @@ -6901,7 +6901,7 @@ sub_810B5D4: @ 810B5D4 mov r9, r0 mov r6, r8 add r6, r9 - ldr r0, _0810B628 @ =gUnknown_2037AB8 + ldr r0, _0810B628 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r7, 0x80 adds r0, r7, 0 @@ -6927,7 +6927,7 @@ sub_810B5D4: @ 810B5D4 b _0810B6E0 .align 2, 0 _0810B624: .4byte gTasks+0x8 -_0810B628: .4byte gUnknown_2037AB8 +_0810B628: .4byte gPaletteFade _0810B62C: movs r0, 0x99 lsls r0, 1 diff --git a/asm/item_pc.s b/asm/item_pc.s index d209e7c0d..1a7a3b498 100644 --- a/asm/item_pc.s +++ b/asm/item_pc.s @@ -365,7 +365,7 @@ sub_810D6E8: @ 810D6E8 push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r0, _0810D714 @ =gUnknown_2037AB8 + ldr r0, _0810D714 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -382,7 +382,7 @@ _0810D70C: pop {r0} bx r0 .align 2, 0 -_0810D714: .4byte gUnknown_2037AB8 +_0810D714: .4byte gPaletteFade _0810D718: .4byte gUnknown_203ADCC thumb_func_end sub_810D6E8 @@ -1140,7 +1140,7 @@ sub_810DCE4: @ 810DCE4 lsls r0, 3 ldr r1, _0810DD28 @ =gTasks+0x8 adds r4, r0, r1 - ldr r0, _0810DD2C @ =gUnknown_2037AB8 + ldr r0, _0810DD2C @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -1164,7 +1164,7 @@ sub_810DCE4: @ 810DCE4 b _0810DD40 .align 2, 0 _0810DD28: .4byte gTasks+0x8 -_0810DD2C: .4byte gUnknown_2037AB8 +_0810DD2C: .4byte gPaletteFade _0810DD30: .4byte gUnknown_203ADD0 _0810DD34: .4byte gUnknown_203ADBC _0810DD38: @@ -1382,7 +1382,7 @@ sub_810DEA0: @ 810DEA0 lsls r0, 3 ldr r1, _0810DF10 @ =gTasks+0x8 adds r6, r0, r1 - ldr r0, _0810DF14 @ =gUnknown_2037AB8 + ldr r0, _0810DF14 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -1426,7 +1426,7 @@ sub_810DEA0: @ 810DEA0 b _0810DF9E .align 2, 0 _0810DF10: .4byte gTasks+0x8 -_0810DF14: .4byte gUnknown_2037AB8 +_0810DF14: .4byte gPaletteFade _0810DF18: .4byte gMain _0810DF1C: .4byte gUnknown_203ADBC _0810DF20: diff --git a/asm/item_use.s b/asm/item_use.s index e2cad1322..e15bd8660 100644 --- a/asm/item_use.s +++ b/asm/item_use.s @@ -1060,7 +1060,7 @@ sub_80A17E8: @ 80A17E8 push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r0, _080A1818 @ =gUnknown_2037AB8 + ldr r0, _080A1818 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -1079,7 +1079,7 @@ _080A1812: pop {r0} bx r0 .align 2, 0 -_080A1818: .4byte gUnknown_2037AB8 +_080A1818: .4byte gPaletteFade _080A181C: .4byte c2_exit_to_overworld_2_switch thumb_func_end sub_80A17E8 @@ -1138,7 +1138,7 @@ sub_80A1880: @ 80A1880 push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r0, _080A18B0 @ =gUnknown_2037AB8 + ldr r0, _080A18B0 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -1157,7 +1157,7 @@ _080A18AA: pop {r0} bx r0 .align 2, 0 -_080A18B0: .4byte gUnknown_2037AB8 +_080A18B0: .4byte gPaletteFade _080A18B4: .4byte c2_exit_to_overworld_2_switch thumb_func_end sub_80A1880 @@ -1253,7 +1253,7 @@ sub_80A1960: @ 80A1960 push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r0, _080A1990 @ =gUnknown_2037AB8 + ldr r0, _080A1990 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -1271,7 +1271,7 @@ _080A1988: pop {r0} bx r0 .align 2, 0 -_080A1990: .4byte gUnknown_2037AB8 +_080A1990: .4byte gPaletteFade _080A1994: .4byte c2_exit_to_overworld_2_switch thumb_func_end sub_80A1960 @@ -1660,7 +1660,7 @@ sub_80A1CC0: @ 80A1CC0 push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r0, _080A1CF0 @ =gUnknown_2037AB8 + ldr r0, _080A1CF0 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -1678,7 +1678,7 @@ _080A1CE8: pop {r0} bx r0 .align 2, 0 -_080A1CF0: .4byte gUnknown_2037AB8 +_080A1CF0: .4byte gPaletteFade _080A1CF4: .4byte c2_exit_to_overworld_2_switch thumb_func_end sub_80A1CC0 @@ -1743,7 +1743,7 @@ sub_80A1D68: @ 80A1D68 push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r0, _080A1D94 @ =gUnknown_2037AB8 + ldr r0, _080A1D94 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -1760,7 +1760,7 @@ _080A1D8E: pop {r0} bx r0 .align 2, 0 -_080A1D94: .4byte gUnknown_2037AB8 +_080A1D94: .4byte gPaletteFade _080A1D98: .4byte c2_exit_to_overworld_2_switch thumb_func_end sub_80A1D68 diff --git a/asm/learn_move.s b/asm/learn_move.s index eba23b712..43eb29d5b 100644 --- a/asm/learn_move.s +++ b/asm/learn_move.s @@ -42,7 +42,7 @@ sub_80E4660: @ 80E4660 push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r0, _080E468C @ =gUnknown_2037AB8 + ldr r0, _080E468C @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -60,7 +60,7 @@ _080E4684: pop {r0} bx r0 .align 2, 0 -_080E468C: .4byte gUnknown_2037AB8 +_080E468C: .4byte gPaletteFade _080E4690: .4byte sub_80E478C _080E4694: .4byte gUnknown_3005020 _080E4698: .4byte sub_807DD24 @@ -406,7 +406,7 @@ _080E49A8: _080E49EC: .4byte gUnknown_203AAB4 _080E49F0: .4byte 0x0000025f _080E49F4: - ldr r0, _080E4A08 @ =gUnknown_2037AB8 + ldr r0, _080E4A08 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -418,7 +418,7 @@ _080E4A02: movs r0, 0x4 b _080E4ED8 .align 2, 0 -_080E4A08: .4byte gUnknown_2037AB8 +_080E4A08: .4byte gPaletteFade _080E4A0C: ldr r1, [r7] ldrb r0, [r1] @@ -720,7 +720,7 @@ _080E4C5A: bl BeginNormalPaletteFade b _080E4EDA _080E4C70: - ldr r0, _080E4CC8 @ =gUnknown_2037AB8 + ldr r0, _080E4CC8 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -763,7 +763,7 @@ _080E4C7E: movs r0, 0x1C b _080E4ED8 .align 2, 0 -_080E4CC8: .4byte gUnknown_2037AB8 +_080E4CC8: .4byte gPaletteFade _080E4CCC: .4byte 0x00000263 _080E4CD0: .4byte 0x00000a68 _080E4CD4: .4byte 0x00000a6a @@ -798,7 +798,7 @@ _080E4CFA: .align 2, 0 _080E4D14: .4byte gUnknown_203AAB4 _080E4D18: - ldr r0, _080E4D3C @ =gUnknown_2037AB8 + ldr r0, _080E4D3C @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -814,7 +814,7 @@ _080E4D26: bl SetMainCallback2 b _080E4EDA .align 2, 0 -_080E4D3C: .4byte gUnknown_2037AB8 +_080E4D3C: .4byte gPaletteFade _080E4D40: .4byte gUnknown_203AAB4 _080E4D44: .4byte c2_exit_to_overworld_2_switch _080E4D48: @@ -844,7 +844,7 @@ _080E4D48: .align 2, 0 _080E4D88: .4byte gUnknown_203AAB4 _080E4D8C: - ldr r0, _080E4DAC @ =gUnknown_2037AB8 + ldr r0, _080E4DAC @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -861,7 +861,7 @@ _080E4D9A: movs r0, 0x18 b _080E4ED8 .align 2, 0 -_080E4DAC: .4byte gUnknown_2037AB8 +_080E4DAC: .4byte gPaletteFade _080E4DB0: .4byte 0x00000261 _080E4DB4: movs r4, 0x98 diff --git a/asm/link_rfu.s b/asm/link_rfu.s index 3f8d3735c..4b20fa9a0 100644 --- a/asm/link_rfu.s +++ b/asm/link_rfu.s @@ -3372,7 +3372,7 @@ _080FED28: strh r0, [r6] b _080FED6E _080FED38: - ldr r0, _080FED78 @ =gUnknown_2037AB8 + ldr r0, _080FED78 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -3402,7 +3402,7 @@ _080FED6E: pop {r0} bx r0 .align 2, 0 -_080FED78: .4byte gUnknown_2037AB8 +_080FED78: .4byte gPaletteFade _080FED7C: .4byte 0x0000082d thumb_func_end sub_80FEC90 diff --git a/asm/link_rfu_3.s b/asm/link_rfu_3.s index f4e12b60f..6f282750b 100644 --- a/asm/link_rfu_3.s +++ b/asm/link_rfu_3.s @@ -3849,7 +3849,7 @@ _08117944: bl fade_screen b _08117968 _08117958: - ldr r0, _08117970 @ =gUnknown_2037AB8 + ldr r0, _08117970 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -3862,7 +3862,7 @@ _08117968: strh r0, [r4] b _08117988 .align 2, 0 -_08117970: .4byte gUnknown_2037AB8 +_08117970: .4byte gPaletteFade _08117974: bl sub_800A4BC lsls r0, 24 @@ -6990,7 +6990,7 @@ _081194F0: movs r0, 0x36 b _081198DA _08119504: - ldr r0, _08119528 @ =gUnknown_2037AB8 + ldr r0, _08119528 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -7009,7 +7009,7 @@ _08119512: bl sub_81277F4 b _081198DC .align 2, 0 -_08119528: .4byte gUnknown_2037AB8 +_08119528: .4byte gPaletteFade _0811952C: .4byte gUnknown_203B06C _08119530: .4byte gUnknown_3005020 _08119534: .4byte sub_807DCE4 diff --git a/asm/mail.s b/asm/mail.s index ecd5e71fd..bf24fe177 100644 --- a/asm/mail.s +++ b/asm/mail.s @@ -497,7 +497,7 @@ _080BF01C: _080BF026: ldr r0, _080BF038 @ =sub_80BF354 bl SetVBlankCallback - ldr r2, _080BF03C @ =gUnknown_2037AB8 + ldr r2, _080BF03C @ =gPaletteFade ldrb r0, [r2, 0x8] movs r1, 0x80 orrs r0, r1 @@ -505,7 +505,7 @@ _080BF026: b _080BF0F4 .align 2, 0 _080BF038: .4byte sub_80BF354 -_080BF03C: .4byte gUnknown_2037AB8 +_080BF03C: .4byte gPaletteFade _080BF040: ldr r5, _080BF064 @ =gUnknown_20399C4 ldr r0, [r5] @@ -573,7 +573,7 @@ _080BF0A4: movs r2, 0x10 movs r3, 0 bl BeginNormalPaletteFade - ldr r2, _080BF0E8 @ =gUnknown_2037AB8 + ldr r2, _080BF0E8 @ =gPaletteFade ldrb r1, [r2, 0x8] movs r0, 0x7F ands r0, r1 @@ -586,7 +586,7 @@ _080BF0A4: movs r0, 0x1 b _080BF104 .align 2, 0 -_080BF0E8: .4byte gUnknown_2037AB8 +_080BF0E8: .4byte gPaletteFade _080BF0EC: .4byte gUnknown_20399C4 _080BF0F0: .4byte sub_80BF394 _080BF0F4: diff --git a/asm/main_menu.s b/asm/main_menu.s index 9c1302cdc..3285c29ea 100644 --- a/asm/main_menu.s +++ b/asm/main_menu.s @@ -223,7 +223,7 @@ sub_800C4D0: @ 800C4D0 push {r4-r6,lr} lsls r0, 24 lsrs r5, r0, 24 - ldr r0, _0800C538 @ =gUnknown_2037AB8 + ldr r0, _0800C538 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -266,7 +266,7 @@ _0800C4E8: beq _0800C54A b _0800C5E8 .align 2, 0 -_0800C538: .4byte gUnknown_2037AB8 +_0800C538: .4byte gPaletteFade _0800C53C: .4byte gUnknown_30053A0 _0800C540: cmp r4, 0x4 @@ -430,7 +430,7 @@ sub_800C688: @ 800C688 push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r0, _0800C6E0 @ =gUnknown_2037AB8 + ldr r0, _0800C6E0 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -466,7 +466,7 @@ sub_800C688: @ 800C688 ldr r0, _0800C6F0 @ =sub_800C704 b _0800C6F6 .align 2, 0 -_0800C6E0: .4byte gUnknown_2037AB8 +_0800C6E0: .4byte gPaletteFade _0800C6E4: .4byte gMain _0800C6E8: .4byte gUnknown_8234638 _0800C6EC: .4byte gTasks @@ -488,7 +488,7 @@ sub_800C704: @ 800C704 push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r0, _0800C764 @ =gUnknown_2037AB8 + ldr r0, _0800C764 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -527,7 +527,7 @@ sub_800C704: @ 800C704 ldr r0, _0800C76C @ =sub_800CA94 b _0800C772 .align 2, 0 -_0800C764: .4byte gUnknown_2037AB8 +_0800C764: .4byte gPaletteFade _0800C768: .4byte gTasks _0800C76C: .4byte sub_800CA94 _0800C770: @@ -547,7 +547,7 @@ sub_800C780: @ 800C780 push {lr} lsls r0, 24 lsrs r2, r0, 24 - ldr r0, _0800C79C @ =gUnknown_2037AB8 + ldr r0, _0800C79C @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -559,7 +559,7 @@ _0800C798: pop {r0} bx r0 .align 2, 0 -_0800C79C: .4byte gUnknown_2037AB8 +_0800C79C: .4byte gPaletteFade thumb_func_end sub_800C780 thumb_func_start sub_800C7A0 @@ -867,7 +867,7 @@ sub_800CA54: @ 800CA54 push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r0, _0800CA88 @ =gUnknown_2037AB8 + ldr r0, _0800CA88 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -890,7 +890,7 @@ _0800CA80: pop {r0} bx r0 .align 2, 0 -_0800CA88: .4byte gUnknown_2037AB8 +_0800CA88: .4byte gPaletteFade _0800CA8C: .4byte gTasks _0800CA90: .4byte sub_800CA28 thumb_func_end sub_800CA54 @@ -901,7 +901,7 @@ sub_800CA94: @ 800CA94 sub sp, 0x4 lsls r0, 24 lsrs r6, r0, 24 - ldr r0, _0800CAC4 @ =gUnknown_2037AB8 + ldr r0, _0800CAC4 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -922,7 +922,7 @@ sub_800CA94: @ 800CA94 beq _0800CADA b _0800CAEE .align 2, 0 -_0800CAC4: .4byte gUnknown_2037AB8 +_0800CAC4: .4byte gPaletteFade _0800CAC8: .4byte gTasks _0800CACC: movs r1, 0xA @@ -1084,13 +1084,13 @@ _0800CBF2: _0800CC04: .4byte gUnknown_8415ACB _0800CC08: .4byte gTasks _0800CC0C: - ldr r0, _0800CC18 @ =gUnknown_2037AB8 + ldr r0, _0800CC18 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 b _0800CC28 .align 2, 0 -_0800CC18: .4byte gUnknown_2037AB8 +_0800CC18: .4byte gPaletteFade _0800CC1C: bl RunTextPrinters movs r0, 0x4 @@ -1135,7 +1135,7 @@ sub_800CC68: @ 800CC68 push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r0, _0800CC8C @ =gUnknown_2037AB8 + ldr r0, _0800CC8C @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -1150,7 +1150,7 @@ _0800CC86: pop {r0} bx r0 .align 2, 0 -_0800CC8C: .4byte gUnknown_2037AB8 +_0800CC8C: .4byte gPaletteFade _0800CC90: .4byte sub_8078914 thumb_func_end sub_800CC68 diff --git a/asm/mevent_8145654.s b/asm/mevent_8145654.s index 0c344853a..ccb86ba64 100644 --- a/asm/mevent_8145654.s +++ b/asm/mevent_8145654.s @@ -246,7 +246,7 @@ _08145834: lsrs r6, r0, 24 cmp r6, 0 bne _0814592E - ldr r2, _081458A0 @ =gUnknown_2037AB8 + ldr r2, _081458A0 @ =gPaletteFade ldrb r0, [r2, 0x8] movs r1, 0x80 orrs r0, r1 @@ -291,7 +291,7 @@ _08145834: bl CopyBgTilemapBufferToVram b _0814591E .align 2, 0 -_081458A0: .4byte gUnknown_2037AB8 +_081458A0: .4byte gPaletteFade _081458A4: .4byte gUnknown_203F3C8 _081458A8: .4byte 0x0000045c _081458AC: @@ -315,7 +315,7 @@ _081458D2: bl ShowBg movs r0, 0x2 bl ShowBg - ldr r2, _08145904 @ =gUnknown_2037AB8 + ldr r2, _08145904 @ =gPaletteFade ldrb r1, [r2, 0x8] movs r0, 0x7F ands r0, r1 @@ -331,7 +331,7 @@ _081458D2: bl UpdatePaletteFade b _0814591E .align 2, 0 -_08145904: .4byte gUnknown_2037AB8 +_08145904: .4byte gPaletteFade _08145908: bl UpdatePaletteFade lsls r0, 24 @@ -1780,7 +1780,7 @@ _08146494: beq _081464A2 b _081465EC _081464A2: - ldr r2, _0814653C @ =gUnknown_2037AB8 + ldr r2, _0814653C @ =gPaletteFade ldrb r0, [r2, 0x8] movs r1, 0x80 orrs r0, r1 @@ -1851,7 +1851,7 @@ _081464A2: bl CopyBgTilemapBufferToVram b _081465D2 .align 2, 0 -_0814653C: .4byte gUnknown_2037AB8 +_0814653C: .4byte gPaletteFade _08146540: .4byte gUnknown_203F3CC _08146544: bl sub_8146980 @@ -1870,7 +1870,7 @@ _0814655C: bl ShowBg movs r0, 0x3 bl ShowBg - ldr r2, _081465AC @ =gUnknown_2037AB8 + ldr r2, _081465AC @ =gPaletteFade ldrb r1, [r2, 0x8] movs r0, 0x7F ands r0, r1 @@ -1898,7 +1898,7 @@ _0814655C: bl UpdatePaletteFade b _081465D2 .align 2, 0 -_081465AC: .4byte gUnknown_2037AB8 +_081465AC: .4byte gPaletteFade _081465B0: .4byte gUnknown_203F3CC _081465B4: .4byte 0x000001c1 _081465B8: diff --git a/asm/naming_screen.s b/asm/naming_screen.s index e42ed45d8..e8a5cb2c2 100644 --- a/asm/naming_screen.s +++ b/asm/naming_screen.s @@ -692,7 +692,7 @@ _0809DF24: .4byte 0x00001e10 thumb_func_start sub_809DF28 sub_809DF28: @ 809DF28 push {lr} - ldr r0, _0809DF58 @ =gUnknown_2037AB8 + ldr r0, _0809DF58 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -714,7 +714,7 @@ _0809DF50: pop {r1} bx r1 .align 2, 0 -_0809DF58: .4byte gUnknown_2037AB8 +_0809DF58: .4byte gPaletteFade _0809DF5C: .4byte gUnknown_203998C _0809DF60: .4byte 0x00001e10 thumb_func_end sub_809DF28 @@ -837,7 +837,7 @@ _0809E044: .4byte 0x00001e10 thumb_func_start sub_809E048 sub_809E048: @ 809E048 push {r4,r5,lr} - ldr r0, _0809E0A0 @ =gUnknown_2037AB8 + ldr r0, _0809E0A0 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -875,7 +875,7 @@ _0809E096: pop {r1} bx r1 .align 2, 0 -_0809E0A0: .4byte gUnknown_2037AB8 +_0809E0A0: .4byte gPaletteFade _0809E0A4: .4byte gUnknown_203998C _0809E0A8: .4byte 0x00001e2c _0809E0AC: .4byte 0x00001e3c diff --git a/asm/oak_speech.s b/asm/oak_speech.s index c5591fc0e..e20c96638 100644 --- a/asm/oak_speech.s +++ b/asm/oak_speech.s @@ -462,7 +462,7 @@ _0812ECF4: .4byte gUnknown_203B108 _0812ECF8: .4byte gSpriteCoordOffsetX _0812ECFC: .4byte gSpriteCoordOffsetY _0812ED00: - ldr r2, _0812ED34 @ =gUnknown_2037AB8 + ldr r2, _0812ED34 @ =gPaletteFade ldrb r0, [r2, 0x8] movs r1, 0x80 orrs r0, r1 @@ -483,7 +483,7 @@ _0812ED00: bl LoadPalette b _0812EE94 .align 2, 0 -_0812ED34: .4byte gUnknown_2037AB8 +_0812ED34: .4byte gPaletteFade _0812ED38: .4byte gUnknown_8460568 _0812ED3C: bl sub_80F78A8 @@ -561,7 +561,7 @@ _0812ED9A: movs r3, 0x13 bl FillBgTilemapBufferRect_Palette0 bl sub_812EEB0 - ldr r2, _0812EE28 @ =gUnknown_2037AB8 + ldr r2, _0812EE28 @ =gPaletteFade ldrb r1, [r2, 0x8] movs r0, 0x7F ands r0, r1 @@ -590,7 +590,7 @@ _0812ED9A: _0812EE1C: .4byte 0x0000d00f _0812EE20: .4byte 0x0000d002 _0812EE24: .4byte 0x0000d00e -_0812EE28: .4byte gUnknown_2037AB8 +_0812EE28: .4byte gPaletteFade _0812EE2C: .4byte gTasks _0812EE30: movs r0, 0x1 @@ -890,7 +890,7 @@ sub_812F0B0: @ 812F0B0 sub sp, 0x4 lsls r0, 24 lsrs r5, r0, 24 - ldr r0, _0812F10C @ =gUnknown_2037AB8 + ldr r0, _0812F10C @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -931,7 +931,7 @@ sub_812F0B0: @ 812F0B0 bl BeginNormalPaletteFade b _0812F150 .align 2, 0 -_0812F10C: .4byte gUnknown_2037AB8 +_0812F10C: .4byte gPaletteFade _0812F110: .4byte gMain _0812F114: .4byte gTasks _0812F118: .4byte gUnknown_203B108 @@ -992,7 +992,7 @@ sub_812F180: @ 812F180 lsrs r7, r0, 24 movs r0, 0 mov r8, r0 - ldr r0, _0812F1B0 @ =gUnknown_2037AB8 + ldr r0, _0812F1B0 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -1008,7 +1008,7 @@ sub_812F180: @ 812F180 mov r8, r1 b _0812F1C4 .align 2, 0 -_0812F1B0: .4byte gUnknown_2037AB8 +_0812F1B0: .4byte gPaletteFade _0812F1B4: .4byte gUnknown_203B108 _0812F1B8: cmp r0, 0 @@ -1115,7 +1115,7 @@ sub_812F274: @ 812F274 lsrs r0, 24 mov r8, r0 movs r6, 0 - ldr r0, _0812F32C @ =gUnknown_2037AB8 + ldr r0, _0812F32C @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -1194,7 +1194,7 @@ _0812F320: pop {r0} bx r0 .align 2, 0 -_0812F32C: .4byte gUnknown_2037AB8 +_0812F32C: .4byte gPaletteFade _0812F330: .4byte gUnknown_203B108 _0812F334: .4byte gTasks _0812F338: .4byte sub_812F33C @@ -1402,7 +1402,7 @@ _0812F4E4: .4byte _0812F644 .4byte _0812F688 _0812F4F8: - ldr r0, _0812F534 @ =gUnknown_2037AB8 + ldr r0, _0812F534 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -1429,7 +1429,7 @@ _0812F506: bl SetGpuRegBits b _0812F676 .align 2, 0 -_0812F534: .4byte gUnknown_2037AB8 +_0812F534: .4byte gPaletteFade _0812F538: ldrh r1, [r4, 0x2E] movs r0, 0x3 @@ -1681,7 +1681,7 @@ sub_812F72C: @ 812F72C ldr r0, _0812F7B4 @ =gTasks+0x8 mov r8, r0 adds r4, r7, r0 - ldr r0, _0812F7B8 @ =gUnknown_2037AB8 + ldr r0, _0812F7B8 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -1731,7 +1731,7 @@ _0812F7A6: bx r0 .align 2, 0 _0812F7B4: .4byte gTasks+0x8 -_0812F7B8: .4byte gUnknown_2037AB8 +_0812F7B8: .4byte gPaletteFade _0812F7BC: .4byte sub_812F7C0 thumb_func_end sub_812F72C @@ -1834,7 +1834,7 @@ sub_812F880: @ 812F880 lsls r0, 3 ldr r1, _0812F8B0 @ =gTasks+0x8 adds r2, r0, r1 - ldr r0, _0812F8B4 @ =gUnknown_2037AB8 + ldr r0, _0812F8B4 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -1850,7 +1850,7 @@ sub_812F880: @ 812F880 b _0812F92E .align 2, 0 _0812F8B0: .4byte gTasks+0x8 -_0812F8B4: .4byte gUnknown_2037AB8 +_0812F8B4: .4byte gPaletteFade _0812F8B8: movs r0, 0 movs r1, 0 @@ -3215,7 +3215,7 @@ sub_81303B4: @ 81303B4 sub sp, 0x8 lsls r0, 24 lsrs r6, r0, 24 - ldr r0, _081303F8 @ =gUnknown_2037AB8 + ldr r0, _081303F8 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -3243,7 +3243,7 @@ sub_81303B4: @ 81303B4 bl DoNamingScreen b _08130440 .align 2, 0 -_081303F8: .4byte gUnknown_2037AB8 +_081303F8: .4byte gPaletteFade _081303FC: .4byte gUnknown_203B108 _08130400: .4byte gSaveBlock2Ptr _08130404: .4byte sub_8130C64 @@ -3301,7 +3301,7 @@ sub_8130464: @ 8130464 lsls r6, r1, 3 ldr r7, _081304A0 @ =gTasks+0x8 adds r5, r6, r7 - ldr r0, _081304A4 @ =gUnknown_2037AB8 + ldr r0, _081304A4 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -3322,7 +3322,7 @@ sub_8130464: @ 8130464 b _081304BC .align 2, 0 _081304A0: .4byte gTasks+0x8 -_081304A4: .4byte gUnknown_2037AB8 +_081304A4: .4byte gPaletteFade _081304A8: .4byte gUnknown_203B108 _081304AC: .4byte gStringVar4 _081304B0: .4byte gUnknown_81C5E13 @@ -4072,7 +4072,7 @@ sub_8130A80: @ 8130A80 lsls r0, 3 ldr r1, _08130AB8 @ =gTasks+0x8 adds r2, r0, r1 - ldr r0, _08130ABC @ =gUnknown_2037AB8 + ldr r0, _08130ABC @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -4091,7 +4091,7 @@ sub_8130A80: @ 8130A80 b _08130AD4 .align 2, 0 _08130AB8: .4byte gTasks+0x8 -_08130ABC: .4byte gUnknown_2037AB8 +_08130ABC: .4byte gPaletteFade _08130AC0: adds r0, 0x1 strh r0, [r2, 0x2] @@ -4260,7 +4260,7 @@ sub_8130BF0: @ 8130BF0 push {lr} lsls r0, 24 lsrs r2, r0, 24 - ldr r0, _08130C14 @ =gUnknown_2037AB8 + ldr r0, _08130C14 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -4277,7 +4277,7 @@ _08130C10: pop {r0} bx r0 .align 2, 0 -_08130C14: .4byte gUnknown_2037AB8 +_08130C14: .4byte gPaletteFade _08130C18: .4byte gTasks _08130C1C: .4byte sub_8130C20 thumb_func_end sub_8130BF0 @@ -5350,7 +5350,7 @@ sub_81314DC: @ 81314DC mov r12, r1 cmp r0, 0x10 bne _08131530 - ldr r0, _0813152C @ =gUnknown_2037AB8 + ldr r0, _0813152C @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -5369,7 +5369,7 @@ sub_81314DC: @ 81314DC b _081315BA .align 2, 0 _08131528: .4byte gTasks -_0813152C: .4byte gUnknown_2037AB8 +_0813152C: .4byte gPaletteFade _08131530: ldrh r1, [r2, 0x10] movs r7, 0x10 diff --git a/asm/option_menu.s b/asm/option_menu.s index 780b5046e..e3c44d1ac 100644 --- a/asm/option_menu.s +++ b/asm/option_menu.s @@ -640,7 +640,7 @@ _08088878: .align 2, 0 _08088890: .4byte gUnknown_2039620 _08088894: - ldr r0, _080888AC @ =gUnknown_2037AB8 + ldr r0, _080888AC @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -653,7 +653,7 @@ _080888A2: strb r0, [r1, 0x10] b _080888B6 .align 2, 0 -_080888AC: .4byte gUnknown_2037AB8 +_080888AC: .4byte gPaletteFade _080888B0: adds r0, r2, 0 bl sub_8088B00 diff --git a/asm/overworld.s b/asm/overworld.s index 5e6315b9f..ddc5bf6d7 100644 --- a/asm/overworld.s +++ b/asm/overworld.s @@ -3409,7 +3409,7 @@ sub_80565A8: @ 80565A8 thumb_func_start sub_80565B4 sub_80565B4: @ 80565B4 push {r4,lr} - ldr r0, _080565DC @ =gUnknown_2037AB8 + ldr r0, _080565DC @ =gPaletteFade ldrb r0, [r0, 0x7] lsrs r0, 7 adds r4, r0, 0 @@ -3427,7 +3427,7 @@ _080565D4: pop {r0} bx r0 .align 2, 0 -_080565DC: .4byte gUnknown_2037AB8 +_080565DC: .4byte gPaletteFade thumb_func_end sub_80565B4 thumb_func_start sub_80565E0 @@ -5161,7 +5161,7 @@ _080574A0: .4byte sub_8056534 thumb_func_start sub_80574A4 sub_80574A4: @ 80574A4 push {r4,lr} - ldr r0, _080574E8 @ =gUnknown_2037AB8 + ldr r0, _080574E8 @ =gPaletteFade ldrb r0, [r0, 0x7] lsrs r0, 7 adds r4, r0, 0 @@ -5186,13 +5186,13 @@ _080574E0: pop {r0} bx r0 .align 2, 0 -_080574E8: .4byte gUnknown_2037AB8 +_080574E8: .4byte gPaletteFade thumb_func_end sub_80574A4 thumb_func_start sub_80574EC sub_80574EC: @ 80574EC push {lr} - ldr r0, _08057500 @ =gUnknown_2037AB8 + ldr r0, _08057500 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -5201,7 +5201,7 @@ sub_80574EC: @ 80574EC movs r0, 0 b _08057506 .align 2, 0 -_08057500: .4byte gUnknown_2037AB8 +_08057500: .4byte gPaletteFade _08057504: movs r0, 0x1 _08057506: @@ -5305,7 +5305,7 @@ _08057560: ldrh r0, [r0, 0x4] strh r0, [r1] bl warp_in - ldr r2, _08057610 @ =gUnknown_2037AB8 + ldr r2, _08057610 @ =gPaletteFade ldrb r0, [r2, 0x8] movs r1, 0x80 orrs r0, r1 @@ -5333,7 +5333,7 @@ _08057600: .4byte 0xffff0000 _08057604: .4byte 0x0000ffff _08057608: .4byte gUnknown_2031DBC _0805760C: .4byte gUnknown_2031DE8 -_08057610: .4byte gUnknown_2037AB8 +_08057610: .4byte gPaletteFade _08057614: .4byte gUnknown_3005024 _08057618: .4byte sub_80574EC _0805761C: .4byte gMain @@ -5443,7 +5443,7 @@ _0805770C: b _0805772A _08057712: bl cur_mapheader_run_tileset_funcs_after_some_cpuset - ldr r2, _08057734 @ =gUnknown_2037AB8 + ldr r2, _08057734 @ =gPaletteFade ldrb r1, [r2, 0x8] movs r0, 0x7F ands r0, r1 @@ -5458,7 +5458,7 @@ _0805772A: strb r0, [r4] b _08057740 .align 2, 0 -_08057734: .4byte gUnknown_2037AB8 +_08057734: .4byte gPaletteFade _08057738: .4byte 0x3fffffff _0805773C: movs r0, 0x1 @@ -5613,7 +5613,7 @@ sub_8057854: @ 8057854 push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r0, _0805787C @ =gUnknown_2037AB8 + ldr r0, _0805787C @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -5629,7 +5629,7 @@ _08057876: pop {r0} bx r0 .align 2, 0 -_0805787C: .4byte gUnknown_2037AB8 +_0805787C: .4byte gPaletteFade _08057880: .4byte sub_805671C thumb_func_end sub_8057854 @@ -7029,7 +7029,7 @@ sub_8058274: @ 8058274 strb r1, [r0] cmp r2, 0x1 beq _080582C0 - ldr r2, _080582D4 @ =gUnknown_2037AB8 + ldr r2, _080582D4 @ =gPaletteFade ldrb r1, [r2, 0x7] movs r0, 0x80 ands r0, r1 @@ -7048,7 +7048,7 @@ _080582C4: .4byte gUnknown_3000E84 _080582C8: .4byte sub_8057DC8 _080582CC: .4byte sub_8057DA4 _080582D0: .4byte gUnknown_3000E88 -_080582D4: .4byte gUnknown_2037AB8 +_080582D4: .4byte gPaletteFade _080582D8: movs r0, 0 _080582DA: diff --git a/asm/palette.s b/asm/palette.s index a99aeda10..d53329082 100644 --- a/asm/palette.s +++ b/asm/palette.s @@ -109,7 +109,7 @@ _08070470: .4byte gUnknown_20375F8 thumb_func_start TransferPlttBuffer TransferPlttBuffer: @ 8070474 push {r4,r5,lr} - ldr r4, _080704BC @ =gUnknown_2037AB8 + ldr r4, _080704BC @ =gPaletteFade ldrb r1, [r4, 0x8] movs r5, 0x80 adds r0, r5, 0 @@ -145,7 +145,7 @@ _080704B6: pop {r0} bx r0 .align 2, 0 -_080704BC: .4byte gUnknown_2037AB8 +_080704BC: .4byte gPaletteFade _080704C0: .4byte gUnknown_20375F8 _080704C4: .4byte 0x040000d4 _080704C8: .4byte 0x80000200 @@ -164,7 +164,7 @@ UpdatePaletteFade: @ 80704D0 .align 2, 0 _080704E0: .4byte gUnknown_2037AC8 _080704E4: - ldr r0, _080704F8 @ =gUnknown_2037AB8 + ldr r0, _080704F8 @ =gPaletteFade ldrb r0, [r0, 0x9] movs r1, 0x3 ands r1, r0 @@ -173,7 +173,7 @@ _080704E4: bl UpdateNormalPaletteFade b _0807050A .align 2, 0 -_080704F8: .4byte gUnknown_2037AB8 +_080704F8: .4byte gPaletteFade _080704FC: cmp r1, 0x1 bne _08070506 @@ -185,7 +185,7 @@ _0807050A: lsls r0, 24 lsrs r3, r0, 24 ldr r2, _08070520 @ =gUnknown_2037AC8 - ldr r0, _08070524 @ =gUnknown_2037AB8 + ldr r0, _08070524 @ =gPaletteFade ldr r0, [r0] movs r1, 0 orrs r0, r1 @@ -196,7 +196,7 @@ _0807051C: bx r1 .align 2, 0 _08070520: .4byte gUnknown_2037AC8 -_08070524: .4byte gUnknown_2037AB8 +_08070524: .4byte gPaletteFade thumb_func_end UpdatePaletteFade thumb_func_start ResetPaletteFade @@ -268,7 +268,7 @@ BeginNormalPaletteFade: @ 8070588 lsls r0, 16 lsrs r0, 16 mov r8, r0 - ldr r5, _080705B8 @ =gUnknown_2037AB8 + ldr r5, _080705B8 @ =gPaletteFade ldrb r1, [r5, 0x7] movs r0, 0x80 ands r0, r1 @@ -277,7 +277,7 @@ BeginNormalPaletteFade: @ 8070588 movs r0, 0 b _080706B4 .align 2, 0 -_080705B8: .4byte gUnknown_2037AB8 +_080705B8: .4byte gPaletteFade _080705BC: ldrb r0, [r5, 0xA] movs r3, 0x79 @@ -367,7 +367,7 @@ _08070664: _08070668: strb r3, [r5, 0x8] bl UpdatePaletteFade - ldr r4, _080706C0 @ =gUnknown_2037AB8 + ldr r4, _080706C0 @ =gPaletteFade ldrb r1, [r4, 0x8] lsrs r5, r1, 7 movs r0, 0x7F @@ -393,7 +393,7 @@ _08070668: beq _080706A4 bl UpdateBlendRegisters _080706A4: - ldr r2, _080706C0 @ =gUnknown_2037AB8 + ldr r2, _080706C0 @ =gPaletteFade lsls r3, r5, 7 ldrb r1, [r2, 0x8] movs r0, 0x7F @@ -408,7 +408,7 @@ _080706B4: pop {r1} bx r1 .align 2, 0 -_080706C0: .4byte gUnknown_2037AB8 +_080706C0: .4byte gPaletteFade _080706C4: .4byte gUnknown_20375F8 _080706C8: .4byte 0x04000100 _080706CC: .4byte gUnknown_2037AC8 @@ -703,7 +703,7 @@ _080708F0: .4byte 0xfffff01f unused_sub_80A1E40: @ 80708F4 push {r4-r6,lr} adds r4, r0, 0 - ldr r3, _0807094C @ =gUnknown_2037AB8 + ldr r3, _0807094C @ =gPaletteFade ldrb r1, [r3, 0x7] movs r0, 0x80 ands r0, r1 @@ -745,7 +745,7 @@ unused_sub_80A1E40: @ 80708F4 bl BlendPalette b _080709A8 .align 2, 0 -_0807094C: .4byte gUnknown_2037AB8 +_0807094C: .4byte gPaletteFade _08070950: ldrb r1, [r3, 0x4] movs r0, 0x3F @@ -912,7 +912,7 @@ _08070A80: .4byte 0xfffff01f thumb_func_start ResetPaletteFadeControl ResetPaletteFadeControl: @ 8070A84 - ldr r2, _08070AEC @ =gUnknown_2037AB8 + ldr r2, _08070AEC @ =gPaletteFade movs r0, 0 str r0, [r2] subs r0, 0x40 @@ -965,7 +965,7 @@ ResetPaletteFadeControl: @ 8070A84 strb r3, [r2, 0xA] bx lr .align 2, 0 -_08070AEC: .4byte gUnknown_2037AB8 +_08070AEC: .4byte gPaletteFade _08070AF0: .4byte 0xfffff83f _08070AF4: .4byte 0xffff8000 _08070AF8: .4byte 0xfffe0fff @@ -1059,7 +1059,7 @@ _08070B88: thumb_func_start UpdateNormalPaletteFade UpdateNormalPaletteFade: @ 8070B8C push {r4-r7,lr} - ldr r4, _08070BA0 @ =gUnknown_2037AB8 + ldr r4, _08070BA0 @ =gPaletteFade ldrb r1, [r4, 0x7] movs r0, 0x80 ands r0, r1 @@ -1068,7 +1068,7 @@ UpdateNormalPaletteFade: @ 8070B8C movs r0, 0 b _08070CC0 .align 2, 0 -_08070BA0: .4byte gUnknown_2037AB8 +_08070BA0: .4byte gPaletteFade _08070BA4: bl IsSoftwarePaletteFadeFinishing lsls r0, 24 @@ -1106,7 +1106,7 @@ _08070BDE: strb r0, [r4, 0x4] _08070BE6: movs r5, 0 - ldr r2, _08070BFC @ =gUnknown_2037AB8 + ldr r2, _08070BFC @ =gPaletteFade ldrb r1, [r2, 0xA] movs r0, 0x4 ands r0, r1 @@ -1116,7 +1116,7 @@ _08070BE6: ldrh r4, [r7] b _08070C06 .align 2, 0 -_08070BFC: .4byte gUnknown_2037AB8 +_08070BFC: .4byte gPaletteFade _08070C00: ldrh r4, [r7, 0x2] movs r5, 0x80 @@ -1124,7 +1124,7 @@ _08070C00: _08070C06: cmp r4, 0 beq _08070C38 - ldr r7, _08070C74 @ =gUnknown_2037AB8 + ldr r7, _08070C74 @ =gPaletteFade adds r6, r7, 0 _08070C0E: movs r0, 0x1 @@ -1180,7 +1180,7 @@ _08070C38: strb r4, [r7, 0xA] b _08070CBC .align 2, 0 -_08070C74: .4byte gUnknown_2037AB8 +_08070C74: .4byte gPaletteFade _08070C78: ldrb r1, [r7, 0x8] movs r0, 0x40 @@ -1445,7 +1445,7 @@ BeginFastPaletteFade: @ 8070E44 push {lr} lsls r0, 24 lsrs r0, 24 - ldr r3, _08070E64 @ =gUnknown_2037AB8 + ldr r3, _08070E64 @ =gPaletteFade ldrb r2, [r3, 0xA] movs r1, 0x79 negs r1, r1 @@ -1457,7 +1457,7 @@ BeginFastPaletteFade: @ 8070E44 pop {r0} bx r0 .align 2, 0 -_08070E64: .4byte gUnknown_2037AB8 +_08070E64: .4byte gPaletteFade thumb_func_end BeginFastPaletteFade thumb_func_start BeginFastPaletteFadeInternal @@ -1467,7 +1467,7 @@ BeginFastPaletteFadeInternal: @ 8070E68 lsls r0, 24 lsrs r0, 24 adds r4, r0, 0 - ldr r2, _08070EDC @ =gUnknown_2037AB8 + ldr r2, _08070EDC @ =gPaletteFade ldrh r0, [r2, 0x4] movs r3, 0xF8 lsls r3, 3 @@ -1520,7 +1520,7 @@ _08070ED0: pop {r0} bx r0 .align 2, 0 -_08070EDC: .4byte gUnknown_2037AB8 +_08070EDC: .4byte gPaletteFade _08070EE0: .4byte gUnknown_20375F8 _08070EE4: .4byte 0x01000200 _08070EE8: .4byte 0x00007fff @@ -1534,7 +1534,7 @@ UpdateFastPaletteFade: @ 8070EEC mov r5, r8 push {r5-r7} sub sp, 0x8 - ldr r4, _08070F08 @ =gUnknown_2037AB8 + ldr r4, _08070F08 @ =gPaletteFade ldrb r1, [r4, 0x7] movs r0, 0x80 ands r0, r1 @@ -1543,7 +1543,7 @@ UpdateFastPaletteFade: @ 8070EEC movs r0, 0 b _08071246 .align 2, 0 -_08070F08: .4byte gUnknown_2037AB8 +_08070F08: .4byte gPaletteFade _08070F0C: bl IsSoftwarePaletteFadeFinishing lsls r0, 24 @@ -1569,7 +1569,7 @@ _08070F30: lsls r1, 1 mov r10, r1 _08070F38: - ldr r1, _08070F50 @ =gUnknown_2037AB8 + ldr r1, _08070F50 @ =gPaletteFade ldrb r0, [r1, 0x8] lsls r0, 26 lsrs r0, 26 @@ -1581,7 +1581,7 @@ _08070F38: beq _08070F62 b _08071148 .align 2, 0 -_08070F50: .4byte gUnknown_2037AB8 +_08070F50: .4byte gPaletteFade _08070F54: cmp r0, 0x2 bne _08070F5A @@ -1853,7 +1853,7 @@ _0807112C: cmp r7, r10 bcc _080710EE _08071148: - ldr r0, _08071174 @ =gUnknown_2037AB8 + ldr r0, _08071174 @ =gPaletteFade ldrb r2, [r0, 0xA] lsls r0, r2, 29 lsrs r0, 31 @@ -1864,7 +1864,7 @@ _08071148: negs r3, r3 ands r3, r2 orrs r3, r1 - ldr r1, _08071174 @ =gUnknown_2037AB8 + ldr r1, _08071174 @ =gPaletteFade strb r3, [r1, 0xA] movs r0, 0x4 ands r0, r3 @@ -1874,9 +1874,9 @@ _08071148: b _08071244 .align 2, 0 _08071170: .4byte gUnknown_20375F8 -_08071174: .4byte gUnknown_2037AB8 +_08071174: .4byte gPaletteFade _08071178: - ldr r2, _08071194 @ =gUnknown_2037AB8 + ldr r2, _08071194 @ =gPaletteFade ldrh r4, [r2, 0x4] lsls r5, r4, 21 lsrs r0, r5, 27 @@ -1887,11 +1887,11 @@ _08071178: bge _0807119C ldr r0, _08071198 @ =0xfffff83f ands r0, r4 - ldr r3, _08071194 @ =gUnknown_2037AB8 + ldr r3, _08071194 @ =gPaletteFade strh r0, [r3, 0x4] b _080711B2 .align 2, 0 -_08071194: .4byte gUnknown_2037AB8 +_08071194: .4byte gPaletteFade _08071198: .4byte 0xfffff83f _0807119C: lsrs r1, r5, 27 @@ -1903,17 +1903,17 @@ _0807119C: ldr r0, _080711D8 @ =0xfffff83f ands r0, r4 orrs r0, r1 - ldr r4, _080711DC @ =gUnknown_2037AB8 + ldr r4, _080711DC @ =gPaletteFade strh r0, [r4, 0x4] _080711B2: - ldr r1, _080711DC @ =gUnknown_2037AB8 + ldr r1, _080711DC @ =gPaletteFade ldrh r0, [r1, 0x4] movs r1, 0xF8 lsls r1, 3 ands r1, r0 cmp r1, 0 bne _08071240 - ldr r2, _080711DC @ =gUnknown_2037AB8 + ldr r2, _080711DC @ =gPaletteFade ldrb r0, [r2, 0x8] lsls r0, 26 lsrs r0, 26 @@ -1926,7 +1926,7 @@ _080711B2: b _0807122C .align 2, 0 _080711D8: .4byte 0xfffff83f -_080711DC: .4byte gUnknown_2037AB8 +_080711DC: .4byte gPaletteFade _080711E0: cmp r0, 0x2 beq _080711EA @@ -1962,7 +1962,7 @@ _08071220: ldr r2, _0807125C @ =0x05000100 bl CpuSet _0807122C: - ldr r2, _08071260 @ =gUnknown_2037AB8 + ldr r2, _08071260 @ =gPaletteFade ldrb r1, [r2, 0x9] movs r0, 0x4 negs r0, r0 @@ -1973,7 +1973,7 @@ _0807122C: orrs r0, r1 strb r0, [r2, 0xA] _08071240: - ldr r3, _08071260 @ =gUnknown_2037AB8 + ldr r3, _08071260 @ =gPaletteFade ldrb r0, [r3, 0x7] _08071244: lsrs r0, 7 @@ -1989,7 +1989,7 @@ _08071246: .align 2, 0 _08071258: .4byte gUnknown_20375F8 _0807125C: .4byte 0x05000100 -_08071260: .4byte gUnknown_2037AB8 +_08071260: .4byte gPaletteFade thumb_func_end UpdateFastPaletteFade thumb_func_start BeginHardwarePaletteFade @@ -2006,7 +2006,7 @@ BeginHardwarePaletteFade: @ 8071264 lsrs r3, 24 lsls r5, 24 lsrs r5, 24 - ldr r7, _080712EC @ =gUnknown_2037AB8 + ldr r7, _080712EC @ =gPaletteFade str r0, [r7] movs r0, 0x3F ands r1, r0 @@ -2062,7 +2062,7 @@ BeginHardwarePaletteFade: @ 8071264 ands r6, r0 b _080712F8 .align 2, 0 -_080712EC: .4byte gUnknown_2037AB8 +_080712EC: .4byte gPaletteFade _080712F0: .4byte 0xfffff83f _080712F4: movs r0, 0x40 @@ -2077,7 +2077,7 @@ _080712F8: thumb_func_start UpdateHardwarePaletteFade UpdateHardwarePaletteFade: @ 8071300 push {r4-r7,lr} - ldr r2, _08071314 @ =gUnknown_2037AB8 + ldr r2, _08071314 @ =gPaletteFade ldrb r1, [r2, 0x7] movs r0, 0x80 ands r0, r1 @@ -2087,7 +2087,7 @@ UpdateHardwarePaletteFade: @ 8071300 movs r0, 0 b _08071410 .align 2, 0 -_08071314: .4byte gUnknown_2037AB8 +_08071314: .4byte gPaletteFade _08071318: ldrb r2, [r4, 0x4] lsls r1, r2, 26 @@ -2229,7 +2229,7 @@ _08071418: .4byte 0xfffff83f thumb_func_start UpdateBlendRegisters UpdateBlendRegisters: @ 807141C push {r4,lr} - ldr r4, _08071468 @ =gUnknown_2037AB8 + ldr r4, _08071468 @ =gPaletteFade ldrh r1, [r4] movs r0, 0x50 bl SetGpuReg @@ -2265,14 +2265,14 @@ _08071460: pop {r0} bx r0 .align 2, 0 -_08071468: .4byte gUnknown_2037AB8 +_08071468: .4byte gPaletteFade _0807146C: .4byte 0xfffff83f thumb_func_end UpdateBlendRegisters thumb_func_start IsSoftwarePaletteFadeFinishing IsSoftwarePaletteFadeFinishing: @ 8071470 push {r4,lr} - ldr r3, _080714A8 @ =gUnknown_2037AB8 + ldr r3, _080714A8 @ =gPaletteFade ldrb r4, [r3, 0xA] movs r0, 0x2 ands r0, r4 @@ -2300,7 +2300,7 @@ IsSoftwarePaletteFadeFinishing: @ 8071470 str r0, [r3, 0x8] b _080714C4 .align 2, 0 -_080714A8: .4byte gUnknown_2037AB8 +_080714A8: .4byte gPaletteFade _080714AC: .4byte 0xfffe0fff _080714B0: lsls r0, r2, 15 diff --git a/asm/party_menu.s b/asm/party_menu.s index c23e401ef..c482366d4 100644 --- a/asm/party_menu.s +++ b/asm/party_menu.s @@ -285,13 +285,13 @@ _0811EC8E: b _0811EDFC _0811EC94: bl ResetPaletteFade - ldr r2, _0811ECA4 @ =gUnknown_2037AB8 + ldr r2, _0811ECA4 @ =gPaletteFade ldrb r0, [r2, 0x8] movs r1, 0x80 orrs r0, r1 b _0811EDFA .align 2, 0 -_0811ECA4: .4byte gUnknown_2037AB8 +_0811ECA4: .4byte gPaletteFade _0811ECA8: bl ResetSpriteData b _0811EDFC @@ -452,7 +452,7 @@ _0811EDDE: movs r2, 0x10 movs r3, 0 bl BeginNormalPaletteFade - ldr r2, _0811EE0C @ =gUnknown_2037AB8 + ldr r2, _0811EE0C @ =gPaletteFade ldrb r1, [r2, 0x8] movs r0, 0x7F ands r0, r1 @@ -468,7 +468,7 @@ _0811EDFC: strb r0, [r1] b _0811EE2C .align 2, 0 -_0811EE0C: .4byte gUnknown_2037AB8 +_0811EE0C: .4byte gPaletteFade _0811EE10: .4byte gMain _0811EE14: ldr r0, _0811EE24 @ =sub_811EBBC @@ -522,7 +522,7 @@ sub_811EE74: @ 811EE74 push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r0, _0811EEA0 @ =gUnknown_2037AB8 + ldr r0, _0811EEA0 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -539,7 +539,7 @@ _0811EE98: pop {r0} bx r0 .align 2, 0 -_0811EEA0: .4byte gUnknown_2037AB8 +_0811EEA0: .4byte gPaletteFade _0811EEA4: .4byte gUnknown_203B0A0 thumb_func_end sub_811EE74 @@ -2092,7 +2092,7 @@ sub_811FAB4: @ 811FAB4 push {r4,r5,lr} lsls r0, 24 lsrs r5, r0, 24 - ldr r0, _0811FAE8 @ =gUnknown_2037AB8 + ldr r0, _0811FAE8 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -2114,7 +2114,7 @@ _0811FAD6: bl SetMainCallback2 b _0811FAFA .align 2, 0 -_0811FAE8: .4byte gUnknown_2037AB8 +_0811FAE8: .4byte gPaletteFade _0811FAEC: .4byte gUnknown_203B0A0 _0811FAF0: .4byte gUnknown_203B09C _0811FAF4: @@ -2156,7 +2156,7 @@ sub_811FB28: @ 811FB28 lsls r0, 24 lsrs r5, r0, 24 adds r6, r5, 0 - ldr r0, _0811FB64 @ =gUnknown_2037AB8 + ldr r0, _0811FB64 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -2180,7 +2180,7 @@ sub_811FB28: @ 811FB28 beq _0811FB6E b _0811FB98 .align 2, 0 -_0811FB64: .4byte gUnknown_2037AB8 +_0811FB64: .4byte gPaletteFade _0811FB68: cmp r0, 0x8 beq _0811FB82 @@ -4413,7 +4413,7 @@ sub_8120C3C: @ 8120C3C push {lr} lsls r0, 24 lsrs r2, r0, 24 - ldr r0, _08120C60 @ =gUnknown_2037AB8 + ldr r0, _08120C60 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -4430,7 +4430,7 @@ _08120C5C: pop {r0} bx r0 .align 2, 0 -_08120C60: .4byte gUnknown_2037AB8 +_08120C60: .4byte gPaletteFade _08120C64: .4byte gTasks _08120C68: .4byte sub_8120C6C thumb_func_end sub_8120C3C @@ -4471,7 +4471,7 @@ sub_8120CA8: @ 8120CA8 push {lr} lsls r0, 24 lsrs r2, r0, 24 - ldr r0, _08120CCC @ =gUnknown_2037AB8 + ldr r0, _08120CCC @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -4488,7 +4488,7 @@ _08120CC8: pop {r0} bx r0 .align 2, 0 -_08120CCC: .4byte gUnknown_2037AB8 +_08120CCC: .4byte gPaletteFade _08120CD0: .4byte gTasks _08120CD4: .4byte sub_8120CD8 thumb_func_end sub_8120CA8 @@ -4584,7 +4584,7 @@ sub_8120D7C: @ 8120D7C push {lr} lsls r0, 24 lsrs r2, r0, 24 - ldr r0, _08120DA0 @ =gUnknown_2037AB8 + ldr r0, _08120DA0 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -4601,7 +4601,7 @@ _08120D9C: pop {r0} bx r0 .align 2, 0 -_08120DA0: .4byte gUnknown_2037AB8 +_08120DA0: .4byte gPaletteFade _08120DA4: .4byte gTasks _08120DA8: .4byte sub_8120DAC thumb_func_end sub_8120D7C @@ -4700,7 +4700,7 @@ sub_8120E58: @ 8120E58 push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r0, _08120E90 @ =gUnknown_2037AB8 + ldr r0, _08120E90 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -4722,7 +4722,7 @@ sub_8120E58: @ 8120E58 bl sub_8121D0C b _08120E9E .align 2, 0 -_08120E90: .4byte gUnknown_2037AB8 +_08120E90: .4byte gPaletteFade _08120E94: .4byte gUnknown_203B0A0 _08120E98: movs r0, 0 @@ -4775,7 +4775,7 @@ sub_8120EE0: @ 8120EE0 lsls r0, 3 ldr r1, _08120F1C @ =gTasks+0x8 adds r6, r0, r1 - ldr r0, _08120F20 @ =gUnknown_2037AB8 + ldr r0, _08120F20 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -4798,7 +4798,7 @@ sub_8120EE0: @ 8120EE0 b _08120F62 .align 2, 0 _08120F1C: .4byte gTasks+0x8 -_08120F20: .4byte gUnknown_2037AB8 +_08120F20: .4byte gPaletteFade _08120F24: cmp r0, 0xF0 beq _08120F44 @@ -4919,7 +4919,7 @@ sub_8120FF0: @ 8120FF0 lsls r0, 3 ldr r1, _0812102C @ =gTasks+0x8 adds r4, r0, r1 - ldr r0, _08121030 @ =gUnknown_2037AB8 + ldr r0, _08121030 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -4941,7 +4941,7 @@ sub_8120FF0: @ 8120FF0 b _08121048 .align 2, 0 _0812102C: .4byte gTasks+0x8 -_08121030: .4byte gUnknown_2037AB8 +_08121030: .4byte gPaletteFade _08121034: ldr r0, _08121050 @ =gUnknown_203B09C ldr r1, [r0] @@ -8529,7 +8529,7 @@ sub_8122C5C: @ 8122C5C push {r4-r7,lr} lsls r0, 24 lsrs r6, r0, 24 - ldr r0, _08122C94 @ =gUnknown_2037AB8 + ldr r0, _08122C94 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -8553,7 +8553,7 @@ sub_8122C5C: @ 8122C5C bl ProcessMenuInputNoWrapAround_other b _08122CA4 .align 2, 0 -_08122C94: .4byte gUnknown_2037AB8 +_08122C94: .4byte gPaletteFade _08122C98: .4byte gTasks+0x8 _08122C9C: .4byte gUnknown_203B09C _08122CA0: @@ -8697,7 +8697,7 @@ _08122DB8: .4byte sub_8122DBC sub_8122DBC: @ 8122DBC push {lr} sub sp, 0xC - ldr r2, _08122DF4 @ =gUnknown_2037AB8 + ldr r2, _08122DF4 @ =gPaletteFade ldrb r0, [r2, 0x8] movs r1, 0x80 orrs r0, r1 @@ -8722,7 +8722,7 @@ sub_8122DBC: @ 8122DBC pop {r0} bx r0 .align 2, 0 -_08122DF4: .4byte gUnknown_2037AB8 +_08122DF4: .4byte gPaletteFade _08122DF8: .4byte gUnknown_203B0A0 _08122DFC: .4byte sub_8122C30 thumb_func_end sub_8122DBC @@ -9986,7 +9986,7 @@ sub_8123824: @ 8123824 push {r7} lsls r0, 24 lsrs r7, r0, 24 - ldr r0, _0812388C @ =gUnknown_2037AB8 + ldr r0, _0812388C @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -10031,7 +10031,7 @@ _08123880: pop {r0} bx r0 .align 2, 0 -_0812388C: .4byte gUnknown_2037AB8 +_0812388C: .4byte gPaletteFade _08123890: .4byte gUnknown_203AD30 _08123894: .4byte gUnknown_203B0A0 _08123898: .4byte gPlayerParty @@ -10044,7 +10044,7 @@ sub_81238A4: @ 81238A4 push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r0, _081238E4 @ =gUnknown_2037AB8 + ldr r0, _081238E4 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -10073,7 +10073,7 @@ _081238DC: pop {r0} bx r0 .align 2, 0 -_081238E4: .4byte gUnknown_2037AB8 +_081238E4: .4byte gPaletteFade _081238E8: .4byte gUnknown_203B0A0 _081238EC: .4byte gPlayerParty _081238F0: .4byte gUnknown_203B0D8 @@ -10383,7 +10383,7 @@ sub_8123B78: @ 8123B78 push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r0, _08123BB0 @ =gUnknown_2037AB8 + ldr r0, _08123BB0 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -10407,7 +10407,7 @@ sub_8123B78: @ 8123B78 bl sub_8120420 b _08123BD0 .align 2, 0 -_08123BB0: .4byte gUnknown_2037AB8 +_08123BB0: .4byte gPaletteFade _08123BB4: .4byte gUnknown_203B0D8 _08123BB8: .4byte gUnknown_203B0A0 _08123BBC: .4byte gPlayerParty @@ -10657,7 +10657,7 @@ _08123DC8: .4byte sub_8123DCC sub_8123DCC: @ 8123DCC push {lr} sub sp, 0xC - ldr r2, _08123E00 @ =gUnknown_2037AB8 + ldr r2, _08123E00 @ =gPaletteFade ldrb r0, [r2, 0x8] movs r1, 0x80 orrs r0, r1 @@ -10680,7 +10680,7 @@ sub_8123DCC: @ 8123DCC pop {r0} bx r0 .align 2, 0 -_08123E00: .4byte gUnknown_2037AB8 +_08123E00: .4byte gPaletteFade _08123E04: .4byte gUnknown_203B0A0 _08123E08: .4byte sub_8122C30 thumb_func_end sub_8123DCC @@ -12870,7 +12870,7 @@ sub_8124FC8: @ 8124FC8 push {lr} lsls r0, 24 lsrs r3, r0, 24 - ldr r0, _08125000 @ =gUnknown_2037AB8 + ldr r0, _08125000 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -12896,7 +12896,7 @@ _08124FFA: pop {r0} bx r0 .align 2, 0 -_08125000: .4byte gUnknown_2037AB8 +_08125000: .4byte gPaletteFade _08125004: .4byte gUnknown_203B0A0 _08125008: .4byte gUnknown_203B09C _0812500C: .4byte sub_8128184 @@ -14729,7 +14729,7 @@ sub_8125F14: @ 8125F14 lsls r0, 24 lsrs r4, r0, 24 adds r5, r4, 0 - ldr r0, _08125F3C @ =gUnknown_2037AB8 + ldr r0, _08125F3C @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -14744,7 +14744,7 @@ sub_8125F14: @ 8125F14 bl sub_8125FFC b _08125F46 .align 2, 0 -_08125F3C: .4byte gUnknown_2037AB8 +_08125F3C: .4byte gPaletteFade _08125F40: adds r0, r5, 0 bl sub_81260D8 @@ -16528,7 +16528,7 @@ sub_8126DC8: @ 8126DC8 push {r7} lsls r0, 24 lsrs r6, r0, 24 - ldr r0, _08126E4C @ =gUnknown_2037AB8 + ldr r0, _08126E4C @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -16583,7 +16583,7 @@ sub_8126DC8: @ 8126DC8 bl sub_8125C48 b _08126E98 .align 2, 0 -_08126E4C: .4byte gUnknown_2037AB8 +_08126E4C: .4byte gPaletteFade _08126E50: .4byte gUnknown_203B0A0 _08126E54: .4byte gPlayerParty _08126E58: .4byte gStringVar1 @@ -16813,7 +16813,7 @@ sub_812701C: @ 812701C push {r7} lsls r0, 24 lsrs r7, r0, 24 - ldr r0, _08127084 @ =gUnknown_2037AB8 + ldr r0, _08127084 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -16858,7 +16858,7 @@ _08127078: pop {r0} bx r0 .align 2, 0 -_08127084: .4byte gUnknown_2037AB8 +_08127084: .4byte gPaletteFade _08127088: .4byte gUnknown_203B0A0 _0812708C: .4byte gPlayerParty _08127090: .4byte gTasks @@ -17010,7 +17010,7 @@ sub_81271C4: @ 81271C4 push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r0, _081271EC @ =gUnknown_2037AB8 + ldr r0, _081271EC @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -17027,7 +17027,7 @@ sub_81271C4: @ 81271C4 bl sub_8120558 b _08127210 .align 2, 0 -_081271EC: .4byte gUnknown_2037AB8 +_081271EC: .4byte gPaletteFade _081271F0: .4byte gUnknown_203B0D8 _081271F4: .4byte gUnknown_203B0A0 _081271F8: @@ -19117,7 +19117,7 @@ sub_81281FC: @ 81281FC lsls r0, 3 ldr r1, _08128270 @ =gTasks+0x8 adds r4, r0, r1 - ldr r0, _08128274 @ =gUnknown_2037AB8 + ldr r0, _08128274 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -19168,7 +19168,7 @@ _08128268: bx r0 .align 2, 0 _08128270: .4byte gTasks+0x8 -_08128274: .4byte gUnknown_2037AB8 +_08128274: .4byte gPaletteFade _08128278: .4byte gUnknown_2022B58 _0812827C: .4byte gUnknown_203B0B4 _08128280: .4byte gTasks diff --git a/asm/player_pc.s b/asm/player_pc.s index a113049c4..ed594cb59 100644 --- a/asm/player_pc.s +++ b/asm/player_pc.s @@ -621,7 +621,7 @@ sub_80EBB70: @ 80EBB70 push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r0, _080EBBA4 @ =gUnknown_2037AB8 + ldr r0, _080EBBA4 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -642,7 +642,7 @@ _080EBB9C: pop {r0} bx r0 .align 2, 0 -_080EBBA4: .4byte gUnknown_2037AB8 +_080EBBA4: .4byte gPaletteFade _080EBBA8: .4byte c2_exit_to_overworld_2_switch _080EBBAC: .4byte gUnknown_3005020 _080EBBB0: .4byte sub_80EBC0C @@ -802,7 +802,7 @@ sub_80EBCD8: @ 80EBCD8 lsls r0, 3 ldr r1, _080EBD0C @ =gTasks+0x8 adds r5, r0, r1 - ldr r0, _080EBD10 @ =gUnknown_2037AB8 + ldr r0, _080EBD10 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -820,7 +820,7 @@ _080EBD06: bx r0 .align 2, 0 _080EBD0C: .4byte gTasks+0x8 -_080EBD10: .4byte gUnknown_2037AB8 +_080EBD10: .4byte gPaletteFade _080EBD14: .4byte c2_exit_to_overworld_2_switch thumb_func_end sub_80EBCD8 @@ -1127,7 +1127,7 @@ sub_80EBF40: @ 80EBF40 mov r10, r0 mov r4, r9 add r4, r10 - ldr r0, _080EBF98 @ =gUnknown_2037AB8 + ldr r0, _080EBF98 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -1153,7 +1153,7 @@ sub_80EBF40: @ 80EBF40 b _080EBFEA .align 2, 0 _080EBF94: .4byte gTasks+0x8 -_080EBF98: .4byte gUnknown_2037AB8 +_080EBF98: .4byte gPaletteFade _080EBF9C: .4byte gUnknown_203AAC6 _080EBFA0: movs r0, 0x5 @@ -1431,7 +1431,7 @@ sub_80EC1D4: @ 80EC1D4 push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r0, _080EC21C @ =gUnknown_2037AB8 + ldr r0, _080EC21C @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -1462,7 +1462,7 @@ _080EC216: pop {r0} bx r0 .align 2, 0 -_080EC21C: .4byte gUnknown_2037AB8 +_080EC21C: .4byte gPaletteFade _080EC220: .4byte gSaveBlock1Ptr _080EC224: .4byte gUnknown_203AAC4 _080EC228: .4byte 0x00002cd0 @@ -1746,7 +1746,7 @@ sub_80EC444: @ 80EC444 push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r0, _080EC470 @ =gUnknown_2037AB8 + ldr r0, _080EC470 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -1762,7 +1762,7 @@ _080EC468: pop {r0} bx r0 .align 2, 0 -_080EC470: .4byte gUnknown_2037AB8 +_080EC470: .4byte gPaletteFade thumb_func_end sub_80EC444 thumb_func_start sub_80EC474 diff --git a/asm/pokedex_screen.s b/asm/pokedex_screen.s index 9cd8b78f0..d6c618dcf 100644 --- a/asm/pokedex_screen.s +++ b/asm/pokedex_screen.s @@ -18,7 +18,7 @@ sub_81024C0: @ 81024C0 thumb_func_start sub_81024D4 sub_81024D4: @ 81024D4 push {lr} - ldr r0, _08102500 @ =gUnknown_2037AB8 + ldr r0, _08102500 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -35,7 +35,7 @@ _081024EC: bl BuildOamBuffer b _08102508 .align 2, 0 -_08102500: .4byte gUnknown_2037AB8 +_08102500: .4byte gPaletteFade _08102504: bl UpdatePaletteFade _08102508: @@ -194,7 +194,7 @@ _081025AE: movs r1, 0 movs r2, 0 bl ChangeBgY - ldr r2, _081026BC @ =gUnknown_2037AB8 + ldr r2, _081026BC @ =gPaletteFade ldrb r0, [r2, 0x8] movs r1, 0x80 orrs r0, r1 @@ -214,7 +214,7 @@ _081026AC: .4byte sub_81024C0 _081026B0: .4byte sub_810287C _081026B4: .4byte gUnknown_203ACF0 _081026B8: .4byte gUnknown_8451EE4 -_081026BC: .4byte gUnknown_2037AB8 +_081026BC: .4byte gPaletteFade _081026C0: .4byte gUnknown_84406E0 _081026C4: ldr r0, _08102758 @ =gUnknown_84404C8 @@ -354,7 +354,7 @@ _081027D4: movs r0, 0 b _0810284C _081027D8: - ldr r0, _081027E8 @ =gUnknown_2037AB8 + ldr r0, _081027E8 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -363,7 +363,7 @@ _081027D8: movs r0, 0x2 b _081027D2 .align 2, 0 -_081027E8: .4byte gUnknown_2037AB8 +_081027E8: .4byte gPaletteFade _081027EC: bl UpdatePaletteFade b _081027D4 @@ -549,7 +549,7 @@ _08102964: bl ShowBg movs r0, 0 bl ShowBg - ldr r2, _081029A4 @ =gUnknown_2037AB8 + ldr r2, _081029A4 @ =gPaletteFade ldrb r1, [r2, 0x8] movs r0, 0x80 ands r0, r1 @@ -568,7 +568,7 @@ _08102964: bl BeginNormalPaletteFade b _081029BC .align 2, 0 -_081029A4: .4byte gUnknown_2037AB8 +_081029A4: .4byte gPaletteFade _081029A8: .4byte 0x0000ffff _081029AC: ldr r0, _081029C4 @ =0xffff7fff @@ -5856,7 +5856,7 @@ _08105506: .align 2, 0 _08105524: .4byte 0x00007fff _08105528: - ldr r2, _08105554 @ =gUnknown_2037AB8 + ldr r2, _08105554 @ =gPaletteFade ldrb r0, [r2, 0x8] movs r1, 0x80 orrs r0, r1 @@ -5875,10 +5875,10 @@ _08105528: adds r0, 0x1 b _0810557A .align 2, 0 -_08105554: .4byte gUnknown_2037AB8 +_08105554: .4byte gPaletteFade _08105558: .4byte gUnknown_203ACF0 _0810555C: - ldr r2, _08105588 @ =gUnknown_2037AB8 + ldr r2, _08105588 @ =gPaletteFade ldrb r1, [r2, 0x8] movs r0, 0x7F ands r0, r1 @@ -5903,7 +5903,7 @@ _0810557E: pop {r1} bx r1 .align 2, 0 -_08105588: .4byte gUnknown_2037AB8 +_08105588: .4byte gPaletteFade _0810558C: .4byte 0x00007fff _08105590: .4byte gUnknown_203ACF0 thumb_func_end sub_81052D0 @@ -8765,7 +8765,7 @@ _08106C98: .align 2, 0 _08106CD0: .4byte gUnknown_203ACF0 _08106CD4: - ldr r2, _08106D10 @ =gUnknown_2037AB8 + ldr r2, _08106D10 @ =gPaletteFade ldrb r1, [r2, 0x8] movs r0, 0x7F ands r0, r1 @@ -8791,7 +8791,7 @@ _08106CD4: movs r0, 0x5 b _08106E68 .align 2, 0 -_08106D10: .4byte gUnknown_2037AB8 +_08106D10: .4byte gPaletteFade _08106D14: .4byte 0x0000ffff _08106D18: .4byte gUnknown_203ACF0 _08106D1C: diff --git a/asm/pokemon_special_anim.s b/asm/pokemon_special_anim.s index 9ebfd51bb..fa73d892f 100644 --- a/asm/pokemon_special_anim.s +++ b/asm/pokemon_special_anim.s @@ -580,7 +580,7 @@ _0811C9E0: strh r0, [r5] b _0811CA16 _0811C9E8: - ldr r0, _0811C9FC @ =gUnknown_2037AB8 + ldr r0, _0811C9FC @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -593,7 +593,7 @@ _0811C9F4: strh r0, [r5] b _0811CA16 .align 2, 0 -_0811C9FC: .4byte gUnknown_2037AB8 +_0811C9FC: .4byte gPaletteFade _0811CA00: ldr r0, [r4, 0x4] bl SetMainCallback2 @@ -686,7 +686,7 @@ _0811CAAE: .align 2, 0 _0811CAD0: .4byte sub_811C6E8 _0811CAD4: - ldr r0, _0811CAF0 @ =gUnknown_2037AB8 + ldr r0, _0811CAF0 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -700,7 +700,7 @@ _0811CAD4: subs r1, 0xC b _0811CBC6 .align 2, 0 -_0811CAF0: .4byte gUnknown_2037AB8 +_0811CAF0: .4byte gPaletteFade _0811CAF4: adds r1, r5, 0 adds r1, 0x9E @@ -908,7 +908,7 @@ _0811CC7C: .align 2, 0 _0811CCA8: .4byte sub_811C6E8 _0811CCAC: - ldr r0, _0811CCBC @ =gUnknown_2037AB8 + ldr r0, _0811CCBC @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -916,7 +916,7 @@ _0811CCAC: bne _0811CD5A b _0811CD2A .align 2, 0 -_0811CCBC: .4byte gUnknown_2037AB8 +_0811CCBC: .4byte gPaletteFade _0811CCC0: adds r0, r5, 0 adds r0, 0x9C @@ -977,7 +977,7 @@ _0811CD2A: .align 2, 0 _0811CD34: .4byte gMain _0811CD38: - ldr r0, _0811CD64 @ =gUnknown_2037AB8 + ldr r0, _0811CD64 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -996,7 +996,7 @@ _0811CD5A: pop {r0} bx r0 .align 2, 0 -_0811CD64: .4byte gUnknown_2037AB8 +_0811CD64: .4byte gPaletteFade thumb_func_end sub_811CBE4 thumb_func_start sub_811CD68 @@ -1073,7 +1073,7 @@ _0811CDD2: .align 2, 0 _0811CDFC: .4byte sub_811C6E8 _0811CE00: - ldr r0, _0811CE20 @ =gUnknown_2037AB8 + ldr r0, _0811CE20 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -1090,7 +1090,7 @@ _0811CE16: strh r0, [r4] b _0811CE3E .align 2, 0 -_0811CE20: .4byte gUnknown_2037AB8 +_0811CE20: .4byte gPaletteFade _0811CE24: adds r1, r5, 0 adds r1, 0x9E @@ -1290,7 +1290,7 @@ _0811CFA8: .align 2, 0 _0811CFC4: .4byte sub_811C6E8 _0811CFC8: - ldr r0, _0811D010 @ =gUnknown_2037AB8 + ldr r0, _0811D010 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -1323,7 +1323,7 @@ _0811D008: pop {r0} bx r0 .align 2, 0 -_0811D010: .4byte gUnknown_2037AB8 +_0811D010: .4byte gPaletteFade _0811D014: .4byte gUnknown_203B090 thumb_func_end sub_811CF88 @@ -2020,7 +2020,7 @@ _0811D546: strh r0, [r4] b _0811D594 _0811D57E: - ldr r0, _0811D590 @ =gUnknown_2037AB8 + ldr r0, _0811D590 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -2029,7 +2029,7 @@ _0811D57E: movs r0, 0 b _0811D596 .align 2, 0 -_0811D590: .4byte gUnknown_2037AB8 +_0811D590: .4byte gPaletteFade _0811D594: movs r0, 0x1 _0811D596: diff --git a/asm/pokemon_storage_system.s b/asm/pokemon_storage_system.s index 67dea9b9e..682d5e9b3 100644 --- a/asm/pokemon_storage_system.s +++ b/asm/pokemon_storage_system.s @@ -1731,7 +1731,7 @@ _0808C66E: .align 2, 0 _0808C67C: .4byte gUnknown_83CDA20 _0808C680: - ldr r0, _0808C6A4 @ =gUnknown_2037AB8 + ldr r0, _0808C6A4 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -1748,7 +1748,7 @@ _0808C69C: pop {r0} bx r0 .align 2, 0 -_0808C6A4: .4byte gUnknown_2037AB8 +_0808C6A4: .4byte gPaletteFade thumb_func_end c3_0808C39C thumb_func_start sub_808C6A8 diff --git a/asm/pokemon_summary_screen.s b/asm/pokemon_summary_screen.s index ead0c8a01..b44f2f9f9 100644 --- a/asm/pokemon_summary_screen.s +++ b/asm/pokemon_summary_screen.s @@ -463,7 +463,7 @@ _08134890: .align 2, 0 _081348A8: .4byte gUnknown_203B140 _081348AC: - ldr r0, _081348C8 @ =gUnknown_2037AB8 + ldr r0, _081348C8 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -476,7 +476,7 @@ _081348AC: adds r0, r2 b _08134AF6 .align 2, 0 -_081348C8: .4byte gUnknown_2037AB8 +_081348C8: .4byte gPaletteFade _081348CC: .4byte gUnknown_203B140 _081348D0: .4byte 0x00003270 _081348D4: @@ -803,7 +803,7 @@ _08134B60: _08134B80: .4byte gUnknown_203B140 _08134B84: .4byte 0x00003270 _08134B88: - ldr r0, _08134BA8 @ =gUnknown_2037AB8 + ldr r0, _08134BA8 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -819,7 +819,7 @@ _08134B9A: pop {r0} bx r0 .align 2, 0 -_08134BA8: .4byte gUnknown_2037AB8 +_08134BA8: .4byte gPaletteFade thumb_func_end sub_8134840 thumb_func_start sub_8134BAC @@ -9566,7 +9566,7 @@ _08139420: _0813943C: .4byte gUnknown_203B140 _08139440: .4byte 0x00003288 _08139444: - ldr r0, _08139460 @ =gUnknown_2037AB8 + ldr r0, _08139460 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -9581,7 +9581,7 @@ _08139452: adds r1, r0 b _08139728 .align 2, 0 -_08139460: .4byte gUnknown_2037AB8 +_08139460: .4byte gPaletteFade _08139464: .4byte gUnknown_203B140 _08139468: .4byte 0x00003288 _0813946C: @@ -9926,7 +9926,7 @@ _08139738: .align 2, 0 _08139744: .4byte gUnknown_203B16D _08139748: - ldr r0, _08139764 @ =gUnknown_2037AB8 + ldr r0, _08139764 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -9940,7 +9940,7 @@ _0813975A: pop {r0} bx r0 .align 2, 0 -_08139764: .4byte gUnknown_2037AB8 +_08139764: .4byte gPaletteFade thumb_func_end sub_81393D4 thumb_func_start sub_8139768 diff --git a/asm/quest_log.s b/asm/quest_log.s index fd78239ff..2a6410b3f 100644 --- a/asm/quest_log.s +++ b/asm/quest_log.s @@ -5,221 +5,6 @@ .text - thumb_func_start sub_8111E20 -sub_8111E20: @ 8111E20 - push {r4,lr} - sub sp, 0x8 - ldr r4, _08111E60 @ =gUnknown_203ADFE - ldrb r0, [r4, 0x2] - bl ClearWindowTilemap - ldrb r0, [r4, 0x2] - movs r1, 0xF0 - str r1, [sp] - movs r1, 0x30 - str r1, [sp, 0x4] - movs r1, 0xF - movs r2, 0 - movs r3, 0 - bl FillWindowPixelRect - ldrb r0, [r4, 0x2] - movs r1, 0x2 - bl CopyWindowToVram - ldrb r0, [r4, 0x1] - bl PutWindowTilemap - ldrb r0, [r4, 0x1] - movs r1, 0x1 - bl CopyWindowToVram - add sp, 0x8 - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_08111E60: .4byte gUnknown_203ADFE - thumb_func_end sub_8111E20 - - thumb_func_start sub_8111E64 -sub_8111E64: @ 8111E64 - push {lr} - adds r1, r0, 0 - lsls r1, 24 - asrs r1, 24 - movs r0, 0x1 - bl fade_screen - ldr r1, _08111E7C @ =gUnknown_203AE8C - ldr r0, _08111E80 @ =sub_8111E84 - str r0, [r1] - pop {r0} - bx r0 - .align 2, 0 -_08111E7C: .4byte gUnknown_203AE8C -_08111E80: .4byte sub_8111E84 - thumb_func_end sub_8111E64 - - thumb_func_start sub_8111E84 -sub_8111E84: @ 8111E84 - push {r4,lr} - ldr r0, _08111F00 @ =gUnknown_2037AB8 - ldrb r1, [r0, 0x7] - movs r0, 0x80 - ands r0, r1 - cmp r0, 0 - bne _08111EF8 - bl ScriptContext2_Enable - ldr r3, _08111F04 @ =gUnknown_203ADF8 - ldrb r0, [r3] - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x3 - bhi _08111EEE - ldr r0, _08111F08 @ =gSaveBlock1Ptr - ldr r0, [r0] - ldrb r2, [r3] - movs r1, 0xCD - lsls r1, 3 - muls r1, r2 - adds r0, r1 - movs r1, 0x98 - lsls r1, 5 - adds r0, r1 - ldrb r0, [r0] - cmp r0, 0 - beq _08111EEE - adds r4, r3, 0 -_08111EBE: - ldrb r0, [r4] - ldr r1, _08111F0C @ =gUnknown_203AE98 - bl sub_811175C - ldrb r0, [r4] - adds r0, 0x1 - strb r0, [r4] - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x3 - bhi _08111EEE - ldr r0, _08111F08 @ =gSaveBlock1Ptr - ldr r1, [r0] - ldrb r2, [r4] - movs r0, 0xCD - lsls r0, 3 - muls r0, r2 - adds r1, r0 - movs r0, 0x98 - lsls r0, 5 - adds r1, r0 - ldrb r0, [r1] - cmp r0, 0 - bne _08111EBE -_08111EEE: - ldr r1, _08111F10 @ =gUnknown_3005E88 - movs r0, 0 - strb r0, [r1] - bl sub_8111984 -_08111EF8: - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_08111F00: .4byte gUnknown_2037AB8 -_08111F04: .4byte gUnknown_203ADF8 -_08111F08: .4byte gSaveBlock1Ptr -_08111F0C: .4byte gUnknown_203AE98 -_08111F10: .4byte gUnknown_3005E88 - thumb_func_end sub_8111E84 - - thumb_func_start sub_8111F14 -sub_8111F14: @ 8111F14 - push {r4,lr} - ldr r0, _08111F30 @ =gUnknown_203ADFA - ldrb r0, [r0] - cmp r0, 0x3 - bne _08111F2A - ldr r4, _08111F34 @ =gUnknown_203AE90 - movs r0, 0x80 - lsls r0, 3 - bl AllocZeroed - str r0, [r4] -_08111F2A: - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_08111F30: .4byte gUnknown_203ADFA -_08111F34: .4byte gUnknown_203AE90 - thumb_func_end sub_8111F14 - - thumb_func_start sub_8111F38 -sub_8111F38: @ 8111F38 - push {lr} - adds r3, r0, 0 - adds r2, r1, 0 - lsls r3, 16 - lsls r2, 16 - lsrs r2, 16 - lsrs r3, 15 - ldr r0, _08111F58 @ =gUnknown_20371F8 - adds r0, r3, r0 - ldr r1, _08111F5C @ =gUnknown_203AE90 - ldr r1, [r1] - adds r1, r3 - bl CpuSet - pop {r0} - bx r0 - .align 2, 0 -_08111F58: .4byte gUnknown_20371F8 -_08111F5C: .4byte gUnknown_203AE90 - thumb_func_end sub_8111F38 - - thumb_func_start sub_8111F60 -sub_8111F60: @ 8111F60 - push {lr} - movs r0, 0x4 - bl stdpal_get - movs r1, 0xF0 - movs r2, 0x20 - bl LoadPalette - movs r0, 0 - bl sub_8111070 - bl sub_807DF7C - ldr r0, _08111F88 @ =sub_8111F8C - movs r1, 0xFF - bl CreateTask - movs r0, 0x1 - pop {r1} - bx r1 - .align 2, 0 -_08111F88: .4byte sub_8111F8C - thumb_func_end sub_8111F60 - - thumb_func_start sub_8111F8C -sub_8111F8C: @ 8111F8C - push {r4,lr} - lsls r0, 24 - lsrs r0, 24 - lsls r1, r0, 2 - adds r1, r0 - lsls r1, 3 - ldr r0, _08111FC4 @ =gTasks - adds r4, r1, r0 - bl ScriptContext2_IsEnabled - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x1 - beq _08111FBC - bl player_bitmagic - bl sub_805C270 - bl sub_805C780 - bl ScriptContext2_Enable - ldr r0, _08111FC8 @ =sub_8111FCC - str r0, [r4] -_08111FBC: - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_08111FC4: .4byte gTasks -_08111FC8: .4byte sub_8111FCC - thumb_func_end sub_8111F8C - thumb_func_start sub_8111FCC sub_8111FCC: @ 8111FCC push {r4,r5,lr} @@ -230,7 +15,7 @@ sub_8111FCC: @ 8111FCC lsls r1, 3 ldr r0, _08112024 @ =gTasks adds r5, r1, r0 - ldr r0, _08112028 @ =gUnknown_2037AB8 + ldr r0, _08112028 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -265,7 +50,7 @@ _0811201E: bx r0 .align 2, 0 _08112024: .4byte gTasks -_08112028: .4byte gUnknown_2037AB8 +_08112028: .4byte gPaletteFade _0811202C: .4byte gUnknown_203AE94 _08112030: .4byte gStringVar1 _08112034: .4byte gMapHeader diff --git a/asm/region_map.s b/asm/region_map.s index aa684531d..f860c6065 100644 --- a/asm/region_map.s +++ b/asm/region_map.s @@ -932,7 +932,7 @@ _080C0584: _080C05D8: .4byte gUnknown_8418EB5 _080C05DC: .4byte gUnknown_8418E8B _080C05E0: - ldr r0, _080C0618 @ =gUnknown_2037AB8 + ldr r0, _080C0618 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -958,7 +958,7 @@ _080C05FA: adds r1, r2 b _080C07A0 .align 2, 0 -_080C0618: .4byte gUnknown_2037AB8 +_080C0618: .4byte gPaletteFade _080C061C: .4byte gUnknown_20399D4 _080C0620: .4byte 0x000047a0 _080C0624: @@ -1140,7 +1140,7 @@ _080C07A0: _080C07A8: .4byte gUnknown_20399D4 _080C07AC: .4byte 0x000047a0 _080C07B0: - ldr r0, _080C07CC @ =gUnknown_2037AB8 + ldr r0, _080C07CC @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -1154,7 +1154,7 @@ _080C07C2: pop {r0} bx r0 .align 2, 0 -_080C07CC: .4byte gUnknown_2037AB8 +_080C07CC: .4byte gPaletteFade thumb_func_end sub_80C04E4 thumb_func_start sub_80C07D0 @@ -5019,7 +5019,7 @@ _080C2768: bl sub_80C2B48 b _080C2976 _080C2788: - ldr r0, _080C27AC @ =gUnknown_2037AB8 + ldr r0, _080C27AC @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -5037,7 +5037,7 @@ _080C2796: bl PlaySE b _080C299A .align 2, 0 -_080C27AC: .4byte gUnknown_2037AB8 +_080C27AC: .4byte gPaletteFade _080C27B0: .4byte 0x00000ccc _080C27B4: bl sub_80C29A4 @@ -10006,7 +10006,7 @@ _080C4FEC: .align 2, 0 _080C4FFC: .4byte gUnknown_8418EB0 _080C5000: - ldr r0, _080C5024 @ =gUnknown_2037AB8 + ldr r0, _080C5024 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -10022,7 +10022,7 @@ _080C500E: bl PutWindowTilemap b _080C51A6 .align 2, 0 -_080C5024: .4byte gUnknown_2037AB8 +_080C5024: .4byte gPaletteFade _080C5028: bl sub_80C3400 lsls r0, 24 @@ -10207,7 +10207,7 @@ _080C51AA: .align 2, 0 _080C51B4: .4byte gUnknown_20399FC _080C51B8: - ldr r0, _080C51E4 @ =gUnknown_2037AB8 + ldr r0, _080C51E4 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -10229,7 +10229,7 @@ _080C51DC: pop {r0} bx r0 .align 2, 0 -_080C51E4: .4byte gUnknown_2037AB8 +_080C51E4: .4byte gPaletteFade thumb_func_end sub_80C4F08 thumb_func_start sub_80C51E8 diff --git a/asm/reshow_battle_screen.s b/asm/reshow_battle_screen.s index 5538afcff..20373bfa8 100644 --- a/asm/reshow_battle_screen.s +++ b/asm/reshow_battle_screen.s @@ -13,7 +13,7 @@ nullsub_44: @ 8077760 thumb_func_start sub_8077764 sub_8077764: @ 8077764 push {lr} - ldr r2, _080777B0 @ =gUnknown_2037AB8 + ldr r2, _080777B0 @ =gPaletteFade ldrb r0, [r2, 0x8] movs r1, 0x80 orrs r0, r1 @@ -48,7 +48,7 @@ sub_8077764: @ 8077764 bl sub_812B1F0 b _080777DA .align 2, 0 -_080777B0: .4byte gUnknown_2037AB8 +_080777B0: .4byte gPaletteFade _080777B4: .4byte gBattleScripting _080777B8: .4byte gBattleTypeFlags _080777BC: @@ -355,7 +355,7 @@ _08077A5C: movs r2, 0x10 movs r3, 0 bl BeginHardwarePaletteFade - ldr r2, _08077AA0 @ =gUnknown_2037AB8 + ldr r2, _08077AA0 @ =gPaletteFade ldrb r1, [r2, 0x8] movs r0, 0x7F ands r0, r1 @@ -375,7 +375,7 @@ _08077A8A: bx r0 .align 2, 0 _08077A9C: .4byte sub_80116F4 -_08077AA0: .4byte gUnknown_2037AB8 +_08077AA0: .4byte gPaletteFade _08077AA4: .4byte sub_8011100 _08077AA8: .4byte gBattleScripting thumb_func_end sub_80777E8 diff --git a/asm/roulette_util.s b/asm/roulette_util.s index 8e60a9fe2..b94b22743 100644 --- a/asm/roulette_util.s +++ b/asm/roulette_util.s @@ -1151,7 +1151,7 @@ _080D93E4: beq _080D93FE b _080D9552 _080D93FE: - ldr r0, _080D944C @ =gUnknown_2037AB8 + ldr r0, _080D944C @ =gPaletteFade ldrb r1, [r0, 0x7] adds r0, r3, 0 ands r0, r1 @@ -1191,7 +1191,7 @@ _080D9424: beq _080D9456 b _080D953C .align 2, 0 -_080D944C: .4byte gUnknown_2037AB8 +_080D944C: .4byte gPaletteFade _080D9450: cmp r0, 0x2 beq _080D94FE diff --git a/asm/scrcmd.s b/asm/scrcmd.s index ec78da1d5..f242a22e5 100644 --- a/asm/scrcmd.s +++ b/asm/scrcmd.s @@ -1423,7 +1423,7 @@ ScrCmd_setflashradius: @ 806A8FC thumb_func_start sub_806A918 sub_806A918: @ 806A918 push {lr} - ldr r0, _0806A92C @ =gUnknown_2037AB8 + ldr r0, _0806A92C @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -1432,7 +1432,7 @@ sub_806A918: @ 806A918 movs r0, 0 b _0806A932 .align 2, 0 -_0806A92C: .4byte gUnknown_2037AB8 +_0806A92C: .4byte gPaletteFade _0806A930: movs r0, 0x1 _0806A932: diff --git a/asm/script_menu.s b/asm/script_menu.s index 08f1c32b4..321f739a0 100644 --- a/asm/script_menu.s +++ b/asm/script_menu.s @@ -453,7 +453,7 @@ sub_809CC98: @ 809CC98 lsls r0, 3 ldr r1, _0809CCC4 @ =gTasks+0x8 adds r5, r0, r1 - ldr r0, _0809CCC8 @ =gUnknown_2037AB8 + ldr r0, _0809CCC8 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -468,7 +468,7 @@ sub_809CC98: @ 809CC98 b _0809CD3C .align 2, 0 _0809CCC4: .4byte gTasks+0x8 -_0809CCC8: .4byte gUnknown_2037AB8 +_0809CCC8: .4byte gPaletteFade _0809CCCC: .4byte gUnknown_2039988 _0809CCD0: movs r1, 0xA diff --git a/asm/script_pokemon_util_80BF8FC.s b/asm/script_pokemon_util_80BF8FC.s index 81b861413..d5c339f0b 100644 --- a/asm/script_pokemon_util_80BF8FC.s +++ b/asm/script_pokemon_util_80BF8FC.s @@ -72,7 +72,7 @@ sub_80BF97C: @ 80BF97C push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r2, _080BF9B4 @ =gUnknown_2037AB8 + ldr r2, _080BF9B4 @ =gPaletteFade ldrb r1, [r2, 0x7] movs r0, 0x80 ands r0, r1 @@ -96,7 +96,7 @@ _080BF9AC: pop {r0} bx r0 .align 2, 0 -_080BF9B4: .4byte gUnknown_2037AB8 +_080BF9B4: .4byte gPaletteFade _080BF9B8: .4byte gTasks thumb_func_end sub_80BF97C diff --git a/asm/seagallop.s b/asm/seagallop.s index 45ff92759..7d40b69e0 100644 --- a/asm/seagallop.s +++ b/asm/seagallop.s @@ -316,7 +316,7 @@ sub_8147108: @ 8147108 lsls r0, 24 cmp r0, 0 beq _08147136 - ldr r0, _0814713C @ =gUnknown_2037AB8 + ldr r0, _0814713C @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -331,7 +331,7 @@ _08147136: pop {r0} bx r0 .align 2, 0 -_0814713C: .4byte gUnknown_2037AB8 +_0814713C: .4byte gPaletteFade thumb_func_end sub_8147108 thumb_func_start sub_8147140 diff --git a/asm/shop.s b/asm/shop.s index 8c39c795f..2160a54ca 100644 --- a/asm/shop.s +++ b/asm/shop.s @@ -347,7 +347,7 @@ sub_809AD40: @ 809AD40 push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r0, _0809AD70 @ =gUnknown_2037AB8 + ldr r0, _0809AD70 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -365,7 +365,7 @@ _0809AD68: pop {r0} bx r0 .align 2, 0 -_0809AD70: .4byte gUnknown_2037AB8 +_0809AD70: .4byte gPaletteFade thumb_func_end sub_809AD40 thumb_func_start sub_809AD74 @@ -2157,7 +2157,7 @@ sub_809BBC0: @ 809BBC0 lsls r0, 3 ldr r1, _0809BC00 @ =gTasks+0x8 adds r5, r0, r1 - ldr r0, _0809BC04 @ =gUnknown_2037AB8 + ldr r0, _0809BC04 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -2181,7 +2181,7 @@ sub_809BBC0: @ 809BBC0 b _0809BC8E .align 2, 0 _0809BC00: .4byte gTasks+0x8 -_0809BC04: .4byte gUnknown_2037AB8 +_0809BC04: .4byte gPaletteFade _0809BC08: .4byte gUnknown_2039942 _0809BC0C: movs r0, 0x5 @@ -2682,7 +2682,7 @@ sub_809C04C: @ 809C04C lsls r0, 3 ldr r1, _0809C088 @ =gTasks+0x8 adds r2, r0, r1 - ldr r0, _0809C08C @ =gUnknown_2037AB8 + ldr r0, _0809C08C @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -2703,7 +2703,7 @@ _0809C082: bx r0 .align 2, 0 _0809C088: .4byte gTasks+0x8 -_0809C08C: .4byte gUnknown_2037AB8 +_0809C08C: .4byte gPaletteFade _0809C090: .4byte c2_exit_to_overworld_2_switch thumb_func_end sub_809C04C diff --git a/asm/slot_machine.s b/asm/slot_machine.s index 1f4cd16c8..2fc05a82a 100644 --- a/asm/slot_machine.s +++ b/asm/slot_machine.s @@ -3683,7 +3683,7 @@ _0814142E: b _08141450 _08141436: bl UpdatePaletteFade - ldr r0, _0814144C @ =gUnknown_2037AB8 + ldr r0, _0814144C @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -3692,7 +3692,7 @@ _08141436: movs r0, 0 b _08141452 .align 2, 0 -_0814144C: .4byte gUnknown_2037AB8 +_0814144C: .4byte gPaletteFade _08141450: movs r0, 0x1 _08141452: @@ -3728,7 +3728,7 @@ _08141472: strb r0, [r4] b _081414A0 _0814148A: - ldr r0, _0814149C @ =gUnknown_2037AB8 + ldr r0, _0814149C @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -3737,7 +3737,7 @@ _0814148A: movs r0, 0 b _081414A2 .align 2, 0 -_0814149C: .4byte gUnknown_2037AB8 +_0814149C: .4byte gPaletteFade _081414A0: movs r0, 0x1 _081414A2: diff --git a/asm/start_menu.s b/asm/start_menu.s index 263e27504..0991b8bc3 100644 --- a/asm/start_menu.s +++ b/asm/start_menu.s @@ -841,7 +841,7 @@ _0806F40A: thumb_func_start sub_806F410 sub_806F410: @ 806F410 push {lr} - ldr r0, _0806F424 @ =gUnknown_2037AB8 + ldr r0, _0806F424 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -850,7 +850,7 @@ sub_806F410: @ 806F410 movs r0, 0 b _0806F442 .align 2, 0 -_0806F424: .4byte gUnknown_2037AB8 +_0806F424: .4byte gPaletteFade _0806F428: movs r0, 0x29 bl IncrementGameStat @@ -870,7 +870,7 @@ _0806F448: .4byte sub_810275C thumb_func_start sub_806F44C sub_806F44C: @ 806F44C push {lr} - ldr r0, _0806F460 @ =gUnknown_2037AB8 + ldr r0, _0806F460 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -879,7 +879,7 @@ sub_806F44C: @ 806F44C movs r0, 0 b _0806F478 .align 2, 0 -_0806F460: .4byte gUnknown_2037AB8 +_0806F460: .4byte gPaletteFade _0806F464: bl play_some_sound bl sub_806EF18 @@ -897,7 +897,7 @@ _0806F47C: .4byte CB2_PartyMenuFromStartMenu thumb_func_start sub_806F480 sub_806F480: @ 806F480 push {lr} - ldr r0, _0806F494 @ =gUnknown_2037AB8 + ldr r0, _0806F494 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -906,7 +906,7 @@ sub_806F480: @ 806F480 movs r0, 0 b _0806F4AC .align 2, 0 -_0806F494: .4byte gUnknown_2037AB8 +_0806F494: .4byte gPaletteFade _0806F498: bl play_some_sound bl sub_806EF18 @@ -924,7 +924,7 @@ _0806F4B0: .4byte sub_8107EB8 thumb_func_start sub_806F4B4 sub_806F4B4: @ 806F4B4 push {lr} - ldr r0, _0806F4C8 @ =gUnknown_2037AB8 + ldr r0, _0806F4C8 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -933,7 +933,7 @@ sub_806F4B4: @ 806F4B4 movs r0, 0 b _0806F4E0 .align 2, 0 -_0806F4C8: .4byte gUnknown_2037AB8 +_0806F4C8: .4byte gPaletteFade _0806F4CC: bl play_some_sound bl sub_806EF18 @@ -963,7 +963,7 @@ _0806F4F8: .4byte sub_806F5A4 thumb_func_start sub_806F4FC sub_806F4FC: @ 806F4FC push {lr} - ldr r0, _0806F510 @ =gUnknown_2037AB8 + ldr r0, _0806F510 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -972,7 +972,7 @@ sub_806F4FC: @ 806F4FC movs r0, 0 b _0806F52E .align 2, 0 -_0806F510: .4byte gUnknown_2037AB8 +_0806F510: .4byte gPaletteFade _0806F514: bl play_some_sound bl sub_806EF18 @@ -1018,7 +1018,7 @@ sub_806F554: @ 806F554 thumb_func_start sub_806F56C sub_806F56C: @ 806F56C push {lr} - ldr r0, _0806F580 @ =gUnknown_2037AB8 + ldr r0, _0806F580 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -1027,7 +1027,7 @@ sub_806F56C: @ 806F56C movs r0, 0 b _0806F598 .align 2, 0 -_0806F580: .4byte gUnknown_2037AB8 +_0806F580: .4byte gPaletteFade _0806F584: bl play_some_sound bl sub_80563F0 @@ -1860,7 +1860,7 @@ sub_806FBB8: @ 806FBB8 lsls r0, 3 ldr r1, _0806FBEC @ =gTasks+0x8 adds r5, r0, r1 - ldr r0, _0806FBF0 @ =gUnknown_2037AB8 + ldr r0, _0806FBF0 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -1881,7 +1881,7 @@ _0806FBE2: mov pc, r0 .align 2, 0 _0806FBEC: .4byte gTasks+0x8 -_0806FBF0: .4byte gUnknown_2037AB8 +_0806FBF0: .4byte gPaletteFade _0806FBF4: .4byte _0806FBF8 .align 2, 0 _0806FBF8: diff --git a/asm/teachy_tv.s b/asm/teachy_tv.s index 70b02bbd5..812aac1a5 100644 --- a/asm/teachy_tv.s +++ b/asm/teachy_tv.s @@ -849,7 +849,7 @@ sub_815B274: @ 815B274 push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r0, _0815B298 @ =gUnknown_2037AB8 + ldr r0, _0815B298 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -863,7 +863,7 @@ sub_815B274: @ 815B274 bl SetMainCallback2 b _0815B2AC .align 2, 0 -_0815B298: .4byte gUnknown_2037AB8 +_0815B298: .4byte gPaletteFade _0815B29C: .4byte gUnknown_203F450 _0815B2A0: bl sub_8055DC4 @@ -893,7 +893,7 @@ sub_815B2C0: @ 815B2C0 ldr r1, _0815B31C @ =gTasks+0x8 adds r6, r0, r1 bl sub_815B0CC - ldr r0, _0815B320 @ =gUnknown_2037AB8 + ldr r0, _0815B320 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -929,7 +929,7 @@ _0815B30A: b _0815B37A .align 2, 0 _0815B31C: .4byte gTasks+0x8 -_0815B320: .4byte gUnknown_2037AB8 +_0815B320: .4byte gPaletteFade _0815B324: .4byte gUnknown_203F44A _0815B328: .4byte gMain _0815B32C: .4byte sub_8107EB8 @@ -1864,7 +1864,7 @@ sub_815BA54: @ 815BA54 lsls r2, r1, 3 ldr r4, _0815BA8C @ =gTasks+0x8 adds r3, r2, r4 - ldr r0, _0815BA90 @ =gUnknown_2037AB8 + ldr r0, _0815BA90 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -1887,7 +1887,7 @@ _0815BA86: bx r0 .align 2, 0 _0815BA8C: .4byte gTasks+0x8 -_0815BA90: .4byte gUnknown_2037AB8 +_0815BA90: .4byte gPaletteFade _0815BA94: .4byte gUnknown_8479390 _0815BA98: .4byte gUnknown_203F444 _0815BA9C: .4byte sub_815B4EC diff --git a/asm/title_screen.s b/asm/title_screen.s index 33c7d7386..c9ec19427 100644 --- a/asm/title_screen.s +++ b/asm/title_screen.s @@ -592,7 +592,7 @@ _08078E02: .align 2, 0 _08078E20: .4byte gUnknown_2037398 _08078E24: - ldr r0, _08078E3C @ =gUnknown_2037AB8 + ldr r0, _08078E3C @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -605,7 +605,7 @@ _08078E36: strh r0, [r6, 0x4] b _08078F80 .align 2, 0 -_08078E3C: .4byte gUnknown_2037AB8 +_08078E3C: .4byte gPaletteFade _08078E40: ldrh r0, [r6, 0x4] adds r0, 0x1 @@ -778,7 +778,7 @@ _08078F98: bl sub_807185C cmp r0, 0 bne _08078FB6 - ldr r0, _08078FC0 @ =gUnknown_2037AB8 + ldr r0, _08078FC0 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -793,7 +793,7 @@ _08078FB6: pop {r0} bx r0 .align 2, 0 -_08078FC0: .4byte gUnknown_2037AB8 +_08078FC0: .4byte gPaletteFade thumb_func_end sub_8078DA4 thumb_func_start sub_8078FC4 @@ -943,7 +943,7 @@ _080790FC: bl sub_8079A88 b _0807918C _08079104: - ldr r0, _08079138 @ =gUnknown_2037AB8 + ldr r0, _08079138 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -966,13 +966,13 @@ _08079104: bl sub_8079528 b _0807918C .align 2, 0 -_08079138: .4byte gUnknown_2037AB8 +_08079138: .4byte gPaletteFade _0807913C: bl IsNotWaitingForBGMStop lsls r0, 24 cmp r0, 0 beq _080791B0 - ldr r0, _08079168 @ =gUnknown_2037AB8 + ldr r0, _08079168 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -988,7 +988,7 @@ _0807913C: strh r5, [r4, 0x4] b _0807918C .align 2, 0 -_08079168: .4byte gUnknown_2037AB8 +_08079168: .4byte gPaletteFade _0807916C: .4byte sub_807941C _08079170: ldrh r0, [r4, 0x4] @@ -1048,7 +1048,7 @@ _080791D8: beq _08079248 b _080792A6 _080791DE: - ldr r0, _08079200 @ =gUnknown_2037AB8 + ldr r0, _08079200 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -1064,7 +1064,7 @@ _080791DE: strh r5, [r4, 0x4] b _08079238 .align 2, 0 -_08079200: .4byte gUnknown_2037AB8 +_08079200: .4byte gPaletteFade _08079204: ldrh r1, [r4, 0x4] movs r2, 0x4 @@ -1098,7 +1098,7 @@ _08079238: _08079240: .4byte 0x0fffffff _08079244: .4byte 0x00007fff _08079248: - ldr r0, _080792B0 @ =gUnknown_2037AB8 + ldr r0, _080792B0 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -1142,7 +1142,7 @@ _080792A6: pop {r0} bx r0 .align 2, 0 -_080792B0: .4byte gUnknown_2037AB8 +_080792B0: .4byte gPaletteFade _080792B4: .4byte gUnknown_30053A0 _080792B8: .4byte gSaveBlock2Ptr _080792BC: .4byte gHeap @@ -1327,7 +1327,7 @@ sub_807941C: @ 807941C ldrsh r0, [r5, r1] cmp r0, 0 beq _08079444 - ldr r0, _08079464 @ =gUnknown_2037AB8 + ldr r0, _08079464 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -1340,7 +1340,7 @@ _08079444: ldrsh r0, [r5, r3] cmp r0, 0 beq _08079468 - ldr r0, _08079464 @ =gUnknown_2037AB8 + ldr r0, _08079464 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -1351,7 +1351,7 @@ _08079444: b _08079510 .align 2, 0 _08079460: .4byte gTasks+0x8 -_08079464: .4byte gUnknown_2037AB8 +_08079464: .4byte gPaletteFade _08079468: movs r1, 0x2 ldrsh r0, [r5, r1] @@ -1432,7 +1432,7 @@ _080794F2: beq _08079510 movs r0, 0x80 lsls r0, 8 - ldr r2, _08079524 @ =gUnknown_2037AB8 + ldr r2, _08079524 @ =gPaletteFade ldrh r1, [r2, 0x4] lsls r1, 21 lsrs r1, 27 @@ -1448,7 +1448,7 @@ _08079510: _08079518: .4byte gUnknown_20371F8 _0807951C: .4byte gUnknown_8EAE094 _08079520: .4byte gUnknown_20375F8 -_08079524: .4byte gUnknown_2037AB8 +_08079524: .4byte gPaletteFade thumb_func_end sub_807941C thumb_func_start sub_8079528 diff --git a/asm/tm_case.s b/asm/tm_case.s index 303586153..3cd478ee6 100644 --- a/asm/tm_case.s +++ b/asm/tm_case.s @@ -1314,7 +1314,7 @@ sub_813226C: @ 813226C lsls r0, 3 ldr r1, _081322A4 @ =gTasks+0x8 adds r2, r0, r1 - ldr r0, _081322A8 @ =gUnknown_2037AB8 + ldr r0, _081322A8 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -1334,7 +1334,7 @@ sub_813226C: @ 813226C b _081322BE .align 2, 0 _081322A4: .4byte gTasks+0x8 -_081322A8: .4byte gUnknown_2037AB8 +_081322A8: .4byte gPaletteFade _081322AC: .4byte gUnknown_203B116 _081322B0: .4byte gUnknown_203B118 _081322B4: @@ -1365,7 +1365,7 @@ sub_81322D4: @ 81322D4 lsls r0, 3 ldr r1, _08132340 @ =gTasks+0x8 adds r6, r0, r1 - ldr r0, _08132344 @ =gUnknown_2037AB8 + ldr r0, _08132344 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -1406,7 +1406,7 @@ sub_81322D4: @ 81322D4 b _08132370 .align 2, 0 _08132340: .4byte gTasks+0x8 -_08132344: .4byte gUnknown_2037AB8 +_08132344: .4byte gPaletteFade _08132348: .4byte gUnknown_203B116 _0813234C: .4byte gMain _08132350: .4byte gUnknown_203AD30 @@ -2770,7 +2770,7 @@ sub_8132F20: @ 8132F20 lsls r3, r1, 3 ldr r4, _08132F54 @ =gTasks+0x8 adds r2, r3, r4 - ldr r0, _08132F58 @ =gUnknown_2037AB8 + ldr r0, _08132F58 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -2791,7 +2791,7 @@ _08132F4E: bx r0 .align 2, 0 _08132F54: .4byte gTasks+0x8 -_08132F58: .4byte gUnknown_2037AB8 +_08132F58: .4byte gPaletteFade _08132F5C: .4byte sub_8132F60 thumb_func_end sub_8132F20 @@ -2873,7 +2873,7 @@ _08133008: .align 2, 0 _08133020: .4byte 0xffff8405 _08133024: - ldr r0, _0813304C @ =gUnknown_2037AB8 + ldr r0, _0813304C @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -2895,7 +2895,7 @@ _08133046: strh r1, [r6, 0x12] b _081331EA .align 2, 0 -_0813304C: .4byte gUnknown_2037AB8 +_0813304C: .4byte gPaletteFade _08133050: movs r0, 0x12 ldrsh r1, [r6, r0] @@ -3035,7 +3035,7 @@ _0813315C: .align 2, 0 _0813316C: .4byte gMain _08133170: - ldr r0, _081331F4 @ =gUnknown_2037AB8 + ldr r0, _081331F4 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -3095,7 +3095,7 @@ _081331EA: strh r0, [r6, 0x10] b _08133232 .align 2, 0 -_081331F4: .4byte gUnknown_2037AB8 +_081331F4: .4byte gPaletteFade _081331F8: .4byte gSaveBlock1Ptr _081331FC: .4byte 0x00000464 _08133200: .4byte gUnknown_203B11C @@ -3103,7 +3103,7 @@ _08133204: .4byte gUnknown_203B10C _08133208: .4byte gUnknown_20375F8 _0813320C: .4byte gUnknown_20371F8 _08133210: - ldr r0, _0813323C @ =gUnknown_2037AB8 + ldr r0, _0813323C @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -3122,7 +3122,7 @@ _08133232: pop {r0} bx r0 .align 2, 0 -_0813323C: .4byte gUnknown_2037AB8 +_0813323C: .4byte gPaletteFade _08133240: .4byte gUnknown_203B10C thumb_func_end sub_8132F60 diff --git a/asm/trade.s b/asm/trade.s index 8351a9a73..0af3865cc 100644 --- a/asm/trade.s +++ b/asm/trade.s @@ -13,7 +13,7 @@ sub_804C600: @ 804C600 bl FreeAllSpritePalettes bl ResetTasks bl ResetPaletteFade - ldr r2, _0804C6F8 @ =gUnknown_2037AB8 + ldr r2, _0804C6F8 @ =gPaletteFade ldrb r0, [r2, 0x8] movs r1, 0x80 orrs r0, r1 @@ -116,7 +116,7 @@ _0804C6F0: pop {r0} bx r0 .align 2, 0 -_0804C6F8: .4byte gUnknown_2037AB8 +_0804C6F8: .4byte gPaletteFade _0804C6FC: .4byte sub_804D4F8 _0804C700: .4byte gUnknown_841F408 _0804C704: .4byte gUnknown_8261F1C @@ -219,7 +219,7 @@ _0804C7F0: .4byte gUnknown_2031C90 _0804C7F4: .4byte gUnknown_2031C94 _0804C7F8: .4byte gMain _0804C7FC: - ldr r2, _0804C864 @ =gUnknown_2037AB8 + ldr r2, _0804C864 @ =gPaletteFade ldrb r1, [r2, 0x8] movs r0, 0x7F ands r0, r1 @@ -267,7 +267,7 @@ _0804C80A: bl sub_80FBB20 b _0804C892 .align 2, 0 -_0804C864: .4byte gUnknown_2037AB8 +_0804C864: .4byte gPaletteFade _0804C868: .4byte gEnemyParty _0804C86C: .4byte gUnknown_3003F64 _0804C870: .4byte gUnknown_202271A @@ -1019,7 +1019,7 @@ _0804CEC2: .align 2, 0 _0804CECC: .4byte gMain _0804CED0: - ldr r0, _0804CF08 @ =gUnknown_2037AB8 + ldr r0, _0804CF08 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -1042,7 +1042,7 @@ _0804CEE6: pop {r0} bx r0 .align 2, 0 -_0804CF08: .4byte gUnknown_2037AB8 +_0804CF08: .4byte gPaletteFade _0804CF0C: .4byte sub_804DFF0 _0804CF10: .4byte sub_804D638 thumb_func_end sub_804C728 @@ -1647,7 +1647,7 @@ _0804D41C: _0804D43C: .4byte gUnknown_2031DA8 _0804D440: .4byte gMain _0804D444: - ldr r2, _0804D478 @ =gUnknown_2037AB8 + ldr r2, _0804D478 @ =gPaletteFade ldrb r1, [r2, 0x8] movs r0, 0x7F ands r0, r1 @@ -1671,7 +1671,7 @@ _0804D444: adds r1, r3 b _0804D4B4 .align 2, 0 -_0804D478: .4byte gUnknown_2037AB8 +_0804D478: .4byte gPaletteFade _0804D47C: .4byte gMain _0804D480: movs r1, 0x82 @@ -1707,7 +1707,7 @@ _0804D4B4: .align 2, 0 _0804D4BC: .4byte gMain _0804D4C0: - ldr r0, _0804D4F0 @ =gUnknown_2037AB8 + ldr r0, _0804D4F0 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -1727,7 +1727,7 @@ _0804D4D2: pop {r0} bx r0 .align 2, 0 -_0804D4F0: .4byte gUnknown_2037AB8 +_0804D4F0: .4byte gPaletteFade _0804D4F4: .4byte sub_804D638 thumb_func_end sub_804CF14 @@ -1778,7 +1778,7 @@ _0804D544: .4byte gUnknown_2031DA8 thumb_func_start sub_804D548 sub_804D548: @ 804D548 push {r4,lr} - ldr r0, _0804D580 @ =gUnknown_2037AB8 + ldr r0, _0804D580 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -1805,7 +1805,7 @@ sub_804D548: @ 804D548 strb r0, [r1] b _0804D59E .align 2, 0 -_0804D580: .4byte gUnknown_2037AB8 +_0804D580: .4byte gPaletteFade _0804D584: .4byte gUnknown_2031DA4 _0804D588: .4byte gUnknown_2031DA8 _0804D58C: .4byte gUnknown_3003F3C @@ -3669,7 +3669,7 @@ _0804E490: .4byte gMain sub_804E494: @ 804E494 push {r4,lr} sub sp, 0x4 - ldr r0, _0804E4CC @ =gUnknown_2037AB8 + ldr r0, _0804E4CC @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -3695,7 +3695,7 @@ sub_804E494: @ 804E494 bl sub_81344F8 b _0804E4F8 .align 2, 0 -_0804E4CC: .4byte gUnknown_2037AB8 +_0804E4CC: .4byte gPaletteFade _0804E4D0: .4byte gUnknown_2031DA8 _0804E4D4: .4byte gPlayerParty _0804E4D8: .4byte sub_804CF14 @@ -4247,7 +4247,7 @@ _0804E904: .4byte gSprites thumb_func_start sub_804E908 sub_804E908: @ 804E908 push {lr} - ldr r0, _0804E924 @ =gUnknown_2037AB8 + ldr r0, _0804E924 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -4260,7 +4260,7 @@ sub_804E908: @ 804E908 bl sub_800AB9C b _0804E932 .align 2, 0 -_0804E924: .4byte gUnknown_2037AB8 +_0804E924: .4byte gPaletteFade _0804E928: .4byte gUnknown_3003F3C _0804E92C: movs r0, 0xC @@ -7739,7 +7739,7 @@ _08050440: .align 2, 0 _08050448: .4byte gMain _0805044C: - ldr r0, _08050490 @ =gUnknown_2037AB8 + ldr r0, _08050490 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -7767,7 +7767,7 @@ _08050472: pop {r0} bx r0 .align 2, 0 -_08050490: .4byte gUnknown_2037AB8 +_08050490: .4byte gPaletteFade _08050494: .4byte gUnknown_3003F3C _08050498: .4byte sub_8053D84 thumb_func_end sub_8050138 @@ -9519,7 +9519,7 @@ _08051598: .align 2, 0 _080515B8: .4byte gUnknown_2031DAC _080515BC: - ldr r0, _080515E8 @ =gUnknown_2037AB8 + ldr r0, _080515E8 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -9537,7 +9537,7 @@ _080515CC: bl CopyWindowToVram bl _080522A8 .align 2, 0 -_080515E8: .4byte gUnknown_2037AB8 +_080515E8: .4byte gPaletteFade _080515EC: movs r1, 0x1 negs r1, r1 @@ -9548,7 +9548,7 @@ _080515EC: movs r3, 0 bl _080522A4 _080515FE: - ldr r0, _0805161C @ =gUnknown_2037AB8 + ldr r0, _0805161C @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -9562,7 +9562,7 @@ _0805160E: strh r1, [r0] bl _08052318 .align 2, 0 -_0805161C: .4byte gUnknown_2037AB8 +_0805161C: .4byte gPaletteFade _08051620: ldr r4, _0805163C @ =gUnknown_2031DAC ldr r0, [r4] @@ -9808,7 +9808,7 @@ _08051808: .align 2, 0 _08051828: .4byte gUnknown_2031DAC _0805182C: - ldr r0, _08051870 @ =gUnknown_2037AB8 + ldr r0, _08051870 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -9838,7 +9838,7 @@ _0805183C: ldr r1, [r7] bl _080522AC .align 2, 0 -_08051870: .4byte gUnknown_2037AB8 +_08051870: .4byte gPaletteFade _08051874: .4byte gSprites _08051878: movs r1, 0x1 @@ -9874,7 +9874,7 @@ _08051878: _080518BC: .4byte gUnknown_826CE84 _080518C0: .4byte gUnknown_2031DAC _080518C4: - ldr r0, _08051914 @ =gUnknown_2037AB8 + ldr r0, _08051914 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -9913,7 +9913,7 @@ _080518E2: strh r1, [r0, 0x26] bl _08052318 .align 2, 0 -_08051914: .4byte gUnknown_2037AB8 +_08051914: .4byte gPaletteFade _08051918: .4byte gUnknown_2031DAC _0805191C: .4byte gSprites _08051920: @@ -10298,7 +10298,7 @@ _08051BF6: .align 2, 0 _08051C38: .4byte gSprites _08051C3C: - ldr r0, _08051CA4 @ =gUnknown_2037AB8 + ldr r0, _08051CA4 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -10347,7 +10347,7 @@ _08051C4A: bl StartSpriteAnim b _08052318 .align 2, 0 -_08051CA4: .4byte gUnknown_2037AB8 +_08051CA4: .4byte gPaletteFade _08051CA8: .4byte gUnknown_826CE44 _08051CAC: .4byte gUnknown_826CE84 _08051CB0: .4byte gSprites @@ -10365,7 +10365,7 @@ _08051CC4: lsls r1, 5 movs r0, 0 bl SetGpuReg - ldr r0, _08051CE0 @ =gUnknown_2037AB8 + ldr r0, _08051CE0 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -10375,7 +10375,7 @@ _08051CC4: _08051CDC: b _080522A8 .align 2, 0 -_08051CE0: .4byte gUnknown_2037AB8 +_08051CE0: .4byte gPaletteFade _08051CE4: ldr r2, _08051D30 @ =gSprites ldr r4, [r7] @@ -10635,7 +10635,7 @@ _08051EC4: .align 2, 0 _08051EE0: .4byte gUnknown_2031DAC _08051EE4: - ldr r4, _08051F08 @ =gUnknown_2037AB8 + ldr r4, _08051F08 @ =gPaletteFade ldrb r1, [r4, 0x7] movs r0, 0x80 ands r0, r1 @@ -10653,9 +10653,9 @@ _08051EF2: strb r0, [r4, 0x8] b _080522A8 .align 2, 0 -_08051F08: .4byte gUnknown_2037AB8 +_08051F08: .4byte gPaletteFade _08051F0C: - ldr r2, _08051F24 @ =gUnknown_2037AB8 + ldr r2, _08051F24 @ =gPaletteFade ldrb r1, [r2, 0x8] movs r0, 0x7F ands r0, r1 @@ -10668,13 +10668,13 @@ _08051F0C: movs r3, 0 b _080522A4 .align 2, 0 -_08051F24: .4byte gUnknown_2037AB8 +_08051F24: .4byte gPaletteFade _08051F28: movs r1, 0xA2 lsls r1, 5 movs r0, 0 bl SetGpuReg - ldr r0, _08051F44 @ =gUnknown_2037AB8 + ldr r0, _08051F44 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -10684,7 +10684,7 @@ _08051F28: _08051F40: b _080522A8 .align 2, 0 -_08051F44: .4byte gUnknown_2037AB8 +_08051F44: .4byte gPaletteFade _08051F48: ldr r0, _08051FDC @ =gUnknown_826CDE4 movs r2, 0x8 @@ -11107,7 +11107,7 @@ _080522AC: .align 2, 0 _080522B8: .4byte gUnknown_2031DAC _080522BC: - ldr r0, _08052324 @ =gUnknown_2037AB8 + ldr r0, _08052324 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -11149,7 +11149,7 @@ _0805231A: pop {r1} bx r1 .align 2, 0 -_08052324: .4byte gUnknown_2037AB8 +_08052324: .4byte gPaletteFade _08052328: .4byte c2_exit_to_overworld_2_switch thumb_func_end sub_8050F3C @@ -11695,7 +11695,7 @@ _08052988: .align 2, 0 _080529A8: .4byte gUnknown_2031DAC _080529AC: - ldr r0, _080529D8 @ =gUnknown_2037AB8 + ldr r0, _080529D8 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -11713,7 +11713,7 @@ _080529BC: bl CopyWindowToVram bl _08053704 .align 2, 0 -_080529D8: .4byte gUnknown_2037AB8 +_080529D8: .4byte gPaletteFade _080529DC: movs r1, 0x1 negs r1, r1 @@ -11724,7 +11724,7 @@ _080529DC: movs r3, 0 bl _08053700 _080529EE: - ldr r0, _08052A0C @ =gUnknown_2037AB8 + ldr r0, _08052A0C @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -11738,7 +11738,7 @@ _080529FE: strh r1, [r0] bl _08053774 .align 2, 0 -_08052A0C: .4byte gUnknown_2037AB8 +_08052A0C: .4byte gPaletteFade _08052A10: ldr r4, _08052A2C @ =gUnknown_2031DAC ldr r0, [r4] @@ -11994,7 +11994,7 @@ _08052C18: .align 2, 0 _08052C38: .4byte gUnknown_2031DAC _08052C3C: - ldr r0, _08052C80 @ =gUnknown_2037AB8 + ldr r0, _08052C80 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -12024,7 +12024,7 @@ _08052C4C: ldr r1, [r7] bl _08053708 .align 2, 0 -_08052C80: .4byte gUnknown_2037AB8 +_08052C80: .4byte gPaletteFade _08052C84: .4byte gSprites _08052C88: movs r1, 0x1 @@ -12060,7 +12060,7 @@ _08052C88: _08052CCC: .4byte gUnknown_826CE84 _08052CD0: .4byte gUnknown_2031DAC _08052CD4: - ldr r0, _08052D24 @ =gUnknown_2037AB8 + ldr r0, _08052D24 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -12099,7 +12099,7 @@ _08052CF2: strh r1, [r0, 0x26] bl _08053774 .align 2, 0 -_08052D24: .4byte gUnknown_2037AB8 +_08052D24: .4byte gPaletteFade _08052D28: .4byte gUnknown_2031DAC _08052D2C: .4byte gSprites _08052D30: @@ -12490,7 +12490,7 @@ _08053012: .align 2, 0 _08053054: .4byte gSprites _08053058: - ldr r0, _080530E4 @ =gUnknown_2037AB8 + ldr r0, _080530E4 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -12557,7 +12557,7 @@ _08053066: bl StartSpriteAnim b _08053774 .align 2, 0 -_080530E4: .4byte gUnknown_2037AB8 +_080530E4: .4byte gPaletteFade _080530E8: .4byte gUnknown_826CE44 _080530EC: .4byte gSprites _080530F0: .4byte sub_804FD48 @@ -12576,7 +12576,7 @@ _08053108: lsls r1, 5 movs r0, 0 bl SetGpuReg - ldr r0, _08053124 @ =gUnknown_2037AB8 + ldr r0, _08053124 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -12586,7 +12586,7 @@ _08053108: _08053120: b _08053704 .align 2, 0 -_08053124: .4byte gUnknown_2037AB8 +_08053124: .4byte gPaletteFade _08053128: ldr r2, _0805317C @ =gSprites ldr r4, [r7] @@ -12860,7 +12860,7 @@ _08053320: .align 2, 0 _0805333C: .4byte gUnknown_2031DAC _08053340: - ldr r4, _08053364 @ =gUnknown_2037AB8 + ldr r4, _08053364 @ =gPaletteFade ldrb r1, [r4, 0x7] movs r0, 0x80 ands r0, r1 @@ -12878,9 +12878,9 @@ _0805334E: strb r0, [r4, 0x8] b _08053704 .align 2, 0 -_08053364: .4byte gUnknown_2037AB8 +_08053364: .4byte gPaletteFade _08053368: - ldr r2, _08053380 @ =gUnknown_2037AB8 + ldr r2, _08053380 @ =gPaletteFade ldrb r1, [r2, 0x8] movs r0, 0x7F ands r0, r1 @@ -12893,13 +12893,13 @@ _08053368: movs r3, 0 b _08053700 .align 2, 0 -_08053380: .4byte gUnknown_2037AB8 +_08053380: .4byte gPaletteFade _08053384: movs r1, 0xA2 lsls r1, 5 movs r0, 0 bl SetGpuReg - ldr r0, _080533A0 @ =gUnknown_2037AB8 + ldr r0, _080533A0 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -12909,7 +12909,7 @@ _08053384: _0805339C: b _08053704 .align 2, 0 -_080533A0: .4byte gUnknown_2037AB8 +_080533A0: .4byte gPaletteFade _080533A4: ldr r0, _08053438 @ =gUnknown_826CDE4 movs r2, 0x8 @@ -13332,7 +13332,7 @@ _08053708: .align 2, 0 _08053714: .4byte gUnknown_2031DAC _08053718: - ldr r0, _08053780 @ =gUnknown_2037AB8 + ldr r0, _08053780 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -13374,7 +13374,7 @@ _08053776: pop {r1} bx r1 .align 2, 0 -_08053780: .4byte gUnknown_2037AB8 +_08053780: .4byte gPaletteFade _08053784: .4byte c2_exit_to_overworld_2_switch thumb_func_end sub_805232C @@ -14685,7 +14685,7 @@ _080542C4: bl BeginNormalPaletteFade b _08054338 _080542E0: - ldr r0, _080542FC @ =gUnknown_2037AB8 + ldr r0, _080542FC @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -14699,7 +14699,7 @@ _080542E0: adds r1, r0 b _08054340 .align 2, 0 -_080542FC: .4byte gUnknown_2037AB8 +_080542FC: .4byte gPaletteFade _08054300: .4byte gMain _08054304: bl IsBGMStopped @@ -14792,7 +14792,7 @@ _080543C0: .4byte sub_80543C4 thumb_func_start sub_80543C4 sub_80543C4: @ 80543C4 push {r4,r5,lr} - ldr r0, _08054430 @ =gUnknown_2037AB8 + ldr r0, _08054430 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -14833,7 +14833,7 @@ _0805441A: pop {r0} bx r0 .align 2, 0 -_08054430: .4byte gUnknown_2037AB8 +_08054430: .4byte gPaletteFade _08054434: .4byte gUnknown_2031DAC _08054438: .4byte gUnknown_3003F3C _0805443C: .4byte gMain @@ -14867,7 +14867,7 @@ sub_8054470: @ 8054470 push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r0, _0805449C @ =gUnknown_2037AB8 + ldr r0, _0805449C @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -14885,7 +14885,7 @@ _08054494: pop {r0} bx r0 .align 2, 0 -_0805449C: .4byte gUnknown_2037AB8 +_0805449C: .4byte gPaletteFade _080544A0: .4byte sub_80505CC _080544A4: .4byte gUnknown_3005020 _080544A8: .4byte sub_807DD24 diff --git a/asm/union_room_chat.s b/asm/union_room_chat.s index 48a4e478f..caec21cff 100644 --- a/asm/union_room_chat.s +++ b/asm/union_room_chat.s @@ -155,7 +155,7 @@ _08128548: _08128550: .4byte sub_81285B4 _08128554: bl UpdatePaletteFade - ldr r0, _081285A0 @ =gUnknown_2037AB8 + ldr r0, _081285A0 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -187,7 +187,7 @@ _08128598: pop {r0} bx r0 .align 2, 0 -_081285A0: .4byte gUnknown_2037AB8 +_081285A0: .4byte gPaletteFade _081285A4: .4byte sub_81285CC _081285A8: .4byte sub_81285E8 _081285AC: .4byte gUnknown_203B0E0 @@ -1711,7 +1711,7 @@ _081291C8: .align 2, 0 _081291E4: .4byte gUnknown_203B0E0 _081291E8: - ldr r0, _08129210 @ =gUnknown_2037AB8 + ldr r0, _08129210 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -1728,7 +1728,7 @@ _08129206: pop {r0} bx r0 .align 2, 0 -_08129210: .4byte gUnknown_2037AB8 +_08129210: .4byte gPaletteFade _08129214: .4byte c2_exit_to_overworld_2_switch thumb_func_end sub_8128FB8 diff --git a/asm/unk_8147AA8.s b/asm/unk_8147AA8.s index fc9620900..9ae5acd08 100644 --- a/asm/unk_8147AA8.s +++ b/asm/unk_8147AA8.s @@ -497,7 +497,7 @@ _08147E98: .4byte sub_8147D58 _08147E9C: .4byte gUnknown_203F3D4 _08147EA0: bl UpdatePaletteFade - ldr r0, _08147EC4 @ =gUnknown_2037AB8 + ldr r0, _08147EC4 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -515,7 +515,7 @@ _08147EBC: strh r0, [r1, 0x8] b _08147F04 .align 2, 0 -_08147EC4: .4byte gUnknown_2037AB8 +_08147EC4: .4byte gPaletteFade _08147EC8: .4byte gUnknown_203F3D4 _08147ECC: ldr r0, [r2] @@ -2529,7 +2529,7 @@ _08148DC4: ldr r1, [r4] b _08148DFE _08148DEA: - ldr r0, _08148E08 @ =gUnknown_2037AB8 + ldr r0, _08148E08 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -2545,7 +2545,7 @@ _08148DFE: strh r0, [r1, 0xA] b _08148E20 .align 2, 0 -_08148E08: .4byte gUnknown_2037AB8 +_08148E08: .4byte gPaletteFade _08148E0C: .4byte gUnknown_203F3D4 _08148E10: ldr r0, _08148E1C @ =gUnknown_3003F64 diff --git a/asm/unk_814BB4C.s b/asm/unk_814BB4C.s index bb11cca7f..1895133dc 100644 --- a/asm/unk_814BB4C.s +++ b/asm/unk_814BB4C.s @@ -89,7 +89,7 @@ sub_814BBB8: @ 814BBB8 lsls r4, 8 ldrb r2, [r1, 0x7] orrs r4, r2 - ldr r5, _0814BC0C @ =gUnknown_2037AB8 + ldr r5, _0814BC0C @ =gPaletteFade ldrb r3, [r5, 0x8] movs r2, 0x7F ands r2, r3 @@ -110,7 +110,7 @@ sub_814BBB8: @ 814BBB8 pop {r1} bx r1 .align 2, 0 -_0814BC0C: .4byte gUnknown_2037AB8 +_0814BC0C: .4byte gPaletteFade thumb_func_end sub_814BBB8 thumb_func_start sub_814BC10 diff --git a/asm/unk_814D5C8.s b/asm/unk_814D5C8.s index 313bf9f78..01a4a08cb 100644 --- a/asm/unk_814D5C8.s +++ b/asm/unk_814D5C8.s @@ -192,14 +192,14 @@ _0814D774: bl sub_814EB38 adds r0, r5, 0 bl sub_814EBB0 - ldr r0, _0814D794 @ =gUnknown_2037AB8 + ldr r0, _0814D794 @ =gPaletteFade ldrb r1, [r0, 0x8] movs r2, 0x80 orrs r1, r2 strb r1, [r0, 0x8] b _0814D878 .align 2, 0 -_0814D794: .4byte gUnknown_2037AB8 +_0814D794: .4byte gPaletteFade _0814D798: ldr r0, _0814D7E4 @ =gUnknown_8EAFEA0 movs r2, 0xC0 @@ -261,7 +261,7 @@ _0814D7F4: .align 2, 0 _0814D82C: .4byte gSpriteCoordOffsetY _0814D830: - ldr r2, _0814D874 @ =gUnknown_2037AB8 + ldr r2, _0814D874 @ =gPaletteFade ldrb r1, [r2, 0x8] movs r0, 0x7F ands r0, r1 @@ -289,7 +289,7 @@ _0814D830: movs r0, 0x1 b _0814D880 .align 2, 0 -_0814D874: .4byte gUnknown_2037AB8 +_0814D874: .4byte gPaletteFade _0814D878: ldrb r0, [r5, 0xC] adds r0, 0x1 diff --git a/asm/unk_81507FC.s b/asm/unk_81507FC.s index cb042d971..a93a5ae2e 100644 --- a/asm/unk_81507FC.s +++ b/asm/unk_81507FC.s @@ -468,7 +468,7 @@ _08150BA2: _08150BC8: .4byte sub_8152034 _08150BCC: bl UpdatePaletteFade - ldr r0, _08150BE8 @ =gUnknown_2037AB8 + ldr r0, _08150BE8 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -483,7 +483,7 @@ _08150BE0: strb r0, [r1, 0xC] b _08150BFC .align 2, 0 -_08150BE8: .4byte gUnknown_2037AB8 +_08150BE8: .4byte gPaletteFade _08150BEC: .4byte gUnknown_203F3E0 _08150BF0: adds r0, r1, 0 @@ -1678,7 +1678,7 @@ _08151512: b _0815155E _08151524: bl UpdatePaletteFade - ldr r0, _08151538 @ =gUnknown_2037AB8 + ldr r0, _08151538 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -1686,7 +1686,7 @@ _08151524: bne _08151590 b _0815155E .align 2, 0 -_08151538: .4byte gUnknown_2037AB8 +_08151538: .4byte gPaletteFade _0815153C: bl sub_8154274 bl sub_8153ED8 @@ -1828,7 +1828,7 @@ _08151656: b _08151686 _08151676: bl UpdatePaletteFade - ldr r0, _08151694 @ =gUnknown_2037AB8 + ldr r0, _08151694 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -1842,7 +1842,7 @@ _08151686: strb r0, [r1, 0x10] b _081516CC .align 2, 0 -_08151694: .4byte gUnknown_2037AB8 +_08151694: .4byte gPaletteFade _08151698: .4byte gUnknown_203F3E0 _0815169C: ldrb r0, [r1, 0x4] diff --git a/asm/wireless_communication_status_screen.s b/asm/wireless_communication_status_screen.s index 5b3186c32..b4aecb9a5 100644 --- a/asm/wireless_communication_status_screen.s +++ b/asm/wireless_communication_status_screen.s @@ -388,7 +388,7 @@ _0814F4D4: bl ShowBg b _0814F618 _0814F4F8: - ldr r0, _0814F510 @ =gUnknown_2037AB8 + ldr r0, _0814F510 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -402,7 +402,7 @@ _0814F506: adds r0, r2 b _0814F622 .align 2, 0 -_0814F510: .4byte gUnknown_2037AB8 +_0814F510: .4byte gPaletteFade _0814F514: ldr r0, _0814F570 @ =gUnknown_3002040 ldr r0, [r0] @@ -541,7 +541,7 @@ _0814F622: .align 2, 0 _0814F62C: .4byte gTasks _0814F630: - ldr r0, _0814F654 @ =gUnknown_2037AB8 + ldr r0, _0814F654 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -559,7 +559,7 @@ _0814F648: pop {r0} bx r0 .align 2, 0 -_0814F654: .4byte gUnknown_2037AB8 +_0814F654: .4byte gPaletteFade _0814F658: .4byte sub_814F32C thumb_func_end sub_814F46C diff --git a/include/field_player_avatar.h b/include/field_player_avatar.h index 25b7f2d71..4bbc197aa 100644 --- a/include/field_player_avatar.h +++ b/include/field_player_avatar.h @@ -11,6 +11,8 @@ u8 player_get_direction_upper_nybble(void); u8 player_get_x22(void); void sub_808D074(u8); +void sub_805C270(); +void sub_805C780(); void GetXYCoordsOneStepInFrontOfPlayer(s16 *xPtr, s16 *yPtr); #endif //GUARD_FIELD_PLAYER_AVATAR_H diff --git a/include/map_obj_80688E4.h b/include/map_obj_80688E4.h new file mode 100644 index 000000000..b131a1a54 --- /dev/null +++ b/include/map_obj_80688E4.h @@ -0,0 +1,6 @@ +#ifndef GUARD_MAP_OBJ_80688E4_H +#define GUARD_MAP_OBJ_80688E4_H + +void player_bitmagic(void); + +#endif //GUARD_MAP_OBJ_80688E4_H diff --git a/include/palette.h b/include/palette.h index ffdc0496d..bdd1d1b93 100644 --- a/include/palette.h +++ b/include/palette.h @@ -68,6 +68,6 @@ void BeginHardwarePaletteFade(u8, u8, u8, u8, u8); void BlendPalettes(u32, u8, u16); void BlendPalettesUnfaded(u32, u8, u16); -extern struct PaletteFadeControl gUnknown_2037AB8; +extern struct PaletteFadeControl gPaletteFade; #endif // GUARD_PALETTE_H diff --git a/src/bg.c b/src/bg.c index d7f84bf4e..df91e9d4a 100644 --- a/src/bg.c +++ b/src/bg.c @@ -1067,7 +1067,6 @@ void CopyBgTilemapBufferToVram(u8 bg) void CopyToBgTilemapBufferRect(u8 bg, void* src, u8 destX, u8 destY, u8 width, u8 height) { - void* srcCopy; u16 destX16; u16 destY16; u16 mode; @@ -1077,26 +1076,30 @@ void CopyToBgTilemapBufferRect(u8 bg, void* src, u8 destX, u8 destY, u8 width, u switch (GetBgType(bg)) { case 0: - srcCopy = src; + { + u16 * srcCopy = src; for (destY16 = destY; destY16 < (destY + height); destY16++) { for (destX16 = destX; destX16 < (destX + width); destX16++) { - ((u16*)sGpuBgConfigs2[bg].tilemap)[((destY16 * 0x20) + destX16)] = *((u16*)srcCopy)++; + ((u16*)sGpuBgConfigs2[bg].tilemap)[((destY16 * 0x20) + destX16)] = *(srcCopy)++; } } break; + } case 1: - srcCopy = src; + { + u8 * srcCopy = src; mode = GetBgMetricAffineMode(bg, 0x1); for (destY16 = destY; destY16 < (destY + height); destY16++) { for (destX16 = destX; destX16 < (destX + width); destX16++) { - ((u8*)sGpuBgConfigs2[bg].tilemap)[((destY16 * mode) + destX16)] = *((u8*)srcCopy)++; + ((u8*)sGpuBgConfigs2[bg].tilemap)[((destY16 * mode) + destX16)] = *(srcCopy)++; } } break; + } } } } diff --git a/src/quest_log.c b/src/quest_log.c index 4cf7e6c95..2c98ca377 100644 --- a/src/quest_log.c +++ b/src/quest_log.c @@ -13,6 +13,8 @@ #include "overworld.h" #include "field_fadetransition.h" #include "field_weather.h" +#include "map_obj_80688E4.h" +#include "field_player_avatar.h" #include "item.h" #include "wild_encounter.h" #include "help_system.h" @@ -39,6 +41,8 @@ struct UnkStruct_203AE98 u8 unk_6; }; +extern u16 gUnknown_20371F8[]; + EWRAM_DATA u8 gUnknown_203ADF8 = 0; EWRAM_DATA u8 gUnknown_203ADF9 = 0; EWRAM_DATA u8 gUnknown_203ADFA = 0; @@ -48,6 +52,7 @@ EWRAM_DATA void * gUnknown_203AE04 = NULL; EWRAM_DATA u16 * gUnknown_203AE08 = NULL; EWRAM_DATA void * gUnknown_203AE0C[32] = {NULL}; EWRAM_DATA void (* gUnknown_203AE8C)(void) = 0; +EWRAM_DATA u16 *gUnknown_203AE90 = NULL; EWRAM_DATA struct UnkStruct_203AE94 gUnknown_203AE94 = {0}; EWRAM_DATA struct UnkStruct_203AE98 gUnknown_203AE98[32] = {0}; EWRAM_DATA u16 gUnknown_203AF98 = 0; @@ -82,7 +87,10 @@ void sub_8111D10(void); void sub_8111D90(u8); void sub_8111E20(void); void sub_8111E64(s8); +void sub_8111E84(void); bool8 sub_8111F60(void); +void sub_8111F8C(u8); +void sub_8111FCC(u8); void sub_8112364(void); void sub_8112888(u8); void sub_8112940(u8, struct UnkStruct_203AE98 *, u16); @@ -916,7 +924,7 @@ void sub_81118F4(s8 a0) void sub_8111914(void) { - if (!gUnknown_2037AB8.active) + if (!gPaletteFade.active) { ScriptContext2_Enable(); if (++gUnknown_203ADF8 < 4 && gSaveBlock1Ptr->questLog[gUnknown_203ADF8].unk_000) @@ -985,7 +993,7 @@ void sub_8111A34(u8 taskId) } break; case 1: - if (!gUnknown_2037AB8.active) + if (!gPaletteFade.active) { gUnknown_3005E88 = 0; routine = (void (*)(void)) GetWordTaskArg(taskId, 14); @@ -1158,3 +1166,68 @@ void sub_8111D90(u8 a0) Free(buffer); } } + +void sub_8111E20(void) +{ + ClearWindowTilemap(gUnknown_203ADFE[2]); + FillWindowPixelRect(gUnknown_203ADFE[2], 15, 0, 0, 0xf0, 0x30); + CopyWindowToVram(gUnknown_203ADFE[2], 2); + PutWindowTilemap(gUnknown_203ADFE[1]); + CopyWindowToVram(gUnknown_203ADFE[1], 1); +} + +void sub_8111E64(s8 a0) +{ + fade_screen(1, a0); + gUnknown_203AE8C = sub_8111E84; +} + +void sub_8111E84(void) +{ + if (!gPaletteFade.active) + { + ScriptContext2_Enable(); + for (gUnknown_203ADF8 = gUnknown_203ADF8; gUnknown_203ADF8 < 4; gUnknown_203ADF8++) + { + if (gSaveBlock1Ptr->questLog[gUnknown_203ADF8].unk_000 == 0) + break; + sub_811175C(gUnknown_203ADF8, gUnknown_203AE98); + } + gUnknown_3005E88 = 0; + sub_8111984(); + } +} + +void sub_8111F14(void) +{ + if (gUnknown_203ADFA == 3) + gUnknown_203AE90 = AllocZeroed(0x200 * sizeof(u16)); +} + +void sub_8111F38(u16 a0, u16 a1) +{ + CpuSet(gUnknown_20371F8 + a0, gUnknown_203AE90 + a0, a1); +} + +bool8 sub_8111F60(void) +{ + LoadPalette(stdpal_get(4), 0xF0, 0x20); + sub_8111070(0); + sub_807DF7C(); + CreateTask(sub_8111F8C, 0xFF); + return TRUE; +} + +void sub_8111F8C(u8 taskId) +{ + struct Task *task = &gTasks[taskId]; + + if (ScriptContext2_IsEnabled() != TRUE) + { + player_bitmagic(); + sub_805C270(); + sub_805C780(); + ScriptContext2_Enable(); + task->func = sub_8111FCC; + } +} diff --git a/sym_ewram.txt b/sym_ewram.txt index 3864a27a7..cebe20e4f 100644 --- a/sym_ewram.txt +++ b/sym_ewram.txt @@ -806,7 +806,7 @@ gUnknown_20377F8: @ 20377F8 gUnknown_20379F8: @ 20379F8 .space 0xC0 -gUnknown_2037AB8: @ 2037AB8 +gPaletteFade: @ 2037AB8 .space 0x10 gUnknown_2037AC8: @ 2037AC8 -- cgit v1.2.3 From 58f91389a345f8dab7c0da2637f9063a823f495f Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Fri, 12 Oct 2018 13:51:56 -0400 Subject: through sub_8112044 --- asm/quest_log.s | 106 --------------------------------------------------- include/gba/gba.h | 1 + include/region_map.h | 1 + src/quest_log.c | 39 +++++++++++++++++++ 4 files changed, 41 insertions(+), 106 deletions(-) diff --git a/asm/quest_log.s b/asm/quest_log.s index 2a6410b3f..1ee1361d6 100644 --- a/asm/quest_log.s +++ b/asm/quest_log.s @@ -5,112 +5,6 @@ .text - thumb_func_start sub_8111FCC -sub_8111FCC: @ 8111FCC - push {r4,r5,lr} - lsls r0, 24 - lsrs r0, 24 - lsls r1, r0, 2 - adds r1, r0 - lsls r1, 3 - ldr r0, _08112024 @ =gTasks - adds r5, r1, r0 - ldr r0, _08112028 @ =gPaletteFade - ldrb r1, [r0, 0x7] - movs r0, 0x80 - ands r0, r1 - lsls r0, 24 - lsrs r4, r0, 24 - cmp r4, 0 - bne _0811201E - ldr r0, _0811202C @ =gUnknown_203AE94 - ldrb r1, [r0] - movs r0, 0xC0 - ands r0, r1 - cmp r0, 0x40 - beq _0811200E - ldr r0, _08112030 @ =gStringVar1 - ldr r1, _08112034 @ =gMapHeader - ldrb r1, [r1, 0x14] - bl sub_80C4DF8 - ldr r0, _08112038 @ =gStringVar4 - ldr r1, _0811203C @ =gUnknown_841B073 - bl StringExpandPlaceholders - bl sub_8111D10 -_0811200E: - strh r4, [r5, 0x8] - strh r4, [r5, 0xA] - ldr r0, _08112040 @ =sub_8112044 - str r0, [r5] - bl player_bitmagic - bl ScriptContext2_Enable -_0811201E: - pop {r4,r5} - pop {r0} - bx r0 - .align 2, 0 -_08112024: .4byte gTasks -_08112028: .4byte gPaletteFade -_0811202C: .4byte gUnknown_203AE94 -_08112030: .4byte gStringVar1 -_08112034: .4byte gMapHeader -_08112038: .4byte gStringVar4 -_0811203C: .4byte gUnknown_841B073 -_08112040: .4byte sub_8112044 - thumb_func_end sub_8111FCC - - thumb_func_start sub_8112044 -sub_8112044: @ 8112044 - push {r4,lr} - lsls r0, 24 - lsrs r0, 24 - lsls r1, r0, 2 - adds r1, r0 - lsls r1, 3 - ldr r0, _0811208C @ =gTasks - adds r4, r1, r0 - ldr r0, _08112090 @ =gMain - ldrh r1, [r0, 0x2E] - movs r0, 0x3 - ands r0, r1 - cmp r0, 0 - bne _08112076 - ldrh r2, [r4, 0x8] - movs r1, 0x8 - ldrsh r0, [r4, r1] - cmp r0, 0x7E - bgt _08112076 - ldr r0, _08112094 @ =gUnknown_203AE94 - ldrb r1, [r0] - movs r0, 0xC0 - ands r0, r1 - cmp r0, 0x40 - bne _081120A0 -_08112076: - bl sub_8111E20 - movs r1, 0 - movs r0, 0 - strh r0, [r4, 0x8] - ldr r0, _08112098 @ =sub_81120AC - str r0, [r4] - ldr r0, _0811209C @ =gUnknown_203ADFA - strb r1, [r0] - b _081120A4 - .align 2, 0 -_0811208C: .4byte gTasks -_08112090: .4byte gMain -_08112094: .4byte gUnknown_203AE94 -_08112098: .4byte sub_81120AC -_0811209C: .4byte gUnknown_203ADFA -_081120A0: - adds r0, r2, 0x1 - strh r0, [r4, 0x8] -_081120A4: - pop {r4} - pop {r0} - bx r0 - thumb_func_end sub_8112044 - thumb_func_start sub_81120AC sub_81120AC: @ 81120AC push {r4-r6,lr} diff --git a/include/gba/gba.h b/include/gba/gba.h index 7e58efb9f..4b5f2de95 100644 --- a/include/gba/gba.h +++ b/include/gba/gba.h @@ -1,6 +1,7 @@ #ifndef GUARD_GBA_GBA_H #define GUARD_GBA_GBA_H +#include #include "defines.h" #include "io_reg.h" #include "types.h" diff --git a/include/region_map.h b/include/region_map.h index 91384d166..eb84a71b1 100644 --- a/include/region_map.h +++ b/include/region_map.h @@ -310,5 +310,6 @@ void CreateRegionMapPlayerIcon(u16 x, u16 y); void CreateRegionMapCursor(u16 tileTag, u16 paletteTag); u8 *GetMapName(u8 *, u16, u16); bool32 sub_8124668(u8 mapSecId); +void sub_80C4DF8(u8 *, u8); #endif //GUARD_REGION_MAP_H diff --git a/src/quest_log.c b/src/quest_log.c index 2c98ca377..fbf8b018e 100644 --- a/src/quest_log.c +++ b/src/quest_log.c @@ -16,6 +16,7 @@ #include "map_obj_80688E4.h" #include "field_player_avatar.h" #include "item.h" +#include "region_map.h" #include "wild_encounter.h" #include "help_system.h" #include "unk_8159F40.h" @@ -91,6 +92,8 @@ void sub_8111E84(void); bool8 sub_8111F60(void); void sub_8111F8C(u8); void sub_8111FCC(u8); +void sub_8112044(u8); +void sub_81120AC(u8); void sub_8112364(void); void sub_8112888(u8); void sub_8112940(u8, struct UnkStruct_203AE98 *, u16); @@ -111,6 +114,7 @@ void * sub_8113D48(void *, struct UnkStruct_203AE98 *); void * sub_8113D94(void *, struct UnkStruct_203AE98 *); extern const u8 gUnknown_841A155[]; +extern const u8 gUnknown_841B073[]; const struct WindowTemplate gUnknown_845661C[3] = { { 0, 0, 0, 30, 2, 15, 0x0e9 }, @@ -1231,3 +1235,38 @@ void sub_8111F8C(u8 taskId) task->func = sub_8111FCC; } } + +void sub_8111FCC(u8 taskId) +{ + struct Task *task = &gTasks[taskId]; + + if (!gPaletteFade.active) + { + if (gUnknown_203AE94.unk_0_6 != 1) + { + sub_80C4DF8(gStringVar1, gMapHeader.regionMapSectionId); + StringExpandPlaceholders(gStringVar4, gUnknown_841B073); + sub_8111D10(); + } + task->data[0] = 0; + task->data[1] = 0; + task->func = sub_8112044; + player_bitmagic(); + ScriptContext2_Enable(); + } +} + +void sub_8112044(u8 taskId) +{ + struct Task *task = &gTasks[taskId]; + + if (gMain.newKeys & (A_BUTTON | B_BUTTON) || task->data[0] >= 0x7f || gUnknown_203AE94.unk_0_6 == 1) + { + sub_8111E20(); + task->data[0] = 0; + task->func = sub_81120AC; + gUnknown_203ADFA = 0; + } + else + task->data[0]++; +} -- cgit v1.2.3 From 67cbc482982245c8cdd0466f59d73ab89d09b633 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Fri, 12 Oct 2018 15:05:47 -0400 Subject: sub_81120AC --- asm/quest_log.s | 141 ----------------------------------------------- include/map_name_popup.h | 1 + include/map_obj_lock.h | 1 + include/overworld.h | 2 + src/quest_log.c | 54 ++++++++++++++++++ 5 files changed, 58 insertions(+), 141 deletions(-) diff --git a/asm/quest_log.s b/asm/quest_log.s index 1ee1361d6..9809b1b52 100644 --- a/asm/quest_log.s +++ b/asm/quest_log.s @@ -5,147 +5,6 @@ .text - thumb_func_start sub_81120AC -sub_81120AC: @ 81120AC - push {r4-r6,lr} - sub sp, 0x8 - lsls r0, 24 - lsrs r5, r0, 24 - lsls r0, r5, 2 - adds r0, r5 - lsls r0, 3 - ldr r1, _081120D0 @ =gTasks+0x8 - adds r6, r0, r1 - movs r0, 0 - ldrsh r1, [r6, r0] - cmp r1, 0x1 - beq _08112110 - cmp r1, 0x1 - bgt _081120D4 - cmp r1, 0 - beq _081120DA - b _08112164 - .align 2, 0 -_081120D0: .4byte gTasks+0x8 -_081120D4: - cmp r1, 0x2 - beq _0811214C - b _08112164 -_081120DA: - ldr r0, _08112104 @ =gUnknown_2031DD8 - strb r1, [r0] - bl sub_8055DC4 - bl sub_811229C - ldr r0, _08112108 @ =gUnknown_203ADFE - ldrb r0, [r0] - ldr r2, _0811210C @ =gUnknown_845661C - ldrb r1, [r2, 0x3] - lsls r1, 3 - str r1, [sp] - ldrb r1, [r2, 0x4] - lsls r1, 3 - str r1, [sp, 0x4] - movs r1, 0xF - movs r2, 0 - movs r3, 0 - bl FillWindowPixelRect - b _0811215C - .align 2, 0 -_08112104: .4byte gUnknown_2031DD8 -_08112108: .4byte gUnknown_203ADFE -_0811210C: .4byte gUnknown_845661C -_08112110: - adds r0, r5, 0 - bl sub_81121D8 - lsls r0, 24 - cmp r0, 0 - beq _081121B8 - movs r5, 0 -_0811211E: - ldr r4, _08112148 @ =gUnknown_203ADFE - adds r4, r5, r4 - ldrb r0, [r4] - bl ClearWindowTilemap - ldrb r0, [r4] - movs r1, 0x1 - bl CopyWindowToVram - ldrb r0, [r4] - bl RemoveWindow - adds r0, r5, 0x1 - lsls r0, 24 - lsrs r5, r0, 24 - cmp r5, 0x2 - bls _0811211E - movs r0, 0 - strh r0, [r6, 0x2] - b _0811215C - .align 2, 0 -_08112148: .4byte gUnknown_203ADFE -_0811214C: - ldrh r1, [r6, 0x2] - movs r2, 0x2 - ldrsh r0, [r6, r2] - cmp r0, 0x1F - bgt _0811215C - adds r0, r1, 0x1 - strh r0, [r6, 0x2] - b _081121B8 -_0811215C: - ldrh r0, [r6] - adds r0, 0x1 - strh r0, [r6] - b _081121B8 -_08112164: - ldr r6, _081121C0 @ =gUnknown_203AE94 - ldrb r1, [r6] - movs r0, 0xC0 - ands r0, r1 - cmp r0, 0x40 - bne _08112176 - movs r0, 0x1 - bl sub_8098110 -_08112176: - ldr r4, _081121C4 @ =gUnknown_203AE90 - ldr r0, [r4] - ldr r1, _081121C8 @ =gUnknown_20371F8 - movs r2, 0x80 - lsls r2, 2 - bl CpuSet - ldr r0, [r4] - bl Free - movs r4, 0 - str r4, [r6] - bl sub_80696C0 - bl ScriptContext2_Disable - ldr r2, _081121CC @ =gTextFlags - ldrb r1, [r2] - movs r0, 0x5 - negs r0, r0 - ands r0, r1 - strb r0, [r2] - ldr r0, _081121D0 @ =gUnknown_2036E28 - strb r4, [r0] - movs r0, 0 - bl sub_8082740 - ldr r1, _081121D4 @ =gUnknown_3005ECC - movs r0, 0x1 - strb r0, [r1] - adds r0, r5, 0 - bl DestroyTask -_081121B8: - add sp, 0x8 - pop {r4-r6} - pop {r0} - bx r0 - .align 2, 0 -_081121C0: .4byte gUnknown_203AE94 -_081121C4: .4byte gUnknown_203AE90 -_081121C8: .4byte gUnknown_20371F8 -_081121CC: .4byte gTextFlags -_081121D0: .4byte gUnknown_2036E28 -_081121D4: .4byte gUnknown_3005ECC - thumb_func_end sub_81120AC - thumb_func_start sub_81121D8 sub_81121D8: @ 81121D8 push {r4-r7,lr} diff --git a/include/map_name_popup.h b/include/map_name_popup.h index 8a9043a3f..0cb0c49ad 100644 --- a/include/map_name_popup.h +++ b/include/map_name_popup.h @@ -7,5 +7,6 @@ // Exported ROM declarations void HideMapNamePopUpWindow(void); +void sub_8098110(u8); #endif //GUARD_MAP_NAME_POPUP_H diff --git a/include/map_obj_lock.h b/include/map_obj_lock.h index a10648f2f..cf1f714d7 100644 --- a/include/map_obj_lock.h +++ b/include/map_obj_lock.h @@ -7,5 +7,6 @@ bool8 sub_809847C(void); void LockSelectedMapObject(void); void sub_8098630(void); bool8 sub_8098734(void); +void sub_80696C0(void); #endif // GUARD_MAP_OBJ_LOCK_H diff --git a/include/overworld.h b/include/overworld.h index ab3554137..d497ddbe1 100644 --- a/include/overworld.h +++ b/include/overworld.h @@ -76,8 +76,10 @@ void sub_8055D5C(struct WarpData *); void sub_80572A8(void); void sub_805726C(void); void sub_8057430(void); +void sub_8055DC4(void); extern u8 gUnknown_2031DD8; +extern u8 gUnknown_2036E28; extern bool8 (* gUnknown_3005024)(void); diff --git a/src/quest_log.c b/src/quest_log.c index fbf8b018e..e7a5a2d5b 100644 --- a/src/quest_log.c +++ b/src/quest_log.c @@ -14,9 +14,11 @@ #include "field_fadetransition.h" #include "field_weather.h" #include "map_obj_80688E4.h" +#include "map_obj_lock.h" #include "field_player_avatar.h" #include "item.h" #include "region_map.h" +#include "map_name_popup.h" #include "wild_encounter.h" #include "help_system.h" #include "unk_8159F40.h" @@ -94,6 +96,8 @@ void sub_8111F8C(u8); void sub_8111FCC(u8); void sub_8112044(u8); void sub_81120AC(u8); +bool8 sub_81121D8(u8); +void sub_811229C(void); void sub_8112364(void); void sub_8112888(u8); void sub_8112940(u8, struct UnkStruct_203AE98 *, u16); @@ -1270,3 +1274,53 @@ void sub_8112044(u8 taskId) else task->data[0]++; } + +void sub_81120AC(u8 taskId) +{ + s16 * data = gTasks[taskId].data; + u8 i; + + switch (data[0]) + { + case 0: + gUnknown_2031DD8 = 0; + sub_8055DC4(); + sub_811229C(); + FillWindowPixelRect(gUnknown_203ADFE[0], 0xF, 0, 0, gUnknown_845661C[0].width * 8, gUnknown_845661C[0].height * 8); + data[0]++; + break; + case 1: + if (sub_81121D8(taskId)) + { + for (i = 0; i < 3; i++) + { + ClearWindowTilemap(gUnknown_203ADFE[i]); + CopyWindowToVram(gUnknown_203ADFE[i], 1); + RemoveWindow(gUnknown_203ADFE[i]); + } + data[1] = 0; + data[0]++; + } + break; + case 2: + if (data[1] < 32) + data[1]++; + else + data[0]++; + break; + default: + if (gUnknown_203AE94.unk_0_6 == 1) + sub_8098110(1); + CpuCopy16(gUnknown_203AE90, gUnknown_20371F8, 0x400); + Free(gUnknown_203AE90); + gUnknown_203AE94 = (struct UnkStruct_203AE94){}; + sub_80696C0(); + ScriptContext2_Disable(); + gTextFlags.flag_2 = FALSE; + gUnknown_2036E28 = 0; + sub_8082740(0); + gUnknown_3005ECC = 1; + DestroyTask(taskId); + break; + } +} -- cgit v1.2.3 From a4000de4bc94c21ee91295727c605b90ce2f7397 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Fri, 12 Oct 2018 15:29:43 -0400 Subject: sub_81121D8 --- asm/battle_1.s | 12 ++--- asm/battle_anim_8074480.s | 24 ++++----- asm/battle_anim_8078178.s | 4 +- asm/battle_anim_80A22E8.s | 66 +++++++++++------------ asm/battle_anim_80DE2C0.s | 12 ++--- asm/battle_anim_80EEC0C.s | 4 +- asm/battle_gfx_sfx_util.s | 32 +++++------ asm/battle_message.s | 4 +- asm/battle_script_commands.s | 4 +- asm/battle_transition.s | 8 +-- asm/blend_palette.s | 8 +-- asm/credits.s | 16 +++--- asm/field_effect.s | 34 ++++++------ asm/field_fadetransition.s | 8 +-- asm/field_weather.s | 76 +++++++++++++------------- asm/fieldmap.s | 36 ++++++------- asm/fldeff_sweetscent.s | 12 ++--- asm/hall_of_fame.s | 16 +++--- asm/mail.s | 8 +-- asm/main_menu.s | 8 +-- asm/naming_screen.s | 8 +-- asm/oak_speech.s | 16 +++--- asm/palette.s | 126 +++++++++++++++++++++---------------------- asm/party_menu.s | 8 +-- asm/pc_screen_effect.s | 12 ++--- asm/pokemon_storage_system.s | 8 +-- asm/quest_log.s | 97 +-------------------------------- asm/roulette_util.s | 52 +++++++++--------- asm/slot_machine.s | 8 +-- asm/title_screen.s | 16 +++--- asm/tm_case.s | 8 +-- include/palette.h | 5 +- src/quest_log.c | 23 ++++++-- sym_ewram.txt | 4 +- 34 files changed, 353 insertions(+), 430 deletions(-) diff --git a/asm/battle_1.s b/asm/battle_1.s index db55d2dcb..bb29b3aab 100644 --- a/asm/battle_1.s +++ b/asm/battle_1.s @@ -228,7 +228,7 @@ sub_800F380: @ 800F380 movs r1, 0x22 movs r2, 0x10 bl sub_815001C - ldr r4, _0800F3F0 @ =gUnknown_20371F8 + ldr r4, _0800F3F0 @ =gPlttBufferUnfaded adds r0, r4, 0 adds r0, 0xB8 ldr r1, _0800F3F4 @ =0x00002529 @@ -271,7 +271,7 @@ _0800F3EA: pop {r0} bx r0 .align 2, 0 -_0800F3F0: .4byte gUnknown_20371F8 +_0800F3F0: .4byte gPlttBufferUnfaded _0800F3F4: .4byte 0x00002529 _0800F3F8: .4byte 0x00007fff _0800F3FC: .4byte 0x0000675a @@ -838,12 +838,12 @@ _0800F850: ldr r0, _0800F8CC @ =0x00002710 bl AllocSpritePalette lsls r0, 24 - ldr r2, _0800F8D0 @ =gUnknown_20371F8 + ldr r2, _0800F8D0 @ =gPlttBufferUnfaded lsrs r0, 19 ldr r3, _0800F8D4 @ =0x0000021e adds r0, r3 adds r2, r0, r2 - ldr r1, _0800F8D8 @ =gUnknown_20375F8 + ldr r1, _0800F8D8 @ =gPlttBufferFaded adds r0, r1 ldr r1, _0800F8DC @ =0x00007fff strh r1, [r0] @@ -895,9 +895,9 @@ _0800F850: b _0800FAC4 .align 2, 0 _0800F8CC: .4byte 0x00002710 -_0800F8D0: .4byte gUnknown_20371F8 +_0800F8D0: .4byte gPlttBufferUnfaded _0800F8D4: .4byte 0x0000021e -_0800F8D8: .4byte gUnknown_20375F8 +_0800F8D8: .4byte gPlttBufferFaded _0800F8DC: .4byte 0x00007fff _0800F8E0: .4byte gUnknown_82482E8 _0800F8E4: .4byte gBattleStruct diff --git a/asm/battle_anim_8074480.s b/asm/battle_anim_8074480.s index 5e4dfecb0..2d11fc6e1 100644 --- a/asm/battle_anim_8074480.s +++ b/asm/battle_anim_8074480.s @@ -3149,8 +3149,8 @@ sub_8075B48: @ 8075B48 lsrs r0, 16 cmp r1, 0 bne _08075BC4 - ldr r2, _08075BB8 @ =gUnknown_20371F8 - ldr r1, _08075BBC @ =gUnknown_20375F8 + ldr r2, _08075BB8 @ =gPlttBufferUnfaded + ldr r1, _08075BBC @ =gPlttBufferFaded lsls r0, 1 adds r4, r0, r1 adds r5, r0, r2 @@ -3200,14 +3200,14 @@ _08075B60: bge _08075B60 b _08075BD4 .align 2, 0 -_08075BB8: .4byte gUnknown_20371F8 -_08075BBC: .4byte gUnknown_20375F8 +_08075BB8: .4byte gPlttBufferUnfaded +_08075BBC: .4byte gPlttBufferFaded _08075BC0: .4byte 0xfffffc1f _08075BC4: lsls r1, r0, 1 - ldr r0, _08075BDC @ =gUnknown_20371F8 + ldr r0, _08075BDC @ =gPlttBufferUnfaded adds r0, r1, r0 - ldr r2, _08075BE0 @ =gUnknown_20375F8 + ldr r2, _08075BE0 @ =gPlttBufferFaded adds r1, r2 ldr r2, _08075BE4 @ =0x04000008 bl CpuSet @@ -3216,8 +3216,8 @@ _08075BD4: pop {r0} bx r0 .align 2, 0 -_08075BDC: .4byte gUnknown_20371F8 -_08075BE0: .4byte gUnknown_20375F8 +_08075BDC: .4byte gPlttBufferUnfaded +_08075BE0: .4byte gPlttBufferFaded _08075BE4: .4byte 0x04000008 thumb_func_end sub_8075B48 @@ -5967,10 +5967,10 @@ _080770D4: _080770D6: strh r0, [r5, 0x14] lsls r0, r4, 1 - ldr r1, _08077104 @ =gUnknown_20371F8 + ldr r1, _08077104 @ =gPlttBufferUnfaded adds r0, r1 lsls r1, r6, 1 - ldr r2, _08077108 @ =gUnknown_20375F8 + ldr r2, _08077108 @ =gPlttBufferFaded adds r1, r2 ldr r2, _0807710C @ =0x04000008 bl CpuSet @@ -5986,8 +5986,8 @@ _080770D6: pop {r0} bx r0 .align 2, 0 -_08077104: .4byte gUnknown_20371F8 -_08077108: .4byte gUnknown_20375F8 +_08077104: .4byte gPlttBufferUnfaded +_08077108: .4byte gPlttBufferFaded _0807710C: .4byte 0x04000008 _08077110: .4byte gUnknown_2037F02 _08077114: .4byte sub_8077118 diff --git a/asm/battle_anim_8078178.s b/asm/battle_anim_8078178.s index e4f15971d..1080351b3 100644 --- a/asm/battle_anim_8078178.s +++ b/asm/battle_anim_8078178.s @@ -505,7 +505,7 @@ sub_8078528: @ 8078528 asrs r0, 16 cmp r0, 0x3 bne _080785B8 - ldr r3, _080785C8 @ =gUnknown_20375F8 + ldr r3, _080785C8 @ =gPlttBufferFaded lsls r2, 4 mov r12, r2 ldr r1, _080785CC @ =0x0000010d @@ -555,7 +555,7 @@ _080785B8: .align 2, 0 _080785C0: .4byte 0x0000271a _080785C4: .4byte gTasks -_080785C8: .4byte gUnknown_20375F8 +_080785C8: .4byte gPlttBufferFaded _080785CC: .4byte 0x0000010d _080785D0: .4byte 0x0000010f _080785D4: .4byte sub_80785D8 diff --git a/asm/battle_anim_80A22E8.s b/asm/battle_anim_80A22E8.s index e38fc6501..2b522ffe8 100644 --- a/asm/battle_anim_80A22E8.s +++ b/asm/battle_anim_80A22E8.s @@ -5084,7 +5084,7 @@ sub_80A49D4: @ 80A49D4 ble _080A4A32 movs r0, 0 strh r0, [r4, 0x30] - ldr r1, _080A4A7C @ =gUnknown_20375F8 + ldr r1, _080A4A7C @ =gPlttBufferFaded movs r2, 0x32 ldrsh r0, [r4, r2] adds r0, 0x1 @@ -5153,7 +5153,7 @@ _080A4A6C: strh r0, [r4, 0x2E] b _080A4AC2 .align 2, 0 -_080A4A7C: .4byte gUnknown_20375F8 +_080A4A7C: .4byte gPlttBufferFaded _080A4A80: ldrh r0, [r4, 0x3A] adds r0, 0x1 @@ -8192,7 +8192,7 @@ _080A614C: cmp r0, 0 beq _080A6178 movs r1, 0x1 - ldr r2, _080A6190 @ =gUnknown_20375F8 + ldr r2, _080A6190 @ =gPlttBufferFaded _080A6164: adds r0, r3, r1 lsls r0, 1 @@ -8216,7 +8216,7 @@ _080A6178: b _080A6232 .align 2, 0 _080A618C: .4byte 0x00007fbb -_080A6190: .4byte gUnknown_20375F8 +_080A6190: .4byte gPlttBufferFaded _080A6194: ldr r0, _080A61DC @ =gPaletteFade ldrb r1, [r0, 0x7] @@ -8534,7 +8534,7 @@ sub_80A63B4: @ 80A63B4 adds r0, 0x10 lsls r4, r0, 4 movs r5, 0x1 - ldr r2, _080A6450 @ =gUnknown_20371F8 + ldr r2, _080A6450 @ =gPlttBufferUnfaded _080A640C: adds r1, r3, r5 lsls r1, 1 @@ -8566,7 +8566,7 @@ _080A640C: _080A6444: .4byte gTasks _080A6448: .4byte 0x00002771 _080A644C: .4byte gSprites -_080A6450: .4byte gUnknown_20371F8 +_080A6450: .4byte gPlttBufferUnfaded _080A6454: lsls r2, r0, 4 adds r2, r0 @@ -8796,7 +8796,7 @@ sub_80A65E8: @ 80A65E8 adds r0, r1 lsrs r3, r0, 16 movs r2, 0x1 - ldr r5, _080A669C @ =gUnknown_20375F8 + ldr r5, _080A669C @ =gPlttBufferFaded _080A6614: adds r1, r3, r2 lsls r1, 1 @@ -8834,7 +8834,7 @@ _080A6632: adds r0, r1 lsrs r3, r0, 16 movs r2, 0x1 - ldr r7, _080A669C @ =gUnknown_20375F8 + ldr r7, _080A669C @ =gPlttBufferFaded ldr r6, _080A6698 @ =gUnknown_83E3898 adds r4, r5, 0 _080A6660: @@ -8867,7 +8867,7 @@ _080A667A: bx r0 .align 2, 0 _080A6698: .4byte gUnknown_83E3898 -_080A669C: .4byte gUnknown_20375F8 +_080A669C: .4byte gPlttBufferFaded thumb_func_end sub_80A65E8 thumb_func_start sub_80A66A0 @@ -11414,7 +11414,7 @@ sub_80A7A18: @ 80A7A18 movs r0, 0 strh r0, [r4, 0x30] ldrh r5, [r4, 0x2E] - ldr r1, _080A7A84 @ =gUnknown_20375F8 + ldr r1, _080A7A84 @ =gPlttBufferFaded adds r0, r5, 0 adds r0, 0x8 lsls r0, 1 @@ -11457,7 +11457,7 @@ _080A7A7C: pop {r0} bx r0 .align 2, 0 -_080A7A84: .4byte gUnknown_20375F8 +_080A7A84: .4byte gPlttBufferFaded thumb_func_end sub_80A7A18 thumb_func_start sub_80A7A88 @@ -18331,7 +18331,7 @@ sub_80AAFA4: @ 80AAFA4 adds r0, 0x1 lsls r0, 16 lsrs r5, r0, 16 - ldr r1, _080AB020 @ =gUnknown_20375F8 + ldr r1, _080AB020 @ =gPlttBufferFaded lsls r0, r5, 1 adds r0, r1 ldrh r6, [r0] @@ -18373,7 +18373,7 @@ _080AB016: bx r0 .align 2, 0 _080AB01C: .4byte gTasks -_080AB020: .4byte gUnknown_20375F8 +_080AB020: .4byte gPlttBufferFaded thumb_func_end sub_80AAFA4 thumb_func_start sub_80AB024 @@ -19110,7 +19110,7 @@ sub_80AB5C8: @ 80AB5C8 asrs r0, 16 cmp r0, 0x4 bne _080AB65C - ldr r1, _080AB700 @ =gUnknown_20375F8 + ldr r1, _080AB700 @ =gPlttBufferFaded mov r0, sp ldrb r0, [r0, 0x8] lsls r0, 4 @@ -19236,7 +19236,7 @@ _080AB6EC: _080AB6F4: .4byte gUnknown_2022978 _080AB6F8: .4byte gUnknown_202297A _080AB6FC: .4byte gTasks -_080AB700: .4byte gUnknown_20375F8 +_080AB700: .4byte gPlttBufferFaded _080AB704: .4byte sub_80AB708 thumb_func_end sub_80AB5C8 @@ -32037,7 +32037,7 @@ sub_80B198C: @ 80B198C movs r0, 0 strh r0, [r3, 0x1C] ldrb r0, [r3, 0xC] - ldr r2, _080B1A10 @ =gUnknown_20375F8 + ldr r2, _080B1A10 @ =gPlttBufferFaded lsls r0, 4 movs r3, 0x84 lsls r3, 1 @@ -32083,7 +32083,7 @@ _080B1A04: bx r0 .align 2, 0 _080B1A0C: .4byte gTasks -_080B1A10: .4byte gUnknown_20375F8 +_080B1A10: .4byte gPlttBufferFaded _080B1A14: .4byte 0x00000107 _080B1A18: .4byte 0x00000101 thumb_func_end sub_80B198C @@ -35026,7 +35026,7 @@ sub_80B3044: @ 80B3044 movs r0, 0 strh r0, [r3, 0x30] ldrh r4, [r3, 0x2E] - ldr r1, _080B30A8 @ =gUnknown_20375F8 + ldr r1, _080B30A8 @ =gPlttBufferFaded adds r0, r4, 0 adds r0, 0x8 lsls r0, 1 @@ -35067,7 +35067,7 @@ _080B30A2: pop {r0} bx r0 .align 2, 0 -_080B30A8: .4byte gUnknown_20375F8 +_080B30A8: .4byte gPlttBufferFaded _080B30AC: .4byte sub_80B30B0 thumb_func_end sub_80B3044 @@ -40643,12 +40643,12 @@ _080B5C2C: movs r2, 0x10 ldrsh r0, [r5, r2] lsls r0, 1 - ldr r1, _080B5C60 @ =gUnknown_20371F8 + ldr r1, _080B5C60 @ =gPlttBufferUnfaded adds r0, r1 movs r2, 0x24 ldrsh r1, [r5, r2] lsls r1, 1 - ldr r2, _080B5C64 @ =gUnknown_20375F8 + ldr r2, _080B5C64 @ =gPlttBufferFaded adds r1, r2 ldr r2, _080B5C68 @ =0x04000008 bl CpuSet @@ -40659,8 +40659,8 @@ _080B5C2C: bl BlendPalette b _080B5D22 .align 2, 0 -_080B5C60: .4byte gUnknown_20371F8 -_080B5C64: .4byte gUnknown_20375F8 +_080B5C60: .4byte gPlttBufferUnfaded +_080B5C64: .4byte gPlttBufferFaded _080B5C68: .4byte 0x04000008 _080B5C6C: .4byte 0x00003c0d _080B5C70: @@ -52261,7 +52261,7 @@ _080BB79A: adds r0, 0x10 cmp r2, r0 bge _080BB7C6 - ldr r1, _080BB7D8 @ =gUnknown_20375F8 + ldr r1, _080BB7D8 @ =gPlttBufferFaded adds r3, r0, 0 _080BB7B6: lsls r0, r2, 1 @@ -52282,7 +52282,7 @@ _080BB7C6: pop {r0} bx r0 .align 2, 0 -_080BB7D8: .4byte gUnknown_20375F8 +_080BB7D8: .4byte gPlttBufferFaded thumb_func_end sub_80BB790 thumb_func_start sub_80BB7DC @@ -53173,7 +53173,7 @@ _080BBEC8: lsls r0, 5 adds r0, r1 lsls r1, r4, 5 - ldr r2, _080BBF04 @ =gUnknown_20371F8 + ldr r2, _080BBF04 @ =gPlttBufferUnfaded adds r1, r2 movs r2, 0x20 bl memcpy @@ -53187,7 +53187,7 @@ _080BBEC8: _080BBEF8: .4byte gUnknown_2037F1B _080BBEFC: .4byte gUnknown_202401C _080BBF00: .4byte gUnknown_2037F02 -_080BBF04: .4byte gUnknown_20371F8 +_080BBF04: .4byte gPlttBufferUnfaded thumb_func_end sub_80BBE6C thumb_func_start sub_80BBF08 @@ -53243,7 +53243,7 @@ _080BBF5E: adds r4, 0x10 _080BBF64: lsls r0, r4, 5 - ldr r1, _080BBF98 @ =gUnknown_20371F8 + ldr r1, _080BBF98 @ =gPlttBufferUnfaded adds r0, r1 ldr r1, _080BBF9C @ =gUnknown_202401C ldr r2, [r1] @@ -53266,7 +53266,7 @@ _080BBF64: bx r0 .align 2, 0 _080BBF94: .4byte gUnknown_2037F1B -_080BBF98: .4byte gUnknown_20371F8 +_080BBF98: .4byte gPlttBufferUnfaded _080BBF9C: .4byte gUnknown_202401C _080BBFA0: .4byte gUnknown_2037F02 thumb_func_end sub_80BBF08 @@ -53324,9 +53324,9 @@ _080BBFFA: adds r4, 0x10 _080BC000: lsls r1, r4, 5 - ldr r0, _080BC024 @ =gUnknown_20371F8 + ldr r0, _080BC024 @ =gPlttBufferUnfaded adds r0, r1, r0 - ldr r2, _080BC028 @ =gUnknown_20375F8 + ldr r2, _080BC028 @ =gPlttBufferFaded adds r1, r2 movs r2, 0x20 bl memcpy @@ -53338,8 +53338,8 @@ _080BC000: bx r0 .align 2, 0 _080BC020: .4byte gUnknown_2037F1B -_080BC024: .4byte gUnknown_20371F8 -_080BC028: .4byte gUnknown_20375F8 +_080BC024: .4byte gPlttBufferUnfaded +_080BC028: .4byte gPlttBufferFaded thumb_func_end sub_80BBFA4 thumb_func_start sub_80BC02C diff --git a/asm/battle_anim_80DE2C0.s b/asm/battle_anim_80DE2C0.s index b80374308..f1e73503a 100644 --- a/asm/battle_anim_80DE2C0.s +++ b/asm/battle_anim_80DE2C0.s @@ -606,7 +606,7 @@ sub_80DE718: @ 80DE718 asrs r0, 16 cmp r0, 0x4 bne _080DE788 - ldr r0, _080DE7A8 @ =gUnknown_20375F8 + ldr r0, _080DE7A8 @ =gPlttBufferFaded lsls r2, r6, 4 adds r1, r2, 0 adds r1, 0xB @@ -658,7 +658,7 @@ _080DE798: bx r0 .align 2, 0 _080DE7A4: .4byte gTasks -_080DE7A8: .4byte gUnknown_20375F8 +_080DE7A8: .4byte gPlttBufferFaded _080DE7AC: .4byte gUnknown_2037F02 _080DE7B0: .4byte 0x0000ffff thumb_func_end sub_80DE718 @@ -711,7 +711,7 @@ sub_80DE7DC: @ 80DE7DC asrs r0, 16 cmp r0, 0x4 bne _080DE87E - ldr r0, _080DE8A0 @ =gUnknown_20375F8 + ldr r0, _080DE8A0 @ =gPlttBufferFaded lsls r2, r7, 4 adds r1, r2, 0 adds r1, 0xB @@ -722,7 +722,7 @@ sub_80DE7DC: @ 80DE7DC mov r10, r3 mov r9, r0 adds r5, r2, 0 - ldr r2, _080DE8A4 @ =gUnknown_20371F8 + ldr r2, _080DE8A4 @ =gPlttBufferUnfaded mov r12, r2 lsls r0, r7, 5 add r0, r9 @@ -787,8 +787,8 @@ _080DE88E: bx r0 .align 2, 0 _080DE89C: .4byte gTasks -_080DE8A0: .4byte gUnknown_20375F8 -_080DE8A4: .4byte gUnknown_20371F8 +_080DE8A0: .4byte gPlttBufferFaded +_080DE8A4: .4byte gPlttBufferUnfaded _080DE8A8: .4byte gUnknown_2037F02 _080DE8AC: .4byte 0x0000ffff thumb_func_end sub_80DE7DC diff --git a/asm/battle_anim_80EEC0C.s b/asm/battle_anim_80EEC0C.s index f79c453b6..5c0ba14b7 100644 --- a/asm/battle_anim_80EEC0C.s +++ b/asm/battle_anim_80EEC0C.s @@ -495,7 +495,7 @@ sub_80EEFC8: @ 80EEFC8 lsls r4, 4 orrs r4, r3 lsls r0, 1 - ldr r1, _080EF0B0 @ =gUnknown_20371F8 + ldr r1, _080EF0B0 @ =gPlttBufferUnfaded mov r8, r1 add r0, r8 mov r2, r9 @@ -557,7 +557,7 @@ _080EF0A0: .4byte gUnknown_3004FF0 _080EF0A4: .4byte gSprites _080EF0A8: .4byte 0x0000d709 _080EF0AC: .4byte 0x0000d70a -_080EF0B0: .4byte gUnknown_20371F8 +_080EF0B0: .4byte gPlttBufferUnfaded thumb_func_end sub_80EEFC8 thumb_func_start sub_80EF0B4 diff --git a/asm/battle_gfx_sfx_util.s b/asm/battle_gfx_sfx_util.s index e56df1923..ab02894c0 100644 --- a/asm/battle_gfx_sfx_util.s +++ b/asm/battle_gfx_sfx_util.s @@ -854,9 +854,9 @@ _0803443C: movs r2, 0x6 bl BlendPalette lsls r1, r7, 1 - ldr r0, _0803448C @ =gUnknown_20375F8 + ldr r0, _0803448C @ =gPlttBufferFaded adds r0, r1, r0 - ldr r2, _08034490 @ =gUnknown_20371F8 + ldr r2, _08034490 @ =gPlttBufferUnfaded adds r1, r2 ldr r2, _08034494 @ =0x04000008 bl CpuSet @@ -875,8 +875,8 @@ _0803447C: .4byte gBattleStruct _08034480: .4byte gUnknown_2024024 _08034484: .4byte gUnknown_2024018 _08034488: .4byte 0x00007fff -_0803448C: .4byte gUnknown_20375F8 -_08034490: .4byte gUnknown_20371F8 +_0803448C: .4byte gPlttBufferFaded +_08034490: .4byte gPlttBufferUnfaded _08034494: .4byte 0x04000008 thumb_func_end BattleLoadOpponentMonSpriteGfx @@ -1059,9 +1059,9 @@ _080345FC: movs r2, 0x6 bl BlendPalette lsls r1, r7, 1 - ldr r0, _0803464C @ =gUnknown_20375F8 + ldr r0, _0803464C @ =gPlttBufferFaded adds r0, r1, r0 - ldr r2, _08034650 @ =gUnknown_20371F8 + ldr r2, _08034650 @ =gPlttBufferUnfaded adds r1, r2 ldr r2, _08034654 @ =0x04000008 bl CpuSet @@ -1080,8 +1080,8 @@ _0803463C: .4byte gBattleStruct _08034640: .4byte gUnknown_2024024 _08034644: .4byte gUnknown_2024018 _08034648: .4byte 0x00007fff -_0803464C: .4byte gUnknown_20375F8 -_08034650: .4byte gUnknown_20371F8 +_0803464C: .4byte gPlttBufferFaded +_08034650: .4byte gPlttBufferUnfaded _08034654: .4byte 0x04000008 thumb_func_end sub_8034498 @@ -2029,9 +2029,9 @@ _08034D88: bl BlendPalette mov r3, r10 lsls r1, r3, 1 - ldr r0, _08034E40 @ =gUnknown_20375F8 + ldr r0, _08034E40 @ =gPlttBufferFaded adds r0, r1, r0 - ldr r2, _08034E44 @ =gUnknown_20371F8 + ldr r2, _08034E44 @ =gPlttBufferUnfaded adds r1, r2 ldr r2, _08034E48 @ =0x04000008 bl CpuSet @@ -2054,8 +2054,8 @@ _08034E30: .4byte gUnknown_2024018 _08034E34: .4byte gBattleStruct _08034E38: .4byte gUnknown_2024024 _08034E3C: .4byte 0x00007fff -_08034E40: .4byte gUnknown_20375F8 -_08034E44: .4byte gUnknown_20371F8 +_08034E40: .4byte gPlttBufferFaded +_08034E44: .4byte gPlttBufferUnfaded _08034E48: .4byte 0x04000008 _08034E4C: mov r0, r9 @@ -2263,9 +2263,9 @@ _08034FFC: bl BlendPalette mov r2, r10 lsls r1, r2, 1 - ldr r0, _080350AC @ =gUnknown_20375F8 + ldr r0, _080350AC @ =gPlttBufferFaded adds r0, r1, r0 - ldr r2, _080350B0 @ =gUnknown_20371F8 + ldr r2, _080350B0 @ =gPlttBufferUnfaded adds r1, r2 ldr r2, _080350B4 @ =0x04000008 bl CpuSet @@ -2327,8 +2327,8 @@ _0803509C: .4byte 0x00000181 _080350A0: .4byte gBattleStruct _080350A4: .4byte gUnknown_2024024 _080350A8: .4byte 0x00007fff -_080350AC: .4byte gUnknown_20375F8 -_080350B0: .4byte gUnknown_20371F8 +_080350AC: .4byte gPlttBufferFaded +_080350B0: .4byte gPlttBufferUnfaded _080350B4: .4byte 0x04000008 _080350B8: .4byte gUnknown_2024018 thumb_func_end sub_8034BF4 diff --git a/asm/battle_message.s b/asm/battle_message.s index 9a9ca1f2f..042b130b0 100644 --- a/asm/battle_message.s +++ b/asm/battle_message.s @@ -2958,7 +2958,7 @@ SetPpNumbersPaletteInMoveSelection: @ 80D89DC ldrb r1, [r1] bl GetCurrentPpToMaxPpState lsls r0, 24 - ldr r5, _080D8A48 @ =gUnknown_20371F8 + ldr r5, _080D8A48 @ =gPlttBufferUnfaded lsrs r0, 22 adds r0, r4 ldrh r1, [r0] @@ -2986,7 +2986,7 @@ _080D8A38: .4byte gActiveBattler _080D8A3C: .4byte gUnknown_2022BC8 _080D8A40: .4byte gUnknown_8D2FBB4 _080D8A44: .4byte gUnknown_2023FFC -_080D8A48: .4byte gUnknown_20371F8 +_080D8A48: .4byte gPlttBufferUnfaded _080D8A4C: .4byte gUnknown_20376B0 thumb_func_end SetPpNumbersPaletteInMoveSelection diff --git a/asm/battle_script_commands.s b/asm/battle_script_commands.s index 58e7a405b..5d411bc70 100644 --- a/asm/battle_script_commands.s +++ b/asm/battle_script_commands.s @@ -32539,7 +32539,7 @@ _0802DAE0: bl sub_810C1CC str r4, [sp, 0x14] add r0, sp, 0x14 - ldr r1, _0802DB48 @ =gUnknown_20375F8 + ldr r1, _0802DB48 @ =gPlttBufferFaded ldr r2, _0802DB4C @ =0x05000080 bl CpuSet ldr r0, _0802DB50 @ =0x0001ffff @@ -32562,7 +32562,7 @@ _0802DB36: .align 2, 0 _0802DB40: .4byte gBattleMons _0802DB44: .4byte 0x0000ffff -_0802DB48: .4byte gUnknown_20375F8 +_0802DB48: .4byte gPlttBufferFaded _0802DB4C: .4byte 0x05000080 _0802DB50: .4byte 0x0001ffff _0802DB54: .4byte gUnknown_2023E82 diff --git a/asm/battle_transition.s b/asm/battle_transition.s index d3128f656..3d56e8fbc 100644 --- a/asm/battle_transition.s +++ b/asm/battle_transition.s @@ -138,8 +138,8 @@ Transition_Phase1: @ 80D09B0 push {r4,lr} adds r4, r0, 0 bl sub_807B05C - ldr r0, _080D09DC @ =gUnknown_20375F8 - ldr r1, _080D09E0 @ =gUnknown_20371F8 + ldr r0, _080D09DC @ =gPlttBufferFaded + ldr r1, _080D09E0 @ =gPlttBufferUnfaded ldr r2, _080D09E4 @ =0x04000100 bl CpuSet ldr r1, _080D09E8 @ =gUnknown_83FA320 @@ -155,8 +155,8 @@ Transition_Phase1: @ 80D09B0 movs r0, 0x1 b _080D09FA .align 2, 0 -_080D09DC: .4byte gUnknown_20375F8 -_080D09E0: .4byte gUnknown_20371F8 +_080D09DC: .4byte gPlttBufferFaded +_080D09E0: .4byte gPlttBufferUnfaded _080D09E4: .4byte 0x04000100 _080D09E8: .4byte gUnknown_83FA320 _080D09EC: diff --git a/asm/blend_palette.s b/asm/blend_palette.s index 5ef3cf070..7c95f18e9 100644 --- a/asm/blend_palette.s +++ b/asm/blend_palette.s @@ -26,9 +26,9 @@ BlendPalette: @ 8045274 movs r6, 0 cmp r6, r12 bcs _080452FA - ldr r0, _0804530C @ =gUnknown_20371F8 + ldr r0, _0804530C @ =gPlttBufferUnfaded mov r10, r0 - ldr r1, _08045310 @ =gUnknown_20375F8 + ldr r1, _08045310 @ =gPlttBufferFaded mov r9, r1 _080452A2: mov r0, r8 @@ -85,8 +85,8 @@ _080452FA: pop {r0} bx r0 .align 2, 0 -_0804530C: .4byte gUnknown_20371F8 -_08045310: .4byte gUnknown_20375F8 +_0804530C: .4byte gPlttBufferUnfaded +_08045310: .4byte gPlttBufferFaded thumb_func_end BlendPalette thumb_func_start sub_8045314 diff --git a/asm/credits.s b/asm/credits.s index af08d608f..bf8c5eeac 100644 --- a/asm/credits.s +++ b/asm/credits.s @@ -242,13 +242,13 @@ _080F3B5E: bl sub_80F3AA4 movs r0, 0xF0 bl sub_80F77CC - ldr r0, _080F3BC8 @ =gUnknown_20371F8 + ldr r0, _080F3BC8 @ =gPlttBufferUnfaded movs r2, 0xFF lsls r2, 1 adds r0, r2 movs r1, 0 strh r1, [r0] - ldr r0, _080F3BCC @ =gUnknown_20375F8 + ldr r0, _080F3BCC @ =gPlttBufferFaded adds r0, r2 strh r1, [r0] movs r0, 0x1 @@ -261,8 +261,8 @@ _080F3BB8: .4byte gUnknown_2031DD8 _080F3BBC: .4byte gUnknown_203AB40 _080F3BC0: .4byte gUnknown_8414588 _080F3BC4: .4byte 0x0000247c -_080F3BC8: .4byte gUnknown_20371F8 -_080F3BCC: .4byte gUnknown_20375F8 +_080F3BC8: .4byte gPlttBufferUnfaded +_080F3BCC: .4byte gPlttBufferFaded thumb_func_end sub_80F3B2C thumb_func_start sub_80F3BD0 @@ -326,13 +326,13 @@ _080F3C64: bl sub_80F3AC4 movs r0, 0xF0 bl sub_80F77CC - ldr r0, _080F3C8C @ =gUnknown_20371F8 + ldr r0, _080F3C8C @ =gPlttBufferUnfaded movs r2, 0xFF lsls r2, 1 adds r0, r2 movs r1, 0 strh r1, [r0] - ldr r0, _080F3C90 @ =gUnknown_20375F8 + ldr r0, _080F3C90 @ =gPlttBufferFaded adds r0, r2 strh r1, [r0] ldr r0, _080F3C94 @ =gUnknown_203AB40 @@ -340,8 +340,8 @@ _080F3C64: movs r0, 0x2 b _080F413C .align 2, 0 -_080F3C8C: .4byte gUnknown_20371F8 -_080F3C90: .4byte gUnknown_20375F8 +_080F3C8C: .4byte gPlttBufferUnfaded +_080F3C90: .4byte gPlttBufferFaded _080F3C94: .4byte gUnknown_203AB40 _080F3C98: movs r0, 0x44 diff --git a/asm/field_effect.s b/asm/field_effect.s index de1776e9d..502c36b00 100644 --- a/asm/field_effect.s +++ b/asm/field_effect.s @@ -218,38 +218,38 @@ _080835B4: .4byte gUnknown_2036E28 _080835B8: adds r4, 0x10 lsls r0, r4, 5 - ldr r1, _080835C8 @ =gUnknown_20371F8 + ldr r1, _080835C8 @ =gPlttBufferUnfaded adds r0, r1 movs r1, 0x10 bl TintPalette_GrayScale b _080835F6 .align 2, 0 -_080835C8: .4byte gUnknown_20371F8 +_080835C8: .4byte gPlttBufferUnfaded _080835CC: adds r4, 0x10 lsls r0, r4, 5 - ldr r1, _080835DC @ =gUnknown_20371F8 + ldr r1, _080835DC @ =gPlttBufferUnfaded adds r0, r1 movs r1, 0x10 bl TintPalette_SepiaTone b _080835F6 .align 2, 0 -_080835DC: .4byte gUnknown_20371F8 +_080835DC: .4byte gPlttBufferUnfaded _080835E0: adds r4, 0x10 lsls r0, r4, 4 movs r1, 0x10 bl sub_8111F38 lsls r0, r4, 5 - ldr r1, _0808360C @ =gUnknown_20371F8 + ldr r1, _0808360C @ =gPlttBufferUnfaded adds r0, r1 movs r1, 0x10 bl TintPalette_GrayScale _080835F6: lsls r1, r4, 5 - ldr r0, _0808360C @ =gUnknown_20371F8 + ldr r0, _0808360C @ =gPlttBufferUnfaded adds r0, r1, r0 - ldr r2, _08083610 @ =gUnknown_20375F8 + ldr r2, _08083610 @ =gPlttBufferFaded adds r1, r2 movs r2, 0x8 bl CpuFastSet @@ -258,8 +258,8 @@ _08083606: pop {r0} bx r0 .align 2, 0 -_0808360C: .4byte gUnknown_20371F8 -_08083610: .4byte gUnknown_20375F8 +_0808360C: .4byte gPlttBufferUnfaded +_08083610: .4byte gPlttBufferFaded thumb_func_end sub_8083598 thumb_func_start sub_8083614 @@ -873,7 +873,7 @@ MultiplyInvertedPaletteRGBComponents: @ 8083A88 lsrs r2, 24 lsls r3, 24 lsrs r3, 24 - ldr r4, _08083B0C @ =gUnknown_20371F8 + ldr r4, _08083B0C @ =gPlttBufferUnfaded lsrs r0, 15 adds r4, r0, r4 ldrh r4, [r4] @@ -918,7 +918,7 @@ MultiplyInvertedPaletteRGBComponents: @ 8083A88 lsls r4, 26 orrs r4, r6 lsrs r4, 16 - ldr r1, _08083B10 @ =gUnknown_20375F8 + ldr r1, _08083B10 @ =gPlttBufferFaded adds r0, r1 strh r4, [r0] pop {r3,r4} @@ -928,8 +928,8 @@ MultiplyInvertedPaletteRGBComponents: @ 8083A88 pop {r0} bx r0 .align 2, 0 -_08083B0C: .4byte gUnknown_20371F8 -_08083B10: .4byte gUnknown_20375F8 +_08083B0C: .4byte gPlttBufferUnfaded +_08083B10: .4byte gPlttBufferFaded thumb_func_end MultiplyInvertedPaletteRGBComponents thumb_func_start MultiplyPaletteRGBComponents @@ -944,7 +944,7 @@ MultiplyPaletteRGBComponents: @ 8083B14 lsrs r2, 24 lsls r3, 24 lsrs r3, 24 - ldr r4, _08083B84 @ =gUnknown_20371F8 + ldr r4, _08083B84 @ =gPlttBufferUnfaded lsrs r0, 15 adds r4, r0, r4 ldrh r4, [r4] @@ -981,7 +981,7 @@ MultiplyPaletteRGBComponents: @ 8083B14 lsls r4, 26 orrs r4, r5 lsrs r4, 16 - ldr r1, _08083B88 @ =gUnknown_20375F8 + ldr r1, _08083B88 @ =gPlttBufferFaded adds r0, r1 strh r4, [r0] pop {r3} @@ -990,8 +990,8 @@ MultiplyPaletteRGBComponents: @ 8083B14 pop {r0} bx r0 .align 2, 0 -_08083B84: .4byte gUnknown_20371F8 -_08083B88: .4byte gUnknown_20375F8 +_08083B84: .4byte gPlttBufferUnfaded +_08083B88: .4byte gPlttBufferFaded thumb_func_end MultiplyPaletteRGBComponents thumb_func_start sub_8083B8C diff --git a/asm/field_fadetransition.s b/asm/field_fadetransition.s index b9a31bee4..6f1e42f48 100644 --- a/asm/field_fadetransition.s +++ b/asm/field_fadetransition.s @@ -11,7 +11,7 @@ palette_bg_faded_fill_white: @ 807DB14 sub sp, 0x4 ldr r0, _0807DB2C @ =0x7fff7fff str r0, [sp] - ldr r1, _0807DB30 @ =gUnknown_20375F8 + ldr r1, _0807DB30 @ =gPlttBufferFaded ldr r2, _0807DB34 @ =0x01000100 mov r0, sp bl CpuFastSet @@ -20,7 +20,7 @@ palette_bg_faded_fill_white: @ 807DB14 bx r0 .align 2, 0 _0807DB2C: .4byte 0x7fff7fff -_0807DB30: .4byte gUnknown_20375F8 +_0807DB30: .4byte gPlttBufferFaded _0807DB34: .4byte 0x01000100 thumb_func_end palette_bg_faded_fill_white @@ -30,7 +30,7 @@ palette_bg_faded_fill_black: @ 807DB38 sub sp, 0x4 movs r0, 0 str r0, [sp] - ldr r1, _0807DB50 @ =gUnknown_20375F8 + ldr r1, _0807DB50 @ =gPlttBufferFaded ldr r2, _0807DB54 @ =0x01000100 mov r0, sp bl CpuFastSet @@ -38,7 +38,7 @@ palette_bg_faded_fill_black: @ 807DB38 pop {r0} bx r0 .align 2, 0 -_0807DB50: .4byte gUnknown_20375F8 +_0807DB50: .4byte gPlttBufferFaded _0807DB54: .4byte 0x01000100 thumb_func_end palette_bg_faded_fill_black diff --git a/asm/field_weather.s b/asm/field_weather.s index 608f03109..36f7941c7 100644 --- a/asm/field_weather.s +++ b/asm/field_weather.s @@ -889,9 +889,9 @@ _0807A2CE: cmp r0, 0 bne _0807A30C lsls r1, r6, 1 - ldr r0, _0807A304 @ =gUnknown_20371F8 + ldr r0, _0807A304 @ =gPlttBufferUnfaded adds r0, r1, r0 - ldr r2, _0807A308 @ =gUnknown_20375F8 + ldr r2, _0807A308 @ =gPlttBufferFaded adds r1, r2 movs r2, 0x8 bl CpuFastSet @@ -907,8 +907,8 @@ _0807A2CE: b _0807A38A .align 2, 0 _0807A300: .4byte gUnknown_20386A4 -_0807A304: .4byte gUnknown_20371F8 -_0807A308: .4byte gUnknown_20375F8 +_0807A304: .4byte gPlttBufferUnfaded +_0807A308: .4byte gPlttBufferFaded _0807A30C: cmp r0, 0x2 beq _0807A320 @@ -940,12 +940,12 @@ _0807A336: mov r8, r3 adds r4, 0x1 mov r12, r4 - ldr r0, _0807A398 @ =gUnknown_20375F8 + ldr r0, _0807A398 @ =gPlttBufferFaded mov r10, r0 _0807A34A: adds r2, r6, 0 lsls r0, r2, 1 - ldr r1, _0807A39C @ =gUnknown_20371F8 + ldr r1, _0807A39C @ =gPlttBufferUnfaded adds r0, r1 ldr r1, [r0] lsls r0, r1, 27 @@ -983,15 +983,15 @@ _0807A38A: bcc _0807A2CE b _0807A3B6 .align 2, 0 -_0807A398: .4byte gUnknown_20375F8 -_0807A39C: .4byte gUnknown_20371F8 +_0807A398: .4byte gPlttBufferFaded +_0807A39C: .4byte gPlttBufferUnfaded _0807A3A0: cmp r0, 0 blt _0807A3B6 lsls r1, r4, 5 - ldr r0, _0807A3C8 @ =gUnknown_20371F8 + ldr r0, _0807A3C8 @ =gPlttBufferUnfaded adds r0, r1, r0 - ldr r2, _0807A3CC @ =gUnknown_20375F8 + ldr r2, _0807A3CC @ =gPlttBufferFaded adds r1, r2 mov r3, r9 lsls r2, r3, 3 @@ -1006,8 +1006,8 @@ _0807A3B6: pop {r0} bx r0 .align 2, 0 -_0807A3C8: .4byte gUnknown_20371F8 -_0807A3CC: .4byte gUnknown_20375F8 +_0807A3C8: .4byte gPlttBufferUnfaded +_0807A3CC: .4byte gPlttBufferFaded thumb_func_end sub_807A294 thumb_func_start sub_807A3D0 @@ -1104,7 +1104,7 @@ _0807A472: _0807A47E: adds r4, r6, 0 lsls r0, r4, 1 - ldr r1, _0807A510 @ =gUnknown_20371F8 + ldr r1, _0807A510 @ =gPlttBufferUnfaded adds r0, r1 ldr r1, [r0] lsls r0, r1, 27 @@ -1148,7 +1148,7 @@ _0807A47E: lsls r0, 16 lsrs r6, r0, 16 lsls r4, 1 - ldr r0, _0807A514 @ =gUnknown_20375F8 + ldr r0, _0807A514 @ =gPlttBufferFaded adds r4, r0 lsrs r1, 14 lsrs r2, 19 @@ -1177,8 +1177,8 @@ _0807A4FC: bx r0 .align 2, 0 _0807A50C: .4byte gUnknown_2038394 -_0807A510: .4byte gUnknown_20371F8 -_0807A514: .4byte gUnknown_20375F8 +_0807A510: .4byte gPlttBufferUnfaded +_0807A514: .4byte gPlttBufferFaded thumb_func_end sub_807A3D0 thumb_func_start sub_807A518 @@ -1231,12 +1231,12 @@ _0807A570: movs r7, 0 adds r4, 0x1 mov r12, r4 - ldr r0, _0807A5F0 @ =gUnknown_20375F8 + ldr r0, _0807A5F0 @ =gPlttBufferFaded mov r9, r0 _0807A57A: adds r4, r5, 0 lsls r0, r4, 1 - ldr r1, _0807A5F4 @ =gUnknown_20371F8 + ldr r1, _0807A5F4 @ =gPlttBufferUnfaded adds r0, r1 ldr r1, [r0] lsls r3, r1, 27 @@ -1294,8 +1294,8 @@ _0807A5D4: pop {r0} bx r0 .align 2, 0 -_0807A5F0: .4byte gUnknown_20375F8 -_0807A5F4: .4byte gUnknown_20371F8 +_0807A5F0: .4byte gPlttBufferFaded +_0807A5F4: .4byte gPlttBufferUnfaded thumb_func_end sub_807A518 thumb_func_start sub_807A5F8 @@ -1349,7 +1349,7 @@ _0807A634: mov r8, r0 _0807A658: lsls r5, r6, 1 - ldr r0, _0807A6DC @ =gUnknown_20371F8 + ldr r0, _0807A6DC @ =gPlttBufferUnfaded adds r0, r5, r0 ldr r2, [r0] lsls r4, r2, 27 @@ -1401,7 +1401,7 @@ _0807A658: asrs r0, 4 adds r2, r0 lsls r2, 24 - ldr r0, _0807A6E0 @ =gUnknown_20375F8 + ldr r0, _0807A6E0 @ =gPlttBufferFaded adds r5, r0 lsrs r2, 14 lsrs r3, 19 @@ -1415,8 +1415,8 @@ _0807A658: bcc _0807A658 b _0807A6F8 .align 2, 0 -_0807A6DC: .4byte gUnknown_20371F8 -_0807A6E0: .4byte gUnknown_20375F8 +_0807A6DC: .4byte gPlttBufferUnfaded +_0807A6E0: .4byte gPlttBufferFaded _0807A6E4: lsls r0, r4, 20 lsrs r0, 16 @@ -1650,8 +1650,8 @@ _0807A882: beq _0807A8C4 cmp r2, 0 beq _0807A896 - ldr r0, _0807A8B4 @ =gUnknown_20375F8 - ldr r1, _0807A8B8 @ =gUnknown_20371F8 + ldr r0, _0807A8B4 @ =gPlttBufferFaded + ldr r1, _0807A8B8 @ =gPlttBufferUnfaded movs r2, 0x80 lsls r2, 1 bl CpuFastSet @@ -1671,8 +1671,8 @@ _0807A896: strb r1, [r0] b _0807A92C .align 2, 0 -_0807A8B4: .4byte gUnknown_20375F8 -_0807A8B8: .4byte gUnknown_20371F8 +_0807A8B4: .4byte gPlttBufferFaded +_0807A8B8: .4byte gPlttBufferUnfaded _0807A8BC: .4byte gUnknown_2037F34 _0807A8C0: .4byte 0x000006c6 _0807A8C4: @@ -1804,8 +1804,8 @@ _0807A9AE: beq _0807A9F0 cmp r2, 0 beq _0807A9C2 - ldr r0, _0807A9E0 @ =gUnknown_20375F8 - ldr r1, _0807A9E4 @ =gUnknown_20371F8 + ldr r0, _0807A9E0 @ =gPlttBufferFaded + ldr r1, _0807A9E4 @ =gPlttBufferUnfaded movs r2, 0x80 lsls r2, 1 bl CpuFastSet @@ -1824,8 +1824,8 @@ _0807A9C2: strb r1, [r0] b _0807AA56 .align 2, 0 -_0807A9E0: .4byte gUnknown_20375F8 -_0807A9E4: .4byte gUnknown_20371F8 +_0807A9E0: .4byte gPlttBufferFaded +_0807A9E4: .4byte gPlttBufferUnfaded _0807A9E8: .4byte gUnknown_2037F34 _0807A9EC: .4byte 0x000006c6 _0807A9F0: @@ -1959,7 +1959,7 @@ _0807AAF0: lsls r0, r4, 20 lsrs r4, r0, 16 movs r2, 0 - ldr r6, _0807AB18 @ =gUnknown_20375F8 + ldr r6, _0807AB18 @ =gPlttBufferFaded ldr r0, _0807AB1C @ =0x000006c4 adds r3, r5, r0 _0807AAFC: @@ -1976,15 +1976,15 @@ _0807AAFC: b _0807AB68 .align 2, 0 _0807AB14: .4byte 0x000006ca -_0807AB18: .4byte gUnknown_20375F8 +_0807AB18: .4byte gPlttBufferFaded _0807AB1C: .4byte 0x000006c4 _0807AB20: lsls r0, r4, 20 lsrs r4, r0, 16 lsls r1, r4, 1 - ldr r0, _0807AB4C @ =gUnknown_20375F8 + ldr r0, _0807AB4C @ =gPlttBufferFaded adds r0, r1, r0 - ldr r2, _0807AB50 @ =gUnknown_20371F8 + ldr r2, _0807AB50 @ =gPlttBufferUnfaded adds r1, r2 movs r2, 0x8 bl CpuFastSet @@ -2000,8 +2000,8 @@ _0807AB20: bl BlendPalette b _0807AB68 .align 2, 0 -_0807AB4C: .4byte gUnknown_20375F8 -_0807AB50: .4byte gUnknown_20371F8 +_0807AB4C: .4byte gPlttBufferFaded +_0807AB50: .4byte gPlttBufferUnfaded _0807AB54: .4byte gPaletteFade _0807AB58: lsls r0, r4, 20 diff --git a/asm/fieldmap.s b/asm/fieldmap.s index f78a4df9b..8be48d4c5 100644 --- a/asm/fieldmap.s +++ b/asm/fieldmap.s @@ -2125,35 +2125,35 @@ sub_80598CC: @ 80598CC _080598EC: .4byte gUnknown_2036E28 _080598F0: lsls r4, 1 - ldr r0, _08059900 @ =gUnknown_20371F8 + ldr r0, _08059900 @ =gPlttBufferUnfaded adds r0, r4, r0 adds r1, r5, 0 bl TintPalette_GrayScale b _0805992C .align 2, 0 -_08059900: .4byte gUnknown_20371F8 +_08059900: .4byte gPlttBufferUnfaded _08059904: lsls r4, 1 - ldr r0, _08059914 @ =gUnknown_20371F8 + ldr r0, _08059914 @ =gPlttBufferUnfaded adds r0, r4, r0 adds r1, r5, 0 bl TintPalette_SepiaTone b _0805992C .align 2, 0 -_08059914: .4byte gUnknown_20371F8 +_08059914: .4byte gPlttBufferUnfaded _08059918: adds r0, r4, 0 adds r1, r5, 0 bl sub_8111F38 lsls r4, 1 - ldr r0, _08059940 @ =gUnknown_20371F8 + ldr r0, _08059940 @ =gPlttBufferUnfaded adds r0, r4, r0 adds r1, r5, 0 bl TintPalette_GrayScale _0805992C: - ldr r0, _08059940 @ =gUnknown_20371F8 + ldr r0, _08059940 @ =gPlttBufferUnfaded adds r0, r4, r0 - ldr r1, _08059944 @ =gUnknown_20375F8 + ldr r1, _08059944 @ =gPlttBufferFaded adds r1, r4, r1 adds r2, r5, 0 bl CpuSet @@ -2162,8 +2162,8 @@ _0805993A: pop {r0} bx r0 .align 2, 0 -_08059940: .4byte gUnknown_20371F8 -_08059944: .4byte gUnknown_20375F8 +_08059940: .4byte gPlttBufferUnfaded +_08059944: .4byte gPlttBufferFaded thumb_func_end sub_80598CC thumb_func_start sub_8059948 @@ -2188,36 +2188,36 @@ sub_8059948: @ 8059948 _08059968: .4byte gUnknown_2036E28 _0805996C: lsls r4, 5 - ldr r0, _0805997C @ =gUnknown_20371F8 + ldr r0, _0805997C @ =gPlttBufferUnfaded adds r0, r4, r0 lsls r1, r6, 4 bl TintPalette_GrayScale b _080599AA .align 2, 0 -_0805997C: .4byte gUnknown_20371F8 +_0805997C: .4byte gPlttBufferUnfaded _08059980: lsls r4, 5 - ldr r0, _08059990 @ =gUnknown_20371F8 + ldr r0, _08059990 @ =gPlttBufferUnfaded adds r0, r4, r0 lsls r1, r6, 4 bl TintPalette_SepiaTone b _080599AA .align 2, 0 -_08059990: .4byte gUnknown_20371F8 +_08059990: .4byte gPlttBufferUnfaded _08059994: lsls r0, r4, 4 lsls r5, r6, 4 adds r1, r5, 0 bl sub_8111F38 lsls r4, 5 - ldr r0, _080599C0 @ =gUnknown_20371F8 + ldr r0, _080599C0 @ =gPlttBufferUnfaded adds r0, r4, r0 adds r1, r5, 0 bl TintPalette_GrayScale _080599AA: - ldr r0, _080599C0 @ =gUnknown_20371F8 + ldr r0, _080599C0 @ =gPlttBufferUnfaded adds r0, r4, r0 - ldr r1, _080599C4 @ =gUnknown_20375F8 + ldr r1, _080599C4 @ =gPlttBufferFaded adds r1, r4, r1 lsls r2, r6, 3 bl CpuFastSet @@ -2226,8 +2226,8 @@ _080599B8: pop {r0} bx r0 .align 2, 0 -_080599C0: .4byte gUnknown_20371F8 -_080599C4: .4byte gUnknown_20375F8 +_080599C0: .4byte gPlttBufferUnfaded +_080599C4: .4byte gPlttBufferFaded thumb_func_end sub_8059948 thumb_func_start apply_map_tileset_palette diff --git a/asm/fldeff_sweetscent.s b/asm/fldeff_sweetscent.s index 6783e1bbb..34a8ee372 100644 --- a/asm/fldeff_sweetscent.s +++ b/asm/fldeff_sweetscent.s @@ -87,13 +87,13 @@ sub_80DE134: @ 80DE134 bl Alloc adds r1, r0, 0 str r1, [r4] - ldr r4, _080DE1BC @ =gUnknown_20371F8 + ldr r4, _080DE1BC @ =gPlttBufferUnfaded movs r5, 0x80 lsls r5, 1 adds r0, r4, 0 adds r2, r5, 0 bl CpuFastSet - ldr r0, _080DE1C0 @ =gUnknown_20375F8 + ldr r0, _080DE1C0 @ =gPlttBufferFaded adds r1, r4, 0 adds r2, r5, 0 bl CpuFastSet @@ -137,8 +137,8 @@ sub_80DE134: @ 80DE134 bx r0 .align 2, 0 _080DE1B8: .4byte gUnknown_203AAB0 -_080DE1BC: .4byte gUnknown_20371F8 -_080DE1C0: .4byte gUnknown_20375F8 +_080DE1BC: .4byte gPlttBufferUnfaded +_080DE1C0: .4byte gPlttBufferFaded _080DE1C4: .4byte gSprites _080DE1C8: .4byte sub_80DE1D0 _080DE1CC: .4byte gTasks @@ -237,7 +237,7 @@ sub_80DE274: @ 80DE274 bne _080DE2AA ldr r4, _080DE2B4 @ =gUnknown_203AAB0 ldr r0, [r4] - ldr r1, _080DE2B8 @ =gUnknown_20371F8 + ldr r1, _080DE2B8 @ =gPlttBufferUnfaded movs r2, 0x80 lsls r2, 1 bl CpuFastSet @@ -255,7 +255,7 @@ _080DE2AA: .align 2, 0 _080DE2B0: .4byte gPaletteFade _080DE2B4: .4byte gUnknown_203AAB0 -_080DE2B8: .4byte gUnknown_20371F8 +_080DE2B8: .4byte gPlttBufferUnfaded _080DE2BC: .4byte gUnknown_81BE564 thumb_func_end sub_80DE274 diff --git a/asm/hall_of_fame.s b/asm/hall_of_fame.s index 1ad8d6f98..ae692a622 100644 --- a/asm/hall_of_fame.s +++ b/asm/hall_of_fame.s @@ -1330,8 +1330,8 @@ Task_Hof_HandlePaletteOnExit: @ 80F283C adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 - ldr r0, _080F287C @ =gUnknown_20375F8 - ldr r1, _080F2880 @ =gUnknown_20371F8 + ldr r0, _080F287C @ =gPlttBufferFaded + ldr r1, _080F2880 @ =gPlttBufferUnfaded movs r2, 0x80 lsls r2, 2 bl CpuSet @@ -1355,8 +1355,8 @@ Task_Hof_HandlePaletteOnExit: @ 80F283C pop {r0} bx r0 .align 2, 0 -_080F287C: .4byte gUnknown_20375F8 -_080F2880: .4byte gUnknown_20371F8 +_080F287C: .4byte gPlttBufferFaded +_080F2880: .4byte gPlttBufferUnfaded _080F2884: .4byte gTasks _080F2888: .4byte Task_Hof_HandleExit thumb_func_end Task_Hof_HandlePaletteOnExit @@ -2256,8 +2256,8 @@ sub_80F2FEC: @ 80F2FEC adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 - ldr r0, _080F3020 @ =gUnknown_20375F8 - ldr r1, _080F3024 @ =gUnknown_20371F8 + ldr r0, _080F3020 @ =gPlttBufferFaded + ldr r1, _080F3024 @ =gPlttBufferUnfaded movs r2, 0x80 lsls r2, 2 bl CpuSet @@ -2276,8 +2276,8 @@ sub_80F2FEC: @ 80F2FEC pop {r0} bx r0 .align 2, 0 -_080F3020: .4byte gUnknown_20375F8 -_080F3024: .4byte gUnknown_20371F8 +_080F3020: .4byte gPlttBufferFaded +_080F3024: .4byte gPlttBufferUnfaded _080F3028: .4byte gTasks _080F302C: .4byte sub_80F3030 thumb_func_end sub_80F2FEC diff --git a/asm/mail.s b/asm/mail.s index bf24fe177..1ecaf17cc 100644 --- a/asm/mail.s +++ b/asm/mail.s @@ -381,7 +381,7 @@ _080BEF28: movs r1, 0xF0 movs r2, 0x20 bl LoadPalette - ldr r6, _080BEFD0 @ =gUnknown_20371F8 + ldr r6, _080BEFD0 @ =gPlttBufferUnfaded ldr r4, _080BEFD4 @ =gUnknown_83EE9C8 ldr r0, _080BEFD8 @ =gUnknown_20399C4 ldr r3, [r0] @@ -396,7 +396,7 @@ _080BEF28: lsls r2, 1 adds r0, r6, r2 strh r1, [r0] - ldr r5, _080BEFDC @ =gUnknown_20375F8 + ldr r5, _080BEFDC @ =gPlttBufferFaded ldrb r1, [r3] lsls r0, r1, 2 adds r0, r1 @@ -458,10 +458,10 @@ _080BEF28: strh r0, [r5, 0x16] b _080BF0F4 .align 2, 0 -_080BEFD0: .4byte gUnknown_20371F8 +_080BEFD0: .4byte gPlttBufferUnfaded _080BEFD4: .4byte gUnknown_83EE9C8 _080BEFD8: .4byte gUnknown_20399C4 -_080BEFDC: .4byte gUnknown_20375F8 +_080BEFDC: .4byte gPlttBufferFaded _080BEFE0: .4byte gUnknown_83EE9C0 _080BEFE4: .4byte gSaveBlock2Ptr _080BEFE8: diff --git a/asm/main_menu.s b/asm/main_menu.s index 3285c29ea..e315c70cf 100644 --- a/asm/main_menu.s +++ b/asm/main_menu.s @@ -988,11 +988,11 @@ _0800CB2E: .align 2, 0 _0800CB44: .4byte gUnknown_2031DE0 _0800CB48: - ldr r0, _0800CB64 @ =gUnknown_20371F8 + ldr r0, _0800CB64 @ =gPlttBufferUnfaded movs r2, 0 movs r1, 0 strh r1, [r0] - ldr r0, _0800CB68 @ =gUnknown_20375F8 + ldr r0, _0800CB68 @ =gPlttBufferFaded strh r1, [r0] ldr r0, _0800CB6C @ =gUnknown_2031DE0 strb r2, [r0] @@ -1001,8 +1001,8 @@ _0800CB48: bl sub_8110F14 b _0800CB84 .align 2, 0 -_0800CB64: .4byte gUnknown_20371F8 -_0800CB68: .4byte gUnknown_20375F8 +_0800CB64: .4byte gPlttBufferUnfaded +_0800CB68: .4byte gPlttBufferFaded _0800CB6C: .4byte gUnknown_2031DE0 _0800CB70: ldr r0, _0800CB8C @ =sub_81422AC diff --git a/asm/naming_screen.s b/asm/naming_screen.s index e8a5cb2c2..bcf7b4772 100644 --- a/asm/naming_screen.s +++ b/asm/naming_screen.s @@ -1648,18 +1648,18 @@ sub_809E6B8: @ 809E6B8 lsrs r0, 24 bl sub_809E644 lsls r0, 16 - ldr r2, _0809E6D8 @ =gUnknown_20375F8 + ldr r2, _0809E6D8 @ =gPlttBufferFaded lsrs r0, 15 adds r2, r0, r2 - ldr r1, _0809E6DC @ =gUnknown_20371F8 + ldr r1, _0809E6DC @ =gPlttBufferUnfaded adds r0, r1 ldrh r0, [r0] strh r0, [r2] pop {r0} bx r0 .align 2, 0 -_0809E6D8: .4byte gUnknown_20375F8 -_0809E6DC: .4byte gUnknown_20371F8 +_0809E6D8: .4byte gPlttBufferFaded +_0809E6DC: .4byte gPlttBufferUnfaded thumb_func_end sub_809E6B8 thumb_func_start sub_809E6E0 diff --git a/asm/oak_speech.s b/asm/oak_speech.s index e20c96638..a44f2fc37 100644 --- a/asm/oak_speech.s +++ b/asm/oak_speech.s @@ -270,10 +270,10 @@ sub_812EB10: @ 812EB10 thumb_func_start sub_812EB2C sub_812EB2C: @ 812EB2C push {lr} - ldr r0, _0812EB48 @ =gUnknown_20371F8 + ldr r0, _0812EB48 @ =gPlttBufferUnfaded movs r1, 0 strh r1, [r0] - ldr r0, _0812EB4C @ =gUnknown_20375F8 + ldr r0, _0812EB4C @ =gPlttBufferFaded strh r1, [r0] ldr r0, _0812EB50 @ =sub_812EB58 bl CreateTask @@ -282,8 +282,8 @@ sub_812EB2C: @ 812EB2C pop {r0} bx r0 .align 2, 0 -_0812EB48: .4byte gUnknown_20371F8 -_0812EB4C: .4byte gUnknown_20375F8 +_0812EB48: .4byte gPlttBufferUnfaded +_0812EB4C: .4byte gPlttBufferFaded _0812EB50: .4byte sub_812EB58 _0812EB54: .4byte sub_812EB10 thumb_func_end sub_812EB2C @@ -4188,9 +4188,9 @@ _08130B4A: cmp r1, 0xE ble _08130B96 movs r2, 0 - ldr r6, _08130BA0 @ =gUnknown_20375F8 + ldr r6, _08130BA0 @ =gPlttBufferFaded adds r3, r7, 0 - ldr r4, _08130BA4 @ =gUnknown_20371F8 + ldr r4, _08130BA4 @ =gPlttBufferUnfaded _08130B78: adds r0, r2, 0 adds r0, 0x40 @@ -4212,8 +4212,8 @@ _08130B96: bx r0 .align 2, 0 _08130B9C: .4byte 0x00007fff -_08130BA0: .4byte gUnknown_20375F8 -_08130BA4: .4byte gUnknown_20371F8 +_08130BA0: .4byte gPlttBufferFaded +_08130BA4: .4byte gPlttBufferUnfaded thumb_func_end sub_8130B10 thumb_func_start sub_8130BA8 diff --git a/asm/palette.s b/asm/palette.s index d53329082..ed9327106 100644 --- a/asm/palette.s +++ b/asm/palette.s @@ -17,13 +17,13 @@ LoadCompressedPalette: @ 80703A8 adds r1, r6, 0 bl LZDecompressWram lsls r4, 1 - ldr r1, _080703E4 @ =gUnknown_20371F8 + ldr r1, _080703E4 @ =gPlttBufferUnfaded adds r1, r4, r1 lsrs r5, 17 adds r0, r6, 0 adds r2, r5, 0 bl CpuSet - ldr r0, _080703E8 @ =gUnknown_20375F8 + ldr r0, _080703E8 @ =gPlttBufferFaded adds r4, r0 adds r0, r6, 0 adds r1, r4, 0 @@ -34,8 +34,8 @@ LoadCompressedPalette: @ 80703A8 bx r0 .align 2, 0 _080703E0: .4byte gUnknown_2037ACC -_080703E4: .4byte gUnknown_20371F8 -_080703E8: .4byte gUnknown_20375F8 +_080703E4: .4byte gPlttBufferUnfaded +_080703E8: .4byte gPlttBufferFaded thumb_func_end LoadCompressedPalette thumb_func_start LoadPalette @@ -47,12 +47,12 @@ LoadPalette: @ 80703EC lsls r4, 16 lsls r5, 16 lsrs r4, 15 - ldr r1, _0807041C @ =gUnknown_20371F8 + ldr r1, _0807041C @ =gPlttBufferUnfaded adds r1, r4, r1 lsrs r5, 17 adds r2, r5, 0 bl CpuSet - ldr r0, _08070420 @ =gUnknown_20375F8 + ldr r0, _08070420 @ =gPlttBufferFaded adds r4, r0 adds r0, r6, 0 adds r1, r4, 0 @@ -62,8 +62,8 @@ LoadPalette: @ 80703EC pop {r0} bx r0 .align 2, 0 -_0807041C: .4byte gUnknown_20371F8 -_08070420: .4byte gUnknown_20375F8 +_0807041C: .4byte gPlttBufferUnfaded +_08070420: .4byte gPlttBufferFaded thumb_func_end LoadPalette thumb_func_start FillPalette @@ -80,7 +80,7 @@ FillPalette: @ 8070424 mov r0, sp strh r6, [r0] lsrs r4, 15 - ldr r1, _0807046C @ =gUnknown_20371F8 + ldr r1, _0807046C @ =gPlttBufferUnfaded adds r1, r4, r1 lsrs r5, 17 movs r0, 0x80 @@ -92,7 +92,7 @@ FillPalette: @ 8070424 mov r0, sp adds r0, 0x2 strh r6, [r0] - ldr r1, _08070470 @ =gUnknown_20375F8 + ldr r1, _08070470 @ =gPlttBufferFaded adds r4, r1 adds r1, r4, 0 adds r2, r5, 0 @@ -102,8 +102,8 @@ FillPalette: @ 8070424 pop {r0} bx r0 .align 2, 0 -_0807046C: .4byte gUnknown_20371F8 -_08070470: .4byte gUnknown_20375F8 +_0807046C: .4byte gPlttBufferUnfaded +_08070470: .4byte gPlttBufferFaded thumb_func_end FillPalette thumb_func_start TransferPlttBuffer @@ -118,7 +118,7 @@ TransferPlttBuffer: @ 8070474 lsrs r3, r0, 24 cmp r3, 0 bne _080704B6 - ldr r1, _080704C0 @ =gUnknown_20375F8 + ldr r1, _080704C0 @ =gPlttBufferFaded movs r2, 0xA0 lsls r2, 19 ldr r0, _080704C4 @ =0x040000d4 @@ -146,7 +146,7 @@ _080704B6: bx r0 .align 2, 0 _080704BC: .4byte gPaletteFade -_080704C0: .4byte gUnknown_20375F8 +_080704C0: .4byte gPlttBufferFaded _080704C4: .4byte 0x040000d4 _080704C8: .4byte 0x80000200 _080704CC: .4byte gUnknown_2037AC8 @@ -224,8 +224,8 @@ ReadPlttIntoBuffers: @ 8070548 lsls r0, 19 mov r12, r0 movs r4, 0 - ldr r7, _0807057C @ =gUnknown_20371F8 - ldr r6, _08070580 @ =gUnknown_20375F8 + ldr r7, _0807057C @ =gPlttBufferUnfaded + ldr r6, _08070580 @ =gPlttBufferFaded ldr r5, _08070584 @ =0x000001ff _08070558: lsls r1, r4, 1 @@ -246,8 +246,8 @@ _08070558: pop {r0} bx r0 .align 2, 0 -_0807057C: .4byte gUnknown_20371F8 -_08070580: .4byte gUnknown_20375F8 +_0807057C: .4byte gPlttBufferUnfaded +_08070580: .4byte gPlttBufferFaded _08070584: .4byte 0x000001ff thumb_func_end ReadPlttIntoBuffers @@ -373,7 +373,7 @@ _08070668: movs r0, 0x7F ands r0, r1 strb r0, [r4, 0x8] - ldr r0, _080706C4 @ =gUnknown_20375F8 + ldr r0, _080706C4 @ =gPlttBufferFaded movs r1, 0xA0 lsls r1, 19 ldr r2, _080706C8 @ =0x04000100 @@ -409,7 +409,7 @@ _080706B4: bx r1 .align 2, 0 _080706C0: .4byte gPaletteFade -_080706C4: .4byte gUnknown_20375F8 +_080706C4: .4byte gPlttBufferFaded _080706C8: .4byte 0x04000100 _080706CC: .4byte gUnknown_2037AC8 thumb_func_end BeginNormalPaletteFade @@ -542,9 +542,9 @@ unused_sub_80A1CDC: @ 8070790 lsrs r0, r2, 27 cmp r6, r0 bcs _08070878 - ldr r0, _0807081C @ =gUnknown_20371F8 + ldr r0, _0807081C @ =gPlttBufferUnfaded mov r12, r0 - ldr r7, _08070820 @ =gUnknown_20375F8 + ldr r7, _08070820 @ =gPlttBufferFaded _080707C4: ldr r0, [r4, 0x4] lsls r0, 11 @@ -591,15 +591,15 @@ _080707C4: bcc _080707C4 b _08070878 .align 2, 0 -_0807081C: .4byte gUnknown_20371F8 -_08070820: .4byte gUnknown_20375F8 +_0807081C: .4byte gPlttBufferUnfaded +_08070820: .4byte gPlttBufferFaded _08070824: .4byte 0x000003ff _08070828: .4byte 0xffe007ff _0807082C: lsrs r0, r2, 27 cmp r6, r0 bcs _08070878 - ldr r3, _080708E4 @ =gUnknown_20375F8 + ldr r3, _080708E4 @ =gPlttBufferFaded _08070834: ldr r1, [r4, 0x4] lsls r1, 11 @@ -693,7 +693,7 @@ _080708C8: pop {r0} bx r0 .align 2, 0 -_080708E4: .4byte gUnknown_20375F8 +_080708E4: .4byte gPlttBufferFaded _080708E8: .4byte 0x000003ff _080708EC: .4byte 0xffe007ff _080708F0: .4byte 0xfffff01f @@ -768,7 +768,7 @@ _08070950: adds r1, r2, 0 cmp r3, r1 bcs _080709A8 - ldr r6, _080709B0 @ =gUnknown_20375F8 + ldr r6, _080709B0 @ =gPlttBufferFaded _0807097C: ldrh r1, [r4, 0x4] lsls r1, 21 @@ -797,7 +797,7 @@ _080709A8: pop {r0} bx r0 .align 2, 0 -_080709B0: .4byte gUnknown_20375F8 +_080709B0: .4byte gPlttBufferFaded thumb_func_end unused_sub_80A1E40 thumb_func_start unused_sub_80A1F00 @@ -1237,7 +1237,7 @@ InvertPlttBuffer: @ 8070CCC movs r3, 0 cmp r1, 0 beq _08070D0A - ldr r7, _08070D10 @ =gUnknown_20375F8 + ldr r7, _08070D10 @ =gPlttBufferFaded _08070CD8: movs r0, 0x1 ands r0, r1 @@ -1271,7 +1271,7 @@ _08070D0A: pop {r0} bx r0 .align 2, 0 -_08070D10: .4byte gUnknown_20375F8 +_08070D10: .4byte gPlttBufferFaded thumb_func_end InvertPlttBuffer thumb_func_start TintPlttBuffer @@ -1308,7 +1308,7 @@ _08070D3E: cmp r0, 0 beq _08070DC2 movs r4, 0 - ldr r2, _08070DE0 @ =gUnknown_20375F8 + ldr r2, _08070DE0 @ =gPlttBufferFaded mov r8, r2 ldr r1, [sp] lsls r0, r1, 24 @@ -1383,7 +1383,7 @@ _08070DD0: pop {r0} bx r0 .align 2, 0 -_08070DE0: .4byte gUnknown_20375F8 +_08070DE0: .4byte gPlttBufferFaded _08070DE4: .4byte 0xfffffc1f thumb_func_end TintPlttBuffer @@ -1396,9 +1396,9 @@ UnfadePlttBuffer: @ 8070DE8 movs r3, 0 cmp r1, 0 beq _08070E32 - ldr r0, _08070E3C @ =gUnknown_20375F8 + ldr r0, _08070E3C @ =gPlttBufferFaded mov r8, r0 - ldr r0, _08070E40 @ =gUnknown_20371F8 + ldr r0, _08070E40 @ =gPlttBufferUnfaded mov r12, r0 _08070DFE: movs r0, 0x1 @@ -1436,8 +1436,8 @@ _08070E32: pop {r0} bx r0 .align 2, 0 -_08070E3C: .4byte gUnknown_20375F8 -_08070E40: .4byte gUnknown_20371F8 +_08070E3C: .4byte gPlttBufferFaded +_08070E40: .4byte gPlttBufferUnfaded thumb_func_end UnfadePlttBuffer thumb_func_start BeginFastPaletteFade @@ -1498,7 +1498,7 @@ BeginFastPaletteFadeInternal: @ 8070E68 mov r1, sp movs r0, 0 strh r0, [r1] - ldr r1, _08070EE0 @ =gUnknown_20375F8 + ldr r1, _08070EE0 @ =gPlttBufferFaded ldr r2, _08070EE4 @ =0x01000200 mov r0, sp bl CpuSet @@ -1510,7 +1510,7 @@ _08070EBA: ldr r2, _08070EE8 @ =0x00007fff adds r1, r2, 0 strh r1, [r0] - ldr r1, _08070EE0 @ =gUnknown_20375F8 + ldr r1, _08070EE0 @ =gPlttBufferFaded ldr r2, _08070EE4 @ =0x01000200 bl CpuSet _08070ED0: @@ -1521,7 +1521,7 @@ _08070ED0: bx r0 .align 2, 0 _08070EDC: .4byte gPaletteFade -_08070EE0: .4byte gUnknown_20375F8 +_08070EE0: .4byte gPlttBufferFaded _08070EE4: .4byte 0x01000200 _08070EE8: .4byte 0x00007fff thumb_func_end BeginFastPaletteFadeInternal @@ -1599,7 +1599,7 @@ _08070F62: b _08071148 _08070F6A: lsls r2, r7, 1 - ldr r0, _08070FF0 @ =gUnknown_20371F8 + ldr r0, _08070FF0 @ =gPlttBufferUnfaded adds r0, r2, r0 ldr r1, [r0] lsls r3, r1, 27 @@ -1609,7 +1609,7 @@ _08070F6A: lsls r1, 17 lsrs r1, 27 mov r8, r1 - ldr r0, _08070FF4 @ =gUnknown_20375F8 + ldr r0, _08070FF4 @ =gPlttBufferFaded adds r2, r0 mov r9, r2 ldr r1, [r2] @@ -1669,8 +1669,8 @@ _08070FD0: bcc _08070F6A b _08071148 .align 2, 0 -_08070FF0: .4byte gUnknown_20371F8 -_08070FF4: .4byte gUnknown_20375F8 +_08070FF0: .4byte gPlttBufferUnfaded +_08070FF4: .4byte gPlttBufferFaded _08070FF8: adds r7, r2, 0 cmp r7, r10 @@ -1678,7 +1678,7 @@ _08070FF8: b _08071148 _08071000: lsls r1, r7, 1 - ldr r0, _08071058 @ =gUnknown_20375F8 + ldr r0, _08071058 @ =gPlttBufferFaded adds r2, r1, r0 ldr r1, [r2] lsls r0, r1, 27 @@ -1725,14 +1725,14 @@ _0807103A: bcc _08071000 b _08071148 .align 2, 0 -_08071058: .4byte gUnknown_20375F8 +_08071058: .4byte gPlttBufferFaded _0807105C: adds r7, r2, 0 cmp r7, r10 bcs _08071148 _08071062: lsls r2, r7, 1 - ldr r0, _080710DC @ =gUnknown_20371F8 + ldr r0, _080710DC @ =gPlttBufferUnfaded adds r0, r2, r0 ldr r1, [r0] lsls r3, r1, 27 @@ -1742,7 +1742,7 @@ _08071062: lsls r1, 17 lsrs r1, 27 mov r8, r1 - ldr r0, _080710E0 @ =gUnknown_20375F8 + ldr r0, _080710E0 @ =gPlttBufferFaded adds r2, r0 ldr r1, [r2] lsls r0, r1, 27 @@ -1795,13 +1795,13 @@ _080710BC: bcc _08071062 b _08071148 .align 2, 0 -_080710DC: .4byte gUnknown_20371F8 -_080710E0: .4byte gUnknown_20375F8 +_080710DC: .4byte gPlttBufferUnfaded +_080710E0: .4byte gPlttBufferFaded _080710E4: adds r7, r2, 0 cmp r7, r10 bcs _08071148 - ldr r4, _08071170 @ =gUnknown_20375F8 + ldr r4, _08071170 @ =gPlttBufferFaded mov r8, r4 _080710EE: lsls r0, r7, 1 @@ -1873,7 +1873,7 @@ _08071148: ldrb r0, [r1, 0x7] b _08071244 .align 2, 0 -_08071170: .4byte gUnknown_20375F8 +_08071170: .4byte gPlttBufferFaded _08071174: .4byte gPaletteFade _08071178: ldr r2, _08071194 @ =gPaletteFade @@ -1934,31 +1934,31 @@ _080711E0: beq _08071220 b _0807122C _080711EA: - ldr r0, _080711F8 @ =gUnknown_20371F8 - ldr r1, _080711FC @ =gUnknown_20375F8 + ldr r0, _080711F8 @ =gPlttBufferUnfaded + ldr r1, _080711FC @ =gPlttBufferFaded ldr r2, _08071200 @ =0x04000100 bl CpuSet b _0807122C .align 2, 0 -_080711F8: .4byte gUnknown_20371F8 -_080711FC: .4byte gUnknown_20375F8 +_080711F8: .4byte gPlttBufferUnfaded +_080711FC: .4byte gPlttBufferFaded _08071200: .4byte 0x04000100 _08071204: movs r0, 0x1 negs r0, r0 str r0, [sp] - ldr r1, _08071218 @ =gUnknown_20375F8 + ldr r1, _08071218 @ =gPlttBufferFaded ldr r2, _0807121C @ =0x05000100 mov r0, sp bl CpuSet b _0807122C .align 2, 0 -_08071218: .4byte gUnknown_20375F8 +_08071218: .4byte gPlttBufferFaded _0807121C: .4byte 0x05000100 _08071220: str r1, [sp, 0x4] add r0, sp, 0x4 - ldr r1, _08071258 @ =gUnknown_20375F8 + ldr r1, _08071258 @ =gPlttBufferFaded ldr r2, _0807125C @ =0x05000100 bl CpuSet _0807122C: @@ -1987,7 +1987,7 @@ _08071246: pop {r1} bx r1 .align 2, 0 -_08071258: .4byte gUnknown_20375F8 +_08071258: .4byte gPlttBufferFaded _0807125C: .4byte 0x05000100 _08071260: .4byte gPaletteFade thumb_func_end UpdateFastPaletteFade @@ -2371,8 +2371,8 @@ BlendPalettesUnfaded: @ 8071510 lsrs r4, 24 lsls r5, 16 lsrs r5, 16 - ldr r0, _0807153C @ =gUnknown_20371F8 - ldr r1, _08071540 @ =gUnknown_20375F8 + ldr r0, _0807153C @ =gPlttBufferUnfaded + ldr r1, _08071540 @ =gPlttBufferFaded movs r2, 0x80 lsls r2, 1 bl CpuFastSet @@ -2384,8 +2384,8 @@ BlendPalettesUnfaded: @ 8071510 pop {r0} bx r0 .align 2, 0 -_0807153C: .4byte gUnknown_20371F8 -_08071540: .4byte gUnknown_20375F8 +_0807153C: .4byte gPlttBufferUnfaded +_08071540: .4byte gPlttBufferFaded thumb_func_end BlendPalettesUnfaded thumb_func_start TintPalette_GrayScale diff --git a/asm/party_menu.s b/asm/party_menu.s index c482366d4..9754bb605 100644 --- a/asm/party_menu.s +++ b/asm/party_menu.s @@ -681,7 +681,7 @@ _0811EFD4: lsls r2, 1 movs r1, 0 bl LoadCompressedPalette - ldr r0, _0811EFF8 @ =gUnknown_20371F8 + ldr r0, _0811EFF8 @ =gPlttBufferUnfaded ldr r4, _0811EFFC @ =gUnknown_203B09C ldr r1, [r4] adds r1, 0x18 @@ -691,7 +691,7 @@ _0811EFD4: b _0811F01A .align 2, 0 _0811EFF4: .4byte gUnknown_8E829C8 -_0811EFF8: .4byte gUnknown_20371F8 +_0811EFF8: .4byte gPlttBufferUnfaded _0811EFFC: .4byte gUnknown_203B09C _0811F000: movs r0, 0x4 @@ -747,7 +747,7 @@ sub_811F03C: @ 811F03C adds r0, r5, 0 movs r2, 0x10 bl CpuSet - ldr r0, _0811F06C @ =gUnknown_20375F8 + ldr r0, _0811F06C @ =gPlttBufferFaded adds r4, r0 adds r0, r5, 0 adds r1, r4, 0 @@ -758,7 +758,7 @@ sub_811F03C: @ 811F03C bx r0 .align 2, 0 _0811F068: .4byte gUnknown_2037258 -_0811F06C: .4byte gUnknown_20375F8 +_0811F06C: .4byte gPlttBufferFaded thumb_func_end sub_811F03C thumb_func_start sub_811F070 diff --git a/asm/pc_screen_effect.s b/asm/pc_screen_effect.s index b8e48f91c..61c47a719 100644 --- a/asm/pc_screen_effect.s +++ b/asm/pc_screen_effect.s @@ -226,7 +226,7 @@ _080A0BCC: movs r1, 0 movs r2, 0 bl BlendPalettes - ldr r0, _080A0C0C @ =gUnknown_20375F8 + ldr r0, _080A0C0C @ =gPlttBufferFaded strh r5, [r0] _080A0BF2: ldrh r1, [r4, 0xE] @@ -241,7 +241,7 @@ _080A0BF2: ldrsh r0, [r4, r1] b _080A0C54 .align 2, 0 -_080A0C0C: .4byte gUnknown_20375F8 +_080A0C0C: .4byte gPlttBufferFaded _080A0C10: ldrh r0, [r4, 0x12] ldrh r1, [r4, 0xC] @@ -326,11 +326,11 @@ _080A0CA0: beq _080A0D54 b _080A0DA8 _080A0CAA: - ldr r0, _080A0CB0 @ =gUnknown_20375F8 + ldr r0, _080A0CB0 @ =gPlttBufferFaded strh r1, [r0] b _080A0DCA .align 2, 0 -_080A0CB0: .4byte gUnknown_20375F8 +_080A0CB0: .4byte gPlttBufferFaded _080A0CB4: movs r1, 0 strh r1, [r4, 0xE] @@ -431,7 +431,7 @@ _080A0D72: movs r1, 0x10 movs r2, 0 bl BlendPalettes - ldr r1, _080A0DA4 @ =gUnknown_20375F8 + ldr r1, _080A0DA4 @ =gPlttBufferFaded movs r0, 0 strh r0, [r1] _080A0D88: @@ -449,7 +449,7 @@ _080A0D88: bne _080A0DD0 b _080A0DCA .align 2, 0 -_080A0DA4: .4byte gUnknown_20375F8 +_080A0DA4: .4byte gPlttBufferFaded _080A0DA8: movs r1, 0x80 lsls r1, 6 diff --git a/asm/pokemon_storage_system.s b/asm/pokemon_storage_system.s index 682d5e9b3..04dae118c 100644 --- a/asm/pokemon_storage_system.s +++ b/asm/pokemon_storage_system.s @@ -12786,7 +12786,7 @@ sub_8091EF0: @ 8091EF0 adds r1, r2, r3 ldrh r1, [r1] lsls r1, 1 - ldr r2, _08091F34 @ =gUnknown_20371F8 + ldr r2, _08091F34 @ =gPlttBufferUnfaded adds r1, r2 movs r2, 0x2 bl CpuSet @@ -12794,7 +12794,7 @@ sub_8091EF0: @ 8091EF0 .align 2, 0 _08091F2C: .4byte gUnknown_20397B0 _08091F30: .4byte gUnknown_83D29D0 -_08091F34: .4byte gUnknown_20371F8 +_08091F34: .4byte gPlttBufferUnfaded _08091F38: lsls r0, r1, 2 ldr r1, _08091F54 @ =gUnknown_83D29D0 @@ -12803,7 +12803,7 @@ _08091F38: adds r1, r2, r3 ldrh r1, [r1] lsls r1, 1 - ldr r2, _08091F5C @ =gUnknown_20371F8 + ldr r2, _08091F5C @ =gPlttBufferUnfaded adds r1, r2 movs r2, 0x2 bl CpuSet @@ -12813,7 +12813,7 @@ _08091F50: .align 2, 0 _08091F54: .4byte gUnknown_83D29D0 _08091F58: .4byte 0x0000071e -_08091F5C: .4byte gUnknown_20371F8 +_08091F5C: .4byte gPlttBufferUnfaded thumb_func_end sub_8091EF0 thumb_func_start sub_8091F60 diff --git a/asm/quest_log.s b/asm/quest_log.s index 9809b1b52..4972eaa07 100644 --- a/asm/quest_log.s +++ b/asm/quest_log.s @@ -5,99 +5,6 @@ .text - thumb_func_start sub_81121D8 -sub_81121D8: @ 81121D8 - push {r4-r7,lr} - sub sp, 0x8 - lsls r0, 24 - lsrs r0, 24 - lsls r1, r0, 2 - adds r1, r0 - lsls r1, 3 - ldr r0, _0811227C @ =gTasks+0x8 - adds r7, r1, r0 - ldrh r1, [r7, 0x2] - movs r2, 0x2 - ldrsh r0, [r7, r2] - cmp r0, 0xF - bgt _08112290 - ldr r5, _08112280 @ =gUnknown_20371FA - ldr r6, _08112284 @ =gUnknown_20375FA - movs r4, 0xF - subs r3, r4, r1 - lsls r3, 24 - lsrs r3, 24 - adds r0, r5, 0 - adds r1, r6, 0 - movs r2, 0xDF - bl sub_80716F8 - movs r0, 0xFF - lsls r0, 1 - adds r5, r0 - adds r6, r0 - movs r2, 0x80 - lsls r2, 1 - ldrb r0, [r7, 0x2] - subs r4, r0 - lsls r4, 24 - lsrs r4, 24 - adds r0, r5, 0 - adds r1, r6, 0 - adds r3, r4, 0 - bl sub_80716F8 - ldr r5, _08112288 @ =gUnknown_203ADFE - ldrb r0, [r5] - ldr r4, _0811228C @ =gUnknown_845661C - ldrb r3, [r4, 0x4] - lsls r3, 3 - subs r3, 0x1 - ldrh r1, [r7, 0x2] - subs r3, r1 - lsls r3, 16 - lsrs r3, 16 - ldrb r1, [r4, 0x3] - lsls r1, 3 - str r1, [sp] - movs r6, 0x1 - str r6, [sp, 0x4] - movs r1, 0 - movs r2, 0 - bl FillWindowPixelRect - ldrb r0, [r5, 0x1] - ldrh r3, [r7, 0x2] - ldrb r1, [r4, 0xB] - lsls r1, 3 - str r1, [sp] - str r6, [sp, 0x4] - movs r1, 0 - movs r2, 0 - bl FillWindowPixelRect - ldrb r0, [r5] - movs r1, 0x2 - bl CopyWindowToVram - ldrb r0, [r5, 0x1] - movs r1, 0x2 - bl CopyWindowToVram - ldrh r0, [r7, 0x2] - adds r0, 0x1 - strh r0, [r7, 0x2] - movs r0, 0 - b _08112292 - .align 2, 0 -_0811227C: .4byte gTasks+0x8 -_08112280: .4byte gUnknown_20371FA -_08112284: .4byte gUnknown_20375FA -_08112288: .4byte gUnknown_203ADFE -_0811228C: .4byte gUnknown_845661C -_08112290: - movs r0, 0x1 -_08112292: - add sp, 0x8 - pop {r4-r7} - pop {r1} - bx r1 - thumb_func_end sub_81121D8 - thumb_func_start sub_811229C sub_811229C: @ 811229C push {r4-r6,lr} @@ -138,7 +45,7 @@ sub_811229C: @ 811229C movs r2, 0x50 bl sub_807B0C4 ldr r0, [r4] - ldr r1, _08112318 @ =gUnknown_20371F8 + ldr r1, _08112318 @ =gPlttBufferUnfaded adds r2, r5, 0 bl CpuSet ldr r1, [r4] @@ -152,7 +59,7 @@ sub_811229C: @ 811229C bx r0 .align 2, 0 _08112314: .4byte gUnknown_203AE90 -_08112318: .4byte gUnknown_20371F8 +_08112318: .4byte gPlttBufferUnfaded thumb_func_end sub_811229C thumb_func_start sub_811231C diff --git a/asm/roulette_util.s b/asm/roulette_util.s index b94b22743..532bf4684 100644 --- a/asm/roulette_util.s +++ b/asm/roulette_util.s @@ -151,9 +151,9 @@ _080D8CD8: ldrh r0, [r5, 0x6] add r0, r12 lsls r0, 1 - ldr r1, _080D8CFC @ =gUnknown_20375F8 + ldr r1, _080D8CFC @ =gPlttBufferFaded adds r3, r0, r1 - ldr r1, _080D8D00 @ =gUnknown_20371F8 + ldr r1, _080D8D00 @ =gPlttBufferUnfaded adds r6, r0, r1 ldrb r0, [r5] lsls r0, 25 @@ -165,8 +165,8 @@ _080D8CD8: b _080D8E4E .align 2, 0 _080D8CF8: .4byte 0xfffffc1f -_080D8CFC: .4byte gUnknown_20375F8 -_080D8D00: .4byte gUnknown_20371F8 +_080D8CFC: .4byte gPlttBufferFaded +_080D8D00: .4byte gPlttBufferUnfaded _080D8D04: ldr r0, [r3] lsls r2, r0, 27 @@ -422,7 +422,7 @@ _080D8ECE: ldrb r0, [r3, 0x8] cmp r2, r0 bcs _080D8EEE - ldr r4, _080D8EF8 @ =gUnknown_20375F8 + ldr r4, _080D8EF8 @ =gPlttBufferFaded _080D8ED6: ldrh r0, [r3, 0x6] adds r0, r2 @@ -443,13 +443,13 @@ _080D8EEE: adds r1, 0x1 b _080D8F28 .align 2, 0 -_080D8EF8: .4byte gUnknown_20375F8 +_080D8EF8: .4byte gPlttBufferFaded _080D8EFC: ldrb r0, [r3, 0x8] cmp r2, r0 bcs _080D8F20 - ldr r5, _080D8F40 @ =gUnknown_20375F8 - ldr r4, _080D8F44 @ =gUnknown_20371F8 + ldr r5, _080D8F40 @ =gPlttBufferFaded + ldr r4, _080D8F44 @ =gPlttBufferUnfaded _080D8F06: ldrh r0, [r3, 0x6] adds r0, r2 @@ -483,8 +483,8 @@ _080D8F36: pop {r1} bx r1 .align 2, 0 -_080D8F40: .4byte gUnknown_20375F8 -_080D8F44: .4byte gUnknown_20371F8 +_080D8F40: .4byte gPlttBufferFaded +_080D8F44: .4byte gPlttBufferUnfaded thumb_func_end sub_80D8EB8 thumb_func_start task_tutorial_controls_fadein @@ -625,9 +625,9 @@ _080D9016: beq _080D907E ldrh r1, [r4, 0xA] lsls r1, 1 - ldr r0, _080D9074 @ =gUnknown_20375F8 + ldr r0, _080D9074 @ =gPlttBufferFaded adds r0, r1, r0 - ldr r2, _080D9078 @ =gUnknown_20371F8 + ldr r2, _080D9078 @ =gPlttBufferUnfaded adds r1, r2 ldrb r2, [r4, 0xC] lsls r2, 1 @@ -651,8 +651,8 @@ _080D9016: strb r0, [r4, 0x7] b _080D907E .align 2, 0 -_080D9074: .4byte gUnknown_20375F8 -_080D9078: .4byte gUnknown_20371F8 +_080D9074: .4byte gPlttBufferFaded +_080D9078: .4byte gPlttBufferUnfaded _080D907C: strb r3, [r4, 0x7] _080D907E: @@ -787,8 +787,8 @@ sub_80D9140: @ 80D9140 adds r0, r2, r0 cmp r2, r0 bge _080D9182 - ldr r5, _080D91B4 @ =gUnknown_20375F8 - ldr r3, _080D91B8 @ =gUnknown_20371F8 + ldr r5, _080D91B4 @ =gPlttBufferFaded + ldr r3, _080D91B8 @ =gPlttBufferUnfaded _080D9168: lsls r0, r2, 1 adds r1, r0, r5 @@ -829,8 +829,8 @@ _080D9182: pop {r0} bx r0 .align 2, 0 -_080D91B4: .4byte gUnknown_20375F8 -_080D91B8: .4byte gUnknown_20371F8 +_080D91B4: .4byte gPlttBufferFaded +_080D91B8: .4byte gPlttBufferUnfaded thumb_func_end sub_80D9140 thumb_func_start sub_80D91BC @@ -992,8 +992,8 @@ sub_80D9294: @ 80D9294 adds r0, r2, r0 cmp r2, r0 bge _080D92FA - ldr r5, _080D9314 @ =gUnknown_20375F8 - ldr r4, _080D9318 @ =gUnknown_20371F8 + ldr r5, _080D9314 @ =gPlttBufferFaded + ldr r4, _080D9318 @ =gPlttBufferUnfaded _080D92E0: lsls r0, r2, 1 adds r1, r0, r5 @@ -1022,8 +1022,8 @@ _080D92FA: strh r0, [r2] b _080D93A6 .align 2, 0 -_080D9314: .4byte gUnknown_20375F8 -_080D9318: .4byte gUnknown_20371F8 +_080D9314: .4byte gPlttBufferFaded +_080D9318: .4byte gPlttBufferUnfaded _080D931C: movs r0, 0x1 mov r9, r0 @@ -1066,8 +1066,8 @@ _080D9350: adds r0, r2, r0 cmp r2, r0 bge _080D9386 - ldr r6, _080D93B4 @ =gUnknown_20375F8 - ldr r4, _080D93B8 @ =gUnknown_20371F8 + ldr r6, _080D93B4 @ =gPlttBufferFaded + ldr r4, _080D93B8 @ =gPlttBufferUnfaded _080D936C: lsls r0, r2, 1 adds r1, r0, r6 @@ -1109,8 +1109,8 @@ _080D93A6: pop {r0} bx r0 .align 2, 0 -_080D93B4: .4byte gUnknown_20375F8 -_080D93B8: .4byte gUnknown_20371F8 +_080D93B4: .4byte gPlttBufferFaded +_080D93B8: .4byte gPlttBufferUnfaded thumb_func_end sub_80D9294 thumb_func_start sub_80D93BC diff --git a/asm/slot_machine.s b/asm/slot_machine.s index 2fc05a82a..f21a6f185 100644 --- a/asm/slot_machine.s +++ b/asm/slot_machine.s @@ -4503,9 +4503,9 @@ _08141A00: bl BlendPalettes _08141A2C: movs r4, 0 - ldr r5, _08141A4C @ =gUnknown_20375F8 + ldr r5, _08141A4C @ =gPlttBufferFaded ldr r3, _08141A50 @ =gUnknown_8466C34 - ldr r2, _08141A54 @ =gUnknown_20371F8 + ldr r2, _08141A54 @ =gPlttBufferUnfaded _08141A34: adds r0, r4, r3 ldrb r0, [r0] @@ -4520,9 +4520,9 @@ _08141A34: bls _08141A34 b _08141AA8 .align 2, 0 -_08141A4C: .4byte gUnknown_20375F8 +_08141A4C: .4byte gPlttBufferFaded _08141A50: .4byte gUnknown_8466C34 -_08141A54: .4byte gUnknown_20371F8 +_08141A54: .4byte gPlttBufferUnfaded _08141A58: movs r4, 0 _08141A5A: diff --git a/asm/title_screen.s b/asm/title_screen.s index c9ec19427..9e12dfbff 100644 --- a/asm/title_screen.s +++ b/asm/title_screen.s @@ -1381,9 +1381,9 @@ _08079478: lsls r0, 16 cmp r0, 0 beq _080794CC - ldr r2, _080794C0 @ =gUnknown_20371F8 + ldr r2, _080794C0 @ =gPlttBufferUnfaded ldr r4, _080794C4 @ =gUnknown_8EAE094 - ldr r1, _080794C8 @ =gUnknown_20375F8 + ldr r1, _080794C8 @ =gPlttBufferFaded movs r0, 0xF1 lsls r0, 1 adds r1, r0 @@ -1401,14 +1401,14 @@ _080794AC: bge _080794AC b _080794F2 .align 2, 0 -_080794C0: .4byte gUnknown_20371F8 +_080794C0: .4byte gPlttBufferUnfaded _080794C4: .4byte gUnknown_8EAE094 -_080794C8: .4byte gUnknown_20375F8 +_080794C8: .4byte gPlttBufferFaded _080794CC: movs r3, 0 - ldr r2, _08079518 @ =gUnknown_20371F8 + ldr r2, _08079518 @ =gPlttBufferUnfaded ldr r0, _0807951C @ =gUnknown_8EAE094 - ldr r1, _08079520 @ =gUnknown_20375F8 + ldr r1, _08079520 @ =gPlttBufferFaded adds r4, r0, 0x2 movs r0, 0xF1 lsls r0, 1 @@ -1445,9 +1445,9 @@ _08079510: pop {r0} bx r0 .align 2, 0 -_08079518: .4byte gUnknown_20371F8 +_08079518: .4byte gPlttBufferUnfaded _0807951C: .4byte gUnknown_8EAE094 -_08079520: .4byte gUnknown_20375F8 +_08079520: .4byte gPlttBufferFaded _08079524: .4byte gPaletteFade thumb_func_end sub_807941C diff --git a/asm/tm_case.s b/asm/tm_case.s index 3cd478ee6..a4767baa5 100644 --- a/asm/tm_case.s +++ b/asm/tm_case.s @@ -3075,8 +3075,8 @@ _08133170: ldrh r1, [r1] strh r1, [r2, 0xA] bl Free - ldr r0, _08133208 @ =gUnknown_20375F8 - ldr r1, _0813320C @ =gUnknown_20371F8 + ldr r0, _08133208 @ =gPlttBufferFaded + ldr r1, _0813320C @ =gPlttBufferUnfaded movs r2, 0x80 lsls r2, 1 bl CpuFastSet @@ -3100,8 +3100,8 @@ _081331F8: .4byte gSaveBlock1Ptr _081331FC: .4byte 0x00000464 _08133200: .4byte gUnknown_203B11C _08133204: .4byte gUnknown_203B10C -_08133208: .4byte gUnknown_20375F8 -_0813320C: .4byte gUnknown_20371F8 +_08133208: .4byte gPlttBufferFaded +_0813320C: .4byte gPlttBufferUnfaded _08133210: ldr r0, _0813323C @ =gPaletteFade ldrb r1, [r0, 0x7] diff --git a/include/palette.h b/include/palette.h index bdd1d1b93..90112947a 100644 --- a/include/palette.h +++ b/include/palette.h @@ -42,8 +42,8 @@ struct PaletteFadeControl extern struct PaletteFadeControl gPaletteFade; extern u32 gPlttBufferTransferPending; extern u8 gPaletteDecompressionBuffer[]; -extern u16 gPlttBufferUnfaded[]; -extern u16 gPlttBufferFaded[]; +extern u16 gPlttBufferUnfaded[PLTT_BUFFER_SIZE]; +extern u16 gPlttBufferFaded[PLTT_BUFFER_SIZE]; void LoadCompressedPalette(const void *, u16, u16); void LoadPalette(const void *, u16, u16); @@ -67,6 +67,7 @@ void BeginFastPaletteFade(u8); void BeginHardwarePaletteFade(u8, u8, u8, u8, u8); void BlendPalettes(u32, u8, u16); void BlendPalettesUnfaded(u32, u8, u16); +void sub_80716F8(const u16 *, u16 *, u16, u8); extern struct PaletteFadeControl gPaletteFade; diff --git a/src/quest_log.c b/src/quest_log.c index e7a5a2d5b..028bd574e 100644 --- a/src/quest_log.c +++ b/src/quest_log.c @@ -44,8 +44,6 @@ struct UnkStruct_203AE98 u8 unk_6; }; -extern u16 gUnknown_20371F8[]; - EWRAM_DATA u8 gUnknown_203ADF8 = 0; EWRAM_DATA u8 gUnknown_203ADF9 = 0; EWRAM_DATA u8 gUnknown_203ADFA = 0; @@ -1214,7 +1212,7 @@ void sub_8111F14(void) void sub_8111F38(u16 a0, u16 a1) { - CpuSet(gUnknown_20371F8 + a0, gUnknown_203AE90 + a0, a1); + CpuSet(gPlttBufferUnfaded + a0, gUnknown_203AE90 + a0, a1); } bool8 sub_8111F60(void) @@ -1311,7 +1309,7 @@ void sub_81120AC(u8 taskId) default: if (gUnknown_203AE94.unk_0_6 == 1) sub_8098110(1); - CpuCopy16(gUnknown_203AE90, gUnknown_20371F8, 0x400); + CpuCopy16(gUnknown_203AE90, gPlttBufferUnfaded, 0x400); Free(gUnknown_203AE90); gUnknown_203AE94 = (struct UnkStruct_203AE94){}; sub_80696C0(); @@ -1324,3 +1322,20 @@ void sub_81120AC(u8 taskId) break; } } + +bool8 sub_81121D8(u8 taskId) +{ + s16 * data = gTasks[taskId].data; + + if (data[1] > 15) + return TRUE; + + sub_80716F8(gPlttBufferUnfaded + 0x01, gPlttBufferFaded + 0x01, 0xDF, 0x0F - data[1]); + sub_80716F8(gPlttBufferUnfaded + 0x100, gPlttBufferFaded + 0x100, 0x100, 0x0F - data[1]); + FillWindowPixelRect(gUnknown_203ADFE[0], 0x00, 0, gUnknown_845661C[0].height * 8 - 1 - data[1], gUnknown_845661C[0].width * 8, 1); + FillWindowPixelRect(gUnknown_203ADFE[1], 0x00, 0, data[1], gUnknown_845661C[1].width * 8, 1); + CopyWindowToVram(gUnknown_203ADFE[0], 2); + CopyWindowToVram(gUnknown_203ADFE[1], 2); + data[1]++; + return FALSE; +} diff --git a/sym_ewram.txt b/sym_ewram.txt index cebe20e4f..dd96b15fd 100644 --- a/sym_ewram.txt +++ b/sym_ewram.txt @@ -761,7 +761,7 @@ gUnknown_2037104: @ 2037104 gUnknown_2037108: @ 2037108 .space 0xF0 -gUnknown_20371F8: @ 20371F8 +gPlttBufferUnfaded: @ 20371F8 .space 0x2 gUnknown_20371FA: @ 20371FA @@ -788,7 +788,7 @@ gUnknown_20373F8: @ 20373F8 gUnknown_2037408: @ 2037408 .space 0x1F0 -gUnknown_20375F8: @ 20375F8 +gPlttBufferFaded: @ 20375F8 .space 0x2 gUnknown_20375FA: @ 20375FA -- cgit v1.2.3 From 4f846b6536382331dee430dd57c61ba7a1e2b7e0 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Fri, 12 Oct 2018 15:45:40 -0400 Subject: Consolidate palette buffers --- asm/battle_1.s | 4 ++-- asm/battle_anim.s | 16 ++++++++-------- asm/battle_anim_80A22E8.s | 4 ++-- asm/battle_interface.s | 4 ++-- asm/battle_message.s | 4 ++-- asm/evolution_graphics.s | 20 ++++++++++---------- asm/evolution_scene.s | 12 ++++++------ asm/field_weather.s | 4 ++-- asm/intro.s | 4 ++-- asm/map_name_popup.s | 4 ++-- asm/party_menu.s | 4 ++-- asm/pokemon_storage_system.s | 4 ++-- asm/title_screen.s | 8 ++++---- sym_ewram.txt | 40 ++-------------------------------------- 14 files changed, 48 insertions(+), 84 deletions(-) diff --git a/asm/battle_1.s b/asm/battle_1.s index bb29b3aab..7db344aca 100644 --- a/asm/battle_1.s +++ b/asm/battle_1.s @@ -242,7 +242,7 @@ sub_800F380: @ 800F380 adds r2, 0x2 ldr r1, _0800F3FC @ =0x0000675a strh r1, [r2] - ldr r5, _0800F400 @ =gUnknown_20376B0 + ldr r5, _0800F400 @ =gPlttBufferFaded + 0xB8 adds r1, r5, 0 movs r2, 0x4 bl CpuSet @@ -275,7 +275,7 @@ _0800F3F0: .4byte gPlttBufferUnfaded _0800F3F4: .4byte 0x00002529 _0800F3F8: .4byte 0x00007fff _0800F3FC: .4byte 0x0000675a -_0800F400: .4byte gUnknown_20376B0 +_0800F400: .4byte gPlttBufferFaded + 0xB8 _0800F404: .4byte gBattleTypeFlags _0800F408: .4byte 0x00010010 thumb_func_end sub_800F380 diff --git a/asm/battle_anim.s b/asm/battle_anim.s index f15200700..6f749f83c 100644 --- a/asm/battle_anim.s +++ b/asm/battle_anim.s @@ -1307,7 +1307,7 @@ _08072E5E: movs r0, 0x16 bl SetGpuReg lsls r4, r7, 5 - ldr r0, _08072F7C @ =gUnknown_20373F8 + ldr r0, _08072F7C @ =gPlttBufferUnfaded + 0x200 adds r4, r0 add r0, sp, 0x10 ldrb r1, [r0, 0x8] @@ -1353,7 +1353,7 @@ _08072F6C: .4byte gUnknown_2023D44 _08072F70: .4byte gUnknown_2022978 _08072F74: .4byte gSprites _08072F78: .4byte gUnknown_202297A -_08072F7C: .4byte gUnknown_20373F8 +_08072F7C: .4byte gPlttBufferUnfaded + 0x200 _08072F80: .4byte 0x04000008 _08072F84: ldr r1, _08073094 @ =0x06006000 @@ -1440,7 +1440,7 @@ _08072F84: movs r0, 0x1A bl SetGpuReg lsls r4, r7, 5 - ldr r0, _080730B4 @ =gUnknown_20373F8 + ldr r0, _080730B4 @ =gPlttBufferUnfaded + 0x200 adds r4, r0 adds r0, r4, 0 movs r1, 0x90 @@ -1487,7 +1487,7 @@ _080730A4: .4byte gUnknown_2023D44 _080730A8: .4byte gUnknown_202297C _080730AC: .4byte gSprites _080730B0: .4byte gUnknown_202297E -_080730B4: .4byte gUnknown_20373F8 +_080730B4: .4byte gPlttBufferUnfaded + 0x200 _080730B8: .4byte 0x05000120 _080730BC: .4byte 0x04000008 thumb_func_end sub_8072E48 @@ -1640,7 +1640,7 @@ task_pA_ma0A_obj_to_bg_pal: @ 8073174 adds r0, r5 strh r0, [r1] lsls r0, r6, 5 - ldr r2, _08073200 @ =gUnknown_20377F8 + ldr r2, _08073200 @ =gPlttBufferFaded + 0x200 adds r0, r2 mov r1, sp ldrb r1, [r1, 0x8] @@ -1656,7 +1656,7 @@ _080731F0: .4byte gTasks _080731F4: .4byte gSprites _080731F8: .4byte gUnknown_2022978 _080731FC: .4byte gUnknown_202297A -_08073200: .4byte gUnknown_20377F8 +_08073200: .4byte gPlttBufferFaded + 0x200 _08073204: .4byte 0xfffffe00 _08073208: .4byte 0x04000008 _0807320C: @@ -1673,7 +1673,7 @@ _0807320C: adds r0, r5 strh r0, [r1] lsls r0, r6, 5 - ldr r1, _08073244 @ =gUnknown_20377F8 + ldr r1, _08073244 @ =gPlttBufferFaded + 0x200 adds r0, r1 subs r1, 0xE0 ldr r2, _08073248 @ =0x04000008 @@ -1686,7 +1686,7 @@ _08073232: .align 2, 0 _0807323C: .4byte gUnknown_202297C _08073240: .4byte gUnknown_202297E -_08073244: .4byte gUnknown_20377F8 +_08073244: .4byte gPlttBufferFaded + 0x200 _08073248: .4byte 0x04000008 thumb_func_end task_pA_ma0A_obj_to_bg_pal diff --git a/asm/battle_anim_80A22E8.s b/asm/battle_anim_80A22E8.s index 2b522ffe8..40cb974fe 100644 --- a/asm/battle_anim_80A22E8.s +++ b/asm/battle_anim_80A22E8.s @@ -6117,7 +6117,7 @@ _080A51A4: ldrb r1, [r4, 0x5] lsrs r1, 4 lsls r0, r1, 5 - ldr r2, _080A5204 @ =gUnknown_2037408 + ldr r2, _080A5204 @ =gPlttBufferUnfaded + 0x210 adds r0, r2 lsls r1, 4 ldr r3, _080A5208 @ =0x00000101 @@ -6135,7 +6135,7 @@ _080A51A4: b _080A5214 .align 2, 0 _080A5200: .4byte 0x00007fff -_080A5204: .4byte gUnknown_2037408 +_080A5204: .4byte gPlttBufferUnfaded + 0x210 _080A5208: .4byte 0x00000101 _080A520C: cmp r0, 0 diff --git a/asm/battle_interface.s b/asm/battle_interface.s index 3e3fb6500..98616d2c9 100644 --- a/asm/battle_interface.s +++ b/asm/battle_interface.s @@ -4066,7 +4066,7 @@ _08049AF4: movs r2, 0x2 bl FillPalette lsls r4, 1 - ldr r0, _08049BCC @ =gUnknown_20373F8 + ldr r0, _08049BCC @ =gPlttBufferUnfaded + 0x200 adds r0, r4, r0 ldr r1, _08049BD0 @ =0x05000200 adds r4, r1 @@ -4145,7 +4145,7 @@ _08049BB6: .align 2, 0 _08049BC4: .4byte gSprites _08049BC8: .4byte gUnknown_826055A -_08049BCC: .4byte gUnknown_20373F8 +_08049BCC: .4byte gPlttBufferUnfaded + 0x200 _08049BD0: .4byte 0x05000200 _08049BD4: .4byte 0x06010000 _08049BD8: .4byte 0x04000018 diff --git a/asm/battle_message.s b/asm/battle_message.s index 042b130b0..aaa023750 100644 --- a/asm/battle_message.s +++ b/asm/battle_message.s @@ -2968,7 +2968,7 @@ SetPpNumbersPaletteInMoveSelection: @ 80D89DC ldrh r0, [r0, 0x2] adds r5, 0xB6 strh r0, [r5] - ldr r4, _080D8A4C @ =gUnknown_20376B0 + ldr r4, _080D8A4C @ =gPlttBufferFaded + 0xB8 adds r0, r2, 0 adds r1, r4, 0 movs r2, 0x1 @@ -2987,7 +2987,7 @@ _080D8A3C: .4byte gUnknown_2022BC8 _080D8A40: .4byte gUnknown_8D2FBB4 _080D8A44: .4byte gUnknown_2023FFC _080D8A48: .4byte gPlttBufferUnfaded -_080D8A4C: .4byte gUnknown_20376B0 +_080D8A4C: .4byte gPlttBufferFaded + 0xB8 thumb_func_end SetPpNumbersPaletteInMoveSelection thumb_func_start GetCurrentPpToMaxPpState diff --git a/asm/evolution_graphics.s b/asm/evolution_graphics.s index dd268128f..1dafc92ea 100644 --- a/asm/evolution_graphics.s +++ b/asm/evolution_graphics.s @@ -997,8 +997,8 @@ sub_80F6080: @ 80F6080 movs r0, 0 strh r0, [r5, 0x26] bl sub_80D0474 - ldr r0, _080F60D0 @ =gUnknown_2037638 - ldr r1, _080F60D4 @ =gUnknown_2037238 + ldr r0, _080F60D0 @ =gPlttBufferFaded + 0x40 + ldr r1, _080F60D4 @ =gPlttBufferUnfaded + 0x40 movs r2, 0x30 bl CpuSet ldr r0, _080F60D8 @ =0xfff90f1c @@ -1018,8 +1018,8 @@ sub_80F6080: @ 80F6080 bx r0 .align 2, 0 _080F60CC: .4byte gTasks -_080F60D0: .4byte gUnknown_2037638 -_080F60D4: .4byte gUnknown_2037238 +_080F60D0: .4byte gPlttBufferFaded + 0x40 +_080F60D4: .4byte gPlttBufferUnfaded + 0x40 _080F60D8: .4byte 0xfff90f1c _080F60DC: .4byte 0x00007fff _080F60E0: .4byte sub_80F60E4 @@ -1159,8 +1159,8 @@ sub_80F61C0: @ 80F61C0 movs r0, 0 strh r0, [r5, 0x26] bl sub_80D0474 - ldr r0, _080F6210 @ =gUnknown_2037638 - ldr r1, _080F6214 @ =gUnknown_2037238 + ldr r0, _080F6210 @ =gPlttBufferFaded + 0x40 + ldr r1, _080F6214 @ =gPlttBufferUnfaded + 0x40 movs r2, 0x30 bl CpuSet ldr r0, _080F6218 @ =0xfff90f00 @@ -1180,8 +1180,8 @@ sub_80F61C0: @ 80F61C0 bx r0 .align 2, 0 _080F620C: .4byte gTasks -_080F6210: .4byte gUnknown_2037638 -_080F6214: .4byte gUnknown_2037238 +_080F6210: .4byte gPlttBufferFaded + 0x40 +_080F6214: .4byte gPlttBufferUnfaded + 0x40 _080F6218: .4byte 0xfff90f00 _080F621C: .4byte 0x00007fff _080F6220: .4byte sub_80F6224 @@ -1369,7 +1369,7 @@ _080F62CE: ldrb r1, [r2, 0x5] lsrs r1, 4 lsls r1, 5 - ldr r0, _080F63FC @ =gUnknown_20377F8 + ldr r0, _080F63FC @ =gPlttBufferFaded + 0x200 mov r10, r0 add r1, r10 add r0, sp, 0x4 @@ -1422,7 +1422,7 @@ _080F63EC: .4byte 0x00007fff _080F63F0: .4byte gTasks _080F63F4: .4byte gSprites _080F63F8: .4byte nullsub_86 -_080F63FC: .4byte gUnknown_20377F8 +_080F63FC: .4byte gPlttBufferFaded + 0x200 thumb_func_end sub_80F62B4 thumb_func_start sub_80F6400 diff --git a/asm/evolution_scene.s b/asm/evolution_scene.s index 6e5466ca2..2e192824f 100644 --- a/asm/evolution_scene.s +++ b/asm/evolution_scene.s @@ -375,7 +375,7 @@ EvolutionScene: @ 80CDDF4 strh r2, [r0, 0x1C] ldr r1, _080CE0A8 @ =gUnknown_2039A20 ldr r0, [r1] - ldr r1, _080CE0D8 @ =gUnknown_2037238 + ldr r1, _080CE0D8 @ =gPlttBufferUnfaded + 0x40 adds r0, 0x4 movs r2, 0x60 bl memcpy @@ -423,7 +423,7 @@ _080CE0C8: .4byte gSprites _080CE0CC: .4byte nullsub_10 _080CE0D0: .4byte sub_80CE8DC _080CE0D4: .4byte gTasks -_080CE0D8: .4byte gUnknown_2037238 +_080CE0D8: .4byte gPlttBufferUnfaded + 0x40 _080CE0DC: .4byte nullsub_76 _080CE0E0: .4byte sub_80D0050 _080CE0E4: .4byte sub_80CE710 @@ -1748,7 +1748,7 @@ _080CECC0: bl _080CF528 _080CECCE: bl m4aMPlayAllStop - ldr r0, _080CED00 @ =gUnknown_2037238 + ldr r0, _080CED00 @ =gPlttBufferUnfaded + 0x40 ldr r1, _080CED04 @ =gUnknown_2039A20 ldr r1, [r1] adds r1, 0x4 @@ -1769,7 +1769,7 @@ _080CECCE: adds r1, r0 b _080CEFDE .align 2, 0 -_080CED00: .4byte gUnknown_2037238 +_080CED00: .4byte gPlttBufferUnfaded + 0x40 _080CED04: .4byte gUnknown_2039A20 _080CED08: .4byte gTasks _080CED0C: @@ -3085,7 +3085,7 @@ _080CF86E: ldrh r0, [r4, 0xC] movs r1, 0 bl PlayCry1 - ldr r0, _080CF894 @ =gUnknown_2037238 + ldr r0, _080CF894 @ =gPlttBufferUnfaded + 0x40 ldr r1, _080CF898 @ =gUnknown_2039A20 ldr r1, [r1] adds r1, 0x4 @@ -3094,7 +3094,7 @@ _080CF86E: b _080CFA90 .align 2, 0 _080CF890: .4byte gTasks -_080CF894: .4byte gUnknown_2037238 +_080CF894: .4byte gPlttBufferUnfaded + 0x40 _080CF898: .4byte gUnknown_2039A20 _080CF89C: bl IsCryFinished diff --git a/asm/field_weather.s b/asm/field_weather.s index 36f7941c7..77a138ad2 100644 --- a/asm/field_weather.s +++ b/asm/field_weather.s @@ -22,7 +22,7 @@ sub_8079C08: @ 8079C08 lsrs r5, 24 ldr r0, _08079CD0 @ =gUnknown_83C2CE0 lsls r1, r5, 5 - ldr r2, _08079CD4 @ =gUnknown_20373F8 + ldr r2, _08079CD4 @ =gPlttBufferUnfaded + 0x200 adds r1, r2 ldr r2, _08079CD8 @ =0x04000008 bl CpuSet @@ -101,7 +101,7 @@ _08079CC4: .align 2, 0 _08079CCC: .4byte Task_WeatherMain _08079CD0: .4byte gUnknown_83C2CE0 -_08079CD4: .4byte gUnknown_20373F8 +_08079CD4: .4byte gPlttBufferUnfaded + 0x200 _08079CD8: .4byte 0x04000008 _08079CDC: .4byte gUnknown_2037F34 _08079CE0: .4byte 0x000006d5 diff --git a/asm/intro.s b/asm/intro.s index 45f4c6e1d..b3fe5a30c 100644 --- a/asm/intro.s +++ b/asm/intro.s @@ -2477,7 +2477,7 @@ _080EDA1C: ldr r2, _080EDA50 @ =0x00007fff adds r0, r2, 0 strh r0, [r1] - ldr r1, _080EDA54 @ =gUnknown_2037218 + ldr r1, _080EDA54 @ =gPlttBufferUnfaded + 0x20 ldr r2, _080EDA58 @ =0x01000020 add r0, sp, 0x4 bl CpuSet @@ -2492,7 +2492,7 @@ _080EDA1C: b _080EDA6E .align 2, 0 _080EDA50: .4byte 0x00007fff -_080EDA54: .4byte gUnknown_2037218 +_080EDA54: .4byte gPlttBufferUnfaded + 0x20 _080EDA58: .4byte 0x01000020 _080EDA5C: ldr r0, _080EDA78 @ =gPaletteFade diff --git a/asm/map_name_popup.s b/asm/map_name_popup.s index 3c67e682a..275c9f0a7 100644 --- a/asm/map_name_popup.s +++ b/asm/map_name_popup.s @@ -348,7 +348,7 @@ _080983B4: .4byte 0x00ffffff _080983B8: movs r0, 0x3 bl stdpal_get - ldr r1, _080983FC @ =gUnknown_2037398 + ldr r1, _080983FC @ =gPlttBufferUnfaded + 0x1A0 movs r2, 0x10 bl CpuSet _080983C6: @@ -374,7 +374,7 @@ _080983C6: pop {r1} bx r1 .align 2, 0 -_080983FC: .4byte gUnknown_2037398 +_080983FC: .4byte gPlttBufferUnfaded + 0x1A0 thumb_func_end sub_8098340 thumb_func_start sub_8098400 diff --git a/asm/party_menu.s b/asm/party_menu.s index 9754bb605..89121fe61 100644 --- a/asm/party_menu.s +++ b/asm/party_menu.s @@ -739,7 +739,7 @@ sub_811F03C: @ 811F03C push {r4,r5,lr} adds r4, r0, 0 lsls r4, 28 - ldr r5, _0811F068 @ =gUnknown_2037258 + ldr r5, _0811F068 @ =gPlttBufferUnfaded + 0x60 lsrs r4, 23 adds r1, r5, 0 subs r1, 0x60 @@ -757,7 +757,7 @@ sub_811F03C: @ 811F03C pop {r0} bx r0 .align 2, 0 -_0811F068: .4byte gUnknown_2037258 +_0811F068: .4byte gPlttBufferUnfaded + 0x60 _0811F06C: .4byte gPlttBufferFaded thumb_func_end sub_811F03C diff --git a/asm/pokemon_storage_system.s b/asm/pokemon_storage_system.s index 04dae118c..e76a6bcc2 100644 --- a/asm/pokemon_storage_system.s +++ b/asm/pokemon_storage_system.s @@ -12030,7 +12030,7 @@ _08091924: adds r1, r2 ldrb r1, [r1] lsls r1, 6 - ldr r2, _08091964 @ =gUnknown_2037278 + ldr r2, _08091964 @ =gPlttBufferUnfaded + 0x80 adds r1, r2 movs r2, 0x20 bl CpuSet @@ -12055,7 +12055,7 @@ _08091938: bx r0 .align 2, 0 _08091960: .4byte 0x000002d2 -_08091964: .4byte gUnknown_2037278 +_08091964: .4byte gPlttBufferUnfaded + 0x80 _08091968: .4byte gUnknown_20397B0 thumb_func_end sub_8091850 diff --git a/asm/title_screen.s b/asm/title_screen.s index 9e12dfbff..de70452ff 100644 --- a/asm/title_screen.s +++ b/asm/title_screen.s @@ -577,7 +577,7 @@ _08078DF2: bgt _08078E02 b _08078FB6 _08078E02: - ldr r0, _08078E20 @ =gUnknown_2037398 + ldr r0, _08078E20 @ =gPlttBufferUnfaded + 0x1A0 movs r1, 0x10 bl TintPalette_GrayScale2 movs r0, 0x80 @@ -590,7 +590,7 @@ _08078E02: bl BeginNormalPaletteFade b _08078F80 .align 2, 0 -_08078E20: .4byte gUnknown_2037398 +_08078E20: .4byte gPlttBufferUnfaded + 0x1A0 _08078E24: ldr r0, _08078E3C @ =gPaletteFade ldrb r1, [r0, 0x7] @@ -749,7 +749,7 @@ _08078F24: movs r0, 0 bl ShowBg ldr r0, _08078F90 @ =gUnknown_8EAD5E8 - ldr r1, _08078F94 @ =gUnknown_2037398 + ldr r1, _08078F94 @ =gPlttBufferUnfaded + 0x1A0 movs r2, 0x10 bl CpuSet movs r0, 0x80 @@ -772,7 +772,7 @@ _08078F80: _08078F88: .4byte 0x00001fff _08078F8C: .4byte 0x00007fde _08078F90: .4byte gUnknown_8EAD5E8 -_08078F94: .4byte gUnknown_2037398 +_08078F94: .4byte gPlttBufferUnfaded + 0x1A0 _08078F98: movs r0, 0 bl sub_807185C diff --git a/sym_ewram.txt b/sym_ewram.txt index dd96b15fd..a399afa95 100644 --- a/sym_ewram.txt +++ b/sym_ewram.txt @@ -762,46 +762,10 @@ gUnknown_2037108: @ 2037108 .space 0xF0 gPlttBufferUnfaded: @ 20371F8 - .space 0x2 - -gUnknown_20371FA: @ 20371FA - .space 0x1E - -gUnknown_2037218: @ 2037218 - .space 0x20 - -gUnknown_2037238: @ 2037238 - .space 0x20 - -gUnknown_2037258: @ 2037258 - .space 0x20 - -gUnknown_2037278: @ 2037278 - .space 0x120 - -gUnknown_2037398: @ 2037398 - .space 0x60 - -gUnknown_20373F8: @ 20373F8 - .space 0x10 - -gUnknown_2037408: @ 2037408 - .space 0x1F0 + .space 0x400 gPlttBufferFaded: @ 20375F8 - .space 0x2 - -gUnknown_20375FA: @ 20375FA - .space 0x3E - -gUnknown_2037638: @ 2037638 - .space 0x78 - -gUnknown_20376B0: @ 20376B0 - .space 0x148 - -gUnknown_20377F8: @ 20377F8 - .space 0x200 + .space 0x400 gUnknown_20379F8: @ 20379F8 .space 0xC0 -- cgit v1.2.3 From 0e8180b9bbf657a1c87d4be3ee559cd4115983c0 Mon Sep 17 00:00:00 2001 From: paul Date: Fri, 12 Oct 2018 23:24:19 +0200 Subject: clean up/redo previous labels --- asm/battle_1.s | 8 +- asm/egg_hatch.s | 4 +- asm/pokeball.s | 4 +- asm/trade.s | 4 +- data/graphics.s | 965 +++++++++++++------------------------------------------- 5 files changed, 229 insertions(+), 756 deletions(-) diff --git a/asm/battle_1.s b/asm/battle_1.s index 7ef803c32..cb1f6817c 100644 --- a/asm/battle_1.s +++ b/asm/battle_1.s @@ -298,7 +298,7 @@ LoadBattleTextboxAndBackground: @ 800F420 movs r1, 0xC0 lsls r1, 19 bl LZDecompressVram - ldr r1, _0800F458 @ =gMenuMapBin + ldr r1, _0800F458 @ =gFile_graphics_interface_menu_map_tilemap movs r0, 0 movs r2, 0 movs r3, 0 @@ -315,7 +315,7 @@ LoadBattleTextboxAndBackground: @ 800F420 bx r0 .align 2, 0 _0800F454: .4byte gUnknown_8D00000 -_0800F458: .4byte gMenuMapBin +_0800F458: .4byte gFile_graphics_interface_menu_map_tilemap _0800F45C: .4byte gUnknown_8D004D8 thumb_func_end LoadBattleTextboxAndBackground @@ -1393,7 +1393,7 @@ _0800FCEC: .align 2, 0 _0800FCF8: .4byte gUnknown_8D00000 _0800FCFC: - ldr r1, _0800FD10 @ =gMenuMapBin + ldr r1, _0800FD10 @ =gFile_graphics_interface_menu_map_tilemap movs r0, 0 movs r2, 0 movs r3, 0 @@ -1402,7 +1402,7 @@ _0800FCFC: bl CopyBgTilemapBufferToVram b _0800FD94 .align 2, 0 -_0800FD10: .4byte gMenuMapBin +_0800FD10: .4byte gFile_graphics_interface_menu_map_tilemap _0800FD14: ldr r0, _0800FD20 @ =gUnknown_8D004D8 movs r1, 0 diff --git a/asm/egg_hatch.s b/asm/egg_hatch.s index 884308c52..f18f3101d 100644 --- a/asm/egg_hatch.s +++ b/asm/egg_hatch.s @@ -648,7 +648,7 @@ _08047174: movs r2, 0 movs r3, 0 bl sub_80F696C - ldr r1, _080471A0 @ =gMenuMapBin + ldr r1, _080471A0 @ =gFile_graphics_interface_menu_map_tilemap movs r0, 0 movs r2, 0 movs r3, 0 @@ -660,7 +660,7 @@ _08047174: b _0804724A .align 2, 0 _0804719C: .4byte gUnknown_8D00000 -_080471A0: .4byte gMenuMapBin +_080471A0: .4byte gFile_graphics_interface_menu_map_tilemap _080471A4: .4byte gUnknown_8D004D8 _080471A8: ldr r0, _080471BC @ =gUnknown_826011C diff --git a/asm/pokeball.s b/asm/pokeball.s index a60a05040..11572c80f 100644 --- a/asm/pokeball.s +++ b/asm/pokeball.s @@ -2811,7 +2811,7 @@ _0804BF2C: bl GetSpriteTileStartByTag adds r1, r0, 0 lsls r1, 16 - ldr r0, _0804BF5C @ =gBallOpen4bpp + ldr r0, _0804BF5C @ =gFile_graphics_interface_ball_Open_sheet lsrs r1, 11 ldr r2, _0804BF60 @ =0x06010100 adds r1, r2 @@ -2824,7 +2824,7 @@ _0804BF48: _0804BF50: .4byte gUnknown_826056C _0804BF54: .4byte 0xffff0000 _0804BF58: .4byte gUnknown_82605CC -_0804BF5C: .4byte gBallOpen4bpp +_0804BF5C: .4byte gFile_graphics_interface_ball_Open_sheet _0804BF60: .4byte 0x06010100 thumb_func_end LoadBallGfx diff --git a/asm/trade.s b/asm/trade.s index 967e0f1fa..8a2041e5e 100644 --- a/asm/trade.s +++ b/asm/trade.s @@ -7850,7 +7850,7 @@ sub_80504CC: @ 80504CC movs r2, 0 movs r3, 0 bl sub_80F696C - ldr r0, _080505BC @ =gMenuMapBin + ldr r0, _080505BC @ =gFile_graphics_interface_menu_map_tilemap mov r8, r0 ldr r4, _080505C0 @ =gUnknown_201C000 adds r1, r4, 0 @@ -7897,7 +7897,7 @@ sub_80504CC: @ 80504CC .align 2, 0 _080505B4: .4byte gUnknown_826D1D4 _080505B8: .4byte gUnknown_8D00000 -_080505BC: .4byte gMenuMapBin +_080505BC: .4byte gFile_graphics_interface_menu_map_tilemap _080505C0: .4byte gUnknown_201C000 _080505C4: .4byte gUnknown_8D004D8 _080505C8: .4byte gUnknown_826D1BC diff --git a/data/graphics.s b/data/graphics.s index 64d7f94ec..b99fece55 100644 --- a/data/graphics.s +++ b/data/graphics.s @@ -7,9 +7,9 @@ gUnknown_8D004D8:: @ 8D004D8 .incbin "baserom.gba", 0xD004D8, 0x44 .align 2 -gMenuMapBin:: @ 8D0051C +gFile_graphics_interface_menu_map_tilemap:: @ 8D0051C .incbin "graphics/interface/menu_map.bin.lz" - + .align 2 gUnknown_8D00748:: @ 8D00748 .incbin "baserom.gba", 0xD00748, 0x488 @@ -23,519 +23,519 @@ gUnknown_8D00BE8:: @ 8D00BE8 .incbin "graphics/pokemon/palettes/circled_question_mark_shiny_palette.gbapal.lz" .align 2 -gOldCharmap4bpp:: @ 8D00C00 +gFile_graphics_unused_old_charmap_sheet:: @ 8D00C00 .incbin "graphics/unused/old_charmap.4bpp.lz" @from ruby - + .align 2 -gOldCharmapBin:: @ 8D013D8 +gFile_graphics_unused_old_charmap_tilemap:: @ 8D013D8 .incbin "graphics/unused/old_charmap.bin.lz" @from ruby - + .align 2 -gOldCharmapGbapal:: @ 8D01604 +gFile_graphics_unused_old_charmap_palette:: @ 8D01604 .incbin "graphics/unused/old_charmap.gbapal.lz" @from ruby - + .align 2 -gSmokescreenImpact4bpp:: @ 8D0162C +gFile_graphics_battle_anims_sprites_smokescreen_impact_sheet:: @ 8D0162C .incbin "graphics/battle_anims/sprites/smokescreen_impact.4bpp.lz" - + .align 2 -gSmokescreenImpactGbapal:: @ 8D0170C +gFile_graphics_battle_anims_sprites_smokescreen_impact_palette:: @ 8D0170C .incbin "graphics/battle_anims/sprites/smokescreen_impact.gbapal.lz" - + .align 2 -gBallPoke4bpp:: @ 8D01724 +gFile_graphics_interface_ball_Poke_sheet:: @ 8D01724 .incbin "graphics/interface/ball/poke.4bpp.lz" - + .align 2 -gBallPokeGbaPal:: @ 8D017E0 +gFile_graphics_interface_ball_Poke_palette:: @ 8D017E0 .incbin "graphics/interface/ball/poke.gbapal.lz" - + .align 2 -gBallGreat4bpp:: @ 8D01800 +gFile_graphics_interface_ball_Great_sheet:: @ 8D01800 .incbin "graphics/interface/ball/great.4bpp.lz" - + .align 2 -gBallGreatGbapal:: @ 8D018BC +gFile_graphics_interface_ball_Great_palette:: @ 8D018BC .incbin "graphics/interface/ball/great.gbapal.lz" - + .align 2 -gBallSafari4bpp:: @ 8D018E0 +gFile_graphics_interface_ball_Safari_sheet:: @ 8D018E0 .incbin "graphics/interface/ball/safari.4bpp.lz" - + .align 2 -gBallSafariGbapal:: @ 8D019A4 +gFile_graphics_interface_ball_Safari_palette:: @ 8D019A4 .incbin "graphics/interface/ball/safari.gbapal.lz" - + .align 2 -gBallUltra4bpp:: @ 8D019C8 +gFile_graphics_interface_ball_Ultra_sheet:: @ 8D019C8 .incbin "graphics/interface/ball/ultra.4bpp.lz" - + .align 2 -gBallUltraGbapal:: @ 8D01A7C +gFile_graphics_interface_ball_Ultra_palette:: @ 8D01A7C .incbin "graphics/interface/ball/ultra.gbapal.lz" - + .align 2 -gBallMaster4bpp:: @ 8D01A9C +gFile_graphics_interface_ball_Master_sheet:: @ 8D01A9C .incbin "graphics/interface/ball/master.4bpp.lz" - + .align 2 -gBallMasterGbapal:: @ 8D01B5C +gFile_graphics_interface_ball_Master_palette:: @ 8D01B5C .incbin "graphics/interface/ball/master.gbapal.lz" - + .align 2 -gBallNet4bpp:: @ 8D01B80 +gFile_graphics_interface_ball_Net_sheet:: @ 8D01B80 .incbin "graphics/interface/ball/net.4bpp.lz" - + .align 2 -gBallNetGbapal:: @ 8D01C40 +gFile_graphics_interface_ball_Net_palette:: @ 8D01C40 .incbin "graphics/interface/ball/net.gbapal.lz" - + .align 2 -gBallDive4bpp:: @ 8D01C60 +gFile_graphics_interface_ball_Dive_sheet:: @ 8D01C60 .incbin "graphics/interface/ball/dive.4bpp.lz" - + .align 2 -gBallDiveGbapal:: @ 8D01D74 +gFile_graphics_interface_ball_Dive_palette:: @ 8D01D74 .incbin "graphics/interface/ball/dive.gbapal.lz" - + .align 2 -gBallNest4bpp:: @ 8D01D9C +gFile_graphics_interface_ball_Nest_sheet:: @ 8D01D9C .incbin "graphics/interface/ball/nest.4bpp.lz" - + .align 2 -gBallNestGbapal:: @ 8D01E60 +gFile_graphics_interface_ball_Nest_palette:: @ 8D01E60 .incbin "graphics/interface/ball/nest.gbapal.lz" - + .align 2 -gBallRepeat4bpp:: @ 8D01E84 +gFile_graphics_interface_ball_Repeat_sheet:: @ 8D01E84 .incbin "graphics/interface/ball/repeat.4bpp.lz" - + .align 2 -gBallRepeatGbapal:: @ 8D01F44 +gFile_graphics_interface_ball_Repeat_palette:: @ 8D01F44 .incbin "graphics/interface/ball/repeat.gbapal.lz" - + .align 2 -gBallTimer4bpp:: @ 8D01F68 +gFile_graphics_interface_ball_Timer_sheet:: @ 8D01F68 .incbin "graphics/interface/ball/timer.4bpp.lz" - + .align 2 -gBallTimerGbapal:: @ 8D02060 +gFile_graphics_interface_ball_Timer_palette:: @ 8D02060 .incbin "graphics/interface/ball/timer.gbapal.lz" - + .align 2 -gBallLuxury4bpp:: @ 8D02084 +gFile_graphics_interface_ball_Luxury_sheet:: @ 8D02084 .incbin "graphics/interface/ball/luxury.4bpp.lz" - + .align 2 -gBallLuxuryGbapal:: @ 8D021B0 +gFile_graphics_interface_ball_Luxury_palette:: @ 8D021B0 .incbin "graphics/interface/ball/luxury.gbapal.lz" - + .align 2 -gBallPremier4bpp:: @ 8D021D8 +gFile_graphics_interface_ball_Premier_sheet:: @ 8D021D8 .incbin "graphics/interface/ball/premier.4bpp.lz" - + .align 2 -gBallPremierGbapal:: @ 8D022C8 +gFile_graphics_interface_ball_Premier_palette:: @ 8D022C8 .incbin "graphics/interface/ball/premier.gbapal.lz" - + .align 2 -gBallOpen4bpp:: @ 8D022E8 +gFile_graphics_interface_ball_Open_sheet:: @ 8D022E8 .incbin "graphics/interface/ball_open.4bpp.lz" - + .align 2 -gBlank4bpp:: @ 8D02364 +gFile_graphics_interface_blank_sheet:: @ 8D02364 .incbin "graphics/interface/blank.4bpp.lz" - + .align 2 -gSprite1464bpp:: @ 8D02460 +gFile_graphics_battle_anims_sprites_146_sheet:: @ 8D02460 .incbin "graphics/battle_anims/sprites/146.4bpp.lz" - + .align 2 -gSprite0004bpp:: @ 8D02520 +gFile_graphics_battle_anims_sprites_000_sheet:: @ 8D02520 .incbin "graphics/battle_anims/sprites/000.4bpp.lz" - + .align 2 -gSprite0034bpp:: @ 8D025D0 +gFile_graphics_battle_anims_sprites_003_sheet:: @ 8D025D0 .incbin "graphics/battle_anims/sprites/003.4bpp.lz" - + .align 2 -gSprite0044bpp:: @ 8D02644 +gFile_graphics_battle_anims_sprites_004_sheet:: @ 8D02644 .incbin "graphics/battle_anims/sprites/004.4bpp.lz" - + .align 2 -gSprite0054bpp:: @ 8D026F4 +gFile_graphics_battle_anims_sprites_005_sheet:: @ 8D026F4 .incbin "graphics/battle_anims/sprites/005.4bpp.lz" - + .align 2 -gSprite0064bpp:: @ 8D027C8 +gFile_graphics_battle_anims_sprites_006_sheet:: @ 8D027C8 .incbin "graphics/battle_anims/sprites/006.4bpp.lz" - + .align 2 -gSprite115Gbapal:: @ 8D02894 +gFile_graphics_battle_anims_sprites_115_palette:: @ 8D02894 .incbin "graphics/battle_anims/sprites/115.gbapal.lz" - + .align 2 -gSprite000Gbapal:: @ 8D028B4 +gFile_graphics_battle_anims_sprites_000_palette:: @ 8D028B4 .incbin "graphics/battle_anims/sprites/000.gbapal.lz" - + .align 2 -gSprite003Gbapal:: @ 8D028D8 +gFile_graphics_battle_anims_sprites_003_palette:: @ 8D028D8 .incbin "graphics/battle_anims/sprites/003.gbapal.lz" - + .align 2 -gSprite004Gbapal:: @ 8D02900 +gFile_graphics_battle_anims_sprites_004_palette:: @ 8D02900 .incbin "graphics/battle_anims/sprites/004.gbapal.lz" - + .align 2 -gSprite005Gbapal:: @ 8D02914 +gFile_graphics_battle_anims_sprites_005_palette:: @ 8D02914 .incbin "graphics/battle_anims/sprites/005.gbapal.lz" - + .align 2 -gSprite006Gbapal:: @ 8D0293C +gFile_graphics_battle_anims_sprites_006_palette:: @ 8D0293C .incbin "graphics/battle_anims/sprites/006.gbapal.lz" - + .align 2 -gSprite1614bpp:: @ 8D02964 +gFile_graphics_battle_anims_sprites_161_sheet:: @ 8D02964 .incbin "graphics/battle_anims/sprites/161.4bpp.lz" - + .align 2 -gSprite161Gbapal:: @ 8D0298C +gFile_graphics_battle_anims_sprites_161_palette:: @ 8D0298C .incbin "graphics/battle_anims/sprites/161.gbapal.lz" - + .align 2 -gSprite0074bpp:: @ 8D029B4 +gFile_graphics_battle_anims_sprites_007_sheet:: @ 8D029B4 .incbin "graphics/battle_anims/sprites/007.4bpp.lz" - + .align 2 -gSprite0074Gbapal:: @ 8D02B30 +gFile_graphics_battle_anims_sprites_007_palette:: @ 8D02B30 .incbin "graphics/battle_anims/sprites/007.gbapal.lz" - + .align 2 -gSprite0084bpp:: @ 8D02B50 +gFile_graphics_battle_anims_sprites_008_sheet:: @ 8D02B50 .incbin "graphics/battle_anims/sprites/008.4bpp.lz" - + .align 2 -gSprite008Gbapal:: @ 8D02B70 +gFile_graphics_battle_anims_sprites_008_palette:: @ 8D02B70 .incbin "graphics/battle_anims/sprites/008.gbapal.lz" - + .align 2 -gSprite010Gbapal:: @ 8D02B8C +gFile_graphics_battle_anims_sprites_010_palette:: @ 8D02B8C .incbin "graphics/battle_anims/sprites/010.gbapal.lz" - + .align 2 -gSprite0104bpp:: @ 8D02BAC +gFile_graphics_battle_anims_sprites_010_sheet:: @ 8D02BAC .incbin "graphics/battle_anims/sprites/010.4bpp.lz" - + .align 2 -gSprite0094bpp:: @ 8D02F8C +gFile_graphics_battle_anims_sprites_009_sheet:: @ 8D02F8C .incbin "graphics/battle_anims/sprites/009.4bpp.lz" - + .align 2 -gSprite009Gbapal:: @ 8D03274 +gFile_graphics_battle_anims_sprites_009_palette:: @ 8D03274 .incbin "graphics/battle_anims/sprites/009.gbapal.lz" .align 2 -gSprite0114bpp:: @ 8D03294 +gFile_graphics_battle_anims_sprites_011_sheet:: @ 8D03294 .incbin "graphics/battle_anims/sprites/011.4bpp.lz" - + .align 2 -gSprite011Gbapal:: @ 8D0330C +gFile_graphics_battle_anims_sprites_011_palette:: @ 8D0330C .incbin "graphics/battle_anims/sprites/011.gbapal.lz" - + .align 2 -gSprite0124bpp:: @ 8D03334 +gFile_graphics_battle_anims_sprites_012_sheet:: @ 8D03334 .incbin "graphics/battle_anims/sprites/012.4bpp.lz" - + .align 2 -gSprite012Gbapal:: @ 8D0339C +gFile_graphics_battle_anims_sprites_012_palette:: @ 8D0339C .incbin "graphics/battle_anims/sprites/012.gbapal.lz" - + .align 2 -gSprite1524bpp:: @ 8D033B4 +gFile_graphics_battle_anims_sprites_152_sheet:: @ 8D033B4 .incbin "graphics/battle_anims/sprites/152.4bpp.lz" - + .align 2 -gSprite152Gbapal:: @ 8D033FC +gFile_graphics_battle_anims_sprites_152_palette:: @ 8D033FC .incbin "graphics/battle_anims/sprites/152.gbapal.lz" - + .align 2 -gSprite0134bpp:: @ 8D03420 +gFile_graphics_battle_anims_sprites_013_sheet:: @ 8D03420 .incbin "graphics/battle_anims/sprites/013.4bpp.lz" - + .align 2 -gSprite013Gbapal:: @ 8D03454 +gFile_graphics_battle_anims_sprites_013_palette:: @ 8D03454 .incbin "graphics/battle_anims/sprites/013.gbapal.lz" - + .align 2 -gSprite0154bpp:: @ 8D0346C +gFile_graphics_battle_anims_sprites_015_sheet:: @ 8D0346C .incbin "graphics/battle_anims/sprites/015.4bpp.lz" - + .align 2 -gSprite015Gbapal:: @ 8D034D8 +gFile_graphics_battle_anims_sprites_015_palette:: @ 8D034D8 .incbin "graphics/battle_anims/sprites/015.gbapal.lz" - + .align 2 -gSprite0164bpp:: @ 8D03500 +gFile_graphics_battle_anims_sprites_016_sheet:: @ 8D03500 .incbin "graphics/battle_anims/sprites/016.4bpp.lz" - + .align 2 -gSprite016Gbapal:: @ 8D03570 +gFile_graphics_battle_anims_sprites_016_palette:: @ 8D03570 .incbin "graphics/battle_anims/sprites/016.gbapal.lz" - + .align 2 -gSprite0174bpp:: @ 8D03580 +gFile_graphics_battle_anims_sprites_017_sheet:: @ 8D03580 .incbin "graphics/battle_anims/sprites/017.4bpp.lz" - + .align 2 -gUnknown_8D035A0:: @ 8D035A0 +gFile_graphics_unknown_Unknown_8D035A0_sheet:: @ 8D035A0 .incbin "graphics/unknown/unknown_D035A0.4bpp.lz" - + .align 2 -gSprite019Gbapal:: @ 8D035C4 +gFile_graphics_battle_anims_sprites_019_palette:: @ 8D035C4 .incbin "graphics/battle_anims/sprites/019.gbapal.lz" - + .align 2 -gSprite0194bpp:: @ 8D035E0 +gFile_graphics_battle_anims_sprites_019_sheet:: @ 8D035E0 .incbin "graphics/battle_anims/sprites/019.4bpp.lz" - + .align 2 -gSprite0204bpp:: @ 8D036A0 +gFile_graphics_battle_anims_sprites_020_sheet:: @ 8D036A0 .incbin "graphics/battle_anims/sprites/020.4bpp.lz" - + .align 2 -gSprite020Gbapal:: @ 8D0376C +gFile_graphics_battle_anims_sprites_020_palette:: @ 8D0376C .incbin "graphics/battle_anims/sprites/020.gbapal.lz" - + .align 2 -gSprite023Gbapal:: @ 8D03794 +gFile_graphics_battle_anims_sprites_023_palette:: @ 8D03794 .incbin "graphics/battle_anims/sprites/023.gbapal.lz" - + .align 2 -gSprite0234bpp:: @ 8D037BC +gFile_graphics_battle_anims_sprites_023_sheet:: @ 8D037BC .incbin "graphics/battle_anims/sprites/023.4bpp.lz" - + .align 2 -gSprite023UnusedGbapal:: @ 8D038C4 +gFile_graphics_unused_battle_anim_023_palette:: @ 8D038C4 .incbin "graphics/unused/battle_anim_023.gbapal.lz" - + .align 2 -gSpriteMusicNotes4bpp:: @ 8D038EC +gFile_graphics_unused_music_notes_sheet:: @ 8D038EC .incbin "graphics/unused/music_notes.4bpp.lz" - + .align 2 -gSprite021Gbapal:: @ 8D039E8 +gFile_graphics_battle_anims_sprites_021_palette:: @ 8D039E8 .incbin "graphics/battle_anims/sprites/021.gbapal.lz" - + .align 2 -gSprite0214bpp:: @ 8D03A10 +gFile_graphics_battle_anims_sprites_021_sheet:: @ 8D03A10 .incbin "graphics/battle_anims/sprites/021.4bpp.lz" - + .align 2 -gSprite022Gbapal:: @ 8D03D48 +gFile_graphics_battle_anims_sprites_022_palette:: @ 8D03D48 .incbin "graphics/battle_anims/sprites/022.gbapal.lz" - + .align 2 -gSprite025Gbapal:: @ 8D03D70 +gFile_graphics_battle_anims_sprites_025_palette:: @ 8D03D70 .incbin "graphics/battle_anims/sprites/025.gbapal.lz" - + .align 2 -gSprite0254bpp:: @ 8D03D98 +gFile_graphics_battle_anims_sprites_025_sheet:: @ 8D03D98 .incbin "graphics/battle_anims/sprites/025.4bpp.lz" - + .align 2 -gSprite0244bpp:: @ 8D03E88 +gFile_graphics_battle_anims_sprites_024_sheet:: @ 8D03E88 .incbin "graphics/battle_anims/sprites/024.4bpp.lz" - + .align 2 -gSprite024Gbapal:: @ 8D03F54 +gFile_graphics_battle_anims_sprites_024_palette:: @ 8D03F54 .incbin "graphics/battle_anims/sprites/024.gbapal.lz" - + .align 2 -gSprite0314bpp:: @ 8D03F68 +gFile_graphics_battle_anims_sprites_031_sheet:: @ 8D03F68 .incbin "graphics/battle_anims/sprites/031.4bpp.lz" - + .align 2 -gSprite031Gbapal:: @ 8D04348 +gFile_graphics_battle_anims_sprites_031_palette:: @ 8D04348 .incbin "graphics/battle_anims/sprites/031.gbapal.lz" - + .align 2 -gSprite032Gbapal:: @ 8D04368 +gFile_graphics_battle_anims_sprites_032_palette:: @ 8D04368 .incbin "graphics/battle_anims/sprites/032.gbapal.lz" - + .align 2 -gSprite0324bpp:: @ 8D04390 +gFile_graphics_battle_anims_sprites_032_sheet:: @ 8D04390 .incbin "graphics/battle_anims/sprites/032.4bpp.lz" - + .align 2 -gSprite0264bpp:: @ 8D0447C +gFile_graphics_battle_anims_sprites_026_sheet:: @ 8D0447C .incbin "graphics/battle_anims/sprites/026.4bpp.lz" - + .align 2 -gSprite026Gbapal:: @ 8D047B4 +gFile_graphics_battle_anims_sprites_026_palette:: @ 8D047B4 .incbin "graphics/battle_anims/sprites/026.gbapal.lz" - + .align 2 -gSprite027Gbapal:: @ 8D047DC +gFile_graphics_battle_anims_sprites_027_palette:: @ 8D047DC .incbin "graphics/battle_anims/sprites/027.gbapal.lz" - + .align 2 -gSprite0274bpp:: @ 8D04804 +gFile_graphics_battle_anims_sprites_027_sheet:: @ 8D04804 .incbin "graphics/battle_anims/sprites/027.4bpp.lz" .align 2 -gSprite028Gbapal:: @ 8D04B00 +gFile_graphics_battle_anims_sprites_028_palette:: @ 8D04B00 .incbin "graphics/battle_anims/sprites/028.gbapal.lz" .align 2 -gSprite0284bpp:: @ 8D04B28 +gFile_graphics_battle_anims_sprites_028_sheet:: @ 8D04B28 .incbin "graphics/battle_anims/sprites/028.4bpp.lz" .align 2 -gSprite0294bpp:: @ 8D04E78 +gFile_graphics_battle_anims_sprites_029_sheet:: @ 8D04E78 .incbin "graphics/battle_anims/sprites/029.4bpp.lz" .align 2 -gSprite029Gbapal:: @ 8D05130 +gFile_graphics_battle_anims_sprites_029_palette:: @ 8D05130 .incbin "graphics/battle_anims/sprites/029.gbapal.lz" .align 2 -gSprite0304bpp:: @ 8D05158 +gFile_graphics_battle_anims_sprites_030_sheet:: @ 8D05158 .incbin "graphics/battle_anims/sprites/030.4bpp.lz" .align 2 -gSprite030Gbapal:: @ 8D05518 +gFile_graphics_battle_anims_sprites_030_palette:: @ 8D05518 .incbin "graphics/battle_anims/sprites/030.gbapal.lz" .align 2 -gSprite033Gbapal:: @ 8D0553C +gFile_graphics_battle_anims_sprites_033_palette:: @ 8D0553C .incbin "graphics/battle_anims/sprites/033.gbapal.lz" .align 2 -gSprite0334bpp:: @ 8D05564 +gFile_graphics_battle_anims_sprites_033_sheet:: @ 8D05564 .incbin "graphics/battle_anims/sprites/033.4bpp.lz" .align 2 -gSprite0344bpp:: @ 8D05ED4 +gFile_graphics_battle_anims_sprites_034_sheet:: @ 8D05ED4 .incbin "graphics/battle_anims/sprites/034.4bpp.lz" .align 2 -gSprite0354bpp:: @ 8D062A0 +gFile_graphics_battle_anims_sprites_035_sheet:: @ 8D062A0 .incbin "graphics/battle_anims/sprites/035.4bpp.lz" .align 2 -gSprite036Gbapal:: @ 8D06638 +gFile_graphics_battle_anims_sprites_036_palette:: @ 8D06638 .incbin "graphics/battle_anims/sprites/036.gbapal.lz" .align 2 -gSprite0364bpp:: @ 8D06660 +gFile_graphics_battle_anims_sprites_036_sheet:: @ 8D06660 .incbin "graphics/battle_anims/sprites/036.4bpp.lz" .align 2 -gSprite0374bpp:: @ 8D06A34 +gFile_graphics_battle_anims_sprites_037_sheet:: @ 8D06A34 .incbin "graphics/battle_anims/sprites/037.4bpp.lz" .align 2 -gUnknown_D06D804bpp:: @ 8D06D80 +gFile_graphics_unknown_unknown_D06D80_sheet:: @ 8D06D80 .incbin "graphics/unknown/unknown_D06D80.4bpp.lz" .align 2 -gUnknown_D06D80Gbapal:: @ 8D06DC4 +gFile_graphics_unknown_unknown_D06D80_palette:: @ 8D06DC4 .incbin "graphics/unknown/unknown_D06D80.gbapal.lz" .align 2 -gUnknown_D06D80Gbapal2:: @ 8D06DD8 +gFile_graphics_unknown_unknown_D06D80_2_palette:: @ 8D06DD8 .incbin "graphics/unknown/unknown_D06D80_2.gbapal.lz" .align 2 -gUnusedObi14bpp:: @ 8D06E0C +gFile_graphics_unused_obi1_sheet:: @ 8D06E0C .incbin "graphics/unused/obi1.4bpp.lz" .align 2 -gUnusedObiPalpak1Gbapal:: @ 8D07170 +gFile_graphics_unused_obi_palpak1_palette:: @ 8D07170 .incbin "graphics/unused/obi_palpak1.gbapal.lz" .align 2 -gUnusedOldPal4Gbapal:: @ 8D071B4 +gFile_graphics_unused_old_pal4_palette:: @ 8D071B4 .incbin "graphics/unused/old_pal4.gbapal.lz" .align 2 -gUnusedObiPalpak3Gbapal:: @ 8D071CC +gFile_graphics_unused_obi_palpak3_palette:: @ 8D071CC .incbin "graphics/unused/obi_palpak3.gbapal.lz" .align 2 -gUnusedObi24bpp:: @ 8D07224 +gFile_graphics_unused_obi2_sheet:: @ 8D07224 .incbin "graphics/unused/obi2.4bpp.lz" .align 2 -gUnusedOldBattleInterfaceTilemapBin:: @ 8D077EC +gFile_graphics_unused_old_battle_interface_tilemap:: @ 8D077EC .incbin "graphics/unused/old_battle_interface_tilemap.bin.lz" .align 2 -gSprite038Gbapal:: @ 8D078FC +gFile_graphics_battle_anims_sprites_038_palette:: @ 8D078FC .incbin "graphics/battle_anims/sprites/038.gbapal.lz" .align 2 -gSprite039Gbapal:: @ 8D07924 +gFile_graphics_battle_anims_sprites_039_palette:: @ 8D07924 .incbin "graphics/battle_anims/sprites/039.gbapal.lz" .align 2 -gSprite0384bpp:: @ 8D0794C +gFile_graphics_battle_anims_sprites_038_sheet:: @ 8D0794C .incbin "graphics/battle_anims/sprites/038.4bpp.lz" .align 2 -gSprite0394bpp:: @ 8D07B70 +gFile_graphics_battle_anims_sprites_039_sheet:: @ 8D07B70 .incbin "graphics/battle_anims/sprites/039.4bpp.lz" .align 2 -gSprite0404bpp:: @ 8D07E6C +gFile_graphics_battle_anims_sprites_040_sheet:: @ 8D07E6C .incbin "graphics/battle_anims/sprites/040.4bpp.lz" .align 2 -gSprite0414bpp:: @ 8D08078 +gFile_graphics_battle_anims_sprites_041_sheet:: @ 8D08078 .incbin "graphics/battle_anims/sprites/041.4bpp.lz" .align 2 -gIntefacePartyMenuHpBar4bpp:: @ 8D08218 +gFile_graphics_interface_party_menu_hpbar_sheet:: @ 8D08218 .incbin "graphics/interface/party_menu_hpbar.4bpp.lz" .align 2 -gSprite0424bpp:: @ 8D082AC +gFile_graphics_battle_anims_sprites_042_sheet:: @ 8D082AC .incbin "graphics/battle_anims/sprites/042.4bpp.lz" .align 2 -gSprite042Gbapal:: @ 8D0857C +gFile_graphics_battle_anims_sprites_042_palette:: @ 8D0857C .incbin "graphics/battle_anims/sprites/042.gbapal.lz" .align 2 -gSprite0434bpp:: @ 8D085A4 +gFile_graphics_battle_anims_sprites_043_sheet:: @ 8D085A4 .incbin "graphics/battle_anims/sprites/043.4bpp.lz" .align 2 -gSprite043Gbapal:: @ 8D089A4 +gFile_graphics_battle_anims_sprites_043_palette:: @ 8D089A4 .incbin "graphics/battle_anims/sprites/043.gbapal.lz" .align 2 -gSprite044Gbapal:: @ 8D089CC +gFile_graphics_battle_anims_sprites_044_palette:: @ 8D089CC .incbin "graphics/battle_anims/sprites/044.gbapal.lz" .align 2 -gSprite0444bpp:: @ 8D089F4 +gFile_graphics_battle_anims_sprites_044_sheet:: @ 8D089F4 .incbin "graphics/battle_anims/sprites/044.4bpp.lz" .align 2 -gSprite045Gbapal:: @ 8D08C60 +gFile_graphics_battle_anims_sprites_045_palette:: @ 8D08C60 .incbin "graphics/battle_anims/sprites/045.gbapal.lz" .align 2 -gSprite0454bpp:: @ 8D08C88 +gFile_graphics_battle_anims_sprites_045_sheet:: @ 8D08C88 .incbin "graphics/battle_anims/sprites/045.4bpp.lz" .align 2 -gBattleInterfaceUnusedWindow4bpp:: @ 8D08EF4 +gFile_graphics_battle_interface_unused_window_sheet:: @ 8D08EF4 .incbin "graphics/battle_interface/unused_window.4bpp.lz" .align 2 -gBattleInterfaceUnusedWindowGbapal:: @ 8D093B0 +gFile_graphics_battle_interface_unused_window_palette:: @ 8D093B0 .incbin "graphics/battle_interface/unused_window.gbapal.lz" ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; @@ -646,689 +646,534 @@ gUnknown_8D2EC70:: @ 8D2EC70 gUnknown_8D2FBB4:: @ 8D2FBB4 .incbin "baserom.gba", 0xD2FBB4, 0x20 - .align 2 gFile_graphics_pokemon_front_pics_bulbasaur_still_front_pic:: @ 8D2FBD4 .incbin "graphics/pokemon/front_pics/bulbasaur_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xD2FBD4, 0x02A4 .align 2 gFile_graphics_pokemon_palettes_bulbasaur_palette:: @ 8D2FE78 .incbin "graphics/pokemon/palettes/bulbasaur_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xD2FE78, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_bulbasaur_back_pic:: @ 8D2FEA0 .incbin "graphics/pokemon/back_pics/bulbasaur_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xD2FEA0, 0x02C4 .align 2 gFile_graphics_pokemon_palettes_bulbasaur_shiny_palette:: @ 8D30164 .incbin "graphics/pokemon/palettes/bulbasaur_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xD30164, 0x0028 .align 2 gFile_graphics_pokemon_icons_bulbasaur_icon:: @ 8D3018C .incbin "graphics/pokemon/icons/bulbasaur_icon.4bpp" - @ .incbin "baserom.gba", 0xD3018C, 0x0400 .align 2 gFile_graphics_pokemon_footprints_bulbasaur_footprint:: @ 8D3058C .incbin "graphics/pokemon/footprints/bulbasaur_footprint.1bpp" - @ .incbin "baserom.gba", 0xD3058C, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_ivysaur_still_front_pic:: @ 8D305AC .incbin "graphics/pokemon/front_pics/ivysaur_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xD305AC, 0x033C .align 2 gFile_graphics_pokemon_palettes_ivysaur_palette:: @ 8D308E8 .incbin "graphics/pokemon/palettes/ivysaur_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xD308E8, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_ivysaur_back_pic:: @ 8D30910 .incbin "graphics/pokemon/back_pics/ivysaur_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xD30910, 0x0354 .align 2 gFile_graphics_pokemon_palettes_ivysaur_shiny_palette:: @ 8D30C64 .incbin "graphics/pokemon/palettes/ivysaur_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xD30C64, 0x0028 .align 2 gFile_graphics_pokemon_icons_ivysaur_icon:: @ 8D30C8C .incbin "graphics/pokemon/icons/ivysaur_icon.4bpp" - @ .incbin "baserom.gba", 0xD30C8C, 0x0400 .align 2 gFile_graphics_pokemon_footprints_ivysaur_footprint:: @ 8D3108C .incbin "graphics/pokemon/footprints/ivysaur_footprint.1bpp" - @ .incbin "baserom.gba", 0xD3108C, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_venusaur_still_front_pic:: @ 8D310AC .incbin "graphics/pokemon/front_pics/venusaur_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xD310AC, 0x0540 .align 2 gFile_graphics_pokemon_palettes_venusaur_palette:: @ 8D315EC .incbin "graphics/pokemon/palettes/venusaur_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xD315EC, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_venusaur_back_pic:: @ 8D31614 .incbin "graphics/pokemon/back_pics/venusaur_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xD31614, 0x04C8 .align 2 gFile_graphics_pokemon_palettes_venusaur_shiny_palette:: @ 8D31ADC .incbin "graphics/pokemon/palettes/venusaur_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xD31ADC, 0x0028 .align 2 gFile_graphics_pokemon_icons_venusaur_icon:: @ 8D31B04 .incbin "graphics/pokemon/icons/venusaur_icon.4bpp" - @ .incbin "baserom.gba", 0xD31B04, 0x0400 .align 2 gFile_graphics_pokemon_footprints_venusaur_footprint:: @ 8D31F04 .incbin "graphics/pokemon/footprints/venusaur_footprint.1bpp" - @ .incbin "baserom.gba", 0xD31F04, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_charmander_still_front_pic:: @ 8D31F24 .incbin "graphics/pokemon/front_pics/charmander_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xD31F24, 0x02A0 .align 2 gFile_graphics_pokemon_palettes_charmander_palette:: @ 8D321C4 .incbin "graphics/pokemon/palettes/charmander_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xD321C4, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_charmander_back_pic:: @ 8D321EC .incbin "graphics/pokemon/back_pics/charmander_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xD321EC, 0x0284 .align 2 gFile_graphics_pokemon_palettes_charmander_shiny_palette:: @ 8D32470 .incbin "graphics/pokemon/palettes/charmander_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xD32470, 0x0028 .align 2 gFile_graphics_pokemon_icons_charmander_icon:: @ 8D32498 .incbin "graphics/pokemon/icons/charmander_icon.4bpp" - @ .incbin "baserom.gba", 0xD32498, 0x0400 .align 2 gFile_graphics_pokemon_footprints_charmander_footprint:: @ 8D32898 .incbin "graphics/pokemon/footprints/charmander_footprint.1bpp" - @ .incbin "baserom.gba", 0xD32898, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_charmeleon_still_front_pic:: @ 8D328B8 .incbin "graphics/pokemon/front_pics/charmeleon_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xD328B8, 0x03AC .align 2 gFile_graphics_pokemon_palettes_charmeleon_palette:: @ 8D32C64 .incbin "graphics/pokemon/palettes/charmeleon_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xD32C64, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_charmeleon_back_pic:: @ 8D32C8C .incbin "graphics/pokemon/back_pics/charmeleon_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xD32C8C, 0x02F4 .align 2 gFile_graphics_pokemon_palettes_charmeleon_shiny_palette:: @ 8D32F80 .incbin "graphics/pokemon/palettes/charmeleon_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xD32F80, 0x0028 .align 2 gFile_graphics_pokemon_icons_charmeleon_icon:: @ 8D32FA8 .incbin "graphics/pokemon/icons/charmeleon_icon.4bpp" - @ .incbin "baserom.gba", 0xD32FA8, 0x0400 .align 2 gFile_graphics_pokemon_footprints_charmeleon_footprint:: @ 8D333A8 .incbin "graphics/pokemon/footprints/charmeleon_footprint.1bpp" - @ .incbin "baserom.gba", 0xD333A8, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_charizard_still_front_pic:: @ 8D333C8 .incbin "graphics/pokemon/front_pics/charizard_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xD333C8, 0x04FC .align 2 gFile_graphics_pokemon_palettes_charizard_palette:: @ 8D338C4 .incbin "graphics/pokemon/palettes/charizard_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xD338C4, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_charizard_back_pic:: @ 8D338EC .incbin "graphics/pokemon/back_pics/charizard_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xD338EC, 0x040C .align 2 gFile_graphics_pokemon_palettes_charizard_shiny_palette:: @ 8D33CF8 .incbin "graphics/pokemon/palettes/charizard_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xD33CF8, 0x0028 .align 2 gFile_graphics_pokemon_icons_charizard_icon:: @ 8D33D20 .incbin "graphics/pokemon/icons/charizard_icon.4bpp" - @ .incbin "baserom.gba", 0xD33D20, 0x0400 .align 2 gFile_graphics_pokemon_footprints_charizard_footprint:: @ 8D34120 .incbin "graphics/pokemon/footprints/charizard_footprint.1bpp" - @ .incbin "baserom.gba", 0xD34120, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_squirtle_still_front_pic:: @ 8D34140 .incbin "graphics/pokemon/front_pics/squirtle_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xD34140, 0x029C .align 2 gFile_graphics_pokemon_palettes_squirtle_palette:: @ 8D343DC .incbin "graphics/pokemon/palettes/squirtle_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xD343DC, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_squirtle_back_pic:: @ 8D34404 .incbin "graphics/pokemon/back_pics/squirtle_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xD34404, 0x0288 .align 2 gFile_graphics_pokemon_palettes_squirtle_shiny_palette:: @ 8D3468C .incbin "graphics/pokemon/palettes/squirtle_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xD3468C, 0x0028 .align 2 gFile_graphics_pokemon_icons_squirtle_icon:: @ 8D346B4 .incbin "graphics/pokemon/icons/squirtle_icon.4bpp" - @ .incbin "baserom.gba", 0xD346B4, 0x0400 .align 2 gFile_graphics_pokemon_footprints_squirtle_footprint:: @ 8D34AB4 .incbin "graphics/pokemon/footprints/squirtle_footprint.1bpp" - @ .incbin "baserom.gba", 0xD34AB4, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_wartortle_still_front_pic:: @ 8D34AD4 .incbin "graphics/pokemon/front_pics/wartortle_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xD34AD4, 0x03AC .align 2 gFile_graphics_pokemon_palettes_wartortle_palette:: @ 8D34E80 .incbin "graphics/pokemon/palettes/wartortle_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xD34E80, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_wartortle_back_pic:: @ 8D34EA8 .incbin "graphics/pokemon/back_pics/wartortle_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xD34EA8, 0x0348 .align 2 gFile_graphics_pokemon_palettes_wartortle_shiny_palette:: @ 8D351F0 .incbin "graphics/pokemon/palettes/wartortle_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xD351F0, 0x0028 .align 2 gFile_graphics_pokemon_icons_wartortle_icon:: @ 8D35218 .incbin "graphics/pokemon/icons/wartortle_icon.4bpp" - @ .incbin "baserom.gba", 0xD35218, 0x0400 .align 2 gFile_graphics_pokemon_footprints_wartortle_footprint:: @ 8D35618 .incbin "graphics/pokemon/footprints/wartortle_footprint.1bpp" - @ .incbin "baserom.gba", 0xD35618, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_blastoise_still_front_pic:: @ 8D35638 .incbin "graphics/pokemon/front_pics/blastoise_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xD35638, 0x0504 .align 2 gFile_graphics_pokemon_palettes_blastoise_palette:: @ 8D35B3C .incbin "graphics/pokemon/palettes/blastoise_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xD35B3C, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_blastoise_back_pic:: @ 8D35B64 .incbin "graphics/pokemon/back_pics/blastoise_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xD35B64, 0x0414 .align 2 gFile_graphics_pokemon_palettes_blastoise_shiny_palette:: @ 8D35F78 .incbin "graphics/pokemon/palettes/blastoise_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xD35F78, 0x0028 .align 2 gFile_graphics_pokemon_icons_blastoise_icon:: @ 8D35FA0 .incbin "graphics/pokemon/icons/blastoise_icon.4bpp" - @ .incbin "baserom.gba", 0xD35FA0, 0x0400 .align 2 gFile_graphics_pokemon_footprints_blastoise_footprint:: @ 8D363A0 .incbin "graphics/pokemon/footprints/blastoise_footprint.1bpp" - @ .incbin "baserom.gba", 0xD363A0, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_caterpie_still_front_pic:: @ 8D363C0 .incbin "graphics/pokemon/front_pics/caterpie_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xD363C0, 0x0258 .align 2 gFile_graphics_pokemon_palettes_caterpie_palette:: @ 8D36618 .incbin "graphics/pokemon/palettes/caterpie_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xD36618, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_caterpie_back_pic:: @ 8D36640 .incbin "graphics/pokemon/back_pics/caterpie_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xD36640, 0x0288 .align 2 gFile_graphics_pokemon_palettes_caterpie_shiny_palette:: @ 8D368C8 .incbin "graphics/pokemon/palettes/caterpie_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xD368C8, 0x0028 .align 2 gFile_graphics_pokemon_icons_caterpie_icon:: @ 8D368F0 .incbin "graphics/pokemon/icons/caterpie_icon.4bpp" - @ .incbin "baserom.gba", 0xD368F0, 0x0400 .align 2 gFile_graphics_pokemon_footprints_caterpie_footprint:: @ 8D36CF0 .incbin "graphics/pokemon/footprints/caterpie_footprint.1bpp" - @ .incbin "baserom.gba", 0xD36CF0, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_metapod_still_front_pic:: @ 8D36D10 .incbin "graphics/pokemon/front_pics/metapod_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xD36D10, 0x021C .align 2 gFile_graphics_pokemon_palettes_metapod_palette:: @ 8D36F2C .incbin "graphics/pokemon/palettes/metapod_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xD36F2C, 0x0020 .align 2 gFile_graphics_pokemon_back_pics_metapod_back_pic:: @ 8D36F4C .incbin "graphics/pokemon/back_pics/metapod_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xD36F4C, 0x021C .align 2 gFile_graphics_pokemon_palettes_metapod_shiny_palette:: @ 8D37168 .incbin "graphics/pokemon/palettes/metapod_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xD37168, 0x0020 .align 2 gFile_graphics_pokemon_icons_metapod_icon:: @ 8D37188 .incbin "graphics/pokemon/icons/metapod_icon.4bpp" - @ .incbin "baserom.gba", 0xD37188, 0x0400 .align 2 gFile_graphics_pokemon_footprints_metapod_footprint:: @ 8D37588 .incbin "graphics/pokemon/footprints/metapod_footprint.1bpp" - @ .incbin "baserom.gba", 0xD37588, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_butterfree_still_front_pic:: @ 8D375A8 .incbin "graphics/pokemon/front_pics/butterfree_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xD375A8, 0x0378 .align 2 gFile_graphics_pokemon_palettes_butterfree_palette:: @ 8D37920 .incbin "graphics/pokemon/palettes/butterfree_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xD37920, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_butterfree_back_pic:: @ 8D37948 .incbin "graphics/pokemon/back_pics/butterfree_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xD37948, 0x0404 .align 2 gFile_graphics_pokemon_palettes_butterfree_shiny_palette:: @ 8D37D4C .incbin "graphics/pokemon/palettes/butterfree_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xD37D4C, 0x0028 .align 2 gFile_graphics_pokemon_icons_butterfree_icon:: @ 8D37D74 .incbin "graphics/pokemon/icons/butterfree_icon.4bpp" - @ .incbin "baserom.gba", 0xD37D74, 0x0400 .align 2 gFile_graphics_pokemon_footprints_butterfree_footprint:: @ 8D38174 .incbin "graphics/pokemon/footprints/butterfree_footprint.1bpp" - @ .incbin "baserom.gba", 0xD38174, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_weedle_still_front_pic:: @ 8D38194 .incbin "graphics/pokemon/front_pics/weedle_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xD38194, 0x023C .align 2 gFile_graphics_pokemon_palettes_weedle_palette:: @ 8D383D0 .incbin "graphics/pokemon/palettes/weedle_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xD383D0, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_weedle_back_pic:: @ 8D383F8 .incbin "graphics/pokemon/back_pics/weedle_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xD383F8, 0x0268 .align 2 gFile_graphics_pokemon_palettes_weedle_shiny_palette:: @ 8D38660 .incbin "graphics/pokemon/palettes/weedle_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xD38660, 0x0028 .align 2 gFile_graphics_pokemon_icons_weedle_icon:: @ 8D38688 .incbin "graphics/pokemon/icons/weedle_icon.4bpp" - @ .incbin "baserom.gba", 0xD38688, 0x0400 .align 2 gFile_graphics_pokemon_footprints_weedle_footprint:: @ 8D38A88 .incbin "graphics/pokemon/footprints/weedle_footprint.1bpp" - @ .incbin "baserom.gba", 0xD38A88, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_kakuna_still_front_pic:: @ 8D38AA8 .incbin "graphics/pokemon/front_pics/kakuna_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xD38AA8, 0x0240 .align 2 gFile_graphics_pokemon_palettes_kakuna_palette:: @ 8D38CE8 .incbin "graphics/pokemon/palettes/kakuna_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xD38CE8, 0x0024 .align 2 gFile_graphics_pokemon_back_pics_kakuna_back_pic:: @ 8D38D0C .incbin "graphics/pokemon/back_pics/kakuna_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xD38D0C, 0x0284 .align 2 gFile_graphics_pokemon_palettes_kakuna_shiny_palette:: @ 8D38F90 .incbin "graphics/pokemon/palettes/kakuna_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xD38F90, 0x0024 .align 2 gFile_graphics_pokemon_icons_kakuna_icon:: @ 8D38FB4 .incbin "graphics/pokemon/icons/kakuna_icon.4bpp" - @ .incbin "baserom.gba", 0xD38FB4, 0x0400 .align 2 gFile_graphics_pokemon_footprints_kakuna_footprint:: @ 8D393B4 .incbin "graphics/pokemon/footprints/kakuna_footprint.1bpp" - @ .incbin "baserom.gba", 0xD393B4, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_beedrill_still_front_pic:: @ 8D393D4 .incbin "graphics/pokemon/front_pics/beedrill_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xD393D4, 0x0420 .align 2 gFile_graphics_pokemon_palettes_beedrill_palette:: @ 8D397F4 .incbin "graphics/pokemon/palettes/beedrill_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xD397F4, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_beedrill_back_pic:: @ 8D3981C .incbin "graphics/pokemon/back_pics/beedrill_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xD3981C, 0x0374 .align 2 gFile_graphics_pokemon_palettes_beedrill_shiny_palette:: @ 8D39B90 .incbin "graphics/pokemon/palettes/beedrill_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xD39B90, 0x0028 .align 2 gFile_graphics_pokemon_icons_beedrill_icon:: @ 8D39BB8 .incbin "graphics/pokemon/icons/beedrill_icon.4bpp" - @ .incbin "baserom.gba", 0xD39BB8, 0x0400 .align 2 gFile_graphics_pokemon_footprints_beedrill_footprint:: @ 8D39FB8 .incbin "graphics/pokemon/footprints/beedrill_footprint.1bpp" - @ .incbin "baserom.gba", 0xD39FB8, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_pidgey_still_front_pic:: @ 8D39FD8 .incbin "graphics/pokemon/front_pics/pidgey_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xD39FD8, 0x0278 .align 2 gFile_graphics_pokemon_palettes_pidgey_palette:: @ 8D3A250 .incbin "graphics/pokemon/palettes/pidgey_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xD3A250, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_pidgey_back_pic:: @ 8D3A278 .incbin "graphics/pokemon/back_pics/pidgey_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xD3A278, 0x0354 .align 2 gFile_graphics_pokemon_palettes_pidgey_shiny_palette:: @ 8D3A5CC .incbin "graphics/pokemon/palettes/pidgey_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xD3A5CC, 0x0028 .align 2 gFile_graphics_pokemon_icons_pidgey_icon:: @ 8D3A5F4 .incbin "graphics/pokemon/icons/pidgey_icon.4bpp" - @ .incbin "baserom.gba", 0xD3A5F4, 0x0400 .align 2 gFile_graphics_pokemon_footprints_pidgey_footprint:: @ 8D3A9F4 .incbin "graphics/pokemon/footprints/pidgey_footprint.1bpp" - @ .incbin "baserom.gba", 0xD3A9F4, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_pidgeotto_still_front_pic:: @ 8D3AA14 .incbin "graphics/pokemon/front_pics/pidgeotto_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xD3AA14, 0x0398 .align 2 gFile_graphics_pokemon_palettes_pidgeotto_palette:: @ 8D3ADAC .incbin "graphics/pokemon/palettes/pidgeotto_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xD3ADAC, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_pidgeotto_back_pic:: @ 8D3ADD4 .incbin "graphics/pokemon/back_pics/pidgeotto_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xD3ADD4, 0x034C .align 2 gFile_graphics_pokemon_palettes_pidgeotto_shiny_palette:: @ 8D3B120 .incbin "graphics/pokemon/palettes/pidgeotto_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xD3B120, 0x0028 .align 2 gFile_graphics_pokemon_icons_pidgeotto_icon:: @ 8D3B148 .incbin "graphics/pokemon/icons/pidgeotto_icon.4bpp" - @ .incbin "baserom.gba", 0xD3B148, 0x0400 .align 2 gFile_graphics_pokemon_footprints_pidgeotto_footprint:: @ 8D3B548 .incbin "graphics/pokemon/footprints/pidgeotto_footprint.1bpp" - @ .incbin "baserom.gba", 0xD3B548, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_pidgeot_still_front_pic:: @ 8D3B568 .incbin "graphics/pokemon/front_pics/pidgeot_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xD3B568, 0x04EC .align 2 gFile_graphics_pokemon_palettes_pidgeot_palette:: @ 8D3BA54 .incbin "graphics/pokemon/palettes/pidgeot_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xD3BA54, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_pidgeot_back_pic:: @ 8D3BA7C .incbin "graphics/pokemon/back_pics/pidgeot_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xD3BA7C, 0x03E8 .align 2 gFile_graphics_pokemon_palettes_pidgeot_shiny_palette:: @ 8D3BE64 .incbin "graphics/pokemon/palettes/pidgeot_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xD3BE64, 0x0028 .align 2 gFile_graphics_pokemon_icons_pidgeot_icon:: @ 8D3BE8C .incbin "graphics/pokemon/icons/pidgeot_icon.4bpp" - @ .incbin "baserom.gba", 0xD3BE8C, 0x0400 .align 2 gFile_graphics_pokemon_footprints_pidgeot_footprint:: @ 8D3C28C .incbin "graphics/pokemon/footprints/pidgeot_footprint.1bpp" - @ .incbin "baserom.gba", 0xD3C28C, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_rattata_still_front_pic:: @ 8D3C2AC .incbin "graphics/pokemon/front_pics/rattata_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xD3C2AC, 0x0258 .align 2 gFile_graphics_pokemon_palettes_rattata_palette:: @ 8D3C504 .incbin "graphics/pokemon/palettes/rattata_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xD3C504, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_rattata_back_pic:: @ 8D3C52C .incbin "graphics/pokemon/back_pics/rattata_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xD3C52C, 0x02B8 .align 2 gFile_graphics_pokemon_palettes_rattata_shiny_palette:: @ 8D3C7E4 .incbin "graphics/pokemon/palettes/rattata_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xD3C7E4, 0x0028 .align 2 gFile_graphics_pokemon_icons_rattata_icon:: @ 8D3C80C .incbin "graphics/pokemon/icons/rattata_icon.4bpp" - @ .incbin "baserom.gba", 0xD3C80C, 0x0400 .align 2 gFile_graphics_pokemon_footprints_rattata_footprint:: @ 8D3CC0C .incbin "graphics/pokemon/footprints/rattata_footprint.1bpp" - @ .incbin "baserom.gba", 0xD3CC0C, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_raticate_still_front_pic:: @ 8D3CC2C .incbin "graphics/pokemon/front_pics/raticate_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xD3CC2C, 0x0390 .align 2 gFile_graphics_pokemon_palettes_raticate_palette:: @ 8D3CFBC .incbin "graphics/pokemon/palettes/raticate_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xD3CFBC, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_raticate_back_pic:: @ 8D3CFE4 .incbin "graphics/pokemon/back_pics/raticate_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xD3CFE4, 0x0310 .align 2 gFile_graphics_pokemon_palettes_raticate_shiny_palette:: @ 8D3D2F4 .incbin "graphics/pokemon/palettes/raticate_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xD3D2F4, 0x0028 .align 2 gFile_graphics_pokemon_icons_raticate_icon:: @ 8D3D31C .incbin "graphics/pokemon/icons/raticate_icon.4bpp" - @ .incbin "baserom.gba", 0xD3D31C, 0x0400 .align 2 gFile_graphics_pokemon_footprints_raticate_footprint:: @ 8D3D71C .incbin "graphics/pokemon/footprints/raticate_footprint.1bpp" - @ .incbin "baserom.gba", 0xD3D71C, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_spearow_still_front_pic:: @ 8D3D73C .incbin "graphics/pokemon/front_pics/spearow_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xD3D73C, 0x02C0 .align 2 gFile_graphics_pokemon_palettes_spearow_palette:: @ 8D3D9FC .incbin "graphics/pokemon/palettes/spearow_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xD3D9FC, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_spearow_back_pic:: @ 8D3DA24 .incbin "graphics/pokemon/back_pics/spearow_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xD3DA24, 0x02DC .align 2 gFile_graphics_pokemon_palettes_spearow_shiny_palette:: @ 8D3DD00 .incbin "graphics/pokemon/palettes/spearow_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xD3DD00, 0x0028 .align 2 gFile_graphics_pokemon_icons_spearow_icon:: @ 8D3DD28 .incbin "graphics/pokemon/icons/spearow_icon.4bpp" - @ .incbin "baserom.gba", 0xD3DD28, 0x0400 .align 2 gFile_graphics_pokemon_footprints_spearow_footprint:: @ 8D3E128 .incbin "graphics/pokemon/footprints/spearow_footprint.1bpp" - @ .incbin "baserom.gba", 0xD3E128, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_fearow_still_front_pic:: @ 8D3E148 .incbin "graphics/pokemon/front_pics/fearow_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xD3E148, 0x04BC .align 2 gFile_graphics_pokemon_palettes_fearow_palette:: @ 8D3E604 .incbin "graphics/pokemon/palettes/fearow_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xD3E604, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_fearow_back_pic:: @ 8D3E62C .incbin "graphics/pokemon/back_pics/fearow_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xD3E62C, 0x02F8 .align 2 gFile_graphics_pokemon_palettes_fearow_shiny_palette:: @ 8D3E924 .incbin "graphics/pokemon/palettes/fearow_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xD3E924, 0x0028 .align 2 gFile_graphics_pokemon_icons_fearow_icon:: @ 8D3E94C .incbin "graphics/pokemon/icons/fearow_icon.4bpp" - @ .incbin "baserom.gba", 0xD3E94C, 0x0400 .align 2 gFile_graphics_pokemon_footprints_fearow_footprint:: @ 8D3ED4C .incbin "graphics/pokemon/footprints/fearow_footprint.1bpp" - @ .incbin "baserom.gba", 0xD3ED4C, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_ekans_still_front_pic:: @ 8D3ED6C @@ -1360,7 +1205,6 @@ gFile_graphics_pokemon_footprints_ekans_footprint:: @ 8D3F774 .incbin "graphics/pokemon/footprints/ekans_footprint.1bpp" @ .incbin "baserom.gba", 0xD3F774, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_arbok_still_front_pic:: @ 8D3F794 .incbin "graphics/pokemon/front_pics/arbok_still_front_pic.4bpp.lz" @@ -1391,7 +1235,6 @@ gFile_graphics_pokemon_footprints_arbok_footprint:: @ 8D402E0 .incbin "graphics/pokemon/footprints/arbok_footprint.1bpp" @ .incbin "baserom.gba", 0xD402E0, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_pikachu_still_front_pic:: @ 8D40300 .incbin "graphics/pokemon/front_pics/pikachu_still_front_pic.4bpp.lz" @@ -1422,7 +1265,6 @@ gFile_graphics_pokemon_footprints_pikachu_footprint:: @ 8D40CF8 .incbin "graphics/pokemon/footprints/pikachu_footprint.1bpp" @ .incbin "baserom.gba", 0xD40CF8, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_raichu_still_front_pic:: @ 8D40D18 .incbin "graphics/pokemon/front_pics/raichu_still_front_pic.4bpp.lz" @@ -1453,7 +1295,6 @@ gFile_graphics_pokemon_footprints_raichu_footprint:: @ 8D41880 .incbin "graphics/pokemon/footprints/raichu_footprint.1bpp" @ .incbin "baserom.gba", 0xD41880, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_sandshrew_still_front_pic:: @ 8D418A0 .incbin "graphics/pokemon/front_pics/sandshrew_still_front_pic.4bpp.lz" @@ -1484,7 +1325,6 @@ gFile_graphics_pokemon_footprints_sandshrew_footprint:: @ 8D422F4 .incbin "graphics/pokemon/footprints/sandshrew_footprint.1bpp" @ .incbin "baserom.gba", 0xD422F4, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_sandslash_still_front_pic:: @ 8D42314 .incbin "graphics/pokemon/front_pics/sandslash_still_front_pic.4bpp.lz" @@ -1515,7 +1355,6 @@ gFile_graphics_pokemon_footprints_sandslash_footprint:: @ 8D42F98 .incbin "graphics/pokemon/footprints/sandslash_footprint.1bpp" @ .incbin "baserom.gba", 0xD42F98, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_nidoran_f_still_front_pic:: @ 8D42FB8 .incbin "graphics/pokemon/front_pics/nidoran_f_still_front_pic.4bpp.lz" @@ -1546,7 +1385,6 @@ gFile_graphics_pokemon_footprints_nidoran_f_footprint:: @ 8D4394C .incbin "graphics/pokemon/footprints/nidoran_f_footprint.1bpp" @ .incbin "baserom.gba", 0xD4394C, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_nidorina_still_front_pic:: @ 8D4396C .incbin "graphics/pokemon/front_pics/nidorina_still_front_pic.4bpp.lz" @@ -1577,7 +1415,6 @@ gFile_graphics_pokemon_footprints_nidorina_footprint:: @ 8D44470 .incbin "graphics/pokemon/footprints/nidorina_footprint.1bpp" @ .incbin "baserom.gba", 0xD44470, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_nidoqueen_still_front_pic:: @ 8D44490 .incbin "graphics/pokemon/front_pics/nidoqueen_still_front_pic.4bpp.lz" @@ -1608,7 +1445,6 @@ gFile_graphics_pokemon_footprints_nidoqueen_footprint:: @ 8D450D0 .incbin "graphics/pokemon/footprints/nidoqueen_footprint.1bpp" @ .incbin "baserom.gba", 0xD450D0, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_nidoran_m_still_front_pic:: @ 8D450F0 .incbin "graphics/pokemon/front_pics/nidoran_m_still_front_pic.4bpp.lz" @@ -1639,7 +1475,6 @@ gFile_graphics_pokemon_footprints_nidoran_m_footprint:: @ 8D45B00 .incbin "graphics/pokemon/footprints/nidoran_m_footprint.1bpp" @ .incbin "baserom.gba", 0xD45B00, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_nidorino_still_front_pic:: @ 8D45B20 .incbin "graphics/pokemon/front_pics/nidorino_still_front_pic.4bpp.lz" @@ -1670,7 +1505,6 @@ gFile_graphics_pokemon_footprints_nidorino_footprint:: @ 8D466B0 .incbin "graphics/pokemon/footprints/nidorino_footprint.1bpp" @ .incbin "baserom.gba", 0xD466B0, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_nidoking_still_front_pic:: @ 8D466D0 .incbin "graphics/pokemon/front_pics/nidoking_still_front_pic.4bpp.lz" @@ -1701,7 +1535,6 @@ gFile_graphics_pokemon_footprints_nidoking_footprint:: @ 8D47498 .incbin "graphics/pokemon/footprints/nidoking_footprint.1bpp" @ .incbin "baserom.gba", 0xD47498, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_clefairy_still_front_pic:: @ 8D474B8 .incbin "graphics/pokemon/front_pics/clefairy_still_front_pic.4bpp.lz" @@ -1732,7 +1565,6 @@ gFile_graphics_pokemon_footprints_clefairy_footprint:: @ 8D47E74 .incbin "graphics/pokemon/footprints/clefairy_footprint.1bpp" @ .incbin "baserom.gba", 0xD47E74, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_clefable_still_front_pic:: @ 8D47E94 .incbin "graphics/pokemon/front_pics/clefable_still_front_pic.4bpp.lz" @@ -1763,7 +1595,6 @@ gFile_graphics_pokemon_footprints_clefable_footprint:: @ 8D4895C .incbin "graphics/pokemon/footprints/clefable_footprint.1bpp" @ .incbin "baserom.gba", 0xD4895C, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_vulpix_still_front_pic:: @ 8D4897C .incbin "graphics/pokemon/front_pics/vulpix_still_front_pic.4bpp.lz" @@ -1794,7 +1625,6 @@ gFile_graphics_pokemon_footprints_vulpix_footprint:: @ 8D493FC .incbin "graphics/pokemon/footprints/vulpix_footprint.1bpp" @ .incbin "baserom.gba", 0xD493FC, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_ninetales_still_front_pic:: @ 8D4941C .incbin "graphics/pokemon/front_pics/ninetales_still_front_pic.4bpp.lz" @@ -1825,7 +1655,6 @@ gFile_graphics_pokemon_footprints_ninetales_footprint:: @ 8D4A0A8 .incbin "graphics/pokemon/footprints/ninetales_footprint.1bpp" @ .incbin "baserom.gba", 0xD4A0A8, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_jigglypuff_still_front_pic:: @ 8D4A0C8 .incbin "graphics/pokemon/front_pics/jigglypuff_still_front_pic.4bpp.lz" @@ -1856,7 +1685,6 @@ gFile_graphics_pokemon_footprints_jigglypuff_footprint:: @ 8D4A9F8 .incbin "graphics/pokemon/footprints/jigglypuff_footprint.1bpp" @ .incbin "baserom.gba", 0xD4A9F8, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_wigglytuff_still_front_pic:: @ 8D4AA18 .incbin "graphics/pokemon/front_pics/wigglytuff_still_front_pic.4bpp.lz" @@ -1887,7 +1715,6 @@ gFile_graphics_pokemon_footprints_wigglytuff_footprint:: @ 8D4B474 .incbin "graphics/pokemon/footprints/wigglytuff_footprint.1bpp" @ .incbin "baserom.gba", 0xD4B474, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_zubat_still_front_pic:: @ 8D4B494 .incbin "graphics/pokemon/front_pics/zubat_still_front_pic.4bpp.lz" @@ -1918,7 +1745,6 @@ gFile_graphics_pokemon_footprints_zubat_footprint:: @ 8D4BE5C .incbin "graphics/pokemon/footprints/zubat_footprint.1bpp" @ .incbin "baserom.gba", 0xD4BE5C, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_golbat_still_front_pic:: @ 8D4BE7C .incbin "graphics/pokemon/front_pics/golbat_still_front_pic.4bpp.lz" @@ -1949,7 +1775,6 @@ gFile_graphics_pokemon_footprints_golbat_footprint:: @ 8D4C928 .incbin "graphics/pokemon/footprints/golbat_footprint.1bpp" @ .incbin "baserom.gba", 0xD4C928, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_oddish_still_front_pic:: @ 8D4C948 .incbin "graphics/pokemon/front_pics/oddish_still_front_pic.4bpp.lz" @@ -1980,7 +1805,6 @@ gFile_graphics_pokemon_footprints_oddish_footprint:: @ 8D4D29C .incbin "graphics/pokemon/footprints/oddish_footprint.1bpp" @ .incbin "baserom.gba", 0xD4D29C, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_gloom_still_front_pic:: @ 8D4D2BC .incbin "graphics/pokemon/front_pics/gloom_still_front_pic.4bpp.lz" @@ -2011,7 +1835,6 @@ gFile_graphics_pokemon_footprints_gloom_footprint:: @ 8D4DDF4 .incbin "graphics/pokemon/footprints/gloom_footprint.1bpp" @ .incbin "baserom.gba", 0xD4DDF4, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_vileplume_still_front_pic:: @ 8D4DE14 .incbin "graphics/pokemon/front_pics/vileplume_still_front_pic.4bpp.lz" @@ -2042,7 +1865,6 @@ gFile_graphics_pokemon_footprints_vileplume_footprint:: @ 8D4EA04 .incbin "graphics/pokemon/footprints/vileplume_footprint.1bpp" @ .incbin "baserom.gba", 0xD4EA04, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_paras_still_front_pic:: @ 8D4EA24 .incbin "graphics/pokemon/front_pics/paras_still_front_pic.4bpp.lz" @@ -2073,7 +1895,6 @@ gFile_graphics_pokemon_footprints_paras_footprint:: @ 8D4F380 .incbin "graphics/pokemon/footprints/paras_footprint.1bpp" @ .incbin "baserom.gba", 0xD4F380, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_parasect_still_front_pic:: @ 8D4F3A0 .incbin "graphics/pokemon/front_pics/parasect_still_front_pic.4bpp.lz" @@ -2104,7 +1925,6 @@ gFile_graphics_pokemon_footprints_parasect_footprint:: @ 8D4FE7C .incbin "graphics/pokemon/footprints/parasect_footprint.1bpp" @ .incbin "baserom.gba", 0xD4FE7C, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_venonat_still_front_pic:: @ 8D4FE9C .incbin "graphics/pokemon/front_pics/venonat_still_front_pic.4bpp.lz" @@ -2135,7 +1955,6 @@ gFile_graphics_pokemon_footprints_venonat_footprint:: @ 8D5093C .incbin "graphics/pokemon/footprints/venonat_footprint.1bpp" @ .incbin "baserom.gba", 0xD5093C, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_venomoth_still_front_pic:: @ 8D5095C .incbin "graphics/pokemon/front_pics/venomoth_still_front_pic.4bpp.lz" @@ -2166,7 +1985,6 @@ gFile_graphics_pokemon_footprints_venomoth_footprint:: @ 8D51554 .incbin "graphics/pokemon/footprints/venomoth_footprint.1bpp" @ .incbin "baserom.gba", 0xD51554, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_diglett_still_front_pic:: @ 8D51574 .incbin "graphics/pokemon/front_pics/diglett_still_front_pic.4bpp.lz" @@ -2197,7 +2015,6 @@ gFile_graphics_pokemon_footprints_diglett_footprint:: @ 8D51DE0 .incbin "graphics/pokemon/footprints/diglett_footprint.1bpp" @ .incbin "baserom.gba", 0xD51DE0, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_dugtrio_still_front_pic:: @ 8D51E00 .incbin "graphics/pokemon/front_pics/dugtrio_still_front_pic.4bpp.lz" @@ -2228,7 +2045,6 @@ gFile_graphics_pokemon_footprints_dugtrio_footprint:: @ 8D52828 .incbin "graphics/pokemon/footprints/dugtrio_footprint.1bpp" @ .incbin "baserom.gba", 0xD52828, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_meowth_still_front_pic:: @ 8D52848 .incbin "graphics/pokemon/front_pics/meowth_still_front_pic.4bpp.lz" @@ -2259,7 +2075,6 @@ gFile_graphics_pokemon_footprints_meowth_footprint:: @ 8D53268 .incbin "graphics/pokemon/footprints/meowth_footprint.1bpp" @ .incbin "baserom.gba", 0xD53268, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_persian_still_front_pic:: @ 8D53288 .incbin "graphics/pokemon/front_pics/persian_still_front_pic.4bpp.lz" @@ -2290,7 +2105,6 @@ gFile_graphics_pokemon_footprints_persian_footprint:: @ 8D53D90 .incbin "graphics/pokemon/footprints/persian_footprint.1bpp" @ .incbin "baserom.gba", 0xD53D90, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_psyduck_still_front_pic:: @ 8D53DB0 .incbin "graphics/pokemon/front_pics/psyduck_still_front_pic.4bpp.lz" @@ -2321,7 +2135,6 @@ gFile_graphics_pokemon_footprints_psyduck_footprint:: @ 8D54780 .incbin "graphics/pokemon/footprints/psyduck_footprint.1bpp" @ .incbin "baserom.gba", 0xD54780, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_golduck_still_front_pic:: @ 8D547A0 .incbin "graphics/pokemon/front_pics/golduck_still_front_pic.4bpp.lz" @@ -2352,7 +2165,6 @@ gFile_graphics_pokemon_footprints_golduck_footprint:: @ 8D552D4 .incbin "graphics/pokemon/footprints/golduck_footprint.1bpp" @ .incbin "baserom.gba", 0xD552D4, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_mankey_still_front_pic:: @ 8D552F4 .incbin "graphics/pokemon/front_pics/mankey_still_front_pic.4bpp.lz" @@ -2383,7 +2195,6 @@ gFile_graphics_pokemon_footprints_mankey_footprint:: @ 8D55DA4 .incbin "graphics/pokemon/footprints/mankey_footprint.1bpp" @ .incbin "baserom.gba", 0xD55DA4, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_primeape_still_front_pic:: @ 8D55DC4 .incbin "graphics/pokemon/front_pics/primeape_still_front_pic.4bpp.lz" @@ -2414,7 +2225,6 @@ gFile_graphics_pokemon_footprints_primeape_footprint:: @ 8D56910 .incbin "graphics/pokemon/footprints/primeape_footprint.1bpp" @ .incbin "baserom.gba", 0xD56910, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_growlithe_still_front_pic:: @ 8D56930 .incbin "graphics/pokemon/front_pics/growlithe_still_front_pic.4bpp.lz" @@ -2445,7 +2255,6 @@ gFile_graphics_pokemon_footprints_growlithe_footprint:: @ 8D573E4 .incbin "graphics/pokemon/footprints/growlithe_footprint.1bpp" @ .incbin "baserom.gba", 0xD573E4, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_arcanine_still_front_pic:: @ 8D57404 .incbin "graphics/pokemon/front_pics/arcanine_still_front_pic.4bpp.lz" @@ -2476,7 +2285,6 @@ gFile_graphics_pokemon_footprints_arcanine_footprint:: @ 8D58130 .incbin "graphics/pokemon/footprints/arcanine_footprint.1bpp" @ .incbin "baserom.gba", 0xD58130, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_poliwag_still_front_pic:: @ 8D58150 .incbin "graphics/pokemon/front_pics/poliwag_still_front_pic.4bpp.lz" @@ -2507,7 +2315,6 @@ gFile_graphics_pokemon_footprints_poliwag_footprint:: @ 8D58AA0 .incbin "graphics/pokemon/footprints/poliwag_footprint.1bpp" @ .incbin "baserom.gba", 0xD58AA0, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_poliwhirl_still_front_pic:: @ 8D58AC0 .incbin "graphics/pokemon/front_pics/poliwhirl_still_front_pic.4bpp.lz" @@ -2538,7 +2345,6 @@ gFile_graphics_pokemon_footprints_poliwhirl_footprint:: @ 8D5950C .incbin "graphics/pokemon/footprints/poliwhirl_footprint.1bpp" @ .incbin "baserom.gba", 0xD5950C, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_poliwrath_still_front_pic:: @ 8D5952C .incbin "graphics/pokemon/front_pics/poliwrath_still_front_pic.4bpp.lz" @@ -2569,7 +2375,6 @@ gFile_graphics_pokemon_footprints_poliwrath_footprint:: @ 8D5A034 .incbin "graphics/pokemon/footprints/poliwrath_footprint.1bpp" @ .incbin "baserom.gba", 0xD5A034, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_abra_still_front_pic:: @ 8D5A054 .incbin "graphics/pokemon/front_pics/abra_still_front_pic.4bpp.lz" @@ -2600,7 +2405,6 @@ gFile_graphics_pokemon_footprints_abra_footprint:: @ 8D5AA44 .incbin "graphics/pokemon/footprints/abra_footprint.1bpp" @ .incbin "baserom.gba", 0xD5AA44, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_kadabra_still_front_pic:: @ 8D5AA64 .incbin "graphics/pokemon/front_pics/kadabra_still_front_pic.4bpp.lz" @@ -2631,7 +2435,6 @@ gFile_graphics_pokemon_footprints_kadabra_footprint:: @ 8D5B728 .incbin "graphics/pokemon/footprints/kadabra_footprint.1bpp" @ .incbin "baserom.gba", 0xD5B728, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_alakazam_still_front_pic:: @ 8D5B748 .incbin "graphics/pokemon/front_pics/alakazam_still_front_pic.4bpp.lz" @@ -2662,7 +2465,6 @@ gFile_graphics_pokemon_footprints_alakazam_footprint:: @ 8D5C3B0 .incbin "graphics/pokemon/footprints/alakazam_footprint.1bpp" @ .incbin "baserom.gba", 0xD5C3B0, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_machop_still_front_pic:: @ 8D5C3D0 .incbin "graphics/pokemon/front_pics/machop_still_front_pic.4bpp.lz" @@ -2693,7 +2495,6 @@ gFile_graphics_pokemon_footprints_machop_footprint:: @ 8D5CD8C .incbin "graphics/pokemon/footprints/machop_footprint.1bpp" @ .incbin "baserom.gba", 0xD5CD8C, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_machoke_still_front_pic:: @ 8D5CDAC .incbin "graphics/pokemon/front_pics/machoke_still_front_pic.4bpp.lz" @@ -2724,7 +2525,6 @@ gFile_graphics_pokemon_footprints_machoke_footprint:: @ 8D5D918 .incbin "graphics/pokemon/footprints/machoke_footprint.1bpp" @ .incbin "baserom.gba", 0xD5D918, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_machamp_still_front_pic:: @ 8D5D938 .incbin "graphics/pokemon/front_pics/machamp_still_front_pic.4bpp.lz" @@ -2755,7 +2555,6 @@ gFile_graphics_pokemon_footprints_machamp_footprint:: @ 8D5E6D0 .incbin "graphics/pokemon/footprints/machamp_footprint.1bpp" @ .incbin "baserom.gba", 0xD5E6D0, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_bellsprout_still_front_pic:: @ 8D5E6F0 .incbin "graphics/pokemon/front_pics/bellsprout_still_front_pic.4bpp.lz" @@ -2786,7 +2585,6 @@ gFile_graphics_pokemon_footprints_bellsprout_footprint:: @ 8D5F068 .incbin "graphics/pokemon/footprints/bellsprout_footprint.1bpp" @ .incbin "baserom.gba", 0xD5F068, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_weepinbell_still_front_pic:: @ 8D5F088 .incbin "graphics/pokemon/front_pics/weepinbell_still_front_pic.4bpp.lz" @@ -2817,7 +2615,6 @@ gFile_graphics_pokemon_footprints_weepinbell_footprint:: @ 8D5FAF8 .incbin "graphics/pokemon/footprints/weepinbell_footprint.1bpp" @ .incbin "baserom.gba", 0xD5FAF8, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_victreebel_still_front_pic:: @ 8D5FB18 .incbin "graphics/pokemon/front_pics/victreebel_still_front_pic.4bpp.lz" @@ -2848,7 +2645,6 @@ gFile_graphics_pokemon_footprints_victreebel_footprint:: @ 8D6072C .incbin "graphics/pokemon/footprints/victreebel_footprint.1bpp" @ .incbin "baserom.gba", 0xD6072C, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_tentacool_still_front_pic:: @ 8D6074C .incbin "graphics/pokemon/front_pics/tentacool_still_front_pic.4bpp.lz" @@ -2879,7 +2675,6 @@ gFile_graphics_pokemon_footprints_tentacool_footprint:: @ 8D61110 .incbin "graphics/pokemon/footprints/tentacool_footprint.1bpp" @ .incbin "baserom.gba", 0xD61110, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_tentacruel_still_front_pic:: @ 8D61130 .incbin "graphics/pokemon/front_pics/tentacruel_still_front_pic.4bpp.lz" @@ -2910,7 +2705,6 @@ gFile_graphics_pokemon_footprints_tentacruel_footprint:: @ 8D61E10 .incbin "graphics/pokemon/footprints/tentacruel_footprint.1bpp" @ .incbin "baserom.gba", 0xD61E10, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_geodude_still_front_pic:: @ 8D61E30 .incbin "graphics/pokemon/front_pics/geodude_still_front_pic.4bpp.lz" @@ -2941,7 +2735,6 @@ gFile_graphics_pokemon_footprints_geodude_footprint:: @ 8D62790 .incbin "graphics/pokemon/footprints/geodude_footprint.1bpp" @ .incbin "baserom.gba", 0xD62790, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_graveler_still_front_pic:: @ 8D627B0 .incbin "graphics/pokemon/front_pics/graveler_still_front_pic.4bpp.lz" @@ -2972,7 +2765,6 @@ gFile_graphics_pokemon_footprints_graveler_footprint:: @ 8D63270 .incbin "graphics/pokemon/footprints/graveler_footprint.1bpp" @ .incbin "baserom.gba", 0xD63270, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_golem_still_front_pic:: @ 8D63290 .incbin "graphics/pokemon/front_pics/golem_still_front_pic.4bpp.lz" @@ -3003,7 +2795,6 @@ gFile_graphics_pokemon_footprints_golem_footprint:: @ 8D63DD0 .incbin "graphics/pokemon/footprints/golem_footprint.1bpp" @ .incbin "baserom.gba", 0xD63DD0, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_ponyta_still_front_pic:: @ 8D63DF0 .incbin "graphics/pokemon/front_pics/ponyta_still_front_pic.4bpp.lz" @@ -3034,7 +2825,6 @@ gFile_graphics_pokemon_footprints_ponyta_footprint:: @ 8D6490C .incbin "graphics/pokemon/footprints/ponyta_footprint.1bpp" @ .incbin "baserom.gba", 0xD6490C, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_rapidash_still_front_pic:: @ 8D6492C .incbin "graphics/pokemon/front_pics/rapidash_still_front_pic.4bpp.lz" @@ -3065,7 +2855,6 @@ gFile_graphics_pokemon_footprints_rapidash_footprint:: @ 8D65614 .incbin "graphics/pokemon/footprints/rapidash_footprint.1bpp" @ .incbin "baserom.gba", 0xD65614, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_slowpoke_still_front_pic:: @ 8D65634 .incbin "graphics/pokemon/front_pics/slowpoke_still_front_pic.4bpp.lz" @@ -3096,7 +2885,6 @@ gFile_graphics_pokemon_footprints_slowpoke_footprint:: @ 8D65FBC .incbin "graphics/pokemon/footprints/slowpoke_footprint.1bpp" @ .incbin "baserom.gba", 0xD65FBC, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_slowbro_still_front_pic:: @ 8D65FDC .incbin "graphics/pokemon/front_pics/slowbro_still_front_pic.4bpp.lz" @@ -3127,7 +2915,6 @@ gFile_graphics_pokemon_footprints_slowbro_footprint:: @ 8D66C68 .incbin "graphics/pokemon/footprints/slowbro_footprint.1bpp" @ .incbin "baserom.gba", 0xD66C68, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_magnemite_still_front_pic:: @ 8D66C88 .incbin "graphics/pokemon/front_pics/magnemite_still_front_pic.4bpp.lz" @@ -3158,7 +2945,6 @@ gFile_graphics_pokemon_footprints_magnemite_footprint:: @ 8D67494 .incbin "graphics/pokemon/footprints/magnemite_footprint.1bpp" @ .incbin "baserom.gba", 0xD67494, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_magneton_still_front_pic:: @ 8D674B4 .incbin "graphics/pokemon/front_pics/magneton_still_front_pic.4bpp.lz" @@ -3189,7 +2975,6 @@ gFile_graphics_pokemon_footprints_magneton_footprint:: @ 8D67FC0 .incbin "graphics/pokemon/footprints/magneton_footprint.1bpp" @ .incbin "baserom.gba", 0xD67FC0, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_farfetch_d_still_front_pic:: @ 8D67FE0 .incbin "graphics/pokemon/front_pics/farfetch_d_still_front_pic.4bpp.lz" @@ -3220,7 +3005,6 @@ gFile_graphics_pokemon_footprints_farfetch_d_footprint:: @ 8D68AF0 .incbin "graphics/pokemon/footprints/farfetch_d_footprint.1bpp" @ .incbin "baserom.gba", 0xD68AF0, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_doduo_still_front_pic:: @ 8D68B10 .incbin "graphics/pokemon/front_pics/doduo_still_front_pic.4bpp.lz" @@ -3251,7 +3035,6 @@ gFile_graphics_pokemon_footprints_doduo_footprint:: @ 8D6955C .incbin "graphics/pokemon/footprints/doduo_footprint.1bpp" @ .incbin "baserom.gba", 0xD6955C, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_dodrio_still_front_pic:: @ 8D6957C .incbin "graphics/pokemon/front_pics/dodrio_still_front_pic.4bpp.lz" @@ -3282,7 +3065,6 @@ gFile_graphics_pokemon_footprints_dodrio_footprint:: @ 8D6A270 .incbin "graphics/pokemon/footprints/dodrio_footprint.1bpp" @ .incbin "baserom.gba", 0xD6A270, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_seel_still_front_pic:: @ 8D6A290 .incbin "graphics/pokemon/front_pics/seel_still_front_pic.4bpp.lz" @@ -3313,7 +3095,6 @@ gFile_graphics_pokemon_footprints_seel_footprint:: @ 8D6ACF0 .incbin "graphics/pokemon/footprints/seel_footprint.1bpp" @ .incbin "baserom.gba", 0xD6ACF0, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_dewgong_still_front_pic:: @ 8D6AD10 .incbin "graphics/pokemon/front_pics/dewgong_still_front_pic.4bpp.lz" @@ -3344,7 +3125,6 @@ gFile_graphics_pokemon_footprints_dewgong_footprint:: @ 8D6B7BC .incbin "graphics/pokemon/footprints/dewgong_footprint.1bpp" @ .incbin "baserom.gba", 0xD6B7BC, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_grimer_still_front_pic:: @ 8D6B7DC .incbin "graphics/pokemon/front_pics/grimer_still_front_pic.4bpp.lz" @@ -3375,7 +3155,6 @@ gFile_graphics_pokemon_footprints_grimer_footprint:: @ 8D6C210 .incbin "graphics/pokemon/footprints/grimer_footprint.1bpp" @ .incbin "baserom.gba", 0xD6C210, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_muk_still_front_pic:: @ 8D6C230 .incbin "graphics/pokemon/front_pics/muk_still_front_pic.4bpp.lz" @@ -3406,7 +3185,6 @@ gFile_graphics_pokemon_footprints_muk_footprint:: @ 8D6CD00 .incbin "graphics/pokemon/footprints/muk_footprint.1bpp" @ .incbin "baserom.gba", 0xD6CD00, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_shellder_still_front_pic:: @ 8D6CD20 .incbin "graphics/pokemon/front_pics/shellder_still_front_pic.4bpp.lz" @@ -3437,7 +3215,6 @@ gFile_graphics_pokemon_footprints_shellder_footprint:: @ 8D6D6F0 .incbin "graphics/pokemon/footprints/shellder_footprint.1bpp" @ .incbin "baserom.gba", 0xD6D6F0, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_cloyster_still_front_pic:: @ 8D6D710 .incbin "graphics/pokemon/front_pics/cloyster_still_front_pic.4bpp.lz" @@ -3468,7 +3245,6 @@ gFile_graphics_pokemon_footprints_cloyster_footprint:: @ 8D6E3A0 .incbin "graphics/pokemon/footprints/cloyster_footprint.1bpp" @ .incbin "baserom.gba", 0xD6E3A0, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_gastly_still_front_pic:: @ 8D6E3C0 .incbin "graphics/pokemon/front_pics/gastly_still_front_pic.4bpp.lz" @@ -3499,7 +3275,6 @@ gFile_graphics_pokemon_footprints_gastly_footprint:: @ 8D6EEEC .incbin "graphics/pokemon/footprints/gastly_footprint.1bpp" @ .incbin "baserom.gba", 0xD6EEEC, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_haunter_still_front_pic:: @ 8D6EF0C .incbin "graphics/pokemon/front_pics/haunter_still_front_pic.4bpp.lz" @@ -3530,7 +3305,6 @@ gFile_graphics_pokemon_footprints_haunter_footprint:: @ 8D6FA20 .incbin "graphics/pokemon/footprints/haunter_footprint.1bpp" @ .incbin "baserom.gba", 0xD6FA20, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_gengar_still_front_pic:: @ 8D6FA40 .incbin "graphics/pokemon/front_pics/gengar_still_front_pic.4bpp.lz" @@ -3561,7 +3335,6 @@ gFile_graphics_pokemon_footprints_gengar_footprint:: @ 8D70528 .incbin "graphics/pokemon/footprints/gengar_footprint.1bpp" @ .incbin "baserom.gba", 0xD70528, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_onix_still_front_pic:: @ 8D70548 .incbin "graphics/pokemon/front_pics/onix_still_front_pic.4bpp.lz" @@ -3592,7 +3365,6 @@ gFile_graphics_pokemon_footprints_onix_footprint:: @ 8D711CC .incbin "graphics/pokemon/footprints/onix_footprint.1bpp" @ .incbin "baserom.gba", 0xD711CC, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_drowzee_still_front_pic:: @ 8D711EC .incbin "graphics/pokemon/front_pics/drowzee_still_front_pic.4bpp.lz" @@ -3623,7 +3395,6 @@ gFile_graphics_pokemon_footprints_drowzee_footprint:: @ 8D71BB0 .incbin "graphics/pokemon/footprints/drowzee_footprint.1bpp" @ .incbin "baserom.gba", 0xD71BB0, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_hypno_still_front_pic:: @ 8D71BD0 .incbin "graphics/pokemon/front_pics/hypno_still_front_pic.4bpp.lz" @@ -3654,7 +3425,6 @@ gFile_graphics_pokemon_footprints_hypno_footprint:: @ 8D72780 .incbin "graphics/pokemon/footprints/hypno_footprint.1bpp" @ .incbin "baserom.gba", 0xD72780, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_krabby_still_front_pic:: @ 8D727A0 .incbin "graphics/pokemon/front_pics/krabby_still_front_pic.4bpp.lz" @@ -3685,7 +3455,6 @@ gFile_graphics_pokemon_footprints_krabby_footprint:: @ 8D732A0 .incbin "graphics/pokemon/footprints/krabby_footprint.1bpp" @ .incbin "baserom.gba", 0xD732A0, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_kingler_still_front_pic:: @ 8D732C0 .incbin "graphics/pokemon/front_pics/kingler_still_front_pic.4bpp.lz" @@ -3716,7 +3485,6 @@ gFile_graphics_pokemon_footprints_kingler_footprint:: @ 8D73F14 .incbin "graphics/pokemon/footprints/kingler_footprint.1bpp" @ .incbin "baserom.gba", 0xD73F14, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_voltorb_still_front_pic:: @ 8D73F34 .incbin "graphics/pokemon/front_pics/voltorb_still_front_pic.4bpp.lz" @@ -3747,7 +3515,6 @@ gFile_graphics_pokemon_footprints_voltorb_footprint:: @ 8D747F8 .incbin "graphics/pokemon/footprints/voltorb_footprint.1bpp" @ .incbin "baserom.gba", 0xD747F8, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_electrode_still_front_pic:: @ 8D74818 .incbin "graphics/pokemon/front_pics/electrode_still_front_pic.4bpp.lz" @@ -3778,7 +3545,6 @@ gFile_graphics_pokemon_footprints_electrode_footprint:: @ 8D7513C .incbin "graphics/pokemon/footprints/electrode_footprint.1bpp" @ .incbin "baserom.gba", 0xD7513C, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_exeggcute_still_front_pic:: @ 8D7515C .incbin "graphics/pokemon/front_pics/exeggcute_still_front_pic.4bpp.lz" @@ -3809,7 +3575,6 @@ gFile_graphics_pokemon_footprints_exeggcute_footprint:: @ 8D75C3C .incbin "graphics/pokemon/footprints/exeggcute_footprint.1bpp" @ .incbin "baserom.gba", 0xD75C3C, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_exeggutor_still_front_pic:: @ 8D75C5C .incbin "graphics/pokemon/front_pics/exeggutor_still_front_pic.4bpp.lz" @@ -3840,7 +3605,6 @@ gFile_graphics_pokemon_footprints_exeggutor_footprint:: @ 8D768C8 .incbin "graphics/pokemon/footprints/exeggutor_footprint.1bpp" @ .incbin "baserom.gba", 0xD768C8, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_cubone_still_front_pic:: @ 8D768E8 .incbin "graphics/pokemon/front_pics/cubone_still_front_pic.4bpp.lz" @@ -3871,7 +3635,6 @@ gFile_graphics_pokemon_footprints_cubone_footprint:: @ 8D77334 .incbin "graphics/pokemon/footprints/cubone_footprint.1bpp" @ .incbin "baserom.gba", 0xD77334, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_marowak_still_front_pic:: @ 8D77354 .incbin "graphics/pokemon/front_pics/marowak_still_front_pic.4bpp.lz" @@ -3902,7 +3665,6 @@ gFile_graphics_pokemon_footprints_marowak_footprint:: @ 8D77E38 .incbin "graphics/pokemon/footprints/marowak_footprint.1bpp" @ .incbin "baserom.gba", 0xD77E38, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_hitmonlee_still_front_pic:: @ 8D77E58 .incbin "graphics/pokemon/front_pics/hitmonlee_still_front_pic.4bpp.lz" @@ -3933,7 +3695,6 @@ gFile_graphics_pokemon_footprints_hitmonlee_footprint:: @ 8D788C0 .incbin "graphics/pokemon/footprints/hitmonlee_footprint.1bpp" @ .incbin "baserom.gba", 0xD788C0, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_hitmonchan_still_front_pic:: @ 8D788E0 .incbin "graphics/pokemon/front_pics/hitmonchan_still_front_pic.4bpp.lz" @@ -3964,7 +3725,6 @@ gFile_graphics_pokemon_footprints_hitmonchan_footprint:: @ 8D793B4 .incbin "graphics/pokemon/footprints/hitmonchan_footprint.1bpp" @ .incbin "baserom.gba", 0xD793B4, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_lickitung_still_front_pic:: @ 8D793D4 .incbin "graphics/pokemon/front_pics/lickitung_still_front_pic.4bpp.lz" @@ -3995,7 +3755,6 @@ gFile_graphics_pokemon_footprints_lickitung_footprint:: @ 8D79EA0 .incbin "graphics/pokemon/footprints/lickitung_footprint.1bpp" @ .incbin "baserom.gba", 0xD79EA0, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_koffing_still_front_pic:: @ 8D79EC0 .incbin "graphics/pokemon/front_pics/koffing_still_front_pic.4bpp.lz" @@ -4026,7 +3785,6 @@ gFile_graphics_pokemon_footprints_koffing_footprint:: @ 8D7A910 .incbin "graphics/pokemon/footprints/koffing_footprint.1bpp" @ .incbin "baserom.gba", 0xD7A910, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_weezing_still_front_pic:: @ 8D7A930 .incbin "graphics/pokemon/front_pics/weezing_still_front_pic.4bpp.lz" @@ -4057,7 +3815,6 @@ gFile_graphics_pokemon_footprints_weezing_footprint:: @ 8D7B5C0 .incbin "graphics/pokemon/footprints/weezing_footprint.1bpp" @ .incbin "baserom.gba", 0xD7B5C0, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_rhyhorn_still_front_pic:: @ 8D7B5E0 .incbin "graphics/pokemon/front_pics/rhyhorn_still_front_pic.4bpp.lz" @@ -4088,7 +3845,6 @@ gFile_graphics_pokemon_footprints_rhyhorn_footprint:: @ 8D7C164 .incbin "graphics/pokemon/footprints/rhyhorn_footprint.1bpp" @ .incbin "baserom.gba", 0xD7C164, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_rhydon_still_front_pic:: @ 8D7C184 .incbin "graphics/pokemon/front_pics/rhydon_still_front_pic.4bpp.lz" @@ -4119,7 +3875,6 @@ gFile_graphics_pokemon_footprints_rhydon_footprint:: @ 8D7CF18 .incbin "graphics/pokemon/footprints/rhydon_footprint.1bpp" @ .incbin "baserom.gba", 0xD7CF18, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_chansey_still_front_pic:: @ 8D7CF38 .incbin "graphics/pokemon/front_pics/chansey_still_front_pic.4bpp.lz" @@ -4150,7 +3905,6 @@ gFile_graphics_pokemon_footprints_chansey_footprint:: @ 8D7D90C .incbin "graphics/pokemon/footprints/chansey_footprint.1bpp" @ .incbin "baserom.gba", 0xD7D90C, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_tangela_still_front_pic:: @ 8D7D92C .incbin "graphics/pokemon/front_pics/tangela_still_front_pic.4bpp.lz" @@ -4181,7 +3935,6 @@ gFile_graphics_pokemon_footprints_tangela_footprint:: @ 8D7E4F4 .incbin "graphics/pokemon/footprints/tangela_footprint.1bpp" @ .incbin "baserom.gba", 0xD7E4F4, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_kangaskhan_still_front_pic:: @ 8D7E514 .incbin "graphics/pokemon/front_pics/kangaskhan_still_front_pic.4bpp.lz" @@ -4212,7 +3965,6 @@ gFile_graphics_pokemon_footprints_kangaskhan_footprint:: @ 8D7F23C .incbin "graphics/pokemon/footprints/kangaskhan_footprint.1bpp" @ .incbin "baserom.gba", 0xD7F23C, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_horsea_still_front_pic:: @ 8D7F25C .incbin "graphics/pokemon/front_pics/horsea_still_front_pic.4bpp.lz" @@ -4243,7 +3995,6 @@ gFile_graphics_pokemon_footprints_horsea_footprint:: @ 8D7FBF8 .incbin "graphics/pokemon/footprints/horsea_footprint.1bpp" @ .incbin "baserom.gba", 0xD7FBF8, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_seadra_still_front_pic:: @ 8D7FC18 .incbin "graphics/pokemon/front_pics/seadra_still_front_pic.4bpp.lz" @@ -4274,7 +4025,6 @@ gFile_graphics_pokemon_footprints_seadra_footprint:: @ 8D80790 .incbin "graphics/pokemon/footprints/seadra_footprint.1bpp" @ .incbin "baserom.gba", 0xD80790, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_goldeen_still_front_pic:: @ 8D807B0 .incbin "graphics/pokemon/front_pics/goldeen_still_front_pic.4bpp.lz" @@ -4305,7 +4055,6 @@ gFile_graphics_pokemon_footprints_goldeen_footprint:: @ 8D812D8 .incbin "graphics/pokemon/footprints/goldeen_footprint.1bpp" @ .incbin "baserom.gba", 0xD812D8, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_seaking_still_front_pic:: @ 8D812F8 .incbin "graphics/pokemon/front_pics/seaking_still_front_pic.4bpp.lz" @@ -4336,7 +4085,6 @@ gFile_graphics_pokemon_footprints_seaking_footprint:: @ 8D81F0C .incbin "graphics/pokemon/footprints/seaking_footprint.1bpp" @ .incbin "baserom.gba", 0xD81F0C, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_staryu_still_front_pic:: @ 8D81F2C .incbin "graphics/pokemon/front_pics/staryu_still_front_pic.4bpp.lz" @@ -4367,7 +4115,6 @@ gFile_graphics_pokemon_footprints_staryu_footprint:: @ 8D82894 .incbin "graphics/pokemon/footprints/staryu_footprint.1bpp" @ .incbin "baserom.gba", 0xD82894, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_starmie_still_front_pic:: @ 8D828B4 .incbin "graphics/pokemon/front_pics/starmie_still_front_pic.4bpp.lz" @@ -4398,7 +4145,6 @@ gFile_graphics_pokemon_footprints_starmie_footprint:: @ 8D83348 .incbin "graphics/pokemon/footprints/starmie_footprint.1bpp" @ .incbin "baserom.gba", 0xD83348, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_mr_mime_still_front_pic:: @ 8D83368 .incbin "graphics/pokemon/front_pics/mr_mime_still_front_pic.4bpp.lz" @@ -4429,7 +4175,6 @@ gFile_graphics_pokemon_footprints_mr_mime_footprint:: @ 8D83EA8 .incbin "graphics/pokemon/footprints/mr_mime_footprint.1bpp" @ .incbin "baserom.gba", 0xD83EA8, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_scyther_still_front_pic:: @ 8D83EC8 .incbin "graphics/pokemon/front_pics/scyther_still_front_pic.4bpp.lz" @@ -4460,7 +4205,6 @@ gFile_graphics_pokemon_footprints_scyther_footprint:: @ 8D84B58 .incbin "graphics/pokemon/footprints/scyther_footprint.1bpp" @ .incbin "baserom.gba", 0xD84B58, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_jynx_still_front_pic:: @ 8D84B78 .incbin "graphics/pokemon/front_pics/jynx_still_front_pic.4bpp.lz" @@ -4491,7 +4235,6 @@ gFile_graphics_pokemon_footprints_jynx_footprint:: @ 8D85680 .incbin "graphics/pokemon/footprints/jynx_footprint.1bpp" @ .incbin "baserom.gba", 0xD85680, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_electabuzz_still_front_pic:: @ 8D856A0 .incbin "graphics/pokemon/front_pics/electabuzz_still_front_pic.4bpp.lz" @@ -4522,7 +4265,6 @@ gFile_graphics_pokemon_footprints_electabuzz_footprint:: @ 8D86258 .incbin "graphics/pokemon/footprints/electabuzz_footprint.1bpp" @ .incbin "baserom.gba", 0xD86258, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_magmar_still_front_pic:: @ 8D86278 .incbin "graphics/pokemon/front_pics/magmar_still_front_pic.4bpp.lz" @@ -4553,7 +4295,6 @@ gFile_graphics_pokemon_footprints_magmar_footprint:: @ 8D86E30 .incbin "graphics/pokemon/footprints/magmar_footprint.1bpp" @ .incbin "baserom.gba", 0xD86E30, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_pinsir_still_front_pic:: @ 8D86E50 .incbin "graphics/pokemon/front_pics/pinsir_still_front_pic.4bpp.lz" @@ -4584,7 +4325,6 @@ gFile_graphics_pokemon_footprints_pinsir_footprint:: @ 8D87A1C .incbin "graphics/pokemon/footprints/pinsir_footprint.1bpp" @ .incbin "baserom.gba", 0xD87A1C, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_tauros_still_front_pic:: @ 8D87A3C .incbin "graphics/pokemon/front_pics/tauros_still_front_pic.4bpp.lz" @@ -4615,7 +4355,6 @@ gFile_graphics_pokemon_footprints_tauros_footprint:: @ 8D885A0 .incbin "graphics/pokemon/footprints/tauros_footprint.1bpp" @ .incbin "baserom.gba", 0xD885A0, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_magikarp_still_front_pic:: @ 8D885C0 .incbin "graphics/pokemon/front_pics/magikarp_still_front_pic.4bpp.lz" @@ -4646,7 +4385,6 @@ gFile_graphics_pokemon_footprints_magikarp_footprint:: @ 8D89088 .incbin "graphics/pokemon/footprints/magikarp_footprint.1bpp" @ .incbin "baserom.gba", 0xD89088, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_gyarados_still_front_pic:: @ 8D890A8 .incbin "graphics/pokemon/front_pics/gyarados_still_front_pic.4bpp.lz" @@ -4677,7 +4415,6 @@ gFile_graphics_pokemon_footprints_gyarados_footprint:: @ 8D89F54 .incbin "graphics/pokemon/footprints/gyarados_footprint.1bpp" @ .incbin "baserom.gba", 0xD89F54, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_lapras_still_front_pic:: @ 8D89F74 .incbin "graphics/pokemon/front_pics/lapras_still_front_pic.4bpp.lz" @@ -4708,7 +4445,6 @@ gFile_graphics_pokemon_footprints_lapras_footprint:: @ 8D8AAE8 .incbin "graphics/pokemon/footprints/lapras_footprint.1bpp" @ .incbin "baserom.gba", 0xD8AAE8, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_ditto_still_front_pic:: @ 8D8AB08 .incbin "graphics/pokemon/front_pics/ditto_still_front_pic.4bpp.lz" @@ -4739,7 +4475,6 @@ gFile_graphics_pokemon_footprints_ditto_footprint:: @ 8D8B338 .incbin "graphics/pokemon/footprints/ditto_footprint.1bpp" @ .incbin "baserom.gba", 0xD8B338, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_eevee_still_front_pic:: @ 8D8B358 .incbin "graphics/pokemon/front_pics/eevee_still_front_pic.4bpp.lz" @@ -4770,7 +4505,6 @@ gFile_graphics_pokemon_footprints_eevee_footprint:: @ 8D8BDBC .incbin "graphics/pokemon/footprints/eevee_footprint.1bpp" @ .incbin "baserom.gba", 0xD8BDBC, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_vaporeon_still_front_pic:: @ 8D8BDDC .incbin "graphics/pokemon/front_pics/vaporeon_still_front_pic.4bpp.lz" @@ -4801,7 +4535,6 @@ gFile_graphics_pokemon_footprints_vaporeon_footprint:: @ 8D8C888 .incbin "graphics/pokemon/footprints/vaporeon_footprint.1bpp" @ .incbin "baserom.gba", 0xD8C888, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_jolteon_still_front_pic:: @ 8D8C8A8 .incbin "graphics/pokemon/front_pics/jolteon_still_front_pic.4bpp.lz" @@ -4832,7 +4565,6 @@ gFile_graphics_pokemon_footprints_jolteon_footprint:: @ 8D8D3F4 .incbin "graphics/pokemon/footprints/jolteon_footprint.1bpp" @ .incbin "baserom.gba", 0xD8D3F4, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_flareon_still_front_pic:: @ 8D8D414 .incbin "graphics/pokemon/front_pics/flareon_still_front_pic.4bpp.lz" @@ -4863,7 +4595,6 @@ gFile_graphics_pokemon_footprints_flareon_footprint:: @ 8D8DF78 .incbin "graphics/pokemon/footprints/flareon_footprint.1bpp" @ .incbin "baserom.gba", 0xD8DF78, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_porygon_still_front_pic:: @ 8D8DF98 .incbin "graphics/pokemon/front_pics/porygon_still_front_pic.4bpp.lz" @@ -4894,7 +4625,6 @@ gFile_graphics_pokemon_footprints_porygon_footprint:: @ 8D8E950 .incbin "graphics/pokemon/footprints/porygon_footprint.1bpp" @ .incbin "baserom.gba", 0xD8E950, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_omanyte_still_front_pic:: @ 8D8E970 .incbin "graphics/pokemon/front_pics/omanyte_still_front_pic.4bpp.lz" @@ -4925,7 +4655,6 @@ gFile_graphics_pokemon_footprints_omanyte_footprint:: @ 8D8F39C .incbin "graphics/pokemon/footprints/omanyte_footprint.1bpp" @ .incbin "baserom.gba", 0xD8F39C, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_omastar_still_front_pic:: @ 8D8F3BC .incbin "graphics/pokemon/front_pics/omastar_still_front_pic.4bpp.lz" @@ -4956,7 +4685,6 @@ gFile_graphics_pokemon_footprints_omastar_footprint:: @ 8D8FF0C .incbin "graphics/pokemon/footprints/omastar_footprint.1bpp" @ .incbin "baserom.gba", 0xD8FF0C, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_kabuto_still_front_pic:: @ 8D8FF2C .incbin "graphics/pokemon/front_pics/kabuto_still_front_pic.4bpp.lz" @@ -4987,7 +4715,6 @@ gFile_graphics_pokemon_footprints_kabuto_footprint:: @ 8D9083C .incbin "graphics/pokemon/footprints/kabuto_footprint.1bpp" @ .incbin "baserom.gba", 0xD9083C, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_kabutops_still_front_pic:: @ 8D9085C .incbin "graphics/pokemon/front_pics/kabutops_still_front_pic.4bpp.lz" @@ -5018,7 +4745,6 @@ gFile_graphics_pokemon_footprints_kabutops_footprint:: @ 8D91458 .incbin "graphics/pokemon/footprints/kabutops_footprint.1bpp" @ .incbin "baserom.gba", 0xD91458, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_aerodactyl_still_front_pic:: @ 8D91478 .incbin "graphics/pokemon/front_pics/aerodactyl_still_front_pic.4bpp.lz" @@ -5049,7 +4775,6 @@ gFile_graphics_pokemon_footprints_aerodactyl_footprint:: @ 8D9201C .incbin "graphics/pokemon/footprints/aerodactyl_footprint.1bpp" @ .incbin "baserom.gba", 0xD9201C, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_snorlax_still_front_pic:: @ 8D9203C .incbin "graphics/pokemon/front_pics/snorlax_still_front_pic.4bpp.lz" @@ -5080,7 +4805,6 @@ gFile_graphics_pokemon_footprints_snorlax_footprint:: @ 8D92A7C .incbin "graphics/pokemon/footprints/snorlax_footprint.1bpp" @ .incbin "baserom.gba", 0xD92A7C, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_articuno_still_front_pic:: @ 8D92A9C .incbin "graphics/pokemon/front_pics/articuno_still_front_pic.4bpp.lz" @@ -5111,7 +4835,6 @@ gFile_graphics_pokemon_footprints_articuno_footprint:: @ 8D93640 .incbin "graphics/pokemon/footprints/articuno_footprint.1bpp" @ .incbin "baserom.gba", 0xD93640, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_zapdos_still_front_pic:: @ 8D93660 .incbin "graphics/pokemon/front_pics/zapdos_still_front_pic.4bpp.lz" @@ -5142,7 +4865,6 @@ gFile_graphics_pokemon_footprints_zapdos_footprint:: @ 8D9423C .incbin "graphics/pokemon/footprints/zapdos_footprint.1bpp" @ .incbin "baserom.gba", 0xD9423C, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_moltres_still_front_pic:: @ 8D9425C .incbin "graphics/pokemon/front_pics/moltres_still_front_pic.4bpp.lz" @@ -5173,7 +4895,6 @@ gFile_graphics_pokemon_footprints_moltres_footprint:: @ 8D94EB4 .incbin "graphics/pokemon/footprints/moltres_footprint.1bpp" @ .incbin "baserom.gba", 0xD94EB4, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_dratini_still_front_pic:: @ 8D94ED4 .incbin "graphics/pokemon/front_pics/dratini_still_front_pic.4bpp.lz" @@ -5204,7 +4925,6 @@ gFile_graphics_pokemon_footprints_dratini_footprint:: @ 8D95868 .incbin "graphics/pokemon/footprints/dratini_footprint.1bpp" @ .incbin "baserom.gba", 0xD95868, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_dragonair_still_front_pic:: @ 8D95888 .incbin "graphics/pokemon/front_pics/dragonair_still_front_pic.4bpp.lz" @@ -5235,7 +4955,6 @@ gFile_graphics_pokemon_footprints_dragonair_footprint:: @ 8D96380 .incbin "graphics/pokemon/footprints/dragonair_footprint.1bpp" @ .incbin "baserom.gba", 0xD96380, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_dragonite_still_front_pic:: @ 8D963A0 .incbin "graphics/pokemon/front_pics/dragonite_still_front_pic.4bpp.lz" @@ -5266,7 +4985,6 @@ gFile_graphics_pokemon_footprints_dragonite_footprint:: @ 8D97038 .incbin "graphics/pokemon/footprints/dragonite_footprint.1bpp" @ .incbin "baserom.gba", 0xD97038, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_mewtwo_still_front_pic:: @ 8D97058 .incbin "graphics/pokemon/front_pics/mewtwo_still_front_pic.4bpp.lz" @@ -5297,7 +5015,6 @@ gFile_graphics_pokemon_footprints_mewtwo_footprint:: @ 8D97CA8 .incbin "graphics/pokemon/footprints/mewtwo_footprint.1bpp" @ .incbin "baserom.gba", 0xD97CA8, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_mew_still_front_pic:: @ 8D97CC8 .incbin "graphics/pokemon/front_pics/mew_still_front_pic.4bpp.lz" @@ -5328,7 +5045,6 @@ gFile_graphics_pokemon_footprints_mew_footprint:: @ 8D98720 .incbin "graphics/pokemon/footprints/mew_footprint.1bpp" @ .incbin "baserom.gba", 0xD98720, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_chikorita_still_front_pic:: @ 8D98740 .incbin "graphics/pokemon/front_pics/chikorita_still_front_pic.4bpp.lz" @@ -5359,7 +5075,6 @@ gFile_graphics_pokemon_footprints_chikorita_footprint:: @ 8D990BC .incbin "graphics/pokemon/footprints/chikorita_footprint.1bpp" @ .incbin "baserom.gba", 0xD990BC, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_bayleef_still_front_pic:: @ 8D990DC .incbin "graphics/pokemon/front_pics/bayleef_still_front_pic.4bpp.lz" @@ -5390,7 +5105,6 @@ gFile_graphics_pokemon_footprints_bayleef_footprint:: @ 8D99C90 .incbin "graphics/pokemon/footprints/bayleef_footprint.1bpp" @ .incbin "baserom.gba", 0xD99C90, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_meganium_still_front_pic:: @ 8D99CB0 .incbin "graphics/pokemon/front_pics/meganium_still_front_pic.4bpp.lz" @@ -5421,7 +5135,6 @@ gFile_graphics_pokemon_footprints_meganium_footprint:: @ 8D9A9AC .incbin "graphics/pokemon/footprints/meganium_footprint.1bpp" @ .incbin "baserom.gba", 0xD9A9AC, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_cyndaquil_still_front_pic:: @ 8D9A9CC .incbin "graphics/pokemon/front_pics/cyndaquil_still_front_pic.4bpp.lz" @@ -5452,7 +5165,6 @@ gFile_graphics_pokemon_footprints_cyndaquil_footprint:: @ 8D9B3D4 .incbin "graphics/pokemon/footprints/cyndaquil_footprint.1bpp" @ .incbin "baserom.gba", 0xD9B3D4, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_quilava_still_front_pic:: @ 8D9B3F4 .incbin "graphics/pokemon/front_pics/quilava_still_front_pic.4bpp.lz" @@ -5483,7 +5195,6 @@ gFile_graphics_pokemon_footprints_quilava_footprint:: @ 8D9BED4 .incbin "graphics/pokemon/footprints/quilava_footprint.1bpp" @ .incbin "baserom.gba", 0xD9BED4, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_typhlosion_still_front_pic:: @ 8D9BEF4 .incbin "graphics/pokemon/front_pics/typhlosion_still_front_pic.4bpp.lz" @@ -5514,7 +5225,6 @@ gFile_graphics_pokemon_footprints_typhlosion_footprint:: @ 8D9CB70 .incbin "graphics/pokemon/footprints/typhlosion_footprint.1bpp" @ .incbin "baserom.gba", 0xD9CB70, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_totodile_still_front_pic:: @ 8D9CB90 .incbin "graphics/pokemon/front_pics/totodile_still_front_pic.4bpp.lz" @@ -5545,7 +5255,6 @@ gFile_graphics_pokemon_footprints_totodile_footprint:: @ 8D9D564 .incbin "graphics/pokemon/footprints/totodile_footprint.1bpp" @ .incbin "baserom.gba", 0xD9D564, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_croconaw_still_front_pic:: @ 8D9D584 .incbin "graphics/pokemon/front_pics/croconaw_still_front_pic.4bpp.lz" @@ -5576,7 +5285,6 @@ gFile_graphics_pokemon_footprints_croconaw_footprint:: @ 8D9E08C .incbin "graphics/pokemon/footprints/croconaw_footprint.1bpp" @ .incbin "baserom.gba", 0xD9E08C, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_feraligatr_still_front_pic:: @ 8D9E0AC .incbin "graphics/pokemon/front_pics/feraligatr_still_front_pic.4bpp.lz" @@ -5607,7 +5315,6 @@ gFile_graphics_pokemon_footprints_feraligatr_footprint:: @ 8D9EF34 .incbin "graphics/pokemon/footprints/feraligatr_footprint.1bpp" @ .incbin "baserom.gba", 0xD9EF34, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_sentret_still_front_pic:: @ 8D9EF54 .incbin "graphics/pokemon/front_pics/sentret_still_front_pic.4bpp.lz" @@ -5638,7 +5345,6 @@ gFile_graphics_pokemon_footprints_sentret_footprint:: @ 8D9F924 .incbin "graphics/pokemon/footprints/sentret_footprint.1bpp" @ .incbin "baserom.gba", 0xD9F924, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_furret_still_front_pic:: @ 8D9F944 .incbin "graphics/pokemon/front_pics/furret_still_front_pic.4bpp.lz" @@ -5669,7 +5375,6 @@ gFile_graphics_pokemon_footprints_furret_footprint:: @ 8DA03F0 .incbin "graphics/pokemon/footprints/furret_footprint.1bpp" @ .incbin "baserom.gba", 0xDA03F0, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_hoothoot_still_front_pic:: @ 8DA0410 .incbin "graphics/pokemon/front_pics/hoothoot_still_front_pic.4bpp.lz" @@ -5700,7 +5405,6 @@ gFile_graphics_pokemon_footprints_hoothoot_footprint:: @ 8DA0DEC .incbin "graphics/pokemon/footprints/hoothoot_footprint.1bpp" @ .incbin "baserom.gba", 0xDA0DEC, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_noctowl_still_front_pic:: @ 8DA0E0C .incbin "graphics/pokemon/front_pics/noctowl_still_front_pic.4bpp.lz" @@ -5731,7 +5435,6 @@ gFile_graphics_pokemon_footprints_noctowl_footprint:: @ 8DA190C .incbin "graphics/pokemon/footprints/noctowl_footprint.1bpp" @ .incbin "baserom.gba", 0xDA190C, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_ledyba_still_front_pic:: @ 8DA192C .incbin "graphics/pokemon/front_pics/ledyba_still_front_pic.4bpp.lz" @@ -5762,7 +5465,6 @@ gFile_graphics_pokemon_footprints_ledyba_footprint:: @ 8DA23A0 .incbin "graphics/pokemon/footprints/ledyba_footprint.1bpp" @ .incbin "baserom.gba", 0xDA23A0, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_ledian_still_front_pic:: @ 8DA23C0 .incbin "graphics/pokemon/front_pics/ledian_still_front_pic.4bpp.lz" @@ -5793,7 +5495,6 @@ gFile_graphics_pokemon_footprints_ledian_footprint:: @ 8DA2EF0 .incbin "graphics/pokemon/footprints/ledian_footprint.1bpp" @ .incbin "baserom.gba", 0xDA2EF0, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_spinarak_still_front_pic:: @ 8DA2F10 .incbin "graphics/pokemon/front_pics/spinarak_still_front_pic.4bpp.lz" @@ -5824,7 +5525,6 @@ gFile_graphics_pokemon_footprints_spinarak_footprint:: @ 8DA3838 .incbin "graphics/pokemon/footprints/spinarak_footprint.1bpp" @ .incbin "baserom.gba", 0xDA3838, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_ariados_still_front_pic:: @ 8DA3858 .incbin "graphics/pokemon/front_pics/ariados_still_front_pic.4bpp.lz" @@ -5855,7 +5555,6 @@ gFile_graphics_pokemon_footprints_ariados_footprint:: @ 8DA43E0 .incbin "graphics/pokemon/footprints/ariados_footprint.1bpp" @ .incbin "baserom.gba", 0xDA43E0, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_crobat_still_front_pic:: @ 8DA4400 .incbin "graphics/pokemon/front_pics/crobat_still_front_pic.4bpp.lz" @@ -5886,7 +5585,6 @@ gFile_graphics_pokemon_footprints_crobat_footprint:: @ 8DA4F08 .incbin "graphics/pokemon/footprints/crobat_footprint.1bpp" @ .incbin "baserom.gba", 0xDA4F08, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_chinchou_still_front_pic:: @ 8DA4F28 .incbin "graphics/pokemon/front_pics/chinchou_still_front_pic.4bpp.lz" @@ -5917,7 +5615,6 @@ gFile_graphics_pokemon_footprints_chinchou_footprint:: @ 8DA5948 .incbin "graphics/pokemon/footprints/chinchou_footprint.1bpp" @ .incbin "baserom.gba", 0xDA5948, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_lanturn_still_front_pic:: @ 8DA5968 .incbin "graphics/pokemon/front_pics/lanturn_still_front_pic.4bpp.lz" @@ -5948,7 +5645,6 @@ gFile_graphics_pokemon_footprints_lanturn_footprint:: @ 8DA6428 .incbin "graphics/pokemon/footprints/lanturn_footprint.1bpp" @ .incbin "baserom.gba", 0xDA6428, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_pichu_still_front_pic:: @ 8DA6448 .incbin "graphics/pokemon/front_pics/pichu_still_front_pic.4bpp.lz" @@ -5979,7 +5675,6 @@ gFile_graphics_pokemon_footprints_pichu_footprint:: @ 8DA6D10 .incbin "graphics/pokemon/footprints/pichu_footprint.1bpp" @ .incbin "baserom.gba", 0xDA6D10, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_cleffa_still_front_pic:: @ 8DA6D30 .incbin "graphics/pokemon/front_pics/cleffa_still_front_pic.4bpp.lz" @@ -6010,7 +5705,6 @@ gFile_graphics_pokemon_footprints_cleffa_footprint:: @ 8DA759C .incbin "graphics/pokemon/footprints/cleffa_footprint.1bpp" @ .incbin "baserom.gba", 0xDA759C, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_igglybuff_still_front_pic:: @ 8DA75BC .incbin "graphics/pokemon/front_pics/igglybuff_still_front_pic.4bpp.lz" @@ -6041,7 +5735,6 @@ gFile_graphics_pokemon_footprints_igglybuff_footprint:: @ 8DA7E30 .incbin "graphics/pokemon/footprints/igglybuff_footprint.1bpp" @ .incbin "baserom.gba", 0xDA7E30, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_togepi_still_front_pic:: @ 8DA7E50 .incbin "graphics/pokemon/front_pics/togepi_still_front_pic.4bpp.lz" @@ -6072,7 +5765,6 @@ gFile_graphics_pokemon_footprints_togepi_footprint:: @ 8DA86E8 .incbin "graphics/pokemon/footprints/togepi_footprint.1bpp" @ .incbin "baserom.gba", 0xDA86E8, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_togetic_still_front_pic:: @ 8DA8708 .incbin "graphics/pokemon/front_pics/togetic_still_front_pic.4bpp.lz" @@ -6103,7 +5795,6 @@ gFile_graphics_pokemon_footprints_togetic_footprint:: @ 8DA90F8 .incbin "graphics/pokemon/footprints/togetic_footprint.1bpp" @ .incbin "baserom.gba", 0xDA90F8, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_natu_still_front_pic:: @ 8DA9118 .incbin "graphics/pokemon/front_pics/natu_still_front_pic.4bpp.lz" @@ -6134,7 +5825,6 @@ gFile_graphics_pokemon_footprints_natu_footprint:: @ 8DA9948 .incbin "graphics/pokemon/footprints/natu_footprint.1bpp" @ .incbin "baserom.gba", 0xDA9948, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_xatu_still_front_pic:: @ 8DA9968 .incbin "graphics/pokemon/front_pics/xatu_still_front_pic.4bpp.lz" @@ -6165,7 +5855,6 @@ gFile_graphics_pokemon_footprints_xatu_footprint:: @ 8DAA40C .incbin "graphics/pokemon/footprints/xatu_footprint.1bpp" @ .incbin "baserom.gba", 0xDAA40C, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_mareep_still_front_pic:: @ 8DAA42C .incbin "graphics/pokemon/front_pics/mareep_still_front_pic.4bpp.lz" @@ -6196,7 +5885,6 @@ gFile_graphics_pokemon_footprints_mareep_footprint:: @ 8DAAE24 .incbin "graphics/pokemon/footprints/mareep_footprint.1bpp" @ .incbin "baserom.gba", 0xDAAE24, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_flaaffy_still_front_pic:: @ 8DAAE44 .incbin "graphics/pokemon/front_pics/flaaffy_still_front_pic.4bpp.lz" @@ -6227,7 +5915,6 @@ gFile_graphics_pokemon_footprints_flaaffy_footprint:: @ 8DAB8B0 .incbin "graphics/pokemon/footprints/flaaffy_footprint.1bpp" @ .incbin "baserom.gba", 0xDAB8B0, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_ampharos_still_front_pic:: @ 8DAB8D0 .incbin "graphics/pokemon/front_pics/ampharos_still_front_pic.4bpp.lz" @@ -6258,7 +5945,6 @@ gFile_graphics_pokemon_footprints_ampharos_footprint:: @ 8DAC3F4 .incbin "graphics/pokemon/footprints/ampharos_footprint.1bpp" @ .incbin "baserom.gba", 0xDAC3F4, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_bellossom_still_front_pic:: @ 8DAC414 .incbin "graphics/pokemon/front_pics/bellossom_still_front_pic.4bpp.lz" @@ -6289,7 +5975,6 @@ gFile_graphics_pokemon_footprints_bellossom_footprint:: @ 8DACDF8 .incbin "graphics/pokemon/footprints/bellossom_footprint.1bpp" @ .incbin "baserom.gba", 0xDACDF8, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_marill_still_front_pic:: @ 8DACE18 .incbin "graphics/pokemon/front_pics/marill_still_front_pic.4bpp.lz" @@ -6320,7 +6005,6 @@ gFile_graphics_pokemon_footprints_marill_footprint:: @ 8DAD7D8 .incbin "graphics/pokemon/footprints/marill_footprint.1bpp" @ .incbin "baserom.gba", 0xDAD7D8, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_azumarill_still_front_pic:: @ 8DAD7F8 .incbin "graphics/pokemon/front_pics/azumarill_still_front_pic.4bpp.lz" @@ -6351,7 +6035,6 @@ gFile_graphics_pokemon_footprints_azumarill_footprint:: @ 8DAE204 .incbin "graphics/pokemon/footprints/azumarill_footprint.1bpp" @ .incbin "baserom.gba", 0xDAE204, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_sudowoodo_still_front_pic:: @ 8DAE224 .incbin "graphics/pokemon/front_pics/sudowoodo_still_front_pic.4bpp.lz" @@ -6382,7 +6065,6 @@ gFile_graphics_pokemon_footprints_sudowoodo_footprint:: @ 8DAECE8 .incbin "graphics/pokemon/footprints/sudowoodo_footprint.1bpp" @ .incbin "baserom.gba", 0xDAECE8, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_politoed_still_front_pic:: @ 8DAED08 .incbin "graphics/pokemon/front_pics/politoed_still_front_pic.4bpp.lz" @@ -6413,7 +6095,6 @@ gFile_graphics_pokemon_footprints_politoed_footprint:: @ 8DAF750 .incbin "graphics/pokemon/footprints/politoed_footprint.1bpp" @ .incbin "baserom.gba", 0xDAF750, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_hoppip_still_front_pic:: @ 8DAF770 .incbin "graphics/pokemon/front_pics/hoppip_still_front_pic.4bpp.lz" @@ -6444,7 +6125,6 @@ gFile_graphics_pokemon_footprints_hoppip_footprint:: @ 8DB0154 .incbin "graphics/pokemon/footprints/hoppip_footprint.1bpp" @ .incbin "baserom.gba", 0xDB0154, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_skiploom_still_front_pic:: @ 8DB0174 .incbin "graphics/pokemon/front_pics/skiploom_still_front_pic.4bpp.lz" @@ -6475,7 +6155,6 @@ gFile_graphics_pokemon_footprints_skiploom_footprint:: @ 8DB0B2C .incbin "graphics/pokemon/footprints/skiploom_footprint.1bpp" @ .incbin "baserom.gba", 0xDB0B2C, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_jumpluff_still_front_pic:: @ 8DB0B4C .incbin "graphics/pokemon/front_pics/jumpluff_still_front_pic.4bpp.lz" @@ -6506,7 +6185,6 @@ gFile_graphics_pokemon_footprints_jumpluff_footprint:: @ 8DB1700 .incbin "graphics/pokemon/footprints/jumpluff_footprint.1bpp" @ .incbin "baserom.gba", 0xDB1700, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_aipom_still_front_pic:: @ 8DB1720 .incbin "graphics/pokemon/front_pics/aipom_still_front_pic.4bpp.lz" @@ -6537,7 +6215,6 @@ gFile_graphics_pokemon_footprints_aipom_footprint:: @ 8DB2160 .incbin "graphics/pokemon/footprints/aipom_footprint.1bpp" @ .incbin "baserom.gba", 0xDB2160, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_sunkern_still_front_pic:: @ 8DB2180 .incbin "graphics/pokemon/front_pics/sunkern_still_front_pic.4bpp.lz" @@ -6568,7 +6245,6 @@ gFile_graphics_pokemon_footprints_sunkern_footprint:: @ 8DB2ACC .incbin "graphics/pokemon/footprints/sunkern_footprint.1bpp" @ .incbin "baserom.gba", 0xDB2ACC, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_sunflora_still_front_pic:: @ 8DB2AEC .incbin "graphics/pokemon/front_pics/sunflora_still_front_pic.4bpp.lz" @@ -6599,7 +6275,6 @@ gFile_graphics_pokemon_footprints_sunflora_footprint:: @ 8DB3634 .incbin "graphics/pokemon/footprints/sunflora_footprint.1bpp" @ .incbin "baserom.gba", 0xDB3634, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_yanma_still_front_pic:: @ 8DB3654 .incbin "graphics/pokemon/front_pics/yanma_still_front_pic.4bpp.lz" @@ -6630,7 +6305,6 @@ gFile_graphics_pokemon_footprints_yanma_footprint:: @ 8DB41DC .incbin "graphics/pokemon/footprints/yanma_footprint.1bpp" @ .incbin "baserom.gba", 0xDB41DC, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_wooper_still_front_pic:: @ 8DB41FC .incbin "graphics/pokemon/front_pics/wooper_still_front_pic.4bpp.lz" @@ -6661,7 +6335,6 @@ gFile_graphics_pokemon_footprints_wooper_footprint:: @ 8DB4B18 .incbin "graphics/pokemon/footprints/wooper_footprint.1bpp" @ .incbin "baserom.gba", 0xDB4B18, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_quagsire_still_front_pic:: @ 8DB4B38 .incbin "graphics/pokemon/front_pics/quagsire_still_front_pic.4bpp.lz" @@ -6692,7 +6365,6 @@ gFile_graphics_pokemon_footprints_quagsire_footprint:: @ 8DB55F8 .incbin "graphics/pokemon/footprints/quagsire_footprint.1bpp" @ .incbin "baserom.gba", 0xDB55F8, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_espeon_still_front_pic:: @ 8DB5618 .incbin "graphics/pokemon/front_pics/espeon_still_front_pic.4bpp.lz" @@ -6723,7 +6395,6 @@ gFile_graphics_pokemon_footprints_espeon_footprint:: @ 8DB607C .incbin "graphics/pokemon/footprints/espeon_footprint.1bpp" @ .incbin "baserom.gba", 0xDB607C, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_umbreon_still_front_pic:: @ 8DB609C .incbin "graphics/pokemon/front_pics/umbreon_still_front_pic.4bpp.lz" @@ -6754,7 +6425,6 @@ gFile_graphics_pokemon_footprints_umbreon_footprint:: @ 8DB6B14 .incbin "graphics/pokemon/footprints/umbreon_footprint.1bpp" @ .incbin "baserom.gba", 0xDB6B14, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_murkrow_still_front_pic:: @ 8DB6B34 .incbin "graphics/pokemon/front_pics/murkrow_still_front_pic.4bpp.lz" @@ -6785,7 +6455,6 @@ gFile_graphics_pokemon_footprints_murkrow_footprint:: @ 8DB757C .incbin "graphics/pokemon/footprints/murkrow_footprint.1bpp" @ .incbin "baserom.gba", 0xDB757C, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_slowking_still_front_pic:: @ 8DB759C .incbin "graphics/pokemon/front_pics/slowking_still_front_pic.4bpp.lz" @@ -6816,7 +6485,6 @@ gFile_graphics_pokemon_footprints_slowking_footprint:: @ 8DB812C .incbin "graphics/pokemon/footprints/slowking_footprint.1bpp" @ .incbin "baserom.gba", 0xDB812C, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_misdreavus_still_front_pic:: @ 8DB814C .incbin "graphics/pokemon/front_pics/misdreavus_still_front_pic.4bpp.lz" @@ -6847,7 +6515,6 @@ gFile_graphics_pokemon_footprints_misdreavus_footprint:: @ 8DB8B80 .incbin "graphics/pokemon/footprints/misdreavus_footprint.1bpp" @ .incbin "baserom.gba", 0xDB8B80, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_unown_a_still_front_pic:: @ 8DB8BA0 .incbin "graphics/pokemon/front_pics/unown_a_still_front_pic.4bpp.lz" @@ -6878,7 +6545,6 @@ gFile_graphics_pokemon_footprints_unown_footprint:: @ 8DB93B4 .incbin "graphics/pokemon/footprints/unown_footprint.1bpp" @ .incbin "baserom.gba", 0xDB93B4, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_wobbuffet_still_front_pic:: @ 8DB93D4 .incbin "graphics/pokemon/front_pics/wobbuffet_still_front_pic.4bpp.lz" @@ -6909,7 +6575,6 @@ gFile_graphics_pokemon_footprints_wobbuffet_footprint:: @ 8DB9DB8 .incbin "graphics/pokemon/footprints/wobbuffet_footprint.1bpp" @ .incbin "baserom.gba", 0xDB9DB8, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_girafarig_still_front_pic:: @ 8DB9DD8 .incbin "graphics/pokemon/front_pics/girafarig_still_front_pic.4bpp.lz" @@ -6940,7 +6605,6 @@ gFile_graphics_pokemon_footprints_girafarig_footprint:: @ 8DBA9D8 .incbin "graphics/pokemon/footprints/girafarig_footprint.1bpp" @ .incbin "baserom.gba", 0xDBA9D8, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_pineco_still_front_pic:: @ 8DBA9F8 .incbin "graphics/pokemon/front_pics/pineco_still_front_pic.4bpp.lz" @@ -6971,7 +6635,6 @@ gFile_graphics_pokemon_footprints_pineco_footprint:: @ 8DBB458 .incbin "graphics/pokemon/footprints/pineco_footprint.1bpp" @ .incbin "baserom.gba", 0xDBB458, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_forretress_still_front_pic:: @ 8DBB478 .incbin "graphics/pokemon/front_pics/forretress_still_front_pic.4bpp.lz" @@ -7002,7 +6665,6 @@ gFile_graphics_pokemon_footprints_forretress_footprint:: @ 8DBBFA4 .incbin "graphics/pokemon/footprints/forretress_footprint.1bpp" @ .incbin "baserom.gba", 0xDBBFA4, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_dunsparce_still_front_pic:: @ 8DBBFC4 .incbin "graphics/pokemon/front_pics/dunsparce_still_front_pic.4bpp.lz" @@ -7033,7 +6695,6 @@ gFile_graphics_pokemon_footprints_dunsparce_footprint:: @ 8DBCA20 .incbin "graphics/pokemon/footprints/dunsparce_footprint.1bpp" @ .incbin "baserom.gba", 0xDBCA20, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_gligar_still_front_pic:: @ 8DBCA40 .incbin "graphics/pokemon/front_pics/gligar_still_front_pic.4bpp.lz" @@ -7064,7 +6725,6 @@ gFile_graphics_pokemon_footprints_gligar_footprint:: @ 8DBD690 .incbin "graphics/pokemon/footprints/gligar_footprint.1bpp" @ .incbin "baserom.gba", 0xDBD690, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_steelix_still_front_pic:: @ 8DBD6B0 .incbin "graphics/pokemon/front_pics/steelix_still_front_pic.4bpp.lz" @@ -7095,7 +6755,6 @@ gFile_graphics_pokemon_footprints_steelix_footprint:: @ 8DBE3CC .incbin "graphics/pokemon/footprints/steelix_footprint.1bpp" @ .incbin "baserom.gba", 0xDBE3CC, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_snubbull_still_front_pic:: @ 8DBE3EC .incbin "graphics/pokemon/front_pics/snubbull_still_front_pic.4bpp.lz" @@ -7126,7 +6785,6 @@ gFile_graphics_pokemon_footprints_snubbull_footprint:: @ 8DBEE38 .incbin "graphics/pokemon/footprints/snubbull_footprint.1bpp" @ .incbin "baserom.gba", 0xDBEE38, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_granbull_still_front_pic:: @ 8DBEE58 .incbin "graphics/pokemon/front_pics/granbull_still_front_pic.4bpp.lz" @@ -7157,7 +6815,6 @@ gFile_graphics_pokemon_footprints_granbull_footprint:: @ 8DBF958 .incbin "graphics/pokemon/footprints/granbull_footprint.1bpp" @ .incbin "baserom.gba", 0xDBF958, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_qwilfish_still_front_pic:: @ 8DBF978 .incbin "graphics/pokemon/front_pics/qwilfish_still_front_pic.4bpp.lz" @@ -7188,7 +6845,6 @@ gFile_graphics_pokemon_footprints_qwilfish_footprint:: @ 8DC0368 .incbin "graphics/pokemon/footprints/qwilfish_footprint.1bpp" @ .incbin "baserom.gba", 0xDC0368, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_scizor_still_front_pic:: @ 8DC0388 .incbin "graphics/pokemon/front_pics/scizor_still_front_pic.4bpp.lz" @@ -7219,7 +6875,6 @@ gFile_graphics_pokemon_footprints_scizor_footprint:: @ 8DC1040 .incbin "graphics/pokemon/footprints/scizor_footprint.1bpp" @ .incbin "baserom.gba", 0xDC1040, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_shuckle_still_front_pic:: @ 8DC1060 .incbin "graphics/pokemon/front_pics/shuckle_still_front_pic.4bpp.lz" @@ -7250,7 +6905,6 @@ gFile_graphics_pokemon_footprints_shuckle_footprint:: @ 8DC19D0 .incbin "graphics/pokemon/footprints/shuckle_footprint.1bpp" @ .incbin "baserom.gba", 0xDC19D0, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_heracross_still_front_pic:: @ 8DC19F0 .incbin "graphics/pokemon/front_pics/heracross_still_front_pic.4bpp.lz" @@ -7284,7 +6938,6 @@ gFile_graphics_pokemon_footprints_heracross_footprint:: @ 8DC29A0 .incbin "graphics/pokemon/footprints/heracross_footprint.1bpp" @ .incbin "baserom.gba", 0xDC29A0, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_sneasel_still_front_pic:: @ 8DC29C0 .incbin "graphics/pokemon/front_pics/sneasel_still_front_pic.4bpp.lz" @@ -7315,7 +6968,6 @@ gFile_graphics_pokemon_footprints_sneasel_footprint:: @ 8DC3478 .incbin "graphics/pokemon/footprints/sneasel_footprint.1bpp" @ .incbin "baserom.gba", 0xDC3478, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_teddiursa_still_front_pic:: @ 8DC3498 .incbin "graphics/pokemon/front_pics/teddiursa_still_front_pic.4bpp.lz" @@ -7346,7 +6998,6 @@ gFile_graphics_pokemon_footprints_teddiursa_footprint:: @ 8DC3E08 .incbin "graphics/pokemon/footprints/teddiursa_footprint.1bpp" @ .incbin "baserom.gba", 0xDC3E08, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_ursaring_still_front_pic:: @ 8DC3E28 .incbin "graphics/pokemon/front_pics/ursaring_still_front_pic.4bpp.lz" @@ -7377,7 +7028,6 @@ gFile_graphics_pokemon_footprints_ursaring_footprint:: @ 8DC4A38 .incbin "graphics/pokemon/footprints/ursaring_footprint.1bpp" @ .incbin "baserom.gba", 0xDC4A38, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_slugma_still_front_pic:: @ 8DC4A58 .incbin "graphics/pokemon/front_pics/slugma_still_front_pic.4bpp.lz" @@ -7408,7 +7058,6 @@ gFile_graphics_pokemon_footprints_slugma_footprint:: @ 8DC53FC .incbin "graphics/pokemon/footprints/slugma_footprint.1bpp" @ .incbin "baserom.gba", 0xDC53FC, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_magcargo_still_front_pic:: @ 8DC541C .incbin "graphics/pokemon/front_pics/magcargo_still_front_pic.4bpp.lz" @@ -7439,7 +7088,6 @@ gFile_graphics_pokemon_footprints_magcargo_footprint:: @ 8DC5FCC .incbin "graphics/pokemon/footprints/magcargo_footprint.1bpp" @ .incbin "baserom.gba", 0xDC5FCC, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_swinub_still_front_pic:: @ 8DC5FEC .incbin "graphics/pokemon/front_pics/swinub_still_front_pic.4bpp.lz" @@ -7470,7 +7118,6 @@ gFile_graphics_pokemon_footprints_swinub_footprint:: @ 8DC6874 .incbin "graphics/pokemon/footprints/swinub_footprint.1bpp" @ .incbin "baserom.gba", 0xDC6874, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_piloswine_still_front_pic:: @ 8DC6894 .incbin "graphics/pokemon/front_pics/piloswine_still_front_pic.4bpp.lz" @@ -7501,7 +7148,6 @@ gFile_graphics_pokemon_footprints_piloswine_footprint:: @ 8DC7258 .incbin "graphics/pokemon/footprints/piloswine_footprint.1bpp" @ .incbin "baserom.gba", 0xDC7258, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_corsola_still_front_pic:: @ 8DC7278 .incbin "graphics/pokemon/front_pics/corsola_still_front_pic.4bpp.lz" @@ -7532,7 +7178,6 @@ gFile_graphics_pokemon_footprints_corsola_footprint:: @ 8DC7C70 .incbin "graphics/pokemon/footprints/corsola_footprint.1bpp" @ .incbin "baserom.gba", 0xDC7C70, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_remoraid_still_front_pic:: @ 8DC7C90 .incbin "graphics/pokemon/front_pics/remoraid_still_front_pic.4bpp.lz" @@ -7563,7 +7208,6 @@ gFile_graphics_pokemon_footprints_remoraid_footprint:: @ 8DC865C .incbin "graphics/pokemon/footprints/remoraid_footprint.1bpp" @ .incbin "baserom.gba", 0xDC865C, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_octillery_still_front_pic:: @ 8DC867C .incbin "graphics/pokemon/front_pics/octillery_still_front_pic.4bpp.lz" @@ -7594,7 +7238,6 @@ gFile_graphics_pokemon_footprints_octillery_footprint:: @ 8DC90B8 .incbin "graphics/pokemon/footprints/octillery_footprint.1bpp" @ .incbin "baserom.gba", 0xDC90B8, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_delibird_still_front_pic:: @ 8DC90D8 .incbin "graphics/pokemon/front_pics/delibird_still_front_pic.4bpp.lz" @@ -7625,7 +7268,6 @@ gFile_graphics_pokemon_footprints_delibird_footprint:: @ 8DC9C58 .incbin "graphics/pokemon/footprints/delibird_footprint.1bpp" @ .incbin "baserom.gba", 0xDC9C58, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_mantine_still_front_pic:: @ 8DC9C78 .incbin "graphics/pokemon/front_pics/mantine_still_front_pic.4bpp.lz" @@ -7656,7 +7298,6 @@ gFile_graphics_pokemon_footprints_mantine_footprint:: @ 8DCA804 .incbin "graphics/pokemon/footprints/mantine_footprint.1bpp" @ .incbin "baserom.gba", 0xDCA804, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_skarmory_still_front_pic:: @ 8DCA824 .incbin "graphics/pokemon/front_pics/skarmory_still_front_pic.4bpp.lz" @@ -7687,7 +7328,6 @@ gFile_graphics_pokemon_footprints_skarmory_footprint:: @ 8DCB458 .incbin "graphics/pokemon/footprints/skarmory_footprint.1bpp" @ .incbin "baserom.gba", 0xDCB458, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_houndour_still_front_pic:: @ 8DCB478 .incbin "graphics/pokemon/front_pics/houndour_still_front_pic.4bpp.lz" @@ -7718,7 +7358,6 @@ gFile_graphics_pokemon_footprints_houndour_footprint:: @ 8DCBE00 .incbin "graphics/pokemon/footprints/houndour_footprint.1bpp" @ .incbin "baserom.gba", 0xDCBE00, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_houndoom_still_front_pic:: @ 8DCBE20 .incbin "graphics/pokemon/front_pics/houndoom_still_front_pic.4bpp.lz" @@ -7749,7 +7388,6 @@ gFile_graphics_pokemon_footprints_houndoom_footprint:: @ 8DCC994 .incbin "graphics/pokemon/footprints/houndoom_footprint.1bpp" @ .incbin "baserom.gba", 0xDCC994, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_kingdra_still_front_pic:: @ 8DCC9B4 .incbin "graphics/pokemon/front_pics/kingdra_still_front_pic.4bpp.lz" @@ -7780,7 +7418,6 @@ gFile_graphics_pokemon_footprints_kingdra_footprint:: @ 8DCD5D8 .incbin "graphics/pokemon/footprints/kingdra_footprint.1bpp" @ .incbin "baserom.gba", 0xDCD5D8, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_phanpy_still_front_pic:: @ 8DCD5F8 .incbin "graphics/pokemon/front_pics/phanpy_still_front_pic.4bpp.lz" @@ -7811,7 +7448,6 @@ gFile_graphics_pokemon_footprints_phanpy_footprint:: @ 8DCDF68 .incbin "graphics/pokemon/footprints/phanpy_footprint.1bpp" @ .incbin "baserom.gba", 0xDCDF68, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_donphan_still_front_pic:: @ 8DCDF88 .incbin "graphics/pokemon/front_pics/donphan_still_front_pic.4bpp.lz" @@ -7842,7 +7478,6 @@ gFile_graphics_pokemon_footprints_donphan_footprint:: @ 8DCEB48 .incbin "graphics/pokemon/footprints/donphan_footprint.1bpp" @ .incbin "baserom.gba", 0xDCEB48, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_porygon2_still_front_pic:: @ 8DCEB68 .incbin "graphics/pokemon/front_pics/porygon2_still_front_pic.4bpp.lz" @@ -7873,7 +7508,6 @@ gFile_graphics_pokemon_footprints_porygon2_footprint:: @ 8DCF55C .incbin "graphics/pokemon/footprints/porygon2_footprint.1bpp" @ .incbin "baserom.gba", 0xDCF55C, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_stantler_still_front_pic:: @ 8DCF57C .incbin "graphics/pokemon/front_pics/stantler_still_front_pic.4bpp.lz" @@ -7904,7 +7538,6 @@ gFile_graphics_pokemon_footprints_stantler_footprint:: @ 8DD012C .incbin "graphics/pokemon/footprints/stantler_footprint.1bpp" @ .incbin "baserom.gba", 0xDD012C, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_smeargle_still_front_pic:: @ 8DD014C .incbin "graphics/pokemon/front_pics/smeargle_still_front_pic.4bpp.lz" @@ -7935,7 +7568,6 @@ gFile_graphics_pokemon_footprints_smeargle_footprint:: @ 8DD0C54 .incbin "graphics/pokemon/footprints/smeargle_footprint.1bpp" @ .incbin "baserom.gba", 0xDD0C54, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_tyrogue_still_front_pic:: @ 8DD0C74 .incbin "graphics/pokemon/front_pics/tyrogue_still_front_pic.4bpp.lz" @@ -7966,7 +7598,6 @@ gFile_graphics_pokemon_footprints_tyrogue_footprint:: @ 8DD166C .incbin "graphics/pokemon/footprints/tyrogue_footprint.1bpp" @ .incbin "baserom.gba", 0xDD166C, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_hitmontop_still_front_pic:: @ 8DD168C .incbin "graphics/pokemon/front_pics/hitmontop_still_front_pic.4bpp.lz" @@ -8001,7 +7632,6 @@ gFile_graphics_pokemon_footprints_hitmontop_footprint:: @ 8DD2490 .incbin "graphics/pokemon/footprints/hitmontop_footprint.1bpp" @ .incbin "baserom.gba", 0xDD2490, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_smoochum_still_front_pic:: @ 8DD24B0 .incbin "graphics/pokemon/front_pics/smoochum_still_front_pic.4bpp.lz" @@ -8032,7 +7662,6 @@ gFile_graphics_pokemon_footprints_smoochum_footprint:: @ 8DD2DD0 .incbin "graphics/pokemon/footprints/smoochum_footprint.1bpp" @ .incbin "baserom.gba", 0xDD2DD0, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_elekid_still_front_pic:: @ 8DD2DF0 .incbin "graphics/pokemon/front_pics/elekid_still_front_pic.4bpp.lz" @@ -8063,7 +7692,6 @@ gFile_graphics_pokemon_footprints_elekid_footprint:: @ 8DD38A0 .incbin "graphics/pokemon/footprints/elekid_footprint.1bpp" @ .incbin "baserom.gba", 0xDD38A0, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_magby_still_front_pic:: @ 8DD38C0 .incbin "graphics/pokemon/front_pics/magby_still_front_pic.4bpp.lz" @@ -8094,7 +7722,6 @@ gFile_graphics_pokemon_footprints_magby_footprint:: @ 8DD4240 .incbin "graphics/pokemon/footprints/magby_footprint.1bpp" @ .incbin "baserom.gba", 0xDD4240, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_miltank_still_front_pic:: @ 8DD4260 .incbin "graphics/pokemon/front_pics/miltank_still_front_pic.4bpp.lz" @@ -8125,7 +7752,6 @@ gFile_graphics_pokemon_footprints_miltank_footprint:: @ 8DD4DFC .incbin "graphics/pokemon/footprints/miltank_footprint.1bpp" @ .incbin "baserom.gba", 0xDD4DFC, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_blissey_still_front_pic:: @ 8DD4E1C .incbin "graphics/pokemon/front_pics/blissey_still_front_pic.4bpp.lz" @@ -8156,7 +7782,6 @@ gFile_graphics_pokemon_footprints_blissey_footprint:: @ 8DD5920 .incbin "graphics/pokemon/footprints/blissey_footprint.1bpp" @ .incbin "baserom.gba", 0xDD5920, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_raikou_still_front_pic:: @ 8DD5940 .incbin "graphics/pokemon/front_pics/raikou_still_front_pic.4bpp.lz" @@ -8187,7 +7812,6 @@ gFile_graphics_pokemon_footprints_raikou_footprint:: @ 8DD66B4 .incbin "graphics/pokemon/footprints/raikou_footprint.1bpp" @ .incbin "baserom.gba", 0xDD66B4, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_entei_still_front_pic:: @ 8DD66D4 .incbin "graphics/pokemon/front_pics/entei_still_front_pic.4bpp.lz" @@ -8218,7 +7842,6 @@ gFile_graphics_pokemon_footprints_entei_footprint:: @ 8DD7544 .incbin "graphics/pokemon/footprints/entei_footprint.1bpp" @ .incbin "baserom.gba", 0xDD7544, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_suicune_still_front_pic:: @ 8DD7564 .incbin "graphics/pokemon/front_pics/suicune_still_front_pic.4bpp.lz" @@ -8249,7 +7872,6 @@ gFile_graphics_pokemon_footprints_suicune_footprint:: @ 8DD8414 .incbin "graphics/pokemon/footprints/suicune_footprint.1bpp" @ .incbin "baserom.gba", 0xDD8414, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_larvitar_still_front_pic:: @ 8DD8434 .incbin "graphics/pokemon/front_pics/larvitar_still_front_pic.4bpp.lz" @@ -8280,7 +7902,6 @@ gFile_graphics_pokemon_footprints_larvitar_footprint:: @ 8DD8D8C .incbin "graphics/pokemon/footprints/larvitar_footprint.1bpp" @ .incbin "baserom.gba", 0xDD8D8C, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_pupitar_still_front_pic:: @ 8DD8DAC .incbin "graphics/pokemon/front_pics/pupitar_still_front_pic.4bpp.lz" @@ -8311,7 +7932,6 @@ gFile_graphics_pokemon_footprints_pupitar_footprint:: @ 8DD9824 .incbin "graphics/pokemon/footprints/pupitar_footprint.1bpp" @ .incbin "baserom.gba", 0xDD9824, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_tyranitar_still_front_pic:: @ 8DD9844 .incbin "graphics/pokemon/front_pics/tyranitar_still_front_pic.4bpp.lz" @@ -8342,7 +7962,6 @@ gFile_graphics_pokemon_footprints_tyranitar_footprint:: @ 8DDA5BC .incbin "graphics/pokemon/footprints/tyranitar_footprint.1bpp" @ .incbin "baserom.gba", 0xDDA5BC, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_lugia_still_front_pic:: @ 8DDA5DC .incbin "graphics/pokemon/front_pics/lugia_still_front_pic.4bpp.lz" @@ -8373,7 +7992,6 @@ gFile_graphics_pokemon_footprints_lugia_footprint:: @ 8DDB2C4 .incbin "graphics/pokemon/footprints/lugia_footprint.1bpp" @ .incbin "baserom.gba", 0xDDB2C4, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_ho_oh_still_front_pic:: @ 8DDB2E4 .incbin "graphics/pokemon/front_pics/ho_oh_still_front_pic.4bpp.lz" @@ -8404,7 +8022,6 @@ gFile_graphics_pokemon_footprints_ho_oh_footprint:: @ 8DDC198 .incbin "graphics/pokemon/footprints/ho_oh_footprint.1bpp" @ .incbin "baserom.gba", 0xDDC198, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_celebi_still_front_pic:: @ 8DDC1B8 .incbin "graphics/pokemon/front_pics/celebi_still_front_pic.4bpp.lz" @@ -8435,7 +8052,6 @@ gFile_graphics_pokemon_footprints_celebi_footprint:: @ 8DDCC2C .incbin "graphics/pokemon/footprints/celebi_footprint.1bpp" @ .incbin "baserom.gba", 0xDDCC2C, 0x0020 - .align 2 gFile_graphics_pokemon_back_pics_double_question_mark_back_pic:: @ 8DDCC4C .incbin "graphics/pokemon/back_pics/double_question_mark_back_pic.4bpp.lz" @@ -8456,7 +8072,6 @@ gFile_graphics_pokemon_palettes_double_question_mark_shiny_palette:: @ 8DDCF68 .incbin "graphics/pokemon/palettes/double_question_mark_shiny_palette.gbapal.lz" @ .incbin "baserom.gba", 0xDDCF68, 0x0014 - .align 2 gFile_graphics_pokemon_front_pics_treecko_still_front_pic:: @ 8DDCF7C .incbin "graphics/pokemon/front_pics/treecko_still_front_pic.4bpp.lz" @@ -8487,7 +8102,6 @@ gFile_graphics_pokemon_footprints_treecko_footprint:: @ 8DDD9D4 .incbin "graphics/pokemon/footprints/treecko_footprint.1bpp" @ .incbin "baserom.gba", 0xDDD9D4, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_grovyle_still_front_pic:: @ 8DDD9F4 .incbin "graphics/pokemon/front_pics/grovyle_still_front_pic.4bpp.lz" @@ -8518,7 +8132,6 @@ gFile_graphics_pokemon_footprints_grovyle_footprint:: @ 8DDE60C .incbin "graphics/pokemon/footprints/grovyle_footprint.1bpp" @ .incbin "baserom.gba", 0xDDE60C, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_sceptile_still_front_pic:: @ 8DDE62C .incbin "graphics/pokemon/front_pics/sceptile_still_front_pic.4bpp.lz" @@ -8549,7 +8162,6 @@ gFile_graphics_pokemon_footprints_sceptile_footprint:: @ 8DDF37C .incbin "graphics/pokemon/footprints/sceptile_footprint.1bpp" @ .incbin "baserom.gba", 0xDDF37C, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_torchic_still_front_pic:: @ 8DDF39C .incbin "graphics/pokemon/front_pics/torchic_still_front_pic.4bpp.lz" @@ -8580,7 +8192,6 @@ gFile_graphics_pokemon_footprints_torchic_footprint:: @ 8DDFD60 .incbin "graphics/pokemon/footprints/torchic_footprint.1bpp" @ .incbin "baserom.gba", 0xDDFD60, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_combusken_still_front_pic:: @ 8DDFD80 .incbin "graphics/pokemon/front_pics/combusken_still_front_pic.4bpp.lz" @@ -8611,7 +8222,6 @@ gFile_graphics_pokemon_footprints_combusken_footprint:: @ 8DE098C .incbin "graphics/pokemon/footprints/combusken_footprint.1bpp" @ .incbin "baserom.gba", 0xDE098C, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_blaziken_still_front_pic:: @ 8DE09AC @ .incbin "graphics/pokemon/front_pics/blaziken_still_front_pic.4bpp.lz" @@ -8642,7 +8252,6 @@ gFile_graphics_pokemon_footprints_blaziken_footprint:: @ 8DE1650 .incbin "graphics/pokemon/footprints/blaziken_footprint.1bpp" @ .incbin "baserom.gba", 0xDE1650, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_mudkip_still_front_pic:: @ 8DE1670 .incbin "graphics/pokemon/front_pics/mudkip_still_front_pic.4bpp.lz" @@ -8673,7 +8282,6 @@ gFile_graphics_pokemon_footprints_mudkip_footprint:: @ 8DE2058 .incbin "graphics/pokemon/footprints/mudkip_footprint.1bpp" @ .incbin "baserom.gba", 0xDE2058, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_marshtomp_still_front_pic:: @ 8DE2078 .incbin "graphics/pokemon/front_pics/marshtomp_still_front_pic.4bpp.lz" @@ -8704,7 +8312,6 @@ gFile_graphics_pokemon_footprints_marshtomp_footprint:: @ 8DE2C00 .incbin "graphics/pokemon/footprints/marshtomp_footprint.1bpp" @ .incbin "baserom.gba", 0xDE2C00, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_swampert_still_front_pic:: @ 8DE2C20 .incbin "graphics/pokemon/front_pics/swampert_still_front_pic.4bpp.lz" @@ -8735,7 +8342,6 @@ gFile_graphics_pokemon_footprints_swampert_footprint:: @ 8DE39A0 .incbin "graphics/pokemon/footprints/swampert_footprint.1bpp" @ .incbin "baserom.gba", 0xDE39A0, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_poochyena_still_front_pic:: @ 8DE39C0 .incbin "graphics/pokemon/front_pics/poochyena_still_front_pic.4bpp.lz" @@ -8766,7 +8372,6 @@ gFile_graphics_pokemon_footprints_poochyena_footprint:: @ 8DE4404 .incbin "graphics/pokemon/footprints/poochyena_footprint.1bpp" @ .incbin "baserom.gba", 0xDE4404, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_mightyena_still_front_pic:: @ 8DE4424 .incbin "graphics/pokemon/front_pics/mightyena_still_front_pic.4bpp.lz" @@ -8797,7 +8402,6 @@ gFile_graphics_pokemon_footprints_mightyena_footprint:: @ 8DE5024 .incbin "graphics/pokemon/footprints/mightyena_footprint.1bpp" @ .incbin "baserom.gba", 0xDE5024, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_zigzagoon_still_front_pic:: @ 8DE5044 .incbin "graphics/pokemon/front_pics/zigzagoon_still_front_pic.4bpp.lz" @@ -8828,7 +8432,6 @@ gFile_graphics_pokemon_footprints_zigzagoon_footprint:: @ 8DE5BA4 .incbin "graphics/pokemon/footprints/zigzagoon_footprint.1bpp" @ .incbin "baserom.gba", 0xDE5BA4, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_linoone_still_front_pic:: @ 8DE5BC4 .incbin "graphics/pokemon/front_pics/linoone_still_front_pic.4bpp.lz" @@ -8859,7 +8462,6 @@ gFile_graphics_pokemon_footprints_linoone_footprint:: @ 8DE6658 .incbin "graphics/pokemon/footprints/linoone_footprint.1bpp" @ .incbin "baserom.gba", 0xDE6658, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_wurmple_still_front_pic:: @ 8DE6678 .incbin "graphics/pokemon/front_pics/wurmple_still_front_pic.4bpp.lz" @@ -8890,7 +8492,6 @@ gFile_graphics_pokemon_footprints_wurmple_footprint:: @ 8DE6F9C .incbin "graphics/pokemon/footprints/wurmple_footprint.1bpp" @ .incbin "baserom.gba", 0xDE6F9C, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_silcoon_still_front_pic:: @ 8DE6FBC .incbin "graphics/pokemon/front_pics/silcoon_still_front_pic.4bpp.lz" @@ -8921,7 +8522,6 @@ gFile_graphics_pokemon_footprints_silcoon_footprint:: @ 8DE78A8 .incbin "graphics/pokemon/footprints/silcoon_footprint.1bpp" @ .incbin "baserom.gba", 0xDE78A8, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_beautifly_still_front_pic:: @ 8DE78C8 .incbin "graphics/pokemon/front_pics/beautifly_still_front_pic.4bpp.lz" @@ -8952,7 +8552,6 @@ gFile_graphics_pokemon_footprints_beautifly_footprint:: @ 8DE8420 .incbin "graphics/pokemon/footprints/beautifly_footprint.1bpp" @ .incbin "baserom.gba", 0xDE8420, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_cascoon_still_front_pic:: @ 8DE8440 .incbin "graphics/pokemon/front_pics/cascoon_still_front_pic.4bpp.lz" @@ -8983,7 +8582,6 @@ gFile_graphics_pokemon_footprints_cascoon_footprint:: @ 8DE8D0C .incbin "graphics/pokemon/footprints/cascoon_footprint.1bpp" @ .incbin "baserom.gba", 0xDE8D0C, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_dustox_still_front_pic:: @ 8DE8D2C .incbin "graphics/pokemon/front_pics/dustox_still_front_pic.4bpp.lz" @@ -9014,7 +8612,6 @@ gFile_graphics_pokemon_footprints_dustox_footprint:: @ 8DE973C .incbin "graphics/pokemon/footprints/dustox_footprint.1bpp" @ .incbin "baserom.gba", 0xDE973C, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_lotad_still_front_pic:: @ 8DE975C .incbin "graphics/pokemon/front_pics/lotad_still_front_pic.4bpp.lz" @@ -9045,7 +8642,6 @@ gFile_graphics_pokemon_footprints_lotad_footprint:: @ 8DEA0F4 .incbin "graphics/pokemon/footprints/lotad_footprint.1bpp" @ .incbin "baserom.gba", 0xDEA0F4, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_lombre_still_front_pic:: @ 8DEA114 .incbin "graphics/pokemon/front_pics/lombre_still_front_pic.4bpp.lz" @@ -9076,7 +8672,6 @@ gFile_graphics_pokemon_footprints_lombre_footprint:: @ 8DEAB78 .incbin "graphics/pokemon/footprints/lombre_footprint.1bpp" @ .incbin "baserom.gba", 0xDEAB78, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_ludicolo_still_front_pic:: @ 8DEAB98 .incbin "graphics/pokemon/front_pics/ludicolo_still_front_pic.4bpp.lz" @@ -9107,7 +8702,6 @@ gFile_graphics_pokemon_footprints_ludicolo_footprint:: @ 8DEB7C8 .incbin "graphics/pokemon/footprints/ludicolo_footprint.1bpp" @ .incbin "baserom.gba", 0xDEB7C8, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_seedot_still_front_pic:: @ 8DEB7E8 .incbin "graphics/pokemon/front_pics/seedot_still_front_pic.4bpp.lz" @@ -9138,7 +8732,6 @@ gFile_graphics_pokemon_footprints_seedot_footprint:: @ 8DEC1AC .incbin "graphics/pokemon/footprints/seedot_footprint.1bpp" @ .incbin "baserom.gba", 0xDEC1AC, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_nuzleaf_still_front_pic:: @ 8DEC1CC .incbin "graphics/pokemon/front_pics/nuzleaf_still_front_pic.4bpp.lz" @@ -9169,7 +8762,6 @@ gFile_graphics_pokemon_footprints_nuzleaf_footprint:: @ 8DECBD0 .incbin "graphics/pokemon/footprints/nuzleaf_footprint.1bpp" @ .incbin "baserom.gba", 0xDECBD0, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_shiftry_still_front_pic:: @ 8DECBF0 .incbin "graphics/pokemon/front_pics/shiftry_still_front_pic.4bpp.lz" @@ -9200,7 +8792,6 @@ gFile_graphics_pokemon_footprints_shiftry_footprint:: @ 8DED7C0 .incbin "graphics/pokemon/footprints/shiftry_footprint.1bpp" @ .incbin "baserom.gba", 0xDED7C0, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_nincada_still_front_pic:: @ 8DED7E0 .incbin "graphics/pokemon/front_pics/nincada_still_front_pic.4bpp.lz" @@ -9231,7 +8822,6 @@ gFile_graphics_pokemon_footprints_nincada_footprint:: @ 8DEE188 .incbin "graphics/pokemon/footprints/nincada_footprint.1bpp" @ .incbin "baserom.gba", 0xDEE188, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_ninjask_still_front_pic:: @ 8DEE1A8 .incbin "graphics/pokemon/front_pics/ninjask_still_front_pic.4bpp.lz" @@ -9262,7 +8852,6 @@ gFile_graphics_pokemon_footprints_ninjask_footprint:: @ 8DEED34 .incbin "graphics/pokemon/footprints/ninjask_footprint.1bpp" @ .incbin "baserom.gba", 0xDEED34, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_shedinja_still_front_pic:: @ 8DEED54 .incbin "graphics/pokemon/front_pics/shedinja_still_front_pic.4bpp.lz" @@ -9293,7 +8882,6 @@ gFile_graphics_pokemon_footprints_shedinja_footprint:: @ 8DEF864 .incbin "graphics/pokemon/footprints/shedinja_footprint.1bpp" @ .incbin "baserom.gba", 0xDEF864, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_taillow_still_front_pic:: @ 8DEF884 .incbin "graphics/pokemon/front_pics/taillow_still_front_pic.4bpp.lz" @@ -9324,7 +8912,6 @@ gFile_graphics_pokemon_footprints_taillow_footprint:: @ 8DF014C .incbin "graphics/pokemon/footprints/taillow_footprint.1bpp" @ .incbin "baserom.gba", 0xDF014C, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_swellow_still_front_pic:: @ 8DF016C .incbin "graphics/pokemon/front_pics/swellow_still_front_pic.4bpp.lz" @@ -9355,7 +8942,6 @@ gFile_graphics_pokemon_footprints_swellow_footprint:: @ 8DF0CB8 .incbin "graphics/pokemon/footprints/swellow_footprint.1bpp" @ .incbin "baserom.gba", 0xDF0CB8, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_shroomish_still_front_pic:: @ 8DF0CD8 .incbin "graphics/pokemon/front_pics/shroomish_still_front_pic.4bpp.lz" @@ -9386,7 +8972,6 @@ gFile_graphics_pokemon_footprints_shroomish_footprint:: @ 8DF1670 .incbin "graphics/pokemon/footprints/shroomish_footprint.1bpp" @ .incbin "baserom.gba", 0xDF1670, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_breloom_still_front_pic:: @ 8DF1690 .incbin "graphics/pokemon/front_pics/breloom_still_front_pic.4bpp.lz" @@ -9417,7 +9002,6 @@ gFile_graphics_pokemon_footprints_breloom_footprint:: @ 8DF22A8 .incbin "graphics/pokemon/footprints/breloom_footprint.1bpp" @ .incbin "baserom.gba", 0xDF22A8, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_spinda_still_front_pic:: @ 8DF22C8 .incbin "graphics/pokemon/front_pics/spinda_still_front_pic.4bpp.lz" @@ -9448,7 +9032,6 @@ gFile_graphics_pokemon_footprints_spinda_footprint:: @ 8DF2D54 .incbin "graphics/pokemon/footprints/spinda_footprint.1bpp" @ .incbin "baserom.gba", 0xDF2D54, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_wingull_still_front_pic:: @ 8DF2D74 .incbin "graphics/pokemon/front_pics/wingull_still_front_pic.4bpp.lz" @@ -9479,7 +9062,6 @@ gFile_graphics_pokemon_footprints_wingull_footprint:: @ 8DF3750 .incbin "graphics/pokemon/footprints/wingull_footprint.1bpp" @ .incbin "baserom.gba", 0xDF3750, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_pelipper_still_front_pic:: @ 8DF3770 .incbin "graphics/pokemon/front_pics/pelipper_still_front_pic.4bpp.lz" @@ -9510,7 +9092,6 @@ gFile_graphics_pokemon_footprints_pelipper_footprint:: @ 8DF42D8 .incbin "graphics/pokemon/footprints/pelipper_footprint.1bpp" @ .incbin "baserom.gba", 0xDF42D8, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_surskit_still_front_pic:: @ 8DF42F8 .incbin "graphics/pokemon/front_pics/surskit_still_front_pic.4bpp.lz" @@ -9541,7 +9122,6 @@ gFile_graphics_pokemon_footprints_surskit_footprint:: @ 8DF4B8C .incbin "graphics/pokemon/footprints/surskit_footprint.1bpp" @ .incbin "baserom.gba", 0xDF4B8C, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_masquerain_still_front_pic:: @ 8DF4BAC .incbin "graphics/pokemon/front_pics/masquerain_still_front_pic.4bpp.lz" @@ -9572,7 +9152,6 @@ gFile_graphics_pokemon_footprints_masquerain_footprint:: @ 8DF56F0 .incbin "graphics/pokemon/footprints/masquerain_footprint.1bpp" @ .incbin "baserom.gba", 0xDF56F0, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_wailmer_still_front_pic:: @ 8DF5710 .incbin "graphics/pokemon/front_pics/wailmer_still_front_pic.4bpp.lz" @@ -9603,7 +9182,6 @@ gFile_graphics_pokemon_footprints_wailmer_footprint:: @ 8DF6024 .incbin "graphics/pokemon/footprints/wailmer_footprint.1bpp" @ .incbin "baserom.gba", 0xDF6024, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_wailord_still_front_pic:: @ 8DF6044 .incbin "graphics/pokemon/front_pics/wailord_still_front_pic.4bpp.lz" @@ -9634,7 +9212,6 @@ gFile_graphics_pokemon_footprints_wailord_footprint:: @ 8DF6A70 .incbin "graphics/pokemon/footprints/wailord_footprint.1bpp" @ .incbin "baserom.gba", 0xDF6A70, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_skitty_still_front_pic:: @ 8DF6A90 .incbin "graphics/pokemon/front_pics/skitty_still_front_pic.4bpp.lz" @@ -9665,7 +9242,6 @@ gFile_graphics_pokemon_footprints_skitty_footprint:: @ 8DF7528 .incbin "graphics/pokemon/footprints/skitty_footprint.1bpp" @ .incbin "baserom.gba", 0xDF7528, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_delcatty_still_front_pic:: @ 8DF7548 .incbin "graphics/pokemon/front_pics/delcatty_still_front_pic.4bpp.lz" @@ -9696,7 +9272,6 @@ gFile_graphics_pokemon_footprints_delcatty_footprint:: @ 8DF80C0 .incbin "graphics/pokemon/footprints/delcatty_footprint.1bpp" @ .incbin "baserom.gba", 0xDF80C0, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_kecleon_still_front_pic:: @ 8DF80E0 .incbin "graphics/pokemon/front_pics/kecleon_still_front_pic.4bpp.lz" @@ -9727,7 +9302,6 @@ gFile_graphics_pokemon_footprints_kecleon_footprint:: @ 8DF8C88 .incbin "graphics/pokemon/footprints/kecleon_footprint.1bpp" @ .incbin "baserom.gba", 0xDF8C88, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_baltoy_still_front_pic:: @ 8DF8CA8 .incbin "graphics/pokemon/front_pics/baltoy_still_front_pic.4bpp.lz" @@ -9758,7 +9332,6 @@ gFile_graphics_pokemon_footprints_baltoy_footprint:: @ 8DF95B4 .incbin "graphics/pokemon/footprints/baltoy_footprint.1bpp" @ .incbin "baserom.gba", 0xDF95B4, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_claydol_still_front_pic:: @ 8DF95D4 .incbin "graphics/pokemon/front_pics/claydol_still_front_pic.4bpp.lz" @@ -9789,7 +9362,6 @@ gFile_graphics_pokemon_footprints_claydol_footprint:: @ 8DFA1B0 .incbin "graphics/pokemon/footprints/claydol_footprint.1bpp" @ .incbin "baserom.gba", 0xDFA1B0, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_nosepass_still_front_pic:: @ 8DFA1D0 .incbin "graphics/pokemon/front_pics/nosepass_still_front_pic.4bpp.lz" @@ -9820,7 +9392,6 @@ gFile_graphics_pokemon_footprints_nosepass_footprint:: @ 8DFAB8C .incbin "graphics/pokemon/footprints/nosepass_footprint.1bpp" @ .incbin "baserom.gba", 0xDFAB8C, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_torkoal_still_front_pic:: @ 8DFABAC .incbin "graphics/pokemon/front_pics/torkoal_still_front_pic.4bpp.lz" @@ -9851,7 +9422,6 @@ gFile_graphics_pokemon_footprints_torkoal_footprint:: @ 8DFB770 .incbin "graphics/pokemon/footprints/torkoal_footprint.1bpp" @ .incbin "baserom.gba", 0xDFB770, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_sableye_still_front_pic:: @ 8DFB790 .incbin "graphics/pokemon/front_pics/sableye_still_front_pic.4bpp.lz" @@ -9882,7 +9452,6 @@ gFile_graphics_pokemon_footprints_sableye_footprint:: @ 8DFC1DC .incbin "graphics/pokemon/footprints/sableye_footprint.1bpp" @ .incbin "baserom.gba", 0xDFC1DC, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_barboach_still_front_pic:: @ 8DFC1FC .incbin "graphics/pokemon/front_pics/barboach_still_front_pic.4bpp.lz" @@ -9913,7 +9482,6 @@ gFile_graphics_pokemon_footprints_barboach_footprint:: @ 8DFCB6C .incbin "graphics/pokemon/footprints/barboach_footprint.1bpp" @ .incbin "baserom.gba", 0xDFCB6C, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_whiscash_still_front_pic:: @ 8DFCB8C .incbin "graphics/pokemon/front_pics/whiscash_still_front_pic.4bpp.lz" @@ -9944,7 +9512,6 @@ gFile_graphics_pokemon_footprints_whiscash_footprint:: @ 8DFD6A0 .incbin "graphics/pokemon/footprints/whiscash_footprint.1bpp" @ .incbin "baserom.gba", 0xDFD6A0, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_luvdisc_still_front_pic:: @ 8DFD6C0 .incbin "graphics/pokemon/front_pics/luvdisc_still_front_pic.4bpp.lz" @@ -9975,7 +9542,6 @@ gFile_graphics_pokemon_footprints_luvdisc_footprint:: @ 8DFDE9C .incbin "graphics/pokemon/footprints/luvdisc_footprint.1bpp" @ .incbin "baserom.gba", 0xDFDE9C, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_corphish_still_front_pic:: @ 8DFDEBC .incbin "graphics/pokemon/front_pics/corphish_still_front_pic.4bpp.lz" @@ -10006,7 +9572,6 @@ gFile_graphics_pokemon_footprints_corphish_footprint:: @ 8DFE984 .incbin "graphics/pokemon/footprints/corphish_footprint.1bpp" @ .incbin "baserom.gba", 0xDFE984, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_crawdaunt_still_front_pic:: @ 8DFE9A4 .incbin "graphics/pokemon/front_pics/crawdaunt_still_front_pic.4bpp.lz" @@ -10037,7 +9602,6 @@ gFile_graphics_pokemon_footprints_crawdaunt_footprint:: @ 8DFF668 .incbin "graphics/pokemon/footprints/crawdaunt_footprint.1bpp" @ .incbin "baserom.gba", 0xDFF668, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_feebas_still_front_pic:: @ 8DFF688 .incbin "graphics/pokemon/front_pics/feebas_still_front_pic.4bpp.lz" @@ -10068,7 +9632,6 @@ gFile_graphics_pokemon_footprints_feebas_footprint:: @ 8E0009C .incbin "graphics/pokemon/footprints/feebas_footprint.1bpp" @ .incbin "baserom.gba", 0xE0009C, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_milotic_still_front_pic:: @ 8E000BC .incbin "graphics/pokemon/front_pics/milotic_still_front_pic.4bpp.lz" @@ -10099,7 +9662,6 @@ gFile_graphics_pokemon_footprints_milotic_footprint:: @ 8E00C90 .incbin "graphics/pokemon/footprints/milotic_footprint.1bpp" @ .incbin "baserom.gba", 0xE00C90, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_carvanha_still_front_pic:: @ 8E00CB0 .incbin "graphics/pokemon/front_pics/carvanha_still_front_pic.4bpp.lz" @@ -10130,7 +9692,6 @@ gFile_graphics_pokemon_footprints_carvanha_footprint:: @ 8E0173C .incbin "graphics/pokemon/footprints/carvanha_footprint.1bpp" @ .incbin "baserom.gba", 0xE0173C, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_sharpedo_still_front_pic:: @ 8E0175C .incbin "graphics/pokemon/front_pics/sharpedo_still_front_pic.4bpp.lz" @@ -10161,7 +9722,6 @@ gFile_graphics_pokemon_footprints_sharpedo_footprint:: @ 8E02294 .incbin "graphics/pokemon/footprints/sharpedo_footprint.1bpp" @ .incbin "baserom.gba", 0xE02294, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_trapinch_still_front_pic:: @ 8E022B4 .incbin "graphics/pokemon/front_pics/trapinch_still_front_pic.4bpp.lz" @@ -10192,7 +9752,6 @@ gFile_graphics_pokemon_footprints_trapinch_footprint:: @ 8E02B40 .incbin "graphics/pokemon/footprints/trapinch_footprint.1bpp" @ .incbin "baserom.gba", 0xE02B40, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_vibrava_still_front_pic:: @ 8E02B60 .incbin "graphics/pokemon/front_pics/vibrava_still_front_pic.4bpp.lz" @@ -10223,7 +9782,6 @@ gFile_graphics_pokemon_footprints_vibrava_footprint:: @ 8E03598 .incbin "graphics/pokemon/footprints/vibrava_footprint.1bpp" @ .incbin "baserom.gba", 0xE03598, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_flygon_still_front_pic:: @ 8E035B8 .incbin "graphics/pokemon/front_pics/flygon_still_front_pic.4bpp.lz" @@ -10254,7 +9812,6 @@ gFile_graphics_pokemon_footprints_flygon_footprint:: @ 8E04334 .incbin "graphics/pokemon/footprints/flygon_footprint.1bpp" @ .incbin "baserom.gba", 0xE04334, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_makuhita_still_front_pic:: @ 8E04354 .incbin "graphics/pokemon/front_pics/makuhita_still_front_pic.4bpp.lz" @@ -10285,7 +9842,6 @@ gFile_graphics_pokemon_footprints_makuhita_footprint:: @ 8E04DA8 .incbin "graphics/pokemon/footprints/makuhita_footprint.1bpp" @ .incbin "baserom.gba", 0xE04DA8, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_hariyama_still_front_pic:: @ 8E04DC8 .incbin "graphics/pokemon/front_pics/hariyama_still_front_pic.4bpp.lz" @@ -10316,7 +9872,6 @@ gFile_graphics_pokemon_footprints_hariyama_footprint:: @ 8E05AA8 .incbin "graphics/pokemon/footprints/hariyama_footprint.1bpp" @ .incbin "baserom.gba", 0xE05AA8, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_electrike_still_front_pic:: @ 8E05AC8 .incbin "graphics/pokemon/front_pics/electrike_still_front_pic.4bpp.lz" @@ -10347,7 +9902,6 @@ gFile_graphics_pokemon_footprints_electrike_footprint:: @ 8E06434 .incbin "graphics/pokemon/footprints/electrike_footprint.1bpp" @ .incbin "baserom.gba", 0xE06434, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_manectric_still_front_pic:: @ 8E06454 .incbin "graphics/pokemon/front_pics/manectric_still_front_pic.4bpp.lz" @@ -10378,7 +9932,6 @@ gFile_graphics_pokemon_footprints_manectric_footprint:: @ 8E06E00 .incbin "graphics/pokemon/footprints/manectric_footprint.1bpp" @ .incbin "baserom.gba", 0xE06E00, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_numel_still_front_pic:: @ 8E06E20 .incbin "graphics/pokemon/front_pics/numel_still_front_pic.4bpp.lz" @@ -10409,7 +9962,6 @@ gFile_graphics_pokemon_footprints_numel_footprint:: @ 8E077FC .incbin "graphics/pokemon/footprints/numel_footprint.1bpp" @ .incbin "baserom.gba", 0xE077FC, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_camerupt_still_front_pic:: @ 8E0781C .incbin "graphics/pokemon/front_pics/camerupt_still_front_pic.4bpp.lz" @@ -10440,7 +9992,6 @@ gFile_graphics_pokemon_footprints_camerupt_footprint:: @ 8E08348 .incbin "graphics/pokemon/footprints/camerupt_footprint.1bpp" @ .incbin "baserom.gba", 0xE08348, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_spheal_still_front_pic:: @ 8E08368 .incbin "graphics/pokemon/front_pics/spheal_still_front_pic.4bpp.lz" @@ -10471,7 +10022,6 @@ gFile_graphics_pokemon_footprints_spheal_footprint:: @ 8E08C28 .incbin "graphics/pokemon/footprints/spheal_footprint.1bpp" @ .incbin "baserom.gba", 0xE08C28, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_sealeo_still_front_pic:: @ 8E08C48 .incbin "graphics/pokemon/front_pics/sealeo_still_front_pic.4bpp.lz" @@ -10502,7 +10052,6 @@ gFile_graphics_pokemon_footprints_sealeo_footprint:: @ 8E09694 .incbin "graphics/pokemon/footprints/sealeo_footprint.1bpp" @ .incbin "baserom.gba", 0xE09694, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_walrein_still_front_pic:: @ 8E096B4 .incbin "graphics/pokemon/front_pics/walrein_still_front_pic.4bpp.lz" @@ -10533,7 +10082,6 @@ gFile_graphics_pokemon_footprints_walrein_footprint:: @ 8E0A32C .incbin "graphics/pokemon/footprints/walrein_footprint.1bpp" @ .incbin "baserom.gba", 0xE0A32C, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_cacnea_still_front_pic:: @ 8E0A34C .incbin "graphics/pokemon/front_pics/cacnea_still_front_pic.4bpp.lz" @@ -10564,7 +10112,6 @@ gFile_graphics_pokemon_footprints_cacnea_footprint:: @ 8E0AE0C .incbin "graphics/pokemon/footprints/cacnea_footprint.1bpp" @ .incbin "baserom.gba", 0xE0AE0C, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_cacturne_still_front_pic:: @ 8E0AE2C .incbin "graphics/pokemon/front_pics/cacturne_still_front_pic.4bpp.lz" @@ -10595,7 +10142,6 @@ gFile_graphics_pokemon_footprints_cacturne_footprint:: @ 8E0B9B4 .incbin "graphics/pokemon/footprints/cacturne_footprint.1bpp" @ .incbin "baserom.gba", 0xE0B9B4, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_snorunt_still_front_pic:: @ 8E0B9D4 .incbin "graphics/pokemon/front_pics/snorunt_still_front_pic.4bpp.lz" @@ -10626,7 +10172,6 @@ gFile_graphics_pokemon_footprints_snorunt_footprint:: @ 8E0C3CC .incbin "graphics/pokemon/footprints/snorunt_footprint.1bpp" @ .incbin "baserom.gba", 0xE0C3CC, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_glalie_still_front_pic:: @ 8E0C3EC .incbin "graphics/pokemon/front_pics/glalie_still_front_pic.4bpp.lz" @@ -10657,7 +10202,6 @@ gFile_graphics_pokemon_footprints_glalie_footprint:: @ 8E0CFB4 .incbin "graphics/pokemon/footprints/glalie_footprint.1bpp" @ .incbin "baserom.gba", 0xE0CFB4, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_lunatone_still_front_pic:: @ 8E0CFD4 .incbin "graphics/pokemon/front_pics/lunatone_still_front_pic.4bpp.lz" @@ -10688,7 +10232,6 @@ gFile_graphics_pokemon_footprints_lunatone_footprint:: @ 8E0DAA4 .incbin "graphics/pokemon/footprints/lunatone_footprint.1bpp" @ .incbin "baserom.gba", 0xE0DAA4, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_solrock_still_front_pic:: @ 8E0DAC4 .incbin "graphics/pokemon/front_pics/solrock_still_front_pic.4bpp.lz" @@ -10719,7 +10262,6 @@ gFile_graphics_pokemon_footprints_solrock_footprint:: @ 8E0E74C .incbin "graphics/pokemon/footprints/solrock_footprint.1bpp" @ .incbin "baserom.gba", 0xE0E74C, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_azurill_still_front_pic:: @ 8E0E76C .incbin "graphics/pokemon/front_pics/azurill_still_front_pic.4bpp.lz" @@ -10750,7 +10292,6 @@ gFile_graphics_pokemon_footprints_azurill_footprint:: @ 8E0F19C .incbin "graphics/pokemon/footprints/azurill_footprint.1bpp" @ .incbin "baserom.gba", 0xE0F19C, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_spoink_still_front_pic:: @ 8E0F1BC .incbin "graphics/pokemon/front_pics/spoink_still_front_pic.4bpp.lz" @@ -10781,7 +10322,6 @@ gFile_graphics_pokemon_footprints_spoink_footprint:: @ 8E0FAB8 .incbin "graphics/pokemon/footprints/spoink_footprint.1bpp" @ .incbin "baserom.gba", 0xE0FAB8, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_grumpig_still_front_pic:: @ 8E0FAD8 .incbin "graphics/pokemon/front_pics/grumpig_still_front_pic.4bpp.lz" @@ -10812,7 +10352,6 @@ gFile_graphics_pokemon_footprints_grumpig_footprint:: @ 8E10644 .incbin "graphics/pokemon/footprints/grumpig_footprint.1bpp" @ .incbin "baserom.gba", 0xE10644, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_plusle_still_front_pic:: @ 8E10664 .incbin "graphics/pokemon/front_pics/plusle_still_front_pic.4bpp.lz" @@ -10843,7 +10382,6 @@ gFile_graphics_pokemon_footprints_plusle_footprint:: @ 8E10FF8 .incbin "graphics/pokemon/footprints/plusle_footprint.1bpp" @ .incbin "baserom.gba", 0xE10FF8, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_minun_still_front_pic:: @ 8E11018 .incbin "graphics/pokemon/front_pics/minun_still_front_pic.4bpp.lz" @@ -10874,7 +10412,6 @@ gFile_graphics_pokemon_footprints_minun_footprint:: @ 8E11998 .incbin "graphics/pokemon/footprints/minun_footprint.1bpp" @ .incbin "baserom.gba", 0xE11998, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_mawile_still_front_pic:: @ 8E119B8 .incbin "graphics/pokemon/front_pics/mawile_still_front_pic.4bpp.lz" @@ -10905,7 +10442,6 @@ gFile_graphics_pokemon_footprints_mawile_footprint:: @ 8E125C4 .incbin "graphics/pokemon/footprints/mawile_footprint.1bpp" @ .incbin "baserom.gba", 0xE125C4, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_meditite_still_front_pic:: @ 8E125E4 .incbin "graphics/pokemon/front_pics/meditite_still_front_pic.4bpp.lz" @@ -10936,7 +10472,6 @@ gFile_graphics_pokemon_footprints_meditite_footprint:: @ 8E12FB0 .incbin "graphics/pokemon/footprints/meditite_footprint.1bpp" @ .incbin "baserom.gba", 0xE12FB0, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_medicham_still_front_pic:: @ 8E12FD0 .incbin "graphics/pokemon/front_pics/medicham_still_front_pic.4bpp.lz" @@ -10967,7 +10502,6 @@ gFile_graphics_pokemon_footprints_medicham_footprint:: @ 8E13A88 .incbin "graphics/pokemon/footprints/medicham_footprint.1bpp" @ .incbin "baserom.gba", 0xE13A88, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_swablu_still_front_pic:: @ 8E13AA8 .incbin "graphics/pokemon/front_pics/swablu_still_front_pic.4bpp.lz" @@ -10998,7 +10532,6 @@ gFile_graphics_pokemon_footprints_swablu_footprint:: @ 8E14588 .incbin "graphics/pokemon/footprints/swablu_footprint.1bpp" @ .incbin "baserom.gba", 0xE14588, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_altaria_still_front_pic:: @ 8E145A8 .incbin "graphics/pokemon/front_pics/altaria_still_front_pic.4bpp.lz" @@ -11029,7 +10562,6 @@ gFile_graphics_pokemon_footprints_altaria_footprint:: @ 8E1514C .incbin "graphics/pokemon/footprints/altaria_footprint.1bpp" @ .incbin "baserom.gba", 0xE1514C, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_wynaut_still_front_pic:: @ 8E1516C .incbin "graphics/pokemon/front_pics/wynaut_still_front_pic.4bpp.lz" @@ -11060,7 +10592,6 @@ gFile_graphics_pokemon_footprints_wynaut_footprint:: @ 8E15AE4 .incbin "graphics/pokemon/footprints/wynaut_footprint.1bpp" @ .incbin "baserom.gba", 0xE15AE4, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_duskull_still_front_pic:: @ 8E15B04 .incbin "graphics/pokemon/front_pics/duskull_still_front_pic.4bpp.lz" @@ -11091,7 +10622,6 @@ gFile_graphics_pokemon_footprints_duskull_footprint:: @ 8E164F4 .incbin "graphics/pokemon/footprints/duskull_footprint.1bpp" @ .incbin "baserom.gba", 0xE164F4, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_dusclops_still_front_pic:: @ 8E16514 .incbin "graphics/pokemon/front_pics/dusclops_still_front_pic.4bpp.lz" @@ -11122,7 +10652,6 @@ gFile_graphics_pokemon_footprints_dusclops_footprint:: @ 8E16FF0 .incbin "graphics/pokemon/footprints/dusclops_footprint.1bpp" @ .incbin "baserom.gba", 0xE16FF0, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_roselia_still_front_pic:: @ 8E17010 .incbin "graphics/pokemon/front_pics/roselia_still_front_pic.4bpp.lz" @@ -11153,7 +10682,6 @@ gFile_graphics_pokemon_footprints_roselia_footprint:: @ 8E17B94 .incbin "graphics/pokemon/footprints/roselia_footprint.1bpp" @ .incbin "baserom.gba", 0xE17B94, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_slakoth_still_front_pic:: @ 8E17BB4 .incbin "graphics/pokemon/front_pics/slakoth_still_front_pic.4bpp.lz" @@ -11184,7 +10712,6 @@ gFile_graphics_pokemon_footprints_slakoth_footprint:: @ 8E185D4 .incbin "graphics/pokemon/footprints/slakoth_footprint.1bpp" @ .incbin "baserom.gba", 0xE185D4, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_vigoroth_still_front_pic:: @ 8E185F4 .incbin "graphics/pokemon/front_pics/vigoroth_still_front_pic.4bpp.lz" @@ -11215,7 +10742,6 @@ gFile_graphics_pokemon_footprints_vigoroth_footprint:: @ 8E19108 .incbin "graphics/pokemon/footprints/vigoroth_footprint.1bpp" @ .incbin "baserom.gba", 0xE19108, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_slaking_still_front_pic:: @ 8E19128 .incbin "graphics/pokemon/front_pics/slaking_still_front_pic.4bpp.lz" @@ -11246,7 +10772,6 @@ gFile_graphics_pokemon_footprints_slaking_footprint:: @ 8E19E10 .incbin "graphics/pokemon/footprints/slaking_footprint.1bpp" @ .incbin "baserom.gba", 0xE19E10, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_gulpin_still_front_pic:: @ 8E19E30 .incbin "graphics/pokemon/front_pics/gulpin_still_front_pic.4bpp.lz" @@ -11277,7 +10802,6 @@ gFile_graphics_pokemon_footprints_gulpin_footprint:: @ 8E1A71C .incbin "graphics/pokemon/footprints/gulpin_footprint.1bpp" @ .incbin "baserom.gba", 0xE1A71C, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_swalot_still_front_pic:: @ 8E1A73C .incbin "graphics/pokemon/front_pics/swalot_still_front_pic.4bpp.lz" @@ -11308,7 +10832,6 @@ gFile_graphics_pokemon_footprints_swalot_footprint:: @ 8E1B218 .incbin "graphics/pokemon/footprints/swalot_footprint.1bpp" @ .incbin "baserom.gba", 0xE1B218, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_tropius_still_front_pic:: @ 8E1B238 .incbin "graphics/pokemon/front_pics/tropius_still_front_pic.4bpp.lz" @@ -11339,7 +10862,6 @@ gFile_graphics_pokemon_footprints_tropius_footprint:: @ 8E1BF24 .incbin "graphics/pokemon/footprints/tropius_footprint.1bpp" @ .incbin "baserom.gba", 0xE1BF24, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_whismur_still_front_pic:: @ 8E1BF44 .incbin "graphics/pokemon/front_pics/whismur_still_front_pic.4bpp.lz" @@ -11370,7 +10892,6 @@ gFile_graphics_pokemon_footprints_whismur_footprint:: @ 8E1C898 .incbin "graphics/pokemon/footprints/whismur_footprint.1bpp" @ .incbin "baserom.gba", 0xE1C898, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_loudred_still_front_pic:: @ 8E1C8B8 .incbin "graphics/pokemon/front_pics/loudred_still_front_pic.4bpp.lz" @@ -11401,7 +10922,6 @@ gFile_graphics_pokemon_footprints_loudred_footprint:: @ 8E1D4F0 .incbin "graphics/pokemon/footprints/loudred_footprint.1bpp" @ .incbin "baserom.gba", 0xE1D4F0, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_exploud_still_front_pic:: @ 8E1D510 .incbin "graphics/pokemon/front_pics/exploud_still_front_pic.4bpp.lz" @@ -11432,7 +10952,6 @@ gFile_graphics_pokemon_footprints_exploud_footprint:: @ 8E1E2D4 .incbin "graphics/pokemon/footprints/exploud_footprint.1bpp" @ .incbin "baserom.gba", 0xE1E2D4, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_clamperl_still_front_pic:: @ 8E1E2F4 .incbin "graphics/pokemon/front_pics/clamperl_still_front_pic.4bpp.lz" @@ -11463,7 +10982,6 @@ gFile_graphics_pokemon_footprints_clamperl_footprint:: @ 8E1ECB0 .incbin "graphics/pokemon/footprints/clamperl_footprint.1bpp" @ .incbin "baserom.gba", 0xE1ECB0, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_huntail_still_front_pic:: @ 8E1ECD0 .incbin "graphics/pokemon/front_pics/huntail_still_front_pic.4bpp.lz" @@ -11494,7 +11012,6 @@ gFile_graphics_pokemon_footprints_huntail_footprint:: @ 8E1F840 .incbin "graphics/pokemon/footprints/huntail_footprint.1bpp" @ .incbin "baserom.gba", 0xE1F840, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_gorebyss_still_front_pic:: @ 8E1F860 .incbin "graphics/pokemon/front_pics/gorebyss_still_front_pic.4bpp.lz" @@ -11525,7 +11042,6 @@ gFile_graphics_pokemon_footprints_gorebyss_footprint:: @ 8E202A8 .incbin "graphics/pokemon/footprints/gorebyss_footprint.1bpp" @ .incbin "baserom.gba", 0xE202A8, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_absol_still_front_pic:: @ 8E202C8 .incbin "graphics/pokemon/front_pics/absol_still_front_pic.4bpp.lz" @@ -11556,7 +11072,6 @@ gFile_graphics_pokemon_footprints_absol_footprint:: @ 8E20EA8 .incbin "graphics/pokemon/footprints/absol_footprint.1bpp" @ .incbin "baserom.gba", 0xE20EA8, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_shuppet_still_front_pic:: @ 8E20EC8 .incbin "graphics/pokemon/front_pics/shuppet_still_front_pic.4bpp.lz" @@ -11587,7 +11102,6 @@ gFile_graphics_pokemon_footprints_shuppet_footprint:: @ 8E217E8 .incbin "graphics/pokemon/footprints/shuppet_footprint.1bpp" @ .incbin "baserom.gba", 0xE217E8, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_banette_still_front_pic:: @ 8E21808 .incbin "graphics/pokemon/front_pics/banette_still_front_pic.4bpp.lz" @@ -11618,7 +11132,6 @@ gFile_graphics_pokemon_footprints_banette_footprint:: @ 8E22188 .incbin "graphics/pokemon/footprints/banette_footprint.1bpp" @ .incbin "baserom.gba", 0xE22188, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_seviper_still_front_pic:: @ 8E221A8 .incbin "graphics/pokemon/front_pics/seviper_still_front_pic.4bpp.lz" @@ -11649,7 +11162,6 @@ gFile_graphics_pokemon_footprints_seviper_footprint:: @ 8E22EA4 .incbin "graphics/pokemon/footprints/seviper_footprint.1bpp" @ .incbin "baserom.gba", 0xE22EA4, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_zangoose_still_front_pic:: @ 8E22EC4 .incbin "graphics/pokemon/front_pics/zangoose_still_front_pic.4bpp.lz" @@ -11680,7 +11192,6 @@ gFile_graphics_pokemon_footprints_zangoose_footprint:: @ 8E23A54 .incbin "graphics/pokemon/footprints/zangoose_footprint.1bpp" @ .incbin "baserom.gba", 0xE23A54, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_relicanth_still_front_pic:: @ 8E23A74 .incbin "graphics/pokemon/front_pics/relicanth_still_front_pic.4bpp.lz" @@ -11711,7 +11222,6 @@ gFile_graphics_pokemon_footprints_relicanth_footprint:: @ 8E245B0 .incbin "graphics/pokemon/footprints/relicanth_footprint.1bpp" @ .incbin "baserom.gba", 0xE245B0, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_aron_still_front_pic:: @ 8E245D0 .incbin "graphics/pokemon/front_pics/aron_still_front_pic.4bpp.lz" @@ -11742,7 +11252,6 @@ gFile_graphics_pokemon_footprints_aron_footprint:: @ 8E24E30 .incbin "graphics/pokemon/footprints/aron_footprint.1bpp" @ .incbin "baserom.gba", 0xE24E30, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_lairon_still_front_pic:: @ 8E24E50 .incbin "graphics/pokemon/front_pics/lairon_still_front_pic.4bpp.lz" @@ -11773,7 +11282,6 @@ gFile_graphics_pokemon_footprints_lairon_footprint:: @ 8E25958 .incbin "graphics/pokemon/footprints/lairon_footprint.1bpp" @ .incbin "baserom.gba", 0xE25958, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_aggron_still_front_pic:: @ 8E25978 .incbin "graphics/pokemon/front_pics/aggron_still_front_pic.4bpp.lz" @@ -11804,7 +11312,6 @@ gFile_graphics_pokemon_footprints_aggron_footprint:: @ 8E2676C .incbin "graphics/pokemon/footprints/aggron_footprint.1bpp" @ .incbin "baserom.gba", 0xE2676C, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_castform_still_front_pic:: @ 8E2678C .incbin "graphics/pokemon/front_pics/castform_still_front_pic.4bpp.lz" @@ -11835,7 +11342,6 @@ gFile_graphics_pokemon_footprints_castform_footprint:: @ 8E280CC .incbin "graphics/pokemon/footprints/castform_footprint.1bpp" @ .incbin "baserom.gba", 0xE280CC, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_volbeat_still_front_pic:: @ 8E280EC .incbin "graphics/pokemon/front_pics/volbeat_still_front_pic.4bpp.lz" @@ -11866,7 +11372,6 @@ gFile_graphics_pokemon_footprints_volbeat_footprint:: @ 8E28C2C .incbin "graphics/pokemon/footprints/volbeat_footprint.1bpp" @ .incbin "baserom.gba", 0xE28C2C, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_illumise_still_front_pic:: @ 8E28C4C .incbin "graphics/pokemon/front_pics/illumise_still_front_pic.4bpp.lz" @@ -11897,7 +11402,6 @@ gFile_graphics_pokemon_footprints_illumise_footprint:: @ 8E2972C .incbin "graphics/pokemon/footprints/illumise_footprint.1bpp" @ .incbin "baserom.gba", 0xE2972C, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_lileep_still_front_pic:: @ 8E2974C .incbin "graphics/pokemon/front_pics/lileep_still_front_pic.4bpp.lz" @@ -11928,7 +11432,6 @@ gFile_graphics_pokemon_footprints_lileep_footprint:: @ 8E2A224 .incbin "graphics/pokemon/footprints/lileep_footprint.1bpp" @ .incbin "baserom.gba", 0xE2A224, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_cradily_still_front_pic:: @ 8E2A244 .incbin "graphics/pokemon/front_pics/cradily_still_front_pic.4bpp.lz" @@ -11959,7 +11462,6 @@ gFile_graphics_pokemon_footprints_cradily_footprint:: @ 8E2AEAC .incbin "graphics/pokemon/footprints/cradily_footprint.1bpp" @ .incbin "baserom.gba", 0xE2AEAC, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_anorith_still_front_pic:: @ 8E2AECC .incbin "graphics/pokemon/front_pics/anorith_still_front_pic.4bpp.lz" @@ -11990,7 +11492,6 @@ gFile_graphics_pokemon_footprints_anorith_footprint:: @ 8E2B888 .incbin "graphics/pokemon/footprints/anorith_footprint.1bpp" @ .incbin "baserom.gba", 0xE2B888, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_armaldo_still_front_pic:: @ 8E2B8A8 .incbin "graphics/pokemon/front_pics/armaldo_still_front_pic.4bpp.lz" @@ -12021,7 +11522,6 @@ gFile_graphics_pokemon_footprints_armaldo_footprint:: @ 8E2C6B0 .incbin "graphics/pokemon/footprints/armaldo_footprint.1bpp" @ .incbin "baserom.gba", 0xE2C6B0, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_ralts_still_front_pic:: @ 8E2C6D0 .incbin "graphics/pokemon/front_pics/ralts_still_front_pic.4bpp.lz" @@ -12052,7 +11552,6 @@ gFile_graphics_pokemon_footprints_ralts_footprint:: @ 8E2CF8C .incbin "graphics/pokemon/footprints/ralts_footprint.1bpp" @ .incbin "baserom.gba", 0xE2CF8C, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_kirlia_still_front_pic:: @ 8E2CFAC .incbin "graphics/pokemon/front_pics/kirlia_still_front_pic.4bpp.lz" @@ -12083,7 +11582,6 @@ gFile_graphics_pokemon_footprints_kirlia_footprint:: @ 8E2DA6C .incbin "graphics/pokemon/footprints/kirlia_footprint.1bpp" @ .incbin "baserom.gba", 0xE2DA6C, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_gardevoir_still_front_pic:: @ 8E2DA8C .incbin "graphics/pokemon/front_pics/gardevoir_still_front_pic.4bpp.lz" @@ -12114,7 +11612,6 @@ gFile_graphics_pokemon_footprints_gardevoir_footprint:: @ 8E2E58C .incbin "graphics/pokemon/footprints/gardevoir_footprint.1bpp" @ .incbin "baserom.gba", 0xE2E58C, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_bagon_still_front_pic:: @ 8E2E5AC .incbin "graphics/pokemon/front_pics/bagon_still_front_pic.4bpp.lz" @@ -12145,7 +11642,6 @@ gFile_graphics_pokemon_footprints_bagon_footprint:: @ 8E2EF5C .incbin "graphics/pokemon/footprints/bagon_footprint.1bpp" @ .incbin "baserom.gba", 0xE2EF5C, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_shelgon_still_front_pic:: @ 8E2EF7C .incbin "graphics/pokemon/front_pics/shelgon_still_front_pic.4bpp.lz" @@ -12176,7 +11672,6 @@ gFile_graphics_pokemon_footprints_shelgon_footprint:: @ 8E2F9B8 .incbin "graphics/pokemon/footprints/shelgon_footprint.1bpp" @ .incbin "baserom.gba", 0xE2F9B8, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_salamence_still_front_pic:: @ 8E2F9D8 .incbin "graphics/pokemon/front_pics/salamence_still_front_pic.4bpp.lz" @@ -12207,7 +11702,6 @@ gFile_graphics_pokemon_footprints_salamence_footprint:: @ 8E30570 .incbin "graphics/pokemon/footprints/salamence_footprint.1bpp" @ .incbin "baserom.gba", 0xE30570, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_beldum_still_front_pic:: @ 8E30590 .incbin "graphics/pokemon/front_pics/beldum_still_front_pic.4bpp.lz" @@ -12238,7 +11732,6 @@ gFile_graphics_pokemon_footprints_beldum_footprint:: @ 8E30F40 .incbin "graphics/pokemon/footprints/beldum_footprint.1bpp" @ .incbin "baserom.gba", 0xE30F40, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_metang_still_front_pic:: @ 8E30F60 .incbin "graphics/pokemon/front_pics/metang_still_front_pic.4bpp.lz" @@ -12269,7 +11762,6 @@ gFile_graphics_pokemon_footprints_metang_footprint:: @ 8E31B30 .incbin "graphics/pokemon/footprints/metang_footprint.1bpp" @ .incbin "baserom.gba", 0xE31B30, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_metagross_still_front_pic:: @ 8E31B50 .incbin "graphics/pokemon/front_pics/metagross_still_front_pic.4bpp.lz" @@ -12300,7 +11792,6 @@ gFile_graphics_pokemon_footprints_metagross_footprint:: @ 8E326D0 .incbin "graphics/pokemon/footprints/metagross_footprint.1bpp" @ .incbin "baserom.gba", 0xE326D0, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_regirock_still_front_pic:: @ 8E326F0 .incbin "graphics/pokemon/front_pics/regirock_still_front_pic.4bpp.lz" @@ -12331,7 +11822,6 @@ gFile_graphics_pokemon_footprints_regirock_footprint:: @ 8E33448 .incbin "graphics/pokemon/footprints/regirock_footprint.1bpp" @ .incbin "baserom.gba", 0xE33448, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_regice_still_front_pic:: @ 8E33468 .incbin "graphics/pokemon/front_pics/regice_still_front_pic.4bpp.lz" @@ -12362,7 +11852,6 @@ gFile_graphics_pokemon_footprints_regice_footprint:: @ 8E33FF0 .incbin "graphics/pokemon/footprints/regice_footprint.1bpp" @ .incbin "baserom.gba", 0xE33FF0, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_registeel_still_front_pic:: @ 8E34010 .incbin "graphics/pokemon/front_pics/registeel_still_front_pic.4bpp.lz" @@ -12393,7 +11882,6 @@ gFile_graphics_pokemon_footprints_registeel_footprint:: @ 8E34C20 .incbin "graphics/pokemon/footprints/registeel_footprint.1bpp" @ .incbin "baserom.gba", 0xE34C20, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_kyogre_still_front_pic:: @ 8E34C40 .incbin "graphics/pokemon/front_pics/kyogre_still_front_pic.4bpp.lz" @@ -12424,7 +11912,6 @@ gFile_graphics_pokemon_footprints_kyogre_footprint:: @ 8E35778 .incbin "graphics/pokemon/footprints/kyogre_footprint.1bpp" @ .incbin "baserom.gba", 0xE35778, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_groudon_still_front_pic:: @ 8E35798 .incbin "graphics/pokemon/front_pics/groudon_still_front_pic.4bpp.lz" @@ -12455,7 +11942,6 @@ gFile_graphics_pokemon_footprints_groudon_footprint:: @ 8E365E4 .incbin "graphics/pokemon/footprints/groudon_footprint.1bpp" @ .incbin "baserom.gba", 0xE365E4, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_rayquaza_still_front_pic:: @ 8E36604 .incbin "graphics/pokemon/front_pics/rayquaza_still_front_pic.4bpp.lz" @@ -12486,7 +11972,6 @@ gFile_graphics_pokemon_footprints_rayquaza_footprint:: @ 8E3729C .incbin "graphics/pokemon/footprints/rayquaza_footprint.1bpp" @ .incbin "baserom.gba", 0xE3729C, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_latias_still_front_pic:: @ 8E372BC .incbin "graphics/pokemon/front_pics/latias_still_front_pic.4bpp.lz" @@ -12517,7 +12002,6 @@ gFile_graphics_pokemon_footprints_latias_footprint:: @ 8E37E2C .incbin "graphics/pokemon/footprints/latias_footprint.1bpp" @ .incbin "baserom.gba", 0xE37E2C, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_latios_still_front_pic:: @ 8E37E4C .incbin "graphics/pokemon/front_pics/latios_still_front_pic.4bpp.lz" @@ -12548,7 +12032,6 @@ gFile_graphics_pokemon_footprints_latios_footprint:: @ 8E38A50 .incbin "graphics/pokemon/footprints/latios_footprint.1bpp" @ .incbin "baserom.gba", 0xE38A50, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_jirachi_still_front_pic:: @ 8E38A70 .incbin "graphics/pokemon/front_pics/jirachi_still_front_pic.4bpp.lz" @@ -12579,7 +12062,6 @@ gFile_graphics_pokemon_footprints_jirachi_footprint:: @ 8E3956C .incbin "graphics/pokemon/footprints/jirachi_footprint.1bpp" @ .incbin "baserom.gba", 0xE3956C, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_deoxys_still_front_pic:: @ 8E3958C .incbin "graphics/pokemon/front_pics/deoxys_still_front_pic.4bpp.lz" @@ -12615,7 +12097,6 @@ gFile_graphics_pokemon_footprints_deoxys_footprint:: @ 8E3AB88 .incbin "graphics/pokemon/footprints/deoxys_footprint.1bpp" @ .incbin "baserom.gba", 0xE3AB88, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_chimecho_still_front_pic:: @ 8E3ABA8 .incbin "graphics/pokemon/front_pics/chimecho_still_front_pic.4bpp.lz" @@ -12646,7 +12127,6 @@ gFile_graphics_pokemon_footprints_chimecho_footprint:: @ 8E3B4B8 .incbin "graphics/pokemon/footprints/chimecho_footprint.1bpp" @ .incbin "baserom.gba", 0xE3B4B8, 0x0020 - .align 2 gFile_graphics_pokemon_front_pics_egg_still_front_pic:: @ 8E3B4D8 .incbin "graphics/pokemon/front_pics/egg_still_front_pic.4bpp.lz" @@ -13062,7 +12542,6 @@ gFile_graphics_pokemon_icons_unown_question_mark_icon:: @ 8E48958 .incbin "graphics/pokemon/icons/unown_question_mark_icon.4bpp" @ .incbin "baserom.gba", 0xE48958, 0x0400 - .align 2 gFile_graphics_trainers_front_pics_aqua_leader_archie_front_pic:: @ 8E48D58 .incbin "graphics/trainers/front_pics/aqua_leader_archie_front_pic.4bpp.lz" @@ -13883,7 +13362,6 @@ gFile_graphics_trainers_palettes_elite_four_drake:: @ 8E5AD34 .incbin "graphics/trainers/palettes/elite_four_drake.gbapal.lz" @ .incbin "baserom.gba", 0xE5AD34, 0x0028 - .align 2 gFile_graphics_trainers_front_pics_youngster_front_pic:: @ 8E5AD5C .incbin "graphics/trainers/front_pics/youngster_front_pic.4bpp.lz" @@ -14394,7 +13872,6 @@ gFile_graphics_trainers_palettes_oak:: @ 8E66BF4 .incbin "graphics/trainers/palettes/oak.gbapal.lz" @ .incbin "baserom.gba", 0xE66BF4, 0x0028 - .align 2 gFile_graphics_trainers_front_pics_ruby_sapphire_brendan_front_pic2:: @ 8E66C1C .incbin "graphics/trainers/front_pics/ruby_sapphire_brendan_front_pic.4bpp.lz" @@ -14435,7 +13912,6 @@ gFile_graphics_trainers_palettes_leaf:: @ 8E678F0 .incbin "graphics/trainers/palettes/leaf.gbapal.lz" @ .incbin "baserom.gba", 0xE678F0, 0x0028 - .align 2 gFile_graphics_trainers_front_pics_rocket_grunt_f_front_pic:: @ 8E67918 .incbin "graphics/trainers/front_pics/rocket_grunt_f_front_pic.4bpp.lz" @@ -14546,7 +14022,6 @@ gFile_graphics_trainers_palettes_painter:: @ 8E69E94 .incbin "graphics/trainers/palettes/painter.gbapal.lz" @ .incbin "baserom.gba", 0xE69E94, 0x0028 - .align 2 gFile_graphics_trainers_back_pics_red_back_pic:: @ 8E69EBC .incbin "graphics/trainers/back_pics/red_back_pic.4bpp" @@ -14577,7 +14052,6 @@ gFile_graphics_trainers_back_pics_ruby_sapphire_may_back_pic:: @ 8E74EBC .incbin "graphics/trainers/back_pics/ruby_sapphire_may_back_pic.4bpp" @ .incbin "baserom.gba", 0xE74EBC, 0x2000 - .align 2 gFile_graphics_trainers_palettes_leaf_back_pic:: @ 8E76EBC .incbin "graphics/trainers/palettes/leaf_back_pic.gbapal.lz" @@ -14608,7 +14082,6 @@ gFile_graphics_pokemon_footprints_question_mark_footprint:: @ 8E7735C .incbin "graphics/pokemon/footprints/question_mark_footprint.1bpp" @ .incbin "baserom.gba", 0xE7735C, 0x0020 - .align 2 @ THIS IS ./graphics/battle_transitions/vs_frame.4bpp.lz gUnknown_8E7737C:: @ 8E7737C -- cgit v1.2.3 From e143072f961cfffc5e8e2cc5b2a6059c27124808 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Fri, 12 Oct 2018 18:00:42 -0400 Subject: through sub_8112364 --- asm/quest_log.s | 131 ------------------------------------------------ include/field_weather.h | 1 + src/quest_log.c | 43 ++++++++++++++++ 3 files changed, 44 insertions(+), 131 deletions(-) diff --git a/asm/quest_log.s b/asm/quest_log.s index 4972eaa07..5045c50be 100644 --- a/asm/quest_log.s +++ b/asm/quest_log.s @@ -5,137 +5,6 @@ .text - thumb_func_start sub_811229C -sub_811229C: @ 811229C - push {r4-r6,lr} - movs r0, 0x80 - lsls r0, 3 - bl Alloc - adds r6, r0, 0 - ldr r4, _08112314 @ =gUnknown_203AE90 - ldr r0, [r4] - movs r5, 0x80 - lsls r5, 2 - adds r1, r6, 0 - adds r2, r5, 0 - bl CpuSet - ldr r1, [r4] - adds r0, r1, 0 - movs r2, 0xD0 - bl sub_807B0C4 - ldr r1, [r4] - movs r0, 0x88 - lsls r0, 2 - adds r1, r0 - adds r0, r1, 0 - movs r2, 0x10 - bl sub_807B0C4 - ldr r1, [r4] - movs r0, 0xB0 - lsls r0, 2 - adds r1, r0 - adds r0, r1, 0 - movs r2, 0x40 - bl sub_807B0C4 - ldr r1, [r4] - movs r0, 0xD8 - lsls r0, 2 - adds r1, r0 - adds r0, r1, 0 - movs r2, 0x50 - bl sub_807B0C4 - ldr r0, [r4] - ldr r1, _08112318 @ =gPlttBufferUnfaded - adds r2, r5, 0 - bl CpuSet - ldr r1, [r4] - adds r0, r6, 0 - adds r2, r5, 0 - bl CpuSet - adds r0, r6, 0 - bl Free - pop {r4-r6} - pop {r0} - bx r0 - .align 2, 0 -_08112314: .4byte gUnknown_203AE90 -_08112318: .4byte gPlttBufferUnfaded - thumb_func_end sub_811229C - - thumb_func_start sub_811231C -sub_811231C: @ 811231C - push {r4,lr} - ldr r4, _0811234C @ =gUnknown_203ADFA - ldrb r0, [r4] - cmp r0, 0x1 - bne _08112346 - ldr r0, _08112350 @ =gUnknown_203AE98 - bl sub_8110E68 - bl sub_8110E3C - movs r0, 0 - strb r0, [r4] - ldr r0, _08112354 @ =gUnknown_203AE8C - movs r1, 0 - str r1, [r0] - ldr r0, _08112358 @ =gUnknown_203AE04 - str r1, [r0] - ldr r0, _0811235C @ =gUnknown_203AE08 - str r1, [r0] - ldr r0, _08112360 @ =gUnknown_3005E88 - strb r1, [r0] -_08112346: - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_0811234C: .4byte gUnknown_203ADFA -_08112350: .4byte gUnknown_203AE98 -_08112354: .4byte gUnknown_203AE8C -_08112358: .4byte gUnknown_203AE04 -_0811235C: .4byte gUnknown_203AE08 -_08112360: .4byte gUnknown_3005E88 - thumb_func_end sub_811231C - - thumb_func_start sub_8112364 -sub_8112364: @ 8112364 - push {r4,r5,lr} - ldr r5, _081123A4 @ =gUnknown_3005E88 - ldrb r0, [r5] - cmp r0, 0 - beq _08112392 - ldr r4, _081123A8 @ =gUnknown_203ADFA - ldrb r0, [r4] - cmp r0, 0x1 - bne _08112392 - ldr r0, _081123AC @ =gUnknown_203AE98 - bl sub_8110E68 - movs r0, 0x1 - bl sub_8113A1C - bl sub_8110E3C - movs r0, 0 - strb r0, [r5] - strb r0, [r4] - ldr r1, _081123B0 @ =gUnknown_203AE8C - movs r0, 0 - str r0, [r1] -_08112392: - ldr r0, _081123B4 @ =gUnknown_203AE04 - movs r1, 0 - str r1, [r0] - ldr r0, _081123B8 @ =gUnknown_203AE08 - str r1, [r0] - pop {r4,r5} - pop {r0} - bx r0 - .align 2, 0 -_081123A4: .4byte gUnknown_3005E88 -_081123A8: .4byte gUnknown_203ADFA -_081123AC: .4byte gUnknown_203AE98 -_081123B0: .4byte gUnknown_203AE8C -_081123B4: .4byte gUnknown_203AE04 -_081123B8: .4byte gUnknown_203AE08 - thumb_func_end sub_8112364 - thumb_func_start sub_81123BC sub_81123BC: @ 81123BC push {r4-r7,lr} diff --git a/include/field_weather.h b/include/field_weather.h index e12107e70..3f7741f00 100644 --- a/include/field_weather.h +++ b/include/field_weather.h @@ -8,5 +8,6 @@ u8 GetSav1Weather(void); void sub_80AEDBC(void); void DoCurrentWeather(void); +void sub_807B0C4(u16 *, u16 *, u32); #endif // GUARD_WEATHER_H diff --git a/src/quest_log.c b/src/quest_log.c index 028bd574e..391a760ba 100644 --- a/src/quest_log.c +++ b/src/quest_log.c @@ -99,6 +99,7 @@ void sub_811229C(void); void sub_8112364(void); void sub_8112888(u8); void sub_8112940(u8, struct UnkStruct_203AE98 *, u16); +void sub_8113A1C(u8); void sub_811381C(void); void sub_81138F8(void); void * sub_8113A78(void *, void **); @@ -1339,3 +1340,45 @@ bool8 sub_81121D8(u8 taskId) data[1]++; return FALSE; } + +void sub_811229C(void) +{ + u16 * buffer = Alloc(0x400); + CpuCopy16(gUnknown_203AE90, buffer, 0x400); + sub_807B0C4(gUnknown_203AE90, gUnknown_203AE90, 0xd0); + sub_807B0C4(gUnknown_203AE90 + 0x110, gUnknown_203AE90 + 0x110, 0x10); + sub_807B0C4(gUnknown_203AE90 + 0x160, gUnknown_203AE90 + 0x160, 0x40); + sub_807B0C4(gUnknown_203AE90 + 0x1b0, gUnknown_203AE90 + 0x1b0, 0x50); + CpuCopy16(gUnknown_203AE90, gPlttBufferUnfaded, 0x400); + CpuCopy16(buffer, gUnknown_203AE90, 0x400); + Free(buffer); +} + +void sub_811231C(void) +{ + if (gUnknown_203ADFA == 1) + { + sub_8110E68(gUnknown_203AE98); + sub_8110E3C(); + gUnknown_203ADFA = 0; + gUnknown_203AE8C = NULL; + gUnknown_203AE04 = NULL; + gUnknown_203AE08 = NULL; + gUnknown_3005E88 = 0; + } +} + +void sub_8112364(void) +{ + if (gUnknown_3005E88 && gUnknown_203ADFA == 1) + { + sub_8110E68(gUnknown_203AE98); + sub_8113A1C(1); + sub_8110E3C(); + gUnknown_3005E88 = 0; + gUnknown_203ADFA = 0; + gUnknown_203AE8C = NULL; + } + gUnknown_203AE04 = NULL; + gUnknown_203AE08 = NULL; +} -- cgit v1.2.3 From a9cef334e09b54d6f0d4ab15861a465cc5bc071c Mon Sep 17 00:00:00 2001 From: paul Date: Sat, 13 Oct 2018 00:39:32 +0200 Subject: fix up blaziken, double_question_mark and pokemaniac --- data/graphics.s | 2594 +------------------- .../back_pics/double_question_mark_back_pic.png | Bin 308 -> 307 bytes .../front_pics/blaziken_still_front_pic.png | Bin 1010 -> 967 bytes .../double_question_mark_still_front_pic.png | Bin 306 -> 308 bytes graphics/trainers/palettes/emerald_pokemaniac.pal | 26 +- graphics/trainers/palettes/pokemaniac.pal | 26 +- 6 files changed, 33 insertions(+), 2613 deletions(-) diff --git a/data/graphics.s b/data/graphics.s index b99fece55..8715afc66 100644 --- a/data/graphics.s +++ b/data/graphics.s @@ -1178,5757 +1178,4606 @@ gFile_graphics_pokemon_footprints_fearow_footprint:: @ 8D3ED4C .align 2 gFile_graphics_pokemon_front_pics_ekans_still_front_pic:: @ 8D3ED6C .incbin "graphics/pokemon/front_pics/ekans_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xD3ED6C, 0x02C8 .align 2 gFile_graphics_pokemon_palettes_ekans_palette:: @ 8D3F034 .incbin "graphics/pokemon/palettes/ekans_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xD3F034, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_ekans_back_pic:: @ 8D3F05C .incbin "graphics/pokemon/back_pics/ekans_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xD3F05C, 0x02F0 .align 2 gFile_graphics_pokemon_palettes_ekans_shiny_palette:: @ 8D3F34C .incbin "graphics/pokemon/palettes/ekans_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xD3F34C, 0x0028 .align 2 gFile_graphics_pokemon_icons_ekans_icon:: @ 8D3F374 .incbin "graphics/pokemon/icons/ekans_icon.4bpp" - @ .incbin "baserom.gba", 0xD3F374, 0x0400 .align 2 gFile_graphics_pokemon_footprints_ekans_footprint:: @ 8D3F774 .incbin "graphics/pokemon/footprints/ekans_footprint.1bpp" - @ .incbin "baserom.gba", 0xD3F774, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_arbok_still_front_pic:: @ 8D3F794 .incbin "graphics/pokemon/front_pics/arbok_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xD3F794, 0x0474 .align 2 gFile_graphics_pokemon_palettes_arbok_palette:: @ 8D3FC08 .incbin "graphics/pokemon/palettes/arbok_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xD3FC08, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_arbok_back_pic:: @ 8D3FC30 .incbin "graphics/pokemon/back_pics/arbok_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xD3FC30, 0x0288 .align 2 gFile_graphics_pokemon_palettes_arbok_shiny_palette:: @ 8D3FEB8 .incbin "graphics/pokemon/palettes/arbok_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xD3FEB8, 0x0028 .align 2 gFile_graphics_pokemon_icons_arbok_icon:: @ 8D3FEE0 .incbin "graphics/pokemon/icons/arbok_icon.4bpp" - @ .incbin "baserom.gba", 0xD3FEE0, 0x0400 .align 2 gFile_graphics_pokemon_footprints_arbok_footprint:: @ 8D402E0 .incbin "graphics/pokemon/footprints/arbok_footprint.1bpp" - @ .incbin "baserom.gba", 0xD402E0, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_pikachu_still_front_pic:: @ 8D40300 .incbin "graphics/pokemon/front_pics/pikachu_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xD40300, 0x02D0 .align 2 gFile_graphics_pokemon_palettes_pikachu_palette:: @ 8D405D0 .incbin "graphics/pokemon/palettes/pikachu_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xD405D0, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_pikachu_back_pic:: @ 8D405F8 .incbin "graphics/pokemon/back_pics/pikachu_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xD405F8, 0x02D8 .align 2 gFile_graphics_pokemon_palettes_pikachu_shiny_palette:: @ 8D408D0 .incbin "graphics/pokemon/palettes/pikachu_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xD408D0, 0x0028 .align 2 gFile_graphics_pokemon_icons_pikachu_icon:: @ 8D408F8 .incbin "graphics/pokemon/icons/pikachu_icon.4bpp" - @ .incbin "baserom.gba", 0xD408F8, 0x0400 .align 2 gFile_graphics_pokemon_footprints_pikachu_footprint:: @ 8D40CF8 .incbin "graphics/pokemon/footprints/pikachu_footprint.1bpp" - @ .incbin "baserom.gba", 0xD40CF8, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_raichu_still_front_pic:: @ 8D40D18 .incbin "graphics/pokemon/front_pics/raichu_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xD40D18, 0x03F8 .align 2 gFile_graphics_pokemon_palettes_raichu_palette:: @ 8D41110 .incbin "graphics/pokemon/palettes/raichu_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xD41110, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_raichu_back_pic:: @ 8D41138 .incbin "graphics/pokemon/back_pics/raichu_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xD41138, 0x0320 .align 2 gFile_graphics_pokemon_palettes_raichu_shiny_palette:: @ 8D41458 .incbin "graphics/pokemon/palettes/raichu_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xD41458, 0x0028 .align 2 gFile_graphics_pokemon_icons_raichu_icon:: @ 8D41480 .incbin "graphics/pokemon/icons/raichu_icon.4bpp" - @ .incbin "baserom.gba", 0xD41480, 0x0400 .align 2 gFile_graphics_pokemon_footprints_raichu_footprint:: @ 8D41880 .incbin "graphics/pokemon/footprints/raichu_footprint.1bpp" - @ .incbin "baserom.gba", 0xD41880, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_sandshrew_still_front_pic:: @ 8D418A0 .incbin "graphics/pokemon/front_pics/sandshrew_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xD418A0, 0x02DC .align 2 gFile_graphics_pokemon_palettes_sandshrew_palette:: @ 8D41B7C .incbin "graphics/pokemon/palettes/sandshrew_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xD41B7C, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_sandshrew_back_pic:: @ 8D41BA4 .incbin "graphics/pokemon/back_pics/sandshrew_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xD41BA4, 0x0328 .align 2 gFile_graphics_pokemon_palettes_sandshrew_shiny_palette:: @ 8D41ECC .incbin "graphics/pokemon/palettes/sandshrew_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xD41ECC, 0x0028 .align 2 gFile_graphics_pokemon_icons_sandshrew_icon:: @ 8D41EF4 .incbin "graphics/pokemon/icons/sandshrew_icon.4bpp" - @ .incbin "baserom.gba", 0xD41EF4, 0x0400 .align 2 gFile_graphics_pokemon_footprints_sandshrew_footprint:: @ 8D422F4 .incbin "graphics/pokemon/footprints/sandshrew_footprint.1bpp" - @ .incbin "baserom.gba", 0xD422F4, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_sandslash_still_front_pic:: @ 8D42314 .incbin "graphics/pokemon/front_pics/sandslash_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xD42314, 0x0418 .align 2 gFile_graphics_pokemon_palettes_sandslash_palette:: @ 8D4272C .incbin "graphics/pokemon/palettes/sandslash_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xD4272C, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_sandslash_back_pic:: @ 8D42754 .incbin "graphics/pokemon/back_pics/sandslash_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xD42754, 0x041C .align 2 gFile_graphics_pokemon_palettes_sandslash_shiny_palette:: @ 8D42B70 .incbin "graphics/pokemon/palettes/sandslash_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xD42B70, 0x0028 .align 2 gFile_graphics_pokemon_icons_sandslash_icon:: @ 8D42B98 .incbin "graphics/pokemon/icons/sandslash_icon.4bpp" - @ .incbin "baserom.gba", 0xD42B98, 0x0400 .align 2 gFile_graphics_pokemon_footprints_sandslash_footprint:: @ 8D42F98 .incbin "graphics/pokemon/footprints/sandslash_footprint.1bpp" - @ .incbin "baserom.gba", 0xD42F98, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_nidoran_f_still_front_pic:: @ 8D42FB8 .incbin "graphics/pokemon/front_pics/nidoran_f_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xD42FB8, 0x0264 .align 2 gFile_graphics_pokemon_palettes_nidoran_f_palette:: @ 8D4321C .incbin "graphics/pokemon/palettes/nidoran_f_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xD4321C, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_nidoran_f_back_pic:: @ 8D43244 .incbin "graphics/pokemon/back_pics/nidoran_f_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xD43244, 0x02E0 .align 2 gFile_graphics_pokemon_palettes_nidoran_f_shiny_palette:: @ 8D43524 .incbin "graphics/pokemon/palettes/nidoran_f_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xD43524, 0x0028 .align 2 gFile_graphics_pokemon_icons_nidoran_f_icon:: @ 8D4354C .incbin "graphics/pokemon/icons/nidoran_f_icon.4bpp" - @ .incbin "baserom.gba", 0xD4354C, 0x0400 .align 2 gFile_graphics_pokemon_footprints_nidoran_f_footprint:: @ 8D4394C .incbin "graphics/pokemon/footprints/nidoran_f_footprint.1bpp" - @ .incbin "baserom.gba", 0xD4394C, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_nidorina_still_front_pic:: @ 8D4396C .incbin "graphics/pokemon/front_pics/nidorina_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xD4396C, 0x0320 .align 2 gFile_graphics_pokemon_palettes_nidorina_palette:: @ 8D43C8C .incbin "graphics/pokemon/palettes/nidorina_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xD43C8C, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_nidorina_back_pic:: @ 8D43CB4 .incbin "graphics/pokemon/back_pics/nidorina_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xD43CB4, 0x0394 .align 2 gFile_graphics_pokemon_palettes_nidorina_shiny_palette:: @ 8D44048 .incbin "graphics/pokemon/palettes/nidorina_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xD44048, 0x0028 .align 2 gFile_graphics_pokemon_icons_nidorina_icon:: @ 8D44070 .incbin "graphics/pokemon/icons/nidorina_icon.4bpp" - @ .incbin "baserom.gba", 0xD44070, 0x0400 .align 2 gFile_graphics_pokemon_footprints_nidorina_footprint:: @ 8D44470 .incbin "graphics/pokemon/footprints/nidorina_footprint.1bpp" - @ .incbin "baserom.gba", 0xD44470, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_nidoqueen_still_front_pic:: @ 8D44490 .incbin "graphics/pokemon/front_pics/nidoqueen_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xD44490, 0x042C .align 2 gFile_graphics_pokemon_palettes_nidoqueen_palette:: @ 8D448BC .incbin "graphics/pokemon/palettes/nidoqueen_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xD448BC, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_nidoqueen_back_pic:: @ 8D448E4 .incbin "graphics/pokemon/back_pics/nidoqueen_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xD448E4, 0x03C4 .align 2 gFile_graphics_pokemon_palettes_nidoqueen_shiny_palette:: @ 8D44CA8 .incbin "graphics/pokemon/palettes/nidoqueen_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xD44CA8, 0x0028 .align 2 gFile_graphics_pokemon_icons_nidoqueen_icon:: @ 8D44CD0 .incbin "graphics/pokemon/icons/nidoqueen_icon.4bpp" - @ .incbin "baserom.gba", 0xD44CD0, 0x0400 .align 2 gFile_graphics_pokemon_footprints_nidoqueen_footprint:: @ 8D450D0 .incbin "graphics/pokemon/footprints/nidoqueen_footprint.1bpp" - @ .incbin "baserom.gba", 0xD450D0, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_nidoran_m_still_front_pic:: @ 8D450F0 .incbin "graphics/pokemon/front_pics/nidoran_m_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xD450F0, 0x028C .align 2 gFile_graphics_pokemon_palettes_nidoran_m_palette:: @ 8D4537C .incbin "graphics/pokemon/palettes/nidoran_m_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xD4537C, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_nidoran_m_back_pic:: @ 8D453A4 .incbin "graphics/pokemon/back_pics/nidoran_m_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xD453A4, 0x0334 .align 2 gFile_graphics_pokemon_palettes_nidoran_m_shiny_palette:: @ 8D456D8 .incbin "graphics/pokemon/palettes/nidoran_m_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xD456D8, 0x0028 .align 2 gFile_graphics_pokemon_icons_nidoran_m_icon:: @ 8D45700 .incbin "graphics/pokemon/icons/nidoran_m_icon.4bpp" - @ .incbin "baserom.gba", 0xD45700, 0x0400 .align 2 gFile_graphics_pokemon_footprints_nidoran_m_footprint:: @ 8D45B00 .incbin "graphics/pokemon/footprints/nidoran_m_footprint.1bpp" - @ .incbin "baserom.gba", 0xD45B00, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_nidorino_still_front_pic:: @ 8D45B20 .incbin "graphics/pokemon/front_pics/nidorino_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xD45B20, 0x0384 .align 2 gFile_graphics_pokemon_palettes_nidorino_palette:: @ 8D45EA4 .incbin "graphics/pokemon/palettes/nidorino_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xD45EA4, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_nidorino_back_pic:: @ 8D45ECC .incbin "graphics/pokemon/back_pics/nidorino_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xD45ECC, 0x03BC .align 2 gFile_graphics_pokemon_palettes_nidorino_shiny_palette:: @ 8D46288 .incbin "graphics/pokemon/palettes/nidorino_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xD46288, 0x0028 .align 2 gFile_graphics_pokemon_icons_nidorino_icon:: @ 8D462B0 .incbin "graphics/pokemon/icons/nidorino_icon.4bpp" - @ .incbin "baserom.gba", 0xD462B0, 0x0400 .align 2 gFile_graphics_pokemon_footprints_nidorino_footprint:: @ 8D466B0 .incbin "graphics/pokemon/footprints/nidorino_footprint.1bpp" - @ .incbin "baserom.gba", 0xD466B0, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_nidoking_still_front_pic:: @ 8D466D0 .incbin "graphics/pokemon/front_pics/nidoking_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xD466D0, 0x053C .align 2 gFile_graphics_pokemon_palettes_nidoking_palette:: @ 8D46C0C .incbin "graphics/pokemon/palettes/nidoking_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xD46C0C, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_nidoking_back_pic:: @ 8D46C34 .incbin "graphics/pokemon/back_pics/nidoking_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xD46C34, 0x043C .align 2 gFile_graphics_pokemon_palettes_nidoking_shiny_palette:: @ 8D47070 .incbin "graphics/pokemon/palettes/nidoking_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xD47070, 0x0028 .align 2 gFile_graphics_pokemon_icons_nidoking_icon:: @ 8D47098 .incbin "graphics/pokemon/icons/nidoking_icon.4bpp" - @ .incbin "baserom.gba", 0xD47098, 0x0400 .align 2 gFile_graphics_pokemon_footprints_nidoking_footprint:: @ 8D47498 .incbin "graphics/pokemon/footprints/nidoking_footprint.1bpp" - @ .incbin "baserom.gba", 0xD47498, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_clefairy_still_front_pic:: @ 8D474B8 .incbin "graphics/pokemon/front_pics/clefairy_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xD474B8, 0x029C .align 2 gFile_graphics_pokemon_palettes_clefairy_palette:: @ 8D47754 .incbin "graphics/pokemon/palettes/clefairy_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xD47754, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_clefairy_back_pic:: @ 8D4777C .incbin "graphics/pokemon/back_pics/clefairy_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xD4777C, 0x02D0 .align 2 gFile_graphics_pokemon_palettes_clefairy_shiny_palette:: @ 8D47A4C .incbin "graphics/pokemon/palettes/clefairy_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xD47A4C, 0x0028 .align 2 gFile_graphics_pokemon_icons_clefairy_icon:: @ 8D47A74 .incbin "graphics/pokemon/icons/clefairy_icon.4bpp" - @ .incbin "baserom.gba", 0xD47A74, 0x0400 .align 2 gFile_graphics_pokemon_footprints_clefairy_footprint:: @ 8D47E74 .incbin "graphics/pokemon/footprints/clefairy_footprint.1bpp" - @ .incbin "baserom.gba", 0xD47E74, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_clefable_still_front_pic:: @ 8D47E94 .incbin "graphics/pokemon/front_pics/clefable_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xD47E94, 0x0340 .align 2 gFile_graphics_pokemon_palettes_clefable_palette:: @ 8D481D4 .incbin "graphics/pokemon/palettes/clefable_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xD481D4, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_clefable_back_pic:: @ 8D481FC .incbin "graphics/pokemon/back_pics/clefable_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xD481FC, 0x0338 .align 2 gFile_graphics_pokemon_palettes_clefable_shiny_palette:: @ 8D48534 .incbin "graphics/pokemon/palettes/clefable_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xD48534, 0x0028 .align 2 gFile_graphics_pokemon_icons_clefable_icon:: @ 8D4855C .incbin "graphics/pokemon/icons/clefable_icon.4bpp" - @ .incbin "baserom.gba", 0xD4855C, 0x0400 .align 2 gFile_graphics_pokemon_footprints_clefable_footprint:: @ 8D4895C .incbin "graphics/pokemon/footprints/clefable_footprint.1bpp" - @ .incbin "baserom.gba", 0xD4895C, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_vulpix_still_front_pic:: @ 8D4897C .incbin "graphics/pokemon/front_pics/vulpix_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xD4897C, 0x032C .align 2 gFile_graphics_pokemon_palettes_vulpix_palette:: @ 8D48CA8 .incbin "graphics/pokemon/palettes/vulpix_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xD48CA8, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_vulpix_back_pic:: @ 8D48CD0 .incbin "graphics/pokemon/back_pics/vulpix_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xD48CD0, 0x0304 .align 2 gFile_graphics_pokemon_palettes_vulpix_shiny_palette:: @ 8D48FD4 .incbin "graphics/pokemon/palettes/vulpix_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xD48FD4, 0x0028 .align 2 gFile_graphics_pokemon_icons_vulpix_icon:: @ 8D48FFC .incbin "graphics/pokemon/icons/vulpix_icon.4bpp" - @ .incbin "baserom.gba", 0xD48FFC, 0x0400 .align 2 gFile_graphics_pokemon_footprints_vulpix_footprint:: @ 8D493FC .incbin "graphics/pokemon/footprints/vulpix_footprint.1bpp" - @ .incbin "baserom.gba", 0xD493FC, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_ninetales_still_front_pic:: @ 8D4941C .incbin "graphics/pokemon/front_pics/ninetales_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xD4941C, 0x0454 .align 2 gFile_graphics_pokemon_palettes_ninetales_palette:: @ 8D49870 .incbin "graphics/pokemon/palettes/ninetales_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xD49870, 0x0024 .align 2 gFile_graphics_pokemon_back_pics_ninetales_back_pic:: @ 8D49894 .incbin "graphics/pokemon/back_pics/ninetales_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xD49894, 0x03F0 .align 2 gFile_graphics_pokemon_palettes_ninetales_shiny_palette:: @ 8D49C84 .incbin "graphics/pokemon/palettes/ninetales_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xD49C84, 0x0024 .align 2 gFile_graphics_pokemon_icons_ninetales_icon:: @ 8D49CA8 .incbin "graphics/pokemon/icons/ninetales_icon.4bpp" - @ .incbin "baserom.gba", 0xD49CA8, 0x0400 .align 2 gFile_graphics_pokemon_footprints_ninetales_footprint:: @ 8D4A0A8 .incbin "graphics/pokemon/footprints/ninetales_footprint.1bpp" - @ .incbin "baserom.gba", 0xD4A0A8, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_jigglypuff_still_front_pic:: @ 8D4A0C8 .incbin "graphics/pokemon/front_pics/jigglypuff_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xD4A0C8, 0x0284 .align 2 gFile_graphics_pokemon_palettes_jigglypuff_palette:: @ 8D4A34C .incbin "graphics/pokemon/palettes/jigglypuff_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xD4A34C, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_jigglypuff_back_pic:: @ 8D4A374 .incbin "graphics/pokemon/back_pics/jigglypuff_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xD4A374, 0x025C .align 2 gFile_graphics_pokemon_palettes_jigglypuff_shiny_palette:: @ 8D4A5D0 .incbin "graphics/pokemon/palettes/jigglypuff_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xD4A5D0, 0x0028 .align 2 gFile_graphics_pokemon_icons_jigglypuff_icon:: @ 8D4A5F8 .incbin "graphics/pokemon/icons/jigglypuff_icon.4bpp" - @ .incbin "baserom.gba", 0xD4A5F8, 0x0400 .align 2 gFile_graphics_pokemon_footprints_jigglypuff_footprint:: @ 8D4A9F8 .incbin "graphics/pokemon/footprints/jigglypuff_footprint.1bpp" - @ .incbin "baserom.gba", 0xD4A9F8, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_wigglytuff_still_front_pic:: @ 8D4AA18 .incbin "graphics/pokemon/front_pics/wigglytuff_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xD4AA18, 0x0374 .align 2 gFile_graphics_pokemon_palettes_wigglytuff_palette:: @ 8D4AD8C .incbin "graphics/pokemon/palettes/wigglytuff_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xD4AD8C, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_wigglytuff_back_pic:: @ 8D4ADB4 .incbin "graphics/pokemon/back_pics/wigglytuff_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xD4ADB4, 0x0298 .align 2 gFile_graphics_pokemon_palettes_wigglytuff_shiny_palette:: @ 8D4B04C .incbin "graphics/pokemon/palettes/wigglytuff_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xD4B04C, 0x0028 .align 2 gFile_graphics_pokemon_icons_wigglytuff_icon:: @ 8D4B074 .incbin "graphics/pokemon/icons/wigglytuff_icon.4bpp" - @ .incbin "baserom.gba", 0xD4B074, 0x0400 .align 2 gFile_graphics_pokemon_footprints_wigglytuff_footprint:: @ 8D4B474 .incbin "graphics/pokemon/footprints/wigglytuff_footprint.1bpp" - @ .incbin "baserom.gba", 0xD4B474, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_zubat_still_front_pic:: @ 8D4B494 .incbin "graphics/pokemon/front_pics/zubat_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xD4B494, 0x02BC .align 2 gFile_graphics_pokemon_palettes_zubat_palette:: @ 8D4B750 .incbin "graphics/pokemon/palettes/zubat_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xD4B750, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_zubat_back_pic:: @ 8D4B778 .incbin "graphics/pokemon/back_pics/zubat_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xD4B778, 0x02BC .align 2 gFile_graphics_pokemon_palettes_zubat_shiny_palette:: @ 8D4BA34 .incbin "graphics/pokemon/palettes/zubat_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xD4BA34, 0x0028 .align 2 gFile_graphics_pokemon_icons_zubat_icon:: @ 8D4BA5C .incbin "graphics/pokemon/icons/zubat_icon.4bpp" - @ .incbin "baserom.gba", 0xD4BA5C, 0x0400 .align 2 gFile_graphics_pokemon_footprints_zubat_footprint:: @ 8D4BE5C .incbin "graphics/pokemon/footprints/zubat_footprint.1bpp" - @ .incbin "baserom.gba", 0xD4BE5C, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_golbat_still_front_pic:: @ 8D4BE7C .incbin "graphics/pokemon/front_pics/golbat_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xD4BE7C, 0x03A0 .align 2 gFile_graphics_pokemon_palettes_golbat_palette:: @ 8D4C21C .incbin "graphics/pokemon/palettes/golbat_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xD4C21C, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_golbat_back_pic:: @ 8D4C244 .incbin "graphics/pokemon/back_pics/golbat_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xD4C244, 0x02BC .align 2 gFile_graphics_pokemon_palettes_golbat_shiny_palette:: @ 8D4C500 .incbin "graphics/pokemon/palettes/golbat_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xD4C500, 0x0028 .align 2 gFile_graphics_pokemon_icons_golbat_icon:: @ 8D4C528 .incbin "graphics/pokemon/icons/golbat_icon.4bpp" - @ .incbin "baserom.gba", 0xD4C528, 0x0400 .align 2 gFile_graphics_pokemon_footprints_golbat_footprint:: @ 8D4C928 .incbin "graphics/pokemon/footprints/golbat_footprint.1bpp" - @ .incbin "baserom.gba", 0xD4C928, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_oddish_still_front_pic:: @ 8D4C948 .incbin "graphics/pokemon/front_pics/oddish_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xD4C948, 0x0240 .align 2 gFile_graphics_pokemon_palettes_oddish_palette:: @ 8D4CB88 .incbin "graphics/pokemon/palettes/oddish_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xD4CB88, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_oddish_back_pic:: @ 8D4CBB0 .incbin "graphics/pokemon/back_pics/oddish_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xD4CBB0, 0x02C4 .align 2 gFile_graphics_pokemon_palettes_oddish_shiny_palette:: @ 8D4CE74 .incbin "graphics/pokemon/palettes/oddish_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xD4CE74, 0x0028 .align 2 gFile_graphics_pokemon_icons_oddish_icon:: @ 8D4CE9C .incbin "graphics/pokemon/icons/oddish_icon.4bpp" - @ .incbin "baserom.gba", 0xD4CE9C, 0x0400 .align 2 gFile_graphics_pokemon_footprints_oddish_footprint:: @ 8D4D29C .incbin "graphics/pokemon/footprints/oddish_footprint.1bpp" - @ .incbin "baserom.gba", 0xD4D29C, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_gloom_still_front_pic:: @ 8D4D2BC .incbin "graphics/pokemon/front_pics/gloom_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xD4D2BC, 0x0368 .align 2 gFile_graphics_pokemon_palettes_gloom_palette:: @ 8D4D624 .incbin "graphics/pokemon/palettes/gloom_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xD4D624, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_gloom_back_pic:: @ 8D4D64C .incbin "graphics/pokemon/back_pics/gloom_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xD4D64C, 0x0380 .align 2 gFile_graphics_pokemon_palettes_gloom_shiny_palette:: @ 8D4D9CC .incbin "graphics/pokemon/palettes/gloom_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xD4D9CC, 0x0028 .align 2 gFile_graphics_pokemon_icons_gloom_icon:: @ 8D4D9F4 .incbin "graphics/pokemon/icons/gloom_icon.4bpp" - @ .incbin "baserom.gba", 0xD4D9F4, 0x0400 .align 2 gFile_graphics_pokemon_footprints_gloom_footprint:: @ 8D4DDF4 .incbin "graphics/pokemon/footprints/gloom_footprint.1bpp" - @ .incbin "baserom.gba", 0xD4DDF4, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_vileplume_still_front_pic:: @ 8D4DE14 .incbin "graphics/pokemon/front_pics/vileplume_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xD4DE14, 0x0354 .align 2 gFile_graphics_pokemon_palettes_vileplume_palette:: @ 8D4E168 .incbin "graphics/pokemon/palettes/vileplume_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xD4E168, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_vileplume_back_pic:: @ 8D4E190 .incbin "graphics/pokemon/back_pics/vileplume_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xD4E190, 0x044C .align 2 gFile_graphics_pokemon_palettes_vileplume_shiny_palette:: @ 8D4E5DC .incbin "graphics/pokemon/palettes/vileplume_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xD4E5DC, 0x0028 .align 2 gFile_graphics_pokemon_icons_vileplume_icon:: @ 8D4E604 .incbin "graphics/pokemon/icons/vileplume_icon.4bpp" - @ .incbin "baserom.gba", 0xD4E604, 0x0400 .align 2 gFile_graphics_pokemon_footprints_vileplume_footprint:: @ 8D4EA04 .incbin "graphics/pokemon/footprints/vileplume_footprint.1bpp" - @ .incbin "baserom.gba", 0xD4EA04, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_paras_still_front_pic:: @ 8D4EA24 .incbin "graphics/pokemon/front_pics/paras_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xD4EA24, 0x026C .align 2 gFile_graphics_pokemon_palettes_paras_palette:: @ 8D4EC90 .incbin "graphics/pokemon/palettes/paras_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xD4EC90, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_paras_back_pic:: @ 8D4ECB8 .incbin "graphics/pokemon/back_pics/paras_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xD4ECB8, 0x02A0 .align 2 gFile_graphics_pokemon_palettes_paras_shiny_palette:: @ 8D4EF58 .incbin "graphics/pokemon/palettes/paras_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xD4EF58, 0x0028 .align 2 gFile_graphics_pokemon_icons_paras_icon:: @ 8D4EF80 .incbin "graphics/pokemon/icons/paras_icon.4bpp" - @ .incbin "baserom.gba", 0xD4EF80, 0x0400 .align 2 gFile_graphics_pokemon_footprints_paras_footprint:: @ 8D4F380 .incbin "graphics/pokemon/footprints/paras_footprint.1bpp" - @ .incbin "baserom.gba", 0xD4F380, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_parasect_still_front_pic:: @ 8D4F3A0 .incbin "graphics/pokemon/front_pics/parasect_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xD4F3A0, 0x0390 .align 2 gFile_graphics_pokemon_palettes_parasect_palette:: @ 8D4F730 .incbin "graphics/pokemon/palettes/parasect_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xD4F730, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_parasect_back_pic:: @ 8D4F758 .incbin "graphics/pokemon/back_pics/parasect_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xD4F758, 0x02FC .align 2 gFile_graphics_pokemon_palettes_parasect_shiny_palette:: @ 8D4FA54 .incbin "graphics/pokemon/palettes/parasect_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xD4FA54, 0x0028 .align 2 gFile_graphics_pokemon_icons_parasect_icon:: @ 8D4FA7C .incbin "graphics/pokemon/icons/parasect_icon.4bpp" - @ .incbin "baserom.gba", 0xD4FA7C, 0x0400 .align 2 gFile_graphics_pokemon_footprints_parasect_footprint:: @ 8D4FE7C .incbin "graphics/pokemon/footprints/parasect_footprint.1bpp" - @ .incbin "baserom.gba", 0xD4FE7C, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_venonat_still_front_pic:: @ 8D4FE9C .incbin "graphics/pokemon/front_pics/venonat_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xD4FE9C, 0x0320 .align 2 gFile_graphics_pokemon_palettes_venonat_palette:: @ 8D501BC .incbin "graphics/pokemon/palettes/venonat_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xD501BC, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_venonat_back_pic:: @ 8D501E4 .incbin "graphics/pokemon/back_pics/venonat_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xD501E4, 0x0330 .align 2 gFile_graphics_pokemon_palettes_venonat_shiny_palette:: @ 8D50514 .incbin "graphics/pokemon/palettes/venonat_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xD50514, 0x0028 .align 2 gFile_graphics_pokemon_icons_venonat_icon:: @ 8D5053C .incbin "graphics/pokemon/icons/venonat_icon.4bpp" - @ .incbin "baserom.gba", 0xD5053C, 0x0400 .align 2 gFile_graphics_pokemon_footprints_venonat_footprint:: @ 8D5093C .incbin "graphics/pokemon/footprints/venonat_footprint.1bpp" - @ .incbin "baserom.gba", 0xD5093C, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_venomoth_still_front_pic:: @ 8D5095C .incbin "graphics/pokemon/front_pics/venomoth_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xD5095C, 0x0404 .align 2 gFile_graphics_pokemon_palettes_venomoth_palette:: @ 8D50D60 .incbin "graphics/pokemon/palettes/venomoth_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xD50D60, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_venomoth_back_pic:: @ 8D50D88 .incbin "graphics/pokemon/back_pics/venomoth_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xD50D88, 0x03A4 .align 2 gFile_graphics_pokemon_palettes_venomoth_shiny_palette:: @ 8D5112C .incbin "graphics/pokemon/palettes/venomoth_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xD5112C, 0x0028 .align 2 gFile_graphics_pokemon_icons_venomoth_icon:: @ 8D51154 .incbin "graphics/pokemon/icons/venomoth_icon.4bpp" - @ .incbin "baserom.gba", 0xD51154, 0x0400 .align 2 gFile_graphics_pokemon_footprints_venomoth_footprint:: @ 8D51554 .incbin "graphics/pokemon/footprints/venomoth_footprint.1bpp" - @ .incbin "baserom.gba", 0xD51554, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_diglett_still_front_pic:: @ 8D51574 .incbin "graphics/pokemon/front_pics/diglett_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xD51574, 0x0210 .align 2 gFile_graphics_pokemon_palettes_diglett_palette:: @ 8D51784 .incbin "graphics/pokemon/palettes/diglett_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xD51784, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_diglett_back_pic:: @ 8D517AC .incbin "graphics/pokemon/back_pics/diglett_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xD517AC, 0x020C .align 2 gFile_graphics_pokemon_palettes_diglett_shiny_palette:: @ 8D519B8 .incbin "graphics/pokemon/palettes/diglett_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xD519B8, 0x0028 .align 2 gFile_graphics_pokemon_icons_diglett_icon:: @ 8D519E0 .incbin "graphics/pokemon/icons/diglett_icon.4bpp" - @ .incbin "baserom.gba", 0xD519E0, 0x0400 .align 2 gFile_graphics_pokemon_footprints_diglett_footprint:: @ 8D51DE0 .incbin "graphics/pokemon/footprints/diglett_footprint.1bpp" - @ .incbin "baserom.gba", 0xD51DE0, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_dugtrio_still_front_pic:: @ 8D51E00 .incbin "graphics/pokemon/front_pics/dugtrio_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xD51E00, 0x032C .align 2 gFile_graphics_pokemon_palettes_dugtrio_palette:: @ 8D5212C .incbin "graphics/pokemon/palettes/dugtrio_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xD5212C, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_dugtrio_back_pic:: @ 8D52154 .incbin "graphics/pokemon/back_pics/dugtrio_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xD52154, 0x02AC .align 2 gFile_graphics_pokemon_palettes_dugtrio_shiny_palette:: @ 8D52400 .incbin "graphics/pokemon/palettes/dugtrio_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xD52400, 0x0028 .align 2 gFile_graphics_pokemon_icons_dugtrio_icon:: @ 8D52428 .incbin "graphics/pokemon/icons/dugtrio_icon.4bpp" - @ .incbin "baserom.gba", 0xD52428, 0x0400 .align 2 gFile_graphics_pokemon_footprints_dugtrio_footprint:: @ 8D52828 .incbin "graphics/pokemon/footprints/dugtrio_footprint.1bpp" - @ .incbin "baserom.gba", 0xD52828, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_meowth_still_front_pic:: @ 8D52848 .incbin "graphics/pokemon/front_pics/meowth_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xD52848, 0x02EC .align 2 gFile_graphics_pokemon_palettes_meowth_palette:: @ 8D52B34 .incbin "graphics/pokemon/palettes/meowth_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xD52B34, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_meowth_back_pic:: @ 8D52B5C .incbin "graphics/pokemon/back_pics/meowth_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xD52B5C, 0x02E4 .align 2 gFile_graphics_pokemon_palettes_meowth_shiny_palette:: @ 8D52E40 .incbin "graphics/pokemon/palettes/meowth_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xD52E40, 0x0028 .align 2 gFile_graphics_pokemon_icons_meowth_icon:: @ 8D52E68 .incbin "graphics/pokemon/icons/meowth_icon.4bpp" - @ .incbin "baserom.gba", 0xD52E68, 0x0400 .align 2 gFile_graphics_pokemon_footprints_meowth_footprint:: @ 8D53268 .incbin "graphics/pokemon/footprints/meowth_footprint.1bpp" - @ .incbin "baserom.gba", 0xD53268, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_persian_still_front_pic:: @ 8D53288 .incbin "graphics/pokemon/front_pics/persian_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xD53288, 0x0378 .align 2 gFile_graphics_pokemon_palettes_persian_palette:: @ 8D53600 .incbin "graphics/pokemon/palettes/persian_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xD53600, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_persian_back_pic:: @ 8D53628 .incbin "graphics/pokemon/back_pics/persian_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xD53628, 0x0340 .align 2 gFile_graphics_pokemon_palettes_persian_shiny_palette:: @ 8D53968 .incbin "graphics/pokemon/palettes/persian_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xD53968, 0x0028 .align 2 gFile_graphics_pokemon_icons_persian_icon:: @ 8D53990 .incbin "graphics/pokemon/icons/persian_icon.4bpp" - @ .incbin "baserom.gba", 0xD53990, 0x0400 .align 2 gFile_graphics_pokemon_footprints_persian_footprint:: @ 8D53D90 .incbin "graphics/pokemon/footprints/persian_footprint.1bpp" - @ .incbin "baserom.gba", 0xD53D90, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_psyduck_still_front_pic:: @ 8D53DB0 .incbin "graphics/pokemon/front_pics/psyduck_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xD53DB0, 0x02E4 .align 2 gFile_graphics_pokemon_palettes_psyduck_palette:: @ 8D54094 .incbin "graphics/pokemon/palettes/psyduck_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xD54094, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_psyduck_back_pic:: @ 8D540BC .incbin "graphics/pokemon/back_pics/psyduck_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xD540BC, 0x029C .align 2 gFile_graphics_pokemon_palettes_psyduck_shiny_palette:: @ 8D54358 .incbin "graphics/pokemon/palettes/psyduck_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xD54358, 0x0028 .align 2 gFile_graphics_pokemon_icons_psyduck_icon:: @ 8D54380 .incbin "graphics/pokemon/icons/psyduck_icon.4bpp" - @ .incbin "baserom.gba", 0xD54380, 0x0400 .align 2 gFile_graphics_pokemon_footprints_psyduck_footprint:: @ 8D54780 .incbin "graphics/pokemon/footprints/psyduck_footprint.1bpp" - @ .incbin "baserom.gba", 0xD54780, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_golduck_still_front_pic:: @ 8D547A0 .incbin "graphics/pokemon/front_pics/golduck_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xD547A0, 0x03B8 .align 2 gFile_graphics_pokemon_palettes_golduck_palette:: @ 8D54B58 .incbin "graphics/pokemon/palettes/golduck_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xD54B58, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_golduck_back_pic:: @ 8D54B80 .incbin "graphics/pokemon/back_pics/golduck_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xD54B80, 0x032C .align 2 gFile_graphics_pokemon_palettes_golduck_shiny_palette:: @ 8D54EAC .incbin "graphics/pokemon/palettes/golduck_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xD54EAC, 0x0028 .align 2 gFile_graphics_pokemon_icons_golduck_icon:: @ 8D54ED4 .incbin "graphics/pokemon/icons/golduck_icon.4bpp" - @ .incbin "baserom.gba", 0xD54ED4, 0x0400 .align 2 gFile_graphics_pokemon_footprints_golduck_footprint:: @ 8D552D4 .incbin "graphics/pokemon/footprints/golduck_footprint.1bpp" - @ .incbin "baserom.gba", 0xD552D4, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_mankey_still_front_pic:: @ 8D552F4 .incbin "graphics/pokemon/front_pics/mankey_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xD552F4, 0x02F8 .align 2 gFile_graphics_pokemon_palettes_mankey_palette:: @ 8D555EC .incbin "graphics/pokemon/palettes/mankey_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xD555EC, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_mankey_back_pic:: @ 8D55614 .incbin "graphics/pokemon/back_pics/mankey_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xD55614, 0x0368 .align 2 gFile_graphics_pokemon_palettes_mankey_shiny_palette:: @ 8D5597C .incbin "graphics/pokemon/palettes/mankey_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xD5597C, 0x0028 .align 2 gFile_graphics_pokemon_icons_mankey_icon:: @ 8D559A4 .incbin "graphics/pokemon/icons/mankey_icon.4bpp" - @ .incbin "baserom.gba", 0xD559A4, 0x0400 .align 2 gFile_graphics_pokemon_footprints_mankey_footprint:: @ 8D55DA4 .incbin "graphics/pokemon/footprints/mankey_footprint.1bpp" - @ .incbin "baserom.gba", 0xD55DA4, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_primeape_still_front_pic:: @ 8D55DC4 .incbin "graphics/pokemon/front_pics/primeape_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xD55DC4, 0x038C .align 2 gFile_graphics_pokemon_palettes_primeape_palette:: @ 8D56150 .incbin "graphics/pokemon/palettes/primeape_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xD56150, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_primeape_back_pic:: @ 8D56178 .incbin "graphics/pokemon/back_pics/primeape_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xD56178, 0x0370 .align 2 gFile_graphics_pokemon_palettes_primeape_shiny_palette:: @ 8D564E8 .incbin "graphics/pokemon/palettes/primeape_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xD564E8, 0x0028 .align 2 gFile_graphics_pokemon_icons_primeape_icon:: @ 8D56510 .incbin "graphics/pokemon/icons/primeape_icon.4bpp" - @ .incbin "baserom.gba", 0xD56510, 0x0400 .align 2 gFile_graphics_pokemon_footprints_primeape_footprint:: @ 8D56910 .incbin "graphics/pokemon/footprints/primeape_footprint.1bpp" - @ .incbin "baserom.gba", 0xD56910, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_growlithe_still_front_pic:: @ 8D56930 .incbin "graphics/pokemon/front_pics/growlithe_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xD56930, 0x0328 .align 2 gFile_graphics_pokemon_palettes_growlithe_palette:: @ 8D56C58 .incbin "graphics/pokemon/palettes/growlithe_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xD56C58, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_growlithe_back_pic:: @ 8D56C80 .incbin "graphics/pokemon/back_pics/growlithe_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xD56C80, 0x033C .align 2 gFile_graphics_pokemon_palettes_growlithe_shiny_palette:: @ 8D56FBC .incbin "graphics/pokemon/palettes/growlithe_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xD56FBC, 0x0028 .align 2 gFile_graphics_pokemon_icons_growlithe_icon:: @ 8D56FE4 .incbin "graphics/pokemon/icons/growlithe_icon.4bpp" - @ .incbin "baserom.gba", 0xD56FE4, 0x0400 .align 2 gFile_graphics_pokemon_footprints_growlithe_footprint:: @ 8D573E4 .incbin "graphics/pokemon/footprints/growlithe_footprint.1bpp" - @ .incbin "baserom.gba", 0xD573E4, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_arcanine_still_front_pic:: @ 8D57404 .incbin "graphics/pokemon/front_pics/arcanine_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xD57404, 0x04FC .align 2 gFile_graphics_pokemon_palettes_arcanine_palette:: @ 8D57900 .incbin "graphics/pokemon/palettes/arcanine_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xD57900, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_arcanine_back_pic:: @ 8D57928 .incbin "graphics/pokemon/back_pics/arcanine_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xD57928, 0x03E0 .align 2 gFile_graphics_pokemon_palettes_arcanine_shiny_palette:: @ 8D57D08 .incbin "graphics/pokemon/palettes/arcanine_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xD57D08, 0x0028 .align 2 gFile_graphics_pokemon_icons_arcanine_icon:: @ 8D57D30 .incbin "graphics/pokemon/icons/arcanine_icon.4bpp" - @ .incbin "baserom.gba", 0xD57D30, 0x0400 .align 2 gFile_graphics_pokemon_footprints_arcanine_footprint:: @ 8D58130 .incbin "graphics/pokemon/footprints/arcanine_footprint.1bpp" - @ .incbin "baserom.gba", 0xD58130, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_poliwag_still_front_pic:: @ 8D58150 .incbin "graphics/pokemon/front_pics/poliwag_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xD58150, 0x029C .align 2 gFile_graphics_pokemon_palettes_poliwag_palette:: @ 8D583EC .incbin "graphics/pokemon/palettes/poliwag_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xD583EC, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_poliwag_back_pic:: @ 8D58414 .incbin "graphics/pokemon/back_pics/poliwag_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xD58414, 0x0264 .align 2 gFile_graphics_pokemon_palettes_poliwag_shiny_palette:: @ 8D58678 .incbin "graphics/pokemon/palettes/poliwag_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xD58678, 0x0028 .align 2 gFile_graphics_pokemon_icons_poliwag_icon:: @ 8D586A0 .incbin "graphics/pokemon/icons/poliwag_icon.4bpp" - @ .incbin "baserom.gba", 0xD586A0, 0x0400 .align 2 gFile_graphics_pokemon_footprints_poliwag_footprint:: @ 8D58AA0 .incbin "graphics/pokemon/footprints/poliwag_footprint.1bpp" - @ .incbin "baserom.gba", 0xD58AA0, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_poliwhirl_still_front_pic:: @ 8D58AC0 .incbin "graphics/pokemon/front_pics/poliwhirl_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xD58AC0, 0x0380 .align 2 gFile_graphics_pokemon_palettes_poliwhirl_palette:: @ 8D58E40 .incbin "graphics/pokemon/palettes/poliwhirl_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xD58E40, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_poliwhirl_back_pic:: @ 8D58E68 .incbin "graphics/pokemon/back_pics/poliwhirl_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xD58E68, 0x027C .align 2 gFile_graphics_pokemon_palettes_poliwhirl_shiny_palette:: @ 8D590E4 .incbin "graphics/pokemon/palettes/poliwhirl_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xD590E4, 0x0028 .align 2 gFile_graphics_pokemon_icons_poliwhirl_icon:: @ 8D5910C .incbin "graphics/pokemon/icons/poliwhirl_icon.4bpp" - @ .incbin "baserom.gba", 0xD5910C, 0x0400 .align 2 gFile_graphics_pokemon_footprints_poliwhirl_footprint:: @ 8D5950C .incbin "graphics/pokemon/footprints/poliwhirl_footprint.1bpp" - @ .incbin "baserom.gba", 0xD5950C, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_poliwrath_still_front_pic:: @ 8D5952C .incbin "graphics/pokemon/front_pics/poliwrath_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xD5952C, 0x03C4 .align 2 gFile_graphics_pokemon_palettes_poliwrath_palette:: @ 8D598F0 .incbin "graphics/pokemon/palettes/poliwrath_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xD598F0, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_poliwrath_back_pic:: @ 8D59918 .incbin "graphics/pokemon/back_pics/poliwrath_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xD59918, 0x02F4 .align 2 gFile_graphics_pokemon_palettes_poliwrath_shiny_palette:: @ 8D59C0C .incbin "graphics/pokemon/palettes/poliwrath_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xD59C0C, 0x0028 .align 2 gFile_graphics_pokemon_icons_poliwrath_icon:: @ 8D59C34 .incbin "graphics/pokemon/icons/poliwrath_icon.4bpp" - @ .incbin "baserom.gba", 0xD59C34, 0x0400 .align 2 gFile_graphics_pokemon_footprints_poliwrath_footprint:: @ 8D5A034 .incbin "graphics/pokemon/footprints/poliwrath_footprint.1bpp" - @ .incbin "baserom.gba", 0xD5A034, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_abra_still_front_pic:: @ 8D5A054 .incbin "graphics/pokemon/front_pics/abra_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xD5A054, 0x02D4 .align 2 gFile_graphics_pokemon_palettes_abra_palette:: @ 8D5A328 .incbin "graphics/pokemon/palettes/abra_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xD5A328, 0x0024 .align 2 gFile_graphics_pokemon_back_pics_abra_back_pic:: @ 8D5A34C .incbin "graphics/pokemon/back_pics/abra_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xD5A34C, 0x02D4 .align 2 gFile_graphics_pokemon_palettes_abra_shiny_palette:: @ 8D5A620 .incbin "graphics/pokemon/palettes/abra_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xD5A620, 0x0024 .align 2 gFile_graphics_pokemon_icons_abra_icon:: @ 8D5A644 .incbin "graphics/pokemon/icons/abra_icon.4bpp" - @ .incbin "baserom.gba", 0xD5A644, 0x0400 .align 2 gFile_graphics_pokemon_footprints_abra_footprint:: @ 8D5AA44 .incbin "graphics/pokemon/footprints/abra_footprint.1bpp" - @ .incbin "baserom.gba", 0xD5AA44, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_kadabra_still_front_pic:: @ 8D5AA64 .incbin "graphics/pokemon/front_pics/kadabra_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xD5AA64, 0x04C8 .align 2 gFile_graphics_pokemon_palettes_kadabra_palette:: @ 8D5AF2C .incbin "graphics/pokemon/palettes/kadabra_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xD5AF2C, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_kadabra_back_pic:: @ 8D5AF54 .incbin "graphics/pokemon/back_pics/kadabra_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xD5AF54, 0x03AC .align 2 gFile_graphics_pokemon_palettes_kadabra_shiny_palette:: @ 8D5B300 .incbin "graphics/pokemon/palettes/kadabra_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xD5B300, 0x0028 .align 2 gFile_graphics_pokemon_icons_kadabra_icon:: @ 8D5B328 .incbin "graphics/pokemon/icons/kadabra_icon.4bpp" - @ .incbin "baserom.gba", 0xD5B328, 0x0400 .align 2 gFile_graphics_pokemon_footprints_kadabra_footprint:: @ 8D5B728 .incbin "graphics/pokemon/footprints/kadabra_footprint.1bpp" - @ .incbin "baserom.gba", 0xD5B728, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_alakazam_still_front_pic:: @ 8D5B748 .incbin "graphics/pokemon/front_pics/alakazam_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xD5B748, 0x0498 .align 2 gFile_graphics_pokemon_palettes_alakazam_palette:: @ 8D5BBE0 .incbin "graphics/pokemon/palettes/alakazam_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xD5BBE0, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_alakazam_back_pic:: @ 8D5BC08 .incbin "graphics/pokemon/back_pics/alakazam_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xD5BC08, 0x0380 .align 2 gFile_graphics_pokemon_palettes_alakazam_shiny_palette:: @ 8D5BF88 .incbin "graphics/pokemon/palettes/alakazam_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xD5BF88, 0x0028 .align 2 gFile_graphics_pokemon_icons_alakazam_icon:: @ 8D5BFB0 .incbin "graphics/pokemon/icons/alakazam_icon.4bpp" - @ .incbin "baserom.gba", 0xD5BFB0, 0x0400 .align 2 gFile_graphics_pokemon_footprints_alakazam_footprint:: @ 8D5C3B0 .incbin "graphics/pokemon/footprints/alakazam_footprint.1bpp" - @ .incbin "baserom.gba", 0xD5C3B0, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_machop_still_front_pic:: @ 8D5C3D0 .incbin "graphics/pokemon/front_pics/machop_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xD5C3D0, 0x028C .align 2 gFile_graphics_pokemon_palettes_machop_palette:: @ 8D5C65C .incbin "graphics/pokemon/palettes/machop_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xD5C65C, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_machop_back_pic:: @ 8D5C684 .incbin "graphics/pokemon/back_pics/machop_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xD5C684, 0x02E0 .align 2 gFile_graphics_pokemon_palettes_machop_shiny_palette:: @ 8D5C964 .incbin "graphics/pokemon/palettes/machop_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xD5C964, 0x0028 .align 2 gFile_graphics_pokemon_icons_machop_icon:: @ 8D5C98C .incbin "graphics/pokemon/icons/machop_icon.4bpp" - @ .incbin "baserom.gba", 0xD5C98C, 0x0400 .align 2 gFile_graphics_pokemon_footprints_machop_footprint:: @ 8D5CD8C .incbin "graphics/pokemon/footprints/machop_footprint.1bpp" - @ .incbin "baserom.gba", 0xD5CD8C, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_machoke_still_front_pic:: @ 8D5CDAC .incbin "graphics/pokemon/front_pics/machoke_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xD5CDAC, 0x03CC .align 2 gFile_graphics_pokemon_palettes_machoke_palette:: @ 8D5D178 .incbin "graphics/pokemon/palettes/machoke_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xD5D178, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_machoke_back_pic:: @ 8D5D1A0 .incbin "graphics/pokemon/back_pics/machoke_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xD5D1A0, 0x0350 .align 2 gFile_graphics_pokemon_palettes_machoke_shiny_palette:: @ 8D5D4F0 .incbin "graphics/pokemon/palettes/machoke_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xD5D4F0, 0x0028 .align 2 gFile_graphics_pokemon_icons_machoke_icon:: @ 8D5D518 .incbin "graphics/pokemon/icons/machoke_icon.4bpp" - @ .incbin "baserom.gba", 0xD5D518, 0x0400 .align 2 gFile_graphics_pokemon_footprints_machoke_footprint:: @ 8D5D918 .incbin "graphics/pokemon/footprints/machoke_footprint.1bpp" - @ .incbin "baserom.gba", 0xD5D918, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_machamp_still_front_pic:: @ 8D5D938 .incbin "graphics/pokemon/front_pics/machamp_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xD5D938, 0x04EC .align 2 gFile_graphics_pokemon_palettes_machamp_palette:: @ 8D5DE24 .incbin "graphics/pokemon/palettes/machamp_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xD5DE24, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_machamp_back_pic:: @ 8D5DE4C .incbin "graphics/pokemon/back_pics/machamp_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xD5DE4C, 0x045C .align 2 gFile_graphics_pokemon_palettes_machamp_shiny_palette:: @ 8D5E2A8 .incbin "graphics/pokemon/palettes/machamp_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xD5E2A8, 0x0028 .align 2 gFile_graphics_pokemon_icons_machamp_icon:: @ 8D5E2D0 .incbin "graphics/pokemon/icons/machamp_icon.4bpp" - @ .incbin "baserom.gba", 0xD5E2D0, 0x0400 .align 2 gFile_graphics_pokemon_footprints_machamp_footprint:: @ 8D5E6D0 .incbin "graphics/pokemon/footprints/machamp_footprint.1bpp" - @ .incbin "baserom.gba", 0xD5E6D0, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_bellsprout_still_front_pic:: @ 8D5E6F0 .incbin "graphics/pokemon/front_pics/bellsprout_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xD5E6F0, 0x028C .align 2 gFile_graphics_pokemon_palettes_bellsprout_palette:: @ 8D5E97C .incbin "graphics/pokemon/palettes/bellsprout_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xD5E97C, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_bellsprout_back_pic:: @ 8D5E9A4 .incbin "graphics/pokemon/back_pics/bellsprout_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xD5E9A4, 0x029C .align 2 gFile_graphics_pokemon_palettes_bellsprout_shiny_palette:: @ 8D5EC40 .incbin "graphics/pokemon/palettes/bellsprout_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xD5EC40, 0x0028 .align 2 gFile_graphics_pokemon_icons_bellsprout_icon:: @ 8D5EC68 .incbin "graphics/pokemon/icons/bellsprout_icon.4bpp" - @ .incbin "baserom.gba", 0xD5EC68, 0x0400 .align 2 gFile_graphics_pokemon_footprints_bellsprout_footprint:: @ 8D5F068 .incbin "graphics/pokemon/footprints/bellsprout_footprint.1bpp" - @ .incbin "baserom.gba", 0xD5F068, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_weepinbell_still_front_pic:: @ 8D5F088 .incbin "graphics/pokemon/front_pics/weepinbell_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xD5F088, 0x0324 .align 2 gFile_graphics_pokemon_palettes_weepinbell_palette:: @ 8D5F3AC .incbin "graphics/pokemon/palettes/weepinbell_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xD5F3AC, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_weepinbell_back_pic:: @ 8D5F3D4 .incbin "graphics/pokemon/back_pics/weepinbell_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xD5F3D4, 0x02FC .align 2 gFile_graphics_pokemon_palettes_weepinbell_shiny_palette:: @ 8D5F6D0 .incbin "graphics/pokemon/palettes/weepinbell_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xD5F6D0, 0x0028 .align 2 gFile_graphics_pokemon_icons_weepinbell_icon:: @ 8D5F6F8 .incbin "graphics/pokemon/icons/weepinbell_icon.4bpp" - @ .incbin "baserom.gba", 0xD5F6F8, 0x0400 .align 2 gFile_graphics_pokemon_footprints_weepinbell_footprint:: @ 8D5FAF8 .incbin "graphics/pokemon/footprints/weepinbell_footprint.1bpp" - @ .incbin "baserom.gba", 0xD5FAF8, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_victreebel_still_front_pic:: @ 8D5FB18 .incbin "graphics/pokemon/front_pics/victreebel_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xD5FB18, 0x042C .align 2 gFile_graphics_pokemon_palettes_victreebel_palette:: @ 8D5FF44 .incbin "graphics/pokemon/palettes/victreebel_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xD5FF44, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_victreebel_back_pic:: @ 8D5FF6C .incbin "graphics/pokemon/back_pics/victreebel_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xD5FF6C, 0x0398 .align 2 gFile_graphics_pokemon_palettes_victreebel_shiny_palette:: @ 8D60304 .incbin "graphics/pokemon/palettes/victreebel_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xD60304, 0x0028 .align 2 gFile_graphics_pokemon_icons_victreebel_icon:: @ 8D6032C .incbin "graphics/pokemon/icons/victreebel_icon.4bpp" - @ .incbin "baserom.gba", 0xD6032C, 0x0400 .align 2 gFile_graphics_pokemon_footprints_victreebel_footprint:: @ 8D6072C .incbin "graphics/pokemon/footprints/victreebel_footprint.1bpp" - @ .incbin "baserom.gba", 0xD6072C, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_tentacool_still_front_pic:: @ 8D6074C .incbin "graphics/pokemon/front_pics/tentacool_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xD6074C, 0x02A8 .align 2 gFile_graphics_pokemon_palettes_tentacool_palette:: @ 8D609F4 .incbin "graphics/pokemon/palettes/tentacool_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xD609F4, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_tentacool_back_pic:: @ 8D60A1C .incbin "graphics/pokemon/back_pics/tentacool_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xD60A1C, 0x02CC .align 2 gFile_graphics_pokemon_palettes_tentacool_shiny_palette:: @ 8D60CE8 .incbin "graphics/pokemon/palettes/tentacool_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xD60CE8, 0x0028 .align 2 gFile_graphics_pokemon_icons_tentacool_icon:: @ 8D60D10 .incbin "graphics/pokemon/icons/tentacool_icon.4bpp" - @ .incbin "baserom.gba", 0xD60D10, 0x0400 .align 2 gFile_graphics_pokemon_footprints_tentacool_footprint:: @ 8D61110 .incbin "graphics/pokemon/footprints/tentacool_footprint.1bpp" - @ .incbin "baserom.gba", 0xD61110, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_tentacruel_still_front_pic:: @ 8D61130 .incbin "graphics/pokemon/front_pics/tentacruel_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xD61130, 0x04F4 .align 2 gFile_graphics_pokemon_palettes_tentacruel_palette:: @ 8D61624 .incbin "graphics/pokemon/palettes/tentacruel_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xD61624, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_tentacruel_back_pic:: @ 8D6164C .incbin "graphics/pokemon/back_pics/tentacruel_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xD6164C, 0x039C .align 2 gFile_graphics_pokemon_palettes_tentacruel_shiny_palette:: @ 8D619E8 .incbin "graphics/pokemon/palettes/tentacruel_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xD619E8, 0x0028 .align 2 gFile_graphics_pokemon_icons_tentacruel_icon:: @ 8D61A10 .incbin "graphics/pokemon/icons/tentacruel_icon.4bpp" - @ .incbin "baserom.gba", 0xD61A10, 0x0400 .align 2 gFile_graphics_pokemon_footprints_tentacruel_footprint:: @ 8D61E10 .incbin "graphics/pokemon/footprints/tentacruel_footprint.1bpp" - @ .incbin "baserom.gba", 0xD61E10, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_geodude_still_front_pic:: @ 8D61E30 .incbin "graphics/pokemon/front_pics/geodude_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xD61E30, 0x0294 .align 2 gFile_graphics_pokemon_palettes_geodude_palette:: @ 8D620C4 .incbin "graphics/pokemon/palettes/geodude_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xD620C4, 0x001C .align 2 gFile_graphics_pokemon_back_pics_geodude_back_pic:: @ 8D620E0 .incbin "graphics/pokemon/back_pics/geodude_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xD620E0, 0x0294 .align 2 gFile_graphics_pokemon_palettes_geodude_shiny_palette:: @ 8D62374 .incbin "graphics/pokemon/palettes/geodude_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xD62374, 0x001C .align 2 gFile_graphics_pokemon_icons_geodude_icon:: @ 8D62390 .incbin "graphics/pokemon/icons/geodude_icon.4bpp" - @ .incbin "baserom.gba", 0xD62390, 0x0400 .align 2 gFile_graphics_pokemon_footprints_geodude_footprint:: @ 8D62790 .incbin "graphics/pokemon/footprints/geodude_footprint.1bpp" - @ .incbin "baserom.gba", 0xD62790, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_graveler_still_front_pic:: @ 8D627B0 .incbin "graphics/pokemon/front_pics/graveler_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xD627B0, 0x03FC .align 2 gFile_graphics_pokemon_palettes_graveler_palette:: @ 8D62BAC .incbin "graphics/pokemon/palettes/graveler_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xD62BAC, 0x0024 .align 2 gFile_graphics_pokemon_back_pics_graveler_back_pic:: @ 8D62BD0 .incbin "graphics/pokemon/back_pics/graveler_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xD62BD0, 0x027C .align 2 gFile_graphics_pokemon_palettes_graveler_shiny_palette:: @ 8D62E4C .incbin "graphics/pokemon/palettes/graveler_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xD62E4C, 0x0024 .align 2 gFile_graphics_pokemon_icons_graveler_icon:: @ 8D62E70 .incbin "graphics/pokemon/icons/graveler_icon.4bpp" - @ .incbin "baserom.gba", 0xD62E70, 0x0400 .align 2 gFile_graphics_pokemon_footprints_graveler_footprint:: @ 8D63270 .incbin "graphics/pokemon/footprints/graveler_footprint.1bpp" - @ .incbin "baserom.gba", 0xD63270, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_golem_still_front_pic:: @ 8D63290 .incbin "graphics/pokemon/front_pics/golem_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xD63290, 0x0430 .align 2 gFile_graphics_pokemon_palettes_golem_palette:: @ 8D636C0 .incbin "graphics/pokemon/palettes/golem_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xD636C0, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_golem_back_pic:: @ 8D636E8 .incbin "graphics/pokemon/back_pics/golem_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xD636E8, 0x02C0 .align 2 gFile_graphics_pokemon_palettes_golem_shiny_palette:: @ 8D639A8 .incbin "graphics/pokemon/palettes/golem_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xD639A8, 0x0028 .align 2 gFile_graphics_pokemon_icons_golem_icon:: @ 8D639D0 .incbin "graphics/pokemon/icons/golem_icon.4bpp" - @ .incbin "baserom.gba", 0xD639D0, 0x0400 .align 2 gFile_graphics_pokemon_footprints_golem_footprint:: @ 8D63DD0 .incbin "graphics/pokemon/footprints/golem_footprint.1bpp" - @ .incbin "baserom.gba", 0xD63DD0, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_ponyta_still_front_pic:: @ 8D63DF0 .incbin "graphics/pokemon/front_pics/ponyta_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xD63DF0, 0x0390 .align 2 gFile_graphics_pokemon_palettes_ponyta_palette:: @ 8D64180 .incbin "graphics/pokemon/palettes/ponyta_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xD64180, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_ponyta_back_pic:: @ 8D641A8 .incbin "graphics/pokemon/back_pics/ponyta_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xD641A8, 0x033C .align 2 gFile_graphics_pokemon_palettes_ponyta_shiny_palette:: @ 8D644E4 .incbin "graphics/pokemon/palettes/ponyta_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xD644E4, 0x0028 .align 2 gFile_graphics_pokemon_icons_ponyta_icon:: @ 8D6450C .incbin "graphics/pokemon/icons/ponyta_icon.4bpp" - @ .incbin "baserom.gba", 0xD6450C, 0x0400 .align 2 gFile_graphics_pokemon_footprints_ponyta_footprint:: @ 8D6490C .incbin "graphics/pokemon/footprints/ponyta_footprint.1bpp" - @ .incbin "baserom.gba", 0xD6490C, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_rapidash_still_front_pic:: @ 8D6492C .incbin "graphics/pokemon/front_pics/rapidash_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xD6492C, 0x0488 .align 2 gFile_graphics_pokemon_palettes_rapidash_palette:: @ 8D64DB4 .incbin "graphics/pokemon/palettes/rapidash_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xD64DB4, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_rapidash_back_pic:: @ 8D64DDC .incbin "graphics/pokemon/back_pics/rapidash_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xD64DDC, 0x0410 .align 2 gFile_graphics_pokemon_palettes_rapidash_shiny_palette:: @ 8D651EC .incbin "graphics/pokemon/palettes/rapidash_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xD651EC, 0x0028 .align 2 gFile_graphics_pokemon_icons_rapidash_icon:: @ 8D65214 .incbin "graphics/pokemon/icons/rapidash_icon.4bpp" - @ .incbin "baserom.gba", 0xD65214, 0x0400 .align 2 gFile_graphics_pokemon_footprints_rapidash_footprint:: @ 8D65614 .incbin "graphics/pokemon/footprints/rapidash_footprint.1bpp" - @ .incbin "baserom.gba", 0xD65614, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_slowpoke_still_front_pic:: @ 8D65634 .incbin "graphics/pokemon/front_pics/slowpoke_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xD65634, 0x02D4 .align 2 gFile_graphics_pokemon_palettes_slowpoke_palette:: @ 8D65908 .incbin "graphics/pokemon/palettes/slowpoke_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xD65908, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_slowpoke_back_pic:: @ 8D65930 .incbin "graphics/pokemon/back_pics/slowpoke_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xD65930, 0x0264 .align 2 gFile_graphics_pokemon_palettes_slowpoke_shiny_palette:: @ 8D65B94 .incbin "graphics/pokemon/palettes/slowpoke_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xD65B94, 0x0028 .align 2 gFile_graphics_pokemon_icons_slowpoke_icon:: @ 8D65BBC .incbin "graphics/pokemon/icons/slowpoke_icon.4bpp" - @ .incbin "baserom.gba", 0xD65BBC, 0x0400 .align 2 gFile_graphics_pokemon_footprints_slowpoke_footprint:: @ 8D65FBC .incbin "graphics/pokemon/footprints/slowpoke_footprint.1bpp" - @ .incbin "baserom.gba", 0xD65FBC, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_slowbro_still_front_pic:: @ 8D65FDC .incbin "graphics/pokemon/front_pics/slowbro_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xD65FDC, 0x04A0 .align 2 gFile_graphics_pokemon_palettes_slowbro_palette:: @ 8D6647C .incbin "graphics/pokemon/palettes/slowbro_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xD6647C, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_slowbro_back_pic:: @ 8D664A4 .incbin "graphics/pokemon/back_pics/slowbro_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xD664A4, 0x039C .align 2 gFile_graphics_pokemon_palettes_slowbro_shiny_palette:: @ 8D66840 .incbin "graphics/pokemon/palettes/slowbro_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xD66840, 0x0028 .align 2 gFile_graphics_pokemon_icons_slowbro_icon:: @ 8D66868 .incbin "graphics/pokemon/icons/slowbro_icon.4bpp" - @ .incbin "baserom.gba", 0xD66868, 0x0400 .align 2 gFile_graphics_pokemon_footprints_slowbro_footprint:: @ 8D66C68 .incbin "graphics/pokemon/footprints/slowbro_footprint.1bpp" - @ .incbin "baserom.gba", 0xD66C68, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_magnemite_still_front_pic:: @ 8D66C88 .incbin "graphics/pokemon/front_pics/magnemite_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xD66C88, 0x01D8 .align 2 gFile_graphics_pokemon_palettes_magnemite_palette:: @ 8D66E60 .incbin "graphics/pokemon/palettes/magnemite_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xD66E60, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_magnemite_back_pic:: @ 8D66E88 .incbin "graphics/pokemon/back_pics/magnemite_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xD66E88, 0x01E8 .align 2 gFile_graphics_pokemon_palettes_magnemite_shiny_palette:: @ 8D67070 .incbin "graphics/pokemon/palettes/magnemite_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xD67070, 0x0024 .align 2 gFile_graphics_pokemon_icons_magnemite_icon:: @ 8D67094 .incbin "graphics/pokemon/icons/magnemite_icon.4bpp" - @ .incbin "baserom.gba", 0xD67094, 0x0400 .align 2 gFile_graphics_pokemon_footprints_magnemite_footprint:: @ 8D67494 .incbin "graphics/pokemon/footprints/magnemite_footprint.1bpp" - @ .incbin "baserom.gba", 0xD67494, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_magneton_still_front_pic:: @ 8D674B4 .incbin "graphics/pokemon/front_pics/magneton_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xD674B4, 0x033C .align 2 gFile_graphics_pokemon_palettes_magneton_palette:: @ 8D677F0 .incbin "graphics/pokemon/palettes/magneton_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xD677F0, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_magneton_back_pic:: @ 8D67818 .incbin "graphics/pokemon/back_pics/magneton_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xD67818, 0x0380 .align 2 gFile_graphics_pokemon_palettes_magneton_shiny_palette:: @ 8D67B98 .incbin "graphics/pokemon/palettes/magneton_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xD67B98, 0x0028 .align 2 gFile_graphics_pokemon_icons_magneton_icon:: @ 8D67BC0 .incbin "graphics/pokemon/icons/magneton_icon.4bpp" - @ .incbin "baserom.gba", 0xD67BC0, 0x0400 .align 2 gFile_graphics_pokemon_footprints_magneton_footprint:: @ 8D67FC0 .incbin "graphics/pokemon/footprints/magneton_footprint.1bpp" - @ .incbin "baserom.gba", 0xD67FC0, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_farfetch_d_still_front_pic:: @ 8D67FE0 .incbin "graphics/pokemon/front_pics/farfetch_d_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xD67FE0, 0x0354 .align 2 gFile_graphics_pokemon_palettes_farfetch_d_palette:: @ 8D68334 .incbin "graphics/pokemon/palettes/farfetch_d_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xD68334, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_farfetch_d_back_pic:: @ 8D6835C .incbin "graphics/pokemon/back_pics/farfetch_d_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xD6835C, 0x036C .align 2 gFile_graphics_pokemon_palettes_farfetch_d_shiny_palette:: @ 8D686C8 .incbin "graphics/pokemon/palettes/farfetch_d_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xD686C8, 0x0028 .align 2 gFile_graphics_pokemon_icons_farfetch_d_icon:: @ 8D686F0 .incbin "graphics/pokemon/icons/farfetch_d_icon.4bpp" - @ .incbin "baserom.gba", 0xD686F0, 0x0400 .align 2 gFile_graphics_pokemon_footprints_farfetch_d_footprint:: @ 8D68AF0 .incbin "graphics/pokemon/footprints/farfetch_d_footprint.1bpp" - @ .incbin "baserom.gba", 0xD68AF0, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_doduo_still_front_pic:: @ 8D68B10 .incbin "graphics/pokemon/front_pics/doduo_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xD68B10, 0x02EC .align 2 gFile_graphics_pokemon_palettes_doduo_palette:: @ 8D68DFC .incbin "graphics/pokemon/palettes/doduo_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xD68DFC, 0x0024 .align 2 gFile_graphics_pokemon_back_pics_doduo_back_pic:: @ 8D68E20 .incbin "graphics/pokemon/back_pics/doduo_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xD68E20, 0x0318 .align 2 gFile_graphics_pokemon_palettes_doduo_shiny_palette:: @ 8D69138 .incbin "graphics/pokemon/palettes/doduo_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xD69138, 0x0024 .align 2 gFile_graphics_pokemon_icons_doduo_icon:: @ 8D6915C .incbin "graphics/pokemon/icons/doduo_icon.4bpp" - @ .incbin "baserom.gba", 0xD6915C, 0x0400 .align 2 gFile_graphics_pokemon_footprints_doduo_footprint:: @ 8D6955C .incbin "graphics/pokemon/footprints/doduo_footprint.1bpp" - @ .incbin "baserom.gba", 0xD6955C, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_dodrio_still_front_pic:: @ 8D6957C .incbin "graphics/pokemon/front_pics/dodrio_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xD6957C, 0x0440 .align 2 gFile_graphics_pokemon_palettes_dodrio_palette:: @ 8D699BC .incbin "graphics/pokemon/palettes/dodrio_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xD699BC, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_dodrio_back_pic:: @ 8D699E4 .incbin "graphics/pokemon/back_pics/dodrio_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xD699E4, 0x0464 .align 2 gFile_graphics_pokemon_palettes_dodrio_shiny_palette:: @ 8D69E48 .incbin "graphics/pokemon/palettes/dodrio_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xD69E48, 0x0028 .align 2 gFile_graphics_pokemon_icons_dodrio_icon:: @ 8D69E70 .incbin "graphics/pokemon/icons/dodrio_icon.4bpp" - @ .incbin "baserom.gba", 0xD69E70, 0x0400 .align 2 gFile_graphics_pokemon_footprints_dodrio_footprint:: @ 8D6A270 .incbin "graphics/pokemon/footprints/dodrio_footprint.1bpp" - @ .incbin "baserom.gba", 0xD6A270, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_seel_still_front_pic:: @ 8D6A290 .incbin "graphics/pokemon/front_pics/seel_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xD6A290, 0x0324 .align 2 gFile_graphics_pokemon_palettes_seel_palette:: @ 8D6A5B4 .incbin "graphics/pokemon/palettes/seel_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xD6A5B4, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_seel_back_pic:: @ 8D6A5DC .incbin "graphics/pokemon/back_pics/seel_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xD6A5DC, 0x02EC .align 2 gFile_graphics_pokemon_palettes_seel_shiny_palette:: @ 8D6A8C8 .incbin "graphics/pokemon/palettes/seel_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xD6A8C8, 0x0028 .align 2 gFile_graphics_pokemon_icons_seel_icon:: @ 8D6A8F0 .incbin "graphics/pokemon/icons/seel_icon.4bpp" - @ .incbin "baserom.gba", 0xD6A8F0, 0x0400 .align 2 gFile_graphics_pokemon_footprints_seel_footprint:: @ 8D6ACF0 .incbin "graphics/pokemon/footprints/seel_footprint.1bpp" - @ .incbin "baserom.gba", 0xD6ACF0, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_dewgong_still_front_pic:: @ 8D6AD10 .incbin "graphics/pokemon/front_pics/dewgong_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xD6AD10, 0x03D0 .align 2 gFile_graphics_pokemon_palettes_dewgong_palette:: @ 8D6B0E0 .incbin "graphics/pokemon/palettes/dewgong_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xD6B0E0, 0x0024 .align 2 gFile_graphics_pokemon_back_pics_dewgong_back_pic:: @ 8D6B104 .incbin "graphics/pokemon/back_pics/dewgong_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xD6B104, 0x0294 .align 2 gFile_graphics_pokemon_palettes_dewgong_shiny_palette:: @ 8D6B398 .incbin "graphics/pokemon/palettes/dewgong_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xD6B398, 0x0024 .align 2 gFile_graphics_pokemon_icons_dewgong_icon:: @ 8D6B3BC .incbin "graphics/pokemon/icons/dewgong_icon.4bpp" - @ .incbin "baserom.gba", 0xD6B3BC, 0x0400 .align 2 gFile_graphics_pokemon_footprints_dewgong_footprint:: @ 8D6B7BC .incbin "graphics/pokemon/footprints/dewgong_footprint.1bpp" - @ .incbin "baserom.gba", 0xD6B7BC, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_grimer_still_front_pic:: @ 8D6B7DC .incbin "graphics/pokemon/front_pics/grimer_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xD6B7DC, 0x0328 .align 2 gFile_graphics_pokemon_palettes_grimer_palette:: @ 8D6BB04 .incbin "graphics/pokemon/palettes/grimer_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xD6BB04, 0x0024 .align 2 gFile_graphics_pokemon_back_pics_grimer_back_pic:: @ 8D6BB28 .incbin "graphics/pokemon/back_pics/grimer_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xD6BB28, 0x02C4 .align 2 gFile_graphics_pokemon_palettes_grimer_shiny_palette:: @ 8D6BDEC .incbin "graphics/pokemon/palettes/grimer_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xD6BDEC, 0x0024 .align 2 gFile_graphics_pokemon_icons_grimer_icon:: @ 8D6BE10 .incbin "graphics/pokemon/icons/grimer_icon.4bpp" - @ .incbin "baserom.gba", 0xD6BE10, 0x0400 .align 2 gFile_graphics_pokemon_footprints_grimer_footprint:: @ 8D6C210 .incbin "graphics/pokemon/footprints/grimer_footprint.1bpp" - @ .incbin "baserom.gba", 0xD6C210, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_muk_still_front_pic:: @ 8D6C230 .incbin "graphics/pokemon/front_pics/muk_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xD6C230, 0x0390 .align 2 gFile_graphics_pokemon_palettes_muk_palette:: @ 8D6C5C0 .incbin "graphics/pokemon/palettes/muk_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xD6C5C0, 0x0024 .align 2 gFile_graphics_pokemon_back_pics_muk_back_pic:: @ 8D6C5E4 .incbin "graphics/pokemon/back_pics/muk_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xD6C5E4, 0x02F8 .align 2 gFile_graphics_pokemon_palettes_muk_shiny_palette:: @ 8D6C8DC .incbin "graphics/pokemon/palettes/muk_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xD6C8DC, 0x0024 .align 2 gFile_graphics_pokemon_icons_muk_icon:: @ 8D6C900 .incbin "graphics/pokemon/icons/muk_icon.4bpp" - @ .incbin "baserom.gba", 0xD6C900, 0x0400 .align 2 gFile_graphics_pokemon_footprints_muk_footprint:: @ 8D6CD00 .incbin "graphics/pokemon/footprints/muk_footprint.1bpp" - @ .incbin "baserom.gba", 0xD6CD00, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_shellder_still_front_pic:: @ 8D6CD20 .incbin "graphics/pokemon/front_pics/shellder_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xD6CD20, 0x0274 .align 2 gFile_graphics_pokemon_palettes_shellder_palette:: @ 8D6CF94 .incbin "graphics/pokemon/palettes/shellder_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xD6CF94, 0x0024 .align 2 gFile_graphics_pokemon_back_pics_shellder_back_pic:: @ 8D6CFB8 .incbin "graphics/pokemon/back_pics/shellder_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xD6CFB8, 0x0314 .align 2 gFile_graphics_pokemon_palettes_shellder_shiny_palette:: @ 8D6D2CC .incbin "graphics/pokemon/palettes/shellder_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xD6D2CC, 0x0024 .align 2 gFile_graphics_pokemon_icons_shellder_icon:: @ 8D6D2F0 .incbin "graphics/pokemon/icons/shellder_icon.4bpp" - @ .incbin "baserom.gba", 0xD6D2F0, 0x0400 .align 2 gFile_graphics_pokemon_footprints_shellder_footprint:: @ 8D6D6F0 .incbin "graphics/pokemon/footprints/shellder_footprint.1bpp" - @ .incbin "baserom.gba", 0xD6D6F0, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_cloyster_still_front_pic:: @ 8D6D710 .incbin "graphics/pokemon/front_pics/cloyster_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xD6D710, 0x043C .align 2 gFile_graphics_pokemon_palettes_cloyster_palette:: @ 8D6DB4C .incbin "graphics/pokemon/palettes/cloyster_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xD6DB4C, 0x0024 .align 2 gFile_graphics_pokemon_back_pics_cloyster_back_pic:: @ 8D6DB70 .incbin "graphics/pokemon/back_pics/cloyster_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xD6DB70, 0x040C .align 2 gFile_graphics_pokemon_palettes_cloyster_shiny_palette:: @ 8D6DF7C .incbin "graphics/pokemon/palettes/cloyster_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xD6DF7C, 0x0024 .align 2 gFile_graphics_pokemon_icons_cloyster_icon:: @ 8D6DFA0 .incbin "graphics/pokemon/icons/cloyster_icon.4bpp" - @ .incbin "baserom.gba", 0xD6DFA0, 0x0400 .align 2 gFile_graphics_pokemon_footprints_cloyster_footprint:: @ 8D6E3A0 .incbin "graphics/pokemon/footprints/cloyster_footprint.1bpp" - @ .incbin "baserom.gba", 0xD6E3A0, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_gastly_still_front_pic:: @ 8D6E3C0 .incbin "graphics/pokemon/front_pics/gastly_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xD6E3C0, 0x03B8 .align 2 gFile_graphics_pokemon_palettes_gastly_palette:: @ 8D6E778 .incbin "graphics/pokemon/palettes/gastly_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xD6E778, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_gastly_back_pic:: @ 8D6E7A0 .incbin "graphics/pokemon/back_pics/gastly_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xD6E7A0, 0x0324 .align 2 gFile_graphics_pokemon_palettes_gastly_shiny_palette:: @ 8D6EAC4 .incbin "graphics/pokemon/palettes/gastly_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xD6EAC4, 0x0028 .align 2 gFile_graphics_pokemon_icons_gastly_icon:: @ 8D6EAEC .incbin "graphics/pokemon/icons/gastly_icon.4bpp" - @ .incbin "baserom.gba", 0xD6EAEC, 0x0400 .align 2 gFile_graphics_pokemon_footprints_gastly_footprint:: @ 8D6EEEC .incbin "graphics/pokemon/footprints/gastly_footprint.1bpp" - @ .incbin "baserom.gba", 0xD6EEEC, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_haunter_still_front_pic:: @ 8D6EF0C .incbin "graphics/pokemon/front_pics/haunter_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xD6EF0C, 0x03E8 .align 2 gFile_graphics_pokemon_palettes_haunter_palette:: @ 8D6F2F4 .incbin "graphics/pokemon/palettes/haunter_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xD6F2F4, 0x0024 .align 2 gFile_graphics_pokemon_back_pics_haunter_back_pic:: @ 8D6F318 .incbin "graphics/pokemon/back_pics/haunter_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xD6F318, 0x02E4 .align 2 gFile_graphics_pokemon_palettes_haunter_shiny_palette:: @ 8D6F5FC .incbin "graphics/pokemon/palettes/haunter_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xD6F5FC, 0x0024 .align 2 gFile_graphics_pokemon_icons_haunter_icon:: @ 8D6F620 .incbin "graphics/pokemon/icons/haunter_icon.4bpp" - @ .incbin "baserom.gba", 0xD6F620, 0x0400 .align 2 gFile_graphics_pokemon_footprints_haunter_footprint:: @ 8D6FA20 .incbin "graphics/pokemon/footprints/haunter_footprint.1bpp" - @ .incbin "baserom.gba", 0xD6FA20, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_gengar_still_front_pic:: @ 8D6FA40 .incbin "graphics/pokemon/front_pics/gengar_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xD6FA40, 0x035C .align 2 gFile_graphics_pokemon_palettes_gengar_palette:: @ 8D6FD9C .incbin "graphics/pokemon/palettes/gengar_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xD6FD9C, 0x0024 .align 2 gFile_graphics_pokemon_back_pics_gengar_back_pic:: @ 8D6FDC0 .incbin "graphics/pokemon/back_pics/gengar_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xD6FDC0, 0x0344 .align 2 gFile_graphics_pokemon_palettes_gengar_shiny_palette:: @ 8D70104 .incbin "graphics/pokemon/palettes/gengar_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xD70104, 0x0024 .align 2 gFile_graphics_pokemon_icons_gengar_icon:: @ 8D70128 .incbin "graphics/pokemon/icons/gengar_icon.4bpp" - @ .incbin "baserom.gba", 0xD70128, 0x0400 .align 2 gFile_graphics_pokemon_footprints_gengar_footprint:: @ 8D70528 .incbin "graphics/pokemon/footprints/gengar_footprint.1bpp" - @ .incbin "baserom.gba", 0xD70528, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_onix_still_front_pic:: @ 8D70548 .incbin "graphics/pokemon/front_pics/onix_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xD70548, 0x04D0 .align 2 gFile_graphics_pokemon_palettes_onix_palette:: @ 8D70A18 .incbin "graphics/pokemon/palettes/onix_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xD70A18, 0x001C .align 2 gFile_graphics_pokemon_back_pics_onix_back_pic:: @ 8D70A34 .incbin "graphics/pokemon/back_pics/onix_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xD70A34, 0x037C .align 2 gFile_graphics_pokemon_palettes_onix_shiny_palette:: @ 8D70DB0 .incbin "graphics/pokemon/palettes/onix_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xD70DB0, 0x001C .align 2 gFile_graphics_pokemon_icons_onix_icon:: @ 8D70DCC .incbin "graphics/pokemon/icons/onix_icon.4bpp" - @ .incbin "baserom.gba", 0xD70DCC, 0x0400 .align 2 gFile_graphics_pokemon_footprints_onix_footprint:: @ 8D711CC .incbin "graphics/pokemon/footprints/onix_footprint.1bpp" - @ .incbin "baserom.gba", 0xD711CC, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_drowzee_still_front_pic:: @ 8D711EC .incbin "graphics/pokemon/front_pics/drowzee_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xD711EC, 0x0340 .align 2 gFile_graphics_pokemon_palettes_drowzee_palette:: @ 8D7152C .incbin "graphics/pokemon/palettes/drowzee_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xD7152C, 0x0024 .align 2 gFile_graphics_pokemon_back_pics_drowzee_back_pic:: @ 8D71550 .incbin "graphics/pokemon/back_pics/drowzee_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xD71550, 0x023C .align 2 gFile_graphics_pokemon_palettes_drowzee_shiny_palette:: @ 8D7178C .incbin "graphics/pokemon/palettes/drowzee_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xD7178C, 0x0024 .align 2 gFile_graphics_pokemon_icons_drowzee_icon:: @ 8D717B0 .incbin "graphics/pokemon/icons/drowzee_icon.4bpp" - @ .incbin "baserom.gba", 0xD717B0, 0x0400 .align 2 gFile_graphics_pokemon_footprints_drowzee_footprint:: @ 8D71BB0 .incbin "graphics/pokemon/footprints/drowzee_footprint.1bpp" - @ .incbin "baserom.gba", 0xD71BB0, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_hypno_still_front_pic:: @ 8D71BD0 .incbin "graphics/pokemon/front_pics/hypno_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xD71BD0, 0x0438 .align 2 gFile_graphics_pokemon_palettes_hypno_palette:: @ 8D72008 .incbin "graphics/pokemon/palettes/hypno_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xD72008, 0x0024 .align 2 gFile_graphics_pokemon_back_pics_hypno_back_pic:: @ 8D7202C .incbin "graphics/pokemon/back_pics/hypno_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xD7202C, 0x0330 .align 2 gFile_graphics_pokemon_palettes_hypno_shiny_palette:: @ 8D7235C .incbin "graphics/pokemon/palettes/hypno_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xD7235C, 0x0024 .align 2 gFile_graphics_pokemon_icons_hypno_icon:: @ 8D72380 .incbin "graphics/pokemon/icons/hypno_icon.4bpp" - @ .incbin "baserom.gba", 0xD72380, 0x0400 .align 2 gFile_graphics_pokemon_footprints_hypno_footprint:: @ 8D72780 .incbin "graphics/pokemon/footprints/hypno_footprint.1bpp" - @ .incbin "baserom.gba", 0xD72780, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_krabby_still_front_pic:: @ 8D727A0 .incbin "graphics/pokemon/front_pics/krabby_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xD727A0, 0x0324 .align 2 gFile_graphics_pokemon_palettes_krabby_palette:: @ 8D72AC4 .incbin "graphics/pokemon/palettes/krabby_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xD72AC4, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_krabby_back_pic:: @ 8D72AEC .incbin "graphics/pokemon/back_pics/krabby_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xD72AEC, 0x038C .align 2 gFile_graphics_pokemon_palettes_krabby_shiny_palette:: @ 8D72E78 .incbin "graphics/pokemon/palettes/krabby_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xD72E78, 0x0028 .align 2 gFile_graphics_pokemon_icons_krabby_icon:: @ 8D72EA0 .incbin "graphics/pokemon/icons/krabby_icon.4bpp" - @ .incbin "baserom.gba", 0xD72EA0, 0x0400 .align 2 gFile_graphics_pokemon_footprints_krabby_footprint:: @ 8D732A0 .incbin "graphics/pokemon/footprints/krabby_footprint.1bpp" - @ .incbin "baserom.gba", 0xD732A0, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_kingler_still_front_pic:: @ 8D732C0 .incbin "graphics/pokemon/front_pics/kingler_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xD732C0, 0x0480 .align 2 gFile_graphics_pokemon_palettes_kingler_palette:: @ 8D73740 .incbin "graphics/pokemon/palettes/kingler_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xD73740, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_kingler_back_pic:: @ 8D73768 .incbin "graphics/pokemon/back_pics/kingler_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xD73768, 0x0384 .align 2 gFile_graphics_pokemon_palettes_kingler_shiny_palette:: @ 8D73AEC .incbin "graphics/pokemon/palettes/kingler_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xD73AEC, 0x0028 .align 2 gFile_graphics_pokemon_icons_kingler_icon:: @ 8D73B14 .incbin "graphics/pokemon/icons/kingler_icon.4bpp" - @ .incbin "baserom.gba", 0xD73B14, 0x0400 .align 2 gFile_graphics_pokemon_footprints_kingler_footprint:: @ 8D73F14 .incbin "graphics/pokemon/footprints/kingler_footprint.1bpp" - @ .incbin "baserom.gba", 0xD73F14, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_voltorb_still_front_pic:: @ 8D73F34 .incbin "graphics/pokemon/front_pics/voltorb_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xD73F34, 0x0208 .align 2 gFile_graphics_pokemon_palettes_voltorb_palette:: @ 8D7413C .incbin "graphics/pokemon/palettes/voltorb_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xD7413C, 0x0024 .align 2 gFile_graphics_pokemon_back_pics_voltorb_back_pic:: @ 8D74160 .incbin "graphics/pokemon/back_pics/voltorb_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xD74160, 0x0274 .align 2 gFile_graphics_pokemon_palettes_voltorb_shiny_palette:: @ 8D743D4 .incbin "graphics/pokemon/palettes/voltorb_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xD743D4, 0x0024 .align 2 gFile_graphics_pokemon_icons_voltorb_icon:: @ 8D743F8 .incbin "graphics/pokemon/icons/voltorb_icon.4bpp" - @ .incbin "baserom.gba", 0xD743F8, 0x0400 .align 2 gFile_graphics_pokemon_footprints_voltorb_footprint:: @ 8D747F8 .incbin "graphics/pokemon/footprints/voltorb_footprint.1bpp" - @ .incbin "baserom.gba", 0xD747F8, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_electrode_still_front_pic:: @ 8D74818 .incbin "graphics/pokemon/front_pics/electrode_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xD74818, 0x026C .align 2 gFile_graphics_pokemon_palettes_electrode_palette:: @ 8D74A84 .incbin "graphics/pokemon/palettes/electrode_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xD74A84, 0x0024 .align 2 gFile_graphics_pokemon_back_pics_electrode_back_pic:: @ 8D74AA8 .incbin "graphics/pokemon/back_pics/electrode_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xD74AA8, 0x0270 .align 2 gFile_graphics_pokemon_palettes_electrode_shiny_palette:: @ 8D74D18 .incbin "graphics/pokemon/palettes/electrode_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xD74D18, 0x0024 .align 2 gFile_graphics_pokemon_icons_electrode_icon:: @ 8D74D3C .incbin "graphics/pokemon/icons/electrode_icon.4bpp" - @ .incbin "baserom.gba", 0xD74D3C, 0x0400 .align 2 gFile_graphics_pokemon_footprints_electrode_footprint:: @ 8D7513C .incbin "graphics/pokemon/footprints/electrode_footprint.1bpp" - @ .incbin "baserom.gba", 0xD7513C, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_exeggcute_still_front_pic:: @ 8D7515C .incbin "graphics/pokemon/front_pics/exeggcute_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xD7515C, 0x0390 .align 2 gFile_graphics_pokemon_palettes_exeggcute_palette:: @ 8D754EC .incbin "graphics/pokemon/palettes/exeggcute_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xD754EC, 0x0024 .align 2 gFile_graphics_pokemon_back_pics_exeggcute_back_pic:: @ 8D75510 .incbin "graphics/pokemon/back_pics/exeggcute_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xD75510, 0x0308 .align 2 gFile_graphics_pokemon_palettes_exeggcute_shiny_palette:: @ 8D75818 .incbin "graphics/pokemon/palettes/exeggcute_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xD75818, 0x0024 .align 2 gFile_graphics_pokemon_icons_exeggcute_icon:: @ 8D7583C .incbin "graphics/pokemon/icons/exeggcute_icon.4bpp" - @ .incbin "baserom.gba", 0xD7583C, 0x0400 .align 2 gFile_graphics_pokemon_footprints_exeggcute_footprint:: @ 8D75C3C .incbin "graphics/pokemon/footprints/exeggcute_footprint.1bpp" - @ .incbin "baserom.gba", 0xD75C3C, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_exeggutor_still_front_pic:: @ 8D75C5C .incbin "graphics/pokemon/front_pics/exeggutor_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xD75C5C, 0x0450 .align 2 gFile_graphics_pokemon_palettes_exeggutor_palette:: @ 8D760AC .incbin "graphics/pokemon/palettes/exeggutor_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xD760AC, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_exeggutor_back_pic:: @ 8D760D4 .incbin "graphics/pokemon/back_pics/exeggutor_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xD760D4, 0x03CC .align 2 gFile_graphics_pokemon_palettes_exeggutor_shiny_palette:: @ 8D764A0 .incbin "graphics/pokemon/palettes/exeggutor_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xD764A0, 0x0028 .align 2 gFile_graphics_pokemon_icons_exeggutor_icon:: @ 8D764C8 .incbin "graphics/pokemon/icons/exeggutor_icon.4bpp" - @ .incbin "baserom.gba", 0xD764C8, 0x0400 .align 2 gFile_graphics_pokemon_footprints_exeggutor_footprint:: @ 8D768C8 .incbin "graphics/pokemon/footprints/exeggutor_footprint.1bpp" - @ .incbin "baserom.gba", 0xD768C8, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_cubone_still_front_pic:: @ 8D768E8 .incbin "graphics/pokemon/front_pics/cubone_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xD768E8, 0x02BC .align 2 gFile_graphics_pokemon_palettes_cubone_palette:: @ 8D76BA4 .incbin "graphics/pokemon/palettes/cubone_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xD76BA4, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_cubone_back_pic:: @ 8D76BCC .incbin "graphics/pokemon/back_pics/cubone_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xD76BCC, 0x0340 .align 2 gFile_graphics_pokemon_palettes_cubone_shiny_palette:: @ 8D76F0C .incbin "graphics/pokemon/palettes/cubone_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xD76F0C, 0x0028 .align 2 gFile_graphics_pokemon_icons_cubone_icon:: @ 8D76F34 .incbin "graphics/pokemon/icons/cubone_icon.4bpp" - @ .incbin "baserom.gba", 0xD76F34, 0x0400 .align 2 gFile_graphics_pokemon_footprints_cubone_footprint:: @ 8D77334 .incbin "graphics/pokemon/footprints/cubone_footprint.1bpp" - @ .incbin "baserom.gba", 0xD77334, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_marowak_still_front_pic:: @ 8D77354 .incbin "graphics/pokemon/front_pics/marowak_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xD77354, 0x0380 .align 2 gFile_graphics_pokemon_palettes_marowak_palette:: @ 8D776D4 .incbin "graphics/pokemon/palettes/marowak_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xD776D4, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_marowak_back_pic:: @ 8D776FC .incbin "graphics/pokemon/back_pics/marowak_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xD776FC, 0x0314 .align 2 gFile_graphics_pokemon_palettes_marowak_shiny_palette:: @ 8D77A10 .incbin "graphics/pokemon/palettes/marowak_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xD77A10, 0x0028 .align 2 gFile_graphics_pokemon_icons_marowak_icon:: @ 8D77A38 .incbin "graphics/pokemon/icons/marowak_icon.4bpp" - @ .incbin "baserom.gba", 0xD77A38, 0x0400 .align 2 gFile_graphics_pokemon_footprints_marowak_footprint:: @ 8D77E38 .incbin "graphics/pokemon/footprints/marowak_footprint.1bpp" - @ .incbin "baserom.gba", 0xD77E38, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_hitmonlee_still_front_pic:: @ 8D77E58 .incbin "graphics/pokemon/front_pics/hitmonlee_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xD77E58, 0x0374 .align 2 gFile_graphics_pokemon_palettes_hitmonlee_palette:: @ 8D781CC .incbin "graphics/pokemon/palettes/hitmonlee_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xD781CC, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_hitmonlee_back_pic:: @ 8D781F4 .incbin "graphics/pokemon/back_pics/hitmonlee_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xD781F4, 0x02A4 .align 2 gFile_graphics_pokemon_palettes_hitmonlee_shiny_palette:: @ 8D78498 .incbin "graphics/pokemon/palettes/hitmonlee_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xD78498, 0x0028 .align 2 gFile_graphics_pokemon_icons_hitmonlee_icon:: @ 8D784C0 .incbin "graphics/pokemon/icons/hitmonlee_icon.4bpp" - @ .incbin "baserom.gba", 0xD784C0, 0x0400 .align 2 gFile_graphics_pokemon_footprints_hitmonlee_footprint:: @ 8D788C0 .incbin "graphics/pokemon/footprints/hitmonlee_footprint.1bpp" - @ .incbin "baserom.gba", 0xD788C0, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_hitmonchan_still_front_pic:: @ 8D788E0 .incbin "graphics/pokemon/front_pics/hitmonchan_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xD788E0, 0x0340 .align 2 gFile_graphics_pokemon_palettes_hitmonchan_palette:: @ 8D78C20 .incbin "graphics/pokemon/palettes/hitmonchan_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xD78C20, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_hitmonchan_back_pic:: @ 8D78C48 .incbin "graphics/pokemon/back_pics/hitmonchan_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xD78C48, 0x0344 .align 2 gFile_graphics_pokemon_palettes_hitmonchan_shiny_palette:: @ 8D78F8C .incbin "graphics/pokemon/palettes/hitmonchan_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xD78F8C, 0x0028 .align 2 gFile_graphics_pokemon_icons_hitmonchan_icon:: @ 8D78FB4 .incbin "graphics/pokemon/icons/hitmonchan_icon.4bpp" - @ .incbin "baserom.gba", 0xD78FB4, 0x0400 .align 2 gFile_graphics_pokemon_footprints_hitmonchan_footprint:: @ 8D793B4 .incbin "graphics/pokemon/footprints/hitmonchan_footprint.1bpp" - @ .incbin "baserom.gba", 0xD793B4, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_lickitung_still_front_pic:: @ 8D793D4 .incbin "graphics/pokemon/front_pics/lickitung_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xD793D4, 0x03D8 .align 2 gFile_graphics_pokemon_palettes_lickitung_palette:: @ 8D797AC .incbin "graphics/pokemon/palettes/lickitung_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xD797AC, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_lickitung_back_pic:: @ 8D797D4 .incbin "graphics/pokemon/back_pics/lickitung_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xD797D4, 0x02A4 .align 2 gFile_graphics_pokemon_palettes_lickitung_shiny_palette:: @ 8D79A78 .incbin "graphics/pokemon/palettes/lickitung_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xD79A78, 0x0028 .align 2 gFile_graphics_pokemon_icons_lickitung_icon:: @ 8D79AA0 .incbin "graphics/pokemon/icons/lickitung_icon.4bpp" - @ .incbin "baserom.gba", 0xD79AA0, 0x0400 .align 2 gFile_graphics_pokemon_footprints_lickitung_footprint:: @ 8D79EA0 .incbin "graphics/pokemon/footprints/lickitung_footprint.1bpp" - @ .incbin "baserom.gba", 0xD79EA0, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_koffing_still_front_pic:: @ 8D79EC0 .incbin "graphics/pokemon/front_pics/koffing_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xD79EC0, 0x0300 .align 2 gFile_graphics_pokemon_palettes_koffing_palette:: @ 8D7A1C0 .incbin "graphics/pokemon/palettes/koffing_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xD7A1C0, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_koffing_back_pic:: @ 8D7A1E8 .incbin "graphics/pokemon/back_pics/koffing_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xD7A1E8, 0x0300 .align 2 gFile_graphics_pokemon_palettes_koffing_shiny_palette:: @ 8D7A4E8 .incbin "graphics/pokemon/palettes/koffing_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xD7A4E8, 0x0028 .align 2 gFile_graphics_pokemon_icons_koffing_icon:: @ 8D7A510 .incbin "graphics/pokemon/icons/koffing_icon.4bpp" - @ .incbin "baserom.gba", 0xD7A510, 0x0400 .align 2 gFile_graphics_pokemon_footprints_koffing_footprint:: @ 8D7A910 .incbin "graphics/pokemon/footprints/koffing_footprint.1bpp" - @ .incbin "baserom.gba", 0xD7A910, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_weezing_still_front_pic:: @ 8D7A930 .incbin "graphics/pokemon/front_pics/weezing_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xD7A930, 0x04BC .align 2 gFile_graphics_pokemon_palettes_weezing_palette:: @ 8D7ADEC .incbin "graphics/pokemon/palettes/weezing_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xD7ADEC, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_weezing_back_pic:: @ 8D7AE14 .incbin "graphics/pokemon/back_pics/weezing_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xD7AE14, 0x0384 .align 2 gFile_graphics_pokemon_palettes_weezing_shiny_palette:: @ 8D7B198 .incbin "graphics/pokemon/palettes/weezing_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xD7B198, 0x0028 .align 2 gFile_graphics_pokemon_icons_weezing_icon:: @ 8D7B1C0 .incbin "graphics/pokemon/icons/weezing_icon.4bpp" - @ .incbin "baserom.gba", 0xD7B1C0, 0x0400 .align 2 gFile_graphics_pokemon_footprints_weezing_footprint:: @ 8D7B5C0 .incbin "graphics/pokemon/footprints/weezing_footprint.1bpp" - @ .incbin "baserom.gba", 0xD7B5C0, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_rhyhorn_still_front_pic:: @ 8D7B5E0 .incbin "graphics/pokemon/front_pics/rhyhorn_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xD7B5E0, 0x03FC .align 2 gFile_graphics_pokemon_palettes_rhyhorn_palette:: @ 8D7B9DC .incbin "graphics/pokemon/palettes/rhyhorn_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xD7B9DC, 0x0020 .align 2 gFile_graphics_pokemon_back_pics_rhyhorn_back_pic:: @ 8D7B9FC .incbin "graphics/pokemon/back_pics/rhyhorn_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xD7B9FC, 0x0348 .align 2 gFile_graphics_pokemon_palettes_rhyhorn_shiny_palette:: @ 8D7BD44 .incbin "graphics/pokemon/palettes/rhyhorn_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xD7BD44, 0x0020 .align 2 gFile_graphics_pokemon_icons_rhyhorn_icon:: @ 8D7BD64 .incbin "graphics/pokemon/icons/rhyhorn_icon.4bpp" - @ .incbin "baserom.gba", 0xD7BD64, 0x0400 .align 2 gFile_graphics_pokemon_footprints_rhyhorn_footprint:: @ 8D7C164 .incbin "graphics/pokemon/footprints/rhyhorn_footprint.1bpp" - @ .incbin "baserom.gba", 0xD7C164, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_rhydon_still_front_pic:: @ 8D7C184 .incbin "graphics/pokemon/front_pics/rhydon_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xD7C184, 0x04F4 .align 2 gFile_graphics_pokemon_palettes_rhydon_palette:: @ 8D7C678 .incbin "graphics/pokemon/palettes/rhydon_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xD7C678, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_rhydon_back_pic:: @ 8D7C6A0 .incbin "graphics/pokemon/back_pics/rhydon_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xD7C6A0, 0x0450 .align 2 gFile_graphics_pokemon_palettes_rhydon_shiny_palette:: @ 8D7CAF0 .incbin "graphics/pokemon/palettes/rhydon_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xD7CAF0, 0x0028 .align 2 gFile_graphics_pokemon_icons_rhydon_icon:: @ 8D7CB18 .incbin "graphics/pokemon/icons/rhydon_icon.4bpp" - @ .incbin "baserom.gba", 0xD7CB18, 0x0400 .align 2 gFile_graphics_pokemon_footprints_rhydon_footprint:: @ 8D7CF18 .incbin "graphics/pokemon/footprints/rhydon_footprint.1bpp" - @ .incbin "baserom.gba", 0xD7CF18, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_chansey_still_front_pic:: @ 8D7CF38 .incbin "graphics/pokemon/front_pics/chansey_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xD7CF38, 0x033C .align 2 gFile_graphics_pokemon_palettes_chansey_palette:: @ 8D7D274 .incbin "graphics/pokemon/palettes/chansey_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xD7D274, 0x0024 .align 2 gFile_graphics_pokemon_back_pics_chansey_back_pic:: @ 8D7D298 .incbin "graphics/pokemon/back_pics/chansey_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xD7D298, 0x0250 .align 2 gFile_graphics_pokemon_palettes_chansey_shiny_palette:: @ 8D7D4E8 .incbin "graphics/pokemon/palettes/chansey_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xD7D4E8, 0x0024 .align 2 gFile_graphics_pokemon_icons_chansey_icon:: @ 8D7D50C .incbin "graphics/pokemon/icons/chansey_icon.4bpp" - @ .incbin "baserom.gba", 0xD7D50C, 0x0400 .align 2 gFile_graphics_pokemon_footprints_chansey_footprint:: @ 8D7D90C .incbin "graphics/pokemon/footprints/chansey_footprint.1bpp" - @ .incbin "baserom.gba", 0xD7D90C, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_tangela_still_front_pic:: @ 8D7D92C .incbin "graphics/pokemon/front_pics/tangela_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xD7D92C, 0x03D4 .align 2 gFile_graphics_pokemon_palettes_tangela_palette:: @ 8D7DD00 .incbin "graphics/pokemon/palettes/tangela_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xD7DD00, 0x0024 .align 2 gFile_graphics_pokemon_back_pics_tangela_back_pic:: @ 8D7DD24 .incbin "graphics/pokemon/back_pics/tangela_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xD7DD24, 0x03AC .align 2 gFile_graphics_pokemon_palettes_tangela_shiny_palette:: @ 8D7E0D0 .incbin "graphics/pokemon/palettes/tangela_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xD7E0D0, 0x0024 .align 2 gFile_graphics_pokemon_icons_tangela_icon:: @ 8D7E0F4 .incbin "graphics/pokemon/icons/tangela_icon.4bpp" - @ .incbin "baserom.gba", 0xD7E0F4, 0x0400 .align 2 gFile_graphics_pokemon_footprints_tangela_footprint:: @ 8D7E4F4 .incbin "graphics/pokemon/footprints/tangela_footprint.1bpp" - @ .incbin "baserom.gba", 0xD7E4F4, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_kangaskhan_still_front_pic:: @ 8D7E514 .incbin "graphics/pokemon/front_pics/kangaskhan_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xD7E514, 0x04A8 .align 2 gFile_graphics_pokemon_palettes_kangaskhan_palette:: @ 8D7E9BC .incbin "graphics/pokemon/palettes/kangaskhan_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xD7E9BC, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_kangaskhan_back_pic:: @ 8D7E9E4 .incbin "graphics/pokemon/back_pics/kangaskhan_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xD7E9E4, 0x0430 .align 2 gFile_graphics_pokemon_palettes_kangaskhan_shiny_palette:: @ 8D7EE14 .incbin "graphics/pokemon/palettes/kangaskhan_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xD7EE14, 0x0028 .align 2 gFile_graphics_pokemon_icons_kangaskhan_icon:: @ 8D7EE3C .incbin "graphics/pokemon/icons/kangaskhan_icon.4bpp" - @ .incbin "baserom.gba", 0xD7EE3C, 0x0400 .align 2 gFile_graphics_pokemon_footprints_kangaskhan_footprint:: @ 8D7F23C .incbin "graphics/pokemon/footprints/kangaskhan_footprint.1bpp" - @ .incbin "baserom.gba", 0xD7F23C, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_horsea_still_front_pic:: @ 8D7F25C .incbin "graphics/pokemon/front_pics/horsea_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xD7F25C, 0x026C .align 2 gFile_graphics_pokemon_palettes_horsea_palette:: @ 8D7F4C8 .incbin "graphics/pokemon/palettes/horsea_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xD7F4C8, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_horsea_back_pic:: @ 8D7F4F0 .incbin "graphics/pokemon/back_pics/horsea_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xD7F4F0, 0x02E0 .align 2 gFile_graphics_pokemon_palettes_horsea_shiny_palette:: @ 8D7F7D0 .incbin "graphics/pokemon/palettes/horsea_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xD7F7D0, 0x0028 .align 2 gFile_graphics_pokemon_icons_horsea_icon:: @ 8D7F7F8 .incbin "graphics/pokemon/icons/horsea_icon.4bpp" - @ .incbin "baserom.gba", 0xD7F7F8, 0x0400 .align 2 gFile_graphics_pokemon_footprints_horsea_footprint:: @ 8D7FBF8 .incbin "graphics/pokemon/footprints/horsea_footprint.1bpp" - @ .incbin "baserom.gba", 0xD7FBF8, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_seadra_still_front_pic:: @ 8D7FC18 .incbin "graphics/pokemon/front_pics/seadra_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xD7FC18, 0x0388 .align 2 gFile_graphics_pokemon_palettes_seadra_palette:: @ 8D7FFA0 .incbin "graphics/pokemon/palettes/seadra_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xD7FFA0, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_seadra_back_pic:: @ 8D7FFC8 .incbin "graphics/pokemon/back_pics/seadra_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xD7FFC8, 0x03A0 .align 2 gFile_graphics_pokemon_palettes_seadra_shiny_palette:: @ 8D80368 .incbin "graphics/pokemon/palettes/seadra_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xD80368, 0x0028 .align 2 gFile_graphics_pokemon_icons_seadra_icon:: @ 8D80390 .incbin "graphics/pokemon/icons/seadra_icon.4bpp" - @ .incbin "baserom.gba", 0xD80390, 0x0400 .align 2 gFile_graphics_pokemon_footprints_seadra_footprint:: @ 8D80790 .incbin "graphics/pokemon/footprints/seadra_footprint.1bpp" - @ .incbin "baserom.gba", 0xD80790, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_goldeen_still_front_pic:: @ 8D807B0 .incbin "graphics/pokemon/front_pics/goldeen_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xD807B0, 0x0368 .align 2 gFile_graphics_pokemon_palettes_goldeen_palette:: @ 8D80B18 .incbin "graphics/pokemon/palettes/goldeen_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xD80B18, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_goldeen_back_pic:: @ 8D80B40 .incbin "graphics/pokemon/back_pics/goldeen_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xD80B40, 0x0370 .align 2 gFile_graphics_pokemon_palettes_goldeen_shiny_palette:: @ 8D80EB0 .incbin "graphics/pokemon/palettes/goldeen_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xD80EB0, 0x0028 .align 2 gFile_graphics_pokemon_icons_goldeen_icon:: @ 8D80ED8 .incbin "graphics/pokemon/icons/goldeen_icon.4bpp" - @ .incbin "baserom.gba", 0xD80ED8, 0x0400 .align 2 gFile_graphics_pokemon_footprints_goldeen_footprint:: @ 8D812D8 .incbin "graphics/pokemon/footprints/goldeen_footprint.1bpp" - @ .incbin "baserom.gba", 0xD812D8, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_seaking_still_front_pic:: @ 8D812F8 .incbin "graphics/pokemon/front_pics/seaking_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xD812F8, 0x0474 .align 2 gFile_graphics_pokemon_palettes_seaking_palette:: @ 8D8176C .incbin "graphics/pokemon/palettes/seaking_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xD8176C, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_seaking_back_pic:: @ 8D81794 .incbin "graphics/pokemon/back_pics/seaking_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xD81794, 0x0350 .align 2 gFile_graphics_pokemon_palettes_seaking_shiny_palette:: @ 8D81AE4 .incbin "graphics/pokemon/palettes/seaking_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xD81AE4, 0x0028 .align 2 gFile_graphics_pokemon_icons_seaking_icon:: @ 8D81B0C .incbin "graphics/pokemon/icons/seaking_icon.4bpp" - @ .incbin "baserom.gba", 0xD81B0C, 0x0400 .align 2 gFile_graphics_pokemon_footprints_seaking_footprint:: @ 8D81F0C .incbin "graphics/pokemon/footprints/seaking_footprint.1bpp" - @ .incbin "baserom.gba", 0xD81F0C, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_staryu_still_front_pic:: @ 8D81F2C .incbin "graphics/pokemon/front_pics/staryu_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xD81F2C, 0x02B0 .align 2 gFile_graphics_pokemon_palettes_staryu_palette:: @ 8D821DC .incbin "graphics/pokemon/palettes/staryu_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xD821DC, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_staryu_back_pic:: @ 8D82204 .incbin "graphics/pokemon/back_pics/staryu_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xD82204, 0x0268 .align 2 gFile_graphics_pokemon_palettes_staryu_shiny_palette:: @ 8D8246C .incbin "graphics/pokemon/palettes/staryu_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xD8246C, 0x0028 .align 2 gFile_graphics_pokemon_icons_staryu_icon:: @ 8D82494 .incbin "graphics/pokemon/icons/staryu_icon.4bpp" - @ .incbin "baserom.gba", 0xD82494, 0x0400 .align 2 gFile_graphics_pokemon_footprints_staryu_footprint:: @ 8D82894 .incbin "graphics/pokemon/footprints/staryu_footprint.1bpp" - @ .incbin "baserom.gba", 0xD82894, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_starmie_still_front_pic:: @ 8D828B4 .incbin "graphics/pokemon/front_pics/starmie_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xD828B4, 0x03A0 .align 2 gFile_graphics_pokemon_palettes_starmie_palette:: @ 8D82C54 .incbin "graphics/pokemon/palettes/starmie_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xD82C54, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_starmie_back_pic:: @ 8D82C7C .incbin "graphics/pokemon/back_pics/starmie_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xD82C7C, 0x02A4 .align 2 gFile_graphics_pokemon_palettes_starmie_shiny_palette:: @ 8D82F20 .incbin "graphics/pokemon/palettes/starmie_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xD82F20, 0x0028 .align 2 gFile_graphics_pokemon_icons_starmie_icon:: @ 8D82F48 .incbin "graphics/pokemon/icons/starmie_icon.4bpp" - @ .incbin "baserom.gba", 0xD82F48, 0x0400 .align 2 gFile_graphics_pokemon_footprints_starmie_footprint:: @ 8D83348 .incbin "graphics/pokemon/footprints/starmie_footprint.1bpp" - @ .incbin "baserom.gba", 0xD83348, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_mr_mime_still_front_pic:: @ 8D83368 .incbin "graphics/pokemon/front_pics/mr_mime_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xD83368, 0x03BC .align 2 gFile_graphics_pokemon_palettes_mr_mime_palette:: @ 8D83724 .incbin "graphics/pokemon/palettes/mr_mime_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xD83724, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_mr_mime_back_pic:: @ 8D8374C .incbin "graphics/pokemon/back_pics/mr_mime_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xD8374C, 0x0334 .align 2 gFile_graphics_pokemon_palettes_mr_mime_shiny_palette:: @ 8D83A80 .incbin "graphics/pokemon/palettes/mr_mime_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xD83A80, 0x0028 .align 2 gFile_graphics_pokemon_icons_mr_mime_icon:: @ 8D83AA8 .incbin "graphics/pokemon/icons/mr_mime_icon.4bpp" - @ .incbin "baserom.gba", 0xD83AA8, 0x0400 .align 2 gFile_graphics_pokemon_footprints_mr_mime_footprint:: @ 8D83EA8 .incbin "graphics/pokemon/footprints/mr_mime_footprint.1bpp" - @ .incbin "baserom.gba", 0xD83EA8, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_scyther_still_front_pic:: @ 8D83EC8 .incbin "graphics/pokemon/front_pics/scyther_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xD83EC8, 0x0428 .align 2 gFile_graphics_pokemon_palettes_scyther_palette:: @ 8D842F0 .incbin "graphics/pokemon/palettes/scyther_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xD842F0, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_scyther_back_pic:: @ 8D84318 .incbin "graphics/pokemon/back_pics/scyther_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xD84318, 0x0418 .align 2 gFile_graphics_pokemon_palettes_scyther_shiny_palette:: @ 8D84730 .incbin "graphics/pokemon/palettes/scyther_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xD84730, 0x0028 .align 2 gFile_graphics_pokemon_icons_scyther_icon:: @ 8D84758 .incbin "graphics/pokemon/icons/scyther_icon.4bpp" - @ .incbin "baserom.gba", 0xD84758, 0x0400 .align 2 gFile_graphics_pokemon_footprints_scyther_footprint:: @ 8D84B58 .incbin "graphics/pokemon/footprints/scyther_footprint.1bpp" - @ .incbin "baserom.gba", 0xD84B58, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_jynx_still_front_pic:: @ 8D84B78 .incbin "graphics/pokemon/front_pics/jynx_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xD84B78, 0x03CC .align 2 gFile_graphics_pokemon_palettes_jynx_palette:: @ 8D84F44 .incbin "graphics/pokemon/palettes/jynx_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xD84F44, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_jynx_back_pic:: @ 8D84F6C .incbin "graphics/pokemon/back_pics/jynx_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xD84F6C, 0x02EC .align 2 gFile_graphics_pokemon_palettes_jynx_shiny_palette:: @ 8D85258 .incbin "graphics/pokemon/palettes/jynx_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xD85258, 0x0028 .align 2 gFile_graphics_pokemon_icons_jynx_icon:: @ 8D85280 .incbin "graphics/pokemon/icons/jynx_icon.4bpp" - @ .incbin "baserom.gba", 0xD85280, 0x0400 .align 2 gFile_graphics_pokemon_footprints_jynx_footprint:: @ 8D85680 .incbin "graphics/pokemon/footprints/jynx_footprint.1bpp" - @ .incbin "baserom.gba", 0xD85680, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_electabuzz_still_front_pic:: @ 8D856A0 .incbin "graphics/pokemon/front_pics/electabuzz_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xD856A0, 0x0458 .align 2 gFile_graphics_pokemon_palettes_electabuzz_palette:: @ 8D85AF8 .incbin "graphics/pokemon/palettes/electabuzz_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xD85AF8, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_electabuzz_back_pic:: @ 8D85B20 .incbin "graphics/pokemon/back_pics/electabuzz_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xD85B20, 0x0310 .align 2 gFile_graphics_pokemon_palettes_electabuzz_shiny_palette:: @ 8D85E30 .incbin "graphics/pokemon/palettes/electabuzz_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xD85E30, 0x0028 .align 2 gFile_graphics_pokemon_icons_electabuzz_icon:: @ 8D85E58 .incbin "graphics/pokemon/icons/electabuzz_icon.4bpp" - @ .incbin "baserom.gba", 0xD85E58, 0x0400 .align 2 gFile_graphics_pokemon_footprints_electabuzz_footprint:: @ 8D86258 .incbin "graphics/pokemon/footprints/electabuzz_footprint.1bpp" - @ .incbin "baserom.gba", 0xD86258, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_magmar_still_front_pic:: @ 8D86278 .incbin "graphics/pokemon/front_pics/magmar_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xD86278, 0x0430 .align 2 gFile_graphics_pokemon_palettes_magmar_palette:: @ 8D866A8 .incbin "graphics/pokemon/palettes/magmar_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xD866A8, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_magmar_back_pic:: @ 8D866D0 .incbin "graphics/pokemon/back_pics/magmar_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xD866D0, 0x0338 .align 2 gFile_graphics_pokemon_palettes_magmar_shiny_palette:: @ 8D86A08 .incbin "graphics/pokemon/palettes/magmar_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xD86A08, 0x0028 .align 2 gFile_graphics_pokemon_icons_magmar_icon:: @ 8D86A30 .incbin "graphics/pokemon/icons/magmar_icon.4bpp" - @ .incbin "baserom.gba", 0xD86A30, 0x0400 .align 2 gFile_graphics_pokemon_footprints_magmar_footprint:: @ 8D86E30 .incbin "graphics/pokemon/footprints/magmar_footprint.1bpp" - @ .incbin "baserom.gba", 0xD86E30, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_pinsir_still_front_pic:: @ 8D86E50 .incbin "graphics/pokemon/front_pics/pinsir_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xD86E50, 0x0430 .align 2 gFile_graphics_pokemon_palettes_pinsir_palette:: @ 8D87280 .incbin "graphics/pokemon/palettes/pinsir_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xD87280, 0x0024 .align 2 gFile_graphics_pokemon_back_pics_pinsir_back_pic:: @ 8D872A4 .incbin "graphics/pokemon/back_pics/pinsir_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xD872A4, 0x0354 .align 2 gFile_graphics_pokemon_palettes_pinsir_shiny_palette:: @ 8D875F8 .incbin "graphics/pokemon/palettes/pinsir_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xD875F8, 0x0024 .align 2 gFile_graphics_pokemon_icons_pinsir_icon:: @ 8D8761C .incbin "graphics/pokemon/icons/pinsir_icon.4bpp" - @ .incbin "baserom.gba", 0xD8761C, 0x0400 .align 2 gFile_graphics_pokemon_footprints_pinsir_footprint:: @ 8D87A1C .incbin "graphics/pokemon/footprints/pinsir_footprint.1bpp" - @ .incbin "baserom.gba", 0xD87A1C, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_tauros_still_front_pic:: @ 8D87A3C .incbin "graphics/pokemon/front_pics/tauros_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xD87A3C, 0x0460 .align 2 gFile_graphics_pokemon_palettes_tauros_palette:: @ 8D87E9C .incbin "graphics/pokemon/palettes/tauros_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xD87E9C, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_tauros_back_pic:: @ 8D87EC4 .incbin "graphics/pokemon/back_pics/tauros_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xD87EC4, 0x02B4 .align 2 gFile_graphics_pokemon_palettes_tauros_shiny_palette:: @ 8D88178 .incbin "graphics/pokemon/palettes/tauros_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xD88178, 0x0028 .align 2 gFile_graphics_pokemon_icons_tauros_icon:: @ 8D881A0 .incbin "graphics/pokemon/icons/tauros_icon.4bpp" - @ .incbin "baserom.gba", 0xD881A0, 0x0400 .align 2 gFile_graphics_pokemon_footprints_tauros_footprint:: @ 8D885A0 .incbin "graphics/pokemon/footprints/tauros_footprint.1bpp" - @ .incbin "baserom.gba", 0xD885A0, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_magikarp_still_front_pic:: @ 8D885C0 .incbin "graphics/pokemon/front_pics/magikarp_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xD885C0, 0x0348 .align 2 gFile_graphics_pokemon_palettes_magikarp_palette:: @ 8D88908 .incbin "graphics/pokemon/palettes/magikarp_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xD88908, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_magikarp_back_pic:: @ 8D88930 .incbin "graphics/pokemon/back_pics/magikarp_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xD88930, 0x0330 .align 2 gFile_graphics_pokemon_palettes_magikarp_shiny_palette:: @ 8D88C60 .incbin "graphics/pokemon/palettes/magikarp_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xD88C60, 0x0028 .align 2 gFile_graphics_pokemon_icons_magikarp_icon:: @ 8D88C88 .incbin "graphics/pokemon/icons/magikarp_icon.4bpp" - @ .incbin "baserom.gba", 0xD88C88, 0x0400 .align 2 gFile_graphics_pokemon_footprints_magikarp_footprint:: @ 8D89088 .incbin "graphics/pokemon/footprints/magikarp_footprint.1bpp" - @ .incbin "baserom.gba", 0xD89088, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_gyarados_still_front_pic:: @ 8D890A8 .incbin "graphics/pokemon/front_pics/gyarados_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xD890A8, 0x05A4 .align 2 gFile_graphics_pokemon_palettes_gyarados_palette:: @ 8D8964C .incbin "graphics/pokemon/palettes/gyarados_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xD8964C, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_gyarados_back_pic:: @ 8D89674 .incbin "graphics/pokemon/back_pics/gyarados_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xD89674, 0x04B8 .align 2 gFile_graphics_pokemon_palettes_gyarados_shiny_palette:: @ 8D89B2C .incbin "graphics/pokemon/palettes/gyarados_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xD89B2C, 0x0028 .align 2 gFile_graphics_pokemon_icons_gyarados_icon:: @ 8D89B54 .incbin "graphics/pokemon/icons/gyarados_icon.4bpp" - @ .incbin "baserom.gba", 0xD89B54, 0x0400 .align 2 gFile_graphics_pokemon_footprints_gyarados_footprint:: @ 8D89F54 .incbin "graphics/pokemon/footprints/gyarados_footprint.1bpp" - @ .incbin "baserom.gba", 0xD89F54, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_lapras_still_front_pic:: @ 8D89F74 .incbin "graphics/pokemon/front_pics/lapras_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xD89F74, 0x03E0 .align 2 gFile_graphics_pokemon_palettes_lapras_palette:: @ 8D8A354 .incbin "graphics/pokemon/palettes/lapras_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xD8A354, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_lapras_back_pic:: @ 8D8A37C .incbin "graphics/pokemon/back_pics/lapras_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xD8A37C, 0x0344 .align 2 gFile_graphics_pokemon_palettes_lapras_shiny_palette:: @ 8D8A6C0 .incbin "graphics/pokemon/palettes/lapras_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xD8A6C0, 0x0028 .align 2 gFile_graphics_pokemon_icons_lapras_icon:: @ 8D8A6E8 .incbin "graphics/pokemon/icons/lapras_icon.4bpp" - @ .incbin "baserom.gba", 0xD8A6E8, 0x0400 .align 2 gFile_graphics_pokemon_footprints_lapras_footprint:: @ 8D8AAE8 .incbin "graphics/pokemon/footprints/lapras_footprint.1bpp" - @ .incbin "baserom.gba", 0xD8AAE8, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_ditto_still_front_pic:: @ 8D8AB08 .incbin "graphics/pokemon/front_pics/ditto_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xD8AB08, 0x01F0 .align 2 gFile_graphics_pokemon_palettes_ditto_palette:: @ 8D8ACF8 .incbin "graphics/pokemon/palettes/ditto_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xD8ACF8, 0x0020 .align 2 gFile_graphics_pokemon_back_pics_ditto_back_pic:: @ 8D8AD18 .incbin "graphics/pokemon/back_pics/ditto_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xD8AD18, 0x0200 .align 2 gFile_graphics_pokemon_palettes_ditto_shiny_palette:: @ 8D8AF18 .incbin "graphics/pokemon/palettes/ditto_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xD8AF18, 0x0020 .align 2 gFile_graphics_pokemon_icons_ditto_icon:: @ 8D8AF38 .incbin "graphics/pokemon/icons/ditto_icon.4bpp" - @ .incbin "baserom.gba", 0xD8AF38, 0x0400 .align 2 gFile_graphics_pokemon_footprints_ditto_footprint:: @ 8D8B338 .incbin "graphics/pokemon/footprints/ditto_footprint.1bpp" - @ .incbin "baserom.gba", 0xD8B338, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_eevee_still_front_pic:: @ 8D8B358 .incbin "graphics/pokemon/front_pics/eevee_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xD8B358, 0x02EC .align 2 gFile_graphics_pokemon_palettes_eevee_palette:: @ 8D8B644 .incbin "graphics/pokemon/palettes/eevee_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xD8B644, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_eevee_back_pic:: @ 8D8B66C .incbin "graphics/pokemon/back_pics/eevee_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xD8B66C, 0x0328 .align 2 gFile_graphics_pokemon_palettes_eevee_shiny_palette:: @ 8D8B994 .incbin "graphics/pokemon/palettes/eevee_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xD8B994, 0x0028 .align 2 gFile_graphics_pokemon_icons_eevee_icon:: @ 8D8B9BC .incbin "graphics/pokemon/icons/eevee_icon.4bpp" - @ .incbin "baserom.gba", 0xD8B9BC, 0x0400 .align 2 gFile_graphics_pokemon_footprints_eevee_footprint:: @ 8D8BDBC .incbin "graphics/pokemon/footprints/eevee_footprint.1bpp" - @ .incbin "baserom.gba", 0xD8BDBC, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_vaporeon_still_front_pic:: @ 8D8BDDC .incbin "graphics/pokemon/front_pics/vaporeon_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xD8BDDC, 0x0394 .align 2 gFile_graphics_pokemon_palettes_vaporeon_palette:: @ 8D8C170 .incbin "graphics/pokemon/palettes/vaporeon_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xD8C170, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_vaporeon_back_pic:: @ 8D8C198 .incbin "graphics/pokemon/back_pics/vaporeon_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xD8C198, 0x02C8 .align 2 gFile_graphics_pokemon_palettes_vaporeon_shiny_palette:: @ 8D8C460 .incbin "graphics/pokemon/palettes/vaporeon_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xD8C460, 0x0028 .align 2 gFile_graphics_pokemon_icons_vaporeon_icon:: @ 8D8C488 .incbin "graphics/pokemon/icons/vaporeon_icon.4bpp" - @ .incbin "baserom.gba", 0xD8C488, 0x0400 .align 2 gFile_graphics_pokemon_footprints_vaporeon_footprint:: @ 8D8C888 .incbin "graphics/pokemon/footprints/vaporeon_footprint.1bpp" - @ .incbin "baserom.gba", 0xD8C888, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_jolteon_still_front_pic:: @ 8D8C8A8 .incbin "graphics/pokemon/front_pics/jolteon_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xD8C8A8, 0x0350 .align 2 gFile_graphics_pokemon_palettes_jolteon_palette:: @ 8D8CBF8 .incbin "graphics/pokemon/palettes/jolteon_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xD8CBF8, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_jolteon_back_pic:: @ 8D8CC20 .incbin "graphics/pokemon/back_pics/jolteon_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xD8CC20, 0x03AC .align 2 gFile_graphics_pokemon_palettes_jolteon_shiny_palette:: @ 8D8CFCC .incbin "graphics/pokemon/palettes/jolteon_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xD8CFCC, 0x0028 .align 2 gFile_graphics_pokemon_icons_jolteon_icon:: @ 8D8CFF4 .incbin "graphics/pokemon/icons/jolteon_icon.4bpp" - @ .incbin "baserom.gba", 0xD8CFF4, 0x0400 .align 2 gFile_graphics_pokemon_footprints_jolteon_footprint:: @ 8D8D3F4 .incbin "graphics/pokemon/footprints/jolteon_footprint.1bpp" - @ .incbin "baserom.gba", 0xD8D3F4, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_flareon_still_front_pic:: @ 8D8D414 .incbin "graphics/pokemon/front_pics/flareon_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xD8D414, 0x0384 .align 2 gFile_graphics_pokemon_palettes_flareon_palette:: @ 8D8D798 .incbin "graphics/pokemon/palettes/flareon_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xD8D798, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_flareon_back_pic:: @ 8D8D7C0 .incbin "graphics/pokemon/back_pics/flareon_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xD8D7C0, 0x0390 .align 2 gFile_graphics_pokemon_palettes_flareon_shiny_palette:: @ 8D8DB50 .incbin "graphics/pokemon/palettes/flareon_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xD8DB50, 0x0028 .align 2 gFile_graphics_pokemon_icons_flareon_icon:: @ 8D8DB78 .incbin "graphics/pokemon/icons/flareon_icon.4bpp" - @ .incbin "baserom.gba", 0xD8DB78, 0x0400 .align 2 gFile_graphics_pokemon_footprints_flareon_footprint:: @ 8D8DF78 .incbin "graphics/pokemon/footprints/flareon_footprint.1bpp" - @ .incbin "baserom.gba", 0xD8DF78, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_porygon_still_front_pic:: @ 8D8DF98 .incbin "graphics/pokemon/front_pics/porygon_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xD8DF98, 0x02B8 .align 2 gFile_graphics_pokemon_palettes_porygon_palette:: @ 8D8E250 .incbin "graphics/pokemon/palettes/porygon_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xD8E250, 0x0024 .align 2 gFile_graphics_pokemon_back_pics_porygon_back_pic:: @ 8D8E274 .incbin "graphics/pokemon/back_pics/porygon_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xD8E274, 0x02B8 .align 2 gFile_graphics_pokemon_palettes_porygon_shiny_palette:: @ 8D8E52C .incbin "graphics/pokemon/palettes/porygon_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xD8E52C, 0x0024 .align 2 gFile_graphics_pokemon_icons_porygon_icon:: @ 8D8E550 .incbin "graphics/pokemon/icons/porygon_icon.4bpp" - @ .incbin "baserom.gba", 0xD8E550, 0x0400 .align 2 gFile_graphics_pokemon_footprints_porygon_footprint:: @ 8D8E950 .incbin "graphics/pokemon/footprints/porygon_footprint.1bpp" - @ .incbin "baserom.gba", 0xD8E950, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_omanyte_still_front_pic:: @ 8D8E970 .incbin "graphics/pokemon/front_pics/omanyte_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xD8E970, 0x0290 .align 2 gFile_graphics_pokemon_palettes_omanyte_palette:: @ 8D8EC00 .incbin "graphics/pokemon/palettes/omanyte_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xD8EC00, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_omanyte_back_pic:: @ 8D8EC28 .incbin "graphics/pokemon/back_pics/omanyte_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xD8EC28, 0x034C .align 2 gFile_graphics_pokemon_palettes_omanyte_shiny_palette:: @ 8D8EF74 .incbin "graphics/pokemon/palettes/omanyte_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xD8EF74, 0x0028 .align 2 gFile_graphics_pokemon_icons_omanyte_icon:: @ 8D8EF9C .incbin "graphics/pokemon/icons/omanyte_icon.4bpp" - @ .incbin "baserom.gba", 0xD8EF9C, 0x0400 .align 2 gFile_graphics_pokemon_footprints_omanyte_footprint:: @ 8D8F39C .incbin "graphics/pokemon/footprints/omanyte_footprint.1bpp" - @ .incbin "baserom.gba", 0xD8F39C, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_omastar_still_front_pic:: @ 8D8F3BC .incbin "graphics/pokemon/front_pics/omastar_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xD8F3BC, 0x03C0 .align 2 gFile_graphics_pokemon_palettes_omastar_palette:: @ 8D8F77C .incbin "graphics/pokemon/palettes/omastar_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xD8F77C, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_omastar_back_pic:: @ 8D8F7A4 .incbin "graphics/pokemon/back_pics/omastar_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xD8F7A4, 0x0340 .align 2 gFile_graphics_pokemon_palettes_omastar_shiny_palette:: @ 8D8FAE4 .incbin "graphics/pokemon/palettes/omastar_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xD8FAE4, 0x0028 .align 2 gFile_graphics_pokemon_icons_omastar_icon:: @ 8D8FB0C .incbin "graphics/pokemon/icons/omastar_icon.4bpp" - @ .incbin "baserom.gba", 0xD8FB0C, 0x0400 .align 2 gFile_graphics_pokemon_footprints_omastar_footprint:: @ 8D8FF0C .incbin "graphics/pokemon/footprints/omastar_footprint.1bpp" - @ .incbin "baserom.gba", 0xD8FF0C, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_kabuto_still_front_pic:: @ 8D8FF2C .incbin "graphics/pokemon/front_pics/kabuto_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xD8FF2C, 0x0228 .align 2 gFile_graphics_pokemon_palettes_kabuto_palette:: @ 8D90154 .incbin "graphics/pokemon/palettes/kabuto_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xD90154, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_kabuto_back_pic:: @ 8D9017C .incbin "graphics/pokemon/back_pics/kabuto_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xD9017C, 0x0298 .align 2 gFile_graphics_pokemon_palettes_kabuto_shiny_palette:: @ 8D90414 .incbin "graphics/pokemon/palettes/kabuto_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xD90414, 0x0028 .align 2 gFile_graphics_pokemon_icons_kabuto_icon:: @ 8D9043C .incbin "graphics/pokemon/icons/kabuto_icon.4bpp" - @ .incbin "baserom.gba", 0xD9043C, 0x0400 .align 2 gFile_graphics_pokemon_footprints_kabuto_footprint:: @ 8D9083C .incbin "graphics/pokemon/footprints/kabuto_footprint.1bpp" - @ .incbin "baserom.gba", 0xD9083C, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_kabutops_still_front_pic:: @ 8D9085C .incbin "graphics/pokemon/front_pics/kabutops_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xD9085C, 0x0410 .align 2 gFile_graphics_pokemon_palettes_kabutops_palette:: @ 8D90C6C .incbin "graphics/pokemon/palettes/kabutops_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xD90C6C, 0x0024 .align 2 gFile_graphics_pokemon_back_pics_kabutops_back_pic:: @ 8D90C90 .incbin "graphics/pokemon/back_pics/kabutops_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xD90C90, 0x03A4 .align 2 gFile_graphics_pokemon_palettes_kabutops_shiny_palette:: @ 8D91034 .incbin "graphics/pokemon/palettes/kabutops_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xD91034, 0x0024 .align 2 gFile_graphics_pokemon_icons_kabutops_icon:: @ 8D91058 .incbin "graphics/pokemon/icons/kabutops_icon.4bpp" - @ .incbin "baserom.gba", 0xD91058, 0x0400 .align 2 gFile_graphics_pokemon_footprints_kabutops_footprint:: @ 8D91458 .incbin "graphics/pokemon/footprints/kabutops_footprint.1bpp" - @ .incbin "baserom.gba", 0xD91458, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_aerodactyl_still_front_pic:: @ 8D91478 .incbin "graphics/pokemon/front_pics/aerodactyl_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xD91478, 0x0450 .align 2 gFile_graphics_pokemon_palettes_aerodactyl_palette:: @ 8D918C8 .incbin "graphics/pokemon/palettes/aerodactyl_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xD918C8, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_aerodactyl_back_pic:: @ 8D918F0 .incbin "graphics/pokemon/back_pics/aerodactyl_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xD918F0, 0x0304 .align 2 gFile_graphics_pokemon_palettes_aerodactyl_shiny_palette:: @ 8D91BF4 .incbin "graphics/pokemon/palettes/aerodactyl_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xD91BF4, 0x0028 .align 2 gFile_graphics_pokemon_icons_aerodactyl_icon:: @ 8D91C1C .incbin "graphics/pokemon/icons/aerodactyl_icon.4bpp" - @ .incbin "baserom.gba", 0xD91C1C, 0x0400 .align 2 gFile_graphics_pokemon_footprints_aerodactyl_footprint:: @ 8D9201C .incbin "graphics/pokemon/footprints/aerodactyl_footprint.1bpp" - @ .incbin "baserom.gba", 0xD9201C, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_snorlax_still_front_pic:: @ 8D9203C .incbin "graphics/pokemon/front_pics/snorlax_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xD9203C, 0x03D4 .align 2 gFile_graphics_pokemon_palettes_snorlax_palette:: @ 8D92410 .incbin "graphics/pokemon/palettes/snorlax_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xD92410, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_snorlax_back_pic:: @ 8D92438 .incbin "graphics/pokemon/back_pics/snorlax_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xD92438, 0x021C .align 2 gFile_graphics_pokemon_palettes_snorlax_shiny_palette:: @ 8D92654 .incbin "graphics/pokemon/palettes/snorlax_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xD92654, 0x0028 .align 2 gFile_graphics_pokemon_icons_snorlax_icon:: @ 8D9267C .incbin "graphics/pokemon/icons/snorlax_icon.4bpp" - @ .incbin "baserom.gba", 0xD9267C, 0x0400 .align 2 gFile_graphics_pokemon_footprints_snorlax_footprint:: @ 8D92A7C .incbin "graphics/pokemon/footprints/snorlax_footprint.1bpp" - @ .incbin "baserom.gba", 0xD92A7C, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_articuno_still_front_pic:: @ 8D92A9C .incbin "graphics/pokemon/front_pics/articuno_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xD92A9C, 0x04F8 .align 2 gFile_graphics_pokemon_palettes_articuno_palette:: @ 8D92F94 .incbin "graphics/pokemon/palettes/articuno_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xD92F94, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_articuno_back_pic:: @ 8D92FBC .incbin "graphics/pokemon/back_pics/articuno_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xD92FBC, 0x025C .align 2 gFile_graphics_pokemon_palettes_articuno_shiny_palette:: @ 8D93218 .incbin "graphics/pokemon/palettes/articuno_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xD93218, 0x0028 .align 2 gFile_graphics_pokemon_icons_articuno_icon:: @ 8D93240 .incbin "graphics/pokemon/icons/articuno_icon.4bpp" - @ .incbin "baserom.gba", 0xD93240, 0x0400 .align 2 gFile_graphics_pokemon_footprints_articuno_footprint:: @ 8D93640 .incbin "graphics/pokemon/footprints/articuno_footprint.1bpp" - @ .incbin "baserom.gba", 0xD93640, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_zapdos_still_front_pic:: @ 8D93660 .incbin "graphics/pokemon/front_pics/zapdos_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xD93660, 0x0450 .align 2 gFile_graphics_pokemon_palettes_zapdos_palette:: @ 8D93AB0 .incbin "graphics/pokemon/palettes/zapdos_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xD93AB0, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_zapdos_back_pic:: @ 8D93AD8 .incbin "graphics/pokemon/back_pics/zapdos_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xD93AD8, 0x033C .align 2 gFile_graphics_pokemon_palettes_zapdos_shiny_palette:: @ 8D93E14 .incbin "graphics/pokemon/palettes/zapdos_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xD93E14, 0x0028 .align 2 gFile_graphics_pokemon_icons_zapdos_icon:: @ 8D93E3C .incbin "graphics/pokemon/icons/zapdos_icon.4bpp" - @ .incbin "baserom.gba", 0xD93E3C, 0x0400 .align 2 gFile_graphics_pokemon_footprints_zapdos_footprint:: @ 8D9423C .incbin "graphics/pokemon/footprints/zapdos_footprint.1bpp" - @ .incbin "baserom.gba", 0xD9423C, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_moltres_still_front_pic:: @ 8D9425C .incbin "graphics/pokemon/front_pics/moltres_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xD9425C, 0x04CC .align 2 gFile_graphics_pokemon_palettes_moltres_palette:: @ 8D94728 .incbin "graphics/pokemon/palettes/moltres_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xD94728, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_moltres_back_pic:: @ 8D94750 .incbin "graphics/pokemon/back_pics/moltres_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xD94750, 0x033C .align 2 gFile_graphics_pokemon_palettes_moltres_shiny_palette:: @ 8D94A8C .incbin "graphics/pokemon/palettes/moltres_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xD94A8C, 0x0028 .align 2 gFile_graphics_pokemon_icons_moltres_icon:: @ 8D94AB4 .incbin "graphics/pokemon/icons/moltres_icon.4bpp" - @ .incbin "baserom.gba", 0xD94AB4, 0x0400 .align 2 gFile_graphics_pokemon_footprints_moltres_footprint:: @ 8D94EB4 .incbin "graphics/pokemon/footprints/moltres_footprint.1bpp" - @ .incbin "baserom.gba", 0xD94EB4, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_dratini_still_front_pic:: @ 8D94ED4 .incbin "graphics/pokemon/front_pics/dratini_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xD94ED4, 0x02BC .align 2 gFile_graphics_pokemon_palettes_dratini_palette:: @ 8D95190 .incbin "graphics/pokemon/palettes/dratini_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xD95190, 0x0024 .align 2 gFile_graphics_pokemon_back_pics_dratini_back_pic:: @ 8D951B4 .incbin "graphics/pokemon/back_pics/dratini_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xD951B4, 0x0290 .align 2 gFile_graphics_pokemon_palettes_dratini_shiny_palette:: @ 8D95444 .incbin "graphics/pokemon/palettes/dratini_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xD95444, 0x0024 .align 2 gFile_graphics_pokemon_icons_dratini_icon:: @ 8D95468 .incbin "graphics/pokemon/icons/dratini_icon.4bpp" - @ .incbin "baserom.gba", 0xD95468, 0x0400 .align 2 gFile_graphics_pokemon_footprints_dratini_footprint:: @ 8D95868 .incbin "graphics/pokemon/footprints/dratini_footprint.1bpp" - @ .incbin "baserom.gba", 0xD95868, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_dragonair_still_front_pic:: @ 8D95888 .incbin "graphics/pokemon/front_pics/dragonair_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xD95888, 0x0398 .align 2 gFile_graphics_pokemon_palettes_dragonair_palette:: @ 8D95C20 .incbin "graphics/pokemon/palettes/dragonair_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xD95C20, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_dragonair_back_pic:: @ 8D95C48 .incbin "graphics/pokemon/back_pics/dragonair_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xD95C48, 0x0310 .align 2 gFile_graphics_pokemon_palettes_dragonair_shiny_palette:: @ 8D95F58 .incbin "graphics/pokemon/palettes/dragonair_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xD95F58, 0x0028 .align 2 gFile_graphics_pokemon_icons_dragonair_icon:: @ 8D95F80 .incbin "graphics/pokemon/icons/dragonair_icon.4bpp" - @ .incbin "baserom.gba", 0xD95F80, 0x0400 .align 2 gFile_graphics_pokemon_footprints_dragonair_footprint:: @ 8D96380 .incbin "graphics/pokemon/footprints/dragonair_footprint.1bpp" - @ .incbin "baserom.gba", 0xD96380, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_dragonite_still_front_pic:: @ 8D963A0 .incbin "graphics/pokemon/front_pics/dragonite_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xD963A0, 0x0550 .align 2 gFile_graphics_pokemon_palettes_dragonite_palette:: @ 8D968F0 .incbin "graphics/pokemon/palettes/dragonite_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xD968F0, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_dragonite_back_pic:: @ 8D96918 .incbin "graphics/pokemon/back_pics/dragonite_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xD96918, 0x02F8 .align 2 gFile_graphics_pokemon_palettes_dragonite_shiny_palette:: @ 8D96C10 .incbin "graphics/pokemon/palettes/dragonite_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xD96C10, 0x0028 .align 2 gFile_graphics_pokemon_icons_dragonite_icon:: @ 8D96C38 .incbin "graphics/pokemon/icons/dragonite_icon.4bpp" - @ .incbin "baserom.gba", 0xD96C38, 0x0400 .align 2 gFile_graphics_pokemon_footprints_dragonite_footprint:: @ 8D97038 .incbin "graphics/pokemon/footprints/dragonite_footprint.1bpp" - @ .incbin "baserom.gba", 0xD97038, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_mewtwo_still_front_pic:: @ 8D97058 .incbin "graphics/pokemon/front_pics/mewtwo_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xD97058, 0x043C .align 2 gFile_graphics_pokemon_palettes_mewtwo_palette:: @ 8D97494 .incbin "graphics/pokemon/palettes/mewtwo_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xD97494, 0x0024 .align 2 gFile_graphics_pokemon_back_pics_mewtwo_back_pic:: @ 8D974B8 .incbin "graphics/pokemon/back_pics/mewtwo_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xD974B8, 0x03CC .align 2 gFile_graphics_pokemon_palettes_mewtwo_shiny_palette:: @ 8D97884 .incbin "graphics/pokemon/palettes/mewtwo_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xD97884, 0x0024 .align 2 gFile_graphics_pokemon_icons_mewtwo_icon:: @ 8D978A8 .incbin "graphics/pokemon/icons/mewtwo_icon.4bpp" - @ .incbin "baserom.gba", 0xD978A8, 0x0400 .align 2 gFile_graphics_pokemon_footprints_mewtwo_footprint:: @ 8D97CA8 .incbin "graphics/pokemon/footprints/mewtwo_footprint.1bpp" - @ .incbin "baserom.gba", 0xD97CA8, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_mew_still_front_pic:: @ 8D97CC8 .incbin "graphics/pokemon/front_pics/mew_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xD97CC8, 0x02C0 .align 2 gFile_graphics_pokemon_palettes_mew_palette:: @ 8D97F88 .incbin "graphics/pokemon/palettes/mew_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xD97F88, 0x0024 .align 2 gFile_graphics_pokemon_back_pics_mew_back_pic:: @ 8D97FAC .incbin "graphics/pokemon/back_pics/mew_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xD97FAC, 0x0350 .align 2 gFile_graphics_pokemon_palettes_mew_shiny_palette:: @ 8D982FC .incbin "graphics/pokemon/palettes/mew_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xD982FC, 0x0024 .align 2 gFile_graphics_pokemon_icons_mew_icon:: @ 8D98320 .incbin "graphics/pokemon/icons/mew_icon.4bpp" - @ .incbin "baserom.gba", 0xD98320, 0x0400 .align 2 gFile_graphics_pokemon_footprints_mew_footprint:: @ 8D98720 .incbin "graphics/pokemon/footprints/mew_footprint.1bpp" - @ .incbin "baserom.gba", 0xD98720, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_chikorita_still_front_pic:: @ 8D98740 .incbin "graphics/pokemon/front_pics/chikorita_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xD98740, 0x0268 .align 2 gFile_graphics_pokemon_palettes_chikorita_palette:: @ 8D989A8 .incbin "graphics/pokemon/palettes/chikorita_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xD989A8, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_chikorita_back_pic:: @ 8D989D0 .incbin "graphics/pokemon/back_pics/chikorita_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xD989D0, 0x02C4 .align 2 gFile_graphics_pokemon_palettes_chikorita_shiny_palette:: @ 8D98C94 .incbin "graphics/pokemon/palettes/chikorita_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xD98C94, 0x0028 .align 2 gFile_graphics_pokemon_icons_chikorita_icon:: @ 8D98CBC .incbin "graphics/pokemon/icons/chikorita_icon.4bpp" - @ .incbin "baserom.gba", 0xD98CBC, 0x0400 .align 2 gFile_graphics_pokemon_footprints_chikorita_footprint:: @ 8D990BC .incbin "graphics/pokemon/footprints/chikorita_footprint.1bpp" - @ .incbin "baserom.gba", 0xD990BC, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_bayleef_still_front_pic:: @ 8D990DC .incbin "graphics/pokemon/front_pics/bayleef_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xD990DC, 0x03D4 .align 2 gFile_graphics_pokemon_palettes_bayleef_palette:: @ 8D994B0 .incbin "graphics/pokemon/palettes/bayleef_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xD994B0, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_bayleef_back_pic:: @ 8D994D8 .incbin "graphics/pokemon/back_pics/bayleef_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xD994D8, 0x0390 .align 2 gFile_graphics_pokemon_palettes_bayleef_shiny_palette:: @ 8D99868 .incbin "graphics/pokemon/palettes/bayleef_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xD99868, 0x0028 .align 2 gFile_graphics_pokemon_icons_bayleef_icon:: @ 8D99890 .incbin "graphics/pokemon/icons/bayleef_icon.4bpp" - @ .incbin "baserom.gba", 0xD99890, 0x0400 .align 2 gFile_graphics_pokemon_footprints_bayleef_footprint:: @ 8D99C90 .incbin "graphics/pokemon/footprints/bayleef_footprint.1bpp" - @ .incbin "baserom.gba", 0xD99C90, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_meganium_still_front_pic:: @ 8D99CB0 .incbin "graphics/pokemon/front_pics/meganium_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xD99CB0, 0x055C .align 2 gFile_graphics_pokemon_palettes_meganium_palette:: @ 8D9A20C .incbin "graphics/pokemon/palettes/meganium_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xD9A20C, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_meganium_back_pic:: @ 8D9A234 .incbin "graphics/pokemon/back_pics/meganium_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xD9A234, 0x0350 .align 2 gFile_graphics_pokemon_palettes_meganium_shiny_palette:: @ 8D9A584 .incbin "graphics/pokemon/palettes/meganium_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xD9A584, 0x0028 .align 2 gFile_graphics_pokemon_icons_meganium_icon:: @ 8D9A5AC .incbin "graphics/pokemon/icons/meganium_icon.4bpp" - @ .incbin "baserom.gba", 0xD9A5AC, 0x0400 .align 2 gFile_graphics_pokemon_footprints_meganium_footprint:: @ 8D9A9AC .incbin "graphics/pokemon/footprints/meganium_footprint.1bpp" - @ .incbin "baserom.gba", 0xD9A9AC, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_cyndaquil_still_front_pic:: @ 8D9A9CC .incbin "graphics/pokemon/front_pics/cyndaquil_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xD9A9CC, 0x028C .align 2 gFile_graphics_pokemon_palettes_cyndaquil_palette:: @ 8D9AC58 .incbin "graphics/pokemon/palettes/cyndaquil_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xD9AC58, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_cyndaquil_back_pic:: @ 8D9AC80 .incbin "graphics/pokemon/back_pics/cyndaquil_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xD9AC80, 0x032C .align 2 gFile_graphics_pokemon_palettes_cyndaquil_shiny_palette:: @ 8D9AFAC .incbin "graphics/pokemon/palettes/cyndaquil_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xD9AFAC, 0x0028 .align 2 gFile_graphics_pokemon_icons_cyndaquil_icon:: @ 8D9AFD4 .incbin "graphics/pokemon/icons/cyndaquil_icon.4bpp" - @ .incbin "baserom.gba", 0xD9AFD4, 0x0400 .align 2 gFile_graphics_pokemon_footprints_cyndaquil_footprint:: @ 8D9B3D4 .incbin "graphics/pokemon/footprints/cyndaquil_footprint.1bpp" - @ .incbin "baserom.gba", 0xD9B3D4, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_quilava_still_front_pic:: @ 8D9B3F4 .incbin "graphics/pokemon/front_pics/quilava_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xD9B3F4, 0x031C .align 2 gFile_graphics_pokemon_palettes_quilava_palette:: @ 8D9B710 .incbin "graphics/pokemon/palettes/quilava_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xD9B710, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_quilava_back_pic:: @ 8D9B738 .incbin "graphics/pokemon/back_pics/quilava_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xD9B738, 0x0374 .align 2 gFile_graphics_pokemon_palettes_quilava_shiny_palette:: @ 8D9BAAC .incbin "graphics/pokemon/palettes/quilava_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xD9BAAC, 0x0028 .align 2 gFile_graphics_pokemon_icons_quilava_icon:: @ 8D9BAD4 .incbin "graphics/pokemon/icons/quilava_icon.4bpp" - @ .incbin "baserom.gba", 0xD9BAD4, 0x0400 .align 2 gFile_graphics_pokemon_footprints_quilava_footprint:: @ 8D9BED4 .incbin "graphics/pokemon/footprints/quilava_footprint.1bpp" - @ .incbin "baserom.gba", 0xD9BED4, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_typhlosion_still_front_pic:: @ 8D9BEF4 .incbin "graphics/pokemon/front_pics/typhlosion_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xD9BEF4, 0x0428 .align 2 gFile_graphics_pokemon_palettes_typhlosion_palette:: @ 8D9C31C .incbin "graphics/pokemon/palettes/typhlosion_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xD9C31C, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_typhlosion_back_pic:: @ 8D9C344 .incbin "graphics/pokemon/back_pics/typhlosion_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xD9C344, 0x0404 .align 2 gFile_graphics_pokemon_palettes_typhlosion_shiny_palette:: @ 8D9C748 .incbin "graphics/pokemon/palettes/typhlosion_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xD9C748, 0x0028 .align 2 gFile_graphics_pokemon_icons_typhlosion_icon:: @ 8D9C770 .incbin "graphics/pokemon/icons/typhlosion_icon.4bpp" - @ .incbin "baserom.gba", 0xD9C770, 0x0400 .align 2 gFile_graphics_pokemon_footprints_typhlosion_footprint:: @ 8D9CB70 .incbin "graphics/pokemon/footprints/typhlosion_footprint.1bpp" - @ .incbin "baserom.gba", 0xD9CB70, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_totodile_still_front_pic:: @ 8D9CB90 .incbin "graphics/pokemon/front_pics/totodile_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xD9CB90, 0x02A4 .align 2 gFile_graphics_pokemon_palettes_totodile_palette:: @ 8D9CE34 .incbin "graphics/pokemon/palettes/totodile_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xD9CE34, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_totodile_back_pic:: @ 8D9CE5C .incbin "graphics/pokemon/back_pics/totodile_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xD9CE5C, 0x02E0 .align 2 gFile_graphics_pokemon_palettes_totodile_shiny_palette:: @ 8D9D13C .incbin "graphics/pokemon/palettes/totodile_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xD9D13C, 0x0028 .align 2 gFile_graphics_pokemon_icons_totodile_icon:: @ 8D9D164 .incbin "graphics/pokemon/icons/totodile_icon.4bpp" - @ .incbin "baserom.gba", 0xD9D164, 0x0400 .align 2 gFile_graphics_pokemon_footprints_totodile_footprint:: @ 8D9D564 .incbin "graphics/pokemon/footprints/totodile_footprint.1bpp" - @ .incbin "baserom.gba", 0xD9D564, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_croconaw_still_front_pic:: @ 8D9D584 .incbin "graphics/pokemon/front_pics/croconaw_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xD9D584, 0x0368 .align 2 gFile_graphics_pokemon_palettes_croconaw_palette:: @ 8D9D8EC .incbin "graphics/pokemon/palettes/croconaw_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xD9D8EC, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_croconaw_back_pic:: @ 8D9D914 .incbin "graphics/pokemon/back_pics/croconaw_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xD9D914, 0x0350 .align 2 gFile_graphics_pokemon_palettes_croconaw_shiny_palette:: @ 8D9DC64 .incbin "graphics/pokemon/palettes/croconaw_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xD9DC64, 0x0028 .align 2 gFile_graphics_pokemon_icons_croconaw_icon:: @ 8D9DC8C .incbin "graphics/pokemon/icons/croconaw_icon.4bpp" - @ .incbin "baserom.gba", 0xD9DC8C, 0x0400 .align 2 gFile_graphics_pokemon_footprints_croconaw_footprint:: @ 8D9E08C .incbin "graphics/pokemon/footprints/croconaw_footprint.1bpp" - @ .incbin "baserom.gba", 0xD9E08C, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_feraligatr_still_front_pic:: @ 8D9E0AC .incbin "graphics/pokemon/front_pics/feraligatr_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xD9E0AC, 0x056C .align 2 gFile_graphics_pokemon_palettes_feraligatr_palette:: @ 8D9E618 .incbin "graphics/pokemon/palettes/feraligatr_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xD9E618, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_feraligatr_back_pic:: @ 8D9E640 .incbin "graphics/pokemon/back_pics/feraligatr_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xD9E640, 0x04CC .align 2 gFile_graphics_pokemon_palettes_feraligatr_shiny_palette:: @ 8D9EB0C .incbin "graphics/pokemon/palettes/feraligatr_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xD9EB0C, 0x0028 .align 2 gFile_graphics_pokemon_icons_feraligatr_icon:: @ 8D9EB34 .incbin "graphics/pokemon/icons/feraligatr_icon.4bpp" - @ .incbin "baserom.gba", 0xD9EB34, 0x0400 .align 2 gFile_graphics_pokemon_footprints_feraligatr_footprint:: @ 8D9EF34 .incbin "graphics/pokemon/footprints/feraligatr_footprint.1bpp" - @ .incbin "baserom.gba", 0xD9EF34, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_sentret_still_front_pic:: @ 8D9EF54 .incbin "graphics/pokemon/front_pics/sentret_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xD9EF54, 0x02DC .align 2 gFile_graphics_pokemon_palettes_sentret_palette:: @ 8D9F230 .incbin "graphics/pokemon/palettes/sentret_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xD9F230, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_sentret_back_pic:: @ 8D9F258 .incbin "graphics/pokemon/back_pics/sentret_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xD9F258, 0x02A4 .align 2 gFile_graphics_pokemon_palettes_sentret_shiny_palette:: @ 8D9F4FC .incbin "graphics/pokemon/palettes/sentret_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xD9F4FC, 0x0028 .align 2 gFile_graphics_pokemon_icons_sentret_icon:: @ 8D9F524 .incbin "graphics/pokemon/icons/sentret_icon.4bpp" - @ .incbin "baserom.gba", 0xD9F524, 0x0400 .align 2 gFile_graphics_pokemon_footprints_sentret_footprint:: @ 8D9F924 .incbin "graphics/pokemon/footprints/sentret_footprint.1bpp" - @ .incbin "baserom.gba", 0xD9F924, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_furret_still_front_pic:: @ 8D9F944 .incbin "graphics/pokemon/front_pics/furret_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xD9F944, 0x0334 .align 2 gFile_graphics_pokemon_palettes_furret_palette:: @ 8D9FC78 .incbin "graphics/pokemon/palettes/furret_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xD9FC78, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_furret_back_pic:: @ 8D9FCA0 .incbin "graphics/pokemon/back_pics/furret_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xD9FCA0, 0x0328 .align 2 gFile_graphics_pokemon_palettes_furret_shiny_palette:: @ 8D9FFC8 .incbin "graphics/pokemon/palettes/furret_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xD9FFC8, 0x0028 .align 2 gFile_graphics_pokemon_icons_furret_icon:: @ 8D9FFF0 .incbin "graphics/pokemon/icons/furret_icon.4bpp" - @ .incbin "baserom.gba", 0xD9FFF0, 0x0400 .align 2 gFile_graphics_pokemon_footprints_furret_footprint:: @ 8DA03F0 .incbin "graphics/pokemon/footprints/furret_footprint.1bpp" - @ .incbin "baserom.gba", 0xDA03F0, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_hoothoot_still_front_pic:: @ 8DA0410 .incbin "graphics/pokemon/front_pics/hoothoot_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xDA0410, 0x0284 .align 2 gFile_graphics_pokemon_palettes_hoothoot_palette:: @ 8DA0694 .incbin "graphics/pokemon/palettes/hoothoot_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xDA0694, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_hoothoot_back_pic:: @ 8DA06BC .incbin "graphics/pokemon/back_pics/hoothoot_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xDA06BC, 0x0308 .align 2 gFile_graphics_pokemon_palettes_hoothoot_shiny_palette:: @ 8DA09C4 .incbin "graphics/pokemon/palettes/hoothoot_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xDA09C4, 0x0028 .align 2 gFile_graphics_pokemon_icons_hoothoot_icon:: @ 8DA09EC .incbin "graphics/pokemon/icons/hoothoot_icon.4bpp" - @ .incbin "baserom.gba", 0xDA09EC, 0x0400 .align 2 gFile_graphics_pokemon_footprints_hoothoot_footprint:: @ 8DA0DEC .incbin "graphics/pokemon/footprints/hoothoot_footprint.1bpp" - @ .incbin "baserom.gba", 0xDA0DEC, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_noctowl_still_front_pic:: @ 8DA0E0C .incbin "graphics/pokemon/front_pics/noctowl_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xDA0E0C, 0x0354 .align 2 gFile_graphics_pokemon_palettes_noctowl_palette:: @ 8DA1160 .incbin "graphics/pokemon/palettes/noctowl_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xDA1160, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_noctowl_back_pic:: @ 8DA1188 .incbin "graphics/pokemon/back_pics/noctowl_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xDA1188, 0x035C .align 2 gFile_graphics_pokemon_palettes_noctowl_shiny_palette:: @ 8DA14E4 .incbin "graphics/pokemon/palettes/noctowl_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xDA14E4, 0x0028 .align 2 gFile_graphics_pokemon_icons_noctowl_icon:: @ 8DA150C .incbin "graphics/pokemon/icons/noctowl_icon.4bpp" - @ .incbin "baserom.gba", 0xDA150C, 0x0400 .align 2 gFile_graphics_pokemon_footprints_noctowl_footprint:: @ 8DA190C .incbin "graphics/pokemon/footprints/noctowl_footprint.1bpp" - @ .incbin "baserom.gba", 0xDA190C, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_ledyba_still_front_pic:: @ 8DA192C .incbin "graphics/pokemon/front_pics/ledyba_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xDA192C, 0x02F4 .align 2 gFile_graphics_pokemon_palettes_ledyba_palette:: @ 8DA1C20 .incbin "graphics/pokemon/palettes/ledyba_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xDA1C20, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_ledyba_back_pic:: @ 8DA1C48 .incbin "graphics/pokemon/back_pics/ledyba_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xDA1C48, 0x0330 .align 2 gFile_graphics_pokemon_palettes_ledyba_shiny_palette:: @ 8DA1F78 .incbin "graphics/pokemon/palettes/ledyba_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xDA1F78, 0x0028 .align 2 gFile_graphics_pokemon_icons_ledyba_icon:: @ 8DA1FA0 .incbin "graphics/pokemon/icons/ledyba_icon.4bpp" - @ .incbin "baserom.gba", 0xDA1FA0, 0x0400 .align 2 gFile_graphics_pokemon_footprints_ledyba_footprint:: @ 8DA23A0 .incbin "graphics/pokemon/footprints/ledyba_footprint.1bpp" - @ .incbin "baserom.gba", 0xDA23A0, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_ledian_still_front_pic:: @ 8DA23C0 .incbin "graphics/pokemon/front_pics/ledian_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xDA23C0, 0x0388 .align 2 gFile_graphics_pokemon_palettes_ledian_palette:: @ 8DA2748 .incbin "graphics/pokemon/palettes/ledian_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xDA2748, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_ledian_back_pic:: @ 8DA2770 .incbin "graphics/pokemon/back_pics/ledian_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xDA2770, 0x0358 .align 2 gFile_graphics_pokemon_palettes_ledian_shiny_palette:: @ 8DA2AC8 .incbin "graphics/pokemon/palettes/ledian_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xDA2AC8, 0x0028 .align 2 gFile_graphics_pokemon_icons_ledian_icon:: @ 8DA2AF0 .incbin "graphics/pokemon/icons/ledian_icon.4bpp" - @ .incbin "baserom.gba", 0xDA2AF0, 0x0400 .align 2 gFile_graphics_pokemon_footprints_ledian_footprint:: @ 8DA2EF0 .incbin "graphics/pokemon/footprints/ledian_footprint.1bpp" - @ .incbin "baserom.gba", 0xDA2EF0, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_spinarak_still_front_pic:: @ 8DA2F10 .incbin "graphics/pokemon/front_pics/spinarak_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xDA2F10, 0x0274 .align 2 gFile_graphics_pokemon_palettes_spinarak_palette:: @ 8DA3184 .incbin "graphics/pokemon/palettes/spinarak_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xDA3184, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_spinarak_back_pic:: @ 8DA31AC .incbin "graphics/pokemon/back_pics/spinarak_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xDA31AC, 0x0264 .align 2 gFile_graphics_pokemon_palettes_spinarak_shiny_palette:: @ 8DA3410 .incbin "graphics/pokemon/palettes/spinarak_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xDA3410, 0x0028 .align 2 gFile_graphics_pokemon_icons_spinarak_icon:: @ 8DA3438 .incbin "graphics/pokemon/icons/spinarak_icon.4bpp" - @ .incbin "baserom.gba", 0xDA3438, 0x0400 .align 2 gFile_graphics_pokemon_footprints_spinarak_footprint:: @ 8DA3838 .incbin "graphics/pokemon/footprints/spinarak_footprint.1bpp" - @ .incbin "baserom.gba", 0xDA3838, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_ariados_still_front_pic:: @ 8DA3858 .incbin "graphics/pokemon/front_pics/ariados_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xDA3858, 0x03C0 .align 2 gFile_graphics_pokemon_palettes_ariados_palette:: @ 8DA3C18 .incbin "graphics/pokemon/palettes/ariados_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xDA3C18, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_ariados_back_pic:: @ 8DA3C40 .incbin "graphics/pokemon/back_pics/ariados_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xDA3C40, 0x0378 .align 2 gFile_graphics_pokemon_palettes_ariados_shiny_palette:: @ 8DA3FB8 .incbin "graphics/pokemon/palettes/ariados_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xDA3FB8, 0x0028 .align 2 gFile_graphics_pokemon_icons_ariados_icon:: @ 8DA3FE0 .incbin "graphics/pokemon/icons/ariados_icon.4bpp" - @ .incbin "baserom.gba", 0xDA3FE0, 0x0400 .align 2 gFile_graphics_pokemon_footprints_ariados_footprint:: @ 8DA43E0 .incbin "graphics/pokemon/footprints/ariados_footprint.1bpp" - @ .incbin "baserom.gba", 0xDA43E0, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_crobat_still_front_pic:: @ 8DA4400 .incbin "graphics/pokemon/front_pics/crobat_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xDA4400, 0x03B0 .align 2 gFile_graphics_pokemon_palettes_crobat_palette:: @ 8DA47B0 .incbin "graphics/pokemon/palettes/crobat_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xDA47B0, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_crobat_back_pic:: @ 8DA47D8 .incbin "graphics/pokemon/back_pics/crobat_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xDA47D8, 0x0308 .align 2 gFile_graphics_pokemon_palettes_crobat_shiny_palette:: @ 8DA4AE0 .incbin "graphics/pokemon/palettes/crobat_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xDA4AE0, 0x0028 .align 2 gFile_graphics_pokemon_icons_crobat_icon:: @ 8DA4B08 .incbin "graphics/pokemon/icons/crobat_icon.4bpp" - @ .incbin "baserom.gba", 0xDA4B08, 0x0400 .align 2 gFile_graphics_pokemon_footprints_crobat_footprint:: @ 8DA4F08 .incbin "graphics/pokemon/footprints/crobat_footprint.1bpp" - @ .incbin "baserom.gba", 0xDA4F08, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_chinchou_still_front_pic:: @ 8DA4F28 .incbin "graphics/pokemon/front_pics/chinchou_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xDA4F28, 0x02D8 .align 2 gFile_graphics_pokemon_palettes_chinchou_palette:: @ 8DA5200 .incbin "graphics/pokemon/palettes/chinchou_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xDA5200, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_chinchou_back_pic:: @ 8DA5228 .incbin "graphics/pokemon/back_pics/chinchou_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xDA5228, 0x02F8 .align 2 gFile_graphics_pokemon_palettes_chinchou_shiny_palette:: @ 8DA5520 .incbin "graphics/pokemon/palettes/chinchou_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xDA5520, 0x0028 .align 2 gFile_graphics_pokemon_icons_chinchou_icon:: @ 8DA5548 .incbin "graphics/pokemon/icons/chinchou_icon.4bpp" - @ .incbin "baserom.gba", 0xDA5548, 0x0400 .align 2 gFile_graphics_pokemon_footprints_chinchou_footprint:: @ 8DA5948 .incbin "graphics/pokemon/footprints/chinchou_footprint.1bpp" - @ .incbin "baserom.gba", 0xDA5948, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_lanturn_still_front_pic:: @ 8DA5968 .incbin "graphics/pokemon/front_pics/lanturn_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xDA5968, 0x0370 .align 2 gFile_graphics_pokemon_palettes_lanturn_palette:: @ 8DA5CD8 .incbin "graphics/pokemon/palettes/lanturn_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xDA5CD8, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_lanturn_back_pic:: @ 8DA5D00 .incbin "graphics/pokemon/back_pics/lanturn_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xDA5D00, 0x0300 .align 2 gFile_graphics_pokemon_palettes_lanturn_shiny_palette:: @ 8DA6000 .incbin "graphics/pokemon/palettes/lanturn_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xDA6000, 0x0028 .align 2 gFile_graphics_pokemon_icons_lanturn_icon:: @ 8DA6028 .incbin "graphics/pokemon/icons/lanturn_icon.4bpp" - @ .incbin "baserom.gba", 0xDA6028, 0x0400 .align 2 gFile_graphics_pokemon_footprints_lanturn_footprint:: @ 8DA6428 .incbin "graphics/pokemon/footprints/lanturn_footprint.1bpp" - @ .incbin "baserom.gba", 0xDA6428, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_pichu_still_front_pic:: @ 8DA6448 .incbin "graphics/pokemon/front_pics/pichu_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xDA6448, 0x021C .align 2 gFile_graphics_pokemon_palettes_pichu_palette:: @ 8DA6664 .incbin "graphics/pokemon/palettes/pichu_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xDA6664, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_pichu_back_pic:: @ 8DA668C .incbin "graphics/pokemon/back_pics/pichu_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xDA668C, 0x025C .align 2 gFile_graphics_pokemon_palettes_pichu_shiny_palette:: @ 8DA68E8 .incbin "graphics/pokemon/palettes/pichu_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xDA68E8, 0x0028 .align 2 gFile_graphics_pokemon_icons_pichu_icon:: @ 8DA6910 .incbin "graphics/pokemon/icons/pichu_icon.4bpp" - @ .incbin "baserom.gba", 0xDA6910, 0x0400 .align 2 gFile_graphics_pokemon_footprints_pichu_footprint:: @ 8DA6D10 .incbin "graphics/pokemon/footprints/pichu_footprint.1bpp" - @ .incbin "baserom.gba", 0xDA6D10, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_cleffa_still_front_pic:: @ 8DA6D30 .incbin "graphics/pokemon/front_pics/cleffa_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xDA6D30, 0x01E0 .align 2 gFile_graphics_pokemon_palettes_cleffa_palette:: @ 8DA6F10 .incbin "graphics/pokemon/palettes/cleffa_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xDA6F10, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_cleffa_back_pic:: @ 8DA6F38 .incbin "graphics/pokemon/back_pics/cleffa_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xDA6F38, 0x023C .align 2 gFile_graphics_pokemon_palettes_cleffa_shiny_palette:: @ 8DA7174 .incbin "graphics/pokemon/palettes/cleffa_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xDA7174, 0x0028 .align 2 gFile_graphics_pokemon_icons_cleffa_icon:: @ 8DA719C .incbin "graphics/pokemon/icons/cleffa_icon.4bpp" - @ .incbin "baserom.gba", 0xDA719C, 0x0400 .align 2 gFile_graphics_pokemon_footprints_cleffa_footprint:: @ 8DA759C .incbin "graphics/pokemon/footprints/cleffa_footprint.1bpp" - @ .incbin "baserom.gba", 0xDA759C, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_igglybuff_still_front_pic:: @ 8DA75BC .incbin "graphics/pokemon/front_pics/igglybuff_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xDA75BC, 0x01E8 .align 2 gFile_graphics_pokemon_palettes_igglybuff_palette:: @ 8DA77A4 .incbin "graphics/pokemon/palettes/igglybuff_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xDA77A4, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_igglybuff_back_pic:: @ 8DA77CC .incbin "graphics/pokemon/back_pics/igglybuff_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xDA77CC, 0x023C .align 2 gFile_graphics_pokemon_palettes_igglybuff_shiny_palette:: @ 8DA7A08 .incbin "graphics/pokemon/palettes/igglybuff_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xDA7A08, 0x0028 .align 2 gFile_graphics_pokemon_icons_igglybuff_icon:: @ 8DA7A30 .incbin "graphics/pokemon/icons/igglybuff_icon.4bpp" - @ .incbin "baserom.gba", 0xDA7A30, 0x0400 .align 2 gFile_graphics_pokemon_footprints_igglybuff_footprint:: @ 8DA7E30 .incbin "graphics/pokemon/footprints/igglybuff_footprint.1bpp" - @ .incbin "baserom.gba", 0xDA7E30, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_togepi_still_front_pic:: @ 8DA7E50 .incbin "graphics/pokemon/front_pics/togepi_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xDA7E50, 0x01D4 .align 2 gFile_graphics_pokemon_palettes_togepi_palette:: @ 8DA8024 .incbin "graphics/pokemon/palettes/togepi_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xDA8024, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_togepi_back_pic:: @ 8DA804C .incbin "graphics/pokemon/back_pics/togepi_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xDA804C, 0x0274 .align 2 gFile_graphics_pokemon_palettes_togepi_shiny_palette:: @ 8DA82C0 .incbin "graphics/pokemon/palettes/togepi_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xDA82C0, 0x0028 .align 2 gFile_graphics_pokemon_icons_togepi_icon:: @ 8DA82E8 .incbin "graphics/pokemon/icons/togepi_icon.4bpp" - @ .incbin "baserom.gba", 0xDA82E8, 0x0400 .align 2 gFile_graphics_pokemon_footprints_togepi_footprint:: @ 8DA86E8 .incbin "graphics/pokemon/footprints/togepi_footprint.1bpp" - @ .incbin "baserom.gba", 0xDA86E8, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_togetic_still_front_pic:: @ 8DA8708 .incbin "graphics/pokemon/front_pics/togetic_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xDA8708, 0x0274 .align 2 gFile_graphics_pokemon_palettes_togetic_palette:: @ 8DA897C .incbin "graphics/pokemon/palettes/togetic_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xDA897C, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_togetic_back_pic:: @ 8DA89A4 .incbin "graphics/pokemon/back_pics/togetic_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xDA89A4, 0x032C .align 2 gFile_graphics_pokemon_palettes_togetic_shiny_palette:: @ 8DA8CD0 .incbin "graphics/pokemon/palettes/togetic_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xDA8CD0, 0x0028 .align 2 gFile_graphics_pokemon_icons_togetic_icon:: @ 8DA8CF8 .incbin "graphics/pokemon/icons/togetic_icon.4bpp" - @ .incbin "baserom.gba", 0xDA8CF8, 0x0400 .align 2 gFile_graphics_pokemon_footprints_togetic_footprint:: @ 8DA90F8 .incbin "graphics/pokemon/footprints/togetic_footprint.1bpp" - @ .incbin "baserom.gba", 0xDA90F8, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_natu_still_front_pic:: @ 8DA9118 .incbin "graphics/pokemon/front_pics/natu_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xDA9118, 0x01CC .align 2 gFile_graphics_pokemon_palettes_natu_palette:: @ 8DA92E4 .incbin "graphics/pokemon/palettes/natu_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xDA92E4, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_natu_back_pic:: @ 8DA930C .incbin "graphics/pokemon/back_pics/natu_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xDA930C, 0x0214 .align 2 gFile_graphics_pokemon_palettes_natu_shiny_palette:: @ 8DA9520 .incbin "graphics/pokemon/palettes/natu_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xDA9520, 0x0028 .align 2 gFile_graphics_pokemon_icons_natu_icon:: @ 8DA9548 .incbin "graphics/pokemon/icons/natu_icon.4bpp" - @ .incbin "baserom.gba", 0xDA9548, 0x0400 .align 2 gFile_graphics_pokemon_footprints_natu_footprint:: @ 8DA9948 .incbin "graphics/pokemon/footprints/natu_footprint.1bpp" - @ .incbin "baserom.gba", 0xDA9948, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_xatu_still_front_pic:: @ 8DA9968 .incbin "graphics/pokemon/front_pics/xatu_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xDA9968, 0x02DC .align 2 gFile_graphics_pokemon_palettes_xatu_palette:: @ 8DA9C44 .incbin "graphics/pokemon/palettes/xatu_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xDA9C44, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_xatu_back_pic:: @ 8DA9C6C .incbin "graphics/pokemon/back_pics/xatu_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xDA9C6C, 0x0378 .align 2 gFile_graphics_pokemon_palettes_xatu_shiny_palette:: @ 8DA9FE4 .incbin "graphics/pokemon/palettes/xatu_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xDA9FE4, 0x0028 .align 2 gFile_graphics_pokemon_icons_xatu_icon:: @ 8DAA00C .incbin "graphics/pokemon/icons/xatu_icon.4bpp" - @ .incbin "baserom.gba", 0xDAA00C, 0x0400 .align 2 gFile_graphics_pokemon_footprints_xatu_footprint:: @ 8DAA40C .incbin "graphics/pokemon/footprints/xatu_footprint.1bpp" - @ .incbin "baserom.gba", 0xDAA40C, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_mareep_still_front_pic:: @ 8DAA42C .incbin "graphics/pokemon/front_pics/mareep_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xDAA42C, 0x02B4 .align 2 gFile_graphics_pokemon_palettes_mareep_palette:: @ 8DAA6E0 .incbin "graphics/pokemon/palettes/mareep_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xDAA6E0, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_mareep_back_pic:: @ 8DAA708 .incbin "graphics/pokemon/back_pics/mareep_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xDAA708, 0x02F4 .align 2 gFile_graphics_pokemon_palettes_mareep_shiny_palette:: @ 8DAA9FC .incbin "graphics/pokemon/palettes/mareep_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xDAA9FC, 0x0028 .align 2 gFile_graphics_pokemon_icons_mareep_icon:: @ 8DAAA24 .incbin "graphics/pokemon/icons/mareep_icon.4bpp" - @ .incbin "baserom.gba", 0xDAAA24, 0x0400 .align 2 gFile_graphics_pokemon_footprints_mareep_footprint:: @ 8DAAE24 .incbin "graphics/pokemon/footprints/mareep_footprint.1bpp" - @ .incbin "baserom.gba", 0xDAAE24, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_flaaffy_still_front_pic:: @ 8DAAE44 .incbin "graphics/pokemon/front_pics/flaaffy_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xDAAE44, 0x0300 .align 2 gFile_graphics_pokemon_palettes_flaaffy_palette:: @ 8DAB144 .incbin "graphics/pokemon/palettes/flaaffy_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xDAB144, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_flaaffy_back_pic:: @ 8DAB16C .incbin "graphics/pokemon/back_pics/flaaffy_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xDAB16C, 0x031C .align 2 gFile_graphics_pokemon_palettes_flaaffy_shiny_palette:: @ 8DAB488 .incbin "graphics/pokemon/palettes/flaaffy_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xDAB488, 0x0028 .align 2 gFile_graphics_pokemon_icons_flaaffy_icon:: @ 8DAB4B0 .incbin "graphics/pokemon/icons/flaaffy_icon.4bpp" - @ .incbin "baserom.gba", 0xDAB4B0, 0x0400 .align 2 gFile_graphics_pokemon_footprints_flaaffy_footprint:: @ 8DAB8B0 .incbin "graphics/pokemon/footprints/flaaffy_footprint.1bpp" - @ .incbin "baserom.gba", 0xDAB8B0, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_ampharos_still_front_pic:: @ 8DAB8D0 .incbin "graphics/pokemon/front_pics/ampharos_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xDAB8D0, 0x035C .align 2 gFile_graphics_pokemon_palettes_ampharos_palette:: @ 8DABC2C .incbin "graphics/pokemon/palettes/ampharos_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xDABC2C, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_ampharos_back_pic:: @ 8DABC54 .incbin "graphics/pokemon/back_pics/ampharos_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xDABC54, 0x0378 .align 2 gFile_graphics_pokemon_palettes_ampharos_shiny_palette:: @ 8DABFCC .incbin "graphics/pokemon/palettes/ampharos_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xDABFCC, 0x0028 .align 2 gFile_graphics_pokemon_icons_ampharos_icon:: @ 8DABFF4 .incbin "graphics/pokemon/icons/ampharos_icon.4bpp" - @ .incbin "baserom.gba", 0xDABFF4, 0x0400 .align 2 gFile_graphics_pokemon_footprints_ampharos_footprint:: @ 8DAC3F4 .incbin "graphics/pokemon/footprints/ampharos_footprint.1bpp" - @ .incbin "baserom.gba", 0xDAC3F4, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_bellossom_still_front_pic:: @ 8DAC414 .incbin "graphics/pokemon/front_pics/bellossom_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xDAC414, 0x0270 .align 2 gFile_graphics_pokemon_palettes_bellossom_palette:: @ 8DAC684 .incbin "graphics/pokemon/palettes/bellossom_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xDAC684, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_bellossom_back_pic:: @ 8DAC6AC .incbin "graphics/pokemon/back_pics/bellossom_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xDAC6AC, 0x0324 .align 2 gFile_graphics_pokemon_palettes_bellossom_shiny_palette:: @ 8DAC9D0 .incbin "graphics/pokemon/palettes/bellossom_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xDAC9D0, 0x0028 .align 2 gFile_graphics_pokemon_icons_bellossom_icon:: @ 8DAC9F8 .incbin "graphics/pokemon/icons/bellossom_icon.4bpp" - @ .incbin "baserom.gba", 0xDAC9F8, 0x0400 .align 2 gFile_graphics_pokemon_footprints_bellossom_footprint:: @ 8DACDF8 .incbin "graphics/pokemon/footprints/bellossom_footprint.1bpp" - @ .incbin "baserom.gba", 0xDACDF8, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_marill_still_front_pic:: @ 8DACE18 .incbin "graphics/pokemon/front_pics/marill_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xDACE18, 0x02C4 .align 2 gFile_graphics_pokemon_palettes_marill_palette:: @ 8DAD0DC .incbin "graphics/pokemon/palettes/marill_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xDAD0DC, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_marill_back_pic:: @ 8DAD104 .incbin "graphics/pokemon/back_pics/marill_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xDAD104, 0x02AC .align 2 gFile_graphics_pokemon_palettes_marill_shiny_palette:: @ 8DAD3B0 .incbin "graphics/pokemon/palettes/marill_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xDAD3B0, 0x0028 .align 2 gFile_graphics_pokemon_icons_marill_icon:: @ 8DAD3D8 .incbin "graphics/pokemon/icons/marill_icon.4bpp" - @ .incbin "baserom.gba", 0xDAD3D8, 0x0400 .align 2 gFile_graphics_pokemon_footprints_marill_footprint:: @ 8DAD7D8 .incbin "graphics/pokemon/footprints/marill_footprint.1bpp" - @ .incbin "baserom.gba", 0xDAD7D8, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_azumarill_still_front_pic:: @ 8DAD7F8 .incbin "graphics/pokemon/front_pics/azumarill_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xDAD7F8, 0x0300 .align 2 gFile_graphics_pokemon_palettes_azumarill_palette:: @ 8DADAF8 .incbin "graphics/pokemon/palettes/azumarill_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xDADAF8, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_azumarill_back_pic:: @ 8DADB20 .incbin "graphics/pokemon/back_pics/azumarill_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xDADB20, 0x02BC .align 2 gFile_graphics_pokemon_palettes_azumarill_shiny_palette:: @ 8DADDDC .incbin "graphics/pokemon/palettes/azumarill_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xDADDDC, 0x0028 .align 2 gFile_graphics_pokemon_icons_azumarill_icon:: @ 8DADE04 .incbin "graphics/pokemon/icons/azumarill_icon.4bpp" - @ .incbin "baserom.gba", 0xDADE04, 0x0400 .align 2 gFile_graphics_pokemon_footprints_azumarill_footprint:: @ 8DAE204 .incbin "graphics/pokemon/footprints/azumarill_footprint.1bpp" - @ .incbin "baserom.gba", 0xDAE204, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_sudowoodo_still_front_pic:: @ 8DAE224 .incbin "graphics/pokemon/front_pics/sudowoodo_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xDAE224, 0x0318 .align 2 gFile_graphics_pokemon_palettes_sudowoodo_palette:: @ 8DAE53C .incbin "graphics/pokemon/palettes/sudowoodo_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xDAE53C, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_sudowoodo_back_pic:: @ 8DAE564 .incbin "graphics/pokemon/back_pics/sudowoodo_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xDAE564, 0x035C .align 2 gFile_graphics_pokemon_palettes_sudowoodo_shiny_palette:: @ 8DAE8C0 .incbin "graphics/pokemon/palettes/sudowoodo_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xDAE8C0, 0x0028 .align 2 gFile_graphics_pokemon_icons_sudowoodo_icon:: @ 8DAE8E8 .incbin "graphics/pokemon/icons/sudowoodo_icon.4bpp" - @ .incbin "baserom.gba", 0xDAE8E8, 0x0400 .align 2 gFile_graphics_pokemon_footprints_sudowoodo_footprint:: @ 8DAECE8 .incbin "graphics/pokemon/footprints/sudowoodo_footprint.1bpp" - @ .incbin "baserom.gba", 0xDAECE8, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_politoed_still_front_pic:: @ 8DAED08 .incbin "graphics/pokemon/front_pics/politoed_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xDAED08, 0x033C .align 2 gFile_graphics_pokemon_palettes_politoed_palette:: @ 8DAF044 .incbin "graphics/pokemon/palettes/politoed_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xDAF044, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_politoed_back_pic:: @ 8DAF06C .incbin "graphics/pokemon/back_pics/politoed_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xDAF06C, 0x02BC .align 2 gFile_graphics_pokemon_palettes_politoed_shiny_palette:: @ 8DAF328 .incbin "graphics/pokemon/palettes/politoed_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xDAF328, 0x0028 .align 2 gFile_graphics_pokemon_icons_politoed_icon:: @ 8DAF350 .incbin "graphics/pokemon/icons/politoed_icon.4bpp" - @ .incbin "baserom.gba", 0xDAF350, 0x0400 .align 2 gFile_graphics_pokemon_footprints_politoed_footprint:: @ 8DAF750 .incbin "graphics/pokemon/footprints/politoed_footprint.1bpp" - @ .incbin "baserom.gba", 0xDAF750, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_hoppip_still_front_pic:: @ 8DAF770 .incbin "graphics/pokemon/front_pics/hoppip_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xDAF770, 0x02B4 .align 2 gFile_graphics_pokemon_palettes_hoppip_palette:: @ 8DAFA24 .incbin "graphics/pokemon/palettes/hoppip_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xDAFA24, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_hoppip_back_pic:: @ 8DAFA4C .incbin "graphics/pokemon/back_pics/hoppip_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xDAFA4C, 0x02E0 .align 2 gFile_graphics_pokemon_palettes_hoppip_shiny_palette:: @ 8DAFD2C .incbin "graphics/pokemon/palettes/hoppip_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xDAFD2C, 0x0028 .align 2 gFile_graphics_pokemon_icons_hoppip_icon:: @ 8DAFD54 .incbin "graphics/pokemon/icons/hoppip_icon.4bpp" - @ .incbin "baserom.gba", 0xDAFD54, 0x0400 .align 2 gFile_graphics_pokemon_footprints_hoppip_footprint:: @ 8DB0154 .incbin "graphics/pokemon/footprints/hoppip_footprint.1bpp" - @ .incbin "baserom.gba", 0xDB0154, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_skiploom_still_front_pic:: @ 8DB0174 .incbin "graphics/pokemon/front_pics/skiploom_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xDB0174, 0x0288 .align 2 gFile_graphics_pokemon_palettes_skiploom_palette:: @ 8DB03FC .incbin "graphics/pokemon/palettes/skiploom_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xDB03FC, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_skiploom_back_pic:: @ 8DB0424 .incbin "graphics/pokemon/back_pics/skiploom_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xDB0424, 0x02E0 .align 2 gFile_graphics_pokemon_palettes_skiploom_shiny_palette:: @ 8DB0704 .incbin "graphics/pokemon/palettes/skiploom_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xDB0704, 0x0028 .align 2 gFile_graphics_pokemon_icons_skiploom_icon:: @ 8DB072C .incbin "graphics/pokemon/icons/skiploom_icon.4bpp" - @ .incbin "baserom.gba", 0xDB072C, 0x0400 .align 2 gFile_graphics_pokemon_footprints_skiploom_footprint:: @ 8DB0B2C .incbin "graphics/pokemon/footprints/skiploom_footprint.1bpp" - @ .incbin "baserom.gba", 0xDB0B2C, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_jumpluff_still_front_pic:: @ 8DB0B4C .incbin "graphics/pokemon/front_pics/jumpluff_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xDB0B4C, 0x036C .align 2 gFile_graphics_pokemon_palettes_jumpluff_palette:: @ 8DB0EB8 .incbin "graphics/pokemon/palettes/jumpluff_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xDB0EB8, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_jumpluff_back_pic:: @ 8DB0EE0 .incbin "graphics/pokemon/back_pics/jumpluff_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xDB0EE0, 0x03F8 .align 2 gFile_graphics_pokemon_palettes_jumpluff_shiny_palette:: @ 8DB12D8 .incbin "graphics/pokemon/palettes/jumpluff_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xDB12D8, 0x0028 .align 2 gFile_graphics_pokemon_icons_jumpluff_icon:: @ 8DB1300 .incbin "graphics/pokemon/icons/jumpluff_icon.4bpp" - @ .incbin "baserom.gba", 0xDB1300, 0x0400 .align 2 gFile_graphics_pokemon_footprints_jumpluff_footprint:: @ 8DB1700 .incbin "graphics/pokemon/footprints/jumpluff_footprint.1bpp" - @ .incbin "baserom.gba", 0xDB1700, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_aipom_still_front_pic:: @ 8DB1720 .incbin "graphics/pokemon/front_pics/aipom_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xDB1720, 0x02FC .align 2 gFile_graphics_pokemon_palettes_aipom_palette:: @ 8DB1A1C .incbin "graphics/pokemon/palettes/aipom_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xDB1A1C, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_aipom_back_pic:: @ 8DB1A44 .incbin "graphics/pokemon/back_pics/aipom_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xDB1A44, 0x02F4 .align 2 gFile_graphics_pokemon_palettes_aipom_shiny_palette:: @ 8DB1D38 .incbin "graphics/pokemon/palettes/aipom_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xDB1D38, 0x0028 .align 2 gFile_graphics_pokemon_icons_aipom_icon:: @ 8DB1D60 .incbin "graphics/pokemon/icons/aipom_icon.4bpp" - @ .incbin "baserom.gba", 0xDB1D60, 0x0400 .align 2 gFile_graphics_pokemon_footprints_aipom_footprint:: @ 8DB2160 .incbin "graphics/pokemon/footprints/aipom_footprint.1bpp" - @ .incbin "baserom.gba", 0xDB2160, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_sunkern_still_front_pic:: @ 8DB2180 .incbin "graphics/pokemon/front_pics/sunkern_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xDB2180, 0x0238 .align 2 gFile_graphics_pokemon_palettes_sunkern_palette:: @ 8DB23B8 .incbin "graphics/pokemon/palettes/sunkern_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xDB23B8, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_sunkern_back_pic:: @ 8DB23E0 .incbin "graphics/pokemon/back_pics/sunkern_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xDB23E0, 0x02C4 .align 2 gFile_graphics_pokemon_palettes_sunkern_shiny_palette:: @ 8DB26A4 .incbin "graphics/pokemon/palettes/sunkern_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xDB26A4, 0x0028 .align 2 gFile_graphics_pokemon_icons_sunkern_icon:: @ 8DB26CC .incbin "graphics/pokemon/icons/sunkern_icon.4bpp" - @ .incbin "baserom.gba", 0xDB26CC, 0x0400 .align 2 gFile_graphics_pokemon_footprints_sunkern_footprint:: @ 8DB2ACC .incbin "graphics/pokemon/footprints/sunkern_footprint.1bpp" - @ .incbin "baserom.gba", 0xDB2ACC, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_sunflora_still_front_pic:: @ 8DB2AEC .incbin "graphics/pokemon/front_pics/sunflora_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xDB2AEC, 0x0358 .align 2 gFile_graphics_pokemon_palettes_sunflora_palette:: @ 8DB2E44 .incbin "graphics/pokemon/palettes/sunflora_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xDB2E44, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_sunflora_back_pic:: @ 8DB2E6C .incbin "graphics/pokemon/back_pics/sunflora_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xDB2E6C, 0x03A0 .align 2 gFile_graphics_pokemon_palettes_sunflora_shiny_palette:: @ 8DB320C .incbin "graphics/pokemon/palettes/sunflora_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xDB320C, 0x0028 .align 2 gFile_graphics_pokemon_icons_sunflora_icon:: @ 8DB3234 .incbin "graphics/pokemon/icons/sunflora_icon.4bpp" - @ .incbin "baserom.gba", 0xDB3234, 0x0400 .align 2 gFile_graphics_pokemon_footprints_sunflora_footprint:: @ 8DB3634 .incbin "graphics/pokemon/footprints/sunflora_footprint.1bpp" - @ .incbin "baserom.gba", 0xDB3634, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_yanma_still_front_pic:: @ 8DB3654 .incbin "graphics/pokemon/front_pics/yanma_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xDB3654, 0x0384 .align 2 gFile_graphics_pokemon_palettes_yanma_palette:: @ 8DB39D8 .incbin "graphics/pokemon/palettes/yanma_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xDB39D8, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_yanma_back_pic:: @ 8DB3A00 .incbin "graphics/pokemon/back_pics/yanma_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xDB3A00, 0x03B4 .align 2 gFile_graphics_pokemon_palettes_yanma_shiny_palette:: @ 8DB3DB4 .incbin "graphics/pokemon/palettes/yanma_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xDB3DB4, 0x0028 .align 2 gFile_graphics_pokemon_icons_yanma_icon:: @ 8DB3DDC .incbin "graphics/pokemon/icons/yanma_icon.4bpp" - @ .incbin "baserom.gba", 0xDB3DDC, 0x0400 .align 2 gFile_graphics_pokemon_footprints_yanma_footprint:: @ 8DB41DC .incbin "graphics/pokemon/footprints/yanma_footprint.1bpp" - @ .incbin "baserom.gba", 0xDB41DC, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_wooper_still_front_pic:: @ 8DB41FC .incbin "graphics/pokemon/front_pics/wooper_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xDB41FC, 0x0240 .align 2 gFile_graphics_pokemon_palettes_wooper_palette:: @ 8DB443C .incbin "graphics/pokemon/palettes/wooper_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xDB443C, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_wooper_back_pic:: @ 8DB4464 .incbin "graphics/pokemon/back_pics/wooper_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xDB4464, 0x028C .align 2 gFile_graphics_pokemon_palettes_wooper_shiny_palette:: @ 8DB46F0 .incbin "graphics/pokemon/palettes/wooper_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xDB46F0, 0x0028 .align 2 gFile_graphics_pokemon_icons_wooper_icon:: @ 8DB4718 .incbin "graphics/pokemon/icons/wooper_icon.4bpp" - @ .incbin "baserom.gba", 0xDB4718, 0x0400 .align 2 gFile_graphics_pokemon_footprints_wooper_footprint:: @ 8DB4B18 .incbin "graphics/pokemon/footprints/wooper_footprint.1bpp" - @ .incbin "baserom.gba", 0xDB4B18, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_quagsire_still_front_pic:: @ 8DB4B38 .incbin "graphics/pokemon/front_pics/quagsire_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xDB4B38, 0x0374 .align 2 gFile_graphics_pokemon_palettes_quagsire_palette:: @ 8DB4EAC .incbin "graphics/pokemon/palettes/quagsire_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xDB4EAC, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_quagsire_back_pic:: @ 8DB4ED4 .incbin "graphics/pokemon/back_pics/quagsire_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xDB4ED4, 0x02FC .align 2 gFile_graphics_pokemon_palettes_quagsire_shiny_palette:: @ 8DB51D0 .incbin "graphics/pokemon/palettes/quagsire_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xDB51D0, 0x0028 .align 2 gFile_graphics_pokemon_icons_quagsire_icon:: @ 8DB51F8 .incbin "graphics/pokemon/icons/quagsire_icon.4bpp" - @ .incbin "baserom.gba", 0xDB51F8, 0x0400 .align 2 gFile_graphics_pokemon_footprints_quagsire_footprint:: @ 8DB55F8 .incbin "graphics/pokemon/footprints/quagsire_footprint.1bpp" - @ .incbin "baserom.gba", 0xDB55F8, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_espeon_still_front_pic:: @ 8DB5618 .incbin "graphics/pokemon/front_pics/espeon_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xDB5618, 0x0340 .align 2 gFile_graphics_pokemon_palettes_espeon_palette:: @ 8DB5958 .incbin "graphics/pokemon/palettes/espeon_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xDB5958, 0x0024 .align 2 gFile_graphics_pokemon_back_pics_espeon_back_pic:: @ 8DB597C .incbin "graphics/pokemon/back_pics/espeon_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xDB597C, 0x02DC .align 2 gFile_graphics_pokemon_palettes_espeon_shiny_palette:: @ 8DB5C58 .incbin "graphics/pokemon/palettes/espeon_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xDB5C58, 0x0024 .align 2 gFile_graphics_pokemon_icons_espeon_icon:: @ 8DB5C7C .incbin "graphics/pokemon/icons/espeon_icon.4bpp" - @ .incbin "baserom.gba", 0xDB5C7C, 0x0400 .align 2 gFile_graphics_pokemon_footprints_espeon_footprint:: @ 8DB607C .incbin "graphics/pokemon/footprints/espeon_footprint.1bpp" - @ .incbin "baserom.gba", 0xDB607C, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_umbreon_still_front_pic:: @ 8DB609C .incbin "graphics/pokemon/front_pics/umbreon_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xDB609C, 0x0314 .align 2 gFile_graphics_pokemon_palettes_umbreon_palette:: @ 8DB63B0 .incbin "graphics/pokemon/palettes/umbreon_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xDB63B0, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_umbreon_back_pic:: @ 8DB63D8 .incbin "graphics/pokemon/back_pics/umbreon_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xDB63D8, 0x0314 .align 2 gFile_graphics_pokemon_palettes_umbreon_shiny_palette:: @ 8DB66EC .incbin "graphics/pokemon/palettes/umbreon_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xDB66EC, 0x0028 .align 2 gFile_graphics_pokemon_icons_umbreon_icon:: @ 8DB6714 .incbin "graphics/pokemon/icons/umbreon_icon.4bpp" - @ .incbin "baserom.gba", 0xDB6714, 0x0400 .align 2 gFile_graphics_pokemon_footprints_umbreon_footprint:: @ 8DB6B14 .incbin "graphics/pokemon/footprints/umbreon_footprint.1bpp" - @ .incbin "baserom.gba", 0xDB6B14, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_murkrow_still_front_pic:: @ 8DB6B34 .incbin "graphics/pokemon/front_pics/murkrow_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xDB6B34, 0x02E0 .align 2 gFile_graphics_pokemon_palettes_murkrow_palette:: @ 8DB6E14 .incbin "graphics/pokemon/palettes/murkrow_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xDB6E14, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_murkrow_back_pic:: @ 8DB6E3C .incbin "graphics/pokemon/back_pics/murkrow_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xDB6E3C, 0x0318 .align 2 gFile_graphics_pokemon_palettes_murkrow_shiny_palette:: @ 8DB7154 .incbin "graphics/pokemon/palettes/murkrow_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xDB7154, 0x0028 .align 2 gFile_graphics_pokemon_icons_murkrow_icon:: @ 8DB717C .incbin "graphics/pokemon/icons/murkrow_icon.4bpp" - @ .incbin "baserom.gba", 0xDB717C, 0x0400 .align 2 gFile_graphics_pokemon_footprints_murkrow_footprint:: @ 8DB757C .incbin "graphics/pokemon/footprints/murkrow_footprint.1bpp" - @ .incbin "baserom.gba", 0xDB757C, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_slowking_still_front_pic:: @ 8DB759C .incbin "graphics/pokemon/front_pics/slowking_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xDB759C, 0x03B4 .align 2 gFile_graphics_pokemon_palettes_slowking_palette:: @ 8DB7950 .incbin "graphics/pokemon/palettes/slowking_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xDB7950, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_slowking_back_pic:: @ 8DB7978 .incbin "graphics/pokemon/back_pics/slowking_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xDB7978, 0x038C .align 2 gFile_graphics_pokemon_palettes_slowking_shiny_palette:: @ 8DB7D04 .incbin "graphics/pokemon/palettes/slowking_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xDB7D04, 0x0028 .align 2 gFile_graphics_pokemon_icons_slowking_icon:: @ 8DB7D2C .incbin "graphics/pokemon/icons/slowking_icon.4bpp" - @ .incbin "baserom.gba", 0xDB7D2C, 0x0400 .align 2 gFile_graphics_pokemon_footprints_slowking_footprint:: @ 8DB812C .incbin "graphics/pokemon/footprints/slowking_footprint.1bpp" - @ .incbin "baserom.gba", 0xDB812C, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_misdreavus_still_front_pic:: @ 8DB814C .incbin "graphics/pokemon/front_pics/misdreavus_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xDB814C, 0x02C0 .align 2 gFile_graphics_pokemon_palettes_misdreavus_palette:: @ 8DB840C .incbin "graphics/pokemon/palettes/misdreavus_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xDB840C, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_misdreavus_back_pic:: @ 8DB8434 .incbin "graphics/pokemon/back_pics/misdreavus_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xDB8434, 0x0324 .align 2 gFile_graphics_pokemon_palettes_misdreavus_shiny_palette:: @ 8DB8758 .incbin "graphics/pokemon/palettes/misdreavus_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xDB8758, 0x0028 .align 2 gFile_graphics_pokemon_icons_misdreavus_icon:: @ 8DB8780 .incbin "graphics/pokemon/icons/misdreavus_icon.4bpp" - @ .incbin "baserom.gba", 0xDB8780, 0x0400 .align 2 gFile_graphics_pokemon_footprints_misdreavus_footprint:: @ 8DB8B80 .incbin "graphics/pokemon/footprints/misdreavus_footprint.1bpp" - @ .incbin "baserom.gba", 0xDB8B80, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_unown_a_still_front_pic:: @ 8DB8BA0 .incbin "graphics/pokemon/front_pics/unown_a_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xDB8BA0, 0x01D4 .align 2 gFile_graphics_pokemon_palettes_unown_palette:: @ 8DB8D74 .incbin "graphics/pokemon/palettes/unown_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xDB8D74, 0x0020 .align 2 gFile_graphics_pokemon_back_pics_unown_a_back_pic:: @ 8DB8D94 .incbin "graphics/pokemon/back_pics/unown_a_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xDB8D94, 0x0200 .align 2 gFile_graphics_pokemon_palettes_unown_shiny_palette:: @ 8DB8F94 .incbin "graphics/pokemon/palettes/unown_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xDB8F94, 0x0020 .align 2 gFile_graphics_pokemon_icons_unown_a_icon:: @ 8DB8FB4 .incbin "graphics/pokemon/icons/unown_a_icon.4bpp" - @ .incbin "baserom.gba", 0xDB8FB4, 0x0400 .align 2 gFile_graphics_pokemon_footprints_unown_footprint:: @ 8DB93B4 .incbin "graphics/pokemon/footprints/unown_footprint.1bpp" - @ .incbin "baserom.gba", 0xDB93B4, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_wobbuffet_still_front_pic:: @ 8DB93D4 .incbin "graphics/pokemon/front_pics/wobbuffet_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xDB93D4, 0x0350 .align 2 gFile_graphics_pokemon_palettes_wobbuffet_palette:: @ 8DB9724 .incbin "graphics/pokemon/palettes/wobbuffet_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xDB9724, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_wobbuffet_back_pic:: @ 8DB974C .incbin "graphics/pokemon/back_pics/wobbuffet_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xDB974C, 0x0244 .align 2 gFile_graphics_pokemon_palettes_wobbuffet_shiny_palette:: @ 8DB9990 .incbin "graphics/pokemon/palettes/wobbuffet_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xDB9990, 0x0028 .align 2 gFile_graphics_pokemon_icons_wobbuffet_icon:: @ 8DB99B8 .incbin "graphics/pokemon/icons/wobbuffet_icon.4bpp" - @ .incbin "baserom.gba", 0xDB99B8, 0x0400 .align 2 gFile_graphics_pokemon_footprints_wobbuffet_footprint:: @ 8DB9DB8 .incbin "graphics/pokemon/footprints/wobbuffet_footprint.1bpp" - @ .incbin "baserom.gba", 0xDB9DB8, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_girafarig_still_front_pic:: @ 8DB9DD8 .incbin "graphics/pokemon/front_pics/girafarig_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xDB9DD8, 0x0404 .align 2 gFile_graphics_pokemon_palettes_girafarig_palette:: @ 8DBA1DC .incbin "graphics/pokemon/palettes/girafarig_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xDBA1DC, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_girafarig_back_pic:: @ 8DBA204 .incbin "graphics/pokemon/back_pics/girafarig_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xDBA204, 0x03AC .align 2 gFile_graphics_pokemon_palettes_girafarig_shiny_palette:: @ 8DBA5B0 .incbin "graphics/pokemon/palettes/girafarig_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xDBA5B0, 0x0028 .align 2 gFile_graphics_pokemon_icons_girafarig_icon:: @ 8DBA5D8 .incbin "graphics/pokemon/icons/girafarig_icon.4bpp" - @ .incbin "baserom.gba", 0xDBA5D8, 0x0400 .align 2 gFile_graphics_pokemon_footprints_girafarig_footprint:: @ 8DBA9D8 .incbin "graphics/pokemon/footprints/girafarig_footprint.1bpp" - @ .incbin "baserom.gba", 0xDBA9D8, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_pineco_still_front_pic:: @ 8DBA9F8 .incbin "graphics/pokemon/front_pics/pineco_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xDBA9F8, 0x0340 .align 2 gFile_graphics_pokemon_palettes_pineco_palette:: @ 8DBAD38 .incbin "graphics/pokemon/palettes/pineco_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xDBAD38, 0x0024 .align 2 gFile_graphics_pokemon_back_pics_pineco_back_pic:: @ 8DBAD5C .incbin "graphics/pokemon/back_pics/pineco_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xDBAD5C, 0x02D8 .align 2 gFile_graphics_pokemon_palettes_pineco_shiny_palette:: @ 8DBB034 .incbin "graphics/pokemon/palettes/pineco_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xDBB034, 0x0024 .align 2 gFile_graphics_pokemon_icons_pineco_icon:: @ 8DBB058 .incbin "graphics/pokemon/icons/pineco_icon.4bpp" - @ .incbin "baserom.gba", 0xDBB058, 0x0400 .align 2 gFile_graphics_pokemon_footprints_pineco_footprint:: @ 8DBB458 .incbin "graphics/pokemon/footprints/pineco_footprint.1bpp" - @ .incbin "baserom.gba", 0xDBB458, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_forretress_still_front_pic:: @ 8DBB478 .incbin "graphics/pokemon/front_pics/forretress_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xDBB478, 0x041C .align 2 gFile_graphics_pokemon_palettes_forretress_palette:: @ 8DBB894 .incbin "graphics/pokemon/palettes/forretress_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xDBB894, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_forretress_back_pic:: @ 8DBB8BC .incbin "graphics/pokemon/back_pics/forretress_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xDBB8BC, 0x02C0 .align 2 gFile_graphics_pokemon_palettes_forretress_shiny_palette:: @ 8DBBB7C .incbin "graphics/pokemon/palettes/forretress_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xDBBB7C, 0x0028 .align 2 gFile_graphics_pokemon_icons_forretress_icon:: @ 8DBBBA4 .incbin "graphics/pokemon/icons/forretress_icon.4bpp" - @ .incbin "baserom.gba", 0xDBBBA4, 0x0400 .align 2 gFile_graphics_pokemon_footprints_forretress_footprint:: @ 8DBBFA4 .incbin "graphics/pokemon/footprints/forretress_footprint.1bpp" - @ .incbin "baserom.gba", 0xDBBFA4, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_dunsparce_still_front_pic:: @ 8DBBFC4 .incbin "graphics/pokemon/front_pics/dunsparce_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xDBBFC4, 0x0310 .align 2 gFile_graphics_pokemon_palettes_dunsparce_palette:: @ 8DBC2D4 .incbin "graphics/pokemon/palettes/dunsparce_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xDBC2D4, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_dunsparce_back_pic:: @ 8DBC2FC .incbin "graphics/pokemon/back_pics/dunsparce_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xDBC2FC, 0x02FC .align 2 gFile_graphics_pokemon_palettes_dunsparce_shiny_palette:: @ 8DBC5F8 .incbin "graphics/pokemon/palettes/dunsparce_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xDBC5F8, 0x0028 .align 2 gFile_graphics_pokemon_icons_dunsparce_icon:: @ 8DBC620 .incbin "graphics/pokemon/icons/dunsparce_icon.4bpp" - @ .incbin "baserom.gba", 0xDBC620, 0x0400 .align 2 gFile_graphics_pokemon_footprints_dunsparce_footprint:: @ 8DBCA20 .incbin "graphics/pokemon/footprints/dunsparce_footprint.1bpp" - @ .incbin "baserom.gba", 0xDBCA20, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_gligar_still_front_pic:: @ 8DBCA40 .incbin "graphics/pokemon/front_pics/gligar_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xDBCA40, 0x0428 .align 2 gFile_graphics_pokemon_palettes_gligar_palette:: @ 8DBCE68 .incbin "graphics/pokemon/palettes/gligar_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xDBCE68, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_gligar_back_pic:: @ 8DBCE90 .incbin "graphics/pokemon/back_pics/gligar_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xDBCE90, 0x03D8 .align 2 gFile_graphics_pokemon_palettes_gligar_shiny_palette:: @ 8DBD268 .incbin "graphics/pokemon/palettes/gligar_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xDBD268, 0x0028 .align 2 gFile_graphics_pokemon_icons_gligar_icon:: @ 8DBD290 .incbin "graphics/pokemon/icons/gligar_icon.4bpp" - @ .incbin "baserom.gba", 0xDBD290, 0x0400 .align 2 gFile_graphics_pokemon_footprints_gligar_footprint:: @ 8DBD690 .incbin "graphics/pokemon/footprints/gligar_footprint.1bpp" - @ .incbin "baserom.gba", 0xDBD690, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_steelix_still_front_pic:: @ 8DBD6B0 .incbin "graphics/pokemon/front_pics/steelix_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xDBD6B0, 0x04C8 .align 2 gFile_graphics_pokemon_palettes_steelix_palette:: @ 8DBDB78 .incbin "graphics/pokemon/palettes/steelix_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xDBDB78, 0x0024 .align 2 gFile_graphics_pokemon_back_pics_steelix_back_pic:: @ 8DBDB9C .incbin "graphics/pokemon/back_pics/steelix_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xDBDB9C, 0x040C .align 2 gFile_graphics_pokemon_palettes_steelix_shiny_palette:: @ 8DBDFA8 .incbin "graphics/pokemon/palettes/steelix_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xDBDFA8, 0x0024 .align 2 gFile_graphics_pokemon_icons_steelix_icon:: @ 8DBDFCC .incbin "graphics/pokemon/icons/steelix_icon.4bpp" - @ .incbin "baserom.gba", 0xDBDFCC, 0x0400 .align 2 gFile_graphics_pokemon_footprints_steelix_footprint:: @ 8DBE3CC .incbin "graphics/pokemon/footprints/steelix_footprint.1bpp" - @ .incbin "baserom.gba", 0xDBE3CC, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_snubbull_still_front_pic:: @ 8DBE3EC .incbin "graphics/pokemon/front_pics/snubbull_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xDBE3EC, 0x02D4 .align 2 gFile_graphics_pokemon_palettes_snubbull_palette:: @ 8DBE6C0 .incbin "graphics/pokemon/palettes/snubbull_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xDBE6C0, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_snubbull_back_pic:: @ 8DBE6E8 .incbin "graphics/pokemon/back_pics/snubbull_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xDBE6E8, 0x0328 .align 2 gFile_graphics_pokemon_palettes_snubbull_shiny_palette:: @ 8DBEA10 .incbin "graphics/pokemon/palettes/snubbull_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xDBEA10, 0x0028 .align 2 gFile_graphics_pokemon_icons_snubbull_icon:: @ 8DBEA38 .incbin "graphics/pokemon/icons/snubbull_icon.4bpp" - @ .incbin "baserom.gba", 0xDBEA38, 0x0400 .align 2 gFile_graphics_pokemon_footprints_snubbull_footprint:: @ 8DBEE38 .incbin "graphics/pokemon/footprints/snubbull_footprint.1bpp" - @ .incbin "baserom.gba", 0xDBEE38, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_granbull_still_front_pic:: @ 8DBEE58 .incbin "graphics/pokemon/front_pics/granbull_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xDBEE58, 0x038C .align 2 gFile_graphics_pokemon_palettes_granbull_palette:: @ 8DBF1E4 .incbin "graphics/pokemon/palettes/granbull_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xDBF1E4, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_granbull_back_pic:: @ 8DBF20C .incbin "graphics/pokemon/back_pics/granbull_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xDBF20C, 0x0324 .align 2 gFile_graphics_pokemon_palettes_granbull_shiny_palette:: @ 8DBF530 .incbin "graphics/pokemon/palettes/granbull_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xDBF530, 0x0028 .align 2 gFile_graphics_pokemon_icons_granbull_icon:: @ 8DBF558 .incbin "graphics/pokemon/icons/granbull_icon.4bpp" - @ .incbin "baserom.gba", 0xDBF558, 0x0400 .align 2 gFile_graphics_pokemon_footprints_granbull_footprint:: @ 8DBF958 .incbin "graphics/pokemon/footprints/granbull_footprint.1bpp" - @ .incbin "baserom.gba", 0xDBF958, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_qwilfish_still_front_pic:: @ 8DBF978 .incbin "graphics/pokemon/front_pics/qwilfish_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xDBF978, 0x02C0 .align 2 gFile_graphics_pokemon_palettes_qwilfish_palette:: @ 8DBFC38 .incbin "graphics/pokemon/palettes/qwilfish_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xDBFC38, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_qwilfish_back_pic:: @ 8DBFC60 .incbin "graphics/pokemon/back_pics/qwilfish_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xDBFC60, 0x02E0 .align 2 gFile_graphics_pokemon_palettes_qwilfish_shiny_palette:: @ 8DBFF40 .incbin "graphics/pokemon/palettes/qwilfish_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xDBFF40, 0x0028 .align 2 gFile_graphics_pokemon_icons_qwilfish_icon:: @ 8DBFF68 .incbin "graphics/pokemon/icons/qwilfish_icon.4bpp" - @ .incbin "baserom.gba", 0xDBFF68, 0x0400 .align 2 gFile_graphics_pokemon_footprints_qwilfish_footprint:: @ 8DC0368 .incbin "graphics/pokemon/footprints/qwilfish_footprint.1bpp" - @ .incbin "baserom.gba", 0xDC0368, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_scizor_still_front_pic:: @ 8DC0388 .incbin "graphics/pokemon/front_pics/scizor_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xDC0388, 0x04E8 .align 2 gFile_graphics_pokemon_palettes_scizor_palette:: @ 8DC0870 .incbin "graphics/pokemon/palettes/scizor_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xDC0870, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_scizor_back_pic:: @ 8DC0898 .incbin "graphics/pokemon/back_pics/scizor_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xDC0898, 0x0380 .align 2 gFile_graphics_pokemon_palettes_scizor_shiny_palette:: @ 8DC0C18 .incbin "graphics/pokemon/palettes/scizor_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xDC0C18, 0x0028 .align 2 gFile_graphics_pokemon_icons_scizor_icon:: @ 8DC0C40 .incbin "graphics/pokemon/icons/scizor_icon.4bpp" - @ .incbin "baserom.gba", 0xDC0C40, 0x0400 .align 2 gFile_graphics_pokemon_footprints_scizor_footprint:: @ 8DC1040 .incbin "graphics/pokemon/footprints/scizor_footprint.1bpp" - @ .incbin "baserom.gba", 0xDC1040, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_shuckle_still_front_pic:: @ 8DC1060 .incbin "graphics/pokemon/front_pics/shuckle_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xDC1060, 0x02C8 .align 2 gFile_graphics_pokemon_palettes_shuckle_palette:: @ 8DC1328 .incbin "graphics/pokemon/palettes/shuckle_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xDC1328, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_shuckle_back_pic:: @ 8DC1350 .incbin "graphics/pokemon/back_pics/shuckle_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xDC1350, 0x0258 .align 2 gFile_graphics_pokemon_palettes_shuckle_shiny_palette:: @ 8DC15A8 .incbin "graphics/pokemon/palettes/shuckle_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xDC15A8, 0x0028 .align 2 gFile_graphics_pokemon_icons_shuckle_icon:: @ 8DC15D0 .incbin "graphics/pokemon/icons/shuckle_icon.4bpp" - @ .incbin "baserom.gba", 0xDC15D0, 0x0400 .align 2 gFile_graphics_pokemon_footprints_shuckle_footprint:: @ 8DC19D0 .incbin "graphics/pokemon/footprints/shuckle_footprint.1bpp" - @ .incbin "baserom.gba", 0xDC19D0, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_heracross_still_front_pic:: @ 8DC19F0 .incbin "graphics/pokemon/front_pics/heracross_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xDC19F0, 0x03F0 .align 2 gFile_graphics_pokemon_palettes_heracross_palette:: @ 8DC1DE0 .incbin "graphics/pokemon/palettes/heracross_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xDC1DE0, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_heracross_back_pic:: @ 8DC1E08 .incbin "graphics/pokemon/back_pics/heracross_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xDC1E08, 0x0370 .align 2 gFile_graphics_pokemon_palettes_heracross_shiny_palette:: @ 8DC2178 .incbin "graphics/pokemon/palettes/heracross_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xDC2178, 0x0028 .align 2 gFile_graphics_pokemon_icons_heracross_icon:: @ 8DC21A0 .incbin "graphics/pokemon/icons/heracross_icon.4bpp" - @ .incbin "baserom.gba", 0xDC21A0, 0x0400 gUnknown_heracross_icon:: @ 8DC25A0 .incbin "baserom.gba", 0xDC25A0, 0x400 @@ -6936,692 +5785,554 @@ gUnknown_heracross_icon:: @ 8DC25A0 .align 2 gFile_graphics_pokemon_footprints_heracross_footprint:: @ 8DC29A0 .incbin "graphics/pokemon/footprints/heracross_footprint.1bpp" - @ .incbin "baserom.gba", 0xDC29A0, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_sneasel_still_front_pic:: @ 8DC29C0 .incbin "graphics/pokemon/front_pics/sneasel_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xDC29C0, 0x0344 .align 2 gFile_graphics_pokemon_palettes_sneasel_palette:: @ 8DC2D04 .incbin "graphics/pokemon/palettes/sneasel_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xDC2D04, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_sneasel_back_pic:: @ 8DC2D2C .incbin "graphics/pokemon/back_pics/sneasel_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xDC2D2C, 0x0324 .align 2 gFile_graphics_pokemon_palettes_sneasel_shiny_palette:: @ 8DC3050 .incbin "graphics/pokemon/palettes/sneasel_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xDC3050, 0x0028 .align 2 gFile_graphics_pokemon_icons_sneasel_icon:: @ 8DC3078 .incbin "graphics/pokemon/icons/sneasel_icon.4bpp" - @ .incbin "baserom.gba", 0xDC3078, 0x0400 .align 2 gFile_graphics_pokemon_footprints_sneasel_footprint:: @ 8DC3478 .incbin "graphics/pokemon/footprints/sneasel_footprint.1bpp" - @ .incbin "baserom.gba", 0xDC3478, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_teddiursa_still_front_pic:: @ 8DC3498 .incbin "graphics/pokemon/front_pics/teddiursa_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xDC3498, 0x02A8 .align 2 gFile_graphics_pokemon_palettes_teddiursa_palette:: @ 8DC3740 .incbin "graphics/pokemon/palettes/teddiursa_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xDC3740, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_teddiursa_back_pic:: @ 8DC3768 .incbin "graphics/pokemon/back_pics/teddiursa_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xDC3768, 0x0278 .align 2 gFile_graphics_pokemon_palettes_teddiursa_shiny_palette:: @ 8DC39E0 .incbin "graphics/pokemon/palettes/teddiursa_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xDC39E0, 0x0028 .align 2 gFile_graphics_pokemon_icons_teddiursa_icon:: @ 8DC3A08 .incbin "graphics/pokemon/icons/teddiursa_icon.4bpp" - @ .incbin "baserom.gba", 0xDC3A08, 0x0400 .align 2 gFile_graphics_pokemon_footprints_teddiursa_footprint:: @ 8DC3E08 .incbin "graphics/pokemon/footprints/teddiursa_footprint.1bpp" - @ .incbin "baserom.gba", 0xDC3E08, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_ursaring_still_front_pic:: @ 8DC3E28 .incbin "graphics/pokemon/front_pics/ursaring_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xDC3E28, 0x0438 .align 2 gFile_graphics_pokemon_palettes_ursaring_palette:: @ 8DC4260 .incbin "graphics/pokemon/palettes/ursaring_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xDC4260, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_ursaring_back_pic:: @ 8DC4288 .incbin "graphics/pokemon/back_pics/ursaring_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xDC4288, 0x0388 .align 2 gFile_graphics_pokemon_palettes_ursaring_shiny_palette:: @ 8DC4610 .incbin "graphics/pokemon/palettes/ursaring_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xDC4610, 0x0028 .align 2 gFile_graphics_pokemon_icons_ursaring_icon:: @ 8DC4638 .incbin "graphics/pokemon/icons/ursaring_icon.4bpp" - @ .incbin "baserom.gba", 0xDC4638, 0x0400 .align 2 gFile_graphics_pokemon_footprints_ursaring_footprint:: @ 8DC4A38 .incbin "graphics/pokemon/footprints/ursaring_footprint.1bpp" - @ .incbin "baserom.gba", 0xDC4A38, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_slugma_still_front_pic:: @ 8DC4A58 .incbin "graphics/pokemon/front_pics/slugma_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xDC4A58, 0x0274 .align 2 gFile_graphics_pokemon_palettes_slugma_palette:: @ 8DC4CCC .incbin "graphics/pokemon/palettes/slugma_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xDC4CCC, 0x0024 .align 2 gFile_graphics_pokemon_back_pics_slugma_back_pic:: @ 8DC4CF0 .incbin "graphics/pokemon/back_pics/slugma_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xDC4CF0, 0x02E8 .align 2 gFile_graphics_pokemon_palettes_slugma_shiny_palette:: @ 8DC4FD8 .incbin "graphics/pokemon/palettes/slugma_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xDC4FD8, 0x0024 .align 2 gFile_graphics_pokemon_icons_slugma_icon:: @ 8DC4FFC .incbin "graphics/pokemon/icons/slugma_icon.4bpp" - @ .incbin "baserom.gba", 0xDC4FFC, 0x0400 .align 2 gFile_graphics_pokemon_footprints_slugma_footprint:: @ 8DC53FC .incbin "graphics/pokemon/footprints/slugma_footprint.1bpp" - @ .incbin "baserom.gba", 0xDC53FC, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_magcargo_still_front_pic:: @ 8DC541C .incbin "graphics/pokemon/front_pics/magcargo_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xDC541C, 0x0348 .align 2 gFile_graphics_pokemon_palettes_magcargo_palette:: @ 8DC5764 .incbin "graphics/pokemon/palettes/magcargo_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xDC5764, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_magcargo_back_pic:: @ 8DC578C .incbin "graphics/pokemon/back_pics/magcargo_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xDC578C, 0x0418 .align 2 gFile_graphics_pokemon_palettes_magcargo_shiny_palette:: @ 8DC5BA4 .incbin "graphics/pokemon/palettes/magcargo_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xDC5BA4, 0x0028 .align 2 gFile_graphics_pokemon_icons_magcargo_icon:: @ 8DC5BCC .incbin "graphics/pokemon/icons/magcargo_icon.4bpp" - @ .incbin "baserom.gba", 0xDC5BCC, 0x0400 .align 2 gFile_graphics_pokemon_footprints_magcargo_footprint:: @ 8DC5FCC .incbin "graphics/pokemon/footprints/magcargo_footprint.1bpp" - @ .incbin "baserom.gba", 0xDC5FCC, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_swinub_still_front_pic:: @ 8DC5FEC .incbin "graphics/pokemon/front_pics/swinub_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xDC5FEC, 0x01FC .align 2 gFile_graphics_pokemon_palettes_swinub_palette:: @ 8DC61E8 .incbin "graphics/pokemon/palettes/swinub_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xDC61E8, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_swinub_back_pic:: @ 8DC6210 .incbin "graphics/pokemon/back_pics/swinub_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xDC6210, 0x023C .align 2 gFile_graphics_pokemon_palettes_swinub_shiny_palette:: @ 8DC644C .incbin "graphics/pokemon/palettes/swinub_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xDC644C, 0x0028 .align 2 gFile_graphics_pokemon_icons_swinub_icon:: @ 8DC6474 .incbin "graphics/pokemon/icons/swinub_icon.4bpp" - @ .incbin "baserom.gba", 0xDC6474, 0x0400 .align 2 gFile_graphics_pokemon_footprints_swinub_footprint:: @ 8DC6874 .incbin "graphics/pokemon/footprints/swinub_footprint.1bpp" - @ .incbin "baserom.gba", 0xDC6874, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_piloswine_still_front_pic:: @ 8DC6894 .incbin "graphics/pokemon/front_pics/piloswine_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xDC6894, 0x0328 .align 2 gFile_graphics_pokemon_palettes_piloswine_palette:: @ 8DC6BBC .incbin "graphics/pokemon/palettes/piloswine_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xDC6BBC, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_piloswine_back_pic:: @ 8DC6BE4 .incbin "graphics/pokemon/back_pics/piloswine_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xDC6BE4, 0x024C .align 2 gFile_graphics_pokemon_palettes_piloswine_shiny_palette:: @ 8DC6E30 .incbin "graphics/pokemon/palettes/piloswine_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xDC6E30, 0x0028 .align 2 gFile_graphics_pokemon_icons_piloswine_icon:: @ 8DC6E58 .incbin "graphics/pokemon/icons/piloswine_icon.4bpp" - @ .incbin "baserom.gba", 0xDC6E58, 0x0400 .align 2 gFile_graphics_pokemon_footprints_piloswine_footprint:: @ 8DC7258 .incbin "graphics/pokemon/footprints/piloswine_footprint.1bpp" - @ .incbin "baserom.gba", 0xDC7258, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_corsola_still_front_pic:: @ 8DC7278 .incbin "graphics/pokemon/front_pics/corsola_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xDC7278, 0x02E8 .align 2 gFile_graphics_pokemon_palettes_corsola_palette:: @ 8DC7560 .incbin "graphics/pokemon/palettes/corsola_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xDC7560, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_corsola_back_pic:: @ 8DC7588 .incbin "graphics/pokemon/back_pics/corsola_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xDC7588, 0x02C0 .align 2 gFile_graphics_pokemon_palettes_corsola_shiny_palette:: @ 8DC7848 .incbin "graphics/pokemon/palettes/corsola_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xDC7848, 0x0028 .align 2 gFile_graphics_pokemon_icons_corsola_icon:: @ 8DC7870 .incbin "graphics/pokemon/icons/corsola_icon.4bpp" - @ .incbin "baserom.gba", 0xDC7870, 0x0400 .align 2 gFile_graphics_pokemon_footprints_corsola_footprint:: @ 8DC7C70 .incbin "graphics/pokemon/footprints/corsola_footprint.1bpp" - @ .incbin "baserom.gba", 0xDC7C70, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_remoraid_still_front_pic:: @ 8DC7C90 .incbin "graphics/pokemon/front_pics/remoraid_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xDC7C90, 0x0268 .align 2 gFile_graphics_pokemon_palettes_remoraid_palette:: @ 8DC7EF8 .incbin "graphics/pokemon/palettes/remoraid_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xDC7EF8, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_remoraid_back_pic:: @ 8DC7F20 .incbin "graphics/pokemon/back_pics/remoraid_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xDC7F20, 0x0314 .align 2 gFile_graphics_pokemon_palettes_remoraid_shiny_palette:: @ 8DC8234 .incbin "graphics/pokemon/palettes/remoraid_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xDC8234, 0x0028 .align 2 gFile_graphics_pokemon_icons_remoraid_icon:: @ 8DC825C .incbin "graphics/pokemon/icons/remoraid_icon.4bpp" - @ .incbin "baserom.gba", 0xDC825C, 0x0400 .align 2 gFile_graphics_pokemon_footprints_remoraid_footprint:: @ 8DC865C .incbin "graphics/pokemon/footprints/remoraid_footprint.1bpp" - @ .incbin "baserom.gba", 0xDC865C, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_octillery_still_front_pic:: @ 8DC867C .incbin "graphics/pokemon/front_pics/octillery_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xDC867C, 0x0334 .align 2 gFile_graphics_pokemon_palettes_octillery_palette:: @ 8DC89B0 .incbin "graphics/pokemon/palettes/octillery_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xDC89B0, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_octillery_back_pic:: @ 8DC89D8 .incbin "graphics/pokemon/back_pics/octillery_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xDC89D8, 0x02B8 .align 2 gFile_graphics_pokemon_palettes_octillery_shiny_palette:: @ 8DC8C90 .incbin "graphics/pokemon/palettes/octillery_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xDC8C90, 0x0028 .align 2 gFile_graphics_pokemon_icons_octillery_icon:: @ 8DC8CB8 .incbin "graphics/pokemon/icons/octillery_icon.4bpp" - @ .incbin "baserom.gba", 0xDC8CB8, 0x0400 .align 2 gFile_graphics_pokemon_footprints_octillery_footprint:: @ 8DC90B8 .incbin "graphics/pokemon/footprints/octillery_footprint.1bpp" - @ .incbin "baserom.gba", 0xDC90B8, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_delibird_still_front_pic:: @ 8DC90D8 .incbin "graphics/pokemon/front_pics/delibird_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xDC90D8, 0x0370 .align 2 gFile_graphics_pokemon_palettes_delibird_palette:: @ 8DC9448 .incbin "graphics/pokemon/palettes/delibird_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xDC9448, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_delibird_back_pic:: @ 8DC9470 .incbin "graphics/pokemon/back_pics/delibird_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xDC9470, 0x03C0 .align 2 gFile_graphics_pokemon_palettes_delibird_shiny_palette:: @ 8DC9830 .incbin "graphics/pokemon/palettes/delibird_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xDC9830, 0x0028 .align 2 gFile_graphics_pokemon_icons_delibird_icon:: @ 8DC9858 .incbin "graphics/pokemon/icons/delibird_icon.4bpp" - @ .incbin "baserom.gba", 0xDC9858, 0x0400 .align 2 gFile_graphics_pokemon_footprints_delibird_footprint:: @ 8DC9C58 .incbin "graphics/pokemon/footprints/delibird_footprint.1bpp" - @ .incbin "baserom.gba", 0xDC9C58, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_mantine_still_front_pic:: @ 8DC9C78 .incbin "graphics/pokemon/front_pics/mantine_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xDC9C78, 0x049C .align 2 gFile_graphics_pokemon_palettes_mantine_palette:: @ 8DCA114 .incbin "graphics/pokemon/palettes/mantine_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xDCA114, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_mantine_back_pic:: @ 8DCA13C .incbin "graphics/pokemon/back_pics/mantine_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xDCA13C, 0x02A0 .align 2 gFile_graphics_pokemon_palettes_mantine_shiny_palette:: @ 8DCA3DC .incbin "graphics/pokemon/palettes/mantine_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xDCA3DC, 0x0028 .align 2 gFile_graphics_pokemon_icons_mantine_icon:: @ 8DCA404 .incbin "graphics/pokemon/icons/mantine_icon.4bpp" - @ .incbin "baserom.gba", 0xDCA404, 0x0400 .align 2 gFile_graphics_pokemon_footprints_mantine_footprint:: @ 8DCA804 .incbin "graphics/pokemon/footprints/mantine_footprint.1bpp" - @ .incbin "baserom.gba", 0xDCA804, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_skarmory_still_front_pic:: @ 8DCA824 .incbin "graphics/pokemon/front_pics/skarmory_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xDCA824, 0x04E0 .align 2 gFile_graphics_pokemon_palettes_skarmory_palette:: @ 8DCAD04 .incbin "graphics/pokemon/palettes/skarmory_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xDCAD04, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_skarmory_back_pic:: @ 8DCAD2C .incbin "graphics/pokemon/back_pics/skarmory_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xDCAD2C, 0x0304 .align 2 gFile_graphics_pokemon_palettes_skarmory_shiny_palette:: @ 8DCB030 .incbin "graphics/pokemon/palettes/skarmory_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xDCB030, 0x0028 .align 2 gFile_graphics_pokemon_icons_skarmory_icon:: @ 8DCB058 .incbin "graphics/pokemon/icons/skarmory_icon.4bpp" - @ .incbin "baserom.gba", 0xDCB058, 0x0400 .align 2 gFile_graphics_pokemon_footprints_skarmory_footprint:: @ 8DCB458 .incbin "graphics/pokemon/footprints/skarmory_footprint.1bpp" - @ .incbin "baserom.gba", 0xDCB458, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_houndour_still_front_pic:: @ 8DCB478 .incbin "graphics/pokemon/front_pics/houndour_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xDCB478, 0x02B8 .align 2 gFile_graphics_pokemon_palettes_houndour_palette:: @ 8DCB730 .incbin "graphics/pokemon/palettes/houndour_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xDCB730, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_houndour_back_pic:: @ 8DCB758 .incbin "graphics/pokemon/back_pics/houndour_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xDCB758, 0x0280 .align 2 gFile_graphics_pokemon_palettes_houndour_shiny_palette:: @ 8DCB9D8 .incbin "graphics/pokemon/palettes/houndour_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xDCB9D8, 0x0028 .align 2 gFile_graphics_pokemon_icons_houndour_icon:: @ 8DCBA00 .incbin "graphics/pokemon/icons/houndour_icon.4bpp" - @ .incbin "baserom.gba", 0xDCBA00, 0x0400 .align 2 gFile_graphics_pokemon_footprints_houndour_footprint:: @ 8DCBE00 .incbin "graphics/pokemon/footprints/houndour_footprint.1bpp" - @ .incbin "baserom.gba", 0xDCBE00, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_houndoom_still_front_pic:: @ 8DCBE20 .incbin "graphics/pokemon/front_pics/houndoom_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xDCBE20, 0x0400 .align 2 gFile_graphics_pokemon_palettes_houndoom_palette:: @ 8DCC220 .incbin "graphics/pokemon/palettes/houndoom_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xDCC220, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_houndoom_back_pic:: @ 8DCC248 .incbin "graphics/pokemon/back_pics/houndoom_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xDCC248, 0x0324 .align 2 gFile_graphics_pokemon_palettes_houndoom_shiny_palette:: @ 8DCC56C .incbin "graphics/pokemon/palettes/houndoom_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xDCC56C, 0x0028 .align 2 gFile_graphics_pokemon_icons_houndoom_icon:: @ 8DCC594 .incbin "graphics/pokemon/icons/houndoom_icon.4bpp" - @ .incbin "baserom.gba", 0xDCC594, 0x0400 .align 2 gFile_graphics_pokemon_footprints_houndoom_footprint:: @ 8DCC994 .incbin "graphics/pokemon/footprints/houndoom_footprint.1bpp" - @ .incbin "baserom.gba", 0xDCC994, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_kingdra_still_front_pic:: @ 8DCC9B4 .incbin "graphics/pokemon/front_pics/kingdra_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xDCC9B4, 0x0420 .align 2 gFile_graphics_pokemon_palettes_kingdra_palette:: @ 8DCCDD4 .incbin "graphics/pokemon/palettes/kingdra_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xDCCDD4, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_kingdra_back_pic:: @ 8DCCDFC .incbin "graphics/pokemon/back_pics/kingdra_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xDCCDFC, 0x03B4 .align 2 gFile_graphics_pokemon_palettes_kingdra_shiny_palette:: @ 8DCD1B0 .incbin "graphics/pokemon/palettes/kingdra_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xDCD1B0, 0x0028 .align 2 gFile_graphics_pokemon_icons_kingdra_icon:: @ 8DCD1D8 .incbin "graphics/pokemon/icons/kingdra_icon.4bpp" - @ .incbin "baserom.gba", 0xDCD1D8, 0x0400 .align 2 gFile_graphics_pokemon_footprints_kingdra_footprint:: @ 8DCD5D8 .incbin "graphics/pokemon/footprints/kingdra_footprint.1bpp" - @ .incbin "baserom.gba", 0xDCD5D8, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_phanpy_still_front_pic:: @ 8DCD5F8 .incbin "graphics/pokemon/front_pics/phanpy_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xDCD5F8, 0x025C .align 2 gFile_graphics_pokemon_palettes_phanpy_palette:: @ 8DCD854 .incbin "graphics/pokemon/palettes/phanpy_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xDCD854, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_phanpy_back_pic:: @ 8DCD87C .incbin "graphics/pokemon/back_pics/phanpy_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xDCD87C, 0x02C4 .align 2 gFile_graphics_pokemon_palettes_phanpy_shiny_palette:: @ 8DCDB40 .incbin "graphics/pokemon/palettes/phanpy_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xDCDB40, 0x0028 .align 2 gFile_graphics_pokemon_icons_phanpy_icon:: @ 8DCDB68 .incbin "graphics/pokemon/icons/phanpy_icon.4bpp" - @ .incbin "baserom.gba", 0xDCDB68, 0x0400 .align 2 gFile_graphics_pokemon_footprints_phanpy_footprint:: @ 8DCDF68 .incbin "graphics/pokemon/footprints/phanpy_footprint.1bpp" - @ .incbin "baserom.gba", 0xDCDF68, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_donphan_still_front_pic:: @ 8DCDF88 .incbin "graphics/pokemon/front_pics/donphan_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xDCDF88, 0x0474 .align 2 gFile_graphics_pokemon_palettes_donphan_palette:: @ 8DCE3FC .incbin "graphics/pokemon/palettes/donphan_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xDCE3FC, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_donphan_back_pic:: @ 8DCE424 .incbin "graphics/pokemon/back_pics/donphan_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xDCE424, 0x02FC .align 2 gFile_graphics_pokemon_palettes_donphan_shiny_palette:: @ 8DCE720 .incbin "graphics/pokemon/palettes/donphan_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xDCE720, 0x0028 .align 2 gFile_graphics_pokemon_icons_donphan_icon:: @ 8DCE748 .incbin "graphics/pokemon/icons/donphan_icon.4bpp" - @ .incbin "baserom.gba", 0xDCE748, 0x0400 .align 2 gFile_graphics_pokemon_footprints_donphan_footprint:: @ 8DCEB48 .incbin "graphics/pokemon/footprints/donphan_footprint.1bpp" - @ .incbin "baserom.gba", 0xDCEB48, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_porygon2_still_front_pic:: @ 8DCEB68 .incbin "graphics/pokemon/front_pics/porygon2_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xDCEB68, 0x0288 .align 2 gFile_graphics_pokemon_palettes_porygon2_palette:: @ 8DCEDF0 .incbin "graphics/pokemon/palettes/porygon2_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xDCEDF0, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_porygon2_back_pic:: @ 8DCEE18 .incbin "graphics/pokemon/back_pics/porygon2_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xDCEE18, 0x031C .align 2 gFile_graphics_pokemon_palettes_porygon2_shiny_palette:: @ 8DCF134 .incbin "graphics/pokemon/palettes/porygon2_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xDCF134, 0x0028 .align 2 gFile_graphics_pokemon_icons_porygon2_icon:: @ 8DCF15C .incbin "graphics/pokemon/icons/porygon2_icon.4bpp" - @ .incbin "baserom.gba", 0xDCF15C, 0x0400 .align 2 gFile_graphics_pokemon_footprints_porygon2_footprint:: @ 8DCF55C .incbin "graphics/pokemon/footprints/porygon2_footprint.1bpp" - @ .incbin "baserom.gba", 0xDCF55C, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_stantler_still_front_pic:: @ 8DCF57C .incbin "graphics/pokemon/front_pics/stantler_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xDCF57C, 0x0414 .align 2 gFile_graphics_pokemon_palettes_stantler_palette:: @ 8DCF990 .incbin "graphics/pokemon/palettes/stantler_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xDCF990, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_stantler_back_pic:: @ 8DCF9B8 .incbin "graphics/pokemon/back_pics/stantler_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xDCF9B8, 0x034C .align 2 gFile_graphics_pokemon_palettes_stantler_shiny_palette:: @ 8DCFD04 .incbin "graphics/pokemon/palettes/stantler_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xDCFD04, 0x0028 .align 2 gFile_graphics_pokemon_icons_stantler_icon:: @ 8DCFD2C .incbin "graphics/pokemon/icons/stantler_icon.4bpp" - @ .incbin "baserom.gba", 0xDCFD2C, 0x0400 .align 2 gFile_graphics_pokemon_footprints_stantler_footprint:: @ 8DD012C .incbin "graphics/pokemon/footprints/stantler_footprint.1bpp" - @ .incbin "baserom.gba", 0xDD012C, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_smeargle_still_front_pic:: @ 8DD014C .incbin "graphics/pokemon/front_pics/smeargle_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xDD014C, 0x0394 .align 2 gFile_graphics_pokemon_palettes_smeargle_palette:: @ 8DD04E0 .incbin "graphics/pokemon/palettes/smeargle_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xDD04E0, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_smeargle_back_pic:: @ 8DD0508 .incbin "graphics/pokemon/back_pics/smeargle_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xDD0508, 0x0324 .align 2 gFile_graphics_pokemon_palettes_smeargle_shiny_palette:: @ 8DD082C .incbin "graphics/pokemon/palettes/smeargle_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xDD082C, 0x0028 .align 2 gFile_graphics_pokemon_icons_smeargle_icon:: @ 8DD0854 .incbin "graphics/pokemon/icons/smeargle_icon.4bpp" - @ .incbin "baserom.gba", 0xDD0854, 0x0400 .align 2 gFile_graphics_pokemon_footprints_smeargle_footprint:: @ 8DD0C54 .incbin "graphics/pokemon/footprints/smeargle_footprint.1bpp" - @ .incbin "baserom.gba", 0xDD0C54, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_tyrogue_still_front_pic:: @ 8DD0C74 .incbin "graphics/pokemon/front_pics/tyrogue_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xDD0C74, 0x028C .align 2 gFile_graphics_pokemon_palettes_tyrogue_palette:: @ 8DD0F00 .incbin "graphics/pokemon/palettes/tyrogue_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xDD0F00, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_tyrogue_back_pic:: @ 8DD0F28 .incbin "graphics/pokemon/back_pics/tyrogue_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xDD0F28, 0x031C .align 2 gFile_graphics_pokemon_palettes_tyrogue_shiny_palette:: @ 8DD1244 .incbin "graphics/pokemon/palettes/tyrogue_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xDD1244, 0x0028 .align 2 gFile_graphics_pokemon_icons_tyrogue_icon:: @ 8DD126C .incbin "graphics/pokemon/icons/tyrogue_icon.4bpp" - @ .incbin "baserom.gba", 0xDD126C, 0x0400 .align 2 gFile_graphics_pokemon_footprints_tyrogue_footprint:: @ 8DD166C .incbin "graphics/pokemon/footprints/tyrogue_footprint.1bpp" - @ .incbin "baserom.gba", 0xDD166C, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_hitmontop_still_front_pic:: @ 8DD168C .incbin "graphics/pokemon/front_pics/hitmontop_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xDD168C, 0x038C .align 2 gFile_graphics_pokemon_palettes_hitmontop_palette:: @ 8DD1A18 .incbin "graphics/pokemon/palettes/hitmontop_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xDD1A18, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_hitmontop_back_pic:: @ 8DD1A40 .incbin "graphics/pokemon/back_pics/hitmontop_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xDD1A40, 0x0428 .align 2 gFile_graphics_pokemon_palettes_hitmontop_shiny_palette:: @ 8DD1E68 .incbin "graphics/pokemon/palettes/hitmontop_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xDD1E68, 0x0028 .align 2 gFile_graphics_pokemon_icons_hitmontop_icon:: @ 8DD1E90 .incbin "graphics/pokemon/icons/hitmontop_icon.4bpp" - @ .incbin "baserom.gba", 0xDD1E90, 0x0400 gUnknown_hitmontop_blank_space:: @ 8DD2290 @.space 0x200 @@ -7630,6457 +6341,5166 @@ gUnknown_hitmontop_blank_space:: @ 8DD2290 .align 2 gFile_graphics_pokemon_footprints_hitmontop_footprint:: @ 8DD2490 .incbin "graphics/pokemon/footprints/hitmontop_footprint.1bpp" - @ .incbin "baserom.gba", 0xDD2490, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_smoochum_still_front_pic:: @ 8DD24B0 .incbin "graphics/pokemon/front_pics/smoochum_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xDD24B0, 0x0258 .align 2 gFile_graphics_pokemon_palettes_smoochum_palette:: @ 8DD2708 .incbin "graphics/pokemon/palettes/smoochum_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xDD2708, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_smoochum_back_pic:: @ 8DD2730 .incbin "graphics/pokemon/back_pics/smoochum_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xDD2730, 0x0278 .align 2 gFile_graphics_pokemon_palettes_smoochum_shiny_palette:: @ 8DD29A8 .incbin "graphics/pokemon/palettes/smoochum_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xDD29A8, 0x0028 .align 2 gFile_graphics_pokemon_icons_smoochum_icon:: @ 8DD29D0 .incbin "graphics/pokemon/icons/smoochum_icon.4bpp" - @ .incbin "baserom.gba", 0xDD29D0, 0x0400 .align 2 gFile_graphics_pokemon_footprints_smoochum_footprint:: @ 8DD2DD0 .incbin "graphics/pokemon/footprints/smoochum_footprint.1bpp" - @ .incbin "baserom.gba", 0xDD2DD0, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_elekid_still_front_pic:: @ 8DD2DF0 .incbin "graphics/pokemon/front_pics/elekid_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xDD2DF0, 0x0308 .align 2 gFile_graphics_pokemon_palettes_elekid_palette:: @ 8DD30F8 .incbin "graphics/pokemon/palettes/elekid_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xDD30F8, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_elekid_back_pic:: @ 8DD3120 .incbin "graphics/pokemon/back_pics/elekid_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xDD3120, 0x0358 .align 2 gFile_graphics_pokemon_palettes_elekid_shiny_palette:: @ 8DD3478 .incbin "graphics/pokemon/palettes/elekid_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xDD3478, 0x0028 .align 2 gFile_graphics_pokemon_icons_elekid_icon:: @ 8DD34A0 .incbin "graphics/pokemon/icons/elekid_icon.4bpp" - @ .incbin "baserom.gba", 0xDD34A0, 0x0400 .align 2 gFile_graphics_pokemon_footprints_elekid_footprint:: @ 8DD38A0 .incbin "graphics/pokemon/footprints/elekid_footprint.1bpp" - @ .incbin "baserom.gba", 0xDD38A0, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_magby_still_front_pic:: @ 8DD38C0 .incbin "graphics/pokemon/front_pics/magby_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xDD38C0, 0x0284 .align 2 gFile_graphics_pokemon_palettes_magby_palette:: @ 8DD3B44 .incbin "graphics/pokemon/palettes/magby_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xDD3B44, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_magby_back_pic:: @ 8DD3B6C .incbin "graphics/pokemon/back_pics/magby_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xDD3B6C, 0x02AC .align 2 gFile_graphics_pokemon_palettes_magby_shiny_palette:: @ 8DD3E18 .incbin "graphics/pokemon/palettes/magby_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xDD3E18, 0x0028 .align 2 gFile_graphics_pokemon_icons_magby_icon:: @ 8DD3E40 .incbin "graphics/pokemon/icons/magby_icon.4bpp" - @ .incbin "baserom.gba", 0xDD3E40, 0x0400 .align 2 gFile_graphics_pokemon_footprints_magby_footprint:: @ 8DD4240 .incbin "graphics/pokemon/footprints/magby_footprint.1bpp" - @ .incbin "baserom.gba", 0xDD4240, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_miltank_still_front_pic:: @ 8DD4260 .incbin "graphics/pokemon/front_pics/miltank_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xDD4260, 0x03B0 .align 2 gFile_graphics_pokemon_palettes_miltank_palette:: @ 8DD4610 .incbin "graphics/pokemon/palettes/miltank_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xDD4610, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_miltank_back_pic:: @ 8DD4638 .incbin "graphics/pokemon/back_pics/miltank_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xDD4638, 0x039C .align 2 gFile_graphics_pokemon_palettes_miltank_shiny_palette:: @ 8DD49D4 .incbin "graphics/pokemon/palettes/miltank_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xDD49D4, 0x0028 .align 2 gFile_graphics_pokemon_icons_miltank_icon:: @ 8DD49FC .incbin "graphics/pokemon/icons/miltank_icon.4bpp" - @ .incbin "baserom.gba", 0xDD49FC, 0x0400 .align 2 gFile_graphics_pokemon_footprints_miltank_footprint:: @ 8DD4DFC .incbin "graphics/pokemon/footprints/miltank_footprint.1bpp" - @ .incbin "baserom.gba", 0xDD4DFC, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_blissey_still_front_pic:: @ 8DD4E1C .incbin "graphics/pokemon/front_pics/blissey_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xDD4E1C, 0x03E8 .align 2 gFile_graphics_pokemon_palettes_blissey_palette:: @ 8DD5204 .incbin "graphics/pokemon/palettes/blissey_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xDD5204, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_blissey_back_pic:: @ 8DD522C .incbin "graphics/pokemon/back_pics/blissey_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xDD522C, 0x02CC .align 2 gFile_graphics_pokemon_palettes_blissey_shiny_palette:: @ 8DD54F8 .incbin "graphics/pokemon/palettes/blissey_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xDD54F8, 0x0028 .align 2 gFile_graphics_pokemon_icons_blissey_icon:: @ 8DD5520 .incbin "graphics/pokemon/icons/blissey_icon.4bpp" - @ .incbin "baserom.gba", 0xDD5520, 0x0400 .align 2 gFile_graphics_pokemon_footprints_blissey_footprint:: @ 8DD5920 .incbin "graphics/pokemon/footprints/blissey_footprint.1bpp" - @ .incbin "baserom.gba", 0xDD5920, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_raikou_still_front_pic:: @ 8DD5940 .incbin "graphics/pokemon/front_pics/raikou_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xDD5940, 0x057C .align 2 gFile_graphics_pokemon_palettes_raikou_palette:: @ 8DD5EBC .incbin "graphics/pokemon/palettes/raikou_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xDD5EBC, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_raikou_back_pic:: @ 8DD5EE4 .incbin "graphics/pokemon/back_pics/raikou_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xDD5EE4, 0x03A8 .align 2 gFile_graphics_pokemon_palettes_raikou_shiny_palette:: @ 8DD628C .incbin "graphics/pokemon/palettes/raikou_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xDD628C, 0x0028 .align 2 gFile_graphics_pokemon_icons_raikou_icon:: @ 8DD62B4 .incbin "graphics/pokemon/icons/raikou_icon.4bpp" - @ .incbin "baserom.gba", 0xDD62B4, 0x0400 .align 2 gFile_graphics_pokemon_footprints_raikou_footprint:: @ 8DD66B4 .incbin "graphics/pokemon/footprints/raikou_footprint.1bpp" - @ .incbin "baserom.gba", 0xDD66B4, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_entei_still_front_pic:: @ 8DD66D4 .incbin "graphics/pokemon/front_pics/entei_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xDD66D4, 0x05FC .align 2 gFile_graphics_pokemon_palettes_entei_palette:: @ 8DD6CD0 .incbin "graphics/pokemon/palettes/entei_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xDD6CD0, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_entei_back_pic:: @ 8DD6CF8 .incbin "graphics/pokemon/back_pics/entei_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xDD6CF8, 0x0424 .align 2 gFile_graphics_pokemon_palettes_entei_shiny_palette:: @ 8DD711C .incbin "graphics/pokemon/palettes/entei_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xDD711C, 0x0028 .align 2 gFile_graphics_pokemon_icons_entei_icon:: @ 8DD7144 .incbin "graphics/pokemon/icons/entei_icon.4bpp" - @ .incbin "baserom.gba", 0xDD7144, 0x0400 .align 2 gFile_graphics_pokemon_footprints_entei_footprint:: @ 8DD7544 .incbin "graphics/pokemon/footprints/entei_footprint.1bpp" - @ .incbin "baserom.gba", 0xDD7544, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_suicune_still_front_pic:: @ 8DD7564 .incbin "graphics/pokemon/front_pics/suicune_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xDD7564, 0x0584 .align 2 gFile_graphics_pokemon_palettes_suicune_palette:: @ 8DD7AE8 .incbin "graphics/pokemon/palettes/suicune_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xDD7AE8, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_suicune_back_pic:: @ 8DD7B10 .incbin "graphics/pokemon/back_pics/suicune_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xDD7B10, 0x04DC .align 2 gFile_graphics_pokemon_palettes_suicune_shiny_palette:: @ 8DD7FEC .incbin "graphics/pokemon/palettes/suicune_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xDD7FEC, 0x0028 .align 2 gFile_graphics_pokemon_icons_suicune_icon:: @ 8DD8014 .incbin "graphics/pokemon/icons/suicune_icon.4bpp" - @ .incbin "baserom.gba", 0xDD8014, 0x0400 .align 2 gFile_graphics_pokemon_footprints_suicune_footprint:: @ 8DD8414 .incbin "graphics/pokemon/footprints/suicune_footprint.1bpp" - @ .incbin "baserom.gba", 0xDD8414, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_larvitar_still_front_pic:: @ 8DD8434 .incbin "graphics/pokemon/front_pics/larvitar_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xDD8434, 0x025C .align 2 gFile_graphics_pokemon_palettes_larvitar_palette:: @ 8DD8690 .incbin "graphics/pokemon/palettes/larvitar_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xDD8690, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_larvitar_back_pic:: @ 8DD86B8 .incbin "graphics/pokemon/back_pics/larvitar_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xDD86B8, 0x02AC .align 2 gFile_graphics_pokemon_palettes_larvitar_shiny_palette:: @ 8DD8964 .incbin "graphics/pokemon/palettes/larvitar_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xDD8964, 0x0028 .align 2 gFile_graphics_pokemon_icons_larvitar_icon:: @ 8DD898C .incbin "graphics/pokemon/icons/larvitar_icon.4bpp" - @ .incbin "baserom.gba", 0xDD898C, 0x0400 .align 2 gFile_graphics_pokemon_footprints_larvitar_footprint:: @ 8DD8D8C .incbin "graphics/pokemon/footprints/larvitar_footprint.1bpp" - @ .incbin "baserom.gba", 0xDD8D8C, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_pupitar_still_front_pic:: @ 8DD8DAC .incbin "graphics/pokemon/front_pics/pupitar_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xDD8DAC, 0x02F0 .align 2 gFile_graphics_pokemon_palettes_pupitar_palette:: @ 8DD909C .incbin "graphics/pokemon/palettes/pupitar_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xDD909C, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_pupitar_back_pic:: @ 8DD90C4 .incbin "graphics/pokemon/back_pics/pupitar_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xDD90C4, 0x0338 .align 2 gFile_graphics_pokemon_palettes_pupitar_shiny_palette:: @ 8DD93FC .incbin "graphics/pokemon/palettes/pupitar_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xDD93FC, 0x0028 .align 2 gFile_graphics_pokemon_icons_pupitar_icon:: @ 8DD9424 .incbin "graphics/pokemon/icons/pupitar_icon.4bpp" - @ .incbin "baserom.gba", 0xDD9424, 0x0400 .align 2 gFile_graphics_pokemon_footprints_pupitar_footprint:: @ 8DD9824 .incbin "graphics/pokemon/footprints/pupitar_footprint.1bpp" - @ .incbin "baserom.gba", 0xDD9824, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_tyranitar_still_front_pic:: @ 8DD9844 .incbin "graphics/pokemon/front_pics/tyranitar_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xDD9844, 0x053C .align 2 gFile_graphics_pokemon_palettes_tyranitar_palette:: @ 8DD9D80 .incbin "graphics/pokemon/palettes/tyranitar_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xDD9D80, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_tyranitar_back_pic:: @ 8DD9DA8 .incbin "graphics/pokemon/back_pics/tyranitar_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xDD9DA8, 0x03EC .align 2 gFile_graphics_pokemon_palettes_tyranitar_shiny_palette:: @ 8DDA194 .incbin "graphics/pokemon/palettes/tyranitar_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xDDA194, 0x0028 .align 2 gFile_graphics_pokemon_icons_tyranitar_icon:: @ 8DDA1BC .incbin "graphics/pokemon/icons/tyranitar_icon.4bpp" - @ .incbin "baserom.gba", 0xDDA1BC, 0x0400 .align 2 gFile_graphics_pokemon_footprints_tyranitar_footprint:: @ 8DDA5BC .incbin "graphics/pokemon/footprints/tyranitar_footprint.1bpp" - @ .incbin "baserom.gba", 0xDDA5BC, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_lugia_still_front_pic:: @ 8DDA5DC .incbin "graphics/pokemon/front_pics/lugia_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xDDA5DC, 0x04C4 .align 2 gFile_graphics_pokemon_palettes_lugia_palette:: @ 8DDAAA0 .incbin "graphics/pokemon/palettes/lugia_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xDDAAA0, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_lugia_back_pic:: @ 8DDAAC8 .incbin "graphics/pokemon/back_pics/lugia_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xDDAAC8, 0x03D4 .align 2 gFile_graphics_pokemon_palettes_lugia_shiny_palette:: @ 8DDAE9C .incbin "graphics/pokemon/palettes/lugia_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xDDAE9C, 0x0028 .align 2 gFile_graphics_pokemon_icons_lugia_icon:: @ 8DDAEC4 .incbin "graphics/pokemon/icons/lugia_icon.4bpp" - @ .incbin "baserom.gba", 0xDDAEC4, 0x0400 .align 2 gFile_graphics_pokemon_footprints_lugia_footprint:: @ 8DDB2C4 .incbin "graphics/pokemon/footprints/lugia_footprint.1bpp" - @ .incbin "baserom.gba", 0xDDB2C4, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_ho_oh_still_front_pic:: @ 8DDB2E4 .incbin "graphics/pokemon/front_pics/ho_oh_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xDDB2E4, 0x0654 .align 2 gFile_graphics_pokemon_palettes_ho_oh_palette:: @ 8DDB938 .incbin "graphics/pokemon/palettes/ho_oh_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xDDB938, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_ho_oh_back_pic:: @ 8DDB960 .incbin "graphics/pokemon/back_pics/ho_oh_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xDDB960, 0x0410 .align 2 gFile_graphics_pokemon_palettes_ho_oh_shiny_palette:: @ 8DDBD70 .incbin "graphics/pokemon/palettes/ho_oh_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xDDBD70, 0x0028 .align 2 gFile_graphics_pokemon_icons_ho_oh_icon:: @ 8DDBD98 .incbin "graphics/pokemon/icons/ho_oh_icon.4bpp" - @ .incbin "baserom.gba", 0xDDBD98, 0x0400 .align 2 gFile_graphics_pokemon_footprints_ho_oh_footprint:: @ 8DDC198 .incbin "graphics/pokemon/footprints/ho_oh_footprint.1bpp" - @ .incbin "baserom.gba", 0xDDC198, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_celebi_still_front_pic:: @ 8DDC1B8 .incbin "graphics/pokemon/front_pics/celebi_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xDDC1B8, 0x0278 .align 2 gFile_graphics_pokemon_palettes_celebi_palette:: @ 8DDC430 .incbin "graphics/pokemon/palettes/celebi_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xDDC430, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_celebi_back_pic:: @ 8DDC458 .incbin "graphics/pokemon/back_pics/celebi_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xDDC458, 0x03AC .align 2 gFile_graphics_pokemon_palettes_celebi_shiny_palette:: @ 8DDC804 .incbin "graphics/pokemon/palettes/celebi_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xDDC804, 0x0028 .align 2 gFile_graphics_pokemon_icons_celebi_icon:: @ 8DDC82C .incbin "graphics/pokemon/icons/celebi_icon.4bpp" - @ .incbin "baserom.gba", 0xDDC82C, 0x0400 .align 2 gFile_graphics_pokemon_footprints_celebi_footprint:: @ 8DDCC2C .incbin "graphics/pokemon/footprints/celebi_footprint.1bpp" - @ .incbin "baserom.gba", 0xDDCC2C, 0x0020 .align 2 -gFile_graphics_pokemon_back_pics_double_question_mark_back_pic:: @ 8DDCC4C - .incbin "graphics/pokemon/back_pics/double_question_mark_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xDDCC4C, 0x0184 +gFile_graphics_pokemon_front_pics_double_question_mark_still_front_pic:: @ 8DDCC4C + .incbin "graphics/pokemon/front_pics/double_question_mark_still_front_pic.4bpp.lz" .align 2 gFile_graphics_pokemon_palettes_double_question_mark_palette:: @ 8DDCDD0 .incbin "graphics/pokemon/palettes/double_question_mark_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xDDCDD0, 0x0014 .align 2 -gFile_graphics_pokemon_back_pics_double_question_mark_back_pic2:: @ 8DDCDE4 - @ .incbin "graphics/pokemon/back_pics/double_question_mark_back_pic.4bpp.lz" - .incbin "baserom.gba", 0xDDCDE4, 0x0184 +gFile_graphics_pokemon_back_pics_double_question_mark_back_pic:: @ 8DDCDE4 + .incbin "graphics/pokemon/back_pics/double_question_mark_back_pic.4bpp.lz" .align 2 gFile_graphics_pokemon_palettes_double_question_mark_shiny_palette:: @ 8DDCF68 .incbin "graphics/pokemon/palettes/double_question_mark_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xDDCF68, 0x0014 .align 2 gFile_graphics_pokemon_front_pics_treecko_still_front_pic:: @ 8DDCF7C .incbin "graphics/pokemon/front_pics/treecko_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xDDCF7C, 0x0308 .align 2 gFile_graphics_pokemon_palettes_treecko_palette:: @ 8DDD284 .incbin "graphics/pokemon/palettes/treecko_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xDDD284, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_treecko_back_pic:: @ 8DDD2AC .incbin "graphics/pokemon/back_pics/treecko_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xDDD2AC, 0x0300 .align 2 gFile_graphics_pokemon_palettes_treecko_shiny_palette:: @ 8DDD5AC .incbin "graphics/pokemon/palettes/treecko_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xDDD5AC, 0x0028 .align 2 gFile_graphics_pokemon_icons_treecko_icon:: @ 8DDD5D4 .incbin "graphics/pokemon/icons/treecko_icon.4bpp" - @ .incbin "baserom.gba", 0xDDD5D4, 0x0400 .align 2 gFile_graphics_pokemon_footprints_treecko_footprint:: @ 8DDD9D4 .incbin "graphics/pokemon/footprints/treecko_footprint.1bpp" - @ .incbin "baserom.gba", 0xDDD9D4, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_grovyle_still_front_pic:: @ 8DDD9F4 .incbin "graphics/pokemon/front_pics/grovyle_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xDDD9F4, 0x048C .align 2 gFile_graphics_pokemon_palettes_grovyle_palette:: @ 8DDDE80 .incbin "graphics/pokemon/palettes/grovyle_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xDDDE80, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_grovyle_back_pic:: @ 8DDDEA8 .incbin "graphics/pokemon/back_pics/grovyle_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xDDDEA8, 0x033C .align 2 gFile_graphics_pokemon_palettes_grovyle_shiny_palette:: @ 8DDE1E4 .incbin "graphics/pokemon/palettes/grovyle_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xDDE1E4, 0x0028 .align 2 gFile_graphics_pokemon_icons_grovyle_icon:: @ 8DDE20C .incbin "graphics/pokemon/icons/grovyle_icon.4bpp" - @ .incbin "baserom.gba", 0xDDE20C, 0x0400 .align 2 gFile_graphics_pokemon_footprints_grovyle_footprint:: @ 8DDE60C .incbin "graphics/pokemon/footprints/grovyle_footprint.1bpp" - @ .incbin "baserom.gba", 0xDDE60C, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_sceptile_still_front_pic:: @ 8DDE62C .incbin "graphics/pokemon/front_pics/sceptile_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xDDE62C, 0x0504 .align 2 gFile_graphics_pokemon_palettes_sceptile_palette:: @ 8DDEB30 .incbin "graphics/pokemon/palettes/sceptile_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xDDEB30, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_sceptile_back_pic:: @ 8DDEB58 .incbin "graphics/pokemon/back_pics/sceptile_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xDDEB58, 0x03FC .align 2 gFile_graphics_pokemon_palettes_sceptile_shiny_palette:: @ 8DDEF54 .incbin "graphics/pokemon/palettes/sceptile_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xDDEF54, 0x0028 .align 2 gFile_graphics_pokemon_icons_sceptile_icon:: @ 8DDEF7C .incbin "graphics/pokemon/icons/sceptile_icon.4bpp" - @ .incbin "baserom.gba", 0xDDEF7C, 0x0400 .align 2 gFile_graphics_pokemon_footprints_sceptile_footprint:: @ 8DDF37C .incbin "graphics/pokemon/footprints/sceptile_footprint.1bpp" - @ .incbin "baserom.gba", 0xDDF37C, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_torchic_still_front_pic:: @ 8DDF39C .incbin "graphics/pokemon/front_pics/torchic_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xDDF39C, 0x029C .align 2 gFile_graphics_pokemon_palettes_torchic_palette:: @ 8DDF638 .incbin "graphics/pokemon/palettes/torchic_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xDDF638, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_torchic_back_pic:: @ 8DDF660 .incbin "graphics/pokemon/back_pics/torchic_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xDDF660, 0x02D8 .align 2 gFile_graphics_pokemon_palettes_torchic_shiny_palette:: @ 8DDF938 .incbin "graphics/pokemon/palettes/torchic_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xDDF938, 0x0028 .align 2 gFile_graphics_pokemon_icons_torchic_icon:: @ 8DDF960 .incbin "graphics/pokemon/icons/torchic_icon.4bpp" - @ .incbin "baserom.gba", 0xDDF960, 0x0400 .align 2 gFile_graphics_pokemon_footprints_torchic_footprint:: @ 8DDFD60 .incbin "graphics/pokemon/footprints/torchic_footprint.1bpp" - @ .incbin "baserom.gba", 0xDDFD60, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_combusken_still_front_pic:: @ 8DDFD80 .incbin "graphics/pokemon/front_pics/combusken_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xDDFD80, 0x03EC .align 2 gFile_graphics_pokemon_palettes_combusken_palette:: @ 8DE016C .incbin "graphics/pokemon/palettes/combusken_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xDE016C, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_combusken_back_pic:: @ 8DE0194 .incbin "graphics/pokemon/back_pics/combusken_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xDE0194, 0x03D0 .align 2 gFile_graphics_pokemon_palettes_combusken_shiny_palette:: @ 8DE0564 .incbin "graphics/pokemon/palettes/combusken_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xDE0564, 0x0028 .align 2 gFile_graphics_pokemon_icons_combusken_icon:: @ 8DE058C .incbin "graphics/pokemon/icons/combusken_icon.4bpp" - @ .incbin "baserom.gba", 0xDE058C, 0x0400 .align 2 gFile_graphics_pokemon_footprints_combusken_footprint:: @ 8DE098C .incbin "graphics/pokemon/footprints/combusken_footprint.1bpp" - @ .incbin "baserom.gba", 0xDE098C, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_blaziken_still_front_pic:: @ 8DE09AC - @ .incbin "graphics/pokemon/front_pics/blaziken_still_front_pic.4bpp.lz" - .incbin "baserom.gba", 0xDE09AC, 0x0478 + .incbin "graphics/pokemon/front_pics/blaziken_still_front_pic.4bpp.lz" .align 2 gFile_graphics_pokemon_palettes_blaziken_palette:: @ 8DE0E24 .incbin "graphics/pokemon/palettes/blaziken_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xDE0E24, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_blaziken_back_pic:: @ 8DE0E4C .incbin "graphics/pokemon/back_pics/blaziken_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xDE0E4C, 0x03DC .align 2 gFile_graphics_pokemon_palettes_blaziken_shiny_palette:: @ 8DE1228 .incbin "graphics/pokemon/palettes/blaziken_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xDE1228, 0x0028 .align 2 gFile_graphics_pokemon_icons_blaziken_icon:: @ 8DE1250 .incbin "graphics/pokemon/icons/blaziken_icon.4bpp" - @ .incbin "baserom.gba", 0xDE1250, 0x0400 .align 2 gFile_graphics_pokemon_footprints_blaziken_footprint:: @ 8DE1650 .incbin "graphics/pokemon/footprints/blaziken_footprint.1bpp" - @ .incbin "baserom.gba", 0xDE1650, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_mudkip_still_front_pic:: @ 8DE1670 .incbin "graphics/pokemon/front_pics/mudkip_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xDE1670, 0x02B8 .align 2 gFile_graphics_pokemon_palettes_mudkip_palette:: @ 8DE1928 .incbin "graphics/pokemon/palettes/mudkip_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xDE1928, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_mudkip_back_pic:: @ 8DE1950 .incbin "graphics/pokemon/back_pics/mudkip_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xDE1950, 0x02E0 .align 2 gFile_graphics_pokemon_palettes_mudkip_shiny_palette:: @ 8DE1C30 .incbin "graphics/pokemon/palettes/mudkip_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xDE1C30, 0x0028 .align 2 gFile_graphics_pokemon_icons_mudkip_icon:: @ 8DE1C58 .incbin "graphics/pokemon/icons/mudkip_icon.4bpp" - @ .incbin "baserom.gba", 0xDE1C58, 0x0400 .align 2 gFile_graphics_pokemon_footprints_mudkip_footprint:: @ 8DE2058 .incbin "graphics/pokemon/footprints/mudkip_footprint.1bpp" - @ .incbin "baserom.gba", 0xDE2058, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_marshtomp_still_front_pic:: @ 8DE2078 .incbin "graphics/pokemon/front_pics/marshtomp_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xDE2078, 0x0388 .align 2 gFile_graphics_pokemon_palettes_marshtomp_palette:: @ 8DE2400 .incbin "graphics/pokemon/palettes/marshtomp_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xDE2400, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_marshtomp_back_pic:: @ 8DE2428 .incbin "graphics/pokemon/back_pics/marshtomp_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xDE2428, 0x03B0 .align 2 gFile_graphics_pokemon_palettes_marshtomp_shiny_palette:: @ 8DE27D8 .incbin "graphics/pokemon/palettes/marshtomp_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xDE27D8, 0x0028 .align 2 gFile_graphics_pokemon_icons_marshtomp_icon:: @ 8DE2800 .incbin "graphics/pokemon/icons/marshtomp_icon.4bpp" - @ .incbin "baserom.gba", 0xDE2800, 0x0400 .align 2 gFile_graphics_pokemon_footprints_marshtomp_footprint:: @ 8DE2C00 .incbin "graphics/pokemon/footprints/marshtomp_footprint.1bpp" - @ .incbin "baserom.gba", 0xDE2C00, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_swampert_still_front_pic:: @ 8DE2C20 .incbin "graphics/pokemon/front_pics/swampert_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xDE2C20, 0x057C .align 2 gFile_graphics_pokemon_palettes_swampert_palette:: @ 8DE319C .incbin "graphics/pokemon/palettes/swampert_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xDE319C, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_swampert_back_pic:: @ 8DE31C4 .incbin "graphics/pokemon/back_pics/swampert_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xDE31C4, 0x03B4 .align 2 gFile_graphics_pokemon_palettes_swampert_shiny_palette:: @ 8DE3578 .incbin "graphics/pokemon/palettes/swampert_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xDE3578, 0x0028 .align 2 gFile_graphics_pokemon_icons_swampert_icon:: @ 8DE35A0 .incbin "graphics/pokemon/icons/swampert_icon.4bpp" - @ .incbin "baserom.gba", 0xDE35A0, 0x0400 .align 2 gFile_graphics_pokemon_footprints_swampert_footprint:: @ 8DE39A0 .incbin "graphics/pokemon/footprints/swampert_footprint.1bpp" - @ .incbin "baserom.gba", 0xDE39A0, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_poochyena_still_front_pic:: @ 8DE39C0 .incbin "graphics/pokemon/front_pics/poochyena_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xDE39C0, 0x02C8 .align 2 gFile_graphics_pokemon_palettes_poochyena_palette:: @ 8DE3C88 .incbin "graphics/pokemon/palettes/poochyena_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xDE3C88, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_poochyena_back_pic:: @ 8DE3CB0 .incbin "graphics/pokemon/back_pics/poochyena_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xDE3CB0, 0x032C .align 2 gFile_graphics_pokemon_palettes_poochyena_shiny_palette:: @ 8DE3FDC .incbin "graphics/pokemon/palettes/poochyena_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xDE3FDC, 0x0028 .align 2 gFile_graphics_pokemon_icons_poochyena_icon:: @ 8DE4004 .incbin "graphics/pokemon/icons/poochyena_icon.4bpp" - @ .incbin "baserom.gba", 0xDE4004, 0x0400 .align 2 gFile_graphics_pokemon_footprints_poochyena_footprint:: @ 8DE4404 .incbin "graphics/pokemon/footprints/poochyena_footprint.1bpp" - @ .incbin "baserom.gba", 0xDE4404, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_mightyena_still_front_pic:: @ 8DE4424 .incbin "graphics/pokemon/front_pics/mightyena_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xDE4424, 0x0438 .align 2 gFile_graphics_pokemon_palettes_mightyena_palette:: @ 8DE485C .incbin "graphics/pokemon/palettes/mightyena_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xDE485C, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_mightyena_back_pic:: @ 8DE4884 .incbin "graphics/pokemon/back_pics/mightyena_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xDE4884, 0x0378 .align 2 gFile_graphics_pokemon_palettes_mightyena_shiny_palette:: @ 8DE4BFC .incbin "graphics/pokemon/palettes/mightyena_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xDE4BFC, 0x0028 .align 2 gFile_graphics_pokemon_icons_mightyena_icon:: @ 8DE4C24 .incbin "graphics/pokemon/icons/mightyena_icon.4bpp" - @ .incbin "baserom.gba", 0xDE4C24, 0x0400 .align 2 gFile_graphics_pokemon_footprints_mightyena_footprint:: @ 8DE5024 .incbin "graphics/pokemon/footprints/mightyena_footprint.1bpp" - @ .incbin "baserom.gba", 0xDE5024, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_zigzagoon_still_front_pic:: @ 8DE5044 .incbin "graphics/pokemon/front_pics/zigzagoon_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xDE5044, 0x03D0 .align 2 gFile_graphics_pokemon_palettes_zigzagoon_palette:: @ 8DE5414 .incbin "graphics/pokemon/palettes/zigzagoon_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xDE5414, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_zigzagoon_back_pic:: @ 8DE543C .incbin "graphics/pokemon/back_pics/zigzagoon_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xDE543C, 0x0340 .align 2 gFile_graphics_pokemon_palettes_zigzagoon_shiny_palette:: @ 8DE577C .incbin "graphics/pokemon/palettes/zigzagoon_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xDE577C, 0x0028 .align 2 gFile_graphics_pokemon_icons_zigzagoon_icon:: @ 8DE57A4 .incbin "graphics/pokemon/icons/zigzagoon_icon.4bpp" - @ .incbin "baserom.gba", 0xDE57A4, 0x0400 .align 2 gFile_graphics_pokemon_footprints_zigzagoon_footprint:: @ 8DE5BA4 .incbin "graphics/pokemon/footprints/zigzagoon_footprint.1bpp" - @ .incbin "baserom.gba", 0xDE5BA4, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_linoone_still_front_pic:: @ 8DE5BC4 .incbin "graphics/pokemon/front_pics/linoone_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xDE5BC4, 0x0370 .align 2 gFile_graphics_pokemon_palettes_linoone_palette:: @ 8DE5F34 .incbin "graphics/pokemon/palettes/linoone_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xDE5F34, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_linoone_back_pic:: @ 8DE5F5C .incbin "graphics/pokemon/back_pics/linoone_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xDE5F5C, 0x02D4 .align 2 gFile_graphics_pokemon_palettes_linoone_shiny_palette:: @ 8DE6230 .incbin "graphics/pokemon/palettes/linoone_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xDE6230, 0x0028 .align 2 gFile_graphics_pokemon_icons_linoone_icon:: @ 8DE6258 .incbin "graphics/pokemon/icons/linoone_icon.4bpp" - @ .incbin "baserom.gba", 0xDE6258, 0x0400 .align 2 gFile_graphics_pokemon_footprints_linoone_footprint:: @ 8DE6658 .incbin "graphics/pokemon/footprints/linoone_footprint.1bpp" - @ .incbin "baserom.gba", 0xDE6658, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_wurmple_still_front_pic:: @ 8DE6678 .incbin "graphics/pokemon/front_pics/wurmple_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xDE6678, 0x0288 .align 2 gFile_graphics_pokemon_palettes_wurmple_palette:: @ 8DE6900 .incbin "graphics/pokemon/palettes/wurmple_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xDE6900, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_wurmple_back_pic:: @ 8DE6928 .incbin "graphics/pokemon/back_pics/wurmple_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xDE6928, 0x024C .align 2 gFile_graphics_pokemon_palettes_wurmple_shiny_palette:: @ 8DE6B74 .incbin "graphics/pokemon/palettes/wurmple_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xDE6B74, 0x0028 .align 2 gFile_graphics_pokemon_icons_wurmple_icon:: @ 8DE6B9C .incbin "graphics/pokemon/icons/wurmple_icon.4bpp" - @ .incbin "baserom.gba", 0xDE6B9C, 0x0400 .align 2 gFile_graphics_pokemon_footprints_wurmple_footprint:: @ 8DE6F9C .incbin "graphics/pokemon/footprints/wurmple_footprint.1bpp" - @ .incbin "baserom.gba", 0xDE6F9C, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_silcoon_still_front_pic:: @ 8DE6FBC .incbin "graphics/pokemon/front_pics/silcoon_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xDE6FBC, 0x0280 .align 2 gFile_graphics_pokemon_palettes_silcoon_palette:: @ 8DE723C .incbin "graphics/pokemon/palettes/silcoon_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xDE723C, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_silcoon_back_pic:: @ 8DE7264 .incbin "graphics/pokemon/back_pics/silcoon_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xDE7264, 0x021C .align 2 gFile_graphics_pokemon_palettes_silcoon_shiny_palette:: @ 8DE7480 .incbin "graphics/pokemon/palettes/silcoon_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xDE7480, 0x0028 .align 2 gFile_graphics_pokemon_icons_silcoon_icon:: @ 8DE74A8 .incbin "graphics/pokemon/icons/silcoon_icon.4bpp" - @ .incbin "baserom.gba", 0xDE74A8, 0x0400 .align 2 gFile_graphics_pokemon_footprints_silcoon_footprint:: @ 8DE78A8 .incbin "graphics/pokemon/footprints/silcoon_footprint.1bpp" - @ .incbin "baserom.gba", 0xDE78A8, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_beautifly_still_front_pic:: @ 8DE78C8 .incbin "graphics/pokemon/front_pics/beautifly_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xDE78C8, 0x0358 .align 2 gFile_graphics_pokemon_palettes_beautifly_palette:: @ 8DE7C20 .incbin "graphics/pokemon/palettes/beautifly_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xDE7C20, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_beautifly_back_pic:: @ 8DE7C48 .incbin "graphics/pokemon/back_pics/beautifly_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xDE7C48, 0x03B0 .align 2 gFile_graphics_pokemon_palettes_beautifly_shiny_palette:: @ 8DE7FF8 .incbin "graphics/pokemon/palettes/beautifly_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xDE7FF8, 0x0028 .align 2 gFile_graphics_pokemon_icons_beautifly_icon:: @ 8DE8020 .incbin "graphics/pokemon/icons/beautifly_icon.4bpp" - @ .incbin "baserom.gba", 0xDE8020, 0x0400 .align 2 gFile_graphics_pokemon_footprints_beautifly_footprint:: @ 8DE8420 .incbin "graphics/pokemon/footprints/beautifly_footprint.1bpp" - @ .incbin "baserom.gba", 0xDE8420, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_cascoon_still_front_pic:: @ 8DE8440 .incbin "graphics/pokemon/front_pics/cascoon_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xDE8440, 0x026C .align 2 gFile_graphics_pokemon_palettes_cascoon_palette:: @ 8DE86AC .incbin "graphics/pokemon/palettes/cascoon_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xDE86AC, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_cascoon_back_pic:: @ 8DE86D4 .incbin "graphics/pokemon/back_pics/cascoon_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xDE86D4, 0x0210 .align 2 gFile_graphics_pokemon_palettes_cascoon_shiny_palette:: @ 8DE88E4 .incbin "graphics/pokemon/palettes/cascoon_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xDE88E4, 0x0028 .align 2 gFile_graphics_pokemon_icons_cascoon_icon:: @ 8DE890C .incbin "graphics/pokemon/icons/cascoon_icon.4bpp" - @ .incbin "baserom.gba", 0xDE890C, 0x0400 .align 2 gFile_graphics_pokemon_footprints_cascoon_footprint:: @ 8DE8D0C .incbin "graphics/pokemon/footprints/cascoon_footprint.1bpp" - @ .incbin "baserom.gba", 0xDE8D0C, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_dustox_still_front_pic:: @ 8DE8D2C .incbin "graphics/pokemon/front_pics/dustox_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xDE8D2C, 0x0368 .align 2 gFile_graphics_pokemon_palettes_dustox_palette:: @ 8DE9094 .incbin "graphics/pokemon/palettes/dustox_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xDE9094, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_dustox_back_pic:: @ 8DE90BC .incbin "graphics/pokemon/back_pics/dustox_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xDE90BC, 0x0258 .align 2 gFile_graphics_pokemon_palettes_dustox_shiny_palette:: @ 8DE9314 .incbin "graphics/pokemon/palettes/dustox_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xDE9314, 0x0028 .align 2 gFile_graphics_pokemon_icons_dustox_icon:: @ 8DE933C .incbin "graphics/pokemon/icons/dustox_icon.4bpp" - @ .incbin "baserom.gba", 0xDE933C, 0x0400 .align 2 gFile_graphics_pokemon_footprints_dustox_footprint:: @ 8DE973C .incbin "graphics/pokemon/footprints/dustox_footprint.1bpp" - @ .incbin "baserom.gba", 0xDE973C, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_lotad_still_front_pic:: @ 8DE975C .incbin "graphics/pokemon/front_pics/lotad_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xDE975C, 0x0260 .align 2 gFile_graphics_pokemon_palettes_lotad_palette:: @ 8DE99BC .incbin "graphics/pokemon/palettes/lotad_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xDE99BC, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_lotad_back_pic:: @ 8DE99E4 .incbin "graphics/pokemon/back_pics/lotad_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xDE99E4, 0x02E8 .align 2 gFile_graphics_pokemon_palettes_lotad_shiny_palette:: @ 8DE9CCC .incbin "graphics/pokemon/palettes/lotad_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xDE9CCC, 0x0028 .align 2 gFile_graphics_pokemon_icons_lotad_icon:: @ 8DE9CF4 .incbin "graphics/pokemon/icons/lotad_icon.4bpp" - @ .incbin "baserom.gba", 0xDE9CF4, 0x0400 .align 2 gFile_graphics_pokemon_footprints_lotad_footprint:: @ 8DEA0F4 .incbin "graphics/pokemon/footprints/lotad_footprint.1bpp" - @ .incbin "baserom.gba", 0xDEA0F4, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_lombre_still_front_pic:: @ 8DEA114 .incbin "graphics/pokemon/front_pics/lombre_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xDEA114, 0x0318 .align 2 gFile_graphics_pokemon_palettes_lombre_palette:: @ 8DEA42C .incbin "graphics/pokemon/palettes/lombre_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xDEA42C, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_lombre_back_pic:: @ 8DEA454 .incbin "graphics/pokemon/back_pics/lombre_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xDEA454, 0x02FC .align 2 gFile_graphics_pokemon_palettes_lombre_shiny_palette:: @ 8DEA750 .incbin "graphics/pokemon/palettes/lombre_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xDEA750, 0x0028 .align 2 gFile_graphics_pokemon_icons_lombre_icon:: @ 8DEA778 .incbin "graphics/pokemon/icons/lombre_icon.4bpp" - @ .incbin "baserom.gba", 0xDEA778, 0x0400 .align 2 gFile_graphics_pokemon_footprints_lombre_footprint:: @ 8DEAB78 .incbin "graphics/pokemon/footprints/lombre_footprint.1bpp" - @ .incbin "baserom.gba", 0xDEAB78, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_ludicolo_still_front_pic:: @ 8DEAB98 .incbin "graphics/pokemon/front_pics/ludicolo_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xDEAB98, 0x04E4 .align 2 gFile_graphics_pokemon_palettes_ludicolo_palette:: @ 8DEB07C .incbin "graphics/pokemon/palettes/ludicolo_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xDEB07C, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_ludicolo_back_pic:: @ 8DEB0A4 .incbin "graphics/pokemon/back_pics/ludicolo_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xDEB0A4, 0x02FC .align 2 gFile_graphics_pokemon_palettes_ludicolo_shiny_palette:: @ 8DEB3A0 .incbin "graphics/pokemon/palettes/ludicolo_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xDEB3A0, 0x0028 .align 2 gFile_graphics_pokemon_icons_ludicolo_icon:: @ 8DEB3C8 .incbin "graphics/pokemon/icons/ludicolo_icon.4bpp" - @ .incbin "baserom.gba", 0xDEB3C8, 0x0400 .align 2 gFile_graphics_pokemon_footprints_ludicolo_footprint:: @ 8DEB7C8 .incbin "graphics/pokemon/footprints/ludicolo_footprint.1bpp" - @ .incbin "baserom.gba", 0xDEB7C8, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_seedot_still_front_pic:: @ 8DEB7E8 .incbin "graphics/pokemon/front_pics/seedot_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xDEB7E8, 0x0294 .align 2 gFile_graphics_pokemon_palettes_seedot_palette:: @ 8DEBA7C .incbin "graphics/pokemon/palettes/seedot_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xDEBA7C, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_seedot_back_pic:: @ 8DEBAA4 .incbin "graphics/pokemon/back_pics/seedot_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xDEBAA4, 0x02E0 .align 2 gFile_graphics_pokemon_palettes_seedot_shiny_palette:: @ 8DEBD84 .incbin "graphics/pokemon/palettes/seedot_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xDEBD84, 0x0028 .align 2 gFile_graphics_pokemon_icons_seedot_icon:: @ 8DEBDAC .incbin "graphics/pokemon/icons/seedot_icon.4bpp" - @ .incbin "baserom.gba", 0xDEBDAC, 0x0400 .align 2 gFile_graphics_pokemon_footprints_seedot_footprint:: @ 8DEC1AC .incbin "graphics/pokemon/footprints/seedot_footprint.1bpp" - @ .incbin "baserom.gba", 0xDEC1AC, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_nuzleaf_still_front_pic:: @ 8DEC1CC .incbin "graphics/pokemon/front_pics/nuzleaf_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xDEC1CC, 0x02EC .align 2 gFile_graphics_pokemon_palettes_nuzleaf_palette:: @ 8DEC4B8 .incbin "graphics/pokemon/palettes/nuzleaf_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xDEC4B8, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_nuzleaf_back_pic:: @ 8DEC4E0 .incbin "graphics/pokemon/back_pics/nuzleaf_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xDEC4E0, 0x02C8 .align 2 gFile_graphics_pokemon_palettes_nuzleaf_shiny_palette:: @ 8DEC7A8 .incbin "graphics/pokemon/palettes/nuzleaf_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xDEC7A8, 0x0028 .align 2 gFile_graphics_pokemon_icons_nuzleaf_icon:: @ 8DEC7D0 .incbin "graphics/pokemon/icons/nuzleaf_icon.4bpp" - @ .incbin "baserom.gba", 0xDEC7D0, 0x0400 .align 2 gFile_graphics_pokemon_footprints_nuzleaf_footprint:: @ 8DECBD0 .incbin "graphics/pokemon/footprints/nuzleaf_footprint.1bpp" - @ .incbin "baserom.gba", 0xDECBD0, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_shiftry_still_front_pic:: @ 8DECBF0 .incbin "graphics/pokemon/front_pics/shiftry_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xDECBF0, 0x04BC .align 2 gFile_graphics_pokemon_palettes_shiftry_palette:: @ 8DED0AC .incbin "graphics/pokemon/palettes/shiftry_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xDED0AC, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_shiftry_back_pic:: @ 8DED0D4 .incbin "graphics/pokemon/back_pics/shiftry_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xDED0D4, 0x02C4 .align 2 gFile_graphics_pokemon_palettes_shiftry_shiny_palette:: @ 8DED398 .incbin "graphics/pokemon/palettes/shiftry_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xDED398, 0x0028 .align 2 gFile_graphics_pokemon_icons_shiftry_icon:: @ 8DED3C0 .incbin "graphics/pokemon/icons/shiftry_icon.4bpp" - @ .incbin "baserom.gba", 0xDED3C0, 0x0400 .align 2 gFile_graphics_pokemon_footprints_shiftry_footprint:: @ 8DED7C0 .incbin "graphics/pokemon/footprints/shiftry_footprint.1bpp" - @ .incbin "baserom.gba", 0xDED7C0, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_nincada_still_front_pic:: @ 8DED7E0 .incbin "graphics/pokemon/front_pics/nincada_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xDED7E0, 0x02A0 .align 2 gFile_graphics_pokemon_palettes_nincada_palette:: @ 8DEDA80 .incbin "graphics/pokemon/palettes/nincada_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xDEDA80, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_nincada_back_pic:: @ 8DEDAA8 .incbin "graphics/pokemon/back_pics/nincada_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xDEDAA8, 0x02B8 .align 2 gFile_graphics_pokemon_palettes_nincada_shiny_palette:: @ 8DEDD60 .incbin "graphics/pokemon/palettes/nincada_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xDEDD60, 0x0028 .align 2 gFile_graphics_pokemon_icons_nincada_icon:: @ 8DEDD88 .incbin "graphics/pokemon/icons/nincada_icon.4bpp" - @ .incbin "baserom.gba", 0xDEDD88, 0x0400 .align 2 gFile_graphics_pokemon_footprints_nincada_footprint:: @ 8DEE188 .incbin "graphics/pokemon/footprints/nincada_footprint.1bpp" - @ .incbin "baserom.gba", 0xDEE188, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_ninjask_still_front_pic:: @ 8DEE1A8 .incbin "graphics/pokemon/front_pics/ninjask_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xDEE1A8, 0x0370 .align 2 gFile_graphics_pokemon_palettes_ninjask_palette:: @ 8DEE518 .incbin "graphics/pokemon/palettes/ninjask_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xDEE518, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_ninjask_back_pic:: @ 8DEE540 .incbin "graphics/pokemon/back_pics/ninjask_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xDEE540, 0x03CC .align 2 gFile_graphics_pokemon_palettes_ninjask_shiny_palette:: @ 8DEE90C .incbin "graphics/pokemon/palettes/ninjask_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xDEE90C, 0x0028 .align 2 gFile_graphics_pokemon_icons_ninjask_icon:: @ 8DEE934 .incbin "graphics/pokemon/icons/ninjask_icon.4bpp" - @ .incbin "baserom.gba", 0xDEE934, 0x0400 .align 2 gFile_graphics_pokemon_footprints_ninjask_footprint:: @ 8DEED34 .incbin "graphics/pokemon/footprints/ninjask_footprint.1bpp" - @ .incbin "baserom.gba", 0xDEED34, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_shedinja_still_front_pic:: @ 8DEED54 .incbin "graphics/pokemon/front_pics/shedinja_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xDEED54, 0x0320 .align 2 gFile_graphics_pokemon_palettes_shedinja_palette:: @ 8DEF074 .incbin "graphics/pokemon/palettes/shedinja_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xDEF074, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_shedinja_back_pic:: @ 8DEF09C .incbin "graphics/pokemon/back_pics/shedinja_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xDEF09C, 0x03A0 .align 2 gFile_graphics_pokemon_palettes_shedinja_shiny_palette:: @ 8DEF43C .incbin "graphics/pokemon/palettes/shedinja_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xDEF43C, 0x0028 .align 2 gFile_graphics_pokemon_icons_shedinja_icon:: @ 8DEF464 .incbin "graphics/pokemon/icons/shedinja_icon.4bpp" - @ .incbin "baserom.gba", 0xDEF464, 0x0400 .align 2 gFile_graphics_pokemon_footprints_shedinja_footprint:: @ 8DEF864 .incbin "graphics/pokemon/footprints/shedinja_footprint.1bpp" - @ .incbin "baserom.gba", 0xDEF864, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_taillow_still_front_pic:: @ 8DEF884 .incbin "graphics/pokemon/front_pics/taillow_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xDEF884, 0x0258 .align 2 gFile_graphics_pokemon_palettes_taillow_palette:: @ 8DEFADC .incbin "graphics/pokemon/palettes/taillow_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xDEFADC, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_taillow_back_pic:: @ 8DEFB04 .incbin "graphics/pokemon/back_pics/taillow_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xDEFB04, 0x0220 .align 2 gFile_graphics_pokemon_palettes_taillow_shiny_palette:: @ 8DEFD24 .incbin "graphics/pokemon/palettes/taillow_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xDEFD24, 0x0028 .align 2 gFile_graphics_pokemon_icons_taillow_icon:: @ 8DEFD4C .incbin "graphics/pokemon/icons/taillow_icon.4bpp" - @ .incbin "baserom.gba", 0xDEFD4C, 0x0400 .align 2 gFile_graphics_pokemon_footprints_taillow_footprint:: @ 8DF014C .incbin "graphics/pokemon/footprints/taillow_footprint.1bpp" - @ .incbin "baserom.gba", 0xDF014C, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_swellow_still_front_pic:: @ 8DF016C .incbin "graphics/pokemon/front_pics/swellow_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xDF016C, 0x03C4 .align 2 gFile_graphics_pokemon_palettes_swellow_palette:: @ 8DF0530 .incbin "graphics/pokemon/palettes/swellow_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xDF0530, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_swellow_back_pic:: @ 8DF0558 .incbin "graphics/pokemon/back_pics/swellow_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xDF0558, 0x0338 .align 2 gFile_graphics_pokemon_palettes_swellow_shiny_palette:: @ 8DF0890 .incbin "graphics/pokemon/palettes/swellow_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xDF0890, 0x0028 .align 2 gFile_graphics_pokemon_icons_swellow_icon:: @ 8DF08B8 .incbin "graphics/pokemon/icons/swellow_icon.4bpp" - @ .incbin "baserom.gba", 0xDF08B8, 0x0400 .align 2 gFile_graphics_pokemon_footprints_swellow_footprint:: @ 8DF0CB8 .incbin "graphics/pokemon/footprints/swellow_footprint.1bpp" - @ .incbin "baserom.gba", 0xDF0CB8, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_shroomish_still_front_pic:: @ 8DF0CD8 .incbin "graphics/pokemon/front_pics/shroomish_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xDF0CD8, 0x0268 .align 2 gFile_graphics_pokemon_palettes_shroomish_palette:: @ 8DF0F40 .incbin "graphics/pokemon/palettes/shroomish_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xDF0F40, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_shroomish_back_pic:: @ 8DF0F68 .incbin "graphics/pokemon/back_pics/shroomish_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xDF0F68, 0x02E0 .align 2 gFile_graphics_pokemon_palettes_shroomish_shiny_palette:: @ 8DF1248 .incbin "graphics/pokemon/palettes/shroomish_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xDF1248, 0x0028 .align 2 gFile_graphics_pokemon_icons_shroomish_icon:: @ 8DF1270 .incbin "graphics/pokemon/icons/shroomish_icon.4bpp" - @ .incbin "baserom.gba", 0xDF1270, 0x0400 .align 2 gFile_graphics_pokemon_footprints_shroomish_footprint:: @ 8DF1670 .incbin "graphics/pokemon/footprints/shroomish_footprint.1bpp" - @ .incbin "baserom.gba", 0xDF1670, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_breloom_still_front_pic:: @ 8DF1690 .incbin "graphics/pokemon/front_pics/breloom_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xDF1690, 0x03E8 .align 2 gFile_graphics_pokemon_palettes_breloom_palette:: @ 8DF1A78 .incbin "graphics/pokemon/palettes/breloom_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xDF1A78, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_breloom_back_pic:: @ 8DF1AA0 .incbin "graphics/pokemon/back_pics/breloom_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xDF1AA0, 0x03E0 .align 2 gFile_graphics_pokemon_palettes_breloom_shiny_palette:: @ 8DF1E80 .incbin "graphics/pokemon/palettes/breloom_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xDF1E80, 0x0028 .align 2 gFile_graphics_pokemon_icons_breloom_icon:: @ 8DF1EA8 .incbin "graphics/pokemon/icons/breloom_icon.4bpp" - @ .incbin "baserom.gba", 0xDF1EA8, 0x0400 .align 2 gFile_graphics_pokemon_footprints_breloom_footprint:: @ 8DF22A8 .incbin "graphics/pokemon/footprints/breloom_footprint.1bpp" - @ .incbin "baserom.gba", 0xDF22A8, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_spinda_still_front_pic:: @ 8DF22C8 .incbin "graphics/pokemon/front_pics/spinda_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xDF22C8, 0x0300 .align 2 gFile_graphics_pokemon_palettes_spinda_palette:: @ 8DF25C8 .incbin "graphics/pokemon/palettes/spinda_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xDF25C8, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_spinda_back_pic:: @ 8DF25F0 .incbin "graphics/pokemon/back_pics/spinda_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xDF25F0, 0x033C .align 2 gFile_graphics_pokemon_palettes_spinda_shiny_palette:: @ 8DF292C .incbin "graphics/pokemon/palettes/spinda_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xDF292C, 0x0028 .align 2 gFile_graphics_pokemon_icons_spinda_icon:: @ 8DF2954 .incbin "graphics/pokemon/icons/spinda_icon.4bpp" - @ .incbin "baserom.gba", 0xDF2954, 0x0400 .align 2 gFile_graphics_pokemon_footprints_spinda_footprint:: @ 8DF2D54 .incbin "graphics/pokemon/footprints/spinda_footprint.1bpp" - @ .incbin "baserom.gba", 0xDF2D54, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_wingull_still_front_pic:: @ 8DF2D74 .incbin "graphics/pokemon/front_pics/wingull_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xDF2D74, 0x023C .align 2 gFile_graphics_pokemon_palettes_wingull_palette:: @ 8DF2FB0 .incbin "graphics/pokemon/palettes/wingull_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xDF2FB0, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_wingull_back_pic:: @ 8DF2FD8 .incbin "graphics/pokemon/back_pics/wingull_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xDF2FD8, 0x0350 .align 2 gFile_graphics_pokemon_palettes_wingull_shiny_palette:: @ 8DF3328 .incbin "graphics/pokemon/palettes/wingull_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xDF3328, 0x0028 .align 2 gFile_graphics_pokemon_icons_wingull_icon:: @ 8DF3350 .incbin "graphics/pokemon/icons/wingull_icon.4bpp" - @ .incbin "baserom.gba", 0xDF3350, 0x0400 .align 2 gFile_graphics_pokemon_footprints_wingull_footprint:: @ 8DF3750 .incbin "graphics/pokemon/footprints/wingull_footprint.1bpp" - @ .incbin "baserom.gba", 0xDF3750, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_pelipper_still_front_pic:: @ 8DF3770 .incbin "graphics/pokemon/front_pics/pelipper_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xDF3770, 0x0398 .align 2 gFile_graphics_pokemon_palettes_pelipper_palette:: @ 8DF3B08 .incbin "graphics/pokemon/palettes/pelipper_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xDF3B08, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_pelipper_back_pic:: @ 8DF3B30 .incbin "graphics/pokemon/back_pics/pelipper_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xDF3B30, 0x0380 .align 2 gFile_graphics_pokemon_palettes_pelipper_shiny_palette:: @ 8DF3EB0 .incbin "graphics/pokemon/palettes/pelipper_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xDF3EB0, 0x0028 .align 2 gFile_graphics_pokemon_icons_pelipper_icon:: @ 8DF3ED8 .incbin "graphics/pokemon/icons/pelipper_icon.4bpp" - @ .incbin "baserom.gba", 0xDF3ED8, 0x0400 .align 2 gFile_graphics_pokemon_footprints_pelipper_footprint:: @ 8DF42D8 .incbin "graphics/pokemon/footprints/pelipper_footprint.1bpp" - @ .incbin "baserom.gba", 0xDF42D8, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_surskit_still_front_pic:: @ 8DF42F8 .incbin "graphics/pokemon/front_pics/surskit_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xDF42F8, 0x020C .align 2 gFile_graphics_pokemon_palettes_surskit_palette:: @ 8DF4504 .incbin "graphics/pokemon/palettes/surskit_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xDF4504, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_surskit_back_pic:: @ 8DF452C .incbin "graphics/pokemon/back_pics/surskit_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xDF452C, 0x0238 .align 2 gFile_graphics_pokemon_palettes_surskit_shiny_palette:: @ 8DF4764 .incbin "graphics/pokemon/palettes/surskit_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xDF4764, 0x0028 .align 2 gFile_graphics_pokemon_icons_surskit_icon:: @ 8DF478C .incbin "graphics/pokemon/icons/surskit_icon.4bpp" - @ .incbin "baserom.gba", 0xDF478C, 0x0400 .align 2 gFile_graphics_pokemon_footprints_surskit_footprint:: @ 8DF4B8C .incbin "graphics/pokemon/footprints/surskit_footprint.1bpp" - @ .incbin "baserom.gba", 0xDF4B8C, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_masquerain_still_front_pic:: @ 8DF4BAC .incbin "graphics/pokemon/front_pics/masquerain_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xDF4BAC, 0x039C .align 2 gFile_graphics_pokemon_palettes_masquerain_palette:: @ 8DF4F48 .incbin "graphics/pokemon/palettes/masquerain_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xDF4F48, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_masquerain_back_pic:: @ 8DF4F70 .incbin "graphics/pokemon/back_pics/masquerain_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xDF4F70, 0x0358 .align 2 gFile_graphics_pokemon_palettes_masquerain_shiny_palette:: @ 8DF52C8 .incbin "graphics/pokemon/palettes/masquerain_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xDF52C8, 0x0028 .align 2 gFile_graphics_pokemon_icons_masquerain_icon:: @ 8DF52F0 .incbin "graphics/pokemon/icons/masquerain_icon.4bpp" - @ .incbin "baserom.gba", 0xDF52F0, 0x0400 .align 2 gFile_graphics_pokemon_footprints_masquerain_footprint:: @ 8DF56F0 .incbin "graphics/pokemon/footprints/masquerain_footprint.1bpp" - @ .incbin "baserom.gba", 0xDF56F0, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_wailmer_still_front_pic:: @ 8DF5710 .incbin "graphics/pokemon/front_pics/wailmer_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xDF5710, 0x02E0 .align 2 gFile_graphics_pokemon_palettes_wailmer_palette:: @ 8DF59F0 .incbin "graphics/pokemon/palettes/wailmer_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xDF59F0, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_wailmer_back_pic:: @ 8DF5A18 .incbin "graphics/pokemon/back_pics/wailmer_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xDF5A18, 0x01E4 .align 2 gFile_graphics_pokemon_palettes_wailmer_shiny_palette:: @ 8DF5BFC .incbin "graphics/pokemon/palettes/wailmer_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xDF5BFC, 0x0028 .align 2 gFile_graphics_pokemon_icons_wailmer_icon:: @ 8DF5C24 .incbin "graphics/pokemon/icons/wailmer_icon.4bpp" - @ .incbin "baserom.gba", 0xDF5C24, 0x0400 .align 2 gFile_graphics_pokemon_footprints_wailmer_footprint:: @ 8DF6024 .incbin "graphics/pokemon/footprints/wailmer_footprint.1bpp" - @ .incbin "baserom.gba", 0xDF6024, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_wailord_still_front_pic:: @ 8DF6044 .incbin "graphics/pokemon/front_pics/wailord_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xDF6044, 0x03C4 .align 2 gFile_graphics_pokemon_palettes_wailord_palette:: @ 8DF6408 .incbin "graphics/pokemon/palettes/wailord_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xDF6408, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_wailord_back_pic:: @ 8DF6430 .incbin "graphics/pokemon/back_pics/wailord_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xDF6430, 0x0218 .align 2 gFile_graphics_pokemon_palettes_wailord_shiny_palette:: @ 8DF6648 .incbin "graphics/pokemon/palettes/wailord_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xDF6648, 0x0028 .align 2 gFile_graphics_pokemon_icons_wailord_icon:: @ 8DF6670 .incbin "graphics/pokemon/icons/wailord_icon.4bpp" - @ .incbin "baserom.gba", 0xDF6670, 0x0400 .align 2 gFile_graphics_pokemon_footprints_wailord_footprint:: @ 8DF6A70 .incbin "graphics/pokemon/footprints/wailord_footprint.1bpp" - @ .incbin "baserom.gba", 0xDF6A70, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_skitty_still_front_pic:: @ 8DF6A90 .incbin "graphics/pokemon/front_pics/skitty_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xDF6A90, 0x0300 .align 2 gFile_graphics_pokemon_palettes_skitty_palette:: @ 8DF6D90 .incbin "graphics/pokemon/palettes/skitty_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xDF6D90, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_skitty_back_pic:: @ 8DF6DB8 .incbin "graphics/pokemon/back_pics/skitty_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xDF6DB8, 0x0348 .align 2 gFile_graphics_pokemon_palettes_skitty_shiny_palette:: @ 8DF7100 .incbin "graphics/pokemon/palettes/skitty_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xDF7100, 0x0028 .align 2 gFile_graphics_pokemon_icons_skitty_icon:: @ 8DF7128 .incbin "graphics/pokemon/icons/skitty_icon.4bpp" - @ .incbin "baserom.gba", 0xDF7128, 0x0400 .align 2 gFile_graphics_pokemon_footprints_skitty_footprint:: @ 8DF7528 .incbin "graphics/pokemon/footprints/skitty_footprint.1bpp" - @ .incbin "baserom.gba", 0xDF7528, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_delcatty_still_front_pic:: @ 8DF7548 .incbin "graphics/pokemon/front_pics/delcatty_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xDF7548, 0x038C .align 2 gFile_graphics_pokemon_palettes_delcatty_palette:: @ 8DF78D4 .incbin "graphics/pokemon/palettes/delcatty_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xDF78D4, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_delcatty_back_pic:: @ 8DF78FC .incbin "graphics/pokemon/back_pics/delcatty_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xDF78FC, 0x039C .align 2 gFile_graphics_pokemon_palettes_delcatty_shiny_palette:: @ 8DF7C98 .incbin "graphics/pokemon/palettes/delcatty_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xDF7C98, 0x0028 .align 2 gFile_graphics_pokemon_icons_delcatty_icon:: @ 8DF7CC0 .incbin "graphics/pokemon/icons/delcatty_icon.4bpp" - @ .incbin "baserom.gba", 0xDF7CC0, 0x0400 .align 2 gFile_graphics_pokemon_footprints_delcatty_footprint:: @ 8DF80C0 .incbin "graphics/pokemon/footprints/delcatty_footprint.1bpp" - @ .incbin "baserom.gba", 0xDF80C0, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_kecleon_still_front_pic:: @ 8DF80E0 .incbin "graphics/pokemon/front_pics/kecleon_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xDF80E0, 0x0380 .align 2 gFile_graphics_pokemon_palettes_kecleon_palette:: @ 8DF8460 .incbin "graphics/pokemon/palettes/kecleon_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xDF8460, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_kecleon_back_pic:: @ 8DF8488 .incbin "graphics/pokemon/back_pics/kecleon_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xDF8488, 0x03D8 .align 2 gFile_graphics_pokemon_palettes_kecleon_shiny_palette:: @ 8DF8860 .incbin "graphics/pokemon/palettes/kecleon_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xDF8860, 0x0028 .align 2 gFile_graphics_pokemon_icons_kecleon_icon:: @ 8DF8888 .incbin "graphics/pokemon/icons/kecleon_icon.4bpp" - @ .incbin "baserom.gba", 0xDF8888, 0x0400 .align 2 gFile_graphics_pokemon_footprints_kecleon_footprint:: @ 8DF8C88 .incbin "graphics/pokemon/footprints/kecleon_footprint.1bpp" - @ .incbin "baserom.gba", 0xDF8C88, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_baltoy_still_front_pic:: @ 8DF8CA8 .incbin "graphics/pokemon/front_pics/baltoy_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xDF8CA8, 0x0224 .align 2 gFile_graphics_pokemon_palettes_baltoy_palette:: @ 8DF8ECC .incbin "graphics/pokemon/palettes/baltoy_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xDF8ECC, 0x0020 .align 2 gFile_graphics_pokemon_back_pics_baltoy_back_pic:: @ 8DF8EEC .incbin "graphics/pokemon/back_pics/baltoy_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xDF8EEC, 0x02A8 .align 2 gFile_graphics_pokemon_palettes_baltoy_shiny_palette:: @ 8DF9194 .incbin "graphics/pokemon/palettes/baltoy_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xDF9194, 0x0020 .align 2 gFile_graphics_pokemon_icons_baltoy_icon:: @ 8DF91B4 .incbin "graphics/pokemon/icons/baltoy_icon.4bpp" - @ .incbin "baserom.gba", 0xDF91B4, 0x0400 .align 2 gFile_graphics_pokemon_footprints_baltoy_footprint:: @ 8DF95B4 .incbin "graphics/pokemon/footprints/baltoy_footprint.1bpp" - @ .incbin "baserom.gba", 0xDF95B4, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_claydol_still_front_pic:: @ 8DF95D4 .incbin "graphics/pokemon/front_pics/claydol_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xDF95D4, 0x03B8 .align 2 gFile_graphics_pokemon_palettes_claydol_palette:: @ 8DF998C .incbin "graphics/pokemon/palettes/claydol_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xDF998C, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_claydol_back_pic:: @ 8DF99B4 .incbin "graphics/pokemon/back_pics/claydol_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xDF99B4, 0x03D4 .align 2 gFile_graphics_pokemon_palettes_claydol_shiny_palette:: @ 8DF9D88 .incbin "graphics/pokemon/palettes/claydol_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xDF9D88, 0x0028 .align 2 gFile_graphics_pokemon_icons_claydol_icon:: @ 8DF9DB0 .incbin "graphics/pokemon/icons/claydol_icon.4bpp" - @ .incbin "baserom.gba", 0xDF9DB0, 0x0400 .align 2 gFile_graphics_pokemon_footprints_claydol_footprint:: @ 8DFA1B0 .incbin "graphics/pokemon/footprints/claydol_footprint.1bpp" - @ .incbin "baserom.gba", 0xDFA1B0, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_nosepass_still_front_pic:: @ 8DFA1D0 .incbin "graphics/pokemon/front_pics/nosepass_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xDFA1D0, 0x02CC .align 2 gFile_graphics_pokemon_palettes_nosepass_palette:: @ 8DFA49C .incbin "graphics/pokemon/palettes/nosepass_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xDFA49C, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_nosepass_back_pic:: @ 8DFA4C4 .incbin "graphics/pokemon/back_pics/nosepass_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xDFA4C4, 0x02A0 .align 2 gFile_graphics_pokemon_palettes_nosepass_shiny_palette:: @ 8DFA764 .incbin "graphics/pokemon/palettes/nosepass_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xDFA764, 0x0028 .align 2 gFile_graphics_pokemon_icons_nosepass_icon:: @ 8DFA78C .incbin "graphics/pokemon/icons/nosepass_icon.4bpp" - @ .incbin "baserom.gba", 0xDFA78C, 0x0400 .align 2 gFile_graphics_pokemon_footprints_nosepass_footprint:: @ 8DFAB8C .incbin "graphics/pokemon/footprints/nosepass_footprint.1bpp" - @ .incbin "baserom.gba", 0xDFAB8C, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_torkoal_still_front_pic:: @ 8DFABAC .incbin "graphics/pokemon/front_pics/torkoal_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xDFABAC, 0x04AC .align 2 gFile_graphics_pokemon_palettes_torkoal_palette:: @ 8DFB058 .incbin "graphics/pokemon/palettes/torkoal_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xDFB058, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_torkoal_back_pic:: @ 8DFB080 .incbin "graphics/pokemon/back_pics/torkoal_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xDFB080, 0x02C8 .align 2 gFile_graphics_pokemon_palettes_torkoal_shiny_palette:: @ 8DFB348 .incbin "graphics/pokemon/palettes/torkoal_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xDFB348, 0x0028 .align 2 gFile_graphics_pokemon_icons_torkoal_icon:: @ 8DFB370 .incbin "graphics/pokemon/icons/torkoal_icon.4bpp" - @ .incbin "baserom.gba", 0xDFB370, 0x0400 .align 2 gFile_graphics_pokemon_footprints_torkoal_footprint:: @ 8DFB770 .incbin "graphics/pokemon/footprints/torkoal_footprint.1bpp" - @ .incbin "baserom.gba", 0xDFB770, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_sableye_still_front_pic:: @ 8DFB790 .incbin "graphics/pokemon/front_pics/sableye_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xDFB790, 0x02D4 .align 2 gFile_graphics_pokemon_palettes_sableye_palette:: @ 8DFBA64 .incbin "graphics/pokemon/palettes/sableye_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xDFBA64, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_sableye_back_pic:: @ 8DFBA8C .incbin "graphics/pokemon/back_pics/sableye_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xDFBA8C, 0x0328 .align 2 gFile_graphics_pokemon_palettes_sableye_shiny_palette:: @ 8DFBDB4 .incbin "graphics/pokemon/palettes/sableye_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xDFBDB4, 0x0028 .align 2 gFile_graphics_pokemon_icons_sableye_icon:: @ 8DFBDDC .incbin "graphics/pokemon/icons/sableye_icon.4bpp" - @ .incbin "baserom.gba", 0xDFBDDC, 0x0400 .align 2 gFile_graphics_pokemon_footprints_sableye_footprint:: @ 8DFC1DC .incbin "graphics/pokemon/footprints/sableye_footprint.1bpp" - @ .incbin "baserom.gba", 0xDFC1DC, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_barboach_still_front_pic:: @ 8DFC1FC .incbin "graphics/pokemon/front_pics/barboach_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xDFC1FC, 0x0290 .align 2 gFile_graphics_pokemon_palettes_barboach_palette:: @ 8DFC48C .incbin "graphics/pokemon/palettes/barboach_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xDFC48C, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_barboach_back_pic:: @ 8DFC4B4 .incbin "graphics/pokemon/back_pics/barboach_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xDFC4B4, 0x0290 .align 2 gFile_graphics_pokemon_palettes_barboach_shiny_palette:: @ 8DFC744 .incbin "graphics/pokemon/palettes/barboach_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xDFC744, 0x0028 .align 2 gFile_graphics_pokemon_icons_barboach_icon:: @ 8DFC76C .incbin "graphics/pokemon/icons/barboach_icon.4bpp" - @ .incbin "baserom.gba", 0xDFC76C, 0x0400 .align 2 gFile_graphics_pokemon_footprints_barboach_footprint:: @ 8DFCB6C .incbin "graphics/pokemon/footprints/barboach_footprint.1bpp" - @ .incbin "baserom.gba", 0xDFCB6C, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_whiscash_still_front_pic:: @ 8DFCB8C .incbin "graphics/pokemon/front_pics/whiscash_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xDFCB8C, 0x0378 .align 2 gFile_graphics_pokemon_palettes_whiscash_palette:: @ 8DFCF04 .incbin "graphics/pokemon/palettes/whiscash_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xDFCF04, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_whiscash_back_pic:: @ 8DFCF2C .incbin "graphics/pokemon/back_pics/whiscash_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xDFCF2C, 0x034C .align 2 gFile_graphics_pokemon_palettes_whiscash_shiny_palette:: @ 8DFD278 .incbin "graphics/pokemon/palettes/whiscash_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xDFD278, 0x0028 .align 2 gFile_graphics_pokemon_icons_whiscash_icon:: @ 8DFD2A0 .incbin "graphics/pokemon/icons/whiscash_icon.4bpp" - @ .incbin "baserom.gba", 0xDFD2A0, 0x0400 .align 2 gFile_graphics_pokemon_footprints_whiscash_footprint:: @ 8DFD6A0 .incbin "graphics/pokemon/footprints/whiscash_footprint.1bpp" - @ .incbin "baserom.gba", 0xDFD6A0, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_luvdisc_still_front_pic:: @ 8DFD6C0 .incbin "graphics/pokemon/front_pics/luvdisc_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xDFD6C0, 0x01C0 .align 2 gFile_graphics_pokemon_palettes_luvdisc_palette:: @ 8DFD880 .incbin "graphics/pokemon/palettes/luvdisc_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xDFD880, 0x0024 .align 2 gFile_graphics_pokemon_back_pics_luvdisc_back_pic:: @ 8DFD8A4 .incbin "graphics/pokemon/back_pics/luvdisc_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xDFD8A4, 0x01D4 .align 2 gFile_graphics_pokemon_palettes_luvdisc_shiny_palette:: @ 8DFDA78 .incbin "graphics/pokemon/palettes/luvdisc_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xDFDA78, 0x0024 .align 2 gFile_graphics_pokemon_icons_luvdisc_icon:: @ 8DFDA9C .incbin "graphics/pokemon/icons/luvdisc_icon.4bpp" - @ .incbin "baserom.gba", 0xDFDA9C, 0x0400 .align 2 gFile_graphics_pokemon_footprints_luvdisc_footprint:: @ 8DFDE9C .incbin "graphics/pokemon/footprints/luvdisc_footprint.1bpp" - @ .incbin "baserom.gba", 0xDFDE9C, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_corphish_still_front_pic:: @ 8DFDEBC .incbin "graphics/pokemon/front_pics/corphish_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xDFDEBC, 0x035C .align 2 gFile_graphics_pokemon_palettes_corphish_palette:: @ 8DFE218 .incbin "graphics/pokemon/palettes/corphish_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xDFE218, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_corphish_back_pic:: @ 8DFE240 .incbin "graphics/pokemon/back_pics/corphish_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xDFE240, 0x031C .align 2 gFile_graphics_pokemon_palettes_corphish_shiny_palette:: @ 8DFE55C .incbin "graphics/pokemon/palettes/corphish_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xDFE55C, 0x0028 .align 2 gFile_graphics_pokemon_icons_corphish_icon:: @ 8DFE584 .incbin "graphics/pokemon/icons/corphish_icon.4bpp" - @ .incbin "baserom.gba", 0xDFE584, 0x0400 .align 2 gFile_graphics_pokemon_footprints_corphish_footprint:: @ 8DFE984 .incbin "graphics/pokemon/footprints/corphish_footprint.1bpp" - @ .incbin "baserom.gba", 0xDFE984, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_crawdaunt_still_front_pic:: @ 8DFE9A4 .incbin "graphics/pokemon/front_pics/crawdaunt_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xDFE9A4, 0x0490 .align 2 gFile_graphics_pokemon_palettes_crawdaunt_palette:: @ 8DFEE34 .incbin "graphics/pokemon/palettes/crawdaunt_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xDFEE34, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_crawdaunt_back_pic:: @ 8DFEE5C .incbin "graphics/pokemon/back_pics/crawdaunt_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xDFEE5C, 0x03E4 .align 2 gFile_graphics_pokemon_palettes_crawdaunt_shiny_palette:: @ 8DFF240 .incbin "graphics/pokemon/palettes/crawdaunt_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xDFF240, 0x0028 .align 2 gFile_graphics_pokemon_icons_crawdaunt_icon:: @ 8DFF268 .incbin "graphics/pokemon/icons/crawdaunt_icon.4bpp" - @ .incbin "baserom.gba", 0xDFF268, 0x0400 .align 2 gFile_graphics_pokemon_footprints_crawdaunt_footprint:: @ 8DFF668 .incbin "graphics/pokemon/footprints/crawdaunt_footprint.1bpp" - @ .incbin "baserom.gba", 0xDFF668, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_feebas_still_front_pic:: @ 8DFF688 .incbin "graphics/pokemon/front_pics/feebas_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xDFF688, 0x028C .align 2 gFile_graphics_pokemon_palettes_feebas_palette:: @ 8DFF914 .incbin "graphics/pokemon/palettes/feebas_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xDFF914, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_feebas_back_pic:: @ 8DFF93C .incbin "graphics/pokemon/back_pics/feebas_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xDFF93C, 0x0338 .align 2 gFile_graphics_pokemon_palettes_feebas_shiny_palette:: @ 8DFFC74 .incbin "graphics/pokemon/palettes/feebas_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xDFFC74, 0x0028 .align 2 gFile_graphics_pokemon_icons_feebas_icon:: @ 8DFFC9C .incbin "graphics/pokemon/icons/feebas_icon.4bpp" - @ .incbin "baserom.gba", 0xDFFC9C, 0x0400 .align 2 gFile_graphics_pokemon_footprints_feebas_footprint:: @ 8E0009C .incbin "graphics/pokemon/footprints/feebas_footprint.1bpp" - @ .incbin "baserom.gba", 0xE0009C, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_milotic_still_front_pic:: @ 8E000BC .incbin "graphics/pokemon/front_pics/milotic_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE000BC, 0x0490 .align 2 gFile_graphics_pokemon_palettes_milotic_palette:: @ 8E0054C .incbin "graphics/pokemon/palettes/milotic_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xE0054C, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_milotic_back_pic:: @ 8E00574 .incbin "graphics/pokemon/back_pics/milotic_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE00574, 0x02F4 .align 2 gFile_graphics_pokemon_palettes_milotic_shiny_palette:: @ 8E00868 .incbin "graphics/pokemon/palettes/milotic_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xE00868, 0x0028 .align 2 gFile_graphics_pokemon_icons_milotic_icon:: @ 8E00890 .incbin "graphics/pokemon/icons/milotic_icon.4bpp" - @ .incbin "baserom.gba", 0xE00890, 0x0400 .align 2 gFile_graphics_pokemon_footprints_milotic_footprint:: @ 8E00C90 .incbin "graphics/pokemon/footprints/milotic_footprint.1bpp" - @ .incbin "baserom.gba", 0xE00C90, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_carvanha_still_front_pic:: @ 8E00CB0 .incbin "graphics/pokemon/front_pics/carvanha_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE00CB0, 0x032C .align 2 gFile_graphics_pokemon_palettes_carvanha_palette:: @ 8E00FDC .incbin "graphics/pokemon/palettes/carvanha_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xE00FDC, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_carvanha_back_pic:: @ 8E01004 .incbin "graphics/pokemon/back_pics/carvanha_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE01004, 0x0310 .align 2 gFile_graphics_pokemon_palettes_carvanha_shiny_palette:: @ 8E01314 .incbin "graphics/pokemon/palettes/carvanha_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xE01314, 0x0028 .align 2 gFile_graphics_pokemon_icons_carvanha_icon:: @ 8E0133C .incbin "graphics/pokemon/icons/carvanha_icon.4bpp" - @ .incbin "baserom.gba", 0xE0133C, 0x0400 .align 2 gFile_graphics_pokemon_footprints_carvanha_footprint:: @ 8E0173C .incbin "graphics/pokemon/footprints/carvanha_footprint.1bpp" - @ .incbin "baserom.gba", 0xE0173C, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_sharpedo_still_front_pic:: @ 8E0175C .incbin "graphics/pokemon/front_pics/sharpedo_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE0175C, 0x0390 .align 2 gFile_graphics_pokemon_palettes_sharpedo_palette:: @ 8E01AEC .incbin "graphics/pokemon/palettes/sharpedo_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xE01AEC, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_sharpedo_back_pic:: @ 8E01B14 .incbin "graphics/pokemon/back_pics/sharpedo_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE01B14, 0x0358 .align 2 gFile_graphics_pokemon_palettes_sharpedo_shiny_palette:: @ 8E01E6C .incbin "graphics/pokemon/palettes/sharpedo_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xE01E6C, 0x0028 .align 2 gFile_graphics_pokemon_icons_sharpedo_icon:: @ 8E01E94 .incbin "graphics/pokemon/icons/sharpedo_icon.4bpp" - @ .incbin "baserom.gba", 0xE01E94, 0x0400 .align 2 gFile_graphics_pokemon_footprints_sharpedo_footprint:: @ 8E02294 .incbin "graphics/pokemon/footprints/sharpedo_footprint.1bpp" - @ .incbin "baserom.gba", 0xE02294, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_trapinch_still_front_pic:: @ 8E022B4 .incbin "graphics/pokemon/front_pics/trapinch_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE022B4, 0x021C .align 2 gFile_graphics_pokemon_palettes_trapinch_palette:: @ 8E024D0 .incbin "graphics/pokemon/palettes/trapinch_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xE024D0, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_trapinch_back_pic:: @ 8E024F8 .incbin "graphics/pokemon/back_pics/trapinch_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE024F8, 0x0220 .align 2 gFile_graphics_pokemon_palettes_trapinch_shiny_palette:: @ 8E02718 .incbin "graphics/pokemon/palettes/trapinch_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xE02718, 0x0028 .align 2 gFile_graphics_pokemon_icons_trapinch_icon:: @ 8E02740 .incbin "graphics/pokemon/icons/trapinch_icon.4bpp" - @ .incbin "baserom.gba", 0xE02740, 0x0400 .align 2 gFile_graphics_pokemon_footprints_trapinch_footprint:: @ 8E02B40 .incbin "graphics/pokemon/footprints/trapinch_footprint.1bpp" - @ .incbin "baserom.gba", 0xE02B40, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_vibrava_still_front_pic:: @ 8E02B60 .incbin "graphics/pokemon/front_pics/vibrava_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE02B60, 0x0370 .align 2 gFile_graphics_pokemon_palettes_vibrava_palette:: @ 8E02ED0 .incbin "graphics/pokemon/palettes/vibrava_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xE02ED0, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_vibrava_back_pic:: @ 8E02EF8 .incbin "graphics/pokemon/back_pics/vibrava_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE02EF8, 0x0278 .align 2 gFile_graphics_pokemon_palettes_vibrava_shiny_palette:: @ 8E03170 .incbin "graphics/pokemon/palettes/vibrava_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xE03170, 0x0028 .align 2 gFile_graphics_pokemon_icons_vibrava_icon:: @ 8E03198 .incbin "graphics/pokemon/icons/vibrava_icon.4bpp" - @ .incbin "baserom.gba", 0xE03198, 0x0400 .align 2 gFile_graphics_pokemon_footprints_vibrava_footprint:: @ 8E03598 .incbin "graphics/pokemon/footprints/vibrava_footprint.1bpp" - @ .incbin "baserom.gba", 0xE03598, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_flygon_still_front_pic:: @ 8E035B8 .incbin "graphics/pokemon/front_pics/flygon_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE035B8, 0x04F0 .align 2 gFile_graphics_pokemon_palettes_flygon_palette:: @ 8E03AA8 .incbin "graphics/pokemon/palettes/flygon_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xE03AA8, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_flygon_back_pic:: @ 8E03AD0 .incbin "graphics/pokemon/back_pics/flygon_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE03AD0, 0x043C .align 2 gFile_graphics_pokemon_palettes_flygon_shiny_palette:: @ 8E03F0C .incbin "graphics/pokemon/palettes/flygon_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xE03F0C, 0x0028 .align 2 gFile_graphics_pokemon_icons_flygon_icon:: @ 8E03F34 .incbin "graphics/pokemon/icons/flygon_icon.4bpp" - @ .incbin "baserom.gba", 0xE03F34, 0x0400 .align 2 gFile_graphics_pokemon_footprints_flygon_footprint:: @ 8E04334 .incbin "graphics/pokemon/footprints/flygon_footprint.1bpp" - @ .incbin "baserom.gba", 0xE04334, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_makuhita_still_front_pic:: @ 8E04354 .incbin "graphics/pokemon/front_pics/makuhita_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE04354, 0x0318 .align 2 gFile_graphics_pokemon_palettes_makuhita_palette:: @ 8E0466C .incbin "graphics/pokemon/palettes/makuhita_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xE0466C, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_makuhita_back_pic:: @ 8E04694 .incbin "graphics/pokemon/back_pics/makuhita_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE04694, 0x02F0 .align 2 gFile_graphics_pokemon_palettes_makuhita_shiny_palette:: @ 8E04984 .incbin "graphics/pokemon/palettes/makuhita_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xE04984, 0x0024 .align 2 gFile_graphics_pokemon_icons_makuhita_icon:: @ 8E049A8 .incbin "graphics/pokemon/icons/makuhita_icon.4bpp" - @ .incbin "baserom.gba", 0xE049A8, 0x0400 .align 2 gFile_graphics_pokemon_footprints_makuhita_footprint:: @ 8E04DA8 .incbin "graphics/pokemon/footprints/makuhita_footprint.1bpp" - @ .incbin "baserom.gba", 0xE04DA8, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_hariyama_still_front_pic:: @ 8E04DC8 .incbin "graphics/pokemon/front_pics/hariyama_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE04DC8, 0x04B0 .align 2 gFile_graphics_pokemon_palettes_hariyama_palette:: @ 8E05278 .incbin "graphics/pokemon/palettes/hariyama_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xE05278, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_hariyama_back_pic:: @ 8E052A0 .incbin "graphics/pokemon/back_pics/hariyama_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE052A0, 0x03E0 .align 2 gFile_graphics_pokemon_palettes_hariyama_shiny_palette:: @ 8E05680 .incbin "graphics/pokemon/palettes/hariyama_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xE05680, 0x0028 .align 2 gFile_graphics_pokemon_icons_hariyama_icon:: @ 8E056A8 .incbin "graphics/pokemon/icons/hariyama_icon.4bpp" - @ .incbin "baserom.gba", 0xE056A8, 0x0400 .align 2 gFile_graphics_pokemon_footprints_hariyama_footprint:: @ 8E05AA8 .incbin "graphics/pokemon/footprints/hariyama_footprint.1bpp" - @ .incbin "baserom.gba", 0xE05AA8, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_electrike_still_front_pic:: @ 8E05AC8 .incbin "graphics/pokemon/front_pics/electrike_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE05AC8, 0x0290 .align 2 gFile_graphics_pokemon_palettes_electrike_palette:: @ 8E05D58 .incbin "graphics/pokemon/palettes/electrike_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xE05D58, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_electrike_back_pic:: @ 8E05D80 .incbin "graphics/pokemon/back_pics/electrike_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE05D80, 0x028C .align 2 gFile_graphics_pokemon_palettes_electrike_shiny_palette:: @ 8E0600C .incbin "graphics/pokemon/palettes/electrike_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xE0600C, 0x0028 .align 2 gFile_graphics_pokemon_icons_electrike_icon:: @ 8E06034 .incbin "graphics/pokemon/icons/electrike_icon.4bpp" - @ .incbin "baserom.gba", 0xE06034, 0x0400 .align 2 gFile_graphics_pokemon_footprints_electrike_footprint:: @ 8E06434 .incbin "graphics/pokemon/footprints/electrike_footprint.1bpp" - @ .incbin "baserom.gba", 0xE06434, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_manectric_still_front_pic:: @ 8E06454 .incbin "graphics/pokemon/front_pics/manectric_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE06454, 0x0330 .align 2 gFile_graphics_pokemon_palettes_manectric_palette:: @ 8E06784 .incbin "graphics/pokemon/palettes/manectric_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xE06784, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_manectric_back_pic:: @ 8E067AC .incbin "graphics/pokemon/back_pics/manectric_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE067AC, 0x022C .align 2 gFile_graphics_pokemon_palettes_manectric_shiny_palette:: @ 8E069D8 .incbin "graphics/pokemon/palettes/manectric_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xE069D8, 0x0028 .align 2 gFile_graphics_pokemon_icons_manectric_icon:: @ 8E06A00 .incbin "graphics/pokemon/icons/manectric_icon.4bpp" - @ .incbin "baserom.gba", 0xE06A00, 0x0400 .align 2 gFile_graphics_pokemon_footprints_manectric_footprint:: @ 8E06E00 .incbin "graphics/pokemon/footprints/manectric_footprint.1bpp" - @ .incbin "baserom.gba", 0xE06E00, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_numel_still_front_pic:: @ 8E06E20 .incbin "graphics/pokemon/front_pics/numel_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE06E20, 0x02D0 .align 2 gFile_graphics_pokemon_palettes_numel_palette:: @ 8E070F0 .incbin "graphics/pokemon/palettes/numel_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xE070F0, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_numel_back_pic:: @ 8E07118 .incbin "graphics/pokemon/back_pics/numel_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE07118, 0x02BC .align 2 gFile_graphics_pokemon_palettes_numel_shiny_palette:: @ 8E073D4 .incbin "graphics/pokemon/palettes/numel_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xE073D4, 0x0028 .align 2 gFile_graphics_pokemon_icons_numel_icon:: @ 8E073FC .incbin "graphics/pokemon/icons/numel_icon.4bpp" - @ .incbin "baserom.gba", 0xE073FC, 0x0400 .align 2 gFile_graphics_pokemon_footprints_numel_footprint:: @ 8E077FC .incbin "graphics/pokemon/footprints/numel_footprint.1bpp" - @ .incbin "baserom.gba", 0xE077FC, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_camerupt_still_front_pic:: @ 8E0781C .incbin "graphics/pokemon/front_pics/camerupt_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE0781C, 0x0418 .align 2 gFile_graphics_pokemon_palettes_camerupt_palette:: @ 8E07C34 .incbin "graphics/pokemon/palettes/camerupt_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xE07C34, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_camerupt_back_pic:: @ 8E07C5C .incbin "graphics/pokemon/back_pics/camerupt_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE07C5C, 0x02C4 .align 2 gFile_graphics_pokemon_palettes_camerupt_shiny_palette:: @ 8E07F20 .incbin "graphics/pokemon/palettes/camerupt_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xE07F20, 0x0028 .align 2 gFile_graphics_pokemon_icons_camerupt_icon:: @ 8E07F48 .incbin "graphics/pokemon/icons/camerupt_icon.4bpp" - @ .incbin "baserom.gba", 0xE07F48, 0x0400 .align 2 gFile_graphics_pokemon_footprints_camerupt_footprint:: @ 8E08348 .incbin "graphics/pokemon/footprints/camerupt_footprint.1bpp" - @ .incbin "baserom.gba", 0xE08348, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_spheal_still_front_pic:: @ 8E08368 .incbin "graphics/pokemon/front_pics/spheal_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE08368, 0x0274 .align 2 gFile_graphics_pokemon_palettes_spheal_palette:: @ 8E085DC .incbin "graphics/pokemon/palettes/spheal_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xE085DC, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_spheal_back_pic:: @ 8E08604 .incbin "graphics/pokemon/back_pics/spheal_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE08604, 0x01FC .align 2 gFile_graphics_pokemon_palettes_spheal_shiny_palette:: @ 8E08800 .incbin "graphics/pokemon/palettes/spheal_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xE08800, 0x0028 .align 2 gFile_graphics_pokemon_icons_spheal_icon:: @ 8E08828 .incbin "graphics/pokemon/icons/spheal_icon.4bpp" - @ .incbin "baserom.gba", 0xE08828, 0x0400 .align 2 gFile_graphics_pokemon_footprints_spheal_footprint:: @ 8E08C28 .incbin "graphics/pokemon/footprints/spheal_footprint.1bpp" - @ .incbin "baserom.gba", 0xE08C28, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_sealeo_still_front_pic:: @ 8E08C48 .incbin "graphics/pokemon/front_pics/sealeo_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE08C48, 0x0380 .align 2 gFile_graphics_pokemon_palettes_sealeo_palette:: @ 8E08FC8 .incbin "graphics/pokemon/palettes/sealeo_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xE08FC8, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_sealeo_back_pic:: @ 8E08FF0 .incbin "graphics/pokemon/back_pics/sealeo_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE08FF0, 0x027C .align 2 gFile_graphics_pokemon_palettes_sealeo_shiny_palette:: @ 8E0926C .incbin "graphics/pokemon/palettes/sealeo_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xE0926C, 0x0028 .align 2 gFile_graphics_pokemon_icons_sealeo_icon:: @ 8E09294 .incbin "graphics/pokemon/icons/sealeo_icon.4bpp" - @ .incbin "baserom.gba", 0xE09294, 0x0400 .align 2 gFile_graphics_pokemon_footprints_sealeo_footprint:: @ 8E09694 .incbin "graphics/pokemon/footprints/sealeo_footprint.1bpp" - @ .incbin "baserom.gba", 0xE09694, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_walrein_still_front_pic:: @ 8E096B4 .incbin "graphics/pokemon/front_pics/walrein_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE096B4, 0x04A0 .align 2 gFile_graphics_pokemon_palettes_walrein_palette:: @ 8E09B54 .incbin "graphics/pokemon/palettes/walrein_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xE09B54, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_walrein_back_pic:: @ 8E09B7C .incbin "graphics/pokemon/back_pics/walrein_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE09B7C, 0x0388 .align 2 gFile_graphics_pokemon_palettes_walrein_shiny_palette:: @ 8E09F04 .incbin "graphics/pokemon/palettes/walrein_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xE09F04, 0x0028 .align 2 gFile_graphics_pokemon_icons_walrein_icon:: @ 8E09F2C .incbin "graphics/pokemon/icons/walrein_icon.4bpp" - @ .incbin "baserom.gba", 0xE09F2C, 0x0400 .align 2 gFile_graphics_pokemon_footprints_walrein_footprint:: @ 8E0A32C .incbin "graphics/pokemon/footprints/walrein_footprint.1bpp" - @ .incbin "baserom.gba", 0xE0A32C, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_cacnea_still_front_pic:: @ 8E0A34C .incbin "graphics/pokemon/front_pics/cacnea_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE0A34C, 0x0310 .align 2 gFile_graphics_pokemon_palettes_cacnea_palette:: @ 8E0A65C .incbin "graphics/pokemon/palettes/cacnea_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xE0A65C, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_cacnea_back_pic:: @ 8E0A684 .incbin "graphics/pokemon/back_pics/cacnea_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE0A684, 0x0360 .align 2 gFile_graphics_pokemon_palettes_cacnea_shiny_palette:: @ 8E0A9E4 .incbin "graphics/pokemon/palettes/cacnea_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xE0A9E4, 0x0028 .align 2 gFile_graphics_pokemon_icons_cacnea_icon:: @ 8E0AA0C .incbin "graphics/pokemon/icons/cacnea_icon.4bpp" - @ .incbin "baserom.gba", 0xE0AA0C, 0x0400 .align 2 gFile_graphics_pokemon_footprints_cacnea_footprint:: @ 8E0AE0C .incbin "graphics/pokemon/footprints/cacnea_footprint.1bpp" - @ .incbin "baserom.gba", 0xE0AE0C, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_cacturne_still_front_pic:: @ 8E0AE2C .incbin "graphics/pokemon/front_pics/cacturne_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE0AE2C, 0x0438 .align 2 gFile_graphics_pokemon_palettes_cacturne_palette:: @ 8E0B264 .incbin "graphics/pokemon/palettes/cacturne_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xE0B264, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_cacturne_back_pic:: @ 8E0B28C .incbin "graphics/pokemon/back_pics/cacturne_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE0B28C, 0x0300 .align 2 gFile_graphics_pokemon_palettes_cacturne_shiny_palette:: @ 8E0B58C .incbin "graphics/pokemon/palettes/cacturne_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xE0B58C, 0x0028 .align 2 gFile_graphics_pokemon_icons_cacturne_icon:: @ 8E0B5B4 .incbin "graphics/pokemon/icons/cacturne_icon.4bpp" - @ .incbin "baserom.gba", 0xE0B5B4, 0x0400 .align 2 gFile_graphics_pokemon_footprints_cacturne_footprint:: @ 8E0B9B4 .incbin "graphics/pokemon/footprints/cacturne_footprint.1bpp" - @ .incbin "baserom.gba", 0xE0B9B4, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_snorunt_still_front_pic:: @ 8E0B9D4 .incbin "graphics/pokemon/front_pics/snorunt_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE0B9D4, 0x02C4 .align 2 gFile_graphics_pokemon_palettes_snorunt_palette:: @ 8E0BC98 .incbin "graphics/pokemon/palettes/snorunt_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xE0BC98, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_snorunt_back_pic:: @ 8E0BCC0 .incbin "graphics/pokemon/back_pics/snorunt_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE0BCC0, 0x02E4 .align 2 gFile_graphics_pokemon_palettes_snorunt_shiny_palette:: @ 8E0BFA4 .incbin "graphics/pokemon/palettes/snorunt_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xE0BFA4, 0x0028 .align 2 gFile_graphics_pokemon_icons_snorunt_icon:: @ 8E0BFCC .incbin "graphics/pokemon/icons/snorunt_icon.4bpp" - @ .incbin "baserom.gba", 0xE0BFCC, 0x0400 .align 2 gFile_graphics_pokemon_footprints_snorunt_footprint:: @ 8E0C3CC .incbin "graphics/pokemon/footprints/snorunt_footprint.1bpp" - @ .incbin "baserom.gba", 0xE0C3CC, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_glalie_still_front_pic:: @ 8E0C3EC .incbin "graphics/pokemon/front_pics/glalie_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE0C3EC, 0x03C8 .align 2 gFile_graphics_pokemon_palettes_glalie_palette:: @ 8E0C7B4 .incbin "graphics/pokemon/palettes/glalie_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xE0C7B4, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_glalie_back_pic:: @ 8E0C7DC .incbin "graphics/pokemon/back_pics/glalie_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE0C7DC, 0x03B0 .align 2 gFile_graphics_pokemon_palettes_glalie_shiny_palette:: @ 8E0CB8C .incbin "graphics/pokemon/palettes/glalie_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xE0CB8C, 0x0028 .align 2 gFile_graphics_pokemon_icons_glalie_icon:: @ 8E0CBB4 .incbin "graphics/pokemon/icons/glalie_icon.4bpp" - @ .incbin "baserom.gba", 0xE0CBB4, 0x0400 .align 2 gFile_graphics_pokemon_footprints_glalie_footprint:: @ 8E0CFB4 .incbin "graphics/pokemon/footprints/glalie_footprint.1bpp" - @ .incbin "baserom.gba", 0xE0CFB4, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_lunatone_still_front_pic:: @ 8E0CFD4 .incbin "graphics/pokemon/front_pics/lunatone_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE0CFD4, 0x0328 .align 2 gFile_graphics_pokemon_palettes_lunatone_palette:: @ 8E0D2FC .incbin "graphics/pokemon/palettes/lunatone_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xE0D2FC, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_lunatone_back_pic:: @ 8E0D324 .incbin "graphics/pokemon/back_pics/lunatone_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE0D324, 0x0358 .align 2 gFile_graphics_pokemon_palettes_lunatone_shiny_palette:: @ 8E0D67C .incbin "graphics/pokemon/palettes/lunatone_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xE0D67C, 0x0028 .align 2 gFile_graphics_pokemon_icons_lunatone_icon:: @ 8E0D6A4 .incbin "graphics/pokemon/icons/lunatone_icon.4bpp" - @ .incbin "baserom.gba", 0xE0D6A4, 0x0400 .align 2 gFile_graphics_pokemon_footprints_lunatone_footprint:: @ 8E0DAA4 .incbin "graphics/pokemon/footprints/lunatone_footprint.1bpp" - @ .incbin "baserom.gba", 0xE0DAA4, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_solrock_still_front_pic:: @ 8E0DAC4 .incbin "graphics/pokemon/front_pics/solrock_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE0DAC4, 0x044C .align 2 gFile_graphics_pokemon_palettes_solrock_palette:: @ 8E0DF10 .incbin "graphics/pokemon/palettes/solrock_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xE0DF10, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_solrock_back_pic:: @ 8E0DF38 .incbin "graphics/pokemon/back_pics/solrock_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE0DF38, 0x03EC .align 2 gFile_graphics_pokemon_palettes_solrock_shiny_palette:: @ 8E0E324 .incbin "graphics/pokemon/palettes/solrock_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xE0E324, 0x0028 .align 2 gFile_graphics_pokemon_icons_solrock_icon:: @ 8E0E34C .incbin "graphics/pokemon/icons/solrock_icon.4bpp" - @ .incbin "baserom.gba", 0xE0E34C, 0x0400 .align 2 gFile_graphics_pokemon_footprints_solrock_footprint:: @ 8E0E74C .incbin "graphics/pokemon/footprints/solrock_footprint.1bpp" - @ .incbin "baserom.gba", 0xE0E74C, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_azurill_still_front_pic:: @ 8E0E76C .incbin "graphics/pokemon/front_pics/azurill_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE0E76C, 0x02C8 .align 2 gFile_graphics_pokemon_palettes_azurill_palette:: @ 8E0EA34 .incbin "graphics/pokemon/palettes/azurill_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xE0EA34, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_azurill_back_pic:: @ 8E0EA5C .incbin "graphics/pokemon/back_pics/azurill_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE0EA5C, 0x0318 .align 2 gFile_graphics_pokemon_palettes_azurill_shiny_palette:: @ 8E0ED74 .incbin "graphics/pokemon/palettes/azurill_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xE0ED74, 0x0028 .align 2 gFile_graphics_pokemon_icons_azurill_icon:: @ 8E0ED9C .incbin "graphics/pokemon/icons/azurill_icon.4bpp" - @ .incbin "baserom.gba", 0xE0ED9C, 0x0400 .align 2 gFile_graphics_pokemon_footprints_azurill_footprint:: @ 8E0F19C .incbin "graphics/pokemon/footprints/azurill_footprint.1bpp" - @ .incbin "baserom.gba", 0xE0F19C, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_spoink_still_front_pic:: @ 8E0F1BC .incbin "graphics/pokemon/front_pics/spoink_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE0F1BC, 0x026C .align 2 gFile_graphics_pokemon_palettes_spoink_palette:: @ 8E0F428 .incbin "graphics/pokemon/palettes/spoink_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xE0F428, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_spoink_back_pic:: @ 8E0F450 .incbin "graphics/pokemon/back_pics/spoink_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE0F450, 0x0240 .align 2 gFile_graphics_pokemon_palettes_spoink_shiny_palette:: @ 8E0F690 .incbin "graphics/pokemon/palettes/spoink_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xE0F690, 0x0028 .align 2 gFile_graphics_pokemon_icons_spoink_icon:: @ 8E0F6B8 .incbin "graphics/pokemon/icons/spoink_icon.4bpp" - @ .incbin "baserom.gba", 0xE0F6B8, 0x0400 .align 2 gFile_graphics_pokemon_footprints_spoink_footprint:: @ 8E0FAB8 .incbin "graphics/pokemon/footprints/spoink_footprint.1bpp" - @ .incbin "baserom.gba", 0xE0FAB8, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_grumpig_still_front_pic:: @ 8E0FAD8 .incbin "graphics/pokemon/front_pics/grumpig_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE0FAD8, 0x03BC .align 2 gFile_graphics_pokemon_palettes_grumpig_palette:: @ 8E0FE94 .incbin "graphics/pokemon/palettes/grumpig_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xE0FE94, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_grumpig_back_pic:: @ 8E0FEBC .incbin "graphics/pokemon/back_pics/grumpig_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE0FEBC, 0x0360 .align 2 gFile_graphics_pokemon_palettes_grumpig_shiny_palette:: @ 8E1021C .incbin "graphics/pokemon/palettes/grumpig_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xE1021C, 0x0028 .align 2 gFile_graphics_pokemon_icons_grumpig_icon:: @ 8E10244 .incbin "graphics/pokemon/icons/grumpig_icon.4bpp" - @ .incbin "baserom.gba", 0xE10244, 0x0400 .align 2 gFile_graphics_pokemon_footprints_grumpig_footprint:: @ 8E10644 .incbin "graphics/pokemon/footprints/grumpig_footprint.1bpp" - @ .incbin "baserom.gba", 0xE10644, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_plusle_still_front_pic:: @ 8E10664 .incbin "graphics/pokemon/front_pics/plusle_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE10664, 0x028C .align 2 gFile_graphics_pokemon_palettes_plusle_palette:: @ 8E108F0 .incbin "graphics/pokemon/palettes/plusle_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xE108F0, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_plusle_back_pic:: @ 8E10918 .incbin "graphics/pokemon/back_pics/plusle_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE10918, 0x02B8 .align 2 gFile_graphics_pokemon_palettes_plusle_shiny_palette:: @ 8E10BD0 .incbin "graphics/pokemon/palettes/plusle_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xE10BD0, 0x0028 .align 2 gFile_graphics_pokemon_icons_plusle_icon:: @ 8E10BF8 .incbin "graphics/pokemon/icons/plusle_icon.4bpp" - @ .incbin "baserom.gba", 0xE10BF8, 0x0400 .align 2 gFile_graphics_pokemon_footprints_plusle_footprint:: @ 8E10FF8 .incbin "graphics/pokemon/footprints/plusle_footprint.1bpp" - @ .incbin "baserom.gba", 0xE10FF8, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_minun_still_front_pic:: @ 8E11018 .incbin "graphics/pokemon/front_pics/minun_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE11018, 0x0268 .align 2 gFile_graphics_pokemon_palettes_minun_palette:: @ 8E11280 .incbin "graphics/pokemon/palettes/minun_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xE11280, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_minun_back_pic:: @ 8E112A8 .incbin "graphics/pokemon/back_pics/minun_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE112A8, 0x02C8 .align 2 gFile_graphics_pokemon_palettes_minun_shiny_palette:: @ 8E11570 .incbin "graphics/pokemon/palettes/minun_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xE11570, 0x0028 .align 2 gFile_graphics_pokemon_icons_minun_icon:: @ 8E11598 .incbin "graphics/pokemon/icons/minun_icon.4bpp" - @ .incbin "baserom.gba", 0xE11598, 0x0400 .align 2 gFile_graphics_pokemon_footprints_minun_footprint:: @ 8E11998 .incbin "graphics/pokemon/footprints/minun_footprint.1bpp" - @ .incbin "baserom.gba", 0xE11998, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_mawile_still_front_pic:: @ 8E119B8 .incbin "graphics/pokemon/front_pics/mawile_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE119B8, 0x03BC .align 2 gFile_graphics_pokemon_palettes_mawile_palette:: @ 8E11D74 .incbin "graphics/pokemon/palettes/mawile_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xE11D74, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_mawile_back_pic:: @ 8E11D9C .incbin "graphics/pokemon/back_pics/mawile_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE11D9C, 0x0400 .align 2 gFile_graphics_pokemon_palettes_mawile_shiny_palette:: @ 8E1219C .incbin "graphics/pokemon/palettes/mawile_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xE1219C, 0x0028 .align 2 gFile_graphics_pokemon_icons_mawile_icon:: @ 8E121C4 .incbin "graphics/pokemon/icons/mawile_icon.4bpp" - @ .incbin "baserom.gba", 0xE121C4, 0x0400 .align 2 gFile_graphics_pokemon_footprints_mawile_footprint:: @ 8E125C4 .incbin "graphics/pokemon/footprints/mawile_footprint.1bpp" - @ .incbin "baserom.gba", 0xE125C4, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_meditite_still_front_pic:: @ 8E125E4 .incbin "graphics/pokemon/front_pics/meditite_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE125E4, 0x02B8 .align 2 gFile_graphics_pokemon_palettes_meditite_palette:: @ 8E1289C .incbin "graphics/pokemon/palettes/meditite_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xE1289C, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_meditite_back_pic:: @ 8E128C4 .incbin "graphics/pokemon/back_pics/meditite_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE128C4, 0x02C8 .align 2 gFile_graphics_pokemon_palettes_meditite_shiny_palette:: @ 8E12B8C .incbin "graphics/pokemon/palettes/meditite_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xE12B8C, 0x0024 .align 2 gFile_graphics_pokemon_icons_meditite_icon:: @ 8E12BB0 .incbin "graphics/pokemon/icons/meditite_icon.4bpp" - @ .incbin "baserom.gba", 0xE12BB0, 0x0400 .align 2 gFile_graphics_pokemon_footprints_meditite_footprint:: @ 8E12FB0 .incbin "graphics/pokemon/footprints/meditite_footprint.1bpp" - @ .incbin "baserom.gba", 0xE12FB0, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_medicham_still_front_pic:: @ 8E12FD0 .incbin "graphics/pokemon/front_pics/medicham_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE12FD0, 0x0330 .align 2 gFile_graphics_pokemon_palettes_medicham_palette:: @ 8E13300 .incbin "graphics/pokemon/palettes/medicham_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xE13300, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_medicham_back_pic:: @ 8E13328 .incbin "graphics/pokemon/back_pics/medicham_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE13328, 0x0338 .align 2 gFile_graphics_pokemon_palettes_medicham_shiny_palette:: @ 8E13660 .incbin "graphics/pokemon/palettes/medicham_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xE13660, 0x0028 .align 2 gFile_graphics_pokemon_icons_medicham_icon:: @ 8E13688 .incbin "graphics/pokemon/icons/medicham_icon.4bpp" - @ .incbin "baserom.gba", 0xE13688, 0x0400 .align 2 gFile_graphics_pokemon_footprints_medicham_footprint:: @ 8E13A88 .incbin "graphics/pokemon/footprints/medicham_footprint.1bpp" - @ .incbin "baserom.gba", 0xE13A88, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_swablu_still_front_pic:: @ 8E13AA8 .incbin "graphics/pokemon/front_pics/swablu_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE13AA8, 0x02D8 .align 2 gFile_graphics_pokemon_palettes_swablu_palette:: @ 8E13D80 .incbin "graphics/pokemon/palettes/swablu_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xE13D80, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_swablu_back_pic:: @ 8E13DA8 .incbin "graphics/pokemon/back_pics/swablu_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE13DA8, 0x03B8 .align 2 gFile_graphics_pokemon_palettes_swablu_shiny_palette:: @ 8E14160 .incbin "graphics/pokemon/palettes/swablu_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xE14160, 0x0028 .align 2 gFile_graphics_pokemon_icons_swablu_icon:: @ 8E14188 .incbin "graphics/pokemon/icons/swablu_icon.4bpp" - @ .incbin "baserom.gba", 0xE14188, 0x0400 .align 2 gFile_graphics_pokemon_footprints_swablu_footprint:: @ 8E14588 .incbin "graphics/pokemon/footprints/swablu_footprint.1bpp" - @ .incbin "baserom.gba", 0xE14588, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_altaria_still_front_pic:: @ 8E145A8 .incbin "graphics/pokemon/front_pics/altaria_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE145A8, 0x03DC .align 2 gFile_graphics_pokemon_palettes_altaria_palette:: @ 8E14984 .incbin "graphics/pokemon/palettes/altaria_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xE14984, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_altaria_back_pic:: @ 8E149AC .incbin "graphics/pokemon/back_pics/altaria_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE149AC, 0x0378 .align 2 gFile_graphics_pokemon_palettes_altaria_shiny_palette:: @ 8E14D24 .incbin "graphics/pokemon/palettes/altaria_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xE14D24, 0x0028 .align 2 gFile_graphics_pokemon_icons_altaria_icon:: @ 8E14D4C .incbin "graphics/pokemon/icons/altaria_icon.4bpp" - @ .incbin "baserom.gba", 0xE14D4C, 0x0400 .align 2 gFile_graphics_pokemon_footprints_altaria_footprint:: @ 8E1514C .incbin "graphics/pokemon/footprints/altaria_footprint.1bpp" - @ .incbin "baserom.gba", 0xE1514C, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_wynaut_still_front_pic:: @ 8E1516C .incbin "graphics/pokemon/front_pics/wynaut_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE1516C, 0x0298 .align 2 gFile_graphics_pokemon_palettes_wynaut_palette:: @ 8E15404 .incbin "graphics/pokemon/palettes/wynaut_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xE15404, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_wynaut_back_pic:: @ 8E1542C .incbin "graphics/pokemon/back_pics/wynaut_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE1542C, 0x0290 .align 2 gFile_graphics_pokemon_palettes_wynaut_shiny_palette:: @ 8E156BC .incbin "graphics/pokemon/palettes/wynaut_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xE156BC, 0x0028 .align 2 gFile_graphics_pokemon_icons_wynaut_icon:: @ 8E156E4 .incbin "graphics/pokemon/icons/wynaut_icon.4bpp" - @ .incbin "baserom.gba", 0xE156E4, 0x0400 .align 2 gFile_graphics_pokemon_footprints_wynaut_footprint:: @ 8E15AE4 .incbin "graphics/pokemon/footprints/wynaut_footprint.1bpp" - @ .incbin "baserom.gba", 0xE15AE4, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_duskull_still_front_pic:: @ 8E15B04 .incbin "graphics/pokemon/front_pics/duskull_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE15B04, 0x02F0 .align 2 gFile_graphics_pokemon_palettes_duskull_palette:: @ 8E15DF4 .incbin "graphics/pokemon/palettes/duskull_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xE15DF4, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_duskull_back_pic:: @ 8E15E1C .incbin "graphics/pokemon/back_pics/duskull_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE15E1C, 0x02B0 .align 2 gFile_graphics_pokemon_palettes_duskull_shiny_palette:: @ 8E160CC .incbin "graphics/pokemon/palettes/duskull_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xE160CC, 0x0028 .align 2 gFile_graphics_pokemon_icons_duskull_icon:: @ 8E160F4 .incbin "graphics/pokemon/icons/duskull_icon.4bpp" - @ .incbin "baserom.gba", 0xE160F4, 0x0400 .align 2 gFile_graphics_pokemon_footprints_duskull_footprint:: @ 8E164F4 .incbin "graphics/pokemon/footprints/duskull_footprint.1bpp" - @ .incbin "baserom.gba", 0xE164F4, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_dusclops_still_front_pic:: @ 8E16514 .incbin "graphics/pokemon/front_pics/dusclops_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE16514, 0x03A0 .align 2 gFile_graphics_pokemon_palettes_dusclops_palette:: @ 8E168B4 .incbin "graphics/pokemon/palettes/dusclops_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xE168B4, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_dusclops_back_pic:: @ 8E168DC .incbin "graphics/pokemon/back_pics/dusclops_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE168DC, 0x02EC .align 2 gFile_graphics_pokemon_palettes_dusclops_shiny_palette:: @ 8E16BC8 .incbin "graphics/pokemon/palettes/dusclops_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xE16BC8, 0x0028 .align 2 gFile_graphics_pokemon_icons_dusclops_icon:: @ 8E16BF0 .incbin "graphics/pokemon/icons/dusclops_icon.4bpp" - @ .incbin "baserom.gba", 0xE16BF0, 0x0400 .align 2 gFile_graphics_pokemon_footprints_dusclops_footprint:: @ 8E16FF0 .incbin "graphics/pokemon/footprints/dusclops_footprint.1bpp" - @ .incbin "baserom.gba", 0xE16FF0, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_roselia_still_front_pic:: @ 8E17010 .incbin "graphics/pokemon/front_pics/roselia_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE17010, 0x036C .align 2 gFile_graphics_pokemon_palettes_roselia_palette:: @ 8E1737C .incbin "graphics/pokemon/palettes/roselia_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xE1737C, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_roselia_back_pic:: @ 8E173A4 .incbin "graphics/pokemon/back_pics/roselia_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE173A4, 0x03C8 .align 2 gFile_graphics_pokemon_palettes_roselia_shiny_palette:: @ 8E1776C .incbin "graphics/pokemon/palettes/roselia_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xE1776C, 0x0028 .align 2 gFile_graphics_pokemon_icons_roselia_icon:: @ 8E17794 .incbin "graphics/pokemon/icons/roselia_icon.4bpp" - @ .incbin "baserom.gba", 0xE17794, 0x0400 .align 2 gFile_graphics_pokemon_footprints_roselia_footprint:: @ 8E17B94 .incbin "graphics/pokemon/footprints/roselia_footprint.1bpp" - @ .incbin "baserom.gba", 0xE17B94, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_slakoth_still_front_pic:: @ 8E17BB4 .incbin "graphics/pokemon/front_pics/slakoth_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE17BB4, 0x02E8 .align 2 gFile_graphics_pokemon_palettes_slakoth_palette:: @ 8E17E9C .incbin "graphics/pokemon/palettes/slakoth_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xE17E9C, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_slakoth_back_pic:: @ 8E17EC4 .incbin "graphics/pokemon/back_pics/slakoth_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE17EC4, 0x02E8 .align 2 gFile_graphics_pokemon_palettes_slakoth_shiny_palette:: @ 8E181AC .incbin "graphics/pokemon/palettes/slakoth_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xE181AC, 0x0028 .align 2 gFile_graphics_pokemon_icons_slakoth_icon:: @ 8E181D4 .incbin "graphics/pokemon/icons/slakoth_icon.4bpp" - @ .incbin "baserom.gba", 0xE181D4, 0x0400 .align 2 gFile_graphics_pokemon_footprints_slakoth_footprint:: @ 8E185D4 .incbin "graphics/pokemon/footprints/slakoth_footprint.1bpp" - @ .incbin "baserom.gba", 0xE185D4, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_vigoroth_still_front_pic:: @ 8E185F4 .incbin "graphics/pokemon/front_pics/vigoroth_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE185F4, 0x03FC .align 2 gFile_graphics_pokemon_palettes_vigoroth_palette:: @ 8E189F0 .incbin "graphics/pokemon/palettes/vigoroth_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xE189F0, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_vigoroth_back_pic:: @ 8E18A18 .incbin "graphics/pokemon/back_pics/vigoroth_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE18A18, 0x02C8 .align 2 gFile_graphics_pokemon_palettes_vigoroth_shiny_palette:: @ 8E18CE0 .incbin "graphics/pokemon/palettes/vigoroth_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xE18CE0, 0x0028 .align 2 gFile_graphics_pokemon_icons_vigoroth_icon:: @ 8E18D08 .incbin "graphics/pokemon/icons/vigoroth_icon.4bpp" - @ .incbin "baserom.gba", 0xE18D08, 0x0400 .align 2 gFile_graphics_pokemon_footprints_vigoroth_footprint:: @ 8E19108 .incbin "graphics/pokemon/footprints/vigoroth_footprint.1bpp" - @ .incbin "baserom.gba", 0xE19108, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_slaking_still_front_pic:: @ 8E19128 .incbin "graphics/pokemon/front_pics/slaking_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE19128, 0x04D4 .align 2 gFile_graphics_pokemon_palettes_slaking_palette:: @ 8E195FC .incbin "graphics/pokemon/palettes/slaking_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xE195FC, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_slaking_back_pic:: @ 8E19624 .incbin "graphics/pokemon/back_pics/slaking_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE19624, 0x03C4 .align 2 gFile_graphics_pokemon_palettes_slaking_shiny_palette:: @ 8E199E8 .incbin "graphics/pokemon/palettes/slaking_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xE199E8, 0x0028 .align 2 gFile_graphics_pokemon_icons_slaking_icon:: @ 8E19A10 .incbin "graphics/pokemon/icons/slaking_icon.4bpp" - @ .incbin "baserom.gba", 0xE19A10, 0x0400 .align 2 gFile_graphics_pokemon_footprints_slaking_footprint:: @ 8E19E10 .incbin "graphics/pokemon/footprints/slaking_footprint.1bpp" - @ .incbin "baserom.gba", 0xE19E10, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_gulpin_still_front_pic:: @ 8E19E30 .incbin "graphics/pokemon/front_pics/gulpin_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE19E30, 0x0218 .align 2 gFile_graphics_pokemon_palettes_gulpin_palette:: @ 8E1A048 .incbin "graphics/pokemon/palettes/gulpin_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xE1A048, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_gulpin_back_pic:: @ 8E1A070 .incbin "graphics/pokemon/back_pics/gulpin_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE1A070, 0x0284 .align 2 gFile_graphics_pokemon_palettes_gulpin_shiny_palette:: @ 8E1A2F4 .incbin "graphics/pokemon/palettes/gulpin_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xE1A2F4, 0x0028 .align 2 gFile_graphics_pokemon_icons_gulpin_icon:: @ 8E1A31C .incbin "graphics/pokemon/icons/gulpin_icon.4bpp" - @ .incbin "baserom.gba", 0xE1A31C, 0x0400 .align 2 gFile_graphics_pokemon_footprints_gulpin_footprint:: @ 8E1A71C .incbin "graphics/pokemon/footprints/gulpin_footprint.1bpp" - @ .incbin "baserom.gba", 0xE1A71C, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_swalot_still_front_pic:: @ 8E1A73C .incbin "graphics/pokemon/front_pics/swalot_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE1A73C, 0x0344 .align 2 gFile_graphics_pokemon_palettes_swalot_palette:: @ 8E1AA80 .incbin "graphics/pokemon/palettes/swalot_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xE1AA80, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_swalot_back_pic:: @ 8E1AAA8 .incbin "graphics/pokemon/back_pics/swalot_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE1AAA8, 0x0348 .align 2 gFile_graphics_pokemon_palettes_swalot_shiny_palette:: @ 8E1ADF0 .incbin "graphics/pokemon/palettes/swalot_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xE1ADF0, 0x0028 .align 2 gFile_graphics_pokemon_icons_swalot_icon:: @ 8E1AE18 .incbin "graphics/pokemon/icons/swalot_icon.4bpp" - @ .incbin "baserom.gba", 0xE1AE18, 0x0400 .align 2 gFile_graphics_pokemon_footprints_swalot_footprint:: @ 8E1B218 .incbin "graphics/pokemon/footprints/swalot_footprint.1bpp" - @ .incbin "baserom.gba", 0xE1B218, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_tropius_still_front_pic:: @ 8E1B238 .incbin "graphics/pokemon/front_pics/tropius_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE1B238, 0x0578 .align 2 gFile_graphics_pokemon_palettes_tropius_palette:: @ 8E1B7B0 .incbin "graphics/pokemon/palettes/tropius_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xE1B7B0, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_tropius_back_pic:: @ 8E1B7D8 .incbin "graphics/pokemon/back_pics/tropius_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE1B7D8, 0x0324 .align 2 gFile_graphics_pokemon_palettes_tropius_shiny_palette:: @ 8E1BAFC .incbin "graphics/pokemon/palettes/tropius_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xE1BAFC, 0x0028 .align 2 gFile_graphics_pokemon_icons_tropius_icon:: @ 8E1BB24 .incbin "graphics/pokemon/icons/tropius_icon.4bpp" - @ .incbin "baserom.gba", 0xE1BB24, 0x0400 .align 2 gFile_graphics_pokemon_footprints_tropius_footprint:: @ 8E1BF24 .incbin "graphics/pokemon/footprints/tropius_footprint.1bpp" - @ .incbin "baserom.gba", 0xE1BF24, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_whismur_still_front_pic:: @ 8E1BF44 .incbin "graphics/pokemon/front_pics/whismur_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE1BF44, 0x0294 .align 2 gFile_graphics_pokemon_palettes_whismur_palette:: @ 8E1C1D8 .incbin "graphics/pokemon/palettes/whismur_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xE1C1D8, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_whismur_back_pic:: @ 8E1C200 .incbin "graphics/pokemon/back_pics/whismur_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE1C200, 0x0270 .align 2 gFile_graphics_pokemon_palettes_whismur_shiny_palette:: @ 8E1C470 .incbin "graphics/pokemon/palettes/whismur_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xE1C470, 0x0028 .align 2 gFile_graphics_pokemon_icons_whismur_icon:: @ 8E1C498 .incbin "graphics/pokemon/icons/whismur_icon.4bpp" - @ .incbin "baserom.gba", 0xE1C498, 0x0400 .align 2 gFile_graphics_pokemon_footprints_whismur_footprint:: @ 8E1C898 .incbin "graphics/pokemon/footprints/whismur_footprint.1bpp" - @ .incbin "baserom.gba", 0xE1C898, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_loudred_still_front_pic:: @ 8E1C8B8 .incbin "graphics/pokemon/front_pics/loudred_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE1C8B8, 0x0478 .align 2 gFile_graphics_pokemon_palettes_loudred_palette:: @ 8E1CD30 .incbin "graphics/pokemon/palettes/loudred_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xE1CD30, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_loudred_back_pic:: @ 8E1CD58 .incbin "graphics/pokemon/back_pics/loudred_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE1CD58, 0x0370 .align 2 gFile_graphics_pokemon_palettes_loudred_shiny_palette:: @ 8E1D0C8 .incbin "graphics/pokemon/palettes/loudred_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xE1D0C8, 0x0028 .align 2 gFile_graphics_pokemon_icons_loudred_icon:: @ 8E1D0F0 .incbin "graphics/pokemon/icons/loudred_icon.4bpp" - @ .incbin "baserom.gba", 0xE1D0F0, 0x0400 .align 2 gFile_graphics_pokemon_footprints_loudred_footprint:: @ 8E1D4F0 .incbin "graphics/pokemon/footprints/loudred_footprint.1bpp" - @ .incbin "baserom.gba", 0xE1D4F0, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_exploud_still_front_pic:: @ 8E1D510 .incbin "graphics/pokemon/front_pics/exploud_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE1D510, 0x0568 .align 2 gFile_graphics_pokemon_palettes_exploud_palette:: @ 8E1DA78 .incbin "graphics/pokemon/palettes/exploud_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xE1DA78, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_exploud_back_pic:: @ 8E1DAA0 .incbin "graphics/pokemon/back_pics/exploud_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE1DAA0, 0x040C .align 2 gFile_graphics_pokemon_palettes_exploud_shiny_palette:: @ 8E1DEAC .incbin "graphics/pokemon/palettes/exploud_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xE1DEAC, 0x0028 .align 2 gFile_graphics_pokemon_icons_exploud_icon:: @ 8E1DED4 .incbin "graphics/pokemon/icons/exploud_icon.4bpp" - @ .incbin "baserom.gba", 0xE1DED4, 0x0400 .align 2 gFile_graphics_pokemon_footprints_exploud_footprint:: @ 8E1E2D4 .incbin "graphics/pokemon/footprints/exploud_footprint.1bpp" - @ .incbin "baserom.gba", 0xE1E2D4, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_clamperl_still_front_pic:: @ 8E1E2F4 .incbin "graphics/pokemon/front_pics/clamperl_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE1E2F4, 0x02D8 .align 2 gFile_graphics_pokemon_palettes_clamperl_palette:: @ 8E1E5CC .incbin "graphics/pokemon/palettes/clamperl_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xE1E5CC, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_clamperl_back_pic:: @ 8E1E5F4 .incbin "graphics/pokemon/back_pics/clamperl_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE1E5F4, 0x0294 .align 2 gFile_graphics_pokemon_palettes_clamperl_shiny_palette:: @ 8E1E888 .incbin "graphics/pokemon/palettes/clamperl_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xE1E888, 0x0028 .align 2 gFile_graphics_pokemon_icons_clamperl_icon:: @ 8E1E8B0 .incbin "graphics/pokemon/icons/clamperl_icon.4bpp" - @ .incbin "baserom.gba", 0xE1E8B0, 0x0400 .align 2 gFile_graphics_pokemon_footprints_clamperl_footprint:: @ 8E1ECB0 .incbin "graphics/pokemon/footprints/clamperl_footprint.1bpp" - @ .incbin "baserom.gba", 0xE1ECB0, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_huntail_still_front_pic:: @ 8E1ECD0 .incbin "graphics/pokemon/front_pics/huntail_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE1ECD0, 0x03CC .align 2 gFile_graphics_pokemon_palettes_huntail_palette:: @ 8E1F09C .incbin "graphics/pokemon/palettes/huntail_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xE1F09C, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_huntail_back_pic:: @ 8E1F0C4 .incbin "graphics/pokemon/back_pics/huntail_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE1F0C4, 0x0354 .align 2 gFile_graphics_pokemon_palettes_huntail_shiny_palette:: @ 8E1F418 .incbin "graphics/pokemon/palettes/huntail_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xE1F418, 0x0028 .align 2 gFile_graphics_pokemon_icons_huntail_icon:: @ 8E1F440 .incbin "graphics/pokemon/icons/huntail_icon.4bpp" - @ .incbin "baserom.gba", 0xE1F440, 0x0400 .align 2 gFile_graphics_pokemon_footprints_huntail_footprint:: @ 8E1F840 .incbin "graphics/pokemon/footprints/huntail_footprint.1bpp" - @ .incbin "baserom.gba", 0xE1F840, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_gorebyss_still_front_pic:: @ 8E1F860 .incbin "graphics/pokemon/front_pics/gorebyss_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE1F860, 0x0310 .align 2 gFile_graphics_pokemon_palettes_gorebyss_palette:: @ 8E1FB70 .incbin "graphics/pokemon/palettes/gorebyss_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xE1FB70, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_gorebyss_back_pic:: @ 8E1FB98 .incbin "graphics/pokemon/back_pics/gorebyss_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE1FB98, 0x02E8 .align 2 gFile_graphics_pokemon_palettes_gorebyss_shiny_palette:: @ 8E1FE80 .incbin "graphics/pokemon/palettes/gorebyss_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xE1FE80, 0x0028 .align 2 gFile_graphics_pokemon_icons_gorebyss_icon:: @ 8E1FEA8 .incbin "graphics/pokemon/icons/gorebyss_icon.4bpp" - @ .incbin "baserom.gba", 0xE1FEA8, 0x0400 .align 2 gFile_graphics_pokemon_footprints_gorebyss_footprint:: @ 8E202A8 .incbin "graphics/pokemon/footprints/gorebyss_footprint.1bpp" - @ .incbin "baserom.gba", 0xE202A8, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_absol_still_front_pic:: @ 8E202C8 .incbin "graphics/pokemon/front_pics/absol_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE202C8, 0x0430 .align 2 gFile_graphics_pokemon_palettes_absol_palette:: @ 8E206F8 .incbin "graphics/pokemon/palettes/absol_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xE206F8, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_absol_back_pic:: @ 8E20720 .incbin "graphics/pokemon/back_pics/absol_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE20720, 0x0360 .align 2 gFile_graphics_pokemon_palettes_absol_shiny_palette:: @ 8E20A80 .incbin "graphics/pokemon/palettes/absol_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xE20A80, 0x0028 .align 2 gFile_graphics_pokemon_icons_absol_icon:: @ 8E20AA8 .incbin "graphics/pokemon/icons/absol_icon.4bpp" - @ .incbin "baserom.gba", 0xE20AA8, 0x0400 .align 2 gFile_graphics_pokemon_footprints_absol_footprint:: @ 8E20EA8 .incbin "graphics/pokemon/footprints/absol_footprint.1bpp" - @ .incbin "baserom.gba", 0xE20EA8, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_shuppet_still_front_pic:: @ 8E20EC8 .incbin "graphics/pokemon/front_pics/shuppet_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE20EC8, 0x0238 .align 2 gFile_graphics_pokemon_palettes_shuppet_palette:: @ 8E21100 .incbin "graphics/pokemon/palettes/shuppet_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xE21100, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_shuppet_back_pic:: @ 8E21128 .incbin "graphics/pokemon/back_pics/shuppet_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE21128, 0x0298 .align 2 gFile_graphics_pokemon_palettes_shuppet_shiny_palette:: @ 8E213C0 .incbin "graphics/pokemon/palettes/shuppet_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xE213C0, 0x0028 .align 2 gFile_graphics_pokemon_icons_shuppet_icon:: @ 8E213E8 .incbin "graphics/pokemon/icons/shuppet_icon.4bpp" - @ .incbin "baserom.gba", 0xE213E8, 0x0400 .align 2 gFile_graphics_pokemon_footprints_shuppet_footprint:: @ 8E217E8 .incbin "graphics/pokemon/footprints/shuppet_footprint.1bpp" - @ .incbin "baserom.gba", 0xE217E8, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_banette_still_front_pic:: @ 8E21808 .incbin "graphics/pokemon/front_pics/banette_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE21808, 0x02B4 .align 2 gFile_graphics_pokemon_palettes_banette_palette:: @ 8E21ABC .incbin "graphics/pokemon/palettes/banette_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xE21ABC, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_banette_back_pic:: @ 8E21AE4 .incbin "graphics/pokemon/back_pics/banette_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE21AE4, 0x027C .align 2 gFile_graphics_pokemon_palettes_banette_shiny_palette:: @ 8E21D60 .incbin "graphics/pokemon/palettes/banette_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xE21D60, 0x0028 .align 2 gFile_graphics_pokemon_icons_banette_icon:: @ 8E21D88 .incbin "graphics/pokemon/icons/banette_icon.4bpp" - @ .incbin "baserom.gba", 0xE21D88, 0x0400 .align 2 gFile_graphics_pokemon_footprints_banette_footprint:: @ 8E22188 .incbin "graphics/pokemon/footprints/banette_footprint.1bpp" - @ .incbin "baserom.gba", 0xE22188, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_seviper_still_front_pic:: @ 8E221A8 .incbin "graphics/pokemon/front_pics/seviper_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE221A8, 0x0420 .align 2 gFile_graphics_pokemon_palettes_seviper_palette:: @ 8E225C8 .incbin "graphics/pokemon/palettes/seviper_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xE225C8, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_seviper_back_pic:: @ 8E225F0 .incbin "graphics/pokemon/back_pics/seviper_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE225F0, 0x048C .align 2 gFile_graphics_pokemon_palettes_seviper_shiny_palette:: @ 8E22A7C .incbin "graphics/pokemon/palettes/seviper_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xE22A7C, 0x0028 .align 2 gFile_graphics_pokemon_icons_seviper_icon:: @ 8E22AA4 .incbin "graphics/pokemon/icons/seviper_icon.4bpp" - @ .incbin "baserom.gba", 0xE22AA4, 0x0400 .align 2 gFile_graphics_pokemon_footprints_seviper_footprint:: @ 8E22EA4 .incbin "graphics/pokemon/footprints/seviper_footprint.1bpp" - @ .incbin "baserom.gba", 0xE22EA4, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_zangoose_still_front_pic:: @ 8E22EC4 .incbin "graphics/pokemon/front_pics/zangoose_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE22EC4, 0x03CC .align 2 gFile_graphics_pokemon_palettes_zangoose_palette:: @ 8E23290 .incbin "graphics/pokemon/palettes/zangoose_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xE23290, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_zangoose_back_pic:: @ 8E232B8 .incbin "graphics/pokemon/back_pics/zangoose_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE232B8, 0x0374 .align 2 gFile_graphics_pokemon_palettes_zangoose_shiny_palette:: @ 8E2362C .incbin "graphics/pokemon/palettes/zangoose_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xE2362C, 0x0028 .align 2 gFile_graphics_pokemon_icons_zangoose_icon:: @ 8E23654 .incbin "graphics/pokemon/icons/zangoose_icon.4bpp" - @ .incbin "baserom.gba", 0xE23654, 0x0400 .align 2 gFile_graphics_pokemon_footprints_zangoose_footprint:: @ 8E23A54 .incbin "graphics/pokemon/footprints/zangoose_footprint.1bpp" - @ .incbin "baserom.gba", 0xE23A54, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_relicanth_still_front_pic:: @ 8E23A74 .incbin "graphics/pokemon/front_pics/relicanth_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE23A74, 0x0394 .align 2 gFile_graphics_pokemon_palettes_relicanth_palette:: @ 8E23E08 .incbin "graphics/pokemon/palettes/relicanth_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xE23E08, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_relicanth_back_pic:: @ 8E23E30 .incbin "graphics/pokemon/back_pics/relicanth_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE23E30, 0x0358 .align 2 gFile_graphics_pokemon_palettes_relicanth_shiny_palette:: @ 8E24188 .incbin "graphics/pokemon/palettes/relicanth_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xE24188, 0x0028 .align 2 gFile_graphics_pokemon_icons_relicanth_icon:: @ 8E241B0 .incbin "graphics/pokemon/icons/relicanth_icon.4bpp" - @ .incbin "baserom.gba", 0xE241B0, 0x0400 .align 2 gFile_graphics_pokemon_footprints_relicanth_footprint:: @ 8E245B0 .incbin "graphics/pokemon/footprints/relicanth_footprint.1bpp" - @ .incbin "baserom.gba", 0xE245B0, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_aron_still_front_pic:: @ 8E245D0 .incbin "graphics/pokemon/front_pics/aron_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE245D0, 0x01E8 .align 2 gFile_graphics_pokemon_palettes_aron_palette:: @ 8E247B8 .incbin "graphics/pokemon/palettes/aron_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xE247B8, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_aron_back_pic:: @ 8E247E0 .incbin "graphics/pokemon/back_pics/aron_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE247E0, 0x0228 .align 2 gFile_graphics_pokemon_palettes_aron_shiny_palette:: @ 8E24A08 .incbin "graphics/pokemon/palettes/aron_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xE24A08, 0x0028 .align 2 gFile_graphics_pokemon_icons_aron_icon:: @ 8E24A30 .incbin "graphics/pokemon/icons/aron_icon.4bpp" - @ .incbin "baserom.gba", 0xE24A30, 0x0400 .align 2 gFile_graphics_pokemon_footprints_aron_footprint:: @ 8E24E30 .incbin "graphics/pokemon/footprints/aron_footprint.1bpp" - @ .incbin "baserom.gba", 0xE24E30, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_lairon_still_front_pic:: @ 8E24E50 .incbin "graphics/pokemon/front_pics/lairon_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE24E50, 0x03CC .align 2 gFile_graphics_pokemon_palettes_lairon_palette:: @ 8E2521C .incbin "graphics/pokemon/palettes/lairon_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xE2521C, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_lairon_back_pic:: @ 8E25244 .incbin "graphics/pokemon/back_pics/lairon_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE25244, 0x02EC .align 2 gFile_graphics_pokemon_palettes_lairon_shiny_palette:: @ 8E25530 .incbin "graphics/pokemon/palettes/lairon_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xE25530, 0x0028 .align 2 gFile_graphics_pokemon_icons_lairon_icon:: @ 8E25558 .incbin "graphics/pokemon/icons/lairon_icon.4bpp" - @ .incbin "baserom.gba", 0xE25558, 0x0400 .align 2 gFile_graphics_pokemon_footprints_lairon_footprint:: @ 8E25958 .incbin "graphics/pokemon/footprints/lairon_footprint.1bpp" - @ .incbin "baserom.gba", 0xE25958, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_aggron_still_front_pic:: @ 8E25978 .incbin "graphics/pokemon/front_pics/aggron_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE25978, 0x057C .align 2 gFile_graphics_pokemon_palettes_aggron_palette:: @ 8E25EF4 .incbin "graphics/pokemon/palettes/aggron_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xE25EF4, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_aggron_back_pic:: @ 8E25F1C .incbin "graphics/pokemon/back_pics/aggron_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE25F1C, 0x0428 .align 2 gFile_graphics_pokemon_palettes_aggron_shiny_palette:: @ 8E26344 .incbin "graphics/pokemon/palettes/aggron_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xE26344, 0x0028 .align 2 gFile_graphics_pokemon_icons_aggron_icon:: @ 8E2636C .incbin "graphics/pokemon/icons/aggron_icon.4bpp" - @ .incbin "baserom.gba", 0xE2636C, 0x0400 .align 2 gFile_graphics_pokemon_footprints_aggron_footprint:: @ 8E2676C .incbin "graphics/pokemon/footprints/aggron_footprint.1bpp" - @ .incbin "baserom.gba", 0xE2676C, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_castform_still_front_pic:: @ 8E2678C .incbin "graphics/pokemon/front_pics/castform_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE2678C, 0x0A88 .align 2 gFile_graphics_pokemon_palettes_castform_palette:: @ 8E27214 .incbin "graphics/pokemon/palettes/castform_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xE27214, 0x0080 .align 2 gFile_graphics_pokemon_back_pics_castform_back_pic:: @ 8E27294 .incbin "graphics/pokemon/back_pics/castform_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE27294, 0x09BC .align 2 gFile_graphics_pokemon_palettes_castform_shiny_palette:: @ 8E27C50 .incbin "graphics/pokemon/palettes/castform_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xE27C50, 0x007C .align 2 gFile_graphics_pokemon_icons_castform_icon:: @ 8E27CCC .incbin "graphics/pokemon/icons/castform_icon.4bpp" - @ .incbin "baserom.gba", 0xE27CCC, 0x0400 .align 2 gFile_graphics_pokemon_footprints_castform_footprint:: @ 8E280CC .incbin "graphics/pokemon/footprints/castform_footprint.1bpp" - @ .incbin "baserom.gba", 0xE280CC, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_volbeat_still_front_pic:: @ 8E280EC .incbin "graphics/pokemon/front_pics/volbeat_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE280EC, 0x0390 .align 2 gFile_graphics_pokemon_palettes_volbeat_palette:: @ 8E2847C .incbin "graphics/pokemon/palettes/volbeat_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xE2847C, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_volbeat_back_pic:: @ 8E284A4 .incbin "graphics/pokemon/back_pics/volbeat_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE284A4, 0x0360 .align 2 gFile_graphics_pokemon_palettes_volbeat_shiny_palette:: @ 8E28804 .incbin "graphics/pokemon/palettes/volbeat_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xE28804, 0x0028 .align 2 gFile_graphics_pokemon_icons_volbeat_icon:: @ 8E2882C .incbin "graphics/pokemon/icons/volbeat_icon.4bpp" - @ .incbin "baserom.gba", 0xE2882C, 0x0400 .align 2 gFile_graphics_pokemon_footprints_volbeat_footprint:: @ 8E28C2C .incbin "graphics/pokemon/footprints/volbeat_footprint.1bpp" - @ .incbin "baserom.gba", 0xE28C2C, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_illumise_still_front_pic:: @ 8E28C4C .incbin "graphics/pokemon/front_pics/illumise_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE28C4C, 0x0374 .align 2 gFile_graphics_pokemon_palettes_illumise_palette:: @ 8E28FC0 .incbin "graphics/pokemon/palettes/illumise_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xE28FC0, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_illumise_back_pic:: @ 8E28FE8 .incbin "graphics/pokemon/back_pics/illumise_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE28FE8, 0x031C .align 2 gFile_graphics_pokemon_palettes_illumise_shiny_palette:: @ 8E29304 .incbin "graphics/pokemon/palettes/illumise_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xE29304, 0x0028 .align 2 gFile_graphics_pokemon_icons_illumise_icon:: @ 8E2932C .incbin "graphics/pokemon/icons/illumise_icon.4bpp" - @ .incbin "baserom.gba", 0xE2932C, 0x0400 .align 2 gFile_graphics_pokemon_footprints_illumise_footprint:: @ 8E2972C .incbin "graphics/pokemon/footprints/illumise_footprint.1bpp" - @ .incbin "baserom.gba", 0xE2972C, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_lileep_still_front_pic:: @ 8E2974C .incbin "graphics/pokemon/front_pics/lileep_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE2974C, 0x0344 .align 2 gFile_graphics_pokemon_palettes_lileep_palette:: @ 8E29A90 .incbin "graphics/pokemon/palettes/lileep_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xE29A90, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_lileep_back_pic:: @ 8E29AB8 .incbin "graphics/pokemon/back_pics/lileep_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE29AB8, 0x0344 .align 2 gFile_graphics_pokemon_palettes_lileep_shiny_palette:: @ 8E29DFC .incbin "graphics/pokemon/palettes/lileep_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xE29DFC, 0x0028 .align 2 gFile_graphics_pokemon_icons_lileep_icon:: @ 8E29E24 .incbin "graphics/pokemon/icons/lileep_icon.4bpp" - @ .incbin "baserom.gba", 0xE29E24, 0x0400 .align 2 gFile_graphics_pokemon_footprints_lileep_footprint:: @ 8E2A224 .incbin "graphics/pokemon/footprints/lileep_footprint.1bpp" - @ .incbin "baserom.gba", 0xE2A224, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_cradily_still_front_pic:: @ 8E2A244 .incbin "graphics/pokemon/front_pics/cradily_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE2A244, 0x041C .align 2 gFile_graphics_pokemon_palettes_cradily_palette:: @ 8E2A660 .incbin "graphics/pokemon/palettes/cradily_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xE2A660, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_cradily_back_pic:: @ 8E2A688 .incbin "graphics/pokemon/back_pics/cradily_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE2A688, 0x03FC .align 2 gFile_graphics_pokemon_palettes_cradily_shiny_palette:: @ 8E2AA84 .incbin "graphics/pokemon/palettes/cradily_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xE2AA84, 0x0028 .align 2 gFile_graphics_pokemon_icons_cradily_icon:: @ 8E2AAAC .incbin "graphics/pokemon/icons/cradily_icon.4bpp" - @ .incbin "baserom.gba", 0xE2AAAC, 0x0400 .align 2 gFile_graphics_pokemon_footprints_cradily_footprint:: @ 8E2AEAC .incbin "graphics/pokemon/footprints/cradily_footprint.1bpp" - @ .incbin "baserom.gba", 0xE2AEAC, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_anorith_still_front_pic:: @ 8E2AECC .incbin "graphics/pokemon/front_pics/anorith_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE2AECC, 0x0324 .align 2 gFile_graphics_pokemon_palettes_anorith_palette:: @ 8E2B1F0 .incbin "graphics/pokemon/palettes/anorith_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xE2B1F0, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_anorith_back_pic:: @ 8E2B218 .incbin "graphics/pokemon/back_pics/anorith_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE2B218, 0x0248 .align 2 gFile_graphics_pokemon_palettes_anorith_shiny_palette:: @ 8E2B460 .incbin "graphics/pokemon/palettes/anorith_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xE2B460, 0x0028 .align 2 gFile_graphics_pokemon_icons_anorith_icon:: @ 8E2B488 .incbin "graphics/pokemon/icons/anorith_icon.4bpp" - @ .incbin "baserom.gba", 0xE2B488, 0x0400 .align 2 gFile_graphics_pokemon_footprints_anorith_footprint:: @ 8E2B888 .incbin "graphics/pokemon/footprints/anorith_footprint.1bpp" - @ .incbin "baserom.gba", 0xE2B888, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_armaldo_still_front_pic:: @ 8E2B8A8 .incbin "graphics/pokemon/front_pics/armaldo_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE2B8A8, 0x0580 .align 2 gFile_graphics_pokemon_palettes_armaldo_palette:: @ 8E2BE28 .incbin "graphics/pokemon/palettes/armaldo_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xE2BE28, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_armaldo_back_pic:: @ 8E2BE50 .incbin "graphics/pokemon/back_pics/armaldo_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE2BE50, 0x0438 .align 2 gFile_graphics_pokemon_palettes_armaldo_shiny_palette:: @ 8E2C288 .incbin "graphics/pokemon/palettes/armaldo_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xE2C288, 0x0028 .align 2 gFile_graphics_pokemon_icons_armaldo_icon:: @ 8E2C2B0 .incbin "graphics/pokemon/icons/armaldo_icon.4bpp" - @ .incbin "baserom.gba", 0xE2C2B0, 0x0400 .align 2 gFile_graphics_pokemon_footprints_armaldo_footprint:: @ 8E2C6B0 .incbin "graphics/pokemon/footprints/armaldo_footprint.1bpp" - @ .incbin "baserom.gba", 0xE2C6B0, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_ralts_still_front_pic:: @ 8E2C6D0 .incbin "graphics/pokemon/front_pics/ralts_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE2C6D0, 0x0230 .align 2 gFile_graphics_pokemon_palettes_ralts_palette:: @ 8E2C900 .incbin "graphics/pokemon/palettes/ralts_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xE2C900, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_ralts_back_pic:: @ 8E2C928 .incbin "graphics/pokemon/back_pics/ralts_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE2C928, 0x023C .align 2 gFile_graphics_pokemon_palettes_ralts_shiny_palette:: @ 8E2CB64 .incbin "graphics/pokemon/palettes/ralts_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xE2CB64, 0x0028 .align 2 gFile_graphics_pokemon_icons_ralts_icon:: @ 8E2CB8C .incbin "graphics/pokemon/icons/ralts_icon.4bpp" - @ .incbin "baserom.gba", 0xE2CB8C, 0x0400 .align 2 gFile_graphics_pokemon_footprints_ralts_footprint:: @ 8E2CF8C .incbin "graphics/pokemon/footprints/ralts_footprint.1bpp" - @ .incbin "baserom.gba", 0xE2CF8C, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_kirlia_still_front_pic:: @ 8E2CFAC .incbin "graphics/pokemon/front_pics/kirlia_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE2CFAC, 0x02FC .align 2 gFile_graphics_pokemon_palettes_kirlia_palette:: @ 8E2D2A8 .incbin "graphics/pokemon/palettes/kirlia_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xE2D2A8, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_kirlia_back_pic:: @ 8E2D2D0 .incbin "graphics/pokemon/back_pics/kirlia_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE2D2D0, 0x0374 .align 2 gFile_graphics_pokemon_palettes_kirlia_shiny_palette:: @ 8E2D644 .incbin "graphics/pokemon/palettes/kirlia_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xE2D644, 0x0028 .align 2 gFile_graphics_pokemon_icons_kirlia_icon:: @ 8E2D66C .incbin "graphics/pokemon/icons/kirlia_icon.4bpp" - @ .incbin "baserom.gba", 0xE2D66C, 0x0400 .align 2 gFile_graphics_pokemon_footprints_kirlia_footprint:: @ 8E2DA6C .incbin "graphics/pokemon/footprints/kirlia_footprint.1bpp" - @ .incbin "baserom.gba", 0xE2DA6C, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_gardevoir_still_front_pic:: @ 8E2DA8C .incbin "graphics/pokemon/front_pics/gardevoir_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE2DA8C, 0x037C .align 2 gFile_graphics_pokemon_palettes_gardevoir_palette:: @ 8E2DE08 .incbin "graphics/pokemon/palettes/gardevoir_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xE2DE08, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_gardevoir_back_pic:: @ 8E2DE30 .incbin "graphics/pokemon/back_pics/gardevoir_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE2DE30, 0x0334 .align 2 gFile_graphics_pokemon_palettes_gardevoir_shiny_palette:: @ 8E2E164 .incbin "graphics/pokemon/palettes/gardevoir_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xE2E164, 0x0028 .align 2 gFile_graphics_pokemon_icons_gardevoir_icon:: @ 8E2E18C .incbin "graphics/pokemon/icons/gardevoir_icon.4bpp" - @ .incbin "baserom.gba", 0xE2E18C, 0x0400 .align 2 gFile_graphics_pokemon_footprints_gardevoir_footprint:: @ 8E2E58C .incbin "graphics/pokemon/footprints/gardevoir_footprint.1bpp" - @ .incbin "baserom.gba", 0xE2E58C, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_bagon_still_front_pic:: @ 8E2E5AC .incbin "graphics/pokemon/front_pics/bagon_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE2E5AC, 0x0278 .align 2 gFile_graphics_pokemon_palettes_bagon_palette:: @ 8E2E824 .incbin "graphics/pokemon/palettes/bagon_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xE2E824, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_bagon_back_pic:: @ 8E2E84C .incbin "graphics/pokemon/back_pics/bagon_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE2E84C, 0x02E8 .align 2 gFile_graphics_pokemon_palettes_bagon_shiny_palette:: @ 8E2EB34 .incbin "graphics/pokemon/palettes/bagon_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xE2EB34, 0x0028 .align 2 gFile_graphics_pokemon_icons_bagon_icon:: @ 8E2EB5C .incbin "graphics/pokemon/icons/bagon_icon.4bpp" - @ .incbin "baserom.gba", 0xE2EB5C, 0x0400 .align 2 gFile_graphics_pokemon_footprints_bagon_footprint:: @ 8E2EF5C .incbin "graphics/pokemon/footprints/bagon_footprint.1bpp" - @ .incbin "baserom.gba", 0xE2EF5C, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_shelgon_still_front_pic:: @ 8E2EF7C .incbin "graphics/pokemon/front_pics/shelgon_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE2EF7C, 0x0304 .align 2 gFile_graphics_pokemon_palettes_shelgon_palette:: @ 8E2F280 .incbin "graphics/pokemon/palettes/shelgon_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xE2F280, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_shelgon_back_pic:: @ 8E2F2A8 .incbin "graphics/pokemon/back_pics/shelgon_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE2F2A8, 0x02E8 .align 2 gFile_graphics_pokemon_palettes_shelgon_shiny_palette:: @ 8E2F590 .incbin "graphics/pokemon/palettes/shelgon_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xE2F590, 0x0028 .align 2 gFile_graphics_pokemon_icons_shelgon_icon:: @ 8E2F5B8 .incbin "graphics/pokemon/icons/shelgon_icon.4bpp" - @ .incbin "baserom.gba", 0xE2F5B8, 0x0400 .align 2 gFile_graphics_pokemon_footprints_shelgon_footprint:: @ 8E2F9B8 .incbin "graphics/pokemon/footprints/shelgon_footprint.1bpp" - @ .incbin "baserom.gba", 0xE2F9B8, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_salamence_still_front_pic:: @ 8E2F9D8 .incbin "graphics/pokemon/front_pics/salamence_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE2F9D8, 0x0464 .align 2 gFile_graphics_pokemon_palettes_salamence_palette:: @ 8E2FE3C .incbin "graphics/pokemon/palettes/salamence_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xE2FE3C, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_salamence_back_pic:: @ 8E2FE64 .incbin "graphics/pokemon/back_pics/salamence_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE2FE64, 0x02E4 .align 2 gFile_graphics_pokemon_palettes_salamence_shiny_palette:: @ 8E30148 .incbin "graphics/pokemon/palettes/salamence_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xE30148, 0x0028 .align 2 gFile_graphics_pokemon_icons_salamence_icon:: @ 8E30170 .incbin "graphics/pokemon/icons/salamence_icon.4bpp" - @ .incbin "baserom.gba", 0xE30170, 0x0400 .align 2 gFile_graphics_pokemon_footprints_salamence_footprint:: @ 8E30570 .incbin "graphics/pokemon/footprints/salamence_footprint.1bpp" - @ .incbin "baserom.gba", 0xE30570, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_beldum_still_front_pic:: @ 8E30590 .incbin "graphics/pokemon/front_pics/beldum_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE30590, 0x0270 .align 2 gFile_graphics_pokemon_palettes_beldum_palette:: @ 8E30800 .incbin "graphics/pokemon/palettes/beldum_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xE30800, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_beldum_back_pic:: @ 8E30828 .incbin "graphics/pokemon/back_pics/beldum_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE30828, 0x02F0 .align 2 gFile_graphics_pokemon_palettes_beldum_shiny_palette:: @ 8E30B18 .incbin "graphics/pokemon/palettes/beldum_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xE30B18, 0x0028 .align 2 gFile_graphics_pokemon_icons_beldum_icon:: @ 8E30B40 .incbin "graphics/pokemon/icons/beldum_icon.4bpp" - @ .incbin "baserom.gba", 0xE30B40, 0x0400 .align 2 gFile_graphics_pokemon_footprints_beldum_footprint:: @ 8E30F40 .incbin "graphics/pokemon/footprints/beldum_footprint.1bpp" - @ .incbin "baserom.gba", 0xE30F40, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_metang_still_front_pic:: @ 8E30F60 .incbin "graphics/pokemon/front_pics/metang_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE30F60, 0x045C .align 2 gFile_graphics_pokemon_palettes_metang_palette:: @ 8E313BC .incbin "graphics/pokemon/palettes/metang_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xE313BC, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_metang_back_pic:: @ 8E313E4 .incbin "graphics/pokemon/back_pics/metang_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE313E4, 0x0324 .align 2 gFile_graphics_pokemon_palettes_metang_shiny_palette:: @ 8E31708 .incbin "graphics/pokemon/palettes/metang_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xE31708, 0x0028 .align 2 gFile_graphics_pokemon_icons_metang_icon:: @ 8E31730 .incbin "graphics/pokemon/icons/metang_icon.4bpp" - @ .incbin "baserom.gba", 0xE31730, 0x0400 .align 2 gFile_graphics_pokemon_footprints_metang_footprint:: @ 8E31B30 .incbin "graphics/pokemon/footprints/metang_footprint.1bpp" - @ .incbin "baserom.gba", 0xE31B30, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_metagross_still_front_pic:: @ 8E31B50 .incbin "graphics/pokemon/front_pics/metagross_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE31B50, 0x0464 .align 2 gFile_graphics_pokemon_palettes_metagross_palette:: @ 8E31FB4 .incbin "graphics/pokemon/palettes/metagross_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xE31FB4, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_metagross_back_pic:: @ 8E31FDC .incbin "graphics/pokemon/back_pics/metagross_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE31FDC, 0x02CC .align 2 gFile_graphics_pokemon_palettes_metagross_shiny_palette:: @ 8E322A8 .incbin "graphics/pokemon/palettes/metagross_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xE322A8, 0x0028 .align 2 gFile_graphics_pokemon_icons_metagross_icon:: @ 8E322D0 .incbin "graphics/pokemon/icons/metagross_icon.4bpp" - @ .incbin "baserom.gba", 0xE322D0, 0x0400 .align 2 gFile_graphics_pokemon_footprints_metagross_footprint:: @ 8E326D0 .incbin "graphics/pokemon/footprints/metagross_footprint.1bpp" - @ .incbin "baserom.gba", 0xE326D0, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_regirock_still_front_pic:: @ 8E326F0 .incbin "graphics/pokemon/front_pics/regirock_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE326F0, 0x04BC .align 2 gFile_graphics_pokemon_palettes_regirock_palette:: @ 8E32BAC .incbin "graphics/pokemon/palettes/regirock_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xE32BAC, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_regirock_back_pic:: @ 8E32BD4 .incbin "graphics/pokemon/back_pics/regirock_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE32BD4, 0x044C .align 2 gFile_graphics_pokemon_palettes_regirock_shiny_palette:: @ 8E33020 .incbin "graphics/pokemon/palettes/regirock_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xE33020, 0x0028 .align 2 gFile_graphics_pokemon_icons_regirock_icon:: @ 8E33048 .incbin "graphics/pokemon/icons/regirock_icon.4bpp" - @ .incbin "baserom.gba", 0xE33048, 0x0400 .align 2 gFile_graphics_pokemon_footprints_regirock_footprint:: @ 8E33448 .incbin "graphics/pokemon/footprints/regirock_footprint.1bpp" - @ .incbin "baserom.gba", 0xE33448, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_regice_still_front_pic:: @ 8E33468 .incbin "graphics/pokemon/front_pics/regice_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE33468, 0x0448 .align 2 gFile_graphics_pokemon_palettes_regice_palette:: @ 8E338B0 .incbin "graphics/pokemon/palettes/regice_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xE338B0, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_regice_back_pic:: @ 8E338D8 .incbin "graphics/pokemon/back_pics/regice_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE338D8, 0x02F0 .align 2 gFile_graphics_pokemon_palettes_regice_shiny_palette:: @ 8E33BC8 .incbin "graphics/pokemon/palettes/regice_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xE33BC8, 0x0028 .align 2 gFile_graphics_pokemon_icons_regice_icon:: @ 8E33BF0 .incbin "graphics/pokemon/icons/regice_icon.4bpp" - @ .incbin "baserom.gba", 0xE33BF0, 0x0400 .align 2 gFile_graphics_pokemon_footprints_regice_footprint:: @ 8E33FF0 .incbin "graphics/pokemon/footprints/regice_footprint.1bpp" - @ .incbin "baserom.gba", 0xE33FF0, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_registeel_still_front_pic:: @ 8E34010 .incbin "graphics/pokemon/front_pics/registeel_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE34010, 0x0488 .align 2 gFile_graphics_pokemon_palettes_registeel_palette:: @ 8E34498 .incbin "graphics/pokemon/palettes/registeel_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xE34498, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_registeel_back_pic:: @ 8E344C0 .incbin "graphics/pokemon/back_pics/registeel_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE344C0, 0x0338 .align 2 gFile_graphics_pokemon_palettes_registeel_shiny_palette:: @ 8E347F8 .incbin "graphics/pokemon/palettes/registeel_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xE347F8, 0x0028 .align 2 gFile_graphics_pokemon_icons_registeel_icon:: @ 8E34820 .incbin "graphics/pokemon/icons/registeel_icon.4bpp" - @ .incbin "baserom.gba", 0xE34820, 0x0400 .align 2 gFile_graphics_pokemon_footprints_registeel_footprint:: @ 8E34C20 .incbin "graphics/pokemon/footprints/registeel_footprint.1bpp" - @ .incbin "baserom.gba", 0xE34C20, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_kyogre_still_front_pic:: @ 8E34C40 .incbin "graphics/pokemon/front_pics/kyogre_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE34C40, 0x0470 .align 2 gFile_graphics_pokemon_palettes_kyogre_palette:: @ 8E350B0 .incbin "graphics/pokemon/palettes/kyogre_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xE350B0, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_kyogre_back_pic:: @ 8E350D8 .incbin "graphics/pokemon/back_pics/kyogre_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE350D8, 0x0278 .align 2 gFile_graphics_pokemon_palettes_kyogre_shiny_palette:: @ 8E35350 .incbin "graphics/pokemon/palettes/kyogre_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xE35350, 0x0028 .align 2 gFile_graphics_pokemon_icons_kyogre_icon:: @ 8E35378 .incbin "graphics/pokemon/icons/kyogre_icon.4bpp" - @ .incbin "baserom.gba", 0xE35378, 0x0400 .align 2 gFile_graphics_pokemon_footprints_kyogre_footprint:: @ 8E35778 .incbin "graphics/pokemon/footprints/kyogre_footprint.1bpp" - @ .incbin "baserom.gba", 0xE35778, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_groudon_still_front_pic:: @ 8E35798 .incbin "graphics/pokemon/front_pics/groudon_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE35798, 0x0594 .align 2 gFile_graphics_pokemon_palettes_groudon_palette:: @ 8E35D2C .incbin "graphics/pokemon/palettes/groudon_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xE35D2C, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_groudon_back_pic:: @ 8E35D54 .incbin "graphics/pokemon/back_pics/groudon_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE35D54, 0x0468 .align 2 gFile_graphics_pokemon_palettes_groudon_shiny_palette:: @ 8E361BC .incbin "graphics/pokemon/palettes/groudon_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xE361BC, 0x0028 .align 2 gFile_graphics_pokemon_icons_groudon_icon:: @ 8E361E4 .incbin "graphics/pokemon/icons/groudon_icon.4bpp" - @ .incbin "baserom.gba", 0xE361E4, 0x0400 .align 2 gFile_graphics_pokemon_footprints_groudon_footprint:: @ 8E365E4 .incbin "graphics/pokemon/footprints/groudon_footprint.1bpp" - @ .incbin "baserom.gba", 0xE365E4, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_rayquaza_still_front_pic:: @ 8E36604 .incbin "graphics/pokemon/front_pics/rayquaza_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE36604, 0x0510 .align 2 gFile_graphics_pokemon_palettes_rayquaza_palette:: @ 8E36B14 .incbin "graphics/pokemon/palettes/rayquaza_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xE36B14, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_rayquaza_back_pic:: @ 8E36B3C .incbin "graphics/pokemon/back_pics/rayquaza_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE36B3C, 0x0338 .align 2 gFile_graphics_pokemon_palettes_rayquaza_shiny_palette:: @ 8E36E74 .incbin "graphics/pokemon/palettes/rayquaza_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xE36E74, 0x0028 .align 2 gFile_graphics_pokemon_icons_rayquaza_icon:: @ 8E36E9C .incbin "graphics/pokemon/icons/rayquaza_icon.4bpp" - @ .incbin "baserom.gba", 0xE36E9C, 0x0400 .align 2 gFile_graphics_pokemon_footprints_rayquaza_footprint:: @ 8E3729C .incbin "graphics/pokemon/footprints/rayquaza_footprint.1bpp" - @ .incbin "baserom.gba", 0xE3729C, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_latias_still_front_pic:: @ 8E372BC .incbin "graphics/pokemon/front_pics/latias_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE372BC, 0x0424 .align 2 gFile_graphics_pokemon_palettes_latias_palette:: @ 8E376E0 .incbin "graphics/pokemon/palettes/latias_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xE376E0, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_latias_back_pic:: @ 8E37708 .incbin "graphics/pokemon/back_pics/latias_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE37708, 0x02FC .align 2 gFile_graphics_pokemon_palettes_latias_shiny_palette:: @ 8E37A04 .incbin "graphics/pokemon/palettes/latias_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xE37A04, 0x0028 .align 2 gFile_graphics_pokemon_icons_latias_icon:: @ 8E37A2C .incbin "graphics/pokemon/icons/latias_icon.4bpp" - @ .incbin "baserom.gba", 0xE37A2C, 0x0400 .align 2 gFile_graphics_pokemon_footprints_latias_footprint:: @ 8E37E2C .incbin "graphics/pokemon/footprints/latias_footprint.1bpp" - @ .incbin "baserom.gba", 0xE37E2C, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_latios_still_front_pic:: @ 8E37E4C .incbin "graphics/pokemon/front_pics/latios_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE37E4C, 0x0454 .align 2 gFile_graphics_pokemon_palettes_latios_palette:: @ 8E382A0 .incbin "graphics/pokemon/palettes/latios_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xE382A0, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_latios_back_pic:: @ 8E382C8 .incbin "graphics/pokemon/back_pics/latios_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE382C8, 0x0360 .align 2 gFile_graphics_pokemon_palettes_latios_shiny_palette:: @ 8E38628 .incbin "graphics/pokemon/palettes/latios_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xE38628, 0x0028 .align 2 gFile_graphics_pokemon_icons_latios_icon:: @ 8E38650 .incbin "graphics/pokemon/icons/latios_icon.4bpp" - @ .incbin "baserom.gba", 0xE38650, 0x0400 .align 2 gFile_graphics_pokemon_footprints_latios_footprint:: @ 8E38A50 .incbin "graphics/pokemon/footprints/latios_footprint.1bpp" - @ .incbin "baserom.gba", 0xE38A50, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_jirachi_still_front_pic:: @ 8E38A70 .incbin "graphics/pokemon/front_pics/jirachi_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE38A70, 0x030C .align 2 gFile_graphics_pokemon_palettes_jirachi_palette:: @ 8E38D7C .incbin "graphics/pokemon/palettes/jirachi_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xE38D7C, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_jirachi_back_pic:: @ 8E38DA4 .incbin "graphics/pokemon/back_pics/jirachi_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE38DA4, 0x03A0 .align 2 gFile_graphics_pokemon_palettes_jirachi_shiny_palette:: @ 8E39144 .incbin "graphics/pokemon/palettes/jirachi_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xE39144, 0x0028 .align 2 gFile_graphics_pokemon_icons_jirachi_icon:: @ 8E3916C .incbin "graphics/pokemon/icons/jirachi_icon.4bpp" - @ .incbin "baserom.gba", 0xE3916C, 0x0400 .align 2 gFile_graphics_pokemon_footprints_jirachi_footprint:: @ 8E3956C .incbin "graphics/pokemon/footprints/jirachi_footprint.1bpp" - @ .incbin "baserom.gba", 0xE3956C, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_deoxys_still_front_pic:: @ 8E3958C .incbin "graphics/pokemon/front_pics/deoxys_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE3958C, 0x07BC .align 2 gFile_graphics_pokemon_palettes_deoxys_palette:: @ 8E39D48 .incbin "graphics/pokemon/palettes/deoxys_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xE39D48, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_deoxys_back_pic:: @ 8E39D70 .incbin "graphics/pokemon/back_pics/deoxys_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE39D70, 0x05F0 .align 2 gFile_graphics_pokemon_palettes_deoxys_shiny_palette:: @ 8E3A360 .incbin "graphics/pokemon/palettes/deoxys_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xE3A360, 0x0028 .align 2 gFile_graphics_pokemon_icons_deoxys_icon:: @ 8E3A388 .incbin "graphics/pokemon/icons/deoxys_icon.4bpp" - @ .incbin "baserom.gba", 0xE3A388, 0x0400 .align 2 gFile_graphics_pokemon_icons_deoxys_speed_icon:: @ 8E3A788 .incbin "graphics/pokemon/icons/deoxys_speed_icon.4bpp" - @ .incbin "baserom.gba", 0xE3A788, 0x0400 .align 2 gFile_graphics_pokemon_footprints_deoxys_footprint:: @ 8E3AB88 .incbin "graphics/pokemon/footprints/deoxys_footprint.1bpp" - @ .incbin "baserom.gba", 0xE3AB88, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_chimecho_still_front_pic:: @ 8E3ABA8 .incbin "graphics/pokemon/front_pics/chimecho_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE3ABA8, 0x024C .align 2 gFile_graphics_pokemon_palettes_chimecho_palette:: @ 8E3ADF4 .incbin "graphics/pokemon/palettes/chimecho_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xE3ADF4, 0x0028 .align 2 gFile_graphics_pokemon_back_pics_chimecho_back_pic:: @ 8E3AE1C .incbin "graphics/pokemon/back_pics/chimecho_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE3AE1C, 0x0274 .align 2 gFile_graphics_pokemon_palettes_chimecho_shiny_palette:: @ 8E3B090 .incbin "graphics/pokemon/palettes/chimecho_shiny_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xE3B090, 0x0028 .align 2 gFile_graphics_pokemon_icons_chimecho_icon:: @ 8E3B0B8 .incbin "graphics/pokemon/icons/chimecho_icon.4bpp" - @ .incbin "baserom.gba", 0xE3B0B8, 0x0400 .align 2 gFile_graphics_pokemon_footprints_chimecho_footprint:: @ 8E3B4B8 .incbin "graphics/pokemon/footprints/chimecho_footprint.1bpp" - @ .incbin "baserom.gba", 0xE3B4B8, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_egg_still_front_pic:: @ 8E3B4D8 .incbin "graphics/pokemon/front_pics/egg_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE3B4D8, 0x01B4 .align 2 gFile_graphics_pokemon_palettes_egg_palette:: @ 8E3B68C .incbin "graphics/pokemon/palettes/egg_palette.gbapal.lz" - @ .incbin "baserom.gba", 0xE3B68C, 0x0020 .align 2 gFile_graphics_pokemon_front_pics_unown_b_still_front_pic:: @ 8E3B6AC .incbin "graphics/pokemon/front_pics/unown_b_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE3B6AC, 0x01D8 .align 2 gFile_graphics_pokemon_back_pics_unown_b_back_pic:: @ 8E3B884 .incbin "graphics/pokemon/back_pics/unown_b_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE3B884, 0x0204 .align 2 gFile_graphics_pokemon_icons_unown_B_icon:: @ 8E3BA88 .incbin "graphics/pokemon/icons/unown_B_icon.4bpp" - @ .incbin "baserom.gba", 0xE3BA88, 0x0400 .align 2 gFile_graphics_pokemon_front_pics_unown_c_still_front_pic:: @ 8E3BE88 .incbin "graphics/pokemon/front_pics/unown_c_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE3BE88, 0x0214 .align 2 gFile_graphics_pokemon_back_pics_unown_c_back_pic:: @ 8E3C09C .incbin "graphics/pokemon/back_pics/unown_c_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE3C09C, 0x02AC .align 2 gFile_graphics_pokemon_icons_unown_C_icon:: @ 8E3C348 .incbin "graphics/pokemon/icons/unown_C_icon.4bpp" - @ .incbin "baserom.gba", 0xE3C348, 0x0400 .align 2 gFile_graphics_pokemon_front_pics_unown_d_still_front_pic:: @ 8E3C748 .incbin "graphics/pokemon/front_pics/unown_d_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE3C748, 0x01F8 .align 2 gFile_graphics_pokemon_back_pics_unown_d_back_pic:: @ 8E3C940 .incbin "graphics/pokemon/back_pics/unown_d_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE3C940, 0x0258 .align 2 gFile_graphics_pokemon_icons_unown_D_icon:: @ 8E3CB98 .incbin "graphics/pokemon/icons/unown_D_icon.4bpp" - @ .incbin "baserom.gba", 0xE3CB98, 0x0400 .align 2 gFile_graphics_pokemon_front_pics_unown_e_still_front_pic:: @ 8E3CF98 .incbin "graphics/pokemon/front_pics/unown_e_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE3CF98, 0x01B8 .align 2 gFile_graphics_pokemon_back_pics_unown_e_back_pic:: @ 8E3D150 .incbin "graphics/pokemon/back_pics/unown_e_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE3D150, 0x0200 .align 2 gFile_graphics_pokemon_icons_unown_E_icon:: @ 8E3D350 .incbin "graphics/pokemon/icons/unown_E_icon.4bpp" - @ .incbin "baserom.gba", 0xE3D350, 0x0400 .align 2 gFile_graphics_pokemon_front_pics_unown_f_still_front_pic:: @ 8E3D750 .incbin "graphics/pokemon/front_pics/unown_f_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE3D750, 0x01F4 .align 2 gFile_graphics_pokemon_back_pics_unown_f_back_pic:: @ 8E3D944 .incbin "graphics/pokemon/back_pics/unown_f_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE3D944, 0x021C .align 2 gFile_graphics_pokemon_icons_unown_F_icon:: @ 8E3DB60 .incbin "graphics/pokemon/icons/unown_F_icon.4bpp" - @ .incbin "baserom.gba", 0xE3DB60, 0x0400 .align 2 gFile_graphics_pokemon_front_pics_unown_g_still_front_pic:: @ 8E3DF60 .incbin "graphics/pokemon/front_pics/unown_g_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE3DF60, 0x01DC .align 2 gFile_graphics_pokemon_back_pics_unown_g_back_pic:: @ 8E3E13C .incbin "graphics/pokemon/back_pics/unown_g_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE3E13C, 0x024C .align 2 gFile_graphics_pokemon_icons_unown_G_icon:: @ 8E3E388 .incbin "graphics/pokemon/icons/unown_G_icon.4bpp" - @ .incbin "baserom.gba", 0xE3E388, 0x0400 .align 2 gFile_graphics_pokemon_front_pics_unown_h_still_front_pic:: @ 8E3E788 .incbin "graphics/pokemon/front_pics/unown_h_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE3E788, 0x0244 .align 2 gFile_graphics_pokemon_back_pics_unown_h_back_pic:: @ 8E3E9CC .incbin "graphics/pokemon/back_pics/unown_h_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE3E9CC, 0x02C4 .align 2 gFile_graphics_pokemon_icons_unown_H_icon:: @ 8E3EC90 .incbin "graphics/pokemon/icons/unown_H_icon.4bpp" - @ .incbin "baserom.gba", 0xE3EC90, 0x0400 .align 2 gFile_graphics_pokemon_front_pics_unown_i_still_front_pic:: @ 8E3F090 .incbin "graphics/pokemon/front_pics/unown_i_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE3F090, 0x0198 .align 2 gFile_graphics_pokemon_back_pics_unown_i_back_pic:: @ 8E3F228 .incbin "graphics/pokemon/back_pics/unown_i_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE3F228, 0x01A8 .align 2 gFile_graphics_pokemon_icons_unown_I_icon:: @ 8E3F3D0 .incbin "graphics/pokemon/icons/unown_I_icon.4bpp" - @ .incbin "baserom.gba", 0xE3F3D0, 0x0400 .align 2 gFile_graphics_pokemon_front_pics_unown_j_still_front_pic:: @ 8E3F7D0 .incbin "graphics/pokemon/front_pics/unown_j_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE3F7D0, 0x01C4 .align 2 gFile_graphics_pokemon_back_pics_unown_j_back_pic:: @ 8E3F994 .incbin "graphics/pokemon/back_pics/unown_j_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE3F994, 0x01E8 .align 2 gFile_graphics_pokemon_icons_unown_J_icon:: @ 8E3FB7C .incbin "graphics/pokemon/icons/unown_J_icon.4bpp" - @ .incbin "baserom.gba", 0xE3FB7C, 0x0400 .align 2 gFile_graphics_pokemon_front_pics_unown_k_still_front_pic:: @ 8E3FF7C .incbin "graphics/pokemon/front_pics/unown_k_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE3FF7C, 0x01D0 .align 2 gFile_graphics_pokemon_back_pics_unown_k_back_pic:: @ 8E4014C .incbin "graphics/pokemon/back_pics/unown_k_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE4014C, 0x01F8 .align 2 gFile_graphics_pokemon_icons_unown_K_icon:: @ 8E40344 .incbin "graphics/pokemon/icons/unown_K_icon.4bpp" - @ .incbin "baserom.gba", 0xE40344, 0x0400 .align 2 gFile_graphics_pokemon_front_pics_unown_l_still_front_pic:: @ 8E40744 .incbin "graphics/pokemon/front_pics/unown_l_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE40744, 0x01B0 .align 2 gFile_graphics_pokemon_back_pics_unown_l_back_pic:: @ 8E408F4 .incbin "graphics/pokemon/back_pics/unown_l_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE408F4, 0x01D4 .align 2 gFile_graphics_pokemon_icons_unown_L_icon:: @ 8E40AC8 .incbin "graphics/pokemon/icons/unown_L_icon.4bpp" - @ .incbin "baserom.gba", 0xE40AC8, 0x0400 .align 2 gFile_graphics_pokemon_front_pics_unown_m_still_front_pic:: @ 8E40EC8 .incbin "graphics/pokemon/front_pics/unown_m_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE40EC8, 0x0224 .align 2 gFile_graphics_pokemon_back_pics_unown_m_back_pic:: @ 8E410EC .incbin "graphics/pokemon/back_pics/unown_m_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE410EC, 0x02A8 .align 2 gFile_graphics_pokemon_icons_unown_M_icon:: @ 8E41394 .incbin "graphics/pokemon/icons/unown_M_icon.4bpp" - @ .incbin "baserom.gba", 0xE41394, 0x0400 .align 2 gFile_graphics_pokemon_front_pics_unown_n_still_front_pic:: @ 8E41794 .incbin "graphics/pokemon/front_pics/unown_n_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE41794, 0x01F8 .align 2 gFile_graphics_pokemon_back_pics_unown_n_back_pic:: @ 8E4198C .incbin "graphics/pokemon/back_pics/unown_n_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE4198C, 0x026C .align 2 gFile_graphics_pokemon_icons_unown_N_icon:: @ 8E41BF8 .incbin "graphics/pokemon/icons/unown_N_icon.4bpp" - @ .incbin "baserom.gba", 0xE41BF8, 0x0400 .align 2 gFile_graphics_pokemon_front_pics_unown_o_still_front_pic:: @ 8E41FF8 .incbin "graphics/pokemon/front_pics/unown_o_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE41FF8, 0x0238 .align 2 gFile_graphics_pokemon_back_pics_unown_o_back_pic:: @ 8E42230 .incbin "graphics/pokemon/back_pics/unown_o_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE42230, 0x02C0 .align 2 gFile_graphics_pokemon_icons_unown_O_icon:: @ 8E424F0 .incbin "graphics/pokemon/icons/unown_O_icon.4bpp" - @ .incbin "baserom.gba", 0xE424F0, 0x0400 .align 2 gFile_graphics_pokemon_front_pics_unown_p_still_front_pic:: @ 8E428F0 .incbin "graphics/pokemon/front_pics/unown_p_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE428F0, 0x01A0 .align 2 gFile_graphics_pokemon_back_pics_unown_p_back_pic:: @ 8E42A90 .incbin "graphics/pokemon/back_pics/unown_p_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE42A90, 0x01C4 .align 2 gFile_graphics_pokemon_icons_unown_P_icon:: @ 8E42C54 .incbin "graphics/pokemon/icons/unown_P_icon.4bpp" - @ .incbin "baserom.gba", 0xE42C54, 0x0400 .align 2 gFile_graphics_pokemon_front_pics_unown_q_still_front_pic:: @ 8E43054 .incbin "graphics/pokemon/front_pics/unown_q_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE43054, 0x01B4 .align 2 gFile_graphics_pokemon_back_pics_unown_q_back_pic:: @ 8E43208 .incbin "graphics/pokemon/back_pics/unown_q_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE43208, 0x01CC .align 2 gFile_graphics_pokemon_icons_unown_Q_icon:: @ 8E433D4 .incbin "graphics/pokemon/icons/unown_Q_icon.4bpp" - @ .incbin "baserom.gba", 0xE433D4, 0x0400 .align 2 gFile_graphics_pokemon_front_pics_unown_r_still_front_pic:: @ 8E437D4 .incbin "graphics/pokemon/front_pics/unown_r_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE437D4, 0x01A4 .align 2 gFile_graphics_pokemon_back_pics_unown_r_back_pic:: @ 8E43978 .incbin "graphics/pokemon/back_pics/unown_r_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE43978, 0x01C8 .align 2 gFile_graphics_pokemon_icons_unown_R_icon:: @ 8E43B40 .incbin "graphics/pokemon/icons/unown_R_icon.4bpp" - @ .incbin "baserom.gba", 0xE43B40, 0x0400 .align 2 gFile_graphics_pokemon_front_pics_unown_s_still_front_pic:: @ 8E43F40 .incbin "graphics/pokemon/front_pics/unown_s_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE43F40, 0x01E8 .align 2 gFile_graphics_pokemon_back_pics_unown_s_back_pic:: @ 8E44128 .incbin "graphics/pokemon/back_pics/unown_s_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE44128, 0x0254 .align 2 gFile_graphics_pokemon_icons_unown_S_icon:: @ 8E4437C .incbin "graphics/pokemon/icons/unown_S_icon.4bpp" - @ .incbin "baserom.gba", 0xE4437C, 0x0400 .align 2 gFile_graphics_pokemon_front_pics_unown_t_still_front_pic:: @ 8E4477C .incbin "graphics/pokemon/front_pics/unown_t_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE4477C, 0x01B0 .align 2 gFile_graphics_pokemon_back_pics_unown_t_back_pic:: @ 8E4492C .incbin "graphics/pokemon/back_pics/unown_t_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE4492C, 0x01B4 .align 2 gFile_graphics_pokemon_icons_unown_T_icon:: @ 8E44AE0 .incbin "graphics/pokemon/icons/unown_T_icon.4bpp" - @ .incbin "baserom.gba", 0xE44AE0, 0x0400 .align 2 gFile_graphics_pokemon_front_pics_unown_u_still_front_pic:: @ 8E44EE0 .incbin "graphics/pokemon/front_pics/unown_u_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE44EE0, 0x0218 .align 2 gFile_graphics_pokemon_back_pics_unown_u_back_pic:: @ 8E450F8 .incbin "graphics/pokemon/back_pics/unown_u_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE450F8, 0x0254 .align 2 gFile_graphics_pokemon_icons_unown_U_icon:: @ 8E4534C .incbin "graphics/pokemon/icons/unown_U_icon.4bpp" - @ .incbin "baserom.gba", 0xE4534C, 0x0400 .align 2 gFile_graphics_pokemon_front_pics_unown_v_still_front_pic:: @ 8E4574C .incbin "graphics/pokemon/front_pics/unown_v_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE4574C, 0x01E4 .align 2 gFile_graphics_pokemon_back_pics_unown_v_back_pic:: @ 8E45930 .incbin "graphics/pokemon/back_pics/unown_v_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE45930, 0x0230 .align 2 gFile_graphics_pokemon_icons_unown_V_icon:: @ 8E45B60 .incbin "graphics/pokemon/icons/unown_V_icon.4bpp" - @ .incbin "baserom.gba", 0xE45B60, 0x0400 .align 2 gFile_graphics_pokemon_front_pics_unown_w_still_front_pic:: @ 8E45F60 .incbin "graphics/pokemon/front_pics/unown_w_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE45F60, 0x01D4 .align 2 gFile_graphics_pokemon_back_pics_unown_w_back_pic:: @ 8E46134 .incbin "graphics/pokemon/back_pics/unown_w_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE46134, 0x0204 .align 2 gFile_graphics_pokemon_icons_unown_W_icon:: @ 8E46338 .incbin "graphics/pokemon/icons/unown_W_icon.4bpp" - @ .incbin "baserom.gba", 0xE46338, 0x0400 .align 2 gFile_graphics_pokemon_front_pics_unown_x_still_front_pic:: @ 8E46738 .incbin "graphics/pokemon/front_pics/unown_x_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE46738, 0x01C4 .align 2 gFile_graphics_pokemon_back_pics_unown_x_back_pic:: @ 8E468FC .incbin "graphics/pokemon/back_pics/unown_x_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE468FC, 0x01F0 .align 2 gFile_graphics_pokemon_icons_unown_X_icon:: @ 8E46AEC .incbin "graphics/pokemon/icons/unown_X_icon.4bpp" - @ .incbin "baserom.gba", 0xE46AEC, 0x0400 .align 2 gFile_graphics_pokemon_front_pics_unown_y_still_front_pic:: @ 8E46EEC .incbin "graphics/pokemon/front_pics/unown_y_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE46EEC, 0x01D8 .align 2 gFile_graphics_pokemon_back_pics_unown_y_back_pic:: @ 8E470C4 .incbin "graphics/pokemon/back_pics/unown_y_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE470C4, 0x01F4 .align 2 gFile_graphics_pokemon_icons_unown_Y_icon:: @ 8E472B8 .incbin "graphics/pokemon/icons/unown_Y_icon.4bpp" - @ .incbin "baserom.gba", 0xE472B8, 0x0400 .align 2 gFile_graphics_pokemon_front_pics_unown_z_still_front_pic:: @ 8E476B8 .incbin "graphics/pokemon/front_pics/unown_z_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE476B8, 0x01B0 .align 2 gFile_graphics_pokemon_back_pics_unown_z_back_pic:: @ 8E47868 .incbin "graphics/pokemon/back_pics/unown_z_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE47868, 0x01DC .align 2 gFile_graphics_pokemon_icons_unown_Z_icon:: @ 8E47A44 .incbin "graphics/pokemon/icons/unown_Z_icon.4bpp" - @ .incbin "baserom.gba", 0xE47A44, 0x0400 .align 2 gFile_graphics_pokemon_front_pics_unown_exclamation_mark_still_front_pic:: @ 8E47E44 .incbin "graphics/pokemon/front_pics/unown_exclamation_mark_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE47E44, 0x0190 .align 2 gFile_graphics_pokemon_back_pics_unown_exclamation_mark_back_pic:: @ 8E47FD4 .incbin "graphics/pokemon/back_pics/unown_exclamation_mark_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE47FD4, 0x01C8 .align 2 gFile_graphics_pokemon_icons_unown_exclamation_mark_icon:: @ 8E4819C .incbin "graphics/pokemon/icons/unown_exclamation_mark_icon.4bpp" - @ .incbin "baserom.gba", 0xE4819C, 0x0400 .align 2 gFile_graphics_pokemon_front_pics_unown_question_mark_still_front_pic:: @ 8E4859C .incbin "graphics/pokemon/front_pics/unown_question_mark_still_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE4859C, 0x01BC .align 2 gFile_graphics_pokemon_back_pics_unown_question_mark_back_pic:: @ 8E48758 .incbin "graphics/pokemon/back_pics/unown_question_mark_back_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE48758, 0x0200 .align 2 gFile_graphics_pokemon_icons_unown_question_mark_icon:: @ 8E48958 .incbin "graphics/pokemon/icons/unown_question_mark_icon.4bpp" - @ .incbin "baserom.gba", 0xE48958, 0x0400 .align 2 gFile_graphics_trainers_front_pics_aqua_leader_archie_front_pic:: @ 8E48D58 .incbin "graphics/trainers/front_pics/aqua_leader_archie_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE48D58, 0x033C .align 2 gFile_graphics_trainers_palettes_aqua_leader_archie:: @ 8E49094 .incbin "graphics/trainers/palettes/aqua_leader_archie.gbapal.lz" - @ .incbin "baserom.gba", 0xE49094, 0x0028 .align 2 gFile_graphics_trainers_front_pics_aqua_grunt_m_front_pic:: @ 8E490BC .incbin "graphics/trainers/front_pics/aqua_grunt_m_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE490BC, 0x0360 .align 2 gFile_graphics_trainers_palettes_aqua_grunt_m:: @ 8E4941C .incbin "graphics/trainers/palettes/aqua_grunt_m.gbapal.lz" - @ .incbin "baserom.gba", 0xE4941C, 0x0028 .align 2 gFile_graphics_trainers_front_pics_aqua_grunt_f_front_pic:: @ 8E49444 .incbin "graphics/trainers/front_pics/aqua_grunt_f_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE49444, 0x033C .align 2 gFile_graphics_trainers_palettes_aqua_grunt_f:: @ 8E49780 .incbin "graphics/trainers/palettes/aqua_grunt_f.gbapal.lz" - @ .incbin "baserom.gba", 0xE49780, 0x0028 .align 2 gFile_graphics_trainers_front_pics_emerald_aroma_lady_front_pic:: @ 8E497A8 .incbin "graphics/trainers/front_pics/emerald_aroma_lady_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE497A8, 0x02C4 .align 2 gFile_graphics_trainers_palettes_emerald_aroma_lady:: @ 8E49A6C .incbin "graphics/trainers/palettes/emerald_aroma_lady.gbapal.lz" - @ .incbin "baserom.gba", 0xE49A6C, 0x0028 .align 2 gFile_graphics_trainers_front_pics_emerald_ruin_maniac_front_pic:: @ 8E49A94 .incbin "graphics/trainers/front_pics/emerald_ruin_maniac_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE49A94, 0x039C .align 2 gFile_graphics_trainers_palettes_emerald_ruin_maniac:: @ 8E49E30 .incbin "graphics/trainers/palettes/emerald_ruin_maniac.gbapal.lz" - @ .incbin "baserom.gba", 0xE49E30, 0x0028 .align 2 gFile_graphics_trainers_front_pics_interviewer_front_pic:: @ 8E49E58 .incbin "graphics/trainers/front_pics/interviewer_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE49E58, 0x04A4 .align 2 gFile_graphics_trainers_palettes_interviewer:: @ 8E4A2FC .incbin "graphics/trainers/palettes/interviewer.gbapal.lz" - @ .incbin "baserom.gba", 0xE4A2FC, 0x0028 .align 2 gFile_graphics_trainers_front_pics_emerald_tuber_f_front_pic:: @ 8E4A324 .incbin "graphics/trainers/front_pics/emerald_tuber_f_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE4A324, 0x02A4 .align 2 gFile_graphics_trainers_palettes_emerald_tuber_f:: @ 8E4A5C8 .incbin "graphics/trainers/palettes/emerald_tuber_f.gbapal.lz" - @ .incbin "baserom.gba", 0xE4A5C8, 0x0028 .align 2 gFile_graphics_trainers_front_pics_emerald_tuber_m_front_pic:: @ 8E4A5F0 .incbin "graphics/trainers/front_pics/emerald_tuber_m_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE4A5F0, 0x028C .align 2 gFile_graphics_trainers_palettes_emerald_tuber_m:: @ 8E4A87C .incbin "graphics/trainers/palettes/emerald_tuber_m.gbapal.lz" - @ .incbin "baserom.gba", 0xE4A87C, 0x0028 .align 2 gFile_graphics_trainers_front_pics_emerald_cool_trainer_m_front_pic:: @ 8E4A8A4 .incbin "graphics/trainers/front_pics/emerald_cool_trainer_m_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE4A8A4, 0x02E8 .align 2 gFile_graphics_trainers_palettes_emerald_cool_trainer_m:: @ 8E4AB8C .incbin "graphics/trainers/palettes/emerald_cool_trainer_m.gbapal.lz" - @ .incbin "baserom.gba", 0xE4AB8C, 0x0028 .align 2 gFile_graphics_trainers_front_pics_emerald_cool_trainer_f_front_pic:: @ 8E4ABB4 .incbin "graphics/trainers/front_pics/emerald_cool_trainer_f_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE4ABB4, 0x0314 .align 2 gFile_graphics_trainers_palettes_emerald_cool_trainer_f:: @ 8E4AEC8 .incbin "graphics/trainers/palettes/emerald_cool_trainer_f.gbapal.lz" - @ .incbin "baserom.gba", 0xE4AEC8, 0x0028 .align 2 gFile_graphics_trainers_front_pics_hex_maniac_front_pic:: @ 8E4AEF0 .incbin "graphics/trainers/front_pics/hex_maniac_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE4AEF0, 0x036C .align 2 gFile_graphics_trainers_palettes_hex_maniac:: @ 8E4B25C .incbin "graphics/trainers/palettes/hex_maniac.gbapal.lz" - @ .incbin "baserom.gba", 0xE4B25C, 0x0028 .align 2 gFile_graphics_trainers_front_pics_emerald_lady_front_pic:: @ 8E4B284 .incbin "graphics/trainers/front_pics/emerald_lady_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE4B284, 0x03B4 .align 2 gFile_graphics_trainers_palettes_emerald_lady:: @ 8E4B638 .incbin "graphics/trainers/palettes/emerald_lady.gbapal.lz" - @ .incbin "baserom.gba", 0xE4B638, 0x0028 .align 2 gFile_graphics_trainers_front_pics_emerald_beauty_front_pic:: @ 8E4B660 .incbin "graphics/trainers/front_pics/emerald_beauty_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE4B660, 0x02E8 .align 2 gFile_graphics_trainers_palettes_emerald_beauty:: @ 8E4B948 .incbin "graphics/trainers/palettes/emerald_beauty.gbapal.lz" - @ .incbin "baserom.gba", 0xE4B948, 0x0028 .align 2 gFile_graphics_trainers_front_pics_rich_boy_front_pic:: @ 8E4B970 .incbin "graphics/trainers/front_pics/rich_boy_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE4B970, 0x02B4 .align 2 gFile_graphics_trainers_palettes_rich_boy:: @ 8E4BC24 .incbin "graphics/trainers/palettes/rich_boy.gbapal.lz" - @ .incbin "baserom.gba", 0xE4BC24, 0x0028 .align 2 gFile_graphics_trainers_front_pics_emerald_pokemaniac_front_pic:: @ 8E4BC4C .incbin "graphics/trainers/front_pics/emerald_pokemaniac_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE4BC4C, 0x0370 .align 2 gFile_graphics_trainers_palettes_emerald_pokemaniac:: @ 8E4BFBC - @ .incbin "graphics/trainers/palettes/emerald_pokemaniac.gbapal.lz" - .incbin "baserom.gba", 0xE4BFBC, 0x0028 + .incbin "graphics/trainers/palettes/emerald_pokemaniac.gbapal.lz" .align 2 gFile_graphics_trainers_front_pics_emerald_swimmer_m_front_pic:: @ 8E4BFE4 .incbin "graphics/trainers/front_pics/emerald_swimmer_m_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE4BFE4, 0x02C0 .align 2 gFile_graphics_trainers_palettes_emerald_swimmer_m:: @ 8E4C2A4 .incbin "graphics/trainers/palettes/emerald_swimmer_m.gbapal.lz" - @ .incbin "baserom.gba", 0xE4C2A4, 0x0028 .align 2 gFile_graphics_trainers_front_pics_emerald_black_belt_front_pic:: @ 8E4C2CC .incbin "graphics/trainers/front_pics/emerald_black_belt_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE4C2CC, 0x0364 .align 2 gFile_graphics_trainers_palettes_black_belt:: @ 8E4C630 .incbin "graphics/trainers/palettes/black_belt.gbapal.lz" - @ .incbin "baserom.gba", 0xE4C630, 0x0028 .align 2 gFile_graphics_trainers_front_pics_guitarist_front_pic:: @ 8E4C658 .incbin "graphics/trainers/front_pics/guitarist_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE4C658, 0x0384 .align 2 gFile_graphics_trainers_palettes_guitarist:: @ 8E4C9DC .incbin "graphics/trainers/palettes/guitarist.gbapal.lz" - @ .incbin "baserom.gba", 0xE4C9DC, 0x0028 .align 2 gFile_graphics_trainers_front_pics_kindler_front_pic:: @ 8E4CA04 .incbin "graphics/trainers/front_pics/kindler_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE4CA04, 0x036C .align 2 gFile_graphics_trainers_palettes_kindler:: @ 8E4CD70 .incbin "graphics/trainers/palettes/kindler.gbapal.lz" - @ .incbin "baserom.gba", 0xE4CD70, 0x0028 .align 2 gFile_graphics_trainers_front_pics_emerald_camper_front_pic:: @ 8E4CD98 .incbin "graphics/trainers/front_pics/emerald_camper_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE4CD98, 0x02E8 .align 2 gFile_graphics_trainers_palettes_emerald_camper:: @ 8E4D080 .incbin "graphics/trainers/palettes/emerald_camper.gbapal.lz" - @ .incbin "baserom.gba", 0xE4D080, 0x0028 .align 2 gFile_graphics_trainers_front_pics_bug_maniac_front_pic:: @ 8E4D0A8 .incbin "graphics/trainers/front_pics/bug_maniac_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE4D0A8, 0x0450 .align 2 gFile_graphics_trainers_palettes_bug_maniac:: @ 8E4D4F8 .incbin "graphics/trainers/palettes/bug_maniac.gbapal.lz" - @ .incbin "baserom.gba", 0xE4D4F8, 0x0028 .align 2 gFile_graphics_trainers_front_pics_emerald_psychic_m_front_pic:: @ 8E4D520 .incbin "graphics/trainers/front_pics/emerald_psychic_m_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE4D520, 0x032C .align 2 gFile_graphics_trainers_palettes_emerald_psychic_m:: @ 8E4D84C .incbin "graphics/trainers/palettes/emerald_psychic_m.gbapal.lz" - @ .incbin "baserom.gba", 0xE4D84C, 0x0028 .align 2 gFile_graphics_trainers_front_pics_emerald_psychic_f_front_pic:: @ 8E4D874 .incbin "graphics/trainers/front_pics/emerald_psychic_f_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE4D874, 0x0328 .align 2 gFile_graphics_trainers_palettes_emerald_psychic_f:: @ 8E4DB9C .incbin "graphics/trainers/palettes/emerald_psychic_f.gbapal.lz" - @ .incbin "baserom.gba", 0xE4DB9C, 0x0028 .align 2 gFile_graphics_trainers_front_pics_emerald_gentleman_front_pic:: @ 8E4DBC4 .incbin "graphics/trainers/front_pics/emerald_gentleman_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE4DBC4, 0x0300 .align 2 gFile_graphics_trainers_palettes_emerald_gentleman:: @ 8E4DEC4 .incbin "graphics/trainers/palettes/emerald_gentleman.gbapal.lz" - @ .incbin "baserom.gba", 0xE4DEC4, 0x0028 .align 2 gFile_graphics_trainers_front_pics_elite_four_sidney_front_pic:: @ 8E4DEEC .incbin "graphics/trainers/front_pics/elite_four_sidney_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE4DEEC, 0x0334 .align 2 gFile_graphics_trainers_palettes_elite_four_sidney:: @ 8E4E220 .incbin "graphics/trainers/palettes/elite_four_sidney.gbapal.lz" - @ .incbin "baserom.gba", 0xE4E220, 0x0028 .align 2 gFile_graphics_trainers_front_pics_elite_four_phoebe_front_pic:: @ 8E4E248 .incbin "graphics/trainers/front_pics/elite_four_phoebe_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE4E248, 0x0300 .align 2 gFile_graphics_trainers_palettes_elite_four_phoebe:: @ 8E4E548 .incbin "graphics/trainers/palettes/elite_four_phoebe.gbapal.lz" - @ .incbin "baserom.gba", 0xE4E548, 0x0028 .align 2 gFile_graphics_trainers_front_pics_leader_roxanne_front_pic:: @ 8E4E570 .incbin "graphics/trainers/front_pics/leader_roxanne_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE4E570, 0x02EC .align 2 gFile_graphics_trainers_palettes_leader_roxanne:: @ 8E4E85C .incbin "graphics/trainers/palettes/leader_roxanne.gbapal.lz" - @ .incbin "baserom.gba", 0xE4E85C, 0x0028 .align 2 gFile_graphics_trainers_front_pics_leader_brawly_front_pic:: @ 8E4E884 .incbin "graphics/trainers/front_pics/leader_brawly_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE4E884, 0x0394 .align 2 gFile_graphics_trainers_palettes_leader_brawly:: @ 8E4EC18 .incbin "graphics/trainers/palettes/leader_brawly.gbapal.lz" - @ .incbin "baserom.gba", 0xE4EC18, 0x0028 .align 2 gFile_graphics_trainers_front_pics_leader_tate_and_liza_front_pic:: @ 8E4EC40 .incbin "graphics/trainers/front_pics/leader_tate_and_liza_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE4EC40, 0x0444 .align 2 gFile_graphics_trainers_palettes_leader_tate_and_liza:: @ 8E4F084 .incbin "graphics/trainers/palettes/leader_tate_and_liza.gbapal.lz" - @ .incbin "baserom.gba", 0xE4F084, 0x0028 .align 2 gFile_graphics_trainers_front_pics_school_kid_m_front_pic:: @ 8E4F0AC .incbin "graphics/trainers/front_pics/school_kid_m_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE4F0AC, 0x02C0 .align 2 gFile_graphics_trainers_palettes_school_kid_m:: @ 8E4F36C .incbin "graphics/trainers/palettes/school_kid_m.gbapal.lz" - @ .incbin "baserom.gba", 0xE4F36C, 0x0028 .align 2 gFile_graphics_trainers_front_pics_school_kid_f_front_pic:: @ 8E4F394 .incbin "graphics/trainers/front_pics/school_kid_f_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE4F394, 0x029C .align 2 gFile_graphics_trainers_palettes_school_kid_f:: @ 8E4F630 .incbin "graphics/trainers/palettes/school_kid_f.gbapal.lz" - @ .incbin "baserom.gba", 0xE4F630, 0x0028 .align 2 gFile_graphics_trainers_front_pics_sr_and_jr_front_pic:: @ 8E4F658 .incbin "graphics/trainers/front_pics/sr_and_jr_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE4F658, 0x0470 .align 2 gFile_graphics_trainers_palettes_sr_and_jr:: @ 8E4FAC8 .incbin "graphics/trainers/palettes/sr_and_jr.gbapal.lz" - @ .incbin "baserom.gba", 0xE4FAC8, 0x0028 .align 2 gFile_graphics_trainers_front_pics_winstrate_m_front_pic:: @ 8E4FAF0 .incbin "graphics/trainers/front_pics/winstrate_m_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE4FAF0, 0x03BC .align 2 gFile_graphics_trainers_palettes_winstrate_m:: @ 8E4FEAC .incbin "graphics/trainers/palettes/winstrate_m.gbapal.lz" - @ .incbin "baserom.gba", 0xE4FEAC, 0x0028 .align 2 gFile_graphics_trainers_front_pics_winstrate_f_front_pic:: @ 8E4FED4 .incbin "graphics/trainers/front_pics/winstrate_f_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE4FED4, 0x03CC .align 2 gFile_graphics_trainers_palettes_winstrate_f:: @ 8E502A0 .incbin "graphics/trainers/palettes/winstrate_f.gbapal.lz" - @ .incbin "baserom.gba", 0xE502A0, 0x0028 .align 2 gFile_graphics_trainers_front_pics_expert_m_front_pic:: @ 8E502C8 .incbin "graphics/trainers/front_pics/expert_m_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE502C8, 0x0340 .align 2 gFile_graphics_trainers_palettes_expert_m:: @ 8E50608 .incbin "graphics/trainers/palettes/expert_m.gbapal.lz" - @ .incbin "baserom.gba", 0xE50608, 0x0028 .align 2 gFile_graphics_trainers_front_pics_expert_f_front_pic:: @ 8E50630 .incbin "graphics/trainers/front_pics/expert_f_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE50630, 0x031C .align 2 gFile_graphics_trainers_palettes_expert_f:: @ 8E5094C .incbin "graphics/trainers/palettes/expert_f.gbapal.lz" - @ .incbin "baserom.gba", 0xE5094C, 0x0028 .align 2 gFile_graphics_trainers_front_pics_emerald_youngster_front_pic:: @ 8E50974 .incbin "graphics/trainers/front_pics/emerald_youngster_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE50974, 0x02A8 .align 2 gFile_graphics_trainers_palettes_emerald_youngster:: @ 8E50C1C .incbin "graphics/trainers/palettes/emerald_youngster.gbapal.lz" - @ .incbin "baserom.gba", 0xE50C1C, 0x0028 .align 2 gFile_graphics_trainers_front_pics_steven_front_pic:: @ 8E50C44 .incbin "graphics/trainers/front_pics/steven_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE50C44, 0x0338 .align 2 gFile_graphics_trainers_palettes_steven:: @ 8E50F7C .incbin "graphics/trainers/palettes/steven.gbapal.lz" - @ .incbin "baserom.gba", 0xE50F7C, 0x0028 .align 2 gFile_graphics_trainers_front_pics_emerald_fisherman_front_pic:: @ 8E50FA4 .incbin "graphics/trainers/front_pics/emerald_fisherman_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE50FA4, 0x03E4 .align 2 gFile_graphics_trainers_palettes_emerald_fisherman:: @ 8E51388 .incbin "graphics/trainers/palettes/emerald_fisherman.gbapal.lz" - @ .incbin "baserom.gba", 0xE51388, 0x0028 .align 2 gFile_graphics_trainers_front_pics_cycling_triathlete_m_front_pic:: @ 8E513B0 .incbin "graphics/trainers/front_pics/cycling_triathlete_m_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE513B0, 0x0410 .align 2 gFile_graphics_trainers_palettes_cycling_triathlete_m:: @ 8E517C0 .incbin "graphics/trainers/palettes/cycling_triathlete_m.gbapal.lz" - @ .incbin "baserom.gba", 0xE517C0, 0x0028 .align 2 gFile_graphics_trainers_front_pics_cycling_triathlete_f_front_pic:: @ 8E517E8 .incbin "graphics/trainers/front_pics/cycling_triathlete_f_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE517E8, 0x040C .align 2 gFile_graphics_trainers_palettes_cycling_triathlete_f:: @ 8E51BF4 .incbin "graphics/trainers/palettes/cycling_triathlete_f.gbapal.lz" - @ .incbin "baserom.gba", 0xE51BF4, 0x0028 .align 2 gFile_graphics_trainers_front_pics_running_triathlete_m_front_pic:: @ 8E51C1C .incbin "graphics/trainers/front_pics/running_triathlete_m_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE51C1C, 0x02B8 .align 2 gFile_graphics_trainers_palettes_running_triathlete_m:: @ 8E51ED4 .incbin "graphics/trainers/palettes/running_triathlete_m.gbapal.lz" - @ .incbin "baserom.gba", 0xE51ED4, 0x0028 .align 2 gFile_graphics_trainers_front_pics_running_triathlete_f_front_pic:: @ 8E51EFC .incbin "graphics/trainers/front_pics/running_triathlete_f_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE51EFC, 0x02A4 .align 2 gFile_graphics_trainers_palettes_running_triathlete_f:: @ 8E521A0 .incbin "graphics/trainers/palettes/running_triathlete_f.gbapal.lz" - @ .incbin "baserom.gba", 0xE521A0, 0x0028 .align 2 gFile_graphics_trainers_front_pics_swimming_triathlete_m_front_pic:: @ 8E521C8 .incbin "graphics/trainers/front_pics/swimming_triathlete_m_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE521C8, 0x032C .align 2 gFile_graphics_trainers_palettes_swimming_triathlete_m:: @ 8E524F4 .incbin "graphics/trainers/palettes/swimming_triathlete_m.gbapal.lz" - @ .incbin "baserom.gba", 0xE524F4, 0x0028 .align 2 gFile_graphics_trainers_front_pics_swimming_triathlete_f_front_pic:: @ 8E5251C .incbin "graphics/trainers/front_pics/swimming_triathlete_f_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE5251C, 0x02DC .align 2 gFile_graphics_trainers_palettes_swimming_triathlete_f:: @ 8E527F8 .incbin "graphics/trainers/palettes/swimming_triathlete_f.gbapal.lz" - @ .incbin "baserom.gba", 0xE527F8, 0x0028 .align 2 gFile_graphics_trainers_front_pics_dragon_tamer_front_pic:: @ 8E52820 .incbin "graphics/trainers/front_pics/dragon_tamer_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE52820, 0x0354 .align 2 gFile_graphics_trainers_palettes_dragon_tamer:: @ 8E52B74 .incbin "graphics/trainers/palettes/dragon_tamer.gbapal.lz" - @ .incbin "baserom.gba", 0xE52B74, 0x0028 .align 2 gFile_graphics_trainers_front_pics_emerald_bird_keeper_front_pic:: @ 8E52B9C .incbin "graphics/trainers/front_pics/emerald_bird_keeper_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE52B9C, 0x0338 .align 2 gFile_graphics_trainers_palettes_emerald_bird_keeper:: @ 8E52ED4 .incbin "graphics/trainers/palettes/emerald_bird_keeper.gbapal.lz" - @ .incbin "baserom.gba", 0xE52ED4, 0x0028 .align 2 gFile_graphics_trainers_front_pics_ninja_boy_front_pic:: @ 8E52EFC .incbin "graphics/trainers/front_pics/ninja_boy_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE52EFC, 0x02DC .align 2 gFile_graphics_trainers_palettes_ninja_boy:: @ 8E531D8 .incbin "graphics/trainers/palettes/ninja_boy.gbapal.lz" - @ .incbin "baserom.gba", 0xE531D8, 0x0028 .align 2 gFile_graphics_trainers_front_pics_battle_girl_front_pic:: @ 8E53200 .incbin "graphics/trainers/front_pics/battle_girl_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE53200, 0x0320 .align 2 gFile_graphics_trainers_palettes_battle_girl:: @ 8E53520 .incbin "graphics/trainers/palettes/battle_girl.gbapal.lz" - @ .incbin "baserom.gba", 0xE53520, 0x0028 .align 2 gFile_graphics_trainers_front_pics_parasol_lady_front_pic:: @ 8E53548 .incbin "graphics/trainers/front_pics/parasol_lady_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE53548, 0x0338 .align 2 gFile_graphics_trainers_palettes_parasol_lady:: @ 8E53880 .incbin "graphics/trainers/palettes/parasol_lady.gbapal.lz" - @ .incbin "baserom.gba", 0xE53880, 0x0028 .align 2 gFile_graphics_trainers_front_pics_emerald_swimmer_f_front_pic:: @ 8E538A8 .incbin "graphics/trainers/front_pics/emerald_swimmer_f_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE538A8, 0x02D0 .align 2 gFile_graphics_trainers_palettes_emerald_swimmer_f:: @ 8E53B78 .incbin "graphics/trainers/palettes/emerald_swimmer_f.gbapal.lz" - @ .incbin "baserom.gba", 0xE53B78, 0x0028 .align 2 gFile_graphics_trainers_front_pics_emerald_picnicker_front_pic:: @ 8E53BA0 .incbin "graphics/trainers/front_pics/emerald_picnicker_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE53BA0, 0x02E0 .align 2 gFile_graphics_trainers_palettes_emerald_picnicker:: @ 8E53E80 .incbin "graphics/trainers/palettes/emerald_picnicker.gbapal.lz" - @ .incbin "baserom.gba", 0xE53E80, 0x0028 .align 2 gFile_graphics_trainers_front_pics_emerald_twins_front_pic:: @ 8E53EA8 .incbin "graphics/trainers/front_pics/emerald_twins_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE53EA8, 0x03C4 .align 2 gFile_graphics_trainers_palettes_emerald_twins:: @ 8E5426C .incbin "graphics/trainers/palettes/emerald_twins.gbapal.lz" - @ .incbin "baserom.gba", 0xE5426C, 0x0028 .align 2 gFile_graphics_trainers_front_pics_emerald_sailor_front_pic:: @ 8E54294 .incbin "graphics/trainers/front_pics/emerald_sailor_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE54294, 0x03B0 .align 2 gFile_graphics_trainers_palettes_emerald_sailor:: @ 8E54644 .incbin "graphics/trainers/palettes/emerald_sailor.gbapal.lz" - @ .incbin "baserom.gba", 0xE54644, 0x0028 .align 2 gFile_graphics_trainers_front_pics_collector_front_pic:: @ 8E5466C .incbin "graphics/trainers/front_pics/collector_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE5466C, 0x0404 .align 2 gFile_graphics_trainers_palettes_collector:: @ 8E54A70 .incbin "graphics/trainers/palettes/collector.gbapal.lz" - @ .incbin "baserom.gba", 0xE54A70, 0x0028 .align 2 gFile_graphics_trainers_front_pics_wally_front_pic:: @ 8E54A98 .incbin "graphics/trainers/front_pics/wally_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE54A98, 0x02D0 .align 2 gFile_graphics_trainers_palettes_wally:: @ 8E54D68 .incbin "graphics/trainers/palettes/wally.gbapal.lz" - @ .incbin "baserom.gba", 0xE54D68, 0x0028 .align 2 gFile_graphics_trainers_front_pics_ruby_sapphire_brendan_front_pic:: @ 8E54D90 .incbin "graphics/trainers/front_pics/ruby_sapphire_brendan_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE54D90, 0x0314 .align 2 gFile_graphics_trainers_palettes_ruby_sapphire_brendan:: @ 8E550A4 .incbin "graphics/trainers/palettes/ruby_sapphire_brendan.gbapal.lz" - @ .incbin "baserom.gba", 0xE550A4, 0x0028 .align 2 gFile_graphics_trainers_front_pics_ruby_sapphire_may_front_pic:: @ 8E550CC .incbin "graphics/trainers/front_pics/ruby_sapphire_may_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE550CC, 0x0300 .align 2 gFile_graphics_trainers_palettes_ruby_sapphire_may:: @ 8E553CC .incbin "graphics/trainers/palettes/ruby_sapphire_may.gbapal.lz" - @ .incbin "baserom.gba", 0xE553CC, 0x0028 .align 2 gFile_graphics_trainers_front_pics_emerald_pokemon_breeder_m_front_pic:: @ 8E553F4 .incbin "graphics/trainers/front_pics/emerald_pokemon_breeder_m_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE553F4, 0x0330 .align 2 gFile_graphics_trainers_palettes_emerald_pokemon_breeder_m:: @ 8E55724 .incbin "graphics/trainers/palettes/emerald_pokemon_breeder_m.gbapal.lz" - @ .incbin "baserom.gba", 0xE55724, 0x0028 .align 2 gFile_graphics_trainers_front_pics_emerald_pokemon_breeder_f_front_pic:: @ 8E5574C .incbin "graphics/trainers/front_pics/emerald_pokemon_breeder_f_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE5574C, 0x0334 .align 2 gFile_graphics_trainers_palettes_emerald_pokemon_breeder_f:: @ 8E55A80 .incbin "graphics/trainers/palettes/emerald_pokemon_breeder_f.gbapal.lz" - @ .incbin "baserom.gba", 0xE55A80, 0x0028 .align 2 gFile_graphics_trainers_front_pics_emerald_pokemon_ranger_m_front_pic:: @ 8E55AA8 .incbin "graphics/trainers/front_pics/emerald_pokemon_ranger_m_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE55AA8, 0x0348 .align 2 gFile_graphics_trainers_palettes_emerald_pokemon_ranger_m:: @ 8E55DF0 .incbin "graphics/trainers/palettes/emerald_pokemon_ranger_m.gbapal.lz" - @ .incbin "baserom.gba", 0xE55DF0, 0x0028 .align 2 gFile_graphics_trainers_front_pics_emerald_pokemon_ranger_f_front_pic:: @ 8E55E18 .incbin "graphics/trainers/front_pics/emerald_pokemon_ranger_f_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE55E18, 0x0334 .align 2 gFile_graphics_trainers_palettes_emerald_pokemon_ranger_f:: @ 8E5614C .incbin "graphics/trainers/palettes/emerald_pokemon_ranger_f.gbapal.lz" - @ .incbin "baserom.gba", 0xE5614C, 0x0028 .align 2 gFile_graphics_trainers_front_pics_magma_leader_maxie_front_pic:: @ 8E56174 .incbin "graphics/trainers/front_pics/magma_leader_maxie_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE56174, 0x02F4 .align 2 gFile_graphics_trainers_palettes_magma_leader_maxie:: @ 8E56468 .incbin "graphics/trainers/palettes/magma_leader_maxie.gbapal.lz" - @ .incbin "baserom.gba", 0xE56468, 0x0028 .align 2 gFile_graphics_trainers_front_pics_magma_grunt_m_front_pic:: @ 8E56490 .incbin "graphics/trainers/front_pics/magma_grunt_m_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE56490, 0x0380 .align 2 gFile_graphics_trainers_palettes_magma_grunt_m:: @ 8E56810 .incbin "graphics/trainers/palettes/magma_grunt_m.gbapal.lz" - @ .incbin "baserom.gba", 0xE56810, 0x0028 .align 2 gFile_graphics_trainers_front_pics_magma_grunt_f_front_pic:: @ 8E56838 .incbin "graphics/trainers/front_pics/magma_grunt_f_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE56838, 0x038C .align 2 gFile_graphics_trainers_palettes_magma_grunt_f:: @ 8E56BC4 .incbin "graphics/trainers/palettes/magma_grunt_f.gbapal.lz" - @ .incbin "baserom.gba", 0xE56BC4, 0x0028 .align 2 gFile_graphics_trainers_front_pics_emerald_lass_front_pic:: @ 8E56BEC .incbin "graphics/trainers/front_pics/emerald_lass_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE56BEC, 0x02D8 .align 2 gFile_graphics_trainers_palettes_emerald_lass:: @ 8E56EC4 .incbin "graphics/trainers/palettes/emerald_lass.gbapal.lz" - @ .incbin "baserom.gba", 0xE56EC4, 0x0028 .align 2 gFile_graphics_trainers_front_pics_emerald_bug_catcher_front_pic:: @ 8E56EEC .incbin "graphics/trainers/front_pics/emerald_bug_catcher_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE56EEC, 0x032C .align 2 gFile_graphics_trainers_palettes_emerald_bug_catcher:: @ 8E57218 .incbin "graphics/trainers/palettes/emerald_bug_catcher.gbapal.lz" - @ .incbin "baserom.gba", 0xE57218, 0x0028 .align 2 gFile_graphics_trainers_front_pics_emerald_hiker_front_pic:: @ 8E57240 .incbin "graphics/trainers/front_pics/emerald_hiker_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE57240, 0x0480 .align 2 gFile_graphics_trainers_palettes_emerald_hiker:: @ 8E576C0 .incbin "graphics/trainers/palettes/emerald_hiker.gbapal.lz" - @ .incbin "baserom.gba", 0xE576C0, 0x0028 .align 2 gFile_graphics_trainers_front_pics_emerald_young_couple_front_pic:: @ 8E576E8 .incbin "graphics/trainers/front_pics/emerald_young_couple_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE576E8, 0x03C0 .align 2 gFile_graphics_trainers_palettes_emerald_young_couple:: @ 8E57AA8 .incbin "graphics/trainers/palettes/emerald_young_couple.gbapal.lz" - @ .incbin "baserom.gba", 0xE57AA8, 0x0028 .align 2 gFile_graphics_trainers_front_pics_old_couple_front_pic:: @ 8E57AD0 .incbin "graphics/trainers/front_pics/old_couple_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE57AD0, 0x0510 .align 2 gFile_graphics_trainers_palettes_old_couple:: @ 8E57FE0 .incbin "graphics/trainers/palettes/old_couple.gbapal.lz" - @ .incbin "baserom.gba", 0xE57FE0, 0x0028 .align 2 gFile_graphics_trainers_front_pics_emerald_sis_and_bro_front_pic:: @ 8E58008 .incbin "graphics/trainers/front_pics/emerald_sis_and_bro_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE58008, 0x044C .align 2 gFile_graphics_trainers_palettes_emerald_sis_and_bro:: @ 8E58454 .incbin "graphics/trainers/palettes/emerald_sis_and_bro.gbapal.lz" - @ .incbin "baserom.gba", 0xE58454, 0x0028 .align 2 gFile_graphics_trainers_front_pics_aqua_admin_m_front_pic:: @ 8E5847C .incbin "graphics/trainers/front_pics/aqua_admin_m_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE5847C, 0x03B4 .align 2 gFile_graphics_trainers_palettes_aqua_admin_m:: @ 8E58830 .incbin "graphics/trainers/palettes/aqua_admin_m.gbapal.lz" - @ .incbin "baserom.gba", 0xE58830, 0x0028 .align 2 gFile_graphics_trainers_front_pics_aqua_admin_f_front_pic:: @ 8E58858 .incbin "graphics/trainers/front_pics/aqua_admin_f_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE58858, 0x03C4 .align 2 gFile_graphics_trainers_palettes_aqua_admin_f:: @ 8E58C1C .incbin "graphics/trainers/palettes/aqua_admin_f.gbapal.lz" - @ .incbin "baserom.gba", 0xE58C1C, 0x0028 .align 2 gFile_graphics_trainers_front_pics_magma_admin_front_pic:: @ 8E58C44 .incbin "graphics/trainers/front_pics/magma_admin_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE58C44, 0x03D8 .align 2 gFile_graphics_trainers_palettes_magma_admin:: @ 8E5901C .incbin "graphics/trainers/palettes/magma_admin.gbapal.lz" - @ .incbin "baserom.gba", 0xE5901C, 0x0028 .align 2 gFile_graphics_trainers_front_pics_ruby_magma_admin_f_front_pic:: @ 8E59044 .incbin "graphics/trainers/front_pics/ruby_magma_admin_f_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE59044, 0x03B0 .align 2 gFile_graphics_trainers_palettes_ruby_magma_admin_f:: @ 8E593F4 .incbin "graphics/trainers/palettes/ruby_magma_admin_f.gbapal.lz" - @ .incbin "baserom.gba", 0xE593F4, 0x0028 .align 2 gFile_graphics_trainers_front_pics_leader_wattson_front_pic:: @ 8E5941C .incbin "graphics/trainers/front_pics/leader_wattson_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE5941C, 0x0348 .align 2 gFile_graphics_trainers_palettes_leader_wattson:: @ 8E59764 .incbin "graphics/trainers/palettes/leader_wattson.gbapal.lz" - @ .incbin "baserom.gba", 0xE59764, 0x0028 .align 2 gFile_graphics_trainers_front_pics_leader_flannery_front_pic:: @ 8E5978C .incbin "graphics/trainers/front_pics/leader_flannery_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE5978C, 0x0380 .align 2 gFile_graphics_trainers_palettes_leader_flannery:: @ 8E59B0C .incbin "graphics/trainers/palettes/leader_flannery.gbapal.lz" - @ .incbin "baserom.gba", 0xE59B0C, 0x0028 .align 2 gFile_graphics_trainers_front_pics_leader_norman_front_pic:: @ 8E59B34 .incbin "graphics/trainers/front_pics/leader_norman_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE59B34, 0x033C .align 2 gFile_graphics_trainers_palettes_leader_norman:: @ 8E59E70 .incbin "graphics/trainers/palettes/leader_norman.gbapal.lz" - @ .incbin "baserom.gba", 0xE59E70, 0x0028 .align 2 gFile_graphics_trainers_front_pics_leader_winona_front_pic:: @ 8E59E98 .incbin "graphics/trainers/front_pics/leader_winona_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE59E98, 0x0380 .align 2 gFile_graphics_trainers_palettes_leader_winona:: @ 8E5A218 .incbin "graphics/trainers/palettes/leader_winona.gbapal.lz" - @ .incbin "baserom.gba", 0xE5A218, 0x0028 .align 2 gFile_graphics_trainers_front_pics_ruby_sapphire_champion_wallace_front_pic:: @ 8E5A240 .incbin "graphics/trainers/front_pics/ruby_sapphire_champion_wallace_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE5A240, 0x0378 .align 2 gFile_graphics_trainers_palettes_champion_wallace:: @ 8E5A5B8 .incbin "graphics/trainers/palettes/champion_wallace.gbapal.lz" - @ .incbin "baserom.gba", 0xE5A5B8, 0x0028 .align 2 gFile_graphics_trainers_front_pics_elite_four_glacia_front_pic:: @ 8E5A5E0 .incbin "graphics/trainers/front_pics/elite_four_glacia_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE5A5E0, 0x0384 .align 2 gFile_graphics_trainers_palettes_elite_four_glacia:: @ 8E5A964 .incbin "graphics/trainers/palettes/elite_four_glacia.gbapal.lz" - @ .incbin "baserom.gba", 0xE5A964, 0x0028 .align 2 gFile_graphics_trainers_front_pics_elite_four_drake_front_pic:: @ 8E5A98C .incbin "graphics/trainers/front_pics/elite_four_drake_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE5A98C, 0x03A8 .align 2 gFile_graphics_trainers_palettes_elite_four_drake:: @ 8E5AD34 .incbin "graphics/trainers/palettes/elite_four_drake.gbapal.lz" - @ .incbin "baserom.gba", 0xE5AD34, 0x0028 .align 2 gFile_graphics_trainers_front_pics_youngster_front_pic:: @ 8E5AD5C .incbin "graphics/trainers/front_pics/youngster_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE5AD5C, 0x02A0 .align 2 gFile_graphics_trainers_palettes_youngster:: @ 8E5AFFC .incbin "graphics/trainers/palettes/youngster.gbapal.lz" - @ .incbin "baserom.gba", 0xE5AFFC, 0x0028 .align 2 gFile_graphics_trainers_front_pics_bug_catcher_front_pic:: @ 8E5B024 .incbin "graphics/trainers/front_pics/bug_catcher_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE5B024, 0x0348 .align 2 gFile_graphics_trainers_palettes_bug_catcher:: @ 8E5B36C .incbin "graphics/trainers/palettes/bug_catcher.gbapal.lz" - @ .incbin "baserom.gba", 0xE5B36C, 0x0028 .align 2 gFile_graphics_trainers_front_pics_lass_front_pic:: @ 8E5B394 .incbin "graphics/trainers/front_pics/lass_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE5B394, 0x02EC .align 2 gFile_graphics_trainers_palettes_lass:: @ 8E5B680 .incbin "graphics/trainers/palettes/lass.gbapal.lz" - @ .incbin "baserom.gba", 0xE5B680, 0x0028 .align 2 gFile_graphics_trainers_front_pics_sailor_front_pic:: @ 8E5B6A8 .incbin "graphics/trainers/front_pics/sailor_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE5B6A8, 0x0320 .align 2 gFile_graphics_trainers_palettes_sailor:: @ 8E5B9C8 .incbin "graphics/trainers/palettes/sailor.gbapal.lz" - @ .incbin "baserom.gba", 0xE5B9C8, 0x0028 .align 2 gFile_graphics_trainers_front_pics_camper_front_pic:: @ 8E5B9F0 .incbin "graphics/trainers/front_pics/camper_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE5B9F0, 0x02E0 .align 2 gFile_graphics_trainers_palettes_camper:: @ 8E5BCD0 .incbin "graphics/trainers/palettes/camper.gbapal.lz" - @ .incbin "baserom.gba", 0xE5BCD0, 0x0028 .align 2 gFile_graphics_trainers_front_pics_picnicker_front_pic:: @ 8E5BCF8 .incbin "graphics/trainers/front_pics/picnicker_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE5BCF8, 0x02E8 .align 2 gFile_graphics_trainers_palettes_picnicker:: @ 8E5BFE0 .incbin "graphics/trainers/palettes/picnicker.gbapal.lz" - @ .incbin "baserom.gba", 0xE5BFE0, 0x0028 .align 2 gFile_graphics_trainers_front_pics_pokemaniac_front_pic:: @ 8E5C008 .incbin "graphics/trainers/front_pics/pokemaniac_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE5C008, 0x03BC .align 2 gFile_graphics_trainers_palettes_pokemaniac:: @ 8E5C3C4 - @ .incbin "graphics/trainers/palettes/pokemaniac.gbapal.lz" - .incbin "baserom.gba", 0xE5C3C4, 0x0028 + .incbin "graphics/trainers/palettes/pokemaniac.gbapal.lz" .align 2 gFile_graphics_trainers_front_pics_super_nerd_front_pic:: @ 8E5C3EC .incbin "graphics/trainers/front_pics/super_nerd_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE5C3EC, 0x0318 .align 2 gFile_graphics_trainers_palettes_super_nerd:: @ 8E5C704 .incbin "graphics/trainers/palettes/super_nerd.gbapal.lz" - @ .incbin "baserom.gba", 0xE5C704, 0x0028 .align 2 gFile_graphics_trainers_front_pics_hiker_front_pic:: @ 8E5C72C .incbin "graphics/trainers/front_pics/hiker_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE5C72C, 0x0470 .align 2 gFile_graphics_trainers_palettes_hiker:: @ 8E5CB9C .incbin "graphics/trainers/palettes/hiker.gbapal.lz" - @ .incbin "baserom.gba", 0xE5CB9C, 0x0028 .align 2 gFile_graphics_trainers_front_pics_biker_front_pic:: @ 8E5CBC4 .incbin "graphics/trainers/front_pics/biker_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE5CBC4, 0x0568 .align 2 gFile_graphics_trainers_palettes_biker:: @ 8E5D12C .incbin "graphics/trainers/palettes/biker.gbapal.lz" - @ .incbin "baserom.gba", 0xE5D12C, 0x0028 .align 2 gFile_graphics_trainers_front_pics_burglar_front_pic:: @ 8E5D154 .incbin "graphics/trainers/front_pics/burglar_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE5D154, 0x034C .align 2 gFile_graphics_trainers_palettes_burglar:: @ 8E5D4A0 .incbin "graphics/trainers/palettes/burglar.gbapal.lz" - @ .incbin "baserom.gba", 0xE5D4A0, 0x0028 .align 2 gFile_graphics_trainers_front_pics_engineer_front_pic:: @ 8E5D4C8 .incbin "graphics/trainers/front_pics/engineer_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE5D4C8, 0x040C .align 2 gFile_graphics_trainers_palettes_engineer:: @ 8E5D8D4 .incbin "graphics/trainers/palettes/engineer.gbapal.lz" - @ .incbin "baserom.gba", 0xE5D8D4, 0x0028 .align 2 gFile_graphics_trainers_front_pics_fisherman_front_pic:: @ 8E5D8FC .incbin "graphics/trainers/front_pics/fisherman_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE5D8FC, 0x03AC .align 2 gFile_graphics_trainers_palettes_fisherman:: @ 8E5DCA8 .incbin "graphics/trainers/palettes/fisherman.gbapal.lz" - @ .incbin "baserom.gba", 0xE5DCA8, 0x0028 .align 2 gFile_graphics_trainers_front_pics_swimmer_m_front_pic:: @ 8E5DCD0 .incbin "graphics/trainers/front_pics/swimmer_m_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE5DCD0, 0x02D8 .align 2 gFile_graphics_trainers_palettes_swimmer_m:: @ 8E5DFA8 .incbin "graphics/trainers/palettes/swimmer_m.gbapal.lz" - @ .incbin "baserom.gba", 0xE5DFA8, 0x0028 .align 2 gFile_graphics_trainers_front_pics_roughneck_front_pic:: @ 8E5DFD0 .incbin "graphics/trainers/front_pics/roughneck_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE5DFD0, 0x05C8 .align 2 gFile_graphics_trainers_palettes_roughneck:: @ 8E5E598 .incbin "graphics/trainers/palettes/roughneck.gbapal.lz" - @ .incbin "baserom.gba", 0xE5E598, 0x0028 .align 2 gFile_graphics_trainers_front_pics_gamer_front_pic:: @ 8E5E5C0 .incbin "graphics/trainers/front_pics/gamer_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE5E5C0, 0x0394 .align 2 gFile_graphics_trainers_palettes_gamer:: @ 8E5E954 .incbin "graphics/trainers/palettes/gamer.gbapal.lz" - @ .incbin "baserom.gba", 0xE5E954, 0x0028 .align 2 gFile_graphics_trainers_front_pics_beauty_front_pic:: @ 8E5E97C .incbin "graphics/trainers/front_pics/beauty_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE5E97C, 0x035C .align 2 gFile_graphics_trainers_palettes_beauty:: @ 8E5ECD8 .incbin "graphics/trainers/palettes/beauty.gbapal.lz" - @ .incbin "baserom.gba", 0xE5ECD8, 0x0028 .align 2 gFile_graphics_trainers_front_pics_swimmer_f_front_pic:: @ 8E5ED00 .incbin "graphics/trainers/front_pics/swimmer_f_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE5ED00, 0x02EC .align 2 gFile_graphics_trainers_palettes_swimmer_f:: @ 8E5EFEC .incbin "graphics/trainers/palettes/swimmer_f.gbapal.lz" - @ .incbin "baserom.gba", 0xE5EFEC, 0x0028 .align 2 gFile_graphics_trainers_front_pics_psychic_m_front_pic:: @ 8E5F014 .incbin "graphics/trainers/front_pics/psychic_m_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE5F014, 0x0360 .align 2 gFile_graphics_trainers_palettes_psychic_m:: @ 8E5F374 .incbin "graphics/trainers/palettes/psychic_m.gbapal.lz" - @ .incbin "baserom.gba", 0xE5F374, 0x0028 .align 2 gFile_graphics_trainers_front_pics_rocker_front_pic:: @ 8E5F39C .incbin "graphics/trainers/front_pics/rocker_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE5F39C, 0x045C .align 2 gFile_graphics_trainers_palettes_rocker:: @ 8E5F7F8 .incbin "graphics/trainers/palettes/rocker.gbapal.lz" - @ .incbin "baserom.gba", 0xE5F7F8, 0x0028 .align 2 gFile_graphics_trainers_front_pics_juggler_front_pic:: @ 8E5F820 .incbin "graphics/trainers/front_pics/juggler_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE5F820, 0x043C .align 2 gFile_graphics_trainers_palettes_juggler:: @ 8E5FC5C .incbin "graphics/trainers/palettes/juggler.gbapal.lz" - @ .incbin "baserom.gba", 0xE5FC5C, 0x0028 .align 2 gFile_graphics_trainers_front_pics_tamer_front_pic:: @ 8E5FC84 .incbin "graphics/trainers/front_pics/tamer_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE5FC84, 0x03B4 .align 2 gFile_graphics_trainers_palettes_tamer:: @ 8E60038 .incbin "graphics/trainers/palettes/tamer.gbapal.lz" - @ .incbin "baserom.gba", 0xE60038, 0x0028 .align 2 gFile_graphics_trainers_front_pics_bird_keeper_front_pic:: @ 8E60060 .incbin "graphics/trainers/front_pics/bird_keeper_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE60060, 0x03C4 .align 2 gFile_graphics_trainers_palettes_bird_keeper:: @ 8E60424 .incbin "graphics/trainers/palettes/bird_keeper.gbapal.lz" - @ .incbin "baserom.gba", 0xE60424, 0x0028 .align 2 gFile_graphics_trainers_front_pics_black_belt_front_pic:: @ 8E6044C .incbin "graphics/trainers/front_pics/black_belt_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE6044C, 0x0420 .align 2 gFile_graphics_trainers_palettes_black_belt2:: @ 8E6086C .incbin "graphics/trainers/palettes/black_belt.gbapal.lz" - @ .incbin "baserom.gba", 0xE6086C, 0x0028 .align 2 gFile_graphics_trainers_front_pics_blue_1_front_pic:: @ 8E60894 .incbin "graphics/trainers/front_pics/blue_1_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE60894, 0x02B8 .align 2 gFile_graphics_trainers_palettes_blue_1:: @ 8E60B4C .incbin "graphics/trainers/palettes/blue_1.gbapal.lz" - @ .incbin "baserom.gba", 0xE60B4C, 0x0028 .align 2 gFile_graphics_trainers_front_pics_scientist_front_pic:: @ 8E60B74 .incbin "graphics/trainers/front_pics/scientist_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE60B74, 0x03DC .align 2 gFile_graphics_trainers_palettes_scientist:: @ 8E60F50 .incbin "graphics/trainers/palettes/scientist.gbapal.lz" - @ .incbin "baserom.gba", 0xE60F50, 0x0028 .align 2 gFile_graphics_trainers_front_pics_giovanni_front_pic:: @ 8E60F78 .incbin "graphics/trainers/front_pics/giovanni_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE60F78, 0x0310 .align 2 gFile_graphics_trainers_palettes_giovanni:: @ 8E61288 .incbin "graphics/trainers/palettes/giovanni.gbapal.lz" - @ .incbin "baserom.gba", 0xE61288, 0x0028 .align 2 gFile_graphics_trainers_front_pics_rocket_grunt_m_front_pic:: @ 8E612B0 .incbin "graphics/trainers/front_pics/rocket_grunt_m_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE612B0, 0x0334 .align 2 gFile_graphics_trainers_palettes_rocket_grunt_m:: @ 8E615E4 .incbin "graphics/trainers/palettes/rocket_grunt_m.gbapal.lz" - @ .incbin "baserom.gba", 0xE615E4, 0x0028 .align 2 gFile_graphics_trainers_front_pics_cool_trainer_m_front_pic:: @ 8E6160C .incbin "graphics/trainers/front_pics/cool_trainer_m_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE6160C, 0x02D0 .align 2 gFile_graphics_trainers_palettes_cool_trainer_m:: @ 8E618DC .incbin "graphics/trainers/palettes/cool_trainer_m.gbapal.lz" - @ .incbin "baserom.gba", 0xE618DC, 0x0028 .align 2 gFile_graphics_trainers_front_pics_cool_trainer_f_front_pic:: @ 8E61904 .incbin "graphics/trainers/front_pics/cool_trainer_f_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE61904, 0x0318 .align 2 gFile_graphics_trainers_palettes_cool_trainer_f:: @ 8E61C1C .incbin "graphics/trainers/palettes/cool_trainer_f.gbapal.lz" - @ .incbin "baserom.gba", 0xE61C1C, 0x0028 .align 2 gFile_graphics_trainers_front_pics_elite_four_lorelei_front_pic:: @ 8E61C44 .incbin "graphics/trainers/front_pics/elite_four_lorelei_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE61C44, 0x032C .align 2 gFile_graphics_trainers_palettes_elite_four_lorelei:: @ 8E61F70 .incbin "graphics/trainers/palettes/elite_four_lorelei.gbapal.lz" - @ .incbin "baserom.gba", 0xE61F70, 0x0028 .align 2 gFile_graphics_trainers_front_pics_elite_four_bruno_front_pic:: @ 8E61F98 .incbin "graphics/trainers/front_pics/elite_four_bruno_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE61F98, 0x044C .align 2 gFile_graphics_trainers_palettes_elite_four_bruno:: @ 8E623E4 .incbin "graphics/trainers/palettes/elite_four_bruno.gbapal.lz" - @ .incbin "baserom.gba", 0xE623E4, 0x0028 .align 2 gFile_graphics_trainers_front_pics_elite_four_agatha_front_pic:: @ 8E6240C .incbin "graphics/trainers/front_pics/elite_four_agatha_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE6240C, 0x031C .align 2 gFile_graphics_trainers_palettes_elite_four_agatha:: @ 8E62728 .incbin "graphics/trainers/palettes/elite_four_agatha.gbapal.lz" - @ .incbin "baserom.gba", 0xE62728, 0x0028 .align 2 gFile_graphics_trainers_front_pics_elite_four_lance_front_pic:: @ 8E62750 .incbin "graphics/trainers/front_pics/elite_four_lance_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE62750, 0x03C8 .align 2 gFile_graphics_trainers_palettes_elite_four_lance:: @ 8E62B18 .incbin "graphics/trainers/palettes/elite_four_lance.gbapal.lz" - @ .incbin "baserom.gba", 0xE62B18, 0x0028 .align 2 gFile_graphics_trainers_front_pics_leader_brock_front_pic:: @ 8E62B40 .incbin "graphics/trainers/front_pics/leader_brock_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE62B40, 0x034C .align 2 gFile_graphics_trainers_palettes_leader_brock:: @ 8E62E8C .incbin "graphics/trainers/palettes/leader_brock.gbapal.lz" - @ .incbin "baserom.gba", 0xE62E8C, 0x0028 .align 2 gFile_graphics_trainers_front_pics_leader_misty_front_pic:: @ 8E62EB4 .incbin "graphics/trainers/front_pics/leader_misty_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE62EB4, 0x0300 .align 2 gFile_graphics_trainers_palettes_leader_misty:: @ 8E631B4 .incbin "graphics/trainers/palettes/leader_misty.gbapal.lz" - @ .incbin "baserom.gba", 0xE631B4, 0x0028 .align 2 gFile_graphics_trainers_front_pics_leader_lt_surge_front_pic:: @ 8E631DC .incbin "graphics/trainers/front_pics/leader_lt_surge_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE631DC, 0x0390 .align 2 gFile_graphics_trainers_palettes_leader_lt_surge:: @ 8E6356C .incbin "graphics/trainers/palettes/leader_lt_surge.gbapal.lz" - @ .incbin "baserom.gba", 0xE6356C, 0x0028 .align 2 gFile_graphics_trainers_front_pics_leader_erika_front_pic:: @ 8E63594 .incbin "graphics/trainers/front_pics/leader_erika_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE63594, 0x02F4 .align 2 gFile_graphics_trainers_palettes_leader_erika:: @ 8E63888 .incbin "graphics/trainers/palettes/leader_erika.gbapal.lz" - @ .incbin "baserom.gba", 0xE63888, 0x0028 .align 2 gFile_graphics_trainers_front_pics_leader_koga_front_pic:: @ 8E638B0 .incbin "graphics/trainers/front_pics/leader_koga_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE638B0, 0x0368 .align 2 gFile_graphics_trainers_palettes_leader_koga:: @ 8E63C18 .incbin "graphics/trainers/palettes/leader_koga.gbapal.lz" - @ .incbin "baserom.gba", 0xE63C18, 0x0028 .align 2 gFile_graphics_trainers_front_pics_leader_blaine_front_pic:: @ 8E63C40 .incbin "graphics/trainers/front_pics/leader_blaine_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE63C40, 0x040C .align 2 gFile_graphics_trainers_palettes_leader_blaine:: @ 8E6404C .incbin "graphics/trainers/palettes/leader_blaine.gbapal.lz" - @ .incbin "baserom.gba", 0xE6404C, 0x0028 .align 2 gFile_graphics_trainers_front_pics_leader_sabrina_front_pic:: @ 8E64074 .incbin "graphics/trainers/front_pics/leader_sabrina_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE64074, 0x0308 .align 2 gFile_graphics_trainers_palettes_leader_sabrina:: @ 8E6437C .incbin "graphics/trainers/palettes/leader_sabrina.gbapal.lz" - @ .incbin "baserom.gba", 0xE6437C, 0x0028 .align 2 gFile_graphics_trainers_front_pics_gentleman_front_pic:: @ 8E643A4 .incbin "graphics/trainers/front_pics/gentleman_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE643A4, 0x0338 .align 2 gFile_graphics_trainers_palettes_gentleman:: @ 8E646DC .incbin "graphics/trainers/palettes/gentleman.gbapal.lz" - @ .incbin "baserom.gba", 0xE646DC, 0x0028 .align 2 gFile_graphics_trainers_front_pics_blue_2_front_pic:: @ 8E64704 .incbin "graphics/trainers/front_pics/blue_2_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE64704, 0x02F4 .align 2 gFile_graphics_trainers_palettes_blue_2:: @ 8E649F8 .incbin "graphics/trainers/palettes/blue_2.gbapal.lz" - @ .incbin "baserom.gba", 0xE649F8, 0x0028 .align 2 gFile_graphics_trainers_front_pics_champion_blue_front_pic:: @ 8E64A20 .incbin "graphics/trainers/front_pics/champion_blue_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE64A20, 0x02FC .align 2 gFile_graphics_trainers_palettes_champion_blue:: @ 8E64D1C .incbin "graphics/trainers/palettes/champion_blue.gbapal.lz" - @ .incbin "baserom.gba", 0xE64D1C, 0x0028 .align 2 gFile_graphics_trainers_front_pics_channeler_front_pic:: @ 8E64D44 .incbin "graphics/trainers/front_pics/channeler_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE64D44, 0x03D8 .align 2 gFile_graphics_trainers_palettes_channeler:: @ 8E6511C .incbin "graphics/trainers/palettes/channeler.gbapal.lz" - @ .incbin "baserom.gba", 0xE6511C, 0x0028 .align 2 gFile_graphics_trainers_front_pics_twins_front_pic:: @ 8E65144 .incbin "graphics/trainers/front_pics/twins_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE65144, 0x0350 .align 2 gFile_graphics_trainers_palettes_twins:: @ 8E65494 .incbin "graphics/trainers/palettes/twins.gbapal.lz" - @ .incbin "baserom.gba", 0xE65494, 0x0028 .align 2 gFile_graphics_trainers_front_pics_cool_couple_front_pic:: @ 8E654BC .incbin "graphics/trainers/front_pics/cool_couple_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE654BC, 0x04E0 .align 2 gFile_graphics_trainers_palettes_cool_couple:: @ 8E6599C .incbin "graphics/trainers/palettes/cool_couple.gbapal.lz" - @ .incbin "baserom.gba", 0xE6599C, 0x0028 .align 2 gFile_graphics_trainers_front_pics_young_couple_front_pic:: @ 8E659C4 .incbin "graphics/trainers/front_pics/young_couple_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE659C4, 0x044C .align 2 gFile_graphics_trainers_palettes_young_couple:: @ 8E65E10 .incbin "graphics/trainers/palettes/young_couple.gbapal.lz" - @ .incbin "baserom.gba", 0xE65E10, 0x0028 .align 2 gFile_graphics_trainers_front_pics_crush_kin_front_pic:: @ 8E65E38 .incbin "graphics/trainers/front_pics/crush_kin_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE65E38, 0x05A0 .align 2 gFile_graphics_trainers_palettes_crush_kin:: @ 8E663D8 .incbin "graphics/trainers/palettes/crush_kin.gbapal.lz" - @ .incbin "baserom.gba", 0xE663D8, 0x0028 .align 2 gFile_graphics_trainers_front_pics_sis_and_bro_front_pic:: @ 8E66400 .incbin "graphics/trainers/front_pics/sis_and_bro_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE66400, 0x0460 .align 2 gFile_graphics_trainers_palettes_sis_and_bro:: @ 8E66860 .incbin "graphics/trainers/palettes/sis_and_bro.gbapal.lz" - @ .incbin "baserom.gba", 0xE66860, 0x0028 .align 2 gFile_graphics_trainers_front_pics_oak_front_pic:: @ 8E66888 .incbin "graphics/trainers/front_pics/oak_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE66888, 0x036C .align 2 gFile_graphics_trainers_palettes_oak:: @ 8E66BF4 .incbin "graphics/trainers/palettes/oak.gbapal.lz" - @ .incbin "baserom.gba", 0xE66BF4, 0x0028 .align 2 gFile_graphics_trainers_front_pics_ruby_sapphire_brendan_front_pic2:: @ 8E66C1C .incbin "graphics/trainers/front_pics/ruby_sapphire_brendan_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE66C1C, 0x0314 .align 2 gFile_graphics_trainers_palettes_ruby_sapphire_brendan2:: @ 8E66F30 .incbin "graphics/trainers/palettes/ruby_sapphire_brendan.gbapal.lz" - @ .incbin "baserom.gba", 0xE66F30, 0x0028 .align 2 gFile_graphics_trainers_front_pics_ruby_sapphire_may_front_pic2:: @ 8E66F58 .incbin "graphics/trainers/front_pics/ruby_sapphire_may_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE66F58, 0x0300 .align 2 gFile_graphics_trainers_palettes_ruby_sapphire_may2:: @ 8E67258 .incbin "graphics/trainers/palettes/ruby_sapphire_may.gbapal.lz" - @ .incbin "baserom.gba", 0xE67258, 0x0028 .align 2 gFile_graphics_trainers_front_pics_red_front_pic:: @ 8E67280 .incbin "graphics/trainers/front_pics/red_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE67280, 0x030C .align 2 gFile_graphics_trainers_palettes_red:: @ 8E6758C .incbin "graphics/trainers/palettes/red.gbapal.lz" - @ .incbin "baserom.gba", 0xE6758C, 0x0028 .align 2 gFile_graphics_trainers_front_pics_leaf_front_pic:: @ 8E675B4 .incbin "graphics/trainers/front_pics/leaf_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE675B4, 0x033C .align 2 gFile_graphics_trainers_palettes_leaf:: @ 8E678F0 .incbin "graphics/trainers/palettes/leaf.gbapal.lz" - @ .incbin "baserom.gba", 0xE678F0, 0x0028 .align 2 gFile_graphics_trainers_front_pics_rocket_grunt_f_front_pic:: @ 8E67918 .incbin "graphics/trainers/front_pics/rocket_grunt_f_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE67918, 0x0318 .align 2 gFile_graphics_trainers_palettes_rocket_grunt_f:: @ 8E67C30 .incbin "graphics/trainers/palettes/rocket_grunt_f.gbapal.lz" - @ .incbin "baserom.gba", 0xE67C30, 0x0028 .align 2 gFile_graphics_trainers_front_pics_psychic_f_front_pic:: @ 8E67C58 .incbin "graphics/trainers/front_pics/psychic_f_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE67C58, 0x03A0 .align 2 gFile_graphics_trainers_palettes_psychic_f:: @ 8E67FF8 .incbin "graphics/trainers/palettes/psychic_f.gbapal.lz" - @ .incbin "baserom.gba", 0xE67FF8, 0x0028 .align 2 gFile_graphics_trainers_front_pics_crush_girl_front_pic:: @ 8E68020 .incbin "graphics/trainers/front_pics/crush_girl_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE68020, 0x030C .align 2 gFile_graphics_trainers_palettes_crush_girl:: @ 8E6832C .incbin "graphics/trainers/palettes/crush_girl.gbapal.lz" - @ .incbin "baserom.gba", 0xE6832C, 0x0028 .align 2 gFile_graphics_trainers_front_pics_tuber_front_pic:: @ 8E68354 .incbin "graphics/trainers/front_pics/tuber_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE68354, 0x0304 .align 2 gFile_graphics_trainers_palettes_tuber:: @ 8E68658 .incbin "graphics/trainers/palettes/tuber.gbapal.lz" - @ .incbin "baserom.gba", 0xE68658, 0x0028 .align 2 gFile_graphics_trainers_front_pics_pokemon_breeder_front_pic:: @ 8E68680 .incbin "graphics/trainers/front_pics/pokemon_breeder_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE68680, 0x0340 .align 2 gFile_graphics_trainers_palettes_pokemon_breeder:: @ 8E689C0 .incbin "graphics/trainers/palettes/pokemon_breeder.gbapal.lz" - @ .incbin "baserom.gba", 0xE689C0, 0x0028 .align 2 gFile_graphics_trainers_front_pics_pokemon_ranger_m_front_pic:: @ 8E689E8 .incbin "graphics/trainers/front_pics/pokemon_ranger_m_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE689E8, 0x0360 .align 2 gFile_graphics_trainers_palettes_pokemon_ranger_m:: @ 8E68D48 .incbin "graphics/trainers/palettes/pokemon_ranger_m.gbapal.lz" - @ .incbin "baserom.gba", 0xE68D48, 0x0028 .align 2 gFile_graphics_trainers_front_pics_pokemon_ranger_f_front_pic:: @ 8E68D70 .incbin "graphics/trainers/front_pics/pokemon_ranger_f_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE68D70, 0x0334 .align 2 gFile_graphics_trainers_palettes_pokemon_ranger_f:: @ 8E690A4 .incbin "graphics/trainers/palettes/pokemon_ranger_f.gbapal.lz" - @ .incbin "baserom.gba", 0xE690A4, 0x0028 .align 2 gFile_graphics_trainers_front_pics_aroma_lady_front_pic:: @ 8E690CC .incbin "graphics/trainers/front_pics/aroma_lady_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE690CC, 0x0350 .align 2 gFile_graphics_trainers_palettes_aroma_lady:: @ 8E6941C .incbin "graphics/trainers/palettes/aroma_lady.gbapal.lz" - @ .incbin "baserom.gba", 0xE6941C, 0x0028 .align 2 gFile_graphics_trainers_front_pics_ruin_maniac_front_pic:: @ 8E69444 .incbin "graphics/trainers/front_pics/ruin_maniac_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE69444, 0x040C .align 2 gFile_graphics_trainers_palettes_ruin_maniac:: @ 8E69850 .incbin "graphics/trainers/palettes/ruin_maniac.gbapal.lz" - @ .incbin "baserom.gba", 0xE69850, 0x0028 .align 2 gFile_graphics_trainers_front_pics_lady_front_pic:: @ 8E69878 .incbin "graphics/trainers/front_pics/lady_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE69878, 0x0328 .align 2 gFile_graphics_trainers_palettes_lady:: @ 8E69BA0 .incbin "graphics/trainers/palettes/lady.gbapal.lz" - @ .incbin "baserom.gba", 0xE69BA0, 0x0028 .align 2 gFile_graphics_trainers_front_pics_painter_front_pic:: @ 8E69BC8 .incbin "graphics/trainers/front_pics/painter_front_pic.4bpp.lz" - @ .incbin "baserom.gba", 0xE69BC8, 0x02CC .align 2 gFile_graphics_trainers_palettes_painter:: @ 8E69E94 .incbin "graphics/trainers/palettes/painter.gbapal.lz" - @ .incbin "baserom.gba", 0xE69E94, 0x0028 .align 2 gFile_graphics_trainers_back_pics_red_back_pic:: @ 8E69EBC .incbin "graphics/trainers/back_pics/red_back_pic.4bpp" - @ .incbin "baserom.gba", 0xE69EBC, 0x2800 .align 2 gFile_graphics_trainers_back_pics_leaf_back_pic:: @ 8E6C6BC .incbin "graphics/trainers/back_pics/leaf_back_pic.4bpp" - @ .incbin "baserom.gba", 0xE6C6BC, 0x2800 .align 2 gFile_graphics_trainers_back_pics_pokedude_back_pic:: @ 8E6EEBC .incbin "graphics/trainers/back_pics/pokedude_back_pic.4bpp" - @ .incbin "baserom.gba", 0xE6EEBC, 0x2000 .align 2 gFile_graphics_trainers_back_pics_old_man_back_pic:: @ 8E70EBC .incbin "graphics/trainers/back_pics/old_man_back_pic.4bpp" - @ .incbin "baserom.gba", 0xE70EBC, 0x2000 .align 2 gFile_graphics_trainers_back_pics_ruby_sapphire_brendan_back_pic:: @ 8E72EBC .incbin "graphics/trainers/back_pics/ruby_sapphire_brendan_back_pic.4bpp" - @ .incbin "baserom.gba", 0xE72EBC, 0x2000 .align 2 gFile_graphics_trainers_back_pics_ruby_sapphire_may_back_pic:: @ 8E74EBC .incbin "graphics/trainers/back_pics/ruby_sapphire_may_back_pic.4bpp" - @ .incbin "baserom.gba", 0xE74EBC, 0x2000 .align 2 gFile_graphics_trainers_palettes_leaf_back_pic:: @ 8E76EBC .incbin "graphics/trainers/palettes/leaf_back_pic.gbapal.lz" - @ .incbin "baserom.gba", 0xE76EBC, 0x0028 .align 2 gFile_graphics_trainers_palettes_red_back_pic:: @ 8E76EE4 .incbin "graphics/trainers/palettes/red_back_pic.gbapal.lz" - @ .incbin "baserom.gba", 0xE76EE4, 0x0028 .align 2 gFile_graphics_trainers_palettes_pokedude_back_pic:: @ 8E76F0C .incbin "graphics/trainers/palettes/pokedude_back_pic.gbapal.lz" - @ .incbin "baserom.gba", 0xE76F0C, 0x0028 .align 2 gFile_graphics_trainers_palettes_old_man_back_pic:: @ 8E76F34 .incbin "graphics/trainers/palettes/old_man_back_pic.gbapal.lz" - @ .incbin "baserom.gba", 0xE76F34, 0x0028 .align 2 gFile_graphics_pokemon_icons_question_mark_icon:: @ 8E76F5C .incbin "graphics/pokemon/icons/question_mark_icon.4bpp" - @ .incbin "baserom.gba", 0xE76F5C, 0x0400 .align 2 gFile_graphics_pokemon_footprints_question_mark_footprint:: @ 8E7735C .incbin "graphics/pokemon/footprints/question_mark_footprint.1bpp" - @ .incbin "baserom.gba", 0xE7735C, 0x0020 .align 2 @ THIS IS ./graphics/battle_transitions/vs_frame.4bpp.lz diff --git a/graphics/pokemon/back_pics/double_question_mark_back_pic.png b/graphics/pokemon/back_pics/double_question_mark_back_pic.png index 14eb6e139..881ff0519 100644 Binary files a/graphics/pokemon/back_pics/double_question_mark_back_pic.png and b/graphics/pokemon/back_pics/double_question_mark_back_pic.png differ diff --git a/graphics/pokemon/front_pics/blaziken_still_front_pic.png b/graphics/pokemon/front_pics/blaziken_still_front_pic.png index 7c8721171..4b22ec1de 100644 Binary files a/graphics/pokemon/front_pics/blaziken_still_front_pic.png and b/graphics/pokemon/front_pics/blaziken_still_front_pic.png differ diff --git a/graphics/pokemon/front_pics/double_question_mark_still_front_pic.png b/graphics/pokemon/front_pics/double_question_mark_still_front_pic.png index f23b08476..14eb6e139 100644 Binary files a/graphics/pokemon/front_pics/double_question_mark_still_front_pic.png and b/graphics/pokemon/front_pics/double_question_mark_still_front_pic.png differ diff --git a/graphics/trainers/palettes/emerald_pokemaniac.pal b/graphics/trainers/palettes/emerald_pokemaniac.pal index 2a41e2be4..3ede03b14 100644 --- a/graphics/trainers/palettes/emerald_pokemaniac.pal +++ b/graphics/trainers/palettes/emerald_pokemaniac.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 115 197 164 -246 213 197 -222 172 139 -197 139 115 -123 90 82 -222 222 230 -180 197 213 -139 156 172 -74 98 123 -49 65 90 -106 49 24 -255 180 106 -238 131 65 -180 106 49 +255 230 205 +246 205 156 +205 156 115 +115 82 65 +246 189 115 +213 123 74 +180 82 74 +139 57 41 +74 74 49 +255 230 57 +98 123 106 +230 82 24 +213 205 230 255 255 255 0 0 0 diff --git a/graphics/trainers/palettes/pokemaniac.pal b/graphics/trainers/palettes/pokemaniac.pal index 3ede03b14..2a41e2be4 100644 --- a/graphics/trainers/palettes/pokemaniac.pal +++ b/graphics/trainers/palettes/pokemaniac.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 115 197 164 -255 230 205 -246 205 156 -205 156 115 -115 82 65 -246 189 115 -213 123 74 -180 82 74 -139 57 41 -74 74 49 -255 230 57 -98 123 106 -230 82 24 -213 205 230 +246 213 197 +222 172 139 +197 139 115 +123 90 82 +222 222 230 +180 197 213 +139 156 172 +74 98 123 +49 65 90 +106 49 24 +255 180 106 +238 131 65 +180 106 49 255 255 255 0 0 0 -- cgit v1.2.3 From 8adafe8c73f362a922931caab7ae169635c5a888 Mon Sep 17 00:00:00 2001 From: paul Date: Sat, 13 Oct 2018 00:44:54 +0200 Subject: add copy of black_belt palette for emerald and fix labels --- data/graphics.s | 6 +++--- graphics/trainers/palettes/emerald_black_belt.pal | 19 +++++++++++++++++++ 2 files changed, 22 insertions(+), 3 deletions(-) create mode 100644 graphics/trainers/palettes/emerald_black_belt.pal diff --git a/data/graphics.s b/data/graphics.s index 8715afc66..5a29a0b01 100644 --- a/data/graphics.s +++ b/data/graphics.s @@ -10403,8 +10403,8 @@ gFile_graphics_trainers_front_pics_emerald_black_belt_front_pic:: @ 8E4C2CC .incbin "graphics/trainers/front_pics/emerald_black_belt_front_pic.4bpp.lz" .align 2 -gFile_graphics_trainers_palettes_black_belt:: @ 8E4C630 - .incbin "graphics/trainers/palettes/black_belt.gbapal.lz" +gFile_graphics_trainers_palettes_emerald_black_belt:: @ 8E4C630 + .incbin "graphics/trainers/palettes/emerald_black_belt.gbapal.lz" .align 2 gFile_graphics_trainers_front_pics_guitarist_front_pic:: @ 8E4C658 @@ -11115,7 +11115,7 @@ gFile_graphics_trainers_front_pics_black_belt_front_pic:: @ 8E6044C .incbin "graphics/trainers/front_pics/black_belt_front_pic.4bpp.lz" .align 2 -gFile_graphics_trainers_palettes_black_belt2:: @ 8E6086C +gFile_graphics_trainers_palettes_black_belt:: @ 8E6086C .incbin "graphics/trainers/palettes/black_belt.gbapal.lz" .align 2 diff --git a/graphics/trainers/palettes/emerald_black_belt.pal b/graphics/trainers/palettes/emerald_black_belt.pal new file mode 100644 index 000000000..869e5d8df --- /dev/null +++ b/graphics/trainers/palettes/emerald_black_belt.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 197 164 +246 205 189 +222 172 148 +172 131 106 +90 65 49 +148 131 123 +106 90 82 +82 90 115 +49 57 82 +205 189 189 +189 164 164 +156 139 139 +255 98 90 +197 65 65 +246 230 230 +0 0 0 -- cgit v1.2.3 From d161ce7ad159b0b2363839cb0cc12c2bf42ff96c Mon Sep 17 00:00:00 2001 From: paul Date: Sat, 13 Oct 2018 00:56:24 +0200 Subject: change label for unknown hitmontop data --- data/graphics.s | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/data/graphics.s b/data/graphics.s index 5a29a0b01..e7cf632e8 100644 --- a/data/graphics.s +++ b/data/graphics.s @@ -6334,8 +6334,7 @@ gFile_graphics_pokemon_palettes_hitmontop_shiny_palette:: @ 8DD1E68 gFile_graphics_pokemon_icons_hitmontop_icon:: @ 8DD1E90 .incbin "graphics/pokemon/icons/hitmontop_icon.4bpp" -gUnknown_hitmontop_blank_space:: @ 8DD2290 - @.space 0x200 +gUnknown_hitmontop_unknown_data:: @ 8DD2290 .incbin "baserom.gba", 0xDD2290, 0x200 .align 2 -- cgit v1.2.3 From ef81b5a2372911c1ab65f87c8a8633862d59d682 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Fri, 12 Oct 2018 21:31:25 -0400 Subject: sub_8112450 --- asm/quest_log.s | 90 -------------------------------------------------- include/menu_helpers.h | 1 + src/quest_log.c | 32 ++++++++++++++++++ 3 files changed, 33 insertions(+), 90 deletions(-) diff --git a/asm/quest_log.s b/asm/quest_log.s index 8e71786c8..505e60275 100644 --- a/asm/quest_log.s +++ b/asm/quest_log.s @@ -5,96 +5,6 @@ .text - thumb_func_start sub_81123BC -sub_81123BC: @ 81123BC - push {r4-r7,lr} - mov r7, r8 - push {r7} - sub sp, 0x4 - movs r0, 0xCD - lsls r0, 5 - bl AllocZeroed - mov r8, r0 - ldr r0, _08112448 @ =gUnknown_203ADF8 - ldrb r4, [r0] - movs r5, 0 - movs r6, 0 -_081123D6: - cmp r4, 0x3 - bls _081123DC - movs r4, 0 -_081123DC: - ldr r3, _0811244C @ =gSaveBlock1Ptr - ldr r0, [r3] - movs r2, 0xCD - lsls r2, 3 - adds r1, r4, 0 - muls r1, r2 - adds r0, r1 - movs r7, 0x98 - lsls r7, 5 - adds r1, r0, r7 - ldrb r0, [r1] - cmp r0, 0 - beq _0811240A - adds r0, r5, 0 - muls r0, r2 - add r0, r8 - str r3, [sp] - bl memcpy - adds r0, r5, 0x1 - lsls r0, 24 - lsrs r5, r0, 24 - ldr r3, [sp] -_0811240A: - adds r0, r4, 0x1 - lsls r0, 24 - lsrs r4, r0, 24 - adds r0, r6, 0x1 - lsls r0, 24 - lsrs r6, r0, 24 - cmp r6, 0x3 - bls _081123D6 - ldr r1, _08112448 @ =gUnknown_203ADF8 - movs r0, 0x3 - ands r5, r0 - strb r5, [r1] - ldr r1, [r3] - movs r0, 0x98 - lsls r0, 5 - adds r1, r0 - movs r2, 0xCD - lsls r2, 4 - mov r0, r8 - bl CpuSet - mov r0, r8 - bl Free - add sp, 0x4 - pop {r3} - mov r8, r3 - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_08112448: .4byte gUnknown_203ADF8 -_0811244C: .4byte gSaveBlock1Ptr - thumb_func_end sub_81123BC - - thumb_func_start sub_8112450 -sub_8112450: @ 8112450 - push {lr} - bl sub_80BF708 - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x1 - beq _08112466 - bl sub_8112364 - bl sub_81123BC -_08112466: - pop {r0} - bx r0 - thumb_func_end sub_8112450 - thumb_func_start sub_811246C sub_811246C: @ 811246C push {r4-r6,lr} diff --git a/include/menu_helpers.h b/include/menu_helpers.h index f083a10e2..e88385f94 100644 --- a/include/menu_helpers.h +++ b/include/menu_helpers.h @@ -16,5 +16,6 @@ void sub_812225C(u16 *, u16 *, u8, u8); void sub_8122298(u16 *, u16 *, u8, u8, u8); void sub_8121F68(u8 taskId, const struct YesNoFuncTable *data); bool8 sub_81221AC(void); +bool8 sub_80BF708(void); #endif //GUARD_MENU_HELPERS_H diff --git a/src/quest_log.c b/src/quest_log.c index 391a760ba..0fdedde97 100644 --- a/src/quest_log.c +++ b/src/quest_log.c @@ -5,6 +5,7 @@ #include "task.h" #include "palette.h" #include "menu.h" +#include "menu_helpers.h" #include "window.h" #include "text_window.h" #include "event_data.h" @@ -1382,3 +1383,34 @@ void sub_8112364(void) gUnknown_203AE04 = NULL; gUnknown_203AE08 = NULL; } + +void sub_81123BC(void) +{ + struct QuestLog * buffer = AllocZeroed(4 * sizeof(struct QuestLog)); + u8 i; + u8 r4 = gUnknown_203ADF8; + u8 count = 0; + for (i = 0; i < 4; i++) + { + if (r4 > 3) + r4 = 0; + if (gSaveBlock1Ptr->questLog[r4].unk_000) + { + buffer[count] = gSaveBlock1Ptr->questLog[r4]; + count++; + } + r4++; + } + gUnknown_203ADF8 = count % 4; + CpuCopy16(buffer, gSaveBlock1Ptr->questLog, 4 * sizeof(struct QuestLog)); + Free(buffer); +} + +void sub_8112450(void) +{ + if (sub_80BF708() != 1) + { + sub_8112364(); + sub_81123BC(); + } +} -- cgit v1.2.3 From 65bce70419a44d62c5f8a6442db6d0ddfb7ced8c Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Fri, 12 Oct 2018 21:56:35 -0400 Subject: sub_811246C --- asm/battle_setup.s | 8 +- asm/bike.s | 24 +-- asm/field_control_avatar.s | 16 +- asm/field_effect.s | 176 ++++++++++---------- asm/field_effect_helpers.s | 80 ++++----- asm/field_fadetransition.s | 44 ++--- asm/field_map_obj.s | 396 ++++++++++++++++++++++---------------------- asm/field_player_avatar.s | 184 ++++++++++---------- asm/field_screen_effect.s | 4 +- asm/field_specials.s | 8 +- asm/link_rfu_3.s | 8 +- asm/load_save.s | 8 +- asm/map_obj_80688E4.s | 12 +- asm/map_obj_lock.s | 24 +-- asm/overworld.s | 56 +++---- asm/quest_log.s | 66 -------- asm/quest_log_8150454.s | 20 +-- asm/rom6.s | 16 +- asm/scrcmd.s | 16 +- asm/script_movement.s | 8 +- asm/shop.s | 8 +- asm/ss_anne.s | 16 +- asm/trainer_see.s | 38 ++--- asm/unk_810C3A4.s | 12 +- asm/unk_8159F40.s | 20 +-- asm/vs_seeker.s | 24 +-- include/field_map_obj.h | 2 + include/quest_log_8150454.h | 6 + src/quest_log.c | 31 ++++ sym_ewram.txt | 2 +- 30 files changed, 653 insertions(+), 680 deletions(-) create mode 100644 include/quest_log_8150454.h diff --git a/asm/battle_setup.s b/asm/battle_setup.s index d9c84dcc4..a1c63477c 100644 --- a/asm/battle_setup.s +++ b/asm/battle_setup.s @@ -1650,7 +1650,7 @@ TrainerWantsBattle: @ 8080334 ldr r2, _08080368 @ =gUnknown_3005074 strb r0, [r2] ldr r4, _0808036C @ =gUnknown_20370D2 - ldr r3, _08080370 @ =gUnknown_2036E38 + ldr r3, _08080370 @ =gMapObjects lsls r2, r0, 3 adds r2, r0 lsls r2, 2 @@ -1669,7 +1669,7 @@ TrainerWantsBattle: @ 8080334 .align 2, 0 _08080368: .4byte gUnknown_3005074 _0808036C: .4byte gUnknown_20370D2 -_08080370: .4byte gUnknown_2036E38 +_08080370: .4byte gMapObjects _08080374: .4byte gUnknown_81A4EB4 thumb_func_end TrainerWantsBattle @@ -1698,7 +1698,7 @@ sub_8080398: @ 8080398 lsls r4, r0, 3 adds r4, r0 lsls r4, 2 - ldr r0, _080803C8 @ =gUnknown_2036E38 + ldr r0, _080803C8 @ =gMapObjects adds r4, r0 ldrb r0, [r4, 0x18] lsls r0, 28 @@ -1714,7 +1714,7 @@ sub_8080398: @ 8080398 bx r0 .align 2, 0 _080803C4: .4byte gUnknown_3005074 -_080803C8: .4byte gUnknown_2036E38 +_080803C8: .4byte gMapObjects thumb_func_end sub_8080398 thumb_func_start sub_80803CC diff --git a/asm/bike.s b/asm/bike.s index 2a1219968..1f891f930 100644 --- a/asm/bike.s +++ b/asm/bike.s @@ -77,7 +77,7 @@ sub_80BD100: @ 80BD100 lsls r4, r0, 3 adds r4, r0 lsls r4, 2 - ldr r0, _080BD160 @ =gUnknown_2036E38 + ldr r0, _080BD160 @ =gMapObjects adds r4, r0 bl player_get_direction_upper_nybble lsls r0, 24 @@ -106,7 +106,7 @@ sub_80BD100: @ 80BD100 b _080BD1B6 .align 2, 0 _080BD15C: .4byte gUnknown_2037078 -_080BD160: .4byte gUnknown_2036E38 +_080BD160: .4byte gMapObjects _080BD164: .4byte gMain _080BD168: ldrb r0, [r6] @@ -204,7 +204,7 @@ sub_80BD1E8: @ 80BD1E8 lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _080BD244 @ =gUnknown_2036E38 + ldr r1, _080BD244 @ =gMapObjects adds r0, r1 ldrb r0, [r0, 0x1E] bl sub_805A1DC @@ -227,7 +227,7 @@ sub_80BD1E8: @ 80BD1E8 b _080BD270 .align 2, 0 _080BD240: .4byte gUnknown_2037078 -_080BD244: .4byte gUnknown_2036E38 +_080BD244: .4byte gMapObjects _080BD248: movs r0, 0x2 strb r0, [r4, 0x2] @@ -281,7 +281,7 @@ sub_80BD28C: @ 80BD28C lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _080BD2C4 @ =gUnknown_2036E38 + ldr r1, _080BD2C4 @ =gMapObjects adds r5, r0, r1 ldrb r1, [r5, 0x1E] adds r0, r4, 0 @@ -299,7 +299,7 @@ _080BD2B2: bx r0 .align 2, 0 _080BD2C0: .4byte gUnknown_2037078 -_080BD2C4: .4byte gUnknown_2036E38 +_080BD2C4: .4byte gMapObjects thumb_func_end sub_80BD28C thumb_func_start sub_80BD2C8 @@ -313,7 +313,7 @@ sub_80BD2C8: @ 80BD2C8 lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _080BD2FC @ =gUnknown_2036E38 + ldr r1, _080BD2FC @ =gMapObjects adds r5, r0, r1 ldrb r1, [r5, 0x1E] adds r0, r4, 0 @@ -327,7 +327,7 @@ sub_80BD2C8: @ 80BD2C8 b _080BD350 .align 2, 0 _080BD2F8: .4byte gUnknown_2037078 -_080BD2FC: .4byte gUnknown_2036E38 +_080BD2FC: .4byte gMapObjects _080BD300: adds r0, r4, 0 bl sub_80BD3A0 @@ -425,7 +425,7 @@ sub_80BD3A0: @ 80BD3A0 lsls r4, r0, 3 adds r4, r0 lsls r4, 2 - ldr r0, _080BD408 @ =gUnknown_2036E38 + ldr r0, _080BD408 @ =gMapObjects adds r4, r0 ldrh r1, [r4, 0x10] add r0, sp, 0x4 @@ -463,7 +463,7 @@ sub_80BD3A0: @ 80BD3A0 bx r1 .align 2, 0 _080BD404: .4byte gUnknown_2037078 -_080BD408: .4byte gUnknown_2036E38 +_080BD408: .4byte gMapObjects thumb_func_end sub_80BD3A0 thumb_func_start sub_80BD40C @@ -689,7 +689,7 @@ player_should_look_direction_be_enforced_upon_movement: @ 80BD58C lsls r0, 24 cmp r0, 0 beq _080BD5C0 - ldr r2, _080BD5B8 @ =gUnknown_2036E38 + ldr r2, _080BD5B8 @ =gMapObjects ldr r0, _080BD5BC @ =gUnknown_2037078 ldrb r1, [r0, 0x5] lsls r0, r1, 3 @@ -704,7 +704,7 @@ player_should_look_direction_be_enforced_upon_movement: @ 80BD58C movs r0, 0 b _080BD5C2 .align 2, 0 -_080BD5B8: .4byte gUnknown_2036E38 +_080BD5B8: .4byte gMapObjects _080BD5BC: .4byte gUnknown_2037078 _080BD5C0: movs r0, 0x1 diff --git a/asm/field_control_avatar.s b/asm/field_control_avatar.s index bcd3a10e9..c4551463d 100644 --- a/asm/field_control_avatar.s +++ b/asm/field_control_avatar.s @@ -906,7 +906,7 @@ _0806CF7E: lsrs r3, r0, 24 cmp r3, 0x10 beq _0806CF9E - ldr r1, _0806CFA8 @ =gUnknown_2036E38 + ldr r1, _0806CFA8 @ =gMapObjects lsls r2, r3, 3 adds r0, r2, r3 lsls r0, 2 @@ -920,7 +920,7 @@ _0806CF9E: b _0806CFDE .align 2, 0 _0806CFA4: .4byte gUnknown_826D2D8 -_0806CFA8: .4byte gUnknown_2036E38 +_0806CFA8: .4byte gMapObjects _0806CFAC: movs r4, 0 ldr r1, _0806CFE4 @ =gUnknown_2031DEC @@ -978,7 +978,7 @@ sub_806CFF4: @ 806CFF4 lsrs r5, r0, 24 cmp r5, 0x10 beq _0806D02A - ldr r2, _0806D098 @ =gUnknown_2036E38 + ldr r2, _0806D098 @ =gMapObjects lsls r1, r5, 3 adds r0, r1, r5 lsls r0, 2 @@ -1016,7 +1016,7 @@ _0806D02A: lsrs r5, r0, 24 cmp r5, 0x10 beq _0806D092 - ldr r2, _0806D098 @ =gUnknown_2036E38 + ldr r2, _0806D098 @ =gMapObjects lsls r1, r5, 3 adds r0, r1, r5 lsls r0, 2 @@ -1031,7 +1031,7 @@ _0806D078: bne _0806D0A0 adds r0, r6, r5 lsls r0, 2 - ldr r1, _0806D098 @ =gUnknown_2036E38 + ldr r1, _0806D098 @ =gMapObjects adds r0, r1 bl FieldObjectCheckIfSpecialAnimFinishedOrInactive lsls r0, 24 @@ -1041,13 +1041,13 @@ _0806D092: movs r0, 0 b _0806D0C8 .align 2, 0 -_0806D098: .4byte gUnknown_2036E38 +_0806D098: .4byte gMapObjects _0806D09C: .4byte gUnknown_826D2D8 _0806D0A0: ldr r0, _0806D0D4 @ =gUnknown_3005074 strb r5, [r0] ldr r4, _0806D0D8 @ =gUnknown_20370D2 - ldr r1, _0806D0DC @ =gUnknown_2036E38 + ldr r1, _0806D0DC @ =gMapObjects adds r0, r6, r5 lsls r0, 2 adds r0, r1 @@ -1071,7 +1071,7 @@ _0806D0C8: .align 2, 0 _0806D0D4: .4byte gUnknown_3005074 _0806D0D8: .4byte gUnknown_20370D2 -_0806D0DC: .4byte gUnknown_2036E38 +_0806D0DC: .4byte gMapObjects _0806D0E0: .4byte gUnknown_20370D4 thumb_func_end sub_806CFF4 diff --git a/asm/field_effect.s b/asm/field_effect.s index 3a26b76e9..a72f6e6e6 100644 --- a/asm/field_effect.s +++ b/asm/field_effect.s @@ -2067,7 +2067,7 @@ mapldr_08084390: @ 8084390 ldr r0, _080843E8 @ =c3_080843F8 movs r1, 0 bl CreateTask - ldr r4, _080843EC @ =gUnknown_2036E38 + ldr r4, _080843EC @ =gMapObjects ldr r3, _080843F0 @ =gUnknown_2037078 ldrb r1, [r3, 0x5] lsls r0, r1, 3 @@ -2101,7 +2101,7 @@ _080843D2: bx r0 .align 2, 0 _080843E8: .4byte c3_080843F8 -_080843EC: .4byte gUnknown_2036E38 +_080843EC: .4byte gMapObjects _080843F0: .4byte gUnknown_2037078 _080843F4: .4byte gUnknown_3005020 thumb_func_end mapldr_08084390 @@ -2214,7 +2214,7 @@ sub_80844BC: @ 80844BC lsls r5, r0, 3 adds r5, r0 lsls r5, 2 - ldr r0, _0808455C @ =gUnknown_2036E38 + ldr r0, _0808455C @ =gMapObjects mov r8, r0 add r5, r8 ldrb r0, [r6, 0x4] @@ -2279,7 +2279,7 @@ sub_80844BC: @ 80844BC bx r1 .align 2, 0 _08084558: .4byte gUnknown_2037078 -_0808455C: .4byte gUnknown_2036E38 +_0808455C: .4byte gMapObjects _08084560: .4byte gSprites thumb_func_end sub_80844BC @@ -2331,7 +2331,7 @@ sub_8084580: @ 8084580 movs r0, 0x1 strh r0, [r5, 0xA] strh r1, [r5, 0xC] - ldr r2, _080845F0 @ =gUnknown_2036E38 + ldr r2, _080845F0 @ =gMapObjects ldrb r0, [r6, 0x5] lsls r1, r0, 3 adds r1, r0 @@ -2355,7 +2355,7 @@ sub_8084580: @ 8084580 _080845E4: .4byte gUnknown_2037078 _080845E8: .4byte gSprites _080845EC: .4byte gSpriteCoordOffsetY -_080845F0: .4byte gUnknown_2036E38 +_080845F0: .4byte gMapObjects thumb_func_end sub_8084580 thumb_func_start sub_80845F4 @@ -2367,7 +2367,7 @@ sub_80845F4: @ 80845F4 lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _080846A4 @ =gUnknown_2036E38 + ldr r1, _080846A4 @ =gMapObjects adds r6, r0, r1 ldrb r1, [r2, 0x4] lsls r0, r1, 4 @@ -2450,7 +2450,7 @@ _08084698: bx r1 .align 2, 0 _080846A0: .4byte gUnknown_2037078 -_080846A4: .4byte gUnknown_2036E38 +_080846A4: .4byte gMapObjects _080846A8: .4byte gSprites thumb_func_end sub_80845F4 @@ -2650,7 +2650,7 @@ sub_8084820: @ 8084820 lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _0808488C @ =gUnknown_2036E38 + ldr r1, _0808488C @ =gMapObjects adds r4, r0, r1 adds r0, r4, 0 bl FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive @@ -2693,7 +2693,7 @@ _0808487E: bx r1 .align 2, 0 _08084888: .4byte gUnknown_2037078 -_0808488C: .4byte gUnknown_2036E38 +_0808488C: .4byte gMapObjects thumb_func_end sub_8084820 thumb_func_start sub_8084890 @@ -2944,7 +2944,7 @@ sub_8084A5C: @ 8084A5C lsls r4, r0, 3 adds r4, r0 lsls r4, 2 - ldr r0, _08084AC0 @ =gUnknown_2036E38 + ldr r0, _08084AC0 @ =gMapObjects adds r4, r0 movs r0, 0x4 bl sub_8063EB8 @@ -2979,7 +2979,7 @@ sub_8084A5C: @ 8084A5C b _08084AC6 .align 2, 0 _08084ABC: .4byte gUnknown_2037078 -_08084AC0: .4byte gUnknown_2036E38 +_08084AC0: .4byte gMapObjects _08084AC4: movs r1, 0 _08084AC6: @@ -3189,7 +3189,7 @@ sub_8084C3C: @ 8084C3C lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _08084C98 @ =gUnknown_2036E38 + ldr r1, _08084C98 @ =gMapObjects adds r4, r0, r1 adds r0, r4, 0 bl FieldObjectClearAnimIfSpecialAnimFinished @@ -3220,7 +3220,7 @@ _08084C8A: bx r1 .align 2, 0 _08084C94: .4byte gUnknown_2037078 -_08084C98: .4byte gUnknown_2036E38 +_08084C98: .4byte gMapObjects _08084C9C: .4byte sub_8084A24 thumb_func_end sub_8084C3C @@ -3273,7 +3273,7 @@ _08084CEA: lsls r1, r0, 3 adds r1, r0 lsls r1, 2 - ldr r0, _08084D20 @ =gUnknown_2036E38 + ldr r0, _08084D20 @ =gMapObjects adds r1, r0 ldr r2, [r2] adds r0, r4, 0 @@ -3288,7 +3288,7 @@ _08084CEA: _08084D14: .4byte gUnknown_83CC084 _08084D18: .4byte gTasks _08084D1C: .4byte gUnknown_2037078 -_08084D20: .4byte gUnknown_2036E38 +_08084D20: .4byte gMapObjects thumb_func_end sub_8084CD8 thumb_func_start sub_8084D24 @@ -3537,7 +3537,7 @@ dive_3_unknown: @ 8084ED4 lsls r0, 24 cmp r0, 0 bne _08084F18 - ldr r2, _08084F20 @ =gUnknown_2036E38 + ldr r2, _08084F20 @ =gMapObjects ldr r0, _08084F24 @ =gUnknown_2037078 ldrb r1, [r0, 0x5] lsls r0, r1, 3 @@ -3560,7 +3560,7 @@ _08084F18: pop {r1} bx r1 .align 2, 0 -_08084F20: .4byte gUnknown_2036E38 +_08084F20: .4byte gMapObjects _08084F24: .4byte gUnknown_2037078 _08084F28: .4byte sub_8084E60 thumb_func_end dive_3_unknown @@ -3600,7 +3600,7 @@ _08084F58: lsls r1, r0, 3 adds r1, r0 lsls r1, 2 - ldr r0, _08084F98 @ =gUnknown_2036E38 + ldr r0, _08084F98 @ =gMapObjects adds r1, r0 ldrb r0, [r5, 0x4] lsls r2, r0, 4 @@ -3621,7 +3621,7 @@ _08084F58: _08084F8C: .4byte gUnknown_83CC0A4 _08084F90: .4byte gTasks _08084F94: .4byte gUnknown_2037078 -_08084F98: .4byte gUnknown_2036E38 +_08084F98: .4byte gMapObjects _08084F9C: .4byte gSprites thumb_func_end sub_8084F44 @@ -3946,7 +3946,7 @@ _080851FC: lsls r1, r0, 3 adds r1, r0 lsls r1, 2 - ldr r0, _0808523C @ =gUnknown_2036E38 + ldr r0, _0808523C @ =gMapObjects adds r1, r0 ldrb r0, [r5, 0x4] lsls r2, r0, 4 @@ -3967,7 +3967,7 @@ _080851FC: _08085230: .4byte gUnknown_83CC0BC _08085234: .4byte gTasks _08085238: .4byte gUnknown_2037078 -_0808523C: .4byte gUnknown_2036E38 +_0808523C: .4byte gMapObjects _08085240: .4byte gSprites thumb_func_end sub_80851E8 @@ -4209,7 +4209,7 @@ _080853F8: lsls r1, r0, 3 adds r1, r0 lsls r1, 2 - ldr r0, _08085438 @ =gUnknown_2036E38 + ldr r0, _08085438 @ =gMapObjects adds r1, r0 ldrb r0, [r5, 0x4] lsls r2, r0, 4 @@ -4230,7 +4230,7 @@ _080853F8: _0808542C: .4byte gUnknown_83CC0CC _08085430: .4byte gTasks _08085434: .4byte gUnknown_2037078 -_08085438: .4byte gUnknown_2036E38 +_08085438: .4byte gMapObjects _0808543C: .4byte gSprites thumb_func_end sub_80853E4 @@ -4546,7 +4546,7 @@ sub_8085690: @ 8085690 lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _080856D8 @ =gUnknown_2036E38 + ldr r1, _080856D8 @ =gMapObjects adds r6, r0, r1 adds r4, r5, 0 adds r4, 0x8 @@ -4572,7 +4572,7 @@ sub_8085690: @ 8085690 b _08085702 .align 2, 0 _080856D4: .4byte gUnknown_2037078 -_080856D8: .4byte gUnknown_2036E38 +_080856D8: .4byte gMapObjects _080856DC: movs r1, 0x8 ldrsh r0, [r4, r1] @@ -4973,7 +4973,7 @@ sub_80859D4: @ 80859D4 ldr r1, _08085A14 @ =gUnknown_3005020 movs r0, 0 str r0, [r1] - ldr r2, _08085A18 @ =gUnknown_2036E38 + ldr r2, _08085A18 @ =gMapObjects ldr r0, _08085A1C @ =gUnknown_2037078 ldrb r1, [r0, 0x5] lsls r0, r1, 3 @@ -4991,7 +4991,7 @@ sub_80859D4: @ 80859D4 bx r0 .align 2, 0 _08085A14: .4byte gUnknown_3005020 -_08085A18: .4byte gUnknown_2036E38 +_08085A18: .4byte gMapObjects _08085A1C: .4byte gUnknown_2037078 _08085A20: .4byte sub_8085A24 thumb_func_end sub_80859D4 @@ -5056,7 +5056,7 @@ sub_8085A80: @ 8085A80 lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _08085AD8 @ =gUnknown_2036E38 + ldr r1, _08085AD8 @ =gMapObjects adds r6, r0, r1 adds r1, r4, 0 adds r1, 0xA @@ -5088,7 +5088,7 @@ sub_8085A80: @ 8085A80 b _08085B10 .align 2, 0 _08085AD4: .4byte gUnknown_2037078 -_08085AD8: .4byte gUnknown_2036E38 +_08085AD8: .4byte gMapObjects _08085ADC: movs r2, 0xE ldrsh r0, [r5, r2] @@ -5226,7 +5226,7 @@ sub_8085BD0: @ 8085BD0 lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _08085C5C @ =gUnknown_2036E38 + ldr r1, _08085C5C @ =gMapObjects adds r5, r0, r1 ldrh r1, [r4, 0xA] movs r2, 0xA @@ -5282,7 +5282,7 @@ _08085C4A: .align 2, 0 _08085C54: .4byte gUnknown_83CC108 _08085C58: .4byte gUnknown_2037078 -_08085C5C: .4byte gUnknown_2036E38 +_08085C5C: .4byte gMapObjects thumb_func_end sub_8085BD0 thumb_func_start sub_8085C60 @@ -5299,7 +5299,7 @@ sub_8085C60: @ 8085C60 lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _08085D2C @ =gUnknown_2036E38 + ldr r1, _08085D2C @ =gMapObjects adds r3, r0, r1 ldrb r1, [r2, 0x4] lsls r0, r1, 4 @@ -5387,7 +5387,7 @@ _08085D1A: .align 2, 0 _08085D24: .4byte gUnknown_83CC108 _08085D28: .4byte gUnknown_2037078 -_08085D2C: .4byte gUnknown_2036E38 +_08085D2C: .4byte gMapObjects _08085D30: .4byte gSprites thumb_func_end sub_8085C60 @@ -5439,7 +5439,7 @@ mapldr_08085D88: @ 8085D88 ldr r1, _08085DCC @ =gUnknown_3005020 movs r0, 0 str r0, [r1] - ldr r2, _08085DD0 @ =gUnknown_2036E38 + ldr r2, _08085DD0 @ =gMapObjects ldr r0, _08085DD4 @ =gUnknown_2037078 ldrb r1, [r0, 0x5] lsls r0, r1, 3 @@ -5458,7 +5458,7 @@ mapldr_08085D88: @ 8085D88 bx r0 .align 2, 0 _08085DCC: .4byte gUnknown_3005020 -_08085DD0: .4byte gUnknown_2036E38 +_08085DD0: .4byte gMapObjects _08085DD4: .4byte gUnknown_2037078 _08085DD8: .4byte sub_8085DDC thumb_func_end mapldr_08085D88 @@ -5518,7 +5518,7 @@ sub_8085E0C: @ 8085E0C adds r0, r1 negs r0, r0 strh r0, [r2, 0x26] - ldr r3, _08085E94 @ =gUnknown_2036E38 + ldr r3, _08085E94 @ =gMapObjects ldrb r0, [r5, 0x5] lsls r1, r0, 3 adds r1, r0 @@ -5554,7 +5554,7 @@ _08085E82: _08085E88: .4byte gUnknown_2037078 _08085E8C: .4byte gSprites _08085E90: .4byte gSpriteCoordOffsetY -_08085E94: .4byte gUnknown_2036E38 +_08085E94: .4byte gMapObjects thumb_func_end sub_8085E0C thumb_func_start sub_8085E98 @@ -5571,7 +5571,7 @@ sub_8085E98: @ 8085E98 lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _08085F08 @ =gUnknown_2036E38 + ldr r1, _08085F08 @ =gMapObjects adds r6, r0, r1 ldrb r1, [r2, 0x4] lsls r0, r1, 4 @@ -5613,7 +5613,7 @@ sub_8085E98: @ 8085E98 .align 2, 0 _08085F00: .4byte gUnknown_83CC108 _08085F04: .4byte gUnknown_2037078 -_08085F08: .4byte gUnknown_2036E38 +_08085F08: .4byte gMapObjects _08085F0C: .4byte gSprites _08085F10: ldrb r1, [r5, 0x5] @@ -5704,7 +5704,7 @@ sub_8085F9C: @ 8085F9C lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _08086020 @ =gUnknown_2036E38 + ldr r1, _08086020 @ =gMapObjects adds r5, r0, r1 ldrh r0, [r4, 0xA] subs r0, 0x1 @@ -5751,7 +5751,7 @@ _08086010: .align 2, 0 _08086018: .4byte gUnknown_83CC108 _0808601C: .4byte gUnknown_2037078 -_08086020: .4byte gUnknown_2036E38 +_08086020: .4byte gMapObjects _08086024: .4byte sub_8085DDC thumb_func_end sub_8085F9C @@ -7014,7 +7014,7 @@ sub_80869C0: @ 80869C0 adds r0, r6, 0 mov r1, r8 bl PlayerGetDestCoords - ldr r2, _08086A1C @ =gUnknown_2036E38 + ldr r2, _08086A1C @ =gMapObjects ldrb r1, [r5, 0x5] lsls r0, r1, 3 adds r0, r1 @@ -7035,7 +7035,7 @@ sub_80869C0: @ 80869C0 bx r0 .align 2, 0 _08086A18: .4byte gUnknown_2037078 -_08086A1C: .4byte gUnknown_2036E38 +_08086A1C: .4byte gMapObjects thumb_func_end sub_80869C0 thumb_func_start sub_8086A20 @@ -7047,7 +7047,7 @@ sub_8086A20: @ 8086A20 lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _08086A68 @ =gUnknown_2036E38 + ldr r1, _08086A68 @ =gMapObjects adds r4, r0, r1 adds r0, r4, 0 bl FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive @@ -7073,7 +7073,7 @@ _08086A5C: bx r0 .align 2, 0 _08086A64: .4byte gUnknown_2037078 -_08086A68: .4byte gUnknown_2036E38 +_08086A68: .4byte gMapObjects thumb_func_end sub_8086A20 thumb_func_start sub_8086A6C @@ -7085,7 +7085,7 @@ sub_8086A6C: @ 8086A6C lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _08086AAC @ =gUnknown_2036E38 + ldr r1, _08086AAC @ =gMapObjects adds r0, r1 bl FieldObjectCheckIfSpecialAnimFinishedOrInactive lsls r0, 24 @@ -7109,7 +7109,7 @@ _08086AA2: bx r0 .align 2, 0 _08086AA8: .4byte gUnknown_2037078 -_08086AAC: .4byte gUnknown_2036E38 +_08086AAC: .4byte gMapObjects _08086AB0: .4byte gUnknown_20386E0 thumb_func_end sub_8086A6C @@ -7127,7 +7127,7 @@ sub_8086AB4: @ 8086AB4 lsls r4, r0, 3 adds r4, r0 lsls r4, 2 - ldr r0, _08086B28 @ =gUnknown_2036E38 + ldr r0, _08086B28 @ =gMapObjects adds r4, r0 movs r0, 0x2 bl sub_805C808 @@ -7167,7 +7167,7 @@ _08086B1E: bx r0 .align 2, 0 _08086B24: .4byte gUnknown_2037078 -_08086B28: .4byte gUnknown_2036E38 +_08086B28: .4byte gMapObjects _08086B2C: .4byte gUnknown_20386E0 thumb_func_end sub_8086AB4 @@ -7179,7 +7179,7 @@ sub_8086B30: @ 8086B30 lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _08086BA0 @ =gUnknown_2036E38 + ldr r1, _08086BA0 @ =gMapObjects adds r4, r0, r1 adds r0, r4, 0 bl FieldObjectClearAnimIfSpecialAnimFinished @@ -7220,7 +7220,7 @@ _08086B96: bx r0 .align 2, 0 _08086B9C: .4byte gUnknown_2037078 -_08086BA0: .4byte gUnknown_2036E38 +_08086BA0: .4byte gMapObjects _08086BA4: .4byte sub_8086990 thumb_func_end sub_8086B30 @@ -7299,7 +7299,7 @@ sub_8086C24: @ 8086C24 lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _08086C6C @ =gUnknown_2036E38 + ldr r1, _08086C6C @ =gMapObjects adds r4, r0, r1 adds r0, r4, 0 bl FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive @@ -7325,7 +7325,7 @@ _08086C60: bx r0 .align 2, 0 _08086C68: .4byte gUnknown_2037078 -_08086C6C: .4byte gUnknown_2036E38 +_08086C6C: .4byte gMapObjects thumb_func_end sub_8086C24 thumb_func_start sub_8086C70 @@ -7337,7 +7337,7 @@ sub_8086C70: @ 8086C70 lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _08086CA0 @ =gUnknown_2036E38 + ldr r1, _08086CA0 @ =gMapObjects adds r4, r0, r1 adds r0, r4, 0 bl FieldObjectClearAnimIfSpecialAnimFinished @@ -7353,7 +7353,7 @@ sub_8086C70: @ 8086C70 b _08086CAE .align 2, 0 _08086C9C: .4byte gUnknown_2037078 -_08086CA0: .4byte gUnknown_2036E38 +_08086CA0: .4byte gMapObjects _08086CA4: movs r0, 0x8 ands r0, r1 @@ -7403,7 +7403,7 @@ sub_8086CF4: @ 8086CF4 lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _08086D30 @ =gUnknown_2036E38 + ldr r1, _08086D30 @ =gMapObjects adds r0, r1 bl FieldObjectClearAnimIfSpecialAnimFinished lsls r0, 24 @@ -7424,7 +7424,7 @@ _08086D26: bx r0 .align 2, 0 _08086D2C: .4byte gUnknown_2037078 -_08086D30: .4byte gUnknown_2036E38 +_08086D30: .4byte gMapObjects _08086D34: .4byte sub_8086BD0 thumb_func_end sub_8086CF4 @@ -7596,7 +7596,7 @@ sub_8086E70: @ 8086E70 lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _08086EC4 @ =gUnknown_2036E38 + ldr r1, _08086EC4 @ =gMapObjects adds r4, r0, r1 adds r0, r4, 0 bl FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive @@ -7627,7 +7627,7 @@ _08086EB8: bx r0 .align 2, 0 _08086EC0: .4byte gUnknown_2037078 -_08086EC4: .4byte gUnknown_2036E38 +_08086EC4: .4byte gMapObjects thumb_func_end sub_8086E70 thumb_func_start sub_8086EC8 @@ -7639,7 +7639,7 @@ sub_8086EC8: @ 8086EC8 lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _08086F04 @ =gUnknown_2036E38 + ldr r1, _08086F04 @ =gMapObjects adds r0, r1 bl FieldObjectClearAnimIfSpecialAnimFinished lsls r0, 24 @@ -7660,7 +7660,7 @@ _08086EF8: bx r0 .align 2, 0 _08086F00: .4byte gUnknown_2037078 -_08086F04: .4byte gUnknown_2036E38 +_08086F04: .4byte gMapObjects _08086F08: .4byte gUnknown_20386E0 thumb_func_end sub_8086EC8 @@ -7678,7 +7678,7 @@ sub_8086F0C: @ 8086F0C lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _08086F60 @ =gUnknown_2036E38 + ldr r1, _08086F60 @ =gMapObjects adds r5, r0, r1 ldrh r1, [r4, 0x26] movs r0, 0x8 @@ -7705,7 +7705,7 @@ _08086F54: bx r0 .align 2, 0 _08086F5C: .4byte gUnknown_2037078 -_08086F60: .4byte gUnknown_2036E38 +_08086F60: .4byte gMapObjects thumb_func_end sub_8086F0C thumb_func_start sub_8086F64 @@ -7729,7 +7729,7 @@ sub_8086F64: @ 8086F64 lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _08086FA4 @ =gUnknown_2036E38 + ldr r1, _08086FA4 @ =gMapObjects adds r0, r1 movs r1, 0x2 bl sub_8063CA4 @@ -7739,7 +7739,7 @@ _08086F98: bx r0 .align 2, 0 _08086FA0: .4byte gUnknown_2037078 -_08086FA4: .4byte gUnknown_2036E38 +_08086FA4: .4byte gMapObjects thumb_func_end sub_8086F64 thumb_func_start sub_8086FA8 @@ -7751,7 +7751,7 @@ sub_8086FA8: @ 8086FA8 lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _08086FF8 @ =gUnknown_2036E38 + ldr r1, _08086FF8 @ =gMapObjects adds r2, r0, r1 ldrh r1, [r4, 0xC] movs r3, 0xC @@ -7782,7 +7782,7 @@ _08086FEC: bx r0 .align 2, 0 _08086FF4: .4byte gUnknown_2037078 -_08086FF8: .4byte gUnknown_2036E38 +_08086FF8: .4byte gMapObjects thumb_func_end sub_8086FA8 thumb_func_start sub_8086FFC @@ -7801,7 +7801,7 @@ sub_8086FFC: @ 8086FFC lsls r4, r0, 3 adds r4, r0 lsls r4, 2 - ldr r0, _08087064 @ =gUnknown_2036E38 + ldr r0, _08087064 @ =gMapObjects adds r4, r0 movs r0, 0x2 bl sub_805C808 @@ -7836,7 +7836,7 @@ _0808705A: bx r0 .align 2, 0 _08087060: .4byte gUnknown_2037078 -_08087064: .4byte gUnknown_2036E38 +_08087064: .4byte gMapObjects _08087068: .4byte gSprites thumb_func_end sub_8086FFC @@ -7856,7 +7856,7 @@ sub_808706C: @ 808706C lsls r4, r0, 3 adds r4, r0 lsls r4, 2 - ldr r0, _08087108 @ =gUnknown_2036E38 + ldr r0, _08087108 @ =gMapObjects adds r4, r0 adds r0, r4, 0 bl FieldObjectClearAnimIfSpecialAnimActive @@ -7915,7 +7915,7 @@ _080870FC: bx r0 .align 2, 0 _08087104: .4byte gUnknown_2037078 -_08087108: .4byte gUnknown_2036E38 +_08087108: .4byte gMapObjects _0808710C: .4byte gSprites _08087110: .4byte gSaveBlock2Ptr _08087114: .4byte sub_8087828 @@ -8430,7 +8430,7 @@ sub_80874C8: @ 80874C8 lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _080875B8 @ =gUnknown_2036E38 + ldr r1, _080875B8 @ =gMapObjects adds r5, r0, r1 adds r0, r5, 0 bl FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive @@ -8532,7 +8532,7 @@ _080875AE: bx r0 .align 2, 0 _080875B4: .4byte gUnknown_2037078 -_080875B8: .4byte gUnknown_2036E38 +_080875B8: .4byte gMapObjects _080875BC: .4byte gSprites _080875C0: .4byte gSaveBlock2Ptr _080875C4: .4byte sub_8087828 @@ -8566,7 +8566,7 @@ _080875F2: lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _08087640 @ =gUnknown_2036E38 + ldr r1, _08087640 @ =gMapObjects adds r0, r1 ldrb r0, [r0, 0x4] lsls r4, r0, 4 @@ -8598,7 +8598,7 @@ _08087630: .align 2, 0 _08087638: .4byte gSprites _0808763C: .4byte gUnknown_2037078 -_08087640: .4byte gUnknown_2036E38 +_08087640: .4byte gMapObjects thumb_func_end sub_80875C8 thumb_func_start sub_8087644 @@ -8658,7 +8658,7 @@ sub_8087698: @ 8087698 lsls r5, r0, 3 adds r5, r0 lsls r5, 2 - ldr r0, _08087708 @ =gUnknown_2036E38 + ldr r0, _08087708 @ =gMapObjects adds r5, r0 ldrb r0, [r5, 0x4] lsls r4, r0, 4 @@ -8698,7 +8698,7 @@ _080876FC: bx r0 .align 2, 0 _08087704: .4byte gUnknown_2037078 -_08087708: .4byte gUnknown_2036E38 +_08087708: .4byte gMapObjects _0808770C: .4byte gSprites thumb_func_end sub_8087698 @@ -8711,7 +8711,7 @@ sub_8087710: @ 8087710 lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _08087744 @ =gUnknown_2036E38 + ldr r1, _08087744 @ =gMapObjects adds r0, r1 bl FieldObjectClearAnimIfSpecialAnimFinished lsls r0, 24 @@ -8728,7 +8728,7 @@ _08087738: bx r0 .align 2, 0 _08087740: .4byte gUnknown_2037078 -_08087744: .4byte gUnknown_2036E38 +_08087744: .4byte gMapObjects thumb_func_end sub_8087710 thumb_func_start sub_8087748 @@ -8776,7 +8776,7 @@ fishE: @ 8087780 lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _080877F4 @ =gUnknown_2036E38 + ldr r1, _080877F4 @ =gMapObjects adds r4, r0, r1 movs r7, 0 ldrh r1, [r5, 0x26] @@ -8816,7 +8816,7 @@ _080877EA: bx r0 .align 2, 0 _080877F0: .4byte gUnknown_2037078 -_080877F4: .4byte gUnknown_2036E38 +_080877F4: .4byte gMapObjects _080877F8: .4byte sub_8087498 thumb_func_end fishE @@ -8991,7 +8991,7 @@ sub_8087924: @ 8087924 lsls r4, r0, 3 adds r4, r0 lsls r4, 2 - ldr r0, _080879C8 @ =gUnknown_2036E38 + ldr r0, _080879C8 @ =gMapObjects adds r4, r0 movs r0, 0x10 ldrsh r5, [r4, r0] @@ -9055,7 +9055,7 @@ _080879BA: bx r1 .align 2, 0 _080879C4: .4byte gUnknown_20386E0 -_080879C8: .4byte gUnknown_2036E38 +_080879C8: .4byte gMapObjects _080879CC: .4byte sub_80879D8 _080879D0: .4byte gTasks _080879D4: .4byte gSprites @@ -9148,7 +9148,7 @@ _08087A78: lsls r4, r0, 3 adds r4, r0 lsls r4, 2 - ldr r0, _08087AB0 @ =gUnknown_2036E38 + ldr r0, _08087AB0 @ =gMapObjects adds r4, r0 ldrh r0, [r5, 0x4] strh r0, [r6, 0x20] @@ -9169,7 +9169,7 @@ _08087AA8: pop {r0} bx r0 .align 2, 0 -_08087AB0: .4byte gUnknown_2036E38 +_08087AB0: .4byte gMapObjects thumb_func_end sub_80879D8 thumb_func_start sub_8087AB4 @@ -9381,7 +9381,7 @@ sub_8087C2C: @ 8087C2C asrs r0, 16 cmp r0, 0x78 ble _08087C9A - ldr r2, _08087CA4 @ =gUnknown_2036E38 + ldr r2, _08087CA4 @ =gMapObjects movs r1, 0x4 ldrsh r0, [r7, r1] lsls r1, r0, 3 @@ -9427,7 +9427,7 @@ _08087C9A: pop {r0} bx r0 .align 2, 0 -_08087CA4: .4byte gUnknown_2036E38 +_08087CA4: .4byte gMapObjects _08087CA8: .4byte gSprites _08087CAC: .4byte 0x0000ffff _08087CB0: .4byte 0x00007fff diff --git a/asm/field_effect_helpers.s b/asm/field_effect_helpers.s index a26978dfd..dfdc880fb 100644 --- a/asm/field_effect_helpers.s +++ b/asm/field_effect_helpers.s @@ -253,7 +253,7 @@ sub_80DAF50: @ 80DAF50 lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _080DAF98 @ =gUnknown_2036E38 + ldr r1, _080DAF98 @ =gMapObjects adds r7, r0, r1 ldrb r1, [r7, 0x4] lsls r0, r1, 4 @@ -281,7 +281,7 @@ _080DAF88: strb r0, [r2] b _080DB0AE .align 2, 0 -_080DAF98: .4byte gUnknown_2036E38 +_080DAF98: .4byte gMapObjects _080DAF9C: .4byte gSprites _080DAFA0: .4byte 0x00020001 _080DAFA4: @@ -587,7 +587,7 @@ oei_shadow: @ 80DB1DC bl GetFieldObjectIdByLocalIdAndMap lsls r0, 24 lsrs r0, 24 - ldr r2, _080DB26C @ =gUnknown_2036E38 + ldr r2, _080DB26C @ =gMapObjects lsls r1, r0, 3 adds r1, r0 lsls r1, 2 @@ -649,7 +649,7 @@ _080DB260: bx r1 .align 2, 0 _080DB268: .4byte gUnknown_20386E0 -_080DB26C: .4byte gUnknown_2036E38 +_080DB26C: .4byte gMapObjects _080DB270: .4byte gUnknown_83A0010 _080DB274: .4byte gUnknown_83FECD2 _080DB278: .4byte gSprites @@ -685,7 +685,7 @@ _080DB2AE: lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _080DB33C @ =gUnknown_2036E38 + ldr r1, _080DB33C @ =gMapObjects adds r4, r0, r1 ldrb r0, [r4, 0x4] lsls r1, r0, 4 @@ -748,7 +748,7 @@ _080DB334: pop {r0} bx r0 .align 2, 0 -_080DB33C: .4byte gUnknown_2036E38 +_080DB33C: .4byte gMapObjects _080DB340: .4byte gSprites _080DB344: .4byte 0x00400001 thumb_func_end oamc_shadow @@ -929,7 +929,7 @@ _080DB4A0: lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _080DB4F0 @ =gUnknown_2036E38 + ldr r1, _080DB4F0 @ =gMapObjects adds r2, r0, r1 ldr r0, [r2, 0x10] ldr r1, [r5, 0x30] @@ -966,7 +966,7 @@ _080DB4E4: pop {r0} bx r0 .align 2, 0 -_080DB4F0: .4byte gUnknown_2036E38 +_080DB4F0: .4byte gMapObjects thumb_func_end unc_grass_normal thumb_func_start FldEff_JumpTallGrass @@ -1280,7 +1280,7 @@ _080DB750: lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _080DB794 @ =gUnknown_2036E38 + ldr r1, _080DB794 @ =gMapObjects adds r2, r0, r1 ldr r0, [r2, 0x10] ldr r1, [r5, 0x30] @@ -1309,7 +1309,7 @@ _080DB786: pop {r0} bx r0 .align 2, 0 -_080DB794: .4byte gUnknown_2036E38 +_080DB794: .4byte gMapObjects thumb_func_end unc_grass_tall thumb_func_start FldEff_JumpLongGrass @@ -1382,7 +1382,7 @@ sub_80DB808: @ 80DB808 lsls r1, r0, 3 adds r1, r0 lsls r1, 2 - ldr r0, _080DB8A0 @ =gUnknown_2036E38 + ldr r0, _080DB8A0 @ =gMapObjects adds r5, r1, r0 ldr r0, _080DB8A4 @ =gUnknown_83A0010 ldr r0, [r0, 0x78] @@ -1446,7 +1446,7 @@ _080DB894: bx r1 .align 2, 0 _080DB89C: .4byte gUnknown_20386E0 -_080DB8A0: .4byte gUnknown_2036E38 +_080DB8A0: .4byte gMapObjects _080DB8A4: .4byte gUnknown_83A0010 _080DB8A8: .4byte gSprites thumb_func_end sub_80DB808 @@ -1472,7 +1472,7 @@ sub_80DB8AC: @ 80DB8AC lsls r0, 24 cmp r0, 0 bne _080DB8EA - ldr r5, _080DB8F4 @ =gUnknown_2036E38 + ldr r5, _080DB8F4 @ =gMapObjects mov r0, sp ldrb r1, [r0] lsls r0, r1, 3 @@ -1489,7 +1489,7 @@ _080DB8EA: bl FieldEffectStop b _080DB98E .align 2, 0 -_080DB8F4: .4byte gUnknown_2036E38 +_080DB8F4: .4byte gMapObjects _080DB8F8: ldrb r0, [r1, 0x5] bl GetFieldObjectGraphicsInfo @@ -1839,7 +1839,7 @@ FldEff_Splash: @ 80DBB88 lsls r1, r0, 3 adds r1, r0 lsls r1, 2 - ldr r0, _080DBC20 @ =gUnknown_2036E38 + ldr r0, _080DBC20 @ =gMapObjects adds r5, r1, r0 ldr r0, _080DBC24 @ =gUnknown_83A0010 ldr r0, [r0, 0x34] @@ -1900,7 +1900,7 @@ _080DBC12: bx r1 .align 2, 0 _080DBC1C: .4byte gUnknown_20386E0 -_080DBC20: .4byte gUnknown_2036E38 +_080DBC20: .4byte gMapObjects _080DBC24: .4byte gUnknown_83A0010 _080DBC28: .4byte gSprites thumb_func_end FldEff_Splash @@ -1937,7 +1937,7 @@ _080DBC5C: b _080DBCA6 _080DBC66: ldr r3, _080DBCB0 @ =gSprites - ldr r2, _080DBCB4 @ =gUnknown_2036E38 + ldr r2, _080DBCB4 @ =gMapObjects mov r0, sp ldrb r1, [r0] lsls r0, r1, 3 @@ -1974,7 +1974,7 @@ _080DBCA6: bx r0 .align 2, 0 _080DBCB0: .4byte gSprites -_080DBCB4: .4byte gUnknown_2036E38 +_080DBCB4: .4byte gMapObjects thumb_func_end sub_80DBC2C thumb_func_start FldEff_JumpSmallSplash @@ -2104,7 +2104,7 @@ FldEff_FeetInFlowingWater: @ 80DBD98 lsls r1, r0, 3 adds r1, r0 lsls r1, 2 - ldr r0, _080DBE3C @ =gUnknown_2036E38 + ldr r0, _080DBE3C @ =gMapObjects adds r6, r1, r0 ldr r0, _080DBE40 @ =gUnknown_83A0010 ldr r0, [r0, 0x34] @@ -2171,7 +2171,7 @@ _080DBE2E: bx r1 .align 2, 0 _080DBE38: .4byte gUnknown_20386E0 -_080DBE3C: .4byte gUnknown_2036E38 +_080DBE3C: .4byte gMapObjects _080DBE40: .4byte gUnknown_83A0010 _080DBE44: .4byte gSprites _080DBE48: .4byte sub_80DBE50 @@ -2197,7 +2197,7 @@ sub_80DBE50: @ 80DBE50 lsls r0, 24 cmp r0, 0 bne _080DBE8A - ldr r2, _080DBE94 @ =gUnknown_2036E38 + ldr r2, _080DBE94 @ =gMapObjects mov r0, sp ldrb r1, [r0] lsls r0, r1, 3 @@ -2214,7 +2214,7 @@ _080DBE8A: bl FieldEffectStop b _080DBEE2 .align 2, 0 -_080DBE94: .4byte gUnknown_2036E38 +_080DBE94: .4byte gMapObjects _080DBE98: ldrb r1, [r5, 0x4] lsls r0, r1, 4 @@ -2323,7 +2323,7 @@ sub_80DBF50: @ 80DBF50 lsls r1, r0, 3 adds r1, r0 lsls r1, 2 - ldr r0, _080DBFE8 @ =gUnknown_2036E38 + ldr r0, _080DBFE8 @ =gMapObjects adds r5, r1, r0 ldr r0, _080DBFEC @ =gUnknown_83A0010 ldr r0, [r0, 0x7C] @@ -2387,7 +2387,7 @@ _080DBFDC: bx r1 .align 2, 0 _080DBFE4: .4byte gUnknown_20386E0 -_080DBFE8: .4byte gUnknown_2036E38 +_080DBFE8: .4byte gMapObjects _080DBFEC: .4byte gUnknown_83A0010 _080DBFF0: .4byte gSprites thumb_func_end sub_80DBF50 @@ -2411,7 +2411,7 @@ sub_80DBFF4: @ 80DBFF4 lsls r0, 24 cmp r0, 0 bne _080DC02E - ldr r5, _080DC038 @ =gUnknown_2036E38 + ldr r5, _080DC038 @ =gMapObjects mov r0, sp ldrb r1, [r0] lsls r0, r1, 3 @@ -2428,7 +2428,7 @@ _080DC02E: bl FieldEffectStop b _080DC080 .align 2, 0 -_080DC038: .4byte gUnknown_2036E38 +_080DC038: .4byte gMapObjects _080DC03C: ldrb r0, [r1, 0x5] bl GetFieldObjectGraphicsInfo @@ -2863,7 +2863,7 @@ sub_80DC348: @ 80DC348 movs r2, 0x32 ldrsh r1, [r4, r2] bl CurrentMapDrawMetatileAt - ldr r2, _080DC3A0 @ =gUnknown_2036E38 + ldr r2, _080DC3A0 @ =gMapObjects ldr r0, _080DC3A4 @ =gUnknown_2037078 ldrb r1, [r0, 0x5] lsls r0, r1, 3 @@ -2880,7 +2880,7 @@ sub_80DC348: @ 80DC348 pop {r0} bx r0 .align 2, 0 -_080DC3A0: .4byte gUnknown_2036E38 +_080DC3A0: .4byte gMapObjects _080DC3A4: .4byte gUnknown_2037078 thumb_func_end sub_80DC348 @@ -3081,7 +3081,7 @@ sub_80DC4F8: @ 80DC4F8 lsls r4, r0, 3 adds r4, r0 lsls r4, 2 - ldr r0, _080DC548 @ =gUnknown_2036E38 + ldr r0, _080DC548 @ =gMapObjects adds r4, r0 ldrb r0, [r4, 0x4] lsls r5, r0, 4 @@ -3112,7 +3112,7 @@ sub_80DC4F8: @ 80DC4F8 pop {r0} bx r0 .align 2, 0 -_080DC548: .4byte gUnknown_2036E38 +_080DC548: .4byte gMapObjects _080DC54C: .4byte gSprites thumb_func_end sub_80DC4F8 @@ -3454,7 +3454,7 @@ FldEff_SandPile: @ 80DC7B0 lsls r1, r0, 3 adds r1, r0 lsls r1, 2 - ldr r0, _080DC860 @ =gUnknown_2036E38 + ldr r0, _080DC860 @ =gMapObjects adds r6, r1, r0 ldr r0, _080DC864 @ =gUnknown_83A0010 ldr r0, [r0, 0x74] @@ -3528,7 +3528,7 @@ _080DC854: bx r1 .align 2, 0 _080DC85C: .4byte gUnknown_20386E0 -_080DC860: .4byte gUnknown_2036E38 +_080DC860: .4byte gMapObjects _080DC864: .4byte gUnknown_83A0010 _080DC868: .4byte gSprites thumb_func_end FldEff_SandPile @@ -3552,7 +3552,7 @@ sub_80DC86C: @ 80DC86C lsls r0, 24 cmp r0, 0 bne _080DC8A6 - ldr r2, _080DC8B0 @ =gUnknown_2036E38 + ldr r2, _080DC8B0 @ =gMapObjects mov r0, sp ldrb r1, [r0] lsls r0, r1, 3 @@ -3569,7 +3569,7 @@ _080DC8A6: bl FieldEffectStop b _080DC926 .align 2, 0 -_080DC8B0: .4byte gUnknown_2036E38 +_080DC8B0: .4byte gMapObjects _080DC8B4: ldr r2, _080DC930 @ =gSprites ldrb r1, [r1, 0x4] @@ -3608,7 +3608,7 @@ _080DC8F6: strh r6, [r4, 0x20] strh r5, [r4, 0x22] ldr r3, _080DC930 @ =gSprites - ldr r2, _080DC934 @ =gUnknown_2036E38 + ldr r2, _080DC934 @ =gMapObjects mov r0, sp ldrb r1, [r0] lsls r0, r1, 3 @@ -3635,7 +3635,7 @@ _080DC926: bx r0 .align 2, 0 _080DC930: .4byte gSprites -_080DC934: .4byte gUnknown_2036E38 +_080DC934: .4byte gMapObjects thumb_func_end sub_80DC86C thumb_func_start FldEff_Bubbles @@ -3882,7 +3882,7 @@ sub_80DCAC8: @ 80DCAC8 adds r0, r5, 0 bl FieldEffectStop _080DCAF8: - ldr r4, _080DCBB0 @ =gUnknown_2036E38 + ldr r4, _080DCBB0 @ =gMapObjects mov r0, sp ldrb r1, [r0] lsls r0, r1, 3 @@ -3975,7 +3975,7 @@ _080DCBA8: pop {r0} bx r0 .align 2, 0 -_080DCBB0: .4byte gUnknown_2036E38 +_080DCBB0: .4byte gMapObjects _080DCBB4: .4byte gSprites thumb_func_end sub_80DCAC8 @@ -4217,7 +4217,7 @@ _080DCD5E: lsls r0, r7, 3 adds r0, r7 lsls r0, 2 - ldr r1, _080DCDF8 @ =gUnknown_2036E38 + ldr r1, _080DCDF8 @ =gMapObjects adds r4, r0, r1 ldrb r0, [r4] lsls r0, 31 @@ -4291,7 +4291,7 @@ _080DCDD8: strb r0, [r2] b _080DCE0A .align 2, 0 -_080DCDF8: .4byte gUnknown_2036E38 +_080DCDF8: .4byte gMapObjects _080DCDFC: .4byte gSprites _080DCE00: adds r0, r7, 0x1 diff --git a/asm/field_fadetransition.s b/asm/field_fadetransition.s index 6f1e42f48..231a3b123 100644 --- a/asm/field_fadetransition.s +++ b/asm/field_fadetransition.s @@ -727,7 +727,7 @@ _0807E0AE: lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _0807E0E8 @ =gUnknown_2036E38 + ldr r1, _0807E0E8 @ =gMapObjects adds r0, r1 movs r1, 0x10 bl sub_8063CA4 @@ -735,7 +735,7 @@ _0807E0AE: strh r0, [r4, 0x8] b _0807E206 .align 2, 0 -_0807E0E8: .4byte gUnknown_2036E38 +_0807E0E8: .4byte gMapObjects _0807E0EC: ldrh r0, [r4, 0x24] adds r0, 0x1 @@ -781,13 +781,13 @@ _0807E10E: lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _0807E15C @ =gUnknown_2036E38 + ldr r1, _0807E15C @ =gMapObjects adds r0, r1 bl FieldObjectClearAnimIfSpecialAnimFinished b _0807E1F2 .align 2, 0 _0807E158: .4byte sub_807F204 -_0807E15C: .4byte gUnknown_2036E38 +_0807E15C: .4byte gMapObjects _0807E160: bl sub_807E418 cmp r0, 0 @@ -804,7 +804,7 @@ _0807E160: lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _0807E194 @ =gUnknown_2036E38 + ldr r1, _0807E194 @ =gMapObjects adds r0, r1 movs r1, 0x10 bl sub_8063CA4 @@ -812,7 +812,7 @@ _0807E160: strh r0, [r4, 0x8] b _0807E206 .align 2, 0 -_0807E194: .4byte gUnknown_2036E38 +_0807E194: .4byte gMapObjects _0807E198: bl walkrun_is_standing_still lsls r0, 24 @@ -836,14 +836,14 @@ _0807E198: lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _0807E1D8 @ =gUnknown_2036E38 + ldr r1, _0807E1D8 @ =gMapObjects adds r0, r1 bl FieldObjectClearAnimIfSpecialAnimFinished movs r0, 0x3 strh r0, [r4, 0x8] b _0807E206 .align 2, 0 -_0807E1D8: .4byte gUnknown_2036E38 +_0807E1D8: .4byte gMapObjects _0807E1DC: movs r1, 0xA ldrsh r0, [r4, r1] @@ -927,7 +927,7 @@ _0807E25E: lsls r4, r0, 3 adds r4, r0 lsls r4, 2 - ldr r0, _0807E2A4 @ =gUnknown_2036E38 + ldr r0, _0807E2A4 @ =gMapObjects adds r4, r0 bl player_get_direction_lower_nybble lsls r0, 24 @@ -942,7 +942,7 @@ _0807E25E: strh r0, [r5, 0x8] b _0807E2C6 .align 2, 0 -_0807E2A4: .4byte gUnknown_2036E38 +_0807E2A4: .4byte gMapObjects _0807E2A8: bl walkrun_is_standing_still lsls r0, 24 @@ -1729,7 +1729,7 @@ _0807E8AE: lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r4, _0807E8F0 @ =gUnknown_2036E38 + ldr r4, _0807E8F0 @ =gMapObjects adds r0, r4 bl FieldObjectClearAnimIfSpecialAnimActive movs r0, 0xFF @@ -1749,7 +1749,7 @@ _0807E8AE: strh r0, [r5, 0x8] b _0807E976 .align 2, 0 -_0807E8F0: .4byte gUnknown_2036E38 +_0807E8F0: .4byte gMapObjects _0807E8F4: bl walkrun_is_standing_still lsls r0, 24 @@ -1774,7 +1774,7 @@ _0807E8F4: lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _0807E93C @ =gUnknown_2036E38 + ldr r1, _0807E93C @ =gMapObjects adds r0, r1 bl FieldObjectClearAnimIfSpecialAnimFinished movs r0, 0 @@ -1783,7 +1783,7 @@ _0807E8F4: strh r0, [r5, 0x8] b _0807E976 .align 2, 0 -_0807E93C: .4byte gUnknown_2036E38 +_0807E93C: .4byte gMapObjects _0807E940: movs r1, 0xA ldrsh r0, [r5, r1] @@ -1836,7 +1836,7 @@ sub_807E980: @ 807E980 lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _0807E9C8 @ =gUnknown_2036E38 + ldr r1, _0807E9C8 @ =gMapObjects adds r6, r0, r1 ldrb r1, [r2, 0x4] lsls r0, r1, 4 @@ -1856,7 +1856,7 @@ sub_807E980: @ 807E980 .align 2, 0 _0807E9C0: .4byte gTasks+0x8 _0807E9C4: .4byte gUnknown_2037078 -_0807E9C8: .4byte gUnknown_2036E38 +_0807E9C8: .4byte gMapObjects _0807E9CC: .4byte gSprites _0807E9D0: cmp r0, 0x2 @@ -1995,7 +1995,7 @@ sub_807EAC4: @ 807EAC4 lsls r0, r2, 3 adds r0, r2 lsls r0, 2 - ldr r2, _0807EB60 @ =gUnknown_2036E38 + ldr r2, _0807EB60 @ =gMapObjects adds r0, r2 mov r8, r0 lsls r1, 16 @@ -2051,7 +2051,7 @@ _0807EB4C: .align 2, 0 _0807EB58: .4byte gUnknown_2037078 _0807EB5C: .4byte gSprites -_0807EB60: .4byte gUnknown_2036E38 +_0807EB60: .4byte gMapObjects thumb_func_end sub_807EAC4 thumb_func_start sub_807EB64 @@ -2069,7 +2069,7 @@ sub_807EB64: @ 807EB64 lsls r4, r0, 3 adds r4, r0 lsls r4, 2 - ldr r0, _0807EBB8 @ =gUnknown_2036E38 + ldr r0, _0807EBB8 @ =gMapObjects adds r4, r0 bl player_get_direction_lower_nybble lsls r0, 24 @@ -2093,7 +2093,7 @@ sub_807EB64: @ 807EB64 bx r0 .align 2, 0 _0807EBB4: .4byte gUnknown_2037078 -_0807EBB8: .4byte gUnknown_2036E38 +_0807EBB8: .4byte gMapObjects thumb_func_end sub_807EB64 thumb_func_start sub_807EBBC @@ -2272,7 +2272,7 @@ _0807ED0C: lsls r4, r0, 3 adds r4, r0 lsls r4, 2 - ldr r0, _0807ED98 @ =gUnknown_2036E38 + ldr r0, _0807ED98 @ =gMapObjects adds r4, r0 adds r0, r1, 0 bl sub_8064270 @@ -2333,7 +2333,7 @@ _0807ED0C: bx r0 .align 2, 0 _0807ED94: .4byte gUnknown_2037078 -_0807ED98: .4byte gUnknown_2036E38 +_0807ED98: .4byte gMapObjects _0807ED9C: .4byte gSprites thumb_func_end sub_807ECBC diff --git a/asm/field_map_obj.s b/asm/field_map_obj.s index 068f9c554..84f023d19 100644 --- a/asm/field_map_obj.s +++ b/asm/field_map_obj.s @@ -28,7 +28,7 @@ npc_clear_ids_and_state: @ 805DE2C npcs_clear_ids_and_state: @ 805DE4C push {r4,r5,lr} movs r4, 0 - ldr r5, _0805DE70 @ =gUnknown_2036E38 + ldr r5, _0805DE70 @ =gMapObjects _0805DE52: lsls r0, r4, 3 adds r0, r4 @@ -44,7 +44,7 @@ _0805DE52: pop {r0} bx r0 .align 2, 0 -_0805DE70: .4byte gUnknown_2036E38 +_0805DE70: .4byte gMapObjects thumb_func_end npcs_clear_ids_and_state thumb_func_start sub_805DE74 @@ -141,11 +141,11 @@ _0805DF2C: .4byte gSprites sub_805DF30: @ 805DF30 push {lr} movs r1, 0 - ldr r2, _0805DF3C @ =gUnknown_2036E38 + ldr r2, _0805DF3C @ =gMapObjects ldrb r0, [r2] b _0805DF54 .align 2, 0 -_0805DF3C: .4byte gUnknown_2036E38 +_0805DF3C: .4byte gMapObjects _0805DF40: adds r0, r1, 0x1 lsls r0, 24 @@ -219,7 +219,7 @@ _0805DFA8: GetFieldObjectIdByXY: @ 805DFB0 push {r4-r6,lr} movs r3, 0 - ldr r5, _0805DFF0 @ =gUnknown_2036E38 + ldr r5, _0805DFF0 @ =gMapObjects lsls r0, 16 asrs r4, r0, 16 lsls r1, 16 @@ -253,7 +253,7 @@ _0805DFE8: pop {r1} bx r1 .align 2, 0 -_0805DFF0: .4byte gUnknown_2036E38 +_0805DFF0: .4byte gMapObjects thumb_func_end GetFieldObjectIdByXY thumb_func_start GetFieldObjectIdByLocalIdAndMapInternal @@ -266,7 +266,7 @@ GetFieldObjectIdByLocalIdAndMapInternal: @ 805DFF4 lsls r2, 24 lsrs r2, 24 movs r1, 0 - ldr r6, _0805E02C @ =gUnknown_2036E38 + ldr r6, _0805E02C @ =gMapObjects _0805E006: lsls r0, r1, 3 adds r0, r1 @@ -288,7 +288,7 @@ _0805E006: adds r0, r1, 0 b _0805E03C .align 2, 0 -_0805E02C: .4byte gUnknown_2036E38 +_0805E02C: .4byte gMapObjects _0805E030: adds r0, r1, 0x1 lsls r0, 24 @@ -308,7 +308,7 @@ GetFieldObjectIdByLocalId: @ 805E044 lsls r0, 24 lsrs r3, r0, 24 movs r2, 0 - ldr r4, _0805E068 @ =gUnknown_2036E38 + ldr r4, _0805E068 @ =gMapObjects _0805E04E: lsls r0, r2, 3 adds r0, r2 @@ -324,7 +324,7 @@ _0805E04E: adds r0, r2, 0 b _0805E078 .align 2, 0 -_0805E068: .4byte gUnknown_2036E38 +_0805E068: .4byte gMapObjects _0805E06C: adds r0, r2, 0x1 lsls r0, 24 @@ -414,7 +414,7 @@ _0805E10A: lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _0805E13C @ =gUnknown_2036E38 + ldr r1, _0805E13C @ =gMapObjects adds r4, r0, r1 adds r0, r4, 0 bl npc_clear_ids_and_state @@ -434,7 +434,7 @@ _0805E10A: adds r0, r1 b _0805E14E .align 2, 0 -_0805E13C: .4byte gUnknown_2036E38 +_0805E13C: .4byte gMapObjects _0805E140: ldrh r0, [r5, 0x4] adds r0, 0x7 @@ -839,7 +839,7 @@ GetAvailableFieldObjectSlot: @ 805E414 lsls r2, 24 lsrs r4, r2, 24 movs r2, 0 - ldr r1, _0805E470 @ =gUnknown_2036E38 + ldr r1, _0805E470 @ =gMapObjects ldrb r0, [r1] lsls r0, 31 adds r7, r1, 0 @@ -881,11 +881,11 @@ _0805E46C: movs r0, 0x1 b _0805E4A8 .align 2, 0 -_0805E470: .4byte gUnknown_2036E38 +_0805E470: .4byte gMapObjects _0805E474: mov r0, r12 strb r2, [r0] - ldr r1, _0805E4B0 @ =gUnknown_2036E38 + ldr r1, _0805E4B0 @ =gMapObjects _0805E47A: lsls r0, r2, 3 adds r0, r2 @@ -916,7 +916,7 @@ _0805E4A8: pop {r1} bx r1 .align 2, 0 -_0805E4B0: .4byte gUnknown_2036E38 +_0805E4B0: .4byte gMapObjects thumb_func_end GetAvailableFieldObjectSlot thumb_func_start RemoveFieldObject @@ -958,7 +958,7 @@ RemoveFieldObjectByLocalIdAndMap: @ 805E4C8 lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _0805E50C @ =gUnknown_2036E38 + ldr r1, _0805E50C @ =gMapObjects adds r0, r1 bl RemoveFieldObject _0805E506: @@ -966,7 +966,7 @@ _0805E506: pop {r0} bx r0 .align 2, 0 -_0805E50C: .4byte gUnknown_2036E38 +_0805E50C: .4byte gMapObjects thumb_func_end RemoveFieldObjectByLocalIdAndMap thumb_func_start RemoveFieldObjectInternal @@ -1019,7 +1019,7 @@ _0805E560: lsls r0, r4, 3 adds r0, r4 lsls r0, 2 - ldr r1, _0805E58C @ =gUnknown_2036E38 + ldr r1, _0805E58C @ =gMapObjects adds r0, r1 bl RemoveFieldObject _0805E576: @@ -1033,7 +1033,7 @@ _0805E576: bx r0 .align 2, 0 _0805E588: .4byte gUnknown_2037078 -_0805E58C: .4byte gUnknown_2036E38 +_0805E58C: .4byte gMapObjects thumb_func_end unref_sub_808D958 thumb_func_start sub_805E590 @@ -1071,7 +1071,7 @@ _0805E5CA: lsls r4, r0, 3 adds r0, r4, r0 lsls r0, 2 - ldr r1, _0805E5F4 @ =gUnknown_2036E38 + ldr r1, _0805E5F4 @ =gMapObjects adds r5, r0, r1 ldrb r0, [r5, 0x5] bl GetFieldObjectGraphicsInfo @@ -1087,7 +1087,7 @@ _0805E5CA: bl npc_load_two_palettes__no_record b _0805E606 .align 2, 0 -_0805E5F4: .4byte gUnknown_2036E38 +_0805E5F4: .4byte gMapObjects _0805E5F8: cmp r0, 0xA bne _0805E606 @@ -1116,7 +1116,7 @@ _0805E614: lsrs r7, r0, 24 cmp r7, 0x40 bne _0805E650 - ldr r0, _0805E64C @ =gUnknown_2036E38 + ldr r0, _0805E64C @ =gMapObjects mov r2, r8 adds r1, r4, r2 lsls r1, 2 @@ -1130,7 +1130,7 @@ _0805E614: b _0805E718 .align 2, 0 _0805E648: .4byte 0x0000ffff -_0805E64C: .4byte gUnknown_2036E38 +_0805E64C: .4byte gMapObjects _0805E650: lsls r0, r7, 4 adds r0, r7 @@ -1302,7 +1302,7 @@ SpawnFieldObject: @ 805E72C _0805E7A4: .4byte 0xffff0000 _0805E7A8: ldr r4, _0805E7EC @ =gSprites - ldr r1, _0805E7F0 @ =gUnknown_2036E38 + ldr r1, _0805E7F0 @ =gMapObjects lsls r0, r2, 3 adds r0, r2 lsls r0, 2 @@ -1338,7 +1338,7 @@ _0805E7DE: bx r1 .align 2, 0 _0805E7EC: .4byte gSprites -_0805E7F0: .4byte gUnknown_2036E38 +_0805E7F0: .4byte gMapObjects thumb_func_end SpawnFieldObject thumb_func_start SpawnSpecialFieldObject @@ -2035,7 +2035,7 @@ _0805ED2E: lsls r0, r3, 3 adds r0, r3 lsls r0, 2 - ldr r1, _0805ED68 @ =gUnknown_2036E38 + ldr r1, _0805ED68 @ =gMapObjects adds r2, r0, r1 ldr r0, [r2] ldr r1, _0805ED6C @ =0x00010001 @@ -2054,7 +2054,7 @@ _0805ED56: bx r0 .align 2, 0 _0805ED64: .4byte gUnknown_2031DEC -_0805ED68: .4byte gUnknown_2036E38 +_0805ED68: .4byte gMapObjects _0805ED6C: .4byte 0x00010001 thumb_func_end RemoveFieldObjectsOutsideView @@ -2138,7 +2138,7 @@ sub_805EDF0: @ 805EDF0 lsrs r5, 16 bl ClearPlayerAvatarInfo movs r6, 0 - ldr r7, _0805EE38 @ =gUnknown_2036E38 + ldr r7, _0805EE38 @ =gMapObjects lsls r4, 16 lsls r5, 16 _0805EE0A: @@ -2165,7 +2165,7 @@ _0805EE24: pop {r0} bx r0 .align 2, 0 -_0805EE38: .4byte gUnknown_2036E38 +_0805EE38: .4byte gMapObjects thumb_func_end sub_805EDF0 thumb_func_start sub_805EE3C @@ -2207,7 +2207,7 @@ _0805EE70: lsls r0, r1, 3 add r0, r8 lsls r0, 2 - ldr r1, _0805EFE4 @ =gUnknown_2036E38 + ldr r1, _0805EFE4 @ =gMapObjects adds r6, r0, r1 movs r0, 0 str r0, [sp, 0x20] @@ -2376,7 +2376,7 @@ _0805EFCE: bx r0 .align 2, 0 _0805EFE0: .4byte gUnknown_2031DEC -_0805EFE4: .4byte gUnknown_2036E38 +_0805EFE4: .4byte gMapObjects _0805EFE8: .4byte 0xffff0000 _0805EFEC: .4byte 0x0000ffff _0805EFF0: .4byte gSprites @@ -2421,7 +2421,7 @@ SetPlayerAvatarFieldObjectIdAndObjectId: @ 805F02C ldr r5, _0805F058 @ =gUnknown_2037078 strb r0, [r5, 0x5] strb r1, [r5, 0x4] - ldr r1, _0805F05C @ =gUnknown_2036E38 + ldr r1, _0805F05C @ =gMapObjects lsls r4, r0, 3 adds r4, r0 lsls r4, 2 @@ -2437,7 +2437,7 @@ SetPlayerAvatarFieldObjectIdAndObjectId: @ 805F02C bx r0 .align 2, 0 _0805F058: .4byte gUnknown_2037078 -_0805F05C: .4byte gUnknown_2036E38 +_0805F05C: .4byte gMapObjects thumb_func_end SetPlayerAvatarFieldObjectIdAndObjectId thumb_func_start sub_805F060 @@ -2649,7 +2649,7 @@ FieldObjectSetGraphicsIdByLocalIdAndMap: @ 805F1D8 lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _0805F214 @ =gUnknown_2036E38 + ldr r1, _0805F214 @ =gMapObjects adds r0, r1 adds r1, r4, 0 bl sub_805F060 @@ -2659,7 +2659,7 @@ _0805F20C: pop {r0} bx r0 .align 2, 0 -_0805F214: .4byte gUnknown_2036E38 +_0805F214: .4byte gMapObjects thumb_func_end FieldObjectSetGraphicsIdByLocalIdAndMap thumb_func_start FieldObjectTurn @@ -2725,7 +2725,7 @@ FieldObjectTurnByLocalIdAndMap: @ 805F268 lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _0805F2A4 @ =gUnknown_2036E38 + ldr r1, _0805F2A4 @ =gMapObjects adds r0, r1 adds r1, r4, 0 bl FieldObjectTurn @@ -2735,7 +2735,7 @@ _0805F29C: pop {r0} bx r0 .align 2, 0 -_0805F2A4: .4byte gUnknown_2036E38 +_0805F2A4: .4byte gMapObjects thumb_func_end FieldObjectTurnByLocalIdAndMap thumb_func_start PlayerObjectTurn @@ -2747,13 +2747,13 @@ PlayerObjectTurn: @ 805F2A8 lsls r0, r2, 3 adds r0, r2 lsls r0, 2 - ldr r2, _0805F2C4 @ =gUnknown_2036E38 + ldr r2, _0805F2C4 @ =gMapObjects adds r0, r2 bl FieldObjectTurn pop {r0} bx r0 .align 2, 0 -_0805F2C4: .4byte gUnknown_2036E38 +_0805F2C4: .4byte gMapObjects thumb_func_end PlayerObjectTurn thumb_func_start GetFieldObjectGraphicsInfo @@ -2819,7 +2819,7 @@ npc_by_local_id_and_map_set_field_1_bit_x20: @ 805F314 lsls r0, 24 cmp r0, 0 bne _0805F356 - ldr r2, _0805F360 @ =gUnknown_2036E38 + ldr r2, _0805F360 @ =gMapObjects mov r0, sp ldrb r0, [r0] lsls r1, r0, 3 @@ -2842,7 +2842,7 @@ _0805F356: pop {r0} bx r0 .align 2, 0 -_0805F360: .4byte gUnknown_2036E38 +_0805F360: .4byte gMapObjects thumb_func_end npc_by_local_id_and_map_set_field_1_bit_x20 thumb_func_start FieldObjectGetLocalIdAndMap @@ -2874,7 +2874,7 @@ sub_805F378: @ 805F378 lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _0805F3A4 @ =gUnknown_2036E38 + ldr r1, _0805F3A4 @ =gMapObjects adds r0, r1 ldrb r1, [r0] movs r2, 0x4 @@ -2884,7 +2884,7 @@ _0805F3A0: pop {r0} bx r0 .align 2, 0 -_0805F3A4: .4byte gUnknown_2036E38 +_0805F3A4: .4byte gMapObjects thumb_func_end sub_805F378 thumb_func_start sub_805F3A8 @@ -2909,7 +2909,7 @@ sub_805F3A8: @ 805F3A8 lsls r2, r0, 3 adds r2, r0 lsls r2, 2 - ldr r0, _0805F3F8 @ =gUnknown_2036E38 + ldr r0, _0805F3F8 @ =gMapObjects adds r2, r0 ldrb r1, [r2, 0x4] lsls r0, r1, 4 @@ -2929,7 +2929,7 @@ _0805F3EE: pop {r0} bx r0 .align 2, 0 -_0805F3F8: .4byte gUnknown_2036E38 +_0805F3F8: .4byte gMapObjects _0805F3FC: .4byte gSprites thumb_func_end sub_805F3A8 @@ -2953,7 +2953,7 @@ sub_805F400: @ 805F400 lsls r1, r0, 3 adds r1, r0 lsls r1, 2 - ldr r0, _0805F444 @ =gUnknown_2036E38 + ldr r0, _0805F444 @ =gMapObjects adds r1, r0 ldrb r2, [r1, 0x3] movs r0, 0x5 @@ -2969,7 +2969,7 @@ _0805F43C: pop {r0} bx r0 .align 2, 0 -_0805F444: .4byte gUnknown_2036E38 +_0805F444: .4byte gMapObjects thumb_func_end sub_805F400 thumb_func_start sub_805F448 @@ -2992,7 +2992,7 @@ sub_805F448: @ 805F448 lsls r0, 24 cmp r0, 0 bne _0805F48C - ldr r2, _0805F494 @ =gUnknown_2036E38 + ldr r2, _0805F494 @ =gMapObjects mov r0, sp ldrb r1, [r0] lsls r0, r1, 3 @@ -3013,7 +3013,7 @@ _0805F48C: pop {r0} bx r0 .align 2, 0 -_0805F494: .4byte gUnknown_2036E38 +_0805F494: .4byte gMapObjects _0805F498: .4byte gSprites thumb_func_end sub_805F448 @@ -3483,7 +3483,7 @@ sub_805F7C4: @ 805F7C4 lsls r0, r3, 3 adds r0, r3 lsls r0, 2 - ldr r3, _0805F814 @ =gUnknown_2036E38 + ldr r3, _0805F814 @ =gMapObjects adds r0, r3 movs r3, 0xE0 lsls r3, 11 @@ -3498,7 +3498,7 @@ _0805F80C: pop {r0} bx r0 .align 2, 0 -_0805F814: .4byte gUnknown_2036E38 +_0805F814: .4byte gMapObjects thumb_func_end sub_805F7C4 thumb_func_start npc_coords_shift_still @@ -3523,7 +3523,7 @@ UpdateFieldObjectCoordsForCameraUpdate: @ 805F82C cmp r0, 0 beq _0805F884 movs r3, 0 - ldr r5, _0805F890 @ =gUnknown_2036E38 + ldr r5, _0805F890 @ =gMapObjects movs r0, 0x4 ldrsh r4, [r2, r0] movs r0, 0x8 @@ -3567,7 +3567,7 @@ _0805F884: bx r0 .align 2, 0 _0805F88C: .4byte gUnknown_2036E18 -_0805F890: .4byte gUnknown_2036E38 +_0805F890: .4byte gMapObjects thumb_func_end UpdateFieldObjectCoordsForCameraUpdate thumb_func_start GetFieldObjectIdByXYZ @@ -3582,7 +3582,7 @@ GetFieldObjectIdByXYZ: @ 805F894 lsls r2, 24 lsrs r5, r2, 24 movs r4, 0 - ldr r0, _0805F8E0 @ =gUnknown_2036E38 + ldr r0, _0805F8E0 @ =gMapObjects mov r8, r0 _0805F8AC: lsls r0, r4, 3 @@ -3611,7 +3611,7 @@ _0805F8AC: adds r0, r4, 0 b _0805F8F0 .align 2, 0 -_0805F8E0: .4byte gUnknown_2036E38 +_0805F8E0: .4byte gMapObjects _0805F8E4: adds r0, r4, 0x1 lsls r0, 24 @@ -4098,7 +4098,7 @@ GetFieldObjectScriptPointerByFieldObjectId: @ 805FC38 push {lr} lsls r0, 24 lsrs r0, 24 - ldr r1, _0805FC58 @ =gUnknown_2036E38 + ldr r1, _0805FC58 @ =gMapObjects lsls r2, r0, 3 adds r2, r0 lsls r2, 2 @@ -4110,7 +4110,7 @@ GetFieldObjectScriptPointerByFieldObjectId: @ 805FC38 pop {r1} bx r1 .align 2, 0 -_0805FC58: .4byte gUnknown_2036E38 +_0805FC58: .4byte gMapObjects thumb_func_end GetFieldObjectScriptPointerByFieldObjectId thumb_func_start GetFieldObjectFlagIdByLocalIdAndMap @@ -4133,7 +4133,7 @@ GetFieldObjectFlagIdByFieldObjectId: @ 805FC74 push {lr} lsls r0, 24 lsrs r0, 24 - ldr r1, _0805FC98 @ =gUnknown_2036E38 + ldr r1, _0805FC98 @ =gMapObjects lsls r2, r0, 3 adds r2, r0 lsls r2, 2 @@ -4147,7 +4147,7 @@ GetFieldObjectFlagIdByFieldObjectId: @ 805FC74 pop {r1} bx r1 .align 2, 0 -_0805FC98: .4byte gUnknown_2036E38 +_0805FC98: .4byte gMapObjects thumb_func_end GetFieldObjectFlagIdByFieldObjectId thumb_func_start sub_805FC9C @@ -4165,7 +4165,7 @@ sub_805FC9C: @ 805FC9C lsls r0, 24 cmp r0, 0 bne _0805FCD0 - ldr r2, _0805FCCC @ =gUnknown_2036E38 + ldr r2, _0805FCCC @ =gMapObjects mov r0, sp ldrb r1, [r0] lsls r0, r1, 3 @@ -4175,7 +4175,7 @@ sub_805FC9C: @ 805FC9C ldrb r0, [r0, 0x7] b _0805FCD2 .align 2, 0 -_0805FCCC: .4byte gUnknown_2036E38 +_0805FCCC: .4byte gMapObjects _0805FCD0: movs r0, 0xFF _0805FCD2: @@ -4203,7 +4203,7 @@ sub_805FCD8: @ 805FCD8 sub_805FCF0: @ 805FCF0 lsls r0, 24 lsrs r0, 24 - ldr r2, _0805FD04 @ =gUnknown_2036E38 + ldr r2, _0805FD04 @ =gMapObjects lsls r1, r0, 3 adds r1, r0 lsls r1, 2 @@ -4211,7 +4211,7 @@ sub_805FCF0: @ 805FCF0 ldrb r0, [r1, 0x7] bx lr .align 2, 0 -_0805FD04: .4byte gUnknown_2036E38 +_0805FD04: .4byte gMapObjects thumb_func_end sub_805FCF0 thumb_func_start sub_805FD08 @@ -4229,7 +4229,7 @@ sub_805FD08: @ 805FD08 lsls r0, 24 cmp r0, 0 bne _0805FD3C - ldr r2, _0805FD38 @ =gUnknown_2036E38 + ldr r2, _0805FD38 @ =gMapObjects mov r0, sp ldrb r1, [r0] lsls r0, r1, 3 @@ -4239,7 +4239,7 @@ sub_805FD08: @ 805FD08 ldrb r0, [r0, 0x1D] b _0805FD3E .align 2, 0 -_0805FD38: .4byte gUnknown_2036E38 +_0805FD38: .4byte gMapObjects _0805FD3C: movs r0, 0xFF _0805FD3E: @@ -4252,7 +4252,7 @@ _0805FD3E: FieldObjectGetBerryTreeId: @ 805FD44 lsls r0, 24 lsrs r0, 24 - ldr r2, _0805FD58 @ =gUnknown_2036E38 + ldr r2, _0805FD58 @ =gMapObjects lsls r1, r0, 3 adds r1, r0 lsls r1, 2 @@ -4260,7 +4260,7 @@ FieldObjectGetBerryTreeId: @ 805FD44 ldrb r0, [r1, 0x1D] bx lr .align 2, 0 -_0805FD58: .4byte gUnknown_2036E38 +_0805FD58: .4byte gMapObjects thumb_func_end FieldObjectGetBerryTreeId thumb_func_start GetFieldObjectTemplateByLocalIdAndMap @@ -4463,7 +4463,7 @@ sub_805FE94: @ 805FE94 lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _0805FEC8 @ =gUnknown_2036E38 + ldr r1, _0805FEC8 @ =gMapObjects adds r0, r1 bl sub_805FE5C _0805FEC2: @@ -4471,7 +4471,7 @@ _0805FEC2: pop {r0} bx r0 .align 2, 0 -_0805FEC8: .4byte gUnknown_2036E38 +_0805FEC8: .4byte gMapObjects thumb_func_end sub_805FE94 thumb_func_start npc_paltag_set_load @@ -4602,14 +4602,14 @@ sub_805FFB4: @ 805FFB4 lsls r0, r2, 3 adds r0, r2 lsls r0, 2 - ldr r2, _0805FFD0 @ =gUnknown_2036E38 + ldr r2, _0805FFD0 @ =gMapObjects adds r0, r2 ldr r2, _0805FFD4 @ =sub_805FFD8 bl FieldObjectStep pop {r0} bx r0 .align 2, 0 -_0805FFD0: .4byte gUnknown_2036E38 +_0805FFD0: .4byte gMapObjects _0805FFD4: .4byte sub_805FFD8 thumb_func_end sub_805FFB4 @@ -4628,14 +4628,14 @@ sub_805FFDC: @ 805FFDC lsls r0, r2, 3 adds r0, r2 lsls r0, 2 - ldr r2, _0805FFF8 @ =gUnknown_2036E38 + ldr r2, _0805FFF8 @ =gMapObjects adds r0, r2 ldr r2, _0805FFFC @ =sub_8060000 bl FieldObjectStep pop {r0} bx r0 .align 2, 0 -_0805FFF8: .4byte gUnknown_2036E38 +_0805FFF8: .4byte gMapObjects _0805FFFC: .4byte sub_8060000 thumb_func_end sub_805FFDC @@ -4667,14 +4667,14 @@ sub_8060020: @ 8060020 lsls r0, r2, 3 adds r0, r2 lsls r0, 2 - ldr r2, _0806003C @ =gUnknown_2036E38 + ldr r2, _0806003C @ =gMapObjects adds r0, r2 ldr r2, _08060040 @ =sub_8060044 bl FieldObjectStep pop {r0} bx r0 .align 2, 0 -_0806003C: .4byte gUnknown_2036E38 +_0806003C: .4byte gMapObjects _08060040: .4byte sub_8060044 thumb_func_end sub_8060020 @@ -5437,14 +5437,14 @@ sub_806058C: @ 806058C lsls r0, r2, 3 adds r0, r2 lsls r0, 2 - ldr r2, _080605A8 @ =gUnknown_2036E38 + ldr r2, _080605A8 @ =gMapObjects adds r0, r2 ldr r2, _080605AC @ =sub_80605B0 bl FieldObjectStep pop {r0} bx r0 .align 2, 0 -_080605A8: .4byte gUnknown_2036E38 +_080605A8: .4byte gMapObjects _080605AC: .4byte sub_80605B0 thumb_func_end sub_806058C @@ -5610,14 +5610,14 @@ sub_80606CC: @ 80606CC lsls r0, r2, 3 adds r0, r2 lsls r0, 2 - ldr r2, _080606E8 @ =gUnknown_2036E38 + ldr r2, _080606E8 @ =gMapObjects adds r0, r2 ldr r2, _080606EC @ =sub_80606F0 bl FieldObjectStep pop {r0} bx r0 .align 2, 0 -_080606E8: .4byte gUnknown_2036E38 +_080606E8: .4byte gMapObjects _080606EC: .4byte sub_80606F0 thumb_func_end sub_80606CC @@ -5825,14 +5825,14 @@ sub_8060850: @ 8060850 lsls r0, r2, 3 adds r0, r2 lsls r0, 2 - ldr r2, _0806086C @ =gUnknown_2036E38 + ldr r2, _0806086C @ =gMapObjects adds r0, r2 ldr r2, _08060870 @ =sub_8060874 bl FieldObjectStep pop {r0} bx r0 .align 2, 0 -_0806086C: .4byte gUnknown_2036E38 +_0806086C: .4byte gMapObjects _08060870: .4byte sub_8060874 thumb_func_end sub_8060850 @@ -6040,14 +6040,14 @@ sub_80609D4: @ 80609D4 lsls r0, r2, 3 adds r0, r2 lsls r0, 2 - ldr r2, _080609F0 @ =gUnknown_2036E38 + ldr r2, _080609F0 @ =gMapObjects adds r0, r2 ldr r2, _080609F4 @ =sub_80609F8 bl FieldObjectStep pop {r0} bx r0 .align 2, 0 -_080609F0: .4byte gUnknown_2036E38 +_080609F0: .4byte gMapObjects _080609F4: .4byte sub_80609F8 thumb_func_end sub_80609D4 @@ -6133,14 +6133,14 @@ sub_8060A74: @ 8060A74 lsls r0, r2, 3 adds r0, r2 lsls r0, 2 - ldr r2, _08060A90 @ =gUnknown_2036E38 + ldr r2, _08060A90 @ =gMapObjects adds r0, r2 ldr r2, _08060A94 @ =sub_8060A98 bl FieldObjectStep pop {r0} bx r0 .align 2, 0 -_08060A90: .4byte gUnknown_2036E38 +_08060A90: .4byte gMapObjects _08060A94: .4byte sub_8060A98 thumb_func_end sub_8060A74 @@ -6306,14 +6306,14 @@ sub_8060BB4: @ 8060BB4 lsls r0, r2, 3 adds r0, r2 lsls r0, 2 - ldr r2, _08060BD0 @ =gUnknown_2036E38 + ldr r2, _08060BD0 @ =gMapObjects adds r0, r2 ldr r2, _08060BD4 @ =sub_8060BD8 bl FieldObjectStep pop {r0} bx r0 .align 2, 0 -_08060BD0: .4byte gUnknown_2036E38 +_08060BD0: .4byte gMapObjects _08060BD4: .4byte sub_8060BD8 thumb_func_end sub_8060BB4 @@ -6479,14 +6479,14 @@ sub_8060CF4: @ 8060CF4 lsls r0, r2, 3 adds r0, r2 lsls r0, 2 - ldr r2, _08060D10 @ =gUnknown_2036E38 + ldr r2, _08060D10 @ =gMapObjects adds r0, r2 ldr r2, _08060D14 @ =sub_8060D18 bl FieldObjectStep pop {r0} bx r0 .align 2, 0 -_08060D10: .4byte gUnknown_2036E38 +_08060D10: .4byte gMapObjects _08060D14: .4byte sub_8060D18 thumb_func_end sub_8060CF4 @@ -6652,14 +6652,14 @@ sub_8060E34: @ 8060E34 lsls r0, r2, 3 adds r0, r2 lsls r0, 2 - ldr r2, _08060E50 @ =gUnknown_2036E38 + ldr r2, _08060E50 @ =gMapObjects adds r0, r2 ldr r2, _08060E54 @ =sub_8060E58 bl FieldObjectStep pop {r0} bx r0 .align 2, 0 -_08060E50: .4byte gUnknown_2036E38 +_08060E50: .4byte gMapObjects _08060E54: .4byte sub_8060E58 thumb_func_end sub_8060E34 @@ -6825,14 +6825,14 @@ sub_8060F74: @ 8060F74 lsls r0, r2, 3 adds r0, r2 lsls r0, 2 - ldr r2, _08060F90 @ =gUnknown_2036E38 + ldr r2, _08060F90 @ =gMapObjects adds r0, r2 ldr r2, _08060F94 @ =sub_8060F98 bl FieldObjectStep pop {r0} bx r0 .align 2, 0 -_08060F90: .4byte gUnknown_2036E38 +_08060F90: .4byte gMapObjects _08060F94: .4byte sub_8060F98 thumb_func_end sub_8060F74 @@ -6998,14 +6998,14 @@ sub_80610B4: @ 80610B4 lsls r0, r2, 3 adds r0, r2 lsls r0, 2 - ldr r2, _080610D0 @ =gUnknown_2036E38 + ldr r2, _080610D0 @ =gMapObjects adds r0, r2 ldr r2, _080610D4 @ =sub_80610D8 bl FieldObjectStep pop {r0} bx r0 .align 2, 0 -_080610D0: .4byte gUnknown_2036E38 +_080610D0: .4byte gMapObjects _080610D4: .4byte sub_80610D8 thumb_func_end sub_80610B4 @@ -7171,14 +7171,14 @@ sub_80611F4: @ 80611F4 lsls r0, r2, 3 adds r0, r2 lsls r0, 2 - ldr r2, _08061210 @ =gUnknown_2036E38 + ldr r2, _08061210 @ =gMapObjects adds r0, r2 ldr r2, _08061214 @ =sub_8061218 bl FieldObjectStep pop {r0} bx r0 .align 2, 0 -_08061210: .4byte gUnknown_2036E38 +_08061210: .4byte gMapObjects _08061214: .4byte sub_8061218 thumb_func_end sub_80611F4 @@ -7344,14 +7344,14 @@ sub_8061334: @ 8061334 lsls r0, r2, 3 adds r0, r2 lsls r0, 2 - ldr r2, _08061350 @ =gUnknown_2036E38 + ldr r2, _08061350 @ =gMapObjects adds r0, r2 ldr r2, _08061354 @ =sub_8061358 bl FieldObjectStep pop {r0} bx r0 .align 2, 0 -_08061350: .4byte gUnknown_2036E38 +_08061350: .4byte gMapObjects _08061354: .4byte sub_8061358 thumb_func_end sub_8061334 @@ -7517,14 +7517,14 @@ sub_8061474: @ 8061474 lsls r0, r2, 3 adds r0, r2 lsls r0, 2 - ldr r2, _08061490 @ =gUnknown_2036E38 + ldr r2, _08061490 @ =gMapObjects adds r0, r2 ldr r2, _08061494 @ =sub_8061498 bl FieldObjectStep pop {r0} bx r0 .align 2, 0 -_08061490: .4byte gUnknown_2036E38 +_08061490: .4byte gMapObjects _08061494: .4byte sub_8061498 thumb_func_end sub_8061474 @@ -7690,14 +7690,14 @@ sub_80615B4: @ 80615B4 lsls r0, r2, 3 adds r0, r2 lsls r0, 2 - ldr r2, _080615D0 @ =gUnknown_2036E38 + ldr r2, _080615D0 @ =gMapObjects adds r0, r2 ldr r2, _080615D4 @ =sub_80615D8 bl FieldObjectStep pop {r0} bx r0 .align 2, 0 -_080615D0: .4byte gUnknown_2036E38 +_080615D0: .4byte gMapObjects _080615D4: .4byte sub_80615D8 thumb_func_end sub_80615B4 @@ -7863,14 +7863,14 @@ sub_80616F4: @ 80616F4 lsls r0, r2, 3 adds r0, r2 lsls r0, 2 - ldr r2, _08061710 @ =gUnknown_2036E38 + ldr r2, _08061710 @ =gMapObjects adds r0, r2 ldr r2, _08061714 @ =sub_8061718 bl FieldObjectStep pop {r0} bx r0 .align 2, 0 -_08061710: .4byte gUnknown_2036E38 +_08061710: .4byte gMapObjects _08061714: .4byte sub_8061718 thumb_func_end sub_80616F4 @@ -8006,14 +8006,14 @@ sub_80617F8: @ 80617F8 lsls r0, r2, 3 adds r0, r2 lsls r0, 2 - ldr r2, _08061814 @ =gUnknown_2036E38 + ldr r2, _08061814 @ =gMapObjects adds r0, r2 ldr r2, _08061818 @ =sub_806181C bl FieldObjectStep pop {r0} bx r0 .align 2, 0 -_08061814: .4byte gUnknown_2036E38 +_08061814: .4byte gMapObjects _08061818: .4byte sub_806181C thumb_func_end sub_80617F8 @@ -8149,14 +8149,14 @@ sub_80618FC: @ 80618FC lsls r0, r2, 3 adds r0, r2 lsls r0, 2 - ldr r2, _08061918 @ =gUnknown_2036E38 + ldr r2, _08061918 @ =gMapObjects adds r0, r2 ldr r2, _0806191C @ =sub_8061920 bl FieldObjectStep pop {r0} bx r0 .align 2, 0 -_08061918: .4byte gUnknown_2036E38 +_08061918: .4byte gMapObjects _0806191C: .4byte sub_8061920 thumb_func_end sub_80618FC @@ -8465,14 +8465,14 @@ sub_8061B5C: @ 8061B5C lsls r0, r2, 3 adds r0, r2 lsls r0, 2 - ldr r2, _08061B78 @ =gUnknown_2036E38 + ldr r2, _08061B78 @ =gMapObjects adds r0, r2 ldr r2, _08061B7C @ =sub_8061B80 bl FieldObjectStep pop {r0} bx r0 .align 2, 0 -_08061B78: .4byte gUnknown_2036E38 +_08061B78: .4byte gMapObjects _08061B7C: .4byte sub_8061B80 thumb_func_end sub_8061B5C @@ -8542,14 +8542,14 @@ sub_8061BE8: @ 8061BE8 lsls r0, r2, 3 adds r0, r2 lsls r0, 2 - ldr r2, _08061C04 @ =gUnknown_2036E38 + ldr r2, _08061C04 @ =gMapObjects adds r0, r2 ldr r2, _08061C08 @ =sub_8061C0C bl FieldObjectStep pop {r0} bx r0 .align 2, 0 -_08061C04: .4byte gUnknown_2036E38 +_08061C04: .4byte gMapObjects _08061C08: .4byte sub_8061C0C thumb_func_end sub_8061BE8 @@ -8619,14 +8619,14 @@ sub_8061C74: @ 8061C74 lsls r0, r2, 3 adds r0, r2 lsls r0, 2 - ldr r2, _08061C90 @ =gUnknown_2036E38 + ldr r2, _08061C90 @ =gMapObjects adds r0, r2 ldr r2, _08061C94 @ =sub_8061C98 bl FieldObjectStep pop {r0} bx r0 .align 2, 0 -_08061C90: .4byte gUnknown_2036E38 +_08061C90: .4byte gMapObjects _08061C94: .4byte sub_8061C98 thumb_func_end sub_8061C74 @@ -8696,14 +8696,14 @@ sub_8061D00: @ 8061D00 lsls r0, r2, 3 adds r0, r2 lsls r0, 2 - ldr r2, _08061D1C @ =gUnknown_2036E38 + ldr r2, _08061D1C @ =gMapObjects adds r0, r2 ldr r2, _08061D20 @ =sub_8061D24 bl FieldObjectStep pop {r0} bx r0 .align 2, 0 -_08061D1C: .4byte gUnknown_2036E38 +_08061D1C: .4byte gMapObjects _08061D20: .4byte sub_8061D24 thumb_func_end sub_8061D00 @@ -8773,14 +8773,14 @@ sub_8061D8C: @ 8061D8C lsls r0, r2, 3 adds r0, r2 lsls r0, 2 - ldr r2, _08061DA8 @ =gUnknown_2036E38 + ldr r2, _08061DA8 @ =gMapObjects adds r0, r2 ldr r2, _08061DAC @ =sub_8061DB0 bl FieldObjectStep pop {r0} bx r0 .align 2, 0 -_08061DA8: .4byte gUnknown_2036E38 +_08061DA8: .4byte gMapObjects _08061DAC: .4byte sub_8061DB0 thumb_func_end sub_8061D8C @@ -8850,14 +8850,14 @@ sub_8061E18: @ 8061E18 lsls r0, r2, 3 adds r0, r2 lsls r0, 2 - ldr r2, _08061E34 @ =gUnknown_2036E38 + ldr r2, _08061E34 @ =gMapObjects adds r0, r2 ldr r2, _08061E38 @ =sub_8061E3C bl FieldObjectStep pop {r0} bx r0 .align 2, 0 -_08061E34: .4byte gUnknown_2036E38 +_08061E34: .4byte gMapObjects _08061E38: .4byte sub_8061E3C thumb_func_end sub_8061E18 @@ -8927,14 +8927,14 @@ sub_8061EA4: @ 8061EA4 lsls r0, r2, 3 adds r0, r2 lsls r0, 2 - ldr r2, _08061EC0 @ =gUnknown_2036E38 + ldr r2, _08061EC0 @ =gMapObjects adds r0, r2 ldr r2, _08061EC4 @ =sub_8061EC8 bl FieldObjectStep pop {r0} bx r0 .align 2, 0 -_08061EC0: .4byte gUnknown_2036E38 +_08061EC0: .4byte gMapObjects _08061EC4: .4byte sub_8061EC8 thumb_func_end sub_8061EA4 @@ -9004,14 +9004,14 @@ sub_8061F30: @ 8061F30 lsls r0, r2, 3 adds r0, r2 lsls r0, 2 - ldr r2, _08061F4C @ =gUnknown_2036E38 + ldr r2, _08061F4C @ =gMapObjects adds r0, r2 ldr r2, _08061F50 @ =sub_8061F54 bl FieldObjectStep pop {r0} bx r0 .align 2, 0 -_08061F4C: .4byte gUnknown_2036E38 +_08061F4C: .4byte gMapObjects _08061F50: .4byte sub_8061F54 thumb_func_end sub_8061F30 @@ -9081,14 +9081,14 @@ sub_8061FBC: @ 8061FBC lsls r0, r2, 3 adds r0, r2 lsls r0, 2 - ldr r2, _08061FD8 @ =gUnknown_2036E38 + ldr r2, _08061FD8 @ =gMapObjects adds r0, r2 ldr r2, _08061FDC @ =sub_8061FE0 bl FieldObjectStep pop {r0} bx r0 .align 2, 0 -_08061FD8: .4byte gUnknown_2036E38 +_08061FD8: .4byte gMapObjects _08061FDC: .4byte sub_8061FE0 thumb_func_end sub_8061FBC @@ -9158,14 +9158,14 @@ sub_8062048: @ 8062048 lsls r0, r2, 3 adds r0, r2 lsls r0, 2 - ldr r2, _08062064 @ =gUnknown_2036E38 + ldr r2, _08062064 @ =gMapObjects adds r0, r2 ldr r2, _08062068 @ =sub_806206C bl FieldObjectStep pop {r0} bx r0 .align 2, 0 -_08062064: .4byte gUnknown_2036E38 +_08062064: .4byte gMapObjects _08062068: .4byte sub_806206C thumb_func_end sub_8062048 @@ -9235,14 +9235,14 @@ sub_80620D4: @ 80620D4 lsls r0, r2, 3 adds r0, r2 lsls r0, 2 - ldr r2, _080620F0 @ =gUnknown_2036E38 + ldr r2, _080620F0 @ =gMapObjects adds r0, r2 ldr r2, _080620F4 @ =sub_80620F8 bl FieldObjectStep pop {r0} bx r0 .align 2, 0 -_080620F0: .4byte gUnknown_2036E38 +_080620F0: .4byte gMapObjects _080620F4: .4byte sub_80620F8 thumb_func_end sub_80620D4 @@ -9312,14 +9312,14 @@ sub_8062160: @ 8062160 lsls r0, r2, 3 adds r0, r2 lsls r0, 2 - ldr r2, _0806217C @ =gUnknown_2036E38 + ldr r2, _0806217C @ =gMapObjects adds r0, r2 ldr r2, _08062180 @ =sub_8062184 bl FieldObjectStep pop {r0} bx r0 .align 2, 0 -_0806217C: .4byte gUnknown_2036E38 +_0806217C: .4byte gMapObjects _08062180: .4byte sub_8062184 thumb_func_end sub_8062160 @@ -9389,14 +9389,14 @@ sub_80621EC: @ 80621EC lsls r0, r2, 3 adds r0, r2 lsls r0, 2 - ldr r2, _08062208 @ =gUnknown_2036E38 + ldr r2, _08062208 @ =gMapObjects adds r0, r2 ldr r2, _0806220C @ =sub_8062210 bl FieldObjectStep pop {r0} bx r0 .align 2, 0 -_08062208: .4byte gUnknown_2036E38 +_08062208: .4byte gMapObjects _0806220C: .4byte sub_8062210 thumb_func_end sub_80621EC @@ -9466,14 +9466,14 @@ sub_8062278: @ 8062278 lsls r0, r2, 3 adds r0, r2 lsls r0, 2 - ldr r2, _08062294 @ =gUnknown_2036E38 + ldr r2, _08062294 @ =gMapObjects adds r0, r2 ldr r2, _08062298 @ =sub_806229C bl FieldObjectStep pop {r0} bx r0 .align 2, 0 -_08062294: .4byte gUnknown_2036E38 +_08062294: .4byte gMapObjects _08062298: .4byte sub_806229C thumb_func_end sub_8062278 @@ -9543,14 +9543,14 @@ sub_8062304: @ 8062304 lsls r0, r2, 3 adds r0, r2 lsls r0, 2 - ldr r2, _08062320 @ =gUnknown_2036E38 + ldr r2, _08062320 @ =gMapObjects adds r0, r2 ldr r2, _08062324 @ =sub_8062328 bl FieldObjectStep pop {r0} bx r0 .align 2, 0 -_08062320: .4byte gUnknown_2036E38 +_08062320: .4byte gMapObjects _08062324: .4byte sub_8062328 thumb_func_end sub_8062304 @@ -9620,14 +9620,14 @@ sub_8062390: @ 8062390 lsls r0, r2, 3 adds r0, r2 lsls r0, 2 - ldr r2, _080623AC @ =gUnknown_2036E38 + ldr r2, _080623AC @ =gMapObjects adds r0, r2 ldr r2, _080623B0 @ =sub_80623B4 bl FieldObjectStep pop {r0} bx r0 .align 2, 0 -_080623AC: .4byte gUnknown_2036E38 +_080623AC: .4byte gMapObjects _080623B0: .4byte sub_80623B4 thumb_func_end sub_8062390 @@ -9697,14 +9697,14 @@ sub_806241C: @ 806241C lsls r0, r2, 3 adds r0, r2 lsls r0, 2 - ldr r2, _08062438 @ =gUnknown_2036E38 + ldr r2, _08062438 @ =gMapObjects adds r0, r2 ldr r2, _0806243C @ =sub_8062440 bl FieldObjectStep pop {r0} bx r0 .align 2, 0 -_08062438: .4byte gUnknown_2036E38 +_08062438: .4byte gMapObjects _0806243C: .4byte sub_8062440 thumb_func_end sub_806241C @@ -9774,14 +9774,14 @@ sub_80624A8: @ 80624A8 lsls r0, r2, 3 adds r0, r2 lsls r0, 2 - ldr r2, _080624C4 @ =gUnknown_2036E38 + ldr r2, _080624C4 @ =gMapObjects adds r0, r2 ldr r2, _080624C8 @ =sub_80624CC bl FieldObjectStep pop {r0} bx r0 .align 2, 0 -_080624C4: .4byte gUnknown_2036E38 +_080624C4: .4byte gMapObjects _080624C8: .4byte sub_80624CC thumb_func_end sub_80624A8 @@ -9851,14 +9851,14 @@ sub_8062534: @ 8062534 lsls r0, r2, 3 adds r0, r2 lsls r0, 2 - ldr r2, _08062550 @ =gUnknown_2036E38 + ldr r2, _08062550 @ =gMapObjects adds r0, r2 ldr r2, _08062554 @ =sub_8062558 bl FieldObjectStep pop {r0} bx r0 .align 2, 0 -_08062550: .4byte gUnknown_2036E38 +_08062550: .4byte gMapObjects _08062554: .4byte sub_8062558 thumb_func_end sub_8062534 @@ -9928,14 +9928,14 @@ sub_80625C0: @ 80625C0 lsls r0, r2, 3 adds r0, r2 lsls r0, 2 - ldr r2, _080625DC @ =gUnknown_2036E38 + ldr r2, _080625DC @ =gMapObjects adds r0, r2 ldr r2, _080625E0 @ =sub_80625E4 bl FieldObjectStep pop {r0} bx r0 .align 2, 0 -_080625DC: .4byte gUnknown_2036E38 +_080625DC: .4byte gMapObjects _080625E0: .4byte sub_80625E4 thumb_func_end sub_80625C0 @@ -10005,14 +10005,14 @@ sub_806264C: @ 806264C lsls r0, r2, 3 adds r0, r2 lsls r0, 2 - ldr r2, _08062668 @ =gUnknown_2036E38 + ldr r2, _08062668 @ =gMapObjects adds r0, r2 ldr r2, _0806266C @ =sub_8062670 bl FieldObjectStep pop {r0} bx r0 .align 2, 0 -_08062668: .4byte gUnknown_2036E38 +_08062668: .4byte gMapObjects _0806266C: .4byte sub_8062670 thumb_func_end sub_806264C @@ -10082,14 +10082,14 @@ sub_80626D8: @ 80626D8 lsls r0, r2, 3 adds r0, r2 lsls r0, 2 - ldr r2, _080626F4 @ =gUnknown_2036E38 + ldr r2, _080626F4 @ =gMapObjects adds r0, r2 ldr r2, _080626F8 @ =sub_80626FC bl FieldObjectStep pop {r0} bx r0 .align 2, 0 -_080626F4: .4byte gUnknown_2036E38 +_080626F4: .4byte gMapObjects _080626F8: .4byte sub_80626FC thumb_func_end sub_80626D8 @@ -10159,14 +10159,14 @@ sub_8062764: @ 8062764 lsls r0, r2, 3 adds r0, r2 lsls r0, 2 - ldr r2, _08062780 @ =gUnknown_2036E38 + ldr r2, _08062780 @ =gMapObjects adds r0, r2 ldr r2, _08062784 @ =sub_8062788 bl FieldObjectStep pop {r0} bx r0 .align 2, 0 -_08062780: .4byte gUnknown_2036E38 +_08062780: .4byte gMapObjects _08062784: .4byte sub_8062788 thumb_func_end sub_8062764 @@ -10236,14 +10236,14 @@ sub_80627F0: @ 80627F0 lsls r0, r2, 3 adds r0, r2 lsls r0, 2 - ldr r2, _0806280C @ =gUnknown_2036E38 + ldr r2, _0806280C @ =gMapObjects adds r0, r2 ldr r2, _08062810 @ =sub_8062814 bl FieldObjectStep pop {r0} bx r0 .align 2, 0 -_0806280C: .4byte gUnknown_2036E38 +_0806280C: .4byte gMapObjects _08062810: .4byte sub_8062814 thumb_func_end sub_80627F0 @@ -10313,14 +10313,14 @@ sub_806287C: @ 806287C lsls r0, r2, 3 adds r0, r2 lsls r0, 2 - ldr r2, _08062898 @ =gUnknown_2036E38 + ldr r2, _08062898 @ =gMapObjects adds r0, r2 ldr r2, _0806289C @ =sub_80628A0 bl FieldObjectStep pop {r0} bx r0 .align 2, 0 -_08062898: .4byte gUnknown_2036E38 +_08062898: .4byte gMapObjects _0806289C: .4byte sub_80628A0 thumb_func_end sub_806287C @@ -10368,7 +10368,7 @@ sub_80628E4: @ 80628E4 push {r4-r7,lr} adds r6, r0, 0 adds r7, r1, 0 - ldr r2, _08062908 @ =gUnknown_2036E38 + ldr r2, _08062908 @ =gMapObjects ldr r3, _0806290C @ =gUnknown_2037078 ldrb r1, [r3, 0x5] lsls r0, r1, 3 @@ -10385,7 +10385,7 @@ _08062904: movs r0, 0 b _08062938 .align 2, 0 -_08062908: .4byte gUnknown_2036E38 +_08062908: .4byte gMapObjects _0806290C: .4byte gUnknown_2037078 _08062910: ldr r5, _08062940 @ =gUnknown_83A6390 @@ -11064,14 +11064,14 @@ sub_8062E60: @ 8062E60 lsls r0, r2, 3 adds r0, r2 lsls r0, 2 - ldr r2, _08062E7C @ =gUnknown_2036E38 + ldr r2, _08062E7C @ =gMapObjects adds r0, r2 ldr r2, _08062E80 @ =sub_8062E84 bl FieldObjectStep pop {r0} bx r0 .align 2, 0 -_08062E7C: .4byte gUnknown_2036E38 +_08062E7C: .4byte gMapObjects _08062E80: .4byte sub_8062E84 thumb_func_end sub_8062E60 @@ -11099,7 +11099,7 @@ mss_08062EA4: @ 8062EA4 push {r4-r7,lr} adds r6, r0, 0 adds r7, r1, 0 - ldr r2, _08062EC8 @ =gUnknown_2036E38 + ldr r2, _08062EC8 @ =gMapObjects ldr r3, _08062ECC @ =gUnknown_2037078 ldrb r1, [r3, 0x5] lsls r0, r1, 3 @@ -11116,7 +11116,7 @@ _08062EC4: movs r0, 0 b _08062EF8 .align 2, 0 -_08062EC8: .4byte gUnknown_2036E38 +_08062EC8: .4byte gMapObjects _08062ECC: .4byte gUnknown_2037078 _08062ED0: ldr r5, _08062F00 @ =gUnknown_83A6390 @@ -11154,7 +11154,7 @@ FieldObjectCB_TreeDisguise: @ 8062F08 lsls r1, r0, 3 adds r1, r0 lsls r1, 2 - ldr r0, _08062F6C @ =gUnknown_2036E38 + ldr r0, _08062F6C @ =gMapObjects adds r4, r1, r0 adds r6, r4, 0 adds r6, 0x21 @@ -11188,7 +11188,7 @@ _08062F50: lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _08062F6C @ =gUnknown_2036E38 + ldr r1, _08062F6C @ =gMapObjects adds r0, r1 ldr r2, _08062F74 @ =sub_8062F78 adds r1, r5, 0 @@ -11197,7 +11197,7 @@ _08062F50: pop {r0} bx r0 .align 2, 0 -_08062F6C: .4byte gUnknown_2036E38 +_08062F6C: .4byte gMapObjects _08062F70: .4byte gUnknown_20386E0 _08062F74: .4byte sub_8062F78 thumb_func_end FieldObjectCB_TreeDisguise @@ -11220,7 +11220,7 @@ FieldObjectCB_MountainDisguise: @ 8062F84 lsls r1, r0, 3 adds r1, r0 lsls r1, 2 - ldr r0, _08062FE8 @ =gUnknown_2036E38 + ldr r0, _08062FE8 @ =gMapObjects adds r4, r1, r0 adds r6, r4, 0 adds r6, 0x21 @@ -11254,7 +11254,7 @@ _08062FCC: lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _08062FE8 @ =gUnknown_2036E38 + ldr r1, _08062FE8 @ =gMapObjects adds r0, r1 ldr r2, _08062FF0 @ =sub_8062F78 adds r1, r5, 0 @@ -11263,7 +11263,7 @@ _08062FCC: pop {r0} bx r0 .align 2, 0 -_08062FE8: .4byte gUnknown_2036E38 +_08062FE8: .4byte gMapObjects _08062FEC: .4byte gUnknown_20386E0 _08062FF0: .4byte sub_8062F78 thumb_func_end FieldObjectCB_MountainDisguise @@ -11274,7 +11274,7 @@ FieldObjectCB_Hidden1: @ 8062FF4 adds r3, r0, 0 movs r1, 0x3C ldrsh r0, [r3, r1] - ldr r4, _08063050 @ =gUnknown_2036E38 + ldr r4, _08063050 @ =gMapObjects cmp r0, 0 bne _08063034 movs r0, 0x2E @@ -11316,7 +11316,7 @@ _08063034: pop {r0} bx r0 .align 2, 0 -_08063050: .4byte gUnknown_2036E38 +_08063050: .4byte gMapObjects _08063054: .4byte sub_8063058 thumb_func_end FieldObjectCB_Hidden1 @@ -11374,14 +11374,14 @@ sub_80630A0: @ 80630A0 lsls r0, r2, 3 adds r0, r2 lsls r0, 2 - ldr r2, _080630BC @ =gUnknown_2036E38 + ldr r2, _080630BC @ =gMapObjects adds r0, r2 ldr r2, _080630C0 @ =sub_80630C4 bl FieldObjectStep pop {r0} bx r0 .align 2, 0 -_080630BC: .4byte gUnknown_2036E38 +_080630BC: .4byte gMapObjects _080630C0: .4byte sub_80630C4 thumb_func_end sub_80630A0 @@ -11436,14 +11436,14 @@ sub_8063110: @ 8063110 lsls r0, r2, 3 adds r0, r2 lsls r0, 2 - ldr r2, _0806312C @ =gUnknown_2036E38 + ldr r2, _0806312C @ =gMapObjects adds r0, r2 ldr r2, _08063130 @ =sub_8063134 bl FieldObjectStep pop {r0} bx r0 .align 2, 0 -_0806312C: .4byte gUnknown_2036E38 +_0806312C: .4byte gMapObjects _08063130: .4byte sub_8063134 thumb_func_end sub_8063110 @@ -11498,14 +11498,14 @@ sub_8063180: @ 8063180 lsls r0, r2, 3 adds r0, r2 lsls r0, 2 - ldr r2, _0806319C @ =gUnknown_2036E38 + ldr r2, _0806319C @ =gMapObjects adds r0, r2 ldr r2, _080631A0 @ =sub_80631A4 bl FieldObjectStep pop {r0} bx r0 .align 2, 0 -_0806319C: .4byte gUnknown_2036E38 +_0806319C: .4byte gMapObjects _080631A0: .4byte sub_80631A4 thumb_func_end sub_8063180 @@ -11560,14 +11560,14 @@ sub_80631F0: @ 80631F0 lsls r0, r2, 3 adds r0, r2 lsls r0, 2 - ldr r2, _0806320C @ =gUnknown_2036E38 + ldr r2, _0806320C @ =gMapObjects adds r0, r2 ldr r2, _08063210 @ =sub_8063214 bl FieldObjectStep pop {r0} bx r0 .align 2, 0 -_0806320C: .4byte gUnknown_2036E38 +_0806320C: .4byte gMapObjects _08063210: .4byte sub_8063214 thumb_func_end sub_80631F0 @@ -11657,14 +11657,14 @@ sub_8063298: @ 8063298 lsls r0, r2, 3 adds r0, r2 lsls r0, 2 - ldr r2, _080632B4 @ =gUnknown_2036E38 + ldr r2, _080632B4 @ =gMapObjects adds r0, r2 ldr r2, _080632B8 @ =sub_8063304 bl FieldObjectStep pop {r0} bx r0 .align 2, 0 -_080632B4: .4byte gUnknown_2036E38 +_080632B4: .4byte gMapObjects _080632B8: .4byte sub_8063304 thumb_func_end sub_8063298 @@ -11677,14 +11677,14 @@ sub_80632BC: @ 80632BC lsls r0, r2, 3 adds r0, r2 lsls r0, 2 - ldr r2, _080632D8 @ =gUnknown_2036E38 + ldr r2, _080632D8 @ =gMapObjects adds r0, r2 ldr r2, _080632DC @ =sub_8063324 bl FieldObjectStep pop {r0} bx r0 .align 2, 0 -_080632D8: .4byte gUnknown_2036E38 +_080632D8: .4byte gMapObjects _080632DC: .4byte sub_8063324 thumb_func_end sub_80632BC @@ -11697,14 +11697,14 @@ sub_80632E0: @ 80632E0 lsls r0, r2, 3 adds r0, r2 lsls r0, 2 - ldr r2, _080632FC @ =gUnknown_2036E38 + ldr r2, _080632FC @ =gMapObjects adds r0, r2 ldr r2, _08063300 @ =sub_8063344 bl FieldObjectStep pop {r0} bx r0 .align 2, 0 -_080632FC: .4byte gUnknown_2036E38 +_080632FC: .4byte gMapObjects _08063300: .4byte sub_8063344 thumb_func_end sub_80632E0 @@ -12628,7 +12628,7 @@ _08063912: lsls r0, r4, 3 adds r0, r4 lsls r0, 2 - ldr r1, _08063968 @ =gUnknown_2036E38 + ldr r1, _08063968 @ =gMapObjects adds r2, r0, r1 ldrb r0, [r2] lsls r0, 31 @@ -12669,7 +12669,7 @@ _0806394C: movs r0, 0x1 b _08063978 .align 2, 0 -_08063968: .4byte gUnknown_2036E38 +_08063968: .4byte gMapObjects _0806396C: adds r0, r4, 0x1 lsls r0, 24 @@ -12699,7 +12699,7 @@ IsBerryTreeSparkling: @ 8063980 cmp r0, 0 bne _080639CC ldr r3, _080639C4 @ =gSprites - ldr r2, _080639C8 @ =gUnknown_2036E38 + ldr r2, _080639C8 @ =gMapObjects mov r0, sp ldrb r1, [r0] lsls r0, r1, 3 @@ -12720,7 +12720,7 @@ IsBerryTreeSparkling: @ 8063980 b _080639CE .align 2, 0 _080639C4: .4byte gSprites -_080639C8: .4byte gUnknown_2036E38 +_080639C8: .4byte gMapObjects _080639CC: movs r0, 0 _080639CE: @@ -12745,7 +12745,7 @@ sub_80639D4: @ 80639D4 cmp r0, 0 bne _08063A12 ldr r3, _08063A18 @ =gSprites - ldr r2, _08063A1C @ =gUnknown_2036E38 + ldr r2, _08063A1C @ =gMapObjects mov r0, sp ldrb r1, [r0] lsls r0, r1, 3 @@ -12767,7 +12767,7 @@ _08063A12: bx r0 .align 2, 0 _08063A18: .4byte gSprites -_08063A1C: .4byte gUnknown_2036E38 +_08063A1C: .4byte gMapObjects thumb_func_end sub_80639D4 thumb_func_start MoveCoords @@ -18661,7 +18661,7 @@ sub_806637C: @ 806637C ldrsh r0, [r5, r1] movs r2, 0x12 ldrsh r1, [r5, r2] - ldr r4, _080663D4 @ =gUnknown_2036E38 + ldr r4, _080663D4 @ =gMapObjects mov r2, sp ldrb r2, [r2] lsls r3, r2, 3 @@ -18687,7 +18687,7 @@ _080663C6: pop {r1} bx r1 .align 2, 0 -_080663D4: .4byte gUnknown_2036E38 +_080663D4: .4byte gMapObjects thumb_func_end sub_806637C thumb_func_start sub_80663D8 @@ -18708,7 +18708,7 @@ sub_80663D8: @ 80663D8 ldrsh r0, [r5, r1] movs r2, 0x12 ldrsh r1, [r5, r2] - ldr r4, _08066438 @ =gUnknown_2036E38 + ldr r4, _08066438 @ =gMapObjects mov r2, sp ldrb r2, [r2] lsls r3, r2, 3 @@ -18737,7 +18737,7 @@ _0806642A: pop {r1} bx r1 .align 2, 0 -_08066438: .4byte gUnknown_2036E38 +_08066438: .4byte gMapObjects thumb_func_end sub_80663D8 thumb_func_start sub_806643C diff --git a/asm/field_player_avatar.s b/asm/field_player_avatar.s index 93a13f293..f0621961a 100644 --- a/asm/field_player_avatar.s +++ b/asm/field_player_avatar.s @@ -14,14 +14,14 @@ sub_805B3B8: @ 805B3B8 lsls r0, r2, 3 adds r0, r2 lsls r0, 2 - ldr r2, _0805B3D4 @ =gUnknown_2036E38 + ldr r2, _0805B3D4 @ =gMapObjects adds r0, r2 ldr r2, _0805B3D8 @ =sub_805B3DC bl FieldObjectStep pop {r0} bx r0 .align 2, 0 -_0805B3D4: .4byte gUnknown_2036E38 +_0805B3D4: .4byte gMapObjects _0805B3D8: .4byte sub_805B3DC thumb_func_end sub_805B3B8 @@ -48,7 +48,7 @@ sub_805B3E0: @ 805B3E0 lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _0805B458 @ =gUnknown_2036E38 + ldr r1, _0805B458 @ =gMapObjects adds r5, r0, r1 adds r0, r5, 0 bl sub_805CC40 @@ -85,7 +85,7 @@ _0805B448: bx r0 .align 2, 0 _0805B454: .4byte gUnknown_2037078 -_0805B458: .4byte gUnknown_2036E38 +_0805B458: .4byte gMapObjects thumb_func_end sub_805B3E0 thumb_func_start sub_805B45C @@ -222,7 +222,7 @@ sub_805B528: @ 805B528 lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _0805B594 @ =gUnknown_2036E38 + ldr r1, _0805B594 @ =gMapObjects adds r1, r0, r1 str r1, [r4] ldrb r0, [r1] @@ -254,7 +254,7 @@ _0805B586: .align 2, 0 _0805B58C: .4byte gUnknown_2037078 _0805B590: .4byte gUnknown_2036E30 -_0805B594: .4byte gUnknown_2036E38 +_0805B594: .4byte gMapObjects _0805B598: movs r0, 0 _0805B59A: @@ -273,7 +273,7 @@ sub_805B5A0: @ 805B5A0 ands r0, r1 cmp r0, 0 bne _0805B610 - ldr r2, _0805B5F8 @ =gUnknown_2036E38 + ldr r2, _0805B5F8 @ =gMapObjects ldrb r1, [r3, 0x5] lsls r0, r1, 3 adds r0, r1 @@ -308,7 +308,7 @@ _0805B5CC: b _0805B628 .align 2, 0 _0805B5F4: .4byte gUnknown_2037078 -_0805B5F8: .4byte gUnknown_2036E38 +_0805B5F8: .4byte gMapObjects _0805B5FC: .4byte gUnknown_835B764 _0805B600: ldr r0, _0805B60C @ =gUnknown_2037078 @@ -362,7 +362,7 @@ ForcedMovement_None: @ 805B644 lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _0805B68C @ =gUnknown_2036E38 + ldr r1, _0805B68C @ =gMapObjects adds r0, r1 ldrb r2, [r0, 0x1] movs r1, 0x3 @@ -386,7 +386,7 @@ _0805B67E: bx r1 .align 2, 0 _0805B688: .4byte gUnknown_2037078 -_0805B68C: .4byte gUnknown_2036E38 +_0805B68C: .4byte gMapObjects thumb_func_end ForcedMovement_None thumb_func_start DoForcedMovement @@ -461,7 +461,7 @@ DoForcedMovementInCurrentDirection: @ 805B708 lsls r0, r2, 3 adds r0, r2 lsls r0, 2 - ldr r2, _0805B738 @ =gUnknown_2036E38 + ldr r2, _0805B738 @ =gMapObjects adds r0, r2 ldrb r2, [r0, 0x1] movs r3, 0x4 @@ -476,7 +476,7 @@ DoForcedMovementInCurrentDirection: @ 805B708 bx r1 .align 2, 0 _0805B734: .4byte gUnknown_2037078 -_0805B738: .4byte gUnknown_2036E38 +_0805B738: .4byte gMapObjects thumb_func_end DoForcedMovementInCurrentDirection thumb_func_start ForcedMovement_Slip @@ -683,7 +683,7 @@ ForcedMovement_Slide: @ 805B88C lsls r2, r3, 3 adds r2, r3 lsls r2, 2 - ldr r3, _0805B8C0 @ =gUnknown_2036E38 + ldr r3, _0805B8C0 @ =gMapObjects adds r2, r3 ldrb r3, [r2, 0x1] movs r4, 0x4 @@ -699,7 +699,7 @@ ForcedMovement_Slide: @ 805B88C bx r1 .align 2, 0 _0805B8BC: .4byte gUnknown_2037078 -_0805B8C0: .4byte gUnknown_2036E38 +_0805B8C0: .4byte gMapObjects thumb_func_end ForcedMovement_Slide thumb_func_start ForcedMovement_SlideSouth @@ -919,7 +919,7 @@ _0805BA30: lsls r0, 24 cmp r0, 0 beq _0805BA8C - ldr r2, _0805BA70 @ =gUnknown_2036E38 + ldr r2, _0805BA70 @ =gMapObjects ldrb r1, [r6, 0x5] lsls r0, r1, 3 adds r0, r1 @@ -938,7 +938,7 @@ _0805BA30: b _0805BA7A .align 2, 0 _0805BA6C: .4byte 0x0000082f -_0805BA70: .4byte gUnknown_2036E38 +_0805BA70: .4byte gMapObjects _0805BA74: adds r0, r4, 0 bl sub_805C17C @@ -979,7 +979,7 @@ sub_805BAAC: @ 805BAAC lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _0805BAE8 @ =gUnknown_2036E38 + ldr r1, _0805BAE8 @ =gMapObjects adds r0, r1 ldrh r2, [r0, 0x10] mov r1, sp @@ -1000,7 +1000,7 @@ sub_805BAAC: @ 805BAAC b _0805BB00 .align 2, 0 _0805BAE4: .4byte gUnknown_2037078 -_0805BAE8: .4byte gUnknown_2036E38 +_0805BAE8: .4byte gMapObjects _0805BAEC: movs r0, 0x1 mov r1, sp @@ -1039,7 +1039,7 @@ sub_805BB1C: @ 805BB1C lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _0805BB98 @ =gUnknown_2036E38 + ldr r1, _0805BB98 @ =gMapObjects adds r5, r0, r1 ldrh r1, [r5, 0x10] add r0, sp, 0x4 @@ -1086,7 +1086,7 @@ sub_805BB1C: @ 805BB1C b _0805BB9E .align 2, 0 _0805BB94: .4byte gUnknown_2037078 -_0805BB98: .4byte gUnknown_2036E38 +_0805BB98: .4byte gMapObjects _0805BB9C: movs r0, 0x8 _0805BB9E: @@ -1291,7 +1291,7 @@ sub_805BCEC: @ 805BCEC lsrs r6, r0, 24 cmp r6, 0x10 beq _0805BDA0 - ldr r0, _0805BD9C @ =gUnknown_2036E38 + ldr r0, _0805BD9C @ =gMapObjects lsls r1, r6, 3 adds r1, r6 lsls r1, 2 @@ -1347,7 +1347,7 @@ _0805BD8A: b _0805BDA2 .align 2, 0 _0805BD98: .4byte 0x00000805 -_0805BD9C: .4byte gUnknown_2036E38 +_0805BD9C: .4byte gMapObjects _0805BDA0: movs r0, 0 _0805BDA2: @@ -1431,7 +1431,7 @@ _0805BE14: lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _0805BE58 @ =gUnknown_2036E38 + ldr r1, _0805BE58 @ =gMapObjects adds r0, r1 ldr r1, [r2] bl _call_via_r1 @@ -1452,7 +1452,7 @@ _0805BE48: .align 2, 0 _0805BE50: .4byte gUnknown_2037078 _0805BE54: .4byte gUnknown_835B844 -_0805BE58: .4byte gUnknown_2036E38 +_0805BE58: .4byte gMapObjects thumb_func_end DoPlayerAvatarTransition thumb_func_start nullsub_22 @@ -1552,7 +1552,7 @@ _0805BEF6: thumb_func_start player_is_anim_in_certain_ranges player_is_anim_in_certain_ranges: @ 805BEFC push {lr} - ldr r2, _0805BF48 @ =gUnknown_2036E38 + ldr r2, _0805BF48 @ =gMapObjects ldr r0, _0805BF4C @ =gUnknown_2037078 ldrb r1, [r0, 0x5] lsls r0, r1, 3 @@ -1590,7 +1590,7 @@ _0805BF42: movs r0, 0x1 b _0805BF52 .align 2, 0 -_0805BF48: .4byte gUnknown_2036E38 +_0805BF48: .4byte gMapObjects _0805BF4C: .4byte gUnknown_2037078 _0805BF50: movs r0, 0 @@ -1629,7 +1629,7 @@ PlayerIsAnimActive: @ 805BF7C lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _0805BF9C @ =gUnknown_2036E38 + ldr r1, _0805BF9C @ =gMapObjects adds r0, r1 bl FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive lsls r0, 24 @@ -1638,7 +1638,7 @@ PlayerIsAnimActive: @ 805BF7C bx r1 .align 2, 0 _0805BF98: .4byte gUnknown_2037078 -_0805BF9C: .4byte gUnknown_2036E38 +_0805BF9C: .4byte gMapObjects thumb_func_end PlayerIsAnimActive thumb_func_start PlayerCheckIfAnimFinishedOrInactive @@ -1649,7 +1649,7 @@ PlayerCheckIfAnimFinishedOrInactive: @ 805BFA0 lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _0805BFC0 @ =gUnknown_2036E38 + ldr r1, _0805BFC0 @ =gMapObjects adds r0, r1 bl FieldObjectCheckIfSpecialAnimFinishedOrInactive lsls r0, 24 @@ -1658,12 +1658,12 @@ PlayerCheckIfAnimFinishedOrInactive: @ 805BFA0 bx r1 .align 2, 0 _0805BFBC: .4byte gUnknown_2037078 -_0805BFC0: .4byte gUnknown_2036E38 +_0805BFC0: .4byte gMapObjects thumb_func_end PlayerCheckIfAnimFinishedOrInactive thumb_func_start player_set_x22 player_set_x22: @ 805BFC4 - ldr r3, _0805BFD8 @ =gUnknown_2036E38 + ldr r3, _0805BFD8 @ =gMapObjects ldr r1, _0805BFDC @ =gUnknown_2037078 ldrb r2, [r1, 0x5] lsls r1, r2, 3 @@ -1674,13 +1674,13 @@ player_set_x22: @ 805BFC4 strb r0, [r1] bx lr .align 2, 0 -_0805BFD8: .4byte gUnknown_2036E38 +_0805BFD8: .4byte gMapObjects _0805BFDC: .4byte gUnknown_2037078 thumb_func_end player_set_x22 thumb_func_start player_get_x22 player_get_x22: @ 805BFE0 - ldr r2, _0805BFF4 @ =gUnknown_2036E38 + ldr r2, _0805BFF4 @ =gMapObjects ldr r0, _0805BFF8 @ =gUnknown_2037078 ldrb r1, [r0, 0x5] lsls r0, r1, 3 @@ -1691,7 +1691,7 @@ player_get_x22: @ 805BFE0 ldrb r0, [r0] bx lr .align 2, 0 -_0805BFF4: .4byte gUnknown_2036E38 +_0805BFF4: .4byte gMapObjects _0805BFF8: .4byte gUnknown_2037078 thumb_func_end player_get_x22 @@ -1706,14 +1706,14 @@ sub_805BFFC: @ 805BFFC lsls r0, r2, 3 adds r0, r2 lsls r0, 2 - ldr r2, _0805C020 @ =gUnknown_2036E38 + ldr r2, _0805C020 @ =gMapObjects adds r0, r2 bl FieldObjectForceSetSpecialAnim pop {r0} bx r0 .align 2, 0 _0805C01C: .4byte gUnknown_2037078 -_0805C020: .4byte gUnknown_2036E38 +_0805C020: .4byte gMapObjects thumb_func_end sub_805BFFC thumb_func_start sub_805C024 @@ -1734,7 +1734,7 @@ sub_805C024: @ 805C024 lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _0805C068 @ =gUnknown_2036E38 + ldr r1, _0805C068 @ =gMapObjects adds r0, r1 adds r1, r5, 0 bl sub_8063CA4 @@ -1749,7 +1749,7 @@ _0805C05E: bx r0 .align 2, 0 _0805C064: .4byte gUnknown_2037078 -_0805C068: .4byte gUnknown_2036E38 +_0805C068: .4byte gMapObjects thumb_func_end sub_805C024 thumb_func_start sub_805C06C @@ -1762,7 +1762,7 @@ sub_805C06C: @ 805C06C lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _0805C0A0 @ =gUnknown_2036E38 + ldr r1, _0805C0A0 @ =gMapObjects adds r0, r1 adds r1, r4, 0 bl sub_8063CA4 @@ -1778,7 +1778,7 @@ _0805C094: bx r0 .align 2, 0 _0805C09C: .4byte gUnknown_2037078 -_0805C0A0: .4byte gUnknown_2036E38 +_0805C0A0: .4byte gMapObjects thumb_func_end sub_805C06C thumb_func_start sub_805C0A4 @@ -2056,7 +2056,7 @@ _0805C27E: lsls r0, 24 cmp r0, 0 beq _0805C2A6 - ldr r2, _0805C2B0 @ =gUnknown_2036E38 + ldr r2, _0805C2B0 @ =gMapObjects ldrb r1, [r4, 0x5] lsls r0, r1, 3 adds r0, r1 @@ -2075,7 +2075,7 @@ _0805C2A6: bx r0 .align 2, 0 _0805C2AC: .4byte gUnknown_2037078 -_0805C2B0: .4byte gUnknown_2036E38 +_0805C2B0: .4byte gMapObjects thumb_func_end sub_805C270 thumb_func_start sub_805C2B4 @@ -2301,7 +2301,7 @@ sub_805C438: @ 805C438 lsls r0, 24 lsrs r5, r0, 24 adds r6, r5, 0 - ldr r2, _0805C4E8 @ =gUnknown_2036E38 + ldr r2, _0805C4E8 @ =gMapObjects ldr r0, _0805C4EC @ =gUnknown_2037078 ldrb r1, [r0, 0x5] lsls r0, r1, 3 @@ -2378,7 +2378,7 @@ _0805C4DE: pop {r0} bx r0 .align 2, 0 -_0805C4E8: .4byte gUnknown_2036E38 +_0805C4E8: .4byte gMapObjects _0805C4EC: .4byte gUnknown_2037078 _0805C4F0: .4byte gUnknown_835B864 thumb_func_end sub_805C438 @@ -2388,7 +2388,7 @@ GetXYCoordsOneStepInFrontOfPlayer: @ 805C4F4 push {r4,r5,lr} adds r4, r0, 0 adds r5, r1, 0 - ldr r3, _0805C530 @ =gUnknown_2036E38 + ldr r3, _0805C530 @ =gMapObjects ldr r2, _0805C534 @ =gUnknown_2037078 ldrb r1, [r2, 0x5] lsls r0, r1, 3 @@ -2414,14 +2414,14 @@ GetXYCoordsOneStepInFrontOfPlayer: @ 805C4F4 pop {r0} bx r0 .align 2, 0 -_0805C530: .4byte gUnknown_2036E38 +_0805C530: .4byte gMapObjects _0805C534: .4byte gUnknown_2037078 thumb_func_end GetXYCoordsOneStepInFrontOfPlayer thumb_func_start PlayerGetDestCoords PlayerGetDestCoords: @ 805C538 push {r4,r5,lr} - ldr r5, _0805C560 @ =gUnknown_2036E38 + ldr r5, _0805C560 @ =gMapObjects ldr r4, _0805C564 @ =gUnknown_2037078 ldrb r3, [r4, 0x5] lsls r2, r3, 3 @@ -2441,7 +2441,7 @@ PlayerGetDestCoords: @ 805C538 pop {r0} bx r0 .align 2, 0 -_0805C560: .4byte gUnknown_2036E38 +_0805C560: .4byte gMapObjects _0805C564: .4byte gUnknown_2037078 thumb_func_end PlayerGetDestCoords @@ -2455,7 +2455,7 @@ plaer_get_pos_including_state_based_drift: @ 805C568 lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _0805C5C0 @ =gUnknown_2036E38 + ldr r1, _0805C5C0 @ =gMapObjects adds r3, r0, r1 ldrb r1, [r3] movs r0, 0xC0 @@ -2493,7 +2493,7 @@ _0805C5B0: mov pc, r0 .align 2, 0 _0805C5BC: .4byte gUnknown_2037078 -_0805C5C0: .4byte gUnknown_2036E38 +_0805C5C0: .4byte gMapObjects _0805C5C4: .4byte gSprites _0805C5C8: .4byte _0805C5CC .align 2, 0 @@ -2584,7 +2584,7 @@ _0805C6BC: thumb_func_start player_get_direction_lower_nybble player_get_direction_lower_nybble: @ 805C6C4 - ldr r2, _0805C6DC @ =gUnknown_2036E38 + ldr r2, _0805C6DC @ =gMapObjects ldr r0, _0805C6E0 @ =gUnknown_2037078 ldrb r1, [r0, 0x5] lsls r0, r1, 3 @@ -2596,13 +2596,13 @@ player_get_direction_lower_nybble: @ 805C6C4 lsrs r0, 28 bx lr .align 2, 0 -_0805C6DC: .4byte gUnknown_2036E38 +_0805C6DC: .4byte gMapObjects _0805C6E0: .4byte gUnknown_2037078 thumb_func_end player_get_direction_lower_nybble thumb_func_start player_get_direction_upper_nybble player_get_direction_upper_nybble: @ 805C6E4 - ldr r2, _0805C6F8 @ =gUnknown_2036E38 + ldr r2, _0805C6F8 @ =gMapObjects ldr r0, _0805C6FC @ =gUnknown_2037078 ldrb r1, [r0, 0x5] lsls r0, r1, 3 @@ -2613,13 +2613,13 @@ player_get_direction_upper_nybble: @ 805C6E4 lsrs r0, 4 bx lr .align 2, 0 -_0805C6F8: .4byte gUnknown_2036E38 +_0805C6F8: .4byte gMapObjects _0805C6FC: .4byte gUnknown_2037078 thumb_func_end player_get_direction_upper_nybble thumb_func_start PlayerGetZCoord PlayerGetZCoord: @ 805C700 - ldr r2, _0805C714 @ =gUnknown_2036E38 + ldr r2, _0805C714 @ =gMapObjects ldr r0, _0805C718 @ =gUnknown_2037078 ldrb r1, [r0, 0x5] lsls r0, r1, 3 @@ -2630,7 +2630,7 @@ PlayerGetZCoord: @ 805C700 lsrs r0, 4 bx lr .align 2, 0 -_0805C714: .4byte gUnknown_2036E38 +_0805C714: .4byte gMapObjects _0805C718: .4byte gUnknown_2037078 thumb_func_end PlayerGetZCoord @@ -2644,7 +2644,7 @@ sub_805C71C: @ 805C71C lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _0805C748 @ =gUnknown_2036E38 + ldr r1, _0805C748 @ =gMapObjects adds r0, r1 lsls r3, 16 asrs r3, 16 @@ -2656,7 +2656,7 @@ sub_805C71C: @ 805C71C bx r0 .align 2, 0 _0805C744: .4byte gUnknown_2037078 -_0805C748: .4byte gUnknown_2036E38 +_0805C748: .4byte gMapObjects thumb_func_end sub_805C71C thumb_func_start TestPlayerAvatarFlags @@ -2704,7 +2704,7 @@ sub_805C780: @ 805C780 lsls r4, r0, 3 adds r4, r0 lsls r4, 2 - ldr r0, _0805C7C4 @ =gUnknown_2036E38 + ldr r0, _0805C7C4 @ =gMapObjects adds r4, r0 adds r0, r4, 0 bl npc_clear_strange_bits @@ -2727,7 +2727,7 @@ _0805C7B8: bx r0 .align 2, 0 _0805C7C0: .4byte gUnknown_2037078 -_0805C7C4: .4byte gUnknown_2036E38 +_0805C7C4: .4byte gMapObjects thumb_func_end sub_805C780 thumb_func_start sub_805C7C8 @@ -2882,7 +2882,7 @@ IsPlayerFacingSurfableFishableWater: @ 805C8B0 lsls r4, r0, 3 adds r4, r0 lsls r4, 2 - ldr r0, _0805C928 @ =gUnknown_2036E38 + ldr r0, _0805C928 @ =gMapObjects adds r4, r0 ldrh r1, [r4, 0x10] mov r0, sp @@ -2930,7 +2930,7 @@ IsPlayerFacingSurfableFishableWater: @ 805C8B0 b _0805C92E .align 2, 0 _0805C924: .4byte gUnknown_2037078 -_0805C928: .4byte gUnknown_2036E38 +_0805C928: .4byte gMapObjects _0805C92C: movs r0, 0 _0805C92E: @@ -3152,7 +3152,7 @@ InitPlayerAvatar: @ 805CA3C lsls r4, r5, 3 adds r4, r5 lsls r4, 2 - ldr r0, _0805CAFC @ =gUnknown_2036E38 + ldr r0, _0805CAFC @ =gMapObjects adds r4, r0 ldrb r0, [r4, 0x2] movs r1, 0x1 @@ -3182,7 +3182,7 @@ InitPlayerAvatar: @ 805CA3C pop {r0} bx r0 .align 2, 0 -_0805CAFC: .4byte gUnknown_2036E38 +_0805CAFC: .4byte gMapObjects _0805CB00: .4byte gUnknown_2037078 thumb_func_end InitPlayerAvatar @@ -3191,7 +3191,7 @@ sub_805CB04: @ 805CB04 push {r4-r6,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r6, _0805CB64 @ =gUnknown_2036E38 + ldr r6, _0805CB64 @ =gMapObjects ldr r5, _0805CB68 @ =gUnknown_2037078 ldrb r0, [r5, 0x5] lsls r1, r0, 3 @@ -3236,7 +3236,7 @@ _0805CB5C: pop {r0} bx r0 .align 2, 0 -_0805CB64: .4byte gUnknown_2036E38 +_0805CB64: .4byte gMapObjects _0805CB68: .4byte gUnknown_2037078 _0805CB6C: .4byte gSprites thumb_func_end sub_805CB04 @@ -3249,7 +3249,7 @@ sub_805CB70: @ 805CB70 lsls r4, r0, 3 adds r4, r0 lsls r4, 2 - ldr r0, _0805CBB0 @ =gUnknown_2036E38 + ldr r0, _0805CBB0 @ =gMapObjects adds r4, r0 movs r0, 0x3 bl sub_805C808 @@ -3271,7 +3271,7 @@ sub_805CB70: @ 805CB70 bx r0 .align 2, 0 _0805CBAC: .4byte gUnknown_2037078 -_0805CBB0: .4byte gUnknown_2036E38 +_0805CBB0: .4byte gMapObjects _0805CBB4: .4byte gSprites thumb_func_end sub_805CB70 @@ -3311,7 +3311,7 @@ sub_805CBE8: @ 805CBE8 lsls r4, r0, 3 adds r4, r0 lsls r4, 2 - ldr r0, _0805CC24 @ =gUnknown_2036E38 + ldr r0, _0805CC24 @ =gMapObjects adds r4, r0 bl sub_805CBB8 adds r1, r0, 0 @@ -3332,7 +3332,7 @@ sub_805CBE8: @ 805CBE8 bx r0 .align 2, 0 _0805CC20: .4byte gUnknown_2037078 -_0805CC24: .4byte gUnknown_2036E38 +_0805CC24: .4byte gMapObjects _0805CC28: .4byte gSprites thumb_func_end sub_805CBE8 @@ -3468,7 +3468,7 @@ taskFF_bump_boulder: @ 805CD0C lsrs r0, 24 ldr r6, _0805CD54 @ =gUnknown_835B8A0 ldr r2, _0805CD58 @ =gTasks - ldr r5, _0805CD5C @ =gUnknown_2036E38 + ldr r5, _0805CD5C @ =gMapObjects lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -3502,7 +3502,7 @@ _0805CD20: .align 2, 0 _0805CD54: .4byte gUnknown_835B8A0 _0805CD58: .4byte gTasks -_0805CD5C: .4byte gUnknown_2036E38 +_0805CD5C: .4byte gMapObjects _0805CD60: .4byte gUnknown_2037078 thumb_func_end taskFF_bump_boulder @@ -3677,7 +3677,7 @@ _0805CEB2: lsls r1, r0, 3 adds r1, r0 lsls r1, 2 - ldr r0, _0805CEE8 @ =gUnknown_2036E38 + ldr r0, _0805CEE8 @ =gMapObjects adds r1, r0 ldr r2, [r2] adds r0, r4, 0 @@ -3692,7 +3692,7 @@ _0805CEB2: _0805CEDC: .4byte gUnknown_835B8AC _0805CEE0: .4byte gTasks _0805CEE4: .4byte gUnknown_2037078 -_0805CEE8: .4byte gUnknown_2036E38 +_0805CEE8: .4byte gMapObjects thumb_func_end sub_805CEA0 thumb_func_start PlayerAvatar_DoSecretBaseMatJump @@ -3785,7 +3785,7 @@ _0805CF8A: lsls r1, r0, 3 adds r1, r0 lsls r1, 2 - ldr r0, _0805CFC0 @ =gUnknown_2036E38 + ldr r0, _0805CFC0 @ =gMapObjects adds r1, r0 ldr r2, [r2] adds r0, r4, 0 @@ -3800,7 +3800,7 @@ _0805CF8A: _0805CFB4: .4byte gUnknown_835B8B0 _0805CFB8: .4byte gTasks _0805CFBC: .4byte gUnknown_2037078 -_0805CFC0: .4byte gUnknown_2036E38 +_0805CFC0: .4byte gMapObjects thumb_func_end sub_805CF78 thumb_func_start sub_805CFC4 @@ -4070,7 +4070,7 @@ taskFF_0805D1D4: @ 805D1D4 lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _0805D234 @ =gUnknown_2036E38 + ldr r1, _0805D234 @ =gMapObjects adds r5, r0, r1 adds r0, r5, 0 bl FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive @@ -4106,7 +4106,7 @@ _0805D228: bx r0 .align 2, 0 _0805D230: .4byte gUnknown_2037078 -_0805D234: .4byte gUnknown_2036E38 +_0805D234: .4byte gMapObjects _0805D238: .4byte gTasks _0805D23C: .4byte sub_805D240 thumb_func_end taskFF_0805D1D4 @@ -4121,7 +4121,7 @@ sub_805D240: @ 805D240 lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _0805D2B8 @ =gUnknown_2036E38 + ldr r1, _0805D2B8 @ =gMapObjects adds r4, r0, r1 adds r0, r4, 0 bl FieldObjectClearAnimIfSpecialAnimFinished @@ -4164,7 +4164,7 @@ _0805D2AE: bx r0 .align 2, 0 _0805D2B4: .4byte gUnknown_2037078 -_0805D2B8: .4byte gUnknown_2036E38 +_0805D2B8: .4byte gMapObjects _0805D2BC: .4byte gSprites thumb_func_end sub_805D240 @@ -4281,7 +4281,7 @@ fish1: @ 805D35C ldrh r1, [r6] adds r1, r0 strh r1, [r5, 0x22] - ldr r3, _0805D3EC @ =gUnknown_2036E38 + ldr r3, _0805D3EC @ =gMapObjects ldr r2, _0805D3F0 @ =gUnknown_2037078 ldrb r1, [r2, 0x5] lsls r0, r1, 3 @@ -4316,7 +4316,7 @@ fish1: @ 805D35C .align 2, 0 _0805D3E4: .4byte gUnknown_835B90C _0805D3E8: .4byte gUnknown_835B912 -_0805D3EC: .4byte gUnknown_2036E38 +_0805D3EC: .4byte gMapObjects _0805D3F0: .4byte gUnknown_2037078 thumb_func_end fish1 @@ -4727,7 +4727,7 @@ _0805D6EA: lsls r4, r0, 3 adds r4, r0 lsls r4, 2 - ldr r0, _0805D77C @ =gUnknown_2036E38 + ldr r0, _0805D77C @ =gMapObjects mov r8, r0 add r4, r8 ldrh r1, [r5, 0x24] @@ -4777,7 +4777,7 @@ _0805D748: .align 2, 0 _0805D774: .4byte gUnknown_2037078 _0805D778: .4byte gSprites -_0805D77C: .4byte gUnknown_2036E38 +_0805D77C: .4byte gMapObjects _0805D780: movs r1, 0xA ldrsh r0, [r5, r1] @@ -4971,7 +4971,7 @@ sub_805D8D8: @ 805D8D8 lsls r4, r0, 3 adds r4, r0 lsls r4, 2 - ldr r0, _0805D97C @ =gUnknown_2036E38 + ldr r0, _0805D97C @ =gMapObjects mov r8, r0 add r4, r8 ldrh r1, [r6, 0x24] @@ -5024,7 +5024,7 @@ _0805D968: .align 2, 0 _0805D974: .4byte gUnknown_2037078 _0805D978: .4byte gSprites -_0805D97C: .4byte gUnknown_2036E38 +_0805D97C: .4byte gMapObjects thumb_func_end sub_805D8D8 thumb_func_start sub_805D980 @@ -5159,7 +5159,7 @@ _0805DA78: ands r0, r1 cmp r0, 0 beq _0805DA9C - ldr r2, _0805DAAC @ =gUnknown_2036E38 + ldr r2, _0805DAAC @ =gMapObjects ldrb r1, [r3, 0x5] lsls r0, r1, 3 adds r0, r1 @@ -5177,7 +5177,7 @@ _0805DA9C: .align 2, 0 _0805DAA4: .4byte 0x0000fff8 _0805DAA8: .4byte gUnknown_2037078 -_0805DAAC: .4byte gUnknown_2036E38 +_0805DAAC: .4byte gMapObjects thumb_func_end sub_805D9C4 thumb_func_start sub_805DAB0 @@ -5247,7 +5247,7 @@ sub_805DB04: @ 805DB04 lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _0805DB4C @ =gUnknown_2036E38 + ldr r1, _0805DB4C @ =gMapObjects adds r4, r0, r1 ldrb r1, [r4, 0x4] lsls r0, r1, 4 @@ -5271,7 +5271,7 @@ sub_805DB04: @ 805DB04 b _0805DBFA .align 2, 0 _0805DB48: .4byte gUnknown_2037078 -_0805DB4C: .4byte gUnknown_2036E38 +_0805DB4C: .4byte gMapObjects _0805DB50: .4byte gSprites _0805DB54: .4byte gTasks+0x8 _0805DB58: @@ -5406,7 +5406,7 @@ sub_805DC38: @ 805DC38 lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _0805DC84 @ =gUnknown_2036E38 + ldr r1, _0805DC84 @ =gMapObjects adds r4, r0, r1 ldrb r1, [r4, 0x4] lsls r0, r1, 4 @@ -5431,7 +5431,7 @@ sub_805DC38: @ 805DC38 b _0805DDBA .align 2, 0 _0805DC80: .4byte gUnknown_2037078 -_0805DC84: .4byte gUnknown_2036E38 +_0805DC84: .4byte gMapObjects _0805DC88: .4byte gSprites _0805DC8C: .4byte gTasks+0x8 _0805DC90: diff --git a/asm/field_screen_effect.s b/asm/field_screen_effect.s index 2a6ee5c65..a1a51b908 100644 --- a/asm/field_screen_effect.s +++ b/asm/field_screen_effect.s @@ -942,7 +942,7 @@ _0807F542: lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _0807F580 @ =gUnknown_2036E38 + ldr r1, _0807F580 @ =gMapObjects adds r0, r1 movs r1, 0x2 bl FieldObjectTurn @@ -958,7 +958,7 @@ _0807F542: .align 2, 0 _0807F578: .4byte gUnknown_841B5B6 _0807F57C: .4byte gUnknown_2037078 -_0807F580: .4byte gUnknown_2036E38 +_0807F580: .4byte gMapObjects _0807F584: .4byte gTasks _0807F588: lsls r4, r6, 2 diff --git a/asm/field_specials.s b/asm/field_specials.s index 40ece5c90..9acb16b27 100644 --- a/asm/field_specials.s +++ b/asm/field_specials.s @@ -604,7 +604,7 @@ SpawnScriptFieldObject: @ 80CAA34 bl SpawnSpecialFieldObjectParametrized lsls r0, 24 lsrs r0, 24 - ldr r2, _080CAA84 @ =gUnknown_2036E38 + ldr r2, _080CAA84 @ =gMapObjects lsls r1, r0, 3 adds r1, r0 lsls r1, 2 @@ -620,7 +620,7 @@ SpawnScriptFieldObject: @ 80CAA34 bx r0 .align 2, 0 _080CAA80: .4byte gSaveBlock1Ptr -_080CAA84: .4byte gUnknown_2036E38 +_080CAA84: .4byte gMapObjects thumb_func_end SpawnScriptFieldObject thumb_func_start RemoveScriptFieldObject @@ -3167,7 +3167,7 @@ sub_80CBE00: @ 80CBE00 _080CBE18: .4byte gUnknown_20370DA _080CBE1C: .4byte gUnknown_3005074 _080CBE20: - ldr r2, _080CBE4C @ =gUnknown_2036E38 + ldr r2, _080CBE4C @ =gMapObjects ldrb r1, [r1] lsls r0, r1, 3 adds r0, r1 @@ -3191,7 +3191,7 @@ _080CBE48: pop {r1} bx r1 .align 2, 0 -_080CBE4C: .4byte gUnknown_2036E38 +_080CBE4C: .4byte gMapObjects thumb_func_end sub_80CBE00 thumb_func_start sub_80CBE50 diff --git a/asm/link_rfu_3.s b/asm/link_rfu_3.s index e9705196f..3715fa608 100644 --- a/asm/link_rfu_3.s +++ b/asm/link_rfu_3.s @@ -11378,7 +11378,7 @@ sub_811B66C: @ 811B66C lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _0811B6C0 @ =gUnknown_2036E38 + ldr r1, _0811B6C0 @ =gMapObjects adds r4, r0, r1 adds r0, r4, 0 bl FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive @@ -11396,7 +11396,7 @@ sub_811B66C: @ 811B66C .align 2, 0 _0811B6B8: .4byte gUnknown_8457120 _0811B6BC: .4byte gSaveBlock1Ptr -_0811B6C0: .4byte gUnknown_2036E38 +_0811B6C0: .4byte gMapObjects _0811B6C4: ldr r0, _0811B6DC @ =gUnknown_8457138 "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/rfu_union_tool.c" ldr r1, _0811B6E0 @ =0x00000183 @@ -11437,7 +11437,7 @@ sub_811B6E8: @ 811B6E8 lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _0811B72C @ =gUnknown_2036E38 + ldr r1, _0811B72C @ =gMapObjects adds r4, r0, r1 adds r0, r4, 0 bl FieldObjectClearAnimIfSpecialAnimFinished @@ -11449,7 +11449,7 @@ sub_811B6E8: @ 811B6E8 .align 2, 0 _0811B724: .4byte gUnknown_8457120 _0811B728: .4byte gSaveBlock1Ptr -_0811B72C: .4byte gUnknown_2036E38 +_0811B72C: .4byte gMapObjects _0811B730: bl ScriptContext2_IsEnabled lsls r0, 24 diff --git a/asm/load_save.s b/asm/load_save.s index 836abd78e..a8e6eff17 100644 --- a/asm/load_save.s +++ b/asm/load_save.s @@ -345,7 +345,7 @@ save_serialize_npcs: @ 804C270 movs r5, 0xD4 lsls r5, 3 mov r8, r5 - ldr r4, _0804C2B4 @ =gUnknown_2036E38 + ldr r4, _0804C2B4 @ =gMapObjects movs r3, 0 movs r2, 0xF _0804C286: @@ -372,7 +372,7 @@ _0804C286: bx r0 .align 2, 0 _0804C2B0: .4byte gSaveBlock1Ptr -_0804C2B4: .4byte gUnknown_2036E38 +_0804C2B4: .4byte gMapObjects thumb_func_end save_serialize_npcs thumb_func_start sub_804C2B8 @@ -385,7 +385,7 @@ sub_804C2B8: @ 804C2B8 movs r5, 0xD4 lsls r5, 3 mov r8, r5 - ldr r4, _0804C2FC @ =gUnknown_2036E38 + ldr r4, _0804C2FC @ =gMapObjects movs r3, 0 movs r2, 0xF _0804C2CE: @@ -412,7 +412,7 @@ _0804C2CE: bx r0 .align 2, 0 _0804C2F8: .4byte gSaveBlock1Ptr -_0804C2FC: .4byte gUnknown_2036E38 +_0804C2FC: .4byte gMapObjects thumb_func_end sub_804C2B8 thumb_func_start SaveSerializedGame diff --git a/asm/map_obj_80688E4.s b/asm/map_obj_80688E4.s index 5ba346f0b..0f878255c 100644 --- a/asm/map_obj_80688E4.s +++ b/asm/map_obj_80688E4.s @@ -86,7 +86,7 @@ _0806896E: player_bitmagic: @ 8068974 push {r4,r5,lr} movs r4, 0 - ldr r5, _080689A8 @ =gUnknown_2036E38 + ldr r5, _080689A8 @ =gMapObjects _0806897A: lsls r0, r4, 3 adds r0, r4 @@ -112,7 +112,7 @@ _08068998: pop {r0} bx r0 .align 2, 0 -_080689A8: .4byte gUnknown_2036E38 +_080689A8: .4byte gMapObjects _080689AC: .4byte gUnknown_2037078 thumb_func_end player_bitmagic @@ -122,7 +122,7 @@ FreezeMapObjectsExceptOne: @ 80689B0 lsls r0, 24 lsrs r5, r0, 24 movs r4, 0 - ldr r6, _080689EC @ =gUnknown_2036E38 + ldr r6, _080689EC @ =gMapObjects _080689BA: cmp r4, r5 beq _080689DC @@ -150,7 +150,7 @@ _080689DC: pop {r0} bx r0 .align 2, 0 -_080689EC: .4byte gUnknown_2036E38 +_080689EC: .4byte gMapObjects _080689F0: .4byte gUnknown_2037078 thumb_func_end FreezeMapObjectsExceptOne @@ -213,7 +213,7 @@ _08068A58: .4byte gSprites UnfreezeMapObjects: @ 8068A5C push {r4,r5,lr} movs r4, 0 - ldr r5, _08068A88 @ =gUnknown_2036E38 + ldr r5, _08068A88 @ =gMapObjects _08068A62: lsls r0, r4, 3 adds r0, r4 @@ -235,7 +235,7 @@ _08068A78: pop {r0} bx r0 .align 2, 0 -_08068A88: .4byte gUnknown_2036E38 +_08068A88: .4byte gMapObjects thumb_func_end UnfreezeMapObjects thumb_func_start little_step diff --git a/asm/map_obj_lock.s b/asm/map_obj_lock.s index 2b3cbfc5a..a5a61662d 100644 --- a/asm/map_obj_lock.s +++ b/asm/map_obj_lock.s @@ -100,7 +100,7 @@ _080695F6: ldrsh r0, [r5, r1] cmp r0, 0 bne _0806961E - ldr r2, _08069640 @ =gUnknown_2036E38 + ldr r2, _08069640 @ =gMapObjects ldr r0, _08069644 @ =gUnknown_3005074 ldrb r1, [r0] lsls r0, r1, 3 @@ -132,7 +132,7 @@ _08069634: bx r0 .align 2, 0 _0806963C: .4byte gTasks -_08069640: .4byte gUnknown_2036E38 +_08069640: .4byte gMapObjects _08069644: .4byte gUnknown_3005074 thumb_func_end sub_80695CC @@ -167,7 +167,7 @@ LockSelectedMapObject: @ 806966C bl CreateTask lsls r0, 24 lsrs r5, r0, 24 - ldr r2, _080696B8 @ =gUnknown_2036E38 + ldr r2, _080696B8 @ =gMapObjects ldrb r1, [r4] lsls r0, r1, 3 adds r0, r1 @@ -193,7 +193,7 @@ _080696AA: .align 2, 0 _080696B0: .4byte gUnknown_3005074 _080696B4: .4byte sub_80695CC -_080696B8: .4byte gUnknown_2036E38 +_080696B8: .4byte gMapObjects _080696BC: .4byte gTasks thumb_func_end LockSelectedMapObject @@ -210,7 +210,7 @@ sub_80696C0: @ 80696C0 lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _080696EC @ =gUnknown_2036E38 + ldr r1, _080696EC @ =gMapObjects adds r0, r1 bl FieldObjectClearAnimIfSpecialAnimFinished bl sub_80974D8 @@ -218,13 +218,13 @@ sub_80696C0: @ 80696C0 pop {r0} bx r0 .align 2, 0 -_080696EC: .4byte gUnknown_2036E38 +_080696EC: .4byte gMapObjects thumb_func_end sub_80696C0 thumb_func_start sub_80696F0 sub_80696F0: @ 80696F0 push {r4,lr} - ldr r4, _08069738 @ =gUnknown_2036E38 + ldr r4, _08069738 @ =gMapObjects ldr r0, _0806973C @ =gUnknown_3005074 ldrb r1, [r0] lsls r0, r1, 3 @@ -256,7 +256,7 @@ _0806970E: pop {r0} bx r0 .align 2, 0 -_08069738: .4byte gUnknown_2036E38 +_08069738: .4byte gMapObjects _0806973C: .4byte gUnknown_3005074 thumb_func_end sub_80696F0 @@ -268,7 +268,7 @@ sub_8069740: @ 8069740 lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _08069760 @ =gUnknown_2036E38 + ldr r1, _08069760 @ =gMapObjects adds r0, r1 ldr r1, _08069764 @ =gUnknown_20370D4 ldrb r1, [r1] @@ -277,7 +277,7 @@ sub_8069740: @ 8069740 bx r0 .align 2, 0 _0806975C: .4byte gUnknown_3005074 -_08069760: .4byte gUnknown_2036E38 +_08069760: .4byte gMapObjects _08069764: .4byte gUnknown_20370D4 thumb_func_end sub_8069740 @@ -289,14 +289,14 @@ sub_8069768: @ 8069768 lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _08069784 @ =gUnknown_2036E38 + ldr r1, _08069784 @ =gMapObjects adds r0, r1 bl FieldObjectClearAnimIfSpecialAnimActive pop {r0} bx r0 .align 2, 0 _08069780: .4byte gUnknown_3005074 -_08069784: .4byte gUnknown_2036E38 +_08069784: .4byte gMapObjects thumb_func_end sub_8069768 .align 2, 0 @ Don't pad with nop. diff --git a/asm/overworld.s b/asm/overworld.s index ec52f7af1..63849f1fb 100644 --- a/asm/overworld.s +++ b/asm/overworld.s @@ -4734,7 +4734,7 @@ sub_8057100: @ 8057100 thumb_func_start sub_8057114 sub_8057114: @ 8057114 push {lr} - ldr r2, _08057138 @ =gUnknown_2036E38 + ldr r2, _08057138 @ =gMapObjects ldr r3, _0805713C @ =gUnknown_2037078 ldrb r1, [r3, 0x5] lsls r0, r1, 3 @@ -4750,7 +4750,7 @@ sub_8057114: @ 8057114 pop {r0} bx r0 .align 2, 0 -_08057138: .4byte gUnknown_2036E38 +_08057138: .4byte gMapObjects _0805713C: .4byte gUnknown_2037078 thumb_func_end sub_8057114 @@ -7200,7 +7200,7 @@ SpawnLinkPlayerMapObject: @ 805839C lsls r5, r6, 3 adds r5, r6 lsls r5, 2 - ldr r0, _08058444 @ =gUnknown_2036E38 + ldr r0, _08058444 @ =gMapObjects adds r5, r0 adds r0, r4, 0 bl ZeroLinkPlayerMapObject @@ -7248,7 +7248,7 @@ SpawnLinkPlayerMapObject: @ 805839C bx r0 .align 2, 0 _08058440: .4byte gUnknown_2031DEC -_08058444: .4byte gUnknown_2036E38 +_08058444: .4byte gMapObjects thumb_func_end SpawnLinkPlayerMapObject thumb_func_start InitLinkPlayerMapObjectPos @@ -7300,7 +7300,7 @@ sub_8058488: @ 8058488 lsls r1, r0, 3 adds r1, r0 lsls r1, 2 - ldr r0, _080584B4 @ =gUnknown_2036E38 + ldr r0, _080584B4 @ =gMapObjects adds r1, r0 strb r2, [r1, 0x19] _080584AA: @@ -7308,7 +7308,7 @@ _080584AA: bx r0 .align 2, 0 _080584B0: .4byte gUnknown_2031DEC -_080584B4: .4byte gUnknown_2036E38 +_080584B4: .4byte gMapObjects thumb_func_end sub_8058488 thumb_func_start sub_80584B8 @@ -7322,7 +7322,7 @@ sub_80584B8: @ 80584B8 lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _080584FC @ =gUnknown_2036E38 + ldr r1, _080584FC @ =gMapObjects adds r4, r0, r1 ldrb r0, [r4, 0x4] cmp r0, 0x40 @@ -7346,7 +7346,7 @@ _080584E4: bx r0 .align 2, 0 _080584F8: .4byte gUnknown_2031DEC -_080584FC: .4byte gUnknown_2036E38 +_080584FC: .4byte gMapObjects _08058500: .4byte gSprites thumb_func_end sub_80584B8 @@ -7360,13 +7360,13 @@ sub_8058504: @ 8058504 lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _08058520 @ =gUnknown_2036E38 + ldr r1, _08058520 @ =gMapObjects adds r0, r1 ldrb r0, [r0, 0x4] bx lr .align 2, 0 _0805851C: .4byte gUnknown_2031DEC -_08058520: .4byte gUnknown_2036E38 +_08058520: .4byte gMapObjects thumb_func_end sub_8058504 thumb_func_start sub_8058524 @@ -7379,7 +7379,7 @@ sub_8058524: @ 8058524 lsls r0, r3, 3 adds r0, r3 lsls r0, 2 - ldr r3, _08058548 @ =gUnknown_2036E38 + ldr r3, _08058548 @ =gMapObjects adds r0, r3 ldrh r3, [r0, 0x10] strh r3, [r1] @@ -7388,7 +7388,7 @@ sub_8058524: @ 8058524 bx lr .align 2, 0 _08058544: .4byte gUnknown_2031DEC -_08058548: .4byte gUnknown_2036E38 +_08058548: .4byte gMapObjects thumb_func_end sub_8058524 thumb_func_start sub_805854C @@ -7401,13 +7401,13 @@ sub_805854C: @ 805854C lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _08058568 @ =gUnknown_2036E38 + ldr r1, _08058568 @ =gMapObjects adds r0, r1 ldrb r0, [r0, 0x19] bx lr .align 2, 0 _08058564: .4byte gUnknown_2031DEC -_08058568: .4byte gUnknown_2036E38 +_08058568: .4byte gMapObjects thumb_func_end sub_805854C thumb_func_start sub_805856C @@ -7420,7 +7420,7 @@ sub_805856C: @ 805856C lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _0805858C @ =gUnknown_2036E38 + ldr r1, _0805858C @ =gMapObjects adds r0, r1 ldrb r0, [r0, 0xB] lsls r0, 28 @@ -7428,7 +7428,7 @@ sub_805856C: @ 805856C bx lr .align 2, 0 _08058588: .4byte gUnknown_2031DEC -_0805858C: .4byte gUnknown_2036E38 +_0805858C: .4byte gMapObjects thumb_func_end sub_805856C thumb_func_start sub_8058590 @@ -7441,7 +7441,7 @@ sub_8058590: @ 8058590 lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _080585B4 @ =gUnknown_2036E38 + ldr r1, _080585B4 @ =gMapObjects adds r0, r1 adds r0, 0x21 movs r1, 0 @@ -7451,7 +7451,7 @@ sub_8058590: @ 8058590 bx lr .align 2, 0 _080585B0: .4byte gUnknown_2031DEC -_080585B4: .4byte gUnknown_2036E38 +_080585B4: .4byte gMapObjects thumb_func_end sub_8058590 thumb_func_start GetLinkPlayerIdAt @@ -7479,7 +7479,7 @@ _080585DA: lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _08058600 @ =gUnknown_2036E38 + ldr r1, _08058600 @ =gMapObjects adds r1, r0, r1 movs r6, 0x10 ldrsh r0, [r1, r6] @@ -7493,7 +7493,7 @@ _080585DA: b _08058610 .align 2, 0 _080585FC: .4byte gUnknown_2031DEC -_08058600: .4byte gUnknown_2036E38 +_08058600: .4byte gMapObjects _08058604: adds r0, r2, 0x1 lsls r0, 24 @@ -7521,7 +7521,7 @@ sub_8058618: @ 8058618 lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _0805864C @ =gUnknown_2036E38 + ldr r1, _0805864C @ =gMapObjects adds r6, r0, r1 ldrb r0, [r5] cmp r0, 0 @@ -7535,7 +7535,7 @@ sub_8058618: @ 8058618 b _08058674 .align 2, 0 _08058648: .4byte gUnknown_2031DEC -_0805864C: .4byte gUnknown_2036E38 +_0805864C: .4byte gMapObjects _08058650: ldr r4, _0805867C @ =gUnknown_826D374 ldr r1, _08058680 @ =gUnknown_826D33C @@ -7780,7 +7780,7 @@ npc_080587EC: @ 80587EC mov r12, r2 lsls r3, 16 movs r4, 0 - ldr r0, _08058850 @ =gUnknown_2036E38 + ldr r0, _08058850 @ =gMapObjects mov r9, r0 lsrs r2, r3, 16 mov r10, r2 @@ -7820,7 +7820,7 @@ _0805884A: movs r0, 0x1 b _0805886A .align 2, 0 -_08058850: .4byte gUnknown_2036E38 +_08058850: .4byte gMapObjects _08058854: adds r0, r4, 0x1 lsls r0, 24 @@ -7857,7 +7857,7 @@ sub_8058878: @ 8058878 lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _080588B8 @ =gUnknown_2036E38 + ldr r1, _080588B8 @ =gMapObjects adds r4, r0, r1 ldrb r0, [r2] cmp r0, 0 @@ -7875,7 +7875,7 @@ sub_8058878: @ 8058878 b _080588C6 .align 2, 0 _080588B4: .4byte gUnknown_2031DEC -_080588B8: .4byte gUnknown_2036E38 +_080588B8: .4byte gMapObjects _080588BC: ldrb r0, [r4] lsls r0, 30 @@ -7931,7 +7931,7 @@ SpriteCB_LinkPlayer: @ 805890C lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _08058974 @ =gUnknown_2036E38 + ldr r1, _08058974 @ =gMapObjects adds r6, r0, r1 ldrh r0, [r6, 0xC] strh r0, [r5, 0x20] @@ -7967,7 +7967,7 @@ SpriteCB_LinkPlayer: @ 805890C b _0805898A .align 2, 0 _08058970: .4byte gUnknown_2031DEC -_08058974: .4byte gUnknown_2036E38 +_08058974: .4byte gMapObjects _08058978: ldrb r0, [r6, 0x19] bl get_go_image_anim_num diff --git a/asm/quest_log.s b/asm/quest_log.s index 505e60275..a1b187919 100644 --- a/asm/quest_log.s +++ b/asm/quest_log.s @@ -5,72 +5,6 @@ .text - thumb_func_start sub_811246C -sub_811246C: @ 811246C - push {r4-r6,lr} - adds r6, r0, 0 - movs r0, 0x2E - ldrsh r1, [r6, r0] - lsls r0, r1, 3 - adds r0, r1 - lsls r0, 2 - ldr r1, _081124B0 @ =gUnknown_2036E38 - adds r4, r0, r1 - ldrb r0, [r4, 0x8] - cmp r0, 0xFF - bne _081124B8 - ldr r5, _081124B4 @ =gUnknown_203AF9A - ldrb r0, [r5] - cmp r0, 0xFF - beq _08112498 - adds r1, r0, 0 - adds r0, r4, 0 - bl sub_8063CA4 - movs r0, 0xFF - strb r0, [r5] -_08112498: - ldrb r0, [r5, 0x1] - cmp r0, 0xFF - beq _081124A6 - bl sub_8150454 - movs r0, 0xFF - strb r0, [r5, 0x1] -_081124A6: - adds r0, r4, 0 - adds r1, r6, 0 - bl sub_8063E28 - b _081124E0 - .align 2, 0 -_081124B0: .4byte gUnknown_2036E38 -_081124B4: .4byte gUnknown_203AF9A -_081124B8: - ldr r5, _081124E8 @ =gUnknown_203AF9A - ldrb r0, [r4, 0x8] - lsls r0, 1 - adds r1, r0, r5 - ldrb r0, [r1] - cmp r0, 0xFF - beq _081124D8 - adds r1, r0, 0 - adds r0, r4, 0 - bl sub_8063CA4 - ldrb r0, [r4, 0x8] - lsls r0, 1 - adds r0, r5 - movs r1, 0xFF - strb r1, [r0] -_081124D8: - adds r0, r4, 0 - adds r1, r6, 0 - bl sub_8063E28 -_081124E0: - pop {r4-r6} - pop {r0} - bx r0 - .align 2, 0 -_081124E8: .4byte gUnknown_203AF9A - thumb_func_end sub_811246C - thumb_func_start sub_81124EC sub_81124EC: @ 81124EC push {r4-r7,lr} diff --git a/asm/quest_log_8150454.s b/asm/quest_log_8150454.s index 1fe631d20..76dadd6e0 100644 --- a/asm/quest_log_8150454.s +++ b/asm/quest_log_8150454.s @@ -64,7 +64,7 @@ sub_81504A8: @ 81504A8 lsls r4, r0, 3 adds r4, r0 lsls r4, 2 - ldr r0, _081504E4 @ =gUnknown_2036E38 + ldr r0, _081504E4 @ =gMapObjects adds r4, r0 movs r0, 0 bl sub_805C808 @@ -84,7 +84,7 @@ sub_81504A8: @ 81504A8 bx r0 .align 2, 0 _081504E0: .4byte gUnknown_2037078 -_081504E4: .4byte gUnknown_2036E38 +_081504E4: .4byte gMapObjects thumb_func_end sub_81504A8 thumb_func_start sub_81504E8 @@ -95,7 +95,7 @@ sub_81504E8: @ 81504E8 lsls r4, r0, 3 adds r4, r0 lsls r4, 2 - ldr r0, _0815052C @ =gUnknown_2036E38 + ldr r0, _0815052C @ =gMapObjects adds r4, r0 movs r0, 0x1 bl sub_805C808 @@ -118,7 +118,7 @@ sub_81504E8: @ 81504E8 bx r0 .align 2, 0 _08150528: .4byte gUnknown_2037078 -_0815052C: .4byte gUnknown_2036E38 +_0815052C: .4byte gMapObjects thumb_func_end sub_81504E8 thumb_func_start sub_8150530 @@ -129,7 +129,7 @@ sub_8150530: @ 8150530 lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _08150580 @ =gUnknown_2036E38 + ldr r1, _08150580 @ =gMapObjects adds r4, r0, r1 ldrb r1, [r4, 0x4] lsls r0, r1, 4 @@ -162,7 +162,7 @@ _08150558: b _081505BC .align 2, 0 _0815057C: .4byte gUnknown_2037078 -_08150580: .4byte gUnknown_2036E38 +_08150580: .4byte gMapObjects _08150584: .4byte gSprites _08150588: .4byte gUnknown_3005E88 _0815058C: .4byte sub_81505C4 @@ -205,7 +205,7 @@ sub_81505C4: @ 81505C4 lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _08150610 @ =gUnknown_2036E38 + ldr r1, _08150610 @ =gMapObjects adds r5, r0, r1 ldrb r1, [r5, 0x4] lsls r0, r1, 4 @@ -230,7 +230,7 @@ sub_81505C4: @ 81505C4 b _081506FC .align 2, 0 _0815060C: .4byte gUnknown_2037078 -_08150610: .4byte gUnknown_2036E38 +_08150610: .4byte gMapObjects _08150614: .4byte gSprites _08150618: .4byte gTasks _0815061C: @@ -353,7 +353,7 @@ sub_8150708: @ 8150708 lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _08150774 @ =gUnknown_2036E38 + ldr r1, _08150774 @ =gMapObjects adds r4, r0, r1 ldrb r1, [r5] movs r0, 0x8 @@ -395,7 +395,7 @@ _08150768: bx r0 .align 2, 0 _08150770: .4byte gUnknown_2037078 -_08150774: .4byte gUnknown_2036E38 +_08150774: .4byte gMapObjects _08150778: .4byte gUnknown_20386E0 thumb_func_end sub_8150708 diff --git a/asm/rom6.s b/asm/rom6.s index a438b9276..76da35ac8 100644 --- a/asm/rom6.s +++ b/asm/rom6.s @@ -23,7 +23,7 @@ npc_before_player_of_type: @ 80C97A8 bl GetFieldObjectIdByXYZ lsls r0, 24 lsrs r0, 24 - ldr r2, _080C97EC @ =gUnknown_2036E38 + ldr r2, _080C97EC @ =gMapObjects lsls r1, r0, 3 adds r1, r0 lsls r1, 2 @@ -38,7 +38,7 @@ npc_before_player_of_type: @ 80C97A8 b _080C97F6 .align 2, 0 _080C97E8: .4byte gUnknown_2039A04 -_080C97EC: .4byte gUnknown_2036E38 +_080C97EC: .4byte gMapObjects _080C97F0: .4byte gUnknown_20370D2 _080C97F4: movs r0, 0 @@ -80,7 +80,7 @@ task08_080C9820: @ 80C9820 lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _080C9878 @ =gUnknown_2036E38 + ldr r1, _080C9878 @ =gMapObjects adds r4, r0, r1 adds r0, r4, 0 bl FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive @@ -108,7 +108,7 @@ _080C9856: b _080C98A0 .align 2, 0 _080C9874: .4byte gUnknown_2037078 -_080C9878: .4byte gUnknown_2036E38 +_080C9878: .4byte gMapObjects _080C987C: .4byte gMapHeader _080C9880: .4byte gTasks _080C9884: .4byte sub_80C98FC @@ -144,7 +144,7 @@ sub_80C98B0: @ 80C98B0 lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _080C98F0 @ =gUnknown_2036E38 + ldr r1, _080C98F0 @ =gMapObjects adds r0, r1 bl FieldObjectCheckIfSpecialAnimFinishedOrInactive lsls r0, 24 @@ -166,7 +166,7 @@ _080C98E4: bx r0 .align 2, 0 _080C98EC: .4byte gUnknown_2037078 -_080C98F0: .4byte gUnknown_2036E38 +_080C98F0: .4byte gMapObjects _080C98F4: .4byte gTasks _080C98F8: .4byte sub_80C98FC thumb_func_end sub_80C98B0 @@ -212,7 +212,7 @@ _080C993C: lsls r4, r0, 3 adds r4, r0 lsls r4, 2 - ldr r0, _080C9990 @ =gUnknown_2036E38 + ldr r0, _080C9990 @ =gMapObjects adds r4, r0 bl GetPlayerAvatarGraphicsIdByCurrentState adds r1, r0, 0 @@ -244,7 +244,7 @@ _080C9980: .align 2, 0 _080C9988: .4byte gUnknown_20386E0 _080C998C: .4byte gUnknown_2037078 -_080C9990: .4byte gUnknown_2036E38 +_080C9990: .4byte gMapObjects _080C9994: .4byte gSprites _080C9998: .4byte gTasks _080C999C: .4byte sub_80C99A0 diff --git a/asm/scrcmd.s b/asm/scrcmd.s index e795e48b8..733860772 100644 --- a/asm/scrcmd.s +++ b/asm/scrcmd.s @@ -3065,7 +3065,7 @@ ScrCmd_resetobjectpriority: @ 806B58C thumb_func_start ScrCmd_faceplayer ScrCmd_faceplayer: @ 806B5BC push {r4,lr} - ldr r2, _0806B5EC @ =gUnknown_2036E38 + ldr r2, _0806B5EC @ =gMapObjects ldr r0, _0806B5F0 @ =gUnknown_3005074 ldrb r1, [r0] lsls r0, r1, 3 @@ -3088,7 +3088,7 @@ _0806B5E4: pop {r1} bx r1 .align 2, 0 -_0806B5EC: .4byte gUnknown_2036E38 +_0806B5EC: .4byte gMapObjects _0806B5F0: .4byte gUnknown_3005074 thumb_func_end ScrCmd_faceplayer @@ -3245,7 +3245,7 @@ ScrCmd_lock: @ 806B704 movs r0, 0 b _0806B752 _0806B714: - ldr r2, _0806B738 @ =gUnknown_2036E38 + ldr r2, _0806B738 @ =gMapObjects ldr r0, _0806B73C @ =gUnknown_3005074 ldrb r1, [r0] lsls r0, r1, 3 @@ -3262,7 +3262,7 @@ _0806B714: bl SetupNativeScript b _0806B750 .align 2, 0 -_0806B738: .4byte gUnknown_2036E38 +_0806B738: .4byte gMapObjects _0806B73C: .4byte gUnknown_3005074 _0806B740: .4byte sub_8069648 _0806B744: @@ -3294,7 +3294,7 @@ ScrCmd_releaseall: @ 806B75C lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _0806B790 @ =gUnknown_2036E38 + ldr r1, _0806B790 @ =gMapObjects adds r0, r1 bl FieldObjectClearAnimIfSpecialAnimFinished bl sub_80974D8 @@ -3303,14 +3303,14 @@ ScrCmd_releaseall: @ 806B75C pop {r1} bx r1 .align 2, 0 -_0806B790: .4byte gUnknown_2036E38 +_0806B790: .4byte gMapObjects thumb_func_end ScrCmd_releaseall thumb_func_start ScrCmd_release ScrCmd_release: @ 806B794 push {r4,lr} bl HideFieldMessageBox - ldr r4, _0806B7E4 @ =gUnknown_2036E38 + ldr r4, _0806B7E4 @ =gMapObjects ldr r0, _0806B7E8 @ =gUnknown_3005074 ldrb r1, [r0] lsls r0, r1, 3 @@ -3343,7 +3343,7 @@ _0806B7B6: pop {r1} bx r1 .align 2, 0 -_0806B7E4: .4byte gUnknown_2036E38 +_0806B7E4: .4byte gMapObjects _0806B7E8: .4byte gUnknown_3005074 thumb_func_end ScrCmd_release diff --git a/asm/script_movement.s b/asm/script_movement.s index 58becc75a..826d6d6bd 100644 --- a/asm/script_movement.s +++ b/asm/script_movement.s @@ -480,7 +480,7 @@ _0809777C: lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _080977A8 @ =gUnknown_2036E38 + ldr r1, _080977A8 @ =gMapObjects adds r0, r1 bl npc_sync_anim_pause_bits _08097792: @@ -495,7 +495,7 @@ _08097792: bx r0 .align 2, 0 _080977A4: .4byte gTasks+0x8 -_080977A8: .4byte gUnknown_2036E38 +_080977A8: .4byte gMapObjects thumb_func_end UnfreezeObjects thumb_func_start Task_80A244C @@ -557,7 +557,7 @@ sub_80977F0: @ 80977F0 lsls r0, r4, 3 adds r0, r4 lsls r0, 2 - ldr r1, _08097850 @ =gUnknown_2036E38 + ldr r1, _08097850 @ =gMapObjects adds r4, r0, r1 adds r0, r4, 0 bl FieldObjectIsSpecialAnimActive @@ -580,7 +580,7 @@ _08097838: bl FreezeMapObject b _0809786A .align 2, 0 -_08097850: .4byte gUnknown_2036E38 +_08097850: .4byte gMapObjects _08097854: adds r0, r4, 0 bl sub_8063CA4 diff --git a/asm/shop.s b/asm/shop.s index 2160a54ca..da5ab15ee 100644 --- a/asm/shop.s +++ b/asm/shop.s @@ -1889,7 +1889,7 @@ _0809B976: ldr r1, _0809B9EC @ =gUnknown_20398B8 adds r0, r2, r1 strh r5, [r0] - ldr r1, _0809B9F0 @ =gUnknown_2036E38 + ldr r1, _0809B9F0 @ =gMapObjects lsls r0, r3, 3 adds r0, r3 lsls r0, 2 @@ -1910,7 +1910,7 @@ _0809B9E0: .4byte gUnknown_20398BA _0809B9E4: .4byte 0x0000fffd _0809B9E8: .4byte 0x0000fffe _0809B9EC: .4byte gUnknown_20398B8 -_0809B9F0: .4byte gUnknown_2036E38 +_0809B9F0: .4byte gMapObjects _0809B9F4: cmp r0, 0x3 beq _0809BA06 @@ -1968,7 +1968,7 @@ sub_809BA40: @ 809BA40 sub sp, 0x4 movs r6, 0 ldr r7, _0809BAE8 @ =gUnknown_20398B4 - ldr r0, _0809BAEC @ =gUnknown_2036E38 + ldr r0, _0809BAEC @ =gMapObjects mov r8, r0 adds r1, r7, 0x6 mov r9, r1 @@ -2045,7 +2045,7 @@ _0809BACE: bx r0 .align 2, 0 _0809BAE8: .4byte gUnknown_20398B4 -_0809BAEC: .4byte gUnknown_2036E38 +_0809BAEC: .4byte gMapObjects _0809BAF0: .4byte 0xfff80000 _0809BAF4: .4byte SpriteCallbackDummy _0809BAF8: .4byte gSprites diff --git a/asm/ss_anne.s b/asm/ss_anne.s index 5ba63dea3..429645f3e 100644 --- a/asm/ss_anne.s +++ b/asm/ss_anne.s @@ -100,7 +100,7 @@ _0815D3D6: lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _0815D42C @ =gUnknown_2036E38 + ldr r1, _0815D42C @ =gMapObjects adds r0, r1 ldr r2, _0815D430 @ =gSprites ldrb r1, [r0, 0x4] @@ -128,7 +128,7 @@ _0815D3D6: .align 2, 0 _0815D424: .4byte gTasks+0x8 _0815D428: .4byte gSaveBlock1Ptr -_0815D42C: .4byte gUnknown_2036E38 +_0815D42C: .4byte gMapObjects _0815D430: .4byte gSprites _0815D434: .4byte sub_815D454 _0815D438: @@ -197,7 +197,7 @@ sub_815D498: @ 815D498 lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _0815D50C @ =gUnknown_2036E38 + ldr r1, _0815D50C @ =gMapObjects adds r0, r1 ldr r4, _0815D510 @ =gSprites ldrb r1, [r0, 0x4] @@ -238,7 +238,7 @@ sub_815D498: @ 815D498 bx r0 .align 2, 0 _0815D508: .4byte gSaveBlock1Ptr -_0815D50C: .4byte gUnknown_2036E38 +_0815D50C: .4byte gMapObjects _0815D510: .4byte gSprites _0815D514: .4byte gUnknown_8479C88 thumb_func_end sub_815D498 @@ -260,7 +260,7 @@ sub_815D518: @ 815D518 lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _0815D59C @ =gUnknown_2036E38 + ldr r1, _0815D59C @ =gMapObjects adds r0, r1 ldr r2, _0815D5A0 @ =gSprites ldrb r1, [r0, 0x4] @@ -308,7 +308,7 @@ _0815D58E: bx r0 .align 2, 0 _0815D598: .4byte gSaveBlock1Ptr -_0815D59C: .4byte gUnknown_2036E38 +_0815D59C: .4byte gMapObjects _0815D5A0: .4byte gSprites thumb_func_end sub_815D518 @@ -328,7 +328,7 @@ sub_815D5A4: @ 815D5A4 lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _0815D618 @ =gUnknown_2036E38 + ldr r1, _0815D618 @ =gMapObjects adds r0, r1 ldr r4, _0815D61C @ =gSprites ldrb r0, [r0, 0x4] @@ -371,7 +371,7 @@ _0815D60C: bx r0 .align 2, 0 _0815D614: .4byte gSaveBlock1Ptr -_0815D618: .4byte gUnknown_2036E38 +_0815D618: .4byte gMapObjects _0815D61C: .4byte gSprites _0815D620: .4byte gUnknown_8479CC0 thumb_func_end sub_815D5A4 diff --git a/asm/trainer_see.s b/asm/trainer_see.s index 29c9b1983..cfdd02906 100644 --- a/asm/trainer_see.s +++ b/asm/trainer_see.s @@ -19,7 +19,7 @@ _08081B40: b _08081B7A _08081B44: movs r4, 0 - ldr r5, _08081B80 @ =gUnknown_2036E38 + ldr r5, _08081B80 @ =gMapObjects _08081B48: lsls r0, r4, 3 adds r0, r4 @@ -53,7 +53,7 @@ _08081B7A: pop {r1} bx r1 .align 2, 0 -_08081B80: .4byte gUnknown_2036E38 +_08081B80: .4byte gMapObjects thumb_func_end sub_8081B30 thumb_func_start sub_8081B84 @@ -70,7 +70,7 @@ sub_8081B84: @ 8081B84 lsls r4, r5, 3 adds r0, r4, r5 lsls r0, 2 - ldr r1, _08081BE0 @ =gUnknown_2036E38 + ldr r1, _08081BE0 @ =gMapObjects adds r0, r1 bl sub_8081BEC lsls r0, 24 @@ -90,7 +90,7 @@ _08081BC0: bl TrainerWantsBattle adds r0, r4, r5 lsls r0, 2 - ldr r1, _08081BE0 @ =gUnknown_2036E38 + ldr r1, _08081BE0 @ =gMapObjects adds r0, r1 subs r1, r7, 0x1 lsls r1, 24 @@ -99,7 +99,7 @@ _08081BC0: movs r0, 0x1 b _08081BE6 .align 2, 0 -_08081BE0: .4byte gUnknown_2036E38 +_08081BE0: .4byte gMapObjects _08081BE4: movs r0, 0 _08081BE6: @@ -740,7 +740,7 @@ _0808204A: lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _080820B8 @ =gUnknown_2036E38 + ldr r1, _080820B8 @ =gMapObjects adds r4, r0, r1 adds r0, r4, 0 bl FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive @@ -764,7 +764,7 @@ _080820AC: bx r1 .align 2, 0 _080820B4: .4byte gUnknown_2037078 -_080820B8: .4byte gUnknown_2036E38 +_080820B8: .4byte gMapObjects thumb_func_end sub_808202C thumb_func_start sub_80820BC @@ -777,7 +777,7 @@ sub_80820BC: @ 80820BC lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _080820FC @ =gUnknown_2036E38 + ldr r1, _080820FC @ =gMapObjects adds r4, r0, r1 adds r0, r4, 0 bl FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive @@ -799,7 +799,7 @@ _080820EE: bx r1 .align 2, 0 _080820F8: .4byte gUnknown_2037078 -_080820FC: .4byte gUnknown_2036E38 +_080820FC: .4byte gMapObjects thumb_func_end sub_80820BC thumb_func_start sub_8082100 @@ -1025,7 +1025,7 @@ sub_808226C: @ 808226C movs r1, 0x7 movs r2, 0x7F bl SpawnSpecialFieldObjectParametrized - ldr r2, _080822C8 @ =gUnknown_2036E38 + ldr r2, _080822C8 @ =gMapObjects lsls r1, r0, 3 adds r1, r0 lsls r1, 2 @@ -1046,7 +1046,7 @@ sub_808226C: @ 808226C bx r1 .align 2, 0 _080822C4: .4byte gSaveBlock1Ptr -_080822C8: .4byte gUnknown_2036E38 +_080822C8: .4byte gMapObjects thumb_func_end sub_808226C thumb_func_start sub_80822CC @@ -1067,7 +1067,7 @@ sub_80822CC: @ 80822CC lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r4, _0808234C @ =gUnknown_2036E38 + ldr r4, _0808234C @ =gMapObjects adds r0, r4 bl FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive lsls r0, 24 @@ -1096,7 +1096,7 @@ _08082312: lsls r4, r0, 3 adds r4, r0 lsls r4, 2 - ldr r0, _0808234C @ =gUnknown_2036E38 + ldr r0, _0808234C @ =gMapObjects adds r4, r0 movs r0, 0x2 bl sub_8063FB0 @@ -1111,7 +1111,7 @@ _08082312: b _0808236E .align 2, 0 _08082348: .4byte gSaveBlock1Ptr -_0808234C: .4byte gUnknown_2036E38 +_0808234C: .4byte gMapObjects _08082350: ldr r1, _08082378 @ =gUnknown_20386E0 adds r2, r1, 0x4 @@ -1158,7 +1158,7 @@ sub_808237C: @ 808237C lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r4, _08082408 @ =gUnknown_2036E38 + ldr r4, _08082408 @ =gMapObjects adds r0, r4 bl FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive lsls r0, 24 @@ -1187,7 +1187,7 @@ _080823CC: lsls r4, r0, 3 adds r4, r0 lsls r4, 2 - ldr r0, _08082408 @ =gUnknown_2036E38 + ldr r0, _08082408 @ =gMapObjects adds r4, r0 movs r0, 0x1 bl sub_8063FB0 @@ -1202,7 +1202,7 @@ _080823CC: b _0808242E .align 2, 0 _08082404: .4byte gSaveBlock1Ptr -_08082408: .4byte gUnknown_2036E38 +_08082408: .4byte gMapObjects _0808240C: bl GetPlayerAvatarObjectId lsls r0, 24 @@ -1579,7 +1579,7 @@ _080826DA: bl FieldEffectStop b _08082736 _080826E8: - ldr r2, _0808272C @ =gUnknown_2036E38 + ldr r2, _0808272C @ =gMapObjects mov r0, sp ldrb r1, [r0] lsls r0, r1, 3 @@ -1614,7 +1614,7 @@ _080826E8: strh r0, [r4, 0x34] b _08082736 .align 2, 0 -_0808272C: .4byte gUnknown_2036E38 +_0808272C: .4byte gMapObjects _08082730: .4byte gSprites _08082734: strh r2, [r4, 0x34] diff --git a/asm/unk_810C3A4.s b/asm/unk_810C3A4.s index a202dc769..e7e825483 100644 --- a/asm/unk_810C3A4.s +++ b/asm/unk_810C3A4.s @@ -44,7 +44,7 @@ _0810C3E2: cmp r0, 0 bne _0810C41C movs r4, 0 - ldr r7, _0810C440 @ =gUnknown_2036E38 + ldr r7, _0810C440 @ =gMapObjects _0810C3EE: adds r0, r4, 0 bl sub_810CF04 @@ -85,7 +85,7 @@ _0810C436: bx r0 .align 2, 0 _0810C43C: .4byte gTasks -_0810C440: .4byte gUnknown_2036E38 +_0810C440: .4byte gMapObjects thumb_func_end sub_810C3B8 thumb_func_start sub_810C444 @@ -140,7 +140,7 @@ _0810C47A: lsls r1, r0, 3 adds r1, r0 lsls r1, 2 - ldr r2, _0810C4E8 @ =gUnknown_2036E38 + ldr r2, _0810C4E8 @ =gMapObjects adds r4, r1, r2 bl sub_810CF04 lsls r0, 24 @@ -171,7 +171,7 @@ _0810C4D2: .align 2, 0 _0810C4E0: .4byte gSaveBlock1Ptr _0810C4E4: .4byte gMapHeader -_0810C4E8: .4byte gUnknown_2036E38 +_0810C4E8: .4byte gMapObjects thumb_func_end sub_810C444 thumb_func_start sub_810C4EC @@ -269,7 +269,7 @@ _0810C59A: lsls r0, r5, 3 adds r0, r5 lsls r0, 2 - ldr r1, _0810C5FC @ =gUnknown_2036E38 + ldr r1, _0810C5FC @ =gMapObjects adds r4, r0, r1 ldrb r0, [r4, 0x6] subs r0, 0x4D @@ -314,7 +314,7 @@ _0810C5EA: pop {r0} bx r0 .align 2, 0 -_0810C5FC: .4byte gUnknown_2036E38 +_0810C5FC: .4byte gMapObjects _0810C600: .4byte gSprites thumb_func_end sub_810C594 diff --git a/asm/unk_8159F40.s b/asm/unk_8159F40.s index d84290a08..a4fb6518c 100644 --- a/asm/unk_8159F40.s +++ b/asm/unk_8159F40.s @@ -127,7 +127,7 @@ sub_815A008: @ 815A008 movs r1, 0x7F mov r9, r1 _0815A02E: - ldr r2, _0815A1F4 @ =gUnknown_2036E38 + ldr r2, _0815A1F4 @ =gMapObjects adds r3, r7, r2 ldrb r0, [r3] lsls r0, 31 @@ -355,7 +355,7 @@ _0815A1E4: pop {r0} bx r0 .align 2, 0 -_0815A1F4: .4byte gUnknown_2036E38 +_0815A1F4: .4byte gMapObjects thumb_func_end sub_815A008 thumb_func_start sub_815A1F8 @@ -372,7 +372,7 @@ sub_815A1F8: @ 815A1F8 mov r1, sp movs r0, 0 strh r0, [r1] - ldr r4, _0815A480 @ =gUnknown_2036E38 + ldr r4, _0815A480 @ =gMapObjects ldr r2, _0815A484 @ =0x01000120 mov r0, sp adds r1, r4, 0 @@ -386,7 +386,7 @@ _0815A224: lsls r7, r2, 3 adds r5, r7, r2 lsls r5, 2 - ldr r0, _0815A480 @ =gUnknown_2036E38 + ldr r0, _0815A480 @ =gMapObjects adds r5, r0 lsls r6, r2, 2 add r6, r12 @@ -663,7 +663,7 @@ _0815A444: mov r0, r8 add r0, r12 lsls r0, 2 - ldr r1, _0815A480 @ =gUnknown_2036E38 + ldr r1, _0815A480 @ =gMapObjects adds r6, r0, r1 movs r2, 0x10 ldrsh r0, [r6, r2] @@ -684,7 +684,7 @@ _0815A444: ldrh r0, [r6, 0x12] b _0815A506 .align 2, 0 -_0815A480: .4byte gUnknown_2036E38 +_0815A480: .4byte gMapObjects _0815A484: .4byte 0x01000120 _0815A488: ldrb r4, [r6, 0x1F] @@ -758,7 +758,7 @@ _0815A508: bhi _0815A512 b _0815A224 _0815A512: - ldr r0, _0815A538 @ =gUnknown_2036E38 + ldr r0, _0815A538 @ =gMapObjects ldr r1, _0815A53C @ =gSaveBlock1Ptr ldr r1, [r1] movs r2, 0xD4 @@ -776,7 +776,7 @@ _0815A512: pop {r0} bx r0 .align 2, 0 -_0815A538: .4byte gUnknown_2036E38 +_0815A538: .4byte gMapObjects _0815A53C: .4byte gSaveBlock1Ptr thumb_func_end sub_815A1F8 @@ -815,7 +815,7 @@ sub_815A540: @ 815A540 lsls r4, r0, 3 adds r4, r0 lsls r4, 2 - ldr r0, _0815A5B4 @ =gUnknown_2036E38 + ldr r0, _0815A5B4 @ =gMapObjects adds r4, r0 movs r0, 0x1 bl SetPlayerAvatarTransitionFlags @@ -834,7 +834,7 @@ _0815A5A4: .align 2, 0 _0815A5AC: .4byte gUnknown_203ADFA _0815A5B0: .4byte gUnknown_2037078 -_0815A5B4: .4byte gUnknown_2036E38 +_0815A5B4: .4byte gMapObjects _0815A5B8: .4byte gSprites thumb_func_end sub_815A540 diff --git a/asm/vs_seeker.s b/asm/vs_seeker.s index 00f880d86..8e66877fa 100644 --- a/asm/vs_seeker.s +++ b/asm/vs_seeker.s @@ -224,7 +224,7 @@ sub_810C808: @ 810C808 bge _0810C8BC ldr r7, _0810C8E4 @ =gUnknown_203ADB8 mov r6, sp - ldr r0, _0810C8E8 @ =gUnknown_2036E38 + ldr r0, _0810C8E8 @ =gMapObjects mov r10, r0 adds r5, r2, 0 _0810C83C: @@ -312,7 +312,7 @@ _0810C8BC: _0810C8DC: .4byte gSaveBlock1Ptr _0810C8E0: .4byte gMapHeader _0810C8E4: .4byte gUnknown_203ADB8 -_0810C8E8: .4byte gUnknown_2036E38 +_0810C8E8: .4byte gMapObjects thumb_func_end sub_810C808 thumb_func_start sub_810C8EC @@ -544,7 +544,7 @@ _0810CAA0: lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _0810CB5C @ =gUnknown_2036E38 + ldr r1, _0810CB5C @ =gMapObjects adds r0, r1 bl npc_coords_shift_still ldr r0, [r6] @@ -618,7 +618,7 @@ _0810CB2C: .align 2, 0 _0810CB54: .4byte gSaveBlock1Ptr _0810CB58: .4byte 0x0000063a -_0810CB5C: .4byte gUnknown_2036E38 +_0810CB5C: .4byte gMapObjects _0810CB60: .4byte gUnknown_8453F64 _0810CB64: .4byte 0x00000431 _0810CB68: .4byte gUnknown_203ADB8 @@ -706,7 +706,7 @@ _0810CBDE: lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _0810CC64 @ =gUnknown_2036E38 + ldr r1, _0810CC64 @ =gMapObjects adds r4, r0, r1 adds r0, r6, 0 bl sub_810CF54 @@ -743,7 +743,7 @@ _0810CC54: .4byte gSaveBlock1Ptr _0810CC58: .4byte gUnknown_845318C _0810CC5C: .4byte gTrainerBattleOpponent_A _0810CC60: .4byte gMapHeader -_0810CC64: .4byte gUnknown_2036E38 +_0810CC64: .4byte gMapObjects _0810CC68: .4byte gUnknown_8453F67 _0810CC6C: .4byte 0x0000063a _0810CC70: .4byte gUnknown_3005074 @@ -1123,7 +1123,7 @@ sub_810CF04: @ 810CF04 lsls r0, r3, 3 adds r0, r3 lsls r0, 2 - ldr r1, _0810CF40 @ =gUnknown_2036E38 + ldr r1, _0810CF40 @ =gMapObjects adds r1, r0, r1 ldrb r0, [r1] lsls r0, 31 @@ -1148,7 +1148,7 @@ sub_810CF04: @ 810CF04 movs r0, 0x1 b _0810CF4E .align 2, 0 -_0810CF40: .4byte gUnknown_2036E38 +_0810CF40: .4byte gMapObjects _0810CF44: .4byte gMapHeader _0810CF48: .4byte gSprites _0810CF4C: @@ -1550,7 +1550,7 @@ sub_810D24C: @ 810D24C lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _0810D278 @ =gUnknown_2036E38 + ldr r1, _0810D278 @ =gMapObjects adds r0, r1 bl npc_sync_anim_pause_bits ldrb r0, [r4, 0x6] @@ -1564,7 +1564,7 @@ sub_810D24C: @ 810D24C pop {r0} bx r0 .align 2, 0 -_0810D278: .4byte gUnknown_2036E38 +_0810D278: .4byte gMapObjects _0810D27C: .4byte gSaveBlock1Ptr thumb_func_end sub_810D24C @@ -1691,7 +1691,7 @@ _0810D340: lsls r1, r0, 3 adds r1, r0 lsls r1, 2 - ldr r2, _0810D3E4 @ =gUnknown_2036E38 + ldr r2, _0810D3E4 @ =gMapObjects adds r4, r1, r2 bl sub_810CF04 lsls r0, 24 @@ -1758,7 +1758,7 @@ _0810D3CC: pop {r0} bx r0 .align 2, 0 -_0810D3E4: .4byte gUnknown_2036E38 +_0810D3E4: .4byte gMapObjects _0810D3E8: .4byte gUnknown_845318C _0810D3EC: .4byte gSaveBlock1Ptr _0810D3F0: .4byte 0x0000063a diff --git a/include/field_map_obj.h b/include/field_map_obj.h index 0107fa10f..22d2d4a78 100644 --- a/include/field_map_obj.h +++ b/include/field_map_obj.h @@ -76,6 +76,8 @@ void MoveCoords(u8, s16 *, s16 *); bool8 FieldObjectIsSpecialAnimActive(struct MapObject *); u8 FieldObjectClearAnimIfSpecialAnimFinished(struct MapObject *); u8 GetFieldObjectIdByXYZ(u16 x, u16 y, u8 z); +void sub_8063E28(struct MapObject *, struct Sprite *); +void sub_8063CA4(struct MapObject *, u8); // Exported data declarations diff --git a/include/quest_log_8150454.h b/include/quest_log_8150454.h new file mode 100644 index 000000000..05bebdd75 --- /dev/null +++ b/include/quest_log_8150454.h @@ -0,0 +1,6 @@ +#ifndef GUARD_QUEST_LOG_8150454_H +#define GUARD_QUEST_LOG_8150454_H + +void sub_8150454(void); + +#endif //GUARD_QUEST_LOG_8150454_H diff --git a/src/quest_log.c b/src/quest_log.c index 0fdedde97..2282520b3 100644 --- a/src/quest_log.c +++ b/src/quest_log.c @@ -14,6 +14,7 @@ #include "overworld.h" #include "field_fadetransition.h" #include "field_weather.h" +#include "field_map_obj.h" #include "map_obj_80688E4.h" #include "map_obj_lock.h" #include "field_player_avatar.h" @@ -25,6 +26,7 @@ #include "unk_8159F40.h" #include "pokemon_storage_system.h" #include "save.h" +#include "quest_log_8150454.h" #include "quest_log.h" u8 gUnknown_3005E88; @@ -58,6 +60,7 @@ EWRAM_DATA u16 *gUnknown_203AE90 = NULL; EWRAM_DATA struct UnkStruct_203AE94 gUnknown_203AE94 = {0}; EWRAM_DATA struct UnkStruct_203AE98 gUnknown_203AE98[32] = {0}; EWRAM_DATA u16 gUnknown_203AF98 = 0; +EWRAM_DATA u8 gUnknown_203AF9A[128]; EWRAM_DATA u16 gUnknown_203B044[2] = {0}; @@ -1414,3 +1417,31 @@ void sub_8112450(void) sub_81123BC(); } } + +void sub_811246C(struct Sprite *sprite) +{ + struct MapObject *mapObject = &gMapObjects[sprite->data[0]]; + if (mapObject->localId == 0xFF) + { + if (gUnknown_203AF9A[0] != 0xFF) + { + sub_8063CA4(mapObject, gUnknown_203AF9A[0]); + gUnknown_203AF9A[0] = 0xFF; + } + if (gUnknown_203AF9A[1] != 0xFF) + { + sub_8150454(); + gUnknown_203AF9A[1] = 0xFF; + } + sub_8063E28(mapObject, sprite); + } + else + { + if (gUnknown_203AF9A[2 * mapObject->localId] != 0xFF) + { + sub_8063CA4(mapObject, gUnknown_203AF9A[2 * mapObject->localId]); + gUnknown_203AF9A[2 * mapObject->localId] = 0xFF; + } + sub_8063E28(mapObject, sprite); + } +} diff --git a/sym_ewram.txt b/sym_ewram.txt index 31eb81c83..3454d792c 100644 --- a/sym_ewram.txt +++ b/sym_ewram.txt @@ -629,7 +629,7 @@ gUnknown_2036E30: @ 2036E30 gUnknown_2036E34: @ 2036E34 .space 0x4 -gUnknown_2036E38: @ 2036E38 +gMapObjects: @ 2036E38 .space 0x240 gUnknown_2037078: @ 2037078 -- cgit v1.2.3 From f0e2b86a7b75d10d4015df92fe8cb3c079bbb2f1 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sat, 13 Oct 2018 08:50:20 -0400 Subject: through sub_81126AC --- asm/quest_log.s | 288 -------------------------------------------------------- src/quest_log.c | 73 +++++++++++++- 2 files changed, 72 insertions(+), 289 deletions(-) diff --git a/asm/quest_log.s b/asm/quest_log.s index a1b187919..ce8445e16 100644 --- a/asm/quest_log.s +++ b/asm/quest_log.s @@ -5,294 +5,6 @@ .text - thumb_func_start sub_81124EC -sub_81124EC: @ 81124EC - push {r4-r7,lr} - mov r7, r10 - mov r6, r9 - mov r5, r8 - push {r5-r7} - lsls r0, 24 - lsrs r6, r0, 24 - lsls r1, 24 - lsrs r1, 24 - mov r8, r1 - lsls r2, 24 - lsrs r2, 24 - mov r9, r2 - lsls r3, 24 - lsrs r3, 24 - mov r10, r3 - bl sub_8112CEC - lsls r0, 24 - lsrs r7, r0, 24 - cmp r7, 0 - bne _0811256E - ldr r2, _0811257C @ =gUnknown_203AF98 - ldrh r0, [r2] - ldr r3, _08112580 @ =gUnknown_3005E94 - ldr r5, [r3] - lsls r0, 3 - adds r0, r5 - ldr r1, _08112584 @ =gUnknown_203B01A - mov r12, r1 - ldrh r1, [r1] - movs r4, 0 - strh r1, [r0, 0x4] - ldrh r0, [r2] - lsls r0, 3 - adds r0, r5 - strb r4, [r0, 0x6] - ldrh r0, [r2] - ldr r1, [r3] - lsls r0, 3 - adds r0, r1 - strb r6, [r0] - ldrh r0, [r2] - ldr r1, [r3] - lsls r0, 3 - adds r0, r1 - mov r4, r8 - strb r4, [r0, 0x1] - ldrh r0, [r2] - ldr r1, [r3] - lsls r0, 3 - adds r0, r1 - mov r1, r9 - strb r1, [r0, 0x2] - ldrh r0, [r2] - ldr r1, [r3] - lsls r0, 3 - adds r0, r1 - mov r4, r10 - strb r4, [r0, 0x3] - ldrh r0, [r2] - adds r0, 0x1 - strh r0, [r2] - mov r0, r12 - strh r7, [r0] -_0811256E: - pop {r3-r5} - mov r8, r3 - mov r9, r4 - mov r10, r5 - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_0811257C: .4byte gUnknown_203AF98 -_08112580: .4byte gUnknown_3005E94 -_08112584: .4byte gUnknown_203B01A - thumb_func_end sub_81124EC - - thumb_func_start sub_8112588 -sub_8112588: @ 8112588 - push {r4-r7,lr} - mov r7, r10 - mov r6, r9 - mov r5, r8 - push {r5-r7} - ldr r4, [sp, 0x20] - lsls r0, 24 - lsrs r7, r0, 24 - lsls r1, 24 - lsrs r6, r1, 24 - lsls r2, 24 - lsrs r2, 24 - mov r8, r2 - lsls r3, 24 - lsrs r3, 24 - mov r9, r3 - lsls r4, 24 - lsrs r4, 24 - mov r10, r4 - bl sub_8112D1C - lsls r0, 24 - cmp r0, 0 - bne _0811260E - ldr r2, _0811261C @ =gUnknown_203AF98 - ldrh r0, [r2] - ldr r3, _08112620 @ =gUnknown_3005E94 - ldr r5, [r3] - lsls r0, 3 - adds r0, r5 - ldr r1, _08112624 @ =gUnknown_203B01A - mov r12, r1 - ldrh r1, [r1] - movs r4, 0 - strh r1, [r0, 0x4] - ldrh r0, [r2] - lsls r0, 3 - adds r0, r5 - strb r4, [r0, 0x6] - ldrh r0, [r2] - ldr r1, [r3] - lsls r0, 3 - adds r0, r1 - strb r7, [r0] - ldrh r0, [r2] - ldr r1, [r3] - lsls r0, 3 - adds r0, r1 - strb r6, [r0, 0x1] - ldrh r0, [r2] - ldr r1, [r3] - lsls r0, 3 - adds r0, r1 - mov r4, r8 - strb r4, [r0, 0x2] - ldrh r0, [r2] - ldr r1, [r3] - lsls r0, 3 - adds r0, r1 - mov r1, r9 - strb r1, [r0, 0x3] - ldrh r0, [r2] - adds r0, 0x1 - strh r0, [r2] - mov r0, r10 - mov r4, r12 - strh r0, [r4] -_0811260E: - pop {r3-r5} - mov r8, r3 - mov r9, r4 - mov r10, r5 - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_0811261C: .4byte gUnknown_203AF98 -_08112620: .4byte gUnknown_3005E94 -_08112624: .4byte gUnknown_203B01A - thumb_func_end sub_8112588 - - thumb_func_start sub_8112628 -sub_8112628: @ 8112628 - push {r4-r7,lr} - mov r7, r8 - push {r7} - lsls r0, 24 - lsrs r4, r0, 24 - mov r8, r4 - bl sub_8112CEC - lsls r0, 24 - lsrs r7, r0, 24 - cmp r7, 0 - bne _08112692 - ldr r0, _0811269C @ =gUnknown_203B01C - mov r12, r0 - ldrh r0, [r0] - ldr r6, _081126A0 @ =gUnknown_3005E94 - ldr r5, [r6] - lsls r0, 3 - adds r0, r5 - ldrb r0, [r0, 0x3] - cmp r4, r0 - bne _08112658 - cmp r4, 0x3 - bls _08112692 -_08112658: - ldr r2, _081126A4 @ =gUnknown_203AF98 - ldrh r0, [r2] - lsls r0, 3 - adds r0, r5 - ldr r4, _081126A8 @ =gUnknown_203B01A - ldrh r1, [r4] - movs r3, 0 - strh r1, [r0, 0x4] - ldrh r0, [r2] - lsls r0, 3 - adds r0, r5 - strb r3, [r0, 0x6] - ldrh r0, [r2] - ldr r1, [r6] - lsls r0, 3 - adds r0, r1 - strb r3, [r0] - ldrh r0, [r2] - ldr r1, [r6] - lsls r0, 3 - adds r0, r1 - mov r1, r8 - strb r1, [r0, 0x3] - ldrh r0, [r2] - mov r1, r12 - strh r0, [r1] - adds r0, 0x1 - strh r0, [r2] - strh r7, [r4] -_08112692: - pop {r3} - mov r8, r3 - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_0811269C: .4byte gUnknown_203B01C -_081126A0: .4byte gUnknown_3005E94 -_081126A4: .4byte gUnknown_203AF98 -_081126A8: .4byte gUnknown_203B01A - thumb_func_end sub_8112628 - - thumb_func_start sub_81126AC -sub_81126AC: @ 81126AC - push {r4-r7,lr} - mov r7, r8 - push {r7} - lsls r0, 24 - lsrs r7, r0, 24 - lsls r1, 24 - lsrs r1, 24 - mov r8, r1 - bl sub_8112D1C - lsls r0, 24 - cmp r0, 0 - bne _08112704 - ldr r2, _08112710 @ =gUnknown_203AF98 - ldrh r0, [r2] - ldr r3, _08112714 @ =gUnknown_3005E94 - ldr r4, [r3] - lsls r0, 3 - adds r0, r4 - ldr r6, _08112718 @ =gUnknown_203B01A - ldrh r1, [r6] - movs r5, 0 - strh r1, [r0, 0x4] - ldrh r0, [r2] - lsls r0, 3 - adds r0, r4 - strb r5, [r0, 0x6] - ldrh r0, [r2] - ldr r1, [r3] - lsls r0, 3 - adds r0, r1 - strb r5, [r0] - ldrh r0, [r2] - ldr r1, [r3] - lsls r0, 3 - adds r0, r1 - strb r7, [r0, 0x3] - ldr r1, _0811271C @ =gUnknown_203B01C - ldrh r0, [r2] - strh r0, [r1] - adds r0, 0x1 - strh r0, [r2] - mov r0, r8 - strh r0, [r6] -_08112704: - pop {r3} - mov r8, r3 - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_08112710: .4byte gUnknown_203AF98 -_08112714: .4byte gUnknown_3005E94 -_08112718: .4byte gUnknown_203B01A -_0811271C: .4byte gUnknown_203B01C - thumb_func_end sub_81126AC - thumb_func_start sub_8112720 sub_8112720: @ 8112720 push {r4-r7,lr} diff --git a/src/quest_log.c b/src/quest_log.c index 2282520b3..3cc392165 100644 --- a/src/quest_log.c +++ b/src/quest_log.c @@ -43,10 +43,16 @@ struct UnkStruct_203AE94 struct UnkStruct_203AE98 { - u8 filler_0[6]; + u8 unk_0; + u8 unk_1; + u8 unk_2; + u8 unk_3; + u16 unk_4; u8 unk_6; }; +IWRAM_DATA struct UnkStruct_203AE98 * gUnknown_3005E94; + EWRAM_DATA u8 gUnknown_203ADF8 = 0; EWRAM_DATA u8 gUnknown_203ADF9 = 0; EWRAM_DATA u8 gUnknown_203ADFA = 0; @@ -61,6 +67,8 @@ EWRAM_DATA struct UnkStruct_203AE94 gUnknown_203AE94 = {0}; EWRAM_DATA struct UnkStruct_203AE98 gUnknown_203AE98[32] = {0}; EWRAM_DATA u16 gUnknown_203AF98 = 0; EWRAM_DATA u8 gUnknown_203AF9A[128]; +EWRAM_DATA u16 gUnknown_203B01A; +EWRAM_DATA u16 gUnknown_203B01C; EWRAM_DATA u16 gUnknown_203B044[2] = {0}; @@ -103,6 +111,8 @@ void sub_811229C(void); void sub_8112364(void); void sub_8112888(u8); void sub_8112940(u8, struct UnkStruct_203AE98 *, u16); +bool8 sub_8112CEC(void); +bool8 sub_8112D1C(void); void sub_8113A1C(u8); void sub_811381C(void); void sub_81138F8(void); @@ -1445,3 +1455,64 @@ void sub_811246C(struct Sprite *sprite) sub_8063E28(mapObject, sprite); } } + +void sub_81124EC(u8 a0, u8 a1, u8 a2, u8 a3) +{ + if (!sub_8112CEC()) + { + gUnknown_3005E94[gUnknown_203AF98].unk_4 = gUnknown_203B01A; + gUnknown_3005E94[gUnknown_203AF98].unk_6 = 0; + gUnknown_3005E94[gUnknown_203AF98].unk_0 = a0; + gUnknown_3005E94[gUnknown_203AF98].unk_1 = a1; + gUnknown_3005E94[gUnknown_203AF98].unk_2 = a2; + gUnknown_3005E94[gUnknown_203AF98].unk_3 = a3; + gUnknown_203AF98++; + gUnknown_203B01A = 0; + } +} + +void sub_8112588(u8 a0, u8 a1, u8 a2, u8 a3, u8 a4) +{ + if (!sub_8112D1C()) + { + gUnknown_3005E94[gUnknown_203AF98].unk_4 = gUnknown_203B01A; + gUnknown_3005E94[gUnknown_203AF98].unk_6 = 0; + gUnknown_3005E94[gUnknown_203AF98].unk_0 = a0; + gUnknown_3005E94[gUnknown_203AF98].unk_1 = a1; + gUnknown_3005E94[gUnknown_203AF98].unk_2 = a2; + gUnknown_3005E94[gUnknown_203AF98].unk_3 = a3; + gUnknown_203AF98++; + gUnknown_203B01A = a4; + } +} + +void sub_8112628(u8 a0) +{ + if (!sub_8112CEC()) + { + if (a0 != gUnknown_3005E94[gUnknown_203B01C].unk_3 || a0 > 3) + { + gUnknown_3005E94[gUnknown_203AF98].unk_4 = gUnknown_203B01A; + gUnknown_3005E94[gUnknown_203AF98].unk_6 = 0; + gUnknown_3005E94[gUnknown_203AF98].unk_0 = 0; + gUnknown_3005E94[gUnknown_203AF98].unk_3 = a0; + gUnknown_203B01C = gUnknown_203AF98; + gUnknown_203AF98++; + gUnknown_203B01A = 0; + } + } +} + +void sub_81126AC(u8 a0, u8 a1) +{ + if (!sub_8112D1C()) + { + gUnknown_3005E94[gUnknown_203AF98].unk_4 = gUnknown_203B01A; + gUnknown_3005E94[gUnknown_203AF98].unk_6 = 0; + gUnknown_3005E94[gUnknown_203AF98].unk_0 = 0; + gUnknown_3005E94[gUnknown_203AF98].unk_3 = a0; + gUnknown_203B01C = gUnknown_203AF98; + gUnknown_203AF98++; + gUnknown_203B01A = a1; + } +} -- cgit v1.2.3 From 4190928a1109d425a5d87bbde8ec2321de52dd58 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sat, 13 Oct 2018 09:28:50 -0400 Subject: through sub_81127F8 --- asm/battle_setup.s | 4 +- asm/bike.s | 74 ++++----- asm/field_camera.s | 4 +- asm/field_control_avatar.s | 86 +++++----- asm/field_door.s | 8 +- asm/field_effect.s | 232 +++++++++++++------------- asm/field_effect_helpers.s | 8 +- asm/field_fadetransition.s | 24 +-- asm/field_ground_effect.s | 18 +- asm/field_map_obj.s | 30 ++-- asm/field_player_avatar.s | 362 ++++++++++++++++++++--------------------- asm/field_screen_effect.s | 4 +- asm/field_specials.s | 4 +- asm/field_tasks.s | 6 +- asm/fieldmap.s | 6 +- asm/fldeff_cut.s | 4 +- asm/item_menu.s | 6 +- asm/item_use.s | 4 +- asm/link_rfu_3.s | 8 +- asm/map_obj_80688E4.s | 8 +- asm/map_obj_lock.s | 4 +- asm/metatile_behavior.s | 6 +- asm/overworld.s | 14 +- asm/party_menu.s | 6 +- asm/quest_log.s | 183 --------------------- asm/quest_log_8150454.s | 20 +-- asm/rom6.s | 16 +- asm/start_menu.s | 6 +- asm/trainer_see.s | 14 +- asm/unk_8159F40.s | 18 +- include/field_control_avatar.h | 6 + include/quest_log.h | 2 + src/quest_log.c | 50 +++++- sym_ewram.txt | 2 +- 34 files changed, 560 insertions(+), 687 deletions(-) create mode 100644 include/field_control_avatar.h diff --git a/asm/battle_setup.s b/asm/battle_setup.s index a1c63477c..128aa459f 100644 --- a/asm/battle_setup.s +++ b/asm/battle_setup.s @@ -757,7 +757,7 @@ sub_807FC5C: @ 807FC5C ldrsh r0, [r0, r1] movs r2, 0 ldrsh r1, [r4, r2] - bl sub_8058F78 + bl MapGridGetMetatileBehaviorAt lsls r0, 16 lsrs r5, r0, 16 lsls r0, r5, 24 @@ -907,7 +907,7 @@ GetBattleTransitionTypeByMap: @ 807FD90 ldrsh r0, [r0, r1] movs r2, 0 ldrsh r1, [r4, r2] - bl sub_8058F78 + bl MapGridGetMetatileBehaviorAt lsls r0, 16 lsrs r4, r0, 16 bl sav1_get_flash_used_on_map diff --git a/asm/bike.s b/asm/bike.s index 1f891f930..fcce5ca66 100644 --- a/asm/bike.s +++ b/asm/bike.s @@ -42,7 +42,7 @@ sub_80BD0D4: @ 80BD0D4 lsls r2, 16 lsrs r2, 16 ldr r4, _080BD0F8 @ =gUnknown_83E7D10 - ldr r3, _080BD0FC @ =gUnknown_2037078 + ldr r3, _080BD0FC @ =gPlayerAvatar ldrb r3, [r3, 0x8] lsls r3, 2 adds r3, r4 @@ -55,7 +55,7 @@ sub_80BD0D4: @ 80BD0D4 bx r1 .align 2, 0 _080BD0F8: .4byte gUnknown_83E7D10 -_080BD0FC: .4byte gUnknown_2037078 +_080BD0FC: .4byte gPlayerAvatar thumb_func_end sub_80BD0D4 thumb_func_start sub_80BD100 @@ -72,7 +72,7 @@ sub_80BD100: @ 80BD100 lsls r2, 16 lsrs r2, 16 mov r9, r2 - ldr r5, _080BD15C @ =gUnknown_2037078 + ldr r5, _080BD15C @ =gPlayerAvatar ldrb r0, [r5, 0x5] lsls r4, r0, 3 adds r4, r0 @@ -105,7 +105,7 @@ sub_80BD100: @ 80BD100 movs r0, 0x3 b _080BD1B6 .align 2, 0 -_080BD15C: .4byte gUnknown_2037078 +_080BD15C: .4byte gPlayerAvatar _080BD160: .4byte gMapObjects _080BD164: .4byte gMain _080BD168: @@ -124,11 +124,11 @@ _080BD176: bne _080BD18C _080BD17E: strb r7, [r6] - ldr r1, _080BD188 @ =gUnknown_2037078 + ldr r1, _080BD188 @ =gPlayerAvatar movs r0, 0 b _080BD1B4 .align 2, 0 -_080BD188: .4byte gUnknown_2037078 +_080BD188: .4byte gPlayerAvatar _080BD18C: cmp r0, r7 beq _080BD1B0 @@ -148,7 +148,7 @@ _080BD18C: lsrs r0, 24 b _080BD1B6 _080BD1B0: - ldr r1, _080BD1C4 @ =gUnknown_2037078 + ldr r1, _080BD1C4 @ =gPlayerAvatar movs r0, 0x2 _080BD1B4: strb r0, [r1, 0x2] @@ -161,13 +161,13 @@ _080BD1B6: pop {r1} bx r1 .align 2, 0 -_080BD1C4: .4byte gUnknown_2037078 +_080BD1C4: .4byte gPlayerAvatar thumb_func_end sub_80BD100 thumb_func_start sub_80BD1C8 sub_80BD1C8: @ 80BD1C8 push {lr} - ldr r2, _080BD1E4 @ =gUnknown_2037078 + ldr r2, _080BD1E4 @ =gPlayerAvatar ldrb r1, [r2, 0x9] strb r1, [r0] movs r1, 0 @@ -179,7 +179,7 @@ sub_80BD1C8: @ 80BD1C8 pop {r1} bx r1 .align 2, 0 -_080BD1E4: .4byte gUnknown_2037078 +_080BD1E4: .4byte gPlayerAvatar thumb_func_end sub_80BD1C8 thumb_func_start sub_80BD1E8 @@ -199,7 +199,7 @@ sub_80BD1E8: @ 80BD1E8 lsls r0, 24 lsrs r5, r0, 24 adds r7, r5, 0 - ldr r4, _080BD240 @ =gUnknown_2037078 + ldr r4, _080BD240 @ =gPlayerAvatar ldrb r1, [r4, 0x5] lsls r0, r1, 3 adds r0, r1 @@ -226,7 +226,7 @@ sub_80BD1E8: @ 80BD1E8 lsrs r0, 24 b _080BD270 .align 2, 0 -_080BD240: .4byte gUnknown_2037078 +_080BD240: .4byte gPlayerAvatar _080BD244: .4byte gMapObjects _080BD248: movs r0, 0x2 @@ -276,7 +276,7 @@ sub_80BD28C: @ 80BD28C push {r4,r5,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r0, _080BD2C0 @ =gUnknown_2037078 + ldr r0, _080BD2C0 @ =gPlayerAvatar ldrb r1, [r0, 0x5] lsls r0, r1, 3 adds r0, r1 @@ -298,7 +298,7 @@ _080BD2B2: pop {r0} bx r0 .align 2, 0 -_080BD2C0: .4byte gUnknown_2037078 +_080BD2C0: .4byte gPlayerAvatar _080BD2C4: .4byte gMapObjects thumb_func_end sub_80BD28C @@ -308,7 +308,7 @@ sub_80BD2C8: @ 80BD2C8 lsls r0, 24 lsrs r4, r0, 24 adds r6, r4, 0 - ldr r0, _080BD2F8 @ =gUnknown_2037078 + ldr r0, _080BD2F8 @ =gPlayerAvatar ldrb r1, [r0, 0x5] lsls r0, r1, 3 adds r0, r1 @@ -326,7 +326,7 @@ sub_80BD2C8: @ 80BD2C8 bl sub_80BD27C b _080BD350 .align 2, 0 -_080BD2F8: .4byte gUnknown_2037078 +_080BD2F8: .4byte gPlayerAvatar _080BD2FC: .4byte gMapObjects _080BD300: adds r0, r4, 0 @@ -420,7 +420,7 @@ sub_80BD3A0: @ 80BD3A0 adds r6, r0, 0 lsls r6, 24 lsrs r6, 24 - ldr r0, _080BD404 @ =gUnknown_2037078 + ldr r0, _080BD404 @ =gPlayerAvatar ldrb r0, [r0, 0x5] lsls r4, r0, 3 adds r4, r0 @@ -443,7 +443,7 @@ sub_80BD3A0: @ 80BD3A0 ldrsh r0, [r0, r1] movs r2, 0 ldrsh r1, [r5, r2] - bl sub_8058F78 + bl MapGridGetMetatileBehaviorAt lsls r0, 24 lsrs r0, 24 add r1, sp, 0x4 @@ -462,7 +462,7 @@ sub_80BD3A0: @ 80BD3A0 pop {r1} bx r1 .align 2, 0 -_080BD404: .4byte gUnknown_2037078 +_080BD404: .4byte gPlayerAvatar _080BD408: .4byte gMapObjects thumb_func_end sub_80BD3A0 @@ -645,7 +645,7 @@ _080BD538: sub_80BD540: @ 80BD540 push {r4,lr} sub sp, 0x4 - ldr r0, _080BD57C @ =gUnknown_2037078 + ldr r0, _080BD57C @ =gPlayerAvatar ldrb r1, [r0] movs r0, 0x18 ands r0, r1 @@ -661,7 +661,7 @@ sub_80BD540: @ 80BD540 ldrsh r0, [r0, r1] movs r2, 0 ldrsh r1, [r4, r2] - bl sub_8058F78 + bl MapGridGetMetatileBehaviorAt lsls r0, 24 lsrs r0, 24 bl sub_80BD4B8 @@ -671,7 +671,7 @@ sub_80BD540: @ 80BD540 movs r0, 0 b _080BD582 .align 2, 0 -_080BD57C: .4byte gUnknown_2037078 +_080BD57C: .4byte gPlayerAvatar _080BD580: movs r0, 0x1 _080BD582: @@ -690,7 +690,7 @@ player_should_look_direction_be_enforced_upon_movement: @ 80BD58C cmp r0, 0 beq _080BD5C0 ldr r2, _080BD5B8 @ =gMapObjects - ldr r0, _080BD5BC @ =gUnknown_2037078 + ldr r0, _080BD5BC @ =gPlayerAvatar ldrb r1, [r0, 0x5] lsls r0, r1, 3 adds r0, r1 @@ -705,7 +705,7 @@ player_should_look_direction_be_enforced_upon_movement: @ 80BD58C b _080BD5C2 .align 2, 0 _080BD5B8: .4byte gMapObjects -_080BD5BC: .4byte gUnknown_2037078 +_080BD5BC: .4byte gPlayerAvatar _080BD5C0: movs r0, 0x1 _080BD5C2: @@ -721,7 +721,7 @@ sub_80BD5C8: @ 80BD5C8 ldr r1, _080BD5F0 @ =gUnknown_2036E2C movs r0, 0 strb r0, [r1] - ldr r0, _080BD5F4 @ =gUnknown_2037078 + ldr r0, _080BD5F4 @ =gPlayerAvatar ldrb r1, [r0] movs r0, 0x6 ands r0, r1 @@ -734,7 +734,7 @@ sub_80BD5C8: @ 80BD5C8 b _080BD618 .align 2, 0 _080BD5F0: .4byte gUnknown_2036E2C -_080BD5F4: .4byte gUnknown_2037078 +_080BD5F4: .4byte gPlayerAvatar _080BD5F8: adds r0, r2, 0 bl SetPlayerAvatarTransitionFlags @@ -757,7 +757,7 @@ _080BD618: thumb_func_start sub_80BD620 sub_80BD620: @ 80BD620 push {lr} - ldr r2, _080BD64C @ =gUnknown_2037078 + ldr r2, _080BD64C @ =gPlayerAvatar movs r3, 0 strb r3, [r2, 0x8] strb r3, [r2, 0x9] @@ -779,32 +779,32 @@ _080BD638: pop {r0} bx r0 .align 2, 0 -_080BD64C: .4byte gUnknown_2037078 +_080BD64C: .4byte gPlayerAvatar thumb_func_end sub_80BD620 thumb_func_start Bike_UpdateBikeCounterSpeed Bike_UpdateBikeCounterSpeed: @ 80BD650 lsls r0, 24 lsrs r0, 24 - ldr r2, _080BD660 @ =gUnknown_2037078 + ldr r2, _080BD660 @ =gPlayerAvatar strb r0, [r2, 0xA] lsrs r1, r0, 1 adds r0, r1 strb r0, [r2, 0xB] bx lr .align 2, 0 -_080BD660: .4byte gUnknown_2037078 +_080BD660: .4byte gPlayerAvatar thumb_func_end Bike_UpdateBikeCounterSpeed thumb_func_start sub_80BD664 sub_80BD664: @ 80BD664 - ldr r1, _080BD670 @ =gUnknown_2037078 + ldr r1, _080BD670 @ =gPlayerAvatar movs r0, 0 strb r0, [r1, 0xA] strb r0, [r1, 0xB] bx lr .align 2, 0 -_080BD670: .4byte gUnknown_2037078 +_080BD670: .4byte gPlayerAvatar thumb_func_end sub_80BD664 thumb_func_start GetPlayerSpeed @@ -815,7 +815,7 @@ GetPlayerSpeed: @ 80BD674 mov r0, sp movs r2, 0x6 bl memcpy - ldr r2, _080BD6A0 @ =gUnknown_2037078 + ldr r2, _080BD6A0 @ =gPlayerAvatar ldrb r1, [r2] movs r0, 0x2 ands r0, r1 @@ -829,7 +829,7 @@ GetPlayerSpeed: @ 80BD674 b _080BD6BE .align 2, 0 _080BD69C: .4byte gUnknown_83E7D1C -_080BD6A0: .4byte gUnknown_2037078 +_080BD6A0: .4byte gPlayerAvatar _080BD6A4: movs r0, 0x4 ands r0, r1 @@ -856,7 +856,7 @@ _080BD6BE: Bike_HandleBumpySlopeJump: @ 80BD6C4 push {r4,r5,lr} sub sp, 0x4 - ldr r5, _080BD714 @ =gUnknown_2037078 + ldr r5, _080BD714 @ =gPlayerAvatar ldrb r1, [r5] movs r0, 0x4 ands r0, r1 @@ -872,7 +872,7 @@ Bike_HandleBumpySlopeJump: @ 80BD6C4 ldrsh r0, [r0, r1] movs r2, 0 ldrsh r1, [r4, r2] - bl sub_8058F78 + bl MapGridGetMetatileBehaviorAt lsls r0, 24 lsrs r0, 24 bl sub_805A20C @@ -891,7 +891,7 @@ _080BD70C: pop {r0} bx r0 .align 2, 0 -_080BD714: .4byte gUnknown_2037078 +_080BD714: .4byte gPlayerAvatar thumb_func_end Bike_HandleBumpySlopeJump .align 2, 0 @ Don't pad with nop. diff --git a/asm/field_camera.s b/asm/field_camera.s index 6228b9435..3d4ca0025 100644 --- a/asm/field_camera.s +++ b/asm/field_camera.s @@ -1222,7 +1222,7 @@ CameraPanningCB_PanAhead: @ 805AE74 .align 2, 0 _0805AE84: .4byte gUnknown_2036E2C _0805AE88: - ldr r0, _0805AEA0 @ =gUnknown_2037078 + ldr r0, _0805AEA0 @ =gPlayerAvatar ldrb r0, [r0, 0x3] cmp r0, 0x1 bne _0805AEA8 @@ -1235,7 +1235,7 @@ _0805AE88: beq _0805AF10 b _0805AEAE .align 2, 0 -_0805AEA0: .4byte gUnknown_2037078 +_0805AEA0: .4byte gPlayerAvatar _0805AEA4: .4byte gUnknown_3000E9C _0805AEA8: ldr r1, _0805AED0 @ =gUnknown_3000E9C diff --git a/asm/field_control_avatar.s b/asm/field_control_avatar.s index c4551463d..41bcd05c1 100644 --- a/asm/field_control_avatar.s +++ b/asm/field_control_avatar.s @@ -34,8 +34,8 @@ sub_806C888: @ 806C888 bx r0 thumb_func_end sub_806C888 - thumb_func_start sub_806C8BC -sub_806C8BC: @ 806C8BC + thumb_func_start FieldGetPlayerInput +FieldGetPlayerInput: @ 806C8BC push {r4-r7,lr} mov r7, r8 push {r7} @@ -46,14 +46,14 @@ sub_806C8BC: @ 806C8BC mov r4, sp adds r4, 0x2 strh r2, [r4] - ldr r0, _0806CA14 @ =gUnknown_2037078 + ldr r0, _0806CA14 @ =gPlayerAvatar ldrb r1, [r0, 0x2] mov r8, r1 ldrb r6, [r0, 0x3] bl cur_mapdata_block_role_at_player_pos lsls r0, 24 lsrs r0, 24 - bl sub_8059D70 + bl MetatileBehavior_IsMoveTile lsls r0, 24 lsrs r7, r0, 24 bl ScriptContext1_IsScriptSetUp @@ -89,7 +89,7 @@ _0806C914: ands r0, r1 cmp r0, 0 beq _0806C940 - ldr r0, _0806CA14 @ =gUnknown_2037078 + ldr r0, _0806CA14 @ =gPlayerAvatar ldrb r1, [r0] movs r0, 0x40 ands r0, r1 @@ -107,7 +107,7 @@ _0806C940: lsrs r0, 24 cmp r0, 0x1 bls _0806C9D0 - ldr r0, _0806CA14 @ =gUnknown_2037078 + ldr r0, _0806CA14 @ =gPlayerAvatar ldrb r1, [r0] movs r0, 0x40 ands r0, r1 @@ -213,7 +213,7 @@ _0806C9F6: movs r0, 0x2 b _0806CA3E .align 2, 0 -_0806CA14: .4byte gUnknown_2037078 +_0806CA14: .4byte gPlayerAvatar _0806CA18: .4byte gUnknown_203ADFA _0806CA1C: movs r0, 0x80 @@ -244,7 +244,7 @@ _0806CA40: pop {r4-r7} pop {r0} bx r0 - thumb_func_end sub_806C8BC + thumb_func_end FieldGetPlayerInput thumb_func_start sub_806CA4C sub_806CA4C: @ 806CA4C @@ -339,7 +339,7 @@ sub_806CAC8: @ 806CAC8 ldrsh r0, [r0, r1] movs r2, 0x2 ldrsh r1, [r4, r2] - bl sub_8058F78 + bl MapGridGetMetatileBehaviorAt lsls r0, 16 lsrs r4, r0, 16 ldr r7, _0806CB70 @ =gUnknown_3005078 @@ -347,7 +347,7 @@ sub_806CAC8: @ 806CAC8 bl sub_806C888 ldrb r0, [r5, 0x2] strb r0, [r7, 0x2] - bl sub_8081B30 + bl CheckForTrainersWantingBattle lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 @@ -406,7 +406,7 @@ _0806CB88: ldrsh r0, [r0, r1] movs r2, 0x2 ldrsh r1, [r7, r2] - bl sub_8058F78 + bl MapGridGetMetatileBehaviorAt lsls r0, 16 lsrs r4, r0, 16 mov r0, sp @@ -431,7 +431,7 @@ _0806CBC0: ldrsh r0, [r0, r1] movs r2, 0x2 ldrsh r1, [r7, r2] - bl sub_8058F78 + bl MapGridGetMetatileBehaviorAt lsls r0, 16 lsrs r4, r0, 16 _0806CBD8: @@ -441,7 +441,7 @@ _0806CBD8: cmp r0, 0 beq _0806CBFC mov r0, r8 - bl sub_806D7F4 + bl is_it_battle_time_3 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 @@ -464,7 +464,7 @@ _0806CBFC: mov r0, sp adds r1, r4, 0 adds r2, r6, 0 - bl sub_806D964 + bl mapheader_run_first_tag2_script_list_match_conditionally lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 @@ -484,7 +484,7 @@ _0806CC2C: ldrsh r0, [r0, r1] movs r2, 0x2 ldrsh r1, [r4, r2] - bl sub_8058F78 + bl MapGridGetMetatileBehaviorAt lsls r0, 16 lsrs r4, r0, 16 ldrb r1, [r5] @@ -541,7 +541,7 @@ _0806CC9C: mov r0, sp adds r1, r4, 0 adds r2, r6, 0 - bl sub_806DCD0 + bl map_warp_consider_2_to_inside lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 @@ -567,7 +567,7 @@ _0806CCCC: bl FlagSet movs r0, 0x6 bl PlaySE - bl sub_806F258 + bl ShowStartMenu b _0806CB6C .align 2, 0 _0806CCF4: .4byte gUnknown_3005078 @@ -577,7 +577,7 @@ _0806CCFC: ands r0, r1 cmp r0, 0 beq _0806CD20 - bl sub_810AD10 + bl UseRegisteredKeyItemOnField lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 @@ -708,7 +708,7 @@ sub_806CDF8: @ 806CDF8 bne _0806CE18 movs r0, 0x6 bl PlaySE - bl sub_806F258 + bl ShowStartMenu adds r0, r4, 0 bl DestroyTask _0806CE18: @@ -775,7 +775,7 @@ cur_mapdata_block_role_at_player_pos: @ 806CE74 ldrsh r0, [r0, r1] movs r2, 0 ldrsh r1, [r4, r2] - bl sub_8058F78 + bl MapGridGetMetatileBehaviorAt lsls r0, 16 lsrs r0, 16 add sp, 0x4 @@ -873,7 +873,7 @@ sub_806CF38: @ 806CF38 ldrsh r0, [r4, r1] movs r2, 0x2 ldrsh r1, [r4, r2] - bl sub_8058F78 + bl MapGridGetMetatileBehaviorAt lsls r0, 24 lsrs r0, 24 bl MetatileBehavior_IsCounter @@ -1713,7 +1713,7 @@ sub_806D5E8: @ 806D5E8 lsrs r0, 24 cmp r0, 0x1 beq _0806D650 - ldr r0, _0806D654 @ =gUnknown_2037078 + ldr r0, _0806D654 @ =gPlayerAvatar ldrb r1, [r0] movs r0, 0x40 ands r0, r1 @@ -1721,7 +1721,7 @@ sub_806D5E8: @ 806D5E8 bne _0806D658 lsls r0, r6, 24 lsrs r0, 24 - bl sub_8059D70 + bl MetatileBehavior_IsMoveTile lsls r0, 24 cmp r0, 0 bne _0806D658 @@ -1734,7 +1734,7 @@ _0806D650: movs r0, 0x1 b _0806D65A .align 2, 0 -_0806D654: .4byte gUnknown_2037078 +_0806D654: .4byte gPlayerAvatar _0806D658: movs r0, 0 _0806D65A: @@ -1792,7 +1792,7 @@ sub_806D698: @ 806D698 cmp r0, 0x2 beq _0806D72C bl AdjustFriendship_step - ldr r0, _0806D6E4 @ =gUnknown_2037078 + ldr r0, _0806D6E4 @ =gPlayerAvatar ldrb r1, [r0] movs r0, 0x40 ands r0, r1 @@ -1800,7 +1800,7 @@ sub_806D698: @ 806D698 bne _0806D720 lsls r0, r4, 24 lsrs r0, 24 - bl sub_8059D70 + bl MetatileBehavior_IsMoveTile lsls r0, 24 cmp r0, 0 bne _0806D720 @@ -1814,7 +1814,7 @@ sub_806D698: @ 806D698 b _0806D730 .align 2, 0 _0806D6E0: .4byte gUnknown_203ADFA -_0806D6E4: .4byte gUnknown_2037078 +_0806D6E4: .4byte gPlayerAvatar _0806D6E8: .4byte gUnknown_81A8CED _0806D6EC: bl overworld_poison_step @@ -1961,15 +1961,15 @@ sub_806D7E8: @ 806D7E8 bx r0 thumb_func_end sub_806D7E8 - thumb_func_start sub_806D7F4 -sub_806D7F4: @ 806D7F4 + thumb_func_start is_it_battle_time_3 +is_it_battle_time_3: @ 806D7F4 push {lr} bl sub_80833B0 lsls r0, 24 lsrs r0, 24 pop {r1} bx r1 - thumb_func_end sub_806D7F4 + thumb_func_end is_it_battle_time_3 thumb_func_start sub_806D804 sub_806D804: @ 806D804 @@ -2159,8 +2159,8 @@ _0806D958: _0806D960: .4byte gUnknown_81C555B thumb_func_end sub_806D928 - thumb_func_start sub_806D964 -sub_806D964: @ 806D964 + thumb_func_start mapheader_run_first_tag2_script_list_match_conditionally +mapheader_run_first_tag2_script_list_match_conditionally: @ 806D964 push {r4-r7,lr} mov r7, r10 mov r6, r9 @@ -2209,7 +2209,7 @@ _0806D9BC: cmp r0, 0x1 bne _0806DA00 movs r4, 0 - ldr r0, _0806D9FC @ =gUnknown_2037078 + ldr r0, _0806D9FC @ =gPlayerAvatar ldrb r1, [r0] movs r0, 0x6 ands r0, r1 @@ -2230,7 +2230,7 @@ _0806D9E2: movs r0, 0x1 b _0806DA02 .align 2, 0 -_0806D9FC: .4byte gUnknown_2037078 +_0806D9FC: .4byte gPlayerAvatar _0806DA00: movs r0, 0 _0806DA02: @@ -2241,7 +2241,7 @@ _0806DA02: pop {r4-r7} pop {r1} bx r1 - thumb_func_end sub_806D964 + thumb_func_end mapheader_run_first_tag2_script_list_match_conditionally thumb_func_start sub_806DA10 sub_806DA10: @ 806DA10 @@ -2600,8 +2600,8 @@ _0806DCC4: _0806DCCC: .4byte gSaveBlock1Ptr thumb_func_end sub_806DC54 - thumb_func_start sub_806DCD0 -sub_806DCD0: @ 806DCD0 + thumb_func_start map_warp_consider_2_to_inside +map_warp_consider_2_to_inside: @ 806DCD0 push {r4-r7,lr} adds r6, r0, 0 lsls r1, 16 @@ -2649,7 +2649,7 @@ _0806DD32: pop {r4-r7} pop {r1} bx r1 - thumb_func_end sub_806DCD0 + thumb_func_end map_warp_consider_2_to_inside thumb_func_start map_warp_check map_warp_check: @ 806DD38 @@ -2799,7 +2799,7 @@ sub_806DE28: @ 806DE28 ldrsh r0, [r5, r1] movs r2, 0x12 ldrsh r1, [r5, r2] - bl sub_8058F78 + bl MapGridGetMetatileBehaviorAt cmp r0, 0x66 bne _0806DE64 movs r0, 0x25 @@ -2839,7 +2839,7 @@ sub_806DE70: @ 806DE70 asrs r0, 16 lsrs r6, r1, 16 asrs r1, 16 - bl sub_8058F78 + bl MapGridGetMetatileBehaviorAt cmp r0, 0x20 bne _0806DEB8 cmp r5, 0 @@ -3017,7 +3017,7 @@ sub_806DFB8: @ 806DFB8 ldrsh r0, [r0, r1] movs r2, 0 ldrsh r1, [r4, r2] - bl sub_8058F78 + bl MapGridGetMetatileBehaviorAt lsls r0, 24 lsrs r5, r0, 24 ldr r0, _0806E010 @ =gMapHeader @@ -3095,7 +3095,7 @@ GetFieldObjectScriptPointerForComparison: @ 806E050 ldrsh r0, [r0, r1] movs r2, 0x2 ldrsh r1, [r5, r2] - bl sub_8058F78 + bl MapGridGetMetatileBehaviorAt adds r1, r0, 0 lsls r1, 24 lsrs r1, 24 @@ -3121,7 +3121,7 @@ SetCableClubWarp: @ 806E08C ldrsh r0, [r0, r1] movs r2, 0x2 ldrsh r1, [r4, r2] - bl sub_8058F78 + bl MapGridGetMetatileBehaviorAt ldr r4, _0806E0CC @ =gMapHeader adds r0, r4, 0 mov r1, sp diff --git a/asm/field_door.s b/asm/field_door.s index 398b27c55..431189e98 100644 --- a/asm/field_door.s +++ b/asm/field_door.s @@ -487,7 +487,7 @@ sub_805B268: @ 805B268 asrs r0, 16 lsls r1, r5, 16 asrs r1, 16 - bl sub_8058F78 + bl MapGridGetMetatileBehaviorAt lsls r0, 24 lsrs r0, 24 bl sub_8059BDC @@ -515,7 +515,7 @@ sub_805B29C: @ 805B29C asrs r0, 16 lsls r1, r5, 16 asrs r1, 16 - bl sub_8058F78 + bl MapGridGetMetatileBehaviorAt lsls r0, 24 lsrs r0, 24 bl sub_8059BDC @@ -543,7 +543,7 @@ sub_805B2D0: @ 805B2D0 asrs r0, 16 lsls r1, r5, 16 asrs r1, 16 - bl sub_8058F78 + bl MapGridGetMetatileBehaviorAt lsls r0, 24 lsrs r0, 24 bl sub_8059BDC @@ -577,7 +577,7 @@ sub_805B310: @ 805B310 asrs r0, 16 lsls r1, r5, 16 asrs r1, 16 - bl sub_8058F78 + bl MapGridGetMetatileBehaviorAt lsls r0, 24 lsrs r0, 24 bl sub_8059BDC diff --git a/asm/field_effect.s b/asm/field_effect.s index a72f6e6e6..4245e711b 100644 --- a/asm/field_effect.s +++ b/asm/field_effect.s @@ -2068,7 +2068,7 @@ mapldr_08084390: @ 8084390 movs r1, 0 bl CreateTask ldr r4, _080843EC @ =gMapObjects - ldr r3, _080843F0 @ =gUnknown_2037078 + ldr r3, _080843F0 @ =gPlayerAvatar ldrb r1, [r3, 0x5] lsls r0, r1, 3 adds r0, r1 @@ -2102,7 +2102,7 @@ _080843D2: .align 2, 0 _080843E8: .4byte c3_080843F8 _080843EC: .4byte gMapObjects -_080843F0: .4byte gUnknown_2037078 +_080843F0: .4byte gPlayerAvatar _080843F4: .4byte gUnknown_3005020 thumb_func_end mapldr_08084390 @@ -2209,7 +2209,7 @@ sub_80844BC: @ 80844BC mov r5, r8 push {r5,r6} mov r9, r0 - ldr r6, _08084558 @ =gUnknown_2037078 + ldr r6, _08084558 @ =gPlayerAvatar ldrb r0, [r6, 0x5] lsls r5, r0, 3 adds r5, r0 @@ -2278,7 +2278,7 @@ sub_80844BC: @ 80844BC pop {r1} bx r1 .align 2, 0 -_08084558: .4byte gUnknown_2037078 +_08084558: .4byte gPlayerAvatar _0808455C: .4byte gMapObjects _08084560: .4byte gSprites thumb_func_end sub_80844BC @@ -2305,7 +2305,7 @@ _08084578: sub_8084580: @ 8084580 push {r4-r6,lr} adds r5, r0, 0 - ldr r6, _080845E4 @ =gUnknown_2037078 + ldr r6, _080845E4 @ =gPlayerAvatar ldrb r0, [r6, 0x4] lsls r2, r0, 4 adds r2, r0 @@ -2352,7 +2352,7 @@ sub_8084580: @ 8084580 pop {r1} bx r1 .align 2, 0 -_080845E4: .4byte gUnknown_2037078 +_080845E4: .4byte gPlayerAvatar _080845E8: .4byte gSprites _080845EC: .4byte gSpriteCoordOffsetY _080845F0: .4byte gMapObjects @@ -2362,7 +2362,7 @@ _080845F0: .4byte gMapObjects sub_80845F4: @ 80845F4 push {r4-r6,lr} adds r4, r0, 0 - ldr r2, _080846A0 @ =gUnknown_2037078 + ldr r2, _080846A0 @ =gPlayerAvatar ldrb r1, [r2, 0x5] lsls r0, r1, 3 adds r0, r1 @@ -2449,7 +2449,7 @@ _08084698: pop {r1} bx r1 .align 2, 0 -_080846A0: .4byte gUnknown_2037078 +_080846A0: .4byte gPlayerAvatar _080846A4: .4byte gMapObjects _080846A8: .4byte gSprites thumb_func_end sub_80845F4 @@ -2511,7 +2511,7 @@ _080846FE: sub_8084708: @ 8084708 push {r4,lr} sub sp, 0x4 - ldr r1, _08084778 @ =gUnknown_2037078 + ldr r1, _08084778 @ =gPlayerAvatar movs r0, 0 strb r0, [r1, 0x6] bl ScriptContext2_Disable @@ -2528,7 +2528,7 @@ sub_8084708: @ 8084708 ldrsh r0, [r0, r1] movs r2, 0 ldrsh r1, [r4, r2] - bl sub_8058F78 + bl MapGridGetMetatileBehaviorAt lsls r0, 16 lsrs r0, 16 bl sub_8055B38 @@ -2555,7 +2555,7 @@ _08084760: pop {r1} bx r1 .align 2, 0 -_08084778: .4byte gUnknown_2037078 +_08084778: .4byte gPlayerAvatar _0808477C: .4byte 0x00004001 _08084780: .4byte sub_8084484 thumb_func_end sub_8084708 @@ -2645,7 +2645,7 @@ sub_80847F8: @ 80847F8 sub_8084820: @ 8084820 push {r4,r5,lr} adds r5, r0, 0 - ldr r0, _08084888 @ =gUnknown_2037078 + ldr r0, _08084888 @ =gPlayerAvatar ldrb r1, [r0, 0x5] lsls r0, r1, 3 adds r0, r1 @@ -2692,7 +2692,7 @@ _0808487E: pop {r1} bx r1 .align 2, 0 -_08084888: .4byte gUnknown_2037078 +_08084888: .4byte gPlayerAvatar _0808488C: .4byte gMapObjects thumb_func_end sub_8084820 @@ -2760,7 +2760,7 @@ sub_80848E8: @ 80848E8 sub_80848F8: @ 80848F8 push {r4,r5,lr} adds r5, r0, 0 - ldr r0, _0808493C @ =gUnknown_2037078 + ldr r0, _0808493C @ =gPlayerAvatar ldrb r0, [r0, 0x4] lsls r4, r0, 4 adds r4, r0 @@ -2792,7 +2792,7 @@ _08084936: pop {r0} bx r0 .align 2, 0 -_0808493C: .4byte gUnknown_2037078 +_0808493C: .4byte gPlayerAvatar _08084940: .4byte gSprites thumb_func_end sub_80848F8 @@ -2800,7 +2800,7 @@ _08084940: .4byte gSprites sub_8084944: @ 8084944 push {r4,r5,lr} adds r5, r0, 0 - ldr r0, _08084988 @ =gUnknown_2037078 + ldr r0, _08084988 @ =gPlayerAvatar ldrb r0, [r0, 0x4] lsls r4, r0, 4 adds r4, r0 @@ -2832,7 +2832,7 @@ _08084982: pop {r0} bx r0 .align 2, 0 -_08084988: .4byte gUnknown_2037078 +_08084988: .4byte gPlayerAvatar _0808498C: .4byte gSprites thumb_func_end sub_8084944 @@ -2939,7 +2939,7 @@ sub_8084A5C: @ 8084A5C sub sp, 0x4 adds r5, r0, 0 bl CameraObjectReset2 - ldr r0, _08084ABC @ =gUnknown_2037078 + ldr r0, _08084ABC @ =gPlayerAvatar ldrb r0, [r0, 0x5] lsls r4, r0, 3 adds r4, r0 @@ -2963,7 +2963,7 @@ sub_8084A5C: @ 8084A5C ldrsh r0, [r0, r1] movs r2, 0 ldrsh r1, [r4, r2] - bl sub_8058F78 + bl MapGridGetMetatileBehaviorAt lsls r0, 24 lsrs r1, r0, 24 ldrh r0, [r5, 0x8] @@ -2978,7 +2978,7 @@ sub_8084A5C: @ 8084A5C strh r0, [r5, 0x8] b _08084AC6 .align 2, 0 -_08084ABC: .4byte gUnknown_2037078 +_08084ABC: .4byte gPlayerAvatar _08084AC0: .4byte gMapObjects _08084AC4: movs r1, 0 @@ -2996,7 +2996,7 @@ _08084AC6: sub_8084AD8: @ 8084AD8 push {r4,r5,lr} adds r5, r0, 0 - ldr r0, _08084B10 @ =gUnknown_2037078 + ldr r0, _08084B10 @ =gPlayerAvatar ldrb r0, [r0, 0x4] lsls r4, r0, 4 adds r4, r0 @@ -3021,7 +3021,7 @@ sub_8084AD8: @ 8084AD8 pop {r1} bx r1 .align 2, 0 -_08084B10: .4byte gUnknown_2037078 +_08084B10: .4byte gPlayerAvatar _08084B14: .4byte gSprites thumb_func_end sub_8084AD8 @@ -3029,7 +3029,7 @@ _08084B14: .4byte gSprites sub_8084B18: @ 8084B18 push {r4,r5,lr} adds r4, r0, 0 - ldr r0, _08084B70 @ =gUnknown_2037078 + ldr r0, _08084B70 @ =gPlayerAvatar ldrb r1, [r0, 0x4] lsls r0, r1, 4 adds r0, r1 @@ -3071,7 +3071,7 @@ _08084B66: pop {r1} bx r1 .align 2, 0 -_08084B70: .4byte gUnknown_2037078 +_08084B70: .4byte gPlayerAvatar _08084B74: .4byte gSprites thumb_func_end sub_8084B18 @@ -3079,7 +3079,7 @@ _08084B74: .4byte gSprites sub_8084B78: @ 8084B78 push {r4,r5,lr} adds r5, r0, 0 - ldr r0, _08084BB0 @ =gUnknown_2037078 + ldr r0, _08084BB0 @ =gPlayerAvatar ldrb r0, [r0, 0x4] lsls r4, r0, 4 adds r4, r0 @@ -3104,7 +3104,7 @@ sub_8084B78: @ 8084B78 pop {r1} bx r1 .align 2, 0 -_08084BB0: .4byte gUnknown_2037078 +_08084BB0: .4byte gPlayerAvatar _08084BB4: .4byte gSprites thumb_func_end sub_8084B78 @@ -3112,7 +3112,7 @@ _08084BB4: .4byte gSprites sub_8084BB8: @ 8084BB8 push {r4,r5,lr} adds r4, r0, 0 - ldr r0, _08084C10 @ =gUnknown_2037078 + ldr r0, _08084C10 @ =gPlayerAvatar ldrb r1, [r0, 0x4] lsls r0, r1, 4 adds r0, r1 @@ -3155,7 +3155,7 @@ _08084C08: pop {r1} bx r1 .align 2, 0 -_08084C10: .4byte gUnknown_2037078 +_08084C10: .4byte gPlayerAvatar _08084C14: .4byte gSprites thumb_func_end sub_8084BB8 @@ -3184,7 +3184,7 @@ _08084C36: thumb_func_start sub_8084C3C sub_8084C3C: @ 8084C3C push {r4,lr} - ldr r0, _08084C94 @ =gUnknown_2037078 + ldr r0, _08084C94 @ =gPlayerAvatar ldrb r1, [r0, 0x5] lsls r0, r1, 3 adds r0, r1 @@ -3219,7 +3219,7 @@ _08084C8A: pop {r1} bx r1 .align 2, 0 -_08084C94: .4byte gUnknown_2037078 +_08084C94: .4byte gPlayerAvatar _08084C98: .4byte gMapObjects _08084C9C: .4byte sub_8084A24 thumb_func_end sub_8084C3C @@ -3268,7 +3268,7 @@ _08084CEA: ldrsh r2, [r4, r0] lsls r2, 2 adds r2, r5 - ldr r0, _08084D1C @ =gUnknown_2037078 + ldr r0, _08084D1C @ =gPlayerAvatar ldrb r0, [r0, 0x5] lsls r1, r0, 3 adds r1, r0 @@ -3287,7 +3287,7 @@ _08084CEA: .align 2, 0 _08084D14: .4byte gUnknown_83CC084 _08084D18: .4byte gTasks -_08084D1C: .4byte gUnknown_2037078 +_08084D1C: .4byte gPlayerAvatar _08084D20: .4byte gMapObjects thumb_func_end sub_8084CD8 @@ -3296,7 +3296,7 @@ sub_8084D24: @ 8084D24 push {r4,lr} adds r4, r0, 0 bl ScriptContext2_Enable - ldr r1, _08084D40 @ =gUnknown_2037078 + ldr r1, _08084D40 @ =gPlayerAvatar movs r0, 0x1 strb r0, [r1, 0x6] ldrh r0, [r4, 0x8] @@ -3307,7 +3307,7 @@ sub_8084D24: @ 8084D24 pop {r1} bx r1 .align 2, 0 -_08084D40: .4byte gUnknown_2037078 +_08084D40: .4byte gPlayerAvatar thumb_func_end sub_8084D24 thumb_func_start waterfall_1_do_anim_probably @@ -3404,7 +3404,7 @@ _08084DE2: cmp r4, 0 bne _08084E18 bl ScriptContext2_Disable - ldr r0, _08084E10 @ =gUnknown_2037078 + ldr r0, _08084E10 @ =gPlayerAvatar strb r4, [r0, 0x6] ldr r0, _08084E14 @ =sub_8084CD8 bl FindTaskIdByFunc @@ -3416,7 +3416,7 @@ _08084DE2: movs r0, 0 b _08084E1E .align 2, 0 -_08084E10: .4byte gUnknown_2037078 +_08084E10: .4byte gPlayerAvatar _08084E14: .4byte sub_8084CD8 _08084E18: movs r0, 0x3 @@ -3490,7 +3490,7 @@ _08084E94: .4byte gTasks thumb_func_start dive_1_lock dive_1_lock: @ 8084E98 - ldr r2, _08084EA8 @ =gUnknown_2037078 + ldr r2, _08084EA8 @ =gPlayerAvatar movs r1, 0x1 strb r1, [r2, 0x6] ldrh r1, [r0, 0x8] @@ -3499,7 +3499,7 @@ dive_1_lock: @ 8084E98 movs r0, 0 bx lr .align 2, 0 -_08084EA8: .4byte gUnknown_2037078 +_08084EA8: .4byte gPlayerAvatar thumb_func_end dive_1_lock thumb_func_start dive_2_unknown @@ -3538,7 +3538,7 @@ dive_3_unknown: @ 8084ED4 cmp r0, 0 bne _08084F18 ldr r2, _08084F20 @ =gMapObjects - ldr r0, _08084F24 @ =gUnknown_2037078 + ldr r0, _08084F24 @ =gPlayerAvatar ldrb r1, [r0, 0x5] lsls r0, r1, 3 adds r0, r1 @@ -3561,7 +3561,7 @@ _08084F18: bx r1 .align 2, 0 _08084F20: .4byte gMapObjects -_08084F24: .4byte gUnknown_2037078 +_08084F24: .4byte gPlayerAvatar _08084F28: .4byte sub_8084E60 thumb_func_end dive_3_unknown @@ -3586,7 +3586,7 @@ sub_8084F44: @ 8084F44 lsrs r0, 24 ldr r6, _08084F8C @ =gUnknown_83CC0A4 ldr r2, _08084F90 @ =gTasks - ldr r5, _08084F94 @ =gUnknown_2037078 + ldr r5, _08084F94 @ =gPlayerAvatar lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -3620,7 +3620,7 @@ _08084F58: .align 2, 0 _08084F8C: .4byte gUnknown_83CC0A4 _08084F90: .4byte gTasks -_08084F94: .4byte gUnknown_2037078 +_08084F94: .4byte gPlayerAvatar _08084F98: .4byte gMapObjects _08084F9C: .4byte gSprites thumb_func_end sub_8084F44 @@ -3634,7 +3634,7 @@ sub_8084FA0: @ 8084FA0 bl CameraObjectReset2 movs r0, 0 bl SetCameraPanningCallback - ldr r0, _08084FD4 @ =gUnknown_2037078 + ldr r0, _08084FD4 @ =gPlayerAvatar movs r2, 0x1 strb r2, [r0, 0x6] ldrb r0, [r5, 0x3] @@ -3650,7 +3650,7 @@ sub_8084FA0: @ 8084FA0 pop {r1} bx r1 .align 2, 0 -_08084FD4: .4byte gUnknown_2037078 +_08084FD4: .4byte gPlayerAvatar thumb_func_end sub_8084FA0 thumb_func_start sub_8084FD8 @@ -3932,7 +3932,7 @@ sub_80851E8: @ 80851E8 lsrs r0, 24 ldr r6, _08085230 @ =gUnknown_83CC0BC ldr r2, _08085234 @ =gTasks - ldr r5, _08085238 @ =gUnknown_2037078 + ldr r5, _08085238 @ =gPlayerAvatar lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -3966,7 +3966,7 @@ _080851FC: .align 2, 0 _08085230: .4byte gUnknown_83CC0BC _08085234: .4byte gTasks -_08085238: .4byte gUnknown_2037078 +_08085238: .4byte gPlayerAvatar _0808523C: .4byte gMapObjects _08085240: .4byte gSprites thumb_func_end sub_80851E8 @@ -3978,7 +3978,7 @@ sub_8085244: @ 8085244 adds r4, r1, 0 bl CameraObjectReset2 bl player_bitmagic - ldr r1, _08085270 @ =gUnknown_2037078 + ldr r1, _08085270 @ =gPlayerAvatar movs r0, 0x1 strb r0, [r1, 0x6] ldrb r0, [r4, 0x1] @@ -3993,7 +3993,7 @@ sub_8085244: @ 8085244 pop {r1} bx r1 .align 2, 0 -_08085270: .4byte gUnknown_2037078 +_08085270: .4byte gPlayerAvatar thumb_func_end sub_8085244 thumb_func_start sub_8085274 @@ -4088,7 +4088,7 @@ sub_8085314: @ 8085314 lsls r0, 24 cmp r0, 0 beq _0808533E - ldr r1, _08085344 @ =gUnknown_2037078 + ldr r1, _08085344 @ =gPlayerAvatar movs r0, 0 strb r0, [r1, 0x6] bl ScriptContext2_Disable @@ -4103,7 +4103,7 @@ _0808533E: pop {r1} bx r1 .align 2, 0 -_08085344: .4byte gUnknown_2037078 +_08085344: .4byte gPlayerAvatar _08085348: .4byte sub_80851E8 thumb_func_end sub_8085314 @@ -4195,7 +4195,7 @@ sub_80853E4: @ 80853E4 lsrs r0, 24 ldr r6, _0808542C @ =gUnknown_83CC0CC ldr r2, _08085430 @ =gTasks - ldr r5, _08085434 @ =gUnknown_2037078 + ldr r5, _08085434 @ =gPlayerAvatar lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -4229,7 +4229,7 @@ _080853F8: .align 2, 0 _0808542C: .4byte gUnknown_83CC0CC _08085430: .4byte gTasks -_08085434: .4byte gUnknown_2037078 +_08085434: .4byte gPlayerAvatar _08085438: .4byte gMapObjects _0808543C: .4byte gSprites thumb_func_end sub_80853E4 @@ -4241,7 +4241,7 @@ sub_8085440: @ 8085440 adds r4, r1, 0 bl player_bitmagic bl CameraObjectReset2 - ldr r1, _0808546C @ =gUnknown_2037078 + ldr r1, _0808546C @ =gPlayerAvatar movs r0, 0x1 strb r0, [r1, 0x6] ldrb r0, [r4, 0x3] @@ -4256,7 +4256,7 @@ sub_8085440: @ 8085440 pop {r1} bx r1 .align 2, 0 -_0808546C: .4byte gUnknown_2037078 +_0808546C: .4byte gPlayerAvatar thumb_func_end sub_8085440 thumb_func_start sub_8085470 @@ -4541,7 +4541,7 @@ sub_808566C: @ 808566C sub_8085690: @ 8085690 push {r4-r6,lr} adds r5, r0, 0 - ldr r0, _080856D4 @ =gUnknown_2037078 + ldr r0, _080856D4 @ =gPlayerAvatar ldrb r1, [r0, 0x5] lsls r0, r1, 3 adds r0, r1 @@ -4571,7 +4571,7 @@ sub_8085690: @ 8085690 bl PlaySE b _08085702 .align 2, 0 -_080856D4: .4byte gUnknown_2037078 +_080856D4: .4byte gPlayerAvatar _080856D8: .4byte gMapObjects _080856DC: movs r1, 0x8 @@ -4974,7 +4974,7 @@ sub_80859D4: @ 80859D4 movs r0, 0 str r0, [r1] ldr r2, _08085A18 @ =gMapObjects - ldr r0, _08085A1C @ =gUnknown_2037078 + ldr r0, _08085A1C @ =gPlayerAvatar ldrb r1, [r0, 0x5] lsls r0, r1, 3 adds r0, r1 @@ -4992,7 +4992,7 @@ sub_80859D4: @ 80859D4 .align 2, 0 _08085A14: .4byte gUnknown_3005020 _08085A18: .4byte gMapObjects -_08085A1C: .4byte gUnknown_2037078 +_08085A1C: .4byte gPlayerAvatar _08085A20: .4byte sub_8085A24 thumb_func_end sub_80859D4 @@ -5051,7 +5051,7 @@ sub_8085A80: @ 8085A80 adds r4, r0, 0 adds r5, r4, 0 adds r5, 0x8 - ldr r0, _08085AD4 @ =gUnknown_2037078 + ldr r0, _08085AD4 @ =gPlayerAvatar ldrb r1, [r0, 0x5] lsls r0, r1, 3 adds r0, r1 @@ -5087,7 +5087,7 @@ sub_8085A80: @ 8085A80 strh r0, [r5, 0xC] b _08085B10 .align 2, 0 -_08085AD4: .4byte gUnknown_2037078 +_08085AD4: .4byte gPlayerAvatar _08085AD8: .4byte gMapObjects _08085ADC: movs r2, 0xE @@ -5221,7 +5221,7 @@ sub_8085BD0: @ 8085BD0 mov r0, sp movs r2, 0x5 bl memcpy - ldr r0, _08085C58 @ =gUnknown_2037078 + ldr r0, _08085C58 @ =gPlayerAvatar ldrb r1, [r0, 0x5] lsls r0, r1, 3 adds r0, r1 @@ -5281,7 +5281,7 @@ _08085C4A: bx r0 .align 2, 0 _08085C54: .4byte gUnknown_83CC108 -_08085C58: .4byte gUnknown_2037078 +_08085C58: .4byte gPlayerAvatar _08085C5C: .4byte gMapObjects thumb_func_end sub_8085BD0 @@ -5294,7 +5294,7 @@ sub_8085C60: @ 8085C60 mov r0, sp movs r2, 0x5 bl memcpy - ldr r2, _08085D28 @ =gUnknown_2037078 + ldr r2, _08085D28 @ =gPlayerAvatar ldrb r1, [r2, 0x5] lsls r0, r1, 3 adds r0, r1 @@ -5386,7 +5386,7 @@ _08085D1A: bx r0 .align 2, 0 _08085D24: .4byte gUnknown_83CC108 -_08085D28: .4byte gUnknown_2037078 +_08085D28: .4byte gPlayerAvatar _08085D2C: .4byte gMapObjects _08085D30: .4byte gSprites thumb_func_end sub_8085C60 @@ -5440,7 +5440,7 @@ mapldr_08085D88: @ 8085D88 movs r0, 0 str r0, [r1] ldr r2, _08085DD0 @ =gMapObjects - ldr r0, _08085DD4 @ =gUnknown_2037078 + ldr r0, _08085DD4 @ =gPlayerAvatar ldrb r1, [r0, 0x5] lsls r0, r1, 3 adds r0, r1 @@ -5459,7 +5459,7 @@ mapldr_08085D88: @ 8085D88 .align 2, 0 _08085DCC: .4byte gUnknown_3005020 _08085DD0: .4byte gMapObjects -_08085DD4: .4byte gUnknown_2037078 +_08085DD4: .4byte gPlayerAvatar _08085DD8: .4byte sub_8085DDC thumb_func_end mapldr_08085D88 @@ -5496,7 +5496,7 @@ sub_8085E0C: @ 8085E0C lsls r0, 24 cmp r0, 0 beq _08085E82 - ldr r5, _08085E88 @ =gUnknown_2037078 + ldr r5, _08085E88 @ =gPlayerAvatar ldrb r0, [r5, 0x4] lsls r2, r0, 4 adds r2, r0 @@ -5551,7 +5551,7 @@ _08085E82: pop {r0} bx r0 .align 2, 0 -_08085E88: .4byte gUnknown_2037078 +_08085E88: .4byte gPlayerAvatar _08085E8C: .4byte gSprites _08085E90: .4byte gSpriteCoordOffsetY _08085E94: .4byte gMapObjects @@ -5566,7 +5566,7 @@ sub_8085E98: @ 8085E98 mov r0, sp movs r2, 0x5 bl memcpy - ldr r2, _08085F04 @ =gUnknown_2037078 + ldr r2, _08085F04 @ =gPlayerAvatar ldrb r1, [r2, 0x5] lsls r0, r1, 3 adds r0, r1 @@ -5612,7 +5612,7 @@ sub_8085E98: @ 8085E98 b _08085F36 .align 2, 0 _08085F00: .4byte gUnknown_83CC108 -_08085F04: .4byte gUnknown_2037078 +_08085F04: .4byte gPlayerAvatar _08085F08: .4byte gMapObjects _08085F0C: .4byte gSprites _08085F10: @@ -5699,7 +5699,7 @@ sub_8085F9C: @ 8085F9C mov r0, sp movs r2, 0x5 bl memcpy - ldr r0, _0808601C @ =gUnknown_2037078 + ldr r0, _0808601C @ =gPlayerAvatar ldrb r1, [r0, 0x5] lsls r0, r1, 3 adds r0, r1 @@ -5750,7 +5750,7 @@ _08086010: bx r0 .align 2, 0 _08086018: .4byte gUnknown_83CC108 -_0808601C: .4byte gUnknown_2037078 +_0808601C: .4byte gPlayerAvatar _08086020: .4byte gMapObjects _08086024: .4byte sub_8085DDC thumb_func_end sub_8085F9C @@ -7001,7 +7001,7 @@ sub_80869C0: @ 80869C0 adds r4, r0, 0 bl ScriptContext2_Enable bl player_bitmagic - ldr r5, _08086A18 @ =gUnknown_2037078 + ldr r5, _08086A18 @ =gPlayerAvatar movs r0, 0x1 strb r0, [r5, 0x6] movs r0, 0x8 @@ -7034,7 +7034,7 @@ sub_80869C0: @ 80869C0 pop {r0} bx r0 .align 2, 0 -_08086A18: .4byte gUnknown_2037078 +_08086A18: .4byte gPlayerAvatar _08086A1C: .4byte gMapObjects thumb_func_end sub_80869C0 @@ -7042,7 +7042,7 @@ _08086A1C: .4byte gMapObjects sub_8086A20: @ 8086A20 push {r4,r5,lr} adds r5, r0, 0 - ldr r0, _08086A64 @ =gUnknown_2037078 + ldr r0, _08086A64 @ =gPlayerAvatar ldrb r1, [r0, 0x5] lsls r0, r1, 3 adds r0, r1 @@ -7072,7 +7072,7 @@ _08086A5C: pop {r0} bx r0 .align 2, 0 -_08086A64: .4byte gUnknown_2037078 +_08086A64: .4byte gPlayerAvatar _08086A68: .4byte gMapObjects thumb_func_end sub_8086A20 @@ -7080,7 +7080,7 @@ _08086A68: .4byte gMapObjects sub_8086A6C: @ 8086A6C push {r4,lr} adds r4, r0, 0 - ldr r0, _08086AA8 @ =gUnknown_2037078 + ldr r0, _08086AA8 @ =gPlayerAvatar ldrb r1, [r0, 0x5] lsls r0, r1, 3 adds r0, r1 @@ -7108,7 +7108,7 @@ _08086AA2: pop {r0} bx r0 .align 2, 0 -_08086AA8: .4byte gUnknown_2037078 +_08086AA8: .4byte gPlayerAvatar _08086AAC: .4byte gMapObjects _08086AB0: .4byte gUnknown_20386E0 thumb_func_end sub_8086A6C @@ -7122,7 +7122,7 @@ sub_8086AB4: @ 8086AB4 lsls r0, 24 cmp r0, 0 bne _08086B1E - ldr r5, _08086B24 @ =gUnknown_2037078 + ldr r5, _08086B24 @ =gPlayerAvatar ldrb r0, [r5, 0x5] lsls r4, r0, 3 adds r4, r0 @@ -7166,7 +7166,7 @@ _08086B1E: pop {r0} bx r0 .align 2, 0 -_08086B24: .4byte gUnknown_2037078 +_08086B24: .4byte gPlayerAvatar _08086B28: .4byte gMapObjects _08086B2C: .4byte gUnknown_20386E0 thumb_func_end sub_8086AB4 @@ -7174,7 +7174,7 @@ _08086B2C: .4byte gUnknown_20386E0 thumb_func_start sub_8086B30 sub_8086B30: @ 8086B30 push {r4,r5,lr} - ldr r5, _08086B9C @ =gUnknown_2037078 + ldr r5, _08086B9C @ =gPlayerAvatar ldrb r1, [r5, 0x5] lsls r0, r1, 3 adds r0, r1 @@ -7219,7 +7219,7 @@ _08086B96: pop {r0} bx r0 .align 2, 0 -_08086B9C: .4byte gUnknown_2037078 +_08086B9C: .4byte gPlayerAvatar _08086BA0: .4byte gMapObjects _08086BA4: .4byte sub_8086990 thumb_func_end sub_8086B30 @@ -7277,7 +7277,7 @@ sub_8086C00: @ 8086C00 adds r4, r0, 0 bl ScriptContext2_Enable bl player_bitmagic - ldr r1, _08086C20 @ =gUnknown_2037078 + ldr r1, _08086C20 @ =gPlayerAvatar movs r0, 0x1 strb r0, [r1, 0x6] ldrh r0, [r4, 0x8] @@ -7287,14 +7287,14 @@ sub_8086C00: @ 8086C00 pop {r0} bx r0 .align 2, 0 -_08086C20: .4byte gUnknown_2037078 +_08086C20: .4byte gPlayerAvatar thumb_func_end sub_8086C00 thumb_func_start sub_8086C24 sub_8086C24: @ 8086C24 push {r4,r5,lr} adds r5, r0, 0 - ldr r0, _08086C68 @ =gUnknown_2037078 + ldr r0, _08086C68 @ =gPlayerAvatar ldrb r1, [r0, 0x5] lsls r0, r1, 3 adds r0, r1 @@ -7324,7 +7324,7 @@ _08086C60: pop {r0} bx r0 .align 2, 0 -_08086C68: .4byte gUnknown_2037078 +_08086C68: .4byte gPlayerAvatar _08086C6C: .4byte gMapObjects thumb_func_end sub_8086C24 @@ -7332,7 +7332,7 @@ _08086C6C: .4byte gMapObjects sub_8086C70: @ 8086C70 push {r4-r6,lr} adds r6, r0, 0 - ldr r5, _08086C9C @ =gUnknown_2037078 + ldr r5, _08086C9C @ =gPlayerAvatar ldrb r1, [r5, 0x5] lsls r0, r1, 3 adds r0, r1 @@ -7352,7 +7352,7 @@ sub_8086C70: @ 8086C70 movs r0, 0x1 b _08086CAE .align 2, 0 -_08086C9C: .4byte gUnknown_2037078 +_08086C9C: .4byte gPlayerAvatar _08086CA0: .4byte gMapObjects _08086CA4: movs r0, 0x8 @@ -7398,7 +7398,7 @@ _08086CEE: thumb_func_start sub_8086CF4 sub_8086CF4: @ 8086CF4 push {r4,lr} - ldr r4, _08086D2C @ =gUnknown_2037078 + ldr r4, _08086D2C @ =gPlayerAvatar ldrb r1, [r4, 0x5] lsls r0, r1, 3 adds r0, r1 @@ -7423,7 +7423,7 @@ _08086D26: pop {r0} bx r0 .align 2, 0 -_08086D2C: .4byte gUnknown_2037078 +_08086D2C: .4byte gPlayerAvatar _08086D30: .4byte gMapObjects _08086D34: .4byte sub_8086BD0 thumb_func_end sub_8086CF4 @@ -7591,7 +7591,7 @@ _08086E6C: .4byte gTasks sub_8086E70: @ 8086E70 push {r4-r6,lr} adds r5, r0, 0 - ldr r6, _08086EC0 @ =gUnknown_2037078 + ldr r6, _08086EC0 @ =gPlayerAvatar ldrb r1, [r6, 0x5] lsls r0, r1, 3 adds r0, r1 @@ -7626,7 +7626,7 @@ _08086EB8: pop {r0} bx r0 .align 2, 0 -_08086EC0: .4byte gUnknown_2037078 +_08086EC0: .4byte gPlayerAvatar _08086EC4: .4byte gMapObjects thumb_func_end sub_8086E70 @@ -7634,7 +7634,7 @@ _08086EC4: .4byte gMapObjects sub_8086EC8: @ 8086EC8 push {r4,lr} adds r4, r0, 0 - ldr r0, _08086F00 @ =gUnknown_2037078 + ldr r0, _08086F00 @ =gPlayerAvatar ldrb r1, [r0, 0x5] lsls r0, r1, 3 adds r0, r1 @@ -7659,7 +7659,7 @@ _08086EF8: pop {r0} bx r0 .align 2, 0 -_08086F00: .4byte gUnknown_2037078 +_08086F00: .4byte gPlayerAvatar _08086F04: .4byte gMapObjects _08086F08: .4byte gUnknown_20386E0 thumb_func_end sub_8086EC8 @@ -7673,7 +7673,7 @@ sub_8086F0C: @ 8086F0C lsls r0, 24 cmp r0, 0 bne _08086F54 - ldr r0, _08086F5C @ =gUnknown_2037078 + ldr r0, _08086F5C @ =gPlayerAvatar ldrb r1, [r0, 0x5] lsls r0, r1, 3 adds r0, r1 @@ -7704,7 +7704,7 @@ _08086F54: pop {r0} bx r0 .align 2, 0 -_08086F5C: .4byte gUnknown_2037078 +_08086F5C: .4byte gPlayerAvatar _08086F60: .4byte gMapObjects thumb_func_end sub_8086F0C @@ -7724,7 +7724,7 @@ sub_8086F64: @ 8086F64 strh r0, [r4, 0xC] movs r0, 0x1 bl SetPlayerAvatarTransitionFlags - ldr r0, _08086FA0 @ =gUnknown_2037078 + ldr r0, _08086FA0 @ =gPlayerAvatar ldrb r1, [r0, 0x5] lsls r0, r1, 3 adds r0, r1 @@ -7738,7 +7738,7 @@ _08086F98: pop {r0} bx r0 .align 2, 0 -_08086FA0: .4byte gUnknown_2037078 +_08086FA0: .4byte gPlayerAvatar _08086FA4: .4byte gMapObjects thumb_func_end sub_8086F64 @@ -7746,7 +7746,7 @@ _08086FA4: .4byte gMapObjects sub_8086FA8: @ 8086FA8 push {r4,lr} adds r4, r0, 0 - ldr r0, _08086FF4 @ =gUnknown_2037078 + ldr r0, _08086FF4 @ =gPlayerAvatar ldrb r1, [r0, 0x5] lsls r0, r1, 3 adds r0, r1 @@ -7781,7 +7781,7 @@ _08086FEC: pop {r0} bx r0 .align 2, 0 -_08086FF4: .4byte gUnknown_2037078 +_08086FF4: .4byte gPlayerAvatar _08086FF8: .4byte gMapObjects thumb_func_end sub_8086FA8 @@ -7796,7 +7796,7 @@ sub_8086FFC: @ 8086FFC asrs r0, 16 cmp r0, 0x7 ble _0808705A - ldr r0, _08087060 @ =gUnknown_2037078 + ldr r0, _08087060 @ =gPlayerAvatar ldrb r0, [r0, 0x5] lsls r4, r0, 3 adds r4, r0 @@ -7835,7 +7835,7 @@ _0808705A: pop {r0} bx r0 .align 2, 0 -_08087060: .4byte gUnknown_2037078 +_08087060: .4byte gPlayerAvatar _08087064: .4byte gMapObjects _08087068: .4byte gSprites thumb_func_end sub_8086FFC @@ -7851,7 +7851,7 @@ sub_808706C: @ 808706C asrs r0, 16 cmp r0, 0x9 ble _080870FC - ldr r0, _08087104 @ =gUnknown_2037078 + ldr r0, _08087104 @ =gPlayerAvatar ldrb r0, [r0, 0x5] lsls r4, r0, 3 adds r4, r0 @@ -7914,7 +7914,7 @@ _080870FC: pop {r0} bx r0 .align 2, 0 -_08087104: .4byte gUnknown_2037078 +_08087104: .4byte gPlayerAvatar _08087108: .4byte gMapObjects _0808710C: .4byte gSprites _08087110: .4byte gSaveBlock2Ptr @@ -8425,7 +8425,7 @@ _080874C4: .4byte gTasks sub_80874C8: @ 80874C8 push {r4-r6,lr} adds r6, r0, 0 - ldr r4, _080875B4 @ =gUnknown_2037078 + ldr r4, _080875B4 @ =gPlayerAvatar ldrb r1, [r4, 0x5] lsls r0, r1, 3 adds r0, r1 @@ -8531,7 +8531,7 @@ _080875AE: pop {r0} bx r0 .align 2, 0 -_080875B4: .4byte gUnknown_2037078 +_080875B4: .4byte gPlayerAvatar _080875B8: .4byte gMapObjects _080875BC: .4byte gSprites _080875C0: .4byte gSaveBlock2Ptr @@ -8561,7 +8561,7 @@ sub_80875C8: @ 80875C8 cmp r0, 0 bne _08087630 _080875F2: - ldr r0, _0808763C @ =gUnknown_2037078 + ldr r0, _0808763C @ =gPlayerAvatar ldrb r1, [r0, 0x5] lsls r0, r1, 3 adds r0, r1 @@ -8597,7 +8597,7 @@ _08087630: bx r0 .align 2, 0 _08087638: .4byte gSprites -_0808763C: .4byte gUnknown_2037078 +_0808763C: .4byte gPlayerAvatar _08087640: .4byte gMapObjects thumb_func_end sub_80875C8 @@ -8610,7 +8610,7 @@ sub_8087644: @ 8087644 mov r0, sp movs r2, 0x24 bl memcpy - ldr r0, _08087690 @ =gUnknown_2037078 + ldr r0, _08087690 @ =gPlayerAvatar ldrb r0, [r0, 0x4] lsls r1, r0, 4 adds r1, r0 @@ -8640,7 +8640,7 @@ _08087682: bx r0 .align 2, 0 _0808768C: .4byte gUnknown_83CC1F0 -_08087690: .4byte gUnknown_2037078 +_08087690: .4byte gPlayerAvatar _08087694: .4byte gSprites thumb_func_end sub_8087644 @@ -8653,7 +8653,7 @@ sub_8087698: @ 8087698 lsls r0, 24 cmp r0, 0 beq _080876FC - ldr r0, _08087704 @ =gUnknown_2037078 + ldr r0, _08087704 @ =gPlayerAvatar ldrb r0, [r0, 0x5] lsls r5, r0, 3 adds r5, r0 @@ -8697,7 +8697,7 @@ _080876FC: pop {r0} bx r0 .align 2, 0 -_08087704: .4byte gUnknown_2037078 +_08087704: .4byte gPlayerAvatar _08087708: .4byte gMapObjects _0808770C: .4byte gSprites thumb_func_end sub_8087698 @@ -8706,7 +8706,7 @@ _0808770C: .4byte gSprites sub_8087710: @ 8087710 push {r4,lr} adds r4, r0, 0 - ldr r0, _08087740 @ =gUnknown_2037078 + ldr r0, _08087740 @ =gPlayerAvatar ldrb r1, [r0, 0x5] lsls r0, r1, 3 adds r0, r1 @@ -8727,7 +8727,7 @@ _08087738: pop {r0} bx r0 .align 2, 0 -_08087740: .4byte gUnknown_2037078 +_08087740: .4byte gPlayerAvatar _08087744: .4byte gMapObjects thumb_func_end sub_8087710 @@ -8771,7 +8771,7 @@ fishE: @ 8087780 lsls r0, 16 cmp r0, 0 bne _080877EA - ldr r6, _080877F0 @ =gUnknown_2037078 + ldr r6, _080877F0 @ =gPlayerAvatar ldrb r1, [r6, 0x5] lsls r0, r1, 3 adds r0, r1 @@ -8815,7 +8815,7 @@ _080877EA: pop {r0} bx r0 .align 2, 0 -_080877F0: .4byte gUnknown_2037078 +_080877F0: .4byte gPlayerAvatar _080877F4: .4byte gMapObjects _080877F8: .4byte sub_8087498 thumb_func_end fishE diff --git a/asm/field_effect_helpers.s b/asm/field_effect_helpers.s index dfdc880fb..9e416b83a 100644 --- a/asm/field_effect_helpers.s +++ b/asm/field_effect_helpers.s @@ -888,7 +888,7 @@ _080DB438: ldrsh r0, [r5, r2] movs r2, 0x32 ldrsh r1, [r5, r2] - bl sub_8058F78 + bl MapGridGetMetatileBehaviorAt lsls r0, 24 lsrs r6, r0, 24 mov r0, r8 @@ -1239,7 +1239,7 @@ _080DB6E8: ldrsh r0, [r5, r2] movs r2, 0x32 ldrsh r1, [r5, r2] - bl sub_8058F78 + bl MapGridGetMetatileBehaviorAt lsls r0, 24 lsrs r4, r0, 24 mov r0, r8 @@ -2864,7 +2864,7 @@ sub_80DC348: @ 80DC348 ldrsh r1, [r4, r2] bl CurrentMapDrawMetatileAt ldr r2, _080DC3A0 @ =gMapObjects - ldr r0, _080DC3A4 @ =gUnknown_2037078 + ldr r0, _080DC3A4 @ =gPlayerAvatar ldrb r1, [r0, 0x5] lsls r0, r1, 3 adds r0, r1 @@ -2881,7 +2881,7 @@ sub_80DC348: @ 80DC348 bx r0 .align 2, 0 _080DC3A0: .4byte gMapObjects -_080DC3A4: .4byte gUnknown_2037078 +_080DC3A4: .4byte gPlayerAvatar thumb_func_end sub_80DC348 thumb_func_start sub_80DC3A8 diff --git a/asm/field_fadetransition.s b/asm/field_fadetransition.s index 231a3b123..703316872 100644 --- a/asm/field_fadetransition.s +++ b/asm/field_fadetransition.s @@ -461,7 +461,7 @@ sub_807DE78: @ 807DE78 ldrsh r0, [r0, r1] movs r2, 0 ldrsh r1, [r4, r2] - bl sub_8058F78 + bl MapGridGetMetatileBehaviorAt lsls r0, 24 lsrs r4, r0, 24 adds r0, r4, 0 @@ -1831,7 +1831,7 @@ sub_807E980: @ 807E980 lsls r0, 3 ldr r1, _0807E9C0 @ =gTasks+0x8 adds r5, r0, r1 - ldr r2, _0807E9C4 @ =gUnknown_2037078 + ldr r2, _0807E9C4 @ =gPlayerAvatar ldrb r1, [r2, 0x5] lsls r0, r1, 3 adds r0, r1 @@ -1855,7 +1855,7 @@ sub_807E980: @ 807E980 b _0807EA9A .align 2, 0 _0807E9C0: .4byte gTasks+0x8 -_0807E9C4: .4byte gUnknown_2037078 +_0807E9C4: .4byte gPlayerAvatar _0807E9C8: .4byte gMapObjects _0807E9CC: .4byte gSprites _0807E9D0: @@ -1984,7 +1984,7 @@ sub_807EAC4: @ 807EAC4 lsls r0, 16 lsrs r0, 16 mov r12, r0 - ldr r3, _0807EB58 @ =gUnknown_2037078 + ldr r3, _0807EB58 @ =gPlayerAvatar ldrb r2, [r3, 0x4] lsls r0, r2, 4 adds r0, r2 @@ -2049,7 +2049,7 @@ _0807EB4C: pop {r0} bx r0 .align 2, 0 -_0807EB58: .4byte gUnknown_2037078 +_0807EB58: .4byte gPlayerAvatar _0807EB5C: .4byte gSprites _0807EB60: .4byte gMapObjects thumb_func_end sub_807EAC4 @@ -2064,7 +2064,7 @@ sub_807EB64: @ 807EB64 mov r8, r2 lsls r5, 16 lsrs r5, 16 - ldr r0, _0807EBB4 @ =gUnknown_2037078 + ldr r0, _0807EBB4 @ =gPlayerAvatar ldrb r0, [r0, 0x5] lsls r4, r0, 3 adds r4, r0 @@ -2092,7 +2092,7 @@ sub_807EB64: @ 807EB64 pop {r0} bx r0 .align 2, 0 -_0807EBB4: .4byte gUnknown_2037078 +_0807EBB4: .4byte gPlayerAvatar _0807EBB8: .4byte gMapObjects thumb_func_end sub_807EB64 @@ -2247,7 +2247,7 @@ sub_807ECBC: @ 807ECBC ldrsh r0, [r0, r1] movs r2, 0 ldrsh r1, [r4, r2] - bl sub_8058F78 + bl MapGridGetMetatileBehaviorAt lsls r0, 24 lsrs r6, r0, 24 adds r0, r6, 0 @@ -2266,7 +2266,7 @@ _0807ED06: _0807ED0A: movs r1, 0x4 _0807ED0C: - ldr r0, _0807ED94 @ =gUnknown_2037078 + ldr r0, _0807ED94 @ =gPlayerAvatar mov r8, r0 ldrb r0, [r0, 0x5] lsls r4, r0, 3 @@ -2332,7 +2332,7 @@ _0807ED0C: pop {r0} bx r0 .align 2, 0 -_0807ED94: .4byte gUnknown_2037078 +_0807ED94: .4byte gPlayerAvatar _0807ED98: .4byte gMapObjects _0807ED9C: .4byte gSprites thumb_func_end sub_807ECBC @@ -2343,7 +2343,7 @@ sub_807EDA0: @ 807EDA0 adds r5, r0, 0 adds r6, r1, 0 ldr r4, [sp, 0x14] - ldr r0, _0807EDC8 @ =gUnknown_2037078 + ldr r0, _0807EDC8 @ =gPlayerAvatar ldrb r1, [r0, 0x4] lsls r0, r1, 4 adds r0, r1 @@ -2359,7 +2359,7 @@ sub_807EDA0: @ 807EDA0 movs r0, 0 b _0807EDF8 .align 2, 0 -_0807EDC8: .4byte gUnknown_2037078 +_0807EDC8: .4byte gPlayerAvatar _0807EDCC: .4byte gSprites _0807EDD0: ldrh r0, [r5] diff --git a/asm/field_ground_effect.s b/asm/field_ground_effect.s index 4fc86db2c..40159bc04 100644 --- a/asm/field_ground_effect.s +++ b/asm/field_ground_effect.s @@ -118,13 +118,13 @@ FieldObjectUpdateMetatileBehaviors: @ 8067C24 ldrsh r0, [r4, r1] movs r2, 0x16 ldrsh r1, [r4, r2] - bl sub_8058F78 + bl MapGridGetMetatileBehaviorAt strb r0, [r4, 0x1F] movs r1, 0x10 ldrsh r0, [r4, r1] movs r2, 0x12 ldrsh r1, [r4, r2] - bl sub_8058F78 + bl MapGridGetMetatileBehaviorAt strb r0, [r4, 0x1E] pop {r4} pop {r0} @@ -616,7 +616,7 @@ _08067FA0: adds r1, r6, r1 lsls r1, 16 asrs r1, 16 - bl sub_8058F78 + bl MapGridGetMetatileBehaviorAt lsls r0, 24 lsrs r0, 24 bl GetReflectionTypeByMetatileBehavior @@ -632,7 +632,7 @@ _08067FA0: adds r1, r6, r1 lsls r1, 16 asrs r1, 16 - bl sub_8058F78 + bl MapGridGetMetatileBehaviorAt lsls r0, 24 lsrs r0, 24 bl GetReflectionTypeByMetatileBehavior @@ -661,7 +661,7 @@ _08067FFC: adds r1, r6, r1 lsls r1, 16 asrs r1, 16 - bl sub_8058F78 + bl MapGridGetMetatileBehaviorAt lsls r0, 24 lsrs r0, 24 bl GetReflectionTypeByMetatileBehavior @@ -678,7 +678,7 @@ _08067FFC: adds r1, r6, r1 lsls r1, 16 asrs r1, 16 - bl sub_8058F78 + bl MapGridGetMetatileBehaviorAt lsls r0, 24 lsrs r0, 24 bl GetReflectionTypeByMetatileBehavior @@ -695,7 +695,7 @@ _08067FFC: adds r1, r6, r1 lsls r1, 16 asrs r1, 16 - bl sub_8058F78 + bl MapGridGetMetatileBehaviorAt lsls r0, 24 lsrs r0, 24 bl GetReflectionTypeByMetatileBehavior @@ -712,7 +712,7 @@ _08067FFC: adds r1, r6, r1 lsls r1, 16 asrs r1, 16 - bl sub_8058F78 + bl MapGridGetMetatileBehaviorAt lsls r0, 24 lsrs r0, 24 bl GetReflectionTypeByMetatileBehavior @@ -801,7 +801,7 @@ _08068114: asrs r0, 16 lsls r1, 16 asrs r1, 16 - bl sub_8058F78 + bl MapGridGetMetatileBehaviorAt lsls r0, 24 lsrs r0, 24 ldr r2, _08068144 @ =gUnknown_83A705C diff --git a/asm/field_map_obj.s b/asm/field_map_obj.s index 84f023d19..c79a0330f 100644 --- a/asm/field_map_obj.s +++ b/asm/field_map_obj.s @@ -1012,7 +1012,7 @@ unref_sub_808D958: @ 805E55C push {r4,lr} movs r4, 0 _0805E560: - ldr r0, _0805E588 @ =gUnknown_2037078 + ldr r0, _0805E588 @ =gPlayerAvatar ldrb r0, [r0, 0x5] cmp r4, r0 beq _0805E576 @@ -1032,7 +1032,7 @@ _0805E576: pop {r0} bx r0 .align 2, 0 -_0805E588: .4byte gUnknown_2037078 +_0805E588: .4byte gPlayerAvatar _0805E58C: .4byte gMapObjects thumb_func_end unref_sub_808D958 @@ -2418,7 +2418,7 @@ SetPlayerAvatarFieldObjectIdAndObjectId: @ 805F02C push {r4,r5,lr} lsls r0, 24 lsrs r0, 24 - ldr r5, _0805F058 @ =gUnknown_2037078 + ldr r5, _0805F058 @ =gPlayerAvatar strb r0, [r5, 0x5] strb r1, [r5, 0x4] ldr r1, _0805F05C @ =gMapObjects @@ -2436,7 +2436,7 @@ SetPlayerAvatarFieldObjectIdAndObjectId: @ 805F02C pop {r0} bx r0 .align 2, 0 -_0805F058: .4byte gUnknown_2037078 +_0805F058: .4byte gPlayerAvatar _0805F05C: .4byte gMapObjects thumb_func_end SetPlayerAvatarFieldObjectIdAndObjectId @@ -10369,7 +10369,7 @@ sub_80628E4: @ 80628E4 adds r6, r0, 0 adds r7, r1, 0 ldr r2, _08062908 @ =gMapObjects - ldr r3, _0806290C @ =gUnknown_2037078 + ldr r3, _0806290C @ =gPlayerAvatar ldrb r1, [r3, 0x5] lsls r0, r1, 3 adds r0, r1 @@ -10386,7 +10386,7 @@ _08062904: b _08062938 .align 2, 0 _08062908: .4byte gMapObjects -_0806290C: .4byte gUnknown_2037078 +_0806290C: .4byte gPlayerAvatar _08062910: ldr r5, _08062940 @ =gUnknown_83A6390 bl player_get_x22 @@ -10533,7 +10533,7 @@ sub_80629B8: @ 80629B8 ldrsh r0, [r0, r2] movs r2, 0 ldrsh r1, [r5, r2] - bl sub_8058F78 + bl MapGridGetMetatileBehaviorAt lsls r0, 24 lsrs r0, 24 bl _call_via_r8 @@ -10622,7 +10622,7 @@ sub_8062A70: @ 8062A70 ldrsh r0, [r0, r2] movs r2, 0 ldrsh r1, [r5, r2] - bl sub_8058F78 + bl MapGridGetMetatileBehaviorAt lsls r0, 24 lsrs r0, 24 bl _call_via_r8 @@ -10711,7 +10711,7 @@ sub_8062B28: @ 8062B28 ldrsh r0, [r0, r2] movs r2, 0 ldrsh r1, [r5, r2] - bl sub_8058F78 + bl MapGridGetMetatileBehaviorAt lsls r0, 24 lsrs r0, 24 bl _call_via_r8 @@ -10800,7 +10800,7 @@ sub_8062BE0: @ 8062BE0 ldrsh r0, [r0, r2] movs r2, 0 ldrsh r1, [r5, r2] - bl sub_8058F78 + bl MapGridGetMetatileBehaviorAt lsls r0, 24 lsrs r0, 24 bl _call_via_r8 @@ -10925,7 +10925,7 @@ sub_8062CE0: @ 8062CE0 ldrsh r0, [r0, r2] movs r2, 0 ldrsh r1, [r5, r2] - bl sub_8058F78 + bl MapGridGetMetatileBehaviorAt lsls r0, 24 lsrs r0, 24 bl _call_via_r8 @@ -11021,7 +11021,7 @@ oac_hopping: @ 8062D98 ldrsh r0, [r0, r2] movs r2, 0 ldrsh r1, [r5, r2] - bl sub_8058F78 + bl MapGridGetMetatileBehaviorAt lsls r0, 24 lsrs r0, 24 bl _call_via_r8 @@ -11100,7 +11100,7 @@ mss_08062EA4: @ 8062EA4 adds r6, r0, 0 adds r7, r1, 0 ldr r2, _08062EC8 @ =gMapObjects - ldr r3, _08062ECC @ =gUnknown_2037078 + ldr r3, _08062ECC @ =gPlayerAvatar ldrb r1, [r3, 0x5] lsls r0, r1, 3 adds r0, r1 @@ -11117,7 +11117,7 @@ _08062EC4: b _08062EF8 .align 2, 0 _08062EC8: .4byte gMapObjects -_08062ECC: .4byte gUnknown_2037078 +_08062ECC: .4byte gPlayerAvatar _08062ED0: ldr r5, _08062F00 @ =gUnknown_83A6390 bl player_get_x22 @@ -12593,7 +12593,7 @@ IsMetatileDirectionallyImpassable: @ 80638AC asrs r0, 16 lsls r1, r7, 16 asrs r1, 16 - bl sub_8058F78 + bl MapGridGetMetatileBehaviorAt lsls r0, 24 lsrs r0, 24 ldr r1, [r4] diff --git a/asm/field_player_avatar.s b/asm/field_player_avatar.s index f0621961a..82c566d6b 100644 --- a/asm/field_player_avatar.s +++ b/asm/field_player_avatar.s @@ -43,7 +43,7 @@ sub_805B3E0: @ 805B3E0 mov r8, r1 lsls r2, 16 lsrs r7, r2, 16 - ldr r4, _0805B454 @ =gUnknown_2037078 + ldr r4, _0805B454 @ =gPlayerAvatar ldrb r1, [r4, 0x5] lsls r0, r1, 3 adds r0, r1 @@ -84,7 +84,7 @@ _0805B448: pop {r0} bx r0 .align 2, 0 -_0805B454: .4byte gUnknown_2037078 +_0805B454: .4byte gPlayerAvatar _0805B458: .4byte gMapObjects thumb_func_end sub_805B3E0 @@ -144,14 +144,14 @@ npc_clear_strange_bits: @ 805B4B0 adds r2, 0x2 ands r1, r2 strb r1, [r0, 0x1] - ldr r2, _0805B4D0 @ =gUnknown_2037078 + ldr r2, _0805B4D0 @ =gPlayerAvatar ldrb r1, [r2] movs r0, 0x7F ands r0, r1 strb r0, [r2] bx lr .align 2, 0 -_0805B4D0: .4byte gUnknown_2037078 +_0805B4D0: .4byte gPlayerAvatar thumb_func_end npc_clear_strange_bits thumb_func_start MovePlayerAvatarUsingKeypadInput @@ -163,7 +163,7 @@ MovePlayerAvatarUsingKeypadInput: @ 805B4D4 lsrs r4, r1, 16 lsls r2, 16 lsrs r2, 16 - ldr r0, _0805B4F8 @ =gUnknown_2037078 + ldr r0, _0805B4F8 @ =gPlayerAvatar ldrb r1, [r0] movs r0, 0x6 ands r0, r1 @@ -174,7 +174,7 @@ MovePlayerAvatarUsingKeypadInput: @ 805B4D4 bl sub_80BD09C b _0805B504 .align 2, 0 -_0805B4F8: .4byte gUnknown_2037078 +_0805B4F8: .4byte gPlayerAvatar _0805B4FC: adds r0, r3, 0 adds r1, r2, 0 @@ -188,7 +188,7 @@ _0805B504: thumb_func_start PlayerAllowForcedMovementIfMovingSameDirection PlayerAllowForcedMovementIfMovingSameDirection: @ 805B50C push {lr} - ldr r2, _0805B524 @ =gUnknown_2037078 + ldr r2, _0805B524 @ =gPlayerAvatar ldrb r0, [r2, 0x2] cmp r0, 0x2 bne _0805B51E @@ -200,13 +200,13 @@ _0805B51E: pop {r0} bx r0 .align 2, 0 -_0805B524: .4byte gUnknown_2037078 +_0805B524: .4byte gPlayerAvatar thumb_func_end PlayerAllowForcedMovementIfMovingSameDirection thumb_func_start sub_805B528 sub_805B528: @ 805B528 push {r4,r5,lr} - ldr r5, _0805B58C @ =gUnknown_2037078 + ldr r5, _0805B58C @ =gPlayerAvatar ldrb r1, [r5] movs r0, 0x40 ands r0, r1 @@ -252,7 +252,7 @@ _0805B586: movs r0, 0x1 b _0805B59A .align 2, 0 -_0805B58C: .4byte gUnknown_2037078 +_0805B58C: .4byte gPlayerAvatar _0805B590: .4byte gUnknown_2036E30 _0805B594: .4byte gMapObjects _0805B598: @@ -267,7 +267,7 @@ _0805B59A: sub_805B5A0: @ 805B5A0 push {r4-r7,lr} sub sp, 0x4 - ldr r3, _0805B5F4 @ =gUnknown_2037078 + ldr r3, _0805B5F4 @ =gPlayerAvatar ldrb r1, [r3] movs r0, 0x20 ands r0, r1 @@ -307,17 +307,17 @@ _0805B5CC: bne _0805B5CC b _0805B628 .align 2, 0 -_0805B5F4: .4byte gUnknown_2037078 +_0805B5F4: .4byte gPlayerAvatar _0805B5F8: .4byte gMapObjects _0805B5FC: .4byte gUnknown_835B764 _0805B600: - ldr r0, _0805B60C @ =gUnknown_2037078 + ldr r0, _0805B60C @ =gPlayerAvatar strh r7, [r0, 0x1C] adds r0, r2, 0x4 adds r0, r5, r0 b _0805B62E .align 2, 0 -_0805B60C: .4byte gUnknown_2037078 +_0805B60C: .4byte gPlayerAvatar _0805B610: movs r6, 0 ldr r0, _0805B640 @ =gUnknown_835B764 @@ -352,7 +352,7 @@ _0805B640: .4byte gUnknown_835B764 thumb_func_start ForcedMovement_None ForcedMovement_None: @ 805B644 push {r4,lr} - ldr r4, _0805B688 @ =gUnknown_2037078 + ldr r4, _0805B688 @ =gPlayerAvatar ldrb r1, [r4] movs r0, 0x40 ands r0, r1 @@ -385,7 +385,7 @@ _0805B67E: pop {r1} bx r1 .align 2, 0 -_0805B688: .4byte gUnknown_2037078 +_0805B688: .4byte gPlayerAvatar _0805B68C: .4byte gMapObjects thumb_func_end ForcedMovement_None @@ -399,7 +399,7 @@ DoForcedMovement: @ 805B690 mov r9, r1 lsls r0, 24 lsrs r5, r0, 24 - ldr r6, _0805B6D0 @ =gUnknown_2037078 + ldr r6, _0805B6D0 @ =gPlayerAvatar adds r0, r5, 0 bl sub_805BB1C lsls r0, 24 @@ -421,7 +421,7 @@ DoForcedMovement: @ 805B690 movs r0, 0 b _0805B6F8 .align 2, 0 -_0805B6D0: .4byte gUnknown_2037078 +_0805B6D0: .4byte gPlayerAvatar _0805B6D4: cmp r7, 0x6 bne _0805B6DE @@ -456,7 +456,7 @@ _0805B6F8: DoForcedMovementInCurrentDirection: @ 805B708 push {lr} adds r1, r0, 0 - ldr r0, _0805B734 @ =gUnknown_2037078 + ldr r0, _0805B734 @ =gPlayerAvatar ldrb r2, [r0, 0x5] lsls r0, r2, 3 adds r0, r2 @@ -475,7 +475,7 @@ DoForcedMovementInCurrentDirection: @ 805B708 pop {r1} bx r1 .align 2, 0 -_0805B734: .4byte gUnknown_2037078 +_0805B734: .4byte gPlayerAvatar _0805B738: .4byte gMapObjects thumb_func_end DoForcedMovementInCurrentDirection @@ -678,7 +678,7 @@ ForcedMovement_Slide: @ 805B88C push {r4,lr} lsls r0, 24 lsrs r0, 24 - ldr r2, _0805B8BC @ =gUnknown_2037078 + ldr r2, _0805B8BC @ =gPlayerAvatar ldrb r3, [r2, 0x5] lsls r2, r3, 3 adds r2, r3 @@ -698,7 +698,7 @@ ForcedMovement_Slide: @ 805B88C pop {r1} bx r1 .align 2, 0 -_0805B8BC: .4byte gUnknown_2037078 +_0805B8BC: .4byte gPlayerAvatar _0805B8C0: .4byte gMapObjects thumb_func_end ForcedMovement_Slide @@ -809,28 +809,28 @@ CheckMovementInputNotOnBike: @ 805B96C lsrs r4, r0, 24 cmp r4, 0 bne _0805B984 - ldr r0, _0805B980 @ =gUnknown_2037078 + ldr r0, _0805B980 @ =gPlayerAvatar strb r4, [r0, 0x2] movs r0, 0 b _0805B9A6 .align 2, 0 -_0805B980: .4byte gUnknown_2037078 +_0805B980: .4byte gPlayerAvatar _0805B984: bl player_get_direction_upper_nybble lsls r0, 24 lsrs r0, 24 cmp r4, r0 beq _0805B9A0 - ldr r1, _0805B99C @ =gUnknown_2037078 + ldr r1, _0805B99C @ =gPlayerAvatar ldrb r0, [r1, 0x2] cmp r0, 0x2 beq _0805B9A0 movs r0, 0x1 b _0805B9A4 .align 2, 0 -_0805B99C: .4byte gUnknown_2037078 +_0805B99C: .4byte gPlayerAvatar _0805B9A0: - ldr r1, _0805B9AC @ =gUnknown_2037078 + ldr r1, _0805B9AC @ =gPlayerAvatar movs r0, 0x2 _0805B9A4: strb r0, [r1, 0x2] @@ -839,7 +839,7 @@ _0805B9A6: pop {r1} bx r1 .align 2, 0 -_0805B9AC: .4byte gUnknown_2037078 +_0805B9AC: .4byte gPlayerAvatar thumb_func_end CheckMovementInputNotOnBike thumb_func_start PlayerNotOnBikeNotMoving @@ -898,7 +898,7 @@ _0805BA06: bl PlayerNotOnBikeCollide b _0805BAA4 _0805BA18: - ldr r6, _0805BA2C @ =gUnknown_2037078 + ldr r6, _0805BA2C @ =gPlayerAvatar ldrb r1, [r6] movs r0, 0x8 ands r0, r1 @@ -908,7 +908,7 @@ _0805BA18: bl sub_805C11C b _0805BAA4 .align 2, 0 -_0805BA2C: .4byte gUnknown_2037078 +_0805BA2C: .4byte gPlayerAvatar _0805BA30: movs r0, 0x2 ands r5, r0 @@ -943,14 +943,14 @@ _0805BA74: adds r0, r4, 0 bl sub_805C17C _0805BA7A: - ldr r2, _0805BA88 @ =gUnknown_2037078 + ldr r2, _0805BA88 @ =gPlayerAvatar ldrb r1, [r2] movs r0, 0x80 orrs r0, r1 strb r0, [r2] b _0805BAA4 .align 2, 0 -_0805BA88: .4byte gUnknown_2037078 +_0805BA88: .4byte gPlayerAvatar _0805BA8C: adds r0, r4, 0 bl sub_805BAAC @@ -974,7 +974,7 @@ sub_805BAAC: @ 805BAAC sub sp, 0x4 lsls r0, 24 lsrs r3, r0, 24 - ldr r0, _0805BAE4 @ =gUnknown_2037078 + ldr r0, _0805BAE4 @ =gPlayerAvatar ldrb r1, [r0, 0x5] lsls r0, r1, 3 adds r0, r1 @@ -999,7 +999,7 @@ sub_805BAAC: @ 805BAAC asrs r1, 16 b _0805BB00 .align 2, 0 -_0805BAE4: .4byte gUnknown_2037078 +_0805BAE4: .4byte gPlayerAvatar _0805BAE8: .4byte gMapObjects _0805BAEC: movs r0, 0x1 @@ -1012,7 +1012,7 @@ _0805BAEC: movs r2, 0 ldrsh r1, [r4, r2] _0805BB00: - bl sub_8058F78 + bl MapGridGetMetatileBehaviorAt lsls r0, 24 lsrs r0, 24 bl sub_805A460 @@ -1034,7 +1034,7 @@ sub_805BB1C: @ 805BB1C sub sp, 0x8 lsls r0, 24 lsrs r6, r0, 24 - ldr r0, _0805BB94 @ =gUnknown_2037078 + ldr r0, _0805BB94 @ =gPlayerAvatar ldrb r1, [r0, 0x5] lsls r0, r1, 3 adds r0, r1 @@ -1052,7 +1052,7 @@ sub_805BB1C: @ 805BB1C ldrsh r0, [r0, r2] lsls r1, 16 asrs r1, 16 - bl sub_8058F78 + bl MapGridGetMetatileBehaviorAt lsls r0, 16 lsrs r0, 16 adds r1, r6, 0 @@ -1069,7 +1069,7 @@ sub_805BB1C: @ 805BB1C ldrsh r0, [r0, r3] movs r2, 0 ldrsh r1, [r4, r2] - bl sub_8058F78 + bl MapGridGetMetatileBehaviorAt lsls r0, 24 lsrs r0, 24 add r1, sp, 0x4 @@ -1085,7 +1085,7 @@ sub_805BB1C: @ 805BB1C lsrs r0, 24 b _0805BB9E .align 2, 0 -_0805BB94: .4byte gUnknown_2037078 +_0805BB94: .4byte gPlayerAvatar _0805BB98: .4byte gMapObjects _0805BB9C: movs r0, 0x8 @@ -1200,7 +1200,7 @@ sub_805BC60: @ 805BC60 lsrs r4, r1, 16 lsls r2, 24 lsrs r6, r2, 24 - ldr r0, _0805BCB8 @ =gUnknown_2037078 + ldr r0, _0805BCB8 @ =gPlayerAvatar ldrb r1, [r0] movs r0, 0x8 ands r0, r1 @@ -1233,7 +1233,7 @@ sub_805BC60: @ 805BC60 movs r0, 0x1 b _0805BCC2 .align 2, 0 -_0805BCB8: .4byte gUnknown_2037078 +_0805BCB8: .4byte gPlayerAvatar _0805BCBC: .4byte gUnknown_835B820 _0805BCC0: movs r0, 0 @@ -1313,7 +1313,7 @@ sub_805BCEC: @ 805BCEC ldrsh r0, [r0, r1] movs r2, 0 ldrsh r1, [r5, r2] - bl sub_8058F78 + bl MapGridGetMetatileBehaviorAt cmp r0, 0x66 beq _0805BD8A mov r0, sp @@ -1332,7 +1332,7 @@ sub_805BCEC: @ 805BCEC ldrsh r0, [r0, r1] movs r2, 0 ldrsh r1, [r5, r2] - bl sub_8058F78 + bl MapGridGetMetatileBehaviorAt lsls r0, 24 lsrs r0, 24 bl sub_8059C8C @@ -1399,7 +1399,7 @@ SetPlayerAvatarTransitionFlags: @ 805BDEC push {lr} lsls r0, 16 lsrs r0, 16 - ldr r2, _0805BE04 @ =gUnknown_2037078 + ldr r2, _0805BE04 @ =gPlayerAvatar ldrb r1, [r2, 0x1] orrs r0, r1 strb r0, [r2, 0x1] @@ -1407,13 +1407,13 @@ SetPlayerAvatarTransitionFlags: @ 805BDEC pop {r0} bx r0 .align 2, 0 -_0805BE04: .4byte gUnknown_2037078 +_0805BE04: .4byte gPlayerAvatar thumb_func_end SetPlayerAvatarTransitionFlags thumb_func_start DoPlayerAvatarTransition DoPlayerAvatarTransition: @ 805BE08 push {r4,r5,lr} - ldr r0, _0805BE50 @ =gUnknown_2037078 + ldr r0, _0805BE50 @ =gPlayerAvatar ldrb r4, [r0, 0x1] cmp r4, 0 beq _0805BE48 @@ -1426,7 +1426,7 @@ _0805BE14: ldr r0, _0805BE54 @ =gUnknown_835B844 lsls r2, r5, 2 adds r2, r0 - ldr r0, _0805BE50 @ =gUnknown_2037078 + ldr r0, _0805BE50 @ =gPlayerAvatar ldrb r1, [r0, 0x5] lsls r0, r1, 3 adds r0, r1 @@ -1442,7 +1442,7 @@ _0805BE36: lsrs r4, 1 cmp r5, 0x7 bls _0805BE14 - ldr r1, _0805BE50 @ =gUnknown_2037078 + ldr r1, _0805BE50 @ =gPlayerAvatar movs r0, 0 strb r0, [r1, 0x1] _0805BE48: @@ -1450,7 +1450,7 @@ _0805BE48: pop {r0} bx r0 .align 2, 0 -_0805BE50: .4byte gUnknown_2037078 +_0805BE50: .4byte gPlayerAvatar _0805BE54: .4byte gUnknown_835B844 _0805BE58: .4byte gMapObjects thumb_func_end DoPlayerAvatarTransition @@ -1503,20 +1503,20 @@ nullsub_23: @ 805BEA4 thumb_func_start PlayerAvatarTransition_ReturnToField PlayerAvatarTransition_ReturnToField: @ 805BEA8 - ldr r2, _0805BEB4 @ =gUnknown_2037078 + ldr r2, _0805BEB4 @ =gPlayerAvatar ldrb r1, [r2] movs r0, 0x20 orrs r0, r1 strb r0, [r2] bx lr .align 2, 0 -_0805BEB4: .4byte gUnknown_2037078 +_0805BEB4: .4byte gPlayerAvatar thumb_func_end PlayerAvatarTransition_ReturnToField thumb_func_start sub_805BEB8 sub_805BEB8: @ 805BEB8 push {r4,lr} - ldr r4, _0805BEE4 @ =gUnknown_2037078 + ldr r4, _0805BEE4 @ =gPlayerAvatar movs r0, 0 strb r0, [r4, 0x3] bl PlayerIsAnimActive @@ -1534,7 +1534,7 @@ sub_805BEB8: @ 805BEB8 movs r0, 0x1 b _0805BEF4 .align 2, 0 -_0805BEE4: .4byte gUnknown_2037078 +_0805BEE4: .4byte gPlayerAvatar _0805BEE8: bl sub_805BF58 lsls r0, 24 @@ -1553,7 +1553,7 @@ _0805BEF6: player_is_anim_in_certain_ranges: @ 805BEFC push {lr} ldr r2, _0805BF48 @ =gMapObjects - ldr r0, _0805BF4C @ =gUnknown_2037078 + ldr r0, _0805BF4C @ =gPlayerAvatar ldrb r1, [r0, 0x5] lsls r0, r1, 3 adds r0, r1 @@ -1591,7 +1591,7 @@ _0805BF42: b _0805BF52 .align 2, 0 _0805BF48: .4byte gMapObjects -_0805BF4C: .4byte gUnknown_2037078 +_0805BF4C: .4byte gPlayerAvatar _0805BF50: movs r0, 0 _0805BF52: @@ -1606,14 +1606,14 @@ sub_805BF58: @ 805BF58 lsls r0, 24 cmp r0, 0 beq _0805BF74 - ldr r0, _0805BF70 @ =gUnknown_2037078 + ldr r0, _0805BF70 @ =gPlayerAvatar ldrb r0, [r0, 0x2] cmp r0, 0x1 beq _0805BF74 movs r0, 0x1 b _0805BF76 .align 2, 0 -_0805BF70: .4byte gUnknown_2037078 +_0805BF70: .4byte gPlayerAvatar _0805BF74: movs r0, 0 _0805BF76: @@ -1624,7 +1624,7 @@ _0805BF76: thumb_func_start PlayerIsAnimActive PlayerIsAnimActive: @ 805BF7C push {lr} - ldr r0, _0805BF98 @ =gUnknown_2037078 + ldr r0, _0805BF98 @ =gPlayerAvatar ldrb r1, [r0, 0x5] lsls r0, r1, 3 adds r0, r1 @@ -1637,14 +1637,14 @@ PlayerIsAnimActive: @ 805BF7C pop {r1} bx r1 .align 2, 0 -_0805BF98: .4byte gUnknown_2037078 +_0805BF98: .4byte gPlayerAvatar _0805BF9C: .4byte gMapObjects thumb_func_end PlayerIsAnimActive thumb_func_start PlayerCheckIfAnimFinishedOrInactive PlayerCheckIfAnimFinishedOrInactive: @ 805BFA0 push {lr} - ldr r0, _0805BFBC @ =gUnknown_2037078 + ldr r0, _0805BFBC @ =gPlayerAvatar ldrb r1, [r0, 0x5] lsls r0, r1, 3 adds r0, r1 @@ -1657,14 +1657,14 @@ PlayerCheckIfAnimFinishedOrInactive: @ 805BFA0 pop {r1} bx r1 .align 2, 0 -_0805BFBC: .4byte gUnknown_2037078 +_0805BFBC: .4byte gPlayerAvatar _0805BFC0: .4byte gMapObjects thumb_func_end PlayerCheckIfAnimFinishedOrInactive thumb_func_start player_set_x22 player_set_x22: @ 805BFC4 ldr r3, _0805BFD8 @ =gMapObjects - ldr r1, _0805BFDC @ =gUnknown_2037078 + ldr r1, _0805BFDC @ =gPlayerAvatar ldrb r2, [r1, 0x5] lsls r1, r2, 3 adds r1, r2 @@ -1675,13 +1675,13 @@ player_set_x22: @ 805BFC4 bx lr .align 2, 0 _0805BFD8: .4byte gMapObjects -_0805BFDC: .4byte gUnknown_2037078 +_0805BFDC: .4byte gPlayerAvatar thumb_func_end player_set_x22 thumb_func_start player_get_x22 player_get_x22: @ 805BFE0 ldr r2, _0805BFF4 @ =gMapObjects - ldr r0, _0805BFF8 @ =gUnknown_2037078 + ldr r0, _0805BFF8 @ =gPlayerAvatar ldrb r1, [r0, 0x5] lsls r0, r1, 3 adds r0, r1 @@ -1692,7 +1692,7 @@ player_get_x22: @ 805BFE0 bx lr .align 2, 0 _0805BFF4: .4byte gMapObjects -_0805BFF8: .4byte gUnknown_2037078 +_0805BFF8: .4byte gPlayerAvatar thumb_func_end player_get_x22 thumb_func_start sub_805BFFC @@ -1701,7 +1701,7 @@ sub_805BFFC: @ 805BFFC adds r1, r0, 0 lsls r1, 24 lsrs r1, 24 - ldr r0, _0805C01C @ =gUnknown_2037078 + ldr r0, _0805C01C @ =gPlayerAvatar ldrb r2, [r0, 0x5] lsls r0, r2, 3 adds r0, r2 @@ -1712,7 +1712,7 @@ sub_805BFFC: @ 805BFFC pop {r0} bx r0 .align 2, 0 -_0805C01C: .4byte gUnknown_2037078 +_0805C01C: .4byte gPlayerAvatar _0805C020: .4byte gMapObjects thumb_func_end sub_805BFFC @@ -1729,7 +1729,7 @@ sub_805C024: @ 805C024 bne _0805C05E adds r0, r4, 0 bl player_set_x22 - ldr r0, _0805C064 @ =gUnknown_2037078 + ldr r0, _0805C064 @ =gPlayerAvatar ldrb r1, [r0, 0x5] lsls r0, r1, 3 adds r0, r1 @@ -1748,7 +1748,7 @@ _0805C05E: pop {r0} bx r0 .align 2, 0 -_0805C064: .4byte gUnknown_2037078 +_0805C064: .4byte gPlayerAvatar _0805C068: .4byte gMapObjects thumb_func_end sub_805C024 @@ -1757,7 +1757,7 @@ sub_805C06C: @ 805C06C push {r4,lr} lsls r1, 24 lsrs r4, r1, 24 - ldr r0, _0805C09C @ =gUnknown_2037078 + ldr r0, _0805C09C @ =gPlayerAvatar ldrb r1, [r0, 0x5] lsls r0, r1, 3 adds r0, r1 @@ -1777,7 +1777,7 @@ _0805C094: pop {r0} bx r0 .align 2, 0 -_0805C09C: .4byte gUnknown_2037078 +_0805C09C: .4byte gPlayerAvatar _0805C0A0: .4byte gMapObjects thumb_func_end sub_805C06C @@ -2045,7 +2045,7 @@ sub_805C260: @ 805C260 thumb_func_start sub_805C270 sub_805C270: @ 805C270 push {r4,lr} - ldr r4, _0805C2AC @ =gUnknown_2037078 + ldr r4, _0805C2AC @ =gPlayerAvatar ldrb r0, [r4, 0x3] cmp r0, 0x2 beq _0805C27E @@ -2074,7 +2074,7 @@ _0805C2A6: pop {r0} bx r0 .align 2, 0 -_0805C2AC: .4byte gUnknown_2037078 +_0805C2AC: .4byte gPlayerAvatar _0805C2B0: .4byte gMapObjects thumb_func_end sub_805C270 @@ -2302,7 +2302,7 @@ sub_805C438: @ 805C438 lsrs r5, r0, 24 adds r6, r5, 0 ldr r2, _0805C4E8 @ =gMapObjects - ldr r0, _0805C4EC @ =gUnknown_2037078 + ldr r0, _0805C4EC @ =gPlayerAvatar ldrb r1, [r0, 0x5] lsls r0, r1, 3 adds r0, r1 @@ -2361,7 +2361,7 @@ _0805C4A0: ldrsh r0, [r0, r1] movs r2, 0 ldrsh r1, [r4, r2] - bl sub_8058F78 + bl MapGridGetMetatileBehaviorAt lsls r0, 24 lsrs r4, r0, 24 adds r0, r4, 0 @@ -2379,7 +2379,7 @@ _0805C4DE: bx r0 .align 2, 0 _0805C4E8: .4byte gMapObjects -_0805C4EC: .4byte gUnknown_2037078 +_0805C4EC: .4byte gPlayerAvatar _0805C4F0: .4byte gUnknown_835B864 thumb_func_end sub_805C438 @@ -2389,7 +2389,7 @@ GetXYCoordsOneStepInFrontOfPlayer: @ 805C4F4 adds r4, r0, 0 adds r5, r1, 0 ldr r3, _0805C530 @ =gMapObjects - ldr r2, _0805C534 @ =gUnknown_2037078 + ldr r2, _0805C534 @ =gPlayerAvatar ldrb r1, [r2, 0x5] lsls r0, r1, 3 adds r0, r1 @@ -2415,14 +2415,14 @@ GetXYCoordsOneStepInFrontOfPlayer: @ 805C4F4 bx r0 .align 2, 0 _0805C530: .4byte gMapObjects -_0805C534: .4byte gUnknown_2037078 +_0805C534: .4byte gPlayerAvatar thumb_func_end GetXYCoordsOneStepInFrontOfPlayer thumb_func_start PlayerGetDestCoords PlayerGetDestCoords: @ 805C538 push {r4,r5,lr} ldr r5, _0805C560 @ =gMapObjects - ldr r4, _0805C564 @ =gUnknown_2037078 + ldr r4, _0805C564 @ =gPlayerAvatar ldrb r3, [r4, 0x5] lsls r2, r3, 3 adds r2, r3 @@ -2442,7 +2442,7 @@ PlayerGetDestCoords: @ 805C538 bx r0 .align 2, 0 _0805C560: .4byte gMapObjects -_0805C564: .4byte gUnknown_2037078 +_0805C564: .4byte gPlayerAvatar thumb_func_end PlayerGetDestCoords thumb_func_start plaer_get_pos_including_state_based_drift @@ -2450,7 +2450,7 @@ plaer_get_pos_including_state_based_drift: @ 805C568 push {r4,r5,lr} adds r4, r0, 0 adds r5, r1, 0 - ldr r0, _0805C5BC @ =gUnknown_2037078 + ldr r0, _0805C5BC @ =gPlayerAvatar ldrb r1, [r0, 0x5] lsls r0, r1, 3 adds r0, r1 @@ -2492,7 +2492,7 @@ _0805C5B0: ldr r0, [r0] mov pc, r0 .align 2, 0 -_0805C5BC: .4byte gUnknown_2037078 +_0805C5BC: .4byte gPlayerAvatar _0805C5C0: .4byte gMapObjects _0805C5C4: .4byte gSprites _0805C5C8: .4byte _0805C5CC @@ -2585,7 +2585,7 @@ _0805C6BC: thumb_func_start player_get_direction_lower_nybble player_get_direction_lower_nybble: @ 805C6C4 ldr r2, _0805C6DC @ =gMapObjects - ldr r0, _0805C6E0 @ =gUnknown_2037078 + ldr r0, _0805C6E0 @ =gPlayerAvatar ldrb r1, [r0, 0x5] lsls r0, r1, 3 adds r0, r1 @@ -2597,13 +2597,13 @@ player_get_direction_lower_nybble: @ 805C6C4 bx lr .align 2, 0 _0805C6DC: .4byte gMapObjects -_0805C6E0: .4byte gUnknown_2037078 +_0805C6E0: .4byte gPlayerAvatar thumb_func_end player_get_direction_lower_nybble thumb_func_start player_get_direction_upper_nybble player_get_direction_upper_nybble: @ 805C6E4 ldr r2, _0805C6F8 @ =gMapObjects - ldr r0, _0805C6FC @ =gUnknown_2037078 + ldr r0, _0805C6FC @ =gPlayerAvatar ldrb r1, [r0, 0x5] lsls r0, r1, 3 adds r0, r1 @@ -2614,13 +2614,13 @@ player_get_direction_upper_nybble: @ 805C6E4 bx lr .align 2, 0 _0805C6F8: .4byte gMapObjects -_0805C6FC: .4byte gUnknown_2037078 +_0805C6FC: .4byte gPlayerAvatar thumb_func_end player_get_direction_upper_nybble thumb_func_start PlayerGetZCoord PlayerGetZCoord: @ 805C700 ldr r2, _0805C714 @ =gMapObjects - ldr r0, _0805C718 @ =gUnknown_2037078 + ldr r0, _0805C718 @ =gPlayerAvatar ldrb r1, [r0, 0x5] lsls r0, r1, 3 adds r0, r1 @@ -2631,7 +2631,7 @@ PlayerGetZCoord: @ 805C700 bx lr .align 2, 0 _0805C714: .4byte gMapObjects -_0805C718: .4byte gUnknown_2037078 +_0805C718: .4byte gPlayerAvatar thumb_func_end PlayerGetZCoord thumb_func_start sub_805C71C @@ -2639,7 +2639,7 @@ sub_805C71C: @ 805C71C push {lr} adds r3, r0, 0 adds r2, r1, 0 - ldr r0, _0805C744 @ =gUnknown_2037078 + ldr r0, _0805C744 @ =gPlayerAvatar ldrb r1, [r0, 0x5] lsls r0, r1, 3 adds r0, r1 @@ -2655,37 +2655,37 @@ sub_805C71C: @ 805C71C pop {r0} bx r0 .align 2, 0 -_0805C744: .4byte gUnknown_2037078 +_0805C744: .4byte gPlayerAvatar _0805C748: .4byte gMapObjects thumb_func_end sub_805C71C thumb_func_start TestPlayerAvatarFlags TestPlayerAvatarFlags: @ 805C74C - ldr r1, _0805C758 @ =gUnknown_2037078 + ldr r1, _0805C758 @ =gPlayerAvatar ldrb r1, [r1] ands r1, r0 adds r0, r1, 0 bx lr .align 2, 0 -_0805C758: .4byte gUnknown_2037078 +_0805C758: .4byte gPlayerAvatar thumb_func_end TestPlayerAvatarFlags thumb_func_start sub_805C75C sub_805C75C: @ 805C75C - ldr r0, _0805C764 @ =gUnknown_2037078 + ldr r0, _0805C764 @ =gPlayerAvatar ldrb r0, [r0] bx lr .align 2, 0 -_0805C764: .4byte gUnknown_2037078 +_0805C764: .4byte gPlayerAvatar thumb_func_end sub_805C75C thumb_func_start GetPlayerAvatarObjectId GetPlayerAvatarObjectId: @ 805C768 - ldr r0, _0805C770 @ =gUnknown_2037078 + ldr r0, _0805C770 @ =gPlayerAvatar ldrb r0, [r0, 0x4] bx lr .align 2, 0 -_0805C770: .4byte gUnknown_2037078 +_0805C770: .4byte gPlayerAvatar thumb_func_end GetPlayerAvatarObjectId thumb_func_start sub_805C774 @@ -2699,7 +2699,7 @@ sub_805C774: @ 805C774 thumb_func_start sub_805C780 sub_805C780: @ 805C780 push {r4,lr} - ldr r0, _0805C7C0 @ =gUnknown_2037078 + ldr r0, _0805C7C0 @ =gPlayerAvatar ldrb r0, [r0, 0x5] lsls r4, r0, 3 adds r4, r0 @@ -2726,7 +2726,7 @@ _0805C7B8: pop {r0} bx r0 .align 2, 0 -_0805C7C0: .4byte gUnknown_2037078 +_0805C7C0: .4byte gPlayerAvatar _0805C7C4: .4byte gMapObjects thumb_func_end sub_805C780 @@ -2776,7 +2776,7 @@ sub_805C808: @ 805C808 push {lr} lsls r0, 24 lsrs r0, 24 - ldr r1, _0805C820 @ =gUnknown_2037078 + ldr r1, _0805C820 @ =gPlayerAvatar ldrb r1, [r1, 0x7] bl GetPlayerAvatarGraphicsIdByStateIdAndGender lsls r0, 24 @@ -2784,7 +2784,7 @@ sub_805C808: @ 805C808 pop {r1} bx r1 .align 2, 0 -_0805C820: .4byte gUnknown_2037078 +_0805C820: .4byte gPlayerAvatar thumb_func_end sub_805C808 thumb_func_start sub_805C824 @@ -2877,7 +2877,7 @@ _0805C8AC: IsPlayerFacingSurfableFishableWater: @ 805C8B0 push {r4,r5,lr} sub sp, 0x4 - ldr r0, _0805C924 @ =gUnknown_2037078 + ldr r0, _0805C924 @ =gPlayerAvatar ldrb r0, [r0, 0x5] lsls r4, r0, 3 adds r4, r0 @@ -2929,7 +2929,7 @@ IsPlayerFacingSurfableFishableWater: @ 805C8B0 movs r0, 0x1 b _0805C92E .align 2, 0 -_0805C924: .4byte gUnknown_2037078 +_0805C924: .4byte gPlayerAvatar _0805C928: .4byte gMapObjects _0805C92C: movs r0, 0 @@ -2962,21 +2962,21 @@ sub_805C938: @ 805C938 thumb_func_start ClearPlayerAvatarInfo ClearPlayerAvatarInfo: @ 805C95C push {lr} - ldr r0, _0805C96C @ =gUnknown_2037078 + ldr r0, _0805C96C @ =gPlayerAvatar movs r1, 0 movs r2, 0x20 bl memset pop {r0} bx r0 .align 2, 0 -_0805C96C: .4byte gUnknown_2037078 +_0805C96C: .4byte gPlayerAvatar thumb_func_end ClearPlayerAvatarInfo thumb_func_start SetPlayerAvatarStateMask SetPlayerAvatarStateMask: @ 805C970 lsls r0, 24 lsrs r0, 24 - ldr r3, _0805C984 @ =gUnknown_2037078 + ldr r3, _0805C984 @ =gPlayerAvatar ldrb r2, [r3] movs r1, 0xE0 ands r1, r2 @@ -2984,7 +2984,7 @@ SetPlayerAvatarStateMask: @ 805C970 strb r0, [r3] bx lr .align 2, 0 -_0805C984: .4byte gUnknown_2037078 +_0805C984: .4byte gPlayerAvatar thumb_func_end SetPlayerAvatarStateMask thumb_func_start GetPlayerAvatarStateTransitionByGraphicsId @@ -3028,7 +3028,7 @@ _0805C9C0: thumb_func_start GetPlayerAvatarGraphicsIdByCurrentState GetPlayerAvatarGraphicsIdByCurrentState: @ 805C9C8 push {r4-r6,lr} - ldr r0, _0805C9F0 @ =gUnknown_2037078 + ldr r0, _0805C9F0 @ =gPlayerAvatar ldrb r5, [r0] movs r2, 0 ldr r3, _0805C9F4 @ =gUnknown_835B882 @@ -3049,7 +3049,7 @@ _0805C9DC: ldrb r0, [r0] b _0805CA04 .align 2, 0 -_0805C9F0: .4byte gUnknown_2037078 +_0805C9F0: .4byte gPlayerAvatar _0805C9F4: .4byte gUnknown_835B882 _0805C9F8: adds r0, r2, 0x1 @@ -3072,7 +3072,7 @@ SetPlayerAvatarExtraStateTransition: @ 805CA0C lsrs r0, 24 lsls r4, 24 lsrs r4, 24 - ldr r5, _0805CA38 @ =gUnknown_2037078 + ldr r5, _0805CA38 @ =gPlayerAvatar ldrb r1, [r5, 0x7] bl GetPlayerAvatarStateTransitionByGraphicsId lsls r0, 24 @@ -3086,7 +3086,7 @@ SetPlayerAvatarExtraStateTransition: @ 805CA0C pop {r0} bx r0 .align 2, 0 -_0805CA38: .4byte gUnknown_2037078 +_0805CA38: .4byte gPlayerAvatar thumb_func_end SetPlayerAvatarExtraStateTransition thumb_func_start InitPlayerAvatar @@ -3164,7 +3164,7 @@ InitPlayerAvatar: @ 805CA3C mov r1, r9 bl FieldObjectTurn bl ClearPlayerAvatarInfo - ldr r0, _0805CB00 @ =gUnknown_2037078 + ldr r0, _0805CB00 @ =gPlayerAvatar strb r6, [r0, 0x2] strb r6, [r0, 0x3] strb r5, [r0, 0x5] @@ -3183,7 +3183,7 @@ InitPlayerAvatar: @ 805CA3C bx r0 .align 2, 0 _0805CAFC: .4byte gMapObjects -_0805CB00: .4byte gUnknown_2037078 +_0805CB00: .4byte gPlayerAvatar thumb_func_end InitPlayerAvatar thumb_func_start sub_805CB04 @@ -3192,7 +3192,7 @@ sub_805CB04: @ 805CB04 lsls r0, 24 lsrs r4, r0, 24 ldr r6, _0805CB64 @ =gMapObjects - ldr r5, _0805CB68 @ =gUnknown_2037078 + ldr r5, _0805CB68 @ =gPlayerAvatar ldrb r0, [r5, 0x5] lsls r1, r0, 3 adds r1, r0 @@ -3237,14 +3237,14 @@ _0805CB5C: bx r0 .align 2, 0 _0805CB64: .4byte gMapObjects -_0805CB68: .4byte gUnknown_2037078 +_0805CB68: .4byte gPlayerAvatar _0805CB6C: .4byte gSprites thumb_func_end sub_805CB04 thumb_func_start sub_805CB70 sub_805CB70: @ 805CB70 push {r4,r5,lr} - ldr r5, _0805CBAC @ =gUnknown_2037078 + ldr r5, _0805CBAC @ =gPlayerAvatar ldrb r0, [r5, 0x5] lsls r4, r0, 3 adds r4, r0 @@ -3270,7 +3270,7 @@ sub_805CB70: @ 805CB70 pop {r0} bx r0 .align 2, 0 -_0805CBAC: .4byte gUnknown_2037078 +_0805CBAC: .4byte gPlayerAvatar _0805CBB0: .4byte gMapObjects _0805CBB4: .4byte gSprites thumb_func_end sub_805CB70 @@ -3278,7 +3278,7 @@ _0805CBB4: .4byte gSprites thumb_func_start sub_805CBB8 sub_805CBB8: @ 805CBB8 push {lr} - ldr r2, _0805CBD4 @ =gUnknown_2037078 + ldr r2, _0805CBD4 @ =gPlayerAvatar ldrb r1, [r2] movs r0, 0x6 ands r0, r1 @@ -3290,7 +3290,7 @@ sub_805CBB8: @ 805CBB8 lsrs r0, 24 b _0805CBE0 .align 2, 0 -_0805CBD4: .4byte gUnknown_2037078 +_0805CBD4: .4byte gPlayerAvatar _0805CBD8: ldr r0, _0805CBE4 @ =gUnknown_835B88E ldrb r1, [r2, 0x7] @@ -3306,7 +3306,7 @@ _0805CBE4: .4byte gUnknown_835B88E thumb_func_start sub_805CBE8 sub_805CBE8: @ 805CBE8 push {r4,r5,lr} - ldr r5, _0805CC20 @ =gUnknown_2037078 + ldr r5, _0805CC20 @ =gPlayerAvatar ldrb r0, [r5, 0x5] lsls r4, r0, 3 adds r4, r0 @@ -3331,7 +3331,7 @@ sub_805CBE8: @ 805CBE8 pop {r0} bx r0 .align 2, 0 -_0805CC20: .4byte gUnknown_2037078 +_0805CC20: .4byte gPlayerAvatar _0805CC24: .4byte gMapObjects _0805CC28: .4byte gSprites thumb_func_end sub_805CBE8 @@ -3478,7 +3478,7 @@ _0805CD20: ldrsh r3, [r4, r0] lsls r3, 2 adds r3, r6 - ldr r0, _0805CD60 @ =gUnknown_2037078 + ldr r0, _0805CD60 @ =gPlayerAvatar ldrb r0, [r0, 0x5] lsls r1, r0, 3 adds r1, r0 @@ -3503,7 +3503,7 @@ _0805CD20: _0805CD54: .4byte gUnknown_835B8A0 _0805CD58: .4byte gTasks _0805CD5C: .4byte gMapObjects -_0805CD60: .4byte gUnknown_2037078 +_0805CD60: .4byte gPlayerAvatar thumb_func_end taskFF_bump_boulder thumb_func_start sub_805CD64 @@ -3511,7 +3511,7 @@ sub_805CD64: @ 805CD64 push {r4,lr} adds r4, r0, 0 bl ScriptContext2_Enable - ldr r1, _0805CD80 @ =gUnknown_2037078 + ldr r1, _0805CD80 @ =gPlayerAvatar movs r0, 0x1 strb r0, [r1, 0x6] ldrh r0, [r4, 0x8] @@ -3522,7 +3522,7 @@ sub_805CD64: @ 805CD64 pop {r1} bx r1 .align 2, 0 -_0805CD80: .4byte gUnknown_2037078 +_0805CD80: .4byte gPlayerAvatar thumb_func_end sub_805CD64 thumb_func_start sub_805CD84 @@ -3620,7 +3620,7 @@ sub_805CE20: @ 805CE20 ldrh r0, [r4, 0x10] ldrh r1, [r4, 0x12] bl sub_806DE70 - ldr r1, _0805CE78 @ =gUnknown_2037078 + ldr r1, _0805CE78 @ =gPlayerAvatar movs r0, 0 strb r0, [r1, 0x6] bl ScriptContext2_Disable @@ -3635,7 +3635,7 @@ _0805CE70: pop {r1} bx r1 .align 2, 0 -_0805CE78: .4byte gUnknown_2037078 +_0805CE78: .4byte gPlayerAvatar _0805CE7C: .4byte taskFF_bump_boulder thumb_func_end sub_805CE20 @@ -3672,7 +3672,7 @@ _0805CEB2: ldrsh r2, [r4, r0] lsls r2, 2 adds r2, r5 - ldr r0, _0805CEE4 @ =gUnknown_2037078 + ldr r0, _0805CEE4 @ =gPlayerAvatar ldrb r0, [r0, 0x5] lsls r1, r0, 3 adds r1, r0 @@ -3691,7 +3691,7 @@ _0805CEB2: .align 2, 0 _0805CEDC: .4byte gUnknown_835B8AC _0805CEE0: .4byte gTasks -_0805CEE4: .4byte gUnknown_2037078 +_0805CEE4: .4byte gPlayerAvatar _0805CEE8: .4byte gMapObjects thumb_func_end sub_805CEA0 @@ -3700,7 +3700,7 @@ PlayerAvatar_DoSecretBaseMatJump: @ 805CEEC push {r4-r6,lr} adds r6, r0, 0 adds r4, r1, 0 - ldr r5, _0805CF50 @ =gUnknown_2037078 + ldr r5, _0805CF50 @ =gPlayerAvatar movs r0, 0x1 strb r0, [r5, 0x6] adds r0, r4, 0 @@ -3743,7 +3743,7 @@ _0805CF48: pop {r1} bx r1 .align 2, 0 -_0805CF50: .4byte gUnknown_2037078 +_0805CF50: .4byte gPlayerAvatar _0805CF54: .4byte sub_805CEA0 thumb_func_end PlayerAvatar_DoSecretBaseMatJump @@ -3780,7 +3780,7 @@ _0805CF8A: ldrsh r2, [r4, r0] lsls r2, 2 adds r2, r5 - ldr r0, _0805CFBC @ =gUnknown_2037078 + ldr r0, _0805CFBC @ =gPlayerAvatar ldrb r0, [r0, 0x5] lsls r1, r0, 3 adds r1, r0 @@ -3799,7 +3799,7 @@ _0805CF8A: .align 2, 0 _0805CFB4: .4byte gUnknown_835B8B0 _0805CFB8: .4byte gTasks -_0805CFBC: .4byte gUnknown_2037078 +_0805CFBC: .4byte gPlayerAvatar _0805CFC0: .4byte gMapObjects thumb_func_end sub_805CF78 @@ -3812,7 +3812,7 @@ sub_805CFC4: @ 805CFC4 ldrb r1, [r1, 0x18] lsrs r1, 4 strh r1, [r0, 0xA] - ldr r1, _0805CFE8 @ =gUnknown_2037078 + ldr r1, _0805CFE8 @ =gPlayerAvatar movs r0, 0x1 strb r0, [r1, 0x6] bl ScriptContext2_Enable @@ -3822,7 +3822,7 @@ sub_805CFC4: @ 805CFC4 pop {r1} bx r1 .align 2, 0 -_0805CFE8: .4byte gUnknown_2037078 +_0805CFE8: .4byte gPlayerAvatar thumb_func_end sub_805CFC4 thumb_func_start sub_805CFEC @@ -3939,7 +3939,7 @@ sub_805D0A4: @ 805D0A4 adds r0, r5, 0 bl sub_805C06C bl ScriptContext2_Disable - ldr r1, _0805D0F0 @ =gUnknown_2037078 + ldr r1, _0805D0F0 @ =gPlayerAvatar movs r0, 0 strb r0, [r1, 0x6] ldr r0, _0805D0F4 @ =sub_805CF78 @@ -3953,7 +3953,7 @@ _0805D0E8: pop {r1} bx r1 .align 2, 0 -_0805D0F0: .4byte gUnknown_2037078 +_0805D0F0: .4byte gPlayerAvatar _0805D0F4: .4byte sub_805CF78 thumb_func_end sub_805D0A4 @@ -3967,7 +3967,7 @@ sub_805D0F8: @ 805D0F8 bl player_bitmagic bl sav1_reset_battle_music_maybe bl Overworld_ChangeMusicToDefault - ldr r2, _0805D148 @ =gUnknown_2037078 + ldr r2, _0805D148 @ =gPlayerAvatar ldrb r1, [r2] movs r0, 0xF7 ands r0, r1 @@ -3993,7 +3993,7 @@ sub_805D0F8: @ 805D0F8 pop {r0} bx r0 .align 2, 0 -_0805D148: .4byte gUnknown_2037078 +_0805D148: .4byte gPlayerAvatar _0805D14C: .4byte taskFF_0805D1D4 _0805D150: .4byte gTasks thumb_func_end sub_805D0F8 @@ -4006,7 +4006,7 @@ sub_805D154: @ 805D154 lsrs r4, 24 bl ScriptContext2_Enable bl player_bitmagic - ldr r2, _0805D19C @ =gUnknown_2037078 + ldr r2, _0805D19C @ =gPlayerAvatar ldrb r1, [r2] movs r0, 0xF7 ands r0, r1 @@ -4032,7 +4032,7 @@ sub_805D154: @ 805D154 pop {r0} bx r0 .align 2, 0 -_0805D19C: .4byte gUnknown_2037078 +_0805D19C: .4byte gPlayerAvatar _0805D1A0: .4byte taskFF_0805D1D4 _0805D1A4: .4byte gTasks thumb_func_end sub_805D154 @@ -4065,7 +4065,7 @@ taskFF_0805D1D4: @ 805D1D4 push {r4-r6,lr} lsls r0, 24 lsrs r6, r0, 24 - ldr r0, _0805D230 @ =gUnknown_2037078 + ldr r0, _0805D230 @ =gPlayerAvatar ldrb r1, [r0, 0x5] lsls r0, r1, 3 adds r0, r1 @@ -4105,7 +4105,7 @@ _0805D228: pop {r0} bx r0 .align 2, 0 -_0805D230: .4byte gUnknown_2037078 +_0805D230: .4byte gPlayerAvatar _0805D234: .4byte gMapObjects _0805D238: .4byte gTasks _0805D23C: .4byte sub_805D240 @@ -4116,7 +4116,7 @@ sub_805D240: @ 805D240 push {r4-r6,lr} lsls r0, 24 lsrs r5, r0, 24 - ldr r6, _0805D2B4 @ =gUnknown_2037078 + ldr r6, _0805D2B4 @ =gPlayerAvatar ldrb r1, [r6, 0x5] lsls r0, r1, 3 adds r0, r1 @@ -4163,7 +4163,7 @@ _0805D2AE: pop {r0} bx r0 .align 2, 0 -_0805D2B4: .4byte gUnknown_2037078 +_0805D2B4: .4byte gPlayerAvatar _0805D2B8: .4byte gMapObjects _0805D2BC: .4byte gSprites thumb_func_end sub_805D240 @@ -4236,7 +4236,7 @@ sub_805D33C: @ 805D33C push {r4,lr} adds r4, r0, 0 bl ScriptContext2_Enable - ldr r1, _0805D358 @ =gUnknown_2037078 + ldr r1, _0805D358 @ =gPlayerAvatar movs r0, 0x1 strb r0, [r1, 0x6] ldrh r0, [r4, 0x8] @@ -4247,7 +4247,7 @@ sub_805D33C: @ 805D33C pop {r1} bx r1 .align 2, 0 -_0805D358: .4byte gUnknown_2037078 +_0805D358: .4byte gPlayerAvatar thumb_func_end sub_805D33C thumb_func_start fish1 @@ -4282,7 +4282,7 @@ fish1: @ 805D35C adds r1, r0 strh r1, [r5, 0x22] ldr r3, _0805D3EC @ =gMapObjects - ldr r2, _0805D3F0 @ =gUnknown_2037078 + ldr r2, _0805D3F0 @ =gPlayerAvatar ldrb r1, [r2, 0x5] lsls r0, r1, 3 adds r0, r1 @@ -4317,14 +4317,14 @@ fish1: @ 805D35C _0805D3E4: .4byte gUnknown_835B90C _0805D3E8: .4byte gUnknown_835B912 _0805D3EC: .4byte gMapObjects -_0805D3F0: .4byte gUnknown_2037078 +_0805D3F0: .4byte gPlayerAvatar thumb_func_end fish1 thumb_func_start fish2 fish2: @ 805D3F4 push {r4,lr} adds r4, r0, 0 - ldr r0, _0805D428 @ =gUnknown_2037078 + ldr r0, _0805D428 @ =gPlayerAvatar ldrb r1, [r0, 0x4] lsls r0, r1, 4 adds r0, r1 @@ -4348,7 +4348,7 @@ _0805D41E: pop {r1} bx r1 .align 2, 0 -_0805D428: .4byte gUnknown_2037078 +_0805D428: .4byte gPlayerAvatar _0805D42C: .4byte gSprites thumb_func_end fish2 @@ -4398,7 +4398,7 @@ sub_805D47C: @ 805D47C push {r4,r5,lr} sub sp, 0xC adds r4, r0, 0 - ldr r0, _0805D4CC @ =gUnknown_2037078 + ldr r0, _0805D4CC @ =gPlayerAvatar ldrb r1, [r0, 0x4] lsls r0, r1, 4 adds r0, r1 @@ -4436,7 +4436,7 @@ _0805D4C6: strh r0, [r4, 0x20] b _0805D4F8 .align 2, 0 -_0805D4CC: .4byte gUnknown_2037078 +_0805D4CC: .4byte gPlayerAvatar _0805D4D0: .4byte gSprites _0805D4D4: ldr r2, _0805D504 @ =gUnknown_835B918 @@ -4470,7 +4470,7 @@ _0805D504: .4byte gUnknown_835B918 sub_805D508: @ 805D508 push {r4-r6,lr} adds r4, r0, 0 - ldr r6, _0805D540 @ =gUnknown_2037078 + ldr r6, _0805D540 @ =gPlayerAvatar ldrb r1, [r6, 0x4] lsls r0, r1, 4 adds r0, r1 @@ -4495,7 +4495,7 @@ _0805D53A: strh r0, [r4, 0x8] b _0805D56A .align 2, 0 -_0805D540: .4byte gUnknown_2037078 +_0805D540: .4byte gPlayerAvatar _0805D544: .4byte gSprites _0805D548: ldrb r0, [r6, 0x4] @@ -4537,7 +4537,7 @@ sub_805D580: @ 805D580 mov r0, sp movs r2, 0x6 bl memcpy - ldr r0, _0805D5C4 @ =gUnknown_2037078 + ldr r0, _0805D5C4 @ =gPlayerAvatar ldrb r1, [r0, 0x4] lsls r0, r1, 4 adds r0, r1 @@ -4562,7 +4562,7 @@ sub_805D580: @ 805D580 b _0805D5DC .align 2, 0 _0805D5C0: .4byte gUnknown_835B91A -_0805D5C4: .4byte gUnknown_2037078 +_0805D5C4: .4byte gPlayerAvatar _0805D5C8: .4byte gSprites _0805D5CC: ldr r0, _0805D5E8 @ =gMain @@ -4594,7 +4594,7 @@ sub_805D5EC: @ 805D5EC mov r0, sp movs r2, 0xC bl memcpy - ldr r0, _0805D664 @ =gUnknown_2037078 + ldr r0, _0805D664 @ =gPlayerAvatar ldrb r1, [r0, 0x4] lsls r0, r1, 4 adds r0, r1 @@ -4644,7 +4644,7 @@ _0805D654: bx r1 .align 2, 0 _0805D660: .4byte gUnknown_835B920 -_0805D664: .4byte gUnknown_2037078 +_0805D664: .4byte gPlayerAvatar _0805D668: .4byte gSprites thumb_func_end sub_805D5EC @@ -4653,7 +4653,7 @@ sub_805D66C: @ 805D66C push {r4,r5,lr} sub sp, 0x10 adds r4, r0, 0 - ldr r0, _0805D6BC @ =gUnknown_2037078 + ldr r0, _0805D6BC @ =gPlayerAvatar ldrb r1, [r0, 0x4] lsls r0, r1, 4 adds r0, r1 @@ -4687,7 +4687,7 @@ sub_805D66C: @ 805D66C pop {r1} bx r1 .align 2, 0 -_0805D6BC: .4byte gUnknown_2037078 +_0805D6BC: .4byte gPlayerAvatar _0805D6C0: .4byte gSprites _0805D6C4: .4byte gUnknown_841D14E thumb_func_end sub_805D66C @@ -4702,7 +4702,7 @@ sub_805D6C8: @ 805D6C8 ldrsh r0, [r5, r1] cmp r0, 0 bne _0805D6EA - ldr r0, _0805D774 @ =gUnknown_2037078 + ldr r0, _0805D774 @ =gPlayerAvatar ldrb r1, [r0, 0x4] lsls r0, r1, 4 adds r0, r1 @@ -4722,7 +4722,7 @@ _0805D6EA: lsrs r6, r0, 16 cmp r6, 0 bne _0805D780 - ldr r7, _0805D774 @ =gUnknown_2037078 + ldr r7, _0805D774 @ =gPlayerAvatar ldrb r0, [r7, 0x5] lsls r4, r0, 3 adds r4, r0 @@ -4775,7 +4775,7 @@ _0805D748: strh r0, [r5, 0xA] b _0805D7AA .align 2, 0 -_0805D774: .4byte gUnknown_2037078 +_0805D774: .4byte gPlayerAvatar _0805D778: .4byte gSprites _0805D77C: .4byte gMapObjects _0805D780: @@ -4784,7 +4784,7 @@ _0805D780: cmp r0, 0 beq _0805D7AA _0805D788: - ldr r1, _0805D7B8 @ =gUnknown_2037078 + ldr r1, _0805D7B8 @ =gPlayerAvatar movs r0, 0 strb r0, [r1, 0x6] bl ScriptContext2_Disable @@ -4805,7 +4805,7 @@ _0805D7AA: pop {r1} bx r1 .align 2, 0 -_0805D7B8: .4byte gUnknown_2037078 +_0805D7B8: .4byte gPlayerAvatar _0805D7BC: .4byte sub_805D304 thumb_func_end sub_805D6C8 @@ -4814,7 +4814,7 @@ sub_805D7C0: @ 805D7C0 push {r4-r6,lr} sub sp, 0x10 adds r6, r0, 0 - ldr r4, _0805D82C @ =gUnknown_2037078 + ldr r4, _0805D82C @ =gPlayerAvatar ldrb r1, [r4, 0x4] lsls r0, r1, 4 adds r0, r1 @@ -4860,7 +4860,7 @@ sub_805D7C0: @ 805D7C0 pop {r1} bx r1 .align 2, 0 -_0805D82C: .4byte gUnknown_2037078 +_0805D82C: .4byte gPlayerAvatar _0805D830: .4byte gSprites _0805D834: .4byte gUnknown_841D169 thumb_func_end sub_805D7C0 @@ -4870,7 +4870,7 @@ sub_805D838: @ 805D838 push {r4-r6,lr} sub sp, 0x10 adds r6, r0, 0 - ldr r4, _0805D8A0 @ =gUnknown_2037078 + ldr r4, _0805D8A0 @ =gPlayerAvatar ldrb r1, [r4, 0x4] lsls r0, r1, 4 adds r0, r1 @@ -4914,7 +4914,7 @@ sub_805D838: @ 805D838 pop {r1} bx r1 .align 2, 0 -_0805D8A0: .4byte gUnknown_2037078 +_0805D8A0: .4byte gPlayerAvatar _0805D8A4: .4byte gSprites _0805D8A8: .4byte gUnknown_841D17E thumb_func_end sub_805D838 @@ -4923,7 +4923,7 @@ _0805D8A8: .4byte gUnknown_841D17E sub_805D8AC: @ 805D8AC push {r4,lr} adds r4, r0, 0 - ldr r0, _0805D8D0 @ =gUnknown_2037078 + ldr r0, _0805D8D0 @ =gPlayerAvatar ldrb r1, [r0, 0x4] lsls r0, r1, 4 adds r0, r1 @@ -4939,7 +4939,7 @@ sub_805D8AC: @ 805D8AC pop {r1} bx r1 .align 2, 0 -_0805D8D0: .4byte gUnknown_2037078 +_0805D8D0: .4byte gPlayerAvatar _0805D8D4: .4byte gSprites thumb_func_end sub_805D8AC @@ -4949,7 +4949,7 @@ sub_805D8D8: @ 805D8D8 mov r7, r8 push {r7} adds r6, r0, 0 - ldr r5, _0805D974 @ =gUnknown_2037078 + ldr r5, _0805D974 @ =gPlayerAvatar ldrb r1, [r5, 0x4] lsls r0, r1, 4 adds r0, r1 @@ -5022,7 +5022,7 @@ _0805D968: pop {r1} bx r1 .align 2, 0 -_0805D974: .4byte gUnknown_2037078 +_0805D974: .4byte gPlayerAvatar _0805D978: .4byte gSprites _0805D97C: .4byte gMapObjects thumb_func_end sub_805D8D8 @@ -5037,7 +5037,7 @@ sub_805D980: @ 805D980 lsrs r1, r0, 16 cmp r1, 0 bne _0805D9B6 - ldr r0, _0805D9BC @ =gUnknown_2037078 + ldr r0, _0805D9BC @ =gPlayerAvatar strb r1, [r0, 0x6] bl ScriptContext2_Disable bl UnfreezeMapObjects @@ -5054,7 +5054,7 @@ _0805D9B6: pop {r1} bx r1 .align 2, 0 -_0805D9BC: .4byte gUnknown_2037078 +_0805D9BC: .4byte gPlayerAvatar _0805D9C0: .4byte sub_805D304 thumb_func_end sub_805D980 @@ -5153,7 +5153,7 @@ _0805DA68: movs r0, 0x8 strh r0, [r4, 0x26] _0805DA78: - ldr r3, _0805DAA8 @ =gUnknown_2037078 + ldr r3, _0805DAA8 @ =gPlayerAvatar ldrb r1, [r3] movs r0, 0x8 ands r0, r1 @@ -5176,7 +5176,7 @@ _0805DA9C: bx r0 .align 2, 0 _0805DAA4: .4byte 0x0000fff8 -_0805DAA8: .4byte gUnknown_2037078 +_0805DAA8: .4byte gPlayerAvatar _0805DAAC: .4byte gMapObjects thumb_func_end sub_805D9C4 @@ -5242,7 +5242,7 @@ sub_805DB04: @ 805DB04 lsls r0, 24 lsrs r0, 24 adds r2, r0, 0 - ldr r0, _0805DB48 @ =gUnknown_2037078 + ldr r0, _0805DB48 @ =gPlayerAvatar ldrb r1, [r0, 0x5] lsls r0, r1, 3 adds r0, r1 @@ -5270,7 +5270,7 @@ sub_805DB04: @ 805DB04 beq _0805DB5E b _0805DBFA .align 2, 0 -_0805DB48: .4byte gUnknown_2037078 +_0805DB48: .4byte gPlayerAvatar _0805DB4C: .4byte gMapObjects _0805DB50: .4byte gSprites _0805DB54: .4byte gTasks+0x8 @@ -5401,7 +5401,7 @@ sub_805DC38: @ 805DC38 lsls r0, 24 lsrs r0, 24 mov r8, r0 - ldr r0, _0805DC80 @ =gUnknown_2037078 + ldr r0, _0805DC80 @ =gPlayerAvatar ldrb r1, [r0, 0x5] lsls r0, r1, 3 adds r0, r1 @@ -5430,7 +5430,7 @@ sub_805DC38: @ 805DC38 beq _0805DC9A b _0805DDBA .align 2, 0 -_0805DC80: .4byte gUnknown_2037078 +_0805DC80: .4byte gPlayerAvatar _0805DC84: .4byte gMapObjects _0805DC88: .4byte gSprites _0805DC8C: .4byte gTasks+0x8 diff --git a/asm/field_screen_effect.s b/asm/field_screen_effect.s index a1a51b908..a8477a33f 100644 --- a/asm/field_screen_effect.s +++ b/asm/field_screen_effect.s @@ -937,7 +937,7 @@ _0807F542: lsls r0, 24 cmp r0, 0 beq _0807F5E4 - ldr r0, _0807F57C @ =gUnknown_2037078 + ldr r0, _0807F57C @ =gPlayerAvatar ldrb r1, [r0, 0x5] lsls r0, r1, 3 adds r0, r1 @@ -957,7 +957,7 @@ _0807F542: b _0807F5E4 .align 2, 0 _0807F578: .4byte gUnknown_841B5B6 -_0807F57C: .4byte gUnknown_2037078 +_0807F57C: .4byte gPlayerAvatar _0807F580: .4byte gMapObjects _0807F584: .4byte gTasks _0807F588: diff --git a/asm/field_specials.s b/asm/field_specials.s index 9acb16b27..537a4e6dc 100644 --- a/asm/field_specials.s +++ b/asm/field_specials.s @@ -21,7 +21,7 @@ _080CA62C: .4byte sub_80F4C10 thumb_func_start sub_80CA630 sub_80CA630: @ 80CA630 push {r4,lr} - ldr r0, _080CA65C @ =gUnknown_2037078 + ldr r0, _080CA65C @ =gPlayerAvatar ldrb r1, [r0] movs r0, 0x1 ands r0, r1 @@ -40,7 +40,7 @@ _080CA644: pop {r0} bx r0 .align 2, 0 -_080CA65C: .4byte gUnknown_2037078 +_080CA65C: .4byte gPlayerAvatar thumb_func_end sub_80CA630 thumb_func_start nullsub_74 diff --git a/asm/field_tasks.s b/asm/field_tasks.s index 88b65274f..d7dd5e6b6 100644 --- a/asm/field_tasks.s +++ b/asm/field_tasks.s @@ -322,7 +322,7 @@ _0806EA52: ldrsh r0, [r0, r1] movs r2, 0 ldrsh r1, [r4, r2] - bl sub_8058F78 + bl MapGridGetMetatileBehaviorAt lsls r0, 24 lsrs r6, r0, 24 adds r0, r6, 0 @@ -478,7 +478,7 @@ _0806EB8E: ldrsh r0, [r0, r1] movs r2, 0 ldrsh r1, [r4, r2] - bl sub_8058F78 + bl MapGridGetMetatileBehaviorAt lsls r0, 24 lsrs r0, 24 bl sub_8059F50 @@ -576,7 +576,7 @@ sub_806EC40: @ 806EC40 ldrsh r0, [r0, r1] movs r2, 0 ldrsh r1, [r4, r2] - bl sub_8058F78 + bl MapGridGetMetatileBehaviorAt lsls r0, 16 lsrs r7, r0, 16 ldrh r1, [r5, 0x8] diff --git a/asm/fieldmap.s b/asm/fieldmap.s index 8be48d4c5..a8b2d36ee 100644 --- a/asm/fieldmap.s +++ b/asm/fieldmap.s @@ -789,8 +789,8 @@ sub_8058F48: @ 8058F48 _08058F74: .4byte gMapHeader thumb_func_end sub_8058F48 - thumb_func_start sub_8058F78 -sub_8058F78: @ 8058F78 + thumb_func_start MapGridGetMetatileBehaviorAt +MapGridGetMetatileBehaviorAt: @ 8058F78 push {lr} lsls r0, 16 asrs r0, 16 @@ -800,7 +800,7 @@ sub_8058F78: @ 8058F78 bl sub_8058F48 pop {r1} bx r1 - thumb_func_end sub_8058F78 + thumb_func_end MapGridGetMetatileBehaviorAt thumb_func_start sub_8058F8C sub_8058F8C: @ 8058F8C diff --git a/asm/fldeff_cut.s b/asm/fldeff_cut.s index 697b80bd5..5710a320e 100644 --- a/asm/fldeff_cut.s +++ b/asm/fldeff_cut.s @@ -319,7 +319,7 @@ _08097ABC: movs r7, 0 ldr r5, _08097B44 @ =gSprites _08097AE2: - ldr r0, _08097B48 @ =gUnknown_2037078 + ldr r0, _08097B48 @ =gPlayerAvatar ldrb r1, [r0, 0x4] lsls r0, r1, 4 adds r0, r1 @@ -366,7 +366,7 @@ _08097B38: .4byte gUnknown_2039A04 _08097B3C: .4byte 0x0000ffff _08097B40: .4byte gUnknown_2039870 _08097B44: .4byte gSprites -_08097B48: .4byte gUnknown_2037078 +_08097B48: .4byte gPlayerAvatar _08097B4C: .4byte gUnknown_83D414C thumb_func_end sub_8097A48 diff --git a/asm/item_menu.s b/asm/item_menu.s index d9aa3dd95..6c508193f 100644 --- a/asm/item_menu.s +++ b/asm/item_menu.s @@ -5817,8 +5817,8 @@ _0810AD08: .4byte gUnknown_84163BB _0810AD0C: .4byte sub_810A1D0 thumb_func_end sub_810AC40 - thumb_func_start sub_810AD10 -sub_810AD10: @ 810AD10 + thumb_func_start UseRegisteredKeyItemOnField +UseRegisteredKeyItemOnField: @ 810AD10 push {r4-r6,lr} bl InUnionRoom cmp r0, 0x1 @@ -5887,7 +5887,7 @@ _0810ADA0: bx r1 .align 2, 0 _0810ADA8: .4byte gUnknown_81A77A0 - thumb_func_end sub_810AD10 + thumb_func_end UseRegisteredKeyItemOnField thumb_func_start sub_810ADAC sub_810ADAC: @ 810ADAC diff --git a/asm/item_use.s b/asm/item_use.s index b3ea4af48..586426239 100644 --- a/asm/item_use.s +++ b/asm/item_use.s @@ -348,7 +348,7 @@ sub_80A122C: @ 80A122C ldrsh r0, [r0, r1] movs r2, 0 ldrsh r1, [r4, r2] - bl sub_8058F78 + bl MapGridGetMetatileBehaviorAt lsls r0, 24 lsrs r4, r0, 24 movs r0, 0x83 @@ -506,7 +506,7 @@ sub_80A137C: @ 80A137C ldrsh r0, [r0, r1] movs r2, 0 ldrsh r1, [r4, r2] - bl sub_8058F78 + bl MapGridGetMetatileBehaviorAt lsls r0, 16 lsrs r6, r0, 16 lsls r0, r6, 24 diff --git a/asm/link_rfu_3.s b/asm/link_rfu_3.s index 3715fa608..a66dc0980 100644 --- a/asm/link_rfu_3.s +++ b/asm/link_rfu_3.s @@ -9685,7 +9685,7 @@ sub_811A9B8: @ 811A9B8 ldrsh r0, [r4, r1] cmp r0, 0x8 bne _0811A9F0 - ldr r0, _0811A9EC @ =gUnknown_2037078 + ldr r0, _0811A9EC @ =gPlayerAvatar ldrb r0, [r0, 0x3] cmp r0, 0x2 beq _0811A9E6 @@ -9695,7 +9695,7 @@ _0811A9E6: movs r0, 0x1 b _0811A9F2 .align 2, 0 -_0811A9EC: .4byte gUnknown_2037078 +_0811A9EC: .4byte gPlayerAvatar _0811A9F0: movs r0, 0 _0811A9F2: @@ -11147,7 +11147,7 @@ _0811B500: .4byte gUnknown_8459580 thumb_func_start is_walking_or_running is_walking_or_running: @ 811B504 push {lr} - ldr r0, _0811B518 @ =gUnknown_2037078 + ldr r0, _0811B518 @ =gPlayerAvatar ldrb r0, [r0, 0x3] cmp r0, 0x2 beq _0811B512 @@ -11157,7 +11157,7 @@ _0811B512: movs r0, 0x1 b _0811B51E .align 2, 0 -_0811B518: .4byte gUnknown_2037078 +_0811B518: .4byte gPlayerAvatar _0811B51C: movs r0, 0 _0811B51E: diff --git a/asm/map_obj_80688E4.s b/asm/map_obj_80688E4.s index 0f878255c..7b3fd584e 100644 --- a/asm/map_obj_80688E4.s +++ b/asm/map_obj_80688E4.s @@ -96,7 +96,7 @@ _0806897A: lsls r0, 31 cmp r0, 0 beq _08068998 - ldr r0, _080689AC @ =gUnknown_2037078 + ldr r0, _080689AC @ =gPlayerAvatar ldrb r0, [r0, 0x5] cmp r4, r0 beq _08068998 @@ -113,7 +113,7 @@ _08068998: bx r0 .align 2, 0 _080689A8: .4byte gMapObjects -_080689AC: .4byte gUnknown_2037078 +_080689AC: .4byte gPlayerAvatar thumb_func_end player_bitmagic thumb_func_start FreezeMapObjectsExceptOne @@ -134,7 +134,7 @@ _080689BA: lsls r0, 31 cmp r0, 0 beq _080689DC - ldr r0, _080689F0 @ =gUnknown_2037078 + ldr r0, _080689F0 @ =gPlayerAvatar ldrb r0, [r0, 0x5] cmp r4, r0 beq _080689DC @@ -151,7 +151,7 @@ _080689DC: bx r0 .align 2, 0 _080689EC: .4byte gMapObjects -_080689F0: .4byte gUnknown_2037078 +_080689F0: .4byte gPlayerAvatar thumb_func_end FreezeMapObjectsExceptOne thumb_func_start npc_sync_anim_pause_bits diff --git a/asm/map_obj_lock.s b/asm/map_obj_lock.s index a5a61662d..4ff07589a 100644 --- a/asm/map_obj_lock.s +++ b/asm/map_obj_lock.s @@ -8,14 +8,14 @@ thumb_func_start walkrun_is_standing_still walkrun_is_standing_still: @ 8069554 push {lr} - ldr r0, _08069564 @ =gUnknown_2037078 + ldr r0, _08069564 @ =gPlayerAvatar ldrb r0, [r0, 0x3] cmp r0, 0x1 beq _08069568 movs r0, 0x1 b _0806956A .align 2, 0 -_08069564: .4byte gUnknown_2037078 +_08069564: .4byte gPlayerAvatar _08069568: movs r0, 0 _0806956A: diff --git a/asm/metatile_behavior.s b/asm/metatile_behavior.s index 12d5b243e..6dd520d71 100644 --- a/asm/metatile_behavior.s +++ b/asm/metatile_behavior.s @@ -484,8 +484,8 @@ _08059D66: bx r1 thumb_func_end sub_8059D2C - thumb_func_start sub_8059D70 -sub_8059D70: @ 8059D70 + thumb_func_start MetatileBehavior_IsMoveTile +MetatileBehavior_IsMoveTile: @ 8059D70 push {lr} lsls r0, 24 lsrs r1, r0, 24 @@ -519,7 +519,7 @@ _08059DA6: _08059DA8: pop {r1} bx r1 - thumb_func_end sub_8059D70 + thumb_func_end MetatileBehavior_IsMoveTile thumb_func_start sub_8059DAC sub_8059DAC: @ 8059DAC diff --git a/asm/overworld.s b/asm/overworld.s index 63849f1fb..4ab22581a 100644 --- a/asm/overworld.s +++ b/asm/overworld.s @@ -2190,7 +2190,7 @@ sub_8055C74: @ 8055C74 adds r1, 0x7 lsls r1, 16 asrs r1, 16 - bl sub_8058F78 + bl MapGridGetMetatileBehaviorAt lsls r0, 16 lsrs r0, 16 pop {r1} @@ -2677,7 +2677,7 @@ sub_8055FE0: @ 8055FE0 ldrsh r0, [r0, r1] movs r2, 0 ldrsh r1, [r4, r2] - bl sub_8058F78 + bl MapGridGetMetatileBehaviorAt lsls r0, 24 lsrs r0, 24 bl sub_8059CA4 @@ -3263,7 +3263,7 @@ sub_805644C: @ 805644C mov r0, sp adds r1, r5, 0 adds r2, r4, 0 - bl sub_806C8BC + bl FieldGetPlayerInput mov r0, sp bl sub_806CD30 bl ScriptContext2_IsEnabled @@ -4735,7 +4735,7 @@ sub_8057100: @ 8057100 sub_8057114: @ 8057114 push {lr} ldr r2, _08057138 @ =gMapObjects - ldr r3, _0805713C @ =gUnknown_2037078 + ldr r3, _0805713C @ =gPlayerAvatar ldrb r1, [r3, 0x5] lsls r0, r1, 3 adds r0, r1 @@ -4751,7 +4751,7 @@ sub_8057114: @ 8057114 bx r0 .align 2, 0 _08057138: .4byte gMapObjects -_0805713C: .4byte gUnknown_2037078 +_0805713C: .4byte gPlayerAvatar thumb_func_end sub_8057114 thumb_func_start sub_8057140 @@ -6640,7 +6640,7 @@ _08057F96: ldrsh r0, [r0, r1] movs r2, 0 ldrsh r1, [r5, r2] - bl sub_8058F78 + bl MapGridGetMetatileBehaviorAt strh r0, [r6, 0xC] add sp, 0x4 pop {r4-r6} @@ -6913,7 +6913,7 @@ sub_80581C8: @ 80581C8 push {lr} movs r0, 0x6 bl PlaySE - bl sub_806F258 + bl ShowStartMenu bl ScriptContext2_Enable pop {r0} bx r0 diff --git a/asm/party_menu.s b/asm/party_menu.s index 88ac3f455..50c485ad5 100644 --- a/asm/party_menu.s +++ b/asm/party_menu.s @@ -12100,7 +12100,7 @@ sub_8124998: @ 8124998 ldrsh r0, [r0, r1] movs r2, 0 ldrsh r1, [r4, r2] - bl sub_8058F78 + bl MapGridGetMetatileBehaviorAt lsls r0, 24 lsrs r0, 24 bl sub_8059CC8 @@ -12163,7 +12163,7 @@ _08124A24: ldrsh r0, [r0, r1] movs r2, 0 ldrsh r1, [r4, r2] - bl sub_8058F78 + bl MapGridGetMetatileBehaviorAt lsls r0, 24 lsrs r0, 24 bl sub_8059CC8 @@ -12276,7 +12276,7 @@ hm_prepare_waterfall: @ 8124AF8 ldrsh r0, [r0, r1] movs r2, 0 ldrsh r1, [r4, r2] - bl sub_8058F78 + bl MapGridGetMetatileBehaviorAt lsls r0, 24 lsrs r0, 24 bl MetatileBehavior_IsWaterfall diff --git a/asm/quest_log.s b/asm/quest_log.s index ce8445e16..09f621d43 100644 --- a/asm/quest_log.s +++ b/asm/quest_log.s @@ -5,189 +5,6 @@ .text - thumb_func_start sub_8112720 -sub_8112720: @ 8112720 - push {r4-r7,lr} - mov r7, r8 - push {r7} - lsls r0, 24 - lsrs r0, 24 - mov r8, r0 - bl sub_8112D1C - lsls r0, 24 - lsrs r7, r0, 24 - cmp r7, 0 - bne _08112774 - ldr r2, _08112780 @ =gUnknown_203AF98 - ldrh r0, [r2] - ldr r3, _08112784 @ =gUnknown_3005E94 - ldr r4, [r3] - lsls r0, 3 - adds r0, r4 - ldr r6, _08112788 @ =gUnknown_203B01A - ldrh r1, [r6] - movs r5, 0 - strh r1, [r0, 0x4] - ldrh r0, [r2] - lsls r0, 3 - adds r0, r4 - movs r1, 0x1 - strb r1, [r0, 0x6] - ldrh r0, [r2] - ldr r1, [r3] - lsls r0, 3 - adds r0, r1 - strb r5, [r0] - ldrh r0, [r2] - ldr r1, [r3] - lsls r0, 3 - adds r0, r1 - mov r1, r8 - strb r1, [r0, 0x3] - ldrh r0, [r2] - adds r0, 0x1 - strh r0, [r2] - strh r7, [r6] -_08112774: - pop {r3} - mov r8, r3 - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_08112780: .4byte gUnknown_203AF98 -_08112784: .4byte gUnknown_3005E94 -_08112788: .4byte gUnknown_203B01A - thumb_func_end sub_8112720 - - thumb_func_start sub_811278C -sub_811278C: @ 811278C - push {r4-r7,lr} - mov r7, r8 - push {r7} - lsls r0, 24 - lsrs r7, r0, 24 - lsls r1, 24 - lsrs r1, 24 - mov r8, r1 - bl sub_8112D1C - lsls r0, 24 - cmp r0, 0 - bne _081127E2 - ldr r2, _081127EC @ =gUnknown_203AF98 - ldrh r0, [r2] - ldr r3, _081127F0 @ =gUnknown_3005E94 - ldr r4, [r3] - lsls r0, 3 - adds r0, r4 - ldr r6, _081127F4 @ =gUnknown_203B01A - ldrh r1, [r6] - movs r5, 0 - strh r1, [r0, 0x4] - ldrh r0, [r2] - lsls r0, 3 - adds r0, r4 - movs r1, 0x1 - strb r1, [r0, 0x6] - ldrh r0, [r2] - ldr r1, [r3] - lsls r0, 3 - adds r0, r1 - strb r5, [r0] - ldrh r0, [r2] - ldr r1, [r3] - lsls r0, 3 - adds r0, r1 - strb r7, [r0, 0x3] - ldrh r0, [r2] - adds r0, 0x1 - strh r0, [r2] - mov r0, r8 - strh r0, [r6] -_081127E2: - pop {r3} - mov r8, r3 - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_081127EC: .4byte gUnknown_203AF98 -_081127F0: .4byte gUnknown_3005E94 -_081127F4: .4byte gUnknown_203B01A - thumb_func_end sub_811278C - - thumb_func_start sub_81127F8 -sub_81127F8: @ 81127F8 - push {r4-r6,lr} - adds r2, r0, 0 - ldr r5, _08112874 @ =gUnknown_203AF98 - ldr r1, _08112878 @ =gUnknown_3005E8C - ldrh r0, [r5] - ldrh r1, [r1] - cmp r0, r1 - bcs _0811286C - ldr r2, [r2] - ldr r0, _0811287C @ =0x00ff00f3 - ands r2, r0 - ldrh r1, [r5] - ldr r3, _08112880 @ =gUnknown_3005E94 - ldr r4, [r3] - lsls r1, 3 - adds r1, r4 - ldr r6, _08112884 @ =gUnknown_203B01A - ldrh r0, [r6] - strh r0, [r1, 0x4] - ldrh r0, [r5] - lsls r0, 3 - adds r0, r4 - movs r1, 0x2 - strb r1, [r0, 0x6] - ldrh r0, [r5] - ldr r1, [r3] - lsls r0, 3 - adds r0, r1 - strb r2, [r0] - ldrh r0, [r5] - ldr r1, [r3] - lsls r0, 3 - adds r0, r1 - lsrs r1, r2, 8 - strb r1, [r0, 0x1] - ldrh r0, [r5] - ldr r1, [r3] - lsls r0, 3 - adds r0, r1 - lsrs r1, r2, 16 - strb r1, [r0, 0x2] - ldrh r0, [r5] - ldr r1, [r3] - lsls r0, 3 - adds r0, r1 - lsrs r2, 24 - strb r2, [r0, 0x3] - ldrh r0, [r5] - adds r0, 0x1 - strh r0, [r5] - bl ScriptContext2_IsEnabled - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0 - beq _0811286A - movs r0, 0x1 -_0811286A: - strh r0, [r6] -_0811286C: - pop {r4-r6} - pop {r0} - bx r0 - .align 2, 0 -_08112874: .4byte gUnknown_203AF98 -_08112878: .4byte gUnknown_3005E8C -_0811287C: .4byte 0x00ff00f3 -_08112880: .4byte gUnknown_3005E94 -_08112884: .4byte gUnknown_203B01A - thumb_func_end sub_81127F8 - thumb_func_start sub_8112888 sub_8112888: @ 8112888 push {lr} diff --git a/asm/quest_log_8150454.s b/asm/quest_log_8150454.s index 76dadd6e0..ac59263d7 100644 --- a/asm/quest_log_8150454.s +++ b/asm/quest_log_8150454.s @@ -59,7 +59,7 @@ sub_8150498: @ 8150498 thumb_func_start sub_81504A8 sub_81504A8: @ 81504A8 push {r4,lr} - ldr r0, _081504E0 @ =gUnknown_2037078 + ldr r0, _081504E0 @ =gPlayerAvatar ldrb r0, [r0, 0x5] lsls r4, r0, 3 adds r4, r0 @@ -83,14 +83,14 @@ sub_81504A8: @ 81504A8 pop {r0} bx r0 .align 2, 0 -_081504E0: .4byte gUnknown_2037078 +_081504E0: .4byte gPlayerAvatar _081504E4: .4byte gMapObjects thumb_func_end sub_81504A8 thumb_func_start sub_81504E8 sub_81504E8: @ 81504E8 push {r4,lr} - ldr r0, _08150528 @ =gUnknown_2037078 + ldr r0, _08150528 @ =gPlayerAvatar ldrb r0, [r0, 0x5] lsls r4, r0, 3 adds r4, r0 @@ -117,14 +117,14 @@ sub_81504E8: @ 81504E8 pop {r0} bx r0 .align 2, 0 -_08150528: .4byte gUnknown_2037078 +_08150528: .4byte gPlayerAvatar _0815052C: .4byte gMapObjects thumb_func_end sub_81504E8 thumb_func_start sub_8150530 sub_8150530: @ 8150530 push {r4-r6,lr} - ldr r6, _0815057C @ =gUnknown_2037078 + ldr r6, _0815057C @ =gPlayerAvatar ldrb r1, [r6, 0x5] lsls r0, r1, 3 adds r0, r1 @@ -161,7 +161,7 @@ _08150558: strh r4, [r1, 0x8] b _081505BC .align 2, 0 -_0815057C: .4byte gUnknown_2037078 +_0815057C: .4byte gPlayerAvatar _08150580: .4byte gMapObjects _08150584: .4byte gSprites _08150588: .4byte gUnknown_3005E88 @@ -199,7 +199,7 @@ sub_81505C4: @ 81505C4 lsls r0, 24 lsrs r0, 24 mov r8, r0 - ldr r0, _0815060C @ =gUnknown_2037078 + ldr r0, _0815060C @ =gPlayerAvatar mov r9, r0 ldrb r1, [r0, 0x5] lsls r0, r1, 3 @@ -229,7 +229,7 @@ sub_81505C4: @ 81505C4 beq _08150626 b _081506FC .align 2, 0 -_0815060C: .4byte gUnknown_2037078 +_0815060C: .4byte gPlayerAvatar _08150610: .4byte gMapObjects _08150614: .4byte gSprites _08150618: .4byte gTasks @@ -348,7 +348,7 @@ _081506FC: thumb_func_start sub_8150708 sub_8150708: @ 8150708 push {r4,r5,lr} - ldr r5, _08150770 @ =gUnknown_2037078 + ldr r5, _08150770 @ =gPlayerAvatar ldrb r1, [r5, 0x5] lsls r0, r1, 3 adds r0, r1 @@ -394,7 +394,7 @@ _08150768: pop {r0} bx r0 .align 2, 0 -_08150770: .4byte gUnknown_2037078 +_08150770: .4byte gPlayerAvatar _08150774: .4byte gMapObjects _08150778: .4byte gUnknown_20386E0 thumb_func_end sub_8150708 diff --git a/asm/rom6.s b/asm/rom6.s index 76da35ac8..8d5e76f8a 100644 --- a/asm/rom6.s +++ b/asm/rom6.s @@ -73,7 +73,7 @@ task08_080C9820: @ 80C9820 lsrs r5, r0, 24 adds r6, r5, 0 bl ScriptContext2_Enable - ldr r1, _080C9874 @ =gUnknown_2037078 + ldr r1, _080C9874 @ =gPlayerAvatar movs r0, 0x1 strb r0, [r1, 0x6] ldrb r1, [r1, 0x5] @@ -107,7 +107,7 @@ _080C9856: ldr r0, _080C9884 @ =sub_80C98FC b _080C98A0 .align 2, 0 -_080C9874: .4byte gUnknown_2037078 +_080C9874: .4byte gPlayerAvatar _080C9878: .4byte gMapObjects _080C987C: .4byte gMapHeader _080C9880: .4byte gTasks @@ -139,7 +139,7 @@ sub_80C98B0: @ 80C98B0 push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r0, _080C98EC @ =gUnknown_2037078 + ldr r0, _080C98EC @ =gPlayerAvatar ldrb r1, [r0, 0x5] lsls r0, r1, 3 adds r0, r1 @@ -165,7 +165,7 @@ _080C98E4: pop {r0} bx r0 .align 2, 0 -_080C98EC: .4byte gUnknown_2037078 +_080C98EC: .4byte gPlayerAvatar _080C98F0: .4byte gMapObjects _080C98F4: .4byte gTasks _080C98F8: .4byte sub_80C98FC @@ -207,7 +207,7 @@ _080C9934: movs r0, 0x3 str r0, [r6, 0x8] _080C993C: - ldr r5, _080C998C @ =gUnknown_2037078 + ldr r5, _080C998C @ =gPlayerAvatar ldrb r0, [r5, 0x5] lsls r4, r0, 3 adds r4, r0 @@ -243,7 +243,7 @@ _080C9980: bx r0 .align 2, 0 _080C9988: .4byte gUnknown_20386E0 -_080C998C: .4byte gUnknown_2037078 +_080C998C: .4byte gPlayerAvatar _080C9990: .4byte gMapObjects _080C9994: .4byte gSprites _080C9998: .4byte gTasks @@ -266,7 +266,7 @@ sub_80C99A0: @ 80C99A0 ldrh r0, [r0, 0x1A] orrs r1, r0 bl _call_via_r1 - ldr r1, _080C99D4 @ =gUnknown_2037078 + ldr r1, _080C99D4 @ =gPlayerAvatar movs r0, 0 strb r0, [r1, 0x6] adds r0, r4, 0 @@ -276,7 +276,7 @@ sub_80C99A0: @ 80C99A0 bx r0 .align 2, 0 _080C99D0: .4byte gTasks -_080C99D4: .4byte gUnknown_2037078 +_080C99D4: .4byte gPlayerAvatar thumb_func_end sub_80C99A0 thumb_func_start SetUpFieldMove_RockSmash diff --git a/asm/start_menu.s b/asm/start_menu.s index 0991b8bc3..3088f613a 100644 --- a/asm/start_menu.s +++ b/asm/start_menu.s @@ -631,8 +631,8 @@ _0806F24E: _0806F254: .4byte gUnknown_20370F0 thumb_func_end sub_806F1F0 - thumb_func_start sub_806F258 -sub_806F258: @ 806F258 + thumb_func_start ShowStartMenu +ShowStartMenu: @ 806F258 push {lr} bl sub_805642C cmp r0, 0 @@ -648,7 +648,7 @@ _0806F26E: bx r0 .align 2, 0 _0806F27C: .4byte sub_806F1F0 - thumb_func_end sub_806F258 + thumb_func_end ShowStartMenu thumb_func_start sub_806F280 sub_806F280: @ 806F280 diff --git a/asm/trainer_see.s b/asm/trainer_see.s index cfdd02906..91dc077d7 100644 --- a/asm/trainer_see.s +++ b/asm/trainer_see.s @@ -5,8 +5,8 @@ .text - thumb_func_start sub_8081B30 -sub_8081B30: @ 8081B30 + thumb_func_start CheckForTrainersWantingBattle +CheckForTrainersWantingBattle: @ 8081B30 push {r4,r5,lr} bl sub_8111C2C lsls r0, 24 @@ -54,7 +54,7 @@ _08081B7A: bx r1 .align 2, 0 _08081B80: .4byte gMapObjects - thumb_func_end sub_8081B30 + thumb_func_end CheckForTrainersWantingBattle thumb_func_start sub_8081B84 sub_8081B84: @ 8081B84 @@ -735,7 +735,7 @@ _0808204A: bl sub_805FE7C adds r0, r4, 0 bl sub_805FE5C - ldr r0, _080820B4 @ =gUnknown_2037078 + ldr r0, _080820B4 @ =gPlayerAvatar ldrb r1, [r0, 0x5] lsls r0, r1, 3 adds r0, r1 @@ -763,7 +763,7 @@ _080820AC: pop {r1} bx r1 .align 2, 0 -_080820B4: .4byte gUnknown_2037078 +_080820B4: .4byte gPlayerAvatar _080820B8: .4byte gMapObjects thumb_func_end sub_808202C @@ -772,7 +772,7 @@ sub_80820BC: @ 80820BC push {r4,r5,lr} lsls r0, 24 lsrs r5, r0, 24 - ldr r0, _080820F8 @ =gUnknown_2037078 + ldr r0, _080820F8 @ =gPlayerAvatar ldrb r1, [r0, 0x5] lsls r0, r1, 3 adds r0, r1 @@ -798,7 +798,7 @@ _080820EE: pop {r1} bx r1 .align 2, 0 -_080820F8: .4byte gUnknown_2037078 +_080820F8: .4byte gPlayerAvatar _080820FC: .4byte gMapObjects thumb_func_end sub_80820BC diff --git a/asm/unk_8159F40.s b/asm/unk_8159F40.s index a4fb6518c..78693e452 100644 --- a/asm/unk_8159F40.s +++ b/asm/unk_8159F40.s @@ -669,14 +669,14 @@ _0815A444: ldrsh r0, [r6, r2] movs r2, 0x12 ldrsh r1, [r6, r2] - bl sub_8058F78 + bl MapGridGetMetatileBehaviorAt strb r0, [r6, 0x1E] ldrb r4, [r6, 0x1F] movs r1, 0x10 ldrsh r0, [r6, r1] movs r2, 0x12 ldrsh r1, [r6, r2] - bl sub_8058F78 + bl MapGridGetMetatileBehaviorAt cmp r4, r0 bne _0815A488 ldrh r0, [r6, 0x10] @@ -694,7 +694,7 @@ _0815A488: asrs r0, 16 movs r2, 0x12 ldrsh r1, [r6, r2] - bl sub_8058F78 + bl MapGridGetMetatileBehaviorAt cmp r4, r0 bne _0815A4A8 ldrh r0, [r6, 0x10] @@ -710,7 +710,7 @@ _0815A4A8: asrs r0, 16 movs r2, 0x12 ldrsh r1, [r6, r2] - bl sub_8058F78 + bl MapGridGetMetatileBehaviorAt cmp r4, r0 bne _0815A4C8 ldrh r0, [r6, 0x10] @@ -726,7 +726,7 @@ _0815A4C8: subs r1, 0x1 lsls r1, 16 asrs r1, 16 - bl sub_8058F78 + bl MapGridGetMetatileBehaviorAt cmp r4, r0 bne _0815A4E8 ldrh r0, [r6, 0x10] @@ -742,7 +742,7 @@ _0815A4E8: adds r1, 0x1 lsls r1, 16 asrs r1, 16 - bl sub_8058F78 + bl MapGridGetMetatileBehaviorAt cmp r4, r0 bne _0815A508 ldrh r0, [r6, 0x10] @@ -798,7 +798,7 @@ sub_815A540: @ 815A540 ldrsh r0, [r0, r1] movs r2, 0 ldrsh r1, [r4, r2] - bl sub_8058F78 + bl MapGridGetMetatileBehaviorAt lsls r0, 24 lsrs r0, 24 bl sub_8059CA4 @@ -810,7 +810,7 @@ sub_815A540: @ 815A540 lsls r0, 24 cmp r0, 0 beq _0815A5A4 - ldr r0, _0815A5B0 @ =gUnknown_2037078 + ldr r0, _0815A5B0 @ =gPlayerAvatar ldrb r0, [r0, 0x5] lsls r4, r0, 3 adds r4, r0 @@ -833,7 +833,7 @@ _0815A5A4: bx r0 .align 2, 0 _0815A5AC: .4byte gUnknown_203ADFA -_0815A5B0: .4byte gUnknown_2037078 +_0815A5B0: .4byte gPlayerAvatar _0815A5B4: .4byte gMapObjects _0815A5B8: .4byte gSprites thumb_func_end sub_815A540 diff --git a/include/field_control_avatar.h b/include/field_control_avatar.h new file mode 100644 index 000000000..5b2184561 --- /dev/null +++ b/include/field_control_avatar.h @@ -0,0 +1,6 @@ +#ifndef GUARD_FIELD_CONTROL_AVATAR_H +#define GUARD_FIELD_CONTROL_AVATAR_H + +extern u32 gUnknown_3005078; + +#endif //GUARD_FIELD_CONTROL_AVATAR_H diff --git a/include/quest_log.h b/include/quest_log.h index dfdd4bf41..280a04423 100644 --- a/include/quest_log.h +++ b/include/quest_log.h @@ -2,5 +2,7 @@ #define GUARD_QUEST_LOG_H extern u8 gUnknown_3005E88; +extern u16 gUnknown_3005E8C; +extern struct UnkStruct_203AE98 * gUnknown_3005E94; #endif //GUARD_QUEST_LOG_H diff --git a/src/quest_log.c b/src/quest_log.c index 3cc392165..14809b8e4 100644 --- a/src/quest_log.c +++ b/src/quest_log.c @@ -18,6 +18,7 @@ #include "map_obj_80688E4.h" #include "map_obj_lock.h" #include "field_player_avatar.h" +#include "field_control_avatar.h" #include "item.h" #include "region_map.h" #include "map_name_popup.h" @@ -51,7 +52,9 @@ struct UnkStruct_203AE98 u8 unk_6; }; -IWRAM_DATA struct UnkStruct_203AE98 * gUnknown_3005E94; +u8 gUnknown_3005E88; +u16 gUnknown_3005E8C; +struct UnkStruct_203AE98 * gUnknown_3005E94; EWRAM_DATA u8 gUnknown_203ADF8 = 0; EWRAM_DATA u8 gUnknown_203ADF9 = 0; @@ -1516,3 +1519,48 @@ void sub_81126AC(u8 a0, u8 a1) gUnknown_203B01A = a1; } } + +void sub_8112720(u8 a0) +{ + if (!sub_8112D1C()) + { + gUnknown_3005E94[gUnknown_203AF98].unk_4 = gUnknown_203B01A; + gUnknown_3005E94[gUnknown_203AF98].unk_6 = 1; + gUnknown_3005E94[gUnknown_203AF98].unk_0 = 0; + gUnknown_3005E94[gUnknown_203AF98].unk_3 = a0; + gUnknown_203AF98++; + gUnknown_203B01A = 0; + } +} + +void sub_811278C(u8 a0, u8 a1) +{ + if (!sub_8112D1C()) + { + gUnknown_3005E94[gUnknown_203AF98].unk_4 = gUnknown_203B01A; + gUnknown_3005E94[gUnknown_203AF98].unk_6 = 1; + gUnknown_3005E94[gUnknown_203AF98].unk_0 = 0; + gUnknown_3005E94[gUnknown_203AF98].unk_3 = a0; + gUnknown_203AF98++; + gUnknown_203B01A = a1; + } +} + +void sub_81127F8(u32 * a0) +{ + if (gUnknown_203AF98 < gUnknown_3005E8C) + { + u32 r2 = *a0 & 0x00FF00F3; + gUnknown_3005E94[gUnknown_203AF98].unk_4 = gUnknown_203B01A; + gUnknown_3005E94[gUnknown_203AF98].unk_6 = 2; + gUnknown_3005E94[gUnknown_203AF98].unk_0 = r2; + gUnknown_3005E94[gUnknown_203AF98].unk_1 = r2 >> 8; + gUnknown_3005E94[gUnknown_203AF98].unk_2 = r2 >> 16; + gUnknown_3005E94[gUnknown_203AF98].unk_3 = r2 >> 24; + gUnknown_203AF98++; + if (ScriptContext2_IsEnabled()) + gUnknown_203B01A = TRUE; + else + gUnknown_203B01A = FALSE; + } +} diff --git a/sym_ewram.txt b/sym_ewram.txt index 3454d792c..c44e340ec 100644 --- a/sym_ewram.txt +++ b/sym_ewram.txt @@ -632,7 +632,7 @@ gUnknown_2036E34: @ 2036E34 gMapObjects: @ 2036E38 .space 0x240 -gUnknown_2037078: @ 2037078 +gPlayerAvatar: @ 2037078 .space 0x20 gUnknown_2037098: @ 2037098 -- cgit v1.2.3 From 9dd0dffc664fed37831d51206a44f8d864207e35 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sat, 13 Oct 2018 09:51:35 -0400 Subject: through sub_81128BC --- asm/quest_log.s | 103 -------------------------------------------------------- src/quest_log.c | 43 +++++++++++++++++++++++ 2 files changed, 43 insertions(+), 103 deletions(-) diff --git a/asm/quest_log.s b/asm/quest_log.s index 09f621d43..69def6a01 100644 --- a/asm/quest_log.s +++ b/asm/quest_log.s @@ -5,109 +5,6 @@ .text - thumb_func_start sub_8112888 -sub_8112888: @ 8112888 - push {lr} - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x1 - beq _08112898 - cmp r0, 0x2 - beq _081128A8 - b _081128B4 -_08112898: - ldr r1, _081128A4 @ =gUnknown_3005E88 - ldrb r0, [r1] - cmp r0, 0x1 - bne _081128B4 - movs r0, 0x3 - b _081128B2 - .align 2, 0 -_081128A4: .4byte gUnknown_3005E88 -_081128A8: - ldr r1, _081128B8 @ =gUnknown_3005E88 - ldrb r0, [r1] - cmp r0, 0x3 - bne _081128B4 - movs r0, 0x1 -_081128B2: - strb r0, [r1] -_081128B4: - pop {r0} - bx r0 - .align 2, 0 -_081128B8: .4byte gUnknown_3005E88 - thumb_func_end sub_8112888 - - thumb_func_start sub_81128BC -sub_81128BC: @ 81128BC - push {r4,r5,lr} - lsls r0, 24 - lsrs r4, r0, 24 - bl sub_8112CAC - lsls r0, 24 - lsrs r1, r0, 24 - cmp r4, 0x1 - beq _081128D4 - cmp r4, 0x2 - beq _08112928 - b _08112934 -_081128D4: - cmp r1, 0x1 - bne _081128E4 - ldr r1, _081128E0 @ =gUnknown_3005E88 - movs r0, 0x3 - strb r0, [r1] - b _08112934 - .align 2, 0 -_081128E0: .4byte gUnknown_3005E88 -_081128E4: - cmp r1, 0x2 - bne _08112934 - ldr r2, _08112918 @ =gUnknown_203AF98 - ldrh r1, [r2] - ldr r0, _0811291C @ =gUnknown_3005E94 - ldr r3, [r0] - lsls r1, 3 - adds r1, r3 - ldr r4, _08112920 @ =gUnknown_203B01A - ldrh r0, [r4] - movs r5, 0 - strh r0, [r1, 0x4] - ldrh r0, [r2] - lsls r0, 3 - adds r0, r3 - movs r1, 0x3 - strb r1, [r0, 0x6] - ldrh r0, [r2] - adds r0, 0x1 - strh r0, [r2] - strh r5, [r4] - ldr r1, _08112924 @ =gUnknown_3005E88 - movs r0, 0x4 - strb r0, [r1] - b _08112934 - .align 2, 0 -_08112918: .4byte gUnknown_203AF98 -_0811291C: .4byte gUnknown_3005E94 -_08112920: .4byte gUnknown_203B01A -_08112924: .4byte gUnknown_3005E88 -_08112928: - cmp r1, 0x1 - beq _08112930 - cmp r1, 0x2 - bne _08112934 -_08112930: - ldr r0, _0811293C @ =gUnknown_3005E88 - strb r1, [r0] -_08112934: - pop {r4,r5} - pop {r0} - bx r0 - .align 2, 0 -_0811293C: .4byte gUnknown_3005E88 - thumb_func_end sub_81128BC - thumb_func_start sub_8112940 sub_8112940: @ 8112940 push {r4-r7,lr} diff --git a/src/quest_log.c b/src/quest_log.c index 14809b8e4..834585ac9 100644 --- a/src/quest_log.c +++ b/src/quest_log.c @@ -114,6 +114,7 @@ void sub_811229C(void); void sub_8112364(void); void sub_8112888(u8); void sub_8112940(u8, struct UnkStruct_203AE98 *, u16); +u8 sub_8112CAC(void); bool8 sub_8112CEC(void); bool8 sub_8112D1C(void); void sub_8113A1C(u8); @@ -1564,3 +1565,45 @@ void sub_81127F8(u32 * a0) gUnknown_203B01A = FALSE; } } + +void sub_8112888(u8 a0) +{ + switch (a0) + { + case 1: + if (gUnknown_3005E88 == 1) + gUnknown_3005E88 = 3; + break; + case 2: + if (gUnknown_3005E88 == 3) + gUnknown_3005E88 = 1; + break; + } +} + +void sub_81128BC(u8 a0) +{ + u8 r1 = sub_8112CAC(); + + switch (a0) + { + case 1: + if (r1 == 1) + gUnknown_3005E88 = 3; + else if (r1 == 2) + { + gUnknown_3005E94[gUnknown_203AF98].unk_4 = gUnknown_203B01A; + gUnknown_3005E94[gUnknown_203AF98].unk_6 = 3; + gUnknown_203AF98++; + gUnknown_203B01A = 0; + gUnknown_3005E88 = 4; + } + break; + case 2: + if (r1 == 1) + gUnknown_3005E88 = 1; + else if (r1 == 2) + gUnknown_3005E88 = 2; + break; + } +} -- cgit v1.2.3 From 0e29da2c9f5dc3ce63f3f00cded7422611c328ec Mon Sep 17 00:00:00 2001 From: paul Date: Sat, 13 Oct 2018 18:07:05 +0200 Subject: replace baserom at 8D093D8 --- asm/battle_gfx_sfx_util.s | 4 +- data/graphics.s | 528 +++++++++++++++++++++++- graphics/battle_anims/sprites/046.png | Bin 0 -> 716 bytes graphics/battle_anims/sprites/047.pal | 19 + graphics/battle_anims/sprites/048.png | Bin 0 -> 666 bytes graphics/battle_anims/sprites/049.pal | 19 + graphics/battle_anims/sprites/050.png | Bin 0 -> 225 bytes graphics/battle_anims/sprites/051.png | Bin 0 -> 224 bytes graphics/battle_anims/sprites/052.png | Bin 0 -> 245 bytes graphics/battle_anims/sprites/054.png | Bin 0 -> 159 bytes graphics/battle_anims/sprites/055.png | Bin 0 -> 242 bytes graphics/battle_anims/sprites/056.png | Bin 0 -> 862 bytes graphics/battle_anims/sprites/057.png | Bin 0 -> 214 bytes graphics/battle_anims/sprites/058.png | Bin 0 -> 818 bytes graphics/battle_anims/sprites/059.png | Bin 0 -> 193 bytes graphics/battle_anims/sprites/060.png | Bin 0 -> 154 bytes graphics/battle_anims/sprites/061.png | Bin 0 -> 259 bytes graphics/battle_anims/sprites/062.png | Bin 0 -> 845 bytes graphics/battle_anims/sprites/063.png | Bin 0 -> 414 bytes graphics/battle_anims/sprites/065.png | Bin 0 -> 343 bytes graphics/battle_anims/sprites/066.png | Bin 0 -> 164 bytes graphics/battle_anims/sprites/070.png | Bin 0 -> 195 bytes graphics/battle_anims/sprites/071.png | Bin 0 -> 412 bytes graphics/battle_anims/sprites/072.png | Bin 0 -> 277 bytes graphics/battle_anims/sprites/073.png | Bin 0 -> 319 bytes graphics/battle_anims/sprites/075.png | Bin 0 -> 541 bytes graphics/battle_anims/sprites/078.png | Bin 0 -> 403 bytes graphics/battle_anims/sprites/079.png | Bin 0 -> 880 bytes graphics/battle_anims/sprites/080.png | Bin 0 -> 661 bytes graphics/battle_anims/sprites/081.png | Bin 0 -> 217 bytes graphics/battle_anims/sprites/082.png | Bin 0 -> 148 bytes graphics/battle_anims/sprites/083.png | Bin 0 -> 846 bytes graphics/battle_anims/sprites/084.png | Bin 0 -> 587 bytes graphics/battle_anims/sprites/085.png | Bin 0 -> 221 bytes graphics/battle_anims/sprites/086.png | Bin 0 -> 393 bytes graphics/battle_anims/sprites/088.png | Bin 0 -> 194 bytes graphics/battle_anims/sprites/089.png | Bin 0 -> 488 bytes graphics/battle_anims/sprites/090.png | Bin 0 -> 229 bytes graphics/battle_anims/sprites/091.png | Bin 0 -> 359 bytes graphics/battle_anims/sprites/092.png | Bin 0 -> 199 bytes graphics/battle_anims/sprites/093.png | Bin 0 -> 1351 bytes graphics/battle_anims/sprites/094.png | Bin 0 -> 281 bytes graphics/battle_anims/sprites/095.png | Bin 0 -> 252 bytes graphics/battle_anims/sprites/096.png | Bin 0 -> 356 bytes graphics/battle_anims/sprites/097.png | Bin 0 -> 405 bytes graphics/battle_anims/sprites/098.png | Bin 0 -> 328 bytes graphics/battle_anims/sprites/100.png | Bin 0 -> 293 bytes graphics/battle_anims/sprites/101.png | Bin 0 -> 352 bytes graphics/battle_anims/sprites/102.png | Bin 0 -> 397 bytes graphics/battle_anims/sprites/103.png | Bin 0 -> 193 bytes graphics/battle_anims/sprites/104.png | Bin 0 -> 427 bytes graphics/battle_anims/sprites/105.png | Bin 0 -> 1101 bytes graphics/battle_anims/sprites/106.png | Bin 0 -> 287 bytes graphics/battle_anims/sprites/107.png | Bin 0 -> 576 bytes graphics/battle_anims/sprites/108.png | Bin 0 -> 800 bytes graphics/battle_anims/sprites/109.png | Bin 0 -> 161 bytes graphics/battle_anims/sprites/110.png | Bin 0 -> 688 bytes graphics/battle_anims/sprites/111.png | Bin 0 -> 169 bytes graphics/battle_anims/sprites/112.png | Bin 0 -> 762 bytes graphics/battle_anims/sprites/113.png | Bin 0 -> 586 bytes graphics/battle_anims/sprites/114.png | Bin 0 -> 284 bytes graphics/battle_interface/unused_window2.png | Bin 0 -> 445 bytes graphics/battle_interface/unused_window2bar.png | Bin 0 -> 91 bytes graphics/interface/hpbar_anim.png | Bin 0 -> 192 bytes graphics/interface/numbers1.png | Bin 0 -> 201 bytes graphics/interface/numbers2.png | Bin 0 -> 215 bytes graphics/unknown/unknown_D0CA04.bin | Bin 0 -> 36 bytes graphics/unknown/unknown_D0CA28.bin | Bin 0 -> 36 bytes graphics/unknown/unknown_D0CA4C.bin | Bin 0 -> 36 bytes graphics/unknown/unknown_D0CAC8.bin | Bin 0 -> 32 bytes graphics/unknown/unknown_D0CD0C.bin | Bin 0 -> 32 bytes graphics/unused/basic_frame.bin | Bin 0 -> 2048 bytes graphics/unused/basic_frame.png | Bin 0 -> 230 bytes graphics/unused/blue_frame.bin | Bin 0 -> 2048 bytes graphics/unused/color_frames.png | Bin 0 -> 282 bytes graphics/unused/line_sketch.png | Bin 0 -> 328 bytes graphics/unused/line_sketch_2.bin | Bin 0 -> 1024 bytes graphics/unused/line_sketch_2.png | Bin 0 -> 154 bytes graphics/unused/metronome_hand_small.png | Bin 0 -> 202 bytes graphics/unused/redyellowgreen_frame.bin | Bin 0 -> 8192 bytes graphics/unused/water_splash.bin | Bin 0 -> 1024 bytes graphics/unused/water_splash.png | Bin 0 -> 1064 bytes 82 files changed, 565 insertions(+), 5 deletions(-) create mode 100644 graphics/battle_anims/sprites/046.png create mode 100644 graphics/battle_anims/sprites/047.pal create mode 100644 graphics/battle_anims/sprites/048.png create mode 100644 graphics/battle_anims/sprites/049.pal create mode 100644 graphics/battle_anims/sprites/050.png create mode 100644 graphics/battle_anims/sprites/051.png create mode 100644 graphics/battle_anims/sprites/052.png create mode 100644 graphics/battle_anims/sprites/054.png create mode 100644 graphics/battle_anims/sprites/055.png create mode 100644 graphics/battle_anims/sprites/056.png create mode 100644 graphics/battle_anims/sprites/057.png create mode 100644 graphics/battle_anims/sprites/058.png create mode 100644 graphics/battle_anims/sprites/059.png create mode 100644 graphics/battle_anims/sprites/060.png create mode 100644 graphics/battle_anims/sprites/061.png create mode 100644 graphics/battle_anims/sprites/062.png create mode 100644 graphics/battle_anims/sprites/063.png create mode 100644 graphics/battle_anims/sprites/065.png create mode 100644 graphics/battle_anims/sprites/066.png create mode 100644 graphics/battle_anims/sprites/070.png create mode 100644 graphics/battle_anims/sprites/071.png create mode 100644 graphics/battle_anims/sprites/072.png create mode 100644 graphics/battle_anims/sprites/073.png create mode 100644 graphics/battle_anims/sprites/075.png create mode 100644 graphics/battle_anims/sprites/078.png create mode 100644 graphics/battle_anims/sprites/079.png create mode 100644 graphics/battle_anims/sprites/080.png create mode 100644 graphics/battle_anims/sprites/081.png create mode 100644 graphics/battle_anims/sprites/082.png create mode 100644 graphics/battle_anims/sprites/083.png create mode 100644 graphics/battle_anims/sprites/084.png create mode 100644 graphics/battle_anims/sprites/085.png create mode 100644 graphics/battle_anims/sprites/086.png create mode 100644 graphics/battle_anims/sprites/088.png create mode 100644 graphics/battle_anims/sprites/089.png create mode 100644 graphics/battle_anims/sprites/090.png create mode 100644 graphics/battle_anims/sprites/091.png create mode 100644 graphics/battle_anims/sprites/092.png create mode 100644 graphics/battle_anims/sprites/093.png create mode 100644 graphics/battle_anims/sprites/094.png create mode 100644 graphics/battle_anims/sprites/095.png create mode 100644 graphics/battle_anims/sprites/096.png create mode 100644 graphics/battle_anims/sprites/097.png create mode 100644 graphics/battle_anims/sprites/098.png create mode 100644 graphics/battle_anims/sprites/100.png create mode 100644 graphics/battle_anims/sprites/101.png create mode 100644 graphics/battle_anims/sprites/102.png create mode 100644 graphics/battle_anims/sprites/103.png create mode 100644 graphics/battle_anims/sprites/104.png create mode 100644 graphics/battle_anims/sprites/105.png create mode 100644 graphics/battle_anims/sprites/106.png create mode 100644 graphics/battle_anims/sprites/107.png create mode 100644 graphics/battle_anims/sprites/108.png create mode 100644 graphics/battle_anims/sprites/109.png create mode 100644 graphics/battle_anims/sprites/110.png create mode 100644 graphics/battle_anims/sprites/111.png create mode 100644 graphics/battle_anims/sprites/112.png create mode 100644 graphics/battle_anims/sprites/113.png create mode 100644 graphics/battle_anims/sprites/114.png create mode 100644 graphics/battle_interface/unused_window2.png create mode 100644 graphics/battle_interface/unused_window2bar.png create mode 100644 graphics/interface/hpbar_anim.png create mode 100644 graphics/interface/numbers1.png create mode 100644 graphics/interface/numbers2.png create mode 100644 graphics/unknown/unknown_D0CA04.bin create mode 100644 graphics/unknown/unknown_D0CA28.bin create mode 100644 graphics/unknown/unknown_D0CA4C.bin create mode 100644 graphics/unknown/unknown_D0CAC8.bin create mode 100644 graphics/unknown/unknown_D0CD0C.bin create mode 100644 graphics/unused/basic_frame.bin create mode 100644 graphics/unused/basic_frame.png create mode 100644 graphics/unused/blue_frame.bin create mode 100644 graphics/unused/color_frames.png create mode 100644 graphics/unused/line_sketch.png create mode 100644 graphics/unused/line_sketch_2.bin create mode 100644 graphics/unused/line_sketch_2.png create mode 100644 graphics/unused/metronome_hand_small.png create mode 100644 graphics/unused/redyellowgreen_frame.bin create mode 100644 graphics/unused/water_splash.bin create mode 100644 graphics/unused/water_splash.png diff --git a/asm/battle_gfx_sfx_util.s b/asm/battle_gfx_sfx_util.s index dd319645e..acd2f7ca8 100644 --- a/asm/battle_gfx_sfx_util.s +++ b/asm/battle_gfx_sfx_util.s @@ -1466,7 +1466,7 @@ _0803495A: thumb_func_start LoadBattleBarGfx LoadBattleBarGfx: @ 8034964 push {lr} - ldr r0, _0803497C @ =gUnknown_8D093D8 + ldr r0, _0803497C @ =gFile_graphics_interface_hp_numbers ldr r1, _08034980 @ =gMonSpritesGfxPtr ldr r1, [r1] movs r2, 0xBA @@ -1477,7 +1477,7 @@ LoadBattleBarGfx: @ 8034964 pop {r0} bx r0 .align 2, 0 -_0803497C: .4byte gUnknown_8D093D8 +_0803497C: .4byte gFile_graphics_interface_hp_numbers _08034980: .4byte gMonSpritesGfxPtr thumb_func_end LoadBattleBarGfx diff --git a/data/graphics.s b/data/graphics.s index e7cf632e8..47622e46f 100644 --- a/data/graphics.s +++ b/data/graphics.s @@ -537,10 +537,532 @@ gFile_graphics_battle_interface_unused_window_sheet:: @ 8D08EF4 .align 2 gFile_graphics_battle_interface_unused_window_palette:: @ 8D093B0 .incbin "graphics/battle_interface/unused_window.gbapal.lz" -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; + +@ ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -gUnknown_8D093D8:: @ 8D093D8 - .incbin "baserom.gba", 0xD093D8, 0x87EC + .align 2 +gFile_graphics_interface_hp_numbers:: @ 8D093D8 + .incbin "graphics/interface/hp_numbers.4bpp.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_046:: @ 8D095EC + .incbin "graphics/battle_anims/sprites/046.4bpp.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_046_palette:: @ 8D099CC + .incbin "graphics/battle_anims/sprites/046.gbapal.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_047_palette:: @ 8D099EC + .incbin "graphics/battle_anims/sprites/047.gbapal.lz" + + .align 2 +gFile_graphics_battle_interface_unused_window2_sheet:: @ 8D09A10 + .incbin "graphics/battle_interface/unused_window2.4bpp.lz" + + .align 2 +gFile_graphics_battle_interface_unused_window2bar_sheet:: @ 8D09CAC + .incbin "graphics/battle_interface/unused_window2bar.4bpp.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_048_sheet:: @ 8D09CD8 + .incbin "graphics/battle_anims/sprites/048.4bpp.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_048_palette:: @ 8D09F70 + .incbin "graphics/battle_anims/sprites/048.gbapal.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_049_palette:: @ 8D09F98 + .incbin "graphics/battle_anims/sprites/049.gbapal.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_050_palette:: @ 8D09FC0 + .incbin "graphics/battle_anims/sprites/050.gbapal.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_050_sheet:: @ 8D09FE4 + .incbin "graphics/battle_anims/sprites/050.4bpp.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_051_sheet:: @ 8D0A084 + .incbin "graphics/battle_anims/sprites/051.4bpp.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_052_sheet:: @ 8D0A130 + .incbin "graphics/battle_anims/sprites/052.4bpp.lz" + + .align 2 +gFile_graphics_unused_line_sketch_sheet:: @ 8D0A1FC + .incbin "graphics/unused/line_sketch.4bpp.lz" + + .align 2 +gFile_graphics_unused_line_sketch_palette:: @ 8D0A380 + .incbin "graphics/unused/line_sketch.gbapal.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_054_sheet:: @ 8D0A390 + .incbin "graphics/battle_anims/sprites/054.4bpp.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_054_palette:: @ 8D0A3BC + .incbin "graphics/battle_anims/sprites/054.gbapal.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_056_sheet:: @ 8D0A3D4 + .incbin "graphics/battle_anims/sprites/056.4bpp.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_056_palette:: @ 8D0A87C + .incbin "graphics/battle_anims/sprites/056.gbapal.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_055_sheet:: @ 8D0A8A4 + .incbin "graphics/battle_anims/sprites/055.4bpp.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_057_sheet:: @ 8D0A968 + .incbin "graphics/battle_anims/sprites/057.4bpp.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_057_palette:: @ 8D0A9F0 + .incbin "graphics/battle_anims/sprites/057.gbapal.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_058_sheet:: @ 8D0AA14 + .incbin "graphics/battle_anims/sprites/058.4bpp.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_058_palette:: @ 8D0AE7C + .incbin "graphics/battle_anims/sprites/058.gbapal.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_059_sheet:: @ 8D0AEA4 + .incbin "graphics/battle_anims/sprites/059.4bpp.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_059_palette:: @ 8D0AF04 + .incbin "graphics/battle_anims/sprites/059.gbapal.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_060_sheet:: @ 8D0AF20 + .incbin "graphics/battle_anims/sprites/060.4bpp.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_060_palette:: @ 8D0AF48 + .incbin "graphics/battle_anims/sprites/060.gbapal.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_061_sheet:: @ 8D0AF64 + .incbin "graphics/battle_anims/sprites/061.4bpp.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_061_palette:: @ 8D0B014 + .incbin "graphics/battle_anims/sprites/061.gbapal.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_062_sheet:: @ 8D0B034 + .incbin "graphics/battle_anims/sprites/062.4bpp.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_062_palette:: @ 8D0B404 + .incbin "graphics/battle_anims/sprites/062.gbapal.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_063_sheet:: @ 8D0B42C + .incbin "graphics/battle_anims/sprites/063.4bpp.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_063_palette:: @ 8D0B5E8 + .incbin "graphics/battle_anims/sprites/063.gbapal.lz" + + .align 2 +gFile_graphics_unused_metronome_hand_small_sheet:: @ 8D0B610 + .incbin "graphics/unused/metronome_hand_small.4bpp.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_091_palette:: @ 8D0B680 + .incbin "graphics/battle_anims/sprites/091.gbapal.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_065_sheet:: @ 8D0B6A4 + .incbin "graphics/battle_anims/sprites/065.4bpp.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_065_palette:: @ 8D0B7B8 + .incbin "graphics/battle_anims/sprites/065.gbapal.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_066_sheet:: @ 8D0B7D8 + .incbin "graphics/battle_anims/sprites/066.4bpp.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_066_palette:: @ 8D0B824 + .incbin "graphics/battle_anims/sprites/066.gbapal.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_070_sheet:: @ 8D0B84C + .incbin "graphics/battle_anims/sprites/070.4bpp.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_070_palette:: @ 8D0B8CC + .incbin "graphics/battle_anims/sprites/070.gbapal.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_071_sheet:: @ 8D0B8F4 + .incbin "graphics/battle_anims/sprites/071.4bpp.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_072_sheet:: @ 8D0BB20 + .incbin "graphics/battle_anims/sprites/072.4bpp.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_072_palette:: @ 8D0BBF0 + .incbin "graphics/battle_anims/sprites/072.gbapal.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_073_sheet:: @ 8D0BC08 + .incbin "graphics/battle_anims/sprites/073.4bpp.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_073_palette:: @ 8D0BD24 + .incbin "graphics/battle_anims/sprites/073.gbapal.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_075_sheet:: @ 8D0BD44 + .incbin "graphics/battle_anims/sprites/075.4bpp.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_075_palette:: @ 8D0BFC0 + .incbin "graphics/battle_anims/sprites/075.gbapal.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_078_sheet:: @ 8D0BFE4 + .incbin "graphics/battle_anims/sprites/078.4bpp.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_078_palette:: @ 8D0C17C + .incbin "graphics/battle_anims/sprites/078.gbapal.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_079_sheet:: @ 8D0C1A4 + .incbin "graphics/battle_anims/sprites/079.4bpp.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_080_sheet:: @ 8D0C5D4 + .incbin "graphics/battle_anims/sprites/080.4bpp.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_080_palette:: @ 8D0C938 + .incbin "graphics/battle_anims/sprites/080.gbapal.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_081_sheet:: @ 8D0C95C + .incbin "graphics/battle_anims/sprites/081.4bpp.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_081_palette:: @ 8D0C9E0 + .incbin "graphics/battle_anims/sprites/081.gbapal.lz" + + .align 2 +gFile_graphics_unknown_unknown_D0CA04:: @ 8D0CA04 + .incbin "graphics/unknown/unknown_D0CA04.bin" + + .align 2 +gFile_graphics_unknown_unknown_D0CA28:: @ 8D0CA28 + .incbin "graphics/unknown/unknown_D0CA28.bin" + + .align 2 +gFile_graphics_unknown_unknown_D0CA4C:: @ 8D0CA4C + .incbin "graphics/unknown/unknown_D0CA4C.bin" + + .align 2 +gFile_graphics_unused_line_sketch_2_sheet:: @ 8D0CA70 + .incbin "graphics/unused/line_sketch_2.8bpp.lz" + + .align 2 +gFile_graphics_unknown_unknown_D0CAC8:: @ 8D0CAC8 + .incbin "graphics/unknown/unknown_D0CAC8.bin" + + .align 2 +gFile_graphics_unused_line_sketch_2_tilemap:: @ 8D0CAE8 + .incbin "graphics/unused/line_sketch_2.bin.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_082_sheet:: @ 8D0CB78 + .incbin "graphics/battle_anims/sprites/082.4bpp.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_082_palette:: @ 8D0CB9C + .incbin "graphics/battle_anims/sprites/082.gbapal.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_083_palette:: @ 8D0CBB0 + .incbin "graphics/battle_anims/sprites/083.gbapal.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_084_palette:: @ 8D0CBD8 + .incbin "graphics/battle_anims/sprites/084.gbapal.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_085_palette:: @ 8D0CC00 + .incbin "graphics/battle_anims/sprites/085.gbapal.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_086_palette:: @ 8D0CC18 + .incbin "graphics/battle_anims/sprites/086.gbapal.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_088_palette:: @ 8D0CC40 + .incbin "graphics/battle_anims/sprites/088.gbapal.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_089_palette:: @ 8D0CC5C + .incbin "graphics/battle_anims/sprites/089.gbapal.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_090_palette:: @ 8D0CC84 + .incbin "graphics/battle_anims/sprites/090.gbapal.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_092_palette:: @ 8D0CCA8 + .incbin "graphics/battle_anims/sprites/092.gbapal.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_093_palette:: @ 8D0CCC4 + .incbin "graphics/battle_anims/sprites/093.gbapal.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_094_palette:: @ 8D0CCEC + .incbin "graphics/battle_anims/sprites/094.gbapal.lz" + + .align 2 +gFile_graphics_unknown_unknown_D0CD0C:: @ 8D0CD0C + .incbin "graphics/unknown/unknown_D0CD0C.bin.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_095_palette:: @ 8D0CD2C + .incbin "graphics/battle_anims/sprites/095.gbapal.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_096_palette:: @ 8D0CD54 + .incbin "graphics/battle_anims/sprites/096.gbapal.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_097_palette:: @ 8D0CD70 + .incbin "graphics/battle_anims/sprites/097.gbapal.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_100_palette:: @ 8D0CD98 + .incbin "graphics/battle_anims/sprites/100.gbapal.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_101_palette:: @ 8D0CDB4 + .incbin "graphics/battle_anims/sprites/101.gbapal.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_103_palette:: @ 8D0CDDC + .incbin "graphics/battle_anims/sprites/103.gbapal.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_083_sheet:: @ 8D0CE00 + .incbin "graphics/battle_anims/sprites/083.4bpp.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_084_sheet:: @ 8D0D2A4 + .incbin "graphics/battle_anims/sprites/084.4bpp.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_085_sheet:: @ 8D0D668 + .incbin "graphics/battle_anims/sprites/085.4bpp.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_086_sheet:: @ 8D0D720 + .incbin "graphics/battle_anims/sprites/086.4bpp.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_088_sheet:: @ 8D0D890 + .incbin "graphics/battle_anims/sprites/088.4bpp.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_089_sheet:: @ 8D0D8E0 + .incbin "graphics/battle_anims/sprites/089.4bpp.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_090_sheet:: @ 8D0DB54 + .incbin "graphics/battle_anims/sprites/090.4bpp.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_091_sheet:: @ 8D0DBE4 + .incbin "graphics/battle_anims/sprites/091.4bpp.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_092_sheet:: @ 8D0DD18 + .incbin "graphics/battle_anims/sprites/092.4bpp.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_093_sheet:: @ 8D0DD94 + .incbin "graphics/battle_anims/sprites/093.4bpp.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_094_sheet:: @ 8D0E464 + .incbin "graphics/battle_anims/sprites/094.4bpp.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_095_sheet:: @ 8D0E608 + .incbin "graphics/battle_anims/sprites/095.4bpp.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_096_sheet:: @ 8D0E6B8 + .incbin "graphics/battle_anims/sprites/096.4bpp.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_097_sheet:: @ 8D0E828 + .incbin "graphics/battle_anims/sprites/097.4bpp.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_098_sheet:: @ 8D0EA08 + .incbin "graphics/battle_anims/sprites/098.4bpp.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_100_sheet:: @ 8D0EB40 + .incbin "graphics/battle_anims/sprites/100.4bpp.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_101_sheet:: @ 8D0EC40 + .incbin "graphics/battle_anims/sprites/101.4bpp.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_102_sheet:: @ 8D0ED70 + .incbin "graphics/battle_anims/sprites/102.4bpp.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_103_sheet:: @ 8D0EF08 + .incbin "graphics/battle_anims/sprites/103.4bpp.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_104_sheet:: @ 8D0EF74 + .incbin "graphics/battle_anims/sprites/104.4bpp.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_104_palette:: @ 8D0F134 + .incbin "graphics/battle_anims/sprites/104.gbapal.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_105_sheet:: @ 8D0F15C + .incbin "graphics/battle_anims/sprites/105.4bpp.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_105_palette:: @ 8D0F6E0 + .incbin "graphics/battle_anims/sprites/105.gbapal.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_106_sheet:: @ 8D0F708 + .incbin "graphics/battle_anims/sprites/106.4bpp.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_107_sheet:: @ 8D0F7F8 + .incbin "graphics/battle_anims/sprites/107.4bpp.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_107_palette:: @ 8D0FBA4 + .incbin "graphics/battle_anims/sprites/107.gbapal.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_108_sheet:: @ 8D0FBCC + .incbin "graphics/battle_anims/sprites/108.4bpp.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_109_sheet:: @ 8D0FF50 + .incbin "graphics/battle_anims/sprites/109.4bpp.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_109_palette:: @ 8D0FF78 + .incbin "graphics/battle_anims/sprites/109.gbapal.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_110_sheet:: @ 8D0FFA0 + .incbin "graphics/battle_anims/sprites/110.4bpp.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_111_sheet:: @ 8D10384 + .incbin "graphics/battle_anims/sprites/111.4bpp.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_111_palette:: @ 8D103C8 + .incbin "graphics/battle_anims/sprites/111.gbapal.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_112_sheet:: @ 8D103EC + .incbin "graphics/battle_anims/sprites/112.4bpp.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_112_palette:: @ 8D10714 + .incbin "graphics/battle_anims/sprites/112.gbapal.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_113_sheet:: @ 8D1073C + .incbin "graphics/battle_anims/sprites/113.4bpp.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_113_palette:: @ 8D109A8 + .incbin "graphics/battle_anims/sprites/113.gbapal.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_114_sheet:: @ 8D109D0 + .incbin "graphics/battle_anims/sprites/114.4bpp.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_114_palette:: @ 8D10AC4 + .incbin "graphics/battle_anims/sprites/114.gbapal.lz" + + .align 2 +gFile_graphics_unused_blue_frame_tilemap:: @ 8D10AEC + .incbin "graphics/unused/blue_frame.bin.lz" + + .align 2 +gFile_graphics_unused_redyellowgreen_frame_tilemap:: @ 8D10C04 + .incbin "graphics/unused/redyellowgreen_frame.bin.lz" + + .align 2 +gFile_graphics_unused_color_frames_sheet:: @ 8D11004 + .incbin "graphics/unused/color_frames.4bpp.lz" + + .align 2 +gFile_graphics_unused_color_frames_palette:: @ 8D115A4 + .incbin "graphics/unused/color_frames.gbapal.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_115_sheet:: @ 8D115CC + .incbin "graphics/battle_anims/sprites/115.4bpp.lz" + + .align 2 +gFile_graphics_unused_water_splash_sheet:: @ 8D116FC + .incbin "graphics/unused/water_splash.8bpp.lz" + + .align 2 +gFile_graphics_unused_water_splash_tilemap:: @ 8D11884 + .incbin "graphics/unused/water_splash.bin.lz" + + .align 2 +gFile_graphics_unused_water_splash_palette:: @ 8D11964 + .incbin "graphics/unused/water_splash.gbapal.lz" + + .align 2 +gFile_graphics_unused_basic_frame_sheet:: @ 8D119C4 + .incbin "graphics/unused/basic_frame.4bpp.lz" + + .align 2 +gFile_graphics_unused_basic_frame_palette:: @ 8D11A50 + .incbin "graphics/unused/basic_frame.gbapal.lz" + + .align 2 +gFile_graphics_unused_basic_frame_tilemap:: @ 8D11A78 + .incbin "graphics/unused/basic_frame.bin.lz" + + .align 2 +gUnknown_8D11B84:: @ 8D11B84 + .incbin "baserom.gba", 0xD11B84, 0x40 gUnknown_8D11BC4:: @ 8D11BC4 .incbin "baserom.gba", 0xD11BC4, 0xB660 diff --git a/graphics/battle_anims/sprites/046.png b/graphics/battle_anims/sprites/046.png new file mode 100644 index 000000000..85a052486 Binary files /dev/null and b/graphics/battle_anims/sprites/046.png differ diff --git a/graphics/battle_anims/sprites/047.pal b/graphics/battle_anims/sprites/047.pal new file mode 100644 index 000000000..226cf039a --- /dev/null +++ b/graphics/battle_anims/sprites/047.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +148 246 197 +255 255 255 +255 255 205 +238 205 164 +222 164 131 +222 115 106 +230 65 82 +180 32 90 +131 0 106 +90 0 82 +57 0 57 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/battle_anims/sprites/048.png b/graphics/battle_anims/sprites/048.png new file mode 100644 index 000000000..4a6631ab8 Binary files /dev/null and b/graphics/battle_anims/sprites/048.png differ diff --git a/graphics/battle_anims/sprites/049.pal b/graphics/battle_anims/sprites/049.pal new file mode 100644 index 000000000..268ce4f4f --- /dev/null +++ b/graphics/battle_anims/sprites/049.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +255 255 255 +255 255 148 +255 230 74 +255 205 0 +230 156 0 +205 106 0 +189 57 0 +255 148 24 +255 98 16 +255 49 8 +255 0 0 +156 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/battle_anims/sprites/050.png b/graphics/battle_anims/sprites/050.png new file mode 100644 index 000000000..9f2c101e4 Binary files /dev/null and b/graphics/battle_anims/sprites/050.png differ diff --git a/graphics/battle_anims/sprites/051.png b/graphics/battle_anims/sprites/051.png new file mode 100644 index 000000000..14d7036bc Binary files /dev/null and b/graphics/battle_anims/sprites/051.png differ diff --git a/graphics/battle_anims/sprites/052.png b/graphics/battle_anims/sprites/052.png new file mode 100644 index 000000000..9928271d5 Binary files /dev/null and b/graphics/battle_anims/sprites/052.png differ diff --git a/graphics/battle_anims/sprites/054.png b/graphics/battle_anims/sprites/054.png new file mode 100644 index 000000000..afffd9e77 Binary files /dev/null and b/graphics/battle_anims/sprites/054.png differ diff --git a/graphics/battle_anims/sprites/055.png b/graphics/battle_anims/sprites/055.png new file mode 100644 index 000000000..bd6590322 Binary files /dev/null and b/graphics/battle_anims/sprites/055.png differ diff --git a/graphics/battle_anims/sprites/056.png b/graphics/battle_anims/sprites/056.png new file mode 100644 index 000000000..1a10645a4 Binary files /dev/null and b/graphics/battle_anims/sprites/056.png differ diff --git a/graphics/battle_anims/sprites/057.png b/graphics/battle_anims/sprites/057.png new file mode 100644 index 000000000..ffc3f7634 Binary files /dev/null and b/graphics/battle_anims/sprites/057.png differ diff --git a/graphics/battle_anims/sprites/058.png b/graphics/battle_anims/sprites/058.png new file mode 100644 index 000000000..89e01f78a Binary files /dev/null and b/graphics/battle_anims/sprites/058.png differ diff --git a/graphics/battle_anims/sprites/059.png b/graphics/battle_anims/sprites/059.png new file mode 100644 index 000000000..4d93be124 Binary files /dev/null and b/graphics/battle_anims/sprites/059.png differ diff --git a/graphics/battle_anims/sprites/060.png b/graphics/battle_anims/sprites/060.png new file mode 100644 index 000000000..c4c0fb53e Binary files /dev/null and b/graphics/battle_anims/sprites/060.png differ diff --git a/graphics/battle_anims/sprites/061.png b/graphics/battle_anims/sprites/061.png new file mode 100644 index 000000000..6efa4e537 Binary files /dev/null and b/graphics/battle_anims/sprites/061.png differ diff --git a/graphics/battle_anims/sprites/062.png b/graphics/battle_anims/sprites/062.png new file mode 100644 index 000000000..bdfaa78c4 Binary files /dev/null and b/graphics/battle_anims/sprites/062.png differ diff --git a/graphics/battle_anims/sprites/063.png b/graphics/battle_anims/sprites/063.png new file mode 100644 index 000000000..8828f4e8d Binary files /dev/null and b/graphics/battle_anims/sprites/063.png differ diff --git a/graphics/battle_anims/sprites/065.png b/graphics/battle_anims/sprites/065.png new file mode 100644 index 000000000..8916253e4 Binary files /dev/null and b/graphics/battle_anims/sprites/065.png differ diff --git a/graphics/battle_anims/sprites/066.png b/graphics/battle_anims/sprites/066.png new file mode 100644 index 000000000..d70924235 Binary files /dev/null and b/graphics/battle_anims/sprites/066.png differ diff --git a/graphics/battle_anims/sprites/070.png b/graphics/battle_anims/sprites/070.png new file mode 100644 index 000000000..dfb03010c Binary files /dev/null and b/graphics/battle_anims/sprites/070.png differ diff --git a/graphics/battle_anims/sprites/071.png b/graphics/battle_anims/sprites/071.png new file mode 100644 index 000000000..88d20bb5e Binary files /dev/null and b/graphics/battle_anims/sprites/071.png differ diff --git a/graphics/battle_anims/sprites/072.png b/graphics/battle_anims/sprites/072.png new file mode 100644 index 000000000..14976ded1 Binary files /dev/null and b/graphics/battle_anims/sprites/072.png differ diff --git a/graphics/battle_anims/sprites/073.png b/graphics/battle_anims/sprites/073.png new file mode 100644 index 000000000..95484d2a0 Binary files /dev/null and b/graphics/battle_anims/sprites/073.png differ diff --git a/graphics/battle_anims/sprites/075.png b/graphics/battle_anims/sprites/075.png new file mode 100644 index 000000000..9455a1962 Binary files /dev/null and b/graphics/battle_anims/sprites/075.png differ diff --git a/graphics/battle_anims/sprites/078.png b/graphics/battle_anims/sprites/078.png new file mode 100644 index 000000000..b48af4900 Binary files /dev/null and b/graphics/battle_anims/sprites/078.png differ diff --git a/graphics/battle_anims/sprites/079.png b/graphics/battle_anims/sprites/079.png new file mode 100644 index 000000000..193ba3942 Binary files /dev/null and b/graphics/battle_anims/sprites/079.png differ diff --git a/graphics/battle_anims/sprites/080.png b/graphics/battle_anims/sprites/080.png new file mode 100644 index 000000000..f4089ee01 Binary files /dev/null and b/graphics/battle_anims/sprites/080.png differ diff --git a/graphics/battle_anims/sprites/081.png b/graphics/battle_anims/sprites/081.png new file mode 100644 index 000000000..0d6783cd9 Binary files /dev/null and b/graphics/battle_anims/sprites/081.png differ diff --git a/graphics/battle_anims/sprites/082.png b/graphics/battle_anims/sprites/082.png new file mode 100644 index 000000000..a1b2d7318 Binary files /dev/null and b/graphics/battle_anims/sprites/082.png differ diff --git a/graphics/battle_anims/sprites/083.png b/graphics/battle_anims/sprites/083.png new file mode 100644 index 000000000..8e8178422 Binary files /dev/null and b/graphics/battle_anims/sprites/083.png differ diff --git a/graphics/battle_anims/sprites/084.png b/graphics/battle_anims/sprites/084.png new file mode 100644 index 000000000..306668035 Binary files /dev/null and b/graphics/battle_anims/sprites/084.png differ diff --git a/graphics/battle_anims/sprites/085.png b/graphics/battle_anims/sprites/085.png new file mode 100644 index 000000000..ab9fdce5e Binary files /dev/null and b/graphics/battle_anims/sprites/085.png differ diff --git a/graphics/battle_anims/sprites/086.png b/graphics/battle_anims/sprites/086.png new file mode 100644 index 000000000..ba93d952e Binary files /dev/null and b/graphics/battle_anims/sprites/086.png differ diff --git a/graphics/battle_anims/sprites/088.png b/graphics/battle_anims/sprites/088.png new file mode 100644 index 000000000..09fed7d85 Binary files /dev/null and b/graphics/battle_anims/sprites/088.png differ diff --git a/graphics/battle_anims/sprites/089.png b/graphics/battle_anims/sprites/089.png new file mode 100644 index 000000000..19155f2c4 Binary files /dev/null and b/graphics/battle_anims/sprites/089.png differ diff --git a/graphics/battle_anims/sprites/090.png b/graphics/battle_anims/sprites/090.png new file mode 100644 index 000000000..c90ff299d Binary files /dev/null and b/graphics/battle_anims/sprites/090.png differ diff --git a/graphics/battle_anims/sprites/091.png b/graphics/battle_anims/sprites/091.png new file mode 100644 index 000000000..7648de5aa Binary files /dev/null and b/graphics/battle_anims/sprites/091.png differ diff --git a/graphics/battle_anims/sprites/092.png b/graphics/battle_anims/sprites/092.png new file mode 100644 index 000000000..8d98d6eaa Binary files /dev/null and b/graphics/battle_anims/sprites/092.png differ diff --git a/graphics/battle_anims/sprites/093.png b/graphics/battle_anims/sprites/093.png new file mode 100644 index 000000000..29f9e6a50 Binary files /dev/null and b/graphics/battle_anims/sprites/093.png differ diff --git a/graphics/battle_anims/sprites/094.png b/graphics/battle_anims/sprites/094.png new file mode 100644 index 000000000..c29ff535d Binary files /dev/null and b/graphics/battle_anims/sprites/094.png differ diff --git a/graphics/battle_anims/sprites/095.png b/graphics/battle_anims/sprites/095.png new file mode 100644 index 000000000..616b02121 Binary files /dev/null and b/graphics/battle_anims/sprites/095.png differ diff --git a/graphics/battle_anims/sprites/096.png b/graphics/battle_anims/sprites/096.png new file mode 100644 index 000000000..99873ba10 Binary files /dev/null and b/graphics/battle_anims/sprites/096.png differ diff --git a/graphics/battle_anims/sprites/097.png b/graphics/battle_anims/sprites/097.png new file mode 100644 index 000000000..5366d02cf Binary files /dev/null and b/graphics/battle_anims/sprites/097.png differ diff --git a/graphics/battle_anims/sprites/098.png b/graphics/battle_anims/sprites/098.png new file mode 100644 index 000000000..33cfd705c Binary files /dev/null and b/graphics/battle_anims/sprites/098.png differ diff --git a/graphics/battle_anims/sprites/100.png b/graphics/battle_anims/sprites/100.png new file mode 100644 index 000000000..057655918 Binary files /dev/null and b/graphics/battle_anims/sprites/100.png differ diff --git a/graphics/battle_anims/sprites/101.png b/graphics/battle_anims/sprites/101.png new file mode 100644 index 000000000..f2fa227f2 Binary files /dev/null and b/graphics/battle_anims/sprites/101.png differ diff --git a/graphics/battle_anims/sprites/102.png b/graphics/battle_anims/sprites/102.png new file mode 100644 index 000000000..aa8842244 Binary files /dev/null and b/graphics/battle_anims/sprites/102.png differ diff --git a/graphics/battle_anims/sprites/103.png b/graphics/battle_anims/sprites/103.png new file mode 100644 index 000000000..0ad9c1b14 Binary files /dev/null and b/graphics/battle_anims/sprites/103.png differ diff --git a/graphics/battle_anims/sprites/104.png b/graphics/battle_anims/sprites/104.png new file mode 100644 index 000000000..7c4244da0 Binary files /dev/null and b/graphics/battle_anims/sprites/104.png differ diff --git a/graphics/battle_anims/sprites/105.png b/graphics/battle_anims/sprites/105.png new file mode 100644 index 000000000..5df0e7215 Binary files /dev/null and b/graphics/battle_anims/sprites/105.png differ diff --git a/graphics/battle_anims/sprites/106.png b/graphics/battle_anims/sprites/106.png new file mode 100644 index 000000000..82297fb00 Binary files /dev/null and b/graphics/battle_anims/sprites/106.png differ diff --git a/graphics/battle_anims/sprites/107.png b/graphics/battle_anims/sprites/107.png new file mode 100644 index 000000000..202152ab4 Binary files /dev/null and b/graphics/battle_anims/sprites/107.png differ diff --git a/graphics/battle_anims/sprites/108.png b/graphics/battle_anims/sprites/108.png new file mode 100644 index 000000000..f3f5871b4 Binary files /dev/null and b/graphics/battle_anims/sprites/108.png differ diff --git a/graphics/battle_anims/sprites/109.png b/graphics/battle_anims/sprites/109.png new file mode 100644 index 000000000..f848e388b Binary files /dev/null and b/graphics/battle_anims/sprites/109.png differ diff --git a/graphics/battle_anims/sprites/110.png b/graphics/battle_anims/sprites/110.png new file mode 100644 index 000000000..787cb58c3 Binary files /dev/null and b/graphics/battle_anims/sprites/110.png differ diff --git a/graphics/battle_anims/sprites/111.png b/graphics/battle_anims/sprites/111.png new file mode 100644 index 000000000..2bbbe8694 Binary files /dev/null and b/graphics/battle_anims/sprites/111.png differ diff --git a/graphics/battle_anims/sprites/112.png b/graphics/battle_anims/sprites/112.png new file mode 100644 index 000000000..4503849e9 Binary files /dev/null and b/graphics/battle_anims/sprites/112.png differ diff --git a/graphics/battle_anims/sprites/113.png b/graphics/battle_anims/sprites/113.png new file mode 100644 index 000000000..3a4a5b328 Binary files /dev/null and b/graphics/battle_anims/sprites/113.png differ diff --git a/graphics/battle_anims/sprites/114.png b/graphics/battle_anims/sprites/114.png new file mode 100644 index 000000000..b1bee0080 Binary files /dev/null and b/graphics/battle_anims/sprites/114.png differ diff --git a/graphics/battle_interface/unused_window2.png b/graphics/battle_interface/unused_window2.png new file mode 100644 index 000000000..32f3da0b0 Binary files /dev/null and b/graphics/battle_interface/unused_window2.png differ diff --git a/graphics/battle_interface/unused_window2bar.png b/graphics/battle_interface/unused_window2bar.png new file mode 100644 index 000000000..e3a2974e8 Binary files /dev/null and b/graphics/battle_interface/unused_window2bar.png differ diff --git a/graphics/interface/hpbar_anim.png b/graphics/interface/hpbar_anim.png new file mode 100644 index 000000000..d4e79fdae Binary files /dev/null and b/graphics/interface/hpbar_anim.png differ diff --git a/graphics/interface/numbers1.png b/graphics/interface/numbers1.png new file mode 100644 index 000000000..f15757958 Binary files /dev/null and b/graphics/interface/numbers1.png differ diff --git a/graphics/interface/numbers2.png b/graphics/interface/numbers2.png new file mode 100644 index 000000000..4ddf364bf Binary files /dev/null and b/graphics/interface/numbers2.png differ diff --git a/graphics/unknown/unknown_D0CA04.bin b/graphics/unknown/unknown_D0CA04.bin new file mode 100644 index 000000000..4b6b2b106 Binary files /dev/null and b/graphics/unknown/unknown_D0CA04.bin differ diff --git a/graphics/unknown/unknown_D0CA28.bin b/graphics/unknown/unknown_D0CA28.bin new file mode 100644 index 000000000..25fc33a73 Binary files /dev/null and b/graphics/unknown/unknown_D0CA28.bin differ diff --git a/graphics/unknown/unknown_D0CA4C.bin b/graphics/unknown/unknown_D0CA4C.bin new file mode 100644 index 000000000..5b81e0216 Binary files /dev/null and b/graphics/unknown/unknown_D0CA4C.bin differ diff --git a/graphics/unknown/unknown_D0CAC8.bin b/graphics/unknown/unknown_D0CAC8.bin new file mode 100644 index 000000000..15379a9ce Binary files /dev/null and b/graphics/unknown/unknown_D0CAC8.bin differ diff --git a/graphics/unknown/unknown_D0CD0C.bin b/graphics/unknown/unknown_D0CD0C.bin new file mode 100644 index 000000000..d42729b58 Binary files /dev/null and b/graphics/unknown/unknown_D0CD0C.bin differ diff --git a/graphics/unused/basic_frame.bin b/graphics/unused/basic_frame.bin new file mode 100644 index 000000000..8e83eb9f5 Binary files /dev/null and b/graphics/unused/basic_frame.bin differ diff --git a/graphics/unused/basic_frame.png b/graphics/unused/basic_frame.png new file mode 100644 index 000000000..132671581 Binary files /dev/null and b/graphics/unused/basic_frame.png differ diff --git a/graphics/unused/blue_frame.bin b/graphics/unused/blue_frame.bin new file mode 100644 index 000000000..d5c3b6600 Binary files /dev/null and b/graphics/unused/blue_frame.bin differ diff --git a/graphics/unused/color_frames.png b/graphics/unused/color_frames.png new file mode 100644 index 000000000..9270879eb Binary files /dev/null and b/graphics/unused/color_frames.png differ diff --git a/graphics/unused/line_sketch.png b/graphics/unused/line_sketch.png new file mode 100644 index 000000000..fdfc8d771 Binary files /dev/null and b/graphics/unused/line_sketch.png differ diff --git a/graphics/unused/line_sketch_2.bin b/graphics/unused/line_sketch_2.bin new file mode 100644 index 000000000..e68d116a3 Binary files /dev/null and b/graphics/unused/line_sketch_2.bin differ diff --git a/graphics/unused/line_sketch_2.png b/graphics/unused/line_sketch_2.png new file mode 100644 index 000000000..cb70b3d83 Binary files /dev/null and b/graphics/unused/line_sketch_2.png differ diff --git a/graphics/unused/metronome_hand_small.png b/graphics/unused/metronome_hand_small.png new file mode 100644 index 000000000..bd6cc8530 Binary files /dev/null and b/graphics/unused/metronome_hand_small.png differ diff --git a/graphics/unused/redyellowgreen_frame.bin b/graphics/unused/redyellowgreen_frame.bin new file mode 100644 index 000000000..6852998fb Binary files /dev/null and b/graphics/unused/redyellowgreen_frame.bin differ diff --git a/graphics/unused/water_splash.bin b/graphics/unused/water_splash.bin new file mode 100644 index 000000000..059347fa7 Binary files /dev/null and b/graphics/unused/water_splash.bin differ diff --git a/graphics/unused/water_splash.png b/graphics/unused/water_splash.png new file mode 100644 index 000000000..a8439a050 Binary files /dev/null and b/graphics/unused/water_splash.png differ -- cgit v1.2.3 From 291935525d456455d810686bb14f575f773d7cb2 Mon Sep 17 00:00:00 2001 From: paul Date: Sat, 13 Oct 2018 19:16:38 +0200 Subject: replace baseroms at D12AC4, D18780, D1A064 --- data/graphics.s | 557 ++++++++++++++++++++++++++- graphics/battle_anims/backgrounds/00.bin | Bin 0 -> 2048 bytes graphics/battle_anims/backgrounds/00.png | Bin 0 -> 1021 bytes graphics/battle_anims/sprites/001.pal | 19 + graphics/battle_anims/sprites/001_0.png | Bin 0 -> 178 bytes graphics/battle_anims/sprites/001_1.png | Bin 0 -> 198 bytes graphics/battle_anims/sprites/074.pal | 19 + graphics/battle_anims/sprites/074_0.png | Bin 0 -> 153 bytes graphics/battle_anims/sprites/074_1.png | Bin 0 -> 172 bytes graphics/battle_anims/sprites/076.png | Bin 0 -> 555 bytes graphics/battle_anims/sprites/077.png | Bin 0 -> 279 bytes graphics/battle_anims/sprites/116.png | Bin 0 -> 576 bytes graphics/battle_anims/sprites/117.png | Bin 0 -> 474 bytes graphics/battle_anims/sprites/118.png | Bin 0 -> 296 bytes graphics/battle_anims/sprites/119.png | Bin 0 -> 580 bytes graphics/battle_anims/sprites/120.png | Bin 0 -> 301 bytes graphics/battle_anims/sprites/121.png | Bin 0 -> 163 bytes graphics/battle_anims/sprites/122.png | Bin 0 -> 293 bytes graphics/battle_anims/sprites/123.png | Bin 0 -> 274 bytes graphics/battle_anims/sprites/124.png | Bin 0 -> 594 bytes graphics/battle_anims/sprites/125.png | Bin 0 -> 287 bytes graphics/battle_anims/sprites/126.png | Bin 0 -> 200 bytes graphics/battle_anims/sprites/127.png | Bin 0 -> 441 bytes graphics/battle_anims/sprites/128.png | Bin 0 -> 500 bytes graphics/battle_anims/sprites/129.png | Bin 0 -> 205 bytes graphics/battle_anims/sprites/130.png | Bin 0 -> 776 bytes graphics/battle_anims/sprites/131.png | Bin 0 -> 354 bytes graphics/battle_anims/sprites/132.png | Bin 0 -> 291 bytes graphics/battle_anims/sprites/133.png | Bin 0 -> 207 bytes graphics/battle_anims/sprites/134.png | Bin 0 -> 248 bytes graphics/battle_anims/sprites/135.png | Bin 0 -> 243 bytes graphics/battle_anims/sprites/136.png | Bin 0 -> 150 bytes graphics/battle_anims/sprites/137.png | Bin 0 -> 377 bytes graphics/battle_anims/sprites/138.png | Bin 0 -> 234 bytes graphics/battle_anims/sprites/139.png | Bin 0 -> 299 bytes graphics/battle_anims/sprites/140.png | Bin 0 -> 224 bytes graphics/battle_anims/sprites/141.pal | 19 + graphics/battle_anims/sprites/141_0.png | Bin 0 -> 180 bytes graphics/battle_anims/sprites/141_1.png | Bin 0 -> 170 bytes graphics/battle_anims/sprites/141_2.png | Bin 0 -> 184 bytes graphics/battle_anims/sprites/141_3.png | Bin 0 -> 168 bytes graphics/battle_anims/sprites/141_4.png | Bin 0 -> 155 bytes graphics/battle_anims/sprites/142.png | Bin 0 -> 191 bytes graphics/battle_anims/sprites/144.png | Bin 0 -> 191 bytes graphics/battle_anims/sprites/145.png | Bin 0 -> 270 bytes graphics/battle_anims/sprites/147.png | Bin 0 -> 311 bytes graphics/battle_anims/sprites/148.png | Bin 0 -> 259 bytes graphics/battle_anims/sprites/149.png | Bin 0 -> 233 bytes graphics/battle_anims/sprites/150.png | Bin 0 -> 259 bytes graphics/battle_anims/sprites/151.png | Bin 0 -> 239 bytes graphics/battle_anims/sprites/153.png | Bin 0 -> 183 bytes graphics/battle_anims/sprites/154.png | Bin 0 -> 225 bytes graphics/battle_anims/sprites/155.png | Bin 0 -> 255 bytes graphics/battle_anims/sprites/156.png | Bin 0 -> 332 bytes graphics/battle_anims/sprites/157.png | Bin 0 -> 184 bytes graphics/battle_anims/sprites/158.png | Bin 0 -> 251 bytes graphics/battle_anims/sprites/159.pal | 19 + graphics/battle_anims/sprites/159_0.png | Bin 0 -> 200 bytes graphics/battle_anims/sprites/159_1.png | Bin 0 -> 147 bytes graphics/battle_anims/sprites/160.png | Bin 0 -> 219 bytes graphics/battle_anims/sprites/162.png | Bin 0 -> 179 bytes graphics/battle_anims/sprites/163.png | Bin 0 -> 188 bytes graphics/battle_anims/sprites/164.pal | 19 + graphics/battle_anims/sprites/165.pal | 19 + graphics/battle_anims/sprites/166.png | Bin 0 -> 401 bytes graphics/battle_anims/sprites/167.pal | 19 + graphics/battle_anims/sprites/168.pal | 19 + graphics/battle_anims/sprites/169.pal | 19 + graphics/battle_anims/sprites/170.pal | 19 + graphics/battle_anims/sprites/171.png | Bin 0 -> 184 bytes graphics/battle_anims/sprites/172.pal | 19 + graphics/battle_anims/sprites/173.png | Bin 0 -> 212 bytes graphics/battle_anims/sprites/259.pal | 19 + graphics/battle_anims/sprites/288.pal | 19 + graphics/battle_anims/sprites/particles.png | Bin 0 -> 277 bytes graphics/battle_interface/unused_window3.png | Bin 0 -> 235 bytes graphics/battle_interface/unused_window4.png | Bin 0 -> 362 bytes graphics/contest/audience.png | Bin 0 -> 2086 bytes graphics/contest/faces.png | Bin 0 -> 1028 bytes graphics/contest/heart.png | Bin 0 -> 873 bytes graphics/contest/judge.png | Bin 0 -> 593 bytes graphics/contest/judge_symbols.png | Bin 0 -> 401 bytes graphics/contest/misc_2.pal | 259 +++++++++++++ graphics/contest/misc_2_tilemap_1.bin | Bin 0 -> 2048 bytes graphics/contest/misc_2_tilemap_2.bin | Bin 0 -> 2048 bytes graphics/contest/misc_2_tilemap_3.bin | 1 + graphics/unknown/party_menu_hpbar.png | Bin 136 -> 0 bytes graphics/unknown/unknown_D15BE8.bin | Bin 0 -> 4096 bytes graphics/unknown/unknown_D172A8.bin | Bin 0 -> 4096 bytes graphics/unknown/unknown_D17548.bin | Bin 0 -> 2048 bytes graphics/unknown/unknown_D17654.bin | Bin 0 -> 8192 bytes graphics/unknown/unknown_D17AB8.bin | Bin 0 -> 2048 bytes graphics/unknown/unknown_D196E4.png | Bin 0 -> 255 bytes graphics/unknown/unknown_D1BE74.bin | Bin 0 -> 2048 bytes graphics/unknown/unknown_D1BE74.png | Bin 0 -> 159 bytes graphics/unused/numbers.png | Bin 0 -> 302 bytes graphics/unused/old_beatup.png | Bin 0 -> 220 bytes graphics/unused/old_contest.bin | Bin 0 -> 2048 bytes graphics/unused/old_contest.pal | 259 +++++++++++++ graphics/unused/old_contest_2.bin | Bin 0 -> 2048 bytes graphics/unused/old_contest_2.pal | 259 +++++++++++++ graphics/unused/old_contest_2_1.png | Bin 0 -> 1829 bytes graphics/unused/old_contest_2_2.png | Bin 0 -> 1274 bytes graphics/unused/old_contest_classes.png | Bin 0 -> 292 bytes graphics/unused/old_contest_floor.png | Bin 0 -> 614 bytes graphics/unused/old_contest_frame_1.png | Bin 0 -> 359 bytes graphics/unused/old_contest_frame_2.png | Bin 0 -> 259 bytes graphics/unused/old_contest_meter.png | Bin 0 -> 212 bytes graphics/unused/old_contest_numbers.png | Bin 0 -> 324 bytes graphics/unused/old_contest_symbols.png | Bin 0 -> 237 bytes graphics_file_rules.mk | 2 +- 111 files changed, 1580 insertions(+), 4 deletions(-) create mode 100644 graphics/battle_anims/backgrounds/00.bin create mode 100644 graphics/battle_anims/backgrounds/00.png create mode 100644 graphics/battle_anims/sprites/001.pal create mode 100644 graphics/battle_anims/sprites/001_0.png create mode 100644 graphics/battle_anims/sprites/001_1.png create mode 100644 graphics/battle_anims/sprites/074.pal create mode 100644 graphics/battle_anims/sprites/074_0.png create mode 100644 graphics/battle_anims/sprites/074_1.png create mode 100644 graphics/battle_anims/sprites/076.png create mode 100644 graphics/battle_anims/sprites/077.png create mode 100644 graphics/battle_anims/sprites/116.png create mode 100644 graphics/battle_anims/sprites/117.png create mode 100644 graphics/battle_anims/sprites/118.png create mode 100644 graphics/battle_anims/sprites/119.png create mode 100644 graphics/battle_anims/sprites/120.png create mode 100644 graphics/battle_anims/sprites/121.png create mode 100644 graphics/battle_anims/sprites/122.png create mode 100644 graphics/battle_anims/sprites/123.png create mode 100644 graphics/battle_anims/sprites/124.png create mode 100644 graphics/battle_anims/sprites/125.png create mode 100644 graphics/battle_anims/sprites/126.png create mode 100644 graphics/battle_anims/sprites/127.png create mode 100644 graphics/battle_anims/sprites/128.png create mode 100644 graphics/battle_anims/sprites/129.png create mode 100644 graphics/battle_anims/sprites/130.png create mode 100644 graphics/battle_anims/sprites/131.png create mode 100644 graphics/battle_anims/sprites/132.png create mode 100644 graphics/battle_anims/sprites/133.png create mode 100644 graphics/battle_anims/sprites/134.png create mode 100644 graphics/battle_anims/sprites/135.png create mode 100644 graphics/battle_anims/sprites/136.png create mode 100644 graphics/battle_anims/sprites/137.png create mode 100644 graphics/battle_anims/sprites/138.png create mode 100644 graphics/battle_anims/sprites/139.png create mode 100644 graphics/battle_anims/sprites/140.png create mode 100644 graphics/battle_anims/sprites/141.pal create mode 100644 graphics/battle_anims/sprites/141_0.png create mode 100644 graphics/battle_anims/sprites/141_1.png create mode 100644 graphics/battle_anims/sprites/141_2.png create mode 100644 graphics/battle_anims/sprites/141_3.png create mode 100644 graphics/battle_anims/sprites/141_4.png create mode 100644 graphics/battle_anims/sprites/142.png create mode 100644 graphics/battle_anims/sprites/144.png create mode 100644 graphics/battle_anims/sprites/145.png create mode 100644 graphics/battle_anims/sprites/147.png create mode 100644 graphics/battle_anims/sprites/148.png create mode 100644 graphics/battle_anims/sprites/149.png create mode 100644 graphics/battle_anims/sprites/150.png create mode 100644 graphics/battle_anims/sprites/151.png create mode 100644 graphics/battle_anims/sprites/153.png create mode 100644 graphics/battle_anims/sprites/154.png create mode 100644 graphics/battle_anims/sprites/155.png create mode 100644 graphics/battle_anims/sprites/156.png create mode 100644 graphics/battle_anims/sprites/157.png create mode 100644 graphics/battle_anims/sprites/158.png create mode 100644 graphics/battle_anims/sprites/159.pal create mode 100644 graphics/battle_anims/sprites/159_0.png create mode 100644 graphics/battle_anims/sprites/159_1.png create mode 100644 graphics/battle_anims/sprites/160.png create mode 100644 graphics/battle_anims/sprites/162.png create mode 100644 graphics/battle_anims/sprites/163.png create mode 100644 graphics/battle_anims/sprites/164.pal create mode 100644 graphics/battle_anims/sprites/165.pal create mode 100644 graphics/battle_anims/sprites/166.png create mode 100644 graphics/battle_anims/sprites/167.pal create mode 100644 graphics/battle_anims/sprites/168.pal create mode 100644 graphics/battle_anims/sprites/169.pal create mode 100644 graphics/battle_anims/sprites/170.pal create mode 100644 graphics/battle_anims/sprites/171.png create mode 100644 graphics/battle_anims/sprites/172.pal create mode 100644 graphics/battle_anims/sprites/173.png create mode 100644 graphics/battle_anims/sprites/259.pal create mode 100644 graphics/battle_anims/sprites/288.pal create mode 100644 graphics/battle_anims/sprites/particles.png create mode 100644 graphics/battle_interface/unused_window3.png create mode 100644 graphics/battle_interface/unused_window4.png create mode 100644 graphics/contest/audience.png create mode 100644 graphics/contest/faces.png create mode 100644 graphics/contest/heart.png create mode 100644 graphics/contest/judge.png create mode 100644 graphics/contest/judge_symbols.png create mode 100644 graphics/contest/misc_2.pal create mode 100644 graphics/contest/misc_2_tilemap_1.bin create mode 100644 graphics/contest/misc_2_tilemap_2.bin create mode 100644 graphics/contest/misc_2_tilemap_3.bin delete mode 100644 graphics/unknown/party_menu_hpbar.png create mode 100644 graphics/unknown/unknown_D15BE8.bin create mode 100644 graphics/unknown/unknown_D172A8.bin create mode 100644 graphics/unknown/unknown_D17548.bin create mode 100644 graphics/unknown/unknown_D17654.bin create mode 100644 graphics/unknown/unknown_D17AB8.bin create mode 100644 graphics/unknown/unknown_D196E4.png create mode 100644 graphics/unknown/unknown_D1BE74.bin create mode 100644 graphics/unknown/unknown_D1BE74.png create mode 100644 graphics/unused/numbers.png create mode 100644 graphics/unused/old_beatup.png create mode 100644 graphics/unused/old_contest.bin create mode 100644 graphics/unused/old_contest.pal create mode 100644 graphics/unused/old_contest_2.bin create mode 100644 graphics/unused/old_contest_2.pal create mode 100644 graphics/unused/old_contest_2_1.png create mode 100644 graphics/unused/old_contest_2_2.png create mode 100644 graphics/unused/old_contest_classes.png create mode 100644 graphics/unused/old_contest_floor.png create mode 100644 graphics/unused/old_contest_frame_1.png create mode 100644 graphics/unused/old_contest_frame_2.png create mode 100644 graphics/unused/old_contest_meter.png create mode 100644 graphics/unused/old_contest_numbers.png create mode 100644 graphics/unused/old_contest_symbols.png diff --git a/data/graphics.s b/data/graphics.s index 47622e46f..d821ff389 100644 --- a/data/graphics.s +++ b/data/graphics.s @@ -537,8 +537,6 @@ gFile_graphics_battle_interface_unused_window_sheet:: @ 8D08EF4 .align 2 gFile_graphics_battle_interface_unused_window_palette:: @ 8D093B0 .incbin "graphics/battle_interface/unused_window.gbapal.lz" - -@ ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; .align 2 gFile_graphics_interface_hp_numbers:: @ 8D093D8 @@ -1065,8 +1063,561 @@ gUnknown_8D11B84:: @ 8D11B84 .incbin "baserom.gba", 0xD11B84, 0x40 gUnknown_8D11BC4:: @ 8D11BC4 - .incbin "baserom.gba", 0xD11BC4, 0xB660 + .incbin "baserom.gba", 0xD11BC4, 0xF00 + + .align 2 +gFile_graphics_battle_interface_unused_window3_sheet:: @ 8D12AC4 + .incbin "graphics/battle_interface/unused_window3.4bpp.lz" + + .align 2 +gFile_graphics_battle_interface_unused_window4_sheet:: @ 8D12C00 + .incbin "graphics/battle_interface/unused_window4.4bpp.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_116_sheet:: @ 8D12EB0 + .incbin "graphics/battle_anims/sprites/116.4bpp.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_116_palette:: @ 8D1315C + .incbin "graphics/battle_anims/sprites/116.gbapal.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_117_sheet:: @ 8D13184 + .incbin "graphics/battle_anims/sprites/117.4bpp.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_117_palette:: @ 8D133C0 + .incbin "graphics/battle_anims/sprites/117.gbapal.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_118_sheet:: @ 8D133DC + .incbin "graphics/battle_anims/sprites/118.4bpp.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_118_palette:: @ 8D13574 + .incbin "graphics/battle_anims/sprites/118.gbapal.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_119_sheet:: @ 8D13590 + .incbin "graphics/battle_anims/sprites/119.4bpp.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_119_palette:: @ 8D13820 + .incbin "graphics/battle_anims/sprites/119.gbapal.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_120_sheet:: @ 8D13848 + .incbin "graphics/battle_anims/sprites/120.4bpp.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_120_palette:: @ 8D1393C + .incbin "graphics/battle_anims/sprites/120.gbapal.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_121_sheet:: @ 8D13964 + .incbin "graphics/battle_anims/sprites/121.4bpp.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_121_palette:: @ 8D13990 + .incbin "graphics/battle_anims/sprites/121.gbapal.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_122_sheet:: @ 8D139B4 + .incbin "graphics/battle_anims/sprites/122.4bpp.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_122_palette:: @ 8D13AB0 + .incbin "graphics/battle_anims/sprites/122.gbapal.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_123_sheet:: @ 8D13ACC + .incbin "graphics/battle_anims/sprites/123.4bpp.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_124_sheet:: @ 8D13C08 + .incbin "graphics/battle_anims/sprites/124.4bpp.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_124_palette:: @ 8D13EA0 + .incbin "graphics/battle_anims/sprites/124.gbapal.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_125_sheet:: @ 8D13EC8 + .incbin "graphics/battle_anims/sprites/125.4bpp.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_125_palette:: @ 8D13FB4 + .incbin "graphics/battle_anims/sprites/125.gbapal.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_126_sheet:: @ 8D13FDC + .incbin "graphics/battle_anims/sprites/126.4bpp.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_126_palette:: @ 8D14044 + .incbin "graphics/battle_anims/sprites/126.gbapal.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_127_sheet:: @ 8D14064 + .incbin "graphics/battle_anims/sprites/127.4bpp.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_127_palette:: @ 8D14204 + .incbin "graphics/battle_anims/sprites/127.gbapal.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_128_sheet:: @ 8D14228 + .incbin "graphics/battle_anims/sprites/128.4bpp.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_128_palette:: @ 8D14494 + .incbin "graphics/battle_anims/sprites/128.gbapal.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_129_sheet:: @ 8D144B4 + .incbin "graphics/battle_anims/sprites/129.4bpp.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_130_sheet:: @ 8D14518 + .incbin "graphics/battle_anims/sprites/130.4bpp.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_130_palette:: @ 8D148E8 + .incbin "graphics/battle_anims/sprites/130.gbapal.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_131_sheet:: @ 8D14910 + .incbin "graphics/battle_anims/sprites/131.4bpp.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_132_sheet:: @ 8D14A80 + .incbin "graphics/battle_anims/sprites/132.4bpp.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_132_palette:: @ 8D14B80 + .incbin "graphics/battle_anims/sprites/132.gbapal.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_133_sheet:: @ 8D14BA0 + .incbin "graphics/battle_anims/sprites/133.4bpp.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_133_palette:: @ 8D14C1C + .incbin "graphics/battle_anims/sprites/133.gbapal.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_134_sheet:: @ 8D14C44 + .incbin "graphics/battle_anims/sprites/134.4bpp.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_076_sheet:: @ 8D14D14 + .incbin "graphics/battle_anims/sprites/076.4bpp.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_076_palette:: @ 8D14F50 + .incbin "graphics/battle_anims/sprites/076.gbapal.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_077_sheet:: @ 8D14F78 + .incbin "graphics/battle_anims/sprites/077.4bpp.lz" + + .align 2 +gFile_graphics_unused_old_contest_sheet:: @ 8D1504C + .incbin "graphics/unused/old_contest.4bpp.lz" + + .align 2 +gFile_graphics_unused_old_contest_palette:: @ 8D15960 + .incbin "graphics/unused/old_contest.gbapal.lz" + + .align 2 +gFile_graphics_unused_old_contest_tilemap:: @ 8D15A64 + .incbin "graphics/unused/old_contest.bin.lz" + + .align 2 +gFile_graphics_unknown_unknown_D15BE8_tilemap:: @ 8D15BE8 + .incbin "graphics/unknown/unknown_D15BE8.bin.lz" + + .align 2 +gFile_graphics_unused_numbers_sheet:: @ 8D15EA8 + .incbin "graphics/unused/numbers.4bpp.lz" @from ruby + + .align 2 +gFile_graphics_unused_numbers_palette:: @ 8D15F98 + .incbin "graphics/unused/numbers.gbapal.lz" @from ruby + + .align 2 +gFile_graphics_unused_old_contest_2_sheet:: @ 8D15FB8 + .incbin "graphics/unused/old_contest_2.4bpp.lz" + + .align 2 +gFile_graphics_unused_old_contest_2_palette:: @ 8D16FC8 + .incbin "graphics/unused/old_contest_2.gbapal.lz" + + .align 2 +gFile_graphics_unused_old_contest_2_tilemap:: @ 8D170E0 + .incbin "graphics/unused/old_contest_2.bin.lz" + + .align 2 +gFile_graphics_unknown_unknown_D172A8_tilemap:: @ 8D172A8 + .incbin "graphics/unknown/unknown_D172A8.bin.lz" + + .align 2 +gFile_graphics_unknown_unknown_D17548_tilemap:: @ 8D17548 + .incbin "graphics/unknown/unknown_D17548.bin.lz" + + .align 2 +gFile_graphics_unknown_unknown_D17654_tilemap:: @ 8D17654 + .incbin "graphics/unknown/unknown_D17654.bin.lz" + + .align 2 +gFile_graphics_unknown_unknown_D17AB8_tilemap:: @ 8D17AB8 + .incbin "graphics/unknown/unknown_D17AB8.bin.lz" + + .align 2 +gUnknown_8D17BE8:: @ 8D17BE8 + .incbin "baserom.gba", 0xD17BE8, 0xB98 + + .align 2 +gFile_graphics_contest_audience_sheet:: @ 8D18780 + .incbin "graphics/contest/audience.4bpp.lz" + + .align 2 +gFile_graphics_contest_faces_sheet:: @ 8D193DC + .incbin "graphics/contest/faces.4bpp.lz" + + .align 2 +gFile_graphics_contest_judge_symbols_sheet:: @ 8D194F8 + .incbin "graphics/contest/judge_symbols.4bpp.lz" + + .align 2 +gFile_graphics_contest_judge_symbols_palette:: @ 8D1969C + .incbin "graphics/contest/judge_symbols.gbapal.lz" + + .align 2 +gFile_graphics_contest_heart:: @ 8D196C4 + .incbin "graphics/contest/heart.4bpp" + + .align 2 +gFile_graphics_unknown_unknown_D196E4_sheet:: @ 8D196E4 + .incbin "graphics/unknown/unknown_D196E4.4bpp.lz" + + .align 2 +gFile_graphics_unknown_unknown_D196E4_palette:: @ 8D197D4 + .incbin "graphics/unknown/unknown_D196E4.gbapal.lz" + + .align 2 +gUnknown_8D197FC:: @ 8D197FC + .incbin "baserom.gba", 0xD197FC, 0x868 + + .align 2 +gFile_graphics_contest_misc_2_tilemap_1_tilemap:: @ 8D1A064 + .incbin "graphics/contest/misc_2_tilemap_1.bin.lz" + + .align 2 +gFile_graphics_contest_misc_2_tilemap_2_tilemap:: @ 8D1A178 + .incbin "graphics/contest/misc_2_tilemap_2.bin.lz" + + .align 2 +gFile_graphics_contest_misc_2_tilemap_3_tilemap:: @ 8D1A2A4 + .incbin "graphics/contest/misc_2_tilemap_3.bin.lz" + + .align 2 +gFile_graphics_contest_misc_2_palette:: @ 8D1A42C + .incbin "graphics/contest/misc_2.gbapal.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_135_sheet:: @ 8D1A518 + .incbin "graphics/battle_anims/sprites/135.4bpp.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_135_palette:: @ 8D1A5F0 + .incbin "graphics/battle_anims/sprites/135.gbapal.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_particles_sheet:: @ 8D1A608 + .incbin "graphics/battle_anims/sprites/particles.4bpp.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_136_sheet:: @ 8D1A6B8 + .incbin "graphics/battle_anims/sprites/136.4bpp.lz" + .align 2 +gFile_graphics_battle_anims_sprites_136_palette:: @ 8D1A6DC + .incbin "graphics/battle_anims/sprites/136.gbapal.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_137_sheet:: @ 8D1A704 + .incbin "graphics/battle_anims/sprites/137.4bpp.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_139_sheet:: @ 8D1A908 + .incbin "graphics/battle_anims/sprites/139.4bpp.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_139_palette:: @ 8D1AAF8 + .incbin "graphics/battle_anims/sprites/139.gbapal.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_145_sheet:: @ 8D1AB18 + .incbin "graphics/battle_anims/sprites/145.4bpp.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_138_sheet:: @ 8D1ACB8 + .incbin "graphics/battle_anims/sprites/138.4bpp.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_140_sheet:: @ 8D1AE04 + .incbin "graphics/battle_anims/sprites/140.4bpp.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_140_palette:: @ 8D1AE84 + .incbin "graphics/battle_anims/sprites/140.gbapal.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_141_sheet:: @ 8D1AEA4 + .incbin "graphics/battle_anims/sprites/141.4bpp.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_141_palette:: @ 8D1AFAC + .incbin "graphics/battle_anims/sprites/141.gbapal.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_142_sheet:: @ 8D1AFCC + .incbin "graphics/battle_anims/sprites/142.4bpp.lz" + + .align 2 +gFile_graphics_unused_old_beatup_sheet:: @ 8D1B02C + .incbin "graphics/unused/old_beatup.4bpp.lz" + + .align 2 +gFile_graphics_unused_old_beatup_palette:: @ 8D1B0C8 + .incbin "graphics/unused/old_beatup.gbapal.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_147_sheet:: @ 8D1B0E4 + .incbin "graphics/battle_anims/sprites/147.4bpp.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_147_palette:: @ 8D1B1F8 + .incbin "graphics/battle_anims/sprites/147.gbapal.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_149_sheet:: @ 8D1B220 + .incbin "graphics/battle_anims/sprites/149.4bpp.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_148_sheet:: @ 8D1B2F0 + .incbin "graphics/battle_anims/sprites/148.4bpp.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_148_palette:: @ 8D1B3D4 + .incbin "graphics/battle_anims/sprites/148.gbapal.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_259_palette:: @ 8D1B3F4 + .incbin "graphics/battle_anims/sprites/259.gbapal.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_074_sheet:: @ 8D1B414 + .incbin "graphics/battle_anims/sprites/074.4bpp.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_074_palette:: @ 8D1B47C + .incbin "graphics/battle_anims/sprites/074.gbapal.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_150_sheet:: @ 8D1B4A0 + .incbin "graphics/battle_anims/sprites/150.4bpp.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_150_palette:: @ 8D1B574 + .incbin "graphics/battle_anims/sprites/150.gbapal.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_151_sheet:: @ 8D1B590 + .incbin "graphics/battle_anims/sprites/151.4bpp.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_153_sheet:: @ 8D1B688 + .incbin "graphics/battle_anims/sprites/153.4bpp.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_153_palette:: @ 8D1B6F4 + .incbin "graphics/battle_anims/sprites/153.gbapal.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_154_sheet:: @ 8D1B70C + .incbin "graphics/battle_anims/sprites/154.4bpp.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_154_palette:: @ 8D1B7B8 + .incbin "graphics/battle_anims/sprites/154.gbapal.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_155_sheet:: @ 8D1B7D8 + .incbin "graphics/battle_anims/sprites/155.4bpp.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_155_palette:: @ 8D1B8A0 + .incbin "graphics/battle_anims/sprites/155.gbapal.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_156_sheet:: @ 8D1B8C0 + .incbin "graphics/battle_anims/sprites/156.4bpp.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_156_palette:: @ 8D1BAD8 + .incbin "graphics/battle_anims/sprites/156.gbapal.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_157_sheet:: @ 8D1BB00 + .incbin "graphics/battle_anims/sprites/157.4bpp.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_157_palette:: @ 8D1BB64 + .incbin "graphics/battle_anims/sprites/157.gbapal.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_158_sheet:: @ 8D1BB7C + .incbin "graphics/battle_anims/sprites/158.4bpp.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_158_palette:: @ 8D1BC44 + .incbin "graphics/battle_anims/sprites/158.gbapal.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_159_sheet:: @ 8D1BC68 + .incbin "graphics/battle_anims/sprites/159.4bpp.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_159_palette:: @ 8D1BCE4 + .incbin "graphics/battle_anims/sprites/159.gbapal.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_160_sheet:: @ 8D1BD0C + .incbin "graphics/battle_anims/sprites/160.4bpp.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_160_palette:: @ 8D1BDB4 + .incbin "graphics/battle_anims/sprites/160.gbapal.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_144_sheet:: @ 8D1BDDC + .incbin "graphics/battle_anims/sprites/144.4bpp.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_144_palette:: @ 8D1BE54 + .incbin "graphics/battle_anims/sprites/144.gbapal.lz" + + .align 2 +gFile_graphics_unknown_unknown_D1BE74_sheet:: @ 8D1BE74 + .incbin "graphics/unknown/unknown_D1BE74.4bpp.lz" + + .align 2 +gFile_graphics_unknown_unknown_D1BE74_palette:: @ 8D1BE9C + .incbin "graphics/unknown/unknown_D1BE74.gbapal.lz" + + .align 2 +gFile_graphics_unknown_unknown_D1BE74_tilemap:: @ 8D1BEB4 + .incbin "graphics/unknown/unknown_D1BE74.bin.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_162_sheet:: @ 8D1BFB8 + .incbin "graphics/battle_anims/sprites/162.4bpp.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_162_palette:: @ 8D1C03C + .incbin "graphics/battle_anims/sprites/162.gbapal.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_163_sheet:: @ 8D1C05C + .incbin "graphics/battle_anims/sprites/163.4bpp.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_163_palette:: @ 8D1C0BC + .incbin "graphics/battle_anims/sprites/163.gbapal.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_288_palette:: @ 8D1C0D4 + .incbin "graphics/battle_anims/sprites/288.gbapal.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_164_palette:: @ 8D1C0EC + .incbin "graphics/battle_anims/sprites/164.gbapal.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_165_palette:: @ 8D1C104 + .incbin "graphics/battle_anims/sprites/165.gbapal.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_166_sheet:: @ 8D1C11C + .incbin "graphics/battle_anims/sprites/166.4bpp.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_166_palette:: @ 8D1C428 + .incbin "graphics/battle_anims/sprites/166.gbapal.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_167_palette:: @ 8D1C448 + .incbin "graphics/battle_anims/sprites/167.gbapal.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_168_palette:: @ 8D1C468 + .incbin "graphics/battle_anims/sprites/168.gbapal.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_169_palette:: @ 8D1C488 + .incbin "graphics/battle_anims/sprites/169.gbapal.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_170_palette:: @ 8D1C4A8 + .incbin "graphics/battle_anims/sprites/170.gbapal.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_171_sheet:: @ 8D1C4C8 + .incbin "graphics/battle_anims/sprites/171.4bpp.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_171_palette:: @ 8D1C514 + .incbin "graphics/battle_anims/sprites/171.gbapal.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_172_palette:: @ 8D1C53C + .incbin "graphics/battle_anims/sprites/172.gbapal.lz" + + .align 2 +gFile_graphics_contest_judge_sheet:: @ 8D1C55C + .incbin "graphics/contest/judge.4bpp.lz" + + .align 2 +gFile_graphics_contest_judge_palette:: @ 8D1C830 + .incbin "graphics/contest/judge.gbapal.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_001_sheet:: @ 8D1C858 + .incbin "graphics/battle_anims/sprites/001.4bpp.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_001_palette:: @ 8D1C90C + .incbin "graphics/battle_anims/sprites/001.gbapal.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_173_sheet:: @ 8D1C934 + .incbin "graphics/battle_anims/sprites/173.4bpp.lz" + + .align 2 +gFile_graphics_battle_anims_backgrounds_00_sheet:: @ 8D1C9BC + .incbin "graphics/battle_anims/backgrounds/00.4bpp.lz" + + .align 2 +gFile_graphics_battle_anims_backgrounds_00_palette:: @ 8D1CFB4 + .incbin "graphics/battle_anims/backgrounds/00.gbapal.lz" + + .align 2 +gFile_graphics_battle_anims_backgrounds_00_tilemap:: @ 8D1CFD4 + .incbin "graphics/battle_anims/backgrounds/00.bin.lz" + + .align 2 gUnknown_8D1D224:: @ 8D1D224 .incbin "baserom.gba", 0xD1D224, 0x13C diff --git a/graphics/battle_anims/backgrounds/00.bin b/graphics/battle_anims/backgrounds/00.bin new file mode 100644 index 000000000..dc70b2cf8 Binary files /dev/null and b/graphics/battle_anims/backgrounds/00.bin differ diff --git a/graphics/battle_anims/backgrounds/00.png b/graphics/battle_anims/backgrounds/00.png new file mode 100644 index 000000000..f88de79c3 Binary files /dev/null and b/graphics/battle_anims/backgrounds/00.png differ diff --git a/graphics/battle_anims/sprites/001.pal b/graphics/battle_anims/sprites/001.pal new file mode 100644 index 000000000..81af310e1 --- /dev/null +++ b/graphics/battle_anims/sprites/001.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +164 148 139 +255 139 0 +255 156 8 +255 172 24 +255 197 41 +255 213 57 +255 230 74 +255 255 90 +255 255 255 +255 74 106 +255 115 148 +255 164 197 +255 205 238 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/battle_anims/sprites/001_0.png b/graphics/battle_anims/sprites/001_0.png new file mode 100644 index 000000000..77c454dcb Binary files /dev/null and b/graphics/battle_anims/sprites/001_0.png differ diff --git a/graphics/battle_anims/sprites/001_1.png b/graphics/battle_anims/sprites/001_1.png new file mode 100644 index 000000000..2cfd6bd0b Binary files /dev/null and b/graphics/battle_anims/sprites/001_1.png differ diff --git a/graphics/battle_anims/sprites/074.pal b/graphics/battle_anims/sprites/074.pal new file mode 100644 index 000000000..f8976f672 --- /dev/null +++ b/graphics/battle_anims/sprites/074.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +164 148 139 +115 106 98 +82 82 82 +164 164 164 +255 255 255 +197 180 115 +164 148 82 +131 115 57 +98 82 24 +74 57 0 +205 205 197 +131 131 131 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/battle_anims/sprites/074_0.png b/graphics/battle_anims/sprites/074_0.png new file mode 100644 index 000000000..81af47193 Binary files /dev/null and b/graphics/battle_anims/sprites/074_0.png differ diff --git a/graphics/battle_anims/sprites/074_1.png b/graphics/battle_anims/sprites/074_1.png new file mode 100644 index 000000000..827ec5d48 Binary files /dev/null and b/graphics/battle_anims/sprites/074_1.png differ diff --git a/graphics/battle_anims/sprites/076.png b/graphics/battle_anims/sprites/076.png new file mode 100644 index 000000000..4d6d9d0c1 Binary files /dev/null and b/graphics/battle_anims/sprites/076.png differ diff --git a/graphics/battle_anims/sprites/077.png b/graphics/battle_anims/sprites/077.png new file mode 100644 index 000000000..c2cc22be3 Binary files /dev/null and b/graphics/battle_anims/sprites/077.png differ diff --git a/graphics/battle_anims/sprites/116.png b/graphics/battle_anims/sprites/116.png new file mode 100644 index 000000000..b9e0df20e Binary files /dev/null and b/graphics/battle_anims/sprites/116.png differ diff --git a/graphics/battle_anims/sprites/117.png b/graphics/battle_anims/sprites/117.png new file mode 100644 index 000000000..f2c7e1b41 Binary files /dev/null and b/graphics/battle_anims/sprites/117.png differ diff --git a/graphics/battle_anims/sprites/118.png b/graphics/battle_anims/sprites/118.png new file mode 100644 index 000000000..6e2075e51 Binary files /dev/null and b/graphics/battle_anims/sprites/118.png differ diff --git a/graphics/battle_anims/sprites/119.png b/graphics/battle_anims/sprites/119.png new file mode 100644 index 000000000..93e03bb00 Binary files /dev/null and b/graphics/battle_anims/sprites/119.png differ diff --git a/graphics/battle_anims/sprites/120.png b/graphics/battle_anims/sprites/120.png new file mode 100644 index 000000000..58e15e018 Binary files /dev/null and b/graphics/battle_anims/sprites/120.png differ diff --git a/graphics/battle_anims/sprites/121.png b/graphics/battle_anims/sprites/121.png new file mode 100644 index 000000000..c4fc11f86 Binary files /dev/null and b/graphics/battle_anims/sprites/121.png differ diff --git a/graphics/battle_anims/sprites/122.png b/graphics/battle_anims/sprites/122.png new file mode 100644 index 000000000..0a1da6c03 Binary files /dev/null and b/graphics/battle_anims/sprites/122.png differ diff --git a/graphics/battle_anims/sprites/123.png b/graphics/battle_anims/sprites/123.png new file mode 100644 index 000000000..c1d71a8b7 Binary files /dev/null and b/graphics/battle_anims/sprites/123.png differ diff --git a/graphics/battle_anims/sprites/124.png b/graphics/battle_anims/sprites/124.png new file mode 100644 index 000000000..343705a07 Binary files /dev/null and b/graphics/battle_anims/sprites/124.png differ diff --git a/graphics/battle_anims/sprites/125.png b/graphics/battle_anims/sprites/125.png new file mode 100644 index 000000000..2bc2c212f Binary files /dev/null and b/graphics/battle_anims/sprites/125.png differ diff --git a/graphics/battle_anims/sprites/126.png b/graphics/battle_anims/sprites/126.png new file mode 100644 index 000000000..9f1962902 Binary files /dev/null and b/graphics/battle_anims/sprites/126.png differ diff --git a/graphics/battle_anims/sprites/127.png b/graphics/battle_anims/sprites/127.png new file mode 100644 index 000000000..55706275c Binary files /dev/null and b/graphics/battle_anims/sprites/127.png differ diff --git a/graphics/battle_anims/sprites/128.png b/graphics/battle_anims/sprites/128.png new file mode 100644 index 000000000..fb9e61980 Binary files /dev/null and b/graphics/battle_anims/sprites/128.png differ diff --git a/graphics/battle_anims/sprites/129.png b/graphics/battle_anims/sprites/129.png new file mode 100644 index 000000000..c29a44c06 Binary files /dev/null and b/graphics/battle_anims/sprites/129.png differ diff --git a/graphics/battle_anims/sprites/130.png b/graphics/battle_anims/sprites/130.png new file mode 100644 index 000000000..4a753e6d5 Binary files /dev/null and b/graphics/battle_anims/sprites/130.png differ diff --git a/graphics/battle_anims/sprites/131.png b/graphics/battle_anims/sprites/131.png new file mode 100644 index 000000000..4683e161f Binary files /dev/null and b/graphics/battle_anims/sprites/131.png differ diff --git a/graphics/battle_anims/sprites/132.png b/graphics/battle_anims/sprites/132.png new file mode 100644 index 000000000..ebed3740a Binary files /dev/null and b/graphics/battle_anims/sprites/132.png differ diff --git a/graphics/battle_anims/sprites/133.png b/graphics/battle_anims/sprites/133.png new file mode 100644 index 000000000..cebce575e Binary files /dev/null and b/graphics/battle_anims/sprites/133.png differ diff --git a/graphics/battle_anims/sprites/134.png b/graphics/battle_anims/sprites/134.png new file mode 100644 index 000000000..933852b07 Binary files /dev/null and b/graphics/battle_anims/sprites/134.png differ diff --git a/graphics/battle_anims/sprites/135.png b/graphics/battle_anims/sprites/135.png new file mode 100644 index 000000000..38a04f373 Binary files /dev/null and b/graphics/battle_anims/sprites/135.png differ diff --git a/graphics/battle_anims/sprites/136.png b/graphics/battle_anims/sprites/136.png new file mode 100644 index 000000000..cc99103d5 Binary files /dev/null and b/graphics/battle_anims/sprites/136.png differ diff --git a/graphics/battle_anims/sprites/137.png b/graphics/battle_anims/sprites/137.png new file mode 100644 index 000000000..7f3d26644 Binary files /dev/null and b/graphics/battle_anims/sprites/137.png differ diff --git a/graphics/battle_anims/sprites/138.png b/graphics/battle_anims/sprites/138.png new file mode 100644 index 000000000..559244bbc Binary files /dev/null and b/graphics/battle_anims/sprites/138.png differ diff --git a/graphics/battle_anims/sprites/139.png b/graphics/battle_anims/sprites/139.png new file mode 100644 index 000000000..38b74a9e4 Binary files /dev/null and b/graphics/battle_anims/sprites/139.png differ diff --git a/graphics/battle_anims/sprites/140.png b/graphics/battle_anims/sprites/140.png new file mode 100644 index 000000000..1133f2ee8 Binary files /dev/null and b/graphics/battle_anims/sprites/140.png differ diff --git a/graphics/battle_anims/sprites/141.pal b/graphics/battle_anims/sprites/141.pal new file mode 100644 index 000000000..c5f241feb --- /dev/null +++ b/graphics/battle_anims/sprites/141.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +106 148 139 +98 90 255 +115 106 255 +139 131 255 +164 156 255 +180 180 255 +205 205 255 +230 230 255 +255 255 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +180 180 255 +205 205 255 +230 230 255 diff --git a/graphics/battle_anims/sprites/141_0.png b/graphics/battle_anims/sprites/141_0.png new file mode 100644 index 000000000..631d344c8 Binary files /dev/null and b/graphics/battle_anims/sprites/141_0.png differ diff --git a/graphics/battle_anims/sprites/141_1.png b/graphics/battle_anims/sprites/141_1.png new file mode 100644 index 000000000..95f24953f Binary files /dev/null and b/graphics/battle_anims/sprites/141_1.png differ diff --git a/graphics/battle_anims/sprites/141_2.png b/graphics/battle_anims/sprites/141_2.png new file mode 100644 index 000000000..ec1e4b090 Binary files /dev/null and b/graphics/battle_anims/sprites/141_2.png differ diff --git a/graphics/battle_anims/sprites/141_3.png b/graphics/battle_anims/sprites/141_3.png new file mode 100644 index 000000000..02ac9d68e Binary files /dev/null and b/graphics/battle_anims/sprites/141_3.png differ diff --git a/graphics/battle_anims/sprites/141_4.png b/graphics/battle_anims/sprites/141_4.png new file mode 100644 index 000000000..a7af91f4b Binary files /dev/null and b/graphics/battle_anims/sprites/141_4.png differ diff --git a/graphics/battle_anims/sprites/142.png b/graphics/battle_anims/sprites/142.png new file mode 100644 index 000000000..130bcf82e Binary files /dev/null and b/graphics/battle_anims/sprites/142.png differ diff --git a/graphics/battle_anims/sprites/144.png b/graphics/battle_anims/sprites/144.png new file mode 100644 index 000000000..069926395 Binary files /dev/null and b/graphics/battle_anims/sprites/144.png differ diff --git a/graphics/battle_anims/sprites/145.png b/graphics/battle_anims/sprites/145.png new file mode 100644 index 000000000..b44edaadb Binary files /dev/null and b/graphics/battle_anims/sprites/145.png differ diff --git a/graphics/battle_anims/sprites/147.png b/graphics/battle_anims/sprites/147.png new file mode 100644 index 000000000..6dcc9cdff Binary files /dev/null and b/graphics/battle_anims/sprites/147.png differ diff --git a/graphics/battle_anims/sprites/148.png b/graphics/battle_anims/sprites/148.png new file mode 100644 index 000000000..ea5738321 Binary files /dev/null and b/graphics/battle_anims/sprites/148.png differ diff --git a/graphics/battle_anims/sprites/149.png b/graphics/battle_anims/sprites/149.png new file mode 100644 index 000000000..8e52802d7 Binary files /dev/null and b/graphics/battle_anims/sprites/149.png differ diff --git a/graphics/battle_anims/sprites/150.png b/graphics/battle_anims/sprites/150.png new file mode 100644 index 000000000..e6c55b573 Binary files /dev/null and b/graphics/battle_anims/sprites/150.png differ diff --git a/graphics/battle_anims/sprites/151.png b/graphics/battle_anims/sprites/151.png new file mode 100644 index 000000000..bf7819273 Binary files /dev/null and b/graphics/battle_anims/sprites/151.png differ diff --git a/graphics/battle_anims/sprites/153.png b/graphics/battle_anims/sprites/153.png new file mode 100644 index 000000000..d3dd12ae1 Binary files /dev/null and b/graphics/battle_anims/sprites/153.png differ diff --git a/graphics/battle_anims/sprites/154.png b/graphics/battle_anims/sprites/154.png new file mode 100644 index 000000000..8b55a24a2 Binary files /dev/null and b/graphics/battle_anims/sprites/154.png differ diff --git a/graphics/battle_anims/sprites/155.png b/graphics/battle_anims/sprites/155.png new file mode 100644 index 000000000..9547b39fa Binary files /dev/null and b/graphics/battle_anims/sprites/155.png differ diff --git a/graphics/battle_anims/sprites/156.png b/graphics/battle_anims/sprites/156.png new file mode 100644 index 000000000..c0567df8c Binary files /dev/null and b/graphics/battle_anims/sprites/156.png differ diff --git a/graphics/battle_anims/sprites/157.png b/graphics/battle_anims/sprites/157.png new file mode 100644 index 000000000..7fa6a0531 Binary files /dev/null and b/graphics/battle_anims/sprites/157.png differ diff --git a/graphics/battle_anims/sprites/158.png b/graphics/battle_anims/sprites/158.png new file mode 100644 index 000000000..a91eaafdb Binary files /dev/null and b/graphics/battle_anims/sprites/158.png differ diff --git a/graphics/battle_anims/sprites/159.pal b/graphics/battle_anims/sprites/159.pal new file mode 100644 index 000000000..81af310e1 --- /dev/null +++ b/graphics/battle_anims/sprites/159.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +164 148 139 +255 139 0 +255 156 8 +255 172 24 +255 197 41 +255 213 57 +255 230 74 +255 255 90 +255 255 255 +255 74 106 +255 115 148 +255 164 197 +255 205 238 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/battle_anims/sprites/159_0.png b/graphics/battle_anims/sprites/159_0.png new file mode 100644 index 000000000..4e9831863 Binary files /dev/null and b/graphics/battle_anims/sprites/159_0.png differ diff --git a/graphics/battle_anims/sprites/159_1.png b/graphics/battle_anims/sprites/159_1.png new file mode 100644 index 000000000..065ea5052 Binary files /dev/null and b/graphics/battle_anims/sprites/159_1.png differ diff --git a/graphics/battle_anims/sprites/160.png b/graphics/battle_anims/sprites/160.png new file mode 100644 index 000000000..35459b66b Binary files /dev/null and b/graphics/battle_anims/sprites/160.png differ diff --git a/graphics/battle_anims/sprites/162.png b/graphics/battle_anims/sprites/162.png new file mode 100644 index 000000000..f1fac116b Binary files /dev/null and b/graphics/battle_anims/sprites/162.png differ diff --git a/graphics/battle_anims/sprites/163.png b/graphics/battle_anims/sprites/163.png new file mode 100644 index 000000000..29c06f9b7 Binary files /dev/null and b/graphics/battle_anims/sprites/163.png differ diff --git a/graphics/battle_anims/sprites/164.pal b/graphics/battle_anims/sprites/164.pal new file mode 100644 index 000000000..4fdffdcdb --- /dev/null +++ b/graphics/battle_anims/sprites/164.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +164 148 139 +0 0 0 +156 24 255 +180 49 255 +255 255 255 +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 diff --git a/graphics/battle_anims/sprites/165.pal b/graphics/battle_anims/sprites/165.pal new file mode 100644 index 000000000..048980708 --- /dev/null +++ b/graphics/battle_anims/sprites/165.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +164 148 139 +0 0 0 +49 148 255 +0 230 255 +255 255 255 +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 diff --git a/graphics/battle_anims/sprites/166.png b/graphics/battle_anims/sprites/166.png new file mode 100644 index 000000000..b5fefee24 Binary files /dev/null and b/graphics/battle_anims/sprites/166.png differ diff --git a/graphics/battle_anims/sprites/167.pal b/graphics/battle_anims/sprites/167.pal new file mode 100644 index 000000000..5f4852f39 --- /dev/null +++ b/graphics/battle_anims/sprites/167.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +164 148 139 +98 90 255 +115 106 255 +139 131 255 +164 156 255 +180 180 255 +205 205 255 +230 230 255 +255 255 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +164 156 255 +180 180 255 +205 205 255 diff --git a/graphics/battle_anims/sprites/168.pal b/graphics/battle_anims/sprites/168.pal new file mode 100644 index 000000000..a99d113d2 --- /dev/null +++ b/graphics/battle_anims/sprites/168.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +164 148 139 +255 74 106 +255 98 123 +255 123 148 +255 148 164 +255 172 189 +255 197 205 +255 222 230 +255 255 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +255 148 164 +255 172 189 +255 197 205 diff --git a/graphics/battle_anims/sprites/169.pal b/graphics/battle_anims/sprites/169.pal new file mode 100644 index 000000000..6d037b09f --- /dev/null +++ b/graphics/battle_anims/sprites/169.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +164 148 139 +123 123 123 +139 139 139 +156 156 156 +172 172 172 +197 197 197 +213 213 213 +230 230 230 +255 255 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +172 172 172 +197 197 197 +213 213 213 diff --git a/graphics/battle_anims/sprites/170.pal b/graphics/battle_anims/sprites/170.pal new file mode 100644 index 000000000..63ff0a239 --- /dev/null +++ b/graphics/battle_anims/sprites/170.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +164 148 139 +255 205 32 +255 205 57 +255 213 90 +255 222 123 +255 230 156 +255 238 189 +255 246 222 +255 255 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +255 222 123 +255 230 156 +255 238 189 diff --git a/graphics/battle_anims/sprites/171.png b/graphics/battle_anims/sprites/171.png new file mode 100644 index 000000000..7b60d7450 Binary files /dev/null and b/graphics/battle_anims/sprites/171.png differ diff --git a/graphics/battle_anims/sprites/172.pal b/graphics/battle_anims/sprites/172.pal new file mode 100644 index 000000000..4b1755b0c --- /dev/null +++ b/graphics/battle_anims/sprites/172.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +106 148 139 +98 90 255 +115 106 255 +139 131 255 +164 156 255 +180 180 255 +205 205 255 +230 230 255 +213 0 213 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +180 180 255 +205 205 255 +230 230 255 diff --git a/graphics/battle_anims/sprites/173.png b/graphics/battle_anims/sprites/173.png new file mode 100644 index 000000000..d50982122 Binary files /dev/null and b/graphics/battle_anims/sprites/173.png differ diff --git a/graphics/battle_anims/sprites/259.pal b/graphics/battle_anims/sprites/259.pal new file mode 100644 index 000000000..ead25c0c6 --- /dev/null +++ b/graphics/battle_anims/sprites/259.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +131 49 0 +148 74 32 +164 106 65 +180 131 106 +197 164 139 +213 189 180 +230 222 213 +255 255 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/battle_anims/sprites/288.pal b/graphics/battle_anims/sprites/288.pal new file mode 100644 index 000000000..f8ea0ca54 --- /dev/null +++ b/graphics/battle_anims/sprites/288.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +164 148 139 +0 0 0 +255 255 255 +230 255 230 +255 255 255 +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 diff --git a/graphics/battle_anims/sprites/particles.png b/graphics/battle_anims/sprites/particles.png new file mode 100644 index 000000000..7edcd54ed Binary files /dev/null and b/graphics/battle_anims/sprites/particles.png differ diff --git a/graphics/battle_interface/unused_window3.png b/graphics/battle_interface/unused_window3.png new file mode 100644 index 000000000..e93b2ff88 Binary files /dev/null and b/graphics/battle_interface/unused_window3.png differ diff --git a/graphics/battle_interface/unused_window4.png b/graphics/battle_interface/unused_window4.png new file mode 100644 index 000000000..6c249c96d Binary files /dev/null and b/graphics/battle_interface/unused_window4.png differ diff --git a/graphics/contest/audience.png b/graphics/contest/audience.png new file mode 100644 index 000000000..59f8d0add Binary files /dev/null and b/graphics/contest/audience.png differ diff --git a/graphics/contest/faces.png b/graphics/contest/faces.png new file mode 100644 index 000000000..bba47a91d Binary files /dev/null and b/graphics/contest/faces.png differ diff --git a/graphics/contest/heart.png b/graphics/contest/heart.png new file mode 100644 index 000000000..bd1ede8fc Binary files /dev/null and b/graphics/contest/heart.png differ diff --git a/graphics/contest/judge.png b/graphics/contest/judge.png new file mode 100644 index 000000000..c4dcf520b Binary files /dev/null and b/graphics/contest/judge.png differ diff --git a/graphics/contest/judge_symbols.png b/graphics/contest/judge_symbols.png new file mode 100644 index 000000000..7669fb88b Binary files /dev/null and b/graphics/contest/judge_symbols.png differ diff --git a/graphics/contest/misc_2.pal b/graphics/contest/misc_2.pal new file mode 100644 index 000000000..869aef9e1 --- /dev/null +++ b/graphics/contest/misc_2.pal @@ -0,0 +1,259 @@ +JASC-PAL +0100 +256 +0 0 0 +255 255 255 +189 189 197 +131 131 139 +98 98 123 +65 74 106 +41 49 90 +255 106 115 +255 57 57 +205 32 0 +246 213 0 +255 123 98 +156 180 90 +164 148 57 +90 106 139 +180 172 82 +0 0 0 +255 255 255 +189 189 197 +131 131 139 +98 98 123 +65 74 106 +41 49 90 +164 222 255 +106 148 255 +24 57 205 +246 213 0 +255 123 98 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +255 255 255 +189 189 197 +131 131 139 +98 98 123 +65 74 106 +41 49 90 +255 197 255 +255 139 255 +213 0 139 +246 213 0 +255 123 98 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +255 255 255 +189 189 197 +131 131 139 +98 98 123 +65 74 106 +41 49 90 +180 255 197 +148 255 164 +65 172 57 +246 213 0 +255 123 98 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +255 255 255 +189 189 197 +131 131 139 +98 98 123 +65 74 106 +41 49 90 +255 255 164 +246 213 0 +230 106 0 +246 213 0 +255 123 98 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +197 255 255 +255 255 255 +213 213 213 +131 131 139 +98 98 123 +65 74 106 +41 49 90 +164 222 255 +106 148 255 +49 82 255 +180 255 197 +148 255 164 +65 172 57 +0 0 0 +0 0 0 +0 0 0 +197 255 255 +255 255 255 +213 213 213 +131 131 139 +98 98 123 +65 74 106 +41 49 90 +255 139 230 +255 139 230 +255 49 156 +255 255 0 +255 255 0 +189 172 0 +41 49 90 +41 49 90 +0 0 0 +197 123 131 +255 255 255 +230 246 255 +205 238 255 +180 238 255 +156 230 255 +139 230 255 +255 205 230 +255 255 139 +255 230 255 +255 255 197 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +197 255 255 +255 255 255 +213 213 213 +131 131 139 +98 98 123 +65 74 106 +41 49 90 +255 172 197 +255 172 172 +255 180 148 +255 189 123 +255 197 98 +255 205 82 +156 156 156 +156 156 156 +156 156 156 +197 255 255 +255 255 255 +213 213 213 +131 131 139 +98 98 123 +65 74 106 +41 49 90 +164 222 255 +106 148 255 +49 82 255 +180 255 197 +148 255 164 +65 172 57 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +164 222 255 +106 230 222 +49 238 189 +0 255 156 +0 255 156 +82 255 98 +164 255 49 +255 255 0 +255 172 16 +255 90 32 +255 8 57 +230 57 106 +205 115 156 +180 164 205 +164 222 255 +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 +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 +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 +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 +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 +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 +0 0 0 +0 0 0 diff --git a/graphics/contest/misc_2_tilemap_1.bin b/graphics/contest/misc_2_tilemap_1.bin new file mode 100644 index 000000000..197e88cee Binary files /dev/null and b/graphics/contest/misc_2_tilemap_1.bin differ diff --git a/graphics/contest/misc_2_tilemap_2.bin b/graphics/contest/misc_2_tilemap_2.bin new file mode 100644 index 000000000..b31126836 Binary files /dev/null and b/graphics/contest/misc_2_tilemap_2.bin differ diff --git a/graphics/contest/misc_2_tilemap_3.bin b/graphics/contest/misc_2_tilemap_3.bin new file mode 100644 index 000000000..5055ab79e --- /dev/null +++ b/graphics/contest/misc_2_tilemap_3.bin @@ -0,0 +1 @@ +`papat`t„p…p…t„tbpcpctbt†p‡p‡t†tdpepetdt€ppt€tfpgpgtft‚pƒpƒt‚tppqpqtpt”p•p•t”trpspstrt–p—p—t–ttpuputttp‘p‘ttvpwpwtvt’p“p“t’t€ppt€tfpgpgtft‚pƒpƒt‚t`papat`t„p…p…t„tbpcpctbt†p‡p‡t†tdpepetdtp‘p‘ttvpwpwtvt’p“p“t’tppqpqtpt”p•p•t”trpspstrt–p—p—t–ttpuputttbpcpctbt†p‡p‡t†tdpepetdt€ppt€tfpgpgtft‚pƒpƒt‚t`papat`t„p…p…t„trpspstrt–p—p—t–ttpuputttp‘p‘ttvpwpwtvt’p“p“t’tppqpqtpt”p•p•t”t‚pƒpƒt‚t`papat`t„p…p…t„tbpcpctbt†p‡p‡t†tdpepetdt€ppt€tfpgpgtft’p“p“t’tppqpqtpt”p•p•t”trpspstrt–p—p—t–ttpuputttp‘p‘ttvpwpwtvtdpepetdt€ppt€tfpgpgtft‚pƒpƒt‚t`papat`t„p…p…t„tbpcpctbt†p‡p‡t†ttpuputttp‘p‘ttvpwpwtvt’p“p“t’tppqpqtpt”p•p•t”trpspstrt–p—p—t–t„p…p…t„tbpcpctbt†p‡p‡t†tdpepetdt€ppt€tfpgpgtft‚pƒpƒt‚t`papat`t”p•p•t”trpspstrt–p—p—t–ttpuputttp‘p‘ttvpwpwtvt’p“p“t’tppqpqtptfpgpgtft‚pƒpƒt‚t`papat`t„p…p…t„tbpcpctbt†p‡p‡t†tdpepetdt€ppt€tvpwpwtvt’p“p“t’tppqpqtpt”p•p•t”trpspstrt–p—p—t–ttpuputttp‘p‘tt†p‡p‡t†tdpepetdt€ppt€tfpgpgtft‚pƒpƒt‚t`papat`t„p…p…t„tbpcpctbt–p—p—t–ttpuputttp‘p‘ttvpwpwtvt’p“p“t’tppqpqtpt”p•p•t”trpspstrt`papat`t„p…p…t„tbpcpctbt†p‡p‡t†tdpepetdt€ppt€tfpgpgtft‚pƒpƒt‚tppqpqtpt”p•p•t”trpspstrt–p—p—t–ttpuputttp‘p‘ttvpwpwtvt’p“p“t’t€ppt€tfpgpgtft‚pƒpƒt‚t`papat`t„p…p…t„tbpcpctbt†p‡p‡t†tdpepetdtp‘p‘ttvpwpwtvt’p“p“t’tppqpqtpt”p•p•t”trpspstrt–p—p—t–ttpuputttbpcpctbt†p‡p‡t†tdpepetdt€ppt€tfpgpgtft‚pƒpƒt‚t`papat`t„p…p…t„trpspstrt–p—p—t–ttpuputttp‘p‘ttvpwpwtvt’p“p“t’tppqpqtpt”p•p•t”t‚pƒpƒt‚t`papat`t„p…p…t„tbpcpctbt†p‡p‡t†tdpepetdt€ppt€tfpgpgtft’p“p“t’tppqpqtpt”p•p•t”trpspstrt–p—p—t–ttpuputttp‘p‘ttvpwpwtvtdpepetdt€ppt€tfpgpgtft‚pƒpƒt‚t`papat`t„p…p…t„tbpcpctbt†p‡p‡t†ttpuputttp‘p‘ttvpwpwtvt’p“p“t’tppqpqtpt”p•p•t”trpspstrt–p—p—t–t„p…p…t„tbpcpctbt†p‡p‡t†tdpepetdt€ppt€tfpgpgtft‚pƒpƒt‚t`papat`t”p•p•t”trpspstrt–p—p—t–ttpuputttp‘p‘ttvpwpwtvt’p“p“t’tppqpqtptfpgpgtft‚pƒpƒt‚t`papat`t„p…p…t„tbpcpctbt†p‡p‡t†tdpepetdt€ppt€tvpwpwtvt’p“p“t’tppqpqtpt”p•p•t”trpspstrt–p—p—t–ttpuputttp‘p‘tt†p‡p‡t†tdpepetdt€ppt€tfpgpgtft‚pƒpƒt‚t`papat`t„p…p…t„tbpcpctbt–p—p—t–ttpuputttp‘p‘ttvpwpwtvt’p“p“t’tppqpqtpt”p•p•t”trpspstrt \ No newline at end of file diff --git a/graphics/unknown/party_menu_hpbar.png b/graphics/unknown/party_menu_hpbar.png deleted file mode 100644 index 763b91210..000000000 Binary files a/graphics/unknown/party_menu_hpbar.png and /dev/null differ diff --git a/graphics/unknown/unknown_D15BE8.bin b/graphics/unknown/unknown_D15BE8.bin new file mode 100644 index 000000000..40de9e529 Binary files /dev/null and b/graphics/unknown/unknown_D15BE8.bin differ diff --git a/graphics/unknown/unknown_D172A8.bin b/graphics/unknown/unknown_D172A8.bin new file mode 100644 index 000000000..9f5141c5b Binary files /dev/null and b/graphics/unknown/unknown_D172A8.bin differ diff --git a/graphics/unknown/unknown_D17548.bin b/graphics/unknown/unknown_D17548.bin new file mode 100644 index 000000000..b2567ca7c Binary files /dev/null and b/graphics/unknown/unknown_D17548.bin differ diff --git a/graphics/unknown/unknown_D17654.bin b/graphics/unknown/unknown_D17654.bin new file mode 100644 index 000000000..e8a506838 Binary files /dev/null and b/graphics/unknown/unknown_D17654.bin differ diff --git a/graphics/unknown/unknown_D17AB8.bin b/graphics/unknown/unknown_D17AB8.bin new file mode 100644 index 000000000..77e35348a Binary files /dev/null and b/graphics/unknown/unknown_D17AB8.bin differ diff --git a/graphics/unknown/unknown_D196E4.png b/graphics/unknown/unknown_D196E4.png new file mode 100644 index 000000000..14cc50cf4 Binary files /dev/null and b/graphics/unknown/unknown_D196E4.png differ diff --git a/graphics/unknown/unknown_D1BE74.bin b/graphics/unknown/unknown_D1BE74.bin new file mode 100644 index 000000000..e4776cba4 Binary files /dev/null and b/graphics/unknown/unknown_D1BE74.bin differ diff --git a/graphics/unknown/unknown_D1BE74.png b/graphics/unknown/unknown_D1BE74.png new file mode 100644 index 000000000..2371241d7 Binary files /dev/null and b/graphics/unknown/unknown_D1BE74.png differ diff --git a/graphics/unused/numbers.png b/graphics/unused/numbers.png new file mode 100644 index 000000000..2c816c426 Binary files /dev/null and b/graphics/unused/numbers.png differ diff --git a/graphics/unused/old_beatup.png b/graphics/unused/old_beatup.png new file mode 100644 index 000000000..e2a0561e2 Binary files /dev/null and b/graphics/unused/old_beatup.png differ diff --git a/graphics/unused/old_contest.bin b/graphics/unused/old_contest.bin new file mode 100644 index 000000000..da6f4652e Binary files /dev/null and b/graphics/unused/old_contest.bin differ diff --git a/graphics/unused/old_contest.pal b/graphics/unused/old_contest.pal new file mode 100644 index 000000000..69fde2000 --- /dev/null +++ b/graphics/unused/old_contest.pal @@ -0,0 +1,259 @@ +JASC-PAL +0100 +256 +0 0 0 +255 255 255 +230 230 230 +197 197 197 +148 148 148 +74 65 82 +0 255 0 +0 255 0 +65 74 123 +139 123 131 +82 82 197 +189 82 74 +131 74 98 +74 74 131 +131 139 222 +106 164 164 +0 0 0 +255 255 255 +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 +222 230 230 +230 230 238 +230 238 238 +238 246 246 +246 246 255 +0 0 0 +255 255 255 +172 172 148 +213 213 189 +230 230 213 +189 189 172 +238 238 222 +197 197 180 +0 0 0 +156 156 131 +197 197 189 +139 139 131 +98 98 98 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +115 106 156 +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 +148 148 156 +131 139 156 +123 131 156 +131 123 164 +123 115 164 +0 0 0 +115 106 156 +255 255 255 +205 156 255 +172 148 197 +230 222 246 +139 131 172 +213 189 238 +0 0 0 +238 238 230 +189 172 197 +222 213 213 +189 172 189 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +255 164 131 +213 131 90 +255 189 172 +197 98 74 +74 65 82 +255 255 255 +156 156 156 +0 0 0 +0 0 0 +255 255 255 +148 148 148 +255 123 98 +131 246 90 +255 246 74 +131 148 255 +0 0 0 +164 238 98 +131 205 90 +213 255 148 +98 197 49 +74 65 82 +255 255 255 +156 156 156 +0 0 0 +0 0 0 +255 255 255 +148 148 148 +255 123 98 +131 246 90 +255 246 74 +131 148 255 +0 0 0 +246 246 90 +205 205 65 +255 255 180 +180 180 24 +74 65 82 +255 255 255 +156 156 156 +0 0 0 +0 0 0 +255 255 255 +148 148 148 +255 123 98 +131 246 90 +255 246 74 +131 148 255 +0 0 0 +115 205 255 +115 180 205 +156 238 255 +49 98 148 +74 65 82 +255 255 255 +156 156 156 +0 0 0 +0 0 0 +255 255 255 +148 148 148 +255 123 98 +131 246 90 +255 246 74 +131 148 255 +0 0 0 +0 0 0 +255 255 255 +230 230 213 +0 0 0 +197 197 197 +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 +255 255 255 +230 230 213 +0 0 0 +197 197 197 +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 +255 255 255 +230 230 213 +0 0 0 +197 197 197 +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 +255 255 255 +230 230 213 +0 0 0 +197 197 197 +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 +74 65 82 +255 255 255 +222 222 222 +172 172 197 +255 0 0 +0 0 255 +255 255 0 +0 197 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +255 164 131 +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 +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 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/unused/old_contest_2.bin b/graphics/unused/old_contest_2.bin new file mode 100644 index 000000000..06836cc19 Binary files /dev/null and b/graphics/unused/old_contest_2.bin differ diff --git a/graphics/unused/old_contest_2.pal b/graphics/unused/old_contest_2.pal new file mode 100644 index 000000000..3fb174790 --- /dev/null +++ b/graphics/unused/old_contest_2.pal @@ -0,0 +1,259 @@ +JASC-PAL +0100 +256 +0 0 0 +255 255 255 +230 230 230 +197 197 197 +148 148 148 +74 65 82 +0 255 0 +0 255 0 +65 74 123 +139 123 131 +82 82 197 +189 82 74 +131 74 98 +74 74 131 +131 139 222 +106 164 164 +0 0 0 +115 123 156 +90 65 57 +148 197 106 +123 98 65 +131 123 49 +222 189 148 +164 131 106 +115 164 82 +164 148 57 +90 106 139 +180 172 82 +82 139 49 +255 230 189 +222 131 41 +246 246 222 +205 148 115 +255 106 115 +255 57 57 +156 0 0 +164 222 255 +106 148 255 +49 82 255 +255 255 115 +246 222 65 +230 106 0 +255 255 255 +189 189 197 +131 131 139 +98 98 123 +65 74 106 +41 49 90 +0 0 0 +255 255 115 +246 222 90 +238 189 65 +238 164 41 +230 131 16 +230 106 0 +255 41 0 +255 148 82 +255 255 164 +255 255 255 +189 189 197 +131 131 139 +98 98 123 +65 74 106 +41 49 90 +0 0 0 +255 131 106 +197 24 16 +164 222 255 +106 148 255 +49 82 255 +255 197 255 +255 139 255 +213 0 139 +148 255 164 +65 205 57 +246 222 65 +230 106 0 +255 255 255 +65 74 106 +65 74 106 +197 255 255 +246 246 90 +205 205 65 +255 255 180 +180 180 24 +74 65 82 +255 255 255 +156 156 156 +255 156 156 +0 0 0 +255 255 255 +255 148 148 +255 123 98 +255 0 0 +148 148 148 +0 0 0 +197 255 255 +246 246 90 +205 205 65 +255 255 180 +180 180 24 +74 65 82 +255 255 255 +156 156 156 +255 156 156 +0 0 0 +255 255 255 +255 148 148 +255 123 98 +255 0 0 +148 148 148 +0 0 0 +197 255 255 +246 246 90 +205 205 65 +255 255 180 +180 180 24 +74 65 82 +255 255 255 +156 156 156 +255 156 156 +0 0 0 +255 255 255 +255 148 148 +255 123 98 +255 0 0 +148 148 148 +0 0 0 +197 255 255 +213 255 213 +156 222 148 +222 255 230 +123 189 115 +74 65 82 +255 255 255 +156 156 156 +255 156 156 +0 0 0 +255 255 255 +255 148 148 +255 123 98 +255 0 0 +148 148 148 +0 0 0 +0 172 255 +0 0 0 +255 255 255 +230 230 213 +0 0 0 +197 197 197 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +255 255 255 +197 255 255 +0 0 0 +0 0 0 +0 0 0 +65 0 0 +123 0 0 +189 0 0 +255 8 0 +255 65 0 +255 123 0 +255 189 0 +255 255 0 +255 255 123 +255 255 255 +189 189 197 +131 131 139 +98 98 123 +65 74 106 +41 49 90 +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 +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 +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 +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 +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 +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 +0 0 0 +0 0 0 diff --git a/graphics/unused/old_contest_2_1.png b/graphics/unused/old_contest_2_1.png new file mode 100644 index 000000000..67b81de2d Binary files /dev/null and b/graphics/unused/old_contest_2_1.png differ diff --git a/graphics/unused/old_contest_2_2.png b/graphics/unused/old_contest_2_2.png new file mode 100644 index 000000000..a33a8c324 Binary files /dev/null and b/graphics/unused/old_contest_2_2.png differ diff --git a/graphics/unused/old_contest_classes.png b/graphics/unused/old_contest_classes.png new file mode 100644 index 000000000..c2e7b5e29 Binary files /dev/null and b/graphics/unused/old_contest_classes.png differ diff --git a/graphics/unused/old_contest_floor.png b/graphics/unused/old_contest_floor.png new file mode 100644 index 000000000..94877b921 Binary files /dev/null and b/graphics/unused/old_contest_floor.png differ diff --git a/graphics/unused/old_contest_frame_1.png b/graphics/unused/old_contest_frame_1.png new file mode 100644 index 000000000..28eaae905 Binary files /dev/null and b/graphics/unused/old_contest_frame_1.png differ diff --git a/graphics/unused/old_contest_frame_2.png b/graphics/unused/old_contest_frame_2.png new file mode 100644 index 000000000..c8b20408c Binary files /dev/null and b/graphics/unused/old_contest_frame_2.png differ diff --git a/graphics/unused/old_contest_meter.png b/graphics/unused/old_contest_meter.png new file mode 100644 index 000000000..606208b1f Binary files /dev/null and b/graphics/unused/old_contest_meter.png differ diff --git a/graphics/unused/old_contest_numbers.png b/graphics/unused/old_contest_numbers.png new file mode 100644 index 000000000..98c145976 Binary files /dev/null and b/graphics/unused/old_contest_numbers.png differ diff --git a/graphics/unused/old_contest_symbols.png b/graphics/unused/old_contest_symbols.png new file mode 100644 index 000000000..87cac733e Binary files /dev/null and b/graphics/unused/old_contest_symbols.png differ diff --git a/graphics_file_rules.mk b/graphics_file_rules.mk index 055c459b2..d6fcb4976 100644 --- a/graphics_file_rules.mk +++ b/graphics_file_rules.mk @@ -351,7 +351,7 @@ $(UNUSEDGFXDIR)/old_contest_2.4bpp: $(UNUSEDGFXDIR)/old_contest_2_1.4bpp \ $(UNUSEDGFXDIR)/old_contest_2_2.4bpp @cat $^ >$@ -$(UNKNOWNGFXDIR)/unknown_C19470.4bpp: %.4bpp: %.png +$(UNKNOWNGFXDIR)/unknown_D196E4.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 36 $(BTLANMSPRGFXDIR)/141.4bpp: $(BTLANMSPRGFXDIR)/141_0.4bpp \ -- cgit v1.2.3 From 8781b66d5f51353fe85afc715708d4a1eaee75cd Mon Sep 17 00:00:00 2001 From: paul Date: Sat, 13 Oct 2018 19:41:45 +0200 Subject: add all battle_anims (assuming there is no funkiness with them in fr), replace more baseroms --- asm/battle_anim_80A22E8.s | 12 +- data/graphics.s | 208 ++++++++++++++++++++- graphics/battle_anims/backgrounds/02.bin | Bin 0 -> 2048 bytes graphics/battle_anims/backgrounds/02.png | Bin 0 -> 2426 bytes graphics/battle_anims/backgrounds/03.bin | Bin 0 -> 1280 bytes graphics/battle_anims/backgrounds/03.png | Bin 0 -> 418 bytes graphics/battle_anims/backgrounds/04.bin | Bin 0 -> 1280 bytes graphics/battle_anims/backgrounds/04.png | Bin 0 -> 2672 bytes graphics/battle_anims/backgrounds/05.bin | Bin 0 -> 1280 bytes graphics/battle_anims/backgrounds/06.bin | Bin 0 -> 1280 bytes graphics/battle_anims/backgrounds/07.bin | Bin 0 -> 2048 bytes graphics/battle_anims/backgrounds/07.png | Bin 0 -> 373 bytes graphics/battle_anims/backgrounds/08.bin | Bin 0 -> 2048 bytes graphics/battle_anims/backgrounds/09.bin | Bin 0 -> 2048 bytes graphics/battle_anims/backgrounds/09.png | Bin 0 -> 964 bytes graphics/battle_anims/backgrounds/10.bin | Bin 0 -> 2048 bytes graphics/battle_anims/backgrounds/11.bin | Bin 0 -> 2048 bytes graphics/battle_anims/backgrounds/11.png | Bin 0 -> 1714 bytes graphics/battle_anims/backgrounds/12.bin | Bin 0 -> 2048 bytes graphics/battle_anims/backgrounds/12.png | Bin 0 -> 2504 bytes graphics/battle_anims/backgrounds/13.bin | Bin 0 -> 2048 bytes graphics/battle_anims/backgrounds/14.bin | Bin 0 -> 2048 bytes graphics/battle_anims/backgrounds/15.bin | Bin 0 -> 2048 bytes graphics/battle_anims/backgrounds/15.png | Bin 0 -> 1859 bytes graphics/battle_anims/backgrounds/16.bin | Bin 0 -> 2048 bytes graphics/battle_anims/backgrounds/16.png | Bin 0 -> 634 bytes graphics/battle_anims/backgrounds/17.bin | Bin 0 -> 2048 bytes graphics/battle_anims/backgrounds/17.png | Bin 0 -> 388 bytes graphics/battle_anims/backgrounds/18.pal | 19 ++ graphics/battle_anims/backgrounds/20.bin | Bin 0 -> 2048 bytes graphics/battle_anims/backgrounds/20.png | Bin 0 -> 1998 bytes graphics/battle_anims/backgrounds/21.bin | Bin 0 -> 4096 bytes graphics/battle_anims/backgrounds/21.png | Bin 0 -> 672 bytes graphics/battle_anims/backgrounds/22.pal | 19 ++ graphics/battle_anims/backgrounds/24.pal | 19 ++ graphics/battle_anims/backgrounds/attract.bin | Bin 0 -> 2048 bytes graphics/battle_anims/backgrounds/attract.png | Bin 0 -> 2150 bytes graphics/battle_anims/backgrounds/fog.bin | Bin 0 -> 2048 bytes .../battle_anims/backgrounds/sandstorm_brew.bin | Bin 0 -> 2048 bytes .../battle_anims/backgrounds/sandstorm_brew.png | Bin 0 -> 997 bytes graphics/battle_anims/backgrounds/scary_face.png | Bin 0 -> 428 bytes .../backgrounds/scary_face_contest.bin | Bin 0 -> 2048 bytes .../backgrounds/scary_face_opponent.bin | Bin 0 -> 2048 bytes .../battle_anims/backgrounds/scary_face_player.bin | Bin 0 -> 2048 bytes graphics/battle_anims/backgrounds/water.png | Bin 0 -> 3793 bytes graphics/battle_anims/backgrounds/water_muddy.pal | 19 ++ graphics/battle_anims/masks/cure_bubbles.bin | Bin 0 -> 2048 bytes graphics/battle_anims/masks/cure_bubbles.png | Bin 0 -> 336 bytes graphics/battle_anims/masks/curse.bin | Bin 0 -> 2048 bytes graphics/battle_anims/masks/curse.png | Bin 0 -> 138 bytes graphics/battle_anims/masks/metal_shine.bin | Bin 0 -> 2048 bytes graphics/battle_anims/masks/metal_shine.png | Bin 0 -> 183 bytes graphics/battle_anims/masks/morning_sun.bin | Bin 0 -> 2048 bytes graphics/battle_anims/masks/morning_sun.png | Bin 0 -> 188 bytes graphics/battle_anims/masks/stat.png | Bin 0 -> 430 bytes graphics/battle_anims/masks/stat1.pal | 19 ++ graphics/battle_anims/masks/stat2.pal | 19 ++ graphics/battle_anims/masks/stat3.pal | 19 ++ graphics/battle_anims/masks/stat4.pal | 19 ++ graphics/battle_anims/masks/stat5.pal | 19 ++ graphics/battle_anims/masks/stat6.pal | 19 ++ graphics/battle_anims/masks/stat7.pal | 19 ++ graphics/battle_anims/masks/stat8.pal | 19 ++ graphics/battle_anims/masks/stat_tilemap_1.bin | Bin 0 -> 2048 bytes graphics/battle_anims/masks/stat_tilemap_2.bin | 1 + graphics/battle_anims/masks/unknown_C2EA50.bin | Bin 0 -> 2048 bytes graphics/battle_anims/masks/unknown_C2EA50.png | Bin 0 -> 175 bytes graphics/battle_anims/sprites/002.png | Bin 0 -> 251 bytes graphics/battle_anims/sprites/014.png | Bin 0 -> 198 bytes graphics/battle_anims/sprites/018.png | Bin 0 -> 172 bytes graphics/battle_anims/sprites/053.png | Bin 0 -> 456 bytes graphics/battle_anims/sprites/064.png | Bin 0 -> 289 bytes graphics/battle_anims/sprites/067.pal | 19 ++ graphics/battle_anims/sprites/068.pal | 19 ++ graphics/battle_anims/sprites/087.png | Bin 0 -> 183 bytes graphics/battle_anims/sprites/099.png | Bin 0 -> 334 bytes graphics/battle_anims/sprites/143.png | Bin 0 -> 461 bytes graphics/battle_anims/sprites/174.png | Bin 0 -> 210 bytes graphics/battle_anims/sprites/175.png | Bin 0 -> 196 bytes graphics/battle_anims/sprites/176.png | Bin 0 -> 330 bytes graphics/battle_anims/sprites/177.png | Bin 0 -> 186 bytes graphics/battle_anims/sprites/178.png | Bin 0 -> 358 bytes graphics/battle_anims/sprites/179.png | Bin 0 -> 226 bytes graphics/battle_anims/sprites/180.png | Bin 0 -> 139 bytes graphics/battle_anims/sprites/181.png | Bin 0 -> 542 bytes graphics/battle_anims/sprites/182.png | Bin 0 -> 235 bytes graphics/battle_anims/sprites/183.png | Bin 0 -> 546 bytes graphics/battle_anims/sprites/184.png | Bin 0 -> 332 bytes graphics/battle_anims/sprites/185.png | Bin 0 -> 819 bytes graphics/battle_anims/sprites/186.png | Bin 0 -> 599 bytes graphics/battle_anims/sprites/187.png | Bin 0 -> 336 bytes graphics/battle_anims/sprites/188.png | Bin 0 -> 249 bytes graphics/battle_anims/sprites/189.png | Bin 0 -> 196 bytes graphics/battle_anims/sprites/190.png | Bin 0 -> 463 bytes graphics/battle_anims/sprites/191.png | Bin 0 -> 399 bytes graphics/battle_anims/sprites/192.png | Bin 0 -> 541 bytes graphics/battle_anims/sprites/193.png | Bin 0 -> 358 bytes graphics/battle_anims/sprites/194.png | Bin 0 -> 616 bytes graphics/battle_anims/sprites/195.png | Bin 0 -> 235 bytes graphics/battle_anims/sprites/196.png | Bin 0 -> 726 bytes graphics/battle_anims/sprites/197.png | Bin 0 -> 375 bytes graphics/battle_anims/sprites/198.png | Bin 0 -> 845 bytes graphics/battle_anims/sprites/199.png | Bin 0 -> 229 bytes graphics/battle_anims/sprites/200.png | Bin 0 -> 333 bytes graphics/battle_anims/sprites/201.png | Bin 0 -> 1316 bytes graphics/battle_anims/sprites/202.png | Bin 0 -> 312 bytes graphics/battle_anims/sprites/203.png | Bin 0 -> 323 bytes graphics/battle_anims/sprites/204.png | Bin 0 -> 390 bytes graphics/battle_anims/sprites/205.png | Bin 0 -> 479 bytes graphics/battle_anims/sprites/206.pal | 83 ++++++++ graphics/battle_anims/sprites/206.png | Bin 0 -> 747 bytes graphics/battle_anims/sprites/207.png | Bin 0 -> 262 bytes graphics/battle_anims/sprites/208.png | Bin 0 -> 815 bytes graphics/battle_anims/sprites/209.png | Bin 0 -> 620 bytes graphics/battle_anims/sprites/210.png | Bin 0 -> 200 bytes graphics/battle_anims/sprites/211.png | Bin 0 -> 190 bytes graphics/battle_anims/sprites/212.png | Bin 0 -> 354 bytes graphics/battle_anims/sprites/213.png | Bin 0 -> 501 bytes graphics/battle_anims/sprites/214.png | Bin 0 -> 534 bytes graphics/battle_anims/sprites/215.png | Bin 0 -> 357 bytes graphics/battle_anims/sprites/216.pal | 19 ++ graphics/battle_anims/sprites/217.png | Bin 0 -> 195 bytes graphics/battle_anims/sprites/218.png | Bin 0 -> 239 bytes graphics/battle_anims/sprites/219.pal | 19 ++ graphics/battle_anims/sprites/220.png | Bin 0 -> 329 bytes graphics/battle_anims/sprites/221.png | Bin 0 -> 521 bytes graphics/battle_anims/sprites/222.png | Bin 0 -> 554 bytes graphics/battle_anims/sprites/223.png | Bin 0 -> 524 bytes graphics/battle_anims/sprites/224.png | Bin 0 -> 300 bytes graphics/battle_anims/sprites/225.png | Bin 0 -> 408 bytes graphics/battle_anims/sprites/226.png | Bin 0 -> 245 bytes graphics/battle_anims/sprites/227.png | Bin 0 -> 269 bytes graphics/battle_anims/sprites/228.png | Bin 0 -> 203 bytes graphics/battle_anims/sprites/229.png | Bin 0 -> 445 bytes graphics/battle_anims/sprites/230.png | Bin 0 -> 481 bytes graphics/battle_anims/sprites/231.png | Bin 0 -> 391 bytes graphics/battle_anims/sprites/232.png | Bin 0 -> 1085 bytes graphics/battle_anims/sprites/233.png | Bin 0 -> 213 bytes graphics/battle_anims/sprites/234.png | Bin 0 -> 333 bytes graphics/battle_anims/sprites/235.png | Bin 0 -> 195 bytes graphics/battle_anims/sprites/236.pal | 19 ++ graphics/battle_anims/sprites/237.pal | 19 ++ graphics/battle_anims/sprites/238.png | Bin 0 -> 210 bytes graphics/battle_anims/sprites/239.png | Bin 0 -> 313 bytes graphics/battle_anims/sprites/240.png | Bin 0 -> 258 bytes graphics/battle_anims/sprites/241.png | Bin 0 -> 258 bytes graphics/battle_anims/sprites/242.png | Bin 0 -> 339 bytes graphics/battle_anims/sprites/243.png | Bin 0 -> 160 bytes graphics/battle_anims/sprites/244.png | Bin 0 -> 226 bytes graphics/battle_anims/sprites/245.png | Bin 0 -> 329 bytes graphics/battle_anims/sprites/246.png | Bin 0 -> 758 bytes graphics/battle_anims/sprites/247.png | Bin 0 -> 441 bytes graphics/battle_anims/sprites/248.png | Bin 0 -> 141 bytes graphics/battle_anims/sprites/249.png | Bin 0 -> 175 bytes graphics/battle_anims/sprites/250.png | Bin 0 -> 457 bytes graphics/battle_anims/sprites/251.png | Bin 0 -> 187 bytes graphics/battle_anims/sprites/252.png | Bin 0 -> 323 bytes graphics/battle_anims/sprites/253.png | Bin 0 -> 467 bytes graphics/battle_anims/sprites/254.png | Bin 0 -> 334 bytes graphics/battle_anims/sprites/255.png | Bin 0 -> 208 bytes graphics/battle_anims/sprites/256.png | Bin 0 -> 686 bytes graphics/battle_anims/sprites/257.png | Bin 0 -> 317 bytes graphics/battle_anims/sprites/258.png | Bin 0 -> 290 bytes graphics/battle_anims/sprites/260.png | Bin 0 -> 342 bytes graphics/battle_anims/sprites/261.png | Bin 0 -> 378 bytes graphics/battle_anims/sprites/262.png | Bin 0 -> 249 bytes graphics/battle_anims/sprites/263.png | Bin 0 -> 166 bytes graphics/battle_anims/sprites/264.png | Bin 0 -> 152 bytes graphics/battle_anims/sprites/265.pal | 19 ++ graphics/battle_anims/sprites/266.png | Bin 0 -> 167 bytes graphics/battle_anims/sprites/267.pal | 19 ++ graphics/battle_anims/sprites/268.pal | 19 ++ graphics/battle_anims/sprites/269.png | Bin 0 -> 179 bytes graphics/battle_anims/sprites/270.png | Bin 0 -> 304 bytes graphics/battle_anims/sprites/271.png | Bin 0 -> 172 bytes graphics/battle_anims/sprites/272.png | Bin 0 -> 384 bytes graphics/battle_anims/sprites/273.png | Bin 0 -> 159 bytes graphics/battle_anims/sprites/274.png | Bin 0 -> 261 bytes graphics/battle_anims/sprites/275.png | Bin 0 -> 221 bytes graphics/battle_anims/sprites/276.png | Bin 0 -> 245 bytes graphics/battle_anims/sprites/277.png | Bin 0 -> 684 bytes graphics/battle_anims/sprites/278.png | Bin 0 -> 421 bytes graphics/battle_anims/sprites/279.png | Bin 0 -> 184 bytes graphics/battle_anims/sprites/280.png | Bin 0 -> 601 bytes graphics/battle_anims/sprites/281.png | Bin 0 -> 399 bytes graphics/battle_anims/sprites/282.png | Bin 0 -> 401 bytes graphics/battle_anims/sprites/283.png | Bin 0 -> 323 bytes graphics/battle_anims/sprites/284.png | Bin 0 -> 679 bytes graphics/battle_anims/sprites/285.png | Bin 0 -> 228 bytes graphics/battle_anims/sprites/286.pal | 19 ++ graphics/battle_anims/sprites/287.pal | 19 ++ graphics/battle_anims/sprites/effect.pal | 27 +++ graphics/battle_anims/sprites/substitute.bin | Bin 0 -> 2048 bytes graphics/battle_anims/sprites/substitute.png | Bin 0 -> 446 bytes graphics/battle_interface/healthbox_safari.png | Bin 0 -> 297 bytes graphics/unused/goosuto.bin | Bin 0 -> 2048 bytes graphics/unused/goosuto.png | Bin 0 -> 290 bytes graphics/unused/shadow.png | Bin 0 -> 170 bytes 198 files changed, 756 insertions(+), 12 deletions(-) create mode 100644 graphics/battle_anims/backgrounds/02.bin create mode 100644 graphics/battle_anims/backgrounds/02.png create mode 100644 graphics/battle_anims/backgrounds/03.bin create mode 100644 graphics/battle_anims/backgrounds/03.png create mode 100644 graphics/battle_anims/backgrounds/04.bin create mode 100644 graphics/battle_anims/backgrounds/04.png create mode 100644 graphics/battle_anims/backgrounds/05.bin create mode 100644 graphics/battle_anims/backgrounds/06.bin create mode 100644 graphics/battle_anims/backgrounds/07.bin create mode 100644 graphics/battle_anims/backgrounds/07.png create mode 100644 graphics/battle_anims/backgrounds/08.bin create mode 100644 graphics/battle_anims/backgrounds/09.bin create mode 100644 graphics/battle_anims/backgrounds/09.png create mode 100644 graphics/battle_anims/backgrounds/10.bin create mode 100644 graphics/battle_anims/backgrounds/11.bin create mode 100644 graphics/battle_anims/backgrounds/11.png create mode 100644 graphics/battle_anims/backgrounds/12.bin create mode 100644 graphics/battle_anims/backgrounds/12.png create mode 100644 graphics/battle_anims/backgrounds/13.bin create mode 100644 graphics/battle_anims/backgrounds/14.bin create mode 100644 graphics/battle_anims/backgrounds/15.bin create mode 100644 graphics/battle_anims/backgrounds/15.png create mode 100644 graphics/battle_anims/backgrounds/16.bin create mode 100644 graphics/battle_anims/backgrounds/16.png create mode 100644 graphics/battle_anims/backgrounds/17.bin create mode 100644 graphics/battle_anims/backgrounds/17.png create mode 100644 graphics/battle_anims/backgrounds/18.pal create mode 100644 graphics/battle_anims/backgrounds/20.bin create mode 100644 graphics/battle_anims/backgrounds/20.png create mode 100644 graphics/battle_anims/backgrounds/21.bin create mode 100644 graphics/battle_anims/backgrounds/21.png create mode 100644 graphics/battle_anims/backgrounds/22.pal create mode 100644 graphics/battle_anims/backgrounds/24.pal create mode 100644 graphics/battle_anims/backgrounds/attract.bin create mode 100644 graphics/battle_anims/backgrounds/attract.png create mode 100644 graphics/battle_anims/backgrounds/fog.bin create mode 100644 graphics/battle_anims/backgrounds/sandstorm_brew.bin create mode 100644 graphics/battle_anims/backgrounds/sandstorm_brew.png create mode 100644 graphics/battle_anims/backgrounds/scary_face.png create mode 100644 graphics/battle_anims/backgrounds/scary_face_contest.bin create mode 100644 graphics/battle_anims/backgrounds/scary_face_opponent.bin create mode 100644 graphics/battle_anims/backgrounds/scary_face_player.bin create mode 100644 graphics/battle_anims/backgrounds/water.png create mode 100644 graphics/battle_anims/backgrounds/water_muddy.pal create mode 100644 graphics/battle_anims/masks/cure_bubbles.bin create mode 100644 graphics/battle_anims/masks/cure_bubbles.png create mode 100644 graphics/battle_anims/masks/curse.bin create mode 100644 graphics/battle_anims/masks/curse.png create mode 100644 graphics/battle_anims/masks/metal_shine.bin create mode 100644 graphics/battle_anims/masks/metal_shine.png create mode 100644 graphics/battle_anims/masks/morning_sun.bin create mode 100644 graphics/battle_anims/masks/morning_sun.png create mode 100644 graphics/battle_anims/masks/stat.png create mode 100644 graphics/battle_anims/masks/stat1.pal create mode 100644 graphics/battle_anims/masks/stat2.pal create mode 100644 graphics/battle_anims/masks/stat3.pal create mode 100644 graphics/battle_anims/masks/stat4.pal create mode 100644 graphics/battle_anims/masks/stat5.pal create mode 100644 graphics/battle_anims/masks/stat6.pal create mode 100644 graphics/battle_anims/masks/stat7.pal create mode 100644 graphics/battle_anims/masks/stat8.pal create mode 100644 graphics/battle_anims/masks/stat_tilemap_1.bin create mode 100644 graphics/battle_anims/masks/stat_tilemap_2.bin create mode 100644 graphics/battle_anims/masks/unknown_C2EA50.bin create mode 100644 graphics/battle_anims/masks/unknown_C2EA50.png create mode 100644 graphics/battle_anims/sprites/002.png create mode 100644 graphics/battle_anims/sprites/014.png create mode 100644 graphics/battle_anims/sprites/018.png create mode 100644 graphics/battle_anims/sprites/053.png create mode 100644 graphics/battle_anims/sprites/064.png create mode 100644 graphics/battle_anims/sprites/067.pal create mode 100644 graphics/battle_anims/sprites/068.pal create mode 100644 graphics/battle_anims/sprites/087.png create mode 100644 graphics/battle_anims/sprites/099.png create mode 100644 graphics/battle_anims/sprites/143.png create mode 100644 graphics/battle_anims/sprites/174.png create mode 100644 graphics/battle_anims/sprites/175.png create mode 100644 graphics/battle_anims/sprites/176.png create mode 100644 graphics/battle_anims/sprites/177.png create mode 100644 graphics/battle_anims/sprites/178.png create mode 100644 graphics/battle_anims/sprites/179.png create mode 100644 graphics/battle_anims/sprites/180.png create mode 100644 graphics/battle_anims/sprites/181.png create mode 100644 graphics/battle_anims/sprites/182.png create mode 100644 graphics/battle_anims/sprites/183.png create mode 100644 graphics/battle_anims/sprites/184.png create mode 100644 graphics/battle_anims/sprites/185.png create mode 100644 graphics/battle_anims/sprites/186.png create mode 100644 graphics/battle_anims/sprites/187.png create mode 100644 graphics/battle_anims/sprites/188.png create mode 100644 graphics/battle_anims/sprites/189.png create mode 100644 graphics/battle_anims/sprites/190.png create mode 100644 graphics/battle_anims/sprites/191.png create mode 100644 graphics/battle_anims/sprites/192.png create mode 100644 graphics/battle_anims/sprites/193.png create mode 100644 graphics/battle_anims/sprites/194.png create mode 100644 graphics/battle_anims/sprites/195.png create mode 100644 graphics/battle_anims/sprites/196.png create mode 100644 graphics/battle_anims/sprites/197.png create mode 100644 graphics/battle_anims/sprites/198.png create mode 100644 graphics/battle_anims/sprites/199.png create mode 100644 graphics/battle_anims/sprites/200.png create mode 100644 graphics/battle_anims/sprites/201.png create mode 100644 graphics/battle_anims/sprites/202.png create mode 100644 graphics/battle_anims/sprites/203.png create mode 100644 graphics/battle_anims/sprites/204.png create mode 100644 graphics/battle_anims/sprites/205.png create mode 100644 graphics/battle_anims/sprites/206.pal create mode 100644 graphics/battle_anims/sprites/206.png create mode 100644 graphics/battle_anims/sprites/207.png create mode 100644 graphics/battle_anims/sprites/208.png create mode 100644 graphics/battle_anims/sprites/209.png create mode 100644 graphics/battle_anims/sprites/210.png create mode 100644 graphics/battle_anims/sprites/211.png create mode 100644 graphics/battle_anims/sprites/212.png create mode 100644 graphics/battle_anims/sprites/213.png create mode 100644 graphics/battle_anims/sprites/214.png create mode 100644 graphics/battle_anims/sprites/215.png create mode 100644 graphics/battle_anims/sprites/216.pal create mode 100644 graphics/battle_anims/sprites/217.png create mode 100644 graphics/battle_anims/sprites/218.png create mode 100644 graphics/battle_anims/sprites/219.pal create mode 100644 graphics/battle_anims/sprites/220.png create mode 100644 graphics/battle_anims/sprites/221.png create mode 100644 graphics/battle_anims/sprites/222.png create mode 100644 graphics/battle_anims/sprites/223.png create mode 100644 graphics/battle_anims/sprites/224.png create mode 100644 graphics/battle_anims/sprites/225.png create mode 100644 graphics/battle_anims/sprites/226.png create mode 100644 graphics/battle_anims/sprites/227.png create mode 100644 graphics/battle_anims/sprites/228.png create mode 100644 graphics/battle_anims/sprites/229.png create mode 100644 graphics/battle_anims/sprites/230.png create mode 100644 graphics/battle_anims/sprites/231.png create mode 100644 graphics/battle_anims/sprites/232.png create mode 100644 graphics/battle_anims/sprites/233.png create mode 100644 graphics/battle_anims/sprites/234.png create mode 100644 graphics/battle_anims/sprites/235.png create mode 100644 graphics/battle_anims/sprites/236.pal create mode 100644 graphics/battle_anims/sprites/237.pal create mode 100644 graphics/battle_anims/sprites/238.png create mode 100644 graphics/battle_anims/sprites/239.png create mode 100644 graphics/battle_anims/sprites/240.png create mode 100644 graphics/battle_anims/sprites/241.png create mode 100644 graphics/battle_anims/sprites/242.png create mode 100644 graphics/battle_anims/sprites/243.png create mode 100644 graphics/battle_anims/sprites/244.png create mode 100644 graphics/battle_anims/sprites/245.png create mode 100644 graphics/battle_anims/sprites/246.png create mode 100644 graphics/battle_anims/sprites/247.png create mode 100644 graphics/battle_anims/sprites/248.png create mode 100644 graphics/battle_anims/sprites/249.png create mode 100644 graphics/battle_anims/sprites/250.png create mode 100644 graphics/battle_anims/sprites/251.png create mode 100644 graphics/battle_anims/sprites/252.png create mode 100644 graphics/battle_anims/sprites/253.png create mode 100644 graphics/battle_anims/sprites/254.png create mode 100644 graphics/battle_anims/sprites/255.png create mode 100644 graphics/battle_anims/sprites/256.png create mode 100644 graphics/battle_anims/sprites/257.png create mode 100644 graphics/battle_anims/sprites/258.png create mode 100644 graphics/battle_anims/sprites/260.png create mode 100644 graphics/battle_anims/sprites/261.png create mode 100644 graphics/battle_anims/sprites/262.png create mode 100644 graphics/battle_anims/sprites/263.png create mode 100644 graphics/battle_anims/sprites/264.png create mode 100644 graphics/battle_anims/sprites/265.pal create mode 100644 graphics/battle_anims/sprites/266.png create mode 100644 graphics/battle_anims/sprites/267.pal create mode 100644 graphics/battle_anims/sprites/268.pal create mode 100644 graphics/battle_anims/sprites/269.png create mode 100644 graphics/battle_anims/sprites/270.png create mode 100644 graphics/battle_anims/sprites/271.png create mode 100644 graphics/battle_anims/sprites/272.png create mode 100644 graphics/battle_anims/sprites/273.png create mode 100644 graphics/battle_anims/sprites/274.png create mode 100644 graphics/battle_anims/sprites/275.png create mode 100644 graphics/battle_anims/sprites/276.png create mode 100644 graphics/battle_anims/sprites/277.png create mode 100644 graphics/battle_anims/sprites/278.png create mode 100644 graphics/battle_anims/sprites/279.png create mode 100644 graphics/battle_anims/sprites/280.png create mode 100644 graphics/battle_anims/sprites/281.png create mode 100644 graphics/battle_anims/sprites/282.png create mode 100644 graphics/battle_anims/sprites/283.png create mode 100644 graphics/battle_anims/sprites/284.png create mode 100644 graphics/battle_anims/sprites/285.png create mode 100644 graphics/battle_anims/sprites/286.pal create mode 100644 graphics/battle_anims/sprites/287.pal create mode 100644 graphics/battle_anims/sprites/effect.pal create mode 100644 graphics/battle_anims/sprites/substitute.bin create mode 100644 graphics/battle_anims/sprites/substitute.png create mode 100644 graphics/battle_interface/healthbox_safari.png create mode 100644 graphics/unused/goosuto.bin create mode 100644 graphics/unused/goosuto.png create mode 100644 graphics/unused/shadow.png diff --git a/asm/battle_anim_80A22E8.s b/asm/battle_anim_80A22E8.s index 2c5feb2f1..a11154651 100644 --- a/asm/battle_anim_80A22E8.s +++ b/asm/battle_anim_80A22E8.s @@ -46190,15 +46190,15 @@ _080B8828: bl sub_80752A0 mov r0, sp ldrb r0, [r0, 0x9] - ldr r1, _080B88C4 @ =gUnknown_8D1D388 + ldr r1, _080B88C4 @ =gFile_graphics_battle_anims_masks_metal_shine_tilemap bl sub_807543C mov r0, sp ldrb r0, [r0, 0x9] - ldr r1, _080B88C8 @ =gUnknown_8D1D224 + ldr r1, _080B88C8 @ =gFile_graphics_battle_anims_masks_metal_shine_sheet mov r2, sp ldrh r2, [r2, 0xA] bl sub_80753B4 - ldr r0, _080B88CC @ =gUnknown_8D1D360 + ldr r0, _080B88CC @ =gFile_graphics_battle_anims_masks_metal_shine_palette mov r1, sp ldrb r1, [r1, 0x8] lsls r1, 4 @@ -46236,9 +46236,9 @@ _080B8828: _080B88B8: .4byte gBattlerPartyIndexes _080B88BC: .4byte gPlayerParty _080B88C0: .4byte gUnknown_2037F1A -_080B88C4: .4byte gUnknown_8D1D388 -_080B88C8: .4byte gUnknown_8D1D224 -_080B88CC: .4byte gUnknown_8D1D360 +_080B88C4: .4byte gFile_graphics_battle_anims_masks_metal_shine_tilemap +_080B88C8: .4byte gFile_graphics_battle_anims_masks_metal_shine_sheet +_080B88CC: .4byte gFile_graphics_battle_anims_masks_metal_shine_palette _080B88D0: .4byte gUnknown_2022978 _080B88D4: .4byte gSprites _080B88D8: .4byte gUnknown_202297A diff --git a/data/graphics.s b/data/graphics.s index d821ff389..82d7feba6 100644 --- a/data/graphics.s +++ b/data/graphics.s @@ -1618,15 +1618,211 @@ gFile_graphics_battle_anims_backgrounds_00_tilemap:: @ 8D1CFD4 .incbin "graphics/battle_anims/backgrounds/00.bin.lz" .align 2 -gUnknown_8D1D224:: @ 8D1D224 - .incbin "baserom.gba", 0xD1D224, 0x13C +gFile_graphics_battle_anims_masks_metal_shine_sheet:: @ 8D1D224 + .incbin "graphics/battle_anims/masks/metal_shine.4bpp.lz" -gUnknown_8D1D360:: @ 8D1D360 - .incbin "baserom.gba", 0xD1D360, 0x28 + .align 2 +gFile_graphics_battle_anims_masks_metal_shine_palette:: @ 8D1D360 + .incbin "graphics/battle_anims/masks/metal_shine.gbapal.lz" + + .align 2 +gFile_graphics_battle_anims_masks_metal_shine_tilemap:: @ 8D1D388 + .incbin "graphics/battle_anims/masks/metal_shine.bin.lz" + + .align 2 +gFile_graphics_unused_goosuto_sheet:: @ 8D1D4FC + .incbin "graphics/unused/goosuto.4bpp.lz" + + .align 2 +gFile_graphics_unused_goosuto_palette:: @ 8D1D60C + .incbin "graphics/unused/goosuto.gbapal.lz" + + .align 2 +gFile_graphics_unused_goosuto_tilemap:: @ 8D1D624 + .incbin "graphics/unused/goosuto.bin.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_174_sheet:: @ 8D1D774 + .incbin "graphics/battle_anims/sprites/174.4bpp.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_174_palette:: @ 8D1D814 + .incbin "graphics/battle_anims/sprites/174.gbapal.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_175_sheet:: @ 8D1D83C + .incbin "graphics/battle_anims/sprites/175.4bpp.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_175_palette:: @ 8D1D8A0 + .incbin "graphics/battle_anims/sprites/175.gbapal.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_176_sheet:: @ 8D1D8C8 + .incbin "graphics/battle_anims/sprites/176.4bpp.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_176_palette:: @ 8D1DA20 + .incbin "graphics/battle_anims/sprites/176.gbapal.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_177_sheet:: @ 8D1DA48 + .incbin "graphics/battle_anims/sprites/177.4bpp.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_177_palette:: @ 8D1DB0C + .incbin "graphics/battle_anims/sprites/177.gbapal.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_178_sheet:: @ 8D1DB24 + .incbin "graphics/battle_anims/sprites/178.4bpp.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_178_palette:: @ 8D1DC8C + .incbin "graphics/battle_anims/sprites/178.gbapal.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_179_palette:: @ 8D1DCB4 + .incbin "graphics/battle_anims/sprites/179.gbapal.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_179_sheet:: @ 8D1DCDC + .incbin "graphics/battle_anims/sprites/179.4bpp.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_180_sheet:: @ 8D1DDB8 + .incbin "graphics/battle_anims/sprites/180.4bpp.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_181_sheet:: @ 8D1DDD0 + .incbin "graphics/battle_anims/sprites/181.4bpp.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_182_sheet:: @ 8D1E160 + .incbin "graphics/battle_anims/sprites/182.4bpp.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_182_palette:: @ 8D1E204 + .incbin "graphics/battle_anims/sprites/182.gbapal.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_183_sheet:: @ 8D1E22C + .incbin "graphics/battle_anims/sprites/183.4bpp.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_183_palette:: @ 8D1E4A4 + .incbin "graphics/battle_anims/sprites/183.gbapal.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_184_sheet:: @ 8D1E4CC + .incbin "graphics/battle_anims/sprites/184.4bpp.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_184_palette:: @ 8D1E620 + .incbin "graphics/battle_anims/sprites/184.gbapal.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_185_sheet:: @ 8D1E648 + .incbin "graphics/battle_anims/sprites/185.4bpp.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_185_palette:: @ 8D1EA5C + .incbin "graphics/battle_anims/sprites/185.gbapal.lz" + + .align 2 +gFile_graphics_battle_anims_backgrounds_03_sheet:: @ 8D1EA84 + .incbin "graphics/battle_anims/backgrounds/03.4bpp.lz" + + .align 2 +gFile_graphics_battle_anims_backgrounds_03_palette:: @ 8D1EC54 + .incbin "graphics/battle_anims/backgrounds/03.gbapal.lz" + + .align 2 +gFile_graphics_battle_anims_backgrounds_03_tilemap:: @ 8D1EC78 + .incbin "graphics/battle_anims/backgrounds/03.bin.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_187_sheet:: @ 8D1ED40 + .incbin "graphics/battle_anims/sprites/187.4bpp.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_187_palette:: @ 8D1EF30 + .incbin "graphics/battle_anims/sprites/187.gbapal.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_186_sheet:: @ 8D1EF50 + .incbin "graphics/battle_anims/sprites/186.4bpp.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_186_palette:: @ 8D1F31C + .incbin "graphics/battle_anims/sprites/186.gbapal.lz" + + + .align 2 +gUnknown_8D1F340:: @ 8D1F340 + .incbin "baserom.gba", 0xD1F340, 0x77C + + .align 2 +gFile_graphics_battle_interface_healthbox_safari_sheet:: @ 8D1FABC + .incbin "graphics/battle_interface/healthbox_safari.4bpp.lz" + + .align 2 +gFile_graphics_unused_shadow_sheet:: @ 8D1FD34 + .incbin "graphics/unused/shadow.4bpp.lz" + + .align 2 +gFile_graphics_unused_shadow_palette:: @ 8D1FD94 + .incbin "graphics/unused/shadow.gbapal.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_014_sheet:: @ 8D1FDA8 + .incbin "graphics/battle_anims/sprites/014.4bpp.lz" -gUnknown_8D1D388:: @ 8D1D388 - .incbin "baserom.gba", 0xD1D388, 0x34B4 + .align 2 +gFile_graphics_battle_anims_sprites_014_palette:: @ 8D1FE3C + .incbin "graphics/battle_anims/sprites/014.gbapal.lz" + .align 2 +gFile_graphics_battle_anims_sprites_190_sheet:: @ 8D1FE58 + .incbin "graphics/battle_anims/sprites/190.4bpp.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_190_palette:: @ 8D200B4 + .incbin "graphics/battle_anims/sprites/190.gbapal.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_191_sheet:: @ 8D200D8 + .incbin "graphics/battle_anims/sprites/191.4bpp.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_191_palette:: @ 8D20344 + .incbin "graphics/battle_anims/sprites/191.gbapal.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_189_sheet:: @ 8D2036C + .incbin "graphics/battle_anims/sprites/189.4bpp.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_189_palette:: @ 8D203F0 + .incbin "graphics/battle_anims/sprites/189.gbapal.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_192_sheet:: @ 8D20410 + .incbin "graphics/battle_anims/sprites/192.4bpp.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_192_palette:: @ 8D20690 + .incbin "graphics/battle_anims/sprites/192.gbapal.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_193_sheet:: @ 8D206B8 + .incbin "graphics/battle_anims/sprites/193.4bpp.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_193_palette:: @ 8D20814 + .incbin "graphics/battle_anims/sprites/193.gbapal.lz" + + .align 2 gUnknown_8D2083C:: @ 8D2083C .incbin "baserom.gba", 0xD2083C, 0x1C diff --git a/graphics/battle_anims/backgrounds/02.bin b/graphics/battle_anims/backgrounds/02.bin new file mode 100644 index 000000000..fabe87b3f Binary files /dev/null and b/graphics/battle_anims/backgrounds/02.bin differ diff --git a/graphics/battle_anims/backgrounds/02.png b/graphics/battle_anims/backgrounds/02.png new file mode 100644 index 000000000..c4519d909 Binary files /dev/null and b/graphics/battle_anims/backgrounds/02.png differ diff --git a/graphics/battle_anims/backgrounds/03.bin b/graphics/battle_anims/backgrounds/03.bin new file mode 100644 index 000000000..f642d1c7a Binary files /dev/null and b/graphics/battle_anims/backgrounds/03.bin differ diff --git a/graphics/battle_anims/backgrounds/03.png b/graphics/battle_anims/backgrounds/03.png new file mode 100644 index 000000000..2c2f9de87 Binary files /dev/null and b/graphics/battle_anims/backgrounds/03.png differ diff --git a/graphics/battle_anims/backgrounds/04.bin b/graphics/battle_anims/backgrounds/04.bin new file mode 100644 index 000000000..91230cb01 Binary files /dev/null and b/graphics/battle_anims/backgrounds/04.bin differ diff --git a/graphics/battle_anims/backgrounds/04.png b/graphics/battle_anims/backgrounds/04.png new file mode 100644 index 000000000..071684622 Binary files /dev/null and b/graphics/battle_anims/backgrounds/04.png differ diff --git a/graphics/battle_anims/backgrounds/05.bin b/graphics/battle_anims/backgrounds/05.bin new file mode 100644 index 000000000..42b26559c Binary files /dev/null and b/graphics/battle_anims/backgrounds/05.bin differ diff --git a/graphics/battle_anims/backgrounds/06.bin b/graphics/battle_anims/backgrounds/06.bin new file mode 100644 index 000000000..ef73f747c Binary files /dev/null and b/graphics/battle_anims/backgrounds/06.bin differ diff --git a/graphics/battle_anims/backgrounds/07.bin b/graphics/battle_anims/backgrounds/07.bin new file mode 100644 index 000000000..ca591c75e Binary files /dev/null and b/graphics/battle_anims/backgrounds/07.bin differ diff --git a/graphics/battle_anims/backgrounds/07.png b/graphics/battle_anims/backgrounds/07.png new file mode 100644 index 000000000..893bcee52 Binary files /dev/null and b/graphics/battle_anims/backgrounds/07.png differ diff --git a/graphics/battle_anims/backgrounds/08.bin b/graphics/battle_anims/backgrounds/08.bin new file mode 100644 index 000000000..8c9716842 Binary files /dev/null and b/graphics/battle_anims/backgrounds/08.bin differ diff --git a/graphics/battle_anims/backgrounds/09.bin b/graphics/battle_anims/backgrounds/09.bin new file mode 100644 index 000000000..d414051ce Binary files /dev/null and b/graphics/battle_anims/backgrounds/09.bin differ diff --git a/graphics/battle_anims/backgrounds/09.png b/graphics/battle_anims/backgrounds/09.png new file mode 100644 index 000000000..5746191e7 Binary files /dev/null and b/graphics/battle_anims/backgrounds/09.png differ diff --git a/graphics/battle_anims/backgrounds/10.bin b/graphics/battle_anims/backgrounds/10.bin new file mode 100644 index 000000000..99b488a43 Binary files /dev/null and b/graphics/battle_anims/backgrounds/10.bin differ diff --git a/graphics/battle_anims/backgrounds/11.bin b/graphics/battle_anims/backgrounds/11.bin new file mode 100644 index 000000000..6aaaae228 Binary files /dev/null and b/graphics/battle_anims/backgrounds/11.bin differ diff --git a/graphics/battle_anims/backgrounds/11.png b/graphics/battle_anims/backgrounds/11.png new file mode 100644 index 000000000..1d63d85bf Binary files /dev/null and b/graphics/battle_anims/backgrounds/11.png differ diff --git a/graphics/battle_anims/backgrounds/12.bin b/graphics/battle_anims/backgrounds/12.bin new file mode 100644 index 000000000..1c0ae690e Binary files /dev/null and b/graphics/battle_anims/backgrounds/12.bin differ diff --git a/graphics/battle_anims/backgrounds/12.png b/graphics/battle_anims/backgrounds/12.png new file mode 100644 index 000000000..cd831bb8f Binary files /dev/null and b/graphics/battle_anims/backgrounds/12.png differ diff --git a/graphics/battle_anims/backgrounds/13.bin b/graphics/battle_anims/backgrounds/13.bin new file mode 100644 index 000000000..89556edc3 Binary files /dev/null and b/graphics/battle_anims/backgrounds/13.bin differ diff --git a/graphics/battle_anims/backgrounds/14.bin b/graphics/battle_anims/backgrounds/14.bin new file mode 100644 index 000000000..2181a0227 Binary files /dev/null and b/graphics/battle_anims/backgrounds/14.bin differ diff --git a/graphics/battle_anims/backgrounds/15.bin b/graphics/battle_anims/backgrounds/15.bin new file mode 100644 index 000000000..5b0aff44b Binary files /dev/null and b/graphics/battle_anims/backgrounds/15.bin differ diff --git a/graphics/battle_anims/backgrounds/15.png b/graphics/battle_anims/backgrounds/15.png new file mode 100644 index 000000000..818811701 Binary files /dev/null and b/graphics/battle_anims/backgrounds/15.png differ diff --git a/graphics/battle_anims/backgrounds/16.bin b/graphics/battle_anims/backgrounds/16.bin new file mode 100644 index 000000000..54740367a Binary files /dev/null and b/graphics/battle_anims/backgrounds/16.bin differ diff --git a/graphics/battle_anims/backgrounds/16.png b/graphics/battle_anims/backgrounds/16.png new file mode 100644 index 000000000..6b0aa4973 Binary files /dev/null and b/graphics/battle_anims/backgrounds/16.png differ diff --git a/graphics/battle_anims/backgrounds/17.bin b/graphics/battle_anims/backgrounds/17.bin new file mode 100644 index 000000000..8cb199d05 Binary files /dev/null and b/graphics/battle_anims/backgrounds/17.bin differ diff --git a/graphics/battle_anims/backgrounds/17.png b/graphics/battle_anims/backgrounds/17.png new file mode 100644 index 000000000..5f9dd14dd Binary files /dev/null and b/graphics/battle_anims/backgrounds/17.png differ diff --git a/graphics/battle_anims/backgrounds/18.pal b/graphics/battle_anims/backgrounds/18.pal new file mode 100644 index 000000000..df2b878f6 --- /dev/null +++ b/graphics/battle_anims/backgrounds/18.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +106 205 197 +222 0 0 +189 0 0 +156 0 0 +123 0 0 +98 0 0 +0 0 0 +255 255 255 +230 246 238 +205 238 230 +180 230 222 +156 222 213 +131 213 205 +106 205 197 +0 0 0 diff --git a/graphics/battle_anims/backgrounds/20.bin b/graphics/battle_anims/backgrounds/20.bin new file mode 100644 index 000000000..d72acf171 Binary files /dev/null and b/graphics/battle_anims/backgrounds/20.bin differ diff --git a/graphics/battle_anims/backgrounds/20.png b/graphics/battle_anims/backgrounds/20.png new file mode 100644 index 000000000..34f22002a Binary files /dev/null and b/graphics/battle_anims/backgrounds/20.png differ diff --git a/graphics/battle_anims/backgrounds/21.bin b/graphics/battle_anims/backgrounds/21.bin new file mode 100644 index 000000000..e3d6f46e9 Binary files /dev/null and b/graphics/battle_anims/backgrounds/21.bin differ diff --git a/graphics/battle_anims/backgrounds/21.png b/graphics/battle_anims/backgrounds/21.png new file mode 100644 index 000000000..1571a1d69 Binary files /dev/null and b/graphics/battle_anims/backgrounds/21.png differ diff --git a/graphics/battle_anims/backgrounds/22.pal b/graphics/battle_anims/backgrounds/22.pal new file mode 100644 index 000000000..e8c5f59dc --- /dev/null +++ b/graphics/battle_anims/backgrounds/22.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +131 123 74 +139 139 90 +156 156 115 +172 172 139 +189 189 164 +205 205 180 +222 222 205 +238 238 230 +255 255 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/battle_anims/backgrounds/24.pal b/graphics/battle_anims/backgrounds/24.pal new file mode 100644 index 000000000..5eec18c67 --- /dev/null +++ b/graphics/battle_anims/backgrounds/24.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +255 197 74 +255 205 98 +255 213 123 +255 222 148 +255 230 172 +255 238 197 +255 246 222 +255 255 255 +255 189 74 +255 238 180 +255 230 139 +255 222 106 +255 213 74 +0 0 0 +0 0 0 diff --git a/graphics/battle_anims/backgrounds/attract.bin b/graphics/battle_anims/backgrounds/attract.bin new file mode 100644 index 000000000..b06f46479 Binary files /dev/null and b/graphics/battle_anims/backgrounds/attract.bin differ diff --git a/graphics/battle_anims/backgrounds/attract.png b/graphics/battle_anims/backgrounds/attract.png new file mode 100644 index 000000000..c5bba0f89 Binary files /dev/null and b/graphics/battle_anims/backgrounds/attract.png differ diff --git a/graphics/battle_anims/backgrounds/fog.bin b/graphics/battle_anims/backgrounds/fog.bin new file mode 100644 index 000000000..1f9d53f95 Binary files /dev/null and b/graphics/battle_anims/backgrounds/fog.bin differ diff --git a/graphics/battle_anims/backgrounds/sandstorm_brew.bin b/graphics/battle_anims/backgrounds/sandstorm_brew.bin new file mode 100644 index 000000000..64e6d8584 Binary files /dev/null and b/graphics/battle_anims/backgrounds/sandstorm_brew.bin differ diff --git a/graphics/battle_anims/backgrounds/sandstorm_brew.png b/graphics/battle_anims/backgrounds/sandstorm_brew.png new file mode 100644 index 000000000..87d5d41ea Binary files /dev/null and b/graphics/battle_anims/backgrounds/sandstorm_brew.png differ diff --git a/graphics/battle_anims/backgrounds/scary_face.png b/graphics/battle_anims/backgrounds/scary_face.png new file mode 100644 index 000000000..a395485cf Binary files /dev/null and b/graphics/battle_anims/backgrounds/scary_face.png differ diff --git a/graphics/battle_anims/backgrounds/scary_face_contest.bin b/graphics/battle_anims/backgrounds/scary_face_contest.bin new file mode 100644 index 000000000..e2d1e3a99 Binary files /dev/null and b/graphics/battle_anims/backgrounds/scary_face_contest.bin differ diff --git a/graphics/battle_anims/backgrounds/scary_face_opponent.bin b/graphics/battle_anims/backgrounds/scary_face_opponent.bin new file mode 100644 index 000000000..dfaaf5f2f Binary files /dev/null and b/graphics/battle_anims/backgrounds/scary_face_opponent.bin differ diff --git a/graphics/battle_anims/backgrounds/scary_face_player.bin b/graphics/battle_anims/backgrounds/scary_face_player.bin new file mode 100644 index 000000000..690305126 Binary files /dev/null and b/graphics/battle_anims/backgrounds/scary_face_player.bin differ diff --git a/graphics/battle_anims/backgrounds/water.png b/graphics/battle_anims/backgrounds/water.png new file mode 100644 index 000000000..7740f99f8 Binary files /dev/null and b/graphics/battle_anims/backgrounds/water.png differ diff --git a/graphics/battle_anims/backgrounds/water_muddy.pal b/graphics/battle_anims/backgrounds/water_muddy.pal new file mode 100644 index 000000000..0cb7218d9 --- /dev/null +++ b/graphics/battle_anims/backgrounds/water_muddy.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +131 49 0 +148 74 32 +164 106 65 +180 131 106 +197 164 139 +213 189 180 +230 222 213 +255 255 255 +148 74 32 +164 106 65 +197 164 139 +230 222 213 +255 255 255 +0 0 0 +0 0 0 diff --git a/graphics/battle_anims/masks/cure_bubbles.bin b/graphics/battle_anims/masks/cure_bubbles.bin new file mode 100644 index 000000000..fa2f572b6 Binary files /dev/null and b/graphics/battle_anims/masks/cure_bubbles.bin differ diff --git a/graphics/battle_anims/masks/cure_bubbles.png b/graphics/battle_anims/masks/cure_bubbles.png new file mode 100644 index 000000000..aa7f7b1f2 Binary files /dev/null and b/graphics/battle_anims/masks/cure_bubbles.png differ diff --git a/graphics/battle_anims/masks/curse.bin b/graphics/battle_anims/masks/curse.bin new file mode 100644 index 000000000..1e9623948 Binary files /dev/null and b/graphics/battle_anims/masks/curse.bin differ diff --git a/graphics/battle_anims/masks/curse.png b/graphics/battle_anims/masks/curse.png new file mode 100644 index 000000000..03979ee8d Binary files /dev/null and b/graphics/battle_anims/masks/curse.png differ diff --git a/graphics/battle_anims/masks/metal_shine.bin b/graphics/battle_anims/masks/metal_shine.bin new file mode 100644 index 000000000..fed60df36 Binary files /dev/null and b/graphics/battle_anims/masks/metal_shine.bin differ diff --git a/graphics/battle_anims/masks/metal_shine.png b/graphics/battle_anims/masks/metal_shine.png new file mode 100644 index 000000000..a9c5a952c Binary files /dev/null and b/graphics/battle_anims/masks/metal_shine.png differ diff --git a/graphics/battle_anims/masks/morning_sun.bin b/graphics/battle_anims/masks/morning_sun.bin new file mode 100644 index 000000000..cfa7b8069 Binary files /dev/null and b/graphics/battle_anims/masks/morning_sun.bin differ diff --git a/graphics/battle_anims/masks/morning_sun.png b/graphics/battle_anims/masks/morning_sun.png new file mode 100644 index 000000000..c10b02782 Binary files /dev/null and b/graphics/battle_anims/masks/morning_sun.png differ diff --git a/graphics/battle_anims/masks/stat.png b/graphics/battle_anims/masks/stat.png new file mode 100644 index 000000000..0a6014ccd Binary files /dev/null and b/graphics/battle_anims/masks/stat.png differ diff --git a/graphics/battle_anims/masks/stat1.pal b/graphics/battle_anims/masks/stat1.pal new file mode 100644 index 000000000..d4128a31f --- /dev/null +++ b/graphics/battle_anims/masks/stat1.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +255 255 255 +222 255 205 +189 255 164 +156 255 123 +115 222 90 +74 197 57 +32 172 24 +0 148 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/battle_anims/masks/stat2.pal b/graphics/battle_anims/masks/stat2.pal new file mode 100644 index 000000000..434b06e8d --- /dev/null +++ b/graphics/battle_anims/masks/stat2.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +255 255 255 +255 255 189 +255 255 123 +255 255 57 +255 189 41 +255 131 32 +255 65 16 +255 8 8 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/battle_anims/masks/stat3.pal b/graphics/battle_anims/masks/stat3.pal new file mode 100644 index 000000000..784e5c640 --- /dev/null +++ b/graphics/battle_anims/masks/stat3.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +255 255 255 +238 222 246 +222 189 246 +205 156 246 +197 123 246 +197 123 246 +164 90 213 +131 57 180 +106 24 148 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/battle_anims/masks/stat4.pal b/graphics/battle_anims/masks/stat4.pal new file mode 100644 index 000000000..2868f2479 --- /dev/null +++ b/graphics/battle_anims/masks/stat4.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +255 255 255 +189 255 255 +123 255 255 +57 255 255 +57 205 238 +57 156 230 +57 106 213 +65 57 205 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/battle_anims/masks/stat5.pal b/graphics/battle_anims/masks/stat5.pal new file mode 100644 index 000000000..4991b1bd7 --- /dev/null +++ b/graphics/battle_anims/masks/stat5.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +255 255 255 +230 230 230 +205 205 205 +180 180 189 +164 164 164 +139 139 148 +115 115 123 +98 98 106 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/battle_anims/masks/stat6.pal b/graphics/battle_anims/masks/stat6.pal new file mode 100644 index 000000000..f647ff4b3 --- /dev/null +++ b/graphics/battle_anims/masks/stat6.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +255 255 255 +205 246 230 +156 246 213 +106 246 197 +57 246 180 +32 213 148 +16 180 123 +0 148 98 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/battle_anims/masks/stat7.pal b/graphics/battle_anims/masks/stat7.pal new file mode 100644 index 000000000..4935eba7c --- /dev/null +++ b/graphics/battle_anims/masks/stat7.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +255 8 8 +255 65 16 +255 131 32 +255 189 41 +255 255 57 +255 255 123 +255 255 189 +255 255 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/battle_anims/masks/stat8.pal b/graphics/battle_anims/masks/stat8.pal new file mode 100644 index 000000000..ab1758e37 --- /dev/null +++ b/graphics/battle_anims/masks/stat8.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 148 0 +32 172 24 +74 197 57 +115 222 90 +156 255 123 +189 255 164 +222 255 205 +255 255 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/battle_anims/masks/stat_tilemap_1.bin b/graphics/battle_anims/masks/stat_tilemap_1.bin new file mode 100644 index 000000000..1b65e515a Binary files /dev/null and b/graphics/battle_anims/masks/stat_tilemap_1.bin differ diff --git a/graphics/battle_anims/masks/stat_tilemap_2.bin b/graphics/battle_anims/masks/stat_tilemap_2.bin new file mode 100644 index 000000000..eb336cb74 --- /dev/null +++ b/graphics/battle_anims/masks/stat_tilemap_2.bin @@ -0,0 +1 @@ +€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€$€%€&€'€$€%€&€'€$€%€&€'€$€%€&€'€$€%€&€'€$€%€&€'€$€%€&€'€$€%€&€'€4€5€6€7€4€5€6€7€4€5€6€7€4€5€6€7€4€5€6€7€4€5€6€7€4€5€6€7€4€5€6€7€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€$€%€&€'€$€%€&€'€$€%€&€'€$€%€&€'€$€%€&€'€$€%€&€'€$€%€&€'€$€%€&€'€4€5€6€7€4€5€6€7€4€5€6€7€4€5€6€7€4€5€6€7€4€5€6€7€4€5€6€7€4€5€6€7€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€$€%€&€'€$€%€&€'€$€%€&€'€$€%€&€'€$€%€&€'€$€%€&€'€$€%€&€'€$€%€&€'€4€5€6€7€4€5€6€7€4€5€6€7€4€5€6€7€4€5€6€7€4€5€6€7€4€5€6€7€4€5€6€7€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€$€%€&€'€$€%€&€'€$€%€&€'€$€%€&€'€$€%€&€'€$€%€&€'€$€%€&€'€$€%€&€'€4€5€6€7€4€5€6€7€4€5€6€7€4€5€6€7€4€5€6€7€4€5€6€7€4€5€6€7€4€5€6€7€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€$€%€&€'€$€%€&€'€$€%€&€'€$€%€&€'€$€%€&€'€$€%€&€'€$€%€&€'€$€%€&€'€4€5€6€7€4€5€6€7€4€5€6€7€4€5€6€7€4€5€6€7€4€5€6€7€4€5€6€7€4€5€6€7€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€$€%€&€'€$€%€&€'€$€%€&€'€$€%€&€'€$€%€&€'€$€%€&€'€$€%€&€'€$€%€&€'€4€5€6€7€4€5€6€7€4€5€6€7€4€5€6€7€4€5€6€7€4€5€6€7€4€5€6€7€4€5€6€7€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€$€%€&€'€$€%€&€'€$€%€&€'€$€%€&€'€$€%€&€'€$€%€&€'€$€%€&€'€$€%€&€'€4€5€6€7€4€5€6€7€4€5€6€7€4€5€6€7€4€5€6€7€4€5€6€7€4€5€6€7€4€5€6€7€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€$€%€&€'€$€%€&€'€$€%€&€'€$€%€&€'€$€%€&€'€$€%€&€'€$€%€&€'€$€%€&€'€4€5€6€7€4€5€6€7€4€5€6€7€4€5€6€7€4€5€6€7€4€5€6€7€4€5€6€7€4€5€6€7€ \ No newline at end of file diff --git a/graphics/battle_anims/masks/unknown_C2EA50.bin b/graphics/battle_anims/masks/unknown_C2EA50.bin new file mode 100644 index 000000000..712c1ee12 Binary files /dev/null and b/graphics/battle_anims/masks/unknown_C2EA50.bin differ diff --git a/graphics/battle_anims/masks/unknown_C2EA50.png b/graphics/battle_anims/masks/unknown_C2EA50.png new file mode 100644 index 000000000..d0b372cbb Binary files /dev/null and b/graphics/battle_anims/masks/unknown_C2EA50.png differ diff --git a/graphics/battle_anims/sprites/002.png b/graphics/battle_anims/sprites/002.png new file mode 100644 index 000000000..c2a98f6f5 Binary files /dev/null and b/graphics/battle_anims/sprites/002.png differ diff --git a/graphics/battle_anims/sprites/014.png b/graphics/battle_anims/sprites/014.png new file mode 100644 index 000000000..ab635306b Binary files /dev/null and b/graphics/battle_anims/sprites/014.png differ diff --git a/graphics/battle_anims/sprites/018.png b/graphics/battle_anims/sprites/018.png new file mode 100644 index 000000000..c760ff81a Binary files /dev/null and b/graphics/battle_anims/sprites/018.png differ diff --git a/graphics/battle_anims/sprites/053.png b/graphics/battle_anims/sprites/053.png new file mode 100644 index 000000000..9aaccf334 Binary files /dev/null and b/graphics/battle_anims/sprites/053.png differ diff --git a/graphics/battle_anims/sprites/064.png b/graphics/battle_anims/sprites/064.png new file mode 100644 index 000000000..069f4a311 Binary files /dev/null and b/graphics/battle_anims/sprites/064.png differ diff --git a/graphics/battle_anims/sprites/067.pal b/graphics/battle_anims/sprites/067.pal new file mode 100644 index 000000000..4c3a4265e --- /dev/null +++ b/graphics/battle_anims/sprites/067.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 197 246 +255 255 255 +230 246 189 +213 246 123 +197 246 57 +180 246 0 +156 222 24 +131 197 49 +106 172 74 +82 148 98 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/battle_anims/sprites/068.pal b/graphics/battle_anims/sprites/068.pal new file mode 100644 index 000000000..3075ab6b6 --- /dev/null +++ b/graphics/battle_anims/sprites/068.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 197 246 +255 255 255 +255 246 164 +255 246 82 +255 246 0 +255 246 0 +246 213 0 +238 180 0 +230 148 0 +230 115 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/battle_anims/sprites/087.png b/graphics/battle_anims/sprites/087.png new file mode 100644 index 000000000..e0e88687e Binary files /dev/null and b/graphics/battle_anims/sprites/087.png differ diff --git a/graphics/battle_anims/sprites/099.png b/graphics/battle_anims/sprites/099.png new file mode 100644 index 000000000..a7a79f8bf Binary files /dev/null and b/graphics/battle_anims/sprites/099.png differ diff --git a/graphics/battle_anims/sprites/143.png b/graphics/battle_anims/sprites/143.png new file mode 100644 index 000000000..da3f273ac Binary files /dev/null and b/graphics/battle_anims/sprites/143.png differ diff --git a/graphics/battle_anims/sprites/174.png b/graphics/battle_anims/sprites/174.png new file mode 100644 index 000000000..d8cf8dbe4 Binary files /dev/null and b/graphics/battle_anims/sprites/174.png differ diff --git a/graphics/battle_anims/sprites/175.png b/graphics/battle_anims/sprites/175.png new file mode 100644 index 000000000..042ef87ac Binary files /dev/null and b/graphics/battle_anims/sprites/175.png differ diff --git a/graphics/battle_anims/sprites/176.png b/graphics/battle_anims/sprites/176.png new file mode 100644 index 000000000..aaa3c2f96 Binary files /dev/null and b/graphics/battle_anims/sprites/176.png differ diff --git a/graphics/battle_anims/sprites/177.png b/graphics/battle_anims/sprites/177.png new file mode 100644 index 000000000..ec1b2246b Binary files /dev/null and b/graphics/battle_anims/sprites/177.png differ diff --git a/graphics/battle_anims/sprites/178.png b/graphics/battle_anims/sprites/178.png new file mode 100644 index 000000000..c7b68d278 Binary files /dev/null and b/graphics/battle_anims/sprites/178.png differ diff --git a/graphics/battle_anims/sprites/179.png b/graphics/battle_anims/sprites/179.png new file mode 100644 index 000000000..94f102402 Binary files /dev/null and b/graphics/battle_anims/sprites/179.png differ diff --git a/graphics/battle_anims/sprites/180.png b/graphics/battle_anims/sprites/180.png new file mode 100644 index 000000000..76eb7c9a8 Binary files /dev/null and b/graphics/battle_anims/sprites/180.png differ diff --git a/graphics/battle_anims/sprites/181.png b/graphics/battle_anims/sprites/181.png new file mode 100644 index 000000000..ea561b9db Binary files /dev/null and b/graphics/battle_anims/sprites/181.png differ diff --git a/graphics/battle_anims/sprites/182.png b/graphics/battle_anims/sprites/182.png new file mode 100644 index 000000000..e586f630b Binary files /dev/null and b/graphics/battle_anims/sprites/182.png differ diff --git a/graphics/battle_anims/sprites/183.png b/graphics/battle_anims/sprites/183.png new file mode 100644 index 000000000..55b2044b8 Binary files /dev/null and b/graphics/battle_anims/sprites/183.png differ diff --git a/graphics/battle_anims/sprites/184.png b/graphics/battle_anims/sprites/184.png new file mode 100644 index 000000000..99ba7e475 Binary files /dev/null and b/graphics/battle_anims/sprites/184.png differ diff --git a/graphics/battle_anims/sprites/185.png b/graphics/battle_anims/sprites/185.png new file mode 100644 index 000000000..f3a4305c5 Binary files /dev/null and b/graphics/battle_anims/sprites/185.png differ diff --git a/graphics/battle_anims/sprites/186.png b/graphics/battle_anims/sprites/186.png new file mode 100644 index 000000000..8fbc31367 Binary files /dev/null and b/graphics/battle_anims/sprites/186.png differ diff --git a/graphics/battle_anims/sprites/187.png b/graphics/battle_anims/sprites/187.png new file mode 100644 index 000000000..b0caeb98f Binary files /dev/null and b/graphics/battle_anims/sprites/187.png differ diff --git a/graphics/battle_anims/sprites/188.png b/graphics/battle_anims/sprites/188.png new file mode 100644 index 000000000..3b0b6f402 Binary files /dev/null and b/graphics/battle_anims/sprites/188.png differ diff --git a/graphics/battle_anims/sprites/189.png b/graphics/battle_anims/sprites/189.png new file mode 100644 index 000000000..67fdd4536 Binary files /dev/null and b/graphics/battle_anims/sprites/189.png differ diff --git a/graphics/battle_anims/sprites/190.png b/graphics/battle_anims/sprites/190.png new file mode 100644 index 000000000..6fcb4826e Binary files /dev/null and b/graphics/battle_anims/sprites/190.png differ diff --git a/graphics/battle_anims/sprites/191.png b/graphics/battle_anims/sprites/191.png new file mode 100644 index 000000000..e1442ff5c Binary files /dev/null and b/graphics/battle_anims/sprites/191.png differ diff --git a/graphics/battle_anims/sprites/192.png b/graphics/battle_anims/sprites/192.png new file mode 100644 index 000000000..1f76354ab Binary files /dev/null and b/graphics/battle_anims/sprites/192.png differ diff --git a/graphics/battle_anims/sprites/193.png b/graphics/battle_anims/sprites/193.png new file mode 100644 index 000000000..f3b6bd2c2 Binary files /dev/null and b/graphics/battle_anims/sprites/193.png differ diff --git a/graphics/battle_anims/sprites/194.png b/graphics/battle_anims/sprites/194.png new file mode 100644 index 000000000..228013658 Binary files /dev/null and b/graphics/battle_anims/sprites/194.png differ diff --git a/graphics/battle_anims/sprites/195.png b/graphics/battle_anims/sprites/195.png new file mode 100644 index 000000000..9aefe398e Binary files /dev/null and b/graphics/battle_anims/sprites/195.png differ diff --git a/graphics/battle_anims/sprites/196.png b/graphics/battle_anims/sprites/196.png new file mode 100644 index 000000000..c3dee2e0a Binary files /dev/null and b/graphics/battle_anims/sprites/196.png differ diff --git a/graphics/battle_anims/sprites/197.png b/graphics/battle_anims/sprites/197.png new file mode 100644 index 000000000..ac7ac5083 Binary files /dev/null and b/graphics/battle_anims/sprites/197.png differ diff --git a/graphics/battle_anims/sprites/198.png b/graphics/battle_anims/sprites/198.png new file mode 100644 index 000000000..abe613212 Binary files /dev/null and b/graphics/battle_anims/sprites/198.png differ diff --git a/graphics/battle_anims/sprites/199.png b/graphics/battle_anims/sprites/199.png new file mode 100644 index 000000000..9468fddc9 Binary files /dev/null and b/graphics/battle_anims/sprites/199.png differ diff --git a/graphics/battle_anims/sprites/200.png b/graphics/battle_anims/sprites/200.png new file mode 100644 index 000000000..b7b9d16e6 Binary files /dev/null and b/graphics/battle_anims/sprites/200.png differ diff --git a/graphics/battle_anims/sprites/201.png b/graphics/battle_anims/sprites/201.png new file mode 100644 index 000000000..4b8cb700c Binary files /dev/null and b/graphics/battle_anims/sprites/201.png differ diff --git a/graphics/battle_anims/sprites/202.png b/graphics/battle_anims/sprites/202.png new file mode 100644 index 000000000..48af9a21e Binary files /dev/null and b/graphics/battle_anims/sprites/202.png differ diff --git a/graphics/battle_anims/sprites/203.png b/graphics/battle_anims/sprites/203.png new file mode 100644 index 000000000..f7a81679f Binary files /dev/null and b/graphics/battle_anims/sprites/203.png differ diff --git a/graphics/battle_anims/sprites/204.png b/graphics/battle_anims/sprites/204.png new file mode 100644 index 000000000..c36d57e10 Binary files /dev/null and b/graphics/battle_anims/sprites/204.png differ diff --git a/graphics/battle_anims/sprites/205.png b/graphics/battle_anims/sprites/205.png new file mode 100644 index 000000000..8c558c433 Binary files /dev/null and b/graphics/battle_anims/sprites/205.png differ diff --git a/graphics/battle_anims/sprites/206.pal b/graphics/battle_anims/sprites/206.pal new file mode 100644 index 000000000..b90e8d645 --- /dev/null +++ b/graphics/battle_anims/sprites/206.pal @@ -0,0 +1,83 @@ +JASC-PAL +0100 +80 +0 0 0 +255 255 255 +255 189 189 +255 123 123 +255 57 57 +255 0 0 +213 0 0 +0 0 0 +197 148 197 +238 246 246 +238 222 180 +246 205 123 +246 189 57 +255 172 0 +213 148 0 +0 0 0 +0 0 0 +238 246 246 +238 246 180 +246 246 123 +246 246 57 +255 246 0 +213 205 0 +0 0 0 +197 148 197 +238 246 246 +189 246 180 +139 246 123 +90 246 57 +41 255 0 +41 213 0 +0 0 0 +0 0 0 +238 246 246 +172 238 230 +115 238 222 +57 230 205 +0 230 197 +0 189 156 +0 0 0 +197 148 197 +238 246 246 +172 205 246 +115 164 246 +57 123 246 +0 82 255 +0 57 205 +0 0 0 +0 0 0 +238 246 246 +222 180 246 +205 123 246 +189 57 246 +172 0 255 +148 0 205 +0 0 0 +197 148 197 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +238 246 246 +164 222 246 +98 197 246 +82 164 205 +65 139 172 +49 106 139 +0 0 0 +197 148 197 +255 255 255 +230 222 213 +205 189 180 +180 156 139 +164 131 106 +123 98 82 +0 0 0 diff --git a/graphics/battle_anims/sprites/206.png b/graphics/battle_anims/sprites/206.png new file mode 100644 index 000000000..d3584f855 Binary files /dev/null and b/graphics/battle_anims/sprites/206.png differ diff --git a/graphics/battle_anims/sprites/207.png b/graphics/battle_anims/sprites/207.png new file mode 100644 index 000000000..0d3450c6e Binary files /dev/null and b/graphics/battle_anims/sprites/207.png differ diff --git a/graphics/battle_anims/sprites/208.png b/graphics/battle_anims/sprites/208.png new file mode 100644 index 000000000..61bac622e Binary files /dev/null and b/graphics/battle_anims/sprites/208.png differ diff --git a/graphics/battle_anims/sprites/209.png b/graphics/battle_anims/sprites/209.png new file mode 100644 index 000000000..dea2a60bb Binary files /dev/null and b/graphics/battle_anims/sprites/209.png differ diff --git a/graphics/battle_anims/sprites/210.png b/graphics/battle_anims/sprites/210.png new file mode 100644 index 000000000..5ebfa0684 Binary files /dev/null and b/graphics/battle_anims/sprites/210.png differ diff --git a/graphics/battle_anims/sprites/211.png b/graphics/battle_anims/sprites/211.png new file mode 100644 index 000000000..28f5317e5 Binary files /dev/null and b/graphics/battle_anims/sprites/211.png differ diff --git a/graphics/battle_anims/sprites/212.png b/graphics/battle_anims/sprites/212.png new file mode 100644 index 000000000..8a8c3a0ac Binary files /dev/null and b/graphics/battle_anims/sprites/212.png differ diff --git a/graphics/battle_anims/sprites/213.png b/graphics/battle_anims/sprites/213.png new file mode 100644 index 000000000..90a622f64 Binary files /dev/null and b/graphics/battle_anims/sprites/213.png differ diff --git a/graphics/battle_anims/sprites/214.png b/graphics/battle_anims/sprites/214.png new file mode 100644 index 000000000..9f6fc8d81 Binary files /dev/null and b/graphics/battle_anims/sprites/214.png differ diff --git a/graphics/battle_anims/sprites/215.png b/graphics/battle_anims/sprites/215.png new file mode 100644 index 000000000..895ab4ec5 Binary files /dev/null and b/graphics/battle_anims/sprites/215.png differ diff --git a/graphics/battle_anims/sprites/216.pal b/graphics/battle_anims/sprites/216.pal new file mode 100644 index 000000000..225cf9cf6 --- /dev/null +++ b/graphics/battle_anims/sprites/216.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +255 238 205 +255 189 164 +255 139 131 +255 90 90 +255 41 57 +213 41 57 +180 41 57 +139 41 57 +106 41 57 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/battle_anims/sprites/217.png b/graphics/battle_anims/sprites/217.png new file mode 100644 index 000000000..3583670eb Binary files /dev/null and b/graphics/battle_anims/sprites/217.png differ diff --git a/graphics/battle_anims/sprites/218.png b/graphics/battle_anims/sprites/218.png new file mode 100644 index 000000000..d22ff8ef9 Binary files /dev/null and b/graphics/battle_anims/sprites/218.png differ diff --git a/graphics/battle_anims/sprites/219.pal b/graphics/battle_anims/sprites/219.pal new file mode 100644 index 000000000..27cf421cc --- /dev/null +++ b/graphics/battle_anims/sprites/219.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +255 255 255 +255 180 255 +238 115 222 +230 57 189 +222 0 156 +189 8 131 +156 24 115 +123 32 90 +90 49 74 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/battle_anims/sprites/220.png b/graphics/battle_anims/sprites/220.png new file mode 100644 index 000000000..900a9e428 Binary files /dev/null and b/graphics/battle_anims/sprites/220.png differ diff --git a/graphics/battle_anims/sprites/221.png b/graphics/battle_anims/sprites/221.png new file mode 100644 index 000000000..f30ca7907 Binary files /dev/null and b/graphics/battle_anims/sprites/221.png differ diff --git a/graphics/battle_anims/sprites/222.png b/graphics/battle_anims/sprites/222.png new file mode 100644 index 000000000..1205494d4 Binary files /dev/null and b/graphics/battle_anims/sprites/222.png differ diff --git a/graphics/battle_anims/sprites/223.png b/graphics/battle_anims/sprites/223.png new file mode 100644 index 000000000..5f9dbf83e Binary files /dev/null and b/graphics/battle_anims/sprites/223.png differ diff --git a/graphics/battle_anims/sprites/224.png b/graphics/battle_anims/sprites/224.png new file mode 100644 index 000000000..c6e8a1c63 Binary files /dev/null and b/graphics/battle_anims/sprites/224.png differ diff --git a/graphics/battle_anims/sprites/225.png b/graphics/battle_anims/sprites/225.png new file mode 100644 index 000000000..c4efbf2de Binary files /dev/null and b/graphics/battle_anims/sprites/225.png differ diff --git a/graphics/battle_anims/sprites/226.png b/graphics/battle_anims/sprites/226.png new file mode 100644 index 000000000..a8b2e817a Binary files /dev/null and b/graphics/battle_anims/sprites/226.png differ diff --git a/graphics/battle_anims/sprites/227.png b/graphics/battle_anims/sprites/227.png new file mode 100644 index 000000000..baa51d106 Binary files /dev/null and b/graphics/battle_anims/sprites/227.png differ diff --git a/graphics/battle_anims/sprites/228.png b/graphics/battle_anims/sprites/228.png new file mode 100644 index 000000000..e569fea34 Binary files /dev/null and b/graphics/battle_anims/sprites/228.png differ diff --git a/graphics/battle_anims/sprites/229.png b/graphics/battle_anims/sprites/229.png new file mode 100644 index 000000000..be1e038da Binary files /dev/null and b/graphics/battle_anims/sprites/229.png differ diff --git a/graphics/battle_anims/sprites/230.png b/graphics/battle_anims/sprites/230.png new file mode 100644 index 000000000..9157118fd Binary files /dev/null and b/graphics/battle_anims/sprites/230.png differ diff --git a/graphics/battle_anims/sprites/231.png b/graphics/battle_anims/sprites/231.png new file mode 100644 index 000000000..7b3474bb9 Binary files /dev/null and b/graphics/battle_anims/sprites/231.png differ diff --git a/graphics/battle_anims/sprites/232.png b/graphics/battle_anims/sprites/232.png new file mode 100644 index 000000000..ebdf118e1 Binary files /dev/null and b/graphics/battle_anims/sprites/232.png differ diff --git a/graphics/battle_anims/sprites/233.png b/graphics/battle_anims/sprites/233.png new file mode 100644 index 000000000..e71e97eda Binary files /dev/null and b/graphics/battle_anims/sprites/233.png differ diff --git a/graphics/battle_anims/sprites/234.png b/graphics/battle_anims/sprites/234.png new file mode 100644 index 000000000..e5efece20 Binary files /dev/null and b/graphics/battle_anims/sprites/234.png differ diff --git a/graphics/battle_anims/sprites/235.png b/graphics/battle_anims/sprites/235.png new file mode 100644 index 000000000..1bbd9c027 Binary files /dev/null and b/graphics/battle_anims/sprites/235.png differ diff --git a/graphics/battle_anims/sprites/236.pal b/graphics/battle_anims/sprites/236.pal new file mode 100644 index 000000000..0b587a87c --- /dev/null +++ b/graphics/battle_anims/sprites/236.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +139 222 255 +65 148 255 +0 74 255 +0 57 205 +0 49 156 +0 41 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 +0 0 0 diff --git a/graphics/battle_anims/sprites/237.pal b/graphics/battle_anims/sprites/237.pal new file mode 100644 index 000000000..3eddc5612 --- /dev/null +++ b/graphics/battle_anims/sprites/237.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +255 172 74 +255 90 41 +255 8 8 +213 8 8 +172 8 8 +139 8 8 +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 diff --git a/graphics/battle_anims/sprites/238.png b/graphics/battle_anims/sprites/238.png new file mode 100644 index 000000000..1c9565881 Binary files /dev/null and b/graphics/battle_anims/sprites/238.png differ diff --git a/graphics/battle_anims/sprites/239.png b/graphics/battle_anims/sprites/239.png new file mode 100644 index 000000000..b2c2d72ce Binary files /dev/null and b/graphics/battle_anims/sprites/239.png differ diff --git a/graphics/battle_anims/sprites/240.png b/graphics/battle_anims/sprites/240.png new file mode 100644 index 000000000..783dd40f9 Binary files /dev/null and b/graphics/battle_anims/sprites/240.png differ diff --git a/graphics/battle_anims/sprites/241.png b/graphics/battle_anims/sprites/241.png new file mode 100644 index 000000000..21218ceb6 Binary files /dev/null and b/graphics/battle_anims/sprites/241.png differ diff --git a/graphics/battle_anims/sprites/242.png b/graphics/battle_anims/sprites/242.png new file mode 100644 index 000000000..414225c8f Binary files /dev/null and b/graphics/battle_anims/sprites/242.png differ diff --git a/graphics/battle_anims/sprites/243.png b/graphics/battle_anims/sprites/243.png new file mode 100644 index 000000000..15cffcc85 Binary files /dev/null and b/graphics/battle_anims/sprites/243.png differ diff --git a/graphics/battle_anims/sprites/244.png b/graphics/battle_anims/sprites/244.png new file mode 100644 index 000000000..09e0c0d68 Binary files /dev/null and b/graphics/battle_anims/sprites/244.png differ diff --git a/graphics/battle_anims/sprites/245.png b/graphics/battle_anims/sprites/245.png new file mode 100644 index 000000000..39618d394 Binary files /dev/null and b/graphics/battle_anims/sprites/245.png differ diff --git a/graphics/battle_anims/sprites/246.png b/graphics/battle_anims/sprites/246.png new file mode 100644 index 000000000..d1835b10b Binary files /dev/null and b/graphics/battle_anims/sprites/246.png differ diff --git a/graphics/battle_anims/sprites/247.png b/graphics/battle_anims/sprites/247.png new file mode 100644 index 000000000..858d4640d Binary files /dev/null and b/graphics/battle_anims/sprites/247.png differ diff --git a/graphics/battle_anims/sprites/248.png b/graphics/battle_anims/sprites/248.png new file mode 100644 index 000000000..5a3fb393f Binary files /dev/null and b/graphics/battle_anims/sprites/248.png differ diff --git a/graphics/battle_anims/sprites/249.png b/graphics/battle_anims/sprites/249.png new file mode 100644 index 000000000..33d6511ff Binary files /dev/null and b/graphics/battle_anims/sprites/249.png differ diff --git a/graphics/battle_anims/sprites/250.png b/graphics/battle_anims/sprites/250.png new file mode 100644 index 000000000..4088e3328 Binary files /dev/null and b/graphics/battle_anims/sprites/250.png differ diff --git a/graphics/battle_anims/sprites/251.png b/graphics/battle_anims/sprites/251.png new file mode 100644 index 000000000..ad16940d9 Binary files /dev/null and b/graphics/battle_anims/sprites/251.png differ diff --git a/graphics/battle_anims/sprites/252.png b/graphics/battle_anims/sprites/252.png new file mode 100644 index 000000000..2ed8eee4a Binary files /dev/null and b/graphics/battle_anims/sprites/252.png differ diff --git a/graphics/battle_anims/sprites/253.png b/graphics/battle_anims/sprites/253.png new file mode 100644 index 000000000..22f08ddef Binary files /dev/null and b/graphics/battle_anims/sprites/253.png differ diff --git a/graphics/battle_anims/sprites/254.png b/graphics/battle_anims/sprites/254.png new file mode 100644 index 000000000..1aa77e17f Binary files /dev/null and b/graphics/battle_anims/sprites/254.png differ diff --git a/graphics/battle_anims/sprites/255.png b/graphics/battle_anims/sprites/255.png new file mode 100644 index 000000000..f5f8c9e8b Binary files /dev/null and b/graphics/battle_anims/sprites/255.png differ diff --git a/graphics/battle_anims/sprites/256.png b/graphics/battle_anims/sprites/256.png new file mode 100644 index 000000000..7043d824b Binary files /dev/null and b/graphics/battle_anims/sprites/256.png differ diff --git a/graphics/battle_anims/sprites/257.png b/graphics/battle_anims/sprites/257.png new file mode 100644 index 000000000..d3fba6c4f Binary files /dev/null and b/graphics/battle_anims/sprites/257.png differ diff --git a/graphics/battle_anims/sprites/258.png b/graphics/battle_anims/sprites/258.png new file mode 100644 index 000000000..bf50cc099 Binary files /dev/null and b/graphics/battle_anims/sprites/258.png differ diff --git a/graphics/battle_anims/sprites/260.png b/graphics/battle_anims/sprites/260.png new file mode 100644 index 000000000..c7883c900 Binary files /dev/null and b/graphics/battle_anims/sprites/260.png differ diff --git a/graphics/battle_anims/sprites/261.png b/graphics/battle_anims/sprites/261.png new file mode 100644 index 000000000..12f0b1744 Binary files /dev/null and b/graphics/battle_anims/sprites/261.png differ diff --git a/graphics/battle_anims/sprites/262.png b/graphics/battle_anims/sprites/262.png new file mode 100644 index 000000000..857558fd2 Binary files /dev/null and b/graphics/battle_anims/sprites/262.png differ diff --git a/graphics/battle_anims/sprites/263.png b/graphics/battle_anims/sprites/263.png new file mode 100644 index 000000000..53148056c Binary files /dev/null and b/graphics/battle_anims/sprites/263.png differ diff --git a/graphics/battle_anims/sprites/264.png b/graphics/battle_anims/sprites/264.png new file mode 100644 index 000000000..a590d96a5 Binary files /dev/null and b/graphics/battle_anims/sprites/264.png differ diff --git a/graphics/battle_anims/sprites/265.pal b/graphics/battle_anims/sprites/265.pal new file mode 100644 index 000000000..34914d257 --- /dev/null +++ b/graphics/battle_anims/sprites/265.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +205 246 197 +106 246 98 +8 246 0 +8 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 +0 0 0 diff --git a/graphics/battle_anims/sprites/266.png b/graphics/battle_anims/sprites/266.png new file mode 100644 index 000000000..c53e8059c Binary files /dev/null and b/graphics/battle_anims/sprites/266.png differ diff --git a/graphics/battle_anims/sprites/267.pal b/graphics/battle_anims/sprites/267.pal new file mode 100644 index 000000000..1973e6f45 --- /dev/null +++ b/graphics/battle_anims/sprites/267.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +246 255 246 +222 238 230 +197 230 213 +172 213 197 +156 205 189 +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 diff --git a/graphics/battle_anims/sprites/268.pal b/graphics/battle_anims/sprites/268.pal new file mode 100644 index 000000000..d40d72f69 --- /dev/null +++ b/graphics/battle_anims/sprites/268.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +197 246 246 +148 180 246 +98 123 246 +49 65 246 +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 diff --git a/graphics/battle_anims/sprites/269.png b/graphics/battle_anims/sprites/269.png new file mode 100644 index 000000000..d699f4c48 Binary files /dev/null and b/graphics/battle_anims/sprites/269.png differ diff --git a/graphics/battle_anims/sprites/270.png b/graphics/battle_anims/sprites/270.png new file mode 100644 index 000000000..1581ad1ea Binary files /dev/null and b/graphics/battle_anims/sprites/270.png differ diff --git a/graphics/battle_anims/sprites/271.png b/graphics/battle_anims/sprites/271.png new file mode 100644 index 000000000..d77ca0682 Binary files /dev/null and b/graphics/battle_anims/sprites/271.png differ diff --git a/graphics/battle_anims/sprites/272.png b/graphics/battle_anims/sprites/272.png new file mode 100644 index 000000000..0acaa474d Binary files /dev/null and b/graphics/battle_anims/sprites/272.png differ diff --git a/graphics/battle_anims/sprites/273.png b/graphics/battle_anims/sprites/273.png new file mode 100644 index 000000000..6398df8c0 Binary files /dev/null and b/graphics/battle_anims/sprites/273.png differ diff --git a/graphics/battle_anims/sprites/274.png b/graphics/battle_anims/sprites/274.png new file mode 100644 index 000000000..e284c57a6 Binary files /dev/null and b/graphics/battle_anims/sprites/274.png differ diff --git a/graphics/battle_anims/sprites/275.png b/graphics/battle_anims/sprites/275.png new file mode 100644 index 000000000..b1b7b6644 Binary files /dev/null and b/graphics/battle_anims/sprites/275.png differ diff --git a/graphics/battle_anims/sprites/276.png b/graphics/battle_anims/sprites/276.png new file mode 100644 index 000000000..21d51a22b Binary files /dev/null and b/graphics/battle_anims/sprites/276.png differ diff --git a/graphics/battle_anims/sprites/277.png b/graphics/battle_anims/sprites/277.png new file mode 100644 index 000000000..7745fc28c Binary files /dev/null and b/graphics/battle_anims/sprites/277.png differ diff --git a/graphics/battle_anims/sprites/278.png b/graphics/battle_anims/sprites/278.png new file mode 100644 index 000000000..7281bfdbd Binary files /dev/null and b/graphics/battle_anims/sprites/278.png differ diff --git a/graphics/battle_anims/sprites/279.png b/graphics/battle_anims/sprites/279.png new file mode 100644 index 000000000..46933b76e Binary files /dev/null and b/graphics/battle_anims/sprites/279.png differ diff --git a/graphics/battle_anims/sprites/280.png b/graphics/battle_anims/sprites/280.png new file mode 100644 index 000000000..ce7f086fd Binary files /dev/null and b/graphics/battle_anims/sprites/280.png differ diff --git a/graphics/battle_anims/sprites/281.png b/graphics/battle_anims/sprites/281.png new file mode 100644 index 000000000..e3cc13492 Binary files /dev/null and b/graphics/battle_anims/sprites/281.png differ diff --git a/graphics/battle_anims/sprites/282.png b/graphics/battle_anims/sprites/282.png new file mode 100644 index 000000000..d89aab1ad Binary files /dev/null and b/graphics/battle_anims/sprites/282.png differ diff --git a/graphics/battle_anims/sprites/283.png b/graphics/battle_anims/sprites/283.png new file mode 100644 index 000000000..03853aef6 Binary files /dev/null and b/graphics/battle_anims/sprites/283.png differ diff --git a/graphics/battle_anims/sprites/284.png b/graphics/battle_anims/sprites/284.png new file mode 100644 index 000000000..67c1bcd0a Binary files /dev/null and b/graphics/battle_anims/sprites/284.png differ diff --git a/graphics/battle_anims/sprites/285.png b/graphics/battle_anims/sprites/285.png new file mode 100644 index 000000000..eb54111b2 Binary files /dev/null and b/graphics/battle_anims/sprites/285.png differ diff --git a/graphics/battle_anims/sprites/286.pal b/graphics/battle_anims/sprites/286.pal new file mode 100644 index 000000000..a2703b853 --- /dev/null +++ b/graphics/battle_anims/sprites/286.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +255 255 255 +230 238 255 +205 230 255 +180 222 255 +156 205 255 +131 197 255 +106 189 255 +90 164 230 +82 148 213 +74 123 189 +65 106 172 +57 90 156 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/battle_anims/sprites/287.pal b/graphics/battle_anims/sprites/287.pal new file mode 100644 index 000000000..631948567 --- /dev/null +++ b/graphics/battle_anims/sprites/287.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +98 197 197 +255 255 255 +222 246 230 +189 246 205 +156 246 180 +123 238 156 +90 238 131 +57 238 115 +57 238 115 +65 205 90 +74 180 74 +82 148 57 +90 123 41 +106 98 24 +0 0 0 +0 0 0 diff --git a/graphics/battle_anims/sprites/effect.pal b/graphics/battle_anims/sprites/effect.pal new file mode 100644 index 000000000..3dcf4cff6 --- /dev/null +++ b/graphics/battle_anims/sprites/effect.pal @@ -0,0 +1,27 @@ +JASC-PAL +0100 +24 +230 205 8 +230 172 41 +222 148 65 +222 115 90 +213 82 123 +213 57 148 +205 24 172 +205 0 205 +205 0 189 +205 0 164 +205 0 131 +205 0 106 +213 0 82 +213 0 49 +213 0 24 +222 0 0 +222 8 0 +222 41 0 +222 74 0 +222 98 0 +230 131 0 +230 156 0 +230 189 0 +238 222 0 diff --git a/graphics/battle_anims/sprites/substitute.bin b/graphics/battle_anims/sprites/substitute.bin new file mode 100644 index 000000000..d30c07d4e Binary files /dev/null and b/graphics/battle_anims/sprites/substitute.bin differ diff --git a/graphics/battle_anims/sprites/substitute.png b/graphics/battle_anims/sprites/substitute.png new file mode 100644 index 000000000..0b6dea850 Binary files /dev/null and b/graphics/battle_anims/sprites/substitute.png differ diff --git a/graphics/battle_interface/healthbox_safari.png b/graphics/battle_interface/healthbox_safari.png new file mode 100644 index 000000000..e48f380a4 Binary files /dev/null and b/graphics/battle_interface/healthbox_safari.png differ diff --git a/graphics/unused/goosuto.bin b/graphics/unused/goosuto.bin new file mode 100644 index 000000000..8e5329157 Binary files /dev/null and b/graphics/unused/goosuto.bin differ diff --git a/graphics/unused/goosuto.png b/graphics/unused/goosuto.png new file mode 100644 index 000000000..257a25c71 Binary files /dev/null and b/graphics/unused/goosuto.png differ diff --git a/graphics/unused/shadow.png b/graphics/unused/shadow.png new file mode 100644 index 000000000..7d090ad3d Binary files /dev/null and b/graphics/unused/shadow.png differ -- cgit v1.2.3 From ad02552fbe3968da26220f3523fc92b83404ab1a Mon Sep 17 00:00:00 2001 From: paul Date: Sat, 13 Oct 2018 20:30:58 +0200 Subject: replace more baserom, fix graphics_file_rules.mk for C2EA50, replace labels for battle_anims --- asm/battle_anim_80A22E8.s | 84 +-- asm/battle_anim_80DE2C0.s | 36 +- asm/battle_anim_80EEC0C.s | 12 +- asm/battle_gfx_sfx_util.s | 12 +- data/graphics.s | 780 +++++++++++++++++++++++-- graphics/battle_anims/masks/unknown_C2EA50.bin | Bin 2048 -> 0 bytes graphics/battle_anims/masks/unknown_C2EA50.png | Bin 175 -> 0 bytes graphics/battle_anims/masks/unknown_D2EC24.bin | Bin 0 -> 2048 bytes graphics/battle_anims/masks/unknown_D2EC24.png | Bin 0 -> 175 bytes graphics/misc/confetti.png | Bin 0 -> 355 bytes graphics_file_rules.mk | 2 +- 11 files changed, 792 insertions(+), 134 deletions(-) delete mode 100644 graphics/battle_anims/masks/unknown_C2EA50.bin delete mode 100644 graphics/battle_anims/masks/unknown_C2EA50.png create mode 100644 graphics/battle_anims/masks/unknown_D2EC24.bin create mode 100644 graphics/battle_anims/masks/unknown_D2EC24.png create mode 100644 graphics/misc/confetti.png diff --git a/asm/battle_anim_80A22E8.s b/asm/battle_anim_80A22E8.s index a11154651..18a6f3ddd 100644 --- a/asm/battle_anim_80A22E8.s +++ b/asm/battle_anim_80A22E8.s @@ -15161,7 +15161,7 @@ _080A96CC: lsls r2, 1 adds r0, r2 str r1, [r0] - ldr r0, _080A975C @ =gUnknown_8D227E4 + ldr r0, _080A975C @ =gFile_graphics_battle_anims_sprites_206_palette bl LZDecompressWram movs r4, 0 _080A9700: @@ -15206,7 +15206,7 @@ _080A9700: _080A9750: .4byte 0x000027de _080A9754: .4byte 0x00002710 _080A9758: .4byte gMonSpritesGfxPtr -_080A975C: .4byte gUnknown_8D227E4 +_080A975C: .4byte gFile_graphics_battle_anims_sprites_206_palette thumb_func_end sub_80A96B4 thumb_func_start sub_80A9760 @@ -15955,15 +15955,15 @@ _080A9D2A: bl sub_80752A0 mov r0, sp ldrb r0, [r0, 0x9] - ldr r1, _080A9DAC @ =gUnknown_8D23F4C + ldr r1, _080A9DAC @ =gFile_graphics_battle_anims_backgrounds_attract_tilemap bl sub_807543C mov r0, sp ldrb r0, [r0, 0x9] - ldr r1, _080A9DB0 @ =gUnknown_8D234B4 + ldr r1, _080A9DB0 @ =gFile_graphics_battle_anims_backgrounds_attract_sheet mov r2, sp ldrh r2, [r2, 0xA] bl sub_80753B4 - ldr r0, _080A9DB4 @ =gUnknown_8D23F24 + ldr r0, _080A9DB4 @ =gFile_graphics_battle_anims_backgrounds_attract_palette mov r1, sp ldrb r1, [r1, 0x8] lsls r1, 4 @@ -15995,9 +15995,9 @@ _080A9D88: _080A9DA0: .4byte 0x00003f42 _080A9DA4: .4byte gUnknown_2022978 _080A9DA8: .4byte gUnknown_202297A -_080A9DAC: .4byte gUnknown_8D23F4C -_080A9DB0: .4byte gUnknown_8D234B4 -_080A9DB4: .4byte gUnknown_8D23F24 +_080A9DAC: .4byte gFile_graphics_battle_anims_backgrounds_attract_tilemap +_080A9DB0: .4byte gFile_graphics_battle_anims_backgrounds_attract_sheet +_080A9DB4: .4byte gFile_graphics_battle_anims_backgrounds_attract_palette _080A9DB8: .4byte gTasks _080A9DBC: .4byte sub_80A9DC0 thumb_func_end sub_80A9CE8 @@ -16247,11 +16247,11 @@ _080A9FBC: _080A9FC6: mov r0, sp ldrb r0, [r0, 0x9] - ldr r1, _080AA014 @ =gUnknown_8D24BCC + ldr r1, _080AA014 @ =gFile_graphics_battle_anims_backgrounds_scary_face_sheet mov r2, sp ldrh r2, [r2, 0xA] bl sub_80753B4 - ldr r0, _080AA018 @ =gUnknown_8D24BA4 + ldr r0, _080AA018 @ =gFile_graphics_battle_anims_backgrounds_scary_face_palette mov r1, sp ldrb r1, [r1, 0x8] lsls r1, 4 @@ -16281,8 +16281,8 @@ _080A9FFA: bx r0 .align 2, 0 _080AA010: .4byte gUnknown_8E7F690 -_080AA014: .4byte gUnknown_8D24BCC -_080AA018: .4byte gUnknown_8D24BA4 +_080AA014: .4byte gFile_graphics_battle_anims_backgrounds_scary_face_sheet +_080AA018: .4byte gFile_graphics_battle_anims_backgrounds_scary_face_palette _080AA01C: .4byte gTasks _080AA020: .4byte sub_80AA024 thumb_func_end sub_80A9F10 @@ -42800,11 +42800,11 @@ _080B6D28: bl sub_80752C8 add r0, sp, 0xC ldrb r0, [r0, 0x9] - ldr r1, _080B6D84 @ =gUnknown_8D24BCC + ldr r1, _080B6D84 @ =gFile_graphics_battle_anims_backgrounds_scary_face_sheet add r2, sp, 0xC ldrh r2, [r2, 0xA] bl sub_80753B4 - ldr r0, _080B6D88 @ =gUnknown_8D24BA4 + ldr r0, _080B6D88 @ =gFile_graphics_battle_anims_backgrounds_scary_face_palette add r1, sp, 0xC ldrb r1, [r1, 0x8] lsls r1, 4 @@ -42814,8 +42814,8 @@ _080B6D28: .align 2, 0 _080B6D7C: .4byte gUnknown_202297C _080B6D80: .4byte gUnknown_202297E -_080B6D84: .4byte gUnknown_8D24BCC -_080B6D88: .4byte gUnknown_8D24BA4 +_080B6D84: .4byte gFile_graphics_battle_anims_backgrounds_scary_face_sheet +_080B6D88: .4byte gFile_graphics_battle_anims_backgrounds_scary_face_palette _080B6D8C: add r0, sp, 0xC movs r1, 0x2 @@ -51145,7 +51145,7 @@ _080BAE5C: bl sub_80752A0 mov r0, sp ldrb r0, [r0, 0x9] - ldr r1, _080BAF18 @ =gUnknown_8D20858 + ldr r1, _080BAF18 @ =gFile_graphics_battle_anims_masks_curse_tilemap bl sub_807543C bl sub_8073788 lsls r0, 24 @@ -51160,7 +51160,7 @@ _080BAE5C: _080BAEAC: mov r0, sp ldrb r0, [r0, 0x9] - ldr r1, _080BAF1C @ =gUnknown_8D2083C + ldr r1, _080BAF1C @ =gFile_graphics_battle_anims_masks_curse_sheet mov r2, sp ldrh r2, [r2, 0xA] bl sub_80753B4 @@ -51207,8 +51207,8 @@ _080BAEAC: _080BAF0C: .4byte gBattlerPartyIndexes _080BAF10: .4byte gPlayerParty _080BAF14: .4byte gUnknown_2037F1A -_080BAF18: .4byte gUnknown_8D20858 -_080BAF1C: .4byte gUnknown_8D2083C +_080BAF18: .4byte gFile_graphics_battle_anims_masks_curse_tilemap +_080BAF1C: .4byte gFile_graphics_battle_anims_masks_curse_sheet _080BAF20: .4byte gUnknown_83E7CC8 _080BAF24: .4byte gUnknown_2022978 _080BAF28: .4byte gSprites @@ -51659,17 +51659,17 @@ _080BB2E2: bne _080BB30C mov r0, sp ldrb r0, [r0, 0x9] - ldr r1, _080BB308 @ =gUnknown_8D2DB04 + ldr r1, _080BB308 @ =gFile_graphics_battle_anims_masks_stat_tilemap_1_tilemap bl sub_807543C b _080BB316 .align 2, 0 _080BB300: .4byte gUnknown_2023D44 _080BB304: .4byte gUnknown_20399B4 -_080BB308: .4byte gUnknown_8D2DB04 +_080BB308: .4byte gFile_graphics_battle_anims_masks_stat_tilemap_1_tilemap _080BB30C: mov r0, sp ldrb r0, [r0, 0x9] - ldr r1, _080BB354 @ =gUnknown_8D2DC20 + ldr r1, _080BB354 @ =gFile_graphics_battle_anims_masks_stat_tilemap_2_tilemap bl sub_807543C _080BB316: bl sub_8073788 @@ -51685,7 +51685,7 @@ _080BB316: _080BB32E: mov r0, sp ldrb r0, [r0, 0x9] - ldr r1, _080BB358 @ =gUnknown_8D2D8F4 + ldr r1, _080BB358 @ =gFile_graphics_battle_anims_masks_stat_sheet mov r2, sp ldrh r2, [r2, 0xA] bl sub_80753B4 @@ -51701,8 +51701,8 @@ _080BB32E: ldr r0, [r0] mov pc, r0 .align 2, 0 -_080BB354: .4byte gUnknown_8D2DC20 -_080BB358: .4byte gUnknown_8D2D8F4 +_080BB354: .4byte gFile_graphics_battle_anims_masks_stat_tilemap_2_tilemap +_080BB358: .4byte gFile_graphics_battle_anims_masks_stat_sheet _080BB35C: .4byte gUnknown_20399B4 _080BB360: .4byte _080BB364 .align 2, 0 @@ -51715,37 +51715,37 @@ _080BB364: .4byte _080BB3A8 .4byte _080BB3B0 _080BB380: - ldr r0, _080BB384 @ =gUnknown_8D2DD5C + ldr r0, _080BB384 @ =gFile_graphics_battle_anims_masks_stat2_palette b _080BB3B2 .align 2, 0 -_080BB384: .4byte gUnknown_8D2DD5C +_080BB384: .4byte gFile_graphics_battle_anims_masks_stat2_palette _080BB388: - ldr r0, _080BB38C @ =gUnknown_8D2DD3C + ldr r0, _080BB38C @ =gFile_graphics_battle_anims_masks_stat1_palette b _080BB3B2 .align 2, 0 -_080BB38C: .4byte gUnknown_8D2DD3C +_080BB38C: .4byte gFile_graphics_battle_anims_masks_stat1_palette _080BB390: - ldr r0, _080BB394 @ =gUnknown_8D2DD7C + ldr r0, _080BB394 @ =gFile_graphics_battle_anims_masks_stat3_palette b _080BB3B2 .align 2, 0 -_080BB394: .4byte gUnknown_8D2DD7C +_080BB394: .4byte gFile_graphics_battle_anims_masks_stat3_palette _080BB398: - ldr r0, _080BB39C @ =gUnknown_8D2DD9C + ldr r0, _080BB39C @ =gFile_graphics_battle_anims_masks_stat4_palette b _080BB3B2 .align 2, 0 -_080BB39C: .4byte gUnknown_8D2DD9C +_080BB39C: .4byte gFile_graphics_battle_anims_masks_stat4_palette _080BB3A0: - ldr r0, _080BB3A4 @ =gUnknown_8D2DDDC + ldr r0, _080BB3A4 @ =gFile_graphics_battle_anims_masks_stat6_palette b _080BB3B2 .align 2, 0 -_080BB3A4: .4byte gUnknown_8D2DDDC +_080BB3A4: .4byte gFile_graphics_battle_anims_masks_stat6_palette _080BB3A8: - ldr r0, _080BB3AC @ =gUnknown_8D2DDFC + ldr r0, _080BB3AC @ =gFile_graphics_battle_anims_masks_stat7_palette b _080BB3B2 .align 2, 0 -_080BB3AC: .4byte gUnknown_8D2DDFC +_080BB3AC: .4byte gFile_graphics_battle_anims_masks_stat7_palette _080BB3B0: - ldr r0, _080BB3C0 @ =gUnknown_8D2DE1C + ldr r0, _080BB3C0 @ =gFile_graphics_battle_anims_masks_stat8_palette _080BB3B2: mov r1, sp ldrb r1, [r1, 0x8] @@ -51754,9 +51754,9 @@ _080BB3B2: bl LoadCompressedPalette b _080BB3D2 .align 2, 0 -_080BB3C0: .4byte gUnknown_8D2DE1C +_080BB3C0: .4byte gFile_graphics_battle_anims_masks_stat8_palette _080BB3C4: - ldr r0, _080BB3FC @ =gUnknown_8D2DDBC + ldr r0, _080BB3FC @ =gFile_graphics_battle_anims_masks_stat5_palette mov r1, sp ldrb r1, [r1, 0x8] lsls r1, 4 @@ -51785,7 +51785,7 @@ _080BB3D2: ldr r1, _080BB410 @ =0x0000fffd b _080BB420 .align 2, 0 -_080BB3FC: .4byte gUnknown_8D2DDBC +_080BB3FC: .4byte gFile_graphics_battle_anims_masks_stat5_palette _080BB400: .4byte gUnknown_2022978 _080BB404: .4byte gUnknown_202297A _080BB408: .4byte gUnknown_20399B4 diff --git a/asm/battle_anim_80DE2C0.s b/asm/battle_anim_80DE2C0.s index 9b56509a2..4304c8c1a 100644 --- a/asm/battle_anim_80DE2C0.s +++ b/asm/battle_anim_80DE2C0.s @@ -3410,15 +3410,15 @@ _080DFCCE: bl sub_80752A0 mov r0, sp ldrb r0, [r0, 0x9] - ldr r1, _080DFD1C @ =gUnknown_8D2A8C0 + ldr r1, _080DFD1C @ =gFile_graphics_battle_anims_masks_morning_sun_tilemap bl sub_807543C mov r0, sp ldrb r0, [r0, 0x9] - ldr r1, _080DFD20 @ =gUnknown_8D2A808 + ldr r1, _080DFD20 @ =gFile_graphics_battle_anims_masks_morning_sun_sheet mov r2, sp ldrh r2, [r2, 0xA] bl sub_80753B4 - ldr r0, _080DFD24 @ =gUnknown_8D2A8A8 + ldr r0, _080DFD24 @ =gFile_graphics_battle_anims_masks_morning_sun_palette mov r1, sp ldrb r1, [r1, 0x8] lsls r1, 4 @@ -3439,9 +3439,9 @@ _080DFCCE: b _080DFD58 .align 2, 0 _080DFD18: .4byte 0x00003f42 -_080DFD1C: .4byte gUnknown_8D2A8C0 -_080DFD20: .4byte gUnknown_8D2A808 -_080DFD24: .4byte gUnknown_8D2A8A8 +_080DFD1C: .4byte gFile_graphics_battle_anims_masks_morning_sun_tilemap +_080DFD20: .4byte gFile_graphics_battle_anims_masks_morning_sun_sheet +_080DFD24: .4byte gFile_graphics_battle_anims_masks_morning_sun_palette _080DFD28: .4byte gUnknown_2022978 _080DFD2C: .4byte 0x0000ffc8 _080DFD30: @@ -4052,15 +4052,15 @@ _080E01FC: bl sub_80752A0 mov r0, sp ldrb r0, [r0, 0x9] - ldr r1, _080E0250 @ =gUnknown_8D2A8C0 + ldr r1, _080E0250 @ =gFile_graphics_battle_anims_masks_morning_sun_tilemap bl sub_807543C mov r0, sp ldrb r0, [r0, 0x9] - ldr r1, _080E0254 @ =gUnknown_8D2A808 + ldr r1, _080E0254 @ =gFile_graphics_battle_anims_masks_morning_sun_sheet mov r2, sp ldrh r2, [r2, 0xA] bl sub_80753B4 - ldr r0, _080E0258 @ =gUnknown_8D2A8A8 + ldr r0, _080E0258 @ =gFile_graphics_battle_anims_masks_morning_sun_palette mov r1, sp ldrb r1, [r1, 0x8] lsls r1, 4 @@ -4083,9 +4083,9 @@ _080E01FC: .align 2, 0 _080E0248: .4byte 0x00003f42 _080E024C: .4byte 0x00000d03 -_080E0250: .4byte gUnknown_8D2A8C0 -_080E0254: .4byte gUnknown_8D2A808 -_080E0258: .4byte gUnknown_8D2A8A8 +_080E0250: .4byte gFile_graphics_battle_anims_masks_morning_sun_tilemap +_080E0254: .4byte gFile_graphics_battle_anims_masks_morning_sun_sheet +_080E0258: .4byte gFile_graphics_battle_anims_masks_morning_sun_palette _080E025C: .4byte gUnknown_2022978 _080E0260: .4byte 0x0000ffc8 _080E0264: @@ -7994,11 +7994,11 @@ sub_80E2084: @ 80E2084 str r1, [sp, 0x8] movs r1, 0x1E str r1, [sp, 0xC] - ldr r1, _080E20C8 @ =gUnknown_8D2DE3C + ldr r1, _080E20C8 @ =gFile_graphics_battle_anims_masks_cure_bubbles_sheet str r1, [sp, 0x10] - ldr r1, _080E20CC @ =gUnknown_8D2DF98 + ldr r1, _080E20CC @ =gFile_graphics_battle_anims_masks_cure_bubbles_tilemap str r1, [sp, 0x14] - ldr r1, _080E20D0 @ =gUnknown_8D2DF78 + ldr r1, _080E20D0 @ =gFile_graphics_battle_anims_masks_cure_bubbles_palette str r1, [sp, 0x18] movs r1, 0 bl sub_80BBA20 @@ -8008,9 +8008,9 @@ sub_80E2084: @ 80E2084 .align 2, 0 _080E20C0: .4byte gUnknown_2037F1A _080E20C4: .4byte gUnknown_2037F02 -_080E20C8: .4byte gUnknown_8D2DE3C -_080E20CC: .4byte gUnknown_8D2DF98 -_080E20D0: .4byte gUnknown_8D2DF78 +_080E20C8: .4byte gFile_graphics_battle_anims_masks_cure_bubbles_sheet +_080E20CC: .4byte gFile_graphics_battle_anims_masks_cure_bubbles_tilemap +_080E20D0: .4byte gFile_graphics_battle_anims_masks_cure_bubbles_palette thumb_func_end sub_80E2084 thumb_func_start sub_80E20D4 diff --git a/asm/battle_anim_80EEC0C.s b/asm/battle_anim_80EEC0C.s index bb6d8d8d8..d09e8ef93 100644 --- a/asm/battle_anim_80EEC0C.s +++ b/asm/battle_anim_80EEC0C.s @@ -154,15 +154,15 @@ sub_80EEC0C: @ 80EEC0C bl sub_80752A0 mov r0, sp ldrb r0, [r0, 0x9] - ldr r1, _080EEDD8 @ =gUnknown_8D2EC70 + ldr r1, _080EEDD8 @ =gFile_graphics_battle_anims_masks_unknown_D2EC24_tilemap bl sub_807543C mov r0, sp ldrb r0, [r0, 0x9] - ldr r1, _080EEDDC @ =gUnknown_8D2EC24 + ldr r1, _080EEDDC @ =gFile_graphics_battle_anims_masks_unknown_D2EC24_sheet mov r2, sp ldrh r2, [r2, 0xA] bl sub_80753B4 - ldr r0, _080EEDE0 @ =gUnknown_8D2DF78 + ldr r0, _080EEDE0 @ =gFile_graphics_battle_anims_masks_cure_bubbles_palette mov r1, sp ldrb r1, [r1, 0x8] lsls r1, 4 @@ -212,9 +212,9 @@ _080EEDC8: .4byte 0x00003f42 _080EEDCC: .4byte gUnknown_3004FF0 _080EEDD0: .4byte gSprites _080EEDD4: .4byte SpriteCallbackDummy -_080EEDD8: .4byte gUnknown_8D2EC70 -_080EEDDC: .4byte gUnknown_8D2EC24 -_080EEDE0: .4byte gUnknown_8D2DF78 +_080EEDD8: .4byte gFile_graphics_battle_anims_masks_unknown_D2EC24_tilemap +_080EEDDC: .4byte gFile_graphics_battle_anims_masks_unknown_D2EC24_sheet +_080EEDE0: .4byte gFile_graphics_battle_anims_masks_cure_bubbles_palette _080EEDE4: .4byte gUnknown_2022978 _080EEDE8: .4byte gUnknown_202297A _080EEDEC: .4byte gTasks diff --git a/asm/battle_gfx_sfx_util.s b/asm/battle_gfx_sfx_util.s index acd2f7ca8..ac088b355 100644 --- a/asm/battle_gfx_sfx_util.s +++ b/asm/battle_gfx_sfx_util.s @@ -2351,7 +2351,7 @@ sub_80350BC: @ 80350BC lsls r0, 24 cmp r0, 0 beq _080350FC - ldr r0, _080350F4 @ =gUnknown_8D2D0B4 + ldr r0, _080350F4 @ =gFile_graphics_battle_anims_sprites_substitute_sheet ldr r1, _080350F8 @ =gMonSpritesGfxPtr ldr r1, [r1] lsls r4, r5, 2 @@ -2361,10 +2361,10 @@ sub_80350BC: @ 80350BC bl LZDecompressVram b _0803510E .align 2, 0 -_080350F4: .4byte gUnknown_8D2D0B4 +_080350F4: .4byte gFile_graphics_battle_anims_sprites_substitute_sheet _080350F8: .4byte gMonSpritesGfxPtr _080350FC: - ldr r0, _08035144 @ =gUnknown_8D2D2F4 + ldr r0, _08035144 @ =gFile_graphics_battle_anims_sprites_substitute_tilemap ldr r1, _08035148 @ =gMonSpritesGfxPtr ldr r1, [r1] lsls r4, r5, 2 @@ -2375,7 +2375,7 @@ _080350FC: _0803510E: movs r3, 0x1 lsls r6, 4 - ldr r7, _0803514C @ =gUnknown_8D2D090 + ldr r7, _0803514C @ =gFile_graphics_battle_anims_sprites_substitute_palette ldr r0, _08035148 @ =gMonSpritesGfxPtr ldr r0, [r0] adds r0, 0x4 @@ -2401,9 +2401,9 @@ _08035120: bl LoadCompressedPalette b _0803519A .align 2, 0 -_08035144: .4byte gUnknown_8D2D2F4 +_08035144: .4byte gFile_graphics_battle_anims_sprites_substitute_tilemap _08035148: .4byte gMonSpritesGfxPtr -_0803514C: .4byte gUnknown_8D2D090 +_0803514C: .4byte gFile_graphics_battle_anims_sprites_substitute_palette _08035150: .4byte 0x040000d4 _08035154: .4byte 0x84000200 _08035158: diff --git a/data/graphics.s b/data/graphics.s index 82d7feba6..f99ea96df 100644 --- a/data/graphics.s +++ b/data/graphics.s @@ -1757,7 +1757,6 @@ gFile_graphics_battle_anims_sprites_186_sheet:: @ 8D1EF50 gFile_graphics_battle_anims_sprites_186_palette:: @ 8D1F31C .incbin "graphics/battle_anims/sprites/186.gbapal.lz" - .align 2 gUnknown_8D1F340:: @ 8D1F340 .incbin "baserom.gba", 0xD1F340, 0x77C @@ -1822,97 +1821,756 @@ gFile_graphics_battle_anims_sprites_193_sheet:: @ 8D206B8 gFile_graphics_battle_anims_sprites_193_palette:: @ 8D20814 .incbin "graphics/battle_anims/sprites/193.gbapal.lz" + + .align 2 +gFile_graphics_battle_anims_masks_curse_sheet:: @ 8D2083C + .incbin "graphics/battle_anims/masks/curse.4bpp.lz" + + .align 2 +gFile_graphics_battle_anims_masks_curse_tilemap:: @ 8D20858 + .incbin "graphics/battle_anims/masks/curse.bin.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_002_sheet:: @ 8D20958 + .incbin "graphics/battle_anims/sprites/002.4bpp.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_002_palette:: @ 8D20A3C + .incbin "graphics/battle_anims/sprites/002.gbapal.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_196_sheet:: @ 8D20A64 + .incbin "graphics/battle_anims/sprites/196.4bpp.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_196_palette:: @ 8D20E08 + .incbin "graphics/battle_anims/sprites/196.gbapal.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_194_sheet:: @ 8D20E20 + .incbin "graphics/battle_anims/sprites/194.4bpp.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_194_palette:: @ 8D21158 + .incbin "graphics/battle_anims/sprites/194.gbapal.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_195_sheet:: @ 8D21180 + .incbin "graphics/battle_anims/sprites/195.4bpp.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_195_palette:: @ 8D21238 + .incbin "graphics/battle_anims/sprites/195.gbapal.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_197_sheet:: @ 8D21258 + .incbin "graphics/battle_anims/sprites/197.4bpp.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_197_palette:: @ 8D213C8 + .incbin "graphics/battle_anims/sprites/197.gbapal.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_198_sheet:: @ 8D213F0 + .incbin "graphics/battle_anims/sprites/198.4bpp.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_198_palette:: @ 8D217E0 + .incbin "graphics/battle_anims/sprites/198.gbapal.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_199_sheet:: @ 8D21808 + .incbin "graphics/battle_anims/sprites/199.4bpp.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_199_palette:: @ 8D218D0 + .incbin "graphics/battle_anims/sprites/199.gbapal.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_200_sheet:: @ 8D218EC + .incbin "graphics/battle_anims/sprites/200.4bpp.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_200_palette:: @ 8D21A2C + .incbin "graphics/battle_anims/sprites/200.gbapal.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_201_sheet:: @ 8D21A48 + .incbin "graphics/battle_anims/sprites/201.4bpp.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_201_palette:: @ 8D220B8 + .incbin "graphics/battle_anims/sprites/201.gbapal.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_204_sheet:: @ 8D220E0 + .incbin "graphics/battle_anims/sprites/204.4bpp.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_204_palette:: @ 8D22254 + .incbin "graphics/battle_anims/sprites/204.gbapal.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_202_sheet:: @ 8D2227C + .incbin "graphics/battle_anims/sprites/202.4bpp.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_202_palette:: @ 8D223E4 + .incbin "graphics/battle_anims/sprites/202.gbapal.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_203_sheet:: @ 8D22408 + .incbin "graphics/battle_anims/sprites/203.4bpp.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_203_palette:: @ 8D225B4 + .incbin "graphics/battle_anims/sprites/203.gbapal.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_206_sheet:: @ 8D225D8 + .incbin "graphics/battle_anims/sprites/206.4bpp.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_206_palette:: @ 8D227E4 + .incbin "graphics/battle_anims/sprites/206.gbapal.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_205_sheet:: @ 8D22878 + .incbin "graphics/battle_anims/sprites/205.4bpp.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_205_palette:: @ 8D22AAC + .incbin "graphics/battle_anims/sprites/205.gbapal.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_207_sheet:: @ 8D22AD0 + .incbin "graphics/battle_anims/sprites/207.4bpp.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_207_palette:: @ 8D22B9C + .incbin "graphics/battle_anims/sprites/207.gbapal.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_208_sheet:: @ 8D22BC0 + .incbin "graphics/battle_anims/sprites/208.4bpp.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_209_sheet:: @ 8D22FB0 + .incbin "graphics/battle_anims/sprites/209.4bpp.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_209_palette:: @ 8D232B8 + .incbin "graphics/battle_anims/sprites/209.gbapal.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_064_sheet:: @ 8D232D8 + .incbin "graphics/battle_anims/sprites/064.4bpp.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_064_palette:: @ 8D233C8 + .incbin "graphics/battle_anims/sprites/064.gbapal.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_210_sheet:: @ 8D233EC + .incbin "graphics/battle_anims/sprites/210.4bpp.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_219_palette:: @ 8D23454 + .incbin "graphics/battle_anims/sprites/219.gbapal.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_210_palette:: @ 8D23474 + .incbin "graphics/battle_anims/sprites/210.gbapal.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_216_palette:: @ 8D23494 + .incbin "graphics/battle_anims/sprites/216.gbapal.lz" + + .align 2 +gFile_graphics_battle_anims_backgrounds_attract_sheet:: @ 8D234B4 + .incbin "graphics/battle_anims/backgrounds/attract.4bpp.lz" + + .align 2 +gFile_graphics_battle_anims_backgrounds_attract_palette:: @ 8D23F24 + .incbin "graphics/battle_anims/backgrounds/attract.gbapal.lz" + + .align 2 +gFile_graphics_battle_anims_backgrounds_attract_tilemap:: @ 8D23F4C + .incbin "graphics/battle_anims/backgrounds/attract.bin.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_217_sheet:: @ 8D241C8 + .incbin "graphics/battle_anims/sprites/217.4bpp.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_217_palette:: @ 8D24230 + .incbin "graphics/battle_anims/sprites/217.gbapal.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_212_sheet:: @ 8D24250 + .incbin "graphics/battle_anims/sprites/212.4bpp.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_211_sheet:: @ 8D24484 + .incbin "graphics/battle_anims/sprites/211.4bpp.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_213_sheet:: @ 8D244D4 + .incbin "graphics/battle_anims/sprites/213.4bpp.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_211_palette:: @ 8D24740 + .incbin "graphics/battle_anims/sprites/211.gbapal.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_214_sheet:: @ 8D24764 + .incbin "graphics/battle_anims/sprites/214.4bpp.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_215_sheet:: @ 8D249F4 + .incbin "graphics/battle_anims/sprites/215.4bpp.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_215_palette:: @ 8D24B80 + .incbin "graphics/battle_anims/sprites/215.gbapal.lz" + + .align 2 +gFile_graphics_battle_anims_backgrounds_scary_face_palette:: @ 8D24BA4 + .incbin "graphics/battle_anims/backgrounds/scary_face.gbapal.lz" + + .align 2 +gFile_graphics_battle_anims_backgrounds_scary_face_sheet:: @ 8D24BCC + .incbin "graphics/battle_anims/backgrounds/scary_face.4bpp.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_218_palette:: @ 8D24DFC + .incbin "graphics/battle_anims/sprites/218.gbapal.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_218_sheet:: @ 8D24E24 + .incbin "graphics/battle_anims/sprites/218.4bpp.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_087_sheet:: @ 8D24ED0 + .incbin "graphics/battle_anims/sprites/087.4bpp.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_087_palette:: @ 8D24F28 + .incbin "graphics/battle_anims/sprites/087.gbapal.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_018_sheet:: @ 8D24F50 + .incbin "graphics/battle_anims/sprites/018.4bpp.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_018_palette:: @ 8D24F8C + .incbin "graphics/battle_anims/sprites/018.gbapal.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_220_palette:: @ 8D24FA8 + .incbin "graphics/battle_anims/sprites/220.gbapal.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_220_sheet:: @ 8D24FD0 + .incbin "graphics/battle_anims/sprites/220.4bpp.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_221_palette:: @ 8D250FC + .incbin "graphics/battle_anims/sprites/221.gbapal.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_221_sheet:: @ 8D2511C + .incbin "graphics/battle_anims/sprites/221.4bpp.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_222_sheet:: @ 8D25380 + .incbin "graphics/battle_anims/sprites/222.4bpp.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_222_palette:: @ 8D2566C + .incbin "graphics/battle_anims/sprites/222.gbapal.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_223_palette:: @ 8D25694 + .incbin "graphics/battle_anims/sprites/223.gbapal.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_223_sheet:: @ 8D256B4 + .incbin "graphics/battle_anims/sprites/223.4bpp.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_224_palette:: @ 8D25948 + .incbin "graphics/battle_anims/sprites/224.gbapal.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_224_sheet:: @ 8D25968 + .incbin "graphics/battle_anims/sprites/224.4bpp.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_230_palette:: @ 8D25A64 + .incbin "graphics/battle_anims/sprites/230.gbapal.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_230_sheet:: @ 8D25A8C + .incbin "graphics/battle_anims/sprites/230.4bpp.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_228_palette:: @ 8D25CD0 + .incbin "graphics/battle_anims/sprites/228.gbapal.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_228_sheet:: @ 8D25CF0 + .incbin "graphics/battle_anims/sprites/228.4bpp.lz" + + .align 2 +gFile_graphics_battle_anims_backgrounds_04_palette:: @ 8D25D98 + .incbin "graphics/battle_anims/backgrounds/04.gbapal.lz" + + .align 2 +gFile_graphics_battle_anims_backgrounds_04_sheet:: @ 8D25DC0 + .incbin "graphics/battle_anims/backgrounds/04.4bpp.lz" + + .align 2 +gFile_graphics_battle_anims_backgrounds_04_tilemap:: @ 8D26B2C + .incbin "graphics/battle_anims/backgrounds/04.bin.lz" + + .align 2 +gFile_graphics_battle_anims_backgrounds_05_tilemap:: @ 8D27028 + .incbin "graphics/battle_anims/backgrounds/05.bin.lz" + + .align 2 +gFile_graphics_battle_anims_backgrounds_06_tilemap:: @ 8D274F8 + .incbin "graphics/battle_anims/backgrounds/06.bin.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_225_sheet:: @ 8D27938 + .incbin "graphics/battle_anims/sprites/225.4bpp.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_225_palette:: @ 8D27ABC + .incbin "graphics/battle_anims/sprites/225.gbapal.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_227_sheet:: @ 8D27AE4 + .incbin "graphics/battle_anims/sprites/227.4bpp.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_226_sheet:: @ 8D27C2C + .incbin "graphics/battle_anims/sprites/226.4bpp.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_226_palette:: @ 8D27CB8 + .incbin "graphics/battle_anims/sprites/226.gbapal.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_229_sheet:: @ 8D27CDC + .incbin "graphics/battle_anims/sprites/229.4bpp.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_229_palette:: @ 8D27E98 + .incbin "graphics/battle_anims/sprites/229.gbapal.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_099_sheet:: @ 8D27EC0 + .incbin "graphics/battle_anims/sprites/099.4bpp.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_099_palette:: @ 8D27FE0 + .incbin "graphics/battle_anims/sprites/099.gbapal.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_232_sheet:: @ 8D28008 + .incbin "graphics/battle_anims/sprites/232.4bpp.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_231_palette:: @ 8D28540 + .incbin "graphics/battle_anims/sprites/231.gbapal.lz" + .align 2 -gUnknown_8D2083C:: @ 8D2083C - .incbin "baserom.gba", 0xD2083C, 0x1C +gFile_graphics_battle_anims_sprites_231_sheet:: @ 8D28568 + .incbin "graphics/battle_anims/sprites/231.4bpp.lz" -gUnknown_8D20858:: @ 8D20858 - .incbin "baserom.gba", 0xD20858, 0x1F8C + .align 2 +gFile_graphics_battle_anims_sprites_233_sheet:: @ 8D28738 + .incbin "graphics/battle_anims/sprites/233.4bpp.lz" -gUnknown_8D227E4:: @ 8D227E4 - .incbin "baserom.gba", 0xD227E4, 0xCD0 + .align 2 +gFile_graphics_battle_anims_sprites_233_palette:: @ 8D287BC + .incbin "graphics/battle_anims/sprites/233.gbapal.lz" -gUnknown_8D234B4:: @ 8D234B4 - .incbin "baserom.gba", 0xD234B4, 0xA70 + .align 2 +gFile_graphics_battle_anims_sprites_234_sheet:: @ 8D287E4 + .incbin "graphics/battle_anims/sprites/234.4bpp.lz" -gUnknown_8D23F24:: @ 8D23F24 - .incbin "baserom.gba", 0xD23F24, 0x28 + .align 2 +gFile_graphics_battle_anims_sprites_234_palette:: @ 8D289A4 + .incbin "graphics/battle_anims/sprites/234.gbapal.lz" -gUnknown_8D23F4C:: @ 8D23F4C - .incbin "baserom.gba", 0xD23F4C, 0xC58 + .align 2 +gFile_graphics_battle_anims_sprites_238_sheet:: @ 8D289C8 + .incbin "graphics/battle_anims/sprites/238.4bpp.lz" -gUnknown_8D24BA4:: @ 8D24BA4 - .incbin "baserom.gba", 0xD24BA4, 0x28 + .align 2 +gFile_graphics_battle_anims_sprites_238_palette:: @ 8D28A30 + .incbin "graphics/battle_anims/sprites/238.gbapal.lz" -gUnknown_8D24BCC:: @ 8D24BCC - .incbin "baserom.gba", 0xD24BCC, 0x5C3C + .align 2 +gFile_graphics_battle_anims_sprites_235_sheet:: @ 8D28A54 + .incbin "graphics/battle_anims/sprites/235.4bpp.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_235_palette:: @ 8D28AA4 + .incbin "graphics/battle_anims/sprites/235.gbapal.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_236_palette:: @ 8D28AC0 + .incbin "graphics/battle_anims/sprites/236.gbapal.lz" -gUnknown_8D2A808:: @ 8D2A808 - .incbin "baserom.gba", 0xD2A808, 0xA0 + .align 2 +gFile_graphics_battle_anims_sprites_237_palette:: @ 8D28ADC + .incbin "graphics/battle_anims/sprites/237.gbapal.lz" -gUnknown_8D2A8A8:: @ 8D2A8A8 - .incbin "baserom.gba", 0xD2A8A8, 0x18 + .align 2 +gFile_graphics_battle_anims_backgrounds_07_sheet:: @ 8D28AF8 + .incbin "graphics/battle_anims/backgrounds/07.4bpp.lz" -gUnknown_8D2A8C0:: @ 8D2A8C0 - .incbin "baserom.gba", 0xD2A8C0, 0x27D0 + .align 2 +gFile_graphics_battle_anims_backgrounds_07_palette:: @ 8D28CA0 + .incbin "graphics/battle_anims/backgrounds/07.gbapal.lz" -gUnknown_8D2D090:: @ 8D2D090 - .incbin "baserom.gba", 0xD2D090, 0x24 + .align 2 +gFile_graphics_battle_anims_backgrounds_18_palette:: @ 8D28CC8 + .incbin "graphics/battle_anims/backgrounds/18.gbapal.lz" -gUnknown_8D2D0B4:: @ 8D2D0B4 - .incbin "baserom.gba", 0xD2D0B4, 0x240 + .align 2 +gFile_graphics_battle_anims_backgrounds_07_tilemap:: @ 8D28CF0 + .incbin "graphics/battle_anims/backgrounds/07.bin.lz" -gUnknown_8D2D2F4:: @ 8D2D2F4 - .incbin "baserom.gba", 0xD2D2F4, 0x600 + .align 2 +gFile_graphics_battle_anims_backgrounds_08_tilemap:: @ 8D28E80 + .incbin "graphics/battle_anims/backgrounds/08.bin.lz" -gUnknown_8D2D8F4:: @ 8D2D8F4 - .incbin "baserom.gba", 0xD2D8F4, 0x210 + .align 2 +gFile_graphics_battle_anims_backgrounds_20_sheet:: @ 8D2900C + .incbin "graphics/battle_anims/backgrounds/20.4bpp.lz" -gUnknown_8D2DB04:: @ 8D2DB04 - .incbin "baserom.gba", 0xD2DB04, 0x11C + .align 2 +gFile_graphics_battle_anims_backgrounds_20_palette:: @ 8D29A34 + .incbin "graphics/battle_anims/backgrounds/20.gbapal.lz" -gUnknown_8D2DC20:: @ 8D2DC20 - .incbin "baserom.gba", 0xD2DC20, 0x11C + .align 2 +gFile_graphics_battle_anims_backgrounds_20_tilemap:: @ 8D29A54 + .incbin "graphics/battle_anims/backgrounds/20.bin.lz" -gUnknown_8D2DD3C:: @ 8D2DD3C - .incbin "baserom.gba", 0xD2DD3C, 0x20 + .align 2 +gFile_graphics_battle_anims_backgrounds_09_tilemap:: @ 8D29C58 + .incbin "graphics/battle_anims/backgrounds/09.bin.lz" -gUnknown_8D2DD5C:: @ 8D2DD5C - .incbin "baserom.gba", 0xD2DD5C, 0x20 + .align 2 +gFile_graphics_battle_anims_backgrounds_09_palette:: @ 8D29F50 + .incbin "graphics/battle_anims/backgrounds/09.gbapal.lz" -gUnknown_8D2DD7C:: @ 8D2DD7C - .incbin "baserom.gba", 0xD2DD7C, 0x20 + .align 2 +gFile_graphics_battle_anims_backgrounds_22_palette:: @ 8D29F70 + .incbin "graphics/battle_anims/backgrounds/22.gbapal.lz" -gUnknown_8D2DD9C:: @ 8D2DD9C - .incbin "baserom.gba", 0xD2DD9C, 0x20 + .align 2 +gFile_graphics_battle_anims_backgrounds_09_sheet:: @ 8D29F90 + .incbin "graphics/battle_anims/backgrounds/09.4bpp.lz" -gUnknown_8D2DDBC:: @ 8D2DDBC - .incbin "baserom.gba", 0xD2DDBC, 0x20 + .align 2 +gFile_graphics_battle_anims_backgrounds_10_tilemap:: @ 8D2A510 + .incbin "graphics/battle_anims/backgrounds/10.bin.lz" -gUnknown_8D2DDDC:: @ 8D2DDDC - .incbin "baserom.gba", 0xD2DDDC, 0x20 + .align 2 +gFile_graphics_battle_anims_masks_morning_sun_sheet:: @ 8D2A808 + .incbin "graphics/battle_anims/masks/morning_sun.4bpp.lz" -gUnknown_8D2DDFC:: @ 8D2DDFC - .incbin "baserom.gba", 0xD2DDFC, 0x20 + .align 2 +gFile_graphics_battle_anims_masks_morning_sun_palette:: @ 8D2A8A8 + .incbin "graphics/battle_anims/masks/morning_sun.gbapal.lz" -gUnknown_8D2DE1C:: @ 8D2DE1C - .incbin "baserom.gba", 0xD2DE1C, 0x20 + .align 2 +gFile_graphics_battle_anims_masks_morning_sun_tilemap:: @ 8D2A8C0 + .incbin "graphics/battle_anims/masks/morning_sun.bin.lz" -gUnknown_8D2DE3C:: @ 8D2DE3C - .incbin "baserom.gba", 0xD2DE3C, 0x13C + .align 2 +gFile_graphics_battle_anims_backgrounds_12_tilemap:: @ 8D2A9DC + .incbin "graphics/battle_anims/backgrounds/12.bin.lz" -gUnknown_8D2DF78:: @ 8D2DF78 - .incbin "baserom.gba", 0xD2DF78, 0x20 + .align 2 +gFile_graphics_battle_anims_backgrounds_13_tilemap:: @ 8D2ACA4 + .incbin "graphics/battle_anims/backgrounds/13.bin.lz" -gUnknown_8D2DF98:: @ 8D2DF98 - .incbin "baserom.gba", 0xD2DF98, 0xC8C + .align 2 +gFile_graphics_battle_anims_backgrounds_14_tilemap:: @ 8D2AFA0 + .incbin "graphics/battle_anims/backgrounds/14.bin.lz" -gUnknown_8D2EC24:: @ 8D2EC24 - .incbin "baserom.gba", 0xD2EC24, 0x4C + .align 2 +gFile_graphics_battle_anims_backgrounds_12_sheet:: @ 8D2B230 + .incbin "graphics/battle_anims/backgrounds/12.4bpp.lz" -gUnknown_8D2EC70:: @ 8D2EC70 - .incbin "baserom.gba", 0xD2EC70, 0xF44 + .align 2 +gFile_graphics_battle_anims_backgrounds_12_palette:: @ 8D2BF98 + .incbin "graphics/battle_anims/backgrounds/12.gbapal.lz" + .align 2 +gFile_graphics_battle_anims_backgrounds_11_sheet:: @ 8D2BFB8 + .incbin "graphics/battle_anims/backgrounds/11.4bpp.lz" + + .align 2 +gFile_graphics_battle_anims_backgrounds_11_palette:: @ 8D2C954 + .incbin "graphics/battle_anims/backgrounds/11.gbapal.lz" + + .align 2 +gFile_graphics_battle_anims_backgrounds_11_tilemap:: @ 8D2C97C + .incbin "graphics/battle_anims/backgrounds/11.bin.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_239_sheet:: @ 8D2CC74 + .incbin "graphics/battle_anims/sprites/239.4bpp.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_239_palette:: @ 8D2CD58 + .incbin "graphics/battle_anims/sprites/239.gbapal.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_143_sheet:: @ 8D2CD80 + .incbin "graphics/battle_anims/sprites/143.4bpp.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_143_palette:: @ 8D2CFB0 + .incbin "graphics/battle_anims/sprites/143.gbapal.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_240_sheet:: @ 8D2CFC8 + .incbin "graphics/battle_anims/sprites/240.4bpp.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_240_palette:: @ 8D2D068 + .incbin "graphics/battle_anims/sprites/240.gbapal.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_substitute_palette:: @ 8D2D090 + .incbin "graphics/battle_anims/sprites/substitute.gbapal.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_substitute_sheet:: @ 8D2D0B4 + .incbin "graphics/battle_anims/sprites/substitute.4bpp.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_substitute_tilemap:: @ 8D2D2F4 + .incbin "graphics/battle_anims/sprites/substitute.bin.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_241_sheet:: @ 8D2D51C + .incbin "graphics/battle_anims/sprites/241.4bpp.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_241_palette:: @ 8D2D5E0 + .incbin "graphics/battle_anims/sprites/241.gbapal.lz" + + .align 2 +gFile_graphics_misc_confetti_sheet:: @ 8D2D5FC + .incbin "graphics/misc/confetti.4bpp.lz" + + .align 2 +gFile_graphics_misc_confetti_palette:: @ 8D2D71C + .incbin "graphics/misc/confetti.gbapal.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_242_sheet:: @ 8D2D744 + .incbin "graphics/battle_anims/sprites/242.4bpp.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_242_palette:: @ 8D2D880 + .incbin "graphics/battle_anims/sprites/242.gbapal.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_243_sheet:: @ 8D2D8A4 + .incbin "graphics/battle_anims/sprites/243.4bpp.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_243_palette:: @ 8D2D8CC + .incbin "graphics/battle_anims/sprites/243.gbapal.lz" + + .align 2 +gFile_graphics_battle_anims_masks_stat_sheet:: @ 8D2D8F4 + .incbin "graphics/battle_anims/masks/stat.4bpp.lz" + + .align 2 +gFile_graphics_battle_anims_masks_stat_tilemap_1_tilemap:: @ 8D2DB04 + .incbin "graphics/battle_anims/masks/stat_tilemap_1.bin.lz" + + .align 2 +gFile_graphics_battle_anims_masks_stat_tilemap_2_tilemap:: @ 8D2DC20 + .incbin "graphics/battle_anims/masks/stat_tilemap_2.bin.lz" + + .align 2 +gFile_graphics_battle_anims_masks_stat1_palette:: @ 8D2DD3C + .incbin "graphics/battle_anims/masks/stat1.gbapal.lz" + + .align 2 +gFile_graphics_battle_anims_masks_stat2_palette:: @ 8D2DD5C + .incbin "graphics/battle_anims/masks/stat2.gbapal.lz" + + .align 2 +gFile_graphics_battle_anims_masks_stat3_palette:: @ 8D2DD7C + .incbin "graphics/battle_anims/masks/stat3.gbapal.lz" + + .align 2 +gFile_graphics_battle_anims_masks_stat4_palette:: @ 8D2DD9C + .incbin "graphics/battle_anims/masks/stat4.gbapal.lz" + + .align 2 +gFile_graphics_battle_anims_masks_stat5_palette:: @ 8D2DDBC + .incbin "graphics/battle_anims/masks/stat5.gbapal.lz" + + .align 2 +gFile_graphics_battle_anims_masks_stat6_palette:: @ 8D2DDDC + .incbin "graphics/battle_anims/masks/stat6.gbapal.lz" + + .align 2 +gFile_graphics_battle_anims_masks_stat7_palette:: @ 8D2DDFC + .incbin "graphics/battle_anims/masks/stat7.gbapal.lz" + + .align 2 +gFile_graphics_battle_anims_masks_stat8_palette:: @ 8D2DE1C + .incbin "graphics/battle_anims/masks/stat8.gbapal.lz" + + .align 2 +gFile_graphics_battle_anims_masks_cure_bubbles_sheet:: @ 8D2DE3C + .incbin "graphics/battle_anims/masks/cure_bubbles.4bpp.lz" + + .align 2 +gFile_graphics_battle_anims_masks_cure_bubbles_palette:: @ 8D2DF78 + .incbin "graphics/battle_anims/masks/cure_bubbles.gbapal.lz" + + .align 2 +gFile_graphics_battle_anims_masks_cure_bubbles_tilemap:: @ 8D2DF98 + .incbin "graphics/battle_anims/masks/cure_bubbles.bin.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_245_palette:: @ 8D2E0B4 + .incbin "graphics/battle_anims/sprites/245.gbapal.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_245_sheet:: @ 8D2E0DC + .incbin "graphics/battle_anims/sprites/245.4bpp.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_246_sheet:: @ 8D2E280 + .incbin "graphics/battle_anims/sprites/246.4bpp.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_244_sheet:: @ 8D2E728 + .incbin "graphics/battle_anims/sprites/244.4bpp.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_244_palette:: @ 8D2E804 + .incbin "graphics/battle_anims/sprites/244.gbapal.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_247_sheet:: @ 8D2E820 + .incbin "graphics/battle_anims/sprites/247.4bpp.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_053_sheet:: @ 8D2EA04 + .incbin "graphics/battle_anims/sprites/053.4bpp.lz" + + .align 2 +gFile_graphics_battle_anims_masks_unknown_D2EC24_sheet:: @ 8D2EC24 + .incbin "graphics/battle_anims/masks/unknown_D2EC24.4bpp.lz" + + .align 2 +gFile_graphics_battle_anims_masks_unknown_D2EC24_tilemap:: @ 8D2EC70 + .incbin "graphics/battle_anims/masks/unknown_D2EC24.bin.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_248_sheet:: @ 8D2ED78 + .incbin "graphics/battle_anims/sprites/248.4bpp.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_248_palette:: @ 8D2ED90 + .incbin "graphics/battle_anims/sprites/248.gbapal.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_249_sheet:: @ 8D2EDA8 + .incbin "graphics/battle_anims/sprites/249.4bpp.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_249_palette:: @ 8D2EDF8 + .incbin "graphics/battle_anims/sprites/249.gbapal.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_250_sheet:: @ 8D2EE18 + .incbin "graphics/battle_anims/sprites/250.4bpp.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_251_sheet:: @ 8D2F00C + .incbin "graphics/battle_anims/sprites/251.4bpp.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_251_palette:: @ 8D2F070 + .incbin "graphics/battle_anims/sprites/251.gbapal.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_252_sheet:: @ 8D2F088 + .incbin "graphics/battle_anims/sprites/252.4bpp.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_252_palette:: @ 8D2F1A0 + .incbin "graphics/battle_anims/sprites/252.gbapal.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_253_sheet:: @ 8D2F1C4 + .incbin "graphics/battle_anims/sprites/253.4bpp.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_253_palette:: @ 8D2F3A0 + .incbin "graphics/battle_anims/sprites/253.gbapal.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_254_sheet:: @ 8D2F3C8 + .incbin "graphics/battle_anims/sprites/254.4bpp.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_254_palette:: @ 8D2F500 + .incbin "graphics/battle_anims/sprites/254.gbapal.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_255_sheet:: @ 8D2F528 + .incbin "graphics/battle_anims/sprites/255.4bpp.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_255_palette:: @ 8D2F5A0 + .incbin "graphics/battle_anims/sprites/255.gbapal.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_258_sheet:: @ 8D2F5B4 + .incbin "graphics/battle_anims/sprites/258.4bpp.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_258_palette:: @ 8D2F69C + .incbin "graphics/battle_anims/sprites/258.gbapal.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_256_sheet:: @ 8D2F6C4 + .incbin "graphics/battle_anims/sprites/256.4bpp.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_256_palette:: @ 8D2FA50 + .incbin "graphics/battle_anims/sprites/256.gbapal.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_257_sheet:: @ 8D2FA78 + .incbin "graphics/battle_anims/sprites/257.4bpp.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_257_palette:: @ 8D2FB94 + .incbin "graphics/battle_anims/sprites/257.gbapal.lz" + + .align 2 gUnknown_8D2FBB4:: @ 8D2FBB4 .incbin "baserom.gba", 0xD2FBB4, 0x20 diff --git a/graphics/battle_anims/masks/unknown_C2EA50.bin b/graphics/battle_anims/masks/unknown_C2EA50.bin deleted file mode 100644 index 712c1ee12..000000000 Binary files a/graphics/battle_anims/masks/unknown_C2EA50.bin and /dev/null differ diff --git a/graphics/battle_anims/masks/unknown_C2EA50.png b/graphics/battle_anims/masks/unknown_C2EA50.png deleted file mode 100644 index d0b372cbb..000000000 Binary files a/graphics/battle_anims/masks/unknown_C2EA50.png and /dev/null differ diff --git a/graphics/battle_anims/masks/unknown_D2EC24.bin b/graphics/battle_anims/masks/unknown_D2EC24.bin new file mode 100644 index 000000000..712c1ee12 Binary files /dev/null and b/graphics/battle_anims/masks/unknown_D2EC24.bin differ diff --git a/graphics/battle_anims/masks/unknown_D2EC24.png b/graphics/battle_anims/masks/unknown_D2EC24.png new file mode 100644 index 000000000..d0b372cbb Binary files /dev/null and b/graphics/battle_anims/masks/unknown_D2EC24.png differ diff --git a/graphics/misc/confetti.png b/graphics/misc/confetti.png new file mode 100644 index 000000000..ef8b921d8 Binary files /dev/null and b/graphics/misc/confetti.png differ diff --git a/graphics_file_rules.mk b/graphics_file_rules.mk index d6fcb4976..493077558 100644 --- a/graphics_file_rules.mk +++ b/graphics_file_rules.mk @@ -373,7 +373,7 @@ $(BTLANMSPRGFXDIR)/001.4bpp: $(BTLANMSPRGFXDIR)/001_0.4bpp \ $(BTLANMSPRGFXDIR)/001_1.4bpp @cat $^ >$@ -$(MASKSGFXDIR)/unknown_C2EA50.4bpp: %.4bpp: %.png +$(MASKSGFXDIR)/unknown_D2EC24.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 14 $(BATTRANSGFXDIR)/vs_frame.4bpp: %.4bpp: %.png -- cgit v1.2.3 From 0283aa99bf62cfc89708b7ef773b3c0d91d0b02d Mon Sep 17 00:00:00 2001 From: paul Date: Sat, 13 Oct 2018 21:43:22 +0200 Subject: add battle terrain and transitions, replace more baserom --- asm/battle_1.s | 16 +- asm/battle_anim_80A22E8.s | 12 +- data/graphics.s | 196 +++++++++++++++++++-- graphics/battle_terrain/building/anim_map.bin | Bin 0 -> 2048 bytes graphics/battle_terrain/building/anim_tiles.png | Bin 0 -> 308 bytes graphics/battle_terrain/building/map.bin | Bin 0 -> 4096 bytes graphics/battle_terrain/building/palette.pal | 51 ++++++ graphics/battle_terrain/building/palette2.pal | 51 ++++++ graphics/battle_terrain/building/palette3.pal | 51 ++++++ graphics/battle_terrain/building/tiles.png | Bin 0 -> 709 bytes graphics/battle_terrain/cave/anim_map.bin | Bin 0 -> 2048 bytes graphics/battle_terrain/cave/anim_tiles.png | Bin 0 -> 1416 bytes graphics/battle_terrain/cave/groudon.pal | 51 ++++++ graphics/battle_terrain/cave/map.bin | Bin 0 -> 4096 bytes graphics/battle_terrain/cave/palette.pal | 51 ++++++ graphics/battle_terrain/cave/tiles.png | Bin 0 -> 864 bytes graphics/battle_terrain/long_grass/anim_map.bin | Bin 0 -> 2048 bytes graphics/battle_terrain/long_grass/anim_tiles.png | Bin 0 -> 1127 bytes graphics/battle_terrain/long_grass/map.bin | Bin 0 -> 4096 bytes graphics/battle_terrain/long_grass/palette.pal | 51 ++++++ graphics/battle_terrain/long_grass/tiles.png | Bin 0 -> 900 bytes graphics/battle_terrain/plain/palette.pal | 51 ++++++ graphics/battle_terrain/pond_water/anim_map.bin | Bin 0 -> 2048 bytes graphics/battle_terrain/pond_water/anim_tiles.png | Bin 0 -> 592 bytes graphics/battle_terrain/pond_water/map.bin | Bin 0 -> 4096 bytes graphics/battle_terrain/pond_water/palette.pal | 51 ++++++ graphics/battle_terrain/pond_water/tiles.png | Bin 0 -> 732 bytes graphics/battle_terrain/rock/anim_map.bin | Bin 0 -> 2048 bytes graphics/battle_terrain/rock/anim_tiles.png | Bin 0 -> 760 bytes graphics/battle_terrain/rock/map.bin | Bin 0 -> 4096 bytes graphics/battle_terrain/rock/palette.pal | 51 ++++++ graphics/battle_terrain/rock/tiles.png | Bin 0 -> 725 bytes graphics/battle_terrain/sand/anim_map.bin | Bin 0 -> 2048 bytes graphics/battle_terrain/sand/anim_tiles.png | Bin 0 -> 644 bytes graphics/battle_terrain/sand/map.bin | Bin 0 -> 4096 bytes graphics/battle_terrain/sand/palette.pal | 51 ++++++ graphics/battle_terrain/sand/tiles.png | Bin 0 -> 805 bytes graphics/battle_terrain/sky/anim_map.bin | Bin 0 -> 2048 bytes graphics/battle_terrain/sky/anim_tiles.png | Bin 0 -> 961 bytes graphics/battle_terrain/sky/map.bin | Bin 0 -> 4096 bytes graphics/battle_terrain/sky/palette.pal | 51 ++++++ graphics/battle_terrain/sky/tiles.png | Bin 0 -> 820 bytes .../battle_terrain/stadium/battle_frontier.pal | 51 ++++++ graphics/battle_terrain/stadium/map.bin | Bin 0 -> 4096 bytes graphics/battle_terrain/stadium/palette1.pal | 51 ++++++ graphics/battle_terrain/stadium/palette2.pal | 51 ++++++ graphics/battle_terrain/stadium/palette3.pal | 51 ++++++ graphics/battle_terrain/stadium/palette4.pal | 51 ++++++ graphics/battle_terrain/stadium/palette5.pal | 51 ++++++ graphics/battle_terrain/stadium/palette6.pal | 51 ++++++ graphics/battle_terrain/stadium/palette7.pal | 51 ++++++ graphics/battle_terrain/stadium/tiles.png | Bin 0 -> 712 bytes graphics/battle_terrain/tall_grass/anim_map.bin | Bin 0 -> 2048 bytes graphics/battle_terrain/tall_grass/anim_tiles.png | Bin 0 -> 793 bytes graphics/battle_terrain/tall_grass/map.bin | Bin 0 -> 4096 bytes graphics/battle_terrain/tall_grass/palette.pal | 51 ++++++ graphics/battle_terrain/tall_grass/tiles.png | Bin 0 -> 739 bytes graphics/battle_terrain/underwater/anim_map.bin | Bin 0 -> 2048 bytes graphics/battle_terrain/underwater/anim_tiles.png | Bin 0 -> 506 bytes graphics/battle_terrain/underwater/map.bin | Bin 0 -> 4096 bytes graphics/battle_terrain/underwater/palette.pal | 51 ++++++ graphics/battle_terrain/underwater/tiles.png | Bin 0 -> 773 bytes graphics/battle_terrain/water/anim_map.bin | Bin 0 -> 2048 bytes graphics/battle_terrain/water/anim_tiles.png | Bin 0 -> 887 bytes graphics/battle_terrain/water/kyogre.pal | 51 ++++++ graphics/battle_terrain/water/map.bin | Bin 0 -> 4096 bytes graphics/battle_terrain/water/palette.pal | 51 ++++++ graphics/battle_terrain/water/tiles.png | Bin 0 -> 766 bytes graphics/battle_transitions/vs.png | Bin 0 -> 533 bytes graphics/battle_transitions/vs_frame.bin | Bin 0 -> 2048 bytes graphics/battle_transitions/vs_frame.png | Bin 0 -> 317 bytes graphics/contest/nextturn_numbers.png | Bin 0 -> 181 bytes graphics/contest/nextturn_random.png | Bin 0 -> 158 bytes 73 files changed, 1367 insertions(+), 30 deletions(-) create mode 100644 graphics/battle_terrain/building/anim_map.bin create mode 100644 graphics/battle_terrain/building/anim_tiles.png create mode 100644 graphics/battle_terrain/building/map.bin create mode 100644 graphics/battle_terrain/building/palette.pal create mode 100644 graphics/battle_terrain/building/palette2.pal create mode 100644 graphics/battle_terrain/building/palette3.pal create mode 100644 graphics/battle_terrain/building/tiles.png create mode 100644 graphics/battle_terrain/cave/anim_map.bin create mode 100644 graphics/battle_terrain/cave/anim_tiles.png create mode 100644 graphics/battle_terrain/cave/groudon.pal create mode 100644 graphics/battle_terrain/cave/map.bin create mode 100644 graphics/battle_terrain/cave/palette.pal create mode 100644 graphics/battle_terrain/cave/tiles.png create mode 100644 graphics/battle_terrain/long_grass/anim_map.bin create mode 100644 graphics/battle_terrain/long_grass/anim_tiles.png create mode 100644 graphics/battle_terrain/long_grass/map.bin create mode 100644 graphics/battle_terrain/long_grass/palette.pal create mode 100644 graphics/battle_terrain/long_grass/tiles.png create mode 100644 graphics/battle_terrain/plain/palette.pal create mode 100644 graphics/battle_terrain/pond_water/anim_map.bin create mode 100644 graphics/battle_terrain/pond_water/anim_tiles.png create mode 100644 graphics/battle_terrain/pond_water/map.bin create mode 100644 graphics/battle_terrain/pond_water/palette.pal create mode 100644 graphics/battle_terrain/pond_water/tiles.png create mode 100644 graphics/battle_terrain/rock/anim_map.bin create mode 100644 graphics/battle_terrain/rock/anim_tiles.png create mode 100644 graphics/battle_terrain/rock/map.bin create mode 100644 graphics/battle_terrain/rock/palette.pal create mode 100644 graphics/battle_terrain/rock/tiles.png create mode 100644 graphics/battle_terrain/sand/anim_map.bin create mode 100644 graphics/battle_terrain/sand/anim_tiles.png create mode 100644 graphics/battle_terrain/sand/map.bin create mode 100644 graphics/battle_terrain/sand/palette.pal create mode 100644 graphics/battle_terrain/sand/tiles.png create mode 100644 graphics/battle_terrain/sky/anim_map.bin create mode 100644 graphics/battle_terrain/sky/anim_tiles.png create mode 100644 graphics/battle_terrain/sky/map.bin create mode 100644 graphics/battle_terrain/sky/palette.pal create mode 100644 graphics/battle_terrain/sky/tiles.png create mode 100644 graphics/battle_terrain/stadium/battle_frontier.pal create mode 100644 graphics/battle_terrain/stadium/map.bin create mode 100644 graphics/battle_terrain/stadium/palette1.pal create mode 100644 graphics/battle_terrain/stadium/palette2.pal create mode 100644 graphics/battle_terrain/stadium/palette3.pal create mode 100644 graphics/battle_terrain/stadium/palette4.pal create mode 100644 graphics/battle_terrain/stadium/palette5.pal create mode 100644 graphics/battle_terrain/stadium/palette6.pal create mode 100644 graphics/battle_terrain/stadium/palette7.pal create mode 100644 graphics/battle_terrain/stadium/tiles.png create mode 100644 graphics/battle_terrain/tall_grass/anim_map.bin create mode 100644 graphics/battle_terrain/tall_grass/anim_tiles.png create mode 100644 graphics/battle_terrain/tall_grass/map.bin create mode 100644 graphics/battle_terrain/tall_grass/palette.pal create mode 100644 graphics/battle_terrain/tall_grass/tiles.png create mode 100644 graphics/battle_terrain/underwater/anim_map.bin create mode 100644 graphics/battle_terrain/underwater/anim_tiles.png create mode 100644 graphics/battle_terrain/underwater/map.bin create mode 100644 graphics/battle_terrain/underwater/palette.pal create mode 100644 graphics/battle_terrain/underwater/tiles.png create mode 100644 graphics/battle_terrain/water/anim_map.bin create mode 100644 graphics/battle_terrain/water/anim_tiles.png create mode 100644 graphics/battle_terrain/water/kyogre.pal create mode 100644 graphics/battle_terrain/water/map.bin create mode 100644 graphics/battle_terrain/water/palette.pal create mode 100644 graphics/battle_terrain/water/tiles.png create mode 100644 graphics/battle_transitions/vs.png create mode 100644 graphics/battle_transitions/vs_frame.bin create mode 100644 graphics/battle_transitions/vs_frame.png create mode 100644 graphics/contest/nextturn_numbers.png create mode 100644 graphics/contest/nextturn_random.png diff --git a/asm/battle_1.s b/asm/battle_1.s index cb1f6817c..6215fc86e 100644 --- a/asm/battle_1.s +++ b/asm/battle_1.s @@ -1152,13 +1152,13 @@ sub_800FAE0: @ 800FAE0 ands r0, r1 cmp r0, 0 beq _0800FB94 - ldr r0, _0800FB68 @ =gUnknown_8E7737C + ldr r0, _0800FB68 @ =gFile_graphics_battle_transitions_vs_frame_sheet ldr r1, _0800FB6C @ =0x06004000 bl LZDecompressVram - ldr r0, _0800FB70 @ =gUnknown_8E77598 + ldr r0, _0800FB70 @ =gFile_graphics_battle_transitions_vs_sheet ldr r1, _0800FB74 @ =0x06010000 bl LZDecompressVram - ldr r0, _0800FB78 @ =gUnknown_8E77570 + ldr r0, _0800FB78 @ =gFile_graphics_battle_transitions_vs_frame_palette movs r1, 0x60 movs r2, 0x20 bl LoadCompressedPalette @@ -1169,7 +1169,7 @@ sub_800FAE0: @ 800FAE0 ldr r1, _0800FB7C @ =0x00005c04 movs r0, 0xA bl SetGpuReg - ldr r4, _0800FB80 @ =gUnknown_8E77464 + ldr r4, _0800FB80 @ =gFile_graphics_battle_transitions_vs_frame_tilemap movs r0, 0x1 adds r1, r4, 0 movs r2, 0 @@ -1201,13 +1201,13 @@ sub_800FAE0: @ 800FAE0 b _0800FC26 .align 2, 0 _0800FB64: .4byte gBattleTypeFlags -_0800FB68: .4byte gUnknown_8E7737C +_0800FB68: .4byte gFile_graphics_battle_transitions_vs_frame_sheet _0800FB6C: .4byte 0x06004000 -_0800FB70: .4byte gUnknown_8E77598 +_0800FB70: .4byte gFile_graphics_battle_transitions_vs_sheet _0800FB74: .4byte 0x06010000 -_0800FB78: .4byte gUnknown_8E77570 +_0800FB78: .4byte gFile_graphics_battle_transitions_vs_frame_palette _0800FB7C: .4byte 0x00005c04 -_0800FB80: .4byte gUnknown_8E77464 +_0800FB80: .4byte gFile_graphics_battle_transitions_vs_frame_tilemap _0800FB84: .4byte gUnknown_202297A _0800FB88: .4byte 0x0000ff5c _0800FB8C: .4byte gUnknown_202297E diff --git a/asm/battle_anim_80A22E8.s b/asm/battle_anim_80A22E8.s index 18a6f3ddd..c7048f9e4 100644 --- a/asm/battle_anim_80A22E8.s +++ b/asm/battle_anim_80A22E8.s @@ -38100,15 +38100,15 @@ _080B4854: bl sub_80752A0 mov r0, sp ldrb r0, [r0, 0x9] - ldr r1, _080B48F0 @ =gUnknown_8E79354 + ldr r1, _080B48F0 @ =gFile_graphics_battle_anims_backgrounds_sandstorm_brew_tilemap bl sub_807543C mov r0, sp ldrb r0, [r0, 0x9] - ldr r1, _080B48F4 @ =gUnknown_8E794D0 + ldr r1, _080B48F4 @ =gFile_graphics_battle_anims_backgrounds_sandstorm_brew_sheet mov r2, sp ldrh r2, [r2, 0xA] bl sub_80753B4 - ldr r0, _080B48F8 @ =gUnknown_8E799FC + ldr r0, _080B48F8 @ =gFile_graphics_battle_anims_sprites_261_palette mov r1, sp ldrb r1, [r1, 0x8] lsls r1, 4 @@ -38154,9 +38154,9 @@ _080B48CA: _080B48E4: .4byte 0x00003f42 _080B48E8: .4byte gUnknown_2022978 _080B48EC: .4byte gUnknown_202297A -_080B48F0: .4byte gUnknown_8E79354 -_080B48F4: .4byte gUnknown_8E794D0 -_080B48F8: .4byte gUnknown_8E799FC +_080B48F0: .4byte gFile_graphics_battle_anims_backgrounds_sandstorm_brew_tilemap +_080B48F4: .4byte gFile_graphics_battle_anims_backgrounds_sandstorm_brew_sheet +_080B48F8: .4byte gFile_graphics_battle_anims_sprites_261_palette _080B48FC: .4byte gUnknown_2037F02 _080B4900: .4byte gUnknown_2037F1A _080B4904: .4byte gTasks diff --git a/data/graphics.s b/data/graphics.s index f99ea96df..62dd2c823 100644 --- a/data/graphics.s +++ b/data/graphics.s @@ -13429,28 +13429,188 @@ gFile_graphics_pokemon_footprints_question_mark_footprint:: @ 8E7735C .incbin "graphics/pokemon/footprints/question_mark_footprint.1bpp" .align 2 - @ THIS IS ./graphics/battle_transitions/vs_frame.4bpp.lz -gUnknown_8E7737C:: @ 8E7737C - .incbin "baserom.gba", 0xE7737C, 0xE8 +gFile_graphics_battle_transitions_vs_frame_sheet:: @ 8E7737C + .incbin "graphics/battle_transitions/vs_frame.4bpp.lz" -gUnknown_8E77464:: @ 8E77464 - .incbin "baserom.gba", 0xE77464, 0x10C + .align 2 +gFile_graphics_battle_transitions_vs_frame_tilemap:: @ 8E77464 + .incbin "graphics/battle_transitions/vs_frame.bin.lz" -gUnknown_8E77570:: @ 8E77570 - .incbin "baserom.gba", 0xE77570, 0x28 + .align 2 +gFile_graphics_battle_transitions_vs_frame_palette:: @ 8E77570 + .incbin "graphics/battle_transitions/vs_frame.gbapal.lz" -gUnknown_8E77598:: @ 8E77598 - .incbin "baserom.gba", 0xE77598, 0x1DBC + .align 2 +gFile_graphics_battle_transitions_vs_sheet:: @ 8E77598 + .incbin "graphics/battle_transitions/vs.4bpp.lz" @from ruby -gUnknown_8E79354:: @ 8E79354 - .incbin "baserom.gba", 0xE79354, 0x17C + .align 2 +gFile_graphics_battle_terrain_plain_palette_palette:: @ 8E777A8 + .incbin "graphics/battle_terrain/plain/palette.gbapal.lz" -gUnknown_8E794D0:: @ 8E794D0 - .incbin "baserom.gba", 0xE794D0, 0x52C + .align 2 +gFile_graphics_battle_terrain_building_tiles_sheet:: @ 8E777E4 + .incbin "graphics/battle_terrain/building/tiles.4bpp.lz" -gUnknown_8E799FC:: @ 8E799FC - .incbin "baserom.gba", 0xE799FC, 0x20B4 + .align 2 +gFile_graphics_battle_terrain_stadium_battle_frontier_palette:: @ 8E77D90 + .incbin "graphics/battle_terrain/stadium/battle_frontier.gbapal.lz" + .align 2 +gFile_graphics_battle_terrain_building_map_tilemap:: @ 8E77DCC + .incbin "graphics/battle_terrain/building/map.bin.lz" + + .align 2 +gFile_graphics_battle_terrain_stadium_tiles_sheet:: @ 8E7807C + .incbin "graphics/battle_terrain/stadium/tiles.4bpp.lz" + + .align 2 +gFile_graphics_battle_terrain_stadium_map_tilemap:: @ 8E78684 + .incbin "graphics/battle_terrain/stadium/map.bin.lz" + + .align 2 +gFile_graphics_battle_terrain_building_palette_palette:: @ 8E78934 + .incbin "graphics/battle_terrain/building/palette.gbapal.lz" + + .align 2 +gFile_graphics_battle_terrain_water_kyogre_palette:: @ 8E78974 + .incbin "graphics/battle_terrain/water/kyogre.gbapal.lz" + + .align 2 +gFile_graphics_battle_terrain_cave_groudon_palette:: @ 8E789B0 + .incbin "graphics/battle_terrain/cave/groudon.gbapal.lz" + + .align 2 +gFile_graphics_battle_terrain_building_palette2_palette:: @ 8E78A08 + .incbin "graphics/battle_terrain/building/palette2.gbapal.lz" + + .align 2 +gFile_graphics_battle_terrain_building_palette3_palette:: @ 8E78A44 + .incbin "graphics/battle_terrain/building/palette3.gbapal.lz" + + .align 2 +gFile_graphics_battle_terrain_stadium_palette1_palette:: @ 8E78A80 + .incbin "graphics/battle_terrain/stadium/palette1.gbapal.lz" + + .align 2 +gFile_graphics_battle_terrain_stadium_palette2_palette:: @ 8E78AE0 + .incbin "graphics/battle_terrain/stadium/palette2.gbapal.lz" + + .align 2 +gFile_graphics_battle_terrain_stadium_palette3_palette:: @ 8E78B4C + .incbin "graphics/battle_terrain/stadium/palette3.gbapal.lz" + + .align 2 +gFile_graphics_battle_terrain_stadium_palette4_palette:: @ 8E78B9C + .incbin "graphics/battle_terrain/stadium/palette4.gbapal.lz" + + .align 2 +gFile_graphics_battle_terrain_stadium_palette5_palette:: @ 8E78BE4 + .incbin "graphics/battle_terrain/stadium/palette5.gbapal.lz" + + .align 2 +gFile_graphics_battle_terrain_stadium_palette6_palette:: @ 8E78C28 + .incbin "graphics/battle_terrain/stadium/palette6.gbapal.lz" + + .align 2 +gFile_graphics_battle_terrain_stadium_palette7_palette:: @ 8E78C78 + .incbin "graphics/battle_terrain/stadium/palette7.gbapal.lz" @from ruby + + .align 2 +gFile_graphics_battle_terrain_building_anim_tiles_sheet:: @ 8E78CB4 + .incbin "graphics/battle_terrain/building/anim_tiles.4bpp.lz" + + .align 2 +gFile_graphics_battle_terrain_building_anim_map_tilemap:: @ 8E790C4 + .incbin "graphics/battle_terrain/building/anim_map.bin.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_261_sheet:: @ 8E791E8 + .incbin "graphics/battle_anims/sprites/261.4bpp.lz" + + .align 2 +gFile_graphics_battle_anims_backgrounds_sandstorm_brew_tilemap:: @ 8E79354 + .incbin "graphics/battle_anims/backgrounds/sandstorm_brew.bin.lz" + + .align 2 +gFile_graphics_battle_anims_backgrounds_sandstorm_brew_sheet:: @ 8E794D0 + .incbin "graphics/battle_anims/backgrounds/sandstorm_brew.4bpp.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_261_palette:: @ 8E799FC + .incbin "graphics/battle_anims/sprites/261.gbapal.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_260_sheet:: @ 8E79A24 + .incbin "graphics/battle_anims/sprites/260.4bpp.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_260_palette:: @ 8E79BE0 + .incbin "graphics/battle_anims/sprites/260.gbapal.lz" + + .align 2 +gFile_graphics_battle_anims_backgrounds_15_sheet:: @ 8E79BF8 + .incbin "graphics/battle_anims/backgrounds/15.4bpp.lz" + + .align 2 +gFile_graphics_battle_anims_backgrounds_15_palette:: @ 8E7A568 + .incbin "graphics/battle_anims/backgrounds/15.gbapal.lz" + + .align 2 +gFile_graphics_battle_anims_backgrounds_15_tilemap:: @ 8E7A58C + .incbin "graphics/battle_anims/backgrounds/15.bin.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_262_sheet:: @ 8E7A784 + .incbin "graphics/battle_anims/sprites/262.4bpp.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_262_palette:: @ 8E7A858 + .incbin "graphics/battle_anims/sprites/262.gbapal.lz" + + .align 2 +gUnknown_8E7A880:: @ 8E7A880 + .incbin "baserom.gba", 0xE7A880, 0x5C + + .align 2 +gFile_graphics_contest_nextturn_numbers:: @ 8E7A8DC + .incbin "graphics/contest/nextturn_numbers.4bpp" + @ .incbin "baserom.gba", 0xE7A8DC, 0x0080 + + .align 2 +gFile_graphics_contest_nextturn_random:: @ 8E7A95C + .incbin "graphics/contest/nextturn_random.4bpp" + @ .incbin "baserom.gba", 0xE7A95C, 0x0020 + + .align 2 +gFile_graphics_battle_anims_sprites_264_sheet:: @ 8E7A97C + .incbin "graphics/battle_anims/sprites/264.4bpp.lz" + @ .incbin "baserom.gba", 0xE7A97C, 0x0020 + + .align 2 +gFile_graphics_battle_anims_sprites_264_palette:: @ 8E7A99C + .incbin "graphics/battle_anims/sprites/264.gbapal.lz" + @ .incbin "baserom.gba", 0xE7A99C, 0x0018 + + .align 2 +gFile_graphics_battle_anims_sprites_265_palette:: @ 8E7A9B4 + .incbin "graphics/battle_anims/sprites/265.gbapal.lz" + @ .incbin "baserom.gba", 0xE7A9B4, 0x0018 + + .align 2 +gFile_graphics_battle_anims_sprites_067_palette:: @ 8E7A9CC + .incbin "graphics/battle_anims/sprites/067.gbapal.lz" + @ .incbin "baserom.gba", 0xE7A9CC, 0x0020 + + .align 2 +gFile_graphics_battle_anims_sprites_068_palette:: @ 8E7A9EC + .incbin "graphics/battle_anims/sprites/068.gbapal.lz" + @ .incbin "baserom.gba", 0xE7A9EC, 0x0020 + + .align 2 +gUnknown_8E7AA0C:: @ 8E7AA0C + .incbin "baserom.gba", 0xE7AA0C, 0x10A4 + gUnknown_8E7BAB0:: @ 8E7BAB0 .incbin "baserom.gba", 0xE7BAB0, 0x3744 @@ -13569,7 +13729,11 @@ gUnknown_8E86D6C:: @ 8E86D6C .incbin "baserom.gba", 0xE86D6C, 0x22C gUnknown_8E86F98:: @ 8E86F98 - .incbin "baserom.gba", 0xE86F98, 0xCB7C + .incbin "baserom.gba", 0xE86F98, 0x90 + + @ THIS IS ITEM ICONS +gUnknown_8E87028:: @ 8E87028 + .incbin "baserom.gba", 0xE87028, 0xCAEC gUnknown_8E93B14:: @ 8E93B14 .incbin "baserom.gba", 0xE93B14, 0x24 diff --git a/graphics/battle_terrain/building/anim_map.bin b/graphics/battle_terrain/building/anim_map.bin new file mode 100644 index 000000000..432e41c2f Binary files /dev/null and b/graphics/battle_terrain/building/anim_map.bin differ diff --git a/graphics/battle_terrain/building/anim_tiles.png b/graphics/battle_terrain/building/anim_tiles.png new file mode 100644 index 000000000..a627523d8 Binary files /dev/null and b/graphics/battle_terrain/building/anim_tiles.png differ diff --git a/graphics/battle_terrain/building/map.bin b/graphics/battle_terrain/building/map.bin new file mode 100644 index 000000000..d7bee6035 Binary files /dev/null and b/graphics/battle_terrain/building/map.bin differ diff --git a/graphics/battle_terrain/building/palette.pal b/graphics/battle_terrain/building/palette.pal new file mode 100644 index 000000000..219cef565 --- /dev/null +++ b/graphics/battle_terrain/building/palette.pal @@ -0,0 +1,51 @@ +JASC-PAL +0100 +48 +0 0 0 +255 255 255 +222 197 164 +238 222 180 +238 230 205 +230 205 164 +246 238 230 +222 213 180 +230 213 172 +0 0 0 +0 0 0 +246 246 156 +246 246 180 +246 246 205 +246 246 230 +246 246 246 +0 0 0 +255 255 255 +222 197 164 +238 222 180 +238 230 205 +230 205 164 +246 238 230 +222 213 180 +246 246 205 +0 0 0 +0 0 0 +246 246 156 +246 246 180 +246 246 205 +246 246 230 +246 246 246 +0 0 0 +246 205 139 +255 238 164 +246 222 156 +255 238 172 +255 246 180 +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 diff --git a/graphics/battle_terrain/building/palette2.pal b/graphics/battle_terrain/building/palette2.pal new file mode 100644 index 000000000..3ca2e0b0c --- /dev/null +++ b/graphics/battle_terrain/building/palette2.pal @@ -0,0 +1,51 @@ +JASC-PAL +0100 +48 +0 0 0 +255 255 255 +205 189 148 +222 213 172 +238 230 197 +205 197 156 +246 238 222 +213 205 164 +222 213 156 +0 0 0 +0 0 0 +213 189 148 +230 213 180 +238 230 213 +246 238 230 +246 246 246 +0 0 0 +255 255 255 +205 189 148 +222 213 172 +238 230 197 +205 197 156 +246 238 222 +213 205 164 +222 213 156 +0 0 0 +0 0 0 +213 189 148 +230 213 180 +238 230 213 +246 238 230 +246 246 246 +0 0 0 +164 197 246 +205 246 255 +180 222 255 +189 230 255 +197 238 255 +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 diff --git a/graphics/battle_terrain/building/palette3.pal b/graphics/battle_terrain/building/palette3.pal new file mode 100644 index 000000000..cebf5e687 --- /dev/null +++ b/graphics/battle_terrain/building/palette3.pal @@ -0,0 +1,51 @@ +JASC-PAL +0100 +48 +0 0 0 +255 255 255 +205 189 148 +222 213 172 +238 230 197 +205 197 156 +246 238 222 +213 205 164 +222 213 156 +0 0 0 +0 0 0 +213 189 148 +230 213 180 +238 230 213 +246 238 230 +246 246 246 +0 0 0 +255 255 255 +205 189 148 +222 213 172 +238 230 197 +205 197 156 +246 238 222 +213 205 164 +222 213 156 +0 0 0 +0 0 0 +213 189 148 +230 213 180 +238 230 213 +246 238 230 +246 246 246 +0 0 0 +255 222 65 +255 255 180 +255 238 74 +255 246 115 +255 255 148 +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 diff --git a/graphics/battle_terrain/building/tiles.png b/graphics/battle_terrain/building/tiles.png new file mode 100644 index 000000000..9a031c297 Binary files /dev/null and b/graphics/battle_terrain/building/tiles.png differ diff --git a/graphics/battle_terrain/cave/anim_map.bin b/graphics/battle_terrain/cave/anim_map.bin new file mode 100644 index 000000000..0ab486890 Binary files /dev/null and b/graphics/battle_terrain/cave/anim_map.bin differ diff --git a/graphics/battle_terrain/cave/anim_tiles.png b/graphics/battle_terrain/cave/anim_tiles.png new file mode 100644 index 000000000..464a2058b Binary files /dev/null and b/graphics/battle_terrain/cave/anim_tiles.png differ diff --git a/graphics/battle_terrain/cave/groudon.pal b/graphics/battle_terrain/cave/groudon.pal new file mode 100644 index 000000000..73021c957 --- /dev/null +++ b/graphics/battle_terrain/cave/groudon.pal @@ -0,0 +1,51 @@ +JASC-PAL +0100 +48 +0 0 0 +246 246 189 +222 213 106 +180 156 106 +197 172 123 +205 189 115 +213 197 148 +197 172 106 +230 222 172 +255 189 49 +238 230 123 +213 115 32 +222 172 106 +230 197 139 +230 213 156 +238 230 180 +0 0 0 +246 246 189 +222 213 106 +180 156 106 +197 172 123 +205 189 115 +213 197 148 +197 172 106 +230 222 172 +255 189 49 +238 230 123 +82 106 172 +148 156 164 +197 189 164 +230 213 180 +238 230 180 +0 0 0 +106 74 65 +148 115 82 +180 139 90 +213 180 131 +230 213 156 +0 0 0 +205 148 74 +230 156 57 +255 172 49 +255 189 49 +205 148 74 +205 148 74 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/battle_terrain/cave/map.bin b/graphics/battle_terrain/cave/map.bin new file mode 100644 index 000000000..61f358f53 Binary files /dev/null and b/graphics/battle_terrain/cave/map.bin differ diff --git a/graphics/battle_terrain/cave/palette.pal b/graphics/battle_terrain/cave/palette.pal new file mode 100644 index 000000000..64894d62c --- /dev/null +++ b/graphics/battle_terrain/cave/palette.pal @@ -0,0 +1,51 @@ +JASC-PAL +0100 +48 +0 0 0 +197 180 131 +205 197 90 +164 139 90 +180 156 106 +189 172 98 +189 164 115 +180 156 90 +197 164 115 +189 172 98 +222 213 106 +172 139 82 +180 148 98 +189 156 106 +197 164 106 +197 172 115 +0 0 0 +197 180 131 +205 197 90 +164 139 90 +180 156 106 +189 172 98 +189 164 115 +180 156 90 +197 164 115 +189 172 98 +222 213 106 +172 139 82 +180 148 98 +189 156 106 +197 164 106 +197 172 115 +0 0 0 +106 74 65 +148 115 82 +180 139 90 +213 180 131 +230 213 156 +0 0 0 +180 139 90 +180 139 90 +180 139 90 +213 180 131 +106 74 65 +148 115 82 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/battle_terrain/cave/tiles.png b/graphics/battle_terrain/cave/tiles.png new file mode 100644 index 000000000..27386731f Binary files /dev/null and b/graphics/battle_terrain/cave/tiles.png differ diff --git a/graphics/battle_terrain/long_grass/anim_map.bin b/graphics/battle_terrain/long_grass/anim_map.bin new file mode 100644 index 000000000..bd86cce6c Binary files /dev/null and b/graphics/battle_terrain/long_grass/anim_map.bin differ diff --git a/graphics/battle_terrain/long_grass/anim_tiles.png b/graphics/battle_terrain/long_grass/anim_tiles.png new file mode 100644 index 000000000..e2f1bb2c1 Binary files /dev/null and b/graphics/battle_terrain/long_grass/anim_tiles.png differ diff --git a/graphics/battle_terrain/long_grass/map.bin b/graphics/battle_terrain/long_grass/map.bin new file mode 100644 index 000000000..61f358f53 Binary files /dev/null and b/graphics/battle_terrain/long_grass/map.bin differ diff --git a/graphics/battle_terrain/long_grass/palette.pal b/graphics/battle_terrain/long_grass/palette.pal new file mode 100644 index 000000000..645c3d0e6 --- /dev/null +++ b/graphics/battle_terrain/long_grass/palette.pal @@ -0,0 +1,51 @@ +JASC-PAL +0100 +48 +0 0 0 +180 238 180 +74 172 98 +115 213 131 +131 230 156 +98 189 131 +156 230 164 +115 197 148 +172 230 180 +0 0 0 +0 0 0 +139 205 90 +148 205 106 +156 222 131 +164 230 156 +172 230 180 +0 0 0 +180 238 180 +74 172 98 +115 213 131 +131 230 156 +98 189 131 +156 230 164 +115 197 148 +172 230 180 +0 0 0 +0 0 0 +139 205 90 +148 205 106 +156 213 131 +164 222 156 +172 230 180 +0 0 0 +115 213 82 +98 180 90 +90 148 74 +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 diff --git a/graphics/battle_terrain/long_grass/tiles.png b/graphics/battle_terrain/long_grass/tiles.png new file mode 100644 index 000000000..8676f2f37 Binary files /dev/null and b/graphics/battle_terrain/long_grass/tiles.png differ diff --git a/graphics/battle_terrain/plain/palette.pal b/graphics/battle_terrain/plain/palette.pal new file mode 100644 index 000000000..2377b7729 --- /dev/null +++ b/graphics/battle_terrain/plain/palette.pal @@ -0,0 +1,51 @@ +JASC-PAL +0100 +48 +0 0 0 +238 255 230 +156 230 156 +230 230 148 +230 238 164 +189 230 148 +230 246 180 +205 230 172 +172 238 172 +0 0 0 +0 0 0 +164 222 246 +180 230 230 +197 238 222 +213 246 213 +230 255 205 +0 0 0 +238 255 230 +156 230 156 +230 230 148 +230 238 164 +189 230 148 +230 246 180 +205 230 172 +172 238 172 +0 0 0 +0 0 0 +164 222 246 +180 230 230 +197 238 222 +213 246 213 +230 255 205 +0 0 0 +74 189 65 +172 230 172 +106 205 90 +131 213 115 +156 213 148 +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 diff --git a/graphics/battle_terrain/pond_water/anim_map.bin b/graphics/battle_terrain/pond_water/anim_map.bin new file mode 100644 index 000000000..00aee5135 Binary files /dev/null and b/graphics/battle_terrain/pond_water/anim_map.bin differ diff --git a/graphics/battle_terrain/pond_water/anim_tiles.png b/graphics/battle_terrain/pond_water/anim_tiles.png new file mode 100644 index 000000000..08568455f Binary files /dev/null and b/graphics/battle_terrain/pond_water/anim_tiles.png differ diff --git a/graphics/battle_terrain/pond_water/map.bin b/graphics/battle_terrain/pond_water/map.bin new file mode 100644 index 000000000..61f358f53 Binary files /dev/null and b/graphics/battle_terrain/pond_water/map.bin differ diff --git a/graphics/battle_terrain/pond_water/palette.pal b/graphics/battle_terrain/pond_water/palette.pal new file mode 100644 index 000000000..b0f74a08f --- /dev/null +++ b/graphics/battle_terrain/pond_water/palette.pal @@ -0,0 +1,51 @@ +JASC-PAL +0100 +48 +0 0 0 +255 255 255 +98 164 230 +164 246 98 +197 255 139 +115 205 180 +205 255 197 +148 222 148 +230 255 222 +139 213 255 +0 0 0 +222 230 230 +230 230 238 +230 238 238 +238 246 246 +246 246 255 +0 0 0 +255 255 255 +98 164 230 +164 246 98 +197 255 139 +115 205 180 +205 255 197 +148 222 148 +230 255 222 +139 213 255 +0 0 0 +222 230 230 +230 230 238 +230 238 238 +238 246 246 +246 246 255 +0 0 0 +205 246 255 +148 213 238 +123 189 230 +90 148 222 +49 106 189 +16 74 156 +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 diff --git a/graphics/battle_terrain/pond_water/tiles.png b/graphics/battle_terrain/pond_water/tiles.png new file mode 100644 index 000000000..81fac5393 Binary files /dev/null and b/graphics/battle_terrain/pond_water/tiles.png differ diff --git a/graphics/battle_terrain/rock/anim_map.bin b/graphics/battle_terrain/rock/anim_map.bin new file mode 100644 index 000000000..d2a2776bd Binary files /dev/null and b/graphics/battle_terrain/rock/anim_map.bin differ diff --git a/graphics/battle_terrain/rock/anim_tiles.png b/graphics/battle_terrain/rock/anim_tiles.png new file mode 100644 index 000000000..41be70296 Binary files /dev/null and b/graphics/battle_terrain/rock/anim_tiles.png differ diff --git a/graphics/battle_terrain/rock/map.bin b/graphics/battle_terrain/rock/map.bin new file mode 100644 index 000000000..61f358f53 Binary files /dev/null and b/graphics/battle_terrain/rock/map.bin differ diff --git a/graphics/battle_terrain/rock/palette.pal b/graphics/battle_terrain/rock/palette.pal new file mode 100644 index 000000000..1702e3810 --- /dev/null +++ b/graphics/battle_terrain/rock/palette.pal @@ -0,0 +1,51 @@ +JASC-PAL +0100 +48 +0 0 0 +255 255 255 +189 172 139 +213 213 172 +222 222 213 +205 189 156 +230 230 213 +213 197 172 +238 238 230 +172 156 131 +0 0 0 +222 230 230 +230 230 238 +230 238 238 +238 246 246 +246 246 255 +0 0 0 +255 255 255 +189 172 139 +213 213 172 +222 222 213 +205 189 156 +230 230 213 +213 197 172 +238 238 230 +172 156 131 +0 0 0 +222 230 230 +230 230 238 +230 238 238 +238 246 246 +246 246 255 +0 0 0 +131 98 90 +164 131 98 +197 156 106 +213 180 131 +230 213 156 +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 diff --git a/graphics/battle_terrain/rock/tiles.png b/graphics/battle_terrain/rock/tiles.png new file mode 100644 index 000000000..efb139eb6 Binary files /dev/null and b/graphics/battle_terrain/rock/tiles.png differ diff --git a/graphics/battle_terrain/sand/anim_map.bin b/graphics/battle_terrain/sand/anim_map.bin new file mode 100644 index 000000000..83c6ba8f1 Binary files /dev/null and b/graphics/battle_terrain/sand/anim_map.bin differ diff --git a/graphics/battle_terrain/sand/anim_tiles.png b/graphics/battle_terrain/sand/anim_tiles.png new file mode 100644 index 000000000..79c774acf Binary files /dev/null and b/graphics/battle_terrain/sand/anim_tiles.png differ diff --git a/graphics/battle_terrain/sand/map.bin b/graphics/battle_terrain/sand/map.bin new file mode 100644 index 000000000..d7bee6035 Binary files /dev/null and b/graphics/battle_terrain/sand/map.bin differ diff --git a/graphics/battle_terrain/sand/palette.pal b/graphics/battle_terrain/sand/palette.pal new file mode 100644 index 000000000..20f4c3f7c --- /dev/null +++ b/graphics/battle_terrain/sand/palette.pal @@ -0,0 +1,51 @@ +JASC-PAL +0100 +48 +0 0 0 +255 255 205 +213 213 90 +238 238 139 +246 246 172 +230 230 106 +255 255 189 +238 230 131 +255 255 230 +0 0 0 +0 0 0 +238 238 123 +238 238 148 +246 246 172 +246 246 180 +246 246 197 +0 0 0 +255 255 205 +222 213 82 +246 246 148 +246 246 189 +230 230 115 +255 255 197 +238 238 123 +255 255 230 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +197 197 74 +164 156 32 +222 222 131 +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 diff --git a/graphics/battle_terrain/sand/tiles.png b/graphics/battle_terrain/sand/tiles.png new file mode 100644 index 000000000..a4f7342be Binary files /dev/null and b/graphics/battle_terrain/sand/tiles.png differ diff --git a/graphics/battle_terrain/sky/anim_map.bin b/graphics/battle_terrain/sky/anim_map.bin new file mode 100644 index 000000000..c1712cdd8 Binary files /dev/null and b/graphics/battle_terrain/sky/anim_map.bin differ diff --git a/graphics/battle_terrain/sky/anim_tiles.png b/graphics/battle_terrain/sky/anim_tiles.png new file mode 100644 index 000000000..246ca2255 Binary files /dev/null and b/graphics/battle_terrain/sky/anim_tiles.png differ diff --git a/graphics/battle_terrain/sky/map.bin b/graphics/battle_terrain/sky/map.bin new file mode 100644 index 000000000..d7bee6035 Binary files /dev/null and b/graphics/battle_terrain/sky/map.bin differ diff --git a/graphics/battle_terrain/sky/palette.pal b/graphics/battle_terrain/sky/palette.pal new file mode 100644 index 000000000..1a547d6a1 --- /dev/null +++ b/graphics/battle_terrain/sky/palette.pal @@ -0,0 +1,51 @@ +JASC-PAL +0100 +48 +0 0 0 +213 238 255 +222 230 255 +148 205 255 +172 213 255 +197 222 255 +197 230 255 +172 213 255 +230 246 255 +205 222 246 +238 246 255 +164 213 255 +180 222 255 +197 230 255 +213 238 255 +230 246 255 +0 0 0 +180 238 255 +222 230 255 +148 205 255 +172 213 255 +197 222 255 +197 230 255 +172 213 255 +230 246 255 +205 222 246 +238 246 255 +148 197 255 +164 205 255 +189 222 255 +205 230 255 +230 246 255 +0 0 0 +222 238 255 +230 238 255 +238 246 255 +246 246 255 +255 255 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +139 172 205 +197 230 255 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/battle_terrain/sky/tiles.png b/graphics/battle_terrain/sky/tiles.png new file mode 100644 index 000000000..461bba675 Binary files /dev/null and b/graphics/battle_terrain/sky/tiles.png differ diff --git a/graphics/battle_terrain/stadium/battle_frontier.pal b/graphics/battle_terrain/stadium/battle_frontier.pal new file mode 100644 index 000000000..10a842bcc --- /dev/null +++ b/graphics/battle_terrain/stadium/battle_frontier.pal @@ -0,0 +1,51 @@ +JASC-PAL +0100 +48 +0 0 0 +255 255 255 +189 189 156 +213 213 197 +230 230 213 +197 197 180 +238 238 222 +205 205 189 +197 197 180 +0 0 0 +0 0 0 +222 230 230 +230 230 238 +230 238 238 +238 246 246 +246 246 255 +0 0 0 +255 255 255 +189 189 156 +213 213 197 +230 230 213 +197 197 180 +238 238 222 +205 205 189 +197 197 180 +0 0 0 +0 0 0 +222 230 230 +230 230 238 +230 238 238 +238 246 246 +246 246 255 +0 0 0 +172 189 213 +238 238 246 +180 197 222 +205 222 238 +222 230 246 +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 diff --git a/graphics/battle_terrain/stadium/map.bin b/graphics/battle_terrain/stadium/map.bin new file mode 100644 index 000000000..d7bee6035 Binary files /dev/null and b/graphics/battle_terrain/stadium/map.bin differ diff --git a/graphics/battle_terrain/stadium/palette1.pal b/graphics/battle_terrain/stadium/palette1.pal new file mode 100644 index 000000000..8252e3c5e --- /dev/null +++ b/graphics/battle_terrain/stadium/palette1.pal @@ -0,0 +1,51 @@ +JASC-PAL +0100 +48 +0 0 0 +230 246 255 +65 131 213 +131 197 255 +148 205 246 +82 148 222 +172 213 246 +106 172 238 +98 164 246 +82 148 230 +98 164 246 +65 164 213 +106 189 230 +139 205 238 +180 230 238 +205 238 246 +0 0 0 +255 255 255 +189 189 156 +213 213 197 +230 230 213 +197 197 180 +238 238 222 +205 205 189 +197 197 180 +0 0 0 +0 0 0 +222 230 230 +230 230 238 +230 238 238 +238 246 246 +246 246 255 +0 0 0 +255 213 65 +255 246 197 +255 213 82 +255 230 115 +255 246 131 +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 diff --git a/graphics/battle_terrain/stadium/palette2.pal b/graphics/battle_terrain/stadium/palette2.pal new file mode 100644 index 000000000..48b2d851b --- /dev/null +++ b/graphics/battle_terrain/stadium/palette2.pal @@ -0,0 +1,51 @@ +JASC-PAL +0100 +48 +0 0 0 +222 222 222 +222 106 0 +156 148 156 +172 164 172 +197 106 49 +189 180 189 +172 123 98 +238 131 0 +230 115 0 +246 131 0 +139 139 139 +156 148 156 +180 172 180 +197 189 197 +205 197 213 +0 0 0 +255 255 255 +189 189 156 +213 213 197 +230 230 213 +197 197 180 +238 238 222 +205 205 189 +197 197 180 +0 0 0 +0 0 0 +222 230 230 +230 230 238 +230 238 238 +238 246 246 +246 246 255 +0 0 0 +123 205 164 +189 255 230 +139 222 180 +156 238 197 +172 255 213 +0 0 0 +213 49 0 +255 222 139 +213 106 57 +246 180 16 +255 197 90 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/battle_terrain/stadium/palette3.pal b/graphics/battle_terrain/stadium/palette3.pal new file mode 100644 index 000000000..10c5b50d6 --- /dev/null +++ b/graphics/battle_terrain/stadium/palette3.pal @@ -0,0 +1,51 @@ +JASC-PAL +0100 +48 +0 0 0 +230 246 230 +222 197 148 +246 222 172 +230 222 189 +230 205 156 +213 230 205 +238 213 164 +246 222 172 +238 205 164 +230 213 164 +65 172 156 +98 197 180 +139 213 213 +164 230 222 +197 238 230 +0 0 0 +230 246 230 +205 172 131 +238 213 164 +238 222 189 +213 180 139 +238 230 222 +222 197 148 +230 205 156 +222 189 148 +230 213 164 +65 172 156 +98 197 180 +139 213 213 +164 230 222 +197 238 230 +0 0 0 +255 213 65 +255 246 197 +255 213 82 +255 230 115 +255 246 131 +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 diff --git a/graphics/battle_terrain/stadium/palette4.pal b/graphics/battle_terrain/stadium/palette4.pal new file mode 100644 index 000000000..201de5471 --- /dev/null +++ b/graphics/battle_terrain/stadium/palette4.pal @@ -0,0 +1,51 @@ +JASC-PAL +0100 +48 +0 0 0 +230 246 230 +197 156 205 +230 205 238 +205 222 230 +205 172 213 +213 213 230 +213 189 222 +213 156 238 +205 164 222 +230 180 238 +65 172 156 +98 197 180 +139 213 213 +164 230 222 +197 238 230 +0 0 0 +230 246 230 +197 139 205 +230 205 238 +205 222 230 +205 156 213 +213 213 230 +213 180 222 +213 156 238 +205 156 213 +230 180 238 +65 172 156 +98 197 180 +139 213 213 +164 230 222 +197 238 230 +0 0 0 +189 90 230 +230 213 246 +189 115 230 +197 139 230 +213 189 230 +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 diff --git a/graphics/battle_terrain/stadium/palette5.pal b/graphics/battle_terrain/stadium/palette5.pal new file mode 100644 index 000000000..16f50d89b --- /dev/null +++ b/graphics/battle_terrain/stadium/palette5.pal @@ -0,0 +1,51 @@ +JASC-PAL +0100 +48 +0 0 0 +230 246 230 +139 172 238 +180 213 255 +180 213 255 +148 180 238 +189 222 255 +164 197 246 +164 197 255 +148 180 246 +180 213 255 +65 172 156 +98 197 180 +139 213 213 +164 230 222 +197 238 230 +0 0 0 +230 246 230 +131 164 230 +180 213 255 +180 213 255 +148 180 238 +189 222 255 +164 197 246 +164 197 255 +148 180 246 +180 213 255 +65 172 156 +98 197 180 +139 213 213 +164 230 222 +197 238 230 +0 0 0 +90 148 238 +172 238 255 +106 172 238 +123 189 246 +164 222 255 +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 diff --git a/graphics/battle_terrain/stadium/palette6.pal b/graphics/battle_terrain/stadium/palette6.pal new file mode 100644 index 000000000..118a6a3bb --- /dev/null +++ b/graphics/battle_terrain/stadium/palette6.pal @@ -0,0 +1,51 @@ +JASC-PAL +0100 +48 +0 0 0 +230 246 230 +246 156 90 +197 197 197 +197 205 205 +230 164 123 +197 222 213 +213 180 156 +255 189 90 +255 172 90 +255 172 32 +65 172 156 +98 197 180 +139 213 213 +164 230 222 +197 238 230 +0 0 0 +230 246 230 +230 115 32 +164 164 164 +172 189 180 +205 131 74 +180 213 205 +180 148 115 +255 148 32 +246 131 32 +255 172 32 +65 172 156 +98 197 180 +139 213 213 +164 230 222 +197 238 230 +0 0 0 +238 189 49 +255 255 131 +238 197 57 +246 222 74 +255 246 98 +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 diff --git a/graphics/battle_terrain/stadium/palette7.pal b/graphics/battle_terrain/stadium/palette7.pal new file mode 100644 index 000000000..b0c050be5 --- /dev/null +++ b/graphics/battle_terrain/stadium/palette7.pal @@ -0,0 +1,51 @@ +JASC-PAL +0100 +48 +0 0 0 +246 238 246 +197 115 205 +246 180 246 +238 205 238 +205 131 213 +238 213 238 +222 164 230 +222 148 230 +213 131 222 +238 156 246 +172 106 172 +205 148 205 +230 189 230 +238 213 238 +238 230 238 +0 0 0 +246 238 246 +197 115 205 +246 180 246 +238 205 238 +205 131 213 +238 213 238 +222 164 230 +222 148 230 +213 131 222 +238 156 246 +172 106 172 +205 148 205 +230 189 230 +238 213 238 +238 230 238 +0 0 0 +246 172 0 +255 238 131 +255 180 16 +255 197 41 +255 238 57 +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 diff --git a/graphics/battle_terrain/stadium/tiles.png b/graphics/battle_terrain/stadium/tiles.png new file mode 100644 index 000000000..ece531ec0 Binary files /dev/null and b/graphics/battle_terrain/stadium/tiles.png differ diff --git a/graphics/battle_terrain/tall_grass/anim_map.bin b/graphics/battle_terrain/tall_grass/anim_map.bin new file mode 100644 index 000000000..8e7d784f3 Binary files /dev/null and b/graphics/battle_terrain/tall_grass/anim_map.bin differ diff --git a/graphics/battle_terrain/tall_grass/anim_tiles.png b/graphics/battle_terrain/tall_grass/anim_tiles.png new file mode 100644 index 000000000..85aed13bb Binary files /dev/null and b/graphics/battle_terrain/tall_grass/anim_tiles.png differ diff --git a/graphics/battle_terrain/tall_grass/map.bin b/graphics/battle_terrain/tall_grass/map.bin new file mode 100644 index 000000000..61f358f53 Binary files /dev/null and b/graphics/battle_terrain/tall_grass/map.bin differ diff --git a/graphics/battle_terrain/tall_grass/palette.pal b/graphics/battle_terrain/tall_grass/palette.pal new file mode 100644 index 000000000..11db31cad --- /dev/null +++ b/graphics/battle_terrain/tall_grass/palette.pal @@ -0,0 +1,51 @@ +JASC-PAL +0100 +48 +0 0 0 +222 255 213 +123 213 131 +172 246 115 +197 246 189 +139 230 131 +222 255 205 +156 238 123 +0 0 0 +0 0 0 +0 0 0 +180 230 148 +189 238 164 +197 238 189 +205 246 197 +213 246 213 +0 0 0 +222 255 213 +123 213 131 +172 246 115 +197 246 189 +139 230 131 +222 255 205 +156 238 123 +0 0 0 +0 0 0 +0 0 0 +180 230 148 +189 238 164 +197 238 189 +205 246 197 +213 246 213 +0 0 0 +123 205 115 +164 222 148 +82 164 57 +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 diff --git a/graphics/battle_terrain/tall_grass/tiles.png b/graphics/battle_terrain/tall_grass/tiles.png new file mode 100644 index 000000000..2d163d7bb Binary files /dev/null and b/graphics/battle_terrain/tall_grass/tiles.png differ diff --git a/graphics/battle_terrain/underwater/anim_map.bin b/graphics/battle_terrain/underwater/anim_map.bin new file mode 100644 index 000000000..616c2a242 Binary files /dev/null and b/graphics/battle_terrain/underwater/anim_map.bin differ diff --git a/graphics/battle_terrain/underwater/anim_tiles.png b/graphics/battle_terrain/underwater/anim_tiles.png new file mode 100644 index 000000000..3e75434db Binary files /dev/null and b/graphics/battle_terrain/underwater/anim_tiles.png differ diff --git a/graphics/battle_terrain/underwater/map.bin b/graphics/battle_terrain/underwater/map.bin new file mode 100644 index 000000000..61f358f53 Binary files /dev/null and b/graphics/battle_terrain/underwater/map.bin differ diff --git a/graphics/battle_terrain/underwater/palette.pal b/graphics/battle_terrain/underwater/palette.pal new file mode 100644 index 000000000..b5859af6e --- /dev/null +++ b/graphics/battle_terrain/underwater/palette.pal @@ -0,0 +1,51 @@ +JASC-PAL +0100 +48 +0 0 0 +197 230 255 +131 139 197 +148 197 246 +172 205 255 +131 164 213 +189 213 255 +148 180 222 +205 222 255 +197 230 255 +0 0 0 +148 164 238 +156 189 238 +172 205 238 +189 213 246 +197 222 255 +0 0 0 +197 230 255 +131 139 197 +148 197 246 +172 205 255 +131 164 213 +189 213 255 +148 180 222 +205 222 255 +197 230 255 +0 0 0 +148 164 238 +156 189 238 +172 205 238 +189 213 246 +197 222 255 +0 0 0 +98 164 230 +131 197 255 +172 238 255 +255 255 255 +205 255 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +98 98 172 +131 131 230 +172 172 255 +255 255 255 diff --git a/graphics/battle_terrain/underwater/tiles.png b/graphics/battle_terrain/underwater/tiles.png new file mode 100644 index 000000000..b0d49a9cc Binary files /dev/null and b/graphics/battle_terrain/underwater/tiles.png differ diff --git a/graphics/battle_terrain/water/anim_map.bin b/graphics/battle_terrain/water/anim_map.bin new file mode 100644 index 000000000..2b5f7a548 Binary files /dev/null and b/graphics/battle_terrain/water/anim_map.bin differ diff --git a/graphics/battle_terrain/water/anim_tiles.png b/graphics/battle_terrain/water/anim_tiles.png new file mode 100644 index 000000000..b50564029 Binary files /dev/null and b/graphics/battle_terrain/water/anim_tiles.png differ diff --git a/graphics/battle_terrain/water/kyogre.pal b/graphics/battle_terrain/water/kyogre.pal new file mode 100644 index 000000000..eaa19730f --- /dev/null +++ b/graphics/battle_terrain/water/kyogre.pal @@ -0,0 +1,51 @@ +JASC-PAL +0100 +48 +0 0 0 +246 246 189 +90 148 222 +148 213 238 +180 222 222 +106 172 230 +172 213 213 +123 189 230 +205 222 197 +0 0 0 +0 0 0 +172 139 82 +189 156 106 +213 197 148 +230 213 164 +238 230 180 +0 0 0 +246 246 189 +90 148 222 +148 213 238 +180 222 222 +106 172 230 +172 213 213 +123 189 230 +205 222 197 +0 0 0 +0 0 0 +172 139 82 +189 156 106 +213 197 148 +230 213 164 +238 230 180 +0 0 0 +98 164 230 +131 197 255 +172 238 255 +255 255 255 +205 255 255 +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 diff --git a/graphics/battle_terrain/water/map.bin b/graphics/battle_terrain/water/map.bin new file mode 100644 index 000000000..61f358f53 Binary files /dev/null and b/graphics/battle_terrain/water/map.bin differ diff --git a/graphics/battle_terrain/water/palette.pal b/graphics/battle_terrain/water/palette.pal new file mode 100644 index 000000000..cbef92774 --- /dev/null +++ b/graphics/battle_terrain/water/palette.pal @@ -0,0 +1,51 @@ +JASC-PAL +0100 +48 +0 0 0 +255 255 255 +90 148 222 +148 213 238 +180 230 246 +106 172 230 +197 238 255 +123 189 230 +222 246 255 +0 0 0 +0 0 0 +205 222 246 +222 230 238 +230 238 238 +238 246 246 +246 246 255 +0 0 0 +255 255 255 +90 148 222 +148 213 238 +180 230 246 +106 172 230 +197 238 255 +123 189 230 +222 246 255 +0 0 0 +0 0 0 +205 222 246 +222 230 238 +230 238 238 +238 246 246 +246 246 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +197 238 255 +148 213 238 +123 189 230 +90 148 222 +49 106 189 +16 74 156 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/battle_terrain/water/tiles.png b/graphics/battle_terrain/water/tiles.png new file mode 100644 index 000000000..902047875 Binary files /dev/null and b/graphics/battle_terrain/water/tiles.png differ diff --git a/graphics/battle_transitions/vs.png b/graphics/battle_transitions/vs.png new file mode 100644 index 000000000..a1badcb02 Binary files /dev/null and b/graphics/battle_transitions/vs.png differ diff --git a/graphics/battle_transitions/vs_frame.bin b/graphics/battle_transitions/vs_frame.bin new file mode 100644 index 000000000..2ad153964 Binary files /dev/null and b/graphics/battle_transitions/vs_frame.bin differ diff --git a/graphics/battle_transitions/vs_frame.png b/graphics/battle_transitions/vs_frame.png new file mode 100644 index 000000000..0b38c8960 Binary files /dev/null and b/graphics/battle_transitions/vs_frame.png differ diff --git a/graphics/contest/nextturn_numbers.png b/graphics/contest/nextturn_numbers.png new file mode 100644 index 000000000..cd0305b16 Binary files /dev/null and b/graphics/contest/nextturn_numbers.png differ diff --git a/graphics/contest/nextturn_random.png b/graphics/contest/nextturn_random.png new file mode 100644 index 000000000..7205bad8c Binary files /dev/null and b/graphics/contest/nextturn_random.png differ -- cgit v1.2.3 From cfe2cbd3818abbefd983ac10986473673cc79130 Mon Sep 17 00:00:00 2001 From: paul Date: Sat, 13 Oct 2018 21:59:56 +0200 Subject: add some battle interface, berry blender and contest files, fix up label --- asm/battle_anim_80A22E8.s | 4 +- data/graphics.s | 148 +++++++++++++++++++++++-- graphics/battle_interface/ball_status_bar.png | Bin 0 -> 174 bytes graphics/battle_interface/enemy_mon_shadow.png | Bin 0 -> 154 bytes graphics/berry_blender/center.png | Bin 0 -> 1374 bytes graphics/berry_blender/outer.png | Bin 0 -> 1880 bytes graphics/berry_blender/outer_map.bin | Bin 0 -> 2048 bytes graphics/contest/applause_meter.png | Bin 0 -> 184 bytes graphics/contest/nextturn.png | Bin 0 -> 195 bytes graphics/unknown/unknown_E7CFB0.bin | Bin 0 -> 1280 bytes 10 files changed, 140 insertions(+), 12 deletions(-) create mode 100644 graphics/battle_interface/ball_status_bar.png create mode 100644 graphics/battle_interface/enemy_mon_shadow.png create mode 100644 graphics/berry_blender/center.png create mode 100644 graphics/berry_blender/outer.png create mode 100644 graphics/berry_blender/outer_map.bin create mode 100644 graphics/contest/applause_meter.png create mode 100644 graphics/contest/nextturn.png create mode 100644 graphics/unknown/unknown_E7CFB0.bin diff --git a/asm/battle_anim_80A22E8.s b/asm/battle_anim_80A22E8.s index c7048f9e4..e61ff48ad 100644 --- a/asm/battle_anim_80A22E8.s +++ b/asm/battle_anim_80A22E8.s @@ -18915,7 +18915,7 @@ _080AB45C: .4byte gUnknown_8E809CC _080AB460: .4byte gUnknown_2037F02 _080AB464: .4byte gUnknown_8E81CEC _080AB468: - ldr r0, _080AB4E0 @ =gUnknown_8E7BAB0 + ldr r0, _080AB4E0 @ =gFile_graphics_battle_anims_backgrounds_water_muddy_palette mov r1, sp ldrb r1, [r1, 0x8] lsls r1, 4 @@ -18973,7 +18973,7 @@ _080AB476: strh r0, [r7, 0xE] b _080AB552 .align 2, 0 -_080AB4E0: .4byte gUnknown_8E7BAB0 +_080AB4E0: .4byte gFile_graphics_battle_anims_backgrounds_water_muddy_palette _080AB4E4: .4byte sub_80AB79C _080AB4E8: .4byte gTasks _080AB4EC: .4byte 0x0000ffb0 diff --git a/data/graphics.s b/data/graphics.s index 62dd2c823..0c79f58e2 100644 --- a/data/graphics.s +++ b/data/graphics.s @@ -13575,45 +13575,173 @@ gUnknown_8E7A880:: @ 8E7A880 .align 2 gFile_graphics_contest_nextturn_numbers:: @ 8E7A8DC .incbin "graphics/contest/nextturn_numbers.4bpp" - @ .incbin "baserom.gba", 0xE7A8DC, 0x0080 .align 2 gFile_graphics_contest_nextturn_random:: @ 8E7A95C .incbin "graphics/contest/nextturn_random.4bpp" - @ .incbin "baserom.gba", 0xE7A95C, 0x0020 .align 2 gFile_graphics_battle_anims_sprites_264_sheet:: @ 8E7A97C .incbin "graphics/battle_anims/sprites/264.4bpp.lz" - @ .incbin "baserom.gba", 0xE7A97C, 0x0020 .align 2 gFile_graphics_battle_anims_sprites_264_palette:: @ 8E7A99C .incbin "graphics/battle_anims/sprites/264.gbapal.lz" - @ .incbin "baserom.gba", 0xE7A99C, 0x0018 .align 2 gFile_graphics_battle_anims_sprites_265_palette:: @ 8E7A9B4 .incbin "graphics/battle_anims/sprites/265.gbapal.lz" - @ .incbin "baserom.gba", 0xE7A9B4, 0x0018 .align 2 gFile_graphics_battle_anims_sprites_067_palette:: @ 8E7A9CC .incbin "graphics/battle_anims/sprites/067.gbapal.lz" - @ .incbin "baserom.gba", 0xE7A9CC, 0x0020 .align 2 gFile_graphics_battle_anims_sprites_068_palette:: @ 8E7A9EC .incbin "graphics/battle_anims/sprites/068.gbapal.lz" - @ .incbin "baserom.gba", 0xE7A9EC, 0x0020 .align 2 gUnknown_8E7AA0C:: @ 8E7AA0C - .incbin "baserom.gba", 0xE7AA0C, 0x10A4 + .incbin "baserom.gba", 0xE7AA0C, 0x12C -gUnknown_8E7BAB0:: @ 8E7BAB0 - .incbin "baserom.gba", 0xE7BAB0, 0x3744 + .align 2 +gFile_graphics_contest_applause_meter:: @ 8E7AB38 + .incbin "graphics/contest/applause_meter.4bpp" + + .align 2 +gFile_graphics_contest_nextturn:: @ 8E7ABB8 + .incbin "graphics/contest/nextturn.gbapal" + + .align 2 +gFile_graphics_battle_anims_sprites_272_sheet:: @ 8E7ABD8 + .incbin "graphics/battle_anims/sprites/272.4bpp.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_272_palette:: @ 8E7ADF4 + .incbin "graphics/battle_anims/sprites/272.gbapal.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_273_sheet:: @ 8E7AE18 + .incbin "graphics/battle_anims/sprites/273.4bpp.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_269_sheet:: @ 8E7AE40 + .incbin "graphics/battle_anims/sprites/269.4bpp.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_269_palette:: @ 8E7AE94 + .incbin "graphics/battle_anims/sprites/269.gbapal.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_274_sheet:: @ 8E7AEAC + .incbin "graphics/battle_anims/sprites/274.4bpp.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_275_sheet:: @ 8E7B02C + .incbin "graphics/battle_anims/sprites/275.4bpp.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_276_sheet:: @ 8E7B198 + .incbin "graphics/battle_anims/sprites/276.4bpp.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_274_palette:: @ 8E7B300 + .incbin "graphics/battle_anims/sprites/274.gbapal.lz" + + .align 2 +gFile_graphics_battle_anims_backgrounds_17_sheet:: @ 8E7B328 + .incbin "graphics/battle_anims/backgrounds/17.4bpp.lz" + + .align 2 +gFile_graphics_battle_anims_backgrounds_17_palette:: @ 8E7B484 + .incbin "graphics/battle_anims/backgrounds/17.gbapal.lz" + + .align 2 +gFile_graphics_battle_anims_backgrounds_17_tilemap:: @ 8E7B4AC + .incbin "graphics/battle_anims/backgrounds/17.bin.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_280_sheet:: @ 8E7B694 + .incbin "graphics/battle_anims/sprites/280.4bpp.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_280_palette:: @ 8E7BA90 + .incbin "graphics/battle_anims/sprites/280.gbapal.lz" + + .align 2 +gFile_graphics_battle_anims_backgrounds_water_muddy_palette:: @ 8E7BAB0 + .incbin "graphics/battle_anims/backgrounds/water_muddy.gbapal.lz" + + .align 2 +gFile_graphics_battle_interface_enemy_mon_shadow_sheet:: @ 8E7BAD4 + .incbin "graphics/battle_interface/enemy_mon_shadow.4bpp.lz" + .align 2 +gFile_graphics_battle_interface_ball_status_bar_sheet:: @ 8E7BB04 + .incbin "graphics/battle_interface/ball_status_bar.4bpp.lz" + + + .align 2 +gUnknown_8E7BBB8:: @ 8E7BB88 + .incbin "baserom.gba", 0xE7BB88, 0x400 + + .align 2 +gFile_graphics_battle_anims_backgrounds_02_sheet:: @ 8E7BF88 + .incbin "graphics/battle_anims/backgrounds/02.4bpp.lz" + + .align 2 +gFile_graphics_battle_anims_backgrounds_02_palette:: @ 8E7CC50 + .incbin "graphics/battle_anims/backgrounds/02.gbapal.lz" + + .align 2 +gFile_graphics_battle_anims_backgrounds_02_tilemap:: @ 8E7CC6C + .incbin "graphics/battle_anims/backgrounds/02.bin.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_287_palette:: @ 8E7CF60 + .incbin "graphics/battle_anims/sprites/287.gbapal.lz" + + .align 2 +gFile_graphics_battle_anims_backgrounds_24_palette:: @ 8E7CF88 + .incbin "graphics/battle_anims/backgrounds/24.gbapal.lz" + + .align 2 +gFile_graphics_unknown_unknown_E7CFB0_tilemap:: @ 8E7CFB0 + .incbin "graphics/unknown/unknown_E7CFB0.bin.lz" + + .align 2 +gFile_graphics_berry_blender_center_sheet:: @ 8E7D4AC + .incbin "graphics/berry_blender/center.8bpp.lz" + + .align 2 +gFile_graphics_berry_blender_outer_sheet:: @ 8E7DCCC + .incbin "graphics/berry_blender/outer.4bpp.lz" + + .align 2 +gFile_graphics_berry_blender_outer_map_tilemap:: @ 8E7E700 + .incbin "graphics/berry_blender/outer_map.bin.lz" + + .align 2 +gFile_graphics_battle_anims_backgrounds_16_palette:: @ 8E7EA14 + .incbin "graphics/battle_anims/backgrounds/16.gbapal.lz" + + .align 2 +gFile_graphics_battle_anims_backgrounds_16_sheet:: @ 8E7EA3C + .incbin "graphics/battle_anims/backgrounds/16.4bpp.lz" + + .align 2 +gFile_graphics_battle_anims_backgrounds_16_tilemap:: @ 8E7EC9C + .incbin "graphics/battle_anims/backgrounds/16.bin.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_277_palette:: @ 8E7EDD8 + .incbin "graphics/battle_anims/sprites/277.gbapal.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_277_sheet:: @ 8E7EE00 + .incbin "graphics/battle_anims/sprites/277.4bpp.lz" + + .align 2 gUnknown_8E7F1F4:: @ 8E7F1F4 .incbin "baserom.gba", 0xE7F1F4, 0x2B8 diff --git a/graphics/battle_interface/ball_status_bar.png b/graphics/battle_interface/ball_status_bar.png new file mode 100644 index 000000000..b947a7803 Binary files /dev/null and b/graphics/battle_interface/ball_status_bar.png differ diff --git a/graphics/battle_interface/enemy_mon_shadow.png b/graphics/battle_interface/enemy_mon_shadow.png new file mode 100644 index 000000000..3db333a92 Binary files /dev/null and b/graphics/battle_interface/enemy_mon_shadow.png differ diff --git a/graphics/berry_blender/center.png b/graphics/berry_blender/center.png new file mode 100644 index 000000000..1da3629d4 Binary files /dev/null and b/graphics/berry_blender/center.png differ diff --git a/graphics/berry_blender/outer.png b/graphics/berry_blender/outer.png new file mode 100644 index 000000000..d8040b022 Binary files /dev/null and b/graphics/berry_blender/outer.png differ diff --git a/graphics/berry_blender/outer_map.bin b/graphics/berry_blender/outer_map.bin new file mode 100644 index 000000000..092e3997e Binary files /dev/null and b/graphics/berry_blender/outer_map.bin differ diff --git a/graphics/contest/applause_meter.png b/graphics/contest/applause_meter.png new file mode 100644 index 000000000..8a4fce8c0 Binary files /dev/null and b/graphics/contest/applause_meter.png differ diff --git a/graphics/contest/nextturn.png b/graphics/contest/nextturn.png new file mode 100644 index 000000000..1d79d0608 Binary files /dev/null and b/graphics/contest/nextturn.png differ diff --git a/graphics/unknown/unknown_E7CFB0.bin b/graphics/unknown/unknown_E7CFB0.bin new file mode 100644 index 000000000..91230cb01 Binary files /dev/null and b/graphics/unknown/unknown_E7CFB0.bin differ -- cgit v1.2.3 From ddb2440809e0f222175c43045fc0d450cf7c0938 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sat, 13 Oct 2018 16:04:33 -0400 Subject: sub_8112940 --- asm/quest_log.s | 247 ---------------------------------------------------- data/quest_log.s | 4 - include/quest_log.h | 12 +++ src/quest_log.c | 88 +++++++++++++++++-- 4 files changed, 91 insertions(+), 260 deletions(-) diff --git a/asm/quest_log.s b/asm/quest_log.s index 69def6a01..e4947d79c 100644 --- a/asm/quest_log.s +++ b/asm/quest_log.s @@ -5,253 +5,6 @@ .text - thumb_func_start sub_8112940 -sub_8112940: @ 8112940 - push {r4-r7,lr} - mov r7, r9 - mov r6, r8 - push {r6,r7} - adds r3, r1, 0 - lsls r0, 24 - lsrs r0, 24 - lsls r4, r2, 16 - cmp r0, 0x1 - beq _08112964 - cmp r0, 0x2 - beq _081129E0 - ldr r1, _08112960 @ =gUnknown_3005E88 - movs r0, 0 - strb r0, [r1] - b _08112B20 - .align 2, 0 -_08112960: .4byte gUnknown_3005E88 -_08112964: - ldr r2, _081129C0 @ =gUnknown_3005E94 - str r3, [r2] - ldr r1, _081129C4 @ =gUnknown_3005E8C - lsrs r0, r4, 19 - strh r0, [r1] - ldr r0, _081129C8 @ =gUnknown_3005E88 - mov r9, r0 - adds r1, r2, 0 - ldr r6, _081129CC @ =gUnknown_203AF9A - ldr r2, _081129D0 @ =gUnknown_203AF98 - ldr r7, _081129D4 @ =gUnknown_203B01C - ldr r0, _081129D8 @ =gUnknown_3005E90 - mov r12, r0 - ldr r0, _081129DC @ =gUnknown_203B01A - mov r8, r0 - movs r5, 0xFF - adds r3, r6, 0 - movs r4, 0x3F -_08112988: - ldrb r0, [r3] - orrs r0, r5 - strb r0, [r3] - ldrb r0, [r3, 0x1] - orrs r0, r5 - strb r0, [r3, 0x1] - adds r3, 0x2 - subs r4, 0x1 - cmp r4, 0 - bge _08112988 - movs r0, 0 - strh r0, [r2] - strh r0, [r7] - movs r0, 0 - mov r2, r12 - str r0, [r2] - ldr r1, [r1] - ldrh r0, [r1, 0x4] - mov r2, r8 - strh r0, [r2] - ldrb r0, [r1, 0x3] - strb r0, [r6] - movs r0, 0xFF - strb r0, [r6, 0x1] - movs r0, 0x1 - mov r1, r9 - strb r0, [r1] - b _08112B20 - .align 2, 0 -_081129C0: .4byte gUnknown_3005E94 -_081129C4: .4byte gUnknown_3005E8C -_081129C8: .4byte gUnknown_3005E88 -_081129CC: .4byte gUnknown_203AF9A -_081129D0: .4byte gUnknown_203AF98 -_081129D4: .4byte gUnknown_203B01C -_081129D8: .4byte gUnknown_3005E90 -_081129DC: .4byte gUnknown_203B01A -_081129E0: - ldr r1, _08112A44 @ =gUnknown_3005E94 - str r3, [r1] - ldr r5, _08112A48 @ =gUnknown_3005E8C - lsrs r0, r4, 19 - strh r0, [r5] - movs r4, 0 - ldr r2, _08112A4C @ =gUnknown_203B01A - mov r8, r2 - cmp r4, r0 - bge _08112A0E - adds r6, r1, 0 - ldr r0, _08112A50 @ =gUnknown_845669C - ldr r2, [r0] - ldr r3, [r0, 0x4] -_081129FC: - ldr r1, [r6] - lsls r0, r4, 3 - adds r0, r1 - str r2, [r0] - str r3, [r0, 0x4] - adds r4, 0x1 - ldrh r0, [r5] - cmp r4, r0 - blt _081129FC -_08112A0E: - ldr r4, _08112A54 @ =gUnknown_203AF98 - movs r2, 0 - strh r2, [r4] - mov r1, r8 - strh r2, [r1] - movs r1, 0 - ldr r3, _08112A44 @ =gUnknown_3005E94 - ldr r0, [r3] - strh r1, [r0, 0x4] - strb r2, [r0, 0x6] - ldrh r0, [r4] - ldr r1, [r3] - lsls r0, 3 - adds r0, r1 - strb r2, [r0] - bl player_get_direction_lower_nybble - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x4 - bhi _08112AC8 - lsls r0, 2 - ldr r1, _08112A58 @ =_08112A5C - adds r0, r1 - ldr r0, [r0] - mov pc, r0 - .align 2, 0 -_08112A44: .4byte gUnknown_3005E94 -_08112A48: .4byte gUnknown_3005E8C -_08112A4C: .4byte gUnknown_203B01A -_08112A50: .4byte gUnknown_845669C -_08112A54: .4byte gUnknown_203AF98 -_08112A58: .4byte _08112A5C - .align 2, 0 -_08112A5C: - .4byte _08112A70 - .4byte _08112A70 - .4byte _08112AA0 - .4byte _08112AB8 - .4byte _08112A88 -_08112A70: - ldr r0, _08112A80 @ =gUnknown_203AF98 - ldrh r0, [r0] - ldr r1, _08112A84 @ =gUnknown_3005E94 - ldr r1, [r1] - lsls r0, 3 - adds r0, r1 - movs r1, 0 - b _08112AC6 - .align 2, 0 -_08112A80: .4byte gUnknown_203AF98 -_08112A84: .4byte gUnknown_3005E94 -_08112A88: - ldr r0, _08112A98 @ =gUnknown_203AF98 - ldrh r0, [r0] - ldr r1, _08112A9C @ =gUnknown_3005E94 - ldr r1, [r1] - lsls r0, 3 - adds r0, r1 - movs r1, 0x3 - b _08112AC6 - .align 2, 0 -_08112A98: .4byte gUnknown_203AF98 -_08112A9C: .4byte gUnknown_3005E94 -_08112AA0: - ldr r0, _08112AB0 @ =gUnknown_203AF98 - ldrh r0, [r0] - ldr r1, _08112AB4 @ =gUnknown_3005E94 - ldr r1, [r1] - lsls r0, 3 - adds r0, r1 - movs r1, 0x1 - b _08112AC6 - .align 2, 0 -_08112AB0: .4byte gUnknown_203AF98 -_08112AB4: .4byte gUnknown_3005E94 -_08112AB8: - ldr r0, _08112B2C @ =gUnknown_203AF98 - ldrh r0, [r0] - ldr r1, _08112B30 @ =gUnknown_3005E94 - ldr r1, [r1] - lsls r0, 3 - adds r0, r1 - movs r1, 0x2 -_08112AC6: - strb r1, [r0, 0x3] -_08112AC8: - ldr r0, _08112B34 @ =gUnknown_203B01C - movs r5, 0 - strh r5, [r0] - ldr r2, _08112B2C @ =gUnknown_203AF98 - ldrh r0, [r2] - adds r0, 0x1 - strh r0, [r2] - ldrh r0, [r2] - ldr r3, _08112B30 @ =gUnknown_3005E94 - ldr r4, [r3] - lsls r0, 3 - adds r0, r4 - movs r1, 0 - strh r1, [r0, 0x4] - ldrh r0, [r2] - lsls r0, 3 - adds r0, r4 - movs r4, 0x2 - strb r4, [r0, 0x6] - ldrh r0, [r2] - ldr r1, [r3] - lsls r0, 3 - adds r0, r1 - strb r5, [r0] - ldrh r0, [r2] - ldr r1, [r3] - lsls r0, 3 - adds r0, r1 - strb r5, [r0, 0x1] - ldrh r0, [r2] - ldr r1, [r3] - lsls r0, 3 - adds r0, r1 - strb r5, [r0, 0x2] - ldrh r0, [r2] - ldr r1, [r3] - lsls r0, 3 - adds r0, r1 - strb r5, [r0, 0x3] - ldrh r0, [r2] - adds r0, 0x1 - strh r0, [r2] - ldr r0, _08112B38 @ =gUnknown_3005E88 - strb r4, [r0] -_08112B20: - pop {r3,r4} - mov r8, r3 - mov r9, r4 - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_08112B2C: .4byte gUnknown_203AF98 -_08112B30: .4byte gUnknown_3005E94 -_08112B34: .4byte gUnknown_203B01C -_08112B38: .4byte gUnknown_3005E88 - thumb_func_end sub_8112940 - thumb_func_start sub_8112B3C sub_8112B3C: @ 8112B3C push {r4-r7,lr} diff --git a/data/quest_log.s b/data/quest_log.s index c7956f82d..dd7776ae0 100644 --- a/data/quest_log.s +++ b/data/quest_log.s @@ -1,9 +1,5 @@ .section .rodata - .align 2, 0 -gUnknown_845669C:: @ 845669C - .incbin "baserom.gba", 0x45669C, 0x8 - gUnknown_84566A4:: @ 84566A4 .incbin "baserom.gba", 0x4566A4, 0x4 diff --git a/include/quest_log.h b/include/quest_log.h index 280a04423..f3fc04f41 100644 --- a/include/quest_log.h +++ b/include/quest_log.h @@ -1,8 +1,20 @@ #ifndef GUARD_QUEST_LOG_H #define GUARD_QUEST_LOG_H +struct UnkStruct_3005E90 +{ + u8 unk_0; + u8 unk_1_0:1; + u8 unk_1_1:1; + u8 unk_1_2:1; + u8 unk_1_3:1; + u8 unk_1_4:1; + u8 unk_2; +}; + extern u8 gUnknown_3005E88; extern u16 gUnknown_3005E8C; +extern struct UnkStruct_3005E90 gUnknown_3005E90; extern struct UnkStruct_203AE98 * gUnknown_3005E94; #endif //GUARD_QUEST_LOG_H diff --git a/src/quest_log.c b/src/quest_log.c index 834585ac9..49e0db836 100644 --- a/src/quest_log.c +++ b/src/quest_log.c @@ -54,6 +54,7 @@ struct UnkStruct_203AE98 u8 gUnknown_3005E88; u16 gUnknown_3005E8C; +struct UnkStruct_3005E90 gUnknown_3005E90; struct UnkStruct_203AE98 * gUnknown_3005E94; EWRAM_DATA u8 gUnknown_203ADF8 = 0; @@ -69,7 +70,7 @@ EWRAM_DATA u16 *gUnknown_203AE90 = NULL; EWRAM_DATA struct UnkStruct_203AE94 gUnknown_203AE94 = {0}; EWRAM_DATA struct UnkStruct_203AE98 gUnknown_203AE98[32] = {0}; EWRAM_DATA u16 gUnknown_203AF98 = 0; -EWRAM_DATA u8 gUnknown_203AF9A[128]; +EWRAM_DATA u8 gUnknown_203AF9A[64][2]; EWRAM_DATA u16 gUnknown_203B01A; EWRAM_DATA u16 gUnknown_203B01C; @@ -149,6 +150,8 @@ const u16 gUnknown_8456638[] = INCBIN_U16("data/graphics/unknown_8456638.bin"); const u8 gUnknown_8456698[] = {17, 10, 3}; +extern const struct UnkStruct_203AE98 gUnknown_845669C; + void sub_8110840(void * a0) { size_t r1 = (void *)gSaveBlock1Ptr - a0; @@ -1437,24 +1440,24 @@ void sub_811246C(struct Sprite *sprite) struct MapObject *mapObject = &gMapObjects[sprite->data[0]]; if (mapObject->localId == 0xFF) { - if (gUnknown_203AF9A[0] != 0xFF) + if (gUnknown_203AF9A[0][0] != 0xFF) { - sub_8063CA4(mapObject, gUnknown_203AF9A[0]); - gUnknown_203AF9A[0] = 0xFF; + sub_8063CA4(mapObject, gUnknown_203AF9A[0][0]); + gUnknown_203AF9A[0][0] = 0xFF; } - if (gUnknown_203AF9A[1] != 0xFF) + if (gUnknown_203AF9A[0][1] != 0xFF) { sub_8150454(); - gUnknown_203AF9A[1] = 0xFF; + gUnknown_203AF9A[0][1] = 0xFF; } sub_8063E28(mapObject, sprite); } else { - if (gUnknown_203AF9A[2 * mapObject->localId] != 0xFF) + if (gUnknown_203AF9A[mapObject->localId][0] != 0xFF) { - sub_8063CA4(mapObject, gUnknown_203AF9A[2 * mapObject->localId]); - gUnknown_203AF9A[2 * mapObject->localId] = 0xFF; + sub_8063CA4(mapObject, gUnknown_203AF9A[mapObject->localId][0]); + gUnknown_203AF9A[mapObject->localId][0] = 0xFF; } sub_8063E28(mapObject, sprite); } @@ -1607,3 +1610,70 @@ void sub_81128BC(u8 a0) break; } } + +void sub_8112940(u8 a0, struct UnkStruct_203AE98 *a1, u16 a2) +{ + s32 i; + + switch (a0) + { + default: + gUnknown_3005E88 = 0; + break; + case 1: + gUnknown_3005E94 = a1; + gUnknown_3005E8C = a2 / 8; + for (i = 0; i < 0x40; i++) + { + gUnknown_203AF9A[i][0] |= 0xFF; + gUnknown_203AF9A[i][1] |= 0xFF; + } + gUnknown_203AF98 = 0; + gUnknown_203B01C = 0; + gUnknown_3005E90 = (struct UnkStruct_3005E90){}; + gUnknown_203B01A = gUnknown_3005E94[gUnknown_203AF98].unk_4; + gUnknown_203AF9A[0][0] = gUnknown_3005E94[gUnknown_203AF98].unk_3; + gUnknown_203AF9A[0][1] = 0xFF; + gUnknown_3005E88 = 1; + break; + case 2: + gUnknown_3005E94 = a1; + gUnknown_3005E8C = a2 / 8; + for (i = 0; i < gUnknown_3005E8C; i++) + { + gUnknown_3005E94[i] = (struct UnkStruct_203AE98){ 0, 0, 0, 0, 0xFFFF, 0xFF }; + } + gUnknown_203AF98 = 0; + gUnknown_203B01A = 0; + gUnknown_3005E94[gUnknown_203AF98].unk_4 = 0; + gUnknown_3005E94[gUnknown_203AF98].unk_6 = 0; + gUnknown_3005E94[gUnknown_203AF98].unk_0 = 0; + switch (player_get_direction_lower_nybble()) + { + case 0: + case 1: + gUnknown_3005E94[gUnknown_203AF98].unk_3 = 0; + break; + case 4: + gUnknown_3005E94[gUnknown_203AF98].unk_3 = 3; + break; + case 2: + gUnknown_3005E94[gUnknown_203AF98].unk_3 = 1; + break; + case 3: + gUnknown_3005E94[gUnknown_203AF98].unk_3 = 2; + break; + } + gUnknown_203B01C = 0; + gUnknown_203AF98++; + gUnknown_3005E94[gUnknown_203AF98].unk_4 = 0; + gUnknown_3005E94[gUnknown_203AF98].unk_6 = 2; + gUnknown_3005E94[gUnknown_203AF98].unk_0 = 0; + gUnknown_3005E94[gUnknown_203AF98].unk_1 = 0; + gUnknown_3005E94[gUnknown_203AF98].unk_2 = 0; + gUnknown_3005E94[gUnknown_203AF98].unk_3 = 0; + gUnknown_203AF98++; + gUnknown_3005E88 = 2; + break; + } +} -- cgit v1.2.3 From fbd6100c36847bb9eff1605484d25b6d31f5b5c0 Mon Sep 17 00:00:00 2001 From: paul Date: Sat, 13 Oct 2018 22:28:46 +0200 Subject: replace more battle anim baseroms, fix up labels --- asm/battle_anim_80A22E8.s | 44 +++++----- asm/party_menu.s | 4 +- data/graphics.s | 147 ++++++++++++++++++++++++++++----- graphics/interface/party_menu_misc.png | Bin 0 -> 613 bytes graphics/unknown/unknown_E81D14.bin | Bin 0 -> 4096 bytes graphics/unknown/unknown_E81FE4.bin | 1 + graphics/unknown/unknown_E822B8.bin | 1 + 7 files changed, 153 insertions(+), 44 deletions(-) create mode 100644 graphics/interface/party_menu_misc.png create mode 100644 graphics/unknown/unknown_E81D14.bin create mode 100644 graphics/unknown/unknown_E81FE4.bin create mode 100644 graphics/unknown/unknown_E822B8.bin diff --git a/asm/battle_anim_80A22E8.s b/asm/battle_anim_80A22E8.s index e61ff48ad..31cf3ba30 100644 --- a/asm/battle_anim_80A22E8.s +++ b/asm/battle_anim_80A22E8.s @@ -16214,7 +16214,7 @@ _080A9F52: lsls r0, 24 cmp r0, 0 beq _080A9F98 - ldr r0, _080A9F94 @ =gUnknown_8E7F874 + ldr r0, _080A9F94 @ =gFile_graphics_battle_anims_backgrounds_scary_face_contest_tilemap ldr r1, [sp, 0x4] bl LZDecompressVram b _080A9FC6 @@ -16222,7 +16222,7 @@ _080A9F52: _080A9F88: .4byte 0x00003f42 _080A9F8C: .4byte gUnknown_2022978 _080A9F90: .4byte gUnknown_202297A -_080A9F94: .4byte gUnknown_8E7F874 +_080A9F94: .4byte gFile_graphics_battle_anims_backgrounds_scary_face_contest_tilemap _080A9F98: ldr r0, _080A9FB4 @ =gUnknown_2037F1B ldrb r0, [r0] @@ -16233,16 +16233,16 @@ _080A9F98: bne _080A9FBC mov r0, sp ldrb r0, [r0, 0x9] - ldr r1, _080A9FB8 @ =gUnknown_8E7F4AC + ldr r1, _080A9FB8 @ =gFile_graphics_battle_anims_backgrounds_scary_face_player_tilemap bl sub_807543C b _080A9FC6 .align 2, 0 _080A9FB4: .4byte gUnknown_2037F1B -_080A9FB8: .4byte gUnknown_8E7F4AC +_080A9FB8: .4byte gFile_graphics_battle_anims_backgrounds_scary_face_player_tilemap _080A9FBC: mov r0, sp ldrb r0, [r0, 0x9] - ldr r1, _080AA010 @ =gUnknown_8E7F690 + ldr r1, _080AA010 @ =gFile_graphics_battle_anims_backgrounds_scary_face_opponent_tilemap bl sub_807543C _080A9FC6: mov r0, sp @@ -16280,7 +16280,7 @@ _080A9FFA: pop {r0} bx r0 .align 2, 0 -_080AA010: .4byte gUnknown_8E7F690 +_080AA010: .4byte gFile_graphics_battle_anims_backgrounds_scary_face_opponent_tilemap _080AA014: .4byte gFile_graphics_battle_anims_backgrounds_scary_face_sheet _080AA018: .4byte gFile_graphics_battle_anims_backgrounds_scary_face_palette _080AA01C: .4byte gTasks @@ -18865,23 +18865,23 @@ sub_80AB38C: @ 80AB38C bne _080AB408 mov r0, sp ldrb r0, [r0, 0x9] - ldr r1, _080AB404 @ =gUnknown_8E81D14 + ldr r1, _080AB404 @ =gFile_graphics_unknown_unknown_E81D14_tilemap bl sub_807543C b _080AB42E .align 2, 0 _080AB3FC: .4byte 0x00003f42 _080AB400: .4byte gUnknown_2037F1A -_080AB404: .4byte gUnknown_8E81D14 +_080AB404: .4byte gFile_graphics_unknown_unknown_E81D14_tilemap _080AB408: mov r0, sp ldrb r0, [r0, 0x9] - ldr r1, _080AB414 @ =gUnknown_8E81FE4 + ldr r1, _080AB414 @ =gFile_graphics_unknown_unknown_E81FE4_tilemap bl sub_807543C b _080AB42E .align 2, 0 -_080AB414: .4byte gUnknown_8E81FE4 +_080AB414: .4byte gFile_graphics_unknown_unknown_E81FE4_tilemap _080AB418: - ldr r0, _080AB458 @ =gUnknown_8E822B8 + ldr r0, _080AB458 @ =gFile_graphics_unknown_unknown_E822B8_tilemap ldr r1, [sp, 0x4] bl LZDecompressVram mov r0, sp @@ -18893,7 +18893,7 @@ _080AB418: _080AB42E: mov r0, sp ldrb r0, [r0, 0x9] - ldr r1, _080AB45C @ =gUnknown_8E809CC + ldr r1, _080AB45C @ =gFile_graphics_battle_anims_backgrounds_water_sheet mov r2, sp ldrh r2, [r2, 0xA] bl sub_80753B4 @@ -18902,7 +18902,7 @@ _080AB42E: ldrsh r0, [r0, r1] cmp r0, 0 bne _080AB468 - ldr r0, _080AB464 @ =gUnknown_8E81CEC + ldr r0, _080AB464 @ =gFile_graphics_battle_anims_backgrounds_water_palette mov r1, sp ldrb r1, [r1, 0x8] lsls r1, 4 @@ -18910,10 +18910,10 @@ _080AB42E: bl LoadCompressedPalette b _080AB476 .align 2, 0 -_080AB458: .4byte gUnknown_8E822B8 -_080AB45C: .4byte gUnknown_8E809CC +_080AB458: .4byte gFile_graphics_unknown_unknown_E822B8_tilemap +_080AB45C: .4byte gFile_graphics_battle_anims_backgrounds_water_sheet _080AB460: .4byte gUnknown_2037F02 -_080AB464: .4byte gUnknown_8E81CEC +_080AB464: .4byte gFile_graphics_battle_anims_backgrounds_water_palette _080AB468: ldr r0, _080AB4E0 @ =gFile_graphics_battle_anims_backgrounds_water_muddy_palette mov r1, sp @@ -28163,7 +28163,7 @@ _080AFB26: bl LoadBgTiles mov r0, sp ldrb r0, [r0, 0x9] - ldr r1, _080AFBB0 @ =gUnknown_8E7F1F4 + ldr r1, _080AFBB0 @ =gFile_graphics_battle_anims_backgrounds_fog_tilemap bl sub_807543C ldr r0, _080AFBB4 @ =gUnknown_83C2CE0 mov r1, sp @@ -28198,7 +28198,7 @@ _080AFBA0: .4byte 0x00003f42 _080AFBA4: .4byte gUnknown_2022978 _080AFBA8: .4byte gUnknown_202297A _080AFBAC: .4byte gUnknown_83C3540 -_080AFBB0: .4byte gUnknown_8E7F1F4 +_080AFBB0: .4byte gFile_graphics_battle_anims_backgrounds_fog_tilemap _080AFBB4: .4byte gUnknown_83C2CE0 _080AFBB8: .4byte gTasks _080AFBBC: .4byte sub_80AFBC0 @@ -28474,7 +28474,7 @@ _080AFDC2: bl LoadBgTiles mov r0, sp ldrb r0, [r0, 0x9] - ldr r1, _080AFE50 @ =gUnknown_8E7F1F4 + ldr r1, _080AFE50 @ =gFile_graphics_battle_anims_backgrounds_fog_tilemap bl sub_807543C ldr r0, _080AFE54 @ =gUnknown_83C2CE0 mov r1, sp @@ -28511,7 +28511,7 @@ _080AFE40: .4byte 0x00003f42 _080AFE44: .4byte gUnknown_2022978 _080AFE48: .4byte gUnknown_202297A _080AFE4C: .4byte gUnknown_83C3540 -_080AFE50: .4byte gUnknown_8E7F1F4 +_080AFE50: .4byte gFile_graphics_battle_anims_backgrounds_fog_tilemap _080AFE54: .4byte gUnknown_83C2CE0 _080AFE58: .4byte gTasks _080AFE5C: .4byte 0x0000ffff @@ -42830,7 +42830,7 @@ _080B6D8C: lsls r4, 1 adds r0, r4 str r1, [r0] - ldr r0, _080B6E00 @ =gUnknown_8E7F4AC + ldr r0, _080B6E00 @ =gFile_graphics_battle_anims_backgrounds_scary_face_player_tilemap bl LZDecompressWram add r0, sp, 0xC ldrb r0, [r0, 0x8] @@ -42867,7 +42867,7 @@ _080B6D8C: b _080B6F1E .align 2, 0 _080B6DFC: .4byte gMonSpritesGfxPtr -_080B6E00: .4byte gUnknown_8E7F4AC +_080B6E00: .4byte gFile_graphics_battle_anims_backgrounds_scary_face_player_tilemap _080B6E04: ldrh r0, [r6, 0xA] adds r0, 0x1 diff --git a/asm/party_menu.s b/asm/party_menu.s index 3a7542241..224fedb1d 100644 --- a/asm/party_menu.s +++ b/asm/party_menu.s @@ -647,7 +647,7 @@ _0811EF6C: .4byte _0811F010 _0811EF8C: ldr r4, _0811EFAC @ =gUnknown_203B0B8 - ldr r0, _0811EFB0 @ =gUnknown_8E82700 + ldr r0, _0811EFB0 @ =gFile_graphics_interface_party_menu_misc_sheet mov r1, sp bl malloc_and_decompress adds r1, r0, 0 @@ -661,7 +661,7 @@ _0811EF8C: b _0811F016 .align 2, 0 _0811EFAC: .4byte gUnknown_203B0B8 -_0811EFB0: .4byte gUnknown_8E82700 +_0811EFB0: .4byte gFile_graphics_interface_party_menu_misc_sheet _0811EFB4: bl IsDma3ManagerBusyWithBgCopy lsls r0, 24 diff --git a/data/graphics.s b/data/graphics.s index 0c79f58e2..98e0939b4 100644 --- a/data/graphics.s +++ b/data/graphics.s @@ -13741,37 +13741,144 @@ gFile_graphics_battle_anims_sprites_277_palette:: @ 8E7EDD8 gFile_graphics_battle_anims_sprites_277_sheet:: @ 8E7EE00 .incbin "graphics/battle_anims/sprites/277.4bpp.lz" + + .align 2 +gFile_graphics_battle_anims_backgrounds_fog_tilemap:: @ 8E7F1F4 + .incbin "graphics/battle_anims/backgrounds/fog.bin.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_283_palette:: @ 8E7F36C + .incbin "graphics/battle_anims/sprites/283.gbapal.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_283_sheet:: @ 8E7F388 + .incbin "graphics/battle_anims/sprites/283.4bpp.lz" + + .align 2 +gFile_graphics_battle_anims_backgrounds_scary_face_player_tilemap:: @ 8E7F4AC + .incbin "graphics/battle_anims/backgrounds/scary_face_player.bin.lz" + + .align 2 +gFile_graphics_battle_anims_backgrounds_scary_face_opponent_tilemap:: @ 8E7F690 + .incbin "graphics/battle_anims/backgrounds/scary_face_opponent.bin.lz" + + .align 2 +gFile_graphics_battle_anims_backgrounds_scary_face_contest_tilemap:: @ 8E7F874 + .incbin "graphics/battle_anims/backgrounds/scary_face_contest.bin.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_263_sheet:: @ 8E7FA58 + .incbin "graphics/battle_anims/sprites/263.4bpp.lz" + .align 2 -gUnknown_8E7F1F4:: @ 8E7F1F4 - .incbin "baserom.gba", 0xE7F1F4, 0x2B8 +gFile_graphics_battle_anims_sprites_263_palette:: @ 8E7FA98 + .incbin "graphics/battle_anims/sprites/263.gbapal.lz" -gUnknown_8E7F4AC:: @ 8E7F4AC - .incbin "baserom.gba", 0xE7F4AC, 0x1E4 + .align 2 +gFile_graphics_battle_anims_sprites_266_sheet:: @ 8E7FAB0 + .incbin "graphics/battle_anims/sprites/266.4bpp.lz" -gUnknown_8E7F690:: @ 8E7F690 - .incbin "baserom.gba", 0xE7F690, 0x1E4 + .align 2 +gFile_graphics_battle_anims_sprites_266_palette:: @ 8E7FAF0 + .incbin "graphics/battle_anims/sprites/266.gbapal.lz" -gUnknown_8E7F874:: @ 8E7F874 - .incbin "baserom.gba", 0xE7F874, 0x1158 + .align 2 +gFile_graphics_battle_anims_sprites_267_palette:: @ 8E7FB08 + .incbin "graphics/battle_anims/sprites/267.gbapal.lz" -gUnknown_8E809CC:: @ 8E809CC - .incbin "baserom.gba", 0xE809CC, 0x1320 + .align 2 +gFile_graphics_battle_anims_sprites_268_palette:: @ 8E7FB20 + .incbin "graphics/battle_anims/sprites/268.gbapal.lz" -gUnknown_8E81CEC:: @ 8E81CEC - .incbin "baserom.gba", 0xE81CEC, 0x28 + .align 2 +gFile_graphics_battle_anims_sprites_278_sheet:: @ 8E7FB38 + .incbin "graphics/battle_anims/sprites/278.4bpp.lz" -gUnknown_8E81D14:: @ 8E81D14 - .incbin "baserom.gba", 0xE81D14, 0x2D0 + .align 2 +gFile_graphics_battle_anims_sprites_278_palette:: @ 8E7FD44 + .incbin "graphics/battle_anims/sprites/278.gbapal.lz" -gUnknown_8E81FE4:: @ 8E81FE4 - .incbin "baserom.gba", 0xE81FE4, 0x2D4 + .align 2 +gFile_graphics_battle_anims_sprites_279_sheet:: @ 8E7FD60 + .incbin "graphics/battle_anims/sprites/279.4bpp.lz" -gUnknown_8E822B8:: @ 8E822B8 - .incbin "baserom.gba", 0xE822B8, 0x448 + .align 2 +gFile_graphics_battle_anims_sprites_279_palette:: @ 8E7FDAC + .incbin "graphics/battle_anims/sprites/279.gbapal.lz" -gUnknown_8E82700:: @ 8E82700 - .incbin "baserom.gba", 0xE82700, 0x2C8 + .align 2 +gFile_graphics_battle_anims_sprites_281_sheet:: @ 8E7FDC8 + .incbin "graphics/battle_anims/sprites/281.4bpp.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_281_palette:: @ 8E7FF50 + .incbin "graphics/battle_anims/sprites/281.gbapal.lz" + + .align 2 +gFile_graphics_battle_anims_backgrounds_21_sheet:: @ 8E7FF70 + .incbin "graphics/battle_anims/backgrounds/21.4bpp.lz" + + .align 2 +gFile_graphics_battle_anims_backgrounds_21_palette:: @ 8E80264 + .incbin "graphics/battle_anims/backgrounds/21.gbapal.lz" + .align 2 +gFile_graphics_battle_anims_backgrounds_21_tilemap:: @ 8E80280 + .incbin "graphics/battle_anims/backgrounds/21.bin.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_284_sheet:: @ 8E8056C + .incbin "graphics/battle_anims/sprites/284.4bpp.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_284_palette:: @ 8E808E8 + .incbin "graphics/battle_anims/sprites/284.gbapal.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_285_sheet:: @ 8E80904 + .incbin "graphics/battle_anims/sprites/285.4bpp.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_285_palette:: @ 8E809A4 + .incbin "graphics/battle_anims/sprites/285.gbapal.lz" + + .align 2 +gFile_graphics_battle_anims_backgrounds_water_sheet:: @ 8E809CC + .incbin "graphics/battle_anims/backgrounds/water.4bpp.lz" + + .align 2 +gFile_graphics_battle_anims_backgrounds_water_palette:: @ 8E81CEC + .incbin "graphics/battle_anims/backgrounds/water.gbapal.lz" + + .align 2 +gFile_graphics_unknown_unknown_E81D14_tilemap:: @ 8E81D14 + .incbin "graphics/unknown/unknown_E81D14.bin.lz" + + .align 2 +gFile_graphics_unknown_unknown_E81FE4_tilemap:: @ 8E81FE4 + .incbin "graphics/unknown/unknown_E81FE4.bin.lz" + + .align 2 +gFile_graphics_unknown_unknown_E822B8_tilemap:: @ 8E822B8 + .incbin "graphics/unknown/unknown_E822B8.bin.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_286_palette:: @ 8E825AC + .incbin "graphics/battle_anims/sprites/286.gbapal.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_188_sheet:: @ 8E825D4 + .incbin "graphics/battle_anims/sprites/188.4bpp.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_188_palette:: @ 8E826E8 + .incbin "graphics/battle_anims/sprites/188.gbapal.lz" + + .align 2 +gFile_graphics_interface_party_menu_misc_sheet:: @ 8E82700 + .incbin "graphics/interface/party_menu_misc.4bpp.lz" + + .align 2 gUnknown_8E829C8:: @ 8E829C8 .incbin "baserom.gba", 0xE829C8, 0xE8 diff --git a/graphics/interface/party_menu_misc.png b/graphics/interface/party_menu_misc.png new file mode 100644 index 000000000..c58f3aae9 Binary files /dev/null and b/graphics/interface/party_menu_misc.png differ diff --git a/graphics/unknown/unknown_E81D14.bin b/graphics/unknown/unknown_E81D14.bin new file mode 100644 index 000000000..d48de1d6f Binary files /dev/null and b/graphics/unknown/unknown_E81D14.bin differ diff --git a/graphics/unknown/unknown_E81FE4.bin b/graphics/unknown/unknown_E81FE4.bin new file mode 100644 index 000000000..6a6f7c049 --- /dev/null +++ b/graphics/unknown/unknown_E81FE4.bin @@ -0,0 +1 @@ +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€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€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€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€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€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€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€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€€€€‚€ƒ€€€€‚€ƒ€€€€‚€ƒ€€€€‚€ƒ€€€€‚€ƒ€€€€‚€ƒ€€€€‚€ƒ€€€€‚€ƒ€€‘€’€“€€‘€’€“€€‘€’€“€€‘€’€“€€‘€’€“€€‘€’€“€€‘€’€“€€‘€’€“€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€ \ No newline at end of file diff --git a/graphics/unknown/unknown_E822B8.bin b/graphics/unknown/unknown_E822B8.bin new file mode 100644 index 000000000..6312b8645 --- /dev/null +++ b/graphics/unknown/unknown_E822B8.bin @@ -0,0 +1 @@ +„Ž„„Œ„‹„Š„‰„ˆ„‡„†„…„„„¢„¢„¢„¢„¢„¢„¢„¢„¢„¢„¢„¢„¢„¢„¢„¢„¢„¢„¢„¢„Ÿ„ž„„œ„›„š„™„˜„—„–„•„”„¢„¢„¢„¢„¢„¢„¢„¢„¢„¢„¢„¢„¢„¢„¢„¢„¢„¢„¢„¢„¯„®„­„¬„«„ª„©„¨„§„¦„¥„¤„£„¢„¡„ „¢„¢„¢„¢„¢„¢„¢„¢„¢„¢„¢„¢„¢„¢„¢„¢„¿„¾„½„¼„»„º„¹„¸„·„¶„µ„´„³„²„±„°„¢„¢„¢„¢„¢„¢„¢„¢„¢„¢„¢„¢„¢„¢„¢„¢„τ΄̈́̄˄ʄɄȄDŽƄńĄÄ„Á„À„¢„¢„¢„¢„¢„¢„¢„¢„¢„¢„¢„¢„¢„¢„¢„¢„߄ބ݄܄ۄڄل؄ׄքՄԄӄ҄фЄ¢„¢„¢„¢„¢„¢„¢„¢„¢„¢„¢„¢„¢„¢„¢„¢„ï„î„í„ì„ë„ê„é„è„ç„æ„å„ä„ã„â„á„à„ƒ„‚„„€„ƒ„‚„„€„ƒ„‚„„€„ƒ„‚„„€„ÿ„þ„ý„ü„û„ú„ù„ø„÷„ö„õ„ô„ó„ò„ñ„ð„“„’„‘„„“„’„‘„„“„’„‘„„“„’„‘„„€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€¢„¢„¢„¢„¢„¢„¢„¢„¢„¢„¢„¢„¢„¢„¢„¢„¢„¢„¢„¢„¢„¢„¢„¢„¢„¢„¢„¢„¢„¢„¢„¢„¢„¢„¢„¢„¢„¢„¢„¢„¢„¢„¢„¢„¢„¢„¢„¢„¢„¢„¢„¢„¢„¢„¢„¢„¢„¢„¢„¢„¢„¢„¢„¢„¢„¢„¢„¢„¢„¢„¢„¢„¢„¢„¢„¢„¢„¢„¢„¢„¢„¢„¢„¢„¢„¢„¢„¢„¢„¢„¢„¢„¢„¢„¢„¢„¢„¢„¢„¢„¢„¢„¢„¢„¢„¢„¢„¢„¢„¢„¢„¢„¢„¢„¢„¢„¢„¢„¢„¢„¢„¢„¢„¢„¢„¢„¢„¢„¢„¢„¢„¢„¢„¢„¢„¢„¢„¢„¢„¢„¢„¢„¢„¢„¢„¢„¢„¢„¢„¢„¢„¢„¢„¢„¢„¢„¢„¢„¢„¢„¢„¢„¢„¢„¢„¢„¢„¢„¢„¢„¢„¢„¢„¢„¢„¢„¢„¢„¢„¢„¢„¢„¢„¢„¢„¢„¢„¢„¢„¢„¢„¢„ƒ„‚„„€„ƒ„‚„„€„ƒ„‚„„€„ƒ„‚„„€„ƒ„‚„„€„ƒ„‚„„€„ƒ„ƒ„‚„„€„ƒ„‚„„“„’„‘„„“„’„‘„„“„’„‘„„“„’„‘„„“„’„‘„„“„’„‘„„“„“„’„‘„„“„’„‘„€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€ \ No newline at end of file -- cgit v1.2.3 From c3ffefa6c284b60ef9aa439029dc7870c364e472 Mon Sep 17 00:00:00 2001 From: paul Date: Sat, 13 Oct 2018 22:38:10 +0200 Subject: replace some interface baseroms, fix labels --- asm/party_menu.s | 4 +-- data/graphics.s | 37 +++++++++++++++++++++-- graphics/interface/bag_swap.png | Bin 0 -> 159 bytes graphics/interface/party_menu_misc.bin | Bin 0 -> 2048 bytes graphics/interface/party_menu_pokeball.png | Bin 0 -> 330 bytes graphics/interface/party_menu_pokeball_small.png | Bin 0 -> 261 bytes graphics/interface/status_icons.png | Bin 0 -> 455 bytes 7 files changed, 36 insertions(+), 5 deletions(-) create mode 100644 graphics/interface/bag_swap.png create mode 100644 graphics/interface/party_menu_misc.bin create mode 100644 graphics/interface/party_menu_pokeball.png create mode 100644 graphics/interface/party_menu_pokeball_small.png create mode 100644 graphics/interface/status_icons.png diff --git a/asm/party_menu.s b/asm/party_menu.s index 224fedb1d..5ba1481ea 100644 --- a/asm/party_menu.s +++ b/asm/party_menu.s @@ -667,13 +667,13 @@ _0811EFB4: lsls r0, 24 cmp r0, 0 bne _0811F030 - ldr r0, _0811EFCC @ =gUnknown_8E82AB0 + ldr r0, _0811EFCC @ =gFile_graphics_interface_party_menu_misc_tilemap ldr r1, _0811EFD0 @ =gUnknown_203B0BC ldr r1, [r1] bl LZDecompressWram b _0811F016 .align 2, 0 -_0811EFCC: .4byte gUnknown_8E82AB0 +_0811EFCC: .4byte gFile_graphics_interface_party_menu_misc_tilemap _0811EFD0: .4byte gUnknown_203B0BC _0811EFD4: ldr r0, _0811EFF4 @ =gUnknown_8E829C8 diff --git a/data/graphics.s b/data/graphics.s index 98e0939b4..47838ad01 100644 --- a/data/graphics.s +++ b/data/graphics.s @@ -13882,9 +13882,31 @@ gFile_graphics_interface_party_menu_misc_sheet:: @ 8E82700 gUnknown_8E829C8:: @ 8E829C8 .incbin "baserom.gba", 0xE829C8, 0xE8 -gUnknown_8E82AB0:: @ 8E82AB0 - .incbin "baserom.gba", 0xE82AB0, 0x61C + .align 2 +gFile_graphics_interface_party_menu_misc_tilemap:: @ 8E82AB0 + .incbin "graphics/interface/party_menu_misc.bin.lz" + + .align 2 +gFile_graphics_interface_party_menu_pokeball_sheet:: @ 8E82BE8 + .incbin "graphics/interface/party_menu_pokeball.4bpp.lz" + + .align 2 +gFile_graphics_interface_party_menu_pokeball_small_sheet:: @ 8E82D68 + .incbin "graphics/interface/party_menu_pokeball_small.4bpp.lz" + + .align 2 +gFile_graphics_interface_party_menu_pokeball_palette:: @ 8E82E7C + .incbin "graphics/interface/party_menu_pokeball.gbapal.lz" + + .align 2 +gUnknown_8E82EA0:: @ 8E82EA0 + .incbin "baserom.gba", 0xE82EA0, 0x204 + .align 2 +gFile_graphics_interface_status_icons_palette:: @ 8E830A4 + .incbin "graphics/interface/status_icons.gbapal.lz" + + .align 2 gUnknown_8E830CC:: @ 8E830CC .incbin "baserom.gba", 0xE830CC, 0x1F4 @@ -13898,8 +13920,17 @@ gUnknown_8E835B4:: @ 8E835B4 .incbin "baserom.gba", 0xE835B4, 0x50 gUnknown_8E83604:: @ 8E83604 - .incbin "baserom.gba", 0xE83604, 0xFD4 + .incbin "baserom.gba", 0xE83604, 0xF84 + + .align 2 +gFile_graphics_interface_bag_swap_sheet:: @ 8E84588 + .incbin "graphics/interface/bag_swap.4bpp.lz" + + .align 2 +gFile_graphics_interface_bag_swap_palette:: @ 8E845C8 + .incbin "graphics/interface/bag_swap.gbapal.lz" + .align 2 gUnknown_8E845D8:: @ 8E845D8 .incbin "baserom.gba", 0xE845D8, 0x44C diff --git a/graphics/interface/bag_swap.png b/graphics/interface/bag_swap.png new file mode 100644 index 000000000..a9bed1e8a Binary files /dev/null and b/graphics/interface/bag_swap.png differ diff --git a/graphics/interface/party_menu_misc.bin b/graphics/interface/party_menu_misc.bin new file mode 100644 index 000000000..d6ff1114d Binary files /dev/null and b/graphics/interface/party_menu_misc.bin differ diff --git a/graphics/interface/party_menu_pokeball.png b/graphics/interface/party_menu_pokeball.png new file mode 100644 index 000000000..2aad54de8 Binary files /dev/null and b/graphics/interface/party_menu_pokeball.png differ diff --git a/graphics/interface/party_menu_pokeball_small.png b/graphics/interface/party_menu_pokeball_small.png new file mode 100644 index 000000000..d2eec4d45 Binary files /dev/null and b/graphics/interface/party_menu_pokeball_small.png differ diff --git a/graphics/interface/status_icons.png b/graphics/interface/status_icons.png new file mode 100644 index 000000000..fe802d7f6 Binary files /dev/null and b/graphics/interface/status_icons.png differ -- cgit v1.2.3 From dc73d6e003e9e77f22684af312fe2843d4c103ce Mon Sep 17 00:00:00 2001 From: paul Date: Sat, 13 Oct 2018 22:42:39 +0200 Subject: add items and some battle anims --- data/graphics.s | 1890 +++++++++++++++++++- graphics/items/icon_palettes/acro_bike.pal | 19 + graphics/items/icon_palettes/aguav_berry.pal | 19 + graphics/items/icon_palettes/amulet_coin.pal | 19 + graphics/items/icon_palettes/antidote.pal | 19 + graphics/items/icon_palettes/apicot_berry.pal | 19 + graphics/items/icon_palettes/aspear_berry.pal | 19 + graphics/items/icon_palettes/aurora_ticket.pal | 19 + graphics/items/icon_palettes/awakening.pal | 19 + graphics/items/icon_palettes/bead_mail.pal | 19 + graphics/items/icon_palettes/belue_berry.pal | 19 + graphics/items/icon_palettes/berry_juice.pal | 19 + graphics/items/icon_palettes/berry_pouch.pal | 19 + graphics/items/icon_palettes/bicycle.pal | 19 + graphics/items/icon_palettes/bike_voucher.pal | 19 + graphics/items/icon_palettes/black_flute.pal | 19 + .../icon_palettes/black_type_enhancing_item.pal | 19 + graphics/items/icon_palettes/blue_flute.pal | 19 + graphics/items/icon_palettes/blue_orb.pal | 19 + graphics/items/icon_palettes/blue_scarf.pal | 19 + graphics/items/icon_palettes/blue_shard.pal | 19 + graphics/items/icon_palettes/bluk_berry.pal | 19 + graphics/items/icon_palettes/bright_powder.pal | 19 + graphics/items/icon_palettes/burn_heal.pal | 19 + graphics/items/icon_palettes/calcium.pal | 19 + graphics/items/icon_palettes/carbos.pal | 19 + graphics/items/icon_palettes/card_key.pal | 19 + graphics/items/icon_palettes/charcoal.pal | 19 + graphics/items/icon_palettes/cheri_berry.pal | 19 + graphics/items/icon_palettes/chesto_berry.pal | 19 + graphics/items/icon_palettes/choice_band.pal | 19 + graphics/items/icon_palettes/cleanse_tag.pal | 19 + graphics/items/icon_palettes/coin_case.pal | 19 + graphics/items/icon_palettes/contest_pass.pal | 19 + graphics/items/icon_palettes/cornn_berry.pal | 19 + graphics/items/icon_palettes/dark_tm_hm.pal | 19 + graphics/items/icon_palettes/deep_sea_scale.pal | 19 + graphics/items/icon_palettes/deep_sea_tooth.pal | 19 + graphics/items/icon_palettes/devon_goods.pal | 19 + graphics/items/icon_palettes/devon_scope.pal | 19 + graphics/items/icon_palettes/dire_hit.pal | 19 + graphics/items/icon_palettes/dive_ball.pal | 19 + graphics/items/icon_palettes/dragon_fang.pal | 19 + graphics/items/icon_palettes/dragon_scale.pal | 19 + graphics/items/icon_palettes/dragon_tm_hm.pal | 19 + graphics/items/icon_palettes/dream_mail.pal | 19 + graphics/items/icon_palettes/durin_berry.pal | 19 + graphics/items/icon_palettes/electric_tm_hm.pal | 19 + graphics/items/icon_palettes/elixir.pal | 19 + graphics/items/icon_palettes/energy_powder.pal | 19 + graphics/items/icon_palettes/energy_root.pal | 19 + graphics/items/icon_palettes/enigma_berry.pal | 19 + graphics/items/icon_palettes/eon_ticket.pal | 19 + graphics/items/icon_palettes/escape_rope.pal | 19 + graphics/items/icon_palettes/ether.pal | 19 + graphics/items/icon_palettes/everstone.pal | 19 + graphics/items/icon_palettes/exp_share.pal | 19 + graphics/items/icon_palettes/fab_mail.pal | 19 + graphics/items/icon_palettes/fame_checker.pal | 19 + graphics/items/icon_palettes/fighting_tm_hm.pal | 19 + graphics/items/icon_palettes/figy_berry.pal | 19 + graphics/items/icon_palettes/fire_stone.pal | 19 + graphics/items/icon_palettes/fire_tm_hm.pal | 19 + graphics/items/icon_palettes/fluffy_tail.pal | 19 + graphics/items/icon_palettes/flying_tm_hm.pal | 19 + graphics/items/icon_palettes/focus_band.pal | 19 + graphics/items/icon_palettes/fresh_water.pal | 19 + graphics/items/icon_palettes/full_heal.pal | 19 + graphics/items/icon_palettes/full_restore.pal | 19 + graphics/items/icon_palettes/ganlon_berry.pal | 19 + graphics/items/icon_palettes/ghost_tm_hm.pal | 19 + graphics/items/icon_palettes/glitter_mail.pal | 19 + graphics/items/icon_palettes/go_goggles.pal | 19 + graphics/items/icon_palettes/gold_teeth.pal | 19 + graphics/items/icon_palettes/good_rod.pal | 19 + graphics/items/icon_palettes/grass_tm_hm.pal | 19 + graphics/items/icon_palettes/great_ball.pal | 19 + graphics/items/icon_palettes/green_scarf.pal | 19 + graphics/items/icon_palettes/green_shard.pal | 19 + graphics/items/icon_palettes/grepa_berry.pal | 19 + graphics/items/icon_palettes/ground_tm_hm.pal | 19 + graphics/items/icon_palettes/guard_spec.pal | 19 + graphics/items/icon_palettes/harbor_mail.pal | 19 + graphics/items/icon_palettes/hard_stone.pal | 19 + graphics/items/icon_palettes/heal_powder.pal | 19 + graphics/items/icon_palettes/heart_scale.pal | 19 + graphics/items/icon_palettes/hoenn_fossil.pal | 19 + graphics/items/icon_palettes/hondew_berry.pal | 19 + graphics/items/icon_palettes/hp_up.pal | 19 + graphics/items/icon_palettes/hyper_potion.pal | 19 + graphics/items/icon_palettes/iapapa_berry.pal | 19 + graphics/items/icon_palettes/ice_heal.pal | 19 + graphics/items/icon_palettes/ice_tm_hm.pal | 19 + graphics/items/icon_palettes/iron.pal | 19 + graphics/items/icon_palettes/itemfinder.pal | 19 + graphics/items/icon_palettes/kanto_fossil.pal | 19 + graphics/items/icon_palettes/kelpsy_berry.pal | 19 + graphics/items/icon_palettes/key.pal | 19 + graphics/items/icon_palettes/kings_rock.pal | 19 + graphics/items/icon_palettes/lansat_berry.pal | 19 + .../items/icon_palettes/lava_cookie_and_letter.pal | 19 + graphics/items/icon_palettes/lax_incense.pal | 19 + graphics/items/icon_palettes/leaf_stone.pal | 19 + graphics/items/icon_palettes/leftovers.pal | 19 + graphics/items/icon_palettes/lemonade.pal | 19 + graphics/items/icon_palettes/leppa_berry.pal | 19 + graphics/items/icon_palettes/liechi_berry.pal | 19 + graphics/items/icon_palettes/light_ball.pal | 19 + graphics/items/icon_palettes/lucky_egg.pal | 19 + graphics/items/icon_palettes/lucky_punch.pal | 19 + graphics/items/icon_palettes/lum_berry.pal | 19 + graphics/items/icon_palettes/luxury_ball.pal | 19 + graphics/items/icon_palettes/mach_bike.pal | 19 + graphics/items/icon_palettes/macho_brace.pal | 19 + graphics/items/icon_palettes/magma_emblem.pal | 19 + graphics/items/icon_palettes/magnet.pal | 19 + graphics/items/icon_palettes/mago_berry.pal | 19 + graphics/items/icon_palettes/magost_berry.pal | 19 + graphics/items/icon_palettes/master_ball.pal | 19 + graphics/items/icon_palettes/max_elixir.pal | 19 + graphics/items/icon_palettes/max_ether.pal | 19 + graphics/items/icon_palettes/max_potion.pal | 19 + graphics/items/icon_palettes/max_repel.pal | 19 + graphics/items/icon_palettes/mech_mail.pal | 19 + graphics/items/icon_palettes/mental_herb.pal | 19 + graphics/items/icon_palettes/metal_coat.pal | 19 + graphics/items/icon_palettes/metal_powder.pal | 19 + graphics/items/icon_palettes/meteorite.pal | 19 + graphics/items/icon_palettes/miracle_seed.pal | 19 + graphics/items/icon_palettes/moomoo_milk.pal | 19 + graphics/items/icon_palettes/moon_stone.pal | 19 + graphics/items/icon_palettes/mushroom.pal | 19 + graphics/items/icon_palettes/mystic_ticket.pal | 19 + graphics/items/icon_palettes/mystic_water.pal | 19 + graphics/items/icon_palettes/nanab_berry.pal | 19 + graphics/items/icon_palettes/nest_ball.pal | 19 + graphics/items/icon_palettes/net_ball.pal | 19 + graphics/items/icon_palettes/never_melt_ice.pal | 19 + graphics/items/icon_palettes/nomel_berry.pal | 19 + graphics/items/icon_palettes/normal_tm_hm.pal | 19 + graphics/items/icon_palettes/nugget.pal | 19 + graphics/items/icon_palettes/oaks_parcel.pal | 19 + graphics/items/icon_palettes/old_amber.pal | 19 + graphics/items/icon_palettes/old_key.pal | 19 + graphics/items/icon_palettes/old_rod.pal | 19 + graphics/items/icon_palettes/old_sea_map.pal | 19 + graphics/items/icon_palettes/oran_berry.pal | 19 + graphics/items/icon_palettes/orange_mail.pal | 19 + graphics/items/icon_palettes/pamtre_berry.pal | 19 + graphics/items/icon_palettes/paralyze_heal.pal | 19 + graphics/items/icon_palettes/pearl.pal | 19 + graphics/items/icon_palettes/pecha_berry.pal | 19 + graphics/items/icon_palettes/persim_berry.pal | 19 + graphics/items/icon_palettes/petaya_berry.pal | 19 + graphics/items/icon_palettes/pinap_berry.pal | 19 + graphics/items/icon_palettes/pink_scarf.pal | 19 + graphics/items/icon_palettes/poison_barb.pal | 19 + graphics/items/icon_palettes/poison_tm_hm.pal | 19 + graphics/items/icon_palettes/poke_ball.pal | 19 + graphics/items/icon_palettes/poke_doll.pal | 19 + graphics/items/icon_palettes/poke_flute.pal | 19 + graphics/items/icon_palettes/pokeblock_case.pal | 19 + graphics/items/icon_palettes/pomeg_berry.pal | 19 + graphics/items/icon_palettes/potion.pal | 19 + graphics/items/icon_palettes/powder_jar.pal | 19 + graphics/items/icon_palettes/pp_max.pal | 19 + graphics/items/icon_palettes/pp_up.pal | 19 + graphics/items/icon_palettes/protein.pal | 19 + graphics/items/icon_palettes/psychic_tm_hm.pal | 19 + graphics/items/icon_palettes/qualot_berry.pal | 19 + graphics/items/icon_palettes/question_mark.pal | 19 + graphics/items/icon_palettes/quick_claw.pal | 19 + graphics/items/icon_palettes/rabuta_berry.pal | 19 + graphics/items/icon_palettes/rainbow_pass.pal | 19 + graphics/items/icon_palettes/rare_candy.pal | 19 + graphics/items/icon_palettes/rawst_berry.pal | 19 + graphics/items/icon_palettes/razz_berry.pal | 19 + graphics/items/icon_palettes/red_flute.pal | 19 + graphics/items/icon_palettes/red_orb.pal | 19 + graphics/items/icon_palettes/red_scarf.pal | 19 + graphics/items/icon_palettes/red_shard.pal | 19 + graphics/items/icon_palettes/repeat_ball.pal | 19 + graphics/items/icon_palettes/repel.pal | 19 + graphics/items/icon_palettes/retro_mail.pal | 19 + .../items/icon_palettes/return_to_field_arrow.pal | 19 + graphics/items/icon_palettes/revival_herb.pal | 19 + graphics/items/icon_palettes/revive.pal | 19 + graphics/items/icon_palettes/rock_tm_hm.pal | 19 + graphics/items/icon_palettes/ruby.pal | 19 + graphics/items/icon_palettes/sacred_ash.pal | 19 + graphics/items/icon_palettes/safari_ball.pal | 19 + graphics/items/icon_palettes/salac_berry.pal | 19 + graphics/items/icon_palettes/sapphire.pal | 19 + graphics/items/icon_palettes/scanner.pal | 19 + graphics/items/icon_palettes/scope_lens.pal | 19 + graphics/items/icon_palettes/sea_incense.pal | 19 + graphics/items/icon_palettes/secret_key.pal | 19 + graphics/items/icon_palettes/shadow_mail.pal | 19 + graphics/items/icon_palettes/sharp_beak.pal | 19 + graphics/items/icon_palettes/shell.pal | 19 + graphics/items/icon_palettes/shoal_salt.pal | 19 + graphics/items/icon_palettes/silk_scarf.pal | 19 + graphics/items/icon_palettes/silph_scope.pal | 19 + graphics/items/icon_palettes/silver_powder.pal | 19 + graphics/items/icon_palettes/sitrus_berry.pal | 19 + graphics/items/icon_palettes/smoke_ball.pal | 19 + graphics/items/icon_palettes/soda_pop.pal | 19 + graphics/items/icon_palettes/soft_sand.pal | 19 + graphics/items/icon_palettes/soot_sack.pal | 19 + graphics/items/icon_palettes/soothe_bell.pal | 19 + graphics/items/icon_palettes/soul_dew.pal | 19 + graphics/items/icon_palettes/spell_tag.pal | 19 + graphics/items/icon_palettes/spelon_berry.pal | 19 + graphics/items/icon_palettes/ss_ticket.pal | 19 + graphics/items/icon_palettes/star.pal | 19 + graphics/items/icon_palettes/starf_berry.pal | 19 + graphics/items/icon_palettes/steel_tm_hm.pal | 19 + graphics/items/icon_palettes/stick.pal | 19 + graphics/items/icon_palettes/sun_stone.pal | 19 + graphics/items/icon_palettes/super_potion.pal | 19 + graphics/items/icon_palettes/super_repel.pal | 19 + graphics/items/icon_palettes/super_rod.pal | 19 + graphics/items/icon_palettes/tamato_berry.pal | 19 + graphics/items/icon_palettes/tea.pal | 19 + graphics/items/icon_palettes/teachy_tv.pal | 19 + graphics/items/icon_palettes/thick_club.pal | 19 + graphics/items/icon_palettes/thunder_stone.pal | 19 + graphics/items/icon_palettes/tm_case.pal | 19 + graphics/items/icon_palettes/town_map.pal | 19 + graphics/items/icon_palettes/tri_pass.pal | 19 + graphics/items/icon_palettes/tropic_mail.pal | 19 + graphics/items/icon_palettes/twisted_spoon.pal | 19 + graphics/items/icon_palettes/ultra_ball.pal | 19 + graphics/items/icon_palettes/up_grade.pal | 19 + graphics/items/icon_palettes/vs_seeker.pal | 19 + graphics/items/icon_palettes/wailmer_pail.pal | 19 + graphics/items/icon_palettes/water_stone.pal | 19 + graphics/items/icon_palettes/water_tm_hm.pal | 19 + graphics/items/icon_palettes/watmel_berry.pal | 19 + graphics/items/icon_palettes/wave_mail.pal | 19 + graphics/items/icon_palettes/wepear_berry.pal | 19 + graphics/items/icon_palettes/white_flute.pal | 19 + graphics/items/icon_palettes/white_herb.pal | 19 + graphics/items/icon_palettes/wiki_berry.pal | 19 + graphics/items/icon_palettes/wood_mail.pal | 19 + graphics/items/icon_palettes/x_accuracy.pal | 19 + graphics/items/icon_palettes/x_attack.pal | 19 + graphics/items/icon_palettes/x_defend.pal | 19 + graphics/items/icon_palettes/x_special.pal | 19 + graphics/items/icon_palettes/x_speed.pal | 19 + graphics/items/icon_palettes/yellow_flute.pal | 19 + graphics/items/icon_palettes/yellow_scarf.pal | 19 + graphics/items/icon_palettes/yellow_shard.pal | 19 + graphics/items/icon_palettes/zinc.pal | 19 + graphics/items/icons/acro_bike.png | Bin 0 -> 313 bytes graphics/items/icons/aguav_berry.png | Bin 0 -> 308 bytes graphics/items/icons/amulet_coin.png | Bin 0 -> 251 bytes graphics/items/icons/antidote.png | Bin 0 -> 255 bytes graphics/items/icons/apicot_berry.png | Bin 0 -> 269 bytes graphics/items/icons/aspear_berry.png | Bin 0 -> 302 bytes graphics/items/icons/aurora_ticket.png | Bin 0 -> 255 bytes graphics/items/icons/basement_key.png | Bin 0 -> 244 bytes graphics/items/icons/battle_stat_item.png | Bin 0 -> 305 bytes graphics/items/icons/bead_mail.png | Bin 0 -> 261 bytes graphics/items/icons/belue_berry.png | Bin 0 -> 320 bytes graphics/items/icons/berry_juice.png | Bin 0 -> 309 bytes graphics/items/icons/berry_pouch.png | Bin 0 -> 324 bytes graphics/items/icons/bicycle.png | Bin 0 -> 302 bytes graphics/items/icons/big_mushroom.png | Bin 0 -> 267 bytes graphics/items/icons/big_pearl.png | Bin 0 -> 269 bytes graphics/items/icons/bike_voucher.png | Bin 0 -> 243 bytes graphics/items/icons/black_belt.png | Bin 0 -> 270 bytes graphics/items/icons/black_glasses.png | Bin 0 -> 221 bytes graphics/items/icons/bluk_berry.png | Bin 0 -> 313 bytes graphics/items/icons/bright_powder.png | Bin 0 -> 282 bytes graphics/items/icons/card_key.png | Bin 0 -> 246 bytes graphics/items/icons/charcoal.png | Bin 0 -> 267 bytes graphics/items/icons/cheri_berry.png | Bin 0 -> 320 bytes graphics/items/icons/chesto_berry.png | Bin 0 -> 288 bytes graphics/items/icons/choice_band.png | Bin 0 -> 330 bytes graphics/items/icons/claw_fossil.png | Bin 0 -> 337 bytes graphics/items/icons/cleanse_tag.png | Bin 0 -> 257 bytes graphics/items/icons/coin_case.png | Bin 0 -> 265 bytes graphics/items/icons/contest_pass.png | Bin 0 -> 261 bytes graphics/items/icons/cornn_berry.png | Bin 0 -> 327 bytes graphics/items/icons/deep_sea_scale.png | Bin 0 -> 245 bytes graphics/items/icons/deep_sea_tooth.png | Bin 0 -> 272 bytes graphics/items/icons/devon_goods.png | Bin 0 -> 255 bytes graphics/items/icons/devon_scope.png | Bin 0 -> 293 bytes graphics/items/icons/dive_ball.png | Bin 0 -> 293 bytes graphics/items/icons/dome_fossil.png | Bin 0 -> 322 bytes graphics/items/icons/dragon_fang.png | Bin 0 -> 272 bytes graphics/items/icons/dragon_scale.png | Bin 0 -> 255 bytes graphics/items/icons/dream_mail.png | Bin 0 -> 284 bytes graphics/items/icons/durin_berry.png | Bin 0 -> 336 bytes graphics/items/icons/energy_root.png | Bin 0 -> 282 bytes graphics/items/icons/enigma_berry.png | Bin 0 -> 289 bytes graphics/items/icons/eon_ticket.png | Bin 0 -> 251 bytes graphics/items/icons/escape_rope.png | Bin 0 -> 265 bytes graphics/items/icons/ether.png | Bin 0 -> 278 bytes graphics/items/icons/everstone.png | Bin 0 -> 259 bytes graphics/items/icons/exp_share.png | Bin 0 -> 332 bytes graphics/items/icons/fab_mail.png | Bin 0 -> 257 bytes graphics/items/icons/fame_checker.png | Bin 0 -> 267 bytes graphics/items/icons/figy_berry.png | Bin 0 -> 292 bytes graphics/items/icons/fire_stone.png | Bin 0 -> 328 bytes graphics/items/icons/fluffy_tail.png | Bin 0 -> 325 bytes graphics/items/icons/flute.png | Bin 0 -> 266 bytes graphics/items/icons/focus_band.png | Bin 0 -> 332 bytes graphics/items/icons/fresh_water.png | Bin 0 -> 267 bytes graphics/items/icons/full_heal.png | Bin 0 -> 255 bytes graphics/items/icons/ganlon_berry.png | Bin 0 -> 298 bytes graphics/items/icons/gem.png | Bin 0 -> 291 bytes graphics/items/icons/glitter_mail.png | Bin 0 -> 302 bytes graphics/items/icons/go_goggles.png | Bin 0 -> 265 bytes graphics/items/icons/gold_teeth.png | Bin 0 -> 297 bytes graphics/items/icons/good_rod.png | Bin 0 -> 261 bytes graphics/items/icons/great_ball.png | Bin 0 -> 292 bytes graphics/items/icons/grepa_berry.png | Bin 0 -> 270 bytes graphics/items/icons/harbor_mail.png | Bin 0 -> 272 bytes graphics/items/icons/hard_stone.png | Bin 0 -> 275 bytes graphics/items/icons/heart_scale.png | Bin 0 -> 241 bytes graphics/items/icons/helix_fossil.png | Bin 0 -> 322 bytes graphics/items/icons/hm.png | Bin 0 -> 346 bytes graphics/items/icons/hondew_berry.png | Bin 0 -> 298 bytes graphics/items/icons/hp_up.png | Bin 0 -> 278 bytes graphics/items/icons/iapapa_berry.png | Bin 0 -> 313 bytes graphics/items/icons/in_battle_herb.png | Bin 0 -> 248 bytes graphics/items/icons/itemfinder.png | Bin 0 -> 288 bytes graphics/items/icons/kelpsy_berry.png | Bin 0 -> 288 bytes graphics/items/icons/kings_rock.png | Bin 0 -> 312 bytes graphics/items/icons/lansat_berry.png | Bin 0 -> 304 bytes graphics/items/icons/large_potion.png | Bin 0 -> 304 bytes graphics/items/icons/lava_cookie.png | Bin 0 -> 292 bytes graphics/items/icons/lax_incense.png | Bin 0 -> 303 bytes graphics/items/icons/leaf_stone.png | Bin 0 -> 326 bytes graphics/items/icons/leftovers.png | Bin 0 -> 262 bytes graphics/items/icons/lemonade.png | Bin 0 -> 285 bytes graphics/items/icons/leppa_berry.png | Bin 0 -> 284 bytes graphics/items/icons/letter.png | Bin 0 -> 220 bytes graphics/items/icons/liechi_berry.png | Bin 0 -> 303 bytes graphics/items/icons/lift_key.png | Bin 0 -> 262 bytes graphics/items/icons/light_ball.png | Bin 0 -> 234 bytes graphics/items/icons/lucky_egg.png | Bin 0 -> 229 bytes graphics/items/icons/lucky_punch.png | Bin 0 -> 274 bytes graphics/items/icons/lum_berry.png | Bin 0 -> 259 bytes graphics/items/icons/luxury_ball.png | Bin 0 -> 277 bytes graphics/items/icons/mach_bike.png | Bin 0 -> 336 bytes graphics/items/icons/macho_brace.png | Bin 0 -> 319 bytes graphics/items/icons/magma_emblem.png | Bin 0 -> 306 bytes graphics/items/icons/magnet.png | Bin 0 -> 271 bytes graphics/items/icons/mago_berry.png | Bin 0 -> 276 bytes graphics/items/icons/magost_berry.png | Bin 0 -> 260 bytes graphics/items/icons/master_ball.png | Bin 0 -> 293 bytes graphics/items/icons/max_revive.png | Bin 0 -> 269 bytes graphics/items/icons/mech_mail.png | Bin 0 -> 300 bytes graphics/items/icons/metal_coat.png | Bin 0 -> 250 bytes graphics/items/icons/metal_powder.png | Bin 0 -> 288 bytes graphics/items/icons/meteorite.png | Bin 0 -> 301 bytes graphics/items/icons/miracle_seed.png | Bin 0 -> 253 bytes graphics/items/icons/moomoo_milk.png | Bin 0 -> 258 bytes graphics/items/icons/moon_stone.png | Bin 0 -> 291 bytes graphics/items/icons/mystic_ticket.png | Bin 0 -> 245 bytes graphics/items/icons/mystic_water.png | Bin 0 -> 244 bytes graphics/items/icons/nanab_berry.png | Bin 0 -> 295 bytes graphics/items/icons/nest_ball.png | Bin 0 -> 287 bytes graphics/items/icons/net_ball.png | Bin 0 -> 297 bytes graphics/items/icons/never_melt_ice.png | Bin 0 -> 277 bytes graphics/items/icons/nomel_berry.png | Bin 0 -> 256 bytes graphics/items/icons/nugget.png | Bin 0 -> 232 bytes graphics/items/icons/oaks_parcel.png | Bin 0 -> 269 bytes graphics/items/icons/old_amber.png | Bin 0 -> 300 bytes graphics/items/icons/old_rod.png | Bin 0 -> 265 bytes graphics/items/icons/old_sea_map.png | Bin 0 -> 309 bytes graphics/items/icons/oran_berry.png | Bin 0 -> 274 bytes graphics/items/icons/orange_mail.png | Bin 0 -> 286 bytes graphics/items/icons/orb.png | Bin 0 -> 264 bytes graphics/items/icons/pamtre_berry.png | Bin 0 -> 311 bytes graphics/items/icons/pearl.png | Bin 0 -> 223 bytes graphics/items/icons/pecha_berry.png | Bin 0 -> 272 bytes graphics/items/icons/persim_berry.png | Bin 0 -> 289 bytes graphics/items/icons/petaya_berry.png | Bin 0 -> 332 bytes graphics/items/icons/pinap_berry.png | Bin 0 -> 326 bytes graphics/items/icons/poison_barb.png | Bin 0 -> 218 bytes graphics/items/icons/poke_ball.png | Bin 0 -> 262 bytes graphics/items/icons/poke_doll.png | Bin 0 -> 298 bytes graphics/items/icons/poke_flute.png | Bin 0 -> 285 bytes graphics/items/icons/pokeblock_case.png | Bin 0 -> 316 bytes graphics/items/icons/pomeg_berry.png | Bin 0 -> 272 bytes graphics/items/icons/potion.png | Bin 0 -> 289 bytes graphics/items/icons/powder.png | Bin 0 -> 231 bytes graphics/items/icons/powder_jar.png | Bin 0 -> 268 bytes graphics/items/icons/pp_max.png | Bin 0 -> 270 bytes graphics/items/icons/pp_up.png | Bin 0 -> 273 bytes graphics/items/icons/premier_ball.png | Bin 0 -> 254 bytes graphics/items/icons/qualot_berry.png | Bin 0 -> 291 bytes graphics/items/icons/question_mark.png | Bin 0 -> 205 bytes graphics/items/icons/quick_claw.png | Bin 0 -> 244 bytes graphics/items/icons/rabuta_berry.png | Bin 0 -> 334 bytes graphics/items/icons/rainbow_pass.png | Bin 0 -> 255 bytes graphics/items/icons/rare_candy.png | Bin 0 -> 279 bytes graphics/items/icons/rawst_berry.png | Bin 0 -> 300 bytes graphics/items/icons/razz_berry.png | Bin 0 -> 303 bytes graphics/items/icons/repeat_ball.png | Bin 0 -> 288 bytes graphics/items/icons/repel.png | Bin 0 -> 266 bytes graphics/items/icons/retro_mail.png | Bin 0 -> 239 bytes graphics/items/icons/return_to_field_arrow.png | Bin 0 -> 219 bytes graphics/items/icons/revival_herb.png | Bin 0 -> 295 bytes graphics/items/icons/revive.png | Bin 0 -> 198 bytes graphics/items/icons/room1_key.png | Bin 0 -> 250 bytes graphics/items/icons/room2_key.png | Bin 0 -> 250 bytes graphics/items/icons/room4_key.png | Bin 0 -> 251 bytes graphics/items/icons/room6_key.png | Bin 0 -> 254 bytes graphics/items/icons/root_fossil.png | Bin 0 -> 354 bytes graphics/items/icons/sacred_ash.png | Bin 0 -> 288 bytes graphics/items/icons/safari_ball.png | Bin 0 -> 296 bytes graphics/items/icons/salac_berry.png | Bin 0 -> 311 bytes graphics/items/icons/scanner.png | Bin 0 -> 285 bytes graphics/items/icons/scarf.png | Bin 0 -> 289 bytes graphics/items/icons/scope_lens.png | Bin 0 -> 348 bytes graphics/items/icons/sea_incense.png | Bin 0 -> 300 bytes graphics/items/icons/secret_key.png | Bin 0 -> 283 bytes graphics/items/icons/shadow_mail.png | Bin 0 -> 289 bytes graphics/items/icons/shard.png | Bin 0 -> 194 bytes graphics/items/icons/sharp_beak.png | Bin 0 -> 266 bytes graphics/items/icons/shell_bell.png | Bin 0 -> 313 bytes graphics/items/icons/shoal_shell.png | Bin 0 -> 329 bytes graphics/items/icons/silk_scarf.png | Bin 0 -> 322 bytes graphics/items/icons/silph_scope.png | Bin 0 -> 308 bytes graphics/items/icons/silver_powder.png | Bin 0 -> 240 bytes graphics/items/icons/sitrus_berry.png | Bin 0 -> 285 bytes graphics/items/icons/smoke_ball.png | Bin 0 -> 269 bytes graphics/items/icons/soda_pop.png | Bin 0 -> 266 bytes graphics/items/icons/soft_sand.png | Bin 0 -> 283 bytes graphics/items/icons/soot_sack.png | Bin 0 -> 293 bytes graphics/items/icons/soothe_bell.png | Bin 0 -> 282 bytes graphics/items/icons/soul_dew.png | Bin 0 -> 241 bytes graphics/items/icons/spell_tag.png | Bin 0 -> 251 bytes graphics/items/icons/spelon_berry.png | Bin 0 -> 283 bytes graphics/items/icons/ss_ticket.png | Bin 0 -> 233 bytes graphics/items/icons/star_piece.png | Bin 0 -> 236 bytes graphics/items/icons/stardust.png | Bin 0 -> 285 bytes graphics/items/icons/starf_berry.png | Bin 0 -> 295 bytes graphics/items/icons/status_heal.png | Bin 0 -> 255 bytes graphics/items/icons/stick.png | Bin 0 -> 232 bytes graphics/items/icons/storage_key.png | Bin 0 -> 248 bytes graphics/items/icons/sun_stone.png | Bin 0 -> 322 bytes graphics/items/icons/super_rod.png | Bin 0 -> 279 bytes graphics/items/icons/tamato_berry.png | Bin 0 -> 305 bytes graphics/items/icons/tea.png | Bin 0 -> 292 bytes graphics/items/icons/teachy_tv.png | Bin 0 -> 333 bytes graphics/items/icons/thick_club.png | Bin 0 -> 228 bytes graphics/items/icons/thunder_stone.png | Bin 0 -> 305 bytes graphics/items/icons/timer_ball.png | Bin 0 -> 290 bytes graphics/items/icons/tiny_mushroom.png | Bin 0 -> 222 bytes graphics/items/icons/tm.png | Bin 0 -> 344 bytes graphics/items/icons/tm_case.png | Bin 0 -> 295 bytes graphics/items/icons/town_map.png | Bin 0 -> 275 bytes graphics/items/icons/tri_pass.png | Bin 0 -> 240 bytes graphics/items/icons/tropic_mail.png | Bin 0 -> 314 bytes graphics/items/icons/twisted_spoon.png | Bin 0 -> 242 bytes graphics/items/icons/ultra_ball.png | Bin 0 -> 282 bytes graphics/items/icons/up_grade.png | Bin 0 -> 276 bytes graphics/items/icons/vitamin.png | Bin 0 -> 273 bytes graphics/items/icons/vs_seeker.png | Bin 0 -> 278 bytes graphics/items/icons/wailmer_pail.png | Bin 0 -> 289 bytes graphics/items/icons/water_stone.png | Bin 0 -> 305 bytes graphics/items/icons/watmel_berry.png | Bin 0 -> 341 bytes graphics/items/icons/wave_mail.png | Bin 0 -> 287 bytes graphics/items/icons/wepear_berry.png | Bin 0 -> 272 bytes graphics/items/icons/wiki_berry.png | Bin 0 -> 299 bytes graphics/items/icons/wood_mail.png | Bin 0 -> 301 bytes 472 files changed, 6695 insertions(+), 2 deletions(-) create mode 100644 graphics/items/icon_palettes/acro_bike.pal create mode 100644 graphics/items/icon_palettes/aguav_berry.pal create mode 100644 graphics/items/icon_palettes/amulet_coin.pal create mode 100644 graphics/items/icon_palettes/antidote.pal create mode 100644 graphics/items/icon_palettes/apicot_berry.pal create mode 100644 graphics/items/icon_palettes/aspear_berry.pal create mode 100644 graphics/items/icon_palettes/aurora_ticket.pal create mode 100644 graphics/items/icon_palettes/awakening.pal create mode 100644 graphics/items/icon_palettes/bead_mail.pal create mode 100644 graphics/items/icon_palettes/belue_berry.pal create mode 100644 graphics/items/icon_palettes/berry_juice.pal create mode 100644 graphics/items/icon_palettes/berry_pouch.pal create mode 100644 graphics/items/icon_palettes/bicycle.pal create mode 100644 graphics/items/icon_palettes/bike_voucher.pal create mode 100644 graphics/items/icon_palettes/black_flute.pal create mode 100644 graphics/items/icon_palettes/black_type_enhancing_item.pal create mode 100644 graphics/items/icon_palettes/blue_flute.pal create mode 100644 graphics/items/icon_palettes/blue_orb.pal create mode 100644 graphics/items/icon_palettes/blue_scarf.pal create mode 100644 graphics/items/icon_palettes/blue_shard.pal create mode 100644 graphics/items/icon_palettes/bluk_berry.pal create mode 100644 graphics/items/icon_palettes/bright_powder.pal create mode 100644 graphics/items/icon_palettes/burn_heal.pal create mode 100644 graphics/items/icon_palettes/calcium.pal create mode 100644 graphics/items/icon_palettes/carbos.pal create mode 100644 graphics/items/icon_palettes/card_key.pal create mode 100644 graphics/items/icon_palettes/charcoal.pal create mode 100644 graphics/items/icon_palettes/cheri_berry.pal create mode 100644 graphics/items/icon_palettes/chesto_berry.pal create mode 100644 graphics/items/icon_palettes/choice_band.pal create mode 100644 graphics/items/icon_palettes/cleanse_tag.pal create mode 100644 graphics/items/icon_palettes/coin_case.pal create mode 100644 graphics/items/icon_palettes/contest_pass.pal create mode 100644 graphics/items/icon_palettes/cornn_berry.pal create mode 100644 graphics/items/icon_palettes/dark_tm_hm.pal create mode 100644 graphics/items/icon_palettes/deep_sea_scale.pal create mode 100644 graphics/items/icon_palettes/deep_sea_tooth.pal create mode 100644 graphics/items/icon_palettes/devon_goods.pal create mode 100644 graphics/items/icon_palettes/devon_scope.pal create mode 100644 graphics/items/icon_palettes/dire_hit.pal create mode 100644 graphics/items/icon_palettes/dive_ball.pal create mode 100644 graphics/items/icon_palettes/dragon_fang.pal create mode 100644 graphics/items/icon_palettes/dragon_scale.pal create mode 100644 graphics/items/icon_palettes/dragon_tm_hm.pal create mode 100644 graphics/items/icon_palettes/dream_mail.pal create mode 100644 graphics/items/icon_palettes/durin_berry.pal create mode 100644 graphics/items/icon_palettes/electric_tm_hm.pal create mode 100644 graphics/items/icon_palettes/elixir.pal create mode 100644 graphics/items/icon_palettes/energy_powder.pal create mode 100644 graphics/items/icon_palettes/energy_root.pal create mode 100644 graphics/items/icon_palettes/enigma_berry.pal create mode 100644 graphics/items/icon_palettes/eon_ticket.pal create mode 100644 graphics/items/icon_palettes/escape_rope.pal create mode 100644 graphics/items/icon_palettes/ether.pal create mode 100644 graphics/items/icon_palettes/everstone.pal create mode 100644 graphics/items/icon_palettes/exp_share.pal create mode 100644 graphics/items/icon_palettes/fab_mail.pal create mode 100644 graphics/items/icon_palettes/fame_checker.pal create mode 100644 graphics/items/icon_palettes/fighting_tm_hm.pal create mode 100644 graphics/items/icon_palettes/figy_berry.pal create mode 100644 graphics/items/icon_palettes/fire_stone.pal create mode 100644 graphics/items/icon_palettes/fire_tm_hm.pal create mode 100644 graphics/items/icon_palettes/fluffy_tail.pal create mode 100644 graphics/items/icon_palettes/flying_tm_hm.pal create mode 100644 graphics/items/icon_palettes/focus_band.pal create mode 100644 graphics/items/icon_palettes/fresh_water.pal create mode 100644 graphics/items/icon_palettes/full_heal.pal create mode 100644 graphics/items/icon_palettes/full_restore.pal create mode 100644 graphics/items/icon_palettes/ganlon_berry.pal create mode 100644 graphics/items/icon_palettes/ghost_tm_hm.pal create mode 100644 graphics/items/icon_palettes/glitter_mail.pal create mode 100644 graphics/items/icon_palettes/go_goggles.pal create mode 100644 graphics/items/icon_palettes/gold_teeth.pal create mode 100644 graphics/items/icon_palettes/good_rod.pal create mode 100644 graphics/items/icon_palettes/grass_tm_hm.pal create mode 100644 graphics/items/icon_palettes/great_ball.pal create mode 100644 graphics/items/icon_palettes/green_scarf.pal create mode 100644 graphics/items/icon_palettes/green_shard.pal create mode 100644 graphics/items/icon_palettes/grepa_berry.pal create mode 100644 graphics/items/icon_palettes/ground_tm_hm.pal create mode 100644 graphics/items/icon_palettes/guard_spec.pal create mode 100644 graphics/items/icon_palettes/harbor_mail.pal create mode 100644 graphics/items/icon_palettes/hard_stone.pal create mode 100644 graphics/items/icon_palettes/heal_powder.pal create mode 100644 graphics/items/icon_palettes/heart_scale.pal create mode 100644 graphics/items/icon_palettes/hoenn_fossil.pal create mode 100644 graphics/items/icon_palettes/hondew_berry.pal create mode 100644 graphics/items/icon_palettes/hp_up.pal create mode 100644 graphics/items/icon_palettes/hyper_potion.pal create mode 100644 graphics/items/icon_palettes/iapapa_berry.pal create mode 100644 graphics/items/icon_palettes/ice_heal.pal create mode 100644 graphics/items/icon_palettes/ice_tm_hm.pal create mode 100644 graphics/items/icon_palettes/iron.pal create mode 100644 graphics/items/icon_palettes/itemfinder.pal create mode 100644 graphics/items/icon_palettes/kanto_fossil.pal create mode 100644 graphics/items/icon_palettes/kelpsy_berry.pal create mode 100644 graphics/items/icon_palettes/key.pal create mode 100644 graphics/items/icon_palettes/kings_rock.pal create mode 100644 graphics/items/icon_palettes/lansat_berry.pal create mode 100644 graphics/items/icon_palettes/lava_cookie_and_letter.pal create mode 100644 graphics/items/icon_palettes/lax_incense.pal create mode 100644 graphics/items/icon_palettes/leaf_stone.pal create mode 100644 graphics/items/icon_palettes/leftovers.pal create mode 100644 graphics/items/icon_palettes/lemonade.pal create mode 100644 graphics/items/icon_palettes/leppa_berry.pal create mode 100644 graphics/items/icon_palettes/liechi_berry.pal create mode 100644 graphics/items/icon_palettes/light_ball.pal create mode 100644 graphics/items/icon_palettes/lucky_egg.pal create mode 100644 graphics/items/icon_palettes/lucky_punch.pal create mode 100644 graphics/items/icon_palettes/lum_berry.pal create mode 100644 graphics/items/icon_palettes/luxury_ball.pal create mode 100644 graphics/items/icon_palettes/mach_bike.pal create mode 100644 graphics/items/icon_palettes/macho_brace.pal create mode 100644 graphics/items/icon_palettes/magma_emblem.pal create mode 100644 graphics/items/icon_palettes/magnet.pal create mode 100644 graphics/items/icon_palettes/mago_berry.pal create mode 100644 graphics/items/icon_palettes/magost_berry.pal create mode 100644 graphics/items/icon_palettes/master_ball.pal create mode 100644 graphics/items/icon_palettes/max_elixir.pal create mode 100644 graphics/items/icon_palettes/max_ether.pal create mode 100644 graphics/items/icon_palettes/max_potion.pal create mode 100644 graphics/items/icon_palettes/max_repel.pal create mode 100644 graphics/items/icon_palettes/mech_mail.pal create mode 100644 graphics/items/icon_palettes/mental_herb.pal create mode 100644 graphics/items/icon_palettes/metal_coat.pal create mode 100644 graphics/items/icon_palettes/metal_powder.pal create mode 100644 graphics/items/icon_palettes/meteorite.pal create mode 100644 graphics/items/icon_palettes/miracle_seed.pal create mode 100644 graphics/items/icon_palettes/moomoo_milk.pal create mode 100644 graphics/items/icon_palettes/moon_stone.pal create mode 100644 graphics/items/icon_palettes/mushroom.pal create mode 100644 graphics/items/icon_palettes/mystic_ticket.pal create mode 100644 graphics/items/icon_palettes/mystic_water.pal create mode 100644 graphics/items/icon_palettes/nanab_berry.pal create mode 100644 graphics/items/icon_palettes/nest_ball.pal create mode 100644 graphics/items/icon_palettes/net_ball.pal create mode 100644 graphics/items/icon_palettes/never_melt_ice.pal create mode 100644 graphics/items/icon_palettes/nomel_berry.pal create mode 100644 graphics/items/icon_palettes/normal_tm_hm.pal create mode 100644 graphics/items/icon_palettes/nugget.pal create mode 100644 graphics/items/icon_palettes/oaks_parcel.pal create mode 100644 graphics/items/icon_palettes/old_amber.pal create mode 100644 graphics/items/icon_palettes/old_key.pal create mode 100644 graphics/items/icon_palettes/old_rod.pal create mode 100644 graphics/items/icon_palettes/old_sea_map.pal create mode 100644 graphics/items/icon_palettes/oran_berry.pal create mode 100644 graphics/items/icon_palettes/orange_mail.pal create mode 100644 graphics/items/icon_palettes/pamtre_berry.pal create mode 100644 graphics/items/icon_palettes/paralyze_heal.pal create mode 100644 graphics/items/icon_palettes/pearl.pal create mode 100644 graphics/items/icon_palettes/pecha_berry.pal create mode 100644 graphics/items/icon_palettes/persim_berry.pal create mode 100644 graphics/items/icon_palettes/petaya_berry.pal create mode 100644 graphics/items/icon_palettes/pinap_berry.pal create mode 100644 graphics/items/icon_palettes/pink_scarf.pal create mode 100644 graphics/items/icon_palettes/poison_barb.pal create mode 100644 graphics/items/icon_palettes/poison_tm_hm.pal create mode 100644 graphics/items/icon_palettes/poke_ball.pal create mode 100644 graphics/items/icon_palettes/poke_doll.pal create mode 100644 graphics/items/icon_palettes/poke_flute.pal create mode 100644 graphics/items/icon_palettes/pokeblock_case.pal create mode 100644 graphics/items/icon_palettes/pomeg_berry.pal create mode 100644 graphics/items/icon_palettes/potion.pal create mode 100644 graphics/items/icon_palettes/powder_jar.pal create mode 100644 graphics/items/icon_palettes/pp_max.pal create mode 100644 graphics/items/icon_palettes/pp_up.pal create mode 100644 graphics/items/icon_palettes/protein.pal create mode 100644 graphics/items/icon_palettes/psychic_tm_hm.pal create mode 100644 graphics/items/icon_palettes/qualot_berry.pal create mode 100644 graphics/items/icon_palettes/question_mark.pal create mode 100644 graphics/items/icon_palettes/quick_claw.pal create mode 100644 graphics/items/icon_palettes/rabuta_berry.pal create mode 100644 graphics/items/icon_palettes/rainbow_pass.pal create mode 100644 graphics/items/icon_palettes/rare_candy.pal create mode 100644 graphics/items/icon_palettes/rawst_berry.pal create mode 100644 graphics/items/icon_palettes/razz_berry.pal create mode 100644 graphics/items/icon_palettes/red_flute.pal create mode 100644 graphics/items/icon_palettes/red_orb.pal create mode 100644 graphics/items/icon_palettes/red_scarf.pal create mode 100644 graphics/items/icon_palettes/red_shard.pal create mode 100644 graphics/items/icon_palettes/repeat_ball.pal create mode 100644 graphics/items/icon_palettes/repel.pal create mode 100644 graphics/items/icon_palettes/retro_mail.pal create mode 100644 graphics/items/icon_palettes/return_to_field_arrow.pal create mode 100644 graphics/items/icon_palettes/revival_herb.pal create mode 100644 graphics/items/icon_palettes/revive.pal create mode 100644 graphics/items/icon_palettes/rock_tm_hm.pal create mode 100644 graphics/items/icon_palettes/ruby.pal create mode 100644 graphics/items/icon_palettes/sacred_ash.pal create mode 100644 graphics/items/icon_palettes/safari_ball.pal create mode 100644 graphics/items/icon_palettes/salac_berry.pal create mode 100644 graphics/items/icon_palettes/sapphire.pal create mode 100644 graphics/items/icon_palettes/scanner.pal create mode 100644 graphics/items/icon_palettes/scope_lens.pal create mode 100644 graphics/items/icon_palettes/sea_incense.pal create mode 100644 graphics/items/icon_palettes/secret_key.pal create mode 100644 graphics/items/icon_palettes/shadow_mail.pal create mode 100644 graphics/items/icon_palettes/sharp_beak.pal create mode 100644 graphics/items/icon_palettes/shell.pal create mode 100644 graphics/items/icon_palettes/shoal_salt.pal create mode 100644 graphics/items/icon_palettes/silk_scarf.pal create mode 100644 graphics/items/icon_palettes/silph_scope.pal create mode 100644 graphics/items/icon_palettes/silver_powder.pal create mode 100644 graphics/items/icon_palettes/sitrus_berry.pal create mode 100644 graphics/items/icon_palettes/smoke_ball.pal create mode 100644 graphics/items/icon_palettes/soda_pop.pal create mode 100644 graphics/items/icon_palettes/soft_sand.pal create mode 100644 graphics/items/icon_palettes/soot_sack.pal create mode 100644 graphics/items/icon_palettes/soothe_bell.pal create mode 100644 graphics/items/icon_palettes/soul_dew.pal create mode 100644 graphics/items/icon_palettes/spell_tag.pal create mode 100644 graphics/items/icon_palettes/spelon_berry.pal create mode 100644 graphics/items/icon_palettes/ss_ticket.pal create mode 100644 graphics/items/icon_palettes/star.pal create mode 100644 graphics/items/icon_palettes/starf_berry.pal create mode 100644 graphics/items/icon_palettes/steel_tm_hm.pal create mode 100644 graphics/items/icon_palettes/stick.pal create mode 100644 graphics/items/icon_palettes/sun_stone.pal create mode 100644 graphics/items/icon_palettes/super_potion.pal create mode 100644 graphics/items/icon_palettes/super_repel.pal create mode 100644 graphics/items/icon_palettes/super_rod.pal create mode 100644 graphics/items/icon_palettes/tamato_berry.pal create mode 100644 graphics/items/icon_palettes/tea.pal create mode 100644 graphics/items/icon_palettes/teachy_tv.pal create mode 100644 graphics/items/icon_palettes/thick_club.pal create mode 100644 graphics/items/icon_palettes/thunder_stone.pal create mode 100644 graphics/items/icon_palettes/tm_case.pal create mode 100644 graphics/items/icon_palettes/town_map.pal create mode 100644 graphics/items/icon_palettes/tri_pass.pal create mode 100644 graphics/items/icon_palettes/tropic_mail.pal create mode 100644 graphics/items/icon_palettes/twisted_spoon.pal create mode 100644 graphics/items/icon_palettes/ultra_ball.pal create mode 100644 graphics/items/icon_palettes/up_grade.pal create mode 100644 graphics/items/icon_palettes/vs_seeker.pal create mode 100644 graphics/items/icon_palettes/wailmer_pail.pal create mode 100644 graphics/items/icon_palettes/water_stone.pal create mode 100644 graphics/items/icon_palettes/water_tm_hm.pal create mode 100644 graphics/items/icon_palettes/watmel_berry.pal create mode 100644 graphics/items/icon_palettes/wave_mail.pal create mode 100644 graphics/items/icon_palettes/wepear_berry.pal create mode 100644 graphics/items/icon_palettes/white_flute.pal create mode 100644 graphics/items/icon_palettes/white_herb.pal create mode 100644 graphics/items/icon_palettes/wiki_berry.pal create mode 100644 graphics/items/icon_palettes/wood_mail.pal create mode 100644 graphics/items/icon_palettes/x_accuracy.pal create mode 100644 graphics/items/icon_palettes/x_attack.pal create mode 100644 graphics/items/icon_palettes/x_defend.pal create mode 100644 graphics/items/icon_palettes/x_special.pal create mode 100644 graphics/items/icon_palettes/x_speed.pal create mode 100644 graphics/items/icon_palettes/yellow_flute.pal create mode 100644 graphics/items/icon_palettes/yellow_scarf.pal create mode 100644 graphics/items/icon_palettes/yellow_shard.pal create mode 100644 graphics/items/icon_palettes/zinc.pal create mode 100644 graphics/items/icons/acro_bike.png create mode 100644 graphics/items/icons/aguav_berry.png create mode 100644 graphics/items/icons/amulet_coin.png create mode 100644 graphics/items/icons/antidote.png create mode 100644 graphics/items/icons/apicot_berry.png create mode 100644 graphics/items/icons/aspear_berry.png create mode 100644 graphics/items/icons/aurora_ticket.png create mode 100644 graphics/items/icons/basement_key.png create mode 100644 graphics/items/icons/battle_stat_item.png create mode 100644 graphics/items/icons/bead_mail.png create mode 100644 graphics/items/icons/belue_berry.png create mode 100644 graphics/items/icons/berry_juice.png create mode 100644 graphics/items/icons/berry_pouch.png create mode 100644 graphics/items/icons/bicycle.png create mode 100644 graphics/items/icons/big_mushroom.png create mode 100644 graphics/items/icons/big_pearl.png create mode 100644 graphics/items/icons/bike_voucher.png create mode 100644 graphics/items/icons/black_belt.png create mode 100644 graphics/items/icons/black_glasses.png create mode 100644 graphics/items/icons/bluk_berry.png create mode 100644 graphics/items/icons/bright_powder.png create mode 100644 graphics/items/icons/card_key.png create mode 100644 graphics/items/icons/charcoal.png create mode 100644 graphics/items/icons/cheri_berry.png create mode 100644 graphics/items/icons/chesto_berry.png create mode 100644 graphics/items/icons/choice_band.png create mode 100644 graphics/items/icons/claw_fossil.png create mode 100644 graphics/items/icons/cleanse_tag.png create mode 100644 graphics/items/icons/coin_case.png create mode 100644 graphics/items/icons/contest_pass.png create mode 100644 graphics/items/icons/cornn_berry.png create mode 100644 graphics/items/icons/deep_sea_scale.png create mode 100644 graphics/items/icons/deep_sea_tooth.png create mode 100644 graphics/items/icons/devon_goods.png create mode 100644 graphics/items/icons/devon_scope.png create mode 100644 graphics/items/icons/dive_ball.png create mode 100644 graphics/items/icons/dome_fossil.png create mode 100644 graphics/items/icons/dragon_fang.png create mode 100644 graphics/items/icons/dragon_scale.png create mode 100644 graphics/items/icons/dream_mail.png create mode 100644 graphics/items/icons/durin_berry.png create mode 100644 graphics/items/icons/energy_root.png create mode 100644 graphics/items/icons/enigma_berry.png create mode 100644 graphics/items/icons/eon_ticket.png create mode 100644 graphics/items/icons/escape_rope.png create mode 100644 graphics/items/icons/ether.png create mode 100644 graphics/items/icons/everstone.png create mode 100644 graphics/items/icons/exp_share.png create mode 100644 graphics/items/icons/fab_mail.png create mode 100644 graphics/items/icons/fame_checker.png create mode 100644 graphics/items/icons/figy_berry.png create mode 100644 graphics/items/icons/fire_stone.png create mode 100644 graphics/items/icons/fluffy_tail.png create mode 100644 graphics/items/icons/flute.png create mode 100644 graphics/items/icons/focus_band.png create mode 100644 graphics/items/icons/fresh_water.png create mode 100644 graphics/items/icons/full_heal.png create mode 100644 graphics/items/icons/ganlon_berry.png create mode 100644 graphics/items/icons/gem.png create mode 100644 graphics/items/icons/glitter_mail.png create mode 100644 graphics/items/icons/go_goggles.png create mode 100644 graphics/items/icons/gold_teeth.png create mode 100644 graphics/items/icons/good_rod.png create mode 100644 graphics/items/icons/great_ball.png create mode 100644 graphics/items/icons/grepa_berry.png create mode 100644 graphics/items/icons/harbor_mail.png create mode 100644 graphics/items/icons/hard_stone.png create mode 100644 graphics/items/icons/heart_scale.png create mode 100644 graphics/items/icons/helix_fossil.png create mode 100644 graphics/items/icons/hm.png create mode 100644 graphics/items/icons/hondew_berry.png create mode 100644 graphics/items/icons/hp_up.png create mode 100644 graphics/items/icons/iapapa_berry.png create mode 100644 graphics/items/icons/in_battle_herb.png create mode 100644 graphics/items/icons/itemfinder.png create mode 100644 graphics/items/icons/kelpsy_berry.png create mode 100644 graphics/items/icons/kings_rock.png create mode 100644 graphics/items/icons/lansat_berry.png create mode 100644 graphics/items/icons/large_potion.png create mode 100644 graphics/items/icons/lava_cookie.png create mode 100644 graphics/items/icons/lax_incense.png create mode 100644 graphics/items/icons/leaf_stone.png create mode 100644 graphics/items/icons/leftovers.png create mode 100644 graphics/items/icons/lemonade.png create mode 100644 graphics/items/icons/leppa_berry.png create mode 100644 graphics/items/icons/letter.png create mode 100644 graphics/items/icons/liechi_berry.png create mode 100644 graphics/items/icons/lift_key.png create mode 100644 graphics/items/icons/light_ball.png create mode 100644 graphics/items/icons/lucky_egg.png create mode 100644 graphics/items/icons/lucky_punch.png create mode 100644 graphics/items/icons/lum_berry.png create mode 100644 graphics/items/icons/luxury_ball.png create mode 100644 graphics/items/icons/mach_bike.png create mode 100644 graphics/items/icons/macho_brace.png create mode 100644 graphics/items/icons/magma_emblem.png create mode 100644 graphics/items/icons/magnet.png create mode 100644 graphics/items/icons/mago_berry.png create mode 100644 graphics/items/icons/magost_berry.png create mode 100644 graphics/items/icons/master_ball.png create mode 100644 graphics/items/icons/max_revive.png create mode 100644 graphics/items/icons/mech_mail.png create mode 100644 graphics/items/icons/metal_coat.png create mode 100644 graphics/items/icons/metal_powder.png create mode 100644 graphics/items/icons/meteorite.png create mode 100644 graphics/items/icons/miracle_seed.png create mode 100644 graphics/items/icons/moomoo_milk.png create mode 100644 graphics/items/icons/moon_stone.png create mode 100644 graphics/items/icons/mystic_ticket.png create mode 100644 graphics/items/icons/mystic_water.png create mode 100644 graphics/items/icons/nanab_berry.png create mode 100644 graphics/items/icons/nest_ball.png create mode 100644 graphics/items/icons/net_ball.png create mode 100644 graphics/items/icons/never_melt_ice.png create mode 100644 graphics/items/icons/nomel_berry.png create mode 100644 graphics/items/icons/nugget.png create mode 100644 graphics/items/icons/oaks_parcel.png create mode 100644 graphics/items/icons/old_amber.png create mode 100644 graphics/items/icons/old_rod.png create mode 100644 graphics/items/icons/old_sea_map.png create mode 100644 graphics/items/icons/oran_berry.png create mode 100644 graphics/items/icons/orange_mail.png create mode 100644 graphics/items/icons/orb.png create mode 100644 graphics/items/icons/pamtre_berry.png create mode 100644 graphics/items/icons/pearl.png create mode 100644 graphics/items/icons/pecha_berry.png create mode 100644 graphics/items/icons/persim_berry.png create mode 100644 graphics/items/icons/petaya_berry.png create mode 100644 graphics/items/icons/pinap_berry.png create mode 100644 graphics/items/icons/poison_barb.png create mode 100644 graphics/items/icons/poke_ball.png create mode 100644 graphics/items/icons/poke_doll.png create mode 100644 graphics/items/icons/poke_flute.png create mode 100644 graphics/items/icons/pokeblock_case.png create mode 100644 graphics/items/icons/pomeg_berry.png create mode 100644 graphics/items/icons/potion.png create mode 100644 graphics/items/icons/powder.png create mode 100644 graphics/items/icons/powder_jar.png create mode 100644 graphics/items/icons/pp_max.png create mode 100644 graphics/items/icons/pp_up.png create mode 100644 graphics/items/icons/premier_ball.png create mode 100644 graphics/items/icons/qualot_berry.png create mode 100644 graphics/items/icons/question_mark.png create mode 100644 graphics/items/icons/quick_claw.png create mode 100644 graphics/items/icons/rabuta_berry.png create mode 100644 graphics/items/icons/rainbow_pass.png create mode 100644 graphics/items/icons/rare_candy.png create mode 100644 graphics/items/icons/rawst_berry.png create mode 100644 graphics/items/icons/razz_berry.png create mode 100644 graphics/items/icons/repeat_ball.png create mode 100644 graphics/items/icons/repel.png create mode 100644 graphics/items/icons/retro_mail.png create mode 100644 graphics/items/icons/return_to_field_arrow.png create mode 100644 graphics/items/icons/revival_herb.png create mode 100644 graphics/items/icons/revive.png create mode 100644 graphics/items/icons/room1_key.png create mode 100644 graphics/items/icons/room2_key.png create mode 100644 graphics/items/icons/room4_key.png create mode 100644 graphics/items/icons/room6_key.png create mode 100644 graphics/items/icons/root_fossil.png create mode 100644 graphics/items/icons/sacred_ash.png create mode 100644 graphics/items/icons/safari_ball.png create mode 100644 graphics/items/icons/salac_berry.png create mode 100644 graphics/items/icons/scanner.png create mode 100644 graphics/items/icons/scarf.png create mode 100644 graphics/items/icons/scope_lens.png create mode 100644 graphics/items/icons/sea_incense.png create mode 100644 graphics/items/icons/secret_key.png create mode 100644 graphics/items/icons/shadow_mail.png create mode 100644 graphics/items/icons/shard.png create mode 100644 graphics/items/icons/sharp_beak.png create mode 100644 graphics/items/icons/shell_bell.png create mode 100644 graphics/items/icons/shoal_shell.png create mode 100644 graphics/items/icons/silk_scarf.png create mode 100644 graphics/items/icons/silph_scope.png create mode 100644 graphics/items/icons/silver_powder.png create mode 100644 graphics/items/icons/sitrus_berry.png create mode 100644 graphics/items/icons/smoke_ball.png create mode 100644 graphics/items/icons/soda_pop.png create mode 100644 graphics/items/icons/soft_sand.png create mode 100644 graphics/items/icons/soot_sack.png create mode 100644 graphics/items/icons/soothe_bell.png create mode 100644 graphics/items/icons/soul_dew.png create mode 100644 graphics/items/icons/spell_tag.png create mode 100644 graphics/items/icons/spelon_berry.png create mode 100644 graphics/items/icons/ss_ticket.png create mode 100644 graphics/items/icons/star_piece.png create mode 100644 graphics/items/icons/stardust.png create mode 100644 graphics/items/icons/starf_berry.png create mode 100644 graphics/items/icons/status_heal.png create mode 100644 graphics/items/icons/stick.png create mode 100644 graphics/items/icons/storage_key.png create mode 100644 graphics/items/icons/sun_stone.png create mode 100644 graphics/items/icons/super_rod.png create mode 100644 graphics/items/icons/tamato_berry.png create mode 100644 graphics/items/icons/tea.png create mode 100644 graphics/items/icons/teachy_tv.png create mode 100644 graphics/items/icons/thick_club.png create mode 100644 graphics/items/icons/thunder_stone.png create mode 100644 graphics/items/icons/timer_ball.png create mode 100644 graphics/items/icons/tiny_mushroom.png create mode 100644 graphics/items/icons/tm.png create mode 100644 graphics/items/icons/tm_case.png create mode 100644 graphics/items/icons/town_map.png create mode 100644 graphics/items/icons/tri_pass.png create mode 100644 graphics/items/icons/tropic_mail.png create mode 100644 graphics/items/icons/twisted_spoon.png create mode 100644 graphics/items/icons/ultra_ball.png create mode 100644 graphics/items/icons/up_grade.png create mode 100644 graphics/items/icons/vitamin.png create mode 100644 graphics/items/icons/vs_seeker.png create mode 100644 graphics/items/icons/wailmer_pail.png create mode 100644 graphics/items/icons/water_stone.png create mode 100644 graphics/items/icons/watmel_berry.png create mode 100644 graphics/items/icons/wave_mail.png create mode 100644 graphics/items/icons/wepear_berry.png create mode 100644 graphics/items/icons/wiki_berry.png create mode 100644 graphics/items/icons/wood_mail.png diff --git a/data/graphics.s b/data/graphics.s index 47838ad01..101ad50dc 100644 --- a/data/graphics.s +++ b/data/graphics.s @@ -13998,9 +13998,1895 @@ gUnknown_8E86F98:: @ 8E86F98 .incbin "baserom.gba", 0xE86F98, 0x90 @ THIS IS ITEM ICONS -gUnknown_8E87028:: @ 8E87028 - .incbin "baserom.gba", 0xE87028, 0xCAEC + .align 2 +gFile_graphics_items_icons_question_mark_sheet:: @ 8E87028 + .incbin "graphics/items/icons/question_mark.4bpp.lz" + + .align 2 +gFile_graphics_items_icon_palettes_question_mark_palette:: @ 8E870A0 + .incbin "graphics/items/icon_palettes/question_mark.gbapal.lz" + + .align 2 +gFile_graphics_items_icons_return_to_field_arrow_sheet:: @ 8E870B4 + .incbin "graphics/items/icons/return_to_field_arrow.4bpp.lz" + + .align 2 +gFile_graphics_items_icon_palettes_return_to_field_arrow_palette:: @ 8E8713C + .incbin "graphics/items/icon_palettes/return_to_field_arrow.gbapal.lz" + + .align 2 +gFile_graphics_items_icons_master_ball_sheet:: @ 8E87154 + .incbin "graphics/items/icons/master_ball.4bpp.lz" + + .align 2 +gFile_graphics_items_icon_palettes_master_ball_palette:: @ 8E87224 + .incbin "graphics/items/icon_palettes/master_ball.gbapal.lz" + + .align 2 +gFile_graphics_items_icons_ultra_ball_sheet:: @ 8E8724C + .incbin "graphics/items/icons/ultra_ball.4bpp.lz" + + .align 2 +gFile_graphics_items_icon_palettes_ultra_ball_palette:: @ 8E8730C + .incbin "graphics/items/icon_palettes/ultra_ball.gbapal.lz" + + .align 2 +gFile_graphics_items_icons_great_ball_sheet:: @ 8E87334 + .incbin "graphics/items/icons/great_ball.4bpp.lz" + + .align 2 +gFile_graphics_items_icon_palettes_great_ball_palette:: @ 8E87404 + .incbin "graphics/items/icon_palettes/great_ball.gbapal.lz" + + .align 2 +gFile_graphics_items_icons_poke_ball_sheet:: @ 8E8742C + .incbin "graphics/items/icons/poke_ball.4bpp.lz" + + .align 2 +gFile_graphics_items_icon_palettes_poke_ball_palette:: @ 8E874DC + .incbin "graphics/items/icon_palettes/poke_ball.gbapal.lz" + + .align 2 +gFile_graphics_items_icons_safari_ball_sheet:: @ 8E87500 + .incbin "graphics/items/icons/safari_ball.4bpp.lz" + + .align 2 +gFile_graphics_items_icon_palettes_safari_ball_palette:: @ 8E875D0 + .incbin "graphics/items/icon_palettes/safari_ball.gbapal.lz" + + .align 2 +gFile_graphics_items_icons_net_ball_sheet:: @ 8E875F8 + .incbin "graphics/items/icons/net_ball.4bpp.lz" + + .align 2 +gFile_graphics_items_icon_palettes_net_ball_palette:: @ 8E876CC + .incbin "graphics/items/icon_palettes/net_ball.gbapal.lz" + + .align 2 +gFile_graphics_items_icons_dive_ball_sheet:: @ 8E876F0 + .incbin "graphics/items/icons/dive_ball.4bpp.lz" + + .align 2 +gFile_graphics_items_icon_palettes_dive_ball_palette:: @ 8E877B8 + .incbin "graphics/items/icon_palettes/dive_ball.gbapal.lz" + + .align 2 +gFile_graphics_items_icons_nest_ball_sheet:: @ 8E877DC + .incbin "graphics/items/icons/nest_ball.4bpp.lz" + + .align 2 +gFile_graphics_items_icon_palettes_nest_ball_palette:: @ 8E878A0 + .incbin "graphics/items/icon_palettes/nest_ball.gbapal.lz" + + .align 2 +gFile_graphics_items_icons_repeat_ball_sheet:: @ 8E878C8 + .incbin "graphics/items/icons/repeat_ball.4bpp.lz" + + .align 2 +gFile_graphics_items_icon_palettes_repeat_ball_palette:: @ 8E8798C + .incbin "graphics/items/icon_palettes/repeat_ball.gbapal.lz" + + .align 2 +gFile_graphics_items_icons_timer_ball_sheet:: @ 8E879B4 + .incbin "graphics/items/icons/timer_ball.4bpp.lz" + + .align 2 +gFile_graphics_items_icons_luxury_ball_sheet:: @ 8E87A7C + .incbin "graphics/items/icons/luxury_ball.4bpp.lz" + + .align 2 +gFile_graphics_items_icon_palettes_luxury_ball_palette:: @ 8E87B38 + .incbin "graphics/items/icon_palettes/luxury_ball.gbapal.lz" + + .align 2 +gFile_graphics_items_icons_premier_ball_sheet:: @ 8E87B60 + .incbin "graphics/items/icons/premier_ball.4bpp.lz" + + .align 2 +gFile_graphics_items_icons_potion_sheet:: @ 8E87C04 + .incbin "graphics/items/icons/potion.4bpp.lz" + + .align 2 +gFile_graphics_items_icon_palettes_potion_palette:: @ 8E87CCC + .incbin "graphics/items/icon_palettes/potion.gbapal.lz" + + .align 2 +gFile_graphics_items_icons_antidote_sheet:: @ 8E87CF0 + .incbin "graphics/items/icons/antidote.4bpp.lz" + + .align 2 +gFile_graphics_items_icon_palettes_antidote_palette:: @ 8E87DA0 + .incbin "graphics/items/icon_palettes/antidote.gbapal.lz" + + .align 2 +gFile_graphics_items_icon_palettes_burn_heal_palette:: @ 8E87DC4 + .incbin "graphics/items/icon_palettes/burn_heal.gbapal.lz" + + .align 2 +gFile_graphics_items_icon_palettes_ice_heal_palette:: @ 8E87DE8 + .incbin "graphics/items/icon_palettes/ice_heal.gbapal.lz" + + .align 2 +gFile_graphics_items_icons_status_heal_sheet:: @ 8E87E0C + .incbin "graphics/items/icons/status_heal.4bpp.lz" + + .align 2 +gFile_graphics_items_icon_palettes_awakening_palette:: @ 8E87EBC + .incbin "graphics/items/icon_palettes/awakening.gbapal.lz" + + .align 2 +gFile_graphics_items_icon_palettes_paralyze_heal_palette:: @ 8E87EE0 + .incbin "graphics/items/icon_palettes/paralyze_heal.gbapal.lz" + + .align 2 +gFile_graphics_items_icons_large_potion_sheet:: @ 8E87F04 + .incbin "graphics/items/icons/large_potion.4bpp.lz" + + .align 2 +gFile_graphics_items_icon_palettes_full_restore_palette:: @ 8E87FE8 + .incbin "graphics/items/icon_palettes/full_restore.gbapal.lz" + + .align 2 +gFile_graphics_items_icon_palettes_max_potion_palette:: @ 8E8800C + .incbin "graphics/items/icon_palettes/max_potion.gbapal.lz" + + .align 2 +gFile_graphics_items_icon_palettes_hyper_potion_palette:: @ 8E88030 + .incbin "graphics/items/icon_palettes/hyper_potion.gbapal.lz" + + .align 2 +gFile_graphics_items_icon_palettes_super_potion_palette:: @ 8E88054 + .incbin "graphics/items/icon_palettes/super_potion.gbapal.lz" + + .align 2 +gFile_graphics_items_icons_full_heal_sheet:: @ 8E88078 + .incbin "graphics/items/icons/full_heal.4bpp.lz" + + .align 2 +gFile_graphics_items_icon_palettes_full_heal_palette:: @ 8E88120 + .incbin "graphics/items/icon_palettes/full_heal.gbapal.lz" + + .align 2 +gFile_graphics_items_icons_revive_sheet:: @ 8E88148 + .incbin "graphics/items/icons/revive.4bpp.lz" + + .align 2 +gFile_graphics_items_icons_max_revive_sheet:: @ 8E881A4 + .incbin "graphics/items/icons/max_revive.4bpp.lz" + + .align 2 +gFile_graphics_items_icon_palettes_revive_palette:: @ 8E88270 + .incbin "graphics/items/icon_palettes/revive.gbapal.lz" + + .align 2 +gFile_graphics_items_icons_fresh_water_sheet:: @ 8E8828C + .incbin "graphics/items/icons/fresh_water.4bpp.lz" + + .align 2 +gFile_graphics_items_icon_palettes_fresh_water_palette:: @ 8E8833C + .incbin "graphics/items/icon_palettes/fresh_water.gbapal.lz" + + .align 2 +gFile_graphics_items_icons_soda_pop_sheet:: @ 8E88360 + .incbin "graphics/items/icons/soda_pop.4bpp.lz" + + .align 2 +gFile_graphics_items_icon_palettes_soda_pop_palette:: @ 8E883F4 + .incbin "graphics/items/icon_palettes/soda_pop.gbapal.lz" + + .align 2 +gFile_graphics_items_icons_lemonade_sheet:: @ 8E8841C + .incbin "graphics/items/icons/lemonade.4bpp.lz" + + .align 2 +gFile_graphics_items_icon_palettes_lemonade_palette:: @ 8E884DC + .incbin "graphics/items/icon_palettes/lemonade.gbapal.lz" + + .align 2 +gFile_graphics_items_icons_moomoo_milk_sheet:: @ 8E88504 + .incbin "graphics/items/icons/moomoo_milk.4bpp.lz" + + .align 2 +gFile_graphics_items_icon_palettes_moomoo_milk_palette:: @ 8E885B4 + .incbin "graphics/items/icon_palettes/moomoo_milk.gbapal.lz" + + .align 2 +gFile_graphics_items_icons_powder_sheet:: @ 8E885DC + .incbin "graphics/items/icons/powder.4bpp.lz" + + .align 2 +gFile_graphics_items_icon_palettes_energy_powder_palette:: @ 8E88668 + .incbin "graphics/items/icon_palettes/energy_powder.gbapal.lz" + + .align 2 +gFile_graphics_items_icons_energy_root_sheet:: @ 8E88688 + .incbin "graphics/items/icons/energy_root.4bpp.lz" + + .align 2 +gFile_graphics_items_icon_palettes_energy_root_palette:: @ 8E88754 + .incbin "graphics/items/icon_palettes/energy_root.gbapal.lz" + + .align 2 +gFile_graphics_items_icon_palettes_heal_powder_palette:: @ 8E88770 + .incbin "graphics/items/icon_palettes/heal_powder.gbapal.lz" + + .align 2 +gFile_graphics_items_icons_revival_herb_sheet:: @ 8E88790 + .incbin "graphics/items/icons/revival_herb.4bpp.lz" + + .align 2 +gFile_graphics_items_icon_palettes_revival_herb_palette:: @ 8E88860 + .incbin "graphics/items/icon_palettes/revival_herb.gbapal.lz" + + .align 2 +gFile_graphics_items_icons_ether_sheet:: @ 8E88880 + .incbin "graphics/items/icons/ether.4bpp.lz" + + .align 2 +gFile_graphics_items_icon_palettes_ether_palette:: @ 8E88940 + .incbin "graphics/items/icon_palettes/ether.gbapal.lz" + + .align 2 +gFile_graphics_items_icon_palettes_max_ether_palette:: @ 8E88964 + .incbin "graphics/items/icon_palettes/max_ether.gbapal.lz" + + .align 2 +gFile_graphics_items_icon_palettes_elixir_palette:: @ 8E88988 + .incbin "graphics/items/icon_palettes/elixir.gbapal.lz" + + .align 2 +gFile_graphics_items_icon_palettes_max_elixir_palette:: @ 8E889AC + .incbin "graphics/items/icon_palettes/max_elixir.gbapal.lz" + + .align 2 +gFile_graphics_items_icons_lava_cookie_sheet:: @ 8E889D0 + .incbin "graphics/items/icons/lava_cookie.4bpp.lz" + + .align 2 +gFile_graphics_items_icon_palettes_lava_cookie_and_letter_palette:: @ 8E88A9C + .incbin "graphics/items/icon_palettes/lava_cookie_and_letter.gbapal.lz" + + .align 2 +gFile_graphics_items_icons_flute_sheet:: @ 8E88AC0 + .incbin "graphics/items/icons/flute.4bpp.lz" + + .align 2 +gFile_graphics_items_icon_palettes_blue_flute_palette:: @ 8E88B74 + .incbin "graphics/items/icon_palettes/blue_flute.gbapal.lz" + + .align 2 +gFile_graphics_items_icon_palettes_yellow_flute_palette:: @ 8E88B98 + .incbin "graphics/items/icon_palettes/yellow_flute.gbapal.lz" + + .align 2 +gFile_graphics_items_icon_palettes_red_flute_palette:: @ 8E88BBC + .incbin "graphics/items/icon_palettes/red_flute.gbapal.lz" + + .align 2 +gFile_graphics_items_icon_palettes_black_flute_palette:: @ 8E88BE0 + .incbin "graphics/items/icon_palettes/black_flute.gbapal.lz" + + .align 2 +gFile_graphics_items_icon_palettes_white_flute_palette:: @ 8E88C04 + .incbin "graphics/items/icon_palettes/white_flute.gbapal.lz" + + .align 2 +gFile_graphics_items_icons_berry_juice_sheet:: @ 8E88C28 + .incbin "graphics/items/icons/berry_juice.4bpp.lz" + + .align 2 +gFile_graphics_items_icon_palettes_berry_juice_palette:: @ 8E88D08 + .incbin "graphics/items/icon_palettes/berry_juice.gbapal.lz" + + .align 2 +gFile_graphics_items_icons_sacred_ash_sheet:: @ 8E88D30 + .incbin "graphics/items/icons/sacred_ash.4bpp.lz" + + .align 2 +gFile_graphics_items_icon_palettes_sacred_ash_palette:: @ 8E88DF0 + .incbin "graphics/items/icon_palettes/sacred_ash.gbapal.lz" + + .align 2 +gFile_graphics_items_icon_palettes_shoal_salt_palette:: @ 8E88E14 + .incbin "graphics/items/icon_palettes/shoal_salt.gbapal.lz" + + .align 2 +gFile_graphics_items_icons_shoal_shell_sheet:: @ 8E88E34 + .incbin "graphics/items/icons/shoal_shell.4bpp.lz" + + .align 2 +gFile_graphics_items_icon_palettes_shell_palette:: @ 8E88F28 + .incbin "graphics/items/icon_palettes/shell.gbapal.lz" + + .align 2 +gFile_graphics_items_icons_shard_sheet:: @ 8E88F50 + .incbin "graphics/items/icons/shard.4bpp.lz" + + .align 2 +gFile_graphics_items_icon_palettes_red_shard_palette:: @ 8E88FAC + .incbin "graphics/items/icon_palettes/red_shard.gbapal.lz" + + .align 2 +gFile_graphics_items_icon_palettes_blue_shard_palette:: @ 8E88FC4 + .incbin "graphics/items/icon_palettes/blue_shard.gbapal.lz" + + .align 2 +gFile_graphics_items_icon_palettes_yellow_shard_palette:: @ 8E88FDC + .incbin "graphics/items/icon_palettes/yellow_shard.gbapal.lz" + + .align 2 +gFile_graphics_items_icon_palettes_green_shard_palette:: @ 8E88FF4 + .incbin "graphics/items/icon_palettes/green_shard.gbapal.lz" + + .align 2 +gFile_graphics_items_icons_hp_up_sheet:: @ 8E8900C + .incbin "graphics/items/icons/hp_up.4bpp.lz" + + .align 2 +gFile_graphics_items_icon_palettes_hp_up_palette:: @ 8E890C4 + .incbin "graphics/items/icon_palettes/hp_up.gbapal.lz" + + .align 2 +gFile_graphics_items_icons_vitamin_sheet:: @ 8E890EC + .incbin "graphics/items/icons/vitamin.4bpp.lz" + + .align 2 +gFile_graphics_items_icon_palettes_protein_palette:: @ 8E8919C + .incbin "graphics/items/icon_palettes/protein.gbapal.lz" + + .align 2 +gFile_graphics_items_icon_palettes_iron_palette:: @ 8E891C4 + .incbin "graphics/items/icon_palettes/iron.gbapal.lz" + + .align 2 +gFile_graphics_items_icon_palettes_carbos_palette:: @ 8E891EC + .incbin "graphics/items/icon_palettes/carbos.gbapal.lz" + + .align 2 +gFile_graphics_items_icon_palettes_calcium_palette:: @ 8E89214 + .incbin "graphics/items/icon_palettes/calcium.gbapal.lz" + + .align 2 +gFile_graphics_items_icons_rare_candy_sheet:: @ 8E8923C + .incbin "graphics/items/icons/rare_candy.4bpp.lz" + + .align 2 +gFile_graphics_items_icon_palettes_rare_candy_palette:: @ 8E89300 + .incbin "graphics/items/icon_palettes/rare_candy.gbapal.lz" + + .align 2 +gFile_graphics_items_icons_pp_up_sheet:: @ 8E8931C + .incbin "graphics/items/icons/pp_up.4bpp.lz" + + .align 2 +gFile_graphics_items_icon_palettes_pp_up_palette:: @ 8E893CC + .incbin "graphics/items/icon_palettes/pp_up.gbapal.lz" + + .align 2 +gFile_graphics_items_icon_palettes_zinc_palette:: @ 8E893F4 + .incbin "graphics/items/icon_palettes/zinc.gbapal.lz" + + .align 2 +gFile_graphics_items_icons_pp_max_sheet:: @ 8E8941C + .incbin "graphics/items/icons/pp_max.4bpp.lz" + + .align 2 +gFile_graphics_items_icon_palettes_pp_max_palette:: @ 8E894C4 + .incbin "graphics/items/icon_palettes/pp_max.gbapal.lz" + + .align 2 +gFile_graphics_items_icon_palettes_guard_spec_palette:: @ 8E894EC + .incbin "graphics/items/icon_palettes/guard_spec.gbapal.lz" + + .align 2 +gFile_graphics_items_icon_palettes_dire_hit_palette:: @ 8E89510 + .incbin "graphics/items/icon_palettes/dire_hit.gbapal.lz" + + .align 2 +gFile_graphics_items_icon_palettes_x_attack_palette:: @ 8E89534 + .incbin "graphics/items/icon_palettes/x_attack.gbapal.lz" + + .align 2 +gFile_graphics_items_icons_battle_stat_item_sheet:: @ 8E89558 + .incbin "graphics/items/icons/battle_stat_item.4bpp.lz" + + .align 2 +gFile_graphics_items_icon_palettes_x_defend_palette:: @ 8E8963C + .incbin "graphics/items/icon_palettes/x_defend.gbapal.lz" + + .align 2 +gFile_graphics_items_icon_palettes_x_speed_palette:: @ 8E89660 + .incbin "graphics/items/icon_palettes/x_speed.gbapal.lz" + + .align 2 +gFile_graphics_items_icon_palettes_x_accuracy_palette:: @ 8E89684 + .incbin "graphics/items/icon_palettes/x_accuracy.gbapal.lz" + + .align 2 +gFile_graphics_items_icon_palettes_x_special_palette:: @ 8E896A8 + .incbin "graphics/items/icon_palettes/x_special.gbapal.lz" + + .align 2 +gFile_graphics_items_icons_poke_doll_sheet:: @ 8E896CC + .incbin "graphics/items/icons/poke_doll.4bpp.lz" + + .align 2 +gFile_graphics_items_icon_palettes_poke_doll_palette:: @ 8E897BC + .incbin "graphics/items/icon_palettes/poke_doll.gbapal.lz" + + .align 2 +gFile_graphics_items_icons_fluffy_tail_sheet:: @ 8E897D8 + .incbin "graphics/items/icons/fluffy_tail.4bpp.lz" + + .align 2 +gFile_graphics_items_icon_palettes_fluffy_tail_palette:: @ 8E898C8 + .incbin "graphics/items/icon_palettes/fluffy_tail.gbapal.lz" + + .align 2 +gFile_graphics_items_icons_repel_sheet:: @ 8E898EC + .incbin "graphics/items/icons/repel.4bpp.lz" + + .align 2 +gFile_graphics_items_icon_palettes_super_repel_palette:: @ 8E8998C + .incbin "graphics/items/icon_palettes/super_repel.gbapal.lz" + + .align 2 +gFile_graphics_items_icon_palettes_max_repel_palette:: @ 8E899B4 + .incbin "graphics/items/icon_palettes/max_repel.gbapal.lz" + + .align 2 +gFile_graphics_items_icons_escape_rope_sheet:: @ 8E899DC + .incbin "graphics/items/icons/escape_rope.4bpp.lz" + + .align 2 +gFile_graphics_items_icon_palettes_escape_rope_palette:: @ 8E89A90 + .incbin "graphics/items/icon_palettes/escape_rope.gbapal.lz" + + .align 2 +gFile_graphics_items_icon_palettes_repel_palette:: @ 8E89AB4 + .incbin "graphics/items/icon_palettes/repel.gbapal.lz" + + .align 2 +gFile_graphics_items_icons_sun_stone_sheet:: @ 8E89ADC + .incbin "graphics/items/icons/sun_stone.4bpp.lz" + + .align 2 +gFile_graphics_items_icon_palettes_sun_stone_palette:: @ 8E89BD4 + .incbin "graphics/items/icon_palettes/sun_stone.gbapal.lz" + + .align 2 +gFile_graphics_items_icons_moon_stone_sheet:: @ 8E89BF0 + .incbin "graphics/items/icons/moon_stone.4bpp.lz" + + .align 2 +gFile_graphics_items_icon_palettes_moon_stone_palette:: @ 8E89CC4 + .incbin "graphics/items/icon_palettes/moon_stone.gbapal.lz" + + .align 2 +gFile_graphics_items_icons_fire_stone_sheet:: @ 8E89CE4 + .incbin "graphics/items/icons/fire_stone.4bpp.lz" + + .align 2 +gFile_graphics_items_icon_palettes_fire_stone_palette:: @ 8E89DD8 + .incbin "graphics/items/icon_palettes/fire_stone.gbapal.lz" + + .align 2 +gFile_graphics_items_icons_thunder_stone_sheet:: @ 8E89E00 + .incbin "graphics/items/icons/thunder_stone.4bpp.lz" + + .align 2 +gFile_graphics_items_icon_palettes_thunder_stone_palette:: @ 8E89EE8 + .incbin "graphics/items/icon_palettes/thunder_stone.gbapal.lz" + + .align 2 +gFile_graphics_items_icons_water_stone_sheet:: @ 8E89F08 + .incbin "graphics/items/icons/water_stone.4bpp.lz" + + .align 2 +gFile_graphics_items_icon_palettes_water_stone_palette:: @ 8E89FE8 + .incbin "graphics/items/icon_palettes/water_stone.gbapal.lz" + + .align 2 +gFile_graphics_items_icons_leaf_stone_sheet:: @ 8E8A00C + .incbin "graphics/items/icons/leaf_stone.4bpp.lz" + + .align 2 +gFile_graphics_items_icon_palettes_leaf_stone_palette:: @ 8E8A100 + .incbin "graphics/items/icon_palettes/leaf_stone.gbapal.lz" + + .align 2 +gFile_graphics_items_icons_tiny_mushroom_sheet:: @ 8E8A128 + .incbin "graphics/items/icons/tiny_mushroom.4bpp.lz" + + .align 2 +gFile_graphics_items_icons_big_mushroom_sheet:: @ 8E8A1A8 + .incbin "graphics/items/icons/big_mushroom.4bpp.lz" + + .align 2 +gFile_graphics_items_icon_palettes_mushroom_palette:: @ 8E8A260 + .incbin "graphics/items/icon_palettes/mushroom.gbapal.lz" + + .align 2 +gFile_graphics_items_icons_pearl_sheet:: @ 8E8A284 + .incbin "graphics/items/icons/pearl.4bpp.lz" + + .align 2 +gFile_graphics_items_icon_palettes_pearl_palette:: @ 8E8A300 + .incbin "graphics/items/icon_palettes/pearl.gbapal.lz" + + .align 2 +gFile_graphics_items_icons_big_pearl_sheet:: @ 8E8A328 + .incbin "graphics/items/icons/big_pearl.4bpp.lz" + + .align 2 +gFile_graphics_items_icons_stardust_sheet:: @ 8E8A3E0 + .incbin "graphics/items/icons/stardust.4bpp.lz" + + .align 2 +gFile_graphics_items_icon_palettes_star_palette:: @ 8E8A4A0 + .incbin "graphics/items/icon_palettes/star.gbapal.lz" + + .align 2 +gFile_graphics_items_icons_star_piece_sheet:: @ 8E8A4C4 + .incbin "graphics/items/icons/star_piece.4bpp.lz" + + .align 2 +gFile_graphics_items_icons_nugget_sheet:: @ 8E8A548 + .incbin "graphics/items/icons/nugget.4bpp.lz" + + .align 2 +gFile_graphics_items_icon_palettes_nugget_palette:: @ 8E8A5D4 + .incbin "graphics/items/icon_palettes/nugget.gbapal.lz" + + .align 2 +gFile_graphics_items_icons_heart_scale_sheet:: @ 8E8A5F4 + .incbin "graphics/items/icons/heart_scale.4bpp.lz" + + .align 2 +gFile_graphics_items_icon_palettes_heart_scale_palette:: @ 8E8A694 + .incbin "graphics/items/icon_palettes/heart_scale.gbapal.lz" + + .align 2 +gFile_graphics_items_icons_orange_mail_sheet:: @ 8E8A6B0 + .incbin "graphics/items/icons/orange_mail.4bpp.lz" + + .align 2 +gFile_graphics_items_icon_palettes_orange_mail_palette:: @ 8E8A784 + .incbin "graphics/items/icon_palettes/orange_mail.gbapal.lz" + + .align 2 +gFile_graphics_items_icons_harbor_mail_sheet:: @ 8E8A7A4 + .incbin "graphics/items/icons/harbor_mail.4bpp.lz" + + .align 2 +gFile_graphics_items_icon_palettes_harbor_mail_palette:: @ 8E8A86C + .incbin "graphics/items/icon_palettes/harbor_mail.gbapal.lz" + + .align 2 +gFile_graphics_items_icons_glitter_mail_sheet:: @ 8E8A88C + .incbin "graphics/items/icons/glitter_mail.4bpp.lz" + + .align 2 +gFile_graphics_items_icon_palettes_glitter_mail_palette:: @ 8E8A968 + .incbin "graphics/items/icon_palettes/glitter_mail.gbapal.lz" + + .align 2 +gFile_graphics_items_icons_mech_mail_sheet:: @ 8E8A990 + .incbin "graphics/items/icons/mech_mail.4bpp.lz" + + .align 2 +gFile_graphics_items_icon_palettes_mech_mail_palette:: @ 8E8AA6C + .incbin "graphics/items/icon_palettes/mech_mail.gbapal.lz" + + .align 2 +gFile_graphics_items_icons_wood_mail_sheet:: @ 8E8AA8C + .incbin "graphics/items/icons/wood_mail.4bpp.lz" + + .align 2 +gFile_graphics_items_icon_palettes_wood_mail_palette:: @ 8E8AB6C + .incbin "graphics/items/icon_palettes/wood_mail.gbapal.lz" + + .align 2 +gFile_graphics_items_icons_wave_mail_sheet:: @ 8E8AB8C + .incbin "graphics/items/icons/wave_mail.4bpp.lz" + + .align 2 +gFile_graphics_items_icon_palettes_wave_mail_palette:: @ 8E8AC64 + .incbin "graphics/items/icon_palettes/wave_mail.gbapal.lz" + + .align 2 +gFile_graphics_items_icons_bead_mail_sheet:: @ 8E8AC84 + .incbin "graphics/items/icons/bead_mail.4bpp.lz" + + .align 2 +gFile_graphics_items_icon_palettes_bead_mail_palette:: @ 8E8AD44 + .incbin "graphics/items/icon_palettes/bead_mail.gbapal.lz" + + .align 2 +gFile_graphics_items_icons_shadow_mail_sheet:: @ 8E8AD64 + .incbin "graphics/items/icons/shadow_mail.4bpp.lz" + + .align 2 +gFile_graphics_items_icon_palettes_shadow_mail_palette:: @ 8E8AE38 + .incbin "graphics/items/icon_palettes/shadow_mail.gbapal.lz" + + .align 2 +gFile_graphics_items_icons_tropic_mail_sheet:: @ 8E8AE5C + .incbin "graphics/items/icons/tropic_mail.4bpp.lz" + + .align 2 +gFile_graphics_items_icon_palettes_tropic_mail_palette:: @ 8E8AF40 + .incbin "graphics/items/icon_palettes/tropic_mail.gbapal.lz" + + .align 2 +gFile_graphics_items_icons_dream_mail_sheet:: @ 8E8AF64 + .incbin "graphics/items/icons/dream_mail.4bpp.lz" + + .align 2 +gFile_graphics_items_icon_palettes_dream_mail_palette:: @ 8E8B044 + .incbin "graphics/items/icon_palettes/dream_mail.gbapal.lz" + + .align 2 +gFile_graphics_items_icons_fab_mail_sheet:: @ 8E8B064 + .incbin "graphics/items/icons/fab_mail.4bpp.lz" + + .align 2 +gFile_graphics_items_icon_palettes_fab_mail_palette:: @ 8E8B12C + .incbin "graphics/items/icon_palettes/fab_mail.gbapal.lz" + + .align 2 +gFile_graphics_items_icons_retro_mail_sheet:: @ 8E8B148 + .incbin "graphics/items/icons/retro_mail.4bpp.lz" + + .align 2 +gFile_graphics_items_icon_palettes_retro_mail_palette:: @ 8E8B1E0 + .incbin "graphics/items/icon_palettes/retro_mail.gbapal.lz" + + .align 2 +gFile_graphics_items_icons_cheri_berry_sheet:: @ 8E8B200 + .incbin "graphics/items/icons/cheri_berry.4bpp.lz" + + .align 2 +gFile_graphics_items_icon_palettes_cheri_berry_palette:: @ 8E8B2E8 + .incbin "graphics/items/icon_palettes/cheri_berry.gbapal.lz" + + .align 2 +gFile_graphics_items_icons_chesto_berry_sheet:: @ 8E8B310 + .incbin "graphics/items/icons/chesto_berry.4bpp.lz" + + .align 2 +gFile_graphics_items_icon_palettes_chesto_berry_palette:: @ 8E8B3D0 + .incbin "graphics/items/icon_palettes/chesto_berry.gbapal.lz" + + .align 2 +gFile_graphics_items_icons_pecha_berry_sheet:: @ 8E8B3F4 + .incbin "graphics/items/icons/pecha_berry.4bpp.lz" + + .align 2 +gFile_graphics_items_icon_palettes_pecha_berry_palette:: @ 8E8B4B4 + .incbin "graphics/items/icon_palettes/pecha_berry.gbapal.lz" + + .align 2 +gFile_graphics_items_icons_rawst_berry_sheet:: @ 8E8B4D8 + .incbin "graphics/items/icons/rawst_berry.4bpp.lz" + + .align 2 +gFile_graphics_items_icon_palettes_rawst_berry_palette:: @ 8E8B5BC + .incbin "graphics/items/icon_palettes/rawst_berry.gbapal.lz" + + .align 2 +gFile_graphics_items_icons_aspear_berry_sheet:: @ 8E8B5E0 + .incbin "graphics/items/icons/aspear_berry.4bpp.lz" + + .align 2 +gFile_graphics_items_icon_palettes_aspear_berry_palette:: @ 8E8B6C8 + .incbin "graphics/items/icon_palettes/aspear_berry.gbapal.lz" + + .align 2 +gFile_graphics_items_icons_leppa_berry_sheet:: @ 8E8B6EC + .incbin "graphics/items/icons/leppa_berry.4bpp.lz" + + .align 2 +gFile_graphics_items_icon_palettes_leppa_berry_palette:: @ 8E8B7A4 + .incbin "graphics/items/icon_palettes/leppa_berry.gbapal.lz" + + .align 2 +gFile_graphics_items_icons_oran_berry_sheet:: @ 8E8B7C8 + .incbin "graphics/items/icons/oran_berry.4bpp.lz" + + .align 2 +gFile_graphics_items_icon_palettes_oran_berry_palette:: @ 8E8B88C + .incbin "graphics/items/icon_palettes/oran_berry.gbapal.lz" + + .align 2 +gFile_graphics_items_icons_persim_berry_sheet:: @ 8E8B8B0 + .incbin "graphics/items/icons/persim_berry.4bpp.lz" + + .align 2 +gFile_graphics_items_icon_palettes_persim_berry_palette:: @ 8E8B984 + .incbin "graphics/items/icon_palettes/persim_berry.gbapal.lz" + + .align 2 +gFile_graphics_items_icons_lum_berry_sheet:: @ 8E8B9A8 + .incbin "graphics/items/icons/lum_berry.4bpp.lz" + + .align 2 +gFile_graphics_items_icon_palettes_lum_berry_palette:: @ 8E8BA60 + .incbin "graphics/items/icon_palettes/lum_berry.gbapal.lz" + + .align 2 +gFile_graphics_items_icons_sitrus_berry_sheet:: @ 8E8BA7C + .incbin "graphics/items/icons/sitrus_berry.4bpp.lz" + + .align 2 +gFile_graphics_items_icon_palettes_sitrus_berry_palette:: @ 8E8BB48 + .incbin "graphics/items/icon_palettes/sitrus_berry.gbapal.lz" + + .align 2 +gFile_graphics_items_icons_figy_berry_sheet:: @ 8E8BB6C + .incbin "graphics/items/icons/figy_berry.4bpp.lz" + + .align 2 +gFile_graphics_items_icon_palettes_figy_berry_palette:: @ 8E8BC34 + .incbin "graphics/items/icon_palettes/figy_berry.gbapal.lz" + + .align 2 +gFile_graphics_items_icons_wiki_berry_sheet:: @ 8E8BC58 + .incbin "graphics/items/icons/wiki_berry.4bpp.lz" + + .align 2 +gFile_graphics_items_icon_palettes_wiki_berry_palette:: @ 8E8BD3C + .incbin "graphics/items/icon_palettes/wiki_berry.gbapal.lz" + + .align 2 +gFile_graphics_items_icons_mago_berry_sheet:: @ 8E8BD60 + .incbin "graphics/items/icons/mago_berry.4bpp.lz" + + .align 2 +gFile_graphics_items_icon_palettes_mago_berry_palette:: @ 8E8BE1C + .incbin "graphics/items/icon_palettes/mago_berry.gbapal.lz" + + .align 2 +gFile_graphics_items_icons_aguav_berry_sheet:: @ 8E8BE40 + .incbin "graphics/items/icons/aguav_berry.4bpp.lz" + + .align 2 +gFile_graphics_items_icon_palettes_aguav_berry_palette:: @ 8E8BF2C + .incbin "graphics/items/icon_palettes/aguav_berry.gbapal.lz" + + .align 2 +gFile_graphics_items_icons_iapapa_berry_sheet:: @ 8E8BF4C + .incbin "graphics/items/icons/iapapa_berry.4bpp.lz" + + .align 2 +gFile_graphics_items_icon_palettes_iapapa_berry_palette:: @ 8E8C034 + .incbin "graphics/items/icon_palettes/iapapa_berry.gbapal.lz" + + .align 2 +gFile_graphics_items_icons_razz_berry_sheet:: @ 8E8C058 + .incbin "graphics/items/icons/razz_berry.4bpp.lz" + + .align 2 +gFile_graphics_items_icon_palettes_razz_berry_palette:: @ 8E8C138 + .incbin "graphics/items/icon_palettes/razz_berry.gbapal.lz" + + .align 2 +gFile_graphics_items_icons_bluk_berry_sheet:: @ 8E8C15C + .incbin "graphics/items/icons/bluk_berry.4bpp.lz" + + .align 2 +gFile_graphics_items_icon_palettes_bluk_berry_palette:: @ 8E8C24C + .incbin "graphics/items/icon_palettes/bluk_berry.gbapal.lz" + + .align 2 +gFile_graphics_items_icons_nanab_berry_sheet:: @ 8E8C270 + .incbin "graphics/items/icons/nanab_berry.4bpp.lz" + + .align 2 +gFile_graphics_items_icon_palettes_nanab_berry_palette:: @ 8E8C354 + .incbin "graphics/items/icon_palettes/nanab_berry.gbapal.lz" + + .align 2 +gFile_graphics_items_icons_wepear_berry_sheet:: @ 8E8C378 + .incbin "graphics/items/icons/wepear_berry.4bpp.lz" + + .align 2 +gFile_graphics_items_icon_palettes_wepear_berry_palette:: @ 8E8C440 + .incbin "graphics/items/icon_palettes/wepear_berry.gbapal.lz" + + .align 2 +gFile_graphics_items_icons_pinap_berry_sheet:: @ 8E8C45C + .incbin "graphics/items/icons/pinap_berry.4bpp.lz" + + .align 2 +gFile_graphics_items_icon_palettes_pinap_berry_palette:: @ 8E8C550 + .incbin "graphics/items/icon_palettes/pinap_berry.gbapal.lz" + + .align 2 +gFile_graphics_items_icons_pomeg_berry_sheet:: @ 8E8C574 + .incbin "graphics/items/icons/pomeg_berry.4bpp.lz" + + .align 2 +gFile_graphics_items_icon_palettes_pomeg_berry_palette:: @ 8E8C628 + .incbin "graphics/items/icon_palettes/pomeg_berry.gbapal.lz" + + .align 2 +gFile_graphics_items_icons_kelpsy_berry_sheet:: @ 8E8C64C + .incbin "graphics/items/icons/kelpsy_berry.4bpp.lz" + + .align 2 +gFile_graphics_items_icon_palettes_kelpsy_berry_palette:: @ 8E8C71C + .incbin "graphics/items/icon_palettes/kelpsy_berry.gbapal.lz" + + .align 2 +gFile_graphics_items_icons_qualot_berry_sheet:: @ 8E8C73C + .incbin "graphics/items/icons/qualot_berry.4bpp.lz" + + .align 2 +gFile_graphics_items_icon_palettes_qualot_berry_palette:: @ 8E8C808 + .incbin "graphics/items/icon_palettes/qualot_berry.gbapal.lz" + + .align 2 +gFile_graphics_items_icons_hondew_berry_sheet:: @ 8E8C82C + .incbin "graphics/items/icons/hondew_berry.4bpp.lz" + + .align 2 +gFile_graphics_items_icon_palettes_hondew_berry_palette:: @ 8E8C90C + .incbin "graphics/items/icon_palettes/hondew_berry.gbapal.lz" + + .align 2 +gFile_graphics_items_icons_grepa_berry_sheet:: @ 8E8C930 + .incbin "graphics/items/icons/grepa_berry.4bpp.lz" + + .align 2 +gFile_graphics_items_icon_palettes_grepa_berry_palette:: @ 8E8C9E4 + .incbin "graphics/items/icon_palettes/grepa_berry.gbapal.lz" + + .align 2 +gFile_graphics_items_icons_tamato_berry_sheet:: @ 8E8CA08 + .incbin "graphics/items/icons/tamato_berry.4bpp.lz" + + .align 2 +gFile_graphics_items_icon_palettes_tamato_berry_palette:: @ 8E8CAE4 + .incbin "graphics/items/icon_palettes/tamato_berry.gbapal.lz" + + .align 2 +gFile_graphics_items_icons_cornn_berry_sheet:: @ 8E8CB08 + .incbin "graphics/items/icons/cornn_berry.4bpp.lz" + + .align 2 +gFile_graphics_items_icon_palettes_cornn_berry_palette:: @ 8E8CBF4 + .incbin "graphics/items/icon_palettes/cornn_berry.gbapal.lz" + + .align 2 +gFile_graphics_items_icons_magost_berry_sheet:: @ 8E8CC1C + .incbin "graphics/items/icons/magost_berry.4bpp.lz" + + .align 2 +gFile_graphics_items_icon_palettes_magost_berry_palette:: @ 8E8CCC4 + .incbin "graphics/items/icon_palettes/magost_berry.gbapal.lz" + + .align 2 +gFile_graphics_items_icons_rabuta_berry_sheet:: @ 8E8CCE8 + .incbin "graphics/items/icons/rabuta_berry.4bpp.lz" + + .align 2 +gFile_graphics_items_icon_palettes_rabuta_berry_palette:: @ 8E8CDE4 + .incbin "graphics/items/icon_palettes/rabuta_berry.gbapal.lz" + + .align 2 +gFile_graphics_items_icons_nomel_berry_sheet:: @ 8E8CE08 + .incbin "graphics/items/icons/nomel_berry.4bpp.lz" + + .align 2 +gFile_graphics_items_icon_palettes_nomel_berry_palette:: @ 8E8CEAC + .incbin "graphics/items/icon_palettes/nomel_berry.gbapal.lz" + + .align 2 +gFile_graphics_items_icons_spelon_berry_sheet:: @ 8E8CEC8 + .incbin "graphics/items/icons/spelon_berry.4bpp.lz" + + .align 2 +gFile_graphics_items_icon_palettes_spelon_berry_palette:: @ 8E8CF8C + .incbin "graphics/items/icon_palettes/spelon_berry.gbapal.lz" + + .align 2 +gFile_graphics_items_icons_pamtre_berry_sheet:: @ 8E8CFAC + .incbin "graphics/items/icons/pamtre_berry.4bpp.lz" + + .align 2 +gFile_graphics_items_icon_palettes_pamtre_berry_palette:: @ 8E8D08C + .incbin "graphics/items/icon_palettes/pamtre_berry.gbapal.lz" + + .align 2 +gFile_graphics_items_icons_watmel_berry_sheet:: @ 8E8D0B4 + .incbin "graphics/items/icons/watmel_berry.4bpp.lz" + + .align 2 +gFile_graphics_items_icon_palettes_watmel_berry_palette:: @ 8E8D1C4 + .incbin "graphics/items/icon_palettes/watmel_berry.gbapal.lz" + + .align 2 +gFile_graphics_items_icons_durin_berry_sheet:: @ 8E8D1E8 + .incbin "graphics/items/icons/durin_berry.4bpp.lz" + + .align 2 +gFile_graphics_items_icon_palettes_durin_berry_palette:: @ 8E8D2EC + .incbin "graphics/items/icon_palettes/durin_berry.gbapal.lz" + + .align 2 +gFile_graphics_items_icons_belue_berry_sheet:: @ 8E8D310 + .incbin "graphics/items/icons/belue_berry.4bpp.lz" + + .align 2 +gFile_graphics_items_icon_palettes_belue_berry_palette:: @ 8E8D3F4 + .incbin "graphics/items/icon_palettes/belue_berry.gbapal.lz" + + .align 2 +gFile_graphics_items_icons_liechi_berry_sheet:: @ 8E8D418 + .incbin "graphics/items/icons/liechi_berry.4bpp.lz" + + .align 2 +gFile_graphics_items_icon_palettes_liechi_berry_palette:: @ 8E8D4F8 + .incbin "graphics/items/icon_palettes/liechi_berry.gbapal.lz" + + .align 2 +gFile_graphics_items_icons_ganlon_berry_sheet:: @ 8E8D518 + .incbin "graphics/items/icons/ganlon_berry.4bpp.lz" + + .align 2 +gFile_graphics_items_icon_palettes_ganlon_berry_palette:: @ 8E8D5F8 + .incbin "graphics/items/icon_palettes/ganlon_berry.gbapal.lz" + + .align 2 +gFile_graphics_items_icons_salac_berry_sheet:: @ 8E8D618 + .incbin "graphics/items/icons/salac_berry.4bpp.lz" + + .align 2 +gFile_graphics_items_icon_palettes_salac_berry_palette:: @ 8E8D700 + .incbin "graphics/items/icon_palettes/salac_berry.gbapal.lz" + + .align 2 +gFile_graphics_items_icons_petaya_berry_sheet:: @ 8E8D720 + .incbin "graphics/items/icons/petaya_berry.4bpp.lz" + + .align 2 +gFile_graphics_items_icon_palettes_petaya_berry_palette:: @ 8E8D818 + .incbin "graphics/items/icon_palettes/petaya_berry.gbapal.lz" + + .align 2 +gFile_graphics_items_icons_apicot_berry_sheet:: @ 8E8D83C + .incbin "graphics/items/icons/apicot_berry.4bpp.lz" + + .align 2 +gFile_graphics_items_icon_palettes_apicot_berry_palette:: @ 8E8D8F4 + .incbin "graphics/items/icon_palettes/apicot_berry.gbapal.lz" + + .align 2 +gFile_graphics_items_icons_lansat_berry_sheet:: @ 8E8D91C + .incbin "graphics/items/icons/lansat_berry.4bpp.lz" + + .align 2 +gFile_graphics_items_icon_palettes_lansat_berry_palette:: @ 8E8D9FC + .incbin "graphics/items/icon_palettes/lansat_berry.gbapal.lz" + + .align 2 +gFile_graphics_items_icons_starf_berry_sheet:: @ 8E8DA20 + .incbin "graphics/items/icons/starf_berry.4bpp.lz" + + .align 2 +gFile_graphics_items_icon_palettes_starf_berry_palette:: @ 8E8DAF0 + .incbin "graphics/items/icon_palettes/starf_berry.gbapal.lz" + + .align 2 +gFile_graphics_items_icons_enigma_berry_sheet:: @ 8E8DB14 + .incbin "graphics/items/icons/enigma_berry.4bpp.lz" + + .align 2 +gFile_graphics_items_icon_palettes_enigma_berry_palette:: @ 8E8DBE0 + .incbin "graphics/items/icon_palettes/enigma_berry.gbapal.lz" + + .align 2 +gFile_graphics_items_icons_bright_powder_sheet:: @ 8E8DC00 + .incbin "graphics/items/icons/bright_powder.4bpp.lz" + + .align 2 +gFile_graphics_items_icon_palettes_bright_powder_palette:: @ 8E8DCBC + .incbin "graphics/items/icon_palettes/bright_powder.gbapal.lz" + + .align 2 +gFile_graphics_items_icons_in_battle_herb_sheet:: @ 8E8DCDC + .incbin "graphics/items/icons/in_battle_herb.4bpp.lz" + + .align 2 +gFile_graphics_items_icon_palettes_white_herb_palette:: @ 8E8DD88 + .incbin "graphics/items/icon_palettes/white_herb.gbapal.lz" + + .align 2 +gFile_graphics_items_icons_macho_brace_sheet:: @ 8E8DDA8 + .incbin "graphics/items/icons/macho_brace.4bpp.lz" + + .align 2 +gFile_graphics_items_icon_palettes_macho_brace_palette:: @ 8E8DE94 + .incbin "graphics/items/icon_palettes/macho_brace.gbapal.lz" + + .align 2 +gFile_graphics_items_icons_exp_share_sheet:: @ 8E8DEBC + .incbin "graphics/items/icons/exp_share.4bpp.lz" + + .align 2 +gFile_graphics_items_icon_palettes_exp_share_palette:: @ 8E8DFA8 + .incbin "graphics/items/icon_palettes/exp_share.gbapal.lz" + + .align 2 +gFile_graphics_items_icons_quick_claw_sheet:: @ 8E8DFD0 + .incbin "graphics/items/icons/quick_claw.4bpp.lz" + + .align 2 +gFile_graphics_items_icon_palettes_quick_claw_palette:: @ 8E8E068 + .incbin "graphics/items/icon_palettes/quick_claw.gbapal.lz" + + .align 2 +gFile_graphics_items_icons_soothe_bell_sheet:: @ 8E8E088 + .incbin "graphics/items/icons/soothe_bell.4bpp.lz" + + .align 2 +gFile_graphics_items_icon_palettes_soothe_bell_palette:: @ 8E8E14C + .incbin "graphics/items/icon_palettes/soothe_bell.gbapal.lz" + + .align 2 +gFile_graphics_items_icon_palettes_mental_herb_palette:: @ 8E8E170 + .incbin "graphics/items/icon_palettes/mental_herb.gbapal.lz" + + .align 2 +gFile_graphics_items_icons_choice_band_sheet:: @ 8E8E190 + .incbin "graphics/items/icons/choice_band.4bpp.lz" + + .align 2 +gFile_graphics_items_icon_palettes_choice_band_palette:: @ 8E8E27C + .incbin "graphics/items/icon_palettes/choice_band.gbapal.lz" + + .align 2 +gFile_graphics_items_icons_kings_rock_sheet:: @ 8E8E2A4 + .incbin "graphics/items/icons/kings_rock.4bpp.lz" + + .align 2 +gFile_graphics_items_icon_palettes_kings_rock_palette:: @ 8E8E394 + .incbin "graphics/items/icon_palettes/kings_rock.gbapal.lz" + + .align 2 +gFile_graphics_items_icons_silver_powder_sheet:: @ 8E8E3B0 + .incbin "graphics/items/icons/silver_powder.4bpp.lz" + + .align 2 +gFile_graphics_items_icon_palettes_silver_powder_palette:: @ 8E8E43C + .incbin "graphics/items/icon_palettes/silver_powder.gbapal.lz" + + .align 2 +gFile_graphics_items_icons_amulet_coin_sheet:: @ 8E8E460 + .incbin "graphics/items/icons/amulet_coin.4bpp.lz" + + .align 2 +gFile_graphics_items_icon_palettes_amulet_coin_palette:: @ 8E8E4F8 + .incbin "graphics/items/icon_palettes/amulet_coin.gbapal.lz" + + .align 2 +gFile_graphics_items_icons_cleanse_tag_sheet:: @ 8E8E51C + .incbin "graphics/items/icons/cleanse_tag.4bpp.lz" + + .align 2 +gFile_graphics_items_icon_palettes_cleanse_tag_palette:: @ 8E8E5C0 + .incbin "graphics/items/icon_palettes/cleanse_tag.gbapal.lz" + + .align 2 +gFile_graphics_items_icons_soul_dew_sheet:: @ 8E8E5E0 + .incbin "graphics/items/icons/soul_dew.4bpp.lz" + + .align 2 +gFile_graphics_items_icon_palettes_soul_dew_palette:: @ 8E8E674 + .incbin "graphics/items/icon_palettes/soul_dew.gbapal.lz" + + .align 2 +gFile_graphics_items_icons_deep_sea_tooth_sheet:: @ 8E8E694 + .incbin "graphics/items/icons/deep_sea_tooth.4bpp.lz" + + .align 2 +gFile_graphics_items_icon_palettes_deep_sea_tooth_palette:: @ 8E8E748 + .incbin "graphics/items/icon_palettes/deep_sea_tooth.gbapal.lz" + + .align 2 +gFile_graphics_items_icons_deep_sea_scale_sheet:: @ 8E8E76C + .incbin "graphics/items/icons/deep_sea_scale.4bpp.lz" + + .align 2 +gFile_graphics_items_icon_palettes_deep_sea_scale_palette:: @ 8E8E814 + .incbin "graphics/items/icon_palettes/deep_sea_scale.gbapal.lz" + + .align 2 +gFile_graphics_items_icons_smoke_ball_sheet:: @ 8E8E834 + .incbin "graphics/items/icons/smoke_ball.4bpp.lz" + + .align 2 +gFile_graphics_items_icon_palettes_smoke_ball_palette:: @ 8E8E8EC + .incbin "graphics/items/icon_palettes/smoke_ball.gbapal.lz" + + .align 2 +gFile_graphics_items_icons_everstone_sheet:: @ 8E8E910 + .incbin "graphics/items/icons/everstone.4bpp.lz" + + .align 2 +gFile_graphics_items_icon_palettes_everstone_palette:: @ 8E8E9C4 + .incbin "graphics/items/icon_palettes/everstone.gbapal.lz" + + .align 2 +gFile_graphics_items_icons_focus_band_sheet:: @ 8E8E9E0 + .incbin "graphics/items/icons/focus_band.4bpp.lz" + + .align 2 +gFile_graphics_items_icon_palettes_focus_band_palette:: @ 8E8EAD0 + .incbin "graphics/items/icon_palettes/focus_band.gbapal.lz" + + .align 2 +gFile_graphics_items_icons_lucky_egg_sheet:: @ 8E8EAF8 + .incbin "graphics/items/icons/lucky_egg.4bpp.lz" + + .align 2 +gFile_graphics_items_icon_palettes_lucky_egg_palette:: @ 8E8EB80 + .incbin "graphics/items/icon_palettes/lucky_egg.gbapal.lz" + + .align 2 +gFile_graphics_items_icons_scope_lens_sheet:: @ 8E8EB98 + .incbin "graphics/items/icons/scope_lens.4bpp.lz" + + .align 2 +gFile_graphics_items_icon_palettes_scope_lens_palette:: @ 8E8EC98 + .incbin "graphics/items/icon_palettes/scope_lens.gbapal.lz" + + .align 2 +gFile_graphics_items_icons_metal_coat_sheet:: @ 8E8ECC0 + .incbin "graphics/items/icons/metal_coat.4bpp.lz" + + .align 2 +gFile_graphics_items_icon_palettes_metal_coat_palette:: @ 8E8ED7C + .incbin "graphics/items/icon_palettes/metal_coat.gbapal.lz" + + .align 2 +gFile_graphics_items_icons_leftovers_sheet:: @ 8E8ED9C + .incbin "graphics/items/icons/leftovers.4bpp.lz" + + .align 2 +gFile_graphics_items_icon_palettes_leftovers_palette:: @ 8E8EE40 + .incbin "graphics/items/icon_palettes/leftovers.gbapal.lz" + + .align 2 +gFile_graphics_items_icons_dragon_scale_sheet:: @ 8E8EE64 + .incbin "graphics/items/icons/dragon_scale.4bpp.lz" + + .align 2 +gFile_graphics_items_icon_palettes_dragon_scale_palette:: @ 8E8EF18 + .incbin "graphics/items/icon_palettes/dragon_scale.gbapal.lz" + + .align 2 +gFile_graphics_items_icons_light_ball_sheet:: @ 8E8EF38 + .incbin "graphics/items/icons/light_ball.4bpp.lz" + + .align 2 +gFile_graphics_items_icon_palettes_light_ball_palette:: @ 8E8EFCC + .incbin "graphics/items/icon_palettes/light_ball.gbapal.lz" + + .align 2 +gFile_graphics_items_icons_soft_sand_sheet:: @ 8E8EFF0 + .incbin "graphics/items/icons/soft_sand.4bpp.lz" + + .align 2 +gFile_graphics_items_icon_palettes_soft_sand_palette:: @ 8E8F0AC + .incbin "graphics/items/icon_palettes/soft_sand.gbapal.lz" + + .align 2 +gFile_graphics_items_icons_hard_stone_sheet:: @ 8E8F0CC + .incbin "graphics/items/icons/hard_stone.4bpp.lz" + + .align 2 +gFile_graphics_items_icon_palettes_hard_stone_palette:: @ 8E8F180 + .incbin "graphics/items/icon_palettes/hard_stone.gbapal.lz" + + .align 2 +gFile_graphics_items_icons_miracle_seed_sheet:: @ 8E8F1A4 + .incbin "graphics/items/icons/miracle_seed.4bpp.lz" + + .align 2 +gFile_graphics_items_icon_palettes_miracle_seed_palette:: @ 8E8F254 + .incbin "graphics/items/icon_palettes/miracle_seed.gbapal.lz" + + .align 2 +gFile_graphics_items_icons_black_glasses_sheet:: @ 8E8F270 + .incbin "graphics/items/icons/black_glasses.4bpp.lz" + + .align 2 +gFile_graphics_items_icon_palettes_black_type_enhancing_item_palette:: @ 8E8F2F8 + .incbin "graphics/items/icon_palettes/black_type_enhancing_item.gbapal.lz" + + .align 2 +gFile_graphics_items_icons_black_belt_sheet:: @ 8E8F310 + .incbin "graphics/items/icons/black_belt.4bpp.lz" + + .align 2 +gFile_graphics_items_icons_magnet_sheet:: @ 8E8F3D8 + .incbin "graphics/items/icons/magnet.4bpp.lz" + + .align 2 +gFile_graphics_items_icon_palettes_magnet_palette:: @ 8E8F488 + .incbin "graphics/items/icon_palettes/magnet.gbapal.lz" + + .align 2 +gFile_graphics_items_icons_mystic_water_sheet:: @ 8E8F4B0 + .incbin "graphics/items/icons/mystic_water.4bpp.lz" + + .align 2 +gFile_graphics_items_icon_palettes_mystic_water_palette:: @ 8E8F548 + .incbin "graphics/items/icon_palettes/mystic_water.gbapal.lz" + + .align 2 +gFile_graphics_items_icons_sharp_beak_sheet:: @ 8E8F568 + .incbin "graphics/items/icons/sharp_beak.4bpp.lz" + + .align 2 +gFile_graphics_items_icon_palettes_sharp_beak_palette:: @ 8E8F624 + .incbin "graphics/items/icon_palettes/sharp_beak.gbapal.lz" + + .align 2 +gFile_graphics_items_icons_poison_barb_sheet:: @ 8E8F644 + .incbin "graphics/items/icons/poison_barb.4bpp.lz" + + .align 2 +gFile_graphics_items_icon_palettes_poison_barb_palette:: @ 8E8F6CC + .incbin "graphics/items/icon_palettes/poison_barb.gbapal.lz" + + .align 2 +gFile_graphics_items_icons_never_melt_ice_sheet:: @ 8E8F6EC + .incbin "graphics/items/icons/never_melt_ice.4bpp.lz" + + .align 2 +gFile_graphics_items_icon_palettes_never_melt_ice_palette:: @ 8E8F7B8 + .incbin "graphics/items/icon_palettes/never_melt_ice.gbapal.lz" + + .align 2 +gFile_graphics_items_icons_spell_tag_sheet:: @ 8E8F7D4 + .incbin "graphics/items/icons/spell_tag.4bpp.lz" + + .align 2 +gFile_graphics_items_icon_palettes_spell_tag_palette:: @ 8E8F874 + .incbin "graphics/items/icon_palettes/spell_tag.gbapal.lz" + + .align 2 +gFile_graphics_items_icons_twisted_spoon_sheet:: @ 8E8F894 + .incbin "graphics/items/icons/twisted_spoon.4bpp.lz" + + .align 2 +gFile_graphics_items_icon_palettes_twisted_spoon_palette:: @ 8E8F934 + .incbin "graphics/items/icon_palettes/twisted_spoon.gbapal.lz" + + .align 2 +gFile_graphics_items_icons_charcoal_sheet:: @ 8E8F94C + .incbin "graphics/items/icons/charcoal.4bpp.lz" + + .align 2 +gFile_graphics_items_icon_palettes_charcoal_palette:: @ 8E8FA1C + .incbin "graphics/items/icon_palettes/charcoal.gbapal.lz" + + .align 2 +gFile_graphics_items_icons_dragon_fang_sheet:: @ 8E8FA38 + .incbin "graphics/items/icons/dragon_fang.4bpp.lz" + + .align 2 +gFile_graphics_items_icon_palettes_dragon_fang_palette:: @ 8E8FAEC + .incbin "graphics/items/icon_palettes/dragon_fang.gbapal.lz" + + .align 2 +gFile_graphics_items_icons_silk_scarf_sheet:: @ 8E8FB0C + .incbin "graphics/items/icons/silk_scarf.4bpp.lz" + + .align 2 +gFile_graphics_items_icon_palettes_silk_scarf_palette:: @ 8E8FC14 + .incbin "graphics/items/icon_palettes/silk_scarf.gbapal.lz" + + .align 2 +gFile_graphics_items_icons_up_grade_sheet:: @ 8E8FC34 + .incbin "graphics/items/icons/up_grade.4bpp.lz" + + .align 2 +gFile_graphics_items_icon_palettes_up_grade_palette:: @ 8E8FCF0 + .incbin "graphics/items/icon_palettes/up_grade.gbapal.lz" + + .align 2 +gFile_graphics_items_icons_shell_bell_sheet:: @ 8E8FD18 + .incbin "graphics/items/icons/shell_bell.4bpp.lz" + + .align 2 +gFile_graphics_items_icons_sea_incense_sheet:: @ 8E8FDF8 + .incbin "graphics/items/icons/sea_incense.4bpp.lz" + + .align 2 +gFile_graphics_items_icon_palettes_sea_incense_palette:: @ 8E8FEE0 + .incbin "graphics/items/icon_palettes/sea_incense.gbapal.lz" + + .align 2 +gFile_graphics_items_icons_lax_incense_sheet:: @ 8E8FF08 + .incbin "graphics/items/icons/lax_incense.4bpp.lz" + + .align 2 +gFile_graphics_items_icon_palettes_lax_incense_palette:: @ 8E8FFF0 + .incbin "graphics/items/icon_palettes/lax_incense.gbapal.lz" + + .align 2 +gFile_graphics_items_icons_lucky_punch_sheet:: @ 8E90018 + .incbin "graphics/items/icons/lucky_punch.4bpp.lz" + + .align 2 +gFile_graphics_items_icon_palettes_lucky_punch_palette:: @ 8E900DC + .incbin "graphics/items/icon_palettes/lucky_punch.gbapal.lz" + + .align 2 +gFile_graphics_items_icons_metal_powder_sheet:: @ 8E900FC + .incbin "graphics/items/icons/metal_powder.4bpp.lz" + + .align 2 +gFile_graphics_items_icon_palettes_metal_powder_palette:: @ 8E901BC + .incbin "graphics/items/icon_palettes/metal_powder.gbapal.lz" + + .align 2 +gFile_graphics_items_icons_thick_club_sheet:: @ 8E901E0 + .incbin "graphics/items/icons/thick_club.4bpp.lz" + + .align 2 +gFile_graphics_items_icon_palettes_thick_club_palette:: @ 8E90274 + .incbin "graphics/items/icon_palettes/thick_club.gbapal.lz" + + .align 2 +gFile_graphics_items_icons_stick_sheet:: @ 8E90290 + .incbin "graphics/items/icons/stick.4bpp.lz" + + .align 2 +gFile_graphics_items_icon_palettes_stick_palette:: @ 8E90330 + .incbin "graphics/items/icon_palettes/stick.gbapal.lz" + + .align 2 +gFile_graphics_items_icons_scarf_sheet:: @ 8E90354 + .incbin "graphics/items/icons/scarf.4bpp.lz" + + .align 2 +gFile_graphics_items_icon_palettes_red_scarf_palette:: @ 8E90420 + .incbin "graphics/items/icon_palettes/red_scarf.gbapal.lz" + + .align 2 +gFile_graphics_items_icon_palettes_blue_scarf_palette:: @ 8E9043C + .incbin "graphics/items/icon_palettes/blue_scarf.gbapal.lz" + + .align 2 +gFile_graphics_items_icon_palettes_pink_scarf_palette:: @ 8E90458 + .incbin "graphics/items/icon_palettes/pink_scarf.gbapal.lz" + + .align 2 +gFile_graphics_items_icon_palettes_green_scarf_palette:: @ 8E90474 + .incbin "graphics/items/icon_palettes/green_scarf.gbapal.lz" + + .align 2 +gFile_graphics_items_icon_palettes_yellow_scarf_palette:: @ 8E90490 + .incbin "graphics/items/icon_palettes/yellow_scarf.gbapal.lz" + + .align 2 +gFile_graphics_items_icons_mach_bike_sheet:: @ 8E904AC + .incbin "graphics/items/icons/mach_bike.4bpp.lz" + + .align 2 +gFile_graphics_items_icon_palettes_mach_bike_palette:: @ 8E905B4 + .incbin "graphics/items/icon_palettes/mach_bike.gbapal.lz" + + .align 2 +gFile_graphics_items_icons_coin_case_sheet:: @ 8E905D8 + .incbin "graphics/items/icons/coin_case.4bpp.lz" + + .align 2 +gFile_graphics_items_icon_palettes_coin_case_palette:: @ 8E90698 + .incbin "graphics/items/icon_palettes/coin_case.gbapal.lz" + + .align 2 +gFile_graphics_items_icons_itemfinder_sheet:: @ 8E906B8 + .incbin "graphics/items/icons/itemfinder.4bpp.lz" + + .align 2 +gFile_graphics_items_icon_palettes_itemfinder_palette:: @ 8E90774 + .incbin "graphics/items/icon_palettes/itemfinder.gbapal.lz" + + .align 2 +gFile_graphics_items_icons_old_rod_sheet:: @ 8E9079C + .incbin "graphics/items/icons/old_rod.4bpp.lz" + + .align 2 +gFile_graphics_items_icon_palettes_old_rod_palette:: @ 8E90848 + .incbin "graphics/items/icon_palettes/old_rod.gbapal.lz" + + .align 2 +gFile_graphics_items_icons_good_rod_sheet:: @ 8E9086C + .incbin "graphics/items/icons/good_rod.4bpp.lz" + + .align 2 +gFile_graphics_items_icon_palettes_good_rod_palette:: @ 8E90908 + .incbin "graphics/items/icon_palettes/good_rod.gbapal.lz" + + .align 2 +gFile_graphics_items_icons_super_rod_sheet:: @ 8E90930 + .incbin "graphics/items/icons/super_rod.4bpp.lz" + + .align 2 +gFile_graphics_items_icon_palettes_super_rod_palette:: @ 8E909E0 + .incbin "graphics/items/icon_palettes/super_rod.gbapal.lz" + + .align 2 +gFile_graphics_items_icons_ss_ticket_sheet:: @ 8E90A08 + .incbin "graphics/items/icons/ss_ticket.4bpp.lz" + + .align 2 +gFile_graphics_items_icon_palettes_ss_ticket_palette:: @ 8E90A9C + .incbin "graphics/items/icon_palettes/ss_ticket.gbapal.lz" + + .align 2 +gFile_graphics_items_icons_contest_pass_sheet:: @ 8E90AB4 + .incbin "graphics/items/icons/contest_pass.4bpp.lz" + + .align 2 +gFile_graphics_items_icon_palettes_contest_pass_palette:: @ 8E90B60 + .incbin "graphics/items/icon_palettes/contest_pass.gbapal.lz" + + .align 2 +gFile_graphics_items_icons_wailmer_pail_sheet:: @ 8E90B88 + .incbin "graphics/items/icons/wailmer_pail.4bpp.lz" + + .align 2 +gFile_graphics_items_icon_palettes_wailmer_pail_palette:: @ 8E90C54 + .incbin "graphics/items/icon_palettes/wailmer_pail.gbapal.lz" + + .align 2 +gFile_graphics_items_icons_devon_goods_sheet:: @ 8E90C78 + .incbin "graphics/items/icons/devon_goods.4bpp.lz" + + .align 2 +gFile_graphics_items_icon_palettes_devon_goods_palette:: @ 8E90D20 + .incbin "graphics/items/icon_palettes/devon_goods.gbapal.lz" + + .align 2 +gFile_graphics_items_icons_soot_sack_sheet:: @ 8E90D3C + .incbin "graphics/items/icons/soot_sack.4bpp.lz" + + .align 2 +gFile_graphics_items_icon_palettes_soot_sack_palette:: @ 8E90E14 + .incbin "graphics/items/icon_palettes/soot_sack.gbapal.lz" + + .align 2 +gFile_graphics_items_icons_basement_key_sheet:: @ 8E90E3C + .incbin "graphics/items/icons/basement_key.4bpp.lz" + + .align 2 +gFile_graphics_items_icon_palettes_old_key_palette:: @ 8E90EE4 + .incbin "graphics/items/icon_palettes/old_key.gbapal.lz" + + .align 2 +gFile_graphics_items_icons_acro_bike_sheet:: @ 8E90F0C + .incbin "graphics/items/icons/acro_bike.4bpp.lz" + + .align 2 +gFile_graphics_items_icon_palettes_acro_bike_palette:: @ 8E91008 + .incbin "graphics/items/icon_palettes/acro_bike.gbapal.lz" + + .align 2 +gFile_graphics_items_icons_pokeblock_case_sheet:: @ 8E91028 + .incbin "graphics/items/icons/pokeblock_case.4bpp.lz" + + .align 2 +gFile_graphics_items_icon_palettes_pokeblock_case_palette:: @ 8E91110 + .incbin "graphics/items/icon_palettes/pokeblock_case.gbapal.lz" + + .align 2 +gFile_graphics_items_icons_letter_sheet:: @ 8E91138 + .incbin "graphics/items/icons/letter.4bpp.lz" + + .align 2 +gFile_graphics_items_icons_eon_ticket_sheet:: @ 8E911B8 + .incbin "graphics/items/icons/eon_ticket.4bpp.lz" + + .align 2 +gFile_graphics_items_icon_palettes_eon_ticket_palette:: @ 8E91254 + .incbin "graphics/items/icon_palettes/eon_ticket.gbapal.lz" + + .align 2 +gFile_graphics_items_icons_orb_sheet:: @ 8E91278 + .incbin "graphics/items/icons/orb.4bpp.lz" + + .align 2 +gFile_graphics_items_icon_palettes_red_orb_palette:: @ 8E91330 + .incbin "graphics/items/icon_palettes/red_orb.gbapal.lz" + + .align 2 +gFile_graphics_items_icon_palettes_blue_orb_palette:: @ 8E9134C + .incbin "graphics/items/icon_palettes/blue_orb.gbapal.lz" + + .align 2 +gFile_graphics_items_icons_scanner_sheet:: @ 8E91368 + .incbin "graphics/items/icons/scanner.4bpp.lz" + + .align 2 +gFile_graphics_items_icon_palettes_scanner_palette:: @ 8E91430 + .incbin "graphics/items/icon_palettes/scanner.gbapal.lz" + + .align 2 +gFile_graphics_items_icons_go_goggles_sheet:: @ 8E91454 + .incbin "graphics/items/icons/go_goggles.4bpp.lz" + + .align 2 +gFile_graphics_items_icon_palettes_go_goggles_palette:: @ 8E91508 + .incbin "graphics/items/icon_palettes/go_goggles.gbapal.lz" + + .align 2 +gFile_graphics_items_icons_meteorite_sheet:: @ 8E91528 + .incbin "graphics/items/icons/meteorite.4bpp.lz" + + .align 2 +gFile_graphics_items_icon_palettes_meteorite_palette:: @ 8E91608 + .incbin "graphics/items/icon_palettes/meteorite.gbapal.lz" + + .align 2 +gFile_graphics_items_icons_room1_key_sheet:: @ 8E91628 + .incbin "graphics/items/icons/room1_key.4bpp.lz" + + .align 2 +gFile_graphics_items_icons_room2_key_sheet:: @ 8E916E0 + .incbin "graphics/items/icons/room2_key.4bpp.lz" + + .align 2 +gFile_graphics_items_icons_room4_key_sheet:: @ 8E9179C + .incbin "graphics/items/icons/room4_key.4bpp.lz" + + .align 2 +gFile_graphics_items_icons_room6_key_sheet:: @ 8E9185C + .incbin "graphics/items/icons/room6_key.4bpp.lz" + + .align 2 +gFile_graphics_items_icons_storage_key_sheet:: @ 8E91918 + .incbin "graphics/items/icons/storage_key.4bpp.lz" + + .align 2 +gFile_graphics_items_icons_root_fossil_sheet:: @ 8E919C0 + .incbin "graphics/items/icons/root_fossil.4bpp.lz" + + .align 2 +gFile_graphics_items_icon_palettes_hoenn_fossil_palette:: @ 8E91ACC + .incbin "graphics/items/icon_palettes/hoenn_fossil.gbapal.lz" + + .align 2 +gFile_graphics_items_icons_claw_fossil_sheet:: @ 8E91AF4 + .incbin "graphics/items/icons/claw_fossil.4bpp.lz" + + .align 2 +gFile_graphics_items_icons_devon_scope_sheet:: @ 8E91BE4 + .incbin "graphics/items/icons/devon_scope.4bpp.lz" + + .align 2 +gFile_graphics_items_icon_palettes_devon_scope_palette:: @ 8E91CA0 + .incbin "graphics/items/icon_palettes/devon_scope.gbapal.lz" + + .align 2 +gFile_graphics_items_icons_tm_sheet:: @ 8E91CC8 + .incbin "graphics/items/icons/tm.4bpp.lz" + + .align 2 +gFile_graphics_items_icon_palettes_fighting_tm_hm_palette:: @ 8E91DC4 + .incbin "graphics/items/icon_palettes/fighting_tm_hm.gbapal.lz" + + .align 2 +gFile_graphics_items_icon_palettes_dragon_tm_hm_palette:: @ 8E91DEC + .incbin "graphics/items/icon_palettes/dragon_tm_hm.gbapal.lz" + + .align 2 +gFile_graphics_items_icon_palettes_water_tm_hm_palette:: @ 8E91E14 + .incbin "graphics/items/icon_palettes/water_tm_hm.gbapal.lz" + + .align 2 +gFile_graphics_items_icon_palettes_psychic_tm_hm_palette:: @ 8E91E3C + .incbin "graphics/items/icon_palettes/psychic_tm_hm.gbapal.lz" + + .align 2 +gFile_graphics_items_icon_palettes_normal_tm_hm_palette:: @ 8E91E64 + .incbin "graphics/items/icon_palettes/normal_tm_hm.gbapal.lz" + + .align 2 +gFile_graphics_items_icon_palettes_poison_tm_hm_palette:: @ 8E91E8C + .incbin "graphics/items/icon_palettes/poison_tm_hm.gbapal.lz" + + .align 2 +gFile_graphics_items_icon_palettes_ice_tm_hm_palette:: @ 8E91EB4 + .incbin "graphics/items/icon_palettes/ice_tm_hm.gbapal.lz" + + .align 2 +gFile_graphics_items_icon_palettes_grass_tm_hm_palette:: @ 8E91EDC + .incbin "graphics/items/icon_palettes/grass_tm_hm.gbapal.lz" + + .align 2 +gFile_graphics_items_icon_palettes_fire_tm_hm_palette:: @ 8E91F04 + .incbin "graphics/items/icon_palettes/fire_tm_hm.gbapal.lz" + + .align 2 +gFile_graphics_items_icon_palettes_dark_tm_hm_palette:: @ 8E91F2C + .incbin "graphics/items/icon_palettes/dark_tm_hm.gbapal.lz" + + .align 2 +gFile_graphics_items_icon_palettes_steel_tm_hm_palette:: @ 8E91F54 + .incbin "graphics/items/icon_palettes/steel_tm_hm.gbapal.lz" + + .align 2 +gFile_graphics_items_icon_palettes_electric_tm_hm_palette:: @ 8E91F7C + .incbin "graphics/items/icon_palettes/electric_tm_hm.gbapal.lz" + + .align 2 +gFile_graphics_items_icon_palettes_ground_tm_hm_palette:: @ 8E91FA4 + .incbin "graphics/items/icon_palettes/ground_tm_hm.gbapal.lz" + + .align 2 +gFile_graphics_items_icon_palettes_ghost_tm_hm_palette:: @ 8E91FCC + .incbin "graphics/items/icon_palettes/ghost_tm_hm.gbapal.lz" + + .align 2 +gFile_graphics_items_icon_palettes_rock_tm_hm_palette:: @ 8E91FF4 + .incbin "graphics/items/icon_palettes/rock_tm_hm.gbapal.lz" + + .align 2 +gFile_graphics_items_icon_palettes_flying_tm_hm_palette:: @ 8E9201C + .incbin "graphics/items/icon_palettes/flying_tm_hm.gbapal.lz" + + .align 2 +gFile_graphics_items_icons_oaks_parcel_sheet:: @ 8E92044 + .incbin "graphics/items/icons/oaks_parcel.4bpp.lz" + + .align 2 +gFile_graphics_items_icon_palettes_oaks_parcel_palette:: @ 8E920FC + .incbin "graphics/items/icon_palettes/oaks_parcel.gbapal.lz" + + .align 2 +gFile_graphics_items_icons_poke_flute_sheet:: @ 8E9211C + .incbin "graphics/items/icons/poke_flute.4bpp.lz" + + .align 2 +gFile_graphics_items_icon_palettes_poke_flute_palette:: @ 8E921E0 + .incbin "graphics/items/icon_palettes/poke_flute.gbapal.lz" + + .align 2 +gFile_graphics_items_icons_secret_key_sheet:: @ 8E92208 + .incbin "graphics/items/icons/secret_key.4bpp.lz" + + .align 2 +gFile_graphics_items_icon_palettes_secret_key_palette:: @ 8E922D4 + .incbin "graphics/items/icon_palettes/secret_key.gbapal.lz" + + .align 2 +gFile_graphics_items_icons_bike_voucher_sheet:: @ 8E922FC + .incbin "graphics/items/icons/bike_voucher.4bpp.lz" + + .align 2 +gFile_graphics_items_icon_palettes_bike_voucher_palette:: @ 8E9239C + .incbin "graphics/items/icon_palettes/bike_voucher.gbapal.lz" + + .align 2 +gFile_graphics_items_icons_gold_teeth_sheet:: @ 8E923BC + .incbin "graphics/items/icons/gold_teeth.4bpp.lz" + + .align 2 +gFile_graphics_items_icon_palettes_gold_teeth_palette:: @ 8E924A8 + .incbin "graphics/items/icon_palettes/gold_teeth.gbapal.lz" + + .align 2 +gFile_graphics_items_icons_old_amber_sheet:: @ 8E924CC + .incbin "graphics/items/icons/old_amber.4bpp.lz" + + .align 2 +gFile_graphics_items_icon_palettes_old_amber_palette:: @ 8E925AC + .incbin "graphics/items/icon_palettes/old_amber.gbapal.lz" + + .align 2 +gFile_graphics_items_icons_card_key_sheet:: @ 8E925D0 + .incbin "graphics/items/icons/card_key.4bpp.lz" + + .align 2 +gFile_graphics_items_icon_palettes_card_key_palette:: @ 8E92678 + .incbin "graphics/items/icon_palettes/card_key.gbapal.lz" + + .align 2 +gFile_graphics_items_icons_lift_key_sheet:: @ 8E92698 + .incbin "graphics/items/icons/lift_key.4bpp.lz" + + .align 2 +gFile_graphics_items_icon_palettes_key_palette:: @ 8E92754 + .incbin "graphics/items/icon_palettes/key.gbapal.lz" + + .align 2 +gFile_graphics_items_icons_helix_fossil_sheet:: @ 8E92774 + .incbin "graphics/items/icons/helix_fossil.4bpp.lz" + + .align 2 +gFile_graphics_items_icon_palettes_kanto_fossil_palette:: @ 8E92868 + .incbin "graphics/items/icon_palettes/kanto_fossil.gbapal.lz" + + .align 2 +gFile_graphics_items_icons_dome_fossil_sheet:: @ 8E92888 + .incbin "graphics/items/icons/dome_fossil.4bpp.lz" + + .align 2 +gFile_graphics_items_icons_silph_scope_sheet:: @ 8E92978 + .incbin "graphics/items/icons/silph_scope.4bpp.lz" + + .align 2 +gFile_graphics_items_icon_palettes_silph_scope_palette:: @ 8E92A4C + .incbin "graphics/items/icon_palettes/silph_scope.gbapal.lz" + + .align 2 +gFile_graphics_items_icons_bicycle_sheet:: @ 8E92A70 + .incbin "graphics/items/icons/bicycle.4bpp.lz" + + .align 2 +gFile_graphics_items_icon_palettes_bicycle_palette:: @ 8E92B74 + .incbin "graphics/items/icon_palettes/bicycle.gbapal.lz" + + .align 2 +gFile_graphics_items_icons_town_map_sheet:: @ 8E92B94 + .incbin "graphics/items/icons/town_map.4bpp.lz" + + .align 2 +gFile_graphics_items_icon_palettes_town_map_palette:: @ 8E92C50 + .incbin "graphics/items/icon_palettes/town_map.gbapal.lz" + + .align 2 +gFile_graphics_items_icons_vs_seeker_sheet:: @ 8E92C78 + .incbin "graphics/items/icons/vs_seeker.4bpp.lz" + + .align 2 +gFile_graphics_items_icon_palettes_vs_seeker_palette:: @ 8E92D40 + .incbin "graphics/items/icon_palettes/vs_seeker.gbapal.lz" + + .align 2 +gFile_graphics_items_icons_fame_checker_sheet:: @ 8E92D60 + .incbin "graphics/items/icons/fame_checker.4bpp.lz" + + .align 2 +gFile_graphics_items_icon_palettes_fame_checker_palette:: @ 8E92E18 + .incbin "graphics/items/icon_palettes/fame_checker.gbapal.lz" + + .align 2 +gFile_graphics_items_icons_tm_case_sheet:: @ 8E92E3C + .incbin "graphics/items/icons/tm_case.4bpp.lz" + + .align 2 +gFile_graphics_items_icon_palettes_tm_case_palette:: @ 8E92F00 + .incbin "graphics/items/icon_palettes/tm_case.gbapal.lz" + + .align 2 +gFile_graphics_items_icons_berry_pouch_sheet:: @ 8E92F28 + .incbin "graphics/items/icons/berry_pouch.4bpp.lz" + + .align 2 +gFile_graphics_items_icon_palettes_berry_pouch_palette:: @ 8E93028 + .incbin "graphics/items/icon_palettes/berry_pouch.gbapal.lz" + + .align 2 +gFile_graphics_items_icons_teachy_tv_sheet:: @ 8E93050 + .incbin "graphics/items/icons/teachy_tv.4bpp.lz" + + .align 2 +gFile_graphics_items_icon_palettes_teachy_tv_palette:: @ 8E93148 + .incbin "graphics/items/icon_palettes/teachy_tv.gbapal.lz" + + .align 2 +gFile_graphics_items_icons_tri_pass_sheet:: @ 8E93170 + .incbin "graphics/items/icons/tri_pass.4bpp.lz" + + .align 2 +gFile_graphics_items_icon_palettes_tri_pass_palette:: @ 8E93214 + .incbin "graphics/items/icon_palettes/tri_pass.gbapal.lz" + + .align 2 +gFile_graphics_items_icons_rainbow_pass_sheet:: @ 8E93234 + .incbin "graphics/items/icons/rainbow_pass.4bpp.lz" + + .align 2 +gFile_graphics_items_icon_palettes_rainbow_pass_palette:: @ 8E932DC + .incbin "graphics/items/icon_palettes/rainbow_pass.gbapal.lz" + + .align 2 +gFile_graphics_items_icons_tea_sheet:: @ 8E93304 + .incbin "graphics/items/icons/tea.4bpp.lz" + + .align 2 +gFile_graphics_items_icon_palettes_tea_palette:: @ 8E933CC + .incbin "graphics/items/icon_palettes/tea.gbapal.lz" + + .align 2 +gFile_graphics_items_icons_mystic_ticket_sheet:: @ 8E933F0 + .incbin "graphics/items/icons/mystic_ticket.4bpp.lz" + + .align 2 +gFile_graphics_items_icon_palettes_mystic_ticket_palette:: @ 8E93488 + .incbin "graphics/items/icon_palettes/mystic_ticket.gbapal.lz" + + .align 2 +gFile_graphics_items_icons_aurora_ticket_sheet:: @ 8E934A8 + .incbin "graphics/items/icons/aurora_ticket.4bpp.lz" + + .align 2 +gFile_graphics_items_icon_palettes_aurora_ticket_palette:: @ 8E93544 + .incbin "graphics/items/icon_palettes/aurora_ticket.gbapal.lz" + + .align 2 +gFile_graphics_items_icons_powder_jar_sheet:: @ 8E93568 + .incbin "graphics/items/icons/powder_jar.4bpp.lz" + + .align 2 +gFile_graphics_items_icon_palettes_powder_jar_palette:: @ 8E93608 + .incbin "graphics/items/icon_palettes/powder_jar.gbapal.lz" + + .align 2 +gFile_graphics_items_icon_palettes_ruby_palette:: @ 8E93630 + .incbin "graphics/items/icon_palettes/ruby.gbapal.lz" + + .align 2 +gFile_graphics_items_icons_gem_sheet:: @ 8E93658 + .incbin "graphics/items/icons/gem.4bpp.lz" + + .align 2 +gFile_graphics_items_icon_palettes_sapphire_palette:: @ 8E93720 + .incbin "graphics/items/icon_palettes/sapphire.gbapal.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_282_palette:: @ 8E93748 + .incbin "graphics/battle_anims/sprites/282.gbapal.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_282_sheet:: @ 8E93770 + .incbin "graphics/battle_anims/sprites/282.4bpp.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_270_palette:: @ 8E93958 + .incbin "graphics/battle_anims/sprites/270.gbapal.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_270_sheet:: @ 8E93974 + .incbin "graphics/battle_anims/sprites/270.4bpp.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_271_palette:: @ 8E93A9C + .incbin "graphics/battle_anims/sprites/271.gbapal.lz" + + .align 2 +gFile_graphics_battle_anims_sprites_271_sheet:: @ 8E93AB4 + .incbin "graphics/battle_anims/sprites/271.4bpp.lz" + .align 2 gUnknown_8E93B14:: @ 8E93B14 .incbin "baserom.gba", 0xE93B14, 0x24 diff --git a/graphics/items/icon_palettes/acro_bike.pal b/graphics/items/icon_palettes/acro_bike.pal new file mode 100644 index 000000000..12a37bf16 --- /dev/null +++ b/graphics/items/icon_palettes/acro_bike.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +180 180 180 +49 49 49 +164 90 57 +246 246 246 +172 189 172 +98 98 98 +197 180 65 +230 164 123 +106 57 32 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/aguav_berry.pal b/graphics/items/icon_palettes/aguav_berry.pal new file mode 100644 index 000000000..101035da3 --- /dev/null +++ b/graphics/items/icon_palettes/aguav_berry.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +180 180 180 +49 49 49 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +115 213 74 +106 189 74 +82 148 65 +74 98 74 +139 238 74 +230 238 106 +189 213 82 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/amulet_coin.pal b/graphics/items/icon_palettes/amulet_coin.pal new file mode 100644 index 000000000..b1d823303 --- /dev/null +++ b/graphics/items/icon_palettes/amulet_coin.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +180 180 180 +49 49 49 +255 255 246 +255 205 32 +180 156 41 +230 180 16 +255 238 65 +205 180 32 +246 246 180 +41 82 41 +115 90 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/antidote.pal b/graphics/items/icon_palettes/antidote.pal new file mode 100644 index 000000000..fc6561702 --- /dev/null +++ b/graphics/items/icon_palettes/antidote.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +180 180 180 +49 49 49 +255 255 255 +205 205 205 +156 156 156 +255 238 98 +255 180 41 +255 213 74 +246 197 57 +255 255 180 +90 90 90 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/apicot_berry.pal b/graphics/items/icon_palettes/apicot_berry.pal new file mode 100644 index 000000000..16ef4ff1a --- /dev/null +++ b/graphics/items/icon_palettes/apicot_berry.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +180 180 180 +49 49 49 +148 172 230 +189 222 106 +238 238 123 +57 74 131 +139 180 74 +106 131 189 +82 106 164 +115 156 49 +197 213 238 +90 131 32 +123 98 24 +205 205 98 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/aspear_berry.pal b/graphics/items/icon_palettes/aspear_berry.pal new file mode 100644 index 000000000..68bd00715 --- /dev/null +++ b/graphics/items/icon_palettes/aspear_berry.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +180 180 180 +49 49 49 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +205 180 74 +246 230 82 +255 255 106 +131 148 131 +172 197 180 +230 213 90 +131 115 65 +180 222 205 +0 0 0 diff --git a/graphics/items/icon_palettes/aurora_ticket.pal b/graphics/items/icon_palettes/aurora_ticket.pal new file mode 100644 index 000000000..ad1274aaf --- /dev/null +++ b/graphics/items/icon_palettes/aurora_ticket.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +164 164 123 +49 49 49 +238 238 123 +65 205 238 +57 156 222 +90 74 164 +57 57 82 +98 238 246 +180 255 255 +57 123 189 +123 148 172 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/awakening.pal b/graphics/items/icon_palettes/awakening.pal new file mode 100644 index 000000000..b2984538c --- /dev/null +++ b/graphics/items/icon_palettes/awakening.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +180 180 180 +49 49 49 +255 255 255 +205 205 205 +156 156 156 +131 238 255 +74 180 197 +106 213 230 +90 197 213 +213 255 255 +90 90 90 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/bead_mail.pal b/graphics/items/icon_palettes/bead_mail.pal new file mode 100644 index 000000000..435dfee87 --- /dev/null +++ b/graphics/items/icon_palettes/bead_mail.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +180 180 180 +49 49 49 +74 106 131 +131 164 189 +238 156 90 +230 98 82 +246 213 123 +172 205 230 +65 98 197 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/belue_berry.pal b/graphics/items/icon_palettes/belue_berry.pal new file mode 100644 index 000000000..8ecbe76e0 --- /dev/null +++ b/graphics/items/icon_palettes/belue_berry.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +180 180 180 +49 49 49 +156 123 230 +123 90 197 +156 222 115 +205 172 255 +238 230 172 +189 180 123 +82 156 49 +49 115 32 +82 57 156 +172 156 106 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/berry_juice.pal b/graphics/items/icon_palettes/berry_juice.pal new file mode 100644 index 000000000..51ec3ce8d --- /dev/null +++ b/graphics/items/icon_palettes/berry_juice.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +180 180 180 +49 49 49 +205 189 131 +205 222 131 +172 189 98 +238 189 115 +164 148 90 +131 148 57 +230 213 156 +98 82 32 +90 106 16 +139 123 65 +205 131 74 +238 255 255 +230 255 213 +180 213 164 diff --git a/graphics/items/icon_palettes/berry_pouch.pal b/graphics/items/icon_palettes/berry_pouch.pal new file mode 100644 index 000000000..bafbbd641 --- /dev/null +++ b/graphics/items/icon_palettes/berry_pouch.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +164 222 106 +49 49 49 +98 106 98 +238 213 82 +222 115 57 +246 246 246 +172 156 65 +255 205 57 +57 98 0 +90 82 57 +139 106 57 +197 172 82 +246 238 139 +230 172 57 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/bicycle.pal b/graphics/items/icon_palettes/bicycle.pal new file mode 100644 index 000000000..9ef361a31 --- /dev/null +++ b/graphics/items/icon_palettes/bicycle.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +180 180 180 +49 49 49 +180 98 98 +246 246 246 +172 189 172 +98 98 98 +197 180 65 +246 172 172 +115 65 65 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/bike_voucher.pal b/graphics/items/icon_palettes/bike_voucher.pal new file mode 100644 index 000000000..165af0357 --- /dev/null +++ b/graphics/items/icon_palettes/bike_voucher.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +180 180 180 +49 49 49 +205 205 49 +230 238 238 +238 156 156 +238 238 82 +156 164 164 +172 156 156 +82 90 90 +180 189 189 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/black_flute.pal b/graphics/items/icon_palettes/black_flute.pal new file mode 100644 index 000000000..93bdbd6e6 --- /dev/null +++ b/graphics/items/icon_palettes/black_flute.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +180 180 180 +49 49 49 +255 255 255 +115 115 115 +49 49 49 +148 148 148 +82 82 82 +222 222 98 +222 222 139 +238 238 189 +180 180 98 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/black_type_enhancing_item.pal b/graphics/items/icon_palettes/black_type_enhancing_item.pal new file mode 100644 index 000000000..db9a737aa --- /dev/null +++ b/graphics/items/icon_palettes/black_type_enhancing_item.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +180 180 180 +49 49 49 +205 205 205 +74 65 74 +98 90 98 +131 123 131 +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 diff --git a/graphics/items/icon_palettes/blue_flute.pal b/graphics/items/icon_palettes/blue_flute.pal new file mode 100644 index 000000000..2aa1aa0c7 --- /dev/null +++ b/graphics/items/icon_palettes/blue_flute.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +180 180 180 +49 49 49 +255 255 255 +139 172 246 +74 106 172 +172 205 255 +106 139 222 +205 74 65 +205 115 106 +222 164 148 +164 74 65 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/blue_orb.pal b/graphics/items/icon_palettes/blue_orb.pal new file mode 100644 index 000000000..9f061a800 --- /dev/null +++ b/graphics/items/icon_palettes/blue_orb.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +180 180 180 +49 49 49 +106 115 230 +156 156 222 +74 82 197 +57 65 148 +205 205 255 +255 255 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/blue_scarf.pal b/graphics/items/icon_palettes/blue_scarf.pal new file mode 100644 index 000000000..c14baa837 --- /dev/null +++ b/graphics/items/icon_palettes/blue_scarf.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +180 180 180 +49 49 49 +90 90 197 +131 131 246 +82 82 148 +106 106 213 +180 172 255 +123 123 230 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/blue_shard.pal b/graphics/items/icon_palettes/blue_shard.pal new file mode 100644 index 000000000..acaf36f90 --- /dev/null +++ b/graphics/items/icon_palettes/blue_shard.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +180 180 180 +49 49 49 +172 180 255 +115 90 197 +32 8 90 +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 diff --git a/graphics/items/icon_palettes/bluk_berry.pal b/graphics/items/icon_palettes/bluk_berry.pal new file mode 100644 index 000000000..9ddacb585 --- /dev/null +++ b/graphics/items/icon_palettes/bluk_berry.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +180 180 180 +49 49 49 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +57 65 98 +180 115 238 +115 82 189 +230 148 255 +57 65 123 +131 90 205 +123 205 65 +65 156 65 +65 115 65 +0 0 0 diff --git a/graphics/items/icon_palettes/bright_powder.pal b/graphics/items/icon_palettes/bright_powder.pal new file mode 100644 index 000000000..9d09f75fa --- /dev/null +++ b/graphics/items/icon_palettes/bright_powder.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +180 180 180 +49 49 49 +131 172 131 +74 115 74 +57 98 57 +156 213 156 +213 255 213 +172 230 172 +246 255 246 +131 189 131 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/burn_heal.pal b/graphics/items/icon_palettes/burn_heal.pal new file mode 100644 index 000000000..9ca167384 --- /dev/null +++ b/graphics/items/icon_palettes/burn_heal.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +180 180 180 +49 49 49 +255 255 255 +205 205 205 +156 156 156 +139 246 139 +82 189 82 +115 222 115 +106 213 106 +222 255 222 +90 90 90 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/calcium.pal b/graphics/items/icon_palettes/calcium.pal new file mode 100644 index 000000000..0a0100e2d --- /dev/null +++ b/graphics/items/icon_palettes/calcium.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +180 180 180 +49 49 49 +246 255 246 +148 90 57 +213 131 74 +255 205 164 +180 106 49 +189 148 41 +255 197 115 +197 222 197 +230 246 230 +172 197 172 +246 65 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/carbos.pal b/graphics/items/icon_palettes/carbos.pal new file mode 100644 index 000000000..75ea0b5e8 --- /dev/null +++ b/graphics/items/icon_palettes/carbos.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +180 180 180 +49 49 49 +246 255 246 +148 90 57 +90 189 189 +164 246 246 +65 139 139 +189 148 41 +255 197 115 +197 222 197 +230 246 230 +172 197 172 +41 164 246 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/card_key.pal b/graphics/items/icon_palettes/card_key.pal new file mode 100644 index 000000000..ab8db329c --- /dev/null +++ b/graphics/items/icon_palettes/card_key.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +180 180 180 +49 49 49 +90 74 74 +222 230 230 +230 106 106 +189 197 197 +156 164 164 +139 123 90 +230 246 246 +246 156 156 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/charcoal.pal b/graphics/items/icon_palettes/charcoal.pal new file mode 100644 index 000000000..af5f51e00 --- /dev/null +++ b/graphics/items/icon_palettes/charcoal.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +180 180 180 +49 49 49 +98 98 98 +139 139 139 +189 189 189 +230 230 230 +255 255 255 +65 65 65 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/cheri_berry.pal b/graphics/items/icon_palettes/cheri_berry.pal new file mode 100644 index 000000000..6d5eb6121 --- /dev/null +++ b/graphics/items/icon_palettes/cheri_berry.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +180 180 180 +49 49 49 +164 230 115 +238 98 82 +205 90 65 +255 222 189 +123 189 74 +213 246 123 +41 106 8 +131 65 49 +255 156 139 +222 106 82 +189 74 49 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/chesto_berry.pal b/graphics/items/icon_palettes/chesto_berry.pal new file mode 100644 index 000000000..738b10391 --- /dev/null +++ b/graphics/items/icon_palettes/chesto_berry.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +180 180 180 +49 49 49 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +148 115 230 +98 90 172 +205 148 255 +57 65 123 +238 213 106 +172 172 106 +123 90 74 +131 90 205 +197 180 106 diff --git a/graphics/items/icon_palettes/choice_band.pal b/graphics/items/icon_palettes/choice_band.pal new file mode 100644 index 000000000..65820988d --- /dev/null +++ b/graphics/items/icon_palettes/choice_band.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +180 180 180 +49 49 49 +180 180 197 +238 238 255 +98 98 106 +213 213 238 +222 222 238 +115 115 197 +222 115 115 +156 156 238 +82 82 164 +180 180 255 +246 246 255 +230 139 139 +246 205 205 +222 90 90 diff --git a/graphics/items/icon_palettes/cleanse_tag.pal b/graphics/items/icon_palettes/cleanse_tag.pal new file mode 100644 index 000000000..03ad379c9 --- /dev/null +++ b/graphics/items/icon_palettes/cleanse_tag.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +180 180 180 +49 49 49 +222 115 115 +82 82 82 +255 255 255 +222 222 222 +180 180 180 +148 148 148 +164 57 57 +189 82 82 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/coin_case.pal b/graphics/items/icon_palettes/coin_case.pal new file mode 100644 index 000000000..baf714b20 --- /dev/null +++ b/graphics/items/icon_palettes/coin_case.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +180 180 180 +49 49 49 +205 90 90 +172 57 57 +123 16 16 +65 65 65 +123 123 123 +238 238 123 +197 172 57 +255 255 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/contest_pass.pal b/graphics/items/icon_palettes/contest_pass.pal new file mode 100644 index 000000000..9ee2fda6f --- /dev/null +++ b/graphics/items/icon_palettes/contest_pass.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +180 180 180 +49 49 49 +238 230 106 +230 98 74 +222 222 255 +189 189 222 +189 180 106 +197 98 74 +148 148 180 +230 172 139 +222 213 139 +238 238 246 +246 238 156 +222 123 98 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/cornn_berry.pal b/graphics/items/icon_palettes/cornn_berry.pal new file mode 100644 index 000000000..479182fbe --- /dev/null +++ b/graphics/items/icon_palettes/cornn_berry.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +180 180 180 +49 49 49 +0 0 0 +0 0 0 +0 0 0 +230 164 230 +156 115 82 +123 106 164 +189 139 213 +98 82 131 +82 65 106 +156 148 98 +98 180 82 +49 148 82 +123 213 82 +49 98 82 diff --git a/graphics/items/icon_palettes/dark_tm_hm.pal b/graphics/items/icon_palettes/dark_tm_hm.pal new file mode 100644 index 000000000..0657cc79f --- /dev/null +++ b/graphics/items/icon_palettes/dark_tm_hm.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +180 180 180 +49 49 49 +74 74 98 +205 230 230 +189 213 213 +164 205 205 +139 189 197 +123 180 180 +98 164 172 +82 156 164 +123 123 148 +123 123 123 +98 98 123 +255 255 255 +238 246 246 +82 82 82 diff --git a/graphics/items/icon_palettes/deep_sea_scale.pal b/graphics/items/icon_palettes/deep_sea_scale.pal new file mode 100644 index 000000000..8783f2191 --- /dev/null +++ b/graphics/items/icon_palettes/deep_sea_scale.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +180 180 180 +49 49 49 +255 189 230 +255 246 255 +255 222 255 +238 164 213 +255 197 246 +255 238 255 +180 82 156 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/deep_sea_tooth.pal b/graphics/items/icon_palettes/deep_sea_tooth.pal new file mode 100644 index 000000000..c68b91459 --- /dev/null +++ b/graphics/items/icon_palettes/deep_sea_tooth.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +180 180 180 +49 49 49 +205 197 255 +246 238 255 +230 230 255 +172 172 230 +246 246 230 +222 222 205 +230 230 164 +106 115 172 +197 197 131 +131 123 65 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/devon_goods.pal b/graphics/items/icon_palettes/devon_goods.pal new file mode 100644 index 000000000..4a6ab3366 --- /dev/null +++ b/graphics/items/icon_palettes/devon_goods.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +180 180 180 +49 49 49 +123 139 123 +246 246 246 +230 230 230 +189 205 189 +164 180 164 +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 diff --git a/graphics/items/icon_palettes/devon_scope.pal b/graphics/items/icon_palettes/devon_scope.pal new file mode 100644 index 000000000..76a699d42 --- /dev/null +++ b/graphics/items/icon_palettes/devon_scope.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +180 180 180 +49 49 49 +197 238 255 +156 197 213 +106 148 164 +65 115 139 +255 238 139 +197 156 74 +205 230 156 +98 98 98 +115 172 65 +148 148 148 +255 255 255 +74 74 74 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/dire_hit.pal b/graphics/items/icon_palettes/dire_hit.pal new file mode 100644 index 000000000..402d5bc5d --- /dev/null +++ b/graphics/items/icon_palettes/dire_hit.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +180 180 180 +49 49 49 +230 189 90 +180 131 49 +255 213 131 +255 255 255 +164 148 148 +238 213 189 +123 57 8 +255 230 205 +205 148 49 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/dive_ball.pal b/graphics/items/icon_palettes/dive_ball.pal new file mode 100644 index 000000000..b5096e7bc --- /dev/null +++ b/graphics/items/icon_palettes/dive_ball.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +180 180 180 +49 49 49 +74 82 82 +123 123 131 +164 164 197 +222 205 246 +255 255 255 +41 115 213 +65 139 230 +90 164 255 +139 205 255 +148 238 246 +255 0 255 +255 0 255 +255 0 255 +255 0 255 diff --git a/graphics/items/icon_palettes/dragon_fang.pal b/graphics/items/icon_palettes/dragon_fang.pal new file mode 100644 index 000000000..3ace9a310 --- /dev/null +++ b/graphics/items/icon_palettes/dragon_fang.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +180 180 180 +49 49 49 +246 238 230 +180 172 164 +189 164 156 +131 106 98 +230 205 197 +255 255 255 +222 213 205 +148 139 131 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/dragon_scale.pal b/graphics/items/icon_palettes/dragon_scale.pal new file mode 100644 index 000000000..641925d3c --- /dev/null +++ b/graphics/items/icon_palettes/dragon_scale.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +180 180 180 +49 49 49 +148 213 238 +172 238 255 +106 172 205 +65 123 156 +156 222 255 +172 238 222 +213 238 189 +246 246 172 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/dragon_tm_hm.pal b/graphics/items/icon_palettes/dragon_tm_hm.pal new file mode 100644 index 000000000..47f0708bc --- /dev/null +++ b/graphics/items/icon_palettes/dragon_tm_hm.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +180 180 180 +49 49 49 +74 74 98 +205 230 255 +180 213 255 +156 197 255 +139 189 255 +172 180 213 +213 180 172 +255 180 131 +123 123 148 +123 123 123 +98 98 123 +255 255 255 +230 246 255 +82 82 82 diff --git a/graphics/items/icon_palettes/dream_mail.pal b/graphics/items/icon_palettes/dream_mail.pal new file mode 100644 index 000000000..643753f18 --- /dev/null +++ b/graphics/items/icon_palettes/dream_mail.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +180 180 180 +49 49 49 +255 197 255 +246 172 238 +205 156 222 +172 123 189 +148 98 164 +123 74 139 +98 49 115 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/durin_berry.pal b/graphics/items/icon_palettes/durin_berry.pal new file mode 100644 index 000000000..7015b8a04 --- /dev/null +++ b/graphics/items/icon_palettes/durin_berry.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +180 180 180 +49 49 49 +115 180 65 +197 246 156 +57 115 16 +164 230 98 +197 172 90 +74 156 49 +139 106 41 +49 90 24 +246 205 148 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/electric_tm_hm.pal b/graphics/items/icon_palettes/electric_tm_hm.pal new file mode 100644 index 000000000..f4ce9febe --- /dev/null +++ b/graphics/items/icon_palettes/electric_tm_hm.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +180 180 180 +49 49 49 +74 74 98 +255 255 189 +255 238 156 +255 230 123 +255 222 90 +255 205 57 +255 197 24 +255 197 0 +123 123 148 +123 123 123 +98 98 123 +255 255 255 +255 255 222 +82 82 82 diff --git a/graphics/items/icon_palettes/elixir.pal b/graphics/items/icon_palettes/elixir.pal new file mode 100644 index 000000000..510968901 --- /dev/null +++ b/graphics/items/icon_palettes/elixir.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +180 180 180 +49 49 49 +238 238 164 +255 189 156 +230 164 131 +205 205 131 +180 106 65 +164 164 90 +246 246 164 +255 222 213 +106 49 65 +197 131 115 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/energy_powder.pal b/graphics/items/icon_palettes/energy_powder.pal new file mode 100644 index 000000000..e4a264706 --- /dev/null +++ b/graphics/items/icon_palettes/energy_powder.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +180 180 180 +49 49 49 +255 255 246 +238 164 164 +148 148 82 +197 115 115 +222 222 156 +238 238 189 +115 65 65 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/energy_root.pal b/graphics/items/icon_palettes/energy_root.pal new file mode 100644 index 000000000..574a7f78b --- /dev/null +++ b/graphics/items/icon_palettes/energy_root.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +180 180 180 +49 49 49 +230 205 131 +213 164 90 +255 230 164 +139 90 16 +205 156 82 +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 diff --git a/graphics/items/icon_palettes/enigma_berry.pal b/graphics/items/icon_palettes/enigma_berry.pal new file mode 100644 index 000000000..4f7b3cfbe --- /dev/null +++ b/graphics/items/icon_palettes/enigma_berry.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +180 180 180 +49 49 49 +246 246 230 +74 74 74 +230 222 197 +205 189 164 +131 131 131 +180 180 180 +180 164 139 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/eon_ticket.pal b/graphics/items/icon_palettes/eon_ticket.pal new file mode 100644 index 000000000..cbfea06a5 --- /dev/null +++ b/graphics/items/icon_palettes/eon_ticket.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +180 180 180 +49 49 49 +238 246 246 +65 139 156 +82 205 205 +139 205 238 +139 189 98 +90 156 49 +213 180 139 +164 115 57 +246 115 98 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/escape_rope.pal b/graphics/items/icon_palettes/escape_rope.pal new file mode 100644 index 000000000..d9b3b84c7 --- /dev/null +++ b/graphics/items/icon_palettes/escape_rope.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +180 180 180 +49 49 49 +148 123 41 +189 164 82 +123 98 16 +98 74 8 +213 82 49 +222 222 230 +189 189 197 +156 156 164 +172 41 8 +222 197 115 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/ether.pal b/graphics/items/icon_palettes/ether.pal new file mode 100644 index 000000000..312f134ff --- /dev/null +++ b/graphics/items/icon_palettes/ether.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +180 180 180 +49 49 49 +213 230 230 +222 172 230 +189 139 197 +164 197 197 +131 82 139 +123 156 164 +230 255 255 +246 213 255 +74 41 98 +156 106 164 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/everstone.pal b/graphics/items/icon_palettes/everstone.pal new file mode 100644 index 000000000..bdcae0850 --- /dev/null +++ b/graphics/items/icon_palettes/everstone.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +180 180 180 +49 49 49 +148 172 189 +180 205 213 +222 246 255 +106 139 156 +205 230 238 +65 98 115 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/exp_share.pal b/graphics/items/icon_palettes/exp_share.pal new file mode 100644 index 000000000..237a7a28d --- /dev/null +++ b/graphics/items/icon_palettes/exp_share.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +180 180 180 +49 49 49 +131 148 131 +172 189 172 +65 82 65 +255 255 148 +222 222 115 +230 230 255 +197 197 222 +164 164 189 +189 205 189 +106 123 106 +131 131 156 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/fab_mail.pal b/graphics/items/icon_palettes/fab_mail.pal new file mode 100644 index 000000000..1ccad3cc3 --- /dev/null +++ b/graphics/items/icon_palettes/fab_mail.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +180 180 180 +49 49 49 +238 246 255 +222 180 197 +246 213 222 +255 255 255 +172 115 148 +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 diff --git a/graphics/items/icon_palettes/fame_checker.pal b/graphics/items/icon_palettes/fame_checker.pal new file mode 100644 index 000000000..ba744f0f5 --- /dev/null +++ b/graphics/items/icon_palettes/fame_checker.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +230 197 57 +49 49 49 +98 106 98 +238 123 41 +74 74 57 +98 156 148 +115 205 189 +0 0 0 +0 0 0 +255 172 65 +197 197 205 +213 246 246 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/fighting_tm_hm.pal b/graphics/items/icon_palettes/fighting_tm_hm.pal new file mode 100644 index 000000000..3dcd54ce7 --- /dev/null +++ b/graphics/items/icon_palettes/fighting_tm_hm.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +180 180 180 +49 49 49 +74 74 98 +246 213 189 +238 197 156 +238 180 123 +238 164 90 +230 148 57 +230 131 24 +230 115 0 +123 123 148 +123 123 123 +98 98 123 +255 255 255 +255 238 230 +82 82 82 diff --git a/graphics/items/icon_palettes/figy_berry.pal b/graphics/items/icon_palettes/figy_berry.pal new file mode 100644 index 000000000..d02bcb970 --- /dev/null +++ b/graphics/items/icon_palettes/figy_berry.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +180 180 180 +49 49 49 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +255 255 213 +246 238 139 +230 213 148 +205 189 123 +238 148 49 +189 106 65 +213 230 123 +139 148 74 +0 0 0 +156 123 57 diff --git a/graphics/items/icon_palettes/fire_stone.pal b/graphics/items/icon_palettes/fire_stone.pal new file mode 100644 index 000000000..4aeef36ab --- /dev/null +++ b/graphics/items/icon_palettes/fire_stone.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +180 180 180 +49 49 49 +246 238 49 +246 148 49 +222 205 16 +222 115 16 +255 255 238 +197 197 106 +230 230 123 +123 123 32 +255 238 156 +255 255 139 +164 164 74 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/fire_tm_hm.pal b/graphics/items/icon_palettes/fire_tm_hm.pal new file mode 100644 index 000000000..1f0ba5049 --- /dev/null +++ b/graphics/items/icon_palettes/fire_tm_hm.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +180 180 180 +49 49 49 +74 74 98 +255 230 189 +255 222 156 +255 205 131 +255 197 98 +255 189 65 +255 180 41 +238 172 32 +123 123 148 +123 123 123 +98 98 123 +255 255 255 +255 238 222 +82 82 82 diff --git a/graphics/items/icon_palettes/fluffy_tail.pal b/graphics/items/icon_palettes/fluffy_tail.pal new file mode 100644 index 000000000..b66157c54 --- /dev/null +++ b/graphics/items/icon_palettes/fluffy_tail.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +180 180 180 +49 49 49 +246 246 139 +222 222 90 +197 139 82 +238 172 115 +255 222 164 +131 74 16 +246 230 246 +180 148 172 +139 98 131 +255 255 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/flying_tm_hm.pal b/graphics/items/icon_palettes/flying_tm_hm.pal new file mode 100644 index 000000000..8bcf19388 --- /dev/null +++ b/graphics/items/icon_palettes/flying_tm_hm.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +180 180 180 +49 49 49 +74 74 98 +213 246 255 +189 238 255 +172 238 255 +156 238 255 +172 222 238 +180 205 222 +197 197 197 +123 123 148 +123 123 123 +98 98 123 +255 255 255 +246 246 255 +82 82 82 diff --git a/graphics/items/icon_palettes/focus_band.pal b/graphics/items/icon_palettes/focus_band.pal new file mode 100644 index 000000000..a5f0543fd --- /dev/null +++ b/graphics/items/icon_palettes/focus_band.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +180 180 180 +49 49 49 +189 82 82 +238 123 123 +139 74 74 +205 98 98 +238 238 189 +213 213 164 +189 189 131 +255 222 123 +230 172 49 +197 139 16 +255 164 172 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/fresh_water.pal b/graphics/items/icon_palettes/fresh_water.pal new file mode 100644 index 000000000..466e9fbbb --- /dev/null +++ b/graphics/items/icon_palettes/fresh_water.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +180 180 180 +49 49 49 +255 255 255 +172 189 246 +213 255 255 +197 213 213 +156 172 172 +98 115 172 +65 82 139 +65 131 49 +115 180 98 +148 164 222 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/full_heal.pal b/graphics/items/icon_palettes/full_heal.pal new file mode 100644 index 000000000..a071627d3 --- /dev/null +++ b/graphics/items/icon_palettes/full_heal.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +180 180 180 +49 49 49 +255 255 205 +238 230 0 +197 189 0 +255 246 65 +222 213 0 +180 172 0 +213 115 32 +255 123 0 +123 123 0 +246 255 65 +156 172 0 +222 238 0 +172 189 0 +197 213 0 diff --git a/graphics/items/icon_palettes/full_restore.pal b/graphics/items/icon_palettes/full_restore.pal new file mode 100644 index 000000000..35de1c562 --- /dev/null +++ b/graphics/items/icon_palettes/full_restore.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +180 180 180 +49 49 49 +156 230 65 +172 255 148 +123 197 32 +90 123 49 +213 213 164 +148 148 98 +255 255 213 +255 255 230 +180 180 131 +238 238 180 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/ganlon_berry.pal b/graphics/items/icon_palettes/ganlon_berry.pal new file mode 100644 index 000000000..cbcecc579 --- /dev/null +++ b/graphics/items/icon_palettes/ganlon_berry.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +180 180 180 +49 49 49 +156 148 205 +222 213 131 +197 189 246 +115 106 164 +74 65 115 +164 148 90 +213 213 172 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/ghost_tm_hm.pal b/graphics/items/icon_palettes/ghost_tm_hm.pal new file mode 100644 index 000000000..8a1a79e85 --- /dev/null +++ b/graphics/items/icon_palettes/ghost_tm_hm.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +180 180 180 +49 49 49 +74 74 98 +238 222 246 +230 205 246 +230 189 246 +222 172 246 +213 148 246 +197 123 238 +180 98 222 +123 123 148 +123 123 123 +98 98 123 +255 255 255 +255 238 255 +82 82 82 diff --git a/graphics/items/icon_palettes/glitter_mail.pal b/graphics/items/icon_palettes/glitter_mail.pal new file mode 100644 index 000000000..59cb7ad54 --- /dev/null +++ b/graphics/items/icon_palettes/glitter_mail.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +180 180 180 +49 49 49 +238 238 148 +238 238 115 +230 205 106 +246 164 115 +139 123 90 +164 148 115 +222 222 106 +230 156 106 +197 189 148 +255 255 238 +180 180 65 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/go_goggles.pal b/graphics/items/icon_palettes/go_goggles.pal new file mode 100644 index 000000000..162581e43 --- /dev/null +++ b/graphics/items/icon_palettes/go_goggles.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +180 180 180 +49 49 49 +255 230 139 +255 255 246 +222 180 49 +222 131 0 +139 139 139 +90 90 90 +189 189 189 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/gold_teeth.pal b/graphics/items/icon_palettes/gold_teeth.pal new file mode 100644 index 000000000..a53141894 --- /dev/null +++ b/graphics/items/icon_palettes/gold_teeth.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +180 180 180 +49 49 49 +230 230 57 +222 106 106 +255 189 189 +189 90 90 +246 172 172 +255 255 230 +148 148 8 +197 197 57 +148 49 49 +123 123 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/good_rod.pal b/graphics/items/icon_palettes/good_rod.pal new file mode 100644 index 000000000..7993d0f8e --- /dev/null +++ b/graphics/items/icon_palettes/good_rod.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +180 180 180 +49 49 49 +222 246 98 +180 205 65 +82 82 139 +123 123 180 +115 139 41 +197 222 230 +156 180 189 +106 131 139 +205 90 57 +246 131 98 +255 255 255 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/grass_tm_hm.pal b/graphics/items/icon_palettes/grass_tm_hm.pal new file mode 100644 index 000000000..3a0a441ce --- /dev/null +++ b/graphics/items/icon_palettes/grass_tm_hm.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +180 180 180 +49 49 49 +74 74 98 +213 246 230 +197 246 213 +180 246 205 +156 238 197 +139 238 180 +123 238 172 +106 238 164 +123 123 148 +123 123 123 +98 98 123 +255 255 255 +238 246 246 +82 82 82 diff --git a/graphics/items/icon_palettes/great_ball.pal b/graphics/items/icon_palettes/great_ball.pal new file mode 100644 index 000000000..6eadfac6d --- /dev/null +++ b/graphics/items/icon_palettes/great_ball.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +180 180 180 +49 49 49 +74 82 82 +123 123 131 +164 164 197 +222 205 246 +255 255 255 +49 65 148 +0 0 0 +49 82 213 +57 148 255 +57 213 255 +189 49 49 +246 74 74 +255 172 172 +255 0 255 diff --git a/graphics/items/icon_palettes/green_scarf.pal b/graphics/items/icon_palettes/green_scarf.pal new file mode 100644 index 000000000..3bad6e011 --- /dev/null +++ b/graphics/items/icon_palettes/green_scarf.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +180 180 180 +49 49 49 +115 197 115 +156 238 156 +82 148 82 +123 213 123 +180 255 180 +139 230 139 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/green_shard.pal b/graphics/items/icon_palettes/green_shard.pal new file mode 100644 index 000000000..066162e07 --- /dev/null +++ b/graphics/items/icon_palettes/green_shard.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +180 180 180 +49 49 49 +148 246 139 +90 197 115 +8 90 32 +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 diff --git a/graphics/items/icon_palettes/grepa_berry.pal b/graphics/items/icon_palettes/grepa_berry.pal new file mode 100644 index 000000000..a89f3fdfb --- /dev/null +++ b/graphics/items/icon_palettes/grepa_berry.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +180 180 180 +49 49 49 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +255 230 57 +222 189 74 +238 197 74 +156 139 74 +255 255 115 +90 164 32 +139 213 32 +0 0 0 +49 98 82 diff --git a/graphics/items/icon_palettes/ground_tm_hm.pal b/graphics/items/icon_palettes/ground_tm_hm.pal new file mode 100644 index 000000000..d17f0db50 --- /dev/null +++ b/graphics/items/icon_palettes/ground_tm_hm.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +180 180 180 +49 49 49 +74 74 98 +255 255 189 +255 255 156 +255 255 123 +255 255 90 +246 238 90 +230 213 82 +222 197 65 +123 123 148 +123 123 123 +98 98 123 +255 255 255 +255 255 222 +82 82 82 diff --git a/graphics/items/icon_palettes/guard_spec.pal b/graphics/items/icon_palettes/guard_spec.pal new file mode 100644 index 000000000..ad5bd2735 --- /dev/null +++ b/graphics/items/icon_palettes/guard_spec.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +180 180 180 +49 49 49 +106 213 115 +74 164 74 +172 238 156 +255 255 255 +148 156 148 +213 230 213 +32 115 32 +222 255 230 +90 172 74 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/harbor_mail.pal b/graphics/items/icon_palettes/harbor_mail.pal new file mode 100644 index 000000000..0edffaf19 --- /dev/null +++ b/graphics/items/icon_palettes/harbor_mail.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +180 180 180 +49 49 49 +106 148 172 +139 205 222 +238 255 255 +246 246 197 +205 238 238 +230 230 180 +115 106 65 +139 131 90 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/hard_stone.pal b/graphics/items/icon_palettes/hard_stone.pal new file mode 100644 index 000000000..f8fefe893 --- /dev/null +++ b/graphics/items/icon_palettes/hard_stone.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +180 180 180 +49 49 49 +255 246 246 +123 115 115 +156 148 148 +90 82 82 +205 197 205 +82 74 74 +238 230 230 +98 90 90 +74 65 65 +180 172 172 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/heal_powder.pal b/graphics/items/icon_palettes/heal_powder.pal new file mode 100644 index 000000000..dfe2d3175 --- /dev/null +++ b/graphics/items/icon_palettes/heal_powder.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +180 180 180 +49 49 49 +205 230 205 +238 238 98 +57 123 57 +197 197 98 +90 172 90 +139 205 139 +115 115 32 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/heart_scale.pal b/graphics/items/icon_palettes/heart_scale.pal new file mode 100644 index 000000000..458bff95f --- /dev/null +++ b/graphics/items/icon_palettes/heart_scale.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +180 180 180 +49 49 49 +238 205 205 +197 230 197 +205 205 238 +205 238 238 +238 238 238 +123 123 156 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/hoenn_fossil.pal b/graphics/items/icon_palettes/hoenn_fossil.pal new file mode 100644 index 000000000..2889dd254 --- /dev/null +++ b/graphics/items/icon_palettes/hoenn_fossil.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +180 180 180 +49 49 49 +189 180 82 +74 65 0 +139 131 32 +98 90 0 +222 213 115 +139 90 0 +0 0 0 +213 213 131 +98 98 41 +164 164 82 +123 123 41 +246 246 164 +164 123 41 +0 0 0 diff --git a/graphics/items/icon_palettes/hondew_berry.pal b/graphics/items/icon_palettes/hondew_berry.pal new file mode 100644 index 000000000..4918cc61a --- /dev/null +++ b/graphics/items/icon_palettes/hondew_berry.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +180 180 180 +49 49 49 +0 0 0 +0 0 0 +0 0 0 +255 238 74 +205 197 74 +148 222 74 +115 197 74 +82 156 74 +74 98 74 +197 255 74 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/hp_up.pal b/graphics/items/icon_palettes/hp_up.pal new file mode 100644 index 000000000..555e10f71 --- /dev/null +++ b/graphics/items/icon_palettes/hp_up.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +180 180 180 +49 49 49 +246 255 246 +148 90 57 +90 189 90 +164 246 164 +65 139 65 +189 148 41 +255 197 115 +197 222 197 +230 246 230 +172 197 172 +106 164 238 +74 131 205 +148 205 255 +0 0 0 diff --git a/graphics/items/icon_palettes/hyper_potion.pal b/graphics/items/icon_palettes/hyper_potion.pal new file mode 100644 index 000000000..fda69e0bb --- /dev/null +++ b/graphics/items/icon_palettes/hyper_potion.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +180 180 180 +49 49 49 +255 131 205 +197 222 238 +255 255 255 +164 189 205 +255 98 172 +131 156 172 +230 255 255 +255 197 255 +82 106 123 +197 57 131 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/iapapa_berry.pal b/graphics/items/icon_palettes/iapapa_berry.pal new file mode 100644 index 000000000..8d1b16468 --- /dev/null +++ b/graphics/items/icon_palettes/iapapa_berry.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +180 180 180 +49 49 49 +0 0 0 +0 0 0 +0 0 0 +255 255 213 +255 238 123 +238 205 148 +213 180 123 +238 148 49 +205 115 65 +172 115 49 +0 0 0 +0 0 0 +0 0 0 +115 123 49 diff --git a/graphics/items/icon_palettes/ice_heal.pal b/graphics/items/icon_palettes/ice_heal.pal new file mode 100644 index 000000000..49a1b20b1 --- /dev/null +++ b/graphics/items/icon_palettes/ice_heal.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +180 180 180 +49 49 49 +255 255 255 +205 205 205 +156 156 156 +255 189 180 +246 106 106 +246 164 164 +246 139 139 +255 222 222 +90 90 90 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/ice_tm_hm.pal b/graphics/items/icon_palettes/ice_tm_hm.pal new file mode 100644 index 000000000..83192ed29 --- /dev/null +++ b/graphics/items/icon_palettes/ice_tm_hm.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +180 180 180 +49 49 49 +74 74 98 +230 246 255 +213 246 255 +197 246 255 +172 238 255 +156 238 255 +139 230 246 +131 213 238 +123 123 148 +123 123 123 +98 98 123 +255 255 255 +255 255 255 +82 82 82 diff --git a/graphics/items/icon_palettes/iron.pal b/graphics/items/icon_palettes/iron.pal new file mode 100644 index 000000000..44592f92b --- /dev/null +++ b/graphics/items/icon_palettes/iron.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +180 180 180 +49 49 49 +246 255 246 +148 90 57 +189 189 90 +246 246 164 +139 139 65 +189 148 41 +255 197 115 +197 222 197 +230 246 230 +172 197 172 +49 164 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/itemfinder.pal b/graphics/items/icon_palettes/itemfinder.pal new file mode 100644 index 000000000..c2052560b --- /dev/null +++ b/graphics/items/icon_palettes/itemfinder.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +180 180 180 +49 49 49 +238 238 106 +255 255 255 +74 74 74 +213 98 98 +98 172 238 +123 74 74 +255 189 189 +65 139 205 +139 213 255 +189 189 189 +106 106 106 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/kanto_fossil.pal b/graphics/items/icon_palettes/kanto_fossil.pal new file mode 100644 index 000000000..c2e2afebf --- /dev/null +++ b/graphics/items/icon_palettes/kanto_fossil.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +180 180 180 +49 49 49 +164 123 0 +189 148 41 +197 156 57 +222 189 106 +123 82 0 +106 65 0 +65 49 0 +238 222 148 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/kelpsy_berry.pal b/graphics/items/icon_palettes/kelpsy_berry.pal new file mode 100644 index 000000000..bbb0874bf --- /dev/null +++ b/graphics/items/icon_palettes/kelpsy_berry.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +180 180 180 +49 49 49 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +115 98 230 +139 213 255 +115 172 255 +90 82 98 +98 82 156 +197 197 123 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/key.pal b/graphics/items/icon_palettes/key.pal new file mode 100644 index 000000000..1acf63710 --- /dev/null +++ b/graphics/items/icon_palettes/key.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +180 180 180 +49 49 49 +106 106 106 +74 65 74 +255 255 255 +164 164 164 +156 156 156 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +164 90 90 +213 90 90 diff --git a/graphics/items/icon_palettes/kings_rock.pal b/graphics/items/icon_palettes/kings_rock.pal new file mode 100644 index 000000000..ba9e92580 --- /dev/null +++ b/graphics/items/icon_palettes/kings_rock.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +180 180 180 +49 49 49 +230 213 90 +246 230 123 +197 180 57 +164 148 32 +131 115 32 +74 57 24 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/lansat_berry.pal b/graphics/items/icon_palettes/lansat_berry.pal new file mode 100644 index 000000000..542953d06 --- /dev/null +++ b/graphics/items/icon_palettes/lansat_berry.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +180 180 180 +49 49 49 +246 189 164 +222 139 106 +139 205 164 +197 106 74 +49 115 74 +246 197 172 +98 164 123 +131 57 32 +164 230 189 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/lava_cookie_and_letter.pal b/graphics/items/icon_palettes/lava_cookie_and_letter.pal new file mode 100644 index 000000000..b4c2b10f2 --- /dev/null +++ b/graphics/items/icon_palettes/lava_cookie_and_letter.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +180 180 180 +49 49 49 +238 238 255 +205 197 230 +0 0 0 +205 139 65 +230 180 24 +180 98 41 +57 49 16 +98 98 57 +172 172 131 +115 65 24 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/lax_incense.pal b/graphics/items/icon_palettes/lax_incense.pal new file mode 100644 index 000000000..a618d5986 --- /dev/null +++ b/graphics/items/icon_palettes/lax_incense.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +180 180 180 +49 49 49 +230 172 16 +172 115 32 +255 222 156 +222 189 123 +156 98 8 +205 148 16 +255 246 189 +246 197 65 +49 98 49 +197 230 197 +98 98 49 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/leaf_stone.pal b/graphics/items/icon_palettes/leaf_stone.pal new file mode 100644 index 000000000..41b1af789 --- /dev/null +++ b/graphics/items/icon_palettes/leaf_stone.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +180 180 180 +49 49 49 +106 148 106 +90 131 82 +139 180 139 +156 172 123 +123 139 90 +90 106 57 +74 90 41 +57 98 57 +197 213 164 +123 164 123 +74 115 65 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/leftovers.pal b/graphics/items/icon_palettes/leftovers.pal new file mode 100644 index 000000000..b5f27b871 --- /dev/null +++ b/graphics/items/icon_palettes/leftovers.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +180 180 180 +49 49 49 +230 82 82 +156 139 82 +123 148 32 +180 90 90 +123 74 74 +255 255 255 +255 139 106 +238 255 213 +205 230 172 +246 98 98 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/lemonade.pal b/graphics/items/icon_palettes/lemonade.pal new file mode 100644 index 000000000..2a93c5bcc --- /dev/null +++ b/graphics/items/icon_palettes/lemonade.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +180 180 180 +49 49 49 +230 230 255 +205 205 230 +164 164 189 +238 238 164 +197 197 131 +255 255 205 +255 197 156 +222 164 123 +255 222 180 +255 148 115 +131 213 180 +213 65 65 +238 98 98 +255 164 172 diff --git a/graphics/items/icon_palettes/leppa_berry.pal b/graphics/items/icon_palettes/leppa_berry.pal new file mode 100644 index 000000000..ac4934b05 --- /dev/null +++ b/graphics/items/icon_palettes/leppa_berry.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +180 180 180 +49 49 49 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +180 164 98 +255 148 49 +205 74 49 +230 115 49 +238 230 98 +90 213 82 +65 156 65 +49 115 65 +156 82 57 +255 222 49 diff --git a/graphics/items/icon_palettes/liechi_berry.pal b/graphics/items/icon_palettes/liechi_berry.pal new file mode 100644 index 000000000..f8907564e --- /dev/null +++ b/graphics/items/icon_palettes/liechi_berry.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +180 180 180 +49 49 49 +255 255 246 +255 172 74 +172 82 16 +246 238 197 +164 156 131 +213 205 148 +213 115 49 +255 230 164 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/light_ball.pal b/graphics/items/icon_palettes/light_ball.pal new file mode 100644 index 000000000..0e592e673 --- /dev/null +++ b/graphics/items/icon_palettes/light_ball.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +180 180 180 +49 49 49 +255 255 156 +230 222 41 +164 164 16 +255 255 255 +90 90 0 +222 222 139 +189 189 0 +131 131 0 +255 255 197 +74 74 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/lucky_egg.pal b/graphics/items/icon_palettes/lucky_egg.pal new file mode 100644 index 000000000..053f7a76e --- /dev/null +++ b/graphics/items/icon_palettes/lucky_egg.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +180 180 180 +49 49 49 +222 238 246 +205 213 222 +164 172 180 +255 255 255 +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 diff --git a/graphics/items/icon_palettes/lucky_punch.pal b/graphics/items/icon_palettes/lucky_punch.pal new file mode 100644 index 000000000..ab87dd5ab --- /dev/null +++ b/graphics/items/icon_palettes/lucky_punch.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +180 180 180 +49 49 49 +222 115 57 +255 222 106 +255 172 115 +172 90 49 +115 65 16 +255 255 255 +139 139 139 +230 230 230 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/lum_berry.pal b/graphics/items/icon_palettes/lum_berry.pal new file mode 100644 index 000000000..0dc661882 --- /dev/null +++ b/graphics/items/icon_palettes/lum_berry.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +180 180 180 +49 49 49 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +148 222 74 +115 197 74 +82 164 74 +74 98 74 +164 255 74 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/luxury_ball.pal b/graphics/items/icon_palettes/luxury_ball.pal new file mode 100644 index 000000000..696a4b385 --- /dev/null +++ b/graphics/items/icon_palettes/luxury_ball.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +180 180 180 +49 49 49 +74 82 82 +123 123 131 +164 164 197 +222 205 246 +255 255 255 +156 74 57 +180 82 57 +222 90 57 +255 148 57 +255 213 57 +230 180 106 +255 255 148 +213 156 49 +255 238 82 diff --git a/graphics/items/icon_palettes/mach_bike.pal b/graphics/items/icon_palettes/mach_bike.pal new file mode 100644 index 000000000..ae035c3b3 --- /dev/null +++ b/graphics/items/icon_palettes/mach_bike.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +180 180 180 +49 49 49 +106 123 189 +172 189 172 +246 255 246 +98 98 98 +172 172 74 +156 164 156 +164 180 255 +139 49 0 +57 74 115 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/macho_brace.pal b/graphics/items/icon_palettes/macho_brace.pal new file mode 100644 index 000000000..5ef43947b --- /dev/null +++ b/graphics/items/icon_palettes/macho_brace.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +180 180 180 +49 49 49 +222 230 238 +74 131 82 +106 164 115 +139 197 148 +180 238 189 +197 205 213 +156 164 172 +213 222 230 +74 90 98 +238 238 246 +255 255 222 +156 156 49 +57 82 65 +49 106 57 diff --git a/graphics/items/icon_palettes/magma_emblem.pal b/graphics/items/icon_palettes/magma_emblem.pal new file mode 100644 index 000000000..55ac014d6 --- /dev/null +++ b/graphics/items/icon_palettes/magma_emblem.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +180 180 180 +49 49 49 +74 82 82 +123 123 131 +164 164 197 +222 205 246 +255 255 255 +164 8 57 +222 82 82 +230 115 82 +238 148 82 +246 180 82 +255 213 82 +255 238 106 +255 255 180 +0 0 0 diff --git a/graphics/items/icon_palettes/magnet.pal b/graphics/items/icon_palettes/magnet.pal new file mode 100644 index 000000000..2ad217c4d --- /dev/null +++ b/graphics/items/icon_palettes/magnet.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +180 180 180 +49 49 49 +255 156 148 +115 57 57 +148 156 255 +57 57 115 +90 90 180 +148 164 148 +74 90 74 +172 189 172 +172 82 82 +255 189 189 +197 197 255 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/mago_berry.pal b/graphics/items/icon_palettes/mago_berry.pal new file mode 100644 index 000000000..eeecc7b12 --- /dev/null +++ b/graphics/items/icon_palettes/mago_berry.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +180 180 180 +49 49 49 +0 0 0 +0 0 0 +0 0 0 +255 230 156 +255 148 131 +255 189 156 +230 123 115 +172 90 65 +255 246 164 +222 213 115 +197 172 98 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/magost_berry.pal b/graphics/items/icon_palettes/magost_berry.pal new file mode 100644 index 000000000..2602221f6 --- /dev/null +++ b/graphics/items/icon_palettes/magost_berry.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +180 180 180 +49 49 49 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +255 189 156 +230 131 98 +172 90 65 +255 164 139 +49 156 82 +98 205 82 +49 98 82 +255 230 156 +0 0 0 diff --git a/graphics/items/icon_palettes/master_ball.pal b/graphics/items/icon_palettes/master_ball.pal new file mode 100644 index 000000000..b3d02bac4 --- /dev/null +++ b/graphics/items/icon_palettes/master_ball.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +180 180 180 +49 49 49 +74 82 82 +123 123 131 +164 164 197 +222 205 246 +255 255 255 +106 49 197 +115 49 205 +180 57 246 +205 65 255 +0 0 0 +180 0 148 +230 32 197 +255 197 255 +0 0 0 diff --git a/graphics/items/icon_palettes/max_elixir.pal b/graphics/items/icon_palettes/max_elixir.pal new file mode 100644 index 000000000..61e3c34f4 --- /dev/null +++ b/graphics/items/icon_palettes/max_elixir.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +180 180 180 +49 49 49 +246 246 180 +156 255 255 +131 230 230 +238 238 156 +65 180 180 +213 213 90 +255 255 205 +213 255 255 +65 106 106 +115 197 197 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/max_ether.pal b/graphics/items/icon_palettes/max_ether.pal new file mode 100644 index 000000000..1e51e009c --- /dev/null +++ b/graphics/items/icon_palettes/max_ether.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +180 180 180 +49 49 49 +238 238 255 +189 255 156 +164 230 131 +205 205 222 +106 180 65 +164 164 180 +246 246 255 +222 255 213 +49 106 65 +131 197 115 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/max_potion.pal b/graphics/items/icon_palettes/max_potion.pal new file mode 100644 index 000000000..8ac590135 --- /dev/null +++ b/graphics/items/icon_palettes/max_potion.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +180 180 180 +49 49 49 +65 156 230 +148 172 255 +32 123 197 +49 90 123 +180 180 197 +115 115 131 +230 230 246 +246 255 246 +148 148 164 +205 205 222 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/max_repel.pal b/graphics/items/icon_palettes/max_repel.pal new file mode 100644 index 000000000..1946607df --- /dev/null +++ b/graphics/items/icon_palettes/max_repel.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +180 180 180 +49 49 49 +255 255 255 +213 230 230 +180 197 197 +123 139 139 +0 0 0 +0 0 0 +213 205 189 +139 131 115 +0 0 0 +0 0 0 +0 0 0 +255 246 230 +189 172 106 +246 230 164 diff --git a/graphics/items/icon_palettes/mech_mail.pal b/graphics/items/icon_palettes/mech_mail.pal new file mode 100644 index 000000000..01e9bf7e1 --- /dev/null +++ b/graphics/items/icon_palettes/mech_mail.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +180 180 180 +49 49 49 +246 255 246 +213 222 213 +131 139 131 +172 180 172 +90 98 90 +172 172 106 +222 222 180 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/mental_herb.pal b/graphics/items/icon_palettes/mental_herb.pal new file mode 100644 index 000000000..b488816e5 --- /dev/null +++ b/graphics/items/icon_palettes/mental_herb.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +180 180 180 +49 49 49 +222 255 255 +148 230 230 +123 205 205 +164 246 246 +172 255 255 +156 238 238 +57 148 148 +106 197 197 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/metal_coat.pal b/graphics/items/icon_palettes/metal_coat.pal new file mode 100644 index 000000000..3b81fa802 --- /dev/null +++ b/graphics/items/icon_palettes/metal_coat.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +180 180 180 +49 49 49 +222 238 238 +180 197 197 +82 106 106 +255 255 255 +0 0 0 +0 0 0 +0 0 0 +106 131 131 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/metal_powder.pal b/graphics/items/icon_palettes/metal_powder.pal new file mode 100644 index 000000000..68d14765d --- /dev/null +++ b/graphics/items/icon_palettes/metal_powder.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +180 180 180 +49 49 49 +213 213 213 +156 156 156 +90 90 90 +238 238 238 +205 148 213 +156 106 164 +238 197 246 +115 65 123 +255 255 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/meteorite.pal b/graphics/items/icon_palettes/meteorite.pal new file mode 100644 index 000000000..5beadc9fe --- /dev/null +++ b/graphics/items/icon_palettes/meteorite.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +180 180 180 +49 49 49 +131 82 82 +90 57 57 +205 131 123 +180 139 172 +213 156 205 +230 189 205 +156 106 106 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/miracle_seed.pal b/graphics/items/icon_palettes/miracle_seed.pal new file mode 100644 index 000000000..baa853e2f --- /dev/null +++ b/graphics/items/icon_palettes/miracle_seed.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +180 180 180 +49 49 49 +255 255 238 +222 222 123 +238 238 90 +197 197 49 +131 131 8 +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 diff --git a/graphics/items/icon_palettes/moomoo_milk.pal b/graphics/items/icon_palettes/moomoo_milk.pal new file mode 100644 index 000000000..d7107e7f5 --- /dev/null +++ b/graphics/items/icon_palettes/moomoo_milk.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +180 180 180 +49 49 49 +246 246 230 +238 238 213 +230 230 180 +180 180 115 +213 148 213 +255 255 255 +238 164 238 +156 82 156 +255 189 255 +131 131 57 +180 106 180 +123 49 139 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/moon_stone.pal b/graphics/items/icon_palettes/moon_stone.pal new file mode 100644 index 000000000..1601eca46 --- /dev/null +++ b/graphics/items/icon_palettes/moon_stone.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +180 180 180 +49 49 49 +205 230 213 +172 197 180 +131 156 139 +90 115 98 +222 246 230 +106 131 115 +74 98 82 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/mushroom.pal b/graphics/items/icon_palettes/mushroom.pal new file mode 100644 index 000000000..25e42a1dd --- /dev/null +++ b/graphics/items/icon_palettes/mushroom.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +180 180 180 +49 49 49 +213 57 32 +255 115 90 +255 164 131 +238 213 74 +246 230 98 +238 222 222 +222 205 205 +180 164 164 +139 123 123 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/mystic_ticket.pal b/graphics/items/icon_palettes/mystic_ticket.pal new file mode 100644 index 000000000..8b4814c59 --- /dev/null +++ b/graphics/items/icon_palettes/mystic_ticket.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +164 164 123 +49 49 49 +180 222 238 +255 255 255 +230 164 222 +139 74 172 +115 74 98 +189 115 197 +123 148 172 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/mystic_water.pal b/graphics/items/icon_palettes/mystic_water.pal new file mode 100644 index 000000000..14565886e --- /dev/null +++ b/graphics/items/icon_palettes/mystic_water.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +180 180 180 +49 49 49 +90 90 213 +156 222 255 +197 213 213 +172 172 222 +255 255 255 +74 0 0 +74 74 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/nanab_berry.pal b/graphics/items/icon_palettes/nanab_berry.pal new file mode 100644 index 000000000..ec13cc181 --- /dev/null +++ b/graphics/items/icon_palettes/nanab_berry.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +180 180 180 +49 49 49 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +255 180 131 +205 106 106 +123 90 65 +255 222 131 +255 238 131 +164 156 74 +213 197 90 +238 148 106 +0 0 0 diff --git a/graphics/items/icon_palettes/nest_ball.pal b/graphics/items/icon_palettes/nest_ball.pal new file mode 100644 index 000000000..810298892 --- /dev/null +++ b/graphics/items/icon_palettes/nest_ball.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +180 180 180 +49 49 49 +74 82 82 +123 123 131 +164 164 197 +222 205 246 +255 255 255 +82 123 57 +57 98 57 +98 148 65 +123 197 57 +180 246 57 +255 0 255 +246 246 156 +172 172 74 +230 230 131 diff --git a/graphics/items/icon_palettes/net_ball.pal b/graphics/items/icon_palettes/net_ball.pal new file mode 100644 index 000000000..3e4d2c41c --- /dev/null +++ b/graphics/items/icon_palettes/net_ball.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +180 180 180 +49 49 49 +74 82 82 +123 123 131 +164 164 197 +222 205 246 +255 255 255 +74 106 123 +65 65 65 +74 123 139 +74 180 197 +57 230 238 +255 0 255 +255 0 255 +255 0 255 +255 0 255 diff --git a/graphics/items/icon_palettes/never_melt_ice.pal b/graphics/items/icon_palettes/never_melt_ice.pal new file mode 100644 index 000000000..e7d4cae58 --- /dev/null +++ b/graphics/items/icon_palettes/never_melt_ice.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +180 180 180 +49 49 49 +246 255 255 +74 90 98 +164 213 230 +222 246 255 +115 164 197 +49 123 164 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/nomel_berry.pal b/graphics/items/icon_palettes/nomel_berry.pal new file mode 100644 index 000000000..9afadafab --- /dev/null +++ b/graphics/items/icon_palettes/nomel_berry.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +180 180 180 +49 49 49 +246 246 98 +197 197 41 +98 98 16 +255 255 246 +230 230 74 +164 164 8 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/normal_tm_hm.pal b/graphics/items/icon_palettes/normal_tm_hm.pal new file mode 100644 index 000000000..a5bd9da1c --- /dev/null +++ b/graphics/items/icon_palettes/normal_tm_hm.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +180 180 180 +49 49 49 +74 74 98 +238 238 238 +230 230 238 +230 230 230 +222 222 222 +213 213 213 +205 205 205 +197 197 197 +123 123 148 +123 123 123 +98 98 123 +255 255 255 +255 255 255 +82 82 82 diff --git a/graphics/items/icon_palettes/nugget.pal b/graphics/items/icon_palettes/nugget.pal new file mode 100644 index 000000000..9cd190dd0 --- /dev/null +++ b/graphics/items/icon_palettes/nugget.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +180 180 180 +49 49 49 +205 172 74 +255 205 74 +255 230 98 +255 238 139 +255 255 255 +156 115 16 +131 90 0 +197 156 57 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/oaks_parcel.pal b/graphics/items/icon_palettes/oaks_parcel.pal new file mode 100644 index 000000000..d02e816ca --- /dev/null +++ b/graphics/items/icon_palettes/oaks_parcel.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +180 180 180 +49 49 49 +246 222 131 +205 180 90 +148 123 32 +115 90 16 +115 115 24 +197 197 82 +164 164 49 +205 82 16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/old_amber.pal b/graphics/items/icon_palettes/old_amber.pal new file mode 100644 index 000000000..1738ccfd8 --- /dev/null +++ b/graphics/items/icon_palettes/old_amber.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +180 180 180 +49 49 49 +197 123 0 +230 148 0 +246 180 0 +246 246 180 +156 82 0 +180 115 0 +255 255 255 +255 255 106 +238 197 131 +255 197 49 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/old_key.pal b/graphics/items/icon_palettes/old_key.pal new file mode 100644 index 000000000..ffeb4692b --- /dev/null +++ b/graphics/items/icon_palettes/old_key.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +180 180 180 +49 49 49 +230 222 197 +205 189 164 +148 131 106 +98 82 57 +255 246 246 +0 0 0 +189 230 197 +164 197 164 +106 139 106 +57 90 57 +213 255 246 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/old_rod.pal b/graphics/items/icon_palettes/old_rod.pal new file mode 100644 index 000000000..526002034 --- /dev/null +++ b/graphics/items/icon_palettes/old_rod.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +180 180 180 +49 49 49 +156 106 8 +197 156 65 +115 65 16 +230 189 106 +197 222 230 +156 180 189 +106 131 139 +205 90 57 +246 131 98 +255 255 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/old_sea_map.pal b/graphics/items/icon_palettes/old_sea_map.pal new file mode 100644 index 000000000..e654202c7 --- /dev/null +++ b/graphics/items/icon_palettes/old_sea_map.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +98 197 98 +49 49 49 +213 180 139 +222 205 164 +197 172 123 +148 131 106 +180 148 106 +197 123 115 +180 90 82 +115 90 57 +0 0 0 +0 0 0 +65 49 24 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/oran_berry.pal b/graphics/items/icon_palettes/oran_berry.pal new file mode 100644 index 000000000..57546dd7b --- /dev/null +++ b/graphics/items/icon_palettes/oran_berry.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +180 180 180 +49 49 49 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +82 164 246 +106 106 189 +90 213 255 +82 82 131 +189 197 255 +230 238 255 +156 164 189 +82 123 205 +0 0 0 diff --git a/graphics/items/icon_palettes/orange_mail.pal b/graphics/items/icon_palettes/orange_mail.pal new file mode 100644 index 000000000..db58702d9 --- /dev/null +++ b/graphics/items/icon_palettes/orange_mail.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +180 180 180 +49 49 49 +246 205 139 +164 222 131 +246 246 164 +123 98 82 +189 164 115 +172 148 115 +255 255 238 +164 164 57 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/pamtre_berry.pal b/graphics/items/icon_palettes/pamtre_berry.pal new file mode 100644 index 000000000..131981654 --- /dev/null +++ b/graphics/items/icon_palettes/pamtre_berry.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +180 180 180 +49 49 49 +139 123 189 +115 180 98 +238 222 180 +90 74 139 +115 98 164 +180 164 230 +156 213 139 +49 115 49 +115 106 74 +205 189 148 +164 148 106 +82 74 41 +65 49 115 +0 0 0 diff --git a/graphics/items/icon_palettes/paralyze_heal.pal b/graphics/items/icon_palettes/paralyze_heal.pal new file mode 100644 index 000000000..e19a72ca9 --- /dev/null +++ b/graphics/items/icon_palettes/paralyze_heal.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +180 180 180 +49 49 49 +255 255 255 +205 205 205 +156 156 156 +255 255 148 +197 197 57 +238 238 98 +222 222 90 +255 255 213 +90 90 90 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/pearl.pal b/graphics/items/icon_palettes/pearl.pal new file mode 100644 index 000000000..2525be880 --- /dev/null +++ b/graphics/items/icon_palettes/pearl.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +180 180 180 +49 49 49 +238 197 197 +180 230 222 +189 189 189 +238 238 189 +255 255 255 +230 230 230 +148 164 164 +74 74 74 +213 172 172 +156 205 197 +164 164 164 +123 139 139 +255 255 205 +0 0 0 diff --git a/graphics/items/icon_palettes/pecha_berry.pal b/graphics/items/icon_palettes/pecha_berry.pal new file mode 100644 index 000000000..0225be168 --- /dev/null +++ b/graphics/items/icon_palettes/pecha_berry.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +180 180 180 +49 49 49 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +255 197 156 +238 148 115 +172 90 65 +255 246 213 +98 205 82 +90 189 65 +49 115 65 +255 230 156 +255 180 115 diff --git a/graphics/items/icon_palettes/persim_berry.pal b/graphics/items/icon_palettes/persim_berry.pal new file mode 100644 index 000000000..62bfa2611 --- /dev/null +++ b/graphics/items/icon_palettes/persim_berry.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +180 180 180 +49 49 49 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +255 205 156 +230 156 115 +189 115 82 +98 106 65 +115 222 82 +74 172 65 +49 98 65 +255 238 164 +255 189 131 diff --git a/graphics/items/icon_palettes/petaya_berry.pal b/graphics/items/icon_palettes/petaya_berry.pal new file mode 100644 index 000000000..582e58207 --- /dev/null +++ b/graphics/items/icon_palettes/petaya_berry.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +180 180 180 +49 49 49 +246 164 123 +139 74 49 +197 123 82 +255 213 197 +213 189 148 +197 238 139 +164 139 98 +98 49 16 +131 189 106 +106 164 82 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/pinap_berry.pal b/graphics/items/icon_palettes/pinap_berry.pal new file mode 100644 index 000000000..28ffd0897 --- /dev/null +++ b/graphics/items/icon_palettes/pinap_berry.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +180 180 180 +49 49 49 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +189 180 98 +246 230 74 +222 205 82 +205 180 82 +148 139 90 +123 222 90 +82 189 90 +74 106 65 +255 246 148 +106 106 65 diff --git a/graphics/items/icon_palettes/pink_scarf.pal b/graphics/items/icon_palettes/pink_scarf.pal new file mode 100644 index 000000000..ebf7456af --- /dev/null +++ b/graphics/items/icon_palettes/pink_scarf.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +180 180 180 +49 49 49 +213 131 156 +255 172 205 +164 98 131 +230 139 180 +255 197 230 +246 156 197 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/poison_barb.pal b/graphics/items/icon_palettes/poison_barb.pal new file mode 100644 index 000000000..41da14ae7 --- /dev/null +++ b/graphics/items/icon_palettes/poison_barb.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +180 180 180 +49 49 49 +255 255 255 +197 148 197 +238 189 238 +98 98 98 +213 213 213 +255 230 255 +148 98 148 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/poison_tm_hm.pal b/graphics/items/icon_palettes/poison_tm_hm.pal new file mode 100644 index 000000000..4b9484f6b --- /dev/null +++ b/graphics/items/icon_palettes/poison_tm_hm.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +180 180 180 +49 49 49 +74 74 98 +255 222 197 +255 205 172 +255 189 148 +255 180 123 +230 148 156 +205 123 189 +180 98 222 +123 123 148 +123 123 123 +98 98 123 +255 255 255 +255 238 230 +82 82 82 diff --git a/graphics/items/icon_palettes/poke_ball.pal b/graphics/items/icon_palettes/poke_ball.pal new file mode 100644 index 000000000..89182c210 --- /dev/null +++ b/graphics/items/icon_palettes/poke_ball.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +180 180 180 +49 49 49 +74 82 82 +123 123 131 +164 164 197 +222 205 246 +255 255 255 +156 74 57 +180 82 57 +222 90 57 +255 148 57 +255 213 57 +255 0 255 +255 0 255 +255 0 255 +255 0 255 diff --git a/graphics/items/icon_palettes/poke_doll.pal b/graphics/items/icon_palettes/poke_doll.pal new file mode 100644 index 000000000..6d4940d31 --- /dev/null +++ b/graphics/items/icon_palettes/poke_doll.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +180 180 180 +49 49 49 +98 65 0 +255 213 222 +246 180 213 +213 148 180 +164 98 131 +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 diff --git a/graphics/items/icon_palettes/poke_flute.pal b/graphics/items/icon_palettes/poke_flute.pal new file mode 100644 index 000000000..736a6ad2c --- /dev/null +++ b/graphics/items/icon_palettes/poke_flute.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +180 180 180 +49 49 49 +213 82 57 +164 32 8 +238 238 246 +123 123 131 +197 172 49 +238 213 98 +255 246 131 +246 115 90 +205 205 213 +189 57 32 +148 98 41 +0 0 0 +0 0 0 +255 255 255 diff --git a/graphics/items/icon_palettes/pokeblock_case.pal b/graphics/items/icon_palettes/pokeblock_case.pal new file mode 100644 index 000000000..3019dca83 --- /dev/null +++ b/graphics/items/icon_palettes/pokeblock_case.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +180 180 180 +49 49 49 +197 115 106 +230 222 246 +197 180 205 +189 230 255 +82 123 164 +246 197 189 +131 230 148 +139 180 238 +123 106 131 +123 74 65 +230 156 148 +49 90 131 +255 255 255 +238 180 172 diff --git a/graphics/items/icon_palettes/pomeg_berry.pal b/graphics/items/icon_palettes/pomeg_berry.pal new file mode 100644 index 000000000..d580c7800 --- /dev/null +++ b/graphics/items/icon_palettes/pomeg_berry.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +180 180 180 +49 49 49 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +255 148 49 +205 74 49 +131 57 49 +230 115 49 +255 222 82 +0 0 0 +90 180 82 +0 0 0 +49 98 82 diff --git a/graphics/items/icon_palettes/potion.pal b/graphics/items/icon_palettes/potion.pal new file mode 100644 index 000000000..d1c83395c --- /dev/null +++ b/graphics/items/icon_palettes/potion.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +180 180 180 +49 49 49 +164 131 205 +197 238 222 +255 255 255 +164 205 189 +131 98 172 +131 172 156 +230 255 255 +230 197 255 +82 123 106 +90 57 131 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/powder_jar.pal b/graphics/items/icon_palettes/powder_jar.pal new file mode 100644 index 000000000..a4c34253b --- /dev/null +++ b/graphics/items/icon_palettes/powder_jar.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +180 180 180 +49 49 49 +255 255 255 +139 131 49 +213 172 49 +255 238 74 +131 98 49 +230 205 57 +115 246 115 +74 189 82 +98 74 49 +255 180 49 +238 189 49 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/pp_max.pal b/graphics/items/icon_palettes/pp_max.pal new file mode 100644 index 000000000..18792e2da --- /dev/null +++ b/graphics/items/icon_palettes/pp_max.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +180 180 180 +49 49 49 +255 246 246 +90 148 57 +255 230 90 +255 255 230 +139 139 8 +148 189 41 +197 255 115 +222 197 197 +246 230 230 +197 172 172 +197 123 197 +172 82 172 +238 148 238 +230 205 74 diff --git a/graphics/items/icon_palettes/pp_up.pal b/graphics/items/icon_palettes/pp_up.pal new file mode 100644 index 000000000..89e493779 --- /dev/null +++ b/graphics/items/icon_palettes/pp_up.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +180 180 180 +49 49 49 +246 255 246 +148 90 57 +189 90 189 +246 164 246 +139 65 139 +189 148 41 +255 197 115 +197 222 197 +230 246 230 +172 197 172 +98 189 189 +74 164 164 +49 139 139 +0 0 0 diff --git a/graphics/items/icon_palettes/protein.pal b/graphics/items/icon_palettes/protein.pal new file mode 100644 index 000000000..913a87ea4 --- /dev/null +++ b/graphics/items/icon_palettes/protein.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +180 180 180 +49 49 49 +246 255 246 +148 90 57 +197 98 98 +246 164 164 +139 65 65 +189 148 41 +255 197 115 +197 222 197 +230 246 230 +172 197 172 +246 164 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/psychic_tm_hm.pal b/graphics/items/icon_palettes/psychic_tm_hm.pal new file mode 100644 index 000000000..7a047b8d6 --- /dev/null +++ b/graphics/items/icon_palettes/psychic_tm_hm.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +180 180 180 +49 49 49 +74 74 98 +255 230 230 +255 222 213 +255 213 205 +255 197 197 +255 189 180 +255 180 172 +255 172 164 +123 123 148 +123 123 123 +98 98 123 +255 255 255 +255 246 246 +82 82 82 diff --git a/graphics/items/icon_palettes/qualot_berry.pal b/graphics/items/icon_palettes/qualot_berry.pal new file mode 100644 index 000000000..15bdb5ac5 --- /dev/null +++ b/graphics/items/icon_palettes/qualot_berry.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +180 180 180 +49 49 49 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +255 213 131 +238 156 115 +246 189 123 +255 246 131 +0 0 0 +156 139 74 +189 180 98 +222 213 115 +238 246 123 diff --git a/graphics/items/icon_palettes/question_mark.pal b/graphics/items/icon_palettes/question_mark.pal new file mode 100644 index 000000000..7bf4ffb4d --- /dev/null +++ b/graphics/items/icon_palettes/question_mark.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 164 98 +0 0 0 +255 255 255 +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 diff --git a/graphics/items/icon_palettes/quick_claw.pal b/graphics/items/icon_palettes/quick_claw.pal new file mode 100644 index 000000000..169de57a1 --- /dev/null +++ b/graphics/items/icon_palettes/quick_claw.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +180 180 180 +49 49 49 +197 197 197 +255 255 255 +222 197 106 +255 222 213 +205 156 82 +172 123 57 +123 123 123 +246 246 205 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/rabuta_berry.pal b/graphics/items/icon_palettes/rabuta_berry.pal new file mode 100644 index 000000000..6c20fdb38 --- /dev/null +++ b/graphics/items/icon_palettes/rabuta_berry.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +180 180 180 +49 49 49 +139 213 115 +246 238 205 +197 189 131 +148 139 82 +49 98 24 +65 139 41 +115 189 90 +82 82 32 +172 238 139 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/rainbow_pass.pal b/graphics/items/icon_palettes/rainbow_pass.pal new file mode 100644 index 000000000..ca5ae1da5 --- /dev/null +++ b/graphics/items/icon_palettes/rainbow_pass.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +164 164 123 +49 49 49 +65 82 180 +74 148 255 +238 156 98 +255 246 90 +74 115 205 +205 115 148 +139 230 255 +98 205 255 +255 189 164 +0 0 0 +255 255 197 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/rare_candy.pal b/graphics/items/icon_palettes/rare_candy.pal new file mode 100644 index 000000000..b1be69b51 --- /dev/null +++ b/graphics/items/icon_palettes/rare_candy.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +180 180 180 +49 49 49 +156 189 255 +98 115 213 +123 148 238 +41 57 156 +82 98 197 +213 238 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/rawst_berry.pal b/graphics/items/icon_palettes/rawst_berry.pal new file mode 100644 index 000000000..df09ffb83 --- /dev/null +++ b/graphics/items/icon_palettes/rawst_berry.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +180 180 180 +49 49 49 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +98 90 123 +131 148 172 +148 213 213 +139 180 213 +148 230 230 +90 213 82 +65 156 65 +49 106 65 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/razz_berry.pal b/graphics/items/icon_palettes/razz_berry.pal new file mode 100644 index 000000000..5bc2e66bb --- /dev/null +++ b/graphics/items/icon_palettes/razz_berry.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +180 180 180 +49 49 49 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +255 172 41 +222 90 49 +246 139 41 +156 65 41 +131 238 65 +65 172 65 +41 90 57 +255 230 65 +0 0 0 diff --git a/graphics/items/icon_palettes/red_flute.pal b/graphics/items/icon_palettes/red_flute.pal new file mode 100644 index 000000000..9fec9ed16 --- /dev/null +++ b/graphics/items/icon_palettes/red_flute.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +180 180 180 +49 49 49 +255 255 255 +246 172 139 +172 106 74 +255 205 172 +222 139 106 +65 74 205 +106 115 205 +148 164 222 +65 74 164 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/red_orb.pal b/graphics/items/icon_palettes/red_orb.pal new file mode 100644 index 000000000..dfbaa5cf3 --- /dev/null +++ b/graphics/items/icon_palettes/red_orb.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +180 180 180 +49 49 49 +230 115 106 +222 156 156 +197 82 74 +148 65 57 +255 205 205 +255 255 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/red_scarf.pal b/graphics/items/icon_palettes/red_scarf.pal new file mode 100644 index 000000000..93a579ed2 --- /dev/null +++ b/graphics/items/icon_palettes/red_scarf.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +180 180 180 +49 49 49 +189 82 82 +238 123 123 +139 74 74 +205 98 98 +255 164 172 +222 115 115 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/red_shard.pal b/graphics/items/icon_palettes/red_shard.pal new file mode 100644 index 000000000..2c4c742b4 --- /dev/null +++ b/graphics/items/icon_palettes/red_shard.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +180 180 180 +49 49 49 +246 148 139 +197 90 115 +90 8 32 +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 diff --git a/graphics/items/icon_palettes/repeat_ball.pal b/graphics/items/icon_palettes/repeat_ball.pal new file mode 100644 index 000000000..d61f62a49 --- /dev/null +++ b/graphics/items/icon_palettes/repeat_ball.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +180 180 180 +49 49 49 +74 82 82 +123 123 131 +164 164 197 +222 205 246 +255 255 255 +156 74 57 +180 82 57 +222 90 57 +255 148 57 +255 213 57 +246 246 139 +180 164 57 +222 205 57 +246 238 57 diff --git a/graphics/items/icon_palettes/repel.pal b/graphics/items/icon_palettes/repel.pal new file mode 100644 index 000000000..c7ef0931c --- /dev/null +++ b/graphics/items/icon_palettes/repel.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +180 180 180 +49 49 49 +255 255 255 +213 230 230 +180 197 197 +123 139 139 +0 0 0 +0 0 0 +230 90 57 +189 49 16 +0 0 0 +0 0 0 +0 0 0 +139 230 139 +49 123 49 +82 180 82 diff --git a/graphics/items/icon_palettes/retro_mail.pal b/graphics/items/icon_palettes/retro_mail.pal new file mode 100644 index 000000000..20b896a7d --- /dev/null +++ b/graphics/items/icon_palettes/retro_mail.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +180 180 180 +49 49 49 +246 139 74 +123 205 65 +98 156 230 +246 172 172 +205 148 90 +172 98 65 +65 98 197 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/return_to_field_arrow.pal b/graphics/items/icon_palettes/return_to_field_arrow.pal new file mode 100644 index 000000000..cf4fb2309 --- /dev/null +++ b/graphics/items/icon_palettes/return_to_field_arrow.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 255 255 +57 57 57 +172 172 189 +205 205 222 +255 255 255 +131 131 156 +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 diff --git a/graphics/items/icon_palettes/revival_herb.pal b/graphics/items/icon_palettes/revival_herb.pal new file mode 100644 index 000000000..a68ded8cf --- /dev/null +++ b/graphics/items/icon_palettes/revival_herb.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +180 180 180 +49 49 49 +180 230 115 +115 164 82 +222 197 123 +65 82 41 +148 148 115 +49 123 16 +65 65 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/revive.pal b/graphics/items/icon_palettes/revive.pal new file mode 100644 index 000000000..ec9f04782 --- /dev/null +++ b/graphics/items/icon_palettes/revive.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +180 180 180 +49 49 49 +246 246 197 +230 230 123 +164 164 57 +255 255 255 +74 74 0 +222 238 238 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/rock_tm_hm.pal b/graphics/items/icon_palettes/rock_tm_hm.pal new file mode 100644 index 000000000..80ac40f8d --- /dev/null +++ b/graphics/items/icon_palettes/rock_tm_hm.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +180 180 180 +49 49 49 +74 74 98 +246 238 222 +238 230 197 +238 222 172 +230 213 148 +222 197 115 +222 189 90 +213 180 65 +123 123 148 +123 123 123 +98 98 123 +255 255 255 +255 255 255 +82 82 82 diff --git a/graphics/items/icon_palettes/ruby.pal b/graphics/items/icon_palettes/ruby.pal new file mode 100644 index 000000000..304d1a5ed --- /dev/null +++ b/graphics/items/icon_palettes/ruby.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +180 180 180 +49 49 49 +123 49 65 +197 82 90 +222 123 123 +238 148 148 +255 172 172 +255 197 197 +255 222 222 +255 238 238 +230 156 156 +255 205 205 +139 65 82 +255 213 213 +255 180 180 +164 74 82 diff --git a/graphics/items/icon_palettes/sacred_ash.pal b/graphics/items/icon_palettes/sacred_ash.pal new file mode 100644 index 000000000..4b7ec0b8c --- /dev/null +++ b/graphics/items/icon_palettes/sacred_ash.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +180 180 180 +49 49 49 +222 222 106 +172 172 41 +98 98 24 +246 246 164 +156 156 156 +115 115 115 +205 205 205 +82 82 82 +222 222 222 +255 255 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/safari_ball.pal b/graphics/items/icon_palettes/safari_ball.pal new file mode 100644 index 000000000..84584f01a --- /dev/null +++ b/graphics/items/icon_palettes/safari_ball.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +180 180 180 +49 49 49 +74 82 82 +123 123 131 +164 164 197 +222 205 246 +255 255 255 +74 98 0 +98 123 24 +156 180 82 +115 98 0 +197 180 57 +222 213 123 +16 90 49 +74 148 98 +106 180 139 diff --git a/graphics/items/icon_palettes/salac_berry.pal b/graphics/items/icon_palettes/salac_berry.pal new file mode 100644 index 000000000..f04414811 --- /dev/null +++ b/graphics/items/icon_palettes/salac_berry.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +180 180 180 +49 49 49 +123 189 115 +49 115 41 +164 213 131 +213 246 180 +74 139 74 +230 246 123 +205 222 106 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/sapphire.pal b/graphics/items/icon_palettes/sapphire.pal new file mode 100644 index 000000000..7e7cf1b8f --- /dev/null +++ b/graphics/items/icon_palettes/sapphire.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +180 180 180 +49 49 49 +65 49 123 +90 82 197 +123 123 222 +148 148 238 +172 172 255 +197 197 255 +222 222 255 +238 238 255 +156 156 230 +205 205 255 +82 65 139 +213 213 255 +180 180 255 +82 74 164 diff --git a/graphics/items/icon_palettes/scanner.pal b/graphics/items/icon_palettes/scanner.pal new file mode 100644 index 000000000..e8df36f35 --- /dev/null +++ b/graphics/items/icon_palettes/scanner.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +180 180 180 +49 49 49 +0 148 0 +0 230 0 +82 106 164 +156 180 238 +197 222 255 +98 90 41 +222 213 65 +41 65 115 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +82 82 106 +238 238 255 diff --git a/graphics/items/icon_palettes/scope_lens.pal b/graphics/items/icon_palettes/scope_lens.pal new file mode 100644 index 000000000..8c73e8faa --- /dev/null +++ b/graphics/items/icon_palettes/scope_lens.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +180 180 180 +49 49 49 +164 180 197 +106 123 139 +213 90 74 +123 156 213 +197 213 230 +65 82 98 +82 115 172 +148 164 180 +246 238 82 +238 197 74 +148 115 41 +238 246 255 +115 82 8 +0 0 0 diff --git a/graphics/items/icon_palettes/sea_incense.pal b/graphics/items/icon_palettes/sea_incense.pal new file mode 100644 index 000000000..f7b7e5e5c --- /dev/null +++ b/graphics/items/icon_palettes/sea_incense.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +180 180 180 +49 49 49 +98 164 246 +74 115 197 +197 222 246 +172 197 222 +49 90 156 +131 197 255 +180 164 115 +164 148 98 +115 98 49 +238 230 197 +74 98 115 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/secret_key.pal b/graphics/items/icon_palettes/secret_key.pal new file mode 100644 index 000000000..d0bf3faba --- /dev/null +++ b/graphics/items/icon_palettes/secret_key.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +180 180 180 +49 49 49 +148 148 49 +115 106 16 +255 255 238 +189 197 41 +197 197 98 +90 90 90 +205 213 205 +156 164 156 +238 246 238 +115 115 115 +0 0 0 +255 115 115 +197 74 74 +230 90 90 diff --git a/graphics/items/icon_palettes/shadow_mail.pal b/graphics/items/icon_palettes/shadow_mail.pal new file mode 100644 index 000000000..064d2f8fa --- /dev/null +++ b/graphics/items/icon_palettes/shadow_mail.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +180 180 180 +49 49 49 +197 172 164 +98 74 65 +74 57 57 +255 98 98 +255 238 238 +197 82 82 +139 115 106 +156 131 123 +156 164 172 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/sharp_beak.pal b/graphics/items/icon_palettes/sharp_beak.pal new file mode 100644 index 000000000..efbe91cb4 --- /dev/null +++ b/graphics/items/icon_palettes/sharp_beak.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +180 180 180 +49 49 49 +246 222 90 +213 172 57 +139 98 32 +255 246 189 +255 230 156 +106 65 24 +189 148 57 +49 74 49 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/shell.pal b/graphics/items/icon_palettes/shell.pal new file mode 100644 index 000000000..dbbcc75ef --- /dev/null +++ b/graphics/items/icon_palettes/shell.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +180 180 180 +49 49 49 +238 213 213 +213 246 238 +205 205 197 +255 255 222 +255 255 255 +230 230 230 +164 180 180 +74 74 74 +213 172 172 +156 205 197 +164 164 164 +123 139 139 +255 255 205 +0 0 0 diff --git a/graphics/items/icon_palettes/shoal_salt.pal b/graphics/items/icon_palettes/shoal_salt.pal new file mode 100644 index 000000000..85e6fd59d --- /dev/null +++ b/graphics/items/icon_palettes/shoal_salt.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +180 180 180 +49 49 49 +255 255 255 +238 205 131 +131 131 131 +197 164 82 +205 205 205 +238 238 238 +115 90 32 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/silk_scarf.pal b/graphics/items/icon_palettes/silk_scarf.pal new file mode 100644 index 000000000..6c3517350 --- /dev/null +++ b/graphics/items/icon_palettes/silk_scarf.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +180 180 180 +49 49 49 +230 255 255 +222 230 230 +197 205 205 +106 123 115 +255 255 255 +238 246 246 +82 98 90 +172 180 180 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/silph_scope.pal b/graphics/items/icon_palettes/silph_scope.pal new file mode 100644 index 000000000..5697ed196 --- /dev/null +++ b/graphics/items/icon_palettes/silph_scope.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +180 180 180 +49 49 49 +255 255 255 +246 139 139 +106 164 222 +189 65 65 +255 189 189 +148 205 255 +74 98 156 +197 213 197 +139 164 139 +65 90 65 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/silver_powder.pal b/graphics/items/icon_palettes/silver_powder.pal new file mode 100644 index 000000000..5f5253d57 --- /dev/null +++ b/graphics/items/icon_palettes/silver_powder.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +180 180 180 +49 49 49 +255 255 255 +139 213 139 +115 115 115 +106 189 106 +156 156 156 +197 197 197 +65 115 65 +238 238 238 +213 213 213 +189 230 189 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/sitrus_berry.pal b/graphics/items/icon_palettes/sitrus_berry.pal new file mode 100644 index 000000000..2a594b09a --- /dev/null +++ b/graphics/items/icon_palettes/sitrus_berry.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +180 180 180 +49 49 49 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +255 238 106 +213 180 74 +139 115 57 +230 180 65 +238 213 90 +106 213 90 +0 0 0 +82 131 74 +172 115 49 diff --git a/graphics/items/icon_palettes/smoke_ball.pal b/graphics/items/icon_palettes/smoke_ball.pal new file mode 100644 index 000000000..07d6cf14b --- /dev/null +++ b/graphics/items/icon_palettes/smoke_ball.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +180 180 180 +49 49 49 +222 189 230 +213 164 230 +148 123 205 +255 246 255 +115 115 115 +246 222 246 +230 205 246 +148 98 164 +197 148 213 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/soda_pop.pal b/graphics/items/icon_palettes/soda_pop.pal new file mode 100644 index 000000000..f5662444b --- /dev/null +++ b/graphics/items/icon_palettes/soda_pop.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +180 180 180 +49 49 49 +49 74 74 +90 123 123 +139 189 197 +189 238 246 +82 156 205 +131 205 255 +255 255 255 +238 230 230 +197 180 180 +57 131 180 +189 213 255 +156 205 238 +106 189 230 +0 0 0 diff --git a/graphics/items/icon_palettes/soft_sand.pal b/graphics/items/icon_palettes/soft_sand.pal new file mode 100644 index 000000000..5f48b04ea --- /dev/null +++ b/graphics/items/icon_palettes/soft_sand.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +180 180 180 +49 49 49 +213 156 213 +156 98 156 +115 57 115 +238 180 238 +246 230 156 +205 172 115 +255 246 213 +148 106 74 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/soot_sack.pal b/graphics/items/icon_palettes/soot_sack.pal new file mode 100644 index 000000000..ece17a7e0 --- /dev/null +++ b/graphics/items/icon_palettes/soot_sack.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +180 180 180 +49 49 49 +238 238 255 +246 197 156 +148 139 172 +74 74 106 +213 205 238 +230 230 246 +180 172 205 +238 238 255 +222 172 123 +189 139 90 +156 106 65 +131 123 156 +98 65 49 +0 0 0 diff --git a/graphics/items/icon_palettes/soothe_bell.pal b/graphics/items/icon_palettes/soothe_bell.pal new file mode 100644 index 000000000..3c64f14c7 --- /dev/null +++ b/graphics/items/icon_palettes/soothe_bell.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +180 180 180 +49 49 49 +255 255 255 +230 230 230 +82 82 82 +123 123 123 +164 164 164 +205 205 205 +213 115 106 +131 49 49 +164 90 82 +255 189 189 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/soul_dew.pal b/graphics/items/icon_palettes/soul_dew.pal new file mode 100644 index 000000000..a262960a7 --- /dev/null +++ b/graphics/items/icon_palettes/soul_dew.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +180 180 180 +49 49 49 +255 255 255 +65 90 180 +98 123 213 +205 222 255 +222 197 246 +172 148 213 +41 65 156 +222 238 238 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/spell_tag.pal b/graphics/items/icon_palettes/spell_tag.pal new file mode 100644 index 000000000..c671dbf5b --- /dev/null +++ b/graphics/items/icon_palettes/spell_tag.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +180 180 180 +49 49 49 +246 148 148 +82 82 82 +255 255 255 +205 205 205 +156 156 156 +148 148 148 +197 98 98 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/spelon_berry.pal b/graphics/items/icon_palettes/spelon_berry.pal new file mode 100644 index 000000000..bea46d8c0 --- /dev/null +++ b/graphics/items/icon_palettes/spelon_berry.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +180 180 180 +49 49 49 +246 123 115 +255 230 156 +205 90 82 +172 90 74 +255 197 115 +255 189 172 +230 106 98 +131 65 57 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/ss_ticket.pal b/graphics/items/icon_palettes/ss_ticket.pal new file mode 100644 index 000000000..d943c9e01 --- /dev/null +++ b/graphics/items/icon_palettes/ss_ticket.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +180 180 180 +49 49 49 +213 222 222 +49 106 139 +82 164 222 +98 180 238 +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 diff --git a/graphics/items/icon_palettes/star.pal b/graphics/items/icon_palettes/star.pal new file mode 100644 index 000000000..d37358e90 --- /dev/null +++ b/graphics/items/icon_palettes/star.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +180 180 180 +49 49 49 +98 156 213 +41 98 156 +24 57 115 +123 180 238 +246 164 164 +222 115 115 +255 222 222 +156 74 74 +255 255 255 +131 49 49 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/starf_berry.pal b/graphics/items/icon_palettes/starf_berry.pal new file mode 100644 index 000000000..bbc1b7aed --- /dev/null +++ b/graphics/items/icon_palettes/starf_berry.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +180 180 180 +49 49 49 +164 230 106 +123 189 65 +213 255 197 +98 148 213 +238 222 65 +238 90 65 +82 148 57 +222 172 57 +189 238 156 +65 106 41 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/steel_tm_hm.pal b/graphics/items/icon_palettes/steel_tm_hm.pal new file mode 100644 index 000000000..73df7faab --- /dev/null +++ b/graphics/items/icon_palettes/steel_tm_hm.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +180 180 180 +49 49 49 +74 74 98 +222 222 222 +213 213 213 +197 197 197 +189 189 189 +148 172 180 +115 164 172 +82 156 164 +123 123 148 +123 123 123 +98 98 123 +255 255 255 +238 246 246 +82 82 82 diff --git a/graphics/items/icon_palettes/stick.pal b/graphics/items/icon_palettes/stick.pal new file mode 100644 index 000000000..e1a16804c --- /dev/null +++ b/graphics/items/icon_palettes/stick.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +180 180 180 +49 49 49 +123 189 8 +180 213 74 +74 148 0 +32 98 0 +197 213 180 +230 230 197 +180 180 139 +98 98 57 +255 255 246 +205 238 98 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/sun_stone.pal b/graphics/items/icon_palettes/sun_stone.pal new file mode 100644 index 000000000..e4af237df --- /dev/null +++ b/graphics/items/icon_palettes/sun_stone.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +180 180 180 +49 49 49 +197 98 41 +255 172 115 +131 74 41 +230 115 57 +255 238 205 +246 131 74 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/super_potion.pal b/graphics/items/icon_palettes/super_potion.pal new file mode 100644 index 000000000..76e58020a --- /dev/null +++ b/graphics/items/icon_palettes/super_potion.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +180 180 180 +49 49 49 +222 131 131 +255 222 131 +255 255 238 +230 189 106 +197 98 90 +180 139 65 +255 246 180 +255 172 148 +148 106 49 +148 82 74 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/super_repel.pal b/graphics/items/icon_palettes/super_repel.pal new file mode 100644 index 000000000..c9c489689 --- /dev/null +++ b/graphics/items/icon_palettes/super_repel.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +180 180 180 +49 49 49 +255 255 255 +213 230 230 +180 197 197 +123 139 139 +0 0 0 +0 0 0 +213 189 189 +139 115 115 +0 0 0 +0 0 0 +0 0 0 +246 246 255 +148 148 172 +205 205 230 diff --git a/graphics/items/icon_palettes/super_rod.pal b/graphics/items/icon_palettes/super_rod.pal new file mode 100644 index 000000000..324e773a5 --- /dev/null +++ b/graphics/items/icon_palettes/super_rod.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +180 180 180 +49 49 49 +205 197 197 +148 131 131 +82 82 139 +123 123 180 +90 82 82 +197 222 230 +156 180 189 +106 131 139 +205 90 57 +246 131 98 +255 255 255 +82 238 82 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/tamato_berry.pal b/graphics/items/icon_palettes/tamato_berry.pal new file mode 100644 index 000000000..cca4901ad --- /dev/null +++ b/graphics/items/icon_palettes/tamato_berry.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +180 180 180 +49 49 49 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +255 148 49 +205 74 49 +131 57 49 +230 115 49 +255 213 49 +0 0 0 +49 164 82 +115 222 82 +49 98 82 diff --git a/graphics/items/icon_palettes/tea.pal b/graphics/items/icon_palettes/tea.pal new file mode 100644 index 000000000..8285602d9 --- /dev/null +++ b/graphics/items/icon_palettes/tea.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +180 180 180 +49 49 49 +180 172 156 +238 230 230 +131 115 106 +205 255 156 +246 230 222 +197 180 156 +131 255 32 +98 82 65 +205 189 172 +148 230 24 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/teachy_tv.pal b/graphics/items/icon_palettes/teachy_tv.pal new file mode 100644 index 000000000..7de3e7f77 --- /dev/null +++ b/graphics/items/icon_palettes/teachy_tv.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +164 164 123 +49 49 49 +98 106 98 +255 205 74 +74 74 57 +98 156 148 +115 205 189 +148 131 74 +205 164 74 +255 230 74 +213 205 172 +156 139 115 +222 180 74 +82 98 98 +115 115 115 +246 246 238 diff --git a/graphics/items/icon_palettes/thick_club.pal b/graphics/items/icon_palettes/thick_club.pal new file mode 100644 index 000000000..819dfebad --- /dev/null +++ b/graphics/items/icon_palettes/thick_club.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +180 180 180 +49 49 49 +230 238 205 +189 197 164 +156 156 131 +213 213 172 +131 131 98 +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 diff --git a/graphics/items/icon_palettes/thunder_stone.pal b/graphics/items/icon_palettes/thunder_stone.pal new file mode 100644 index 000000000..debec0709 --- /dev/null +++ b/graphics/items/icon_palettes/thunder_stone.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +180 180 180 +49 49 49 +246 255 246 +139 213 139 +74 148 74 +213 238 123 +106 180 106 +41 115 41 +180 205 90 +172 246 172 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/tm_case.pal b/graphics/items/icon_palettes/tm_case.pal new file mode 100644 index 000000000..04e3fcd66 --- /dev/null +++ b/graphics/items/icon_palettes/tm_case.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +32 148 57 +49 49 49 +74 74 82 +123 148 131 +180 205 238 +246 230 41 +82 98 123 +230 189 41 +90 115 98 +82 148 197 +180 148 41 +0 0 0 +106 98 41 +205 230 246 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/town_map.pal b/graphics/items/icon_palettes/town_map.pal new file mode 100644 index 000000000..b55ac92ee --- /dev/null +++ b/graphics/items/icon_palettes/town_map.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +164 222 106 +49 49 49 +148 98 41 +238 139 41 +57 90 139 +246 230 41 +90 82 74 +148 131 156 +205 222 238 +156 164 189 +197 180 41 +131 123 41 +238 246 255 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/tri_pass.pal b/graphics/items/icon_palettes/tri_pass.pal new file mode 100644 index 000000000..a4806b9c5 --- /dev/null +++ b/graphics/items/icon_palettes/tri_pass.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +164 164 123 +49 49 49 +57 98 189 +82 156 255 +57 148 65 +74 172 65 +41 172 106 +98 205 255 +106 222 255 +41 197 131 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/tropic_mail.pal b/graphics/items/icon_palettes/tropic_mail.pal new file mode 100644 index 000000000..0a07e3ea4 --- /dev/null +++ b/graphics/items/icon_palettes/tropic_mail.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +180 180 180 +49 49 49 +205 246 172 +172 238 139 +106 172 74 +246 172 131 +197 123 82 +238 222 139 +230 156 115 +90 131 74 +156 222 123 +230 246 189 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/twisted_spoon.pal b/graphics/items/icon_palettes/twisted_spoon.pal new file mode 100644 index 000000000..4d93de7a1 --- /dev/null +++ b/graphics/items/icon_palettes/twisted_spoon.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +180 180 180 +49 49 49 +246 255 255 +106 131 131 +230 246 246 +156 172 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 diff --git a/graphics/items/icon_palettes/ultra_ball.pal b/graphics/items/icon_palettes/ultra_ball.pal new file mode 100644 index 000000000..0aca283a1 --- /dev/null +++ b/graphics/items/icon_palettes/ultra_ball.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +180 180 180 +49 49 49 +74 82 82 +123 123 131 +164 164 197 +222 205 246 +255 255 255 +57 74 90 +82 98 106 +115 131 148 +164 180 197 +213 172 16 +255 213 57 +255 246 90 +255 0 255 +255 0 255 diff --git a/graphics/items/icon_palettes/up_grade.pal b/graphics/items/icon_palettes/up_grade.pal new file mode 100644 index 000000000..ee3dfee40 --- /dev/null +++ b/graphics/items/icon_palettes/up_grade.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +180 180 180 +49 49 49 +213 213 180 +131 131 106 +238 255 213 +98 98 74 +255 246 222 +172 172 148 +238 238 197 +230 189 189 +230 148 0 +238 238 213 +197 197 197 +131 131 131 +255 222 0 +164 213 164 diff --git a/graphics/items/icon_palettes/vs_seeker.pal b/graphics/items/icon_palettes/vs_seeker.pal new file mode 100644 index 000000000..12de7db41 --- /dev/null +++ b/graphics/items/icon_palettes/vs_seeker.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +164 222 106 +49 49 49 +222 238 238 +180 197 197 +49 82 148 +255 255 255 +65 131 230 +115 205 255 +148 156 180 +74 90 106 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/wailmer_pail.pal b/graphics/items/icon_palettes/wailmer_pail.pal new file mode 100644 index 000000000..0aa71a151 --- /dev/null +++ b/graphics/items/icon_palettes/wailmer_pail.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +180 180 180 +49 49 49 +180 180 213 +139 139 197 +90 90 148 +246 246 238 +222 222 213 +189 189 180 +222 222 255 +131 131 123 +57 57 115 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/water_stone.pal b/graphics/items/icon_palettes/water_stone.pal new file mode 100644 index 000000000..3a27802cc --- /dev/null +++ b/graphics/items/icon_palettes/water_stone.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +180 180 180 +49 49 49 +98 82 205 +156 131 255 +197 197 255 +238 238 255 +222 222 255 +74 74 180 +106 106 222 +172 205 246 +148 180 222 +115 148 189 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/water_tm_hm.pal b/graphics/items/icon_palettes/water_tm_hm.pal new file mode 100644 index 000000000..9d10b3c1d --- /dev/null +++ b/graphics/items/icon_palettes/water_tm_hm.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +180 180 180 +49 49 49 +74 74 98 +205 230 246 +180 213 246 +164 205 246 +139 197 238 +115 180 238 +90 172 238 +74 164 238 +123 123 148 +123 123 123 +98 98 123 +255 255 255 +238 246 246 +82 82 82 diff --git a/graphics/items/icon_palettes/watmel_berry.pal b/graphics/items/icon_palettes/watmel_berry.pal new file mode 100644 index 000000000..d5b9a5e5c --- /dev/null +++ b/graphics/items/icon_palettes/watmel_berry.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +180 180 180 +49 49 49 +255 197 172 +156 213 90 +90 148 57 +222 148 123 +246 172 148 +139 197 74 +115 172 49 +255 222 205 +180 238 131 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/wave_mail.pal b/graphics/items/icon_palettes/wave_mail.pal new file mode 100644 index 000000000..8e08d49a6 --- /dev/null +++ b/graphics/items/icon_palettes/wave_mail.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +180 180 180 +49 49 49 +148 222 246 +98 131 230 +238 255 255 +255 246 230 +238 222 172 +123 156 246 +65 98 197 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/wepear_berry.pal b/graphics/items/icon_palettes/wepear_berry.pal new file mode 100644 index 000000000..cc4e3ff01 --- /dev/null +++ b/graphics/items/icon_palettes/wepear_berry.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +180 180 180 +49 49 49 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +148 222 74 +115 197 74 +90 164 74 +74 98 74 +180 246 98 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/white_flute.pal b/graphics/items/icon_palettes/white_flute.pal new file mode 100644 index 000000000..6dffd6f79 --- /dev/null +++ b/graphics/items/icon_palettes/white_flute.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +180 180 180 +49 49 49 +255 255 255 +230 230 230 +164 164 164 +230 230 230 +197 197 197 +222 98 222 +222 139 222 +238 189 238 +180 98 180 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/white_herb.pal b/graphics/items/icon_palettes/white_herb.pal new file mode 100644 index 000000000..9869f6495 --- /dev/null +++ b/graphics/items/icon_palettes/white_herb.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +180 180 180 +49 49 49 +255 255 255 +230 213 230 +213 189 213 +246 230 246 +255 238 255 +238 222 238 +148 123 148 +197 172 197 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/wiki_berry.pal b/graphics/items/icon_palettes/wiki_berry.pal new file mode 100644 index 000000000..26a3ca4ca --- /dev/null +++ b/graphics/items/icon_palettes/wiki_berry.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +180 180 180 +49 49 49 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +148 115 230 +98 90 172 +205 164 255 +57 65 123 +131 90 205 +90 213 82 +65 156 65 +74 98 65 +0 0 0 diff --git a/graphics/items/icon_palettes/wood_mail.pal b/graphics/items/icon_palettes/wood_mail.pal new file mode 100644 index 000000000..d0e54475b --- /dev/null +++ b/graphics/items/icon_palettes/wood_mail.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +180 180 180 +49 49 49 +222 205 148 +213 148 106 +172 131 74 +255 246 222 +148 106 49 +230 205 197 +189 123 82 +238 172 131 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/x_accuracy.pal b/graphics/items/icon_palettes/x_accuracy.pal new file mode 100644 index 000000000..4c600d07d --- /dev/null +++ b/graphics/items/icon_palettes/x_accuracy.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +180 180 180 +49 49 49 +205 115 189 +164 82 148 +238 180 222 +255 255 255 +156 148 156 +230 213 230 +115 49 98 +255 230 246 +172 98 156 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/x_attack.pal b/graphics/items/icon_palettes/x_attack.pal new file mode 100644 index 000000000..4976e5623 --- /dev/null +++ b/graphics/items/icon_palettes/x_attack.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +180 180 180 +49 49 49 +230 131 123 +164 74 74 +238 156 172 +255 255 255 +156 148 148 +230 213 213 +131 49 49 +255 230 222 +197 98 115 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/x_defend.pal b/graphics/items/icon_palettes/x_defend.pal new file mode 100644 index 000000000..a76518dbd --- /dev/null +++ b/graphics/items/icon_palettes/x_defend.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +180 180 180 +49 49 49 +123 131 230 +74 74 164 +172 156 238 +255 255 255 +148 148 156 +213 213 230 +57 57 139 +222 230 255 +115 98 197 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/x_special.pal b/graphics/items/icon_palettes/x_special.pal new file mode 100644 index 000000000..6f5bc3d49 --- /dev/null +++ b/graphics/items/icon_palettes/x_special.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +180 180 180 +49 49 49 +205 205 106 +156 156 74 +230 230 172 +255 255 255 +156 156 148 +230 230 213 +106 106 32 +255 255 222 +164 164 90 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/x_speed.pal b/graphics/items/icon_palettes/x_speed.pal new file mode 100644 index 000000000..151380380 --- /dev/null +++ b/graphics/items/icon_palettes/x_speed.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +180 180 180 +49 49 49 +106 205 205 +74 156 156 +172 230 230 +255 255 255 +148 156 156 +213 230 230 +32 106 106 +222 255 255 +90 164 164 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/yellow_flute.pal b/graphics/items/icon_palettes/yellow_flute.pal new file mode 100644 index 000000000..d20ae4498 --- /dev/null +++ b/graphics/items/icon_palettes/yellow_flute.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +180 180 180 +49 49 49 +255 255 255 +230 230 115 +139 139 74 +238 238 172 +205 205 90 +74 205 65 +115 205 106 +164 222 148 +74 172 65 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/yellow_scarf.pal b/graphics/items/icon_palettes/yellow_scarf.pal new file mode 100644 index 000000000..a73b3c245 --- /dev/null +++ b/graphics/items/icon_palettes/yellow_scarf.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +180 180 180 +49 49 49 +197 197 74 +238 238 115 +148 148 41 +213 213 82 +255 255 139 +230 230 98 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/yellow_shard.pal b/graphics/items/icon_palettes/yellow_shard.pal new file mode 100644 index 000000000..3e33880bb --- /dev/null +++ b/graphics/items/icon_palettes/yellow_shard.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +180 180 180 +49 49 49 +255 230 90 +197 172 65 +90 65 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 diff --git a/graphics/items/icon_palettes/zinc.pal b/graphics/items/icon_palettes/zinc.pal new file mode 100644 index 000000000..472936091 --- /dev/null +++ b/graphics/items/icon_palettes/zinc.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +180 180 180 +49 49 49 +246 255 246 +148 90 57 +189 131 49 +238 205 106 +123 106 0 +189 148 41 +255 197 115 +197 222 197 +230 246 230 +172 197 172 +131 222 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icons/acro_bike.png b/graphics/items/icons/acro_bike.png new file mode 100644 index 000000000..c132252eb Binary files /dev/null and b/graphics/items/icons/acro_bike.png differ diff --git a/graphics/items/icons/aguav_berry.png b/graphics/items/icons/aguav_berry.png new file mode 100644 index 000000000..faae50cc6 Binary files /dev/null and b/graphics/items/icons/aguav_berry.png differ diff --git a/graphics/items/icons/amulet_coin.png b/graphics/items/icons/amulet_coin.png new file mode 100644 index 000000000..2d6b3d569 Binary files /dev/null and b/graphics/items/icons/amulet_coin.png differ diff --git a/graphics/items/icons/antidote.png b/graphics/items/icons/antidote.png new file mode 100644 index 000000000..e577fdc29 Binary files /dev/null and b/graphics/items/icons/antidote.png differ diff --git a/graphics/items/icons/apicot_berry.png b/graphics/items/icons/apicot_berry.png new file mode 100644 index 000000000..d3f17b95e Binary files /dev/null and b/graphics/items/icons/apicot_berry.png differ diff --git a/graphics/items/icons/aspear_berry.png b/graphics/items/icons/aspear_berry.png new file mode 100644 index 000000000..1014262f1 Binary files /dev/null and b/graphics/items/icons/aspear_berry.png differ diff --git a/graphics/items/icons/aurora_ticket.png b/graphics/items/icons/aurora_ticket.png new file mode 100644 index 000000000..97827e513 Binary files /dev/null and b/graphics/items/icons/aurora_ticket.png differ diff --git a/graphics/items/icons/basement_key.png b/graphics/items/icons/basement_key.png new file mode 100644 index 000000000..3c31a8851 Binary files /dev/null and b/graphics/items/icons/basement_key.png differ diff --git a/graphics/items/icons/battle_stat_item.png b/graphics/items/icons/battle_stat_item.png new file mode 100644 index 000000000..1b0adfa1f Binary files /dev/null and b/graphics/items/icons/battle_stat_item.png differ diff --git a/graphics/items/icons/bead_mail.png b/graphics/items/icons/bead_mail.png new file mode 100644 index 000000000..b3e784597 Binary files /dev/null and b/graphics/items/icons/bead_mail.png differ diff --git a/graphics/items/icons/belue_berry.png b/graphics/items/icons/belue_berry.png new file mode 100644 index 000000000..8c8acfe53 Binary files /dev/null and b/graphics/items/icons/belue_berry.png differ diff --git a/graphics/items/icons/berry_juice.png b/graphics/items/icons/berry_juice.png new file mode 100644 index 000000000..73c8f0543 Binary files /dev/null and b/graphics/items/icons/berry_juice.png differ diff --git a/graphics/items/icons/berry_pouch.png b/graphics/items/icons/berry_pouch.png new file mode 100644 index 000000000..26f011d65 Binary files /dev/null and b/graphics/items/icons/berry_pouch.png differ diff --git a/graphics/items/icons/bicycle.png b/graphics/items/icons/bicycle.png new file mode 100644 index 000000000..e3051e03b Binary files /dev/null and b/graphics/items/icons/bicycle.png differ diff --git a/graphics/items/icons/big_mushroom.png b/graphics/items/icons/big_mushroom.png new file mode 100644 index 000000000..3ca2d2abc Binary files /dev/null and b/graphics/items/icons/big_mushroom.png differ diff --git a/graphics/items/icons/big_pearl.png b/graphics/items/icons/big_pearl.png new file mode 100644 index 000000000..d21e45d5c Binary files /dev/null and b/graphics/items/icons/big_pearl.png differ diff --git a/graphics/items/icons/bike_voucher.png b/graphics/items/icons/bike_voucher.png new file mode 100644 index 000000000..a39436494 Binary files /dev/null and b/graphics/items/icons/bike_voucher.png differ diff --git a/graphics/items/icons/black_belt.png b/graphics/items/icons/black_belt.png new file mode 100644 index 000000000..9cacaf557 Binary files /dev/null and b/graphics/items/icons/black_belt.png differ diff --git a/graphics/items/icons/black_glasses.png b/graphics/items/icons/black_glasses.png new file mode 100644 index 000000000..740dc9a9f Binary files /dev/null and b/graphics/items/icons/black_glasses.png differ diff --git a/graphics/items/icons/bluk_berry.png b/graphics/items/icons/bluk_berry.png new file mode 100644 index 000000000..8e670c30d Binary files /dev/null and b/graphics/items/icons/bluk_berry.png differ diff --git a/graphics/items/icons/bright_powder.png b/graphics/items/icons/bright_powder.png new file mode 100644 index 000000000..2e7c3b66a Binary files /dev/null and b/graphics/items/icons/bright_powder.png differ diff --git a/graphics/items/icons/card_key.png b/graphics/items/icons/card_key.png new file mode 100644 index 000000000..b57039282 Binary files /dev/null and b/graphics/items/icons/card_key.png differ diff --git a/graphics/items/icons/charcoal.png b/graphics/items/icons/charcoal.png new file mode 100644 index 000000000..5f19f6e8a Binary files /dev/null and b/graphics/items/icons/charcoal.png differ diff --git a/graphics/items/icons/cheri_berry.png b/graphics/items/icons/cheri_berry.png new file mode 100644 index 000000000..cdd0ad96d Binary files /dev/null and b/graphics/items/icons/cheri_berry.png differ diff --git a/graphics/items/icons/chesto_berry.png b/graphics/items/icons/chesto_berry.png new file mode 100644 index 000000000..0d4484518 Binary files /dev/null and b/graphics/items/icons/chesto_berry.png differ diff --git a/graphics/items/icons/choice_band.png b/graphics/items/icons/choice_band.png new file mode 100644 index 000000000..0e5658260 Binary files /dev/null and b/graphics/items/icons/choice_band.png differ diff --git a/graphics/items/icons/claw_fossil.png b/graphics/items/icons/claw_fossil.png new file mode 100644 index 000000000..51578f634 Binary files /dev/null and b/graphics/items/icons/claw_fossil.png differ diff --git a/graphics/items/icons/cleanse_tag.png b/graphics/items/icons/cleanse_tag.png new file mode 100644 index 000000000..44d74c053 Binary files /dev/null and b/graphics/items/icons/cleanse_tag.png differ diff --git a/graphics/items/icons/coin_case.png b/graphics/items/icons/coin_case.png new file mode 100644 index 000000000..675642aa7 Binary files /dev/null and b/graphics/items/icons/coin_case.png differ diff --git a/graphics/items/icons/contest_pass.png b/graphics/items/icons/contest_pass.png new file mode 100644 index 000000000..7160d5c5d Binary files /dev/null and b/graphics/items/icons/contest_pass.png differ diff --git a/graphics/items/icons/cornn_berry.png b/graphics/items/icons/cornn_berry.png new file mode 100644 index 000000000..7a3ddd481 Binary files /dev/null and b/graphics/items/icons/cornn_berry.png differ diff --git a/graphics/items/icons/deep_sea_scale.png b/graphics/items/icons/deep_sea_scale.png new file mode 100644 index 000000000..41ec035fe Binary files /dev/null and b/graphics/items/icons/deep_sea_scale.png differ diff --git a/graphics/items/icons/deep_sea_tooth.png b/graphics/items/icons/deep_sea_tooth.png new file mode 100644 index 000000000..8fe0d4a5c Binary files /dev/null and b/graphics/items/icons/deep_sea_tooth.png differ diff --git a/graphics/items/icons/devon_goods.png b/graphics/items/icons/devon_goods.png new file mode 100644 index 000000000..8feffd30c Binary files /dev/null and b/graphics/items/icons/devon_goods.png differ diff --git a/graphics/items/icons/devon_scope.png b/graphics/items/icons/devon_scope.png new file mode 100644 index 000000000..88702cbe4 Binary files /dev/null and b/graphics/items/icons/devon_scope.png differ diff --git a/graphics/items/icons/dive_ball.png b/graphics/items/icons/dive_ball.png new file mode 100644 index 000000000..dcd13177f Binary files /dev/null and b/graphics/items/icons/dive_ball.png differ diff --git a/graphics/items/icons/dome_fossil.png b/graphics/items/icons/dome_fossil.png new file mode 100644 index 000000000..78ea129d9 Binary files /dev/null and b/graphics/items/icons/dome_fossil.png differ diff --git a/graphics/items/icons/dragon_fang.png b/graphics/items/icons/dragon_fang.png new file mode 100644 index 000000000..96d799b36 Binary files /dev/null and b/graphics/items/icons/dragon_fang.png differ diff --git a/graphics/items/icons/dragon_scale.png b/graphics/items/icons/dragon_scale.png new file mode 100644 index 000000000..08db6d68d Binary files /dev/null and b/graphics/items/icons/dragon_scale.png differ diff --git a/graphics/items/icons/dream_mail.png b/graphics/items/icons/dream_mail.png new file mode 100644 index 000000000..53b296175 Binary files /dev/null and b/graphics/items/icons/dream_mail.png differ diff --git a/graphics/items/icons/durin_berry.png b/graphics/items/icons/durin_berry.png new file mode 100644 index 000000000..95e4c86a1 Binary files /dev/null and b/graphics/items/icons/durin_berry.png differ diff --git a/graphics/items/icons/energy_root.png b/graphics/items/icons/energy_root.png new file mode 100644 index 000000000..04a11641b Binary files /dev/null and b/graphics/items/icons/energy_root.png differ diff --git a/graphics/items/icons/enigma_berry.png b/graphics/items/icons/enigma_berry.png new file mode 100644 index 000000000..d8d6368d1 Binary files /dev/null and b/graphics/items/icons/enigma_berry.png differ diff --git a/graphics/items/icons/eon_ticket.png b/graphics/items/icons/eon_ticket.png new file mode 100644 index 000000000..b631d96f3 Binary files /dev/null and b/graphics/items/icons/eon_ticket.png differ diff --git a/graphics/items/icons/escape_rope.png b/graphics/items/icons/escape_rope.png new file mode 100644 index 000000000..9213aefa2 Binary files /dev/null and b/graphics/items/icons/escape_rope.png differ diff --git a/graphics/items/icons/ether.png b/graphics/items/icons/ether.png new file mode 100644 index 000000000..b94d9567b Binary files /dev/null and b/graphics/items/icons/ether.png differ diff --git a/graphics/items/icons/everstone.png b/graphics/items/icons/everstone.png new file mode 100644 index 000000000..7bdd2409a Binary files /dev/null and b/graphics/items/icons/everstone.png differ diff --git a/graphics/items/icons/exp_share.png b/graphics/items/icons/exp_share.png new file mode 100644 index 000000000..46444261d Binary files /dev/null and b/graphics/items/icons/exp_share.png differ diff --git a/graphics/items/icons/fab_mail.png b/graphics/items/icons/fab_mail.png new file mode 100644 index 000000000..969faaf31 Binary files /dev/null and b/graphics/items/icons/fab_mail.png differ diff --git a/graphics/items/icons/fame_checker.png b/graphics/items/icons/fame_checker.png new file mode 100644 index 000000000..20f4d13a8 Binary files /dev/null and b/graphics/items/icons/fame_checker.png differ diff --git a/graphics/items/icons/figy_berry.png b/graphics/items/icons/figy_berry.png new file mode 100644 index 000000000..c3c3fbb35 Binary files /dev/null and b/graphics/items/icons/figy_berry.png differ diff --git a/graphics/items/icons/fire_stone.png b/graphics/items/icons/fire_stone.png new file mode 100644 index 000000000..147fd9470 Binary files /dev/null and b/graphics/items/icons/fire_stone.png differ diff --git a/graphics/items/icons/fluffy_tail.png b/graphics/items/icons/fluffy_tail.png new file mode 100644 index 000000000..ddc4c194e Binary files /dev/null and b/graphics/items/icons/fluffy_tail.png differ diff --git a/graphics/items/icons/flute.png b/graphics/items/icons/flute.png new file mode 100644 index 000000000..9e1580ecc Binary files /dev/null and b/graphics/items/icons/flute.png differ diff --git a/graphics/items/icons/focus_band.png b/graphics/items/icons/focus_band.png new file mode 100644 index 000000000..f4054c90e Binary files /dev/null and b/graphics/items/icons/focus_band.png differ diff --git a/graphics/items/icons/fresh_water.png b/graphics/items/icons/fresh_water.png new file mode 100644 index 000000000..b3578a964 Binary files /dev/null and b/graphics/items/icons/fresh_water.png differ diff --git a/graphics/items/icons/full_heal.png b/graphics/items/icons/full_heal.png new file mode 100644 index 000000000..151777143 Binary files /dev/null and b/graphics/items/icons/full_heal.png differ diff --git a/graphics/items/icons/ganlon_berry.png b/graphics/items/icons/ganlon_berry.png new file mode 100644 index 000000000..428b6cc0e Binary files /dev/null and b/graphics/items/icons/ganlon_berry.png differ diff --git a/graphics/items/icons/gem.png b/graphics/items/icons/gem.png new file mode 100644 index 000000000..362b8b068 Binary files /dev/null and b/graphics/items/icons/gem.png differ diff --git a/graphics/items/icons/glitter_mail.png b/graphics/items/icons/glitter_mail.png new file mode 100644 index 000000000..cd1355acf Binary files /dev/null and b/graphics/items/icons/glitter_mail.png differ diff --git a/graphics/items/icons/go_goggles.png b/graphics/items/icons/go_goggles.png new file mode 100644 index 000000000..636ed0620 Binary files /dev/null and b/graphics/items/icons/go_goggles.png differ diff --git a/graphics/items/icons/gold_teeth.png b/graphics/items/icons/gold_teeth.png new file mode 100644 index 000000000..a6dd8b569 Binary files /dev/null and b/graphics/items/icons/gold_teeth.png differ diff --git a/graphics/items/icons/good_rod.png b/graphics/items/icons/good_rod.png new file mode 100644 index 000000000..a30aeba90 Binary files /dev/null and b/graphics/items/icons/good_rod.png differ diff --git a/graphics/items/icons/great_ball.png b/graphics/items/icons/great_ball.png new file mode 100644 index 000000000..92a57202d Binary files /dev/null and b/graphics/items/icons/great_ball.png differ diff --git a/graphics/items/icons/grepa_berry.png b/graphics/items/icons/grepa_berry.png new file mode 100644 index 000000000..3dae1e92b Binary files /dev/null and b/graphics/items/icons/grepa_berry.png differ diff --git a/graphics/items/icons/harbor_mail.png b/graphics/items/icons/harbor_mail.png new file mode 100644 index 000000000..441f5581c Binary files /dev/null and b/graphics/items/icons/harbor_mail.png differ diff --git a/graphics/items/icons/hard_stone.png b/graphics/items/icons/hard_stone.png new file mode 100644 index 000000000..5e27383c0 Binary files /dev/null and b/graphics/items/icons/hard_stone.png differ diff --git a/graphics/items/icons/heart_scale.png b/graphics/items/icons/heart_scale.png new file mode 100644 index 000000000..a9785ed64 Binary files /dev/null and b/graphics/items/icons/heart_scale.png differ diff --git a/graphics/items/icons/helix_fossil.png b/graphics/items/icons/helix_fossil.png new file mode 100644 index 000000000..05fefc5f5 Binary files /dev/null and b/graphics/items/icons/helix_fossil.png differ diff --git a/graphics/items/icons/hm.png b/graphics/items/icons/hm.png new file mode 100644 index 000000000..46e0f51c2 Binary files /dev/null and b/graphics/items/icons/hm.png differ diff --git a/graphics/items/icons/hondew_berry.png b/graphics/items/icons/hondew_berry.png new file mode 100644 index 000000000..cf89e3446 Binary files /dev/null and b/graphics/items/icons/hondew_berry.png differ diff --git a/graphics/items/icons/hp_up.png b/graphics/items/icons/hp_up.png new file mode 100644 index 000000000..0870f82b5 Binary files /dev/null and b/graphics/items/icons/hp_up.png differ diff --git a/graphics/items/icons/iapapa_berry.png b/graphics/items/icons/iapapa_berry.png new file mode 100644 index 000000000..91054adc9 Binary files /dev/null and b/graphics/items/icons/iapapa_berry.png differ diff --git a/graphics/items/icons/in_battle_herb.png b/graphics/items/icons/in_battle_herb.png new file mode 100644 index 000000000..1187d35fb Binary files /dev/null and b/graphics/items/icons/in_battle_herb.png differ diff --git a/graphics/items/icons/itemfinder.png b/graphics/items/icons/itemfinder.png new file mode 100644 index 000000000..b1df6f66f Binary files /dev/null and b/graphics/items/icons/itemfinder.png differ diff --git a/graphics/items/icons/kelpsy_berry.png b/graphics/items/icons/kelpsy_berry.png new file mode 100644 index 000000000..471d28735 Binary files /dev/null and b/graphics/items/icons/kelpsy_berry.png differ diff --git a/graphics/items/icons/kings_rock.png b/graphics/items/icons/kings_rock.png new file mode 100644 index 000000000..a45ada81d Binary files /dev/null and b/graphics/items/icons/kings_rock.png differ diff --git a/graphics/items/icons/lansat_berry.png b/graphics/items/icons/lansat_berry.png new file mode 100644 index 000000000..db3c70fe5 Binary files /dev/null and b/graphics/items/icons/lansat_berry.png differ diff --git a/graphics/items/icons/large_potion.png b/graphics/items/icons/large_potion.png new file mode 100644 index 000000000..9d5b8a051 Binary files /dev/null and b/graphics/items/icons/large_potion.png differ diff --git a/graphics/items/icons/lava_cookie.png b/graphics/items/icons/lava_cookie.png new file mode 100644 index 000000000..5c8c37c7d Binary files /dev/null and b/graphics/items/icons/lava_cookie.png differ diff --git a/graphics/items/icons/lax_incense.png b/graphics/items/icons/lax_incense.png new file mode 100644 index 000000000..564c8da13 Binary files /dev/null and b/graphics/items/icons/lax_incense.png differ diff --git a/graphics/items/icons/leaf_stone.png b/graphics/items/icons/leaf_stone.png new file mode 100644 index 000000000..d0adc7181 Binary files /dev/null and b/graphics/items/icons/leaf_stone.png differ diff --git a/graphics/items/icons/leftovers.png b/graphics/items/icons/leftovers.png new file mode 100644 index 000000000..8b4dbc922 Binary files /dev/null and b/graphics/items/icons/leftovers.png differ diff --git a/graphics/items/icons/lemonade.png b/graphics/items/icons/lemonade.png new file mode 100644 index 000000000..f3dcf7965 Binary files /dev/null and b/graphics/items/icons/lemonade.png differ diff --git a/graphics/items/icons/leppa_berry.png b/graphics/items/icons/leppa_berry.png new file mode 100644 index 000000000..b7e62df8a Binary files /dev/null and b/graphics/items/icons/leppa_berry.png differ diff --git a/graphics/items/icons/letter.png b/graphics/items/icons/letter.png new file mode 100644 index 000000000..ed240ea33 Binary files /dev/null and b/graphics/items/icons/letter.png differ diff --git a/graphics/items/icons/liechi_berry.png b/graphics/items/icons/liechi_berry.png new file mode 100644 index 000000000..ce269355c Binary files /dev/null and b/graphics/items/icons/liechi_berry.png differ diff --git a/graphics/items/icons/lift_key.png b/graphics/items/icons/lift_key.png new file mode 100644 index 000000000..b0d2cd72d Binary files /dev/null and b/graphics/items/icons/lift_key.png differ diff --git a/graphics/items/icons/light_ball.png b/graphics/items/icons/light_ball.png new file mode 100644 index 000000000..22cd69cdb Binary files /dev/null and b/graphics/items/icons/light_ball.png differ diff --git a/graphics/items/icons/lucky_egg.png b/graphics/items/icons/lucky_egg.png new file mode 100644 index 000000000..7455b9f1f Binary files /dev/null and b/graphics/items/icons/lucky_egg.png differ diff --git a/graphics/items/icons/lucky_punch.png b/graphics/items/icons/lucky_punch.png new file mode 100644 index 000000000..cbc018ea6 Binary files /dev/null and b/graphics/items/icons/lucky_punch.png differ diff --git a/graphics/items/icons/lum_berry.png b/graphics/items/icons/lum_berry.png new file mode 100644 index 000000000..33020e558 Binary files /dev/null and b/graphics/items/icons/lum_berry.png differ diff --git a/graphics/items/icons/luxury_ball.png b/graphics/items/icons/luxury_ball.png new file mode 100644 index 000000000..393b46d0f Binary files /dev/null and b/graphics/items/icons/luxury_ball.png differ diff --git a/graphics/items/icons/mach_bike.png b/graphics/items/icons/mach_bike.png new file mode 100644 index 000000000..32f41cfce Binary files /dev/null and b/graphics/items/icons/mach_bike.png differ diff --git a/graphics/items/icons/macho_brace.png b/graphics/items/icons/macho_brace.png new file mode 100644 index 000000000..ff7a30c97 Binary files /dev/null and b/graphics/items/icons/macho_brace.png differ diff --git a/graphics/items/icons/magma_emblem.png b/graphics/items/icons/magma_emblem.png new file mode 100644 index 000000000..5404efcf8 Binary files /dev/null and b/graphics/items/icons/magma_emblem.png differ diff --git a/graphics/items/icons/magnet.png b/graphics/items/icons/magnet.png new file mode 100644 index 000000000..60607f2ae Binary files /dev/null and b/graphics/items/icons/magnet.png differ diff --git a/graphics/items/icons/mago_berry.png b/graphics/items/icons/mago_berry.png new file mode 100644 index 000000000..c0734713c Binary files /dev/null and b/graphics/items/icons/mago_berry.png differ diff --git a/graphics/items/icons/magost_berry.png b/graphics/items/icons/magost_berry.png new file mode 100644 index 000000000..b62fd8894 Binary files /dev/null and b/graphics/items/icons/magost_berry.png differ diff --git a/graphics/items/icons/master_ball.png b/graphics/items/icons/master_ball.png new file mode 100644 index 000000000..6db66df96 Binary files /dev/null and b/graphics/items/icons/master_ball.png differ diff --git a/graphics/items/icons/max_revive.png b/graphics/items/icons/max_revive.png new file mode 100644 index 000000000..dd3df2b0c Binary files /dev/null and b/graphics/items/icons/max_revive.png differ diff --git a/graphics/items/icons/mech_mail.png b/graphics/items/icons/mech_mail.png new file mode 100644 index 000000000..93c6c4f39 Binary files /dev/null and b/graphics/items/icons/mech_mail.png differ diff --git a/graphics/items/icons/metal_coat.png b/graphics/items/icons/metal_coat.png new file mode 100644 index 000000000..54af148f5 Binary files /dev/null and b/graphics/items/icons/metal_coat.png differ diff --git a/graphics/items/icons/metal_powder.png b/graphics/items/icons/metal_powder.png new file mode 100644 index 000000000..654b07da7 Binary files /dev/null and b/graphics/items/icons/metal_powder.png differ diff --git a/graphics/items/icons/meteorite.png b/graphics/items/icons/meteorite.png new file mode 100644 index 000000000..56a8a4802 Binary files /dev/null and b/graphics/items/icons/meteorite.png differ diff --git a/graphics/items/icons/miracle_seed.png b/graphics/items/icons/miracle_seed.png new file mode 100644 index 000000000..6d3c89e16 Binary files /dev/null and b/graphics/items/icons/miracle_seed.png differ diff --git a/graphics/items/icons/moomoo_milk.png b/graphics/items/icons/moomoo_milk.png new file mode 100644 index 000000000..1ccca7bf5 Binary files /dev/null and b/graphics/items/icons/moomoo_milk.png differ diff --git a/graphics/items/icons/moon_stone.png b/graphics/items/icons/moon_stone.png new file mode 100644 index 000000000..335952858 Binary files /dev/null and b/graphics/items/icons/moon_stone.png differ diff --git a/graphics/items/icons/mystic_ticket.png b/graphics/items/icons/mystic_ticket.png new file mode 100644 index 000000000..6502806a1 Binary files /dev/null and b/graphics/items/icons/mystic_ticket.png differ diff --git a/graphics/items/icons/mystic_water.png b/graphics/items/icons/mystic_water.png new file mode 100644 index 000000000..9067bca97 Binary files /dev/null and b/graphics/items/icons/mystic_water.png differ diff --git a/graphics/items/icons/nanab_berry.png b/graphics/items/icons/nanab_berry.png new file mode 100644 index 000000000..c45853267 Binary files /dev/null and b/graphics/items/icons/nanab_berry.png differ diff --git a/graphics/items/icons/nest_ball.png b/graphics/items/icons/nest_ball.png new file mode 100644 index 000000000..cc375c9e6 Binary files /dev/null and b/graphics/items/icons/nest_ball.png differ diff --git a/graphics/items/icons/net_ball.png b/graphics/items/icons/net_ball.png new file mode 100644 index 000000000..cf51843eb Binary files /dev/null and b/graphics/items/icons/net_ball.png differ diff --git a/graphics/items/icons/never_melt_ice.png b/graphics/items/icons/never_melt_ice.png new file mode 100644 index 000000000..55c7f8302 Binary files /dev/null and b/graphics/items/icons/never_melt_ice.png differ diff --git a/graphics/items/icons/nomel_berry.png b/graphics/items/icons/nomel_berry.png new file mode 100644 index 000000000..fa40dc811 Binary files /dev/null and b/graphics/items/icons/nomel_berry.png differ diff --git a/graphics/items/icons/nugget.png b/graphics/items/icons/nugget.png new file mode 100644 index 000000000..1b81b95c6 Binary files /dev/null and b/graphics/items/icons/nugget.png differ diff --git a/graphics/items/icons/oaks_parcel.png b/graphics/items/icons/oaks_parcel.png new file mode 100644 index 000000000..93284c6d1 Binary files /dev/null and b/graphics/items/icons/oaks_parcel.png differ diff --git a/graphics/items/icons/old_amber.png b/graphics/items/icons/old_amber.png new file mode 100644 index 000000000..3e70a4f56 Binary files /dev/null and b/graphics/items/icons/old_amber.png differ diff --git a/graphics/items/icons/old_rod.png b/graphics/items/icons/old_rod.png new file mode 100644 index 000000000..b392eda8d Binary files /dev/null and b/graphics/items/icons/old_rod.png differ diff --git a/graphics/items/icons/old_sea_map.png b/graphics/items/icons/old_sea_map.png new file mode 100644 index 000000000..2c17bfeaa Binary files /dev/null and b/graphics/items/icons/old_sea_map.png differ diff --git a/graphics/items/icons/oran_berry.png b/graphics/items/icons/oran_berry.png new file mode 100644 index 000000000..ed8d3b212 Binary files /dev/null and b/graphics/items/icons/oran_berry.png differ diff --git a/graphics/items/icons/orange_mail.png b/graphics/items/icons/orange_mail.png new file mode 100644 index 000000000..af499954e Binary files /dev/null and b/graphics/items/icons/orange_mail.png differ diff --git a/graphics/items/icons/orb.png b/graphics/items/icons/orb.png new file mode 100644 index 000000000..0a3e18292 Binary files /dev/null and b/graphics/items/icons/orb.png differ diff --git a/graphics/items/icons/pamtre_berry.png b/graphics/items/icons/pamtre_berry.png new file mode 100644 index 000000000..fea8f98fe Binary files /dev/null and b/graphics/items/icons/pamtre_berry.png differ diff --git a/graphics/items/icons/pearl.png b/graphics/items/icons/pearl.png new file mode 100644 index 000000000..cf7e4aa03 Binary files /dev/null and b/graphics/items/icons/pearl.png differ diff --git a/graphics/items/icons/pecha_berry.png b/graphics/items/icons/pecha_berry.png new file mode 100644 index 000000000..aa7f2f154 Binary files /dev/null and b/graphics/items/icons/pecha_berry.png differ diff --git a/graphics/items/icons/persim_berry.png b/graphics/items/icons/persim_berry.png new file mode 100644 index 000000000..e8f7a0ea0 Binary files /dev/null and b/graphics/items/icons/persim_berry.png differ diff --git a/graphics/items/icons/petaya_berry.png b/graphics/items/icons/petaya_berry.png new file mode 100644 index 000000000..6138af4e1 Binary files /dev/null and b/graphics/items/icons/petaya_berry.png differ diff --git a/graphics/items/icons/pinap_berry.png b/graphics/items/icons/pinap_berry.png new file mode 100644 index 000000000..9a10cc755 Binary files /dev/null and b/graphics/items/icons/pinap_berry.png differ diff --git a/graphics/items/icons/poison_barb.png b/graphics/items/icons/poison_barb.png new file mode 100644 index 000000000..eef95e4a1 Binary files /dev/null and b/graphics/items/icons/poison_barb.png differ diff --git a/graphics/items/icons/poke_ball.png b/graphics/items/icons/poke_ball.png new file mode 100644 index 000000000..fa039f916 Binary files /dev/null and b/graphics/items/icons/poke_ball.png differ diff --git a/graphics/items/icons/poke_doll.png b/graphics/items/icons/poke_doll.png new file mode 100644 index 000000000..d6a776d61 Binary files /dev/null and b/graphics/items/icons/poke_doll.png differ diff --git a/graphics/items/icons/poke_flute.png b/graphics/items/icons/poke_flute.png new file mode 100644 index 000000000..d05288d1e Binary files /dev/null and b/graphics/items/icons/poke_flute.png differ diff --git a/graphics/items/icons/pokeblock_case.png b/graphics/items/icons/pokeblock_case.png new file mode 100644 index 000000000..6990a6bfe Binary files /dev/null and b/graphics/items/icons/pokeblock_case.png differ diff --git a/graphics/items/icons/pomeg_berry.png b/graphics/items/icons/pomeg_berry.png new file mode 100644 index 000000000..fc0e42802 Binary files /dev/null and b/graphics/items/icons/pomeg_berry.png differ diff --git a/graphics/items/icons/potion.png b/graphics/items/icons/potion.png new file mode 100644 index 000000000..c985ee570 Binary files /dev/null and b/graphics/items/icons/potion.png differ diff --git a/graphics/items/icons/powder.png b/graphics/items/icons/powder.png new file mode 100644 index 000000000..f61e2f570 Binary files /dev/null and b/graphics/items/icons/powder.png differ diff --git a/graphics/items/icons/powder_jar.png b/graphics/items/icons/powder_jar.png new file mode 100644 index 000000000..edf92baef Binary files /dev/null and b/graphics/items/icons/powder_jar.png differ diff --git a/graphics/items/icons/pp_max.png b/graphics/items/icons/pp_max.png new file mode 100644 index 000000000..caa5a0ef8 Binary files /dev/null and b/graphics/items/icons/pp_max.png differ diff --git a/graphics/items/icons/pp_up.png b/graphics/items/icons/pp_up.png new file mode 100644 index 000000000..d5187efc1 Binary files /dev/null and b/graphics/items/icons/pp_up.png differ diff --git a/graphics/items/icons/premier_ball.png b/graphics/items/icons/premier_ball.png new file mode 100644 index 000000000..9dec98af9 Binary files /dev/null and b/graphics/items/icons/premier_ball.png differ diff --git a/graphics/items/icons/qualot_berry.png b/graphics/items/icons/qualot_berry.png new file mode 100644 index 000000000..7c3a0d770 Binary files /dev/null and b/graphics/items/icons/qualot_berry.png differ diff --git a/graphics/items/icons/question_mark.png b/graphics/items/icons/question_mark.png new file mode 100644 index 000000000..e64c07196 Binary files /dev/null and b/graphics/items/icons/question_mark.png differ diff --git a/graphics/items/icons/quick_claw.png b/graphics/items/icons/quick_claw.png new file mode 100644 index 000000000..3f2c298c8 Binary files /dev/null and b/graphics/items/icons/quick_claw.png differ diff --git a/graphics/items/icons/rabuta_berry.png b/graphics/items/icons/rabuta_berry.png new file mode 100644 index 000000000..514f5b0af Binary files /dev/null and b/graphics/items/icons/rabuta_berry.png differ diff --git a/graphics/items/icons/rainbow_pass.png b/graphics/items/icons/rainbow_pass.png new file mode 100644 index 000000000..ec0c6e9b2 Binary files /dev/null and b/graphics/items/icons/rainbow_pass.png differ diff --git a/graphics/items/icons/rare_candy.png b/graphics/items/icons/rare_candy.png new file mode 100644 index 000000000..a005a5004 Binary files /dev/null and b/graphics/items/icons/rare_candy.png differ diff --git a/graphics/items/icons/rawst_berry.png b/graphics/items/icons/rawst_berry.png new file mode 100644 index 000000000..ebe395737 Binary files /dev/null and b/graphics/items/icons/rawst_berry.png differ diff --git a/graphics/items/icons/razz_berry.png b/graphics/items/icons/razz_berry.png new file mode 100644 index 000000000..3340d8854 Binary files /dev/null and b/graphics/items/icons/razz_berry.png differ diff --git a/graphics/items/icons/repeat_ball.png b/graphics/items/icons/repeat_ball.png new file mode 100644 index 000000000..796afe0de Binary files /dev/null and b/graphics/items/icons/repeat_ball.png differ diff --git a/graphics/items/icons/repel.png b/graphics/items/icons/repel.png new file mode 100644 index 000000000..a6cb74fc3 Binary files /dev/null and b/graphics/items/icons/repel.png differ diff --git a/graphics/items/icons/retro_mail.png b/graphics/items/icons/retro_mail.png new file mode 100644 index 000000000..9562088d4 Binary files /dev/null and b/graphics/items/icons/retro_mail.png differ diff --git a/graphics/items/icons/return_to_field_arrow.png b/graphics/items/icons/return_to_field_arrow.png new file mode 100644 index 000000000..d520a3657 Binary files /dev/null and b/graphics/items/icons/return_to_field_arrow.png differ diff --git a/graphics/items/icons/revival_herb.png b/graphics/items/icons/revival_herb.png new file mode 100644 index 000000000..4380fa896 Binary files /dev/null and b/graphics/items/icons/revival_herb.png differ diff --git a/graphics/items/icons/revive.png b/graphics/items/icons/revive.png new file mode 100644 index 000000000..f5a63c29d Binary files /dev/null and b/graphics/items/icons/revive.png differ diff --git a/graphics/items/icons/room1_key.png b/graphics/items/icons/room1_key.png new file mode 100644 index 000000000..e02747b77 Binary files /dev/null and b/graphics/items/icons/room1_key.png differ diff --git a/graphics/items/icons/room2_key.png b/graphics/items/icons/room2_key.png new file mode 100644 index 000000000..a7e0d70ec Binary files /dev/null and b/graphics/items/icons/room2_key.png differ diff --git a/graphics/items/icons/room4_key.png b/graphics/items/icons/room4_key.png new file mode 100644 index 000000000..1a6b4a17c Binary files /dev/null and b/graphics/items/icons/room4_key.png differ diff --git a/graphics/items/icons/room6_key.png b/graphics/items/icons/room6_key.png new file mode 100644 index 000000000..358ba49ca Binary files /dev/null and b/graphics/items/icons/room6_key.png differ diff --git a/graphics/items/icons/root_fossil.png b/graphics/items/icons/root_fossil.png new file mode 100644 index 000000000..52b0038be Binary files /dev/null and b/graphics/items/icons/root_fossil.png differ diff --git a/graphics/items/icons/sacred_ash.png b/graphics/items/icons/sacred_ash.png new file mode 100644 index 000000000..ca9279539 Binary files /dev/null and b/graphics/items/icons/sacred_ash.png differ diff --git a/graphics/items/icons/safari_ball.png b/graphics/items/icons/safari_ball.png new file mode 100644 index 000000000..f4f7779fd Binary files /dev/null and b/graphics/items/icons/safari_ball.png differ diff --git a/graphics/items/icons/salac_berry.png b/graphics/items/icons/salac_berry.png new file mode 100644 index 000000000..b78ff40e6 Binary files /dev/null and b/graphics/items/icons/salac_berry.png differ diff --git a/graphics/items/icons/scanner.png b/graphics/items/icons/scanner.png new file mode 100644 index 000000000..45b0cd036 Binary files /dev/null and b/graphics/items/icons/scanner.png differ diff --git a/graphics/items/icons/scarf.png b/graphics/items/icons/scarf.png new file mode 100644 index 000000000..a74626540 Binary files /dev/null and b/graphics/items/icons/scarf.png differ diff --git a/graphics/items/icons/scope_lens.png b/graphics/items/icons/scope_lens.png new file mode 100644 index 000000000..8c613e971 Binary files /dev/null and b/graphics/items/icons/scope_lens.png differ diff --git a/graphics/items/icons/sea_incense.png b/graphics/items/icons/sea_incense.png new file mode 100644 index 000000000..7a885babb Binary files /dev/null and b/graphics/items/icons/sea_incense.png differ diff --git a/graphics/items/icons/secret_key.png b/graphics/items/icons/secret_key.png new file mode 100644 index 000000000..7b7426d69 Binary files /dev/null and b/graphics/items/icons/secret_key.png differ diff --git a/graphics/items/icons/shadow_mail.png b/graphics/items/icons/shadow_mail.png new file mode 100644 index 000000000..98f3f9be9 Binary files /dev/null and b/graphics/items/icons/shadow_mail.png differ diff --git a/graphics/items/icons/shard.png b/graphics/items/icons/shard.png new file mode 100644 index 000000000..747a833dd Binary files /dev/null and b/graphics/items/icons/shard.png differ diff --git a/graphics/items/icons/sharp_beak.png b/graphics/items/icons/sharp_beak.png new file mode 100644 index 000000000..f327d582a Binary files /dev/null and b/graphics/items/icons/sharp_beak.png differ diff --git a/graphics/items/icons/shell_bell.png b/graphics/items/icons/shell_bell.png new file mode 100644 index 000000000..0f9f51033 Binary files /dev/null and b/graphics/items/icons/shell_bell.png differ diff --git a/graphics/items/icons/shoal_shell.png b/graphics/items/icons/shoal_shell.png new file mode 100644 index 000000000..ead644d72 Binary files /dev/null and b/graphics/items/icons/shoal_shell.png differ diff --git a/graphics/items/icons/silk_scarf.png b/graphics/items/icons/silk_scarf.png new file mode 100644 index 000000000..a9ea4f587 Binary files /dev/null and b/graphics/items/icons/silk_scarf.png differ diff --git a/graphics/items/icons/silph_scope.png b/graphics/items/icons/silph_scope.png new file mode 100644 index 000000000..6c906ac3b Binary files /dev/null and b/graphics/items/icons/silph_scope.png differ diff --git a/graphics/items/icons/silver_powder.png b/graphics/items/icons/silver_powder.png new file mode 100644 index 000000000..e255a0d0a Binary files /dev/null and b/graphics/items/icons/silver_powder.png differ diff --git a/graphics/items/icons/sitrus_berry.png b/graphics/items/icons/sitrus_berry.png new file mode 100644 index 000000000..6b5ffeb0c Binary files /dev/null and b/graphics/items/icons/sitrus_berry.png differ diff --git a/graphics/items/icons/smoke_ball.png b/graphics/items/icons/smoke_ball.png new file mode 100644 index 000000000..7dff91443 Binary files /dev/null and b/graphics/items/icons/smoke_ball.png differ diff --git a/graphics/items/icons/soda_pop.png b/graphics/items/icons/soda_pop.png new file mode 100644 index 000000000..334d816b1 Binary files /dev/null and b/graphics/items/icons/soda_pop.png differ diff --git a/graphics/items/icons/soft_sand.png b/graphics/items/icons/soft_sand.png new file mode 100644 index 000000000..29a4fde0d Binary files /dev/null and b/graphics/items/icons/soft_sand.png differ diff --git a/graphics/items/icons/soot_sack.png b/graphics/items/icons/soot_sack.png new file mode 100644 index 000000000..a7b8699e7 Binary files /dev/null and b/graphics/items/icons/soot_sack.png differ diff --git a/graphics/items/icons/soothe_bell.png b/graphics/items/icons/soothe_bell.png new file mode 100644 index 000000000..91a0ffbfa Binary files /dev/null and b/graphics/items/icons/soothe_bell.png differ diff --git a/graphics/items/icons/soul_dew.png b/graphics/items/icons/soul_dew.png new file mode 100644 index 000000000..057ef6936 Binary files /dev/null and b/graphics/items/icons/soul_dew.png differ diff --git a/graphics/items/icons/spell_tag.png b/graphics/items/icons/spell_tag.png new file mode 100644 index 000000000..65936f529 Binary files /dev/null and b/graphics/items/icons/spell_tag.png differ diff --git a/graphics/items/icons/spelon_berry.png b/graphics/items/icons/spelon_berry.png new file mode 100644 index 000000000..f7bc51c9c Binary files /dev/null and b/graphics/items/icons/spelon_berry.png differ diff --git a/graphics/items/icons/ss_ticket.png b/graphics/items/icons/ss_ticket.png new file mode 100644 index 000000000..faf5fc617 Binary files /dev/null and b/graphics/items/icons/ss_ticket.png differ diff --git a/graphics/items/icons/star_piece.png b/graphics/items/icons/star_piece.png new file mode 100644 index 000000000..809bfceb9 Binary files /dev/null and b/graphics/items/icons/star_piece.png differ diff --git a/graphics/items/icons/stardust.png b/graphics/items/icons/stardust.png new file mode 100644 index 000000000..1f427cfbe Binary files /dev/null and b/graphics/items/icons/stardust.png differ diff --git a/graphics/items/icons/starf_berry.png b/graphics/items/icons/starf_berry.png new file mode 100644 index 000000000..64070b928 Binary files /dev/null and b/graphics/items/icons/starf_berry.png differ diff --git a/graphics/items/icons/status_heal.png b/graphics/items/icons/status_heal.png new file mode 100644 index 000000000..205512e4a Binary files /dev/null and b/graphics/items/icons/status_heal.png differ diff --git a/graphics/items/icons/stick.png b/graphics/items/icons/stick.png new file mode 100644 index 000000000..1675255e2 Binary files /dev/null and b/graphics/items/icons/stick.png differ diff --git a/graphics/items/icons/storage_key.png b/graphics/items/icons/storage_key.png new file mode 100644 index 000000000..eb52a0dc9 Binary files /dev/null and b/graphics/items/icons/storage_key.png differ diff --git a/graphics/items/icons/sun_stone.png b/graphics/items/icons/sun_stone.png new file mode 100644 index 000000000..3a2c3708c Binary files /dev/null and b/graphics/items/icons/sun_stone.png differ diff --git a/graphics/items/icons/super_rod.png b/graphics/items/icons/super_rod.png new file mode 100644 index 000000000..68091a4f4 Binary files /dev/null and b/graphics/items/icons/super_rod.png differ diff --git a/graphics/items/icons/tamato_berry.png b/graphics/items/icons/tamato_berry.png new file mode 100644 index 000000000..cd0268755 Binary files /dev/null and b/graphics/items/icons/tamato_berry.png differ diff --git a/graphics/items/icons/tea.png b/graphics/items/icons/tea.png new file mode 100644 index 000000000..4d09fd00e Binary files /dev/null and b/graphics/items/icons/tea.png differ diff --git a/graphics/items/icons/teachy_tv.png b/graphics/items/icons/teachy_tv.png new file mode 100644 index 000000000..43a158835 Binary files /dev/null and b/graphics/items/icons/teachy_tv.png differ diff --git a/graphics/items/icons/thick_club.png b/graphics/items/icons/thick_club.png new file mode 100644 index 000000000..cf32da9fd Binary files /dev/null and b/graphics/items/icons/thick_club.png differ diff --git a/graphics/items/icons/thunder_stone.png b/graphics/items/icons/thunder_stone.png new file mode 100644 index 000000000..8955b0224 Binary files /dev/null and b/graphics/items/icons/thunder_stone.png differ diff --git a/graphics/items/icons/timer_ball.png b/graphics/items/icons/timer_ball.png new file mode 100644 index 000000000..c4566a035 Binary files /dev/null and b/graphics/items/icons/timer_ball.png differ diff --git a/graphics/items/icons/tiny_mushroom.png b/graphics/items/icons/tiny_mushroom.png new file mode 100644 index 000000000..138ebf2d7 Binary files /dev/null and b/graphics/items/icons/tiny_mushroom.png differ diff --git a/graphics/items/icons/tm.png b/graphics/items/icons/tm.png new file mode 100644 index 000000000..c4e6d1df7 Binary files /dev/null and b/graphics/items/icons/tm.png differ diff --git a/graphics/items/icons/tm_case.png b/graphics/items/icons/tm_case.png new file mode 100644 index 000000000..53aafd125 Binary files /dev/null and b/graphics/items/icons/tm_case.png differ diff --git a/graphics/items/icons/town_map.png b/graphics/items/icons/town_map.png new file mode 100644 index 000000000..9562c6375 Binary files /dev/null and b/graphics/items/icons/town_map.png differ diff --git a/graphics/items/icons/tri_pass.png b/graphics/items/icons/tri_pass.png new file mode 100644 index 000000000..b88edb65e Binary files /dev/null and b/graphics/items/icons/tri_pass.png differ diff --git a/graphics/items/icons/tropic_mail.png b/graphics/items/icons/tropic_mail.png new file mode 100644 index 000000000..4abc5212e Binary files /dev/null and b/graphics/items/icons/tropic_mail.png differ diff --git a/graphics/items/icons/twisted_spoon.png b/graphics/items/icons/twisted_spoon.png new file mode 100644 index 000000000..a67893e23 Binary files /dev/null and b/graphics/items/icons/twisted_spoon.png differ diff --git a/graphics/items/icons/ultra_ball.png b/graphics/items/icons/ultra_ball.png new file mode 100644 index 000000000..0e58d05c8 Binary files /dev/null and b/graphics/items/icons/ultra_ball.png differ diff --git a/graphics/items/icons/up_grade.png b/graphics/items/icons/up_grade.png new file mode 100644 index 000000000..3b539c60a Binary files /dev/null and b/graphics/items/icons/up_grade.png differ diff --git a/graphics/items/icons/vitamin.png b/graphics/items/icons/vitamin.png new file mode 100644 index 000000000..2ba89b154 Binary files /dev/null and b/graphics/items/icons/vitamin.png differ diff --git a/graphics/items/icons/vs_seeker.png b/graphics/items/icons/vs_seeker.png new file mode 100644 index 000000000..64ab6623e Binary files /dev/null and b/graphics/items/icons/vs_seeker.png differ diff --git a/graphics/items/icons/wailmer_pail.png b/graphics/items/icons/wailmer_pail.png new file mode 100644 index 000000000..2ca75a069 Binary files /dev/null and b/graphics/items/icons/wailmer_pail.png differ diff --git a/graphics/items/icons/water_stone.png b/graphics/items/icons/water_stone.png new file mode 100644 index 000000000..904e53462 Binary files /dev/null and b/graphics/items/icons/water_stone.png differ diff --git a/graphics/items/icons/watmel_berry.png b/graphics/items/icons/watmel_berry.png new file mode 100644 index 000000000..5a477f31a Binary files /dev/null and b/graphics/items/icons/watmel_berry.png differ diff --git a/graphics/items/icons/wave_mail.png b/graphics/items/icons/wave_mail.png new file mode 100644 index 000000000..7c0c20ac8 Binary files /dev/null and b/graphics/items/icons/wave_mail.png differ diff --git a/graphics/items/icons/wepear_berry.png b/graphics/items/icons/wepear_berry.png new file mode 100644 index 000000000..05edc7bf2 Binary files /dev/null and b/graphics/items/icons/wepear_berry.png differ diff --git a/graphics/items/icons/wiki_berry.png b/graphics/items/icons/wiki_berry.png new file mode 100644 index 000000000..7114e13b7 Binary files /dev/null and b/graphics/items/icons/wiki_berry.png differ diff --git a/graphics/items/icons/wood_mail.png b/graphics/items/icons/wood_mail.png new file mode 100644 index 000000000..a687ec269 Binary files /dev/null and b/graphics/items/icons/wood_mail.png differ -- cgit v1.2.3 From 943931f86f50b946145548b0bee9663724e14980 Mon Sep 17 00:00:00 2001 From: paul Date: Sat, 13 Oct 2018 22:49:21 +0200 Subject: add mail --- data/graphics.s | 99 +++++++++++++++++++++++++++++++++++++- graphics/mail/bead/map.bin | Bin 0 -> 1280 bytes graphics/mail/bead/palette.pal | 19 ++++++++ graphics/mail/bead/tiles.png | Bin 0 -> 263 bytes graphics/mail/dream/map.bin | Bin 0 -> 1280 bytes graphics/mail/dream/palette.pal | 19 ++++++++ graphics/mail/dream/tiles.png | Bin 0 -> 351 bytes graphics/mail/fab/map.bin | Bin 0 -> 1280 bytes graphics/mail/fab/palette.pal | 19 ++++++++ graphics/mail/fab/tiles.png | Bin 0 -> 388 bytes graphics/mail/glitter/map.bin | Bin 0 -> 1280 bytes graphics/mail/glitter/palette.pal | 19 ++++++++ graphics/mail/glitter/tiles.png | Bin 0 -> 548 bytes graphics/mail/harbor/map.bin | Bin 0 -> 1280 bytes graphics/mail/harbor/palette.pal | 19 ++++++++ graphics/mail/harbor/tiles.png | Bin 0 -> 366 bytes graphics/mail/mech/map.bin | Bin 0 -> 1280 bytes graphics/mail/mech/palette.pal | 19 ++++++++ graphics/mail/mech/tiles.png | Bin 0 -> 299 bytes graphics/mail/orange/map.bin | Bin 0 -> 1280 bytes graphics/mail/orange/palette.pal | 19 ++++++++ graphics/mail/orange/tiles.png | Bin 0 -> 439 bytes graphics/mail/retro/map.bin | Bin 0 -> 1280 bytes graphics/mail/retro/palette.pal | 19 ++++++++ graphics/mail/retro/tiles.png | Bin 0 -> 615 bytes graphics/mail/shadow/map.bin | Bin 0 -> 1280 bytes graphics/mail/shadow/palette.pal | 19 ++++++++ graphics/mail/shadow/tiles.png | Bin 0 -> 400 bytes graphics/mail/tropic/map.bin | Bin 0 -> 1280 bytes graphics/mail/tropic/palette.pal | 19 ++++++++ graphics/mail/tropic/tiles.png | Bin 0 -> 389 bytes graphics/mail/wave/map.bin | Bin 0 -> 1280 bytes graphics/mail/wave/palette.pal | 19 ++++++++ graphics/mail/wave/tiles.png | Bin 0 -> 409 bytes graphics/mail/wood/map.bin | Bin 0 -> 1280 bytes graphics/mail/wood/palette.pal | 19 ++++++++ graphics/mail/wood/tiles.png | Bin 0 -> 518 bytes 37 files changed, 326 insertions(+), 1 deletion(-) create mode 100644 graphics/mail/bead/map.bin create mode 100644 graphics/mail/bead/palette.pal create mode 100644 graphics/mail/bead/tiles.png create mode 100644 graphics/mail/dream/map.bin create mode 100644 graphics/mail/dream/palette.pal create mode 100644 graphics/mail/dream/tiles.png create mode 100644 graphics/mail/fab/map.bin create mode 100644 graphics/mail/fab/palette.pal create mode 100644 graphics/mail/fab/tiles.png create mode 100644 graphics/mail/glitter/map.bin create mode 100644 graphics/mail/glitter/palette.pal create mode 100644 graphics/mail/glitter/tiles.png create mode 100644 graphics/mail/harbor/map.bin create mode 100644 graphics/mail/harbor/palette.pal create mode 100644 graphics/mail/harbor/tiles.png create mode 100644 graphics/mail/mech/map.bin create mode 100644 graphics/mail/mech/palette.pal create mode 100644 graphics/mail/mech/tiles.png create mode 100644 graphics/mail/orange/map.bin create mode 100644 graphics/mail/orange/palette.pal create mode 100644 graphics/mail/orange/tiles.png create mode 100644 graphics/mail/retro/map.bin create mode 100644 graphics/mail/retro/palette.pal create mode 100644 graphics/mail/retro/tiles.png create mode 100644 graphics/mail/shadow/map.bin create mode 100644 graphics/mail/shadow/palette.pal create mode 100644 graphics/mail/shadow/tiles.png create mode 100644 graphics/mail/tropic/map.bin create mode 100644 graphics/mail/tropic/palette.pal create mode 100644 graphics/mail/tropic/tiles.png create mode 100644 graphics/mail/wave/map.bin create mode 100644 graphics/mail/wave/palette.pal create mode 100644 graphics/mail/wave/tiles.png create mode 100644 graphics/mail/wood/map.bin create mode 100644 graphics/mail/wood/palette.pal create mode 100644 graphics/mail/wood/tiles.png diff --git a/data/graphics.s b/data/graphics.s index 101ad50dc..d2389d361 100644 --- a/data/graphics.s +++ b/data/graphics.s @@ -15891,8 +15891,105 @@ gUnknown_8E93B14:: @ 8E93B14 .incbin "baserom.gba", 0xE93B14, 0x24 gUnknown_8E93B38:: @ 8E93B38 - .incbin "baserom.gba", 0xE93B38, 0x2264 + .incbin "baserom.gba", 0xE93B38, 0x4E8 + + .align 2 +gFile_graphics_mail_orange_tiles_sheet:: @ 8E94020 + .incbin "graphics/mail/orange/tiles.4bpp.lz" + + .align 2 +gFile_graphics_mail_harbor_tiles_sheet:: @ 8E941C0 + .incbin "graphics/mail/harbor/tiles.4bpp.lz" + .align 2 +gFile_graphics_mail_glitter_tiles_sheet:: @ 8E942FC + .incbin "graphics/mail/glitter/tiles.4bpp.lz" + + .align 2 +gFile_graphics_mail_mech_tiles_sheet:: @ 8E9450C + .incbin "graphics/mail/mech/tiles.4bpp.lz" + + .align 2 +gFile_graphics_mail_wood_tiles_sheet:: @ 8E945E4 + .incbin "graphics/mail/wood/tiles.4bpp.lz" + + .align 2 +gFile_graphics_mail_wave_tiles_sheet:: @ 8E947DC + .incbin "graphics/mail/wave/tiles.4bpp.lz" + + .align 2 +gFile_graphics_mail_bead_tiles_sheet:: @ 8E9495C + .incbin "graphics/mail/bead/tiles.4bpp.lz" + + .align 2 +gFile_graphics_mail_shadow_tiles_sheet:: @ 8E94A04 + .incbin "graphics/mail/shadow/tiles.4bpp.lz" + + .align 2 +gFile_graphics_mail_tropic_tiles_sheet:: @ 8E94B94 + .incbin "graphics/mail/tropic/tiles.4bpp.lz" + + .align 2 +gFile_graphics_mail_dream_tiles_sheet:: @ 8E94CD4 + .incbin "graphics/mail/dream/tiles.4bpp.lz" + + .align 2 +gFile_graphics_mail_fab_tiles_sheet:: @ 8E94E3C + .incbin "graphics/mail/fab/tiles.4bpp.lz" + + .align 2 +gFile_graphics_mail_retro_tiles_sheet:: @ 8E94F8C + .incbin "graphics/mail/retro/tiles.4bpp.lz" + + .align 2 +gFile_graphics_mail_orange_map_tilemap:: @ 8E9522C + .incbin "graphics/mail/orange/map.bin.lz" + + .align 2 +gFile_graphics_mail_harbor_map_tilemap:: @ 8E95304 + .incbin "graphics/mail/harbor/map.bin.lz" + + .align 2 +gFile_graphics_mail_glitter_map_tilemap:: @ 8E953E4 + .incbin "graphics/mail/glitter/map.bin.lz" + + .align 2 +gFile_graphics_mail_mech_map_tilemap:: @ 8E954F0 + .incbin "graphics/mail/mech/map.bin.lz" + + .align 2 +gFile_graphics_mail_wood_map_tilemap:: @ 8E955CC + .incbin "graphics/mail/wood/map.bin.lz" + + .align 2 +gFile_graphics_mail_wave_map_tilemap:: @ 8E956BC + .incbin "graphics/mail/wave/map.bin.lz" + + .align 2 +gFile_graphics_mail_bead_map_tilemap:: @ 8E9579C + .incbin "graphics/mail/bead/map.bin.lz" + + .align 2 +gFile_graphics_mail_shadow_map_tilemap:: @ 8E9587C + .incbin "graphics/mail/shadow/map.bin.lz" + + .align 2 +gFile_graphics_mail_tropic_map_tilemap:: @ 8E95988 + .incbin "graphics/mail/tropic/map.bin.lz" + + .align 2 +gFile_graphics_mail_dream_map_tilemap:: @ 8E95A78 + .incbin "graphics/mail/dream/map.bin.lz" + + .align 2 +gFile_graphics_mail_fab_map_tilemap:: @ 8E95B70 + .incbin "graphics/mail/fab/map.bin.lz" + + .align 2 +gFile_graphics_mail_retro_map_tilemap:: @ 8E95C88 + .incbin "graphics/mail/retro/map.bin.lz" + + .align 2 gUnknown_8E95D9C:: @ 8E95D9C .incbin "baserom.gba", 0xE95D9C, 0x20 diff --git a/graphics/mail/bead/map.bin b/graphics/mail/bead/map.bin new file mode 100644 index 000000000..6ebb4932c Binary files /dev/null and b/graphics/mail/bead/map.bin differ diff --git a/graphics/mail/bead/palette.pal b/graphics/mail/bead/palette.pal new file mode 100644 index 000000000..e2e6ca291 --- /dev/null +++ b/graphics/mail/bead/palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +139 164 189 +65 90 123 +98 123 156 +213 230 238 +238 255 255 +139 189 164 +255 148 131 +213 106 90 +164 156 189 +255 197 82 +98 197 197 +57 148 148 +82 82 82 +139 139 139 +205 205 205 +255 255 255 diff --git a/graphics/mail/bead/tiles.png b/graphics/mail/bead/tiles.png new file mode 100644 index 000000000..d006fb987 Binary files /dev/null and b/graphics/mail/bead/tiles.png differ diff --git a/graphics/mail/dream/map.bin b/graphics/mail/dream/map.bin new file mode 100644 index 000000000..bc28d8864 Binary files /dev/null and b/graphics/mail/dream/map.bin differ diff --git a/graphics/mail/dream/palette.pal b/graphics/mail/dream/palette.pal new file mode 100644 index 000000000..47172825c --- /dev/null +++ b/graphics/mail/dream/palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +139 164 189 +255 189 205 +222 164 197 +197 148 189 +172 131 189 +255 213 230 +0 0 0 +205 255 213 +230 255 230 +0 0 0 +98 197 197 +57 148 148 +82 82 82 +139 139 139 +205 205 205 +255 255 255 diff --git a/graphics/mail/dream/tiles.png b/graphics/mail/dream/tiles.png new file mode 100644 index 000000000..cb4411757 Binary files /dev/null and b/graphics/mail/dream/tiles.png differ diff --git a/graphics/mail/fab/map.bin b/graphics/mail/fab/map.bin new file mode 100644 index 000000000..b11121bdf Binary files /dev/null and b/graphics/mail/fab/map.bin differ diff --git a/graphics/mail/fab/palette.pal b/graphics/mail/fab/palette.pal new file mode 100644 index 000000000..17e1afcc3 --- /dev/null +++ b/graphics/mail/fab/palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +139 164 189 +238 205 222 +255 230 238 +213 230 238 +238 255 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +98 197 197 +57 148 148 +82 82 82 +139 139 139 +205 205 205 +255 255 255 diff --git a/graphics/mail/fab/tiles.png b/graphics/mail/fab/tiles.png new file mode 100644 index 000000000..99e9cac71 Binary files /dev/null and b/graphics/mail/fab/tiles.png differ diff --git a/graphics/mail/glitter/map.bin b/graphics/mail/glitter/map.bin new file mode 100644 index 000000000..fad949aa9 Binary files /dev/null and b/graphics/mail/glitter/map.bin differ diff --git a/graphics/mail/glitter/palette.pal b/graphics/mail/glitter/palette.pal new file mode 100644 index 000000000..544a0a11b --- /dev/null +++ b/graphics/mail/glitter/palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +139 164 189 +255 255 172 +255 238 123 +255 238 0 +255 41 41 +255 238 230 +255 189 41 +238 180 0 +0 0 0 +0 0 0 +98 197 197 +57 148 148 +82 82 82 +139 139 139 +205 205 205 +255 255 255 diff --git a/graphics/mail/glitter/tiles.png b/graphics/mail/glitter/tiles.png new file mode 100644 index 000000000..12bd11801 Binary files /dev/null and b/graphics/mail/glitter/tiles.png differ diff --git a/graphics/mail/harbor/map.bin b/graphics/mail/harbor/map.bin new file mode 100644 index 000000000..ce07a7539 Binary files /dev/null and b/graphics/mail/harbor/map.bin differ diff --git a/graphics/mail/harbor/palette.pal b/graphics/mail/harbor/palette.pal new file mode 100644 index 000000000..1a8795c33 --- /dev/null +++ b/graphics/mail/harbor/palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +139 164 189 +24 172 255 +255 255 148 +115 205 255 +74 172 255 +16 57 230 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +98 197 197 +57 148 148 +82 82 82 +139 139 139 +205 205 205 +255 255 255 diff --git a/graphics/mail/harbor/tiles.png b/graphics/mail/harbor/tiles.png new file mode 100644 index 000000000..b0a09ef69 Binary files /dev/null and b/graphics/mail/harbor/tiles.png differ diff --git a/graphics/mail/mech/map.bin b/graphics/mail/mech/map.bin new file mode 100644 index 000000000..d74974008 Binary files /dev/null and b/graphics/mail/mech/map.bin differ diff --git a/graphics/mail/mech/palette.pal b/graphics/mail/mech/palette.pal new file mode 100644 index 000000000..bb55d7c04 --- /dev/null +++ b/graphics/mail/mech/palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +139 164 189 +230 230 230 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +230 230 189 +197 189 139 +172 164 115 +98 197 197 +57 148 148 +82 82 82 +139 139 139 +205 205 205 +255 255 255 diff --git a/graphics/mail/mech/tiles.png b/graphics/mail/mech/tiles.png new file mode 100644 index 000000000..4d47dd73b Binary files /dev/null and b/graphics/mail/mech/tiles.png differ diff --git a/graphics/mail/orange/map.bin b/graphics/mail/orange/map.bin new file mode 100644 index 000000000..be4dbf9c5 Binary files /dev/null and b/graphics/mail/orange/map.bin differ diff --git a/graphics/mail/orange/palette.pal b/graphics/mail/orange/palette.pal new file mode 100644 index 000000000..20efef172 --- /dev/null +++ b/graphics/mail/orange/palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +139 164 189 +246 213 148 +238 180 74 +205 139 65 +189 246 222 +148 222 197 +131 189 164 +255 255 148 +189 180 123 +139 123 65 +98 197 197 +57 148 148 +82 82 82 +139 139 139 +205 205 205 +255 255 255 diff --git a/graphics/mail/orange/tiles.png b/graphics/mail/orange/tiles.png new file mode 100644 index 000000000..1676bd258 Binary files /dev/null and b/graphics/mail/orange/tiles.png differ diff --git a/graphics/mail/retro/map.bin b/graphics/mail/retro/map.bin new file mode 100644 index 000000000..30ee05ba2 Binary files /dev/null and b/graphics/mail/retro/map.bin differ diff --git a/graphics/mail/retro/palette.pal b/graphics/mail/retro/palette.pal new file mode 100644 index 000000000..707bdff93 --- /dev/null +++ b/graphics/mail/retro/palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +139 164 189 +246 106 41 +255 246 156 +255 205 65 +148 238 82 +172 106 49 +189 164 57 +123 213 246 +0 0 0 +255 230 90 +98 197 197 +57 148 148 +82 82 82 +139 139 139 +205 205 205 +255 255 255 diff --git a/graphics/mail/retro/tiles.png b/graphics/mail/retro/tiles.png new file mode 100644 index 000000000..da96ad486 Binary files /dev/null and b/graphics/mail/retro/tiles.png differ diff --git a/graphics/mail/shadow/map.bin b/graphics/mail/shadow/map.bin new file mode 100644 index 000000000..01fcfe4ce Binary files /dev/null and b/graphics/mail/shadow/map.bin differ diff --git a/graphics/mail/shadow/palette.pal b/graphics/mail/shadow/palette.pal new file mode 100644 index 000000000..f08b838c5 --- /dev/null +++ b/graphics/mail/shadow/palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +139 164 189 +139 139 164 +123 123 139 +106 106 123 +90 90 98 +0 0 0 +0 0 0 +0 0 0 +213 65 16 +148 49 0 +98 197 197 +57 148 148 +82 82 82 +139 139 139 +205 205 205 +255 255 255 diff --git a/graphics/mail/shadow/tiles.png b/graphics/mail/shadow/tiles.png new file mode 100644 index 000000000..cdc63cde1 Binary files /dev/null and b/graphics/mail/shadow/tiles.png differ diff --git a/graphics/mail/tropic/map.bin b/graphics/mail/tropic/map.bin new file mode 100644 index 000000000..8ef408f37 Binary files /dev/null and b/graphics/mail/tropic/map.bin differ diff --git a/graphics/mail/tropic/palette.pal b/graphics/mail/tropic/palette.pal new file mode 100644 index 000000000..99b2bb636 --- /dev/null +++ b/graphics/mail/tropic/palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +139 164 189 +230 255 98 +197 246 131 +189 246 65 +123 213 41 +255 180 98 +255 255 148 +123 180 24 +197 238 65 +205 156 90 +98 197 197 +57 148 148 +82 82 82 +139 139 139 +205 205 205 +255 255 255 diff --git a/graphics/mail/tropic/tiles.png b/graphics/mail/tropic/tiles.png new file mode 100644 index 000000000..6cee88775 Binary files /dev/null and b/graphics/mail/tropic/tiles.png differ diff --git a/graphics/mail/wave/map.bin b/graphics/mail/wave/map.bin new file mode 100644 index 000000000..0af44f798 Binary files /dev/null and b/graphics/mail/wave/map.bin differ diff --git a/graphics/mail/wave/palette.pal b/graphics/mail/wave/palette.pal new file mode 100644 index 000000000..dd9bbfae4 --- /dev/null +++ b/graphics/mail/wave/palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +139 164 189 +0 172 246 +65 90 156 +106 131 197 +197 222 255 +82 156 197 +230 246 255 +0 0 0 +0 0 0 +0 0 0 +98 197 197 +57 148 148 +82 82 82 +139 139 139 +205 205 205 +255 255 255 diff --git a/graphics/mail/wave/tiles.png b/graphics/mail/wave/tiles.png new file mode 100644 index 000000000..6b5af8a01 Binary files /dev/null and b/graphics/mail/wave/tiles.png differ diff --git a/graphics/mail/wood/map.bin b/graphics/mail/wood/map.bin new file mode 100644 index 000000000..4338a31c8 Binary files /dev/null and b/graphics/mail/wood/map.bin differ diff --git a/graphics/mail/wood/palette.pal b/graphics/mail/wood/palette.pal new file mode 100644 index 000000000..9ed936918 --- /dev/null +++ b/graphics/mail/wood/palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +139 164 189 +139 131 74 +164 180 82 +189 180 106 +222 205 106 +180 156 65 +246 213 156 +189 164 90 +222 164 123 +255 205 180 +98 197 197 +57 148 148 +82 82 82 +139 139 139 +205 205 205 +255 255 255 diff --git a/graphics/mail/wood/tiles.png b/graphics/mail/wood/tiles.png new file mode 100644 index 000000000..a55029fac Binary files /dev/null and b/graphics/mail/wood/tiles.png differ -- cgit v1.2.3 From 771cc93d932058d4ba079a33c04c0380f339c6a7 Mon Sep 17 00:00:00 2001 From: paul Date: Sun, 14 Oct 2018 16:38:48 +0200 Subject: actually fix trade.s --- asm/trade.s | 5 ----- 1 file changed, 5 deletions(-) diff --git a/asm/trade.s b/asm/trade.s index 769b9b808..cf1cde171 100644 --- a/asm/trade.s +++ b/asm/trade.s @@ -7897,13 +7897,8 @@ sub_80504CC: @ 80504CC .align 2, 0 _080505B4: .4byte gUnknown_826D1D4 _080505B8: .4byte gUnknown_8D00000 -<<<<<<< HEAD _080505BC: .4byte gFile_graphics_interface_menu_map_tilemap -_080505C0: .4byte gUnknown_201C000 -======= -_080505BC: .4byte gUnknown_8D0051C _080505C0: .4byte gDecompressionBuffer ->>>>>>> upstream/master _080505C4: .4byte gUnknown_8D004D8 _080505C8: .4byte gUnknown_826D1BC thumb_func_end sub_80504CC -- cgit v1.2.3 From f12a82b068bb5871bc8ee9fd4146baa89799e645 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Mon, 15 Oct 2018 05:41:11 -0400 Subject: nonmatching sub_8112B3C --- asm/quest_log.s | 184 ---------------------------------------- src/quest_log.c | 259 +++++++++++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 257 insertions(+), 186 deletions(-) diff --git a/asm/quest_log.s b/asm/quest_log.s index e4947d79c..2bfc14dd1 100644 --- a/asm/quest_log.s +++ b/asm/quest_log.s @@ -5,190 +5,6 @@ .text - thumb_func_start sub_8112B3C -sub_8112B3C: @ 8112B3C - push {r4-r7,lr} - ldr r0, _08112B54 @ =gUnknown_3005E88 - ldrb r0, [r0] - cmp r0, 0x4 - bls _08112B48 - b _08112C84 -_08112B48: - lsls r0, 2 - ldr r1, _08112B58 @ =_08112B5C - adds r0, r1 - ldr r0, [r0] - mov pc, r0 - .align 2, 0 -_08112B54: .4byte gUnknown_3005E88 -_08112B58: .4byte _08112B5C - .align 2, 0 -_08112B5C: - .4byte _08112C84 - .4byte _08112B70 - .4byte _08112C5E - .4byte _08112C84 - .4byte _08112C84 -_08112B70: - bl sub_8112CEC - lsls r0, 24 - cmp r0, 0 - beq _08112B7C - b _08112C72 -_08112B7C: - ldr r0, _08112B8C @ =gUnknown_203B01A - ldrh r1, [r0] - adds r7, r0, 0 - cmp r1, 0 - beq _08112B90 - subs r0, r1, 0x1 - strh r0, [r7] - b _08112C84 - .align 2, 0 -_08112B8C: .4byte gUnknown_203B01A -_08112B90: - ldr r5, _08112B98 @ =gUnknown_3005E88 - ldr r4, _08112B9C @ =gUnknown_203AF98 - ldr r6, _08112BA0 @ =gUnknown_3005E94 - b _08112BD4 - .align 2, 0 -_08112B98: .4byte gUnknown_3005E88 -_08112B9C: .4byte gUnknown_203AF98 -_08112BA0: .4byte gUnknown_3005E94 -_08112BA4: - ldrh r0, [r4] - adds r0, 0x1 - strh r0, [r4] - ldr r1, _08112BF0 @ =gUnknown_3005E8C - lsls r0, 16 - lsrs r0, 16 - ldrh r1, [r1] - cmp r0, r1 - bcs _08112C58 - ldrh r0, [r4] - ldr r1, [r6] - lsls r0, 3 - adds r0, r1 - ldrh r0, [r0, 0x4] - strh r0, [r7] - cmp r2, 0x3 - beq _08112C84 - lsls r0, 16 - lsrs r1, r0, 16 - cmp r1, 0 - beq _08112BD4 - ldr r0, _08112BF4 @ =0x0000ffff - cmp r1, r0 - bne _08112C84 -_08112BD4: - ldrh r0, [r4] - ldr r1, [r6] - lsls r0, 3 - adds r3, r0, r1 - ldrb r0, [r3, 0x6] - cmp r0, 0x2 - beq _08112C2C - cmp r0, 0x2 - bgt _08112BF8 - cmp r0, 0 - beq _08112C0C - cmp r0, 0x1 - beq _08112C18 - b _08112C50 - .align 2, 0 -_08112BF0: .4byte gUnknown_3005E8C -_08112BF4: .4byte 0x0000ffff -_08112BF8: - cmp r0, 0xFE - beq _08112C50 - cmp r0, 0xFE - bgt _08112C06 - cmp r0, 0x3 - beq _08112C4E - b _08112C50 -_08112C06: - cmp r0, 0xFF - beq _08112C4C - b _08112C50 -_08112C0C: - ldr r0, _08112C14 @ =gUnknown_203AF9A - ldrb r1, [r3] - lsls r1, 1 - b _08112C20 - .align 2, 0 -_08112C14: .4byte gUnknown_203AF9A -_08112C18: - ldr r0, _08112C28 @ =gUnknown_203AF9A - ldrb r1, [r3] - lsls r1, 1 - adds r0, 0x1 -_08112C20: - adds r1, r0 - ldrb r0, [r3, 0x3] - strb r0, [r1] - b _08112C50 - .align 2, 0 -_08112C28: .4byte gUnknown_203AF9A -_08112C2C: - ldr r2, _08112C48 @ =gUnknown_3005E90 - ldrb r1, [r3, 0x3] - lsls r1, 24 - ldrb r0, [r3, 0x2] - lsls r0, 16 - orrs r1, r0 - ldrb r0, [r3, 0x1] - lsls r0, 8 - orrs r1, r0 - ldrb r0, [r3] - orrs r1, r0 - str r1, [r2] - b _08112C50 - .align 2, 0 -_08112C48: .4byte gUnknown_3005E90 -_08112C4C: - movs r0, 0 -_08112C4E: - strb r0, [r5] -_08112C50: - ldrb r2, [r5] - cmp r2, 0 - bne _08112BA4 - b _08112C84 -_08112C58: - movs r0, 0 - strb r0, [r5] - b _08112C84 -_08112C5E: - bl ScriptContext2_IsEnabled - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x1 - beq _08112C84 - ldr r1, _08112C8C @ =gUnknown_203B01A - ldrh r0, [r1] - adds r0, 0x1 - strh r0, [r1] -_08112C72: - ldr r0, _08112C90 @ =gUnknown_203AF98 - ldr r1, _08112C94 @ =gUnknown_3005E8C - ldrh r0, [r0] - ldrh r1, [r1] - cmp r0, r1 - bcc _08112C84 - ldr r1, _08112C98 @ =gUnknown_3005E88 - movs r0, 0 - strb r0, [r1] -_08112C84: - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_08112C8C: .4byte gUnknown_203B01A -_08112C90: .4byte gUnknown_203AF98 -_08112C94: .4byte gUnknown_3005E8C -_08112C98: .4byte gUnknown_3005E88 - thumb_func_end sub_8112B3C - thumb_func_start sub_8112C9C sub_8112C9C: @ 8112C9C ldr r1, _08112CA8 @ =gUnknown_203B01A diff --git a/src/quest_log.c b/src/quest_log.c index 49e0db836..61b1e66d6 100644 --- a/src/quest_log.c +++ b/src/quest_log.c @@ -1550,11 +1550,11 @@ void sub_811278C(u8 a0, u8 a1) } } -void sub_81127F8(u32 * a0) +void sub_81127F8(struct UnkStruct_3005E90 * a0) { if (gUnknown_203AF98 < gUnknown_3005E8C) { - u32 r2 = *a0 & 0x00FF00F3; + u32 r2 = *(u32 *)a0 & 0x00FF00F3; gUnknown_3005E94[gUnknown_203AF98].unk_4 = gUnknown_203B01A; gUnknown_3005E94[gUnknown_203AF98].unk_6 = 2; gUnknown_3005E94[gUnknown_203AF98].unk_0 = r2; @@ -1677,3 +1677,258 @@ void sub_8112940(u8 a0, struct UnkStruct_203AE98 *a1, u16 a2) break; } } + +#ifdef NONMATCHING +void sub_8112B3C(void) +{ + switch (gUnknown_3005E88) + { + case 0: + break; + case 1: + if (sub_8112CEC()) + { + if (gUnknown_203B01A != 0) + gUnknown_203B01A--; + else + { + while (1) + { + switch (gUnknown_3005E94[gUnknown_203AF98].unk_6) + { + case 0: + gUnknown_203AF9A[gUnknown_3005E94[gUnknown_203AF98].unk_0][0] = gUnknown_3005E94[gUnknown_203AF98].unk_3; + break; + case 1: + gUnknown_203AF9A[gUnknown_3005E94[gUnknown_203AF98].unk_0][1] = gUnknown_3005E94[gUnknown_203AF98].unk_3; + break; + case 2: + *(u32 *)&gUnknown_3005E90 = ((gUnknown_3005E94[gUnknown_203AF98].unk_3 << 24) | (gUnknown_3005E94[gUnknown_203AF98].unk_2 << 16) | (gUnknown_3005E94[gUnknown_203AF98].unk_1 << 8) | (gUnknown_3005E94[gUnknown_203AF98].unk_0 << 0)); + break; + case 3: + gUnknown_3005E88 = 3; + break; + case 0xFE: + break; + case 0xFF: + gUnknown_3005E88 = 0; + break; + } + if (gUnknown_3005E88 == 0) + break; + if (++gUnknown_203AF98 >= gUnknown_3005E8C) + { + gUnknown_3005E88 = 0; + break; + } + gUnknown_203B01A = gUnknown_3005E94[gUnknown_203AF98].unk_4; + if (gUnknown_3005E88 == 3) + break; + if (gUnknown_203B01A == 0) + continue; + if (gUnknown_203B01A == 0xFFFF) + break; + } + } + } + else if (gUnknown_203AF98 >= gUnknown_3005E8C) + gUnknown_3005E88 = 0; + break; + case 2: + if (ScriptContext2_IsEnabled() != 1) + gUnknown_203B01A++; + if (gUnknown_203AF98 >= gUnknown_3005E8C) + gUnknown_3005E88 = 0; + break; + case 3: + break; + case 4: + break; + } +} +#else +NAKED +void sub_8112B3C(void) +{ + asm_unified("\tpush {r4-r7,lr}\n" + "\tldr r0, _08112B54 @ =gUnknown_3005E88\n" + "\tldrb r0, [r0]\n" + "\tcmp r0, 0x4\n" + "\tbls _08112B48\n" + "\tb _08112C84\n" + "_08112B48:\n" + "\tlsls r0, 2\n" + "\tldr r1, _08112B58 @ =_08112B5C\n" + "\tadds r0, r1\n" + "\tldr r0, [r0]\n" + "\tmov pc, r0\n" + "\t.align 2, 0\n" + "_08112B54: .4byte gUnknown_3005E88\n" + "_08112B58: .4byte _08112B5C\n" + "\t.align 2, 0\n" + "_08112B5C:\n" + "\t.4byte _08112C84\n" + "\t.4byte _08112B70\n" + "\t.4byte _08112C5E\n" + "\t.4byte _08112C84\n" + "\t.4byte _08112C84\n" + "_08112B70:\n" + "\tbl sub_8112CEC\n" + "\tlsls r0, 24\n" + "\tcmp r0, 0\n" + "\tbeq _08112B7C\n" + "\tb _08112C72\n" + "_08112B7C:\n" + "\tldr r0, _08112B8C @ =gUnknown_203B01A\n" + "\tldrh r1, [r0]\n" + "\tadds r7, r0, 0\n" + "\tcmp r1, 0\n" + "\tbeq _08112B90\n" + "\tsubs r0, r1, 0x1\n" + "\tstrh r0, [r7]\n" + "\tb _08112C84\n" + "\t.align 2, 0\n" + "_08112B8C: .4byte gUnknown_203B01A\n" + "_08112B90:\n" + "\tldr r5, _08112B98 @ =gUnknown_3005E88\n" + "\tldr r4, _08112B9C @ =gUnknown_203AF98\n" + "\tldr r6, _08112BA0 @ =gUnknown_3005E94\n" + "\tb _08112BD4\n" + "\t.align 2, 0\n" + "_08112B98: .4byte gUnknown_3005E88\n" + "_08112B9C: .4byte gUnknown_203AF98\n" + "_08112BA0: .4byte gUnknown_3005E94\n" + "_08112BA4:\n" + "\tldrh r0, [r4]\n" + "\tadds r0, 0x1\n" + "\tstrh r0, [r4]\n" + "\tldr r1, _08112BF0 @ =gUnknown_3005E8C\n" + "\tlsls r0, 16\n" + "\tlsrs r0, 16\n" + "\tldrh r1, [r1]\n" + "\tcmp r0, r1\n" + "\tbcs _08112C58\n" + "\tldrh r0, [r4]\n" + "\tldr r1, [r6]\n" + "\tlsls r0, 3\n" + "\tadds r0, r1\n" + "\tldrh r0, [r0, 0x4]\n" + "\tstrh r0, [r7]\n" + "\tcmp r2, 0x3\n" + "\tbeq _08112C84\n" + "\tlsls r0, 16\n" + "\tlsrs r1, r0, 16\n" + "\tcmp r1, 0\n" + "\tbeq _08112BD4\n" + "\tldr r0, _08112BF4 @ =0x0000ffff\n" + "\tcmp r1, r0\n" + "\tbne _08112C84\n" + "_08112BD4:\n" + "\tldrh r0, [r4]\n" + "\tldr r1, [r6]\n" + "\tlsls r0, 3\n" + "\tadds r3, r0, r1\n" + "\tldrb r0, [r3, 0x6]\n" + "\tcmp r0, 0x2\n" + "\tbeq _08112C2C\n" + "\tcmp r0, 0x2\n" + "\tbgt _08112BF8\n" + "\tcmp r0, 0\n" + "\tbeq _08112C0C\n" + "\tcmp r0, 0x1\n" + "\tbeq _08112C18\n" + "\tb _08112C50\n" + "\t.align 2, 0\n" + "_08112BF0: .4byte gUnknown_3005E8C\n" + "_08112BF4: .4byte 0x0000ffff\n" + "_08112BF8:\n" + "\tcmp r0, 0xFE\n" + "\tbeq _08112C50\n" + "\tcmp r0, 0xFE\n" + "\tbgt _08112C06\n" + "\tcmp r0, 0x3\n" + "\tbeq _08112C4E\n" + "\tb _08112C50\n" + "_08112C06:\n" + "\tcmp r0, 0xFF\n" + "\tbeq _08112C4C\n" + "\tb _08112C50\n" + "_08112C0C:\n" + "\tldr r0, _08112C14 @ =gUnknown_203AF9A\n" + "\tldrb r1, [r3]\n" + "\tlsls r1, 1\n" + "\tb _08112C20\n" + "\t.align 2, 0\n" + "_08112C14: .4byte gUnknown_203AF9A\n" + "_08112C18:\n" + "\tldr r0, _08112C28 @ =gUnknown_203AF9A\n" + "\tldrb r1, [r3]\n" + "\tlsls r1, 1\n" + "\tadds r0, 0x1\n" + "_08112C20:\n" + "\tadds r1, r0\n" + "\tldrb r0, [r3, 0x3]\n" + "\tstrb r0, [r1]\n" + "\tb _08112C50\n" + "\t.align 2, 0\n" + "_08112C28: .4byte gUnknown_203AF9A\n" + "_08112C2C:\n" + "\tldr r2, _08112C48 @ =gUnknown_3005E90\n" + "\tldrb r1, [r3, 0x3]\n" + "\tlsls r1, 24\n" + "\tldrb r0, [r3, 0x2]\n" + "\tlsls r0, 16\n" + "\torrs r1, r0\n" + "\tldrb r0, [r3, 0x1]\n" + "\tlsls r0, 8\n" + "\torrs r1, r0\n" + "\tldrb r0, [r3]\n" + "\torrs r1, r0\n" + "\tstr r1, [r2]\n" + "\tb _08112C50\n" + "\t.align 2, 0\n" + "_08112C48: .4byte gUnknown_3005E90\n" + "_08112C4C:\n" + "\tmovs r0, 0\n" + "_08112C4E:\n" + "\tstrb r0, [r5]\n" + "_08112C50:\n" + "\tldrb r2, [r5]\n" + "\tcmp r2, 0\n" + "\tbne _08112BA4\n" + "\tb _08112C84\n" + "_08112C58:\n" + "\tmovs r0, 0\n" + "\tstrb r0, [r5]\n" + "\tb _08112C84\n" + "_08112C5E:\n" + "\tbl ScriptContext2_IsEnabled\n" + "\tlsls r0, 24\n" + "\tlsrs r0, 24\n" + "\tcmp r0, 0x1\n" + "\tbeq _08112C84\n" + "\tldr r1, _08112C8C @ =gUnknown_203B01A\n" + "\tldrh r0, [r1]\n" + "\tadds r0, 0x1\n" + "\tstrh r0, [r1]\n" + "_08112C72:\n" + "\tldr r0, _08112C90 @ =gUnknown_203AF98\n" + "\tldr r1, _08112C94 @ =gUnknown_3005E8C\n" + "\tldrh r0, [r0]\n" + "\tldrh r1, [r1]\n" + "\tcmp r0, r1\n" + "\tbcc _08112C84\n" + "\tldr r1, _08112C98 @ =gUnknown_3005E88\n" + "\tmovs r0, 0\n" + "\tstrb r0, [r1]\n" + "_08112C84:\n" + "\tpop {r4-r7}\n" + "\tpop {r0}\n" + "\tbx r0\n" + "\t.align 2, 0\n" + "_08112C8C: .4byte gUnknown_203B01A\n" + "_08112C90: .4byte gUnknown_203AF98\n" + "_08112C94: .4byte gUnknown_3005E8C\n" + "_08112C98: .4byte gUnknown_3005E88"); +} +#endif -- cgit v1.2.3 From 1c90805498f7a03d415d74bfe3b380396b81e14f Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Mon, 15 Oct 2018 10:07:39 -0500 Subject: through sub_8112D40 --- asm/quest_log.s | 154 -------------------------------------------------------- include/save.h | 1 - src/quest_log.c | 65 ++++++++++++++++++++++++ 3 files changed, 65 insertions(+), 155 deletions(-) diff --git a/asm/quest_log.s b/asm/quest_log.s index 2bfc14dd1..22a28b96f 100644 --- a/asm/quest_log.s +++ b/asm/quest_log.s @@ -5,160 +5,6 @@ .text - thumb_func_start sub_8112C9C -sub_8112C9C: @ 8112C9C - ldr r1, _08112CA8 @ =gUnknown_203B01A - ldrh r0, [r1] - adds r0, 0x1 - strh r0, [r1] - bx lr - .align 2, 0 -_08112CA8: .4byte gUnknown_203B01A - thumb_func_end sub_8112C9C - - thumb_func_start sub_8112CAC -sub_8112CAC: @ 8112CAC - push {lr} - ldr r0, _08112CC0 @ =gUnknown_3005E88 - ldrb r0, [r0] - cmp r0, 0x4 - bhi _08112CDC - lsls r0, 2 - ldr r1, _08112CC4 @ =_08112CC8 - adds r0, r1 - ldr r0, [r0] - mov pc, r0 - .align 2, 0 -_08112CC0: .4byte gUnknown_3005E88 -_08112CC4: .4byte _08112CC8 - .align 2, 0 -_08112CC8: - .4byte _08112CDC - .4byte _08112CE0 - .4byte _08112CE4 - .4byte _08112CE0 - .4byte _08112CE4 -_08112CDC: - movs r0, 0 - b _08112CE6 -_08112CE0: - movs r0, 0x1 - b _08112CE6 -_08112CE4: - movs r0, 0x2 -_08112CE6: - pop {r1} - bx r1 - thumb_func_end sub_8112CAC - - thumb_func_start sub_8112CEC -sub_8112CEC: @ 8112CEC - push {lr} - ldr r0, _08112D0C @ =gUnknown_203AF98 - ldr r1, _08112D10 @ =gUnknown_3005E8C - ldrh r0, [r0] - ldrh r1, [r1] - cmp r0, r1 - bcs _08112D06 - bl ScriptContext2_IsEnabled - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x1 - bne _08112D14 -_08112D06: - movs r0, 0x1 - b _08112D16 - .align 2, 0 -_08112D0C: .4byte gUnknown_203AF98 -_08112D10: .4byte gUnknown_3005E8C -_08112D14: - movs r0, 0 -_08112D16: - pop {r1} - bx r1 - thumb_func_end sub_8112CEC - - thumb_func_start sub_8112D1C -sub_8112D1C: @ 8112D1C - push {lr} - ldr r0, _08112D30 @ =gUnknown_203AF98 - ldr r1, _08112D34 @ =gUnknown_3005E8C - ldrh r0, [r0] - ldrh r1, [r1] - cmp r0, r1 - bcs _08112D38 - movs r0, 0 - b _08112D3A - .align 2, 0 -_08112D30: .4byte gUnknown_203AF98 -_08112D34: .4byte gUnknown_3005E8C -_08112D38: - movs r0, 0x1 -_08112D3A: - pop {r1} - bx r1 - thumb_func_end sub_8112D1C - - thumb_func_start sub_8112D40 -sub_8112D40: @ 8112D40 - push {r4-r6,lr} - lsls r0, 24 - lsrs r6, r0, 24 - lsls r1, 16 - lsrs r5, r1, 16 - ldr r0, _08112D6C @ =gUnknown_203AF98 - ldrh r1, [r0] - cmp r1, 0 - beq _08112D66 - ldr r0, _08112D70 @ =gUnknown_3005E8C - ldrh r0, [r0] - cmp r1, r0 - bcs _08112D66 - ldr r4, _08112D74 @ =gUnknown_203B01E - ldr r1, _08112D78 @ =gUnknown_3002020 - ldrh r0, [r4] - ldrh r1, [r1] - cmp r0, r1 - bcc _08112D7C -_08112D66: - movs r0, 0 - b _08112DA8 - .align 2, 0 -_08112D6C: .4byte gUnknown_203AF98 -_08112D70: .4byte gUnknown_3005E8C -_08112D74: .4byte gUnknown_203B01E -_08112D78: .4byte gUnknown_3002020 -_08112D7C: - ldrh r3, [r4] - ldr r0, _08112DA0 @ =gUnknown_300201C - ldr r1, [r0] - lsls r0, r3, 2 - adds r2, r0, r1 - ldr r1, [r2] - lsls r0, r1, 17 - lsrs r0, 17 - cmp r0, r5 - bne _08112DA4 - lsls r0, r1, 16 - lsrs r0, 31 - cmp r0, r6 - bne _08112DA4 - adds r1, r2, 0x2 - adds r0, r3, 0x1 - strh r0, [r4] - b _08112DA6 - .align 2, 0 -_08112DA0: .4byte gUnknown_300201C -_08112DA4: - movs r1, 0 -_08112DA6: - adds r0, r1, 0 -_08112DA8: - pop {r4-r6} - pop {r1} - bx r1 - thumb_func_end sub_8112D40 - thumb_func_start sub_8112DB0 sub_8112DB0: @ 8112DB0 push {r4-r7,lr} diff --git a/include/save.h b/include/save.h index 5a502e1fc..29524a7e2 100644 --- a/include/save.h +++ b/include/save.h @@ -119,7 +119,6 @@ u8 Save_LoadGameData(u8 a1); u32 TryCopySpecialSaveSection(u8 sector, u8* dst); u32 sub_8153634(u8 sector, u8* src); void sub_8153688(u8 taskId); -//void Save_LoadGameData(u8); u32 sub_80DA5E0(u8 sector, u8* src); void sub_80DA634(u8 taskId); diff --git a/src/quest_log.c b/src/quest_log.c index a1008aa06..1419ca8a0 100644 --- a/src/quest_log.c +++ b/src/quest_log.c @@ -52,11 +52,21 @@ struct UnkStruct_203AE98 u8 unk_6; }; +struct UnkStruct_300201C +{ + u16 unk_0_0:15; + u16 unk_0_f:1; + u16 unk_2; +}; + u8 gUnknown_3005E88; u16 gUnknown_3005E8C; struct UnkStruct_3005E90 gUnknown_3005E90; struct UnkStruct_203AE98 * gUnknown_3005E94; +IWRAM_DATA struct UnkStruct_300201C * gUnknown_300201C; +IWRAM_DATA u16 gUnknown_3002020; + EWRAM_DATA u8 gUnknown_203ADF8 = 0; EWRAM_DATA u8 gUnknown_203ADF9 = 0; EWRAM_DATA u8 gUnknown_203ADFA = 0; @@ -73,6 +83,7 @@ EWRAM_DATA u16 gUnknown_203AF98 = 0; EWRAM_DATA u8 gUnknown_203AF9A[64][2]; EWRAM_DATA u16 gUnknown_203B01A; EWRAM_DATA u16 gUnknown_203B01C; +EWRAM_DATA u16 gUnknown_203B01E; EWRAM_DATA u16 gUnknown_203B044[2] = {0}; @@ -1932,3 +1943,57 @@ void sub_8112B3C(void) "_08112C98: .4byte gUnknown_3005E88"); } #endif + +void sub_8112C9C(void) +{ + gUnknown_203B01A++; +} + +u8 sub_8112CAC(void) +{ + switch (gUnknown_3005E88) + { + case 0: + default: + return 0; + case 1: + case 3: + return 1; + case 2: + case 4: + return 2; + } +} + +bool8 sub_8112CEC(void) +{ + if (gUnknown_203AF98 >= gUnknown_3005E8C || ScriptContext2_IsEnabled() == TRUE) + return TRUE; + return FALSE; +} + +bool8 sub_8112D1C(void) +{ + if (gUnknown_203AF98 >= gUnknown_3005E8C) + return TRUE; + return FALSE; +} + +u16 * sub_8112D40(u8 a0, u16 a1) +{ + u16 * response; + if (gUnknown_203AF98 == 0) + return NULL; + if (gUnknown_203AF98 >= gUnknown_3005E8C) + return NULL; + if (gUnknown_203B01E >= gUnknown_3002020) + return NULL; + if (gUnknown_300201C[gUnknown_203B01E].unk_0_0 == a1 && gUnknown_300201C[gUnknown_203B01E].unk_0_f == a0) + { + response = &gUnknown_300201C[gUnknown_203B01E].unk_2; + gUnknown_203B01E++; + } + else + response = NULL; + return response; +} -- cgit v1.2.3 From 3f43d60bc240bfcdc3da254bf9ff50af3cbaee1a Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Mon, 15 Oct 2018 11:30:50 -0500 Subject: through sub_8112EB4 --- asm/quest_log.s | 157 ------------------------------------------------------- data/quest_log.s | 10 +--- src/quest_log.c | 63 ++++++++++++++++++++++ 3 files changed, 64 insertions(+), 166 deletions(-) diff --git a/asm/quest_log.s b/asm/quest_log.s index 22a28b96f..d6dc18f13 100644 --- a/asm/quest_log.s +++ b/asm/quest_log.s @@ -5,163 +5,6 @@ .text - thumb_func_start sub_8112DB0 -sub_8112DB0: @ 8112DB0 - push {r4-r7,lr} - lsls r0, 24 - lsrs r7, r0, 24 - lsls r1, 16 - lsrs r3, r1, 16 - lsls r2, 16 - lsrs r2, 16 - mov r12, r2 - ldr r0, _08112E20 @ =gUnknown_203AF98 - ldrh r1, [r0] - cmp r1, 0 - beq _08112E18 - ldr r0, _08112E24 @ =gUnknown_3005E8C - ldrh r0, [r0] - cmp r1, r0 - bcs _08112E18 - ldr r6, _08112E28 @ =gUnknown_203B01E - ldr r1, _08112E2C @ =gUnknown_3002020 - ldrh r0, [r6] - ldrh r1, [r1] - cmp r0, r1 - bcs _08112E18 - adds r2, r0, 0 - ldr r5, _08112E30 @ =gUnknown_300201C - ldr r4, [r5] - lsls r2, 2 - adds r2, r4 - ldr r1, _08112E34 @ =0x00007fff - ands r1, r3 - ldrh r3, [r2] - ldr r0, _08112E38 @ =0xffff8000 - ands r0, r3 - orrs r0, r1 - strh r0, [r2] - ldrh r1, [r6] - lsls r1, 2 - adds r1, r4 - lsls r3, r7, 7 - ldrb r2, [r1, 0x1] - movs r0, 0x7F - ands r0, r2 - orrs r0, r3 - strb r0, [r1, 0x1] - ldrh r0, [r6] - ldr r1, [r5] - lsls r0, 2 - adds r0, r1 - mov r1, r12 - strh r1, [r0, 0x2] - ldrh r0, [r6] - adds r0, 0x1 - strh r0, [r6] -_08112E18: - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_08112E20: .4byte gUnknown_203AF98 -_08112E24: .4byte gUnknown_3005E8C -_08112E28: .4byte gUnknown_203B01E -_08112E2C: .4byte gUnknown_3002020 -_08112E30: .4byte gUnknown_300201C -_08112E34: .4byte 0x00007fff -_08112E38: .4byte 0xffff8000 - thumb_func_end sub_8112DB0 - - thumb_func_start sub_8112E3C -sub_8112E3C: @ 8112E3C - push {r4,r5,lr} - lsls r0, 24 - lsls r2, 16 - lsrs r3, r0, 24 - movs r4, 0xFF - lsls r4, 24 - adds r0, r4 - lsrs r0, 24 - cmp r0, 0x1 - bls _08112E5C - ldr r1, _08112E58 @ =gUnknown_3005E88 - movs r0, 0 - strb r0, [r1] - b _08112E8E - .align 2, 0 -_08112E58: .4byte gUnknown_3005E88 -_08112E5C: - ldr r5, _08112E94 @ =gUnknown_300201C - str r1, [r5] - ldr r1, _08112E98 @ =gUnknown_3002020 - lsrs r0, r2, 18 - strh r0, [r1] - ldr r1, _08112E9C @ =gUnknown_203B01E - movs r0, 0 - strh r0, [r1] - cmp r3, 0x2 - bne _08112E8E - movs r2, 0 - ldr r4, _08112EA0 @ =gUnknown_3005E8C - ldrh r0, [r4] - cmp r2, r0 - bge _08112E8E - ldr r0, _08112EA4 @ =gUnknown_84566A4 - ldr r3, [r0] -_08112E7E: - ldr r1, [r5] - lsls r0, r2, 2 - adds r0, r1 - str r3, [r0] - adds r2, 0x1 - ldrh r0, [r4] - cmp r2, r0 - blt _08112E7E -_08112E8E: - pop {r4,r5} - pop {r0} - bx r0 - .align 2, 0 -_08112E94: .4byte gUnknown_300201C -_08112E98: .4byte gUnknown_3002020 -_08112E9C: .4byte gUnknown_203B01E -_08112EA0: .4byte gUnknown_3005E8C -_08112EA4: .4byte gUnknown_84566A4 - thumb_func_end sub_8112E3C - - thumb_func_start sub_8112EA8 -sub_8112EA8: @ 8112EA8 - ldr r1, _08112EB0 @ =gUnknown_203B020 - movs r0, 0xFF - strb r0, [r1] - bx lr - .align 2, 0 -_08112EB0: .4byte gUnknown_203B020 - thumb_func_end sub_8112EA8 - - thumb_func_start sub_8112EB4 -sub_8112EB4: @ 8112EB4 - push {r4,lr} - ldr r4, _08112ED4 @ =gUnknown_203B020 - ldrb r0, [r4] - cmp r0, 0xFF - bne _08112ECC - ldr r0, _08112ED8 @ =gUnknown_8456928 - bl AddWindow - strb r0, [r4] - ldrb r0, [r4] - bl PutWindowTilemap -_08112ECC: - ldrb r0, [r4] - pop {r4} - pop {r1} - bx r1 - .align 2, 0 -_08112ED4: .4byte gUnknown_203B020 -_08112ED8: .4byte gUnknown_8456928 - thumb_func_end sub_8112EB4 - thumb_func_start sub_8112EDC sub_8112EDC: @ 8112EDC push {r4,r5,lr} diff --git a/data/quest_log.s b/data/quest_log.s index dd7776ae0..a68d924a7 100644 --- a/data/quest_log.s +++ b/data/quest_log.s @@ -1,14 +1,6 @@ .section .rodata -gUnknown_84566A4:: @ 84566A4 - .incbin "baserom.gba", 0x4566A4, 0x4 - -gUnknown_84566A8:: @ 84566A8 - .incbin "baserom.gba", 0x4566A8, 0x280 - -gUnknown_8456928:: @ 8456928 - .incbin "baserom.gba", 0x456928, 0x8 - + .align 2 gUnknown_8456930:: @ 8456930 .incbin "baserom.gba", 0x456930, 0x4 diff --git a/src/quest_log.c b/src/quest_log.c index 1419ca8a0..590892acf 100644 --- a/src/quest_log.c +++ b/src/quest_log.c @@ -84,6 +84,7 @@ EWRAM_DATA u8 gUnknown_203AF9A[64][2]; EWRAM_DATA u16 gUnknown_203B01A; EWRAM_DATA u16 gUnknown_203B01C; EWRAM_DATA u16 gUnknown_203B01E; +EWRAM_DATA u8 gUnknown_203B020; EWRAM_DATA u16 gUnknown_203B044[2] = {0}; @@ -1979,6 +1980,12 @@ bool8 sub_8112D1C(void) return FALSE; } +const struct UnkStruct_300201C gUnknown_84566A4 = { + 0, + FALSE, + 0x7FFF +}; + u16 * sub_8112D40(u8 a0, u16 a1) { u16 * response; @@ -1997,3 +2004,59 @@ u16 * sub_8112D40(u8 a0, u16 a1) response = NULL; return response; } + +void sub_8112DB0(u8 a0, u16 a1, u16 a2) +{ + if (gUnknown_203AF98 == 0) + return; + if (gUnknown_203AF98 >= gUnknown_3005E8C) + return; + if (gUnknown_203B01E >= gUnknown_3002020) + return; + gUnknown_300201C[gUnknown_203B01E].unk_0_0 = a1; + gUnknown_300201C[gUnknown_203B01E].unk_0_f = a0; + gUnknown_300201C[gUnknown_203B01E].unk_2 = a2; + gUnknown_203B01E++; +} + +void sub_8112E3C(u8 a0, struct UnkStruct_300201C * a1, u16 a2) +{ + s32 i; + + if (a0 == 0 || a0 > 2) + gUnknown_3005E88 = 0; + else + { + gUnknown_300201C = a1; + gUnknown_3002020 = a2 >> 2; + gUnknown_203B01E = 0; + if (a0 == 2) + { + for (i = 0; i < gUnknown_3005E8C; i++) + { + gUnknown_300201C[i] = gUnknown_84566A4; + } + } + } +} + +const u16 gUnknown_84566A8[] = INCBIN_U16("data/graphics/unknown_84566a8.bin"); + +const struct WindowTemplate gUnknown_8456928 = { + 0x00, 0, 15, 30, 5, 15, 0x008F +}; + +void sub_8112EA8(void) +{ + gUnknown_203B020 = 0xFF; +} + +u8 sub_8112EB4(void) +{ + if (gUnknown_203B020 == 0xFF) + { + gUnknown_203B020 = AddWindow(&gUnknown_8456928); + PutWindowTilemap(gUnknown_203B020); + } + return gUnknown_203B020; +} -- cgit v1.2.3 From f214ba976da083876d6ed6c87e38c48823d44e93 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Mon, 15 Oct 2018 18:48:37 -0500 Subject: nonmatching sub_8112F18 --- asm/quest_log.s | 126 ------------------------------------------------ src/quest_log.c | 147 +++++++++++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 146 insertions(+), 127 deletions(-) diff --git a/asm/quest_log.s b/asm/quest_log.s index d6dc18f13..5e6e71eb4 100644 --- a/asm/quest_log.s +++ b/asm/quest_log.s @@ -5,132 +5,6 @@ .text - thumb_func_start sub_8112EDC -sub_8112EDC: @ 8112EDC - push {r4,r5,lr} - lsls r0, 24 - lsrs r5, r0, 24 - ldr r4, _08112F14 @ =gUnknown_203B020 - ldrb r0, [r4] - cmp r0, 0xFF - beq _08112F0C - movs r1, 0 - bl FillWindowPixelBuffer - ldrb r0, [r4] - bl ClearWindowTilemap - cmp r5, 0 - beq _08112F02 - ldrb r0, [r4] - adds r1, r5, 0 - bl CopyWindowToVram -_08112F02: - ldrb r0, [r4] - bl RemoveWindow - movs r0, 0xFF - strb r0, [r4] -_08112F0C: - pop {r4,r5} - pop {r0} - bx r0 - .align 2, 0 -_08112F14: .4byte gUnknown_203B020 - thumb_func_end sub_8112EDC - - thumb_func_start sub_8112F18 -sub_8112F18: @ 8112F18 - push {r4-r7,lr} - mov r7, r10 - mov r6, r9 - mov r5, r8 - push {r5-r7} - sub sp, 0x8 - lsls r0, 24 - lsrs r0, 24 - mov r10, r0 - movs r1, 0x3 - bl GetWindowAttribute - lsls r0, 24 - lsrs r6, r0, 24 - mov r0, r10 - movs r1, 0x4 - bl GetWindowAttribute - lsls r0, 24 - lsrs r7, r0, 24 - lsls r0, r7, 5 - muls r0, r6 - bl Alloc - mov r8, r0 - cmp r0, 0 - beq _08112FB8 - movs r5, 0 - adds r0, r6, 0 - muls r0, r7 - str r0, [sp] - cmp r5, r7 - bcs _08112FA2 -_08112F5A: - movs r4, 0 - adds r1, r5, 0x1 - mov r9, r1 - cmp r4, r6 - bcs _08112F98 - subs r3, r7, 0x1 -_08112F66: - movs r0, 0 - cmp r5, 0 - beq _08112F74 - movs r0, 0x5 - cmp r5, r3 - bne _08112F74 - movs r0, 0xE -_08112F74: - lsls r0, 5 - ldr r1, _08112FC8 @ =gUnknown_84566A8 - adds r0, r1, r0 - adds r1, r5, 0 - muls r1, r6 - adds r1, r4 - lsls r1, 5 - add r1, r8 - ldr r2, _08112FCC @ =0x04000008 - str r3, [sp, 0x4] - bl CpuSet - adds r0, r4, 0x1 - lsls r0, 24 - lsrs r4, r0, 24 - ldr r3, [sp, 0x4] - cmp r4, r6 - bcc _08112F66 -_08112F98: - mov r1, r9 - lsls r0, r1, 24 - lsrs r5, r0, 24 - cmp r5, r7 - bcc _08112F5A -_08112FA2: - ldr r0, [sp] - lsls r2, r0, 21 - lsrs r2, 16 - mov r0, r10 - mov r1, r8 - movs r3, 0 - bl CopyToWindowPixelBuffer - mov r0, r8 - bl Free -_08112FB8: - add sp, 0x8 - pop {r3-r5} - mov r8, r3 - mov r9, r4 - mov r10, r5 - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_08112FC8: .4byte gUnknown_84566A8 -_08112FCC: .4byte 0x04000008 - thumb_func_end sub_8112F18 - thumb_func_start sub_8112FD0 sub_8112FD0: @ 8112FD0 push {lr} diff --git a/src/quest_log.c b/src/quest_log.c index 590892acf..cf24cf462 100644 --- a/src/quest_log.c +++ b/src/quest_log.c @@ -2040,7 +2040,7 @@ void sub_8112E3C(u8 a0, struct UnkStruct_300201C * a1, u16 a2) } } -const u16 gUnknown_84566A8[] = INCBIN_U16("data/graphics/unknown_84566a8.bin"); +const u16 gUnknown_84566A8[][16] = INCBIN_U16("data/graphics/unknown_84566a8.bin"); const struct WindowTemplate gUnknown_8456928 = { 0x00, 0, 15, 30, 5, 15, 0x008F @@ -2060,3 +2060,148 @@ u8 sub_8112EB4(void) } return gUnknown_203B020; } + +void sub_8112EDC(u8 a0) +{ + if (gUnknown_203B020 != 0xFF) + { + FillWindowPixelBuffer(gUnknown_203B020, 0x00); + ClearWindowTilemap(gUnknown_203B020); + + if (a0) + CopyWindowToVram(gUnknown_203B020, a0); + + RemoveWindow(gUnknown_203B020); + gUnknown_203B020 = 0xFF; + } +} + +#ifdef NONMATCHING +void sub_8112F18(u8 a0) +{ + u8 width = GetWindowAttribute(a0, WINDOW_WIDTH); + u8 height = GetWindowAttribute(a0, WINDOW_HEIGHT); + u8 * buffer = Alloc(32 * width * height); + u8 i, j; + u8 k; + + if (buffer) + { + for (i = 0; i < height; i++) + { + for (j = 0; j < width; j++) + { + if (i == 0) + k = 0; + else if (i == height - 1) + k = 14; + else + k = 5; + CpuCopy32( + gUnknown_84566A8[k], // operand swap on "add" instruction + buffer + 32 * (i * width + j), + 32 + ); + } + } + CopyToWindowPixelBuffer(a0, buffer, width * height * 32, 0); + Free(buffer); + } +} +#else +NAKED +void sub_8112F18(u8 a0) +{ + 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, 0x8\n" + "\tlsls r0, 24\n" + "\tlsrs r0, 24\n" + "\tmov r10, r0\n" + "\tmovs r1, 0x3\n" + "\tbl GetWindowAttribute\n" + "\tlsls r0, 24\n" + "\tlsrs r6, r0, 24\n" + "\tmov r0, r10\n" + "\tmovs r1, 0x4\n" + "\tbl GetWindowAttribute\n" + "\tlsls r0, 24\n" + "\tlsrs r7, r0, 24\n" + "\tlsls r0, r7, 5\n" + "\tmuls r0, r6\n" + "\tbl Alloc\n" + "\tmov r8, r0\n" + "\tcmp r0, 0\n" + "\tbeq _08112FB8\n" + "\tmovs r5, 0\n" + "\tadds r0, r6, 0\n" + "\tmuls r0, r7\n" + "\tstr r0, [sp]\n" + "\tcmp r5, r7\n" + "\tbcs _08112FA2\n" + "_08112F5A:\n" + "\tmovs r4, 0\n" + "\tadds r1, r5, 0x1\n" + "\tmov r9, r1\n" + "\tcmp r4, r6\n" + "\tbcs _08112F98\n" + "\tsubs r3, r7, 0x1\n" + "_08112F66:\n" + "\tmovs r0, 0\n" + "\tcmp r5, 0\n" + "\tbeq _08112F74\n" + "\tmovs r0, 0x5\n" + "\tcmp r5, r3\n" + "\tbne _08112F74\n" + "\tmovs r0, 0xE\n" + "_08112F74:\n" + "\tlsls r0, 5\n" + "\tldr r1, _08112FC8 @ =gUnknown_84566A8\n" + "\tadds r0, r1, r0\n" + "\tadds r1, r5, 0\n" + "\tmuls r1, r6\n" + "\tadds r1, r4\n" + "\tlsls r1, 5\n" + "\tadd r1, r8\n" + "\tldr r2, _08112FCC @ =0x04000008\n" + "\tstr r3, [sp, 0x4]\n" + "\tbl CpuSet\n" + "\tadds r0, r4, 0x1\n" + "\tlsls r0, 24\n" + "\tlsrs r4, r0, 24\n" + "\tldr r3, [sp, 0x4]\n" + "\tcmp r4, r6\n" + "\tbcc _08112F66\n" + "_08112F98:\n" + "\tmov r1, r9\n" + "\tlsls r0, r1, 24\n" + "\tlsrs r5, r0, 24\n" + "\tcmp r5, r7\n" + "\tbcc _08112F5A\n" + "_08112FA2:\n" + "\tldr r0, [sp]\n" + "\tlsls r2, r0, 21\n" + "\tlsrs r2, 16\n" + "\tmov r0, r10\n" + "\tmov r1, r8\n" + "\tmovs r3, 0\n" + "\tbl CopyToWindowPixelBuffer\n" + "\tmov r0, r8\n" + "\tbl Free\n" + "_08112FB8:\n" + "\tadd sp, 0x8\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\n" + "\t.align 2, 0\n" + "_08112FC8: .4byte gUnknown_84566A8\n" + "_08112FCC: .4byte 0x04000008"); +} +#endif -- cgit v1.2.3 From 6d31e24cba449b856f63c8279339bf1406013b83 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Mon, 15 Oct 2018 20:08:52 -0500 Subject: through sub_8113114 --- asm/event_data.s | 18 ++-- asm/field_control_avatar.s | 4 +- asm/pokemon_size_record.s | 8 +- asm/quest_log.s | 245 ++------------------------------------------- asm/scrcmd.s | 26 ++--- data/quest_log.s | 6 -- include/event_data.h | 2 +- src/menews_jisan.c | 2 +- src/quest_log.c | 109 +++++++++++++++++++- 9 files changed, 140 insertions(+), 280 deletions(-) diff --git a/asm/event_data.s b/asm/event_data.s index 1875449fa..b6a12e8b2 100644 --- a/asm/event_data.s +++ b/asm/event_data.s @@ -78,7 +78,7 @@ _0806E164: .4byte 0x00000842 sub_806E168: @ 806E168 push {lr} ldr r0, _0806E184 @ =0x0000403c - bl sub_806E454 + bl GetVarPointer ldr r1, _0806E188 @ =gSaveBlock2Ptr ldr r2, [r1] movs r1, 0 @@ -98,7 +98,7 @@ _0806E18C: .4byte 0x00000838 sub_806E190: @ 806E190 push {lr} ldr r0, _0806E1B0 @ =0x0000403c - bl sub_806E454 + bl GetVarPointer ldr r1, _0806E1B4 @ =gSaveBlock2Ptr ldr r2, [r1] movs r1, 0xDA @@ -154,7 +154,7 @@ _0806E1FE: sub_806E204: @ 806E204 push {lr} ldr r0, _0806E224 @ =0x0000404e - bl sub_806E454 + bl GetVarPointer ldr r1, _0806E228 @ =gSaveBlock2Ptr ldr r2, [r1] movs r1, 0 @@ -174,7 +174,7 @@ _0806E228: .4byte gSaveBlock2Ptr sub_806E22C: @ 806E22C push {lr} ldr r0, _0806E250 @ =0x0000404e - bl sub_806E454 + bl GetVarPointer ldr r1, _0806E254 @ =gSaveBlock2Ptr ldr r2, [r1] movs r1, 0xB9 @@ -419,8 +419,8 @@ _0806E44E: bx r1 thumb_func_end CanResetRTC - thumb_func_start sub_806E454 -sub_806E454: @ 806E454 + thumb_func_start GetVarPointer +GetVarPointer: @ 806E454 push {r4-r6,lr} lsls r0, 16 lsrs r4, r0, 16 @@ -522,7 +522,7 @@ _0806E518: .align 2, 0 _0806E520: .4byte gUnknown_815FD0C _0806E524: .4byte 0xffff8000 - thumb_func_end sub_806E454 + thumb_func_end GetVarPointer thumb_func_start sub_806E528 sub_806E528: @ 806E528 @@ -569,7 +569,7 @@ VarGet: @ 806E568 lsls r0, 16 lsrs r4, r0, 16 adds r0, r4, 0 - bl sub_806E454 + bl GetVarPointer cmp r0, 0 beq _0806E57C ldrh r0, [r0] @@ -589,7 +589,7 @@ VarSet: @ 806E584 lsrs r0, 16 lsls r1, 16 lsrs r4, r1, 16 - bl sub_806E454 + bl GetVarPointer cmp r0, 0 beq _0806E59C strh r4, [r0] diff --git a/asm/field_control_avatar.s b/asm/field_control_avatar.s index 41bcd05c1..237472c45 100644 --- a/asm/field_control_avatar.s +++ b/asm/field_control_avatar.s @@ -1872,7 +1872,7 @@ _0806D748: .4byte 0x00004021 AdjustFriendship_step: @ 806D74C push {r4,r5,lr} ldr r0, _0806D780 @ =0x00004021 - bl sub_806E454 + bl GetVarPointer ldrh r1, [r0] adds r1, 0x1 strh r1, [r0] @@ -1921,7 +1921,7 @@ overworld_poison_step: @ 806D79C cmp r0, 0x9 beq _0806D7E0 ldr r0, _0806D7DC @ =0x00004022 - bl sub_806E454 + bl GetVarPointer adds r4, r0, 0 ldrh r0, [r4] adds r0, 0x1 diff --git a/asm/pokemon_size_record.s b/asm/pokemon_size_record.s index 50ddd41a4..56a5d54f5 100644 --- a/asm/pokemon_size_record.s +++ b/asm/pokemon_size_record.s @@ -327,7 +327,7 @@ _080A0914: .4byte 0x0000403d sub_80A0918: @ 80A0918 push {lr} ldr r0, _080A092C @ =0x0000403d - bl sub_806E454 + bl GetVarPointer adds r1, r0, 0 movs r0, 0xD6 bl sub_80A08CC @@ -341,7 +341,7 @@ _080A092C: .4byte 0x0000403d sub_80A0930: @ 80A0930 push {r4,lr} ldr r0, _080A0950 @ =0x0000403d - bl sub_806E454 + bl GetVarPointer adds r1, r0, 0 ldr r4, _080A0954 @ =gUnknown_20370D0 movs r0, 0xD6 @@ -373,7 +373,7 @@ _080A0968: .4byte 0x00004040 sub_80A096C: @ 80A096C push {lr} ldr r0, _080A0980 @ =0x00004040 - bl sub_806E454 + bl GetVarPointer adds r1, r0, 0 movs r0, 0x81 bl sub_80A08CC @@ -387,7 +387,7 @@ _080A0980: .4byte 0x00004040 sub_80A0984: @ 80A0984 push {r4,lr} ldr r0, _080A09A4 @ =0x00004040 - bl sub_806E454 + bl GetVarPointer adds r1, r0, 0 ldr r4, _080A09A8 @ =gUnknown_20370D0 movs r0, 0x81 diff --git a/asm/quest_log.s b/asm/quest_log.s index 5e6e71eb4..fa9018ce5 100644 --- a/asm/quest_log.s +++ b/asm/quest_log.s @@ -5,239 +5,6 @@ .text - thumb_func_start sub_8112FD0 -sub_8112FD0: @ 8112FD0 - push {lr} - ldr r0, _08112FE0 @ =gUnknown_203B020 - ldrb r0, [r0] - bl sub_8112F18 - pop {r0} - bx r0 - .align 2, 0 -_08112FE0: .4byte gUnknown_203B020 - thumb_func_end sub_8112FD0 - - thumb_func_start sub_8112FE4 -sub_8112FE4: @ 8112FE4 - push {lr} - sub sp, 0x14 - adds r2, r0, 0 - ldr r0, _08113010 @ =gUnknown_203B020 - ldrb r0, [r0] - movs r1, 0x1 - str r1, [sp] - str r1, [sp, 0x4] - ldr r1, _08113014 @ =gUnknown_8456930 - str r1, [sp, 0x8] - movs r1, 0x1 - negs r1, r1 - str r1, [sp, 0xC] - str r2, [sp, 0x10] - movs r1, 0x2 - movs r2, 0x2 - movs r3, 0x5 - bl AddTextPrinterParametrized2 - add sp, 0x14 - pop {r0} - bx r0 - .align 2, 0 -_08113010: .4byte gUnknown_203B020 -_08113014: .4byte gUnknown_8456930 - thumb_func_end sub_8112FE4 - - thumb_func_start sub_8113018 -sub_8113018: @ 8113018 - push {r4,r5,lr} - adds r4, r0, 0 - lsls r1, 24 - lsrs r5, r1, 24 - bl sub_8112FD0 - adds r0, r4, 0 - bl sub_8112FE4 - cmp r5, 0 - beq _08113038 - ldr r0, _08113040 @ =gUnknown_203B020 - ldrb r0, [r0] - adds r1, r5, 0 - bl CopyWindowToVram -_08113038: - pop {r4,r5} - pop {r0} - bx r0 - .align 2, 0 -_08113040: .4byte gUnknown_203B020 - thumb_func_end sub_8113018 - - thumb_func_start sub_8113044 -sub_8113044: @ 8113044 - push {lr} - ldr r0, _0811305C @ =0x00004038 - movs r1, 0 - bl VarSet - ldr r0, _08113060 @ =0x00004039 - movs r1, 0 - bl VarSet - pop {r0} - bx r0 - .align 2, 0 -_0811305C: .4byte 0x00004038 -_08113060: .4byte 0x00004039 - thumb_func_end sub_8113044 - - thumb_func_start sub_8113064 -sub_8113064: @ 8113064 - push {lr} - ldr r0, _08113074 @ =0x00004038 - bl sub_806E454 - bl sub_8113078 - pop {r0} - bx r0 - .align 2, 0 -_08113074: .4byte 0x00004038 - thumb_func_end sub_8113064 - - thumb_func_start sub_8113078 -sub_8113078: @ 8113078 - push {r4,lr} - adds r4, r0, 0 - bl sub_8113508 - lsls r0, 24 - cmp r0, 0 - beq _08113098 - adds r0, r4, 0 - bl sub_81132E0 - ldr r0, _081130A0 @ =0x00004039 - ldr r1, _081130A4 @ =gSaveBlock2Ptr - ldr r1, [r1] - ldrh r1, [r1, 0xE] - bl VarSet -_08113098: - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_081130A0: .4byte 0x00004039 -_081130A4: .4byte gSaveBlock2Ptr - thumb_func_end sub_8113078 - - thumb_func_start sub_81130A8 -sub_81130A8: @ 81130A8 - push {lr} - ldr r0, _081130B8 @ =0x00004038 - bl sub_806E454 - bl sub_81130BC - pop {r0} - bx r0 - .align 2, 0 -_081130B8: .4byte 0x00004038 - thumb_func_end sub_81130A8 - - thumb_func_start sub_81130BC -sub_81130BC: @ 81130BC - push {r4,lr} - adds r4, r0, 0 - ldrb r1, [r4] - movs r0, 0x80 - ands r0, r1 - cmp r0, 0 - bne _08113102 - adds r0, r4, 0 - bl sub_8113524 - adds r0, r4, 0 - bl sub_8113390 - ldr r0, _08113108 @ =0x00004039 - ldr r1, _0811310C @ =gSaveBlock2Ptr - ldr r1, [r1] - ldrh r1, [r1, 0xE] - bl VarSet - movs r0, 0x6C - bl FlagClear - movs r0, 0x6D - bl FlagClear - movs r0, 0x6E - bl FlagClear - movs r0, 0x6F - bl FlagClear - ldr r0, _08113110 @ =0x00004073 - movs r1, 0x1 - bl VarSet -_08113102: - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_08113108: .4byte 0x00004039 -_0811310C: .4byte gSaveBlock2Ptr -_08113110: .4byte 0x00004073 - thumb_func_end sub_81130BC - - thumb_func_start sub_8113114 -sub_8113114: @ 8113114 - push {r4,r5,lr} - adds r4, r0, 0 - lsls r1, 24 - lsrs r5, r1, 24 - ldr r0, _0811315C @ =0x00004073 - bl VarGet - lsls r0, 16 - lsrs r0, 16 - cmp r0, 0x2 - bne _08113188 - ldr r0, [r4] - lsls r2, r0, 25 - lsrs r1, r2, 25 - ldr r0, _08113160 @ =gUnknown_8456934 - adds r0, r5, r0 - ldrb r0, [r0] - adds r1, r0 - cmp r1, 0x13 - ble _08113174 - adds r0, r4, 0 - bl sub_81132A0 - lsls r0, 16 - lsrs r0, 16 - cmp r0, 0x2 - bhi _08113164 - adds r0, r4, 0 - bl sub_8113194 - ldrb r1, [r4] - movs r0, 0x80 - negs r0, r0 - ands r0, r1 - b _08113186 - .align 2, 0 -_0811315C: .4byte 0x00004073 -_08113160: .4byte gUnknown_8456934 -_08113164: - ldrb r0, [r4] - movs r1, 0x80 - negs r1, r1 - ands r1, r0 - movs r0, 0x14 - orrs r1, r0 - strb r1, [r4] - b _08113188 -_08113174: - lsrs r1, r2, 25 - adds r1, r0 - movs r0, 0x7F - ands r1, r0 - ldrb r2, [r4] - movs r0, 0x80 - negs r0, r0 - ands r0, r2 - orrs r0, r1 -_08113186: - strb r0, [r4] -_08113188: - ldr r0, [r4] - lsls r0, 25 - lsrs r0, 25 - pop {r4,r5} - pop {r1} - bx r1 - thumb_func_end sub_8113114 - thumb_func_start sub_8113194 sub_8113194: @ 8113194 push {r4-r7,lr} @@ -377,7 +144,7 @@ _08113284: .4byte gUnknown_8456940 sub_8113288: @ 8113288 push {lr} ldr r0, _0811329C @ =0x00004038 - bl sub_806E454 + bl GetVarPointer bl sub_81132A0 lsls r0, 16 lsrs r0, 16 @@ -419,7 +186,7 @@ _081132BA: sub_81132CC: @ 81132CC push {lr} ldr r0, _081132DC @ =0x00004038 - bl sub_806E454 + bl GetVarPointer bl sub_81132E0 pop {r0} bx r0 @@ -495,7 +262,7 @@ _0811335C: sub_8113364: @ 8113364 push {lr} ldr r0, _08113378 @ =0x00004038 - bl sub_806E454 + bl GetVarPointer bl sub_811337C lsls r0, 16 lsrs r0, 16 @@ -674,7 +441,7 @@ _081134B2: sub_81134B8: @ 81134B8 push {lr} ldr r0, _081134C8 @ =0x00004038 - bl sub_806E454 + bl GetVarPointer bl sub_81134CC pop {r0} bx r0 @@ -725,7 +492,7 @@ sub_8113508: @ 8113508 sub_8113510: @ 8113510 push {lr} ldr r0, _08113520 @ =0x00004038 - bl sub_806E454 + bl GetVarPointer bl sub_8113524 pop {r0} bx r0 @@ -746,7 +513,7 @@ sub_8113524: @ 8113524 sub_8113530: @ 8113530 push {lr} ldr r0, _08113548 @ =0x00004038 - bl sub_806E454 + bl GetVarPointer ldr r1, _0811354C @ =gUnknown_20370C0 ldrb r1, [r1] bl sub_8113114 diff --git a/asm/scrcmd.s b/asm/scrcmd.s index 733860772..85fbd6162 100644 --- a/asm/scrcmd.s +++ b/asm/scrcmd.s @@ -79,7 +79,7 @@ sub_8069F3C: @ 8069F3C bl ScriptReadHalfword lsls r0, 16 lsrs r0, 16 - bl sub_806E454 + bl GetVarPointer adds r5, r0, 0 adds r0, r4, 0 bl ScriptReadHalfword @@ -692,7 +692,7 @@ ScrCmd_setvar: @ 806A390 bl ScriptReadHalfword lsls r0, 16 lsrs r0, 16 - bl sub_806E454 + bl GetVarPointer adds r4, r0, 0 adds r0, r5, 0 bl ScriptReadHalfword @@ -710,13 +710,13 @@ ScrCmd_copyvar: @ 806A3B4 bl ScriptReadHalfword lsls r0, 16 lsrs r0, 16 - bl sub_806E454 + bl GetVarPointer adds r5, r0, 0 adds r0, r4, 0 bl ScriptReadHalfword lsls r0, 16 lsrs r0, 16 - bl sub_806E454 + bl GetVarPointer ldrh r0, [r0] strh r0, [r5] movs r0, 0 @@ -732,7 +732,7 @@ ScrCmd_setorcopyvar: @ 806A3E0 bl ScriptReadHalfword lsls r0, 16 lsrs r0, 16 - bl sub_806E454 + bl GetVarPointer adds r5, r0, 0 adds r0, r4, 0 bl ScriptReadHalfword @@ -909,7 +909,7 @@ ScrCmd_compare_var_to_value: @ 806A520 bl ScriptReadHalfword lsls r0, 16 lsrs r0, 16 - bl sub_806E454 + bl GetVarPointer ldrh r5, [r0] adds r0, r4, 0 bl ScriptReadHalfword @@ -932,13 +932,13 @@ ScrCmd_compare_var_to_var: @ 806A550 bl ScriptReadHalfword lsls r0, 16 lsrs r0, 16 - bl sub_806E454 + bl GetVarPointer adds r5, r0, 0 adds r0, r4, 0 bl ScriptReadHalfword lsls r0, 16 lsrs r0, 16 - bl sub_806E454 + bl GetVarPointer ldrh r2, [r5] ldrh r1, [r0] adds r0, r2, 0 @@ -957,7 +957,7 @@ ScrCmd_addvar: @ 806A584 bl ScriptReadHalfword lsls r0, 16 lsrs r0, 16 - bl sub_806E454 + bl GetVarPointer adds r4, r0, 0 adds r0, r5, 0 bl ScriptReadHalfword @@ -977,7 +977,7 @@ ScrCmd_subvar: @ 806A5AC bl ScriptReadHalfword lsls r0, 16 lsrs r0, 16 - bl sub_806E454 + bl GetVarPointer adds r5, r0, 0 adds r0, r4, 0 bl ScriptReadHalfword @@ -2319,13 +2319,13 @@ ScrCmd_getplayerxy: @ 806B010 bl ScriptReadHalfword lsls r0, 16 lsrs r0, 16 - bl sub_806E454 + bl GetVarPointer adds r5, r0, 0 adds r0, r4, 0 bl ScriptReadHalfword lsls r0, 16 lsrs r0, 16 - bl sub_806E454 + bl GetVarPointer ldr r2, _0806B048 @ =gSaveBlock1Ptr ldr r1, [r2] ldrh r1, [r1] @@ -5428,7 +5428,7 @@ ScrCmd_checkcoins: @ 806C72C bl ScriptReadHalfword lsls r0, 16 lsrs r0, 16 - bl sub_806E454 + bl GetVarPointer adds r4, r0, 0 bl sub_80D0554 strh r0, [r4] diff --git a/data/quest_log.s b/data/quest_log.s index a68d924a7..4cbfdbd28 100644 --- a/data/quest_log.s +++ b/data/quest_log.s @@ -1,12 +1,6 @@ .section .rodata .align 2 -gUnknown_8456930:: @ 8456930 - .incbin "baserom.gba", 0x456930, 0x4 - -gUnknown_8456934:: @ 8456934 - .incbin "baserom.gba", 0x456934, 0x4 - gUnknown_8456938:: @ 8456938 .incbin "baserom.gba", 0x456938, 0x8 diff --git a/include/event_data.h b/include/event_data.h index 77bc41603..555887b6c 100644 --- a/include/event_data.h +++ b/include/event_data.h @@ -29,7 +29,7 @@ u8 *GetFlagPointer(u16 id); u8 FlagSet(u16 id); u8 FlagClear(u16 id); bool8 FlagGet(u16 id); -u16 * sub_806E454(u16 id); +u16 * GetVarPointer(u16 id); bool32 sub_806E2BC(void); void sub_806E6FC(void); diff --git a/src/menews_jisan.c b/src/menews_jisan.c index 7dfcee939..31540c411 100644 --- a/src/menews_jisan.c +++ b/src/menews_jisan.c @@ -94,7 +94,7 @@ void sub_8146C88(void) void sub_8146CA4(void) { - u16 *r4 = sub_806E454(0x4028); + u16 *r4 = GetVarPointer(0x4028); struct MysteryEventStruct *r2 = sub_8143D94(); struct MysteryEventStruct r0 = *r2; diff --git a/src/quest_log.c b/src/quest_log.c index cf24cf462..36de09ca7 100644 --- a/src/quest_log.c +++ b/src/quest_log.c @@ -32,6 +32,12 @@ u8 gUnknown_3005E88; +struct Var4038Struct +{ + u8 unk_0_0:7; + u8 unk_0_7:1; +}; + struct UnkStruct_203AE94 { u8 unk_0_0:4; @@ -130,6 +136,14 @@ void sub_8112940(u8, struct UnkStruct_203AE98 *, u16); u8 sub_8112CAC(void); bool8 sub_8112CEC(void); bool8 sub_8112D1C(void); +void sub_8113078(struct Var4038Struct *); +void sub_81130BC(struct Var4038Struct *); +u16 sub_81132A0(struct Var4038Struct *); +void sub_8113194(struct Var4038Struct *); +void sub_81132E0(struct Var4038Struct *); +bool8 sub_8113508(void); +void sub_8113524(struct Var4038Struct *); +void sub_8113390(struct Var4038Struct *); void sub_8113A1C(u8); void sub_811381C(void); void sub_81138F8(void); @@ -164,21 +178,21 @@ const u8 gUnknown_8456698[] = {17, 10, 3}; extern const struct UnkStruct_203AE98 gUnknown_845669C; -void sub_8110840(void * a0) +void sub_8110840(void * oldPointer) { - size_t r1 = (void *)gSaveBlock1Ptr - a0; + ptrdiff_t offset = (void *)gSaveBlock1Ptr - oldPointer; if (gUnknown_203AE04) - gUnknown_203AE04 += r1; + gUnknown_203AE04 += offset; if (gUnknown_203ADFA != 0) { if (gUnknown_203AE08) - gUnknown_203AE08 = (void *)gUnknown_203AE08 + r1; + gUnknown_203AE08 = (void *)gUnknown_203AE08 + offset; if (gUnknown_203ADFA == 2) { int r3; for (r3 = 0; r3 < 0x20; r3++) if (gUnknown_203AE0C[r3]) - gUnknown_203AE0C[r3] += r1; + gUnknown_203AE0C[r3] += offset; } } } @@ -2205,3 +2219,88 @@ void sub_8112F18(u8 a0) "_08112FCC: .4byte 0x04000008"); } #endif + +void sub_8112FD0(void) +{ + sub_8112F18(gUnknown_203B020); +} + +const struct TextColor gUnknown_8456930 = { + 0, 10, 2 +}; + +void sub_8112FE4(const u8 * a0) +{ + AddTextPrinterParametrized2(gUnknown_203B020, 0x02, 2, 5, 1, 1, &gUnknown_8456930, -1, a0); +} + +void sub_8113018(const u8 * a0, u8 a1) +{ + sub_8112FD0(); + sub_8112FE4(a0); + if (a1) + CopyWindowToVram(gUnknown_203B020, a1); +} + +void sub_8113044(void) +{ + VarSet(VAR_0x4038, 0); + VarSet(VAR_0x4039, 0); +} + +void sub_8113064(void) +{ + sub_8113078((struct Var4038Struct *)GetVarPointer(VAR_0x4038)); +} + +void sub_8113078(struct Var4038Struct * varPtr) +{ + if (sub_8113508()) + { + sub_81132E0(varPtr); + VarSet(VAR_0x4039, gSaveBlock2Ptr->playTimeHours); + } +} + +void sub_81130A8(void) +{ + sub_81130BC((struct Var4038Struct *)GetVarPointer(VAR_0x4038)); +} + +void sub_81130BC(struct Var4038Struct * varPtr) +{ + if (!varPtr->unk_0_7) + { + sub_8113524(varPtr); + sub_8113390(varPtr); + VarSet(VAR_0x4039, gSaveBlock2Ptr->playTimeHours); + FlagClear(FLAG_0x06C); + FlagClear(FLAG_0x06D); + FlagClear(FLAG_0x06E); + FlagClear(FLAG_0x06F); + VarSet(VAR_0x4073, 1); + } +} + +ALIGNED(4) const u8 gUnknown_8456934[] = {2, 1, 2, 1}; + +u8 sub_8113114(struct Var4038Struct * a0, u8 a1) +{ + if (VarGet(VAR_0x4073) == 2) + { + if (a0->unk_0_0 + gUnknown_8456934[a1] >= 20) + { + if (sub_81132A0(a0) < 3) + { + sub_8113194(a0); + a0->unk_0_0 = 0; + } + else + a0->unk_0_0 = 20; + } + else + a0->unk_0_0 += gUnknown_8456934[a1]; + } + + return a0->unk_0_0; +} -- cgit v1.2.3 From 11066dc88f55c32ec1877c2f7e995412c4a07318 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Tue, 16 Oct 2018 12:56:37 -0700 Subject: sub_8113194 --- asm/quest_log.s | 58 -------------------------------------------------------- data/quest_log.s | 3 --- src/quest_log.c | 29 +++++++++++++++++++++++++++- 3 files changed, 28 insertions(+), 62 deletions(-) diff --git a/asm/quest_log.s b/asm/quest_log.s index fa9018ce5..c8f7f9a29 100644 --- a/asm/quest_log.s +++ b/asm/quest_log.s @@ -5,64 +5,6 @@ .text - thumb_func_start sub_8113194 -sub_8113194: @ 8113194 - push {r4-r7,lr} - mov r7, r8 - push {r7} - adds r5, r0, 0 - movs r0, 0 - mov r8, r0 - movs r6, 0 - movs r7, 0x1 -_081131A4: - ldrb r1, [r5, 0x1] - ldr r0, _081131D0 @ =gUnknown_8456938 - adds r0, r6, r0 - ldrb r4, [r0] - asrs r1, r4 - ands r1, r7 - cmp r1, 0 - bne _081131D4 - mov r8, r6 - bl Random - adds r1, r7, 0 - ands r1, r0 - cmp r1, 0 - beq _081131D4 - adds r0, r7, 0 - lsls r0, r4 - ldrb r1, [r5, 0x1] - orrs r0, r1 - strb r0, [r5, 0x1] - adds r0, r4, 0 - b _081131EE - .align 2, 0 -_081131D0: .4byte gUnknown_8456938 -_081131D4: - adds r0, r6, 0x1 - lsls r0, 24 - lsrs r6, r0, 24 - cmp r6, 0x7 - bls _081131A4 - ldr r0, _081131F8 @ =gUnknown_8456938 - add r0, r8 - ldrb r0, [r0] - movs r1, 0x1 - lsls r1, r0 - ldrb r2, [r5, 0x1] - orrs r1, r2 - strb r1, [r5, 0x1] -_081131EE: - pop {r3} - mov r8, r3 - pop {r4-r7} - pop {r1} - bx r1 - .align 2, 0 -_081131F8: .4byte gUnknown_8456938 - thumb_func_end sub_8113194 - thumb_func_start sub_81131FC sub_81131FC: @ 81131FC push {r4-r7,lr} diff --git a/data/quest_log.s b/data/quest_log.s index 4cbfdbd28..839a9d9e5 100644 --- a/data/quest_log.s +++ b/data/quest_log.s @@ -1,9 +1,6 @@ .section .rodata .align 2 -gUnknown_8456938:: @ 8456938 - .incbin "baserom.gba", 0x456938, 0x8 - gUnknown_8456940:: @ 8456940 .incbin "baserom.gba", 0x456940, 0x8 diff --git a/src/quest_log.c b/src/quest_log.c index 36de09ca7..30f529615 100644 --- a/src/quest_log.c +++ b/src/quest_log.c @@ -5,6 +5,7 @@ #include "task.h" #include "palette.h" #include "menu.h" +#include "random.h" #include "menu_helpers.h" #include "window.h" #include "text_window.h" @@ -36,6 +37,7 @@ struct Var4038Struct { u8 unk_0_0:7; u8 unk_0_7:1; + u8 unk_1; }; struct UnkStruct_203AE94 @@ -139,7 +141,7 @@ bool8 sub_8112D1C(void); void sub_8113078(struct Var4038Struct *); void sub_81130BC(struct Var4038Struct *); u16 sub_81132A0(struct Var4038Struct *); -void sub_8113194(struct Var4038Struct *); +u8 sub_8113194(struct Var4038Struct *); void sub_81132E0(struct Var4038Struct *); bool8 sub_8113508(void); void sub_8113524(struct Var4038Struct *); @@ -2304,3 +2306,28 @@ u8 sub_8113114(struct Var4038Struct * a0, u8 a1) return a0->unk_0_0; } + +const u8 gUnknown_8456938[] = { + 1, 3, 5, 0, 7, 6, 4, 2 +}; + +u8 sub_8113194(struct Var4038Struct * a0) +{ + u8 i; + u8 retval = 0; + + for (i = 0; i < 8; i++) + { + if (!((a0->unk_1 >> gUnknown_8456938[i]) & 1)) + { + retval = i; + if (Random() % 2) + { + a0->unk_1 |= 1 << gUnknown_8456938[i]; + return gUnknown_8456938[i]; + } + } + } + a0->unk_1 |= 1 << gUnknown_8456938[retval]; + return gUnknown_8456938[retval]; +} -- cgit v1.2.3 From 9dd047d9db67586529cbde6a32176413af659c1d Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Tue, 16 Oct 2018 13:07:02 -0700 Subject: sub_81131FC --- asm/quest_log.s | 77 -------------------------------------------------------- data/quest_log.s | 3 --- src/quest_log.c | 29 +++++++++++++++++++++ 3 files changed, 29 insertions(+), 80 deletions(-) diff --git a/asm/quest_log.s b/asm/quest_log.s index c8f7f9a29..2f032248a 100644 --- a/asm/quest_log.s +++ b/asm/quest_log.s @@ -5,83 +5,6 @@ .text - thumb_func_start sub_81131FC -sub_81131FC: @ 81131FC - push {r4-r7,lr} - mov r7, r8 - push {r7} - sub sp, 0x4 - adds r7, r0, 0 - movs r0, 0 - mov r8, r0 - adds r0, r7, 0 - bl sub_81132A0 - lsls r0, 16 - lsrs r0, 16 - cmp r0, 0x1 - bne _08113228 - movs r0, 0 - b _08113276 -_0811321C: - lsls r4, r6 - ldrb r0, [r7, 0x1] - eors r4, r0 - strb r4, [r7, 0x1] - adds r0, r6, 0 - b _08113276 -_08113228: - movs r5, 0 - movs r4, 0x1 -_0811322C: - ldrb r1, [r7, 0x1] - ldr r2, _08113284 @ =gUnknown_8456940 - adds r0, r5, r2 - ldrb r6, [r0] - asrs r1, r6 - ands r1, r4 - cmp r1, 0 - beq _0811324E - mov r8, r5 - str r2, [sp] - bl Random - adds r1, r4, 0 - ands r1, r0 - ldr r2, [sp] - cmp r1, 0 - bne _0811321C -_0811324E: - adds r0, r5, 0x1 - lsls r0, 24 - lsrs r5, r0, 24 - cmp r5, 0x7 - bls _0811322C - ldrb r1, [r7, 0x1] - mov r3, r8 - adds r0, r3, r2 - ldrb r2, [r0] - adds r0, r1, 0 - asrs r0, r2 - movs r3, 0x1 - ands r0, r3 - cmp r0, 0 - beq _08113274 - adds r0, r3, 0 - lsls r0, r2 - eors r1, r0 - strb r1, [r7, 0x1] -_08113274: - adds r0, r2, 0 -_08113276: - add sp, 0x4 - pop {r3} - mov r8, r3 - pop {r4-r7} - pop {r1} - bx r1 - .align 2, 0 -_08113284: .4byte gUnknown_8456940 - thumb_func_end sub_81131FC - thumb_func_start sub_8113288 sub_8113288: @ 8113288 push {lr} diff --git a/data/quest_log.s b/data/quest_log.s index 839a9d9e5..527fadb75 100644 --- a/data/quest_log.s +++ b/data/quest_log.s @@ -1,9 +1,6 @@ .section .rodata .align 2 -gUnknown_8456940:: @ 8456940 - .incbin "baserom.gba", 0x456940, 0x8 - gUnknown_8456948:: @ 8456948 .incbin "baserom.gba", 0x456948, 0xAC diff --git a/src/quest_log.c b/src/quest_log.c index 30f529615..51ffaac11 100644 --- a/src/quest_log.c +++ b/src/quest_log.c @@ -2331,3 +2331,32 @@ u8 sub_8113194(struct Var4038Struct * a0) a0->unk_1 |= 1 << gUnknown_8456938[retval]; return gUnknown_8456938[retval]; } + +const u8 gUnknown_8456940[] = { + 5, 6, 3, 7, 4, 1, 0, 2 +}; + +u8 sub_81131FC(struct Var4038Struct * a0) +{ + u8 i; + u8 retval = 0; + + if (sub_81132A0(a0) == 1) + return 0; + + for (i = 0; i < 8; i++) + { + if ((a0->unk_1 >> gUnknown_8456940[i]) & 1) + { + retval = i; + if (Random() % 2) + { + a0->unk_1 ^= 1 << gUnknown_8456940[i]; + return gUnknown_8456940[i]; + } + } + } + if ((a0->unk_1 >> gUnknown_8456940[retval]) & 1) + a0->unk_1 ^= 1 << gUnknown_8456940[retval]; + return gUnknown_8456940[retval]; +} -- cgit v1.2.3 From d50948133d3ad740ee4c719bc84a7991abd53a34 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Tue, 16 Oct 2018 17:32:29 -0700 Subject: through sub_81132E0 --- asm/quest_log.s | 118 -------------------------------------------------------- src/quest_log.c | 53 ++++++++++++++++++++++++- 2 files changed, 52 insertions(+), 119 deletions(-) diff --git a/asm/quest_log.s b/asm/quest_log.s index 2f032248a..53672cf3f 100644 --- a/asm/quest_log.s +++ b/asm/quest_log.s @@ -5,124 +5,6 @@ .text - thumb_func_start sub_8113288 -sub_8113288: @ 8113288 - push {lr} - ldr r0, _0811329C @ =0x00004038 - bl GetVarPointer - bl sub_81132A0 - lsls r0, 16 - lsrs r0, 16 - pop {r1} - bx r1 - .align 2, 0 -_0811329C: .4byte 0x00004038 - thumb_func_end sub_8113288 - - thumb_func_start sub_81132A0 -sub_81132A0: @ 81132A0 - push {r4,lr} - movs r2, 0 - movs r1, 0 - ldrb r3, [r0, 0x1] - movs r4, 0x1 -_081132AA: - adds r0, r3, 0 - asrs r0, r1 - ands r0, r4 - cmp r0, 0 - beq _081132BA - adds r0, r2, 0x1 - lsls r0, 24 - lsrs r2, r0, 24 -_081132BA: - adds r0, r1, 0x1 - lsls r0, 24 - lsrs r1, r0, 24 - cmp r1, 0x7 - bls _081132AA - adds r0, r2, 0 - pop {r4} - pop {r1} - bx r1 - thumb_func_end sub_81132A0 - - thumb_func_start sub_81132CC -sub_81132CC: @ 81132CC - push {lr} - ldr r0, _081132DC @ =0x00004038 - bl GetVarPointer - bl sub_81132E0 - pop {r0} - bx r0 - .align 2, 0 -_081132DC: .4byte 0x00004038 - thumb_func_end sub_81132CC - - thumb_func_start sub_81132E0 -sub_81132E0: @ 81132E0 - push {r4-r6,lr} - adds r4, r0, 0 - movs r5, 0 - ldr r2, _081132F8 @ =gSaveBlock2Ptr - ldr r0, [r2] - ldrh r1, [r0, 0xE] - ldr r0, _081132FC @ =0x000003e6 - cmp r1, r0 - bhi _0811335C - adds r6, r2, 0 - b _08113338 - .align 2, 0 -_081132F8: .4byte gSaveBlock2Ptr -_081132FC: .4byte 0x000003e6 -_08113300: - ldr r0, _08113354 @ =0x00004039 - bl VarGet - lsls r0, 16 - lsrs r0, 16 - ldr r1, [r6] - ldrh r1, [r1, 0xE] - subs r1, r0 - cmp r1, 0xB - ble _0811335C - adds r0, r4, 0 - bl sub_81131FC - ldr r0, _08113354 @ =0x00004039 - bl VarGet - adds r1, r0, 0 - lsls r1, 16 - movs r0, 0xC0 - lsls r0, 12 - adds r1, r0 - lsrs r1, 16 - ldr r0, _08113354 @ =0x00004039 - bl VarSet - adds r0, r5, 0x1 - lsls r0, 24 - lsrs r5, r0, 24 -_08113338: - adds r0, r4, 0 - bl sub_81132A0 - lsls r0, 16 - lsrs r0, 16 - cmp r0, 0x4 - bhi _08113358 - ldr r0, [r6] - ldrh r1, [r0, 0xE] - ldr r0, _08113354 @ =0x00004039 - bl VarSet - b _0811335C - .align 2, 0 -_08113354: .4byte 0x00004039 -_08113358: - cmp r5, 0x8 - bne _08113300 -_0811335C: - pop {r4-r6} - pop {r0} - bx r0 - thumb_func_end sub_81132E0 - thumb_func_start sub_8113364 sub_8113364: @ 8113364 push {lr} diff --git a/src/quest_log.c b/src/quest_log.c index 51ffaac11..7d2b2511d 100644 --- a/src/quest_log.c +++ b/src/quest_log.c @@ -140,8 +140,8 @@ bool8 sub_8112CEC(void); bool8 sub_8112D1C(void); void sub_8113078(struct Var4038Struct *); void sub_81130BC(struct Var4038Struct *); -u16 sub_81132A0(struct Var4038Struct *); u8 sub_8113194(struct Var4038Struct *); +u16 sub_81132A0(struct Var4038Struct *); void sub_81132E0(struct Var4038Struct *); bool8 sub_8113508(void); void sub_8113524(struct Var4038Struct *); @@ -2360,3 +2360,54 @@ u8 sub_81131FC(struct Var4038Struct * a0) a0->unk_1 ^= 1 << gUnknown_8456940[retval]; return gUnknown_8456940[retval]; } + +u16 sub_8113288(void) +{ + return sub_81132A0((struct Var4038Struct *)GetVarPointer(VAR_0x4038)); +} + +u16 sub_81132A0(struct Var4038Struct * a0) +{ + u8 count = 0; + u8 i; + + for (i = 0; i < 8; i++) + { + if ((a0->unk_1 >> i) & 1) + count++; + } + + return count; +} + +void sub_81132CC(void) +{ + sub_81132E0((struct Var4038Struct *)GetVarPointer(VAR_0x4038)); +} + +void sub_81132E0(struct Var4038Struct * a0) +{ + u8 i = 0; + u16 var_4039; + + if (gSaveBlock2Ptr->playTimeHours < 999) + { + while (1) + { + if (sub_81132A0(a0) < 5) + { + VarSet(VAR_0x4039, gSaveBlock2Ptr->playTimeHours); + break; + } + if (i == 8) + break; + var_4039 = VarGet(VAR_0x4039); + if (gSaveBlock2Ptr->playTimeHours - var_4039 < 12) + break; + sub_81131FC(a0); + var_4039 = VarGet(VAR_0x4039); + VarSet(VAR_0x4039, var_4039 + 12); + i++; + } + } +} -- cgit v1.2.3 From 7670f0527fcbd49269ed52a52b8fa3e30353ef64 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Tue, 16 Oct 2018 18:05:39 -0700 Subject: through sub_8113414 --- asm/quest_log.s | 179 ------------------------------------------------ include/event_data.h | 1 + include/event_scripts.h | 3 + include/global.h | 4 +- src/quest_log.c | 104 ++++++++++++++++++++++++++-- 5 files changed, 106 insertions(+), 185 deletions(-) diff --git a/asm/quest_log.s b/asm/quest_log.s index 53672cf3f..0ce955c8d 100644 --- a/asm/quest_log.s +++ b/asm/quest_log.s @@ -5,185 +5,6 @@ .text - thumb_func_start sub_8113364 -sub_8113364: @ 8113364 - push {lr} - ldr r0, _08113378 @ =0x00004038 - bl GetVarPointer - bl sub_811337C - lsls r0, 16 - lsrs r0, 16 - pop {r1} - bx r1 - .align 2, 0 -_08113378: .4byte 0x00004038 - thumb_func_end sub_8113364 - - thumb_func_start sub_811337C -sub_811337C: @ 811337C - ldrb r0, [r0, 0x1] - ldr r1, _0811338C @ =gUnknown_20370C0 - ldrh r1, [r1] - asrs r0, r1 - movs r1, 0x1 - ands r0, r1 - bx lr - .align 2, 0 -_0811338C: .4byte gUnknown_20370C0 - thumb_func_end sub_811337C - - thumb_func_start sub_8113390 -sub_8113390: @ 8113390 - ldrb r2, [r0, 0x1] - movs r1, 0x1 - orrs r1, r2 - movs r2, 0x2 - orrs r1, r2 - movs r2, 0x4 - orrs r1, r2 - strb r1, [r0, 0x1] - bx lr - thumb_func_end sub_8113390 - - thumb_func_start sub_81133A4 -sub_81133A4: @ 81133A4 - push {lr} - movs r3, 0 - movs r2, 0 - ldr r0, _081133BC @ =gUnknown_20370C0 - ldrh r0, [r0] - cmp r0, 0x7 - bhi _081133F8 - lsls r0, 2 - ldr r1, _081133C0 @ =_081133C4 - adds r0, r1 - ldr r0, [r0] - mov pc, r0 - .align 2, 0 -_081133BC: .4byte gUnknown_20370C0 -_081133C0: .4byte _081133C4 - .align 2, 0 -_081133C4: - .4byte _081133E4 - .4byte _081133F8 - .4byte _081133F8 - .4byte _081133F8 - .4byte _081133EA - .4byte _081133F0 - .4byte _081133F4 - .4byte _081133F8 -_081133E4: - movs r2, 0 - movs r3, 0 - b _081133F8 -_081133EA: - movs r2, 0x1 - movs r3, 0 - b _081133F8 -_081133F0: - movs r2, 0 - b _081133F6 -_081133F4: - movs r2, 0x2 -_081133F6: - movs r3, 0x1 -_081133F8: - ldr r0, _0811340C @ =gSaveBlock2Ptr - ldr r0, [r0] - ldr r1, _08113410 @ =0x00000a98 - adds r0, r1 - adds r1, r3, 0 - bl sub_8113414 - pop {r0} - bx r0 - .align 2, 0 -_0811340C: .4byte gSaveBlock2Ptr -_08113410: .4byte 0x00000a98 - thumb_func_end sub_81133A4 - - thumb_func_start sub_8113414 -sub_8113414: @ 8113414 - push {r4,lr} - lsls r1, 24 - lsls r2, 24 - lsrs r2, 24 - adds r3, r2, 0 - lsrs r1, 20 - adds r1, r0, r1 - ldrb r0, [r1] - cmp r0, 0xFF - bne _08113478 - cmp r2, 0x1 - beq _08113436 - cmp r2, 0x1 - ble _0811345C - cmp r3, 0x2 - beq _08113448 - b _0811345C -_08113436: - ldr r0, _08113440 @ =gStringVar1 - ldr r1, _08113444 @ =gUnknown_84178D0 - bl StringCopy - b _081134B2 - .align 2, 0 -_08113440: .4byte gStringVar1 -_08113444: .4byte gUnknown_84178D0 -_08113448: - ldr r0, _08113454 @ =gStringVar1 - ldr r1, _08113458 @ =gUnknown_84178DA - bl StringCopy - b _081134B2 - .align 2, 0 -_08113454: .4byte gStringVar1 -_08113458: .4byte gUnknown_84178DA -_0811345C: - ldr r0, _0811346C @ =gStringVar1 - ldr r1, _08113470 @ =gSaveBlock1Ptr - ldr r1, [r1] - ldr r2, _08113474 @ =0x00003a4c - adds r1, r2 - bl StringCopy - b _081134B2 - .align 2, 0 -_0811346C: .4byte gStringVar1 -_08113470: .4byte gSaveBlock1Ptr -_08113474: .4byte 0x00003a4c -_08113478: - ldr r4, _08113498 @ =gStringVar1 - adds r0, r4, 0 - movs r2, 0x7 - bl StringCopyN - movs r0, 0xFF - strb r0, [r4, 0x7] - ldrb r0, [r4] - cmp r0, 0xFC - bne _081134B2 - ldrb r0, [r4, 0x1] - cmp r0, 0x15 - bne _081134B2 - adds r4, 0x2 - b _0811349E - .align 2, 0 -_08113498: .4byte gStringVar1 -_0811349C: - adds r4, 0x1 -_0811349E: - ldrb r0, [r4] - cmp r0, 0xFF - bne _0811349C - movs r0, 0xFC - strb r0, [r4] - adds r4, 0x1 - movs r0, 0x16 - strb r0, [r4] - movs r0, 0xFF - strb r0, [r4, 0x1] -_081134B2: - pop {r4} - pop {r0} - bx r0 - thumb_func_end sub_8113414 - thumb_func_start sub_81134B8 sub_81134B8: @ 81134B8 push {lr} diff --git a/include/event_data.h b/include/event_data.h index 555887b6c..398e03264 100644 --- a/include/event_data.h +++ b/include/event_data.h @@ -53,5 +53,6 @@ extern u16 gSpecialVar_MonBoxPos; extern u16 gSpecialVar_0x8014; extern u16 gUnknown_20370D0; +extern u16 gUnknown_20370C0; #endif // GUARD_EVENT_DATA_H diff --git a/include/event_scripts.h b/include/event_scripts.h index 844f1052a..6b9025ec2 100644 --- a/include/event_scripts.h +++ b/include/event_scripts.h @@ -372,4 +372,7 @@ extern const u8 SecretBase_RedCave1_Text_274E75[]; extern const u8 SecretBase_RedCave1_Text_2751E1[]; extern const u8 SecretBase_RedCave1_Text_2754F6[]; extern const u8 SecretBase_RedCave1_Text_2758CC[]; + +extern const u8 gUnknown_84178D0[]; +extern const u8 gUnknown_84178DA[]; #endif //GUARD_EVENT_SCRIPTS_H diff --git a/include/global.h b/include/global.h index ee64e855a..0857d552a 100644 --- a/include/global.h +++ b/include/global.h @@ -237,7 +237,9 @@ struct SaveBlock2 /*0x098*/ struct Time localTimeOffset; /*0x0A0*/ struct Time lastBerryTreeUpdate; /*0x0A8*/ u32 field_A8; - /*0x0AC*/ u8 filler_AC[0xE74]; + /*0x0AC*/ u8 filler_AC[0x9ec]; + /*0xA98*/ u8 unk_A98[2][16]; + /*0xAB8*/ u8 filler_AB8[0x468]; /*0xF20*/ u32 encryptionKey; }; diff --git a/src/quest_log.c b/src/quest_log.c index 7d2b2511d..f0b79bb58 100644 --- a/src/quest_log.c +++ b/src/quest_log.c @@ -10,6 +10,7 @@ #include "window.h" #include "text_window.h" #include "event_data.h" +#include "event_scripts.h" #include "string_util.h" #include "script.h" #include "overworld.h" @@ -40,6 +41,8 @@ struct Var4038Struct u8 unk_1; }; +#define VAR_0x4038_STRUCT ((struct Var4038Struct *)GetVarPointer(VAR_0x4038)) + struct UnkStruct_203AE94 { u8 unk_0_0:4; @@ -143,9 +146,11 @@ void sub_81130BC(struct Var4038Struct *); u8 sub_8113194(struct Var4038Struct *); u16 sub_81132A0(struct Var4038Struct *); void sub_81132E0(struct Var4038Struct *); +bool16 sub_811337C(struct Var4038Struct *); +void sub_8113390(struct Var4038Struct *); +void sub_8113414(u8 (*)[16], u8, u8); bool8 sub_8113508(void); void sub_8113524(struct Var4038Struct *); -void sub_8113390(struct Var4038Struct *); void sub_8113A1C(u8); void sub_811381C(void); void sub_81138F8(void); @@ -2252,7 +2257,7 @@ void sub_8113044(void) void sub_8113064(void) { - sub_8113078((struct Var4038Struct *)GetVarPointer(VAR_0x4038)); + sub_8113078(VAR_0x4038_STRUCT); } void sub_8113078(struct Var4038Struct * varPtr) @@ -2266,7 +2271,7 @@ void sub_8113078(struct Var4038Struct * varPtr) void sub_81130A8(void) { - sub_81130BC((struct Var4038Struct *)GetVarPointer(VAR_0x4038)); + sub_81130BC(VAR_0x4038_STRUCT); } void sub_81130BC(struct Var4038Struct * varPtr) @@ -2363,7 +2368,7 @@ u8 sub_81131FC(struct Var4038Struct * a0) u16 sub_8113288(void) { - return sub_81132A0((struct Var4038Struct *)GetVarPointer(VAR_0x4038)); + return sub_81132A0(VAR_0x4038_STRUCT); } u16 sub_81132A0(struct Var4038Struct * a0) @@ -2382,7 +2387,7 @@ u16 sub_81132A0(struct Var4038Struct * a0) void sub_81132CC(void) { - sub_81132E0((struct Var4038Struct *)GetVarPointer(VAR_0x4038)); + sub_81132E0(VAR_0x4038_STRUCT); } void sub_81132E0(struct Var4038Struct * a0) @@ -2411,3 +2416,92 @@ void sub_81132E0(struct Var4038Struct * a0) } } } + +bool16 sub_8113364(void) +{ + return sub_811337C(VAR_0x4038_STRUCT); +} + +bool16 sub_811337C(struct Var4038Struct * a0) +{ + return (a0->unk_1 >> gUnknown_20370C0) & 1; +} + +void sub_8113390(struct Var4038Struct * a0) +{ + a0->unk_1 |= 1; + a0->unk_1 |= 2; + a0->unk_1 |= 4; +} + +void sub_81133A4(void) +{ + u8 r3 = 0; + u8 r2 = 0; + + switch (gUnknown_20370C0) + { + case 0: + r2 = 0; + r3 = 0; + break; + case 1: + case 2: + case 3: + case 7: + break; + case 4: + r2 = 1; + r3 = 0; + break; + case 5: + r2 = 0; + r3 = 1; + break; + case 6: + r2 = 2; + r3 = 1; + break; + } + sub_8113414(gSaveBlock2Ptr->unk_A98, r3, r2); +} + +void sub_8113414(u8 (* a0)[16], u8 a1, u8 a2) +{ + u8 * str; + const u8 * src = a0[a1]; + if (src[0] == EOS) + { + switch (a2) + { + case 0: + StringCopy(gStringVar1, gSaveBlock1Ptr->rivalName); + break; + case 1: + StringCopy(gStringVar1, gUnknown_84178D0); + break; + case 2: + StringCopy(gStringVar1, gUnknown_84178DA); + break; + default: + StringCopy(gStringVar1, gSaveBlock1Ptr->rivalName); + break; + } + } + else + { + str = gStringVar1; + StringCopyN(str, src, 7); + str[7] = EOS; + if ( str[0] == EXT_CTRL_CODE_BEGIN + && str[1] == EXT_CTRL_CODE_JPN) + { + str += 2; + while (*str != EOS) + str++; + *str++ = EXT_CTRL_CODE_BEGIN; + *str++ = EXT_CTRL_CODE_ENG; + *str++ = EOS; + } + } +} -- cgit v1.2.3 From 0ba52688584d8a35ec9c617b035c9dea71e2689f Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Tue, 16 Oct 2018 21:46:09 -0700 Subject: through sub_8113530 --- asm/quest_log.s | 89 -------------------------------------------------------- include/battle.h | 2 ++ src/quest_log.c | 43 +++++++++++++++++++++++++-- 3 files changed, 43 insertions(+), 91 deletions(-) diff --git a/asm/quest_log.s b/asm/quest_log.s index 0ce955c8d..4a2914209 100644 --- a/asm/quest_log.s +++ b/asm/quest_log.s @@ -5,95 +5,6 @@ .text - thumb_func_start sub_81134B8 -sub_81134B8: @ 81134B8 - push {lr} - ldr r0, _081134C8 @ =0x00004038 - bl GetVarPointer - bl sub_81134CC - pop {r0} - bx r0 - .align 2, 0 -_081134C8: .4byte 0x00004038 - thumb_func_end sub_81134B8 - - thumb_func_start sub_81134CC -sub_81134CC: @ 81134CC - push {r4,lr} - adds r4, r0, 0 - ldr r0, _081134F4 @ =0x00004073 - bl VarGet - lsls r0, 16 - lsrs r0, 16 - cmp r0, 0x2 - bne _08113502 - adds r0, r4, 0 - bl sub_8113078 - ldr r0, _081134F8 @ =gUnknown_2023E8A - ldrb r0, [r0] - cmp r0, 0x1 - bne _081134FC - adds r0, r4, 0 - bl sub_8113194 - b _08113502 - .align 2, 0 -_081134F4: .4byte 0x00004073 -_081134F8: .4byte gUnknown_2023E8A -_081134FC: - adds r0, r4, 0 - bl sub_81131FC -_08113502: - pop {r4} - pop {r0} - bx r0 - thumb_func_end sub_81134CC - - thumb_func_start sub_8113508 -sub_8113508: @ 8113508 - ldr r0, [r0] - lsls r0, 24 - lsrs r0, 31 - bx lr - thumb_func_end sub_8113508 - - thumb_func_start sub_8113510 -sub_8113510: @ 8113510 - push {lr} - ldr r0, _08113520 @ =0x00004038 - bl GetVarPointer - bl sub_8113524 - pop {r0} - bx r0 - .align 2, 0 -_08113520: .4byte 0x00004038 - thumb_func_end sub_8113510 - - thumb_func_start sub_8113524 -sub_8113524: @ 8113524 - ldrb r1, [r0] - movs r2, 0x80 - orrs r1, r2 - strb r1, [r0] - bx lr - thumb_func_end sub_8113524 - - thumb_func_start sub_8113530 -sub_8113530: @ 8113530 - push {lr} - ldr r0, _08113548 @ =0x00004038 - bl GetVarPointer - ldr r1, _0811354C @ =gUnknown_20370C0 - ldrb r1, [r1] - bl sub_8113114 - lsls r0, 24 - lsrs r0, 24 - pop {r1} - bx r1 - .align 2, 0 -_08113548: .4byte 0x00004038 -_0811354C: .4byte gUnknown_20370C0 - thumb_func_end sub_8113530 - thumb_func_start sub_8113550 sub_8113550: @ 8113550 push {r4,r5,lr} diff --git a/include/battle.h b/include/battle.h index ee707f78b..d89db4656 100644 --- a/include/battle.h +++ b/include/battle.h @@ -977,4 +977,6 @@ extern u8 gBattlersCount; extern u16 gBattlerPartyIndexes[MAX_BATTLERS_COUNT]; extern s32 gBattleMoveDamage; +extern u8 gUnknown_2023E8A; + #endif // GUARD_BATTLE_H diff --git a/src/quest_log.c b/src/quest_log.c index f0b79bb58..e16de5e5d 100644 --- a/src/quest_log.c +++ b/src/quest_log.c @@ -21,6 +21,7 @@ #include "map_obj_lock.h" #include "field_player_avatar.h" #include "field_control_avatar.h" +#include "battle.h" #include "item.h" #include "region_map.h" #include "map_name_popup.h" @@ -149,7 +150,8 @@ void sub_81132E0(struct Var4038Struct *); bool16 sub_811337C(struct Var4038Struct *); void sub_8113390(struct Var4038Struct *); void sub_8113414(u8 (*)[16], u8, u8); -bool8 sub_8113508(void); +void sub_81134CC(struct Var4038Struct *); +bool8 sub_8113508(struct Var4038Struct * ); void sub_8113524(struct Var4038Struct *); void sub_8113A1C(u8); void sub_811381C(void); @@ -2262,7 +2264,7 @@ void sub_8113064(void) void sub_8113078(struct Var4038Struct * varPtr) { - if (sub_8113508()) + if (sub_8113508(varPtr)) { sub_81132E0(varPtr); VarSet(VAR_0x4039, gSaveBlock2Ptr->playTimeHours); @@ -2505,3 +2507,40 @@ void sub_8113414(u8 (* a0)[16], u8 a1, u8 a2) } } } + +void sub_81134B8(void) +{ + sub_81134CC(VAR_0x4038_STRUCT); +} + +void sub_81134CC(struct Var4038Struct * a0) +{ + if (VarGet(VAR_0x4073) == 2) + { + sub_8113078(a0); + if (gUnknown_2023E8A == 1) + sub_8113194(a0); + else + sub_81131FC(a0); + } +} + +bool8 sub_8113508(struct Var4038Struct * a0) +{ + return a0->unk_0_7; +} + +void sub_8113510(void) +{ + sub_8113524(VAR_0x4038_STRUCT); +} + +void sub_8113524(struct Var4038Struct * a0) +{ + a0->unk_0_7 = TRUE; +} + +u8 sub_8113530(void) +{ + return sub_8113114(VAR_0x4038_STRUCT, gUnknown_20370C0); +} -- cgit v1.2.3 From d40ea8b15da1dfcd2477121e4191a0c1dec3e400 Mon Sep 17 00:00:00 2001 From: paul Date: Tue, 30 Oct 2018 01:27:51 +0100 Subject: prepare graphics.s for further dumping of compressed data, tag regions which arent compressed --- data/graphics.s | 283 +++++++++++++++++++++++++++++++++++++++++++++----------- 1 file changed, 230 insertions(+), 53 deletions(-) diff --git a/data/graphics.s b/data/graphics.s index d2389d361..ab8075c41 100644 --- a/data/graphics.s +++ b/data/graphics.s @@ -12,7 +12,10 @@ gFile_graphics_interface_menu_map_tilemap:: @ 8D0051C .align 2 gUnknown_8D00748:: @ 8D00748 - .incbin "baserom.gba", 0xD00748, 0x488 + .incbin "baserom.gba", 0xD00748, 0x244 + +gUnknown_8D0098C:: @ 8D0098C + .incbin "baserom.gba", 0xD0098C, 0x244 .align 2 gUnknown_8D00BD0:: @ 8D00BD0 @@ -1759,7 +1762,19 @@ gFile_graphics_battle_anims_sprites_186_palette:: @ 8D1F31C .align 2 gUnknown_8D1F340:: @ 8D1F340 - .incbin "baserom.gba", 0xD1F340, 0x77C + .incbin "baserom.gba", 0xD1F340, 0x2C4 + + .align 2 +gUnknown_8D1F604:: @ 8D1F604 + .incbin "baserom.gba", 0xD1F604, 0x190 + + .align 2 +gUnknown_8D1F794:: @ 8D1F794 + .incbin "baserom.gba", 0xD1F794, 0x194 + + .align 2 +gUnknown_8D1F928:: @ 8D1F928 + .incbin "baserom.gba", 0xD1F928, 0x194 .align 2 gFile_graphics_battle_interface_healthbox_safari_sheet:: @ 8D1FABC @@ -13683,7 +13698,7 @@ gFile_graphics_battle_interface_ball_status_bar_sheet:: @ 8E7BB04 .align 2 gUnknown_8E7BBB8:: @ 8E7BB88 - .incbin "baserom.gba", 0xE7BB88, 0x400 + .incbin "baserom.gba", 0xE7BB88, 0x400 @UNKNOWN .align 2 gFile_graphics_battle_anims_backgrounds_02_sheet:: @ 8E7BF88 @@ -13920,7 +13935,16 @@ gUnknown_8E835B4:: @ 8E835B4 .incbin "baserom.gba", 0xE835B4, 0x50 gUnknown_8E83604:: @ 8E83604 - .incbin "baserom.gba", 0xE83604, 0xF84 + .incbin "baserom.gba", 0xE83604, 0x28 + +gUnknown_8E8362C:: @ 8E8362C + .incbin "baserom.gba", 0xE8362C, 0x790 + +gUnknown_8E83DBC:: @ 8E83DBC + .incbin "baserom.gba", 0xE83DBC, 0x7A4 + +gUnknown_8E84560:: @ 8E84560 + .incbin "baserom.gba", 0xE84560, 0x28 .align 2 gFile_graphics_interface_bag_swap_sheet:: @ 8E84588 @@ -13944,7 +13968,10 @@ gUnknown_8E84CB0:: @ 8E84CB0 .incbin "baserom.gba", 0xE84CB0, 0x70 gUnknown_8E84D20:: @ 8E84D20 - .incbin "baserom.gba", 0xE84D20, 0x200 + .incbin "baserom.gba", 0xE84D20, 0x70 + +gUnknown_8E84D90:: @ 8E84D90 + .incbin "baserom.gba", 0xE84D90, 0x190 gUnknown_8E84F20:: @ 8E84F20 .incbin "baserom.gba", 0xE84F20, 0x148 @@ -13959,7 +13986,10 @@ gUnknown_8E85408:: @ 8E85408 .incbin "baserom.gba", 0xE85408, 0x50 gUnknown_8E85458:: @ 8E85458 - .incbin "baserom.gba", 0xE85458, 0x578 + .incbin "baserom.gba", 0xE85458, 0x1B4 + +gUnknown_8E8560C:: @ 8E8560C + .incbin "baserom.gba", 0xE8560C, 0x3C4 gUnknown_8E859D0:: @ 8E859D0 .incbin "baserom.gba", 0xE859D0, 0x1D4 @@ -13968,7 +13998,10 @@ gUnknown_8E85BA4:: @ 8E85BA4 .incbin "baserom.gba", 0xE85BA4, 0x50 gUnknown_8E85BF4:: @ 8E85BF4 - .incbin "baserom.gba", 0xE85BF4, 0x50 + .incbin "baserom.gba", 0xE85BF4, 0x28 + +gUnknown_8E85C1C:: @ 8E85C1C + .incbin "baserom.gba", 0xE85C1C, 0x28 gUnknown_8E85C44:: @ 8E85C44 .incbin "baserom.gba", 0xE85C44, 0x184 @@ -13983,7 +14016,10 @@ gUnknown_8E86038:: @ 8E86038 .incbin "baserom.gba", 0xE86038, 0x138 gUnknown_8E86170:: @ 8E86170 - .incbin "baserom.gba", 0xE86170, 0xD0 + .incbin "baserom.gba", 0xE86170, 0x38 + +gUnknown_8E861A8:: @ 8E861A8 + .incbin "baserom.gba", 0xE861A8, 0x98 gUnknown_8E86240:: @ 8E86240 .incbin "baserom.gba", 0xE86240, 0x9A8 @@ -13995,7 +14031,10 @@ gUnknown_8E86D6C:: @ 8E86D6C .incbin "baserom.gba", 0xE86D6C, 0x22C gUnknown_8E86F98:: @ 8E86F98 - .incbin "baserom.gba", 0xE86F98, 0x90 + .incbin "baserom.gba", 0xE86F98, 0x78 + +gUnknown_8E87010:: @ 8E87010 + .incbin "baserom.gba", 0xE87010, 0x18 @ THIS IS ITEM ICONS .align 2 @@ -15891,7 +15930,10 @@ gUnknown_8E93B14:: @ 8E93B14 .incbin "baserom.gba", 0xE93B14, 0x24 gUnknown_8E93B38:: @ 8E93B38 - .incbin "baserom.gba", 0xE93B38, 0x4E8 + .incbin "baserom.gba", 0xE93B38, 0x368 + +gUnknown_8E93EA0:: @ 8E93EA0 + .incbin "baserom.gba", 0xE93EA0, 0x180 @UNKNOWN .align 2 gFile_graphics_mail_orange_tiles_sheet:: @ 8E94020 @@ -15991,16 +16033,16 @@ gFile_graphics_mail_retro_map_tilemap:: @ 8E95C88 .align 2 gUnknown_8E95D9C:: @ 8E95D9C - .incbin "baserom.gba", 0xE95D9C, 0x20 + .incbin "baserom.gba", 0xE95D9C, 0x20 @UNKNOWN gUnknown_8E95DBC:: @ 8E95DBC - .incbin "baserom.gba", 0xE95DBC, 0x20 + .incbin "baserom.gba", 0xE95DBC, 0x20 @UNKNOWN gUnknown_8E95DDC:: @ 8E95DDC - .incbin "baserom.gba", 0xE95DDC, 0x2000 + .incbin "baserom.gba", 0xE95DDC, 0x2000 @UNKNOWN gUnknown_8E97DDC:: @ 8E97DDC - .incbin "baserom.gba", 0xE97DDC, 0x20 + .incbin "baserom.gba", 0xE97DDC, 0x20 @UNKNOWN gUnknown_8E97DFC:: @ 8E97DFC .incbin "baserom.gba", 0xE97DFC, 0xC8 @@ -16009,10 +16051,10 @@ gUnknown_8E97EC4:: @ 8E97EC4 .incbin "baserom.gba", 0xE97EC4, 0x120 gUnknown_8E97FE4:: @ 8E97FE4 - .incbin "baserom.gba", 0xE97FE4, 0x40 + .incbin "baserom.gba", 0xE97FE4, 0x40 @UNKNOWN gUnknown_8E98024:: @ 8E98024 - .incbin "baserom.gba", 0xE98024, 0xC0 + .incbin "baserom.gba", 0xE98024, 0xC0 @UNKNOWN gUnknown_8E980E4:: @ 8E980E4 .incbin "baserom.gba", 0xE980E4, 0x1D8 @@ -16024,34 +16066,52 @@ gUnknown_8E98398:: @ 8E98398 .incbin "baserom.gba", 0xE98398, 0xC0 gUnknown_8E98458:: @ 8E98458 - .incbin "baserom.gba", 0xE98458, 0xCC0 + .incbin "baserom.gba", 0xE98458, 0xC0 + +gUnknown_8E98518:: @ 8E98518 + .incbin "baserom.gba", 0xE98518, 0xC0 + +gUnknown_8E985D8:: @ 8E985D8 + .incbin "baserom.gba", 0xE985D8, 0xB40 @UNKNOWN, FALSEPOSITIVE? gUnknown_8E99118:: @ 8E99118 - .incbin "baserom.gba", 0xE99118, 0xE0 + .incbin "baserom.gba", 0xE99118, 0xE0 @UNKNOWN gUnknown_8E991F8:: @ 8E991F8 - .incbin "baserom.gba", 0xE991F8, 0x6D4 + .incbin "baserom.gba", 0xE991F8, 0x674 + +gUnknown_8E9986C:: @ 8E9986C + .incbin "baserom.gba", 0xE9986C, 0x60 @UNKNOWN gUnknown_8E998CC:: @ 8E998CC .incbin "baserom.gba", 0xE998CC, 0x4C0 gUnknown_8E99D8C:: @ 8E99D8C - .incbin "baserom.gba", 0xE99D8C, 0x20 + .incbin "baserom.gba", 0xE99D8C, 0x20 @UNKNOWN gUnknown_8E99DAC:: @ 8E99DAC - .incbin "baserom.gba", 0xE99DAC, 0xC8 + .incbin "baserom.gba", 0xE99DAC, 0xC8 @UNKNOWN gUnknown_8E99E74:: @ 8E99E74 - .incbin "baserom.gba", 0xE99E74, 0x5EC + .incbin "baserom.gba", 0xE99E74, 0xB0 + +gUnknown_8E99F24:: @ 8E99F24 + .incbin "baserom.gba", 0xE99F24, 0x20 @UNKNOWN + +gUnknown_8E99F44:: @ 8E99F44 + .incbin "baserom.gba", 0xE99F44, 0x224 + +gUnknown_8E9A168:: @ 8E9A168 + .incbin "baserom.gba", 0xE9A168, 0x2F8 gUnknown_8E9A460:: @ 8E9A460 .incbin "baserom.gba", 0xE9A460, 0xEB0 gUnknown_8E9B310:: @ 8E9B310 - .incbin "baserom.gba", 0xE9B310, 0xC0 + .incbin "baserom.gba", 0xE9B310, 0xC0 @UNKNOWN gUnknown_8E9B3D0:: @ 8E9B3D0 - .incbin "baserom.gba", 0xE9B3D0, 0x20 + .incbin "baserom.gba", 0xE9B3D0, 0x20 @UNKNOWN gUnknown_8E9B3F0:: @ 8E9B3F0 .incbin "baserom.gba", 0xE9B3F0, 0xC8 @@ -16060,7 +16120,7 @@ gUnknown_8E9B4B8:: @ 8E9B4B8 .incbin "baserom.gba", 0xE9B4B8, 0xC0 gUnknown_8E9B578:: @ 8E9B578 - .incbin "baserom.gba", 0xE9B578, 0x20 + .incbin "baserom.gba", 0xE9B578, 0x20 @UNKNOWN gUnknown_8E9B598:: @ 8E9B598 .incbin "baserom.gba", 0xE9B598, 0x1B8 @@ -16075,22 +16135,34 @@ gUnknown_8E9BA9C:: @ 8E9BA9C .incbin "baserom.gba", 0xE9BA9C, 0x130 gUnknown_8E9BBCC:: @ 8E9BBCC - .incbin "baserom.gba", 0xE9BBCC, 0x35C + .incbin "baserom.gba", 0xE9BBCC, 0x13C + +gUnknown_8E9BD08:: @ 8E9BD08 + .incbin "baserom.gba", 0xE9BD08, 0x20 @UNKNOWN + +gUnknown_8E9BD28:: @ 8E9BD28 + .incbin "baserom.gba", 0xE9BD28, 0x200 gUnknown_8E9BF28:: @ 8E9BF28 - .incbin "baserom.gba", 0xE9BF28, 0x20 + .incbin "baserom.gba", 0xE9BF28, 0x20 @UNKNOWN gUnknown_8E9BF48:: @ 8E9BF48 - .incbin "baserom.gba", 0xE9BF48, 0x490 + .incbin "baserom.gba", 0xE9BF48, 0x204 + +gUnknown_8E9C14C:: @ 8E9C14C + .incbin "baserom.gba", 0xE9C14C, 0x20 @UNKNOWN + +gUnknown_8E9C16C:: @ 8E9C16C + .incbin "baserom.gba", 0xE9C16C, 0x26C gUnknown_8E9C3D8:: @ 8E9C3D8 - .incbin "baserom.gba", 0xE9C3D8, 0x20 + .incbin "baserom.gba", 0xE9C3D8, 0x20 @UNKNOWN gUnknown_8E9C3F8:: @ 8E9C3F8 - .incbin "baserom.gba", 0xE9C3F8, 0x20 + .incbin "baserom.gba", 0xE9C3F8, 0x20 @UNKNOWN gUnknown_8E9C418:: @ 8E9C418 - .incbin "baserom.gba", 0xE9C418, 0x20 + .incbin "baserom.gba", 0xE9C418, 0x20 @UNKNOWN gUnknown_8E9C438:: @ 8E9C438 .incbin "baserom.gba", 0xE9C438, 0x6B4 @@ -16099,46 +16171,133 @@ gUnknown_8E9CAEC:: @ 8E9CAEC .incbin "baserom.gba", 0xE9CAEC, 0xB0 gUnknown_8E9CB9C:: @ 8E9CB9C - .incbin "baserom.gba", 0xE9CB9C, 0x20 + .incbin "baserom.gba", 0xE9CB9C, 0x20 @UNKNOWN gUnknown_8E9CBBC:: @ 8E9CBBC - .incbin "baserom.gba", 0xE9CBBC, 0x320 + .incbin "baserom.gba", 0xE9CBBC, 0x320 @UNKNOWN gUnknown_8E9CEDC:: @ 8E9CEDC - .incbin "baserom.gba", 0xE9CEDC, 0x80 + .incbin "baserom.gba", 0xE9CEDC, 0x80 @UNKNOWN gUnknown_8E9CF5C:: @ 8E9CF5C - .incbin "baserom.gba", 0xE9CF5C, 0x1AA0 + .incbin "baserom.gba", 0xE9CF5C, 0x1AA0 @UNKNOWN gUnknown_8E9E9FC:: @ 8E9E9FC - .incbin "baserom.gba", 0xE9E9FC, 0x800 + .incbin "baserom.gba", 0xE9E9FC, 0x800 @UNKNOWN gUnknown_8E9F1FC:: @ 8E9F1FC - .incbin "baserom.gba", 0xE9F1FC, 0x24 + .incbin "baserom.gba", 0xE9F1FC, 0x24 @UNKNOWN gUnknown_8E9F220:: @ 8E9F220 - .incbin "baserom.gba", 0xE9F220, 0x40 + .incbin "baserom.gba", 0xE9F220, 0x40 @UNKNOWN gUnknown_8E9F260:: @ 8E9F260 - .incbin "baserom.gba", 0xE9F260, 0x14A0 + .incbin "baserom.gba", 0xE9F260, 0x14A0 @UNKNOWN gUnknown_8EA0700:: @ 8EA0700 - .incbin "baserom.gba", 0xEA0700, 0x800 + .incbin "baserom.gba", 0xEA0700, 0x800 @UNKNOWN gUnknown_8EA0F00:: @ 8EA0F00 - .incbin "baserom.gba", 0xEA0F00, 0x800 + .incbin "baserom.gba", 0xEA0F00, 0x800 @UNKNOWN gUnknown_8EA1700:: @ 8EA1700 - .incbin "baserom.gba", 0xEA1700, 0x20 + .incbin "baserom.gba", 0xEA1700, 0x20 @UNKNOWN gUnknown_8EA1720:: @ 8EA1720 .incbin "baserom.gba", 0xEA1720, 0x238 gUnknown_8EA1958:: @ 8EA1958 - .incbin "baserom.gba", 0xEA1958, 0x9098 + .incbin "baserom.gba", 0xEA1958, 0xF8 + +gUnknown_8EA1A50:: @ 8EA1A50 + .incbin "baserom.gba", 0xEA1A50, 0x118 + +gUnknown_8EA1B68:: @ 8EA1B68 + .incbin "baserom.gba", 0xEA1B68, 0xE0 @UNKNOWN + +gUnknown_8EA1C48:: @ 8EA1C48 + .incbin "baserom.gba", 0xEA1C48, 0x90 + +gUnknown_8EA1CD8:: @ 8EA1CD8 + .incbin "baserom.gba", 0xEA1CD8, 0x90 @UNKNOWN + +gUnknown_8EA1D68:: @ 8EA1D68 + .incbin "baserom.gba", 0xEA1D68, 0x28D4 + +gUnknown_8EA463C:: @ 8EA463C + .incbin "baserom.gba", 0xEA463C, 0x40 @UNKNOWN + +gUnknown_8EA467C:: @ 8EA467C + .incbin "baserom.gba", 0xEA467C, 0xC3C + +gUnknown_8EA52B8:: @ 8EA52B8 + .incbin "baserom.gba", 0xEA52B8, 0x34C + +gUnknown_8EA5604:: @ 8EA5604 + .incbin "baserom.gba", 0xEA5604, 0x60 @UNKNOWN + +gUnknown_8EA5664:: @ 8EA5664 + .incbin "baserom.gba", 0xEA5664, 0xA64 + +gUnknown_8EA60C8:: @ 8EA60C8 + .incbin "baserom.gba", 0xEA60C8, 0x300 + +gUnknown_8EA63C8:: @ 8EA63C8 + .incbin "baserom.gba", 0xEA63C8, 0x40 @UNKNOWN + +gUnknown_8EA6408:: @ 8EA6408 + .incbin "baserom.gba", 0xEA6408, 0xC20 + +gUnknown_8EA7028:: @ 8EA7028 + .incbin "baserom.gba", 0xEA7028, 0x2B8 + +gUnknown_8EA72E0:: @ 8EA72E0 + .incbin "baserom.gba", 0xEA72E0, 0x40 @UNKNOWN + +gUnknown_8EA7320:: @ 8EA7320 + .incbin "baserom.gba", 0xEA7320, 0xDF8 + +gUnknown_8EA8118:: @ 8EA8118 + .incbin "baserom.gba", 0xEA8118, 0x2B0 + +gUnknown_8EA83C8:: @ 8EA83C8 + .incbin "baserom.gba", 0xEA83C8, 0x40 @UNKNOWN + +gUnknown_8EA8408:: @ 8EA8408 + .incbin "baserom.gba", 0xEA8408, 0x8C0 + +gUnknown_8EA8CC8:: @ 8EA8CC8 + .incbin "baserom.gba", 0xEA8CC8, 0x238 + +gUnknown_8EA8F00:: @ 8EA8F00 + .incbin "baserom.gba", 0xEA8F00, 0x40 @UNKNOWN + +gUnknown_8EA8F40:: @ 8EA8F40 + .incbin "baserom.gba", 0xEA8F40, 0x648 + +gUnknown_8EA9588:: @ 8EA9588 + .incbin "baserom.gba", 0xEA9588, 0x26C + +gUnknown_8EA97F4:: @ 8EA97F4 + .incbin "baserom.gba", 0xEA97F4, 0x120 @UNKNOWN + +gUnknown_8EA9914:: @ 8EA9914 + .incbin "baserom.gba", 0xEA9914, 0x90 + +gUnknown_8EA99A4:: @ 8EA99A4 + .incbin "baserom.gba", 0xEA99A4, 0x50 @UNKNOWN + +gUnknown_8EA99F4:: @ 8EA99F4 + .incbin "baserom.gba", 0xEA99F4, 0x394 + +gUnknown_8EA9D88:: @ 8EA9D88 + .incbin "baserom.gba", 0xEA9D88, 0x200 @UNKNOWN + +gUnknown_8EA9F88:: @ 8EA9F88 + .incbin "baserom.gba", 0xEA9F88, 0xA68 gUnknown_8EAA9F0:: @ 8EAA9F0 - .incbin "baserom.gba", 0xEAA9F0, 0x20 + .incbin "baserom.gba", 0xEAA9F0, 0x20 @UNKNOWN gUnknown_8EAAA10:: @ 8EAAA10 .incbin "baserom.gba", 0xEAAA10, 0x5C @@ -16147,7 +16306,7 @@ gUnknown_8EAAA6C:: @ 8EAAA6C .incbin "baserom.gba", 0xEAAA6C, 0xAC gUnknown_8EAAB18:: @ 8EAAB18 - .incbin "baserom.gba", 0xEAAB18, 0x80 + .incbin "baserom.gba", 0xEAAB18, 0x80 @UNKNOWN gUnknown_8EAAB98:: @ 8EAAB98 .incbin "baserom.gba", 0xEAAB98, 0x774 @@ -16156,7 +16315,7 @@ gUnknown_8EAB30C:: @ 8EAB30C .incbin "baserom.gba", 0xEAB30C, 0x3B8 gUnknown_8EAB6C4:: @ 8EAB6C4 - .incbin "baserom.gba", 0xEAB6C4, 0x200 + .incbin "baserom.gba", 0xEAB6C4, 0x200 @UNKNOWN gUnknown_8EAB8C4:: @ 8EAB8C4 .incbin "baserom.gba", 0xEAB8C4, 0x1ACC @@ -16165,7 +16324,7 @@ gUnknown_8EAD390:: @ 8EAD390 .incbin "baserom.gba", 0xEAD390, 0x258 gUnknown_8EAD5E8:: @ 8EAD5E8 - .incbin "baserom.gba", 0xEAD5E8, 0x20 + .incbin "baserom.gba", 0xEAD5E8, 0x20 @UNKNOWN gUnknown_8EAD608:: @ 8EAD608 .incbin "baserom.gba", 0xEAD608, 0x8DC @@ -16174,7 +16333,7 @@ gUnknown_8EADEE4:: @ 8EADEE4 .incbin "baserom.gba", 0xEADEE4, 0x1B0 gUnknown_8EAE094:: @ 8EAE094 - .incbin "baserom.gba", 0xEAE094, 0x20 + .incbin "baserom.gba", 0xEAE094, 0x20 @UNKNOWN gUnknown_8EAE0B4:: @ 8EAE0B4 .incbin "baserom.gba", 0xEAE0B4, 0x2C0 @@ -16183,19 +16342,37 @@ gUnknown_8EAE374:: @ 8EAE374 .incbin "baserom.gba", 0xEAE374, 0x114 gUnknown_8EAE488:: @ 8EAE488 - .incbin "baserom.gba", 0xEAE488, 0x598 + .incbin "baserom.gba", 0xEAE488, 0x20 @UNKNOWN + +gUnknown_8EAE4A8:: @ 8EAE4A8 + .incbin "baserom.gba", 0xEAE4A8, 0x80 + +gUnknown_8EAE528:: @ 8EAE528 + .incbin "baserom.gba", 0xEAE528, 0x20 @UNKNOWN + +gUnknown_8EAE548:: @ 8EAE548 + .incbin "baserom.gba", 0xEAE548, 0x3B8 + +gUnknown_8EAE900:: @ 8EAE900 + .incbin "baserom.gba", 0xEAE900, 0x100 + +gUnknown_8EAEA00:: @ 8EAEA00 + .incbin "baserom.gba", 0xEAEA00, 0x20 @UNKNOWN gUnknown_8EAEA20:: @ 8EAEA20 - .incbin "baserom.gba", 0xEAEA20, 0x60 + .incbin "baserom.gba", 0xEAEA20, 0x60 @UNKNOWN gUnknown_8EAEA80:: @ 8EAEA80 - .incbin "baserom.gba", 0xEAEA80, 0x1420 + .incbin "baserom.gba", 0xEAEA80, 0x1420 @UNKNOWN gUnknown_8EAFEA0:: @ 8EAFEA0 - .incbin "baserom.gba", 0xEAFEA0, 0x120 + .incbin "baserom.gba", 0xEAFEA0, 0x120 @UNKNOWN gUnknown_8EAFFC0:: @ 8EAFFC0 .incbin "baserom.gba", 0xEAFFC0, 0xB1C gUnknown_8EB0ADC:: @ 8EB0ADC - .incbin "baserom.gba", 0xEB0ADC + .incbin "baserom.gba", 0xEB0ADC, 0x44 + +gUnknown_8EB0B20:: @ 8EB0B20 + .incbin "baserom.gba", 0xEB0B20 -- cgit v1.2.3 From 812f735c03d90b92c10e8c2ee460654317fc1822 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sat, 3 Nov 2018 11:25:27 -0400 Subject: Nonmatching sub_8113550 --- asm/quest_log.s | 183 --------------------------- data/quest_log.s | 3 - src/quest_log.c | 369 ++++++++++++++++++++++++++++++++++++++++++++++++++++++- 3 files changed, 367 insertions(+), 188 deletions(-) diff --git a/asm/quest_log.s b/asm/quest_log.s index 4a2914209..72cd3da6a 100644 --- a/asm/quest_log.s +++ b/asm/quest_log.s @@ -5,189 +5,6 @@ .text - thumb_func_start sub_8113550 -sub_8113550: @ 8113550 - push {r4,r5,lr} - adds r5, r1, 0 - lsls r0, 16 - lsrs r4, r0, 16 - cmp r4, 0x23 - bne _08113570 - ldr r0, _0811356C @ =gUnknown_203B048 - ldrb r0, [r0] - cmp r0, 0x2 - bne _08113570 - bl sub_811381C - b _081136BC - .align 2, 0 -_0811356C: .4byte gUnknown_203B048 -_08113570: - bl sub_811381C - ldr r0, _0811362C @ =gUnknown_203ADFA - ldrb r0, [r0] - cmp r0, 0x2 - bne _0811357E - b _081136BC -_0811357E: - subs r0, r4, 0x3 - lsls r0, 16 - lsrs r0, 16 - cmp r0, 0x27 - bls _0811358A - b _081136BC -_0811358A: - bl sub_81136D4 - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x1 - bne _08113598 - b _081136BC -_08113598: - adds r0, r4, 0 - adds r1, r5, 0 - bl sub_81138A0 - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x1 - bne _081135AA - b _081136BC -_081135AA: - bl sub_80BF708 - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x1 - bne _081135B8 - b _081136BC -_081135B8: - bl InUnionRoom - cmp r0, 0x1 - bne _081135C2 - b _081136BC -_081135C2: - adds r0, r4, 0 - adds r1, r5, 0 - bl sub_8113954 - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x1 - beq _081136BC - adds r0, r4, 0 - adds r1, r5, 0 - bl sub_8113A44 - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x1 - beq _081136BC - adds r0, r4, 0 - adds r1, r5, 0 - bl sub_81153E4 - lsls r0, 24 - cmp r0, 0 - beq _081136BC - ldr r0, _08113630 @ =gUnknown_3005E88 - ldrb r0, [r0] - cmp r0, 0 - bne _08113638 - adds r0, r4, 0 - adds r1, r5, 0 - bl sub_8113778 - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x1 - beq _081136BC - cmp r4, 0x1F - bne _08113614 - ldr r0, _08113634 @ =gUnknown_203AE04 - ldr r0, [r0] - cmp r0, 0 - bne _0811363C -_08113614: - adds r0, r4, 0 - adds r1, r5, 0 - bl sub_81153A8 - lsls r0, 24 - cmp r0, 0 - beq _081136BC - adds r0, r4, 0 - bl sub_8110AEC - b _0811363C - .align 2, 0 -_0811362C: .4byte gUnknown_203ADFA -_08113630: .4byte gUnknown_3005E88 -_08113634: .4byte gUnknown_203AE04 -_08113638: - cmp r4, 0x28 - beq _081136BC -_0811363C: - adds r0, r4, 0 - bl sub_8113B94 - cmp r4, 0x1F - bne _0811367C - ldr r2, _0811365C @ =gUnknown_203AE04 - ldr r1, [r2] - cmp r1, 0 - bne _08113668 - ldr r0, _08113660 @ =gUnknown_203AE08 - ldr r0, [r0] - str r0, [r2] - ldr r1, _08113664 @ =gUnknown_8456948 - ldr r2, [r1, 0x7C] - b _0811368E - .align 2, 0 -_0811365C: .4byte gUnknown_203AE04 -_08113660: .4byte gUnknown_203AE08 -_08113664: .4byte gUnknown_8456948 -_08113668: - ldr r0, _08113678 @ =gUnknown_8456948 - ldr r2, [r0, 0x7C] - adds r0, r1, 0 - adds r1, r5, 0 - bl _call_via_r2 - b _081136BC - .align 2, 0 -_08113678: .4byte gUnknown_8456948 -_0811367C: - ldr r1, _081136C4 @ =gUnknown_203AE04 - movs r0, 0 - str r0, [r1] - ldr r0, _081136C8 @ =gUnknown_8456948 - lsls r1, r4, 2 - adds r1, r0 - ldr r0, _081136CC @ =gUnknown_203AE08 - ldr r0, [r0] - ldr r2, [r1] -_0811368E: - adds r1, r5, 0 - bl _call_via_r2 - adds r1, r0, 0 - cmp r1, 0 - bne _081136AC - bl sub_811231C - adds r0, r4, 0 - adds r1, r5, 0 - bl sub_8113828 - adds r1, r0, 0 - cmp r1, 0 - beq _081136BC -_081136AC: - ldr r0, _081136CC @ =gUnknown_203AE08 - str r1, [r0] - ldr r0, _081136D0 @ =gUnknown_203B048 - ldrb r0, [r0] - cmp r0, 0 - beq _081136BC - bl sub_811231C -_081136BC: - pop {r4,r5} - pop {r0} - bx r0 - .align 2, 0 -_081136C4: .4byte gUnknown_203AE04 -_081136C8: .4byte gUnknown_8456948 -_081136CC: .4byte gUnknown_203AE08 -_081136D0: .4byte gUnknown_203B048 - thumb_func_end sub_8113550 - thumb_func_start sub_81136D4 sub_81136D4: @ 81136D4 push {lr} diff --git a/data/quest_log.s b/data/quest_log.s index 527fadb75..6a0f5449d 100644 --- a/data/quest_log.s +++ b/data/quest_log.s @@ -1,9 +1,6 @@ .section .rodata .align 2 -gUnknown_8456948:: @ 8456948 - .incbin "baserom.gba", 0x456948, 0xAC - gUnknown_84569F4:: @ 84569F4 .incbin "baserom.gba", 0x4569F4, 0xAC diff --git a/src/quest_log.c b/src/quest_log.c index e16de5e5d..cfa353caa 100644 --- a/src/quest_log.c +++ b/src/quest_log.c @@ -30,6 +30,7 @@ #include "unk_8159F40.h" #include "pokemon_storage_system.h" #include "save.h" +#include "link.h" #include "quest_log_8150454.h" #include "quest_log.h" @@ -99,6 +100,7 @@ EWRAM_DATA u16 gUnknown_203B01E; EWRAM_DATA u8 gUnknown_203B020; EWRAM_DATA u16 gUnknown_203B044[2] = {0}; +EWRAM_DATA u8 gUnknown_203B048 = 0; void sub_8110A00(void); void sub_8110A3C(void); @@ -153,6 +155,53 @@ void sub_8113414(u8 (*)[16], u8, u8); void sub_81134CC(struct Var4038Struct *); bool8 sub_8113508(struct Var4038Struct * ); void sub_8113524(struct Var4038Struct *); +bool8 sub_81136D4(void); +bool8 sub_8113778(u16, void*); +void* sub_8113828(u16, void*); +bool8 sub_81138A0(u16, void*); +bool8 sub_8113954(u16, void*); +bool8 sub_8113A44(u16, void*); +void sub_8113B94(u16); +void *sub_8113F14(void *, void *); +void *sub_8113F80(void *, void *); +void *sub_8114174(void *, void *); +void *sub_81141D0(void *, void *); +void *sub_811422C(void *, void *); +void *sub_8114288(void *, void *); +void *sub_8114310(void *, void *); +void *sub_8114380(void *, void *); +void *sub_81143F0(void *, void *); +void *sub_811445C(void *, void *); +void *sub_81144EC(void *, void *); +void *sub_8114578(void *, void *); +void *sub_8114604(void *, void *); +void *sub_8114710(void *, void *); +void *sub_8114744(void *, void *); +void *sub_8114778(void *, void *); +void *sub_8114808(void *, void *); +void *sub_811488C(void *, void *); +void *sub_8114918(void *, void *); +void *sub_8114990(void *, void *); +void *sub_8114A1C(void *, void *); +void *sub_8114AA0(void *, void *); +void *sub_8114B0C(void *, void *); +void *sub_8114B78(void *, void *); +void *sub_8114BE4(void *, void *); +void *sub_8114C68(void *, void *); +void *sub_8114CC0(void *, void *); +void *sub_8114D4C(void *, void *); +void *sub_8114DE8(void *, void *); +void *sub_8114FF0(void *, void *); +void *sub_8115078(void *, void *); +void *sub_81151C0(void *, void *); +void *sub_8115280(void *, void *); +void *sub_8115410(void *, void *); +void *sub_81154DC(void *, void *); +void *sub_81155A4(void *, void *); +void *sub_81156D8(void *, void *); +void *sub_81157DC(void *, void *); +bool8 sub_81153A8(u16, void*); +bool8 sub_81153E4(u16, void*); void sub_8113A1C(u8); void sub_811381C(void); void sub_81138F8(void); @@ -185,8 +234,6 @@ const u16 gUnknown_8456638[] = INCBIN_U16("data/graphics/unknown_8456638.bin"); const u8 gUnknown_8456698[] = {17, 10, 3}; -extern const struct UnkStruct_203AE98 gUnknown_845669C; - void sub_8110840(void * oldPointer) { ptrdiff_t offset = (void *)gSaveBlock1Ptr - oldPointer; @@ -2544,3 +2591,321 @@ u8 sub_8113530(void) { return sub_8113114(VAR_0x4038_STRUCT, gUnknown_20370C0); } + +void * (*const gUnknown_8456948[])(void *, void *) = { + NULL, + NULL, + NULL, + sub_8113F14, + sub_8113F80, + sub_8114174, + sub_81141D0, + sub_811422C, + sub_8114288, + sub_8114310, + sub_8114380, + sub_81143F0, + sub_811445C, + sub_81144EC, + sub_8114578, + sub_8114604, + sub_8114710, + sub_8114744, + sub_8114778, + sub_8114808, + sub_811488C, + sub_8114918, + sub_8114990, + sub_8114A1C, + sub_8114AA0, + sub_8114B0C, + sub_8114B78, + sub_8114BE4, + sub_8114C68, + sub_8114CC0, + sub_8114D4C, + sub_8114DE8, + sub_8114FF0, + sub_8115078, + sub_81151C0, + sub_8115280, + sub_8115410, + sub_81154DC, + sub_81155A4, + NULL, + sub_81156D8, + NULL, + sub_81157DC +}; + +#ifdef NONMATCHING +void sub_8113550(u16 a0, void * a1) +{ + void * r1; + + if (a0 == 35 && gUnknown_203B048 == 2) + { + sub_811381C(); + return; + } + sub_811381C(); + if (gUnknown_203ADFA == 2) + return; + + if (a0 < 3 || a0 > 26) + return; + + if (sub_81136D4() == TRUE) + return; + + if (sub_81138A0(a0, a1) == TRUE) + return; + + if (sub_80BF708() == TRUE) + return; + + // NONMATCHING: branch logic here + if (InUnionRoom() == TRUE) + return; + + if (sub_8113954(a0, a1) == TRUE) + return; + + if (sub_8113A44(a0, a1) == TRUE) + return; + + if (sub_81153E4(a0, a1) == FALSE) + return; + + if (gUnknown_3005E88 == 0) + { + if (sub_8113778(a0, a1) == TRUE) + return; + + if (a0 != 31 || gUnknown_203AE04 == NULL) + { + if (sub_81153A8(a0, a1) == FALSE) + return; + sub_8110AEC(a0); + } + } + else if (a0 == 40) + return; + + sub_8113B94(a0); + if (a0 == 31) + { + if (gUnknown_203AE04 == NULL) + { + gUnknown_203AE04 = gUnknown_203AE08; + r1 = gUnknown_8456948[a0](gUnknown_203AE04, a1); + } + else + { + gUnknown_8456948[a0](gUnknown_203AE04, a1); + return; + } + } + else + { + gUnknown_203AE04 = NULL; + r1 = gUnknown_8456948[a0](gUnknown_203AE08, a1); + } + + if (r1 == NULL) + { + r1 = sub_8113828(a0, a1); + if (r1 == NULL) + return; + } + + gUnknown_203AE08 = r1; + if (gUnknown_203B048 == 0) + return; + sub_811231C(); +} +#else +NAKED +void sub_8113550(u16 a0, void * a1) +{ + asm_unified("\tpush {r4,r5,lr}\n" + "\tadds r5, r1, 0\n" + "\tlsls r0, 16\n" + "\tlsrs r4, r0, 16\n" + "\tcmp r4, 0x23\n" + "\tbne _08113570\n" + "\tldr r0, _0811356C @ =gUnknown_203B048\n" + "\tldrb r0, [r0]\n" + "\tcmp r0, 0x2\n" + "\tbne _08113570\n" + "\tbl sub_811381C\n" + "\tb ._return\n" + "\t.align 2, 0\n" + "_0811356C: .4byte gUnknown_203B048\n" + "_08113570:\n" + "\tbl sub_811381C\n" + "\tldr r0, _0811362C @ =gUnknown_203ADFA\n" + "\tldrb r0, [r0]\n" + "\tcmp r0, 0x2\n" + "\tbne _0811357E\n" + "\tb ._return\n" + "_0811357E:\n" + "\tsubs r0, r4, 0x3\n" + "\tlsls r0, 16\n" + "\tlsrs r0, 16\n" + "\tcmp r0, 0x27\n" + "\tbls _0811358A\n" + "\tb ._return\n" + "_0811358A:\n" + "\tbl sub_81136D4\n" + "\tlsls r0, 24\n" + "\tlsrs r0, 24\n" + "\tcmp r0, 0x1\n" + "\tbne _08113598\n" + "\tb ._return\n" + "_08113598:\n" + "\tadds r0, r4, 0\n" + "\tadds r1, r5, 0\n" + "\tbl sub_81138A0\n" + "\tlsls r0, 24\n" + "\tlsrs r0, 24\n" + "\tcmp r0, 0x1\n" + "\tbne _081135AA\n" + "\tb ._return\n" + "_081135AA:\n" + "\tbl sub_80BF708\n" + "\tlsls r0, 24\n" + "\tlsrs r0, 24\n" + "\tcmp r0, 0x1\n" + "\tbne _081135B8\n" + "\tb ._return\n" + "_081135B8:\n" + "\tbl InUnionRoom\n" + "\tcmp r0, 0x1\n" + "\tbne _081135C2\n" + "\tb ._return\n" + "_081135C2:\n" + "\tadds r0, r4, 0\n" + "\tadds r1, r5, 0\n" + "\tbl sub_8113954\n" + "\tlsls r0, 24\n" + "\tlsrs r0, 24\n" + "\tcmp r0, 0x1\n" + "\tbeq ._return\n" + "\tadds r0, r4, 0\n" + "\tadds r1, r5, 0\n" + "\tbl sub_8113A44\n" + "\tlsls r0, 24\n" + "\tlsrs r0, 24\n" + "\tcmp r0, 0x1\n" + "\tbeq ._return\n" + "\tadds r0, r4, 0\n" + "\tadds r1, r5, 0\n" + "\tbl sub_81153E4\n" + "\tlsls r0, 24\n" + "\tcmp r0, 0\n" + "\tbeq ._return\n" + "\tldr r0, _08113630 @ =gUnknown_3005E88\n" + "\tldrb r0, [r0]\n" + "\tcmp r0, 0\n" + "\tbne _08113638\n" + "\tadds r0, r4, 0\n" + "\tadds r1, r5, 0\n" + "\tbl sub_8113778\n" + "\tlsls r0, 24\n" + "\tlsrs r0, 24\n" + "\tcmp r0, 0x1\n" + "\tbeq ._return\n" + "\tcmp r4, 0x1F\n" + "\tbne _08113614\n" + "\tldr r0, _08113634 @ =gUnknown_203AE04\n" + "\tldr r0, [r0]\n" + "\tcmp r0, 0\n" + "\tbne _0811363C\n" + "_08113614:\n" + "\tadds r0, r4, 0\n" + "\tadds r1, r5, 0\n" + "\tbl sub_81153A8\n" + "\tlsls r0, 24\n" + "\tcmp r0, 0\n" + "\tbeq ._return\n" + "\tadds r0, r4, 0\n" + "\tbl sub_8110AEC\n" + "\tb _0811363C\n" + "\t.align 2, 0\n" + "_0811362C: .4byte gUnknown_203ADFA\n" + "_08113630: .4byte gUnknown_3005E88\n" + "_08113634: .4byte gUnknown_203AE04\n" + "_08113638:\n" + "\tcmp r4, 0x28\n" + "\tbeq ._return\n" + "_0811363C:\n" + "\tadds r0, r4, 0\n" + "\tbl sub_8113B94\n" + "\tcmp r4, 0x1F\n" + "\tbne _0811367C\n" + "\tldr r2, _0811365C @ =gUnknown_203AE04\n" + "\tldr r1, [r2]\n" + "\tcmp r1, 0\n" + "\tbne _08113668\n" + "\tldr r0, _08113660 @ =gUnknown_203AE08\n" + "\tldr r0, [r0]\n" + "\tstr r0, [r2]\n" + "\tldr r1, _08113664 @ =gUnknown_8456948\n" + "\tldr r2, [r1, 0x7C]\n" + "\tb _0811368E\n" + "\t.align 2, 0\n" + "_0811365C: .4byte gUnknown_203AE04\n" + "_08113660: .4byte gUnknown_203AE08\n" + "_08113664: .4byte gUnknown_8456948\n" + "_08113668:\n" + "\tldr r0, _08113678 @ =gUnknown_8456948\n" + "\tldr r2, [r0, 0x7C]\n" + "\tadds r0, r1, 0\n" + "\tadds r1, r5, 0\n" + "\tbl _call_via_r2\n" + "\tb ._return\n" + "\t.align 2, 0\n" + "_08113678: .4byte gUnknown_8456948\n" + "_0811367C:\n" + "\tldr r1, _081136C4 @ =gUnknown_203AE04\n" + "\tmovs r0, 0\n" + "\tstr r0, [r1]\n" + "\tldr r0, _081136C8 @ =gUnknown_8456948\n" + "\tlsls r1, r4, 2\n" + "\tadds r1, r0\n" + "\tldr r0, _081136CC @ =gUnknown_203AE08\n" + "\tldr r0, [r0]\n" + "\tldr r2, [r1]\n" + "_0811368E:\n" + "\tadds r1, r5, 0\n" + "\tbl _call_via_r2\n" + "\tadds r1, r0, 0\n" + "\tcmp r1, 0\n" + "\tbne _081136AC\n" + "\tbl sub_811231C\n" + "\tadds r0, r4, 0\n" + "\tadds r1, r5, 0\n" + "\tbl sub_8113828\n" + "\tadds r1, r0, 0\n" + "\tcmp r1, 0\n" + "\tbeq ._return\n" + "_081136AC:\n" + "\tldr r0, _081136CC @ =gUnknown_203AE08\n" + "\tstr r1, [r0]\n" + "\tldr r0, _081136D0 @ =gUnknown_203B048\n" + "\tldrb r0, [r0]\n" + "\tcmp r0, 0\n" + "\tbeq ._return\n" + "\tbl sub_811231C\n" + "._return:\n" + "\tpop {r4,r5}\n" + "\tpop {r0}\n" + "\tbx r0\n" + "\t.align 2, 0\n" + "_081136C4: .4byte gUnknown_203AE04\n" + "_081136C8: .4byte gUnknown_8456948\n" + "_081136CC: .4byte gUnknown_203AE08\n" + "_081136D0: .4byte gUnknown_203B048"); +} +#endif // NONMATCHING -- cgit v1.2.3 From 8dcea40e585c6aa37a42aa570de9b37d78538756 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sat, 3 Nov 2018 13:36:42 -0400 Subject: sub_81136D4 --- asm/quest_log.s | 61 --------------------------------------------------------- src/quest_log.c | 17 ++++++++++++++++ 2 files changed, 17 insertions(+), 61 deletions(-) diff --git a/asm/quest_log.s b/asm/quest_log.s index 72cd3da6a..a256be271 100644 --- a/asm/quest_log.s +++ b/asm/quest_log.s @@ -5,67 +5,6 @@ .text - thumb_func_start sub_81136D4 -sub_81136D4: @ 81136D4 - push {lr} - ldr r0, _08113728 @ =gSaveBlock1Ptr - ldr r2, [r0] - movs r1, 0x4 - ldrsb r1, [r2, r1] - adds r3, r0, 0 - cmp r1, 0x2 - bne _081136F0 - ldrb r0, [r2, 0x5] - subs r0, 0x1 - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0xA - bls _08113724 -_081136F0: - ldr r2, [r3] - ldrh r1, [r2, 0x4] - ldr r0, _0811372C @ =0x0000090e - cmp r1, r0 - beq _08113724 - movs r0, 0x4 - ldrsb r0, [r2, r0] - cmp r0, 0x1F - bne _08113708 - ldrb r0, [r2, 0x5] - cmp r0, 0x1 - bls _08113724 -_08113708: - ldr r0, [r3] - ldrh r1, [r0, 0x4] - ldr r0, _08113730 @ =0x00002e01 - cmp r1, r0 - beq _08113724 - ldr r0, _08113734 @ =0x00003a01 - cmp r1, r0 - beq _08113724 - ldr r0, _08113738 @ =0x00000b02 - cmp r1, r0 - beq _08113724 - ldr r0, _0811373C @ =0x0000060a - cmp r1, r0 - bne _08113740 -_08113724: - movs r0, 0x1 - b _08113742 - .align 2, 0 -_08113728: .4byte gSaveBlock1Ptr -_0811372C: .4byte 0x0000090e -_08113730: .4byte 0x00002e01 -_08113734: .4byte 0x00003a01 -_08113738: .4byte 0x00000b02 -_0811373C: .4byte 0x0000060a -_08113740: - movs r0, 0 -_08113742: - pop {r1} - bx r1 - thumb_func_end sub_81136D4 - thumb_func_start sub_8113748 sub_8113748: @ 8113748 push {lr} diff --git a/src/quest_log.c b/src/quest_log.c index cfa353caa..50998b0eb 100644 --- a/src/quest_log.c +++ b/src/quest_log.c @@ -2909,3 +2909,20 @@ void sub_8113550(u16 a0, void * a1) "_081136D0: .4byte gUnknown_203B048"); } #endif // NONMATCHING + +bool8 sub_81136D4(void) +{ + if (gSaveBlock1Ptr->location.mapGroup == 2 && (gSaveBlock1Ptr->location.mapNum == 1 || gSaveBlock1Ptr->location.mapNum == 2 || gSaveBlock1Ptr->location.mapNum == 3 || gSaveBlock1Ptr->location.mapNum == 4 || gSaveBlock1Ptr->location.mapNum == 5 || gSaveBlock1Ptr->location.mapNum == 6 || gSaveBlock1Ptr->location.mapNum == 7 || gSaveBlock1Ptr->location.mapNum == 8 || gSaveBlock1Ptr->location.mapNum == 9 || gSaveBlock1Ptr->location.mapNum == 10 || gSaveBlock1Ptr->location.mapNum == 11)) + return TRUE; + + if (gSaveBlock1Ptr->location.mapGroup == 14 && gSaveBlock1Ptr->location.mapNum == 9) + return TRUE; + + if (gSaveBlock1Ptr->location.mapGroup == 31 && (gSaveBlock1Ptr->location.mapNum == 0 || gSaveBlock1Ptr->location.mapNum == 1)) + return TRUE; + + if ((gSaveBlock1Ptr->location.mapGroup == 1 && gSaveBlock1Ptr->location.mapNum == 46) || (gSaveBlock1Ptr->location.mapGroup == 1 && gSaveBlock1Ptr->location.mapNum == 58) || (gSaveBlock1Ptr->location.mapGroup == 2 && gSaveBlock1Ptr->location.mapNum == 11) || (gSaveBlock1Ptr->location.mapGroup == 10 && gSaveBlock1Ptr->location.mapNum == 6)) + return TRUE; + + return FALSE; +} -- cgit v1.2.3 From be7cda00a1f047fdf38ff88da9477e2c5dfc8cf4 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sat, 3 Nov 2018 16:21:34 -0400 Subject: through sub_81138F8 --- asm/quest_log.s | 249 -------------------------------------------------------- src/quest_log.c | 123 +++++++++++++++++++++++++--- 2 files changed, 111 insertions(+), 261 deletions(-) diff --git a/asm/quest_log.s b/asm/quest_log.s index a256be271..fe46a9da6 100644 --- a/asm/quest_log.s +++ b/asm/quest_log.s @@ -5,255 +5,6 @@ .text - thumb_func_start sub_8113748 -sub_8113748: @ 8113748 - push {lr} - bl sub_81136D4 - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x1 - bne _08113770 - ldr r0, _08113764 @ =gUnknown_203ADFA - ldrb r0, [r0] - cmp r0, 0x2 - bne _08113768 - movs r0, 0x1 - b _08113772 - .align 2, 0 -_08113764: .4byte gUnknown_203ADFA -_08113768: - cmp r0, 0x1 - bne _08113770 - bl sub_8112364 -_08113770: - movs r0, 0 -_08113772: - pop {r1} - bx r1 - thumb_func_end sub_8113748 - - thumb_func_start sub_8113778 -sub_8113778: @ 8113778 - push {r4,r5,lr} - adds r5, r1, 0 - lsls r0, 16 - lsrs r4, r0, 16 - cmp r4, 0x24 - beq _081137CE - cmp r4, 0xB - beq _081137CE - ldr r0, _081137D4 @ =0x0000082c - bl FlagGet - lsls r0, 24 - cmp r0, 0 - bne _081137AC - cmp r4, 0x3 - beq _081137CE - cmp r4, 0x1F - beq _081137CE - adds r0, r4, 0 - adds r1, r5, 0 - bl sub_81137E4 - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x1 - beq _081137CE -_081137AC: - ldr r0, _081137D8 @ =0x00000844 - bl FlagGet - lsls r0, 24 - cmp r0, 0 - bne _081137DC - subs r0, r4, 0x4 - lsls r0, 16 - lsrs r0, 16 - cmp r0, 0x6 - bls _081137CE - cmp r4, 0x16 - beq _081137CE - cmp r4, 0x19 - beq _081137CE - cmp r4, 0x1A - bne _081137DC -_081137CE: - movs r0, 0x1 - b _081137DE - .align 2, 0 -_081137D4: .4byte 0x0000082c -_081137D8: .4byte 0x00000844 -_081137DC: - movs r0, 0 -_081137DE: - pop {r4,r5} - pop {r1} - bx r1 - thumb_func_end sub_8113778 - - thumb_func_start sub_81137E4 -sub_81137E4: @ 81137E4 - push {lr} - lsls r0, 16 - lsrs r0, 16 - cmp r0, 0x22 - bne _08113814 - ldr r2, _08113810 @ =gTrainers - ldrh r1, [r1] - lsls r0, r1, 2 - adds r0, r1 - lsls r0, 3 - adds r0, r2 - ldrb r1, [r0, 0x1] - cmp r1, 0x51 - beq _08113814 - cmp r1, 0x59 - beq _08113814 - cmp r1, 0x5A - beq _08113814 - cmp r1, 0x53 - beq _08113814 - movs r0, 0x1 - b _08113816 - .align 2, 0 -_08113810: .4byte gTrainers -_08113814: - movs r0, 0 -_08113816: - pop {r1} - bx r1 - thumb_func_end sub_81137E4 - - thumb_func_start sub_811381C -sub_811381C: @ 811381C - ldr r1, _08113824 @ =gUnknown_203B048 - movs r0, 0 - strb r0, [r1] - bx lr - .align 2, 0 -_08113824: .4byte gUnknown_203B048 - thumb_func_end sub_811381C - - thumb_func_start sub_8113828 -sub_8113828: @ 8113828 - push {r4,r5,lr} - adds r5, r1, 0 - lsls r0, 16 - lsrs r4, r0, 16 - adds r0, r4, 0 - bl sub_8113778 - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x1 - beq _0811384C - adds r0, r4, 0 - adds r1, r5, 0 - bl sub_81153A8 - lsls r0, 24 - cmp r0, 0 - bne _08113850 -_0811384C: - movs r0, 0 - b _0811388C -_08113850: - adds r0, r4, 0 - bl sub_8110AEC - adds r0, r4, 0 - bl sub_8113B94 - cmp r4, 0x1F - bne _08113874 - ldr r2, _0811386C @ =gUnknown_203AE04 - ldr r1, _08113870 @ =gUnknown_203AE08 - ldr r0, [r1] - str r0, [r2] - adds r2, r1, 0 - b _0811387C - .align 2, 0 -_0811386C: .4byte gUnknown_203AE04 -_08113870: .4byte gUnknown_203AE08 -_08113874: - ldr r1, _08113894 @ =gUnknown_203AE04 - movs r0, 0 - str r0, [r1] - ldr r2, _08113898 @ =gUnknown_203AE08 -_0811387C: - ldr r0, _0811389C @ =gUnknown_8456948 - lsls r1, r4, 2 - adds r1, r0 - ldr r0, [r2] - ldr r2, [r1] - adds r1, r5, 0 - bl _call_via_r2 -_0811388C: - pop {r4,r5} - pop {r1} - bx r1 - .align 2, 0 -_08113894: .4byte gUnknown_203AE04 -_08113898: .4byte gUnknown_203AE08 -_0811389C: .4byte gUnknown_8456948 - thumb_func_end sub_8113828 - - thumb_func_start sub_81138A0 -sub_81138A0: @ 81138A0 - push {r4,r5,lr} - adds r5, r1, 0 - lsls r0, 16 - lsrs r0, 16 - adds r4, r0, 0 - subs r0, 0xC - lsls r0, 16 - lsrs r0, 16 - cmp r0, 0x7 - bls _081138B8 - movs r0, 0 - b _081138F0 -_081138B8: - bl sub_81138F8 - ldr r1, _081138E0 @ =gUnknown_203B024 - strh r4, [r1] - adds r0, r4, 0 - subs r0, 0x10 - lsls r0, 16 - lsrs r0, 16 - cmp r0, 0x1 - bls _081138EE - cmp r4, 0xC - beq _081138D4 - cmp r4, 0x12 - bne _081138E4 -_081138D4: - adds r0, r1, 0x4 - adds r1, r5, 0 - movs r2, 0xC - bl memcpy - b _081138EE - .align 2, 0 -_081138E0: .4byte gUnknown_203B024 -_081138E4: - adds r0, r1, 0x4 - adds r1, r5, 0 - movs r2, 0x18 - bl memcpy -_081138EE: - movs r0, 0x1 -_081138F0: - pop {r4,r5} - pop {r1} - bx r1 - thumb_func_end sub_81138A0 - - thumb_func_start sub_81138F8 -sub_81138F8: @ 81138F8 - push {lr} - ldr r0, _08113908 @ =gUnknown_203B024 - movs r1, 0 - movs r2, 0x20 - bl memset - pop {r0} - bx r0 - .align 2, 0 -_08113908: .4byte gUnknown_203B024 - thumb_func_end sub_81138F8 - thumb_func_start sub_811390C sub_811390C: @ 811390C push {r4,r5,lr} diff --git a/src/quest_log.c b/src/quest_log.c index 50998b0eb..9cdd17816 100644 --- a/src/quest_log.c +++ b/src/quest_log.c @@ -93,11 +93,13 @@ EWRAM_DATA u16 *gUnknown_203AE90 = NULL; EWRAM_DATA struct UnkStruct_203AE94 gUnknown_203AE94 = {0}; EWRAM_DATA struct UnkStruct_203AE98 gUnknown_203AE98[32] = {0}; EWRAM_DATA u16 gUnknown_203AF98 = 0; -EWRAM_DATA u8 gUnknown_203AF9A[64][2]; -EWRAM_DATA u16 gUnknown_203B01A; -EWRAM_DATA u16 gUnknown_203B01C; -EWRAM_DATA u16 gUnknown_203B01E; -EWRAM_DATA u8 gUnknown_203B020; +EWRAM_DATA u8 gUnknown_203AF9A[64][2] = {{0}}; +EWRAM_DATA u16 gUnknown_203B01A = 0; +EWRAM_DATA u16 gUnknown_203B01C = 0; +EWRAM_DATA u16 gUnknown_203B01E = 0; +EWRAM_DATA u8 gUnknown_203B020 = 0; + +EWRAM_DATA ALIGNED(2) u16 gUnknown_203B024[16] = {0}; EWRAM_DATA u16 gUnknown_203B044[2] = {0}; EWRAM_DATA u8 gUnknown_203B048 = 0; @@ -156,11 +158,12 @@ void sub_81134CC(struct Var4038Struct *); bool8 sub_8113508(struct Var4038Struct * ); void sub_8113524(struct Var4038Struct *); bool8 sub_81136D4(void); -bool8 sub_8113778(u16, void*); -void* sub_8113828(u16, void*); -bool8 sub_81138A0(u16, void*); -bool8 sub_8113954(u16, void*); -bool8 sub_8113A44(u16, void*); +bool8 sub_8113778(u16, u16 *); +bool8 sub_81137E4(u16, u16 *); +void * sub_8113828(u16, u16 *); +bool8 sub_81138A0(u16, u16 *); +bool8 sub_8113954(u16, u16 *); +bool8 sub_8113A44(u16, u16 *); void sub_8113B94(u16); void *sub_8113F14(void *, void *); void *sub_8113F80(void *, void *); @@ -2639,7 +2642,7 @@ void * (*const gUnknown_8456948[])(void *, void *) = { }; #ifdef NONMATCHING -void sub_8113550(u16 a0, void * a1) +void sub_8113550(u16 a0, u16 * a1) { void * r1; @@ -2726,7 +2729,7 @@ void sub_8113550(u16 a0, void * a1) } #else NAKED -void sub_8113550(u16 a0, void * a1) +void sub_8113550(u16 a0, u16 * a1) { asm_unified("\tpush {r4,r5,lr}\n" "\tadds r5, r1, 0\n" @@ -2926,3 +2929,99 @@ bool8 sub_81136D4(void) return FALSE; } + +bool8 sub_8113748(void) +{ + if (sub_81136D4() != TRUE) + return FALSE; + + if (gUnknown_203ADFA == 2) + return TRUE; + + if (gUnknown_203ADFA == 1) + sub_8112364(); + + return FALSE; +} + +bool8 sub_8113778(u16 a0, u16 * a1) +{ + if (a0 == 36 || a0 == 11) + return TRUE; + + if (!FlagGet(0x82C)) + { + if (a0 == 3 || a0 == 31 || sub_81137E4(a0, a1) == TRUE) + return TRUE; + } + + if (!FlagGet(0x844)) + { + if (a0 == 4 || a0 == 5 || a0 == 6 || a0 == 7 || a0 == 8 || a0 == 9 || a0 == 10 || a0 == 22 || a0 == 25 || a0 == 26) + return TRUE; + } + + return FALSE; +} + +bool8 sub_81137E4(u16 a0, u16 * a1) +{ + if (a0 == 34) + { + u8 trainerClass = gTrainers[*a1].trainerClass; + if ( trainerClass == 0x51 + || trainerClass == 0x59 + || trainerClass == 0x5A + || trainerClass == 0x53) + return FALSE; + return TRUE; + } + return FALSE; +} + +void sub_811381C(void) +{ + gUnknown_203B048 = 0; +} + +void * sub_8113828(u16 a0, u16 * a1) +{ + if (sub_8113778(a0, a1) == TRUE) + return NULL; + + if (sub_81153A8(a0, a1) == FALSE) + return NULL; + + sub_8110AEC(a0); + sub_8113B94(a0); + + if (a0 == 31) + gUnknown_203AE04 = gUnknown_203AE08; + else + gUnknown_203AE04 = NULL; + + return gUnknown_8456948[a0](gUnknown_203AE08, a1); +} + +bool8 sub_81138A0(u16 a0, u16 * a1) +{ + if (a0 < 12 || a0 > 19) + return FALSE; + + sub_81138F8(); + gUnknown_203B024[0] = a0; + + if (a0 < 16 || a0 > 17) + { + if (a0 == 12 || a0 == 18) + memcpy(gUnknown_203B024 + 2, a1, 12); + else + memcpy(gUnknown_203B024 + 2, a1, 24); + } + return TRUE; +} + +void sub_81138F8(void) +{ + memset(gUnknown_203B024, 0, sizeof(gUnknown_203B024)); +} -- cgit v1.2.3 From a68ed3ec1758533b73078da934e109d12c502691 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sat, 3 Nov 2018 18:24:00 -0400 Subject: through sub_81139BC --- asm/quest_log.s | 131 -------------------------------------------------------- src/quest_log.c | 70 ++++++++++++++++++++++++++---- sym_ewram.txt | 72 +------------------------------ 3 files changed, 62 insertions(+), 211 deletions(-) diff --git a/asm/quest_log.s b/asm/quest_log.s index fe46a9da6..c85a496bc 100644 --- a/asm/quest_log.s +++ b/asm/quest_log.s @@ -5,137 +5,6 @@ .text - thumb_func_start sub_811390C -sub_811390C: @ 811390C - push {r4,r5,lr} - ldr r5, _08113944 @ =gUnknown_203B024 - ldrh r0, [r5] - cmp r0, 0 - beq _0811393C - ldr r1, _08113948 @ =gUnknown_203B04A - movs r0, 0 - strb r0, [r1] - ldrh r0, [r5] - bl sub_8110AEC - ldr r0, _0811394C @ =gUnknown_8456948 - ldrh r2, [r5] - lsls r2, 2 - adds r2, r0 - ldr r4, _08113950 @ =gUnknown_203AE08 - ldr r0, [r4] - adds r1, r5, 0x4 - ldr r2, [r2] - bl _call_via_r2 - str r0, [r4] - bl sub_81138F8 -_0811393C: - pop {r4,r5} - pop {r0} - bx r0 - .align 2, 0 -_08113944: .4byte gUnknown_203B024 -_08113948: .4byte gUnknown_203B04A -_0811394C: .4byte gUnknown_8456948 -_08113950: .4byte gUnknown_203AE08 - thumb_func_end sub_811390C - - thumb_func_start sub_8113954 -sub_8113954: @ 8113954 - push {r4,r5,lr} - adds r5, r1, 0 - lsls r0, 16 - lsrs r4, r0, 16 - cmp r4, 0x22 - beq _08113970 - cmp r4, 0x1E - beq _08113970 - cmp r4, 0x20 - beq _08113970 - cmp r4, 0x21 - beq _08113970 - movs r0, 0 - b _081139A8 -_08113970: - bl sub_81138F8 - ldr r0, _081139B0 @ =gUnknown_3005E88 - ldrb r0, [r0] - cmp r0, 0 - bne _08113998 - ldr r0, _081139B4 @ =0x0000082c - bl FlagGet - lsls r0, 24 - cmp r0, 0 - bne _08113998 - adds r0, r4, 0 - adds r1, r5, 0 - bl sub_81137E4 - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x1 - beq _081139A6 -_08113998: - ldr r0, _081139B8 @ =gUnknown_203B024 - strh r4, [r0] - adds r0, 0x4 - adds r1, r5, 0 - movs r2, 0x8 - bl memcpy -_081139A6: - movs r0, 0x1 -_081139A8: - pop {r4,r5} - pop {r1} - bx r1 - .align 2, 0 -_081139B0: .4byte gUnknown_3005E88 -_081139B4: .4byte 0x0000082c -_081139B8: .4byte gUnknown_203B024 - thumb_func_end sub_8113954 - - thumb_func_start sub_81139BC -sub_81139BC: @ 81139BC - push {r4,r5,lr} - ldr r5, _08113A08 @ =gUnknown_203B024 - ldrh r0, [r5] - cmp r0, 0 - beq _08113A02 - ldr r0, _08113A0C @ =gUnknown_3005E88 - ldrb r1, [r0] - cmp r1, 0 - bne _081139D8 - ldr r0, _08113A10 @ =gUnknown_203B04A - strb r1, [r0] - ldrh r0, [r5] - bl sub_8110AEC -_081139D8: - ldrh r0, [r5] - bl sub_8113B94 - ldr r0, _08113A14 @ =gUnknown_8456948 - ldrh r2, [r5] - lsls r2, 2 - adds r2, r0 - ldr r4, _08113A18 @ =gUnknown_203AE08 - ldr r0, [r4] - adds r1, r5, 0x4 - ldr r2, [r2] - bl _call_via_r2 - str r0, [r4] - movs r0, 0x1 - bl sub_8113A1C - bl sub_81138F8 - bl sub_811231C -_08113A02: - pop {r4,r5} - pop {r0} - bx r0 - .align 2, 0 -_08113A08: .4byte gUnknown_203B024 -_08113A0C: .4byte gUnknown_3005E88 -_08113A10: .4byte gUnknown_203B04A -_08113A14: .4byte gUnknown_8456948 -_08113A18: .4byte gUnknown_203AE08 - thumb_func_end sub_81139BC - thumb_func_start sub_8113A1C sub_8113A1C: @ 8113A1C push {r4,lr} diff --git a/src/quest_log.c b/src/quest_log.c index 9cdd17816..98bb0b3b1 100644 --- a/src/quest_log.c +++ b/src/quest_log.c @@ -72,6 +72,12 @@ struct UnkStruct_300201C u16 unk_2; }; +struct UnkStruct_203B024 +{ + u16 unk_00; + u32 unk_04[7]; +}; + u8 gUnknown_3005E88; u16 gUnknown_3005E8C; struct UnkStruct_3005E90 gUnknown_3005E90; @@ -84,11 +90,11 @@ EWRAM_DATA u8 gUnknown_203ADF8 = 0; EWRAM_DATA u8 gUnknown_203ADF9 = 0; EWRAM_DATA u8 gUnknown_203ADFA = 0; EWRAM_DATA u16 gUnknown_203ADFC = 0; -EWRAM_DATA u8 gUnknown_203ADFE[3]; +EWRAM_DATA u8 gUnknown_203ADFE[3] = {0}; EWRAM_DATA void * gUnknown_203AE04 = NULL; EWRAM_DATA u16 * gUnknown_203AE08 = NULL; EWRAM_DATA void * gUnknown_203AE0C[32] = {NULL}; -EWRAM_DATA void (* gUnknown_203AE8C)(void) = 0; +EWRAM_DATA void (* gUnknown_203AE8C)(void) = NULL; EWRAM_DATA u16 *gUnknown_203AE90 = NULL; EWRAM_DATA struct UnkStruct_203AE94 gUnknown_203AE94 = {0}; EWRAM_DATA struct UnkStruct_203AE98 gUnknown_203AE98[32] = {0}; @@ -98,11 +104,12 @@ EWRAM_DATA u16 gUnknown_203B01A = 0; EWRAM_DATA u16 gUnknown_203B01C = 0; EWRAM_DATA u16 gUnknown_203B01E = 0; EWRAM_DATA u8 gUnknown_203B020 = 0; - -EWRAM_DATA ALIGNED(2) u16 gUnknown_203B024[16] = {0}; - +EWRAM_DATA struct UnkStruct_203B024 gUnknown_203B024 = {0}; EWRAM_DATA u16 gUnknown_203B044[2] = {0}; EWRAM_DATA u8 gUnknown_203B048 = 0; +EWRAM_DATA u8 gUnknown_203B049 = 0; +EWRAM_DATA u8 gUnknown_203B04A = 0; +EWRAM_DATA u8 gUnknown_203B04B = 0; void sub_8110A00(void); void sub_8110A3C(void); @@ -3009,19 +3016,64 @@ bool8 sub_81138A0(u16 a0, u16 * a1) return FALSE; sub_81138F8(); - gUnknown_203B024[0] = a0; + gUnknown_203B024.unk_00 = a0; if (a0 < 16 || a0 > 17) { if (a0 == 12 || a0 == 18) - memcpy(gUnknown_203B024 + 2, a1, 12); + memcpy(gUnknown_203B024.unk_04, a1, 12); else - memcpy(gUnknown_203B024 + 2, a1, 24); + memcpy(gUnknown_203B024.unk_04, a1, 24); } return TRUE; } void sub_81138F8(void) { - memset(gUnknown_203B024, 0, sizeof(gUnknown_203B024)); + gUnknown_203B024 = (struct UnkStruct_203B024){}; +} + +void sub_811390C(void) +{ + if (gUnknown_203B024.unk_00 != 0) + { + void * resp; + gUnknown_203B04A = 0; + sub_8110AEC(gUnknown_203B024.unk_00); + resp = gUnknown_8456948[gUnknown_203B024.unk_00](gUnknown_203AE08, gUnknown_203B024.unk_04); + gUnknown_203AE08 = resp; + sub_81138F8(); + } +} + +bool8 sub_8113954(u16 a0, u16 * a1) +{ + if (a0 != 34 && a0 != 30 && a0 != 32 && a0 != 33) + return FALSE; + sub_81138F8(); + if (gUnknown_3005E88 || FlagGet(0x82C) || sub_81137E4(a0, a1) != TRUE) + { + gUnknown_203B024.unk_00 = a0; + memcpy(gUnknown_203B024.unk_04, a1, 8); + } + return TRUE; +} + +void sub_81139BC(void) +{ + if (gUnknown_203B024.unk_00 != 0) + { + void * resp; + if (gUnknown_3005E88 == 0) + { + gUnknown_203B04A = 0; + sub_8110AEC(gUnknown_203B024.unk_00); + } + sub_8113B94(gUnknown_203B024.unk_00); + resp = gUnknown_8456948[gUnknown_203B024.unk_00](gUnknown_203AE08, gUnknown_203B024.unk_04); + gUnknown_203AE08 = resp; + sub_8113A1C(1); + sub_81138F8(); + sub_811231C(); + } } diff --git a/sym_ewram.txt b/sym_ewram.txt index 7aa860fdd..2e0123d6f 100644 --- a/sym_ewram.txt +++ b/sym_ewram.txt @@ -1457,77 +1457,7 @@ gUnknown_203ADF3: @ 203ADF3 gUnknown_203ADF4: @ 203ADF4 .space 0x4 -gUnknown_203ADF8: @ 203ADF8 - .space 0x1 - -gUnknown_203ADF9: @ 203ADF9 - .space 0x1 - -gUnknown_203ADFA: @ 203ADFA - .space 0x2 - -gUnknown_203ADFC: @ 203ADFC - .space 0x2 - -gUnknown_203ADFE: @ 203ADFE - .space 0x6 - -gUnknown_203AE04: @ 203AE04 - .space 0x4 - -gUnknown_203AE08: @ 203AE08 - .space 0x4 - -gUnknown_203AE0C: @ 203AE0C - .space 0x80 - -gUnknown_203AE8C: @ 203AE8C - .space 0x4 - -gUnknown_203AE90: @ 203AE90 - .space 0x4 - -gUnknown_203AE94: @ 203AE94 - .space 0x4 - -gUnknown_203AE98: @ 203AE98 - .space 0x100 - -gUnknown_203AF98: @ 203AF98 - .space 0x2 - -gUnknown_203AF9A: @ 203AF9A - .space 0x80 - -gUnknown_203B01A: @ 203B01A - .space 0x2 - -gUnknown_203B01C: @ 203B01C - .space 0x2 - -gUnknown_203B01E: @ 203B01E - .space 0x2 - -gUnknown_203B020: @ 203B020 - .space 0x4 - -gUnknown_203B024: @ 203B024 - .space 0x20 - -gUnknown_203B044: @ 203B044 - .space 0x4 - -gUnknown_203B048: @ 203B048 - .space 0x1 - -gUnknown_203B049: @ 203B049 - .space 0x1 - -gUnknown_203B04A: @ 203B04A - .space 0x1 - -gUnknown_203B04B: @ 203B04B - .space 0x1 + .include "src/quest_log.o" gUnknown_203B04C: @ 203B04C .space 0xC -- cgit v1.2.3 From f3231493dbb90dbcb5d5653d0a873b38b1a6f2d4 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sat, 3 Nov 2018 19:28:55 -0400 Subject: through sub_8113A78 --- asm/quest_log.s | 92 -------------------------- data/quest_log.s | 6 -- src/quest_log.c | 196 ++++++++++++++++++++++++++++++++++++++++++++++++++----- 3 files changed, 180 insertions(+), 114 deletions(-) diff --git a/asm/quest_log.s b/asm/quest_log.s index c85a496bc..d273125dc 100644 --- a/asm/quest_log.s +++ b/asm/quest_log.s @@ -5,98 +5,6 @@ .text - thumb_func_start sub_8113A1C -sub_8113A1C: @ 8113A1C - push {r4,lr} - adds r1, r0, 0 - lsls r1, 16 - lsrs r1, 16 - ldr r4, _08113A3C @ =gUnknown_203AE08 - ldr r0, [r4] - bl sub_8113C5C - str r0, [r4] - ldr r1, _08113A40 @ =gUnknown_203AF98 - ldrh r0, [r1] - adds r0, 0x1 - strh r0, [r1] - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_08113A3C: .4byte gUnknown_203AE08 -_08113A40: .4byte gUnknown_203AF98 - thumb_func_end sub_8113A1C - - thumb_func_start sub_8113A44 -sub_8113A44: @ 8113A44 - push {r4,lr} - adds r4, r1, 0 - lsls r0, 16 - lsrs r0, 16 - cmp r0, 0x1F - bne _08113A6C - ldrh r0, [r4] - bl sub_8114FBC - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x1 - beq _08113A70 - ldrh r0, [r4, 0x2] - bl sub_8114FBC - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x1 - beq _08113A70 -_08113A6C: - movs r0, 0 - b _08113A72 -_08113A70: - movs r0, 0x1 -_08113A72: - pop {r4} - pop {r1} - bx r1 - thumb_func_end sub_8113A44 - - thumb_func_start sub_8113A78 -sub_8113A78: @ 8113A78 - push {r4,r5,lr} - adds r3, r0, 0 - adds r5, r1, 0 - ldrh r1, [r3] - ldr r0, _08113AAC @ =0x00000fff - ands r0, r1 - adds r2, r0, 0 - lsrs r4, r1, 12 - cmp r2, 0x21 - bne _08113A8E - movs r4, 0 -_08113A8E: - subs r0, r2, 0x3 - lsls r0, 16 - lsrs r0, 16 - cmp r0, 0x27 - bhi _08113AB4 - str r3, [r5] - ldr r0, _08113AB0 @ =gUnknown_8456AA0 - adds r0, r2, r0 - ldrb r0, [r0] - subs r1, r0, 0x4 - muls r1, r4 - adds r0, r1 - adds r0, r3, r0 - b _08113AB6 - .align 2, 0 -_08113AAC: .4byte 0x00000fff -_08113AB0: .4byte gUnknown_8456AA0 -_08113AB4: - movs r0, 0 -_08113AB6: - pop {r4,r5} - pop {r1} - bx r1 - thumb_func_end sub_8113A78 - thumb_func_start sub_8113ABC sub_8113ABC: @ 8113ABC push {lr} diff --git a/data/quest_log.s b/data/quest_log.s index 6a0f5449d..f8d02c32a 100644 --- a/data/quest_log.s +++ b/data/quest_log.s @@ -1,12 +1,6 @@ .section .rodata .align 2 -gUnknown_84569F4:: @ 84569F4 - .incbin "baserom.gba", 0x4569F4, 0xAC - -gUnknown_8456AA0:: @ 8456AA0 - .incbin "baserom.gba", 0x456AA0, 0x2C - gUnknown_8456ACC:: @ 8456ACC .incbin "baserom.gba", 0x456ACC, 0xC diff --git a/src/quest_log.c b/src/quest_log.c index 98bb0b3b1..58006d9ca 100644 --- a/src/quest_log.c +++ b/src/quest_log.c @@ -170,64 +170,104 @@ bool8 sub_81137E4(u16, u16 *); void * sub_8113828(u16, u16 *); bool8 sub_81138A0(u16, u16 *); bool8 sub_8113954(u16, u16 *); +void sub_8113A1C(u16); +void sub_811381C(void); +void sub_81138F8(void); bool8 sub_8113A44(u16, u16 *); +void * sub_8113A78(u16 *, void **); +void sub_8113ABC(void *); +bool8 sub_8113AE8(void *); +bool8 sub_8113B44(void *); +void sub_8113B88(void); void sub_8113B94(u16); +void sub_8113BD8(void); +void * sub_8113BF4(void *); +void * sub_8113C20(void *, struct UnkStruct_203AE98 *); +void *sub_8113C5C(void *, u16); +void * sub_8113C8C(void *, struct UnkStruct_203AE98 *); +void * sub_8113CC8(void *, struct UnkStruct_203AE98 *); +void * sub_8113D08(void *, struct UnkStruct_203AE98 *); +void * sub_8113D48(void *, struct UnkStruct_203AE98 *); +void * sub_8113D94(void *, struct UnkStruct_203AE98 *); void *sub_8113F14(void *, void *); +u16 *sub_8113F3C(u16 *); void *sub_8113F80(void *, void *); +u16 *sub_8113FBC(u16 *); void *sub_8114174(void *, void *); +u16 *sub_8114188(u16 *); void *sub_81141D0(void *, void *); +u16 *sub_81141E4(u16 *); void *sub_811422C(void *, void *); +u16 *sub_8114240(u16 *); void *sub_8114288(void *, void *); +u16 *sub_811429C(u16 *); void *sub_8114310(void *, void *); +u16 *sub_8114324(u16 *); void *sub_8114380(void *, void *); +u16 *sub_8114394(u16 *); void *sub_81143F0(void *, void *); +u16 *sub_811443C(u16 *); void *sub_811445C(void *, void *); +u16 *sub_811448C(u16 *); void *sub_81144EC(void *, void *); +u16 *sub_8114518(u16 *); void *sub_8114578(void *, void *); +u16 *sub_81145A4(u16 *); void *sub_8114604(void *, void *); +u16 *sub_811464C(u16 *); void *sub_8114710(void *, void *); +u16 *sub_8114724(u16 *); void *sub_8114744(void *, void *); +u16 *sub_8114758(u16 *); void *sub_8114778(void *, void *); +u16 *sub_81147A8(u16 *); void *sub_8114808(void *, void *); +u16 *sub_8114834(u16 *); void *sub_811488C(void *, void *); +u16 *sub_81148BC(u16 *); void *sub_8114918(void *, void *); +u16 *sub_8114944(u16 *); void *sub_8114990(void *, void *); +u16 *sub_81149D0(u16 *); void *sub_8114A1C(void *, void *); +u16 *sub_8114A4C(u16 *); void *sub_8114AA0(void *, void *); +u16 *sub_8114AC8(u16 *); void *sub_8114B0C(void *, void *); +u16 *sub_8114B34(u16 *); void *sub_8114B78(void *, void *); +u16 *sub_8114BA0(u16 *); void *sub_8114BE4(void *, void *); +u16 *sub_8114C0C(u16 *); void *sub_8114C68(void *, void *); +u16 *sub_8114C8C(u16 *); void *sub_8114CC0(void *, void *); +u16 *sub_8114CE4(u16 *); void *sub_8114D4C(void *, void *); +u16 *sub_8114D68(u16 *); void *sub_8114DE8(void *, void *); +u16 *sub_8114E68(u16 *); +bool8 sub_8114FBC(u16); void *sub_8114FF0(void *, void *); +u16 *sub_811500C(u16 *); void *sub_8115078(void *, void *); +u16 *sub_81150CC(u16 *); void *sub_81151C0(void *, void *); +u16 *sub_81151DC(u16 *); void *sub_8115280(void *, void *); +u16 *sub_81152BC(u16 *); void *sub_8115410(void *, void *); +u16 *sub_8115460(u16 *); void *sub_81154DC(void *, void *); +u16 *sub_8115518(u16 *); void *sub_81155A4(void *, void *); +u16 *sub_81155E0(u16 *); void *sub_81156D8(void *, void *); +u16 *sub_8115700(u16 *); void *sub_81157DC(void *, void *); +u16 *sub_8115800(u16 *); bool8 sub_81153A8(u16, void*); bool8 sub_81153E4(u16, void*); -void sub_8113A1C(u8); -void sub_811381C(void); -void sub_81138F8(void); -void * sub_8113A78(void *, void **); -void sub_8113ABC(void *); -bool8 sub_8113AE8(void *); -bool8 sub_8113B44(void *); -void sub_8113B88(void); -void sub_8113BD8(void); -void * sub_8113BF4(void *); -void * sub_8113C20(void *, struct UnkStruct_203AE98 *); -void * sub_8113C8C(void *, struct UnkStruct_203AE98 *); -void * sub_8113CC8(void *, struct UnkStruct_203AE98 *); -void * sub_8113D08(void *, struct UnkStruct_203AE98 *); -void * sub_8113D48(void *, struct UnkStruct_203AE98 *); -void * sub_8113D94(void *, struct UnkStruct_203AE98 *); extern const u8 gUnknown_841A155[]; extern const u8 gUnknown_841B073[]; @@ -3077,3 +3117,127 @@ void sub_81139BC(void) sub_811231C(); } } + +void sub_8113A1C(u16 a0) +{ + gUnknown_203AE08 = sub_8113C5C(gUnknown_203AE08, a0); + gUnknown_203AF98++; +} + +bool8 sub_8113A44(u16 a0, u16 *a1) +{ + if (a0 != 31) + return FALSE; + + if (sub_8114FBC(a1[0]) == TRUE) + return TRUE; + + if (sub_8114FBC(a1[1]) == TRUE) + return TRUE; + + return FALSE; +} + +u16 * (*const gUnknown_84569F4[])(u16 *) = { + NULL, + NULL, + NULL, + sub_8113F3C, + sub_8113FBC, + sub_8114188, + sub_81141E4, + sub_8114240, + sub_811429C, + sub_8114324, + sub_8114394, + sub_811443C, + sub_811448C, + sub_8114518, + sub_81145A4, + sub_811464C, + sub_8114724, + sub_8114758, + sub_81147A8, + sub_8114834, + sub_81148BC, + sub_8114944, + sub_81149D0, + sub_8114A4C, + sub_8114AC8, + sub_8114B34, + sub_8114BA0, + sub_8114C0C, + sub_8114C8C, + sub_8114CE4, + sub_8114D68, + sub_8114E68, + sub_811500C, + sub_81150CC, + sub_81151DC, + sub_81152BC, + sub_8115460, + sub_8115518, + sub_81155E0, + NULL, + sub_8115700, + NULL, + sub_8115800 +}; + +const u8 gUnknown_8456AA0[] = { + 0x08, + 0x08, + 0x08, + 0x08, + 0x0a, + 0x08, + 0x08, + 0x08, + 0x08, + 0x0a, + 0x0a, + 0x04, + 0x10, + 0x0c, + 0x0c, + 0x1a, + 0x04, + 0x04, + 0x10, + 0x0c, + 0x0a, + 0x0a, + 0x0a, + 0x08, + 0x08, + 0x08, + 0x08, + 0x06, + 0x06, + 0x06, + 0x0c, + 0x0c, + 0x0c, + 0x0a, + 0x0c, + 0x06, + 0x08, + 0x0e, + 0x0e, + 0x02, + 0x08, + 0x04, + 0x06 +}; + +void * sub_8113A78(u16 *a0, void **a1) +{ + u16 r2 = *a0 & 0xfff; + u16 r4 = *a0 >> 12; + if (r2 == 33) + r4 = 0; + if (r2 < 3 || r2 > 42) + return NULL; + *a1 = a0; + return gUnknown_8456AA0[r2] + (gUnknown_8456AA0[r2] - 4) * r4 + (void *)a0; +} -- cgit v1.2.3 From 7344d64b15d5389dcf1eafcbce7ac93f087df98f Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Mon, 5 Nov 2018 13:46:45 -0500 Subject: Add missing data/graphics/unknown_84566a8.bin --- data/graphics/unknown_84566a8.bin | Bin 0 -> 640 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 data/graphics/unknown_84566a8.bin diff --git a/data/graphics/unknown_84566a8.bin b/data/graphics/unknown_84566a8.bin new file mode 100644 index 000000000..2fc4a648a Binary files /dev/null and b/data/graphics/unknown_84566a8.bin differ -- cgit v1.2.3 From 5819c8a97e7a24e8c86afda2f0bcf659d6fc4893 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Mon, 5 Nov 2018 17:45:21 -0500 Subject: sub_8113ABC --- asm/quest_log.s | 27 --------------------------- include/global.h | 21 ++++++++++++++++++++- src/quest_log.c | 57 +++++++++++++++++++++++++++++--------------------------- 3 files changed, 50 insertions(+), 55 deletions(-) diff --git a/asm/quest_log.s b/asm/quest_log.s index d273125dc..29b5a4e33 100644 --- a/asm/quest_log.s +++ b/asm/quest_log.s @@ -5,33 +5,6 @@ .text - thumb_func_start sub_8113ABC -sub_8113ABC: @ 8113ABC - push {lr} - adds r2, r0, 0x4 - ldrh r1, [r0] - ldr r0, _08113AD0 @ =0x00000fff - ands r0, r1 - cmp r0, 0x23 - beq _08113AD8 - ldr r1, _08113AD4 @ =gUnknown_203B04A - movs r0, 0 - b _08113ADE - .align 2, 0 -_08113AD0: .4byte 0x00000fff -_08113AD4: .4byte gUnknown_203B04A -_08113AD8: - ldr r1, _08113AE4 @ =gUnknown_203B04A - ldrb r0, [r2, 0x1] - adds r0, 0x1 -_08113ADE: - strb r0, [r1] - pop {r0} - bx r0 - .align 2, 0 -_08113AE4: .4byte gUnknown_203B04A - thumb_func_end sub_8113ABC - thumb_func_start sub_8113AE8 sub_8113AE8: @ 8113AE8 push {r4,lr} diff --git a/include/global.h b/include/global.h index b1604e1d6..50d979cba 100644 --- a/include/global.h +++ b/include/global.h @@ -503,6 +503,25 @@ struct QuestLogNPCData u32 movementType:8; }; +struct UnkStruct_203B024_Sub1 +{ + u8 unk_00; + u8 unk_01; + u8 filler_02[26]; +}; + +union UnkUnion_203B024 +{ + struct UnkStruct_203B024_Sub1 type1; + u8 filler[28]; +}; + +struct UnkStruct_203B024 +{ + u16 unk_00; + union UnkUnion_203B024 unk_04; +}; + struct QuestLog { /*0x0000*/ u8 unk_000; @@ -515,7 +534,7 @@ struct QuestLog /*0x0148*/ u8 unk_148[0x120]; /*0x02c8*/ u8 unk_268[0x200]; /*0x0468*/ struct QuestLogNPCData npcData[64]; - /*0x0568*/ u16 unk_568[0x80]; + /*0x0568*/ struct UnkStruct_203B024 unk_568[8]; /*0x0668*/ u16 end[0]; }; diff --git a/src/quest_log.c b/src/quest_log.c index 58006d9ca..393eed73f 100644 --- a/src/quest_log.c +++ b/src/quest_log.c @@ -72,12 +72,6 @@ struct UnkStruct_300201C u16 unk_2; }; -struct UnkStruct_203B024 -{ - u16 unk_00; - u32 unk_04[7]; -}; - u8 gUnknown_3005E88; u16 gUnknown_3005E8C; struct UnkStruct_3005E90 gUnknown_3005E90; @@ -92,8 +86,8 @@ EWRAM_DATA u8 gUnknown_203ADFA = 0; EWRAM_DATA u16 gUnknown_203ADFC = 0; EWRAM_DATA u8 gUnknown_203ADFE[3] = {0}; EWRAM_DATA void * gUnknown_203AE04 = NULL; -EWRAM_DATA u16 * gUnknown_203AE08 = NULL; -EWRAM_DATA void * gUnknown_203AE0C[32] = {NULL}; +EWRAM_DATA struct UnkStruct_203B024 * gUnknown_203AE08 = NULL; +EWRAM_DATA struct UnkStruct_203B024 * gUnknown_203AE0C[32] = {NULL}; EWRAM_DATA void (* gUnknown_203AE8C)(void) = NULL; EWRAM_DATA u16 *gUnknown_203AE90 = NULL; EWRAM_DATA struct UnkStruct_203AE94 gUnknown_203AE94 = {0}; @@ -174,21 +168,21 @@ void sub_8113A1C(u16); void sub_811381C(void); void sub_81138F8(void); bool8 sub_8113A44(u16, u16 *); -void * sub_8113A78(u16 *, void **); -void sub_8113ABC(void *); +void * sub_8113A78(struct UnkStruct_203B024 *, struct UnkStruct_203B024 **); +void sub_8113ABC(struct UnkStruct_203B024 *); bool8 sub_8113AE8(void *); bool8 sub_8113B44(void *); void sub_8113B88(void); void sub_8113B94(u16); void sub_8113BD8(void); -void * sub_8113BF4(void *); +struct UnkStruct_203B024 * sub_8113BF4(struct UnkStruct_203B024 *); void * sub_8113C20(void *, struct UnkStruct_203AE98 *); void *sub_8113C5C(void *, u16); -void * sub_8113C8C(void *, struct UnkStruct_203AE98 *); -void * sub_8113CC8(void *, struct UnkStruct_203AE98 *); -void * sub_8113D08(void *, struct UnkStruct_203AE98 *); -void * sub_8113D48(void *, struct UnkStruct_203AE98 *); -void * sub_8113D94(void *, struct UnkStruct_203AE98 *); +struct UnkStruct_203B024 * sub_8113C8C(void *, struct UnkStruct_203AE98 *); +struct UnkStruct_203B024 * sub_8113CC8(void *, struct UnkStruct_203AE98 *); +struct UnkStruct_203B024 * sub_8113D08(void *, struct UnkStruct_203AE98 *); +struct UnkStruct_203B024 * sub_8113D48(void *, struct UnkStruct_203AE98 *); +struct UnkStruct_203B024 * sub_8113D94(void *, struct UnkStruct_203AE98 *); void *sub_8113F14(void *, void *); u16 *sub_8113F3C(u16 *); void *sub_8113F80(void *, void *); @@ -298,7 +292,7 @@ void sub_8110840(void * oldPointer) int r3; for (r3 = 0; r3 < 0x20; r3++) if (gUnknown_203AE0C[r3]) - gUnknown_203AE0C[r3] += offset; + gUnknown_203AE0C[r3] = (void *)gUnknown_203AE0C[r3] + offset; } } } @@ -1032,7 +1026,7 @@ void sub_8111708(void) void sub_811175C(u8 a0, struct UnkStruct_203AE98 * a1) { u16 i; - u16 *r4; + struct UnkStruct_203B024 *r4; u16 r6 = 0; u16 r9 = 0; @@ -1045,7 +1039,7 @@ void sub_811175C(u8 a0, struct UnkStruct_203AE98 * a1) r4 = gSaveBlock1Ptr->questLog[a0].unk_568; for (i = 0; i < 32; i++) { - switch (*r4 & 0xFFF) + switch (r4->unk_00 & 0xFFF) { case 0: r4 = sub_8113D08(r4, &a1[r6]); @@ -3061,9 +3055,9 @@ bool8 sub_81138A0(u16 a0, u16 * a1) if (a0 < 16 || a0 > 17) { if (a0 == 12 || a0 == 18) - memcpy(gUnknown_203B024.unk_04, a1, 12); + memcpy(&gUnknown_203B024.unk_04, a1, 12); else - memcpy(gUnknown_203B024.unk_04, a1, 24); + memcpy(&gUnknown_203B024.unk_04, a1, 24); } return TRUE; } @@ -3080,7 +3074,7 @@ void sub_811390C(void) void * resp; gUnknown_203B04A = 0; sub_8110AEC(gUnknown_203B024.unk_00); - resp = gUnknown_8456948[gUnknown_203B024.unk_00](gUnknown_203AE08, gUnknown_203B024.unk_04); + resp = gUnknown_8456948[gUnknown_203B024.unk_00](gUnknown_203AE08, &gUnknown_203B024.unk_04); gUnknown_203AE08 = resp; sub_81138F8(); } @@ -3094,7 +3088,7 @@ bool8 sub_8113954(u16 a0, u16 * a1) if (gUnknown_3005E88 || FlagGet(0x82C) || sub_81137E4(a0, a1) != TRUE) { gUnknown_203B024.unk_00 = a0; - memcpy(gUnknown_203B024.unk_04, a1, 8); + memcpy(&gUnknown_203B024.unk_04, a1, 8); } return TRUE; } @@ -3110,7 +3104,7 @@ void sub_81139BC(void) sub_8110AEC(gUnknown_203B024.unk_00); } sub_8113B94(gUnknown_203B024.unk_00); - resp = gUnknown_8456948[gUnknown_203B024.unk_00](gUnknown_203AE08, gUnknown_203B024.unk_04); + resp = gUnknown_8456948[gUnknown_203B024.unk_00](gUnknown_203AE08, &gUnknown_203B024.unk_04); gUnknown_203AE08 = resp; sub_8113A1C(1); sub_81138F8(); @@ -3230,10 +3224,10 @@ const u8 gUnknown_8456AA0[] = { 0x06 }; -void * sub_8113A78(u16 *a0, void **a1) +void * sub_8113A78(struct UnkStruct_203B024 *a0, struct UnkStruct_203B024 **a1) { - u16 r2 = *a0 & 0xfff; - u16 r4 = *a0 >> 12; + u16 r2 = a0->unk_00 & 0xfff; + u16 r4 = a0->unk_00 >> 12; if (r2 == 33) r4 = 0; if (r2 < 3 || r2 > 42) @@ -3241,3 +3235,12 @@ void * sub_8113A78(u16 *a0, void **a1) *a1 = a0; return gUnknown_8456AA0[r2] + (gUnknown_8456AA0[r2] - 4) * r4 + (void *)a0; } + +void sub_8113ABC(struct UnkStruct_203B024 * a0) +{ + struct UnkStruct_203B024_Sub1 * r2 = &a0->unk_04.type1; + if ((a0->unk_00 & 0xFFF) != 35) + gUnknown_203B04A = 0; + else + gUnknown_203B04A = r2->unk_01 + 1; +} -- cgit v1.2.3 From ed3cc83264cf25acb4889508ffc6b878b1e1d095 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Mon, 5 Nov 2018 22:19:53 -0500 Subject: nonmatching sub_8113AE8 --- asm/quest_log.s | 50 ------------------ include/global.h | 1 + src/quest_log.c | 157 ++++++++++++++++++++++++++++++++++++++++--------------- 3 files changed, 116 insertions(+), 92 deletions(-) diff --git a/asm/quest_log.s b/asm/quest_log.s index 29b5a4e33..cf93da04f 100644 --- a/asm/quest_log.s +++ b/asm/quest_log.s @@ -5,56 +5,6 @@ .text - thumb_func_start sub_8113AE8 -sub_8113AE8: @ 8113AE8 - push {r4,lr} - adds r4, r0, 0 - cmp r0, 0 - beq _08113AFA - ldr r1, _08113B00 @ =gUnknown_203AF98 - ldrh r0, [r0, 0x2] - ldrh r1, [r1] - cmp r0, r1 - bls _08113B04 -_08113AFA: - movs r0, 0 - b _08113B32 - .align 2, 0 -_08113B00: .4byte gUnknown_203AF98 -_08113B04: - ldr r2, _08113B38 @ =gUnknown_84569F4 - ldrh r1, [r4] - ldr r0, _08113B3C @ =0x00000fff - ands r0, r1 - lsls r0, 2 - adds r0, r2 - ldr r1, [r0] - adds r0, r4, 0 - bl _call_via_r1 - ldr r2, _08113B40 @ =gUnknown_203B044 - ldrh r1, [r4] - strb r1, [r2] - movs r0, 0xF0 - lsls r0, 8 - ands r0, r1 - lsrs r0, 12 - strb r0, [r2, 0x1] - cmp r0, 0 - beq _08113B30 - movs r0, 0x1 - strh r0, [r2, 0x2] -_08113B30: - movs r0, 0x1 -_08113B32: - pop {r4} - pop {r1} - bx r1 - .align 2, 0 -_08113B38: .4byte gUnknown_84569F4 -_08113B3C: .4byte 0x00000fff -_08113B40: .4byte gUnknown_203B044 - thumb_func_end sub_8113AE8 - thumb_func_start sub_8113B44 sub_8113B44: @ 8113B44 push {r4,lr} diff --git a/include/global.h b/include/global.h index 50d979cba..6a178feb6 100644 --- a/include/global.h +++ b/include/global.h @@ -519,6 +519,7 @@ union UnkUnion_203B024 struct UnkStruct_203B024 { u16 unk_00; + u16 unk_02; union UnkUnion_203B024 unk_04; }; diff --git a/src/quest_log.c b/src/quest_log.c index 393eed73f..e69f012d7 100644 --- a/src/quest_log.c +++ b/src/quest_log.c @@ -72,6 +72,13 @@ struct UnkStruct_300201C u16 unk_2; }; +struct UnkStruct_203B044 +{ + u8 unk_0; + u8 unk_1; + u16 unk_2; +}; + u8 gUnknown_3005E88; u16 gUnknown_3005E8C; struct UnkStruct_3005E90 gUnknown_3005E90; @@ -99,7 +106,7 @@ EWRAM_DATA u16 gUnknown_203B01C = 0; EWRAM_DATA u16 gUnknown_203B01E = 0; EWRAM_DATA u8 gUnknown_203B020 = 0; EWRAM_DATA struct UnkStruct_203B024 gUnknown_203B024 = {0}; -EWRAM_DATA u16 gUnknown_203B044[2] = {0}; +EWRAM_DATA struct UnkStruct_203B044 gUnknown_203B044 = {0}; EWRAM_DATA u8 gUnknown_203B048 = 0; EWRAM_DATA u8 gUnknown_203B049 = 0; EWRAM_DATA u8 gUnknown_203B04A = 0; @@ -170,7 +177,7 @@ void sub_81138F8(void); bool8 sub_8113A44(u16, u16 *); void * sub_8113A78(struct UnkStruct_203B024 *, struct UnkStruct_203B024 **); void sub_8113ABC(struct UnkStruct_203B024 *); -bool8 sub_8113AE8(void *); +bool8 sub_8113AE8(struct UnkStruct_203B024 *); bool8 sub_8113B44(void *); void sub_8113B88(void); void sub_8113B94(u16); @@ -184,82 +191,82 @@ struct UnkStruct_203B024 * sub_8113D08(void *, struct UnkStruct_203AE98 *); struct UnkStruct_203B024 * sub_8113D48(void *, struct UnkStruct_203AE98 *); struct UnkStruct_203B024 * sub_8113D94(void *, struct UnkStruct_203AE98 *); void *sub_8113F14(void *, void *); -u16 *sub_8113F3C(u16 *); +struct UnkStruct_203B024 *sub_8113F3C(struct UnkStruct_203B024 *); void *sub_8113F80(void *, void *); -u16 *sub_8113FBC(u16 *); +struct UnkStruct_203B024 *sub_8113FBC(struct UnkStruct_203B024 *); void *sub_8114174(void *, void *); -u16 *sub_8114188(u16 *); +struct UnkStruct_203B024 *sub_8114188(struct UnkStruct_203B024 *); void *sub_81141D0(void *, void *); -u16 *sub_81141E4(u16 *); +struct UnkStruct_203B024 *sub_81141E4(struct UnkStruct_203B024 *); void *sub_811422C(void *, void *); -u16 *sub_8114240(u16 *); +struct UnkStruct_203B024 *sub_8114240(struct UnkStruct_203B024 *); void *sub_8114288(void *, void *); -u16 *sub_811429C(u16 *); +struct UnkStruct_203B024 *sub_811429C(struct UnkStruct_203B024 *); void *sub_8114310(void *, void *); -u16 *sub_8114324(u16 *); +struct UnkStruct_203B024 *sub_8114324(struct UnkStruct_203B024 *); void *sub_8114380(void *, void *); -u16 *sub_8114394(u16 *); +struct UnkStruct_203B024 *sub_8114394(struct UnkStruct_203B024 *); void *sub_81143F0(void *, void *); -u16 *sub_811443C(u16 *); +struct UnkStruct_203B024 *sub_811443C(struct UnkStruct_203B024 *); void *sub_811445C(void *, void *); -u16 *sub_811448C(u16 *); +struct UnkStruct_203B024 *sub_811448C(struct UnkStruct_203B024 *); void *sub_81144EC(void *, void *); -u16 *sub_8114518(u16 *); +struct UnkStruct_203B024 *sub_8114518(struct UnkStruct_203B024 *); void *sub_8114578(void *, void *); -u16 *sub_81145A4(u16 *); +struct UnkStruct_203B024 *sub_81145A4(struct UnkStruct_203B024 *); void *sub_8114604(void *, void *); -u16 *sub_811464C(u16 *); +struct UnkStruct_203B024 *sub_811464C(struct UnkStruct_203B024 *); void *sub_8114710(void *, void *); -u16 *sub_8114724(u16 *); +struct UnkStruct_203B024 *sub_8114724(struct UnkStruct_203B024 *); void *sub_8114744(void *, void *); -u16 *sub_8114758(u16 *); +struct UnkStruct_203B024 *sub_8114758(struct UnkStruct_203B024 *); void *sub_8114778(void *, void *); -u16 *sub_81147A8(u16 *); +struct UnkStruct_203B024 *sub_81147A8(struct UnkStruct_203B024 *); void *sub_8114808(void *, void *); -u16 *sub_8114834(u16 *); +struct UnkStruct_203B024 *sub_8114834(struct UnkStruct_203B024 *); void *sub_811488C(void *, void *); -u16 *sub_81148BC(u16 *); +struct UnkStruct_203B024 *sub_81148BC(struct UnkStruct_203B024 *); void *sub_8114918(void *, void *); -u16 *sub_8114944(u16 *); +struct UnkStruct_203B024 *sub_8114944(struct UnkStruct_203B024 *); void *sub_8114990(void *, void *); -u16 *sub_81149D0(u16 *); +struct UnkStruct_203B024 *sub_81149D0(struct UnkStruct_203B024 *); void *sub_8114A1C(void *, void *); -u16 *sub_8114A4C(u16 *); +struct UnkStruct_203B024 *sub_8114A4C(struct UnkStruct_203B024 *); void *sub_8114AA0(void *, void *); -u16 *sub_8114AC8(u16 *); +struct UnkStruct_203B024 *sub_8114AC8(struct UnkStruct_203B024 *); void *sub_8114B0C(void *, void *); -u16 *sub_8114B34(u16 *); +struct UnkStruct_203B024 *sub_8114B34(struct UnkStruct_203B024 *); void *sub_8114B78(void *, void *); -u16 *sub_8114BA0(u16 *); +struct UnkStruct_203B024 *sub_8114BA0(struct UnkStruct_203B024 *); void *sub_8114BE4(void *, void *); -u16 *sub_8114C0C(u16 *); +struct UnkStruct_203B024 *sub_8114C0C(struct UnkStruct_203B024 *); void *sub_8114C68(void *, void *); -u16 *sub_8114C8C(u16 *); +struct UnkStruct_203B024 *sub_8114C8C(struct UnkStruct_203B024 *); void *sub_8114CC0(void *, void *); -u16 *sub_8114CE4(u16 *); +struct UnkStruct_203B024 *sub_8114CE4(struct UnkStruct_203B024 *); void *sub_8114D4C(void *, void *); -u16 *sub_8114D68(u16 *); +struct UnkStruct_203B024 *sub_8114D68(struct UnkStruct_203B024 *); void *sub_8114DE8(void *, void *); -u16 *sub_8114E68(u16 *); +struct UnkStruct_203B024 *sub_8114E68(struct UnkStruct_203B024 *); bool8 sub_8114FBC(u16); void *sub_8114FF0(void *, void *); -u16 *sub_811500C(u16 *); +struct UnkStruct_203B024 *sub_811500C(struct UnkStruct_203B024 *); void *sub_8115078(void *, void *); -u16 *sub_81150CC(u16 *); +struct UnkStruct_203B024 *sub_81150CC(struct UnkStruct_203B024 *); void *sub_81151C0(void *, void *); -u16 *sub_81151DC(u16 *); +struct UnkStruct_203B024 *sub_81151DC(struct UnkStruct_203B024 *); void *sub_8115280(void *, void *); -u16 *sub_81152BC(u16 *); +struct UnkStruct_203B024 *sub_81152BC(struct UnkStruct_203B024 *); void *sub_8115410(void *, void *); -u16 *sub_8115460(u16 *); +struct UnkStruct_203B024 *sub_8115460(struct UnkStruct_203B024 *); void *sub_81154DC(void *, void *); -u16 *sub_8115518(u16 *); +struct UnkStruct_203B024 *sub_8115518(struct UnkStruct_203B024 *); void *sub_81155A4(void *, void *); -u16 *sub_81155E0(u16 *); +struct UnkStruct_203B024 *sub_81155E0(struct UnkStruct_203B024 *); void *sub_81156D8(void *, void *); -u16 *sub_8115700(u16 *); +struct UnkStruct_203B024 *sub_8115700(struct UnkStruct_203B024 *); void *sub_81157DC(void *, void *); -u16 *sub_8115800(u16 *); +struct UnkStruct_203B024 *sub_8115800(struct UnkStruct_203B024 *); bool8 sub_81153A8(u16, void*); bool8 sub_81153E4(u16, void*); @@ -1197,7 +1204,7 @@ void sub_8111B80(void) gUnknown_203AE94.unk_0_4 = 0; gUnknown_203AE94.unk_3 = 0; gUnknown_203AE94.unk_2 = sub_8111BD4(); - if (gUnknown_203B044[1] == 0) + if (gUnknown_203B044.unk_2 == 0) gUnknown_203AE94.unk_1++; if (gUnknown_203AE94.unk_1 > 32) return; @@ -3132,7 +3139,7 @@ bool8 sub_8113A44(u16 a0, u16 *a1) return FALSE; } -u16 * (*const gUnknown_84569F4[])(u16 *) = { +struct UnkStruct_203B024 * (*const gUnknown_84569F4[])(struct UnkStruct_203B024 *) = { NULL, NULL, NULL, @@ -3244,3 +3251,69 @@ void sub_8113ABC(struct UnkStruct_203B024 * a0) else gUnknown_203B04A = r2->unk_01 + 1; } + +#ifdef NONMATCHING +bool8 sub_8113AE8(struct UnkStruct_203B024 * a0) +{ + if (a0 == NULL || a0->unk_02 > gUnknown_203AF98) + return FALSE; + + gUnknown_84569F4[a0->unk_00 & 0xFFF](a0); + gUnknown_203B044.unk_0 = a0->unk_00; + gUnknown_203B044.unk_1 = (a0->unk_00 & 0xF000) >> 12; + if (gUnknown_203B044.unk_1 != 0) + gUnknown_203B044.unk_2 = 1; + return TRUE; +} +#else +NAKED +bool8 sub_8113AE8(struct UnkStruct_203B024 * a0) +{ + asm_unified("\tpush {r4,lr}\n" + "\tadds r4, r0, 0\n" + "\tcmp r0, 0\n" + "\tbeq _08113AFA\n" + "\tldr r1, _08113B00 @ =gUnknown_203AF98\n" + "\tldrh r0, [r0, 0x2]\n" + "\tldrh r1, [r1]\n" + "\tcmp r0, r1\n" + "\tbls _08113B04\n" + "_08113AFA:\n" + "\tmovs r0, 0\n" + "\tb _08113B32\n" + "\t.align 2, 0\n" + "_08113B00: .4byte gUnknown_203AF98\n" + "_08113B04:\n" + "\tldr r2, _08113B38 @ =gUnknown_84569F4\n" + "\tldrh r1, [r4]\n" + "\tldr r0, _08113B3C @ =0x00000fff\n" + "\tands r0, r1\n" + "\tlsls r0, 2\n" + "\tadds r0, r2\n" + "\tldr r1, [r0]\n" + "\tadds r0, r4, 0\n" + "\tbl _call_via_r1\n" + "\tldr r2, _08113B40 @ =gUnknown_203B044\n" + "\tldrh r1, [r4]\n" + "\tstrb r1, [r2]\n" + "\tmovs r0, 0xF0\n" + "\tlsls r0, 8\n" + "\tands r0, r1\n" + "\tlsrs r0, 12\n" + "\tstrb r0, [r2, 0x1]\n" + "\tcmp r0, 0\n" + "\tbeq _08113B30\n" + "\tmovs r0, 0x1\n" + "\tstrh r0, [r2, 0x2]\n" + "_08113B30:\n" + "\tmovs r0, 0x1\n" + "_08113B32:\n" + "\tpop {r4}\n" + "\tpop {r1}\n" + "\tbx r1\n" + "\t.align 2, 0\n" + "_08113B38: .4byte gUnknown_84569F4\n" + "_08113B3C: .4byte 0x00000fff\n" + "_08113B40: .4byte gUnknown_203B044"); +} +#endif -- cgit v1.2.3 From 1e63aeb48ddb282a64d9acc73e0dcec54ddfd745 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Tue, 6 Nov 2018 08:40:46 -0500 Subject: through sub_8113B94 --- asm/quest_log.s | 88 --------------------------------------------------------- src/quest_log.c | 31 +++++++++++++++++++- 2 files changed, 30 insertions(+), 89 deletions(-) diff --git a/asm/quest_log.s b/asm/quest_log.s index cf93da04f..8bd75ed2f 100644 --- a/asm/quest_log.s +++ b/asm/quest_log.s @@ -5,94 +5,6 @@ .text - thumb_func_start sub_8113B44 -sub_8113B44: @ 8113B44 - push {r4,lr} - adds r2, r0, 0 - ldr r4, _08113B54 @ =gUnknown_203B044 - ldrh r0, [r4, 0x2] - cmp r0, 0 - bne _08113B58 - movs r0, 0 - b _08113B7E - .align 2, 0 -_08113B54: .4byte gUnknown_203B044 -_08113B58: - ldr r1, _08113B84 @ =gUnknown_84569F4 - ldrb r0, [r4] - lsls r0, 2 - adds r0, r1 - ldr r1, [r0] - adds r0, r2, 0 - bl _call_via_r1 - ldrh r0, [r4, 0x2] - adds r0, 0x1 - strh r0, [r4, 0x2] - lsls r0, 16 - lsrs r0, 16 - ldrb r4, [r4, 0x1] - cmp r0, r4 - bls _08113B7C - bl sub_8113B88 -_08113B7C: - movs r0, 0x1 -_08113B7E: - pop {r4} - pop {r1} - bx r1 - .align 2, 0 -_08113B84: .4byte gUnknown_84569F4 - thumb_func_end sub_8113B44 - - thumb_func_start sub_8113B88 -sub_8113B88: @ 8113B88 - ldr r1, _08113B90 @ =gUnknown_203B044 - movs r0, 0 - str r0, [r1] - bx lr - .align 2, 0 -_08113B90: .4byte gUnknown_203B044 - thumb_func_end sub_8113B88 - - thumb_func_start sub_8113B94 -sub_8113B94: @ 8113B94 - push {r4,lr} - lsls r0, 16 - lsrs r0, 16 - adds r4, r0, 0 - ldr r2, _08113BC0 @ =gUnknown_203B044 - ldrb r1, [r2] - lsls r0, r4, 24 - lsrs r0, 24 - ldr r3, _08113BC4 @ =gUnknown_203AF98 - cmp r1, r0 - bne _08113BB2 - ldrh r1, [r2, 0x2] - ldrh r0, [r3] - cmp r1, r0 - beq _08113BC8 -_08113BB2: - movs r0, 0 - strb r4, [r2] - strb r0, [r2, 0x1] - ldrh r0, [r3] - strh r0, [r2, 0x2] - b _08113BD2 - .align 2, 0 -_08113BC0: .4byte gUnknown_203B044 -_08113BC4: .4byte gUnknown_203AF98 -_08113BC8: - ldrb r0, [r2, 0x1] - cmp r0, 0x4 - bhi _08113BD2 - adds r0, 0x1 - strb r0, [r2, 0x1] -_08113BD2: - pop {r4} - pop {r0} - bx r0 - thumb_func_end sub_8113B94 - thumb_func_start sub_8113BD8 sub_8113BD8: @ 8113BD8 ldr r0, _08113BE8 @ =gUnknown_203B049 diff --git a/src/quest_log.c b/src/quest_log.c index e69f012d7..d2ffb2461 100644 --- a/src/quest_log.c +++ b/src/quest_log.c @@ -178,7 +178,7 @@ bool8 sub_8113A44(u16, u16 *); void * sub_8113A78(struct UnkStruct_203B024 *, struct UnkStruct_203B024 **); void sub_8113ABC(struct UnkStruct_203B024 *); bool8 sub_8113AE8(struct UnkStruct_203B024 *); -bool8 sub_8113B44(void *); +bool8 sub_8113B44(struct UnkStruct_203B024 *); void sub_8113B88(void); void sub_8113B94(u16); void sub_8113BD8(void); @@ -3317,3 +3317,32 @@ bool8 sub_8113AE8(struct UnkStruct_203B024 * a0) "_08113B40: .4byte gUnknown_203B044"); } #endif + +bool8 sub_8113B44(struct UnkStruct_203B024 * a0) +{ + if (gUnknown_203B044.unk_2 == 0) + return FALSE; + + gUnknown_84569F4[gUnknown_203B044.unk_0](a0); + gUnknown_203B044.unk_2++; + if (gUnknown_203B044.unk_2 > gUnknown_203B044.unk_1) + sub_8113B88(); + return TRUE; +} + +void sub_8113B88(void) +{ + gUnknown_203B044 = (struct UnkStruct_203B044){}; +} + +void sub_8113B94(u16 a0) +{ + if (gUnknown_203B044.unk_0 != (u8)a0 || gUnknown_203B044.unk_2 != gUnknown_203AF98) + { + gUnknown_203B044.unk_0 = a0; + gUnknown_203B044.unk_1 = 0; + gUnknown_203B044.unk_2 = gUnknown_203AF98; + } + else if (gUnknown_203B044.unk_1 < 5) + gUnknown_203B044.unk_1++; +} -- cgit v1.2.3 From 2c627ae37367500aff4063ec07bfd3fc2c37cf57 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Tue, 6 Nov 2018 11:19:39 -0500 Subject: through sub_8113C20 --- asm/quest_log.s | 76 --------------------------------------------------------- src/quest_log.c | 36 ++++++++++++++++++++++++--- 2 files changed, 32 insertions(+), 80 deletions(-) diff --git a/asm/quest_log.s b/asm/quest_log.s index 8bd75ed2f..915837f58 100644 --- a/asm/quest_log.s +++ b/asm/quest_log.s @@ -5,82 +5,6 @@ .text - thumb_func_start sub_8113BD8 -sub_8113BD8: @ 8113BD8 - ldr r0, _08113BE8 @ =gUnknown_203B049 - movs r1, 0 - strb r1, [r0] - ldr r0, _08113BEC @ =gUnknown_203B04A - strb r1, [r0] - ldr r0, _08113BF0 @ =gUnknown_203B04B - strb r1, [r0] - bx lr - .align 2, 0 -_08113BE8: .4byte gUnknown_203B049 -_08113BEC: .4byte gUnknown_203B04A -_08113BF0: .4byte gUnknown_203B04B - thumb_func_end sub_8113BD8 - - thumb_func_start sub_8113BF4 -sub_8113BF4: @ 8113BF4 - push {r4,lr} - adds r4, r0, 0 - ldr r0, _08113C14 @ =gUnknown_8456AA0 - adds r0, 0x27 - ldrb r1, [r0] - adds r0, r4, 0 - bl sub_8110988 - lsls r0, 24 - cmp r0, 0 - beq _08113C18 - movs r0, 0x27 - strh r0, [r4] - adds r0, r4, 0x2 - b _08113C1A - .align 2, 0 -_08113C14: .4byte gUnknown_8456AA0 -_08113C18: - movs r0, 0 -_08113C1A: - pop {r4} - pop {r1} - bx r1 - thumb_func_end sub_8113BF4 - - thumb_func_start sub_8113C20 -sub_8113C20: @ 8113C20 - push {r4,r5,lr} - adds r5, r0, 0 - adds r4, r1, 0 - ldr r0, _08113C50 @ =gUnknown_8456AA0 - adds r0, 0x27 - ldrb r1, [r0] - adds r0, r5, 0 - bl sub_8110988 - lsls r0, 24 - cmp r0, 0 - beq _08113C54 - movs r0, 0xFF - strb r0, [r4, 0x6] - movs r1, 0 - movs r0, 0 - strh r0, [r4, 0x4] - strb r1, [r4] - strb r1, [r4, 0x1] - strb r1, [r4, 0x2] - strb r1, [r4, 0x3] - adds r0, r5, 0x2 - b _08113C56 - .align 2, 0 -_08113C50: .4byte gUnknown_8456AA0 -_08113C54: - movs r0, 0 -_08113C56: - pop {r4,r5} - pop {r1} - bx r1 - thumb_func_end sub_8113C20 - thumb_func_start sub_8113C5C sub_8113C5C: @ 8113C5C push {r4,r5,lr} diff --git a/src/quest_log.c b/src/quest_log.c index d2ffb2461..9ccad6042 100644 --- a/src/quest_log.c +++ b/src/quest_log.c @@ -183,7 +183,7 @@ void sub_8113B88(void); void sub_8113B94(u16); void sub_8113BD8(void); struct UnkStruct_203B024 * sub_8113BF4(struct UnkStruct_203B024 *); -void * sub_8113C20(void *, struct UnkStruct_203AE98 *); +struct UnkStruct_203B024 * sub_8113C20(struct UnkStruct_203B024 * a0, struct UnkStruct_203AE98 * a1); void *sub_8113C5C(void *, u16); struct UnkStruct_203B024 * sub_8113C8C(void *, struct UnkStruct_203AE98 *); struct UnkStruct_203B024 * sub_8113CC8(void *, struct UnkStruct_203AE98 *); @@ -338,17 +338,17 @@ bool8 sub_8110944(void * a0, size_t a1) void * r2 = gSaveBlock1Ptr->questLog[gUnknown_203ADF8].unk_568; void * r0 = gSaveBlock1Ptr->questLog[gUnknown_203ADF8].end; r0 -= a1; - if (a0 < r2 || a0 > r0) + if ((void *)a0 < r2 || (void *)a0 > r0) return FALSE; return TRUE; } -bool8 sub_8110988(void * a0, size_t a1) +bool8 sub_8110988(struct UnkStruct_203B024 * a0, size_t a1) { void * r2 = gSaveBlock1Ptr->questLog[gUnknown_203ADF8].unk_568; void * r0 = gSaveBlock1Ptr->questLog[gUnknown_203ADF8].end; r0 -= a1; - if (a0 < r2 || a0 > r0) + if ((void *)a0 < r2 || (void *)a0 > r0) return FALSE; return TRUE; } @@ -3346,3 +3346,31 @@ void sub_8113B94(u16 a0) else if (gUnknown_203B044.unk_1 < 5) gUnknown_203B044.unk_1++; } + +void sub_8113BD8(void) +{ + gUnknown_203B049 = 0; + gUnknown_203B04A = 0; + gUnknown_203B04B = 0; +} + +struct UnkStruct_203B024 * sub_8113BF4(struct UnkStruct_203B024 * a0) +{ + if (!sub_8110988(a0, gUnknown_8456AA0[39])) + return NULL; + a0->unk_00 = 39; + return (void *)a0 + 2; +} + +struct UnkStruct_203B024 * sub_8113C20(struct UnkStruct_203B024 * a0, struct UnkStruct_203AE98 * a1) +{ + if (!sub_8110988(a0, gUnknown_8456AA0[39])) + return NULL; + a1->unk_6 = 0xFF; + a1->unk_4 = 0; + a1->unk_0 = 0; + a1->unk_1 = 0; + a1->unk_2 = 0; + a1->unk_3 = 0; + return (void *)a0 + 2; +} -- cgit v1.2.3 From 226bd50a5c49f422f8038c23b4f9c194e93164b3 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Tue, 6 Nov 2018 11:36:09 -0500 Subject: sub_8113C5C; rethink what this data actually is --- asm/quest_log.s | 29 ---------- src/quest_log.c | 167 +++++++++++++++++++++++++++++--------------------------- 2 files changed, 88 insertions(+), 108 deletions(-) diff --git a/asm/quest_log.s b/asm/quest_log.s index 915837f58..164fdc06c 100644 --- a/asm/quest_log.s +++ b/asm/quest_log.s @@ -5,35 +5,6 @@ .text - thumb_func_start sub_8113C5C -sub_8113C5C: @ 8113C5C - push {r4,r5,lr} - adds r4, r0, 0 - lsls r1, 16 - lsrs r5, r1, 16 - ldr r0, _08113C80 @ =gUnknown_8456AA0 - adds r0, 0x29 - ldrb r1, [r0] - adds r0, r4, 0 - bl sub_8110988 - lsls r0, 24 - cmp r0, 0 - beq _08113C84 - movs r0, 0x29 - strh r0, [r4] - strh r5, [r4, 0x2] - adds r0, r4, 0x4 - b _08113C86 - .align 2, 0 -_08113C80: .4byte gUnknown_8456AA0 -_08113C84: - movs r0, 0 -_08113C86: - pop {r4,r5} - pop {r1} - bx r1 - thumb_func_end sub_8113C5C - thumb_func_start sub_8113C8C sub_8113C8C: @ 8113C8C push {r4,r5,lr} diff --git a/src/quest_log.c b/src/quest_log.c index 9ccad6042..fe1ca9e18 100644 --- a/src/quest_log.c +++ b/src/quest_log.c @@ -92,9 +92,9 @@ EWRAM_DATA u8 gUnknown_203ADF9 = 0; EWRAM_DATA u8 gUnknown_203ADFA = 0; EWRAM_DATA u16 gUnknown_203ADFC = 0; EWRAM_DATA u8 gUnknown_203ADFE[3] = {0}; -EWRAM_DATA void * gUnknown_203AE04 = NULL; -EWRAM_DATA struct UnkStruct_203B024 * gUnknown_203AE08 = NULL; -EWRAM_DATA struct UnkStruct_203B024 * gUnknown_203AE0C[32] = {NULL}; +EWRAM_DATA u16 * gUnknown_203AE04 = NULL; +EWRAM_DATA u16 * gUnknown_203AE08 = NULL; +EWRAM_DATA u16 * gUnknown_203AE0C[32] = {NULL}; EWRAM_DATA void (* gUnknown_203AE8C)(void) = NULL; EWRAM_DATA u16 *gUnknown_203AE90 = NULL; EWRAM_DATA struct UnkStruct_203AE94 gUnknown_203AE94 = {0}; @@ -175,98 +175,98 @@ void sub_8113A1C(u16); void sub_811381C(void); void sub_81138F8(void); bool8 sub_8113A44(u16, u16 *); -void * sub_8113A78(struct UnkStruct_203B024 *, struct UnkStruct_203B024 **); -void sub_8113ABC(struct UnkStruct_203B024 *); -bool8 sub_8113AE8(struct UnkStruct_203B024 *); -bool8 sub_8113B44(struct UnkStruct_203B024 *); +u16 * sub_8113A78(u16 *, u16 **); +void sub_8113ABC(u16 *); +bool8 sub_8113AE8(u16 *); +bool8 sub_8113B44(u16 *); void sub_8113B88(void); void sub_8113B94(u16); void sub_8113BD8(void); -struct UnkStruct_203B024 * sub_8113BF4(struct UnkStruct_203B024 *); -struct UnkStruct_203B024 * sub_8113C20(struct UnkStruct_203B024 * a0, struct UnkStruct_203AE98 * a1); -void *sub_8113C5C(void *, u16); -struct UnkStruct_203B024 * sub_8113C8C(void *, struct UnkStruct_203AE98 *); -struct UnkStruct_203B024 * sub_8113CC8(void *, struct UnkStruct_203AE98 *); -struct UnkStruct_203B024 * sub_8113D08(void *, struct UnkStruct_203AE98 *); -struct UnkStruct_203B024 * sub_8113D48(void *, struct UnkStruct_203AE98 *); -struct UnkStruct_203B024 * sub_8113D94(void *, struct UnkStruct_203AE98 *); +u16 * sub_8113BF4(u16 *); +u16 * sub_8113C20(u16 *, struct UnkStruct_203AE98 *); +u16 * sub_8113C5C(u16 *, u16); +u16 * sub_8113C8C(u16 *, struct UnkStruct_203AE98 *); +u16 * sub_8113CC8(u16 *, struct UnkStruct_203AE98 *); +u16 * sub_8113D08(u16 *, struct UnkStruct_203AE98 *); +u16 * sub_8113D48(u16 *, struct UnkStruct_203AE98 *); +u16 * sub_8113D94(u16 *, struct UnkStruct_203AE98 *); void *sub_8113F14(void *, void *); -struct UnkStruct_203B024 *sub_8113F3C(struct UnkStruct_203B024 *); +u16 *sub_8113F3C(u16 *); void *sub_8113F80(void *, void *); -struct UnkStruct_203B024 *sub_8113FBC(struct UnkStruct_203B024 *); +u16 *sub_8113FBC(u16 *); void *sub_8114174(void *, void *); -struct UnkStruct_203B024 *sub_8114188(struct UnkStruct_203B024 *); +u16 *sub_8114188(u16 *); void *sub_81141D0(void *, void *); -struct UnkStruct_203B024 *sub_81141E4(struct UnkStruct_203B024 *); +u16 *sub_81141E4(u16 *); void *sub_811422C(void *, void *); -struct UnkStruct_203B024 *sub_8114240(struct UnkStruct_203B024 *); +u16 *sub_8114240(u16 *); void *sub_8114288(void *, void *); -struct UnkStruct_203B024 *sub_811429C(struct UnkStruct_203B024 *); +u16 *sub_811429C(u16 *); void *sub_8114310(void *, void *); -struct UnkStruct_203B024 *sub_8114324(struct UnkStruct_203B024 *); +u16 *sub_8114324(u16 *); void *sub_8114380(void *, void *); -struct UnkStruct_203B024 *sub_8114394(struct UnkStruct_203B024 *); +u16 *sub_8114394(u16 *); void *sub_81143F0(void *, void *); -struct UnkStruct_203B024 *sub_811443C(struct UnkStruct_203B024 *); +u16 *sub_811443C(u16 *); void *sub_811445C(void *, void *); -struct UnkStruct_203B024 *sub_811448C(struct UnkStruct_203B024 *); +u16 *sub_811448C(u16 *); void *sub_81144EC(void *, void *); -struct UnkStruct_203B024 *sub_8114518(struct UnkStruct_203B024 *); +u16 *sub_8114518(u16 *); void *sub_8114578(void *, void *); -struct UnkStruct_203B024 *sub_81145A4(struct UnkStruct_203B024 *); +u16 *sub_81145A4(u16 *); void *sub_8114604(void *, void *); -struct UnkStruct_203B024 *sub_811464C(struct UnkStruct_203B024 *); +u16 *sub_811464C(u16 *); void *sub_8114710(void *, void *); -struct UnkStruct_203B024 *sub_8114724(struct UnkStruct_203B024 *); +u16 *sub_8114724(u16 *); void *sub_8114744(void *, void *); -struct UnkStruct_203B024 *sub_8114758(struct UnkStruct_203B024 *); +u16 *sub_8114758(u16 *); void *sub_8114778(void *, void *); -struct UnkStruct_203B024 *sub_81147A8(struct UnkStruct_203B024 *); +u16 *sub_81147A8(u16 *); void *sub_8114808(void *, void *); -struct UnkStruct_203B024 *sub_8114834(struct UnkStruct_203B024 *); +u16 *sub_8114834(u16 *); void *sub_811488C(void *, void *); -struct UnkStruct_203B024 *sub_81148BC(struct UnkStruct_203B024 *); +u16 *sub_81148BC(u16 *); void *sub_8114918(void *, void *); -struct UnkStruct_203B024 *sub_8114944(struct UnkStruct_203B024 *); +u16 *sub_8114944(u16 *); void *sub_8114990(void *, void *); -struct UnkStruct_203B024 *sub_81149D0(struct UnkStruct_203B024 *); +u16 *sub_81149D0(u16 *); void *sub_8114A1C(void *, void *); -struct UnkStruct_203B024 *sub_8114A4C(struct UnkStruct_203B024 *); +u16 *sub_8114A4C(u16 *); void *sub_8114AA0(void *, void *); -struct UnkStruct_203B024 *sub_8114AC8(struct UnkStruct_203B024 *); +u16 *sub_8114AC8(u16 *); void *sub_8114B0C(void *, void *); -struct UnkStruct_203B024 *sub_8114B34(struct UnkStruct_203B024 *); +u16 *sub_8114B34(u16 *); void *sub_8114B78(void *, void *); -struct UnkStruct_203B024 *sub_8114BA0(struct UnkStruct_203B024 *); +u16 *sub_8114BA0(u16 *); void *sub_8114BE4(void *, void *); -struct UnkStruct_203B024 *sub_8114C0C(struct UnkStruct_203B024 *); +u16 *sub_8114C0C(u16 *); void *sub_8114C68(void *, void *); -struct UnkStruct_203B024 *sub_8114C8C(struct UnkStruct_203B024 *); +u16 *sub_8114C8C(u16 *); void *sub_8114CC0(void *, void *); -struct UnkStruct_203B024 *sub_8114CE4(struct UnkStruct_203B024 *); +u16 *sub_8114CE4(u16 *); void *sub_8114D4C(void *, void *); -struct UnkStruct_203B024 *sub_8114D68(struct UnkStruct_203B024 *); +u16 *sub_8114D68(u16 *); void *sub_8114DE8(void *, void *); -struct UnkStruct_203B024 *sub_8114E68(struct UnkStruct_203B024 *); +u16 *sub_8114E68(u16 *); bool8 sub_8114FBC(u16); void *sub_8114FF0(void *, void *); -struct UnkStruct_203B024 *sub_811500C(struct UnkStruct_203B024 *); +u16 *sub_811500C(u16 *); void *sub_8115078(void *, void *); -struct UnkStruct_203B024 *sub_81150CC(struct UnkStruct_203B024 *); +u16 *sub_81150CC(u16 *); void *sub_81151C0(void *, void *); -struct UnkStruct_203B024 *sub_81151DC(struct UnkStruct_203B024 *); +u16 *sub_81151DC(u16 *); void *sub_8115280(void *, void *); -struct UnkStruct_203B024 *sub_81152BC(struct UnkStruct_203B024 *); +u16 *sub_81152BC(u16 *); void *sub_8115410(void *, void *); -struct UnkStruct_203B024 *sub_8115460(struct UnkStruct_203B024 *); +u16 *sub_8115460(u16 *); void *sub_81154DC(void *, void *); -struct UnkStruct_203B024 *sub_8115518(struct UnkStruct_203B024 *); +u16 *sub_8115518(u16 *); void *sub_81155A4(void *, void *); -struct UnkStruct_203B024 *sub_81155E0(struct UnkStruct_203B024 *); +u16 *sub_81155E0(u16 *); void *sub_81156D8(void *, void *); -struct UnkStruct_203B024 *sub_8115700(struct UnkStruct_203B024 *); +u16 *sub_8115700(u16 *); void *sub_81157DC(void *, void *); -struct UnkStruct_203B024 *sub_8115800(struct UnkStruct_203B024 *); +u16 *sub_8115800(u16 *); bool8 sub_81153A8(u16, void*); bool8 sub_81153E4(u16, void*); @@ -289,7 +289,7 @@ void sub_8110840(void * oldPointer) { ptrdiff_t offset = (void *)gSaveBlock1Ptr - oldPointer; if (gUnknown_203AE04) - gUnknown_203AE04 += offset; + gUnknown_203AE04 = (void *)gUnknown_203AE04 + offset; if (gUnknown_203ADFA != 0) { if (gUnknown_203AE08) @@ -343,7 +343,7 @@ bool8 sub_8110944(void * a0, size_t a1) return TRUE; } -bool8 sub_8110988(struct UnkStruct_203B024 * a0, size_t a1) +bool8 sub_8110988(u16 * a0, size_t a1) { void * r2 = gSaveBlock1Ptr->questLog[gUnknown_203ADF8].unk_568; void * r0 = gSaveBlock1Ptr->questLog[gUnknown_203ADF8].end; @@ -408,7 +408,7 @@ void sub_8110AEC(u16 a0) sub_81108F0(gUnknown_203ADF8); sub_8113B88(); - gUnknown_203AE08 = gSaveBlock1Ptr->questLog[gUnknown_203ADF8].unk_568; + gUnknown_203AE08 = (u16 *)gSaveBlock1Ptr->questLog[gUnknown_203ADF8].unk_568; if ((a0 >= 12 && a0 < 20) || a0 == 35) gSaveBlock1Ptr->questLog[gUnknown_203ADF8].unk_000 = 2; else @@ -1033,7 +1033,7 @@ void sub_8111708(void) void sub_811175C(u8 a0, struct UnkStruct_203AE98 * a1) { u16 i; - struct UnkStruct_203B024 *r4; + u16 *r4; u16 r6 = 0; u16 r9 = 0; @@ -1043,10 +1043,10 @@ void sub_811175C(u8 a0, struct UnkStruct_203AE98 * a1) gUnknown_203AE0C[i] = NULL; } - r4 = gSaveBlock1Ptr->questLog[a0].unk_568; + r4 = (u16 *)gSaveBlock1Ptr->questLog[a0].unk_568; for (i = 0; i < 32; i++) { - switch (r4->unk_00 & 0xFFF) + switch (r4[0] & 0xFFF) { case 0: r4 = sub_8113D08(r4, &a1[r6]); @@ -3139,7 +3139,7 @@ bool8 sub_8113A44(u16 a0, u16 *a1) return FALSE; } -struct UnkStruct_203B024 * (*const gUnknown_84569F4[])(struct UnkStruct_203B024 *) = { +u16 * (*const gUnknown_84569F4[])(u16 *) = { NULL, NULL, NULL, @@ -3231,10 +3231,10 @@ const u8 gUnknown_8456AA0[] = { 0x06 }; -void * sub_8113A78(struct UnkStruct_203B024 *a0, struct UnkStruct_203B024 **a1) +u16 * sub_8113A78(u16 * a0, u16 **a1) { - u16 r2 = a0->unk_00 & 0xfff; - u16 r4 = a0->unk_00 >> 12; + u16 r2 = a0[0] & 0xfff; + u16 r4 = a0[0] >> 12; if (r2 == 33) r4 = 0; if (r2 < 3 || r2 > 42) @@ -3243,31 +3243,31 @@ void * sub_8113A78(struct UnkStruct_203B024 *a0, struct UnkStruct_203B024 **a1) return gUnknown_8456AA0[r2] + (gUnknown_8456AA0[r2] - 4) * r4 + (void *)a0; } -void sub_8113ABC(struct UnkStruct_203B024 * a0) +void sub_8113ABC(u16 * a0) { - struct UnkStruct_203B024_Sub1 * r2 = &a0->unk_04.type1; - if ((a0->unk_00 & 0xFFF) != 35) + u8 * r2 = (u8 *)(a0 + 2); + if ((a0[0] & 0xFFF) != 35) gUnknown_203B04A = 0; else - gUnknown_203B04A = r2->unk_01 + 1; + gUnknown_203B04A = r2[1] + 1; } #ifdef NONMATCHING -bool8 sub_8113AE8(struct UnkStruct_203B024 * a0) +bool8 sub_8113AE8(u16 * a0) { - if (a0 == NULL || a0->unk_02 > gUnknown_203AF98) + if (a0 == NULL || a0[1] > gUnknown_203AF98) return FALSE; - gUnknown_84569F4[a0->unk_00 & 0xFFF](a0); - gUnknown_203B044.unk_0 = a0->unk_00; - gUnknown_203B044.unk_1 = (a0->unk_00 & 0xF000) >> 12; + gUnknown_84569F4[a0[0] & 0xFFF](a0); + gUnknown_203B044.unk_0 = a0[0]; + gUnknown_203B044.unk_1 = (a0[0] & 0xF000) >> 12; if (gUnknown_203B044.unk_1 != 0) gUnknown_203B044.unk_2 = 1; return TRUE; } #else NAKED -bool8 sub_8113AE8(struct UnkStruct_203B024 * a0) +bool8 sub_8113AE8(u16 * a0) { asm_unified("\tpush {r4,lr}\n" "\tadds r4, r0, 0\n" @@ -3318,7 +3318,7 @@ bool8 sub_8113AE8(struct UnkStruct_203B024 * a0) } #endif -bool8 sub_8113B44(struct UnkStruct_203B024 * a0) +bool8 sub_8113B44(u16 * a0) { if (gUnknown_203B044.unk_2 == 0) return FALSE; @@ -3354,15 +3354,15 @@ void sub_8113BD8(void) gUnknown_203B04B = 0; } -struct UnkStruct_203B024 * sub_8113BF4(struct UnkStruct_203B024 * a0) +u16 * sub_8113BF4(u16 * a0) { if (!sub_8110988(a0, gUnknown_8456AA0[39])) return NULL; - a0->unk_00 = 39; - return (void *)a0 + 2; + a0[0] = 39; + return a0 + 1; } -struct UnkStruct_203B024 * sub_8113C20(struct UnkStruct_203B024 * a0, struct UnkStruct_203AE98 * a1) +u16 * sub_8113C20(u16 * a0, struct UnkStruct_203AE98 * a1) { if (!sub_8110988(a0, gUnknown_8456AA0[39])) return NULL; @@ -3372,5 +3372,14 @@ struct UnkStruct_203B024 * sub_8113C20(struct UnkStruct_203B024 * a0, struct Unk a1->unk_1 = 0; a1->unk_2 = 0; a1->unk_3 = 0; - return (void *)a0 + 2; + return a0 + 1; +} + +u16 * sub_8113C5C(u16 * a0, u16 a1) +{ + if (!sub_8110988(a0, gUnknown_8456AA0[41])) + return NULL; + a0[0] = 41; + a0[1] = a1; + return a0 + 2; } -- cgit v1.2.3 From 5a85a2273d25222d6504d7b7b4c9c16e9a262f32 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Tue, 6 Nov 2018 14:29:43 -0500 Subject: through sub_8113D94 --- asm/quest_log.s | 196 -------------------------------------------------------- src/quest_log.c | 81 +++++++++++++++++++++++ 2 files changed, 81 insertions(+), 196 deletions(-) diff --git a/asm/quest_log.s b/asm/quest_log.s index 164fdc06c..95cd834b7 100644 --- a/asm/quest_log.s +++ b/asm/quest_log.s @@ -5,202 +5,6 @@ .text - thumb_func_start sub_8113C8C -sub_8113C8C: @ 8113C8C - push {r4,r5,lr} - adds r5, r0, 0 - adds r4, r1, 0 - ldr r0, _08113CBC @ =gUnknown_8456AA0 - adds r0, 0x29 - ldrb r1, [r0] - adds r0, r5, 0 - bl sub_8110988 - lsls r0, 24 - cmp r0, 0 - beq _08113CC0 - movs r0, 0xFE - strb r0, [r4, 0x6] - ldrh r1, [r5, 0x2] - movs r0, 0 - strh r1, [r4, 0x4] - strb r0, [r4] - strb r0, [r4, 0x1] - strb r0, [r4, 0x2] - strb r0, [r4, 0x3] - adds r0, r5, 0x4 - b _08113CC2 - .align 2, 0 -_08113CBC: .4byte gUnknown_8456AA0 -_08113CC0: - movs r0, 0 -_08113CC2: - pop {r4,r5} - pop {r1} - bx r1 - thumb_func_end sub_8113C8C - - thumb_func_start sub_8113CC8 -sub_8113CC8: @ 8113CC8 - push {r4-r6,lr} - adds r4, r0, 0 - adds r5, r1, 0 - adds r6, r4, 0x4 - ldr r0, _08113CFC @ =gUnknown_8456AA0 - ldrb r1, [r0] - adds r0, r4, 0 - bl sub_8110988 - lsls r0, 24 - cmp r0, 0 - beq _08113D00 - movs r0, 0 - strh r0, [r4] - ldrh r0, [r5, 0x4] - strh r0, [r4, 0x2] - ldrb r0, [r5] - strb r0, [r4, 0x4] - ldrb r0, [r5, 0x1] - strb r0, [r6, 0x1] - ldrb r0, [r5, 0x2] - strb r0, [r6, 0x2] - ldrb r0, [r5, 0x3] - strb r0, [r6, 0x3] - adds r0, r6, 0x4 - b _08113D02 - .align 2, 0 -_08113CFC: .4byte gUnknown_8456AA0 -_08113D00: - movs r0, 0 -_08113D02: - pop {r4-r6} - pop {r1} - bx r1 - thumb_func_end sub_8113CC8 - - thumb_func_start sub_8113D08 -sub_8113D08: @ 8113D08 - push {r4-r6,lr} - adds r5, r0, 0 - adds r4, r1, 0 - adds r6, r5, 0x4 - ldr r0, _08113D3C @ =gUnknown_8456AA0 - ldrb r1, [r0] - adds r0, r5, 0 - bl sub_8110988 - lsls r0, 24 - cmp r0, 0 - beq _08113D40 - movs r0, 0x2 - strb r0, [r4, 0x6] - ldrh r0, [r5, 0x2] - strh r0, [r4, 0x4] - ldrb r0, [r5, 0x4] - strb r0, [r4] - ldrb r0, [r6, 0x1] - strb r0, [r4, 0x1] - ldrb r0, [r6, 0x2] - strb r0, [r4, 0x2] - ldrb r0, [r6, 0x3] - strb r0, [r4, 0x3] - adds r0, r6, 0x4 - b _08113D42 - .align 2, 0 -_08113D3C: .4byte gUnknown_8456AA0 -_08113D40: - movs r0, 0 -_08113D42: - pop {r4-r6} - pop {r1} - bx r1 - thumb_func_end sub_8113D08 - - thumb_func_start sub_8113D48 -sub_8113D48: @ 8113D48 - push {r4-r6,lr} - adds r5, r1, 0 - adds r4, r0, 0 - adds r6, r4, 0x4 - ldr r0, _08113D64 @ =gUnknown_8456AA0 - ldrb r1, [r0, 0x2] - adds r0, r4, 0 - bl sub_8110988 - lsls r0, 24 - cmp r0, 0 - bne _08113D68 - movs r0, 0 - b _08113D8C - .align 2, 0 -_08113D64: .4byte gUnknown_8456AA0 -_08113D68: - ldrb r0, [r5, 0x6] - cmp r0, 0 - bne _08113D72 - movs r0, 0x2 - b _08113D74 -_08113D72: - movs r0, 0x1 -_08113D74: - strh r0, [r4] - ldrh r0, [r5, 0x4] - strh r0, [r4, 0x2] - ldrb r0, [r5] - strb r0, [r6] - ldrb r0, [r5, 0x1] - strb r0, [r6, 0x1] - ldrb r0, [r5, 0x2] - strb r0, [r6, 0x2] - ldrb r0, [r5, 0x3] - strb r0, [r6, 0x3] - adds r0, r6, 0x4 -_08113D8C: - pop {r4-r6} - pop {r1} - bx r1 - thumb_func_end sub_8113D48 - - thumb_func_start sub_8113D94 -sub_8113D94: @ 8113D94 - push {r4-r6,lr} - adds r4, r1, 0 - adds r5, r0, 0 - adds r6, r5, 0x4 - ldr r0, _08113DB0 @ =gUnknown_8456AA0 - ldrb r1, [r0, 0x2] - adds r0, r5, 0 - bl sub_8110988 - lsls r0, 24 - cmp r0, 0 - bne _08113DB4 - movs r0, 0 - b _08113DD8 - .align 2, 0 -_08113DB0: .4byte gUnknown_8456AA0 -_08113DB4: - ldrh r0, [r5] - cmp r0, 0x2 - bne _08113DBE - movs r0, 0 - b _08113DC0 -_08113DBE: - movs r0, 0x1 -_08113DC0: - strb r0, [r4, 0x6] - ldrh r0, [r5, 0x2] - strh r0, [r4, 0x4] - ldrb r0, [r6] - strb r0, [r4] - ldrb r0, [r6, 0x1] - strb r0, [r4, 0x1] - ldrb r0, [r6, 0x2] - strb r0, [r4, 0x2] - ldrb r0, [r6, 0x3] - strb r0, [r4, 0x3] - adds r0, r6, 0x4 -_08113DD8: - pop {r4-r6} - pop {r1} - bx r1 - thumb_func_end sub_8113D94 - thumb_func_start sub_8113DE0 sub_8113DE0: @ 8113DE0 push {r4-r7,lr} diff --git a/src/quest_log.c b/src/quest_log.c index fe1ca9e18..1d6951485 100644 --- a/src/quest_log.c +++ b/src/quest_log.c @@ -3383,3 +3383,84 @@ u16 * sub_8113C5C(u16 * a0, u16 a1) a0[1] = a1; return a0 + 2; } + +u16 * sub_8113C8C(u16 * a0, struct UnkStruct_203AE98 * a1) +{ + if (!sub_8110988(a0, gUnknown_8456AA0[41])) + return NULL; + a1->unk_6 = 0xFE; + a1->unk_4 = a0[1]; + a1->unk_0 = 0; + a1->unk_1 = 0; + a1->unk_2 = 0; + a1->unk_3 = 0; + return a0 + 2; +} + +u16 * sub_8113CC8(u16 * a0, struct UnkStruct_203AE98 * a1) +{ + u8 * r6 = (u8 *)a0 + 4; + + if (!sub_8110988(a0, gUnknown_8456AA0[0])) + return NULL; + a0[0] = 0; + a0[1] = a1->unk_4; + r6[0] = a1->unk_0; + r6[1] = a1->unk_1; + r6[2] = a1->unk_2; + r6[3] = a1->unk_3; + return (u16 *)(r6 + 4); +} + +u16 * sub_8113D08(u16 * a0, struct UnkStruct_203AE98 * a1) +{ + u8 * r6 = (u8 *)a0 + 4; + + if (!sub_8110988(a0, gUnknown_8456AA0[0])) + return NULL; + a1->unk_6 = 2; + a1->unk_4 = a0[1]; + a1->unk_0 = r6[0]; + a1->unk_1 = r6[1]; + a1->unk_2 = r6[2]; + a1->unk_3 = r6[3]; + return (u16 *)(r6 + 4); +} + +u16 * sub_8113D48(u16 * a0, struct UnkStruct_203AE98 * a1) +{ + u16 * r4 = a0; + u8 * r6 = (u8 *)a0 + 4; + + if (!sub_8110988(r4, gUnknown_8456AA0[2])) + return NULL; + if (a1->unk_6 == 0) + r4[0] = 2; + else + r4[0] = 1; + r4[1] = a1->unk_4; + r6[0] = a1->unk_0; + r6[1] = a1->unk_1; + r6[2] = a1->unk_2; + r6[3] = a1->unk_3; + return (u16 *)(r6 + 4); +} + +u16 * sub_8113D94(u16 * a0, struct UnkStruct_203AE98 * a1) +{ + u16 * r5 = a0; + u8 * r6 = (u8 *)a0 + 4; + + if (!sub_8110988(r5, gUnknown_8456AA0[2])) + return NULL; + if (r5[0] == 2) + a1->unk_6 = 0; + else + a1->unk_6 = 1; + a1->unk_4 = r5[1]; + a1->unk_0 = r6[0]; + a1->unk_1 = r6[1]; + a1->unk_2 = r6[2]; + a1->unk_3 = r6[3]; + return (u16 *)(r6 + 4); +} -- cgit v1.2.3 From 4628859055b05feeebdde69b6852c3b6c88e6afe Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Tue, 6 Nov 2018 17:27:11 -0500 Subject: sub_8113DE0 --- asm/quest_log.s | 91 --------------------------------------------------------- src/quest_log.c | 40 +++++++++++++++++++++++++ 2 files changed, 40 insertions(+), 91 deletions(-) diff --git a/asm/quest_log.s b/asm/quest_log.s index 95cd834b7..3c4845ae6 100644 --- a/asm/quest_log.s +++ b/asm/quest_log.s @@ -5,97 +5,6 @@ .text - thumb_func_start sub_8113DE0 -sub_8113DE0: @ 8113DE0 - push {r4-r7,lr} - adds r4, r1, 0 - lsls r0, 16 - lsrs r7, r0, 16 - ldr r0, _08113DF8 @ =gUnknown_203B044 - ldrb r0, [r0, 0x1] - cmp r0, 0 - bne _08113E00 - ldr r0, _08113DFC @ =gUnknown_8456AA0 - adds r0, r7, r0 - ldrb r6, [r0] - b _08113E0C - .align 2, 0 -_08113DF8: .4byte gUnknown_203B044 -_08113DFC: .4byte gUnknown_8456AA0 -_08113E00: - ldr r0, _08113E20 @ =gUnknown_8456AA0 - adds r0, r7, r0 - ldrb r0, [r0] - subs r0, 0x4 - lsls r0, 24 - lsrs r6, r0, 24 -_08113E0C: - adds r0, r4, 0 - adds r1, r6, 0 - bl sub_8110944 - lsls r0, 24 - cmp r0, 0 - bne _08113E24 - movs r0, 0 - b _08113E7C - .align 2, 0 -_08113E20: .4byte gUnknown_8456AA0 -_08113E24: - adds r5, r4, 0 - ldr r2, _08113E60 @ =gUnknown_203B044 - ldrb r1, [r2, 0x1] - cmp r1, 0 - beq _08113E36 - adds r0, r1, 0 - muls r0, r6 - adds r0, 0x4 - subs r5, r0 -_08113E36: - cmp r1, 0x5 - bne _08113E64 - movs r4, 0 -_08113E3C: - adds r0, r4, 0 - muls r0, r6 - adds r0, r5 - adds r0, 0x4 - adds r4, 0x1 - adds r1, r4, 0 - muls r1, r6 - adds r1, r5 - adds r1, 0x4 - adds r2, r6, 0 - bl memcpy - lsls r4, 24 - lsrs r4, 24 - cmp r4, 0x3 - bls _08113E3C - movs r1, 0x4 - b _08113E66 - .align 2, 0 -_08113E60: .4byte gUnknown_203B044 -_08113E64: - ldrb r1, [r2, 0x1] -_08113E66: - lsls r0, r1, 12 - adds r0, r7, r0 - strh r0, [r5] - ldr r0, _08113E84 @ =gUnknown_203AF98 - ldrh r0, [r0] - strh r0, [r5, 0x2] - adds r0, r1, 0 - muls r0, r6 - adds r0, 0x4 - adds r5, r0 - adds r0, r5, 0 -_08113E7C: - pop {r4-r7} - pop {r1} - bx r1 - .align 2, 0 -_08113E84: .4byte gUnknown_203AF98 - thumb_func_end sub_8113DE0 - thumb_func_start sub_8113E88 sub_8113E88: @ 8113E88 lsls r0, 16 diff --git a/src/quest_log.c b/src/quest_log.c index 1d6951485..6e2767a1e 100644 --- a/src/quest_log.c +++ b/src/quest_log.c @@ -3464,3 +3464,43 @@ u16 * sub_8113D94(u16 * a0, struct UnkStruct_203AE98 * a1) a1->unk_3 = r6[3]; return (u16 *)(r6 + 4); } + +u16 * sub_8113DE0(u16 a0, u16 * a1) +{ + u8 r6; + u16 * r5; + u8 r4; + u8 r1; + + if (gUnknown_203B044.unk_1 == 0) + r6 = gUnknown_8456AA0[a0]; + else + r6 = gUnknown_8456AA0[a0] - 4; + if (!sub_8110944(a1, r6)) + return NULL; + + r5 = (void *)a1; + + if (gUnknown_203B044.unk_1 != 0) + r5 = (void *)r5 - (gUnknown_203B044.unk_1 * r6 + 4); + + if (gUnknown_203B044.unk_1 == 5) + { + for (r4 = 0; r4 < 4; r4++) + { + memcpy( + (void *)r5 + (r4 * r6 + 4), + (void *)r5 + ((r4 + 1) * r6 + 4), + r6 + ); + } + r1 = 4; + } + else + r1 = gUnknown_203B044.unk_1; + + r5[0] = a0 + (r1 << 12); + r5[1] = gUnknown_203AF98; + r5 = (void *)r5 + (r1 * r6 + 4); + return r5; +} -- cgit v1.2.3 From 65b57e5a269c9dd4bdaf82e9cac2b2f5bb82772c Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Wed, 7 Nov 2018 08:45:08 -0500 Subject: through sub_8113EAC --- asm/quest_log.s | 73 --------------------------------------------------------- src/quest_log.c | 29 +++++++++++++++++++++++ 2 files changed, 29 insertions(+), 73 deletions(-) diff --git a/asm/quest_log.s b/asm/quest_log.s index 3c4845ae6..655d791c5 100644 --- a/asm/quest_log.s +++ b/asm/quest_log.s @@ -5,79 +5,6 @@ .text - thumb_func_start sub_8113E88 -sub_8113E88: @ 8113E88 - lsls r0, 16 - lsrs r0, 16 - ldr r2, _08113EA4 @ =gUnknown_203B044 - ldrh r3, [r2, 0x2] - ldr r2, _08113EA8 @ =gUnknown_8456AA0 - adds r0, r2 - ldrb r0, [r0] - subs r0, 0x4 - muls r0, r3 - adds r0, 0x4 - adds r1, r0 - adds r0, r1, 0 - bx lr - .align 2, 0 -_08113EA4: .4byte gUnknown_203B044 -_08113EA8: .4byte gUnknown_8456AA0 - thumb_func_end sub_8113E88 - - thumb_func_start sub_8113EAC -sub_8113EAC: @ 8113EAC - push {r4,r5,lr} - adds r3, r1, 0 - lsls r0, 16 - lsrs r1, r0, 16 - adds r4, r1, 0 - lsls r2, 24 - lsrs r2, 24 - adds r5, r2, 0 - cmp r3, 0 - beq _08113EE0 - movs r0, 0xCE - lsls r0, 1 - cmp r1, r0 - beq _08113ED0 - adds r0, r3, 0 - bl GetSpeciesName - b _08113F08 -_08113ED0: - ldr r1, _08113EDC @ =gText_EggNickname - adds r0, r3, 0 - bl StringCopy - b _08113F08 - .align 2, 0 -_08113EDC: .4byte gText_EggNickname -_08113EE0: - movs r0, 0xCE - lsls r0, 1 - cmp r4, r0 - beq _08113F00 - movs r0, 0xB - adds r1, r4, 0 - muls r1, r0 - ldr r0, _08113EFC @ =gSpeciesNames - adds r1, r0 - adds r0, r2, 0 - bl UnkTextUtil_SetPtrI - b _08113F08 - .align 2, 0 -_08113EFC: .4byte gSpeciesNames -_08113F00: - ldr r1, _08113F10 @ =gText_EggNickname - adds r0, r5, 0 - bl UnkTextUtil_SetPtrI -_08113F08: - pop {r4,r5} - pop {r0} - bx r0 - .align 2, 0 -_08113F10: .4byte gText_EggNickname - thumb_func_end sub_8113EAC - thumb_func_start sub_8113F14 sub_8113F14: @ 8113F14 push {r4,lr} diff --git a/src/quest_log.c b/src/quest_log.c index 6e2767a1e..82b93898e 100644 --- a/src/quest_log.c +++ b/src/quest_log.c @@ -1,5 +1,6 @@ #include "global.h" #include "constants/species.h" +#include "data2.h" #include "malloc.h" #include "main.h" #include "task.h" @@ -9,6 +10,7 @@ #include "menu_helpers.h" #include "window.h" #include "text_window.h" +#include "unk_text_util.h" #include "event_data.h" #include "event_scripts.h" #include "string_util.h" @@ -3504,3 +3506,30 @@ u16 * sub_8113DE0(u16 a0, u16 * a1) r5 = (void *)r5 + (r1 * r6 + 4); return r5; } + +u16 * sub_8113E88(u16 a0, u16 * a1) +{ + a1 = (void *)a1 + (gUnknown_203B044.unk_2 * (gUnknown_8456AA0[a0] - 4) + 4); + return a1; +} + +// TODO: delete this declaration once data_83FECCC.s is decompiled +extern const u8 gText_EggNickname[]; + +void sub_8113EAC(u16 a0, u8 * a1, u8 a2) +{ + if (a1 != NULL) + { + if (a0 != SPECIES_EGG) + GetSpeciesName(a1, a0); + else + StringCopy(a1, gText_EggNickname); + } + else + { + if (a0 != SPECIES_EGG) + UnkTextUtil_SetPtrI(a2, gSpeciesNames[a0]); + else + UnkTextUtil_SetPtrI(a2, gText_EggNickname); + } +} -- cgit v1.2.3 From 325cc10aa762d9a80b95fc4101383a23a7e12f14 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Wed, 7 Nov 2018 15:37:00 -0500 Subject: sub_8113F14; make C code compatible with modern cc1 --- asm/quest_log.s | 25 -------------- src/load_save.c | 8 ++--- src/quest_log.c | 103 +++++++++++++++++++++++++++++++------------------------- src/save.c | 7 +++- 4 files changed, 67 insertions(+), 76 deletions(-) diff --git a/asm/quest_log.s b/asm/quest_log.s index 655d791c5..fb9a5692c 100644 --- a/asm/quest_log.s +++ b/asm/quest_log.s @@ -5,31 +5,6 @@ .text - thumb_func_start sub_8113F14 -sub_8113F14: @ 8113F14 - push {r4,lr} - adds r2, r0, 0 - adds r4, r1, 0 - movs r0, 0x3 - adds r1, r2, 0 - bl sub_8113DE0 - adds r2, r0, 0 - cmp r2, 0 - beq _08113F34 - ldrh r0, [r4] - strh r0, [r2] - ldrh r0, [r4, 0x2] - strh r0, [r2, 0x2] - adds r0, r2, 0x4 - b _08113F36 -_08113F34: - movs r0, 0 -_08113F36: - pop {r4} - pop {r1} - bx r1 - thumb_func_end sub_8113F14 - thumb_func_start sub_8113F3C sub_8113F3C: @ 8113F3C push {r4,lr} diff --git a/src/load_save.c b/src/load_save.c index eba01642c..da55869aa 100644 --- a/src/load_save.c +++ b/src/load_save.c @@ -40,10 +40,10 @@ EWRAM_DATA struct LoadedSaveData gLoadedSaveData = {0}; EWRAM_DATA u32 gLastEncryptionKey = 0; // IWRAM common -IWRAM_DATA bool32 gFlashMemoryPresent; -IWRAM_DATA struct SaveBlock1 *gSaveBlock1Ptr; -IWRAM_DATA struct SaveBlock2 *gSaveBlock2Ptr; -IWRAM_DATA struct PokemonStorage *gPokemonStoragePtr; +bool32 gFlashMemoryPresent; +struct SaveBlock1 *gSaveBlock1Ptr; +struct SaveBlock2 *gSaveBlock2Ptr; +struct PokemonStorage *gPokemonStoragePtr; void CheckForFlashMemory(void) { diff --git a/src/quest_log.c b/src/quest_log.c index 82b93898e..a82d4f0ab 100644 --- a/src/quest_log.c +++ b/src/quest_log.c @@ -170,7 +170,7 @@ void sub_8113524(struct Var4038Struct *); bool8 sub_81136D4(void); bool8 sub_8113778(u16, u16 *); bool8 sub_81137E4(u16, u16 *); -void * sub_8113828(u16, u16 *); +u16 * sub_8113828(u16, u16 *); bool8 sub_81138A0(u16, u16 *); bool8 sub_8113954(u16, u16 *); void sub_8113A1C(u16); @@ -192,82 +192,82 @@ u16 * sub_8113CC8(u16 *, struct UnkStruct_203AE98 *); u16 * sub_8113D08(u16 *, struct UnkStruct_203AE98 *); u16 * sub_8113D48(u16 *, struct UnkStruct_203AE98 *); u16 * sub_8113D94(u16 *, struct UnkStruct_203AE98 *); -void *sub_8113F14(void *, void *); +u16 *sub_8113F14(u16 *, u16 *); u16 *sub_8113F3C(u16 *); -void *sub_8113F80(void *, void *); +u16 *sub_8113F80(u16 *, u16 *); u16 *sub_8113FBC(u16 *); -void *sub_8114174(void *, void *); +u16 *sub_8114174(u16 *, u16 *); u16 *sub_8114188(u16 *); -void *sub_81141D0(void *, void *); +u16 *sub_81141D0(u16 *, u16 *); u16 *sub_81141E4(u16 *); -void *sub_811422C(void *, void *); +u16 *sub_811422C(u16 *, u16 *); u16 *sub_8114240(u16 *); -void *sub_8114288(void *, void *); +u16 *sub_8114288(u16 *, u16 *); u16 *sub_811429C(u16 *); -void *sub_8114310(void *, void *); +u16 *sub_8114310(u16 *, u16 *); u16 *sub_8114324(u16 *); -void *sub_8114380(void *, void *); +u16 *sub_8114380(u16 *, u16 *); u16 *sub_8114394(u16 *); -void *sub_81143F0(void *, void *); +u16 *sub_81143F0(u16 *, u16 *); u16 *sub_811443C(u16 *); -void *sub_811445C(void *, void *); +u16 *sub_811445C(u16 *, u16 *); u16 *sub_811448C(u16 *); -void *sub_81144EC(void *, void *); +u16 *sub_81144EC(u16 *, u16 *); u16 *sub_8114518(u16 *); -void *sub_8114578(void *, void *); +u16 *sub_8114578(u16 *, u16 *); u16 *sub_81145A4(u16 *); -void *sub_8114604(void *, void *); +u16 *sub_8114604(u16 *, u16 *); u16 *sub_811464C(u16 *); -void *sub_8114710(void *, void *); +u16 *sub_8114710(u16 *, u16 *); u16 *sub_8114724(u16 *); -void *sub_8114744(void *, void *); +u16 *sub_8114744(u16 *, u16 *); u16 *sub_8114758(u16 *); -void *sub_8114778(void *, void *); +u16 *sub_8114778(u16 *, u16 *); u16 *sub_81147A8(u16 *); -void *sub_8114808(void *, void *); +u16 *sub_8114808(u16 *, u16 *); u16 *sub_8114834(u16 *); -void *sub_811488C(void *, void *); +u16 *sub_811488C(u16 *, u16 *); u16 *sub_81148BC(u16 *); -void *sub_8114918(void *, void *); +u16 *sub_8114918(u16 *, u16 *); u16 *sub_8114944(u16 *); -void *sub_8114990(void *, void *); +u16 *sub_8114990(u16 *, u16 *); u16 *sub_81149D0(u16 *); -void *sub_8114A1C(void *, void *); +u16 *sub_8114A1C(u16 *, u16 *); u16 *sub_8114A4C(u16 *); -void *sub_8114AA0(void *, void *); +u16 *sub_8114AA0(u16 *, u16 *); u16 *sub_8114AC8(u16 *); -void *sub_8114B0C(void *, void *); +u16 *sub_8114B0C(u16 *, u16 *); u16 *sub_8114B34(u16 *); -void *sub_8114B78(void *, void *); +u16 *sub_8114B78(u16 *, u16 *); u16 *sub_8114BA0(u16 *); -void *sub_8114BE4(void *, void *); +u16 *sub_8114BE4(u16 *, u16 *); u16 *sub_8114C0C(u16 *); -void *sub_8114C68(void *, void *); +u16 *sub_8114C68(u16 *, u16 *); u16 *sub_8114C8C(u16 *); -void *sub_8114CC0(void *, void *); +u16 *sub_8114CC0(u16 *, u16 *); u16 *sub_8114CE4(u16 *); -void *sub_8114D4C(void *, void *); +u16 *sub_8114D4C(u16 *, u16 *); u16 *sub_8114D68(u16 *); -void *sub_8114DE8(void *, void *); +u16 *sub_8114DE8(u16 *, u16 *); u16 *sub_8114E68(u16 *); bool8 sub_8114FBC(u16); -void *sub_8114FF0(void *, void *); +u16 *sub_8114FF0(u16 *, u16 *); u16 *sub_811500C(u16 *); -void *sub_8115078(void *, void *); +u16 *sub_8115078(u16 *, u16 *); u16 *sub_81150CC(u16 *); -void *sub_81151C0(void *, void *); +u16 *sub_81151C0(u16 *, u16 *); u16 *sub_81151DC(u16 *); -void *sub_8115280(void *, void *); +u16 *sub_8115280(u16 *, u16 *); u16 *sub_81152BC(u16 *); -void *sub_8115410(void *, void *); +u16 *sub_8115410(u16 *, u16 *); u16 *sub_8115460(u16 *); -void *sub_81154DC(void *, void *); +u16 *sub_81154DC(u16 *, u16 *); u16 *sub_8115518(u16 *); -void *sub_81155A4(void *, void *); +u16 *sub_81155A4(u16 *, u16 *); u16 *sub_81155E0(u16 *); -void *sub_81156D8(void *, void *); +u16 *sub_81156D8(u16 *, u16 *); u16 *sub_8115700(u16 *); -void *sub_81157DC(void *, void *); +u16 *sub_81157DC(u16 *, u16 *); u16 *sub_8115800(u16 *); bool8 sub_81153A8(u16, void*); bool8 sub_81153E4(u16, void*); @@ -2645,7 +2645,7 @@ u8 sub_8113530(void) return sub_8113114(VAR_0x4038_STRUCT, gUnknown_20370C0); } -void * (*const gUnknown_8456948[])(void *, void *) = { +u16 * (*const gUnknown_8456948[])(u16 *, u16 *) = { NULL, NULL, NULL, @@ -2694,7 +2694,7 @@ void * (*const gUnknown_8456948[])(void *, void *) = { #ifdef NONMATCHING void sub_8113550(u16 a0, u16 * a1) { - void * r1; + u16 * r1; if (a0 == 35 && gUnknown_203B048 == 2) { @@ -3034,7 +3034,7 @@ void sub_811381C(void) gUnknown_203B048 = 0; } -void * sub_8113828(u16 a0, u16 * a1) +u16 * sub_8113828(u16 a0, u16 * a1) { if (sub_8113778(a0, a1) == TRUE) return NULL; @@ -3080,10 +3080,10 @@ void sub_811390C(void) { if (gUnknown_203B024.unk_00 != 0) { - void * resp; + u16 * resp; gUnknown_203B04A = 0; sub_8110AEC(gUnknown_203B024.unk_00); - resp = gUnknown_8456948[gUnknown_203B024.unk_00](gUnknown_203AE08, &gUnknown_203B024.unk_04); + resp = gUnknown_8456948[gUnknown_203B024.unk_00](gUnknown_203AE08, (u16 *)&gUnknown_203B024.unk_04); gUnknown_203AE08 = resp; sub_81138F8(); } @@ -3106,14 +3106,14 @@ void sub_81139BC(void) { if (gUnknown_203B024.unk_00 != 0) { - void * resp; + u16 * resp; if (gUnknown_3005E88 == 0) { gUnknown_203B04A = 0; sub_8110AEC(gUnknown_203B024.unk_00); } sub_8113B94(gUnknown_203B024.unk_00); - resp = gUnknown_8456948[gUnknown_203B024.unk_00](gUnknown_203AE08, &gUnknown_203B024.unk_04); + resp = gUnknown_8456948[gUnknown_203B024.unk_00](gUnknown_203AE08, (u16 *)&gUnknown_203B024.unk_04); gUnknown_203AE08 = resp; sub_8113A1C(1); sub_81138F8(); @@ -3533,3 +3533,14 @@ void sub_8113EAC(u16 a0, u8 * a1, u8 a2) UnkTextUtil_SetPtrI(a2, gText_EggNickname); } } + +u16 * sub_8113F14(u16 * a0, u16 * a1) +{ + u16 * r2 = sub_8113DE0(3, a0); + if (r2 == NULL) + return NULL; + + r2[0] = a1[0]; + r2[1] = a1[1]; + return r2 + 2; +} diff --git a/src/save.c b/src/save.c index 28f6a2896..ef38d8b17 100644 --- a/src/save.c +++ b/src/save.c @@ -614,7 +614,12 @@ u16 CalculateChecksum(void *data, u16 size) u32 checksum = 0; for (i = 0; i < (size / 4); i++) - checksum += *((u32 *)data)++; + { + // checksum += *(u32 *)data++; + // For compatibility with modern gcc, these statements were separated. + checksum += *(u32 *)data; + data += 4; + } return ((checksum >> 16) + checksum); } -- cgit v1.2.3 From 2cc1329cd0433e65614bfd498ac979512aa6866c Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Thu, 8 Nov 2018 09:44:56 -0500 Subject: sub_8113F3C; disassemble some strings --- asm/quest_log.s | 30 ------- charmap.txt | 2 + data/data_83FECCC.s | 224 ++++++++++++++++++++++++++++++++++++++++++++++++---- data/quest_log.s | 170 ++++++++++++++++++++++++++++++++++++--- src/quest_log.c | 11 +++ 5 files changed, 381 insertions(+), 56 deletions(-) diff --git a/asm/quest_log.s b/asm/quest_log.s index fb9a5692c..d0933093a 100644 --- a/asm/quest_log.s +++ b/asm/quest_log.s @@ -5,36 +5,6 @@ .text - thumb_func_start sub_8113F3C -sub_8113F3C: @ 8113F3C - push {r4,lr} - adds r1, r0, 0 - movs r0, 0x3 - bl sub_8113E88 - adds r4, r0, 0 - ldrh r0, [r4] - ldr r1, _08113F70 @ =gStringVar1 - movs r2, 0 - bl sub_8113EAC - ldrh r0, [r4, 0x2] - ldr r1, _08113F74 @ =gStringVar2 - movs r2, 0 - bl sub_8113EAC - ldr r0, _08113F78 @ =gStringVar4 - ldr r1, _08113F7C @ =gUnknown_841A16F - bl StringExpandPlaceholders - adds r4, 0x4 - adds r0, r4, 0 - pop {r4} - pop {r1} - bx r1 - .align 2, 0 -_08113F70: .4byte gStringVar1 -_08113F74: .4byte gStringVar2 -_08113F78: .4byte gStringVar4 -_08113F7C: .4byte gUnknown_841A16F - thumb_func_end sub_8113F3C - thumb_func_start sub_8113F80 sub_8113F80: @ 8113F80 push {r4,lr} diff --git a/charmap.txt b/charmap.txt index 1c68994df..b81563bfc 100644 --- a/charmap.txt +++ b/charmap.txt @@ -321,6 +321,8 @@ TALL_PLUS = FC 0C FB '·' = AF '‥' = B0 +@ TODO: Identify and declare F7 control codes + STRING = FD @ string placeholders diff --git a/data/data_83FECCC.s b/data/data_83FECCC.s index 666549d4c..31c3c67fd 100644 --- a/data/data_83FECCC.s +++ b/data/data_83FECCC.s @@ -2,7 +2,7 @@ .align 2 gUnknown_83FECCC:: @ 83FECCC - .incbin "baserom.gba", 0x3FECCC, 0x6 + .byte 0x0c, 0x00, 0x1c, 0x00, 0x2c, 0x00 gUnknown_83FECD2:: @ 83FECD2 .incbin "baserom.gba", 0x3FECD2, 0x4 @@ -1511,10 +1511,19 @@ gUnknown_841A477:: @ 841A477 .incbin "baserom.gba", 0x41A477, 0x4F gUnknown_841A4C6:: @ 841A4C6 - .incbin "baserom.gba", 0x41A4C6, 0x45 + .incbin "baserom.gba", 0x41A4C6, 0x3C + +gUnknown_841A502:: + .string "win$" + +gUnknown_841A506:: + .string "loss$" gUnknown_841A50B:: @ 841A50B - .incbin "baserom.gba", 0x41A50B, 0x5B + .string "Mingled with other TRAINERS in\nthe UNION ROOM.$" + +gUnknown_841A53A:: + .string "Departed {STR_VAR_2}\nin {STR_VAR_1} for the next\ndestination.$" gUnknown_841A566:: @ 841A566 .incbin "baserom.gba", 0x41A566, 0x36 @@ -1541,16 +1550,25 @@ gUnknown_841A66E:: @ 841A66E .incbin "baserom.gba", 0x41A66E, 0x26 gUnknown_841A694:: @ 841A694 - .incbin "baserom.gba", 0x41A694, 0x11 + .string "a different spot$" gUnknown_841A6A5:: @ 841A6A5 - .incbin "baserom.gba", 0x41A6A5, 0x3C + .string "Removed the item {STR_VAR_1} from\n{PLAYER}’s PC and gave it to {STR_VAR_2}\nto hold.$" gUnknown_841A6E1:: @ 841A6E1 - .incbin "baserom.gba", 0x41A6E1, 0x51 + .string "Removed the item {STR_VAR_1} from\na PC, gave it to {STR_VAR_2}, and put\nthe {STR_VAR_3} it held in the BAG.$" gUnknown_841A732:: @ 841A732 - .incbin "baserom.gba", 0x41A732, 0x38 + .string "Chatted with many TRAINERS.$" + +gUnknown_841A74E:: + .string "handily$" + +gUnknown_841A756:: + .string "tenaciously$" + +gUnknown_841A762:: + .string "somehow$" gUnknown_841A76A:: @ 841A76A .incbin "baserom.gba", 0x41A76A, 0x46 @@ -1574,7 +1592,13 @@ gUnknown_841A8D4:: @ 841A8D4 .incbin "baserom.gba", 0x41A8D4, 0x9 gUnknown_841A8DD:: @ 841A8DD - .incbin "baserom.gba", 0x41A8DD, 0x5B + .incbin "baserom.gba", 0x41A8DD, 0x3 + +gUnknown_841A8E0:: @ 841A8E0 + .string "{STR_VAR_1} shared its HP using the move\nSOFTBOILED.$" + +gUnknown_841A90C:: @ 841A90C + .string "{STR_VAR_1} shared its HP using the move\nMILK DRINK.$" gUnknown_841A938:: @ 841A938 .incbin "baserom.gba", 0x41A938, 0x2D @@ -1610,13 +1634,64 @@ gUnknown_841AB74:: @ 841AB74 .incbin "baserom.gba", 0x41AB74, 0x1A gUnknown_841AB8E:: @ 841AB8E - .incbin "baserom.gba", 0x41AB8E, 0x2BA + .string "{PLAYER} made {STR_VAR_1} hold the item\n{STR_VAR_2}.$" + +gUnknown_841ABAB:: @ 841ABAB + .string "{STR_VAR_1} used the Hidden Move\nCUT here.$" + +gUnknown_841ABCD:: @ 841ABCD + .string "{STR_VAR_1} used the Hidden Move\nFLY and flew to {STR_VAR_2}.$" + +gUnknown_841ABF9:: @ 841ABF9 + .string "{STR_VAR_1} used the Hidden Move\nSURF and rode the waves.$" + +gUnknown_841AC2A:: @ 841AC2A + .string "{STR_VAR_1} used the Hidden Move\nSTRENGTH here.$" + +gUnknown_841AC51:: @ 841AC51 + .string "{STR_VAR_1} used the Hidden Move\nFLASH and illuminated a pitch-black\ncave.$" + +gUnknown_841AC93:: @ 841AC93 + .string "{STR_VAR_1} used the Hidden Move\nROCK SMASH here.$" + +gUnknown_841ACBC:: @ 841ACBC + .string "{STR_VAR_1} used the Hidden Move\nWATERFALL to scale a raging torrent.$" + +gUnknown_841ACF9:: @ 841ACF9 + .string "{STR_VAR_1}è êÉà Ñ㓪& òã–Ã\néã§+ã‚ã–\nダ¡ビング& ÚÉã£Å’!$" + +gUnknown_841AD1D:: @ 841AD1D + .string "{STR_VAR_1} used DIG to escape from\n{STR_VAR_2}.$" + +gUnknown_841AD3C:: @ 841AD3C + .string "{STR_VAR_1} used SWEET SCENT to attract\nwild POKéMON.$" + +gUnknown_841AD69:: @ 841AD69 + .string "{STR_VAR_1} used TELEPORT, transporting\nthe party to {STR_VAR_2}’s\n{STR_VAR_3}.$" + +gUnknown_841AD9E:: @ 841AD9E + .string "{PLAYER} left {STR_VAR_1}’s\n{STR_VAR_2} for the next\ndestination.$" + +gUnknown_841ADC8:: @ 841ADC8 + .string "Played a lot of games at the ROCKET\nGAME CORNER in {STR_VAR_1}.$" + +gUnknown_841ADFF:: @ 841ADFF + .string "{PLAYER} rested comfortably at home.$" + +gUnknown_841AE1E:: @ 841AE1E + .string "{PLAYER} left PROF. OAK’s POKéMON\nRESEARCH LAB.$" gUnknown_841AE48:: @ 841AE48 - .incbin "baserom.gba", 0x41AE48, 0x47 + .string "The GYM in {STR_VAR_1} was full of\ntough TRAINERS…\nPreparations had to be made.$" gUnknown_841AE8F:: @ 841AE8F - .incbin "baserom.gba", 0x41AE8F, 0x7D + .string "Departed the GYM in {STR_VAR_1}.$" + +gUnknown_841AEA7:: @ 841AEA7 + .string "{PLAYER} had a great time with POKéMON\nin the SAFARI ZONE.$" + +gUnknown_841AEDC:: @ 841AEDC + .string "Managed to get out of {STR_VAR_2}\nafter wandering about.$" gUnknown_841AF0C:: @ 841AF0C .incbin "baserom.gba", 0x41AF0C, 0x32 @@ -1625,22 +1700,136 @@ gUnknown_841AF3E:: @ 841AF3E .incbin "baserom.gba", 0x41AF3E, 0x2F gUnknown_841AF6D:: @ 841AF6D - .incbin "baserom.gba", 0x41AF6D, 0x39 + .incbin "baserom.gba", 0x41AF6D, 0x2B + +gUnknown_841AF98:: @ 841AF98 + .string "coolly$" + +gUnknown_841AF9F:: @ 841AF9F + .string "barely$" gUnknown_841AFA6:: @ 841AFA6 - .incbin "baserom.gba", 0x41AFA6, 0x99 + .string "{PLAYER} used an ESCAPE ROPE to get\nout from {STR_VAR_2}.$" + +gUnknown_841AFD1:: @ 841AFD1 + .string "draw$" + +gUnknown_841AFD6:: @ 841AFD6 + .string "Departed from the {STR_VAR_2}\nfor the next destination.$" + +gUnknown_841B005:: @ 841B005 + .string "{PLAYER} departed from\n{STR_VAR_2} and made way\nto the next destination.$" gUnknown_841B03F:: @ 841B03F - .incbin "baserom.gba", 0x41B03F, 0x25 + .string "Here in {STR_VAR_1}, {PLAYER}\nobtained the item {STR_VAR_2}.$" gUnknown_841B064:: @ 841B064 - .incbin "baserom.gba", 0x41B064, 0xF + .string "Arrived in {STR_VAR_1}.$" gUnknown_841B073:: @ 841B073 - .incbin "baserom.gba", 0x41B073, 0x2C + .string "And {PLAYER} saved the game at this\nlocation: {STR_VAR_1}.$" gUnknown_841B09F:: @ 841B09F - .incbin "baserom.gba", 0x41B09F, 0x1E6 + .string "HOME$" + +gUnknown_841B0A4:: @ 841B0A4 + .string "OAK RESEARCH LAB$" + +gUnknown_841B0B5:: @ 841B0B5 + .string "GYM$" + +gUnknown_841B0B9:: @ 841B0B9 + .string "POKéMON LEAGUE GATE$" + +gUnknown_841B0CD:: @ 841B0CD + .string "VIRIDIAN FOREST$" + +gUnknown_841B0DD:: @ 841B0DD + .string "PEWTER MUSEUM OF SCIENCE$" + +gUnknown_841B0F6:: @ 841B0F6 + .string "MT. MOON$" + +gUnknown_841B0FF:: @ 841B0FF + .string "BIKE SHOP$" + +gUnknown_841B109:: @ 841B109 + .string "BILL’S HOUSE$" + +gUnknown_841B116:: @ 841B116 + .string "DAY CARE$" + +gUnknown_841B11F:: @ 841B11F + .string "UNDERGROUND PATH$" + +gUnknown_841B130:: @ 841B130 + .string "POKéMON FAN CLUB$" + +gUnknown_841B141:: @ 841B141 + .string "S.S. ANNE$" + +gUnknown_841B14B:: @ 841B14B + .string "DIGLETT’S CAVE$" + +gUnknown_841B15A:: @ 841B15A + .string "ROCK TUNNEL$" + +gUnknown_841B166:: @ 841B166 + .string "POWER PLANT$" + +gUnknown_841B172:: @ 841B172 + .string "POKéMON TOWER$" + +gUnknown_841B180:: @ 841B180 + .string "VOLUNTEER HOUSE$" + +gUnknown_841B190:: @ 841B190 + .string "NAME RATER’S HOUSE$" + +gUnknown_841B1A3:: @ 841B1A3 + .string "CELADON DEPT. STORE$" + +gUnknown_841B1B7:: @ 841B1B7 + .string "CELADON MANSION$" + +gUnknown_841B1C7:: @ 841B1C7 + .string "ROCKET GAME CORNER$" + +gUnknown_841B1DA:: @ 841B1DA + .string "RESTAURANT$" + +gUnknown_841B1E5:: @ 841B1E5 + .string "ROCKET HIDEOUT$" + +gUnknown_841B1F4:: @ 841B1F4 + .string "SAFARI ZONE$" + +gUnknown_841B200:: @ 841B200 + .string "WARDEN’S HOME$" + +gUnknown_841B20E:: @ 841B20E + .string "FIGHTING DOJO$" + +gUnknown_841B21C:: @ 841B21C + .string "SILPH CO.$" + +gUnknown_841B226:: @ 841B226 + .string "SEAFOAM ISLANDS$" + +gUnknown_841B236:: @ 841B236 + .string "POKéMON MANSION$" + +gUnknown_841B246:: @ 841B246 + .string "POKéMON RESEARCH LAB$" + +gUnknown_841B25B:: @ 841B25B + .string "VICTORY ROAD$" + +gUnknown_841B268:: @ 841B268 + .string "POKéMON LEAGUE$" + +gUnknown_841B277:: @ 841B277 + .string "CERULEAN CAVE$" gUnknown_841B285:: @ 841B285 .incbin "baserom.gba", 0x41B285, 0xE @@ -4312,3 +4501,4 @@ gUnknown_8468B6C:: @ 8468B6C gUnknown_8468BCC:: @ 8468BCC .incbin "baserom.gba", 0x468BCC, 0x90 + diff --git a/data/quest_log.s b/data/quest_log.s index f8d02c32a..cf55e5b0a 100644 --- a/data/quest_log.s +++ b/data/quest_log.s @@ -2,28 +2,180 @@ .align 2 gUnknown_8456ACC:: @ 8456ACC - .incbin "baserom.gba", 0x456ACC, 0xC + .4byte gUnknown_841A74E + .4byte gUnknown_841A756 + .4byte gUnknown_841A762 gUnknown_8456AD8:: @ 8456AD8 - .incbin "baserom.gba", 0x456AD8, 0xC + .4byte gUnknown_841AF98 + .4byte gUnknown_841A762 + .4byte gUnknown_841AF9F gUnknown_8456AE4:: @ 8456AE4 - .incbin "baserom.gba", 0x456AE4, 0xC + .4byte gUnknown_841A502 + .4byte gUnknown_841A506 + .4byte gUnknown_841AFD1 gUnknown_8456AF0:: @ 8456AF0 - .incbin "baserom.gba", 0x456AF0, 0xCC + .4byte gUnknown_841B09F + .4byte gUnknown_841B0A4 + .4byte gUnknown_841B0B5 + .4byte gUnknown_841B0B9 + .4byte gUnknown_841B0B9 + .4byte gUnknown_841B0CD + .4byte gUnknown_841B0CD + .4byte gUnknown_841B0DD + .4byte gUnknown_841B0B5 + .4byte gUnknown_841B0F6 + .4byte gUnknown_841B0F6 + .4byte gUnknown_841B0B5 + .4byte gUnknown_841B0FF + .4byte gUnknown_841B109 + .4byte gUnknown_841B116 + .4byte gUnknown_841B11F + .4byte gUnknown_841B11F + .4byte gUnknown_841B130 + .4byte gUnknown_841B0B5 + .4byte gUnknown_841B141 + .4byte gUnknown_841B14B + .4byte gUnknown_841B14B + .4byte gUnknown_841B15A + .4byte gUnknown_841B15A + .4byte gUnknown_841B166 + .4byte gUnknown_841B172 + .4byte gUnknown_841B180 + .4byte gUnknown_841B190 + .4byte gUnknown_841B11F + .4byte gUnknown_841B11F + .4byte gUnknown_841B1A3 + .4byte gUnknown_841B1B7 + .4byte gUnknown_841B1C7 + .4byte gUnknown_841B0B5 + .4byte gUnknown_841B1DA + .4byte gUnknown_841B1E5 + .4byte gUnknown_841B1F4 + .4byte gUnknown_841B0B5 + .4byte gUnknown_841B200 + .4byte gUnknown_841B20E + .4byte gUnknown_841B0B5 + .4byte gUnknown_841B21C + .4byte gUnknown_841B226 + .4byte gUnknown_841B226 + .4byte gUnknown_841B236 + .4byte gUnknown_841B0B5 + .4byte gUnknown_841B246 + .4byte gUnknown_841B25B + .4byte gUnknown_841B25B + .4byte gUnknown_841B268 + .4byte gUnknown_841B277 gUnknown_8456BBC:: @ 8456BBC - .incbin "baserom.gba", 0x456BBC, 0x28 + .4byte gUnknown_841A53A + .4byte gUnknown_841AD9E + .4byte gUnknown_841ADC8 + .4byte gUnknown_841ADFF + .4byte gUnknown_841AE1E + .4byte gUnknown_841AE48 + .4byte gUnknown_841AEA7 + .4byte gUnknown_841AEDC + .4byte gUnknown_841AFD6 + .4byte gUnknown_841B005 gUnknown_8456BE4:: @ 8456BE4 - .incbin "baserom.gba", 0x456BE4, 0x33 + .byte 0x03 + .byte 0x04 + .byte 0x05 + .byte 0x08 + .byte 0x08 + .byte 0x07 + .byte 0x07 + .byte 0x01 + .byte 0x05 + .byte 0x07 + .byte 0x07 + .byte 0x05 + .byte 0x00 + .byte 0x00 + .byte 0x00 + .byte 0x08 + .byte 0x08 + .byte 0x00 + .byte 0x05 + .byte 0x08 + .byte 0x07 + .byte 0x07 + .byte 0x07 + .byte 0x07 + .byte 0x08 + .byte 0x08 + .byte 0x00 + .byte 0x00 + .byte 0x08 + .byte 0x08 + .byte 0x00 + .byte 0x00 + .byte 0x02 + .byte 0x05 + .byte 0x00 + .byte 0x08 + .byte 0x06 + .byte 0x05 + .byte 0x00 + .byte 0x00 + .byte 0x05 + .byte 0x09 + .byte 0x07 + .byte 0x07 + .byte 0x09 + .byte 0x05 + .byte 0x00 + .byte 0x07 + .byte 0x07 + .byte 0x08 + .byte 0x07 gUnknown_8456C17:: @ 8456C17 - .incbin "baserom.gba", 0x456C17, 0x9 + .byte 0x5a + .byte 0x5b + .byte 0x5d + .byte 0x5e + .byte 0x5f + .byte 0x62 + .byte 0x60 + .byte 0x59 + .byte 0x00 gUnknown_8456C20:: @ 8456C20 - .incbin "baserom.gba", 0x456C20, 0x30 + .4byte gUnknown_841AC51 + .4byte gUnknown_841ABAB + .4byte gUnknown_841ABCD + .4byte gUnknown_841AC2A + .4byte gUnknown_841ABF9 + .4byte gUnknown_841AC93 + .4byte gUnknown_841ACBC + .4byte gUnknown_841AD69 + .4byte gUnknown_841AD1D + .4byte gUnknown_841A90C + .4byte gUnknown_841A8E0 + .4byte gUnknown_841AD3C gUnknown_8456C50:: @ 8456C50 - .incbin "baserom.gba", 0x456C50, 0x24 + .2byte 0x0891 + .2byte 0x0892 + .2byte 0x0893 + .2byte 0x0894 + .2byte 0x0895 + .2byte 0x0896 + .2byte 0x0897 + .2byte 0x0898 + .2byte 0x0899 + .2byte 0x089a + .2byte 0x089b + .2byte 0x089c + .2byte 0x089d + .2byte 0x089e + .2byte 0x089f + .2byte 0x08a0 + .2byte 0x08a1 + .2byte 0x0000 + diff --git a/src/quest_log.c b/src/quest_log.c index a82d4f0ab..b95bc8bd6 100644 --- a/src/quest_log.c +++ b/src/quest_log.c @@ -273,6 +273,7 @@ bool8 sub_81153A8(u16, void*); bool8 sub_81153E4(u16, void*); extern const u8 gUnknown_841A155[]; +extern const u8 gUnknown_841A16F[]; extern const u8 gUnknown_841B073[]; const struct WindowTemplate gUnknown_845661C[3] = { @@ -3544,3 +3545,13 @@ u16 * sub_8113F14(u16 * a0, u16 * a1) r2[1] = a1[1]; return r2 + 2; } + +u16 * sub_8113F3C(u16 * a0) +{ + u16 * r4 = sub_8113E88(3, a0); + sub_8113EAC(r4[0], gStringVar1, 0); + sub_8113EAC(r4[1], gStringVar2, 0); + StringExpandPlaceholders(gStringVar4, gUnknown_841A16F); + r4 += 2; + return r4; +} -- cgit v1.2.3 From 27ed9452c6559d973e3ad4484d84c309a5713a09 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Thu, 8 Nov 2018 10:05:22 -0500 Subject: Placeholder for text control code F7 --- charmap.txt | 1 + data/data_83FECCC.s | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/charmap.txt b/charmap.txt index b81563bfc..2abc3fa50 100644 --- a/charmap.txt +++ b/charmap.txt @@ -322,6 +322,7 @@ TALL_PLUS = FC 0C FB '‥' = B0 @ TODO: Identify and declare F7 control codes +UNKNOWN_F7 = F7 STRING = FD diff --git a/data/data_83FECCC.s b/data/data_83FECCC.s index 31c3c67fd..4b332a1aa 100644 --- a/data/data_83FECCC.s +++ b/data/data_83FECCC.s @@ -1592,7 +1592,7 @@ gUnknown_841A8D4:: @ 841A8D4 .incbin "baserom.gba", 0x41A8D4, 0x9 gUnknown_841A8DD:: @ 841A8DD - .incbin "baserom.gba", 0x41A8DD, 0x3 + .string "{UNKNOWN_F7 0x04}$" gUnknown_841A8E0:: @ 841A8E0 .string "{STR_VAR_1} shared its HP using the move\nSOFTBOILED.$" -- cgit v1.2.3 From 21b5f78d6a38032aa49870a4c02cacfed2249ab8 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Thu, 8 Nov 2018 11:01:58 -0500 Subject: More string dumps (some Japanese text was incorrectly dumped as gibberish) --- charmap.txt | 1 + data/data_83FECCC.s | 357 ++++++++++++++++++++++++++++++++++++++++++++-------- data/quest_log.s | 1 + 3 files changed, 306 insertions(+), 53 deletions(-) diff --git a/charmap.txt b/charmap.txt index 2abc3fa50..f89919509 100644 --- a/charmap.txt +++ b/charmap.txt @@ -323,6 +323,7 @@ TALL_PLUS = FC 0C FB @ TODO: Identify and declare F7 control codes UNKNOWN_F7 = F7 +UNKNOWN_F9 = F9 STRING = FD diff --git a/data/data_83FECCC.s b/data/data_83FECCC.s index 4b332a1aa..724138136 100644 --- a/data/data_83FECCC.s +++ b/data/data_83FECCC.s @@ -1271,7 +1271,14 @@ gUnknown_8418C83:: @ 8418C83 .incbin "baserom.gba", 0x418C83, 0x56 gUnknown_8418CD9:: @ 8418CD9 - .incbin "baserom.gba", 0x418CD9, 0x130 + .string "The backup memory is damaged or\n" + .string "the game’s battery has run dry.\n" + .string "The game can be played, but its\n" + .string "progress cannot be saved.\n" + .string "“Please press the A Button.â€$" + +gUnknown_8418D70:: @ 8418D70 + .incbin "baserom.gba", 0x418D70, 0x99 gUnknown_8418E09:: @ 8418E09 .incbin "baserom.gba", 0x418E09, 0x6E @@ -1307,46 +1314,210 @@ gUnknown_8418EBC:: @ 8418EBC .incbin "baserom.gba", 0x418EBC, 0x7 gUnknown_8418EC3:: @ 8418EC3 - .incbin "baserom.gba", 0x418EC3, 0x8BF + .string "No data$" + +gUnknown_8418ECB:: @ 8418ECB + @ Viridian Forest + .string "A deep and sprawling forest that\n" + .string "extends around VIRIDIAN CITY.\n" + .string "A natural maze, many people\n" + .string "become lost inside.$" + +gUnknown_8418F3A:: @ 8418F3A + @ Mt. Moon + .string "A mystical mountain that is known\n" + .string "for its frequent meteor falls.\n" + .string "The shards of stars that fall\n" + .string "here are known as MOON STONES.$" + +gUnknown_8418FB8:: @ 8418FB8 + @ Diglett's Cave + .string "A seemingly plain tunnel that was\n" + .string "dug by wild DIGLETT.\n" + .string "It is famous for connecting\n" + .string "ROUTES 2 and 11.$" + +gUnknown_841901C:: @ 841901C + @ Victory Road + .string "A tunnel situated on ROUTE 23.\n" + .string "It earned its name because it\n" + .string "must be traveled by all TRAINERS\n" + .string "aiming for the top.$" + +gUnknown_841908E:: @ 841908E + @ Pokémon Mansion + .string "A decrepit, burned-down mansion\n" + .string "on CINNABAR ISLAND.\n" + .string "It got its name because a famous\n" + .string "POKéMON researcher lived there.$" + +gUnknown_8419103:: @ 8419103 + @ Safari Zone + .string "An amusement park outside FUCHSIA\n" + .string "CITY where many rare POKéMON can\n" + .string "be observed in the wild.\n" + .string "Catch them in a popular game!$" + +gUnknown_841917D:: @ 841917D + @ Rock Tunnel + .string "A naturally formed underground\n" + .string "tunnel. Because it has not been\n" + .string "developed, it is inky dark inside.\n" + .string "A light is needed to get through.$" + +gUnknown_8419201:: @ 8419201 + @ Seafoam Islands + .string "A pair of islands that is situated\n" + .string "on ROUTE 20.\n" + .string "The two islands are shaped the\n" + .string "same, as if they were twins.$" + +gUnknown_841926D:: @ 841926D + @ Pokémon Tower + .string "A tower that houses the graves of\n" + .string "countless POKéMON.\n" + .string "Many people visit it daily to pay\n" + .string "their respects to the fallen.$" + +gUnknown_84192E2:: @ 84192E2 + @ Cerulean Cave + .string "A mysterious cave that is filled\n" + .string "with terribly tough POKéMON.\n" + .string "It is so dangerous, the POKéMON\n" + .string "LEAGUE is in charge of it.$" + +gUnknown_841935B:: @ 841935B + @ Power Plant + .string "A power plant that was abandoned\n" + .string "years ago, though some of the\n" + .string "machines still work. It is infested\n" + .string "with electric POKéMON.$" + +gUnknown_84193D5:: @ 84193D5 + @ Mt. Ember + .string "Supposedly an inactive volcano.\n" + .string "However, there are persistent\n" + .string "reports that the peak blazes\n" + .string "with fire at night.$" + +gUnknown_8419444:: @ 8419444 + @ Berry Forest + .string "A forest on a small islet off the\n" + .string "coast of THREE ISLAND. BERRIES\n" + .string "grow wildly in profusion, quickly\n" + .string "replenishing those that fall off.$" + +gUnknown_84194C9:: @ 84194C9 + @ Icefall Cave + .string "A cave which is covered by water\n" + .string "and ice on FOUR ISLAND.\n" + .string "It seems like the end of the cave\n" + .string "is connected to the ocean.$" + +gUnknown_841953F:: @ 841953F + @ Lost Cave + .string "A bewildering cave off the coast\n" + .string "of RESORT GORGEOUS.\n" + .string "Some curious thrill seekers have\n" + .string "never emerged from it.$" + +gUnknown_84195AC:: @ 84195AC + @ Tanoby Ruins + .string "An ancient ruin that is rumored to\n" + .string "be home to a peculiar POKéMON.\n" + .string "However, so far, the POKéMON\n" + .string "remains an unconfirmed rumor.$" + +gUnknown_8419629:: @ 8419629 + @ Altering Cave + .string "This island has been known by this\n" + .string "name since the distant past.\n" + .string "No one today knows where it got\n" + .string "this name, however.$" + +gUnknown_841969D:: @ 841969D + @ Pattern Bush + .string "A lush and bush-like area. \n" + .string "In it are patterns where no grass\n" + .string "grows. Some study it in the belief\n" + .string "that a secret is concealed.$" + +gUnknown_841971A:: @ 841971A + @ Dotted Hole + .string "A mysterious, just-discovered\n" + .string "ruin from an ancient time.\n" + .string "It got its name from the six dots\n" + .string "on its door.$" gUnknown_8419782:: @ 8419782 - .incbin "baserom.gba", 0x419782, 0x1B + .string "{UNKNOWN_F7 0x00} nature.\n" + .string "Met in a trade.$" gUnknown_841979D:: @ 841979D - .incbin "baserom.gba", 0x41979D, 0x1B + .string "{UNKNOWN_F7 0x00} nature.\n" + .string "Met in a trade.$" gUnknown_84197B8:: @ 84197B8 - .incbin "baserom.gba", 0x4197B8, 0x35 + .string "{UNKNOWN_F7 0x00} nature.\n" + .string "Met in a fateful encounter when\n" + .string "at {UNKNOWN_F9 0x05} {UNKNOWN_F7 0x01}.$" gUnknown_84197ED:: @ 84197ED - .incbin "baserom.gba", 0x4197ED, 0x35 + .string "{UNKNOWN_F7 0x00} nature.\n" + .string "Met in a fateful encounter when\n" + .string "at {UNKNOWN_F9 0x05} {UNKNOWN_F7 0x01}.$" gUnknown_8419822:: @ 8419822 - .incbin "baserom.gba", 0x419822, 0x1F + .string "{UNKNOWN_F7 0x00} nature.\n" + .string "Met in {UNKNOWN_F7 0x02} at {UNKNOWN_F9 0x05} {UNKNOWN_F7 0x01}.$" gUnknown_8419841:: @ 8419841 - .incbin "baserom.gba", 0x419841, 0x1F + .string "{UNKNOWN_F7 0x00} nature.\n" + .string "Met in {UNKNOWN_F7 0x02} at {UNKNOWN_F9 0x05} {UNKNOWN_F7 0x01}.$" gUnknown_8419860:: @ 8419860 - .incbin "baserom.gba", 0x419860, 0x2A + .string "{UNKNOWN_F7 0x00} nature.\n" + .string "Apparently met in {UNKNOWN_F7 0x02}\n" + .string "at {UNKNOWN_F9 0x05} {UNKNOWN_F7 0x01}.$" gUnknown_841988A:: @ 841988A - .incbin "baserom.gba", 0x41988A, 0x2A + .string "{UNKNOWN_F7 0x00} nature.\n" + .string "Apparently met in {UNKNOWN_F7 0x02}\n" + .string "at {UNKNOWN_F9 0x05} {UNKNOWN_F7 0x01}.$" gUnknown_84198B4:: @ 84198B4 - .incbin "baserom.gba", 0x4198B4, 0x21 + .string "{UNKNOWN_F7 0x00} nature.\n" + .string "Hatched: {UNKNOWN_F7 0x02}\n" + .string "at {UNKNOWN_F9 0x05} {UNKNOWN_F7 0x01}.$" gUnknown_84198D5:: @ 84198D5 - .incbin "baserom.gba", 0x4198D5, 0x5A + .string "{UNKNOWN_F7 0x00} nature.\n" + .string "Hatched: {UNKNOWN_F7 0x02}\n" + .string "at {UNKNOWN_F9 0x05} {UNKNOWN_F7 0x01}.$" + +@ TODO: Replace this gibberish with the proper Hiragana +gUnknown_84198F6:: @ 84198F6 + .string "{UNKNOWN_F7 0x00}ßÓÃÉË {UNKNOWN_F9 0x05}{UNKNOWN_F7 0x01}çÑÊ\n" + .string "{UNKNOWN_F7 0x02}㧠ÉÇã£Å’ ùÂã $" + +gUnknown_8419913:: @ 8419913 + .string "{UNKNOWN_F7 0x00}ÓÃÉË {UNKNOWN_F9 0x05}{UNKNOWN_F7 0x01}çÑÊ\n" + .string "{UNKNOWN_F7 0x02}㧠ÉÇã£Å’ ùÂã $" gUnknown_841992F:: @ 841992F - .incbin "baserom.gba", 0x41992F, 0x3E + .string "{UNKNOWN_F7 0x00} nature. Met in a fateful\n" + .string "encounter (hatched: {UNKNOWN_F7 0x02}\n" + .string "at {UNKNOWN_F9 0x05} {UNKNOWN_F7 0x01}).$" gUnknown_841996D:: @ 841996D - .incbin "baserom.gba", 0x41996D, 0x3E + .string "{UNKNOWN_F7 0x00} nature. Met in a fateful\n" + .string "encounter (hatched: {UNKNOWN_F7 0x02}\n" + .string "at {UNKNOWN_F9 0x05} {UNKNOWN_F7 0x01}).$" gUnknown_84199AB:: @ 84199AB - .incbin "baserom.gba", 0x4199AB, 0x49 + .string "{UNKNOWN_F7 0x00} nature. Apparently met in\n" + .string "a fateful encounter (hatched:\n" + .string "{UNKNOWN_F7 0x02} at {UNKNOWN_F9 0x05} {UNKNOWN_F7 0x01}).$" gUnknown_84199F4:: @ 84199F4 .incbin "baserom.gba", 0x4199F4, 0x217 @@ -1454,7 +1625,38 @@ gUnknown_8419E57:: @ 8419E57 .incbin "baserom.gba", 0x419E57, 0xFD gUnknown_8419F54:: @ 8419F54 - .incbin "baserom.gba", 0x419F54, 0x201 + .string "SAVING…\n" + .string "DON’T TURN OFF THE POWER.$" + +gUnknown_8419F76:: @ 8419F76 + .string "A device that records POKéMON secrets\n" + .string "upon meeting or catching them.$" + +gUnknown_8419FBB:: @ 8419FBB + .string "Check and organize POKéMON that are\n" + .string "traveling with you in your party.$" + +gUnknown_841A001:: @ 841A001 + .string "Equipped with pockets for storing items\n" + .string "you bought, received, or found.$" + +gUnknown_841A049:: @ 841A049 + .string "Check your money and other game data.$" + +gUnknown_841A06F:: @ 841A06F + .string "Save your game with a complete record\n" + .string "of your progress to take a break.$" + +gUnknown_841A0B7:: @ 841A0B7 + .string "Adjust various game settings such as text\n" + .string "speed, game rules, etc.$" + +gUnknown_841A0F9:: @ 841A0F9 + .string "Close this MENU window.$" + +gUnknown_841A111:: @ 841A111 + .string "Retire from the SAFARI GAME and return to\n" + .string "the registration counter.$" gUnknown_841A155:: @ 841A155 .string "Previously on your quest…$" @@ -1520,43 +1722,59 @@ gUnknown_841A506:: .string "loss$" gUnknown_841A50B:: @ 841A50B - .string "Mingled with other TRAINERS in\nthe UNION ROOM.$" + .string "Mingled with other TRAINERS in\n" + .string "the UNION ROOM.$" gUnknown_841A53A:: - .string "Departed {STR_VAR_2}\nin {STR_VAR_1} for the next\ndestination.$" + .string "Departed {STR_VAR_2}\n" + .string "in {STR_VAR_1} for the next\n" + .string "destination.$" gUnknown_841A566:: @ 841A566 - .incbin "baserom.gba", 0x41A566, 0x36 + .string "After consideration, switched\n" + .string "{UNKNOWN_F7 0x01} in {UNKNOWN_F7 0x00} with\n" + .string "{UNKNOWN_F7 0x03} in {UNKNOWN_F7 0x02}.$" gUnknown_841A59C:: @ 841A59C - .incbin "baserom.gba", 0x41A59C, 0x3D + .string "After deep thought, switched\n" + .string "{UNKNOWN_F7 0x01} in BOX “{UNKNOWN_F7 0x00}†to\n" + .string "the BOX “{UNKNOWN_F7 0x02}.â€$" gUnknown_841A5D9:: @ 841A5D9 - .incbin "baserom.gba", 0x41A5D9, 0x21 + .string "Switched around {UNKNOWN_F7 0x01} and\n" + .string "{UNKNOWN_F7 0x02} in {UNKNOWN_F7 0x00}.$" gUnknown_841A5FA:: @ 841A5FA - .incbin "baserom.gba", 0x41A5FA, 0x10 + .string "Moved {UNKNOWN_F7 0x01} in {UNKNOWN_F7 0x00}.$" gUnknown_841A60A:: @ 841A60A - .incbin "baserom.gba", 0x41A60A, 0x28 + .string "Switched {UNKNOWN_F7 0x01} in {UNKNOWN_F7 0x00}\n" + .string "with {UNKNOWN_F7 0x02} in the party.$" gUnknown_841A632:: @ 841A632 - .incbin "baserom.gba", 0x41A632, 0x1D + .string "Added {UNKNOWN_F7 0x01} in {UNKNOWN_F7 0x00}\n" + .string "to the party.$" gUnknown_841A64F:: @ 841A64F - .incbin "baserom.gba", 0x41A64F, 0x1F + .string "Moved {UNKNOWN_F7 0x00} from the party\n" + .string "to {UNKNOWN_F7 0x01}.$" gUnknown_841A66E:: @ 841A66E - .incbin "baserom.gba", 0x41A66E, 0x26 + .string "Moved a group of POKéMON in\n" + .string "{UNKNOWN_F7 0x00} to {UNKNOWN_F7 0x01}.$" gUnknown_841A694:: @ 841A694 .string "a different spot$" gUnknown_841A6A5:: @ 841A6A5 - .string "Removed the item {STR_VAR_1} from\n{PLAYER}’s PC and gave it to {STR_VAR_2}\nto hold.$" + .string "Removed the item {STR_VAR_1} from\n" + .string "{PLAYER}’s PC and gave it to {STR_VAR_2}\n" + .string "to hold.$" gUnknown_841A6E1:: @ 841A6E1 - .string "Removed the item {STR_VAR_1} from\na PC, gave it to {STR_VAR_2}, and put\nthe {STR_VAR_3} it held in the BAG.$" + .string "Removed the item {STR_VAR_1} from\n" + .string "a PC, gave it to {STR_VAR_2}, and put\n" + .string "the {STR_VAR_3} it held in the BAG.$" gUnknown_841A732:: @ 841A732 .string "Chatted with many TRAINERS.$" @@ -1595,10 +1813,12 @@ gUnknown_841A8DD:: @ 841A8DD .string "{UNKNOWN_F7 0x04}$" gUnknown_841A8E0:: @ 841A8E0 - .string "{STR_VAR_1} shared its HP using the move\nSOFTBOILED.$" + .string "{STR_VAR_1} shared its HP using the move\n" + .string "SOFTBOILED.$" gUnknown_841A90C:: @ 841A90C - .string "{STR_VAR_1} shared its HP using the move\nMILK DRINK.$" + .string "{STR_VAR_1} shared its HP using the move\n" + .string "MILK DRINK.$" gUnknown_841A938:: @ 841A938 .incbin "baserom.gba", 0x41A938, 0x2D @@ -1634,64 +1854,87 @@ gUnknown_841AB74:: @ 841AB74 .incbin "baserom.gba", 0x41AB74, 0x1A gUnknown_841AB8E:: @ 841AB8E - .string "{PLAYER} made {STR_VAR_1} hold the item\n{STR_VAR_2}.$" + .string "{PLAYER} made {STR_VAR_1} hold the item\n" + .string "{STR_VAR_2}.$" gUnknown_841ABAB:: @ 841ABAB - .string "{STR_VAR_1} used the Hidden Move\nCUT here.$" + .string "{STR_VAR_1} used the Hidden Move\n" + .string "CUT here.$" gUnknown_841ABCD:: @ 841ABCD - .string "{STR_VAR_1} used the Hidden Move\nFLY and flew to {STR_VAR_2}.$" + .string "{STR_VAR_1} used the Hidden Move\n" + .string "FLY and flew to {STR_VAR_2}.$" gUnknown_841ABF9:: @ 841ABF9 - .string "{STR_VAR_1} used the Hidden Move\nSURF and rode the waves.$" + .string "{STR_VAR_1} used the Hidden Move\n" + .string "SURF and rode the waves.$" gUnknown_841AC2A:: @ 841AC2A - .string "{STR_VAR_1} used the Hidden Move\nSTRENGTH here.$" + .string "{STR_VAR_1} used the Hidden Move\n" + .string "STRENGTH here.$" gUnknown_841AC51:: @ 841AC51 - .string "{STR_VAR_1} used the Hidden Move\nFLASH and illuminated a pitch-black\ncave.$" + .string "{STR_VAR_1} used the Hidden Move\n" + .string "FLASH and illuminated a pitch-black\n" + .string "cave.$" gUnknown_841AC93:: @ 841AC93 - .string "{STR_VAR_1} used the Hidden Move\nROCK SMASH here.$" + .string "{STR_VAR_1} used the Hidden Move\n" + .string "ROCK SMASH here.$" gUnknown_841ACBC:: @ 841ACBC - .string "{STR_VAR_1} used the Hidden Move\nWATERFALL to scale a raging torrent.$" + .string "{STR_VAR_1} used the Hidden Move\n" + .string "WATERFALL to scale a raging torrent.$" gUnknown_841ACF9:: @ 841ACF9 - .string "{STR_VAR_1}è êÉà Ñ㓪& òã–Ã\néã§+ã‚ã–\nダ¡ビング& ÚÉã£Å’!$" + .string "{STR_VAR_1}è êÉà Ñ㓪& òã–Ã\n" + .string "éã§+ã‚ã–\n" + .string "ダ¡ビング& ÚÉã£Å’!$" gUnknown_841AD1D:: @ 841AD1D - .string "{STR_VAR_1} used DIG to escape from\n{STR_VAR_2}.$" + .string "{STR_VAR_1} used DIG to escape from\n" + .string "{STR_VAR_2}.$" gUnknown_841AD3C:: @ 841AD3C - .string "{STR_VAR_1} used SWEET SCENT to attract\nwild POKéMON.$" + .string "{STR_VAR_1} used SWEET SCENT to attract\n" + .string "wild POKéMON.$" gUnknown_841AD69:: @ 841AD69 - .string "{STR_VAR_1} used TELEPORT, transporting\nthe party to {STR_VAR_2}’s\n{STR_VAR_3}.$" + .string "{STR_VAR_1} used TELEPORT, transporting\n" + .string "the party to {STR_VAR_2}’s\n" + .string "{STR_VAR_3}.$" gUnknown_841AD9E:: @ 841AD9E - .string "{PLAYER} left {STR_VAR_1}’s\n{STR_VAR_2} for the next\ndestination.$" + .string "{PLAYER} left {STR_VAR_1}’s\n" + .string "{STR_VAR_2} for the next\n" + .string "destination.$" gUnknown_841ADC8:: @ 841ADC8 - .string "Played a lot of games at the ROCKET\nGAME CORNER in {STR_VAR_1}.$" + .string "Played a lot of games at the ROCKET\n" + .string "GAME CORNER in {STR_VAR_1}.$" gUnknown_841ADFF:: @ 841ADFF .string "{PLAYER} rested comfortably at home.$" gUnknown_841AE1E:: @ 841AE1E - .string "{PLAYER} left PROF. OAK’s POKéMON\nRESEARCH LAB.$" + .string "{PLAYER} left PROF. OAK’s POKéMON\n" + .string "RESEARCH LAB.$" gUnknown_841AE48:: @ 841AE48 - .string "The GYM in {STR_VAR_1} was full of\ntough TRAINERS…\nPreparations had to be made.$" + .string "The GYM in {STR_VAR_1} was full of\n" + .string "tough TRAINERS…\n" + .string "Preparations had to be made.$" gUnknown_841AE8F:: @ 841AE8F .string "Departed the GYM in {STR_VAR_1}.$" gUnknown_841AEA7:: @ 841AEA7 - .string "{PLAYER} had a great time with POKéMON\nin the SAFARI ZONE.$" + .string "{PLAYER} had a great time with POKéMON\n" + .string "in the SAFARI ZONE.$" gUnknown_841AEDC:: @ 841AEDC - .string "Managed to get out of {STR_VAR_2}\nafter wandering about.$" + .string "Managed to get out of {STR_VAR_2}\n" + .string "after wandering about.$" gUnknown_841AF0C:: @ 841AF0C .incbin "baserom.gba", 0x41AF0C, 0x32 @@ -1709,25 +1952,31 @@ gUnknown_841AF9F:: @ 841AF9F .string "barely$" gUnknown_841AFA6:: @ 841AFA6 - .string "{PLAYER} used an ESCAPE ROPE to get\nout from {STR_VAR_2}.$" + .string "{PLAYER} used an ESCAPE ROPE to get\n" + .string "out from {STR_VAR_2}.$" gUnknown_841AFD1:: @ 841AFD1 .string "draw$" gUnknown_841AFD6:: @ 841AFD6 - .string "Departed from the {STR_VAR_2}\nfor the next destination.$" + .string "Departed from the {STR_VAR_2}\n" + .string "for the next destination.$" gUnknown_841B005:: @ 841B005 - .string "{PLAYER} departed from\n{STR_VAR_2} and made way\nto the next destination.$" + .string "{PLAYER} departed from\n" + .string "{STR_VAR_2} and made way\n" + .string "to the next destination.$" gUnknown_841B03F:: @ 841B03F - .string "Here in {STR_VAR_1}, {PLAYER}\nobtained the item {STR_VAR_2}.$" + .string "Here in {STR_VAR_1}, {PLAYER}\n" + .string "obtained the item {STR_VAR_2}.$" gUnknown_841B064:: @ 841B064 .string "Arrived in {STR_VAR_1}.$" gUnknown_841B073:: @ 841B073 - .string "And {PLAYER} saved the game at this\nlocation: {STR_VAR_1}.$" + .string "And {PLAYER} saved the game at this\n" + .string "location: {STR_VAR_1}.$" gUnknown_841B09F:: @ 841B09F .string "HOME$" @@ -4502,3 +4751,5 @@ gUnknown_8468B6C:: @ 8468B6C gUnknown_8468BCC:: @ 8468BCC .incbin "baserom.gba", 0x468BCC, 0x90 + + diff --git a/data/quest_log.s b/data/quest_log.s index cf55e5b0a..bd28fd62b 100644 --- a/data/quest_log.s +++ b/data/quest_log.s @@ -179,3 +179,4 @@ gUnknown_8456C50:: @ 8456C50 .2byte 0x08a1 .2byte 0x0000 + -- cgit v1.2.3 From 50709682c7b1db4a1fcdfcf8080910bde2f969a1 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Thu, 8 Nov 2018 11:43:54 -0500 Subject: through sub_8113FBC --- asm/battle_controller_player.s | 4 +- asm/battle_message.s | 12 +- asm/easy_chat.s | 4 +- asm/field_specials.s | 4 +- asm/item_pc.s | 4 +- asm/learn_move.s | 8 +- asm/party_menu.s | 52 ++++---- asm/pokemon_special_anim.s | 8 +- asm/pokemon_summary_screen.s | 4 +- asm/quest_log.s | 268 +++++--------------------------------- asm/scrcmd.s | 4 +- asm/script_pokemon_util_80BF8FC.s | 4 +- asm/shop.s | 4 +- asm/tm_case.s | 4 +- asm/trade.s | 4 +- constants/item_data_constants.inc | 10 +- data/data.s | 2 +- data/data_83FECCC.s | 36 ++--- include/constants/items.h | 7 + include/party_menu.h | 1 + src/quest_log.c | 120 ++++++++++++++--- 21 files changed, 222 insertions(+), 342 deletions(-) diff --git a/asm/battle_controller_player.s b/asm/battle_controller_player.s index 89f98fc35..c009baf03 100644 --- a/asm/battle_controller_player.s +++ b/asm/battle_controller_player.s @@ -4570,7 +4570,7 @@ _08030848: ldrh r1, [r4] movs r0, 0xD muls r1, r0 - ldr r0, _080308A4 @ =gUnknown_8247094 + ldr r0, _080308A4 @ =gMoveNames adds r1, r0 adds r0, r6, 0 bl StringAppend @@ -4599,7 +4599,7 @@ _08030894: .4byte gUnknown_2022BC8 _08030898: .4byte gUnknown_3004FF8 _0803089C: .4byte gDisplayedStringBattle _080308A0: .4byte gUnknown_83FE770 -_080308A4: .4byte gUnknown_8247094 +_080308A4: .4byte gMoveNames thumb_func_end sub_8030830 thumb_func_start MoveSelectionDisplayPpString diff --git a/asm/battle_message.s b/asm/battle_message.s index c3d9dd018..ecfd738f1 100644 --- a/asm/battle_message.s +++ b/asm/battle_message.s @@ -473,7 +473,7 @@ _080D762C: ldrh r2, [r2] movs r1, 0xD muls r1, r2 - ldr r2, _080D764C @ =gUnknown_8247094 + ldr r2, _080D764C @ =gMoveNames adds r1, r2 bl StringCopy _080D763C: @@ -483,7 +483,7 @@ _080D763C: b _080D77DC .align 2, 0 _080D7648: .4byte gBattleTextBuff2 -_080D764C: .4byte gUnknown_8247094 +_080D764C: .4byte gMoveNames _080D7650: .4byte gUnknown_83FD57B _080D7654: ldr r4, _080D7694 @ =gBattleTextBuff1 @@ -1505,11 +1505,11 @@ _080D7ED4: _080D7ED6: movs r0, 0xD muls r1, r0 - ldr r0, _080D7EE0 @ =gUnknown_8247094 + ldr r0, _080D7EE0 @ =gMoveNames adds r4, r1, r0 b _080D8382 .align 2, 0 -_080D7EE0: .4byte gUnknown_8247094 +_080D7EE0: .4byte gMoveNames _080D7EE4: ldr r0, _080D7F1C @ =gBattleTypeFlags ldr r1, [r0] @@ -2294,11 +2294,11 @@ _080D84EC: orrs r1, r0 movs r0, 0xD muls r1, r0 - ldr r0, _080D8500 @ =gUnknown_8247094 + ldr r0, _080D8500 @ =gMoveNames adds r1, r0 b _080D868E .align 2, 0 -_080D8500: .4byte gUnknown_8247094 +_080D8500: .4byte gMoveNames _080D8504: adds r0, r5, r7 ldrb r0, [r0, 0x1] diff --git a/asm/easy_chat.s b/asm/easy_chat.s index 05a45baa1..1b4879bf3 100644 --- a/asm/easy_chat.s +++ b/asm/easy_chat.s @@ -166,11 +166,11 @@ _080BD820: .4byte gSpeciesNames _080BD824: movs r0, 0xD muls r0, r2 - ldr r1, _080BD830 @ =gUnknown_8247094 + ldr r1, _080BD830 @ =gMoveNames adds r0, r1 b _080BD846 .align 2, 0 -_080BD830: .4byte gUnknown_8247094 +_080BD830: .4byte gMoveNames _080BD834: ldr r1, _080BD84C @ =gUnknown_83ECED4 lsls r0, 3 diff --git a/asm/field_specials.s b/asm/field_specials.s index e9b2ba085..0a0bbb7ec 100644 --- a/asm/field_specials.s +++ b/asm/field_specials.s @@ -4570,7 +4570,7 @@ _080CC8EC: lsrs r0, 16 movs r1, 0xD muls r1, r0 - ldr r0, _080CC914 @ =gUnknown_8247094 + ldr r0, _080CC914 @ =gMoveNames adds r1, r0 adds r0, r4, 0 bl StringCopy @@ -4581,7 +4581,7 @@ _080CC908: bx r1 .align 2, 0 _080CC910: .4byte gStringVar1 -_080CC914: .4byte gUnknown_8247094 +_080CC914: .4byte gMoveNames thumb_func_end sub_80CC8CC thumb_func_start sub_80CC918 diff --git a/asm/item_pc.s b/asm/item_pc.s index af247572b..8e71d9dc3 100644 --- a/asm/item_pc.s +++ b/asm/item_pc.s @@ -709,12 +709,12 @@ _0810D968: lsrs r0, 16 movs r1, 0xD muls r1, r0 - ldr r0, _0810D9C0 @ =gUnknown_8247094 + ldr r0, _0810D9C0 @ =gMoveNames adds r5, r1, r0 b _0810D9DA .align 2, 0 _0810D9BC: .4byte gUnknown_203ADBC -_0810D9C0: .4byte gUnknown_8247094 +_0810D9C0: .4byte gMoveNames _0810D9C4: adds r0, r4, 0 bl ItemId_GetDescription diff --git a/asm/learn_move.s b/asm/learn_move.s index 0db1b01ff..f3f472847 100644 --- a/asm/learn_move.s +++ b/asm/learn_move.s @@ -882,7 +882,7 @@ _080E4DB4: mov r9, r1 mov r1, r9 muls r1, r0 - ldr r3, _080E4E58 @ =gUnknown_8247094 + ldr r3, _080E4E58 @ =gMoveNames mov r8, r3 add r1, r8 adds r0, r2, 0 @@ -938,7 +938,7 @@ _080E4DB4: .align 2, 0 _080E4E50: .4byte gPlayerParty _080E4E54: .4byte gStringVar3 -_080E4E58: .4byte gUnknown_8247094 +_080E4E58: .4byte gMoveNames _080E4E5C: .4byte 0x00000261 _080E4E60: .4byte 0x00000a67 _080E4E64: .4byte gStringVar2 @@ -1297,7 +1297,7 @@ _080E511A: adds r1, r2 ldrh r1, [r1] muls r1, r7 - ldr r2, _080E51F0 @ =gUnknown_8247094 + ldr r2, _080E51F0 @ =gMoveNames adds r1, r2 bl StringCopy adds r4, 0xD @@ -1394,7 +1394,7 @@ _080E51AA: .align 2, 0 _080E51E8: .4byte gUnknown_203AAB4 _080E51EC: .4byte gPlayerParty -_080E51F0: .4byte gUnknown_8247094 +_080E51F0: .4byte gMoveNames _080E51F4: .4byte gStringVar1 _080E51F8: .4byte gUnknown_84161C1 _080E51FC: .4byte gUnknown_3005E70 diff --git a/asm/party_menu.s b/asm/party_menu.s index 8bf8b4ff2..5f2d4d4db 100644 --- a/asm/party_menu.s +++ b/asm/party_menu.s @@ -13647,7 +13647,7 @@ _08125620: movs r0, 0xD adds r2, r5, 0 muls r2, r0 - ldr r0, _081256BC @ =gUnknown_8247094 + ldr r0, _081256BC @ =gMoveNames adds r2, r0 lsls r0, r6, 4 adds r0, 0x2 @@ -13697,7 +13697,7 @@ _08125680: bx r0 .align 2, 0 _081256B8: .4byte gPlayerParty -_081256BC: .4byte gUnknown_8247094 +_081256BC: .4byte gMoveNames thumb_func_end sub_81255F0 thumb_func_start sub_81256C0 @@ -13974,7 +13974,7 @@ sub_8125898: @ 8125898 ldr r2, _08125944 @ =gStringVar1 movs r1, 0xD muls r1, r0 - ldr r0, _08125948 @ =gUnknown_8247094 + ldr r0, _08125948 @ =gMoveNames adds r1, r0 adds r0, r2, 0 bl StringCopy @@ -14005,7 +14005,7 @@ _08125938: .4byte gUnknown_203AD30 _0812593C: .4byte gUnknown_203B0C0 _08125940: .4byte 0x0000ffff _08125944: .4byte gStringVar1 -_08125948: .4byte gUnknown_8247094 +_08125948: .4byte gMoveNames _0812594C: .4byte gStringVar4 _08125950: .4byte gTasks _08125954: .4byte sub_81255BC @@ -14076,7 +14076,7 @@ _081259A0: ldr r0, _08125A28 @ =gStringVar1 movs r1, 0xD muls r1, r4 - ldr r2, _08125A2C @ =gUnknown_8247094 + ldr r2, _08125A2C @ =gMoveNames adds r1, r2 bl StringCopy adds r0, r5, 0 @@ -14104,7 +14104,7 @@ _08125A1C: .4byte gUnknown_203B0C0 _08125A20: .4byte gPlayerParty _08125A24: .4byte 0x0000ffff _08125A28: .4byte gStringVar1 -_08125A2C: .4byte gUnknown_8247094 +_08125A2C: .4byte gMoveNames _08125A30: .4byte gStringVar4 _08125A34: .4byte gTasks _08125A38: .4byte sub_81255BC @@ -14288,7 +14288,7 @@ sub_8125B40: @ 8125B40 ldrsh r2, [r7, r1] movs r1, 0xD muls r1, r2 - ldr r2, _08125BE4 @ =gUnknown_8247094 + ldr r2, _08125BE4 @ =gMoveNames adds r1, r2 bl StringCopy movs r0, 0 @@ -14328,7 +14328,7 @@ _08125BD4: .4byte gPlayerParty _08125BD8: .4byte gUnknown_203AD30 _08125BDC: .4byte gStringVar1 _08125BE0: .4byte gStringVar2 -_08125BE4: .4byte gUnknown_8247094 +_08125BE4: .4byte gMoveNames _08125BE8: .4byte 0x0000ffff _08125BEC: .4byte gUnknown_3005E98 _08125BF0: .4byte sub_8125C38 @@ -14416,7 +14416,7 @@ _08125C84: ldrsh r2, [r6, r1] movs r1, 0xD muls r1, r2 - ldr r2, _08125CE0 @ =gUnknown_8247094 + ldr r2, _08125CE0 @ =gMoveNames adds r1, r2 bl StringCopy ldr r4, _08125CE4 @ =gStringVar4 @@ -14444,7 +14444,7 @@ _08125CD0: .4byte gPlayerParty _08125CD4: .4byte gUnknown_203AD30 _08125CD8: .4byte gStringVar1 _08125CDC: .4byte gStringVar2 -_08125CE0: .4byte gUnknown_8247094 +_08125CE0: .4byte gMoveNames _08125CE4: .4byte gStringVar4 _08125CE8: .4byte gUnknown_8416DB3 _08125CEC: .4byte gTasks @@ -14806,7 +14806,7 @@ sub_8125F5C: @ 8125F5C ldr r0, _08125FF4 @ =gStringVar2 movs r1, 0xD muls r1, r4 - ldr r2, _08125FF8 @ =gUnknown_8247094 + ldr r2, _08125FF8 @ =gMoveNames adds r1, r2 bl StringCopy adds r0, r6, 0 @@ -14831,7 +14831,7 @@ _08125FE8: .4byte gPlayerParty _08125FEC: .4byte gUnknown_203AD30 _08125FF0: .4byte gStringVar1 _08125FF4: .4byte gStringVar2 -_08125FF8: .4byte gUnknown_8247094 +_08125FF8: .4byte gMoveNames thumb_func_end sub_8125F5C thumb_func_start sub_8125FFC @@ -14864,7 +14864,7 @@ sub_8125FFC: @ 8125FFC ldr r0, _08126068 @ =gStringVar2 movs r1, 0xD muls r1, r4 - ldr r2, _0812606C @ =gUnknown_8247094 + ldr r2, _0812606C @ =gMoveNames adds r1, r2 bl StringCopy ldr r0, _08126070 @ =gUnknown_8416EC6 @@ -14884,7 +14884,7 @@ _0812605C: .4byte gUnknown_203B0A0 _08126060: .4byte gPlayerParty _08126064: .4byte gStringVar1 _08126068: .4byte gStringVar2 -_0812606C: .4byte gUnknown_8247094 +_0812606C: .4byte gMoveNames _08126070: .4byte gUnknown_8416EC6 _08126074: .4byte gTasks _08126078: .4byte sub_812607C @@ -14945,7 +14945,7 @@ sub_81260D8: @ 81260D8 ldrsh r2, [r1, r3] movs r1, 0xD muls r1, r2 - ldr r2, _08126128 @ =gUnknown_8247094 + ldr r2, _08126128 @ =gMoveNames adds r1, r2 bl StringCopy ldr r4, _0812612C @ =gStringVar4 @@ -14970,7 +14970,7 @@ sub_81260D8: @ 81260D8 .align 2, 0 _08126120: .4byte gStringVar2 _08126124: .4byte gUnknown_203B0A0 -_08126128: .4byte gUnknown_8247094 +_08126128: .4byte gMoveNames _0812612C: .4byte gStringVar4 _08126130: .4byte gUnknown_8416E6B _08126134: .4byte gTasks @@ -15044,7 +15044,7 @@ _081261AE: ldrsh r2, [r7, r1] movs r1, 0xD muls r1, r2 - ldr r2, _081261FC @ =gUnknown_8247094 + ldr r2, _081261FC @ =gMoveNames adds r1, r2 bl StringCopy ldr r4, _08126200 @ =gStringVar4 @@ -15069,7 +15069,7 @@ _081261AE: .align 2, 0 _081261F4: .4byte gStringVar1 _081261F8: .4byte gStringVar2 -_081261FC: .4byte gUnknown_8247094 +_081261FC: .4byte gMoveNames _08126200: .4byte gStringVar4 _08126204: .4byte gUnknown_8416E84 _08126208: .4byte gTasks @@ -15105,7 +15105,7 @@ _0812623A: ldrsh r2, [r1, r3] movs r1, 0xD muls r1, r2 - ldr r2, _0812627C @ =gUnknown_8247094 + ldr r2, _0812627C @ =gMoveNames adds r1, r2 bl StringCopy ldr r0, _08126280 @ =gUnknown_8416DF7 @@ -15125,7 +15125,7 @@ _0812626A: _08126270: .4byte gStringVar1 _08126274: .4byte gStringVar2 _08126278: .4byte gUnknown_203B0A0 -_0812627C: .4byte gUnknown_8247094 +_0812627C: .4byte gMoveNames _08126280: .4byte gUnknown_8416DF7 _08126284: .4byte gTasks _08126288: .4byte sub_8125D88 @@ -15754,7 +15754,7 @@ sub_8126770: @ 8126770 ldrh r2, [r6] movs r1, 0xD muls r1, r2 - ldr r2, _081267F0 @ =gUnknown_8247094 + ldr r2, _081267F0 @ =gMoveNames adds r1, r2 bl StringCopy ldr r4, _081267F4 @ =gStringVar4 @@ -15787,7 +15787,7 @@ _081267E0: .4byte gPlayerParty _081267E4: .4byte gStringVar1 _081267E8: .4byte gStringVar2 _081267EC: .4byte gMoveToLearn -_081267F0: .4byte gUnknown_8247094 +_081267F0: .4byte gMoveNames _081267F4: .4byte gStringVar4 _081267F8: .4byte gUnknown_8416DF7 _081267FC: .4byte gTasks @@ -15818,7 +15818,7 @@ sub_8126804: @ 8126804 ldr r0, _0812687C @ =gStringVar2 movs r1, 0xD muls r1, r5 - ldr r2, _08126880 @ =gUnknown_8247094 + ldr r2, _08126880 @ =gMoveNames adds r1, r2 bl StringCopy ldr r4, _08126884 @ =gStringVar4 @@ -15849,7 +15849,7 @@ _08126870: .4byte gUnknown_203B0A0 _08126874: .4byte gPlayerParty _08126878: .4byte gStringVar1 _0812687C: .4byte gStringVar2 -_08126880: .4byte gUnknown_8247094 +_08126880: .4byte gMoveNames _08126884: .4byte gStringVar4 _08126888: .4byte gUnknown_8416DB3 _0812688C: .4byte gTasks @@ -16556,7 +16556,7 @@ sub_8126DC8: @ 8126DC8 ldrsh r2, [r7, r1] movs r1, 0xD muls r1, r2 - ldr r2, _08126E64 @ =gUnknown_8247094 + ldr r2, _08126E64 @ =gMoveNames adds r1, r2 bl StringCopy movs r0, 0x2 @@ -16589,7 +16589,7 @@ _08126E54: .4byte gPlayerParty _08126E58: .4byte gStringVar1 _08126E5C: .4byte gSpecialVar_0x8005 _08126E60: .4byte gStringVar2 -_08126E64: .4byte gUnknown_8247094 +_08126E64: .4byte gMoveNames _08126E68: .4byte 0xffff0000 _08126E6C: ldr r1, _08126E70 @ =gUnknown_8416DC2 diff --git a/asm/pokemon_special_anim.s b/asm/pokemon_special_anim.s index fa73d892f..fa72d3c8e 100644 --- a/asm/pokemon_special_anim.s +++ b/asm/pokemon_special_anim.s @@ -50,7 +50,7 @@ _0811C58C: adds r0, 0x77 movs r1, 0xD muls r1, r6 - ldr r2, _0811C5A8 @ =gUnknown_8247094 + ldr r2, _0811C5A8 @ =gMoveNames adds r1, r2 bl StringCopy adds r0, r4, 0 @@ -60,7 +60,7 @@ _0811C5A2: pop {r0} bx r0 .align 2, 0 -_0811C5A8: .4byte gUnknown_8247094 +_0811C5A8: .4byte gMoveNames thumb_func_end sub_811C568 thumb_func_start sub_811C5AC @@ -194,7 +194,7 @@ _0811C628: adds r2, 0x84 movs r1, 0xD muls r1, r0 - ldr r0, _0811C6E4 @ =gUnknown_8247094 + ldr r0, _0811C6E4 @ =gMoveNames adds r1, r0 adds r0, r2, 0 bl StringCopy @@ -209,7 +209,7 @@ _0811C6D2: bx r1 .align 2, 0 _0811C6E0: .4byte gPlayerParty -_0811C6E4: .4byte gUnknown_8247094 +_0811C6E4: .4byte gMoveNames thumb_func_end sub_811C5D4 thumb_func_start sub_811C6E8 diff --git a/asm/pokemon_summary_screen.s b/asm/pokemon_summary_screen.s index e2680033d..073727d7f 100644 --- a/asm/pokemon_summary_screen.s +++ b/asm/pokemon_summary_screen.s @@ -4241,7 +4241,7 @@ _081368B0: adds r0, r1 ldrh r1, [r3] muls r1, r2 - ldr r2, _0813695C @ =gUnknown_8247094 + ldr r2, _0813695C @ =gMoveNames adds r1, r2 bl StringCopy cmp r7, 0x3 @@ -4292,7 +4292,7 @@ _0813694C: .4byte 0x0000324e _08136950: .4byte gBattleMoves _08136954: .4byte 0x00003258 _08136958: .4byte 0x00003128 -_0813695C: .4byte gUnknown_8247094 +_0813695C: .4byte gMoveNames _08136960: .4byte 0x00003208 _08136964: .4byte 0x000030b8 _08136968: .4byte 0x000030f0 diff --git a/asm/quest_log.s b/asm/quest_log.s index d0933093a..be4e55ce8 100644 --- a/asm/quest_log.s +++ b/asm/quest_log.s @@ -5,212 +5,6 @@ .text - thumb_func_start sub_8113F80 -sub_8113F80: @ 8113F80 - push {r4,lr} - adds r2, r0, 0 - adds r4, r1, 0 - movs r0, 0x4 - adds r1, r2, 0 - bl sub_8113DE0 - adds r2, r0, 0 - cmp r2, 0 - bne _08113F98 - movs r0, 0 - b _08113FB2 -_08113F98: - ldrh r0, [r4] - strh r0, [r2] - ldrh r0, [r4, 0x4] - strh r0, [r2, 0x2] - ldrh r0, [r4, 0x6] - strh r0, [r2, 0x4] - ldrh r0, [r4] - cmp r0, 0x55 - bne _08113FB0 - ldr r1, _08113FB8 @ =gUnknown_203B048 - movs r0, 0x2 - strb r0, [r1] -_08113FB0: - adds r0, r2, 0x6 -_08113FB2: - pop {r4} - pop {r1} - bx r1 - .align 2, 0 -_08113FB8: .4byte gUnknown_203B048 - thumb_func_end sub_8113F80 - - thumb_func_start sub_8113FBC -sub_8113FBC: @ 8113FBC - push {r4-r7,lr} - adds r1, r0, 0 - movs r0, 0x4 - bl sub_8113E88 - adds r5, r0, 0 - ldrh r0, [r5] - bl ItemId_GetPocket - lsls r0, 24 - lsrs r0, 24 - subs r0, 0x1 - cmp r0, 0x4 - bls _08113FDA - b _0811413C -_08113FDA: - lsls r0, 2 - ldr r1, _08113FE4 @ =_08113FE8 - adds r0, r1 - ldr r0, [r0] - mov pc, r0 - .align 2, 0 -_08113FE4: .4byte _08113FE8 - .align 2, 0 -_08113FE8: - .4byte _08113FFC - .4byte _08114074 - .4byte _08113FFC - .4byte _0811409C - .4byte _08113FFC -_08113FFC: - ldr r4, _08114024 @ =gStringVar1 - ldrh r0, [r5] - bl ItemId_GetItem - adds r1, r0, 0 - adds r0, r4, 0 - bl StringCopy - ldrh r0, [r5] - cmp r0, 0x55 - bne _08114034 - ldr r0, _08114028 @ =gStringVar2 - ldrb r1, [r5, 0x4] - bl sub_80C4DF8 - ldr r0, _0811402C @ =gStringVar4 - ldr r1, _08114030 @ =gUnknown_841AFA6 - bl StringExpandPlaceholders - b _0811413C - .align 2, 0 -_08114024: .4byte gStringVar1 -_08114028: .4byte gStringVar2 -_0811402C: .4byte gStringVar4 -_08114030: .4byte gUnknown_841AFA6 -_08114034: - ldrh r1, [r5, 0x2] - ldr r0, _08114050 @ =0x0000ffff - cmp r1, r0 - beq _08114060 - adds r0, r1, 0 - ldr r1, _08114054 @ =gStringVar2 - movs r2, 0 - bl sub_8113EAC - ldr r0, _08114058 @ =gStringVar4 - ldr r1, _0811405C @ =gUnknown_841A1E7 - bl StringExpandPlaceholders - b _0811413C - .align 2, 0 -_08114050: .4byte 0x0000ffff -_08114054: .4byte gStringVar2 -_08114058: .4byte gStringVar4 -_0811405C: .4byte gUnknown_841A1E7 -_08114060: - ldr r0, _0811406C @ =gStringVar4 - ldr r1, _08114070 @ =gUnknown_841A210 - bl StringExpandPlaceholders - b _0811413C - .align 2, 0 -_0811406C: .4byte gStringVar4 -_08114070: .4byte gUnknown_841A210 -_08114074: - ldr r4, _08114090 @ =gStringVar1 - ldrh r0, [r5] - bl ItemId_GetItem - adds r1, r0, 0 - adds r0, r4, 0 - bl StringCopy - ldr r0, _08114094 @ =gStringVar4 - ldr r1, _08114098 @ =gUnknown_841A220 - bl StringExpandPlaceholders - b _0811413C - .align 2, 0 -_08114090: .4byte gStringVar1 -_08114094: .4byte gStringVar4 -_08114098: .4byte gUnknown_841A220 -_0811409C: - ldrh r0, [r5, 0x2] - ldr r1, _081140E8 @ =gStringVar1 - movs r2, 0 - bl sub_8113EAC - ldr r4, _081140EC @ =gStringVar2 - ldrh r0, [r5] - bl ItemIdToBattleMoveId - lsls r0, 16 - lsrs r0, 16 - movs r7, 0xD - adds r1, r0, 0 - muls r1, r7 - ldr r6, _081140F0 @ =gUnknown_8247094 - adds r1, r6 - adds r0, r4, 0 - bl StringCopy - ldrh r1, [r5, 0x4] - ldr r0, _081140F4 @ =0x0000ffff - cmp r1, r0 - beq _08114118 - ldr r0, _081140F8 @ =gStringVar3 - muls r1, r7 - adds r1, r6 - bl StringCopy - ldrh r1, [r5] - movs r0, 0xA9 - lsls r0, 1 - cmp r1, r0 - bls _08114104 - ldr r0, _081140FC @ =gStringVar4 - ldr r1, _08114100 @ =gUnknown_841A965 - bl StringExpandPlaceholders - b _0811413C - .align 2, 0 -_081140E8: .4byte gStringVar1 -_081140EC: .4byte gStringVar2 -_081140F0: .4byte gUnknown_8247094 -_081140F4: .4byte 0x0000ffff -_081140F8: .4byte gStringVar3 -_081140FC: .4byte gStringVar4 -_08114100: .4byte gUnknown_841A965 -_08114104: - ldr r0, _08114110 @ =gStringVar4 - ldr r1, _08114114 @ =gUnknown_841A277 - bl StringExpandPlaceholders - b _0811413C - .align 2, 0 -_08114110: .4byte gStringVar4 -_08114114: .4byte gUnknown_841A277 -_08114118: - ldrh r1, [r5] - movs r0, 0xA9 - lsls r0, 1 - cmp r1, r0 - bls _08114134 - ldr r0, _0811412C @ =gStringVar4 - ldr r1, _08114130 @ =gUnknown_841A938 - bl StringExpandPlaceholders - b _0811413C - .align 2, 0 -_0811412C: .4byte gStringVar4 -_08114130: .4byte gUnknown_841A938 -_08114134: - ldr r0, _08114144 @ =gStringVar4 - ldr r1, _08114148 @ =gUnknown_841A255 - bl StringExpandPlaceholders -_0811413C: - adds r0, r5, 0x6 - pop {r4-r7} - pop {r1} - bx r1 - .align 2, 0 -_08114144: .4byte gStringVar4 -_08114148: .4byte gUnknown_841A255 - thumb_func_end sub_8113FBC - thumb_func_start sub_811414C sub_811414C: @ 811414C push {r4,lr} @@ -257,7 +51,7 @@ sub_8114188: @ 8114188 ldrh r0, [r4, 0x2] ldr r1, _081141C0 @ =gStringVar1 movs r2, 0 - bl sub_8113EAC + bl QuestLog_AutoGetSpeciesname ldr r5, _081141C4 @ =gStringVar2 ldrh r0, [r4] bl ItemId_GetItem @@ -301,7 +95,7 @@ sub_81141E4: @ 81141E4 ldrh r0, [r4, 0x2] ldr r1, _0811421C @ =gStringVar1 movs r2, 0 - bl sub_8113EAC + bl QuestLog_AutoGetSpeciesname ldr r5, _08114220 @ =gStringVar2 ldrh r0, [r4] bl ItemId_GetItem @@ -345,7 +139,7 @@ sub_8114240: @ 8114240 ldrh r0, [r4, 0x2] ldr r1, _08114278 @ =gStringVar2 movs r2, 0 - bl sub_8113EAC + bl QuestLog_AutoGetSpeciesname ldr r5, _0811427C @ =gStringVar1 ldrh r0, [r4] bl ItemId_GetItem @@ -389,7 +183,7 @@ sub_811429C: @ 811429C ldrh r0, [r4, 0x2] ldr r1, _081142D4 @ =gStringVar1 movs r2, 0 - bl sub_8113EAC + bl QuestLog_AutoGetSpeciesname ldr r5, _081142D8 @ =gStringVar2 ldrh r0, [r4] bl ItemId_GetItem @@ -459,7 +253,7 @@ sub_8114324: @ 8114324 ldrh r0, [r4, 0x4] ldr r1, _0811436C @ =gStringVar1 movs r2, 0 - bl sub_8113EAC + bl QuestLog_AutoGetSpeciesname ldr r5, _08114370 @ =gStringVar2 ldrh r0, [r4] bl ItemId_GetItem @@ -510,7 +304,7 @@ sub_8114394: @ 8114394 ldrh r0, [r4, 0x4] ldr r1, _081143DC @ =gStringVar2 movs r2, 0 - bl sub_8113EAC + bl QuestLog_AutoGetSpeciesname ldr r5, _081143E0 @ =gStringVar3 ldrh r0, [r4] bl ItemId_GetItem @@ -645,11 +439,11 @@ sub_811448C: @ 811448C ldrh r0, [r5, 0x6] ldr r1, _081144DC @ =gStringVar2 movs r2, 0 - bl sub_8113EAC + bl QuestLog_AutoGetSpeciesname ldrh r0, [r5, 0x4] ldr r1, _081144E0 @ =gStringVar3 movs r2, 0 - bl sub_8113EAC + bl QuestLog_AutoGetSpeciesname ldr r0, _081144E4 @ =gStringVar4 ldr r1, _081144E8 @ =gUnknown_841A3FF bl StringExpandPlaceholders @@ -1019,11 +813,11 @@ sub_81147A8: @ 81147A8 ldrh r0, [r5, 0x6] ldr r1, _081147F8 @ =gStringVar2 movs r2, 0 - bl sub_8113EAC + bl QuestLog_AutoGetSpeciesname ldrh r0, [r5, 0x4] ldr r1, _081147FC @ =gStringVar3 movs r2, 0 - bl sub_8113EAC + bl QuestLog_AutoGetSpeciesname ldr r0, _08114800 @ =gStringVar4 ldr r1, _08114804 @ =gUnknown_841A76A bl StringExpandPlaceholders @@ -1148,7 +942,7 @@ sub_81148BC: @ 81148BC ldrh r0, [r4] movs r1, 0 movs r2, 0x1 - bl sub_8113EAC + bl QuestLog_AutoGetSpeciesname ldrb r0, [r5, 0x1] bl GetBoxNamePtr adds r1, r0, 0 @@ -1157,7 +951,7 @@ sub_81148BC: @ 81148BC ldrh r0, [r4, 0x2] movs r1, 0 movs r2, 0x3 - bl sub_8113EAC + bl QuestLog_AutoGetSpeciesname ldr r0, _08114910 @ =gStringVar4 ldr r1, _08114914 @ =gUnknown_841A566 bl UnkTextUtil_StringExpandPlaceholders @@ -1214,11 +1008,11 @@ sub_8114944: @ 8114944 ldrh r0, [r4] movs r1, 0 movs r2, 0x1 - bl sub_8113EAC + bl QuestLog_AutoGetSpeciesname ldrh r0, [r4, 0x2] movs r1, 0 movs r2, 0x2 - bl sub_8113EAC + bl QuestLog_AutoGetSpeciesname ldr r0, _08114988 @ =gStringVar4 ldr r1, _0811498C @ =gUnknown_841A5D9 bl UnkTextUtil_StringExpandPlaceholders @@ -1287,11 +1081,11 @@ sub_81149D0: @ 81149D0 ldrh r0, [r4] movs r1, 0 movs r2, 0x1 - bl sub_8113EAC + bl QuestLog_AutoGetSpeciesname ldrh r0, [r4, 0x2] movs r1, 0 movs r2, 0x2 - bl sub_8113EAC + bl QuestLog_AutoGetSpeciesname ldr r0, _08114A14 @ =gStringVar4 ldr r1, _08114A18 @ =gUnknown_841A60A bl UnkTextUtil_StringExpandPlaceholders @@ -1350,7 +1144,7 @@ sub_8114A4C: @ 8114A4C ldrh r0, [r4] movs r1, 0 movs r2, 0x1 - bl sub_8113EAC + bl QuestLog_AutoGetSpeciesname ldrb r0, [r5, 0x1] bl GetBoxNamePtr adds r1, r0, 0 @@ -1411,7 +1205,7 @@ sub_8114AC8: @ 8114AC8 ldrh r0, [r4] movs r1, 0 movs r2, 0x1 - bl sub_8113EAC + bl QuestLog_AutoGetSpeciesname ldr r0, _08114B04 @ =gStringVar4 ldr r1, _08114B08 @ =gUnknown_841A5FA bl UnkTextUtil_StringExpandPlaceholders @@ -1467,7 +1261,7 @@ sub_8114B34: @ 8114B34 ldrh r0, [r4] movs r1, 0 movs r2, 0x1 - bl sub_8113EAC + bl QuestLog_AutoGetSpeciesname ldr r0, _08114B70 @ =gStringVar4 ldr r1, _08114B74 @ =gUnknown_841A632 bl UnkTextUtil_StringExpandPlaceholders @@ -1518,7 +1312,7 @@ sub_8114BA0: @ 8114BA0 ldrh r0, [r4] movs r1, 0 movs r2, 0 - bl sub_8113EAC + bl QuestLog_AutoGetSpeciesname ldrb r0, [r4, 0x2] bl GetBoxNamePtr adds r1, r0, 0 @@ -1773,11 +1567,11 @@ sub_8114D68: @ 8114D68 ldrh r0, [r4] movs r1, 0 movs r2, 0x2 - bl sub_8113EAC + bl QuestLog_AutoGetSpeciesname ldrh r0, [r4, 0x2] movs r1, 0 movs r2, 0x3 - bl sub_8113EAC + bl QuestLog_AutoGetSpeciesname ldr r1, _08114DDC @ =gUnknown_8456ACC ldrb r0, [r6, 0x1] lsls r0, 2 @@ -1903,7 +1697,7 @@ _08114E84: ldrh r0, [r5, 0x4] movs r1, 0 movs r2, 0x1 - bl sub_8113EAC + bl QuestLog_AutoGetSpeciesname ldr r4, _08114F04 @ =gStringVar2 ldrb r1, [r5, 0x8] adds r0, r4, 0 @@ -1916,7 +1710,7 @@ _08114E84: ldrh r0, [r5, 0x6] movs r1, 0 movs r2, 0x3 - bl sub_8113EAC + bl QuestLog_AutoGetSpeciesname ldr r4, _08114F08 @ =gStringVar3 ldrb r1, [r6, 0x1] adds r0, r4, 0 @@ -2092,11 +1886,11 @@ sub_811500C: @ 811500C ldrh r0, [r4] movs r1, 0 movs r2, 0x1 - bl sub_8113EAC + bl QuestLog_AutoGetSpeciesname ldrh r0, [r4, 0x2] movs r1, 0 movs r2, 0x2 - bl sub_8113EAC + bl QuestLog_AutoGetSpeciesname ldr r1, _0811506C @ =gUnknown_8456ACC ldrb r0, [r5, 0x1] lsls r0, 2 @@ -2229,7 +2023,7 @@ _08115148: ldrh r0, [r4, 0x4] movs r1, 0 movs r2, 0x1 - bl sub_8113EAC + bl QuestLog_AutoGetSpeciesname ldr r0, _08115188 @ =gSaveBlock2Ptr ldr r1, [r0] movs r0, 0x2 @@ -2237,7 +2031,7 @@ _08115148: ldrh r0, [r4, 0x6] movs r1, 0 movs r2, 0x3 - bl sub_8113EAC + bl QuestLog_AutoGetSpeciesname ldr r0, _0811518C @ =gStringVar4 ldr r1, _08115190 @ =gUnknown_841A312 bl UnkTextUtil_StringExpandPlaceholders @@ -2336,11 +2130,11 @@ _0811523E: ldrh r0, [r5] movs r1, 0 movs r2, 0x2 - bl sub_8113EAC + bl QuestLog_AutoGetSpeciesname ldrh r0, [r5, 0x2] movs r1, 0 movs r2, 0x3 - bl sub_8113EAC + bl QuestLog_AutoGetSpeciesname ldr r1, _08115274 @ =gUnknown_8456ACC ldrb r0, [r6, 0x1] lsls r0, 2 @@ -2626,7 +2420,7 @@ sub_8115460: @ 8115460 ldrh r0, [r4] ldr r1, _0811549C @ =gStringVar1 movs r2, 0 - bl sub_8113EAC + bl QuestLog_AutoGetSpeciesname ldrb r0, [r5, 0x1] cmp r0, 0xFF beq _08115486 diff --git a/asm/scrcmd.s b/asm/scrcmd.s index 321f8768e..6fd8d83a5 100644 --- a/asm/scrcmd.s +++ b/asm/scrcmd.s @@ -4243,7 +4243,7 @@ ScrCmd_buffermovename: @ 806BE50 ldr r2, [r4] movs r1, 0xD muls r1, r0 - ldr r0, _0806BE8C @ =gUnknown_8247094 + ldr r0, _0806BE8C @ =gMoveNames adds r1, r0 adds r0, r2, 0 bl StringCopy @@ -4253,7 +4253,7 @@ ScrCmd_buffermovename: @ 806BE50 bx r1 .align 2, 0 _0806BE88: .4byte gUnknown_83A7294 -_0806BE8C: .4byte gUnknown_8247094 +_0806BE8C: .4byte gMoveNames thumb_func_end ScrCmd_buffermovename thumb_func_start ScrCmd_buffernumberstring diff --git a/asm/script_pokemon_util_80BF8FC.s b/asm/script_pokemon_util_80BF8FC.s index aa393e36b..b8da48f65 100644 --- a/asm/script_pokemon_util_80BF8FC.s +++ b/asm/script_pokemon_util_80BF8FC.s @@ -196,7 +196,7 @@ ScrSpecial_GetPokemonNicknameAndMoveName: @ 80BFA50 ldr r0, _080BFAA0 @ =gStringVar2 movs r1, 0xD muls r1, r4 - ldr r2, _080BFAA4 @ =gUnknown_8247094 + ldr r2, _080BFAA4 @ =gMoveNames adds r1, r2 bl StringCopy pop {r4,r5} @@ -208,7 +208,7 @@ _080BFA94: .4byte gPlayerParty _080BFA98: .4byte gSpecialVar_0x8005 _080BFA9C: .4byte gStringVar1 _080BFAA0: .4byte gStringVar2 -_080BFAA4: .4byte gUnknown_8247094 +_080BFAA4: .4byte gMoveNames thumb_func_end ScrSpecial_GetPokemonNicknameAndMoveName thumb_func_start sub_80BFAA8 diff --git a/asm/shop.s b/asm/shop.s index 08e81ad38..a732c8656 100644 --- a/asm/shop.s +++ b/asm/shop.s @@ -1259,7 +1259,7 @@ sub_809B494: @ 809B494 lsrs r0, 16 movs r1, 0xD muls r1, r0 - ldr r0, _0809B524 @ =gUnknown_8247094 + ldr r0, _0809B524 @ =gMoveNames adds r1, r0 adds r0, r5, 0 bl StringCopy @@ -1280,7 +1280,7 @@ _0809B514: .4byte gStringVar1 _0809B518: .4byte 0xfffffee0 _0809B51C: .4byte gStringVar4 _0809B520: .4byte gUnknown_8416226 -_0809B524: .4byte gUnknown_8247094 +_0809B524: .4byte gMoveNames _0809B528: ldr r2, _0809B564 @ =gUnknown_8416213 movs r4, 0 diff --git a/asm/tm_case.s b/asm/tm_case.s index afb3fc274..d3bf0cbf2 100644 --- a/asm/tm_case.s +++ b/asm/tm_case.s @@ -704,7 +704,7 @@ _08131DC4: lsrs r0, 16 movs r1, 0xD muls r1, r0 - ldr r0, _08131E14 @ =gUnknown_8247094 + ldr r0, _08131E14 @ =gMoveNames adds r1, r0 adds r0, r4, 0 bl StringAppend @@ -721,7 +721,7 @@ _08131E04: .4byte 0xfffffee0 _08131E08: .4byte gStringVar4 _08131E0C: .4byte gUnknown_846317C _08131E10: .4byte gUnknown_8416703 -_08131E14: .4byte gUnknown_8247094 +_08131E14: .4byte gMoveNames thumb_func_end sub_8131D48 thumb_func_start sub_8131E18 diff --git a/asm/trade.s b/asm/trade.s index 0abbb8e7f..cb15185e9 100644 --- a/asm/trade.s +++ b/asm/trade.s @@ -5033,7 +5033,7 @@ _0804EF50: adds r1, r0, 0 movs r0, 0xD muls r1, r0 - ldr r0, _0804EF84 @ =gUnknown_8247094 + ldr r0, _0804EF84 @ =gMoveNames adds r1, r0 adds r0, r6, 0 bl StringAppend @@ -5049,7 +5049,7 @@ _0804EF6C: b _0804EF9C .align 2, 0 _0804EF80: .4byte gUnknown_8261EB6 -_0804EF84: .4byte gUnknown_8247094 +_0804EF84: .4byte gMoveNames _0804EF88: .4byte gUnknown_8261EC7 _0804EF8C: ldr r1, _0804EFAC @ =gUnknown_8261EB6 diff --git a/constants/item_data_constants.inc b/constants/item_data_constants.inc index 07ceb6e3b..cfeb9c1c4 100644 --- a/constants/item_data_constants.inc +++ b/constants/item_data_constants.inc @@ -1,5 +1,5 @@ - .set POCKET_ITEMS, 0x01 - .set POCKET_POKE_BALLS, 0x02 - .set POCKET_TM_HM, 0x03 - .set POCKET_BERRIES, 0x04 - .set POCKET_KEY_ITEMS, 0x05 + .set POCKET_ITEMS, 0x01 + .set POCKET_KEY_ITEMS, 0x02 + .set POCKET_POKE_BALLS, 0x03 + .set POCKET_TM_CASE, 0x04 + .set POCKET_BERRY_POUCH, 0x05 diff --git a/data/data.s b/data/data.s index 5c81abcac..1c4806436 100644 --- a/data/data.s +++ b/data/data.s @@ -128,7 +128,7 @@ gSpeciesNames:: @ 8245EE0 gUnknown_8246BE5:: @ 8246BE5 .incbin "baserom.gba", 0x246BE5, 0x4AF -gUnknown_8247094:: @ 8247094 +gMoveNames:: @ 8247094 .incbin "baserom.gba", 0x247094, 0xF97 gUnknown_824802B:: @ 824802B diff --git a/data/data_83FECCC.s b/data/data_83FECCC.s index 724138136..da553d83e 100644 --- a/data/data_83FECCC.s +++ b/data/data_83FECCC.s @@ -1662,58 +1662,58 @@ gUnknown_841A155:: @ 841A155 .string "Previously on your quest…$" gUnknown_841A16F:: @ 841A16F - .incbin "baserom.gba", 0x41A16F, 0x24 + .string "{PLAYER} switched the POKéMON\n{STR_VAR_1} with {STR_VAR_2}.$" gUnknown_841A193:: @ 841A193 - .incbin "baserom.gba", 0x41A193, 0x3A + .string "Took the item {STR_VAR_2} from\n{STR_VAR_1} and gave it the item\n{STR_VAR_3} to hold.$" gUnknown_841A1CD:: @ 841A1CD - .incbin "baserom.gba", 0x41A1CD, 0x1A + .string "Took the item {STR_VAR_2} from\n{STR_VAR_1}.$" gUnknown_841A1E7:: @ 841A1E7 - .incbin "baserom.gba", 0x41A1E7, 0x29 + .string "Used the item {STR_VAR_1} on {STR_VAR_2}\nat this location.$" gUnknown_841A210:: @ 841A210 - .incbin "baserom.gba", 0x41A210, 0x10 + .string "{PLAYER} used the\n{STR_VAR_1}.$" gUnknown_841A220:: @ 841A220 - .incbin "baserom.gba", 0x41A220, 0x35 + .string "Used the item {STR_VAR_1}, which was\nin the KEY ITEMS POCKET.$" gUnknown_841A255:: @ 841A255 - .incbin "baserom.gba", 0x41A255, 0x22 + .string "{STR_VAR_1} learned the move\n{STR_VAR_2} from a TM.$" gUnknown_841A277:: @ 841A277 - .incbin "baserom.gba", 0x41A277, 0x39 + .string "{STR_VAR_1} learned the move\n{STR_VAR_2} from a TM and forgot\nthe move {STR_VAR_3}.$" gUnknown_841A2B0:: @ 841A2B0 - .incbin "baserom.gba", 0x41A2B0, 0x31 + .string "POKéMON were fully restored\nat a POKéMON CENTER.$" gUnknown_841A2E1:: @ 841A2E1 - .incbin "baserom.gba", 0x41A2E1, 0x31 + .string "{UNKNOWN_F7 0x00} had a marvelous battle\nwith the CHAMPION, {UNKNOWN_F7 0x01}.$" gUnknown_841A312:: @ 841A312 - .incbin "baserom.gba", 0x41A312, 0x37 + .string "In the end, {UNKNOWN_F7 0x00} sent out {UNKNOWN_F7 0x01}\nwhile {UNKNOWN_F7 0x02} countered with\n{UNKNOWN_F7 0x03}.$" gUnknown_841A349:: @ 841A349 - .incbin "baserom.gba", 0x41A349, 0x48 + .string "And, as a result of battling with every\nbit of power, {UNKNOWN_F7 0x00} won\nthe match.$" gUnknown_841A391:: @ 841A391 - .incbin "baserom.gba", 0x41A391, 0x49 + .string "Removed the item {STR_VAR_1} from\nthe BAG’s ITEMS POCKET and stored it\non the PC.$" gUnknown_841A3DA:: @ 841A3DA - .incbin "baserom.gba", 0x41A3DA, 0x25 + .string "{PLAYER} withdrew the item {STR_VAR_1}\nfrom the PC.$" gUnknown_841A3FF:: @ 841A3FF - .incbin "baserom.gba", 0x41A3FF, 0x23 + .string "Traded {STR_VAR_3} in exchange for\n{STR_VAR_1}’s {STR_VAR_2}.$" gUnknown_841A422:: @ 841A422 - .incbin "baserom.gba", 0x41A422, 0x55 + .string "Took on {UNKNOWN_F7 0x00} in a SINGLE BATTLE.\nIt was a hotly contested match that\nresulted in a {UNKNOWN_F7 0x01}.$" gUnknown_841A477:: @ 841A477 - .incbin "baserom.gba", 0x41A477, 0x4F + .string "Took on {UNKNOWN_F7 0x00} in a DOUBLE BATTLE.\nIt was an extended match that resulted\nin a {UNKNOWN_F7 0x01}.$" gUnknown_841A4C6:: @ 841A4C6 - .incbin "baserom.gba", 0x41A4C6, 0x3C + .string "{UNKNOWN_F7 0x00} and {UNKNOWN_F7 0x01} took on\n{UNKNOWN_F7 0x02} and {UNKNOWN_F7 0x03} in a\nMULTI BATTLE and got a {UNKNOWN_F7 0x04}.$" gUnknown_841A502:: .string "win$" diff --git a/include/constants/items.h b/include/constants/items.h index dd2b4c4ed..64fed0e4c 100644 --- a/include/constants/items.h +++ b/include/constants/items.h @@ -393,4 +393,11 @@ // Check if the item is one that can be used on a Pokemon. #define IS_POKEMON_ITEM(item) ((item) >= ITEM_POTION && (item) <= ITEM_0B2) +// POCKETS +#define POCKET_ITEMS 1 +#define POCKET_KEY_ITEMS 2 +#define POCKET_POKE_BALLS 3 +#define POCKET_TM_CASE 4 +#define POCKET_BERRY_POUCH 5 + #endif // GUARD_CONSTANTS_ITEMS_H diff --git a/include/party_menu.h b/include/party_menu.h index c787bafb1..75a1645c4 100644 --- a/include/party_menu.h +++ b/include/party_menu.h @@ -14,5 +14,6 @@ bool8 pokemon_has_move(struct Pokemon *, u16); void sub_81B58A8(void); void DoWallyTutorialBagMenu(void); u8 pokemon_ailments_get_primary(u32 status); +u16 ItemIdToBattleMoveId(u16 itemId); #endif // GUARD_PARTY_MENU_H diff --git a/src/quest_log.c b/src/quest_log.c index b95bc8bd6..8131e1937 100644 --- a/src/quest_log.c +++ b/src/quest_log.c @@ -1,5 +1,6 @@ #include "global.h" #include "constants/species.h" +#include "constants/items.h" #include "data2.h" #include "malloc.h" #include "main.h" @@ -29,6 +30,7 @@ #include "map_name_popup.h" #include "wild_encounter.h" #include "help_system.h" +#include "party_menu.h" #include "unk_8159F40.h" #include "pokemon_storage_system.h" #include "save.h" @@ -275,6 +277,14 @@ bool8 sub_81153E4(u16, void*); extern const u8 gUnknown_841A155[]; extern const u8 gUnknown_841A16F[]; extern const u8 gUnknown_841B073[]; +extern const u8 gUnknown_841AFA6[]; +extern const u8 gUnknown_841A1E7[]; +extern const u8 gUnknown_841A210[]; +extern const u8 gUnknown_841A220[]; +extern const u8 gUnknown_841A965[]; +extern const u8 gUnknown_841A277[]; +extern const u8 gUnknown_841A938[]; +extern const u8 gUnknown_841A255[]; const struct WindowTemplate gUnknown_845661C[3] = { { 0, 0, 0, 30, 2, 15, 0x0e9 }, @@ -2646,7 +2656,7 @@ u8 sub_8113530(void) return sub_8113114(VAR_0x4038_STRUCT, gUnknown_20370C0); } -u16 * (*const gUnknown_8456948[])(u16 *, u16 *) = { +static u16 * (*const sQuestLogStorageCBs[])(u16 *, u16 *) = { NULL, NULL, NULL, @@ -2752,18 +2762,18 @@ void sub_8113550(u16 a0, u16 * a1) if (gUnknown_203AE04 == NULL) { gUnknown_203AE04 = gUnknown_203AE08; - r1 = gUnknown_8456948[a0](gUnknown_203AE04, a1); + r1 = sQuestLogStorageCBs[a0](gUnknown_203AE04, a1); } else { - gUnknown_8456948[a0](gUnknown_203AE04, a1); + sQuestLogStorageCBs[a0](gUnknown_203AE04, a1); return; } } else { gUnknown_203AE04 = NULL; - r1 = gUnknown_8456948[a0](gUnknown_203AE08, a1); + r1 = sQuestLogStorageCBs[a0](gUnknown_203AE08, a1); } if (r1 == NULL) @@ -2905,27 +2915,27 @@ void sub_8113550(u16 a0, u16 * a1) "\tldr r0, _08113660 @ =gUnknown_203AE08\n" "\tldr r0, [r0]\n" "\tstr r0, [r2]\n" - "\tldr r1, _08113664 @ =gUnknown_8456948\n" + "\tldr r1, _08113664 @ =sQuestLogStorageCBs\n" "\tldr r2, [r1, 0x7C]\n" "\tb _0811368E\n" "\t.align 2, 0\n" "_0811365C: .4byte gUnknown_203AE04\n" "_08113660: .4byte gUnknown_203AE08\n" - "_08113664: .4byte gUnknown_8456948\n" + "_08113664: .4byte sQuestLogStorageCBs\n" "_08113668:\n" - "\tldr r0, _08113678 @ =gUnknown_8456948\n" + "\tldr r0, _08113678 @ =sQuestLogStorageCBs\n" "\tldr r2, [r0, 0x7C]\n" "\tadds r0, r1, 0\n" "\tadds r1, r5, 0\n" "\tbl _call_via_r2\n" "\tb ._return\n" "\t.align 2, 0\n" - "_08113678: .4byte gUnknown_8456948\n" + "_08113678: .4byte sQuestLogStorageCBs\n" "_0811367C:\n" "\tldr r1, _081136C4 @ =gUnknown_203AE04\n" "\tmovs r0, 0\n" "\tstr r0, [r1]\n" - "\tldr r0, _081136C8 @ =gUnknown_8456948\n" + "\tldr r0, _081136C8 @ =sQuestLogStorageCBs\n" "\tlsls r1, r4, 2\n" "\tadds r1, r0\n" "\tldr r0, _081136CC @ =gUnknown_203AE08\n" @@ -2958,7 +2968,7 @@ void sub_8113550(u16 a0, u16 * a1) "\tbx r0\n" "\t.align 2, 0\n" "_081136C4: .4byte gUnknown_203AE04\n" - "_081136C8: .4byte gUnknown_8456948\n" + "_081136C8: .4byte sQuestLogStorageCBs\n" "_081136CC: .4byte gUnknown_203AE08\n" "_081136D0: .4byte gUnknown_203B048"); } @@ -3051,7 +3061,7 @@ u16 * sub_8113828(u16 a0, u16 * a1) else gUnknown_203AE04 = NULL; - return gUnknown_8456948[a0](gUnknown_203AE08, a1); + return sQuestLogStorageCBs[a0](gUnknown_203AE08, a1); } bool8 sub_81138A0(u16 a0, u16 * a1) @@ -3084,7 +3094,7 @@ void sub_811390C(void) u16 * resp; gUnknown_203B04A = 0; sub_8110AEC(gUnknown_203B024.unk_00); - resp = gUnknown_8456948[gUnknown_203B024.unk_00](gUnknown_203AE08, (u16 *)&gUnknown_203B024.unk_04); + resp = sQuestLogStorageCBs[gUnknown_203B024.unk_00](gUnknown_203AE08, (u16 *)&gUnknown_203B024.unk_04); gUnknown_203AE08 = resp; sub_81138F8(); } @@ -3114,7 +3124,7 @@ void sub_81139BC(void) sub_8110AEC(gUnknown_203B024.unk_00); } sub_8113B94(gUnknown_203B024.unk_00); - resp = gUnknown_8456948[gUnknown_203B024.unk_00](gUnknown_203AE08, (u16 *)&gUnknown_203B024.unk_04); + resp = sQuestLogStorageCBs[gUnknown_203B024.unk_00](gUnknown_203AE08, (u16 *)&gUnknown_203B024.unk_04); gUnknown_203AE08 = resp; sub_8113A1C(1); sub_81138F8(); @@ -3142,7 +3152,7 @@ bool8 sub_8113A44(u16 a0, u16 *a1) return FALSE; } -u16 * (*const gUnknown_84569F4[])(u16 *) = { +static u16 * (*const sQuestLogScriptParsingCBs[])(u16 *) = { NULL, NULL, NULL, @@ -3261,7 +3271,7 @@ bool8 sub_8113AE8(u16 * a0) if (a0 == NULL || a0[1] > gUnknown_203AF98) return FALSE; - gUnknown_84569F4[a0[0] & 0xFFF](a0); + sQuestLogScriptParsingCBs[a0[0] & 0xFFF](a0); gUnknown_203B044.unk_0 = a0[0]; gUnknown_203B044.unk_1 = (a0[0] & 0xF000) >> 12; if (gUnknown_203B044.unk_1 != 0) @@ -3287,7 +3297,7 @@ bool8 sub_8113AE8(u16 * a0) "\t.align 2, 0\n" "_08113B00: .4byte gUnknown_203AF98\n" "_08113B04:\n" - "\tldr r2, _08113B38 @ =gUnknown_84569F4\n" + "\tldr r2, _08113B38 @ =sQuestLogScriptParsingCBs\n" "\tldrh r1, [r4]\n" "\tldr r0, _08113B3C @ =0x00000fff\n" "\tands r0, r1\n" @@ -3315,7 +3325,7 @@ bool8 sub_8113AE8(u16 * a0) "\tpop {r1}\n" "\tbx r1\n" "\t.align 2, 0\n" - "_08113B38: .4byte gUnknown_84569F4\n" + "_08113B38: .4byte sQuestLogScriptParsingCBs\n" "_08113B3C: .4byte 0x00000fff\n" "_08113B40: .4byte gUnknown_203B044"); } @@ -3326,7 +3336,7 @@ bool8 sub_8113B44(u16 * a0) if (gUnknown_203B044.unk_2 == 0) return FALSE; - gUnknown_84569F4[gUnknown_203B044.unk_0](a0); + sQuestLogScriptParsingCBs[gUnknown_203B044.unk_0](a0); gUnknown_203B044.unk_2++; if (gUnknown_203B044.unk_2 > gUnknown_203B044.unk_1) sub_8113B88(); @@ -3517,7 +3527,7 @@ u16 * sub_8113E88(u16 a0, u16 * a1) // TODO: delete this declaration once data_83FECCC.s is decompiled extern const u8 gText_EggNickname[]; -void sub_8113EAC(u16 a0, u8 * a1, u8 a2) +void QuestLog_AutoGetSpeciesname(u16 a0, u8 * a1, u8 a2) { if (a1 != NULL) { @@ -3549,9 +3559,77 @@ u16 * sub_8113F14(u16 * a0, u16 * a1) u16 * sub_8113F3C(u16 * a0) { u16 * r4 = sub_8113E88(3, a0); - sub_8113EAC(r4[0], gStringVar1, 0); - sub_8113EAC(r4[1], gStringVar2, 0); + QuestLog_AutoGetSpeciesname(r4[0], gStringVar1, 0); + QuestLog_AutoGetSpeciesname(r4[1], gStringVar2, 0); StringExpandPlaceholders(gStringVar4, gUnknown_841A16F); r4 += 2; return r4; } + +u16 * sub_8113F80(u16 * a0, u16 * a1) +{ + u16 * r2 = sub_8113DE0(4, a0); + if (r2 == NULL) + return NULL; + + r2[0] = a1[0]; + r2[1] = a1[2]; + r2[2] = a1[3]; + + if (a1[0] == ITEM_ESCAPE_ROPE) + gUnknown_203B048 = 2; + + return r2 + 3; +} + +u16 * sub_8113FBC(u16 * a0) +{ + u16 * r5 = sub_8113E88(4, a0); + + switch (ItemId_GetPocket(r5[0])) + { + case POCKET_ITEMS: + case POCKET_POKE_BALLS: + case POCKET_BERRY_POUCH: + StringCopy(gStringVar1, ItemId_GetItem(r5[0])->name); + if (r5[0] == ITEM_ESCAPE_ROPE) + { + sub_80C4DF8(gStringVar2, r5[2]); + StringExpandPlaceholders(gStringVar4, gUnknown_841AFA6); + } + else if (r5[1] != 0xFFFF) + { + QuestLog_AutoGetSpeciesname(r5[1], gStringVar2, 0); + StringExpandPlaceholders(gStringVar4, gUnknown_841A1E7); + } + else + { + StringExpandPlaceholders(gStringVar4, gUnknown_841A210); + } + break; + case POCKET_KEY_ITEMS: + StringCopy(gStringVar1, ItemId_GetItem(r5[0])->name); + StringExpandPlaceholders(gStringVar4, gUnknown_841A220); + break; + case POCKET_TM_CASE: + QuestLog_AutoGetSpeciesname(r5[1], gStringVar1, 0); + StringCopy(gStringVar2, gMoveNames[ItemIdToBattleMoveId(r5[0])]); + if (r5[2] != 0xFFFF) + { + StringCopy(gStringVar3, gMoveNames[r5[2]]); + if (r5[0] > ITEM_TM50) + StringExpandPlaceholders(gStringVar4, gUnknown_841A965); + else + StringExpandPlaceholders(gStringVar4, gUnknown_841A277); + } + else + { + if (r5[0] > ITEM_TM50) + StringExpandPlaceholders(gStringVar4, gUnknown_841A938); + else + StringExpandPlaceholders(gStringVar4, gUnknown_841A255); + } + break; + } + return r5 + 3; +} -- cgit v1.2.3 From 3e418d7a7be44631f33d4e05bc54c495aa181ecb Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Thu, 8 Nov 2018 14:20:36 -0500 Subject: Finish disming quest_log strings --- asm/quest_log.s | 62 +++---- data/data_83FECCC.s | 439 +------------------------------------------ data/text/quest_log.inc | 481 ++++++++++++++++++++++++++++++++++++++++++++++++ src/quest_log.c | 10 +- 4 files changed, 527 insertions(+), 465 deletions(-) create mode 100644 data/text/quest_log.inc diff --git a/asm/quest_log.s b/asm/quest_log.s index be4e55ce8..cd3812b47 100644 --- a/asm/quest_log.s +++ b/asm/quest_log.s @@ -51,7 +51,7 @@ sub_8114188: @ 8114188 ldrh r0, [r4, 0x2] ldr r1, _081141C0 @ =gStringVar1 movs r2, 0 - bl QuestLog_AutoGetSpeciesname + bl QuestLog_AutoGetSpeciesName ldr r5, _081141C4 @ =gStringVar2 ldrh r0, [r4] bl ItemId_GetItem @@ -95,7 +95,7 @@ sub_81141E4: @ 81141E4 ldrh r0, [r4, 0x2] ldr r1, _0811421C @ =gStringVar1 movs r2, 0 - bl QuestLog_AutoGetSpeciesname + bl QuestLog_AutoGetSpeciesName ldr r5, _08114220 @ =gStringVar2 ldrh r0, [r4] bl ItemId_GetItem @@ -139,7 +139,7 @@ sub_8114240: @ 8114240 ldrh r0, [r4, 0x2] ldr r1, _08114278 @ =gStringVar2 movs r2, 0 - bl QuestLog_AutoGetSpeciesname + bl QuestLog_AutoGetSpeciesName ldr r5, _0811427C @ =gStringVar1 ldrh r0, [r4] bl ItemId_GetItem @@ -183,7 +183,7 @@ sub_811429C: @ 811429C ldrh r0, [r4, 0x2] ldr r1, _081142D4 @ =gStringVar1 movs r2, 0 - bl QuestLog_AutoGetSpeciesname + bl QuestLog_AutoGetSpeciesName ldr r5, _081142D8 @ =gStringVar2 ldrh r0, [r4] bl ItemId_GetItem @@ -253,7 +253,7 @@ sub_8114324: @ 8114324 ldrh r0, [r4, 0x4] ldr r1, _0811436C @ =gStringVar1 movs r2, 0 - bl QuestLog_AutoGetSpeciesname + bl QuestLog_AutoGetSpeciesName ldr r5, _08114370 @ =gStringVar2 ldrh r0, [r4] bl ItemId_GetItem @@ -304,7 +304,7 @@ sub_8114394: @ 8114394 ldrh r0, [r4, 0x4] ldr r1, _081143DC @ =gStringVar2 movs r2, 0 - bl QuestLog_AutoGetSpeciesname + bl QuestLog_AutoGetSpeciesName ldr r5, _081143E0 @ =gStringVar3 ldrh r0, [r4] bl ItemId_GetItem @@ -439,11 +439,11 @@ sub_811448C: @ 811448C ldrh r0, [r5, 0x6] ldr r1, _081144DC @ =gStringVar2 movs r2, 0 - bl QuestLog_AutoGetSpeciesname + bl QuestLog_AutoGetSpeciesName ldrh r0, [r5, 0x4] ldr r1, _081144E0 @ =gStringVar3 movs r2, 0 - bl QuestLog_AutoGetSpeciesname + bl QuestLog_AutoGetSpeciesName ldr r0, _081144E4 @ =gStringVar4 ldr r1, _081144E8 @ =gUnknown_841A3FF bl StringExpandPlaceholders @@ -813,11 +813,11 @@ sub_81147A8: @ 81147A8 ldrh r0, [r5, 0x6] ldr r1, _081147F8 @ =gStringVar2 movs r2, 0 - bl QuestLog_AutoGetSpeciesname + bl QuestLog_AutoGetSpeciesName ldrh r0, [r5, 0x4] ldr r1, _081147FC @ =gStringVar3 movs r2, 0 - bl QuestLog_AutoGetSpeciesname + bl QuestLog_AutoGetSpeciesName ldr r0, _08114800 @ =gStringVar4 ldr r1, _08114804 @ =gUnknown_841A76A bl StringExpandPlaceholders @@ -942,7 +942,7 @@ sub_81148BC: @ 81148BC ldrh r0, [r4] movs r1, 0 movs r2, 0x1 - bl QuestLog_AutoGetSpeciesname + bl QuestLog_AutoGetSpeciesName ldrb r0, [r5, 0x1] bl GetBoxNamePtr adds r1, r0, 0 @@ -951,7 +951,7 @@ sub_81148BC: @ 81148BC ldrh r0, [r4, 0x2] movs r1, 0 movs r2, 0x3 - bl QuestLog_AutoGetSpeciesname + bl QuestLog_AutoGetSpeciesName ldr r0, _08114910 @ =gStringVar4 ldr r1, _08114914 @ =gUnknown_841A566 bl UnkTextUtil_StringExpandPlaceholders @@ -1008,11 +1008,11 @@ sub_8114944: @ 8114944 ldrh r0, [r4] movs r1, 0 movs r2, 0x1 - bl QuestLog_AutoGetSpeciesname + bl QuestLog_AutoGetSpeciesName ldrh r0, [r4, 0x2] movs r1, 0 movs r2, 0x2 - bl QuestLog_AutoGetSpeciesname + bl QuestLog_AutoGetSpeciesName ldr r0, _08114988 @ =gStringVar4 ldr r1, _0811498C @ =gUnknown_841A5D9 bl UnkTextUtil_StringExpandPlaceholders @@ -1081,11 +1081,11 @@ sub_81149D0: @ 81149D0 ldrh r0, [r4] movs r1, 0 movs r2, 0x1 - bl QuestLog_AutoGetSpeciesname + bl QuestLog_AutoGetSpeciesName ldrh r0, [r4, 0x2] movs r1, 0 movs r2, 0x2 - bl QuestLog_AutoGetSpeciesname + bl QuestLog_AutoGetSpeciesName ldr r0, _08114A14 @ =gStringVar4 ldr r1, _08114A18 @ =gUnknown_841A60A bl UnkTextUtil_StringExpandPlaceholders @@ -1144,7 +1144,7 @@ sub_8114A4C: @ 8114A4C ldrh r0, [r4] movs r1, 0 movs r2, 0x1 - bl QuestLog_AutoGetSpeciesname + bl QuestLog_AutoGetSpeciesName ldrb r0, [r5, 0x1] bl GetBoxNamePtr adds r1, r0, 0 @@ -1205,7 +1205,7 @@ sub_8114AC8: @ 8114AC8 ldrh r0, [r4] movs r1, 0 movs r2, 0x1 - bl QuestLog_AutoGetSpeciesname + bl QuestLog_AutoGetSpeciesName ldr r0, _08114B04 @ =gStringVar4 ldr r1, _08114B08 @ =gUnknown_841A5FA bl UnkTextUtil_StringExpandPlaceholders @@ -1261,7 +1261,7 @@ sub_8114B34: @ 8114B34 ldrh r0, [r4] movs r1, 0 movs r2, 0x1 - bl QuestLog_AutoGetSpeciesname + bl QuestLog_AutoGetSpeciesName ldr r0, _08114B70 @ =gStringVar4 ldr r1, _08114B74 @ =gUnknown_841A632 bl UnkTextUtil_StringExpandPlaceholders @@ -1312,7 +1312,7 @@ sub_8114BA0: @ 8114BA0 ldrh r0, [r4] movs r1, 0 movs r2, 0 - bl QuestLog_AutoGetSpeciesname + bl QuestLog_AutoGetSpeciesName ldrb r0, [r4, 0x2] bl GetBoxNamePtr adds r1, r0, 0 @@ -1567,11 +1567,11 @@ sub_8114D68: @ 8114D68 ldrh r0, [r4] movs r1, 0 movs r2, 0x2 - bl QuestLog_AutoGetSpeciesname + bl QuestLog_AutoGetSpeciesName ldrh r0, [r4, 0x2] movs r1, 0 movs r2, 0x3 - bl QuestLog_AutoGetSpeciesname + bl QuestLog_AutoGetSpeciesName ldr r1, _08114DDC @ =gUnknown_8456ACC ldrb r0, [r6, 0x1] lsls r0, 2 @@ -1697,7 +1697,7 @@ _08114E84: ldrh r0, [r5, 0x4] movs r1, 0 movs r2, 0x1 - bl QuestLog_AutoGetSpeciesname + bl QuestLog_AutoGetSpeciesName ldr r4, _08114F04 @ =gStringVar2 ldrb r1, [r5, 0x8] adds r0, r4, 0 @@ -1710,7 +1710,7 @@ _08114E84: ldrh r0, [r5, 0x6] movs r1, 0 movs r2, 0x3 - bl QuestLog_AutoGetSpeciesname + bl QuestLog_AutoGetSpeciesName ldr r4, _08114F08 @ =gStringVar3 ldrb r1, [r6, 0x1] adds r0, r4, 0 @@ -1886,11 +1886,11 @@ sub_811500C: @ 811500C ldrh r0, [r4] movs r1, 0 movs r2, 0x1 - bl QuestLog_AutoGetSpeciesname + bl QuestLog_AutoGetSpeciesName ldrh r0, [r4, 0x2] movs r1, 0 movs r2, 0x2 - bl QuestLog_AutoGetSpeciesname + bl QuestLog_AutoGetSpeciesName ldr r1, _0811506C @ =gUnknown_8456ACC ldrb r0, [r5, 0x1] lsls r0, 2 @@ -2023,7 +2023,7 @@ _08115148: ldrh r0, [r4, 0x4] movs r1, 0 movs r2, 0x1 - bl QuestLog_AutoGetSpeciesname + bl QuestLog_AutoGetSpeciesName ldr r0, _08115188 @ =gSaveBlock2Ptr ldr r1, [r0] movs r0, 0x2 @@ -2031,7 +2031,7 @@ _08115148: ldrh r0, [r4, 0x6] movs r1, 0 movs r2, 0x3 - bl QuestLog_AutoGetSpeciesname + bl QuestLog_AutoGetSpeciesName ldr r0, _0811518C @ =gStringVar4 ldr r1, _08115190 @ =gUnknown_841A312 bl UnkTextUtil_StringExpandPlaceholders @@ -2130,11 +2130,11 @@ _0811523E: ldrh r0, [r5] movs r1, 0 movs r2, 0x2 - bl QuestLog_AutoGetSpeciesname + bl QuestLog_AutoGetSpeciesName ldrh r0, [r5, 0x2] movs r1, 0 movs r2, 0x3 - bl QuestLog_AutoGetSpeciesname + bl QuestLog_AutoGetSpeciesName ldr r1, _08115274 @ =gUnknown_8456ACC ldrb r0, [r6, 0x1] lsls r0, 2 @@ -2420,7 +2420,7 @@ sub_8115460: @ 8115460 ldrh r0, [r4] ldr r1, _0811549C @ =gStringVar1 movs r2, 0 - bl QuestLog_AutoGetSpeciesname + bl QuestLog_AutoGetSpeciesName ldrb r0, [r5, 0x1] cmp r0, 0xFF beq _08115486 diff --git a/data/data_83FECCC.s b/data/data_83FECCC.s index da553d83e..bdcf0a201 100644 --- a/data/data_83FECCC.s +++ b/data/data_83FECCC.s @@ -1628,457 +1628,38 @@ gUnknown_8419F54:: @ 8419F54 .string "SAVING…\n" .string "DON’T TURN OFF THE POWER.$" -gUnknown_8419F76:: @ 8419F76 +// Start menu option descriptions +gUnknown_8419F76:: @ 8419F76 // Pokedex .string "A device that records POKéMON secrets\n" .string "upon meeting or catching them.$" -gUnknown_8419FBB:: @ 8419FBB +gUnknown_8419FBB:: @ 8419FBB // Pokemon .string "Check and organize POKéMON that are\n" .string "traveling with you in your party.$" -gUnknown_841A001:: @ 841A001 +gUnknown_841A001:: @ 841A001 // Bag .string "Equipped with pockets for storing items\n" .string "you bought, received, or found.$" -gUnknown_841A049:: @ 841A049 +gUnknown_841A049:: @ 841A049 // {PLAYER} .string "Check your money and other game data.$" -gUnknown_841A06F:: @ 841A06F +gUnknown_841A06F:: @ 841A06F // Save .string "Save your game with a complete record\n" .string "of your progress to take a break.$" -gUnknown_841A0B7:: @ 841A0B7 +gUnknown_841A0B7:: @ 841A0B7 // Options .string "Adjust various game settings such as text\n" .string "speed, game rules, etc.$" -gUnknown_841A0F9:: @ 841A0F9 +gUnknown_841A0F9:: @ 841A0F9 // Quit .string "Close this MENU window.$" -gUnknown_841A111:: @ 841A111 +gUnknown_841A111:: @ 841A111 // Retire .string "Retire from the SAFARI GAME and return to\n" .string "the registration counter.$" -gUnknown_841A155:: @ 841A155 - .string "Previously on your quest…$" - -gUnknown_841A16F:: @ 841A16F - .string "{PLAYER} switched the POKéMON\n{STR_VAR_1} with {STR_VAR_2}.$" - -gUnknown_841A193:: @ 841A193 - .string "Took the item {STR_VAR_2} from\n{STR_VAR_1} and gave it the item\n{STR_VAR_3} to hold.$" - -gUnknown_841A1CD:: @ 841A1CD - .string "Took the item {STR_VAR_2} from\n{STR_VAR_1}.$" - -gUnknown_841A1E7:: @ 841A1E7 - .string "Used the item {STR_VAR_1} on {STR_VAR_2}\nat this location.$" - -gUnknown_841A210:: @ 841A210 - .string "{PLAYER} used the\n{STR_VAR_1}.$" - -gUnknown_841A220:: @ 841A220 - .string "Used the item {STR_VAR_1}, which was\nin the KEY ITEMS POCKET.$" - -gUnknown_841A255:: @ 841A255 - .string "{STR_VAR_1} learned the move\n{STR_VAR_2} from a TM.$" - -gUnknown_841A277:: @ 841A277 - .string "{STR_VAR_1} learned the move\n{STR_VAR_2} from a TM and forgot\nthe move {STR_VAR_3}.$" - -gUnknown_841A2B0:: @ 841A2B0 - .string "POKéMON were fully restored\nat a POKéMON CENTER.$" - -gUnknown_841A2E1:: @ 841A2E1 - .string "{UNKNOWN_F7 0x00} had a marvelous battle\nwith the CHAMPION, {UNKNOWN_F7 0x01}.$" - -gUnknown_841A312:: @ 841A312 - .string "In the end, {UNKNOWN_F7 0x00} sent out {UNKNOWN_F7 0x01}\nwhile {UNKNOWN_F7 0x02} countered with\n{UNKNOWN_F7 0x03}.$" - -gUnknown_841A349:: @ 841A349 - .string "And, as a result of battling with every\nbit of power, {UNKNOWN_F7 0x00} won\nthe match.$" - -gUnknown_841A391:: @ 841A391 - .string "Removed the item {STR_VAR_1} from\nthe BAG’s ITEMS POCKET and stored it\non the PC.$" - -gUnknown_841A3DA:: @ 841A3DA - .string "{PLAYER} withdrew the item {STR_VAR_1}\nfrom the PC.$" - -gUnknown_841A3FF:: @ 841A3FF - .string "Traded {STR_VAR_3} in exchange for\n{STR_VAR_1}’s {STR_VAR_2}.$" - -gUnknown_841A422:: @ 841A422 - .string "Took on {UNKNOWN_F7 0x00} in a SINGLE BATTLE.\nIt was a hotly contested match that\nresulted in a {UNKNOWN_F7 0x01}.$" - -gUnknown_841A477:: @ 841A477 - .string "Took on {UNKNOWN_F7 0x00} in a DOUBLE BATTLE.\nIt was an extended match that resulted\nin a {UNKNOWN_F7 0x01}.$" - -gUnknown_841A4C6:: @ 841A4C6 - .string "{UNKNOWN_F7 0x00} and {UNKNOWN_F7 0x01} took on\n{UNKNOWN_F7 0x02} and {UNKNOWN_F7 0x03} in a\nMULTI BATTLE and got a {UNKNOWN_F7 0x04}.$" - -gUnknown_841A502:: - .string "win$" - -gUnknown_841A506:: - .string "loss$" - -gUnknown_841A50B:: @ 841A50B - .string "Mingled with other TRAINERS in\n" - .string "the UNION ROOM.$" - -gUnknown_841A53A:: - .string "Departed {STR_VAR_2}\n" - .string "in {STR_VAR_1} for the next\n" - .string "destination.$" - -gUnknown_841A566:: @ 841A566 - .string "After consideration, switched\n" - .string "{UNKNOWN_F7 0x01} in {UNKNOWN_F7 0x00} with\n" - .string "{UNKNOWN_F7 0x03} in {UNKNOWN_F7 0x02}.$" - -gUnknown_841A59C:: @ 841A59C - .string "After deep thought, switched\n" - .string "{UNKNOWN_F7 0x01} in BOX “{UNKNOWN_F7 0x00}†to\n" - .string "the BOX “{UNKNOWN_F7 0x02}.â€$" - -gUnknown_841A5D9:: @ 841A5D9 - .string "Switched around {UNKNOWN_F7 0x01} and\n" - .string "{UNKNOWN_F7 0x02} in {UNKNOWN_F7 0x00}.$" - -gUnknown_841A5FA:: @ 841A5FA - .string "Moved {UNKNOWN_F7 0x01} in {UNKNOWN_F7 0x00}.$" - -gUnknown_841A60A:: @ 841A60A - .string "Switched {UNKNOWN_F7 0x01} in {UNKNOWN_F7 0x00}\n" - .string "with {UNKNOWN_F7 0x02} in the party.$" - -gUnknown_841A632:: @ 841A632 - .string "Added {UNKNOWN_F7 0x01} in {UNKNOWN_F7 0x00}\n" - .string "to the party.$" - -gUnknown_841A64F:: @ 841A64F - .string "Moved {UNKNOWN_F7 0x00} from the party\n" - .string "to {UNKNOWN_F7 0x01}.$" - -gUnknown_841A66E:: @ 841A66E - .string "Moved a group of POKéMON in\n" - .string "{UNKNOWN_F7 0x00} to {UNKNOWN_F7 0x01}.$" - -gUnknown_841A694:: @ 841A694 - .string "a different spot$" - -gUnknown_841A6A5:: @ 841A6A5 - .string "Removed the item {STR_VAR_1} from\n" - .string "{PLAYER}’s PC and gave it to {STR_VAR_2}\n" - .string "to hold.$" - -gUnknown_841A6E1:: @ 841A6E1 - .string "Removed the item {STR_VAR_1} from\n" - .string "a PC, gave it to {STR_VAR_2}, and put\n" - .string "the {STR_VAR_3} it held in the BAG.$" - -gUnknown_841A732:: @ 841A732 - .string "Chatted with many TRAINERS.$" - -gUnknown_841A74E:: - .string "handily$" - -gUnknown_841A756:: - .string "tenaciously$" - -gUnknown_841A762:: - .string "somehow$" - -gUnknown_841A76A:: @ 841A76A - .incbin "baserom.gba", 0x41A76A, 0x46 - -gUnknown_841A7B0:: @ 841A7B0 - .incbin "baserom.gba", 0x41A7B0, 0x2D - -gUnknown_841A7DD:: @ 841A7DD - .incbin "baserom.gba", 0x41A7DD, 0x33 - -gUnknown_841A810:: @ 841A810 - .incbin "baserom.gba", 0x41A810, 0x48 - -gUnknown_841A858:: @ 841A858 - .incbin "baserom.gba", 0x41A858, 0x3E - -gUnknown_841A896:: @ 841A896 - .incbin "baserom.gba", 0x41A896, 0x3E - -gUnknown_841A8D4:: @ 841A8D4 - .incbin "baserom.gba", 0x41A8D4, 0x9 - -gUnknown_841A8DD:: @ 841A8DD - .string "{UNKNOWN_F7 0x04}$" - -gUnknown_841A8E0:: @ 841A8E0 - .string "{STR_VAR_1} shared its HP using the move\n" - .string "SOFTBOILED.$" - -gUnknown_841A90C:: @ 841A90C - .string "{STR_VAR_1} shared its HP using the move\n" - .string "MILK DRINK.$" - -gUnknown_841A938:: @ 841A938 - .incbin "baserom.gba", 0x41A938, 0x2D - -gUnknown_841A965:: @ 841A965 - .incbin "baserom.gba", 0x41A965, 0x44 - -gUnknown_841A9A9:: @ 841A9A9 - .incbin "baserom.gba", 0x41A9A9, 0x2B - -gUnknown_841A9D4:: @ 841A9D4 - .incbin "baserom.gba", 0x41A9D4, 0x2D - -gUnknown_841AA01:: @ 841AA01 - .incbin "baserom.gba", 0x41AA01, 0x2A - -gUnknown_841AA2B:: @ 841AA2B - .incbin "baserom.gba", 0x41AA2B, 0x4B - -gUnknown_841AA76:: @ 841AA76 - .incbin "baserom.gba", 0x41AA76, 0x34 - -gUnknown_841AAAA:: @ 841AAAA - .incbin "baserom.gba", 0x41AAAA, 0x42 - -gUnknown_841AAEC:: @ 841AAEC - .incbin "baserom.gba", 0x41AAEC, 0x3D - -gUnknown_841AB29:: @ 841AB29 - .incbin "baserom.gba", 0x41AB29, 0x4B - -gUnknown_841AB74:: @ 841AB74 - .incbin "baserom.gba", 0x41AB74, 0x1A - -gUnknown_841AB8E:: @ 841AB8E - .string "{PLAYER} made {STR_VAR_1} hold the item\n" - .string "{STR_VAR_2}.$" - -gUnknown_841ABAB:: @ 841ABAB - .string "{STR_VAR_1} used the Hidden Move\n" - .string "CUT here.$" - -gUnknown_841ABCD:: @ 841ABCD - .string "{STR_VAR_1} used the Hidden Move\n" - .string "FLY and flew to {STR_VAR_2}.$" - -gUnknown_841ABF9:: @ 841ABF9 - .string "{STR_VAR_1} used the Hidden Move\n" - .string "SURF and rode the waves.$" - -gUnknown_841AC2A:: @ 841AC2A - .string "{STR_VAR_1} used the Hidden Move\n" - .string "STRENGTH here.$" - -gUnknown_841AC51:: @ 841AC51 - .string "{STR_VAR_1} used the Hidden Move\n" - .string "FLASH and illuminated a pitch-black\n" - .string "cave.$" - -gUnknown_841AC93:: @ 841AC93 - .string "{STR_VAR_1} used the Hidden Move\n" - .string "ROCK SMASH here.$" - -gUnknown_841ACBC:: @ 841ACBC - .string "{STR_VAR_1} used the Hidden Move\n" - .string "WATERFALL to scale a raging torrent.$" - -gUnknown_841ACF9:: @ 841ACF9 - .string "{STR_VAR_1}è êÉà Ñ㓪& òã–Ã\n" - .string "éã§+ã‚ã–\n" - .string "ダ¡ビング& ÚÉã£Å’!$" - -gUnknown_841AD1D:: @ 841AD1D - .string "{STR_VAR_1} used DIG to escape from\n" - .string "{STR_VAR_2}.$" - -gUnknown_841AD3C:: @ 841AD3C - .string "{STR_VAR_1} used SWEET SCENT to attract\n" - .string "wild POKéMON.$" - -gUnknown_841AD69:: @ 841AD69 - .string "{STR_VAR_1} used TELEPORT, transporting\n" - .string "the party to {STR_VAR_2}’s\n" - .string "{STR_VAR_3}.$" - -gUnknown_841AD9E:: @ 841AD9E - .string "{PLAYER} left {STR_VAR_1}’s\n" - .string "{STR_VAR_2} for the next\n" - .string "destination.$" - -gUnknown_841ADC8:: @ 841ADC8 - .string "Played a lot of games at the ROCKET\n" - .string "GAME CORNER in {STR_VAR_1}.$" - -gUnknown_841ADFF:: @ 841ADFF - .string "{PLAYER} rested comfortably at home.$" - -gUnknown_841AE1E:: @ 841AE1E - .string "{PLAYER} left PROF. OAK’s POKéMON\n" - .string "RESEARCH LAB.$" - -gUnknown_841AE48:: @ 841AE48 - .string "The GYM in {STR_VAR_1} was full of\n" - .string "tough TRAINERS…\n" - .string "Preparations had to be made.$" - -gUnknown_841AE8F:: @ 841AE8F - .string "Departed the GYM in {STR_VAR_1}.$" - -gUnknown_841AEA7:: @ 841AEA7 - .string "{PLAYER} had a great time with POKéMON\n" - .string "in the SAFARI ZONE.$" - -gUnknown_841AEDC:: @ 841AEDC - .string "Managed to get out of {STR_VAR_2}\n" - .string "after wandering about.$" - -gUnknown_841AF0C:: @ 841AF0C - .incbin "baserom.gba", 0x41AF0C, 0x32 - -gUnknown_841AF3E:: @ 841AF3E - .incbin "baserom.gba", 0x41AF3E, 0x2F - -gUnknown_841AF6D:: @ 841AF6D - .incbin "baserom.gba", 0x41AF6D, 0x2B - -gUnknown_841AF98:: @ 841AF98 - .string "coolly$" - -gUnknown_841AF9F:: @ 841AF9F - .string "barely$" - -gUnknown_841AFA6:: @ 841AFA6 - .string "{PLAYER} used an ESCAPE ROPE to get\n" - .string "out from {STR_VAR_2}.$" - -gUnknown_841AFD1:: @ 841AFD1 - .string "draw$" - -gUnknown_841AFD6:: @ 841AFD6 - .string "Departed from the {STR_VAR_2}\n" - .string "for the next destination.$" - -gUnknown_841B005:: @ 841B005 - .string "{PLAYER} departed from\n" - .string "{STR_VAR_2} and made way\n" - .string "to the next destination.$" - -gUnknown_841B03F:: @ 841B03F - .string "Here in {STR_VAR_1}, {PLAYER}\n" - .string "obtained the item {STR_VAR_2}.$" - -gUnknown_841B064:: @ 841B064 - .string "Arrived in {STR_VAR_1}.$" - -gUnknown_841B073:: @ 841B073 - .string "And {PLAYER} saved the game at this\n" - .string "location: {STR_VAR_1}.$" - -gUnknown_841B09F:: @ 841B09F - .string "HOME$" - -gUnknown_841B0A4:: @ 841B0A4 - .string "OAK RESEARCH LAB$" - -gUnknown_841B0B5:: @ 841B0B5 - .string "GYM$" - -gUnknown_841B0B9:: @ 841B0B9 - .string "POKéMON LEAGUE GATE$" - -gUnknown_841B0CD:: @ 841B0CD - .string "VIRIDIAN FOREST$" - -gUnknown_841B0DD:: @ 841B0DD - .string "PEWTER MUSEUM OF SCIENCE$" - -gUnknown_841B0F6:: @ 841B0F6 - .string "MT. MOON$" - -gUnknown_841B0FF:: @ 841B0FF - .string "BIKE SHOP$" - -gUnknown_841B109:: @ 841B109 - .string "BILL’S HOUSE$" - -gUnknown_841B116:: @ 841B116 - .string "DAY CARE$" - -gUnknown_841B11F:: @ 841B11F - .string "UNDERGROUND PATH$" - -gUnknown_841B130:: @ 841B130 - .string "POKéMON FAN CLUB$" - -gUnknown_841B141:: @ 841B141 - .string "S.S. ANNE$" - -gUnknown_841B14B:: @ 841B14B - .string "DIGLETT’S CAVE$" - -gUnknown_841B15A:: @ 841B15A - .string "ROCK TUNNEL$" - -gUnknown_841B166:: @ 841B166 - .string "POWER PLANT$" - -gUnknown_841B172:: @ 841B172 - .string "POKéMON TOWER$" - -gUnknown_841B180:: @ 841B180 - .string "VOLUNTEER HOUSE$" - -gUnknown_841B190:: @ 841B190 - .string "NAME RATER’S HOUSE$" - -gUnknown_841B1A3:: @ 841B1A3 - .string "CELADON DEPT. STORE$" - -gUnknown_841B1B7:: @ 841B1B7 - .string "CELADON MANSION$" - -gUnknown_841B1C7:: @ 841B1C7 - .string "ROCKET GAME CORNER$" - -gUnknown_841B1DA:: @ 841B1DA - .string "RESTAURANT$" - -gUnknown_841B1E5:: @ 841B1E5 - .string "ROCKET HIDEOUT$" - -gUnknown_841B1F4:: @ 841B1F4 - .string "SAFARI ZONE$" - -gUnknown_841B200:: @ 841B200 - .string "WARDEN’S HOME$" - -gUnknown_841B20E:: @ 841B20E - .string "FIGHTING DOJO$" - -gUnknown_841B21C:: @ 841B21C - .string "SILPH CO.$" - -gUnknown_841B226:: @ 841B226 - .string "SEAFOAM ISLANDS$" - -gUnknown_841B236:: @ 841B236 - .string "POKéMON MANSION$" - -gUnknown_841B246:: @ 841B246 - .string "POKéMON RESEARCH LAB$" - -gUnknown_841B25B:: @ 841B25B - .string "VICTORY ROAD$" - -gUnknown_841B268:: @ 841B268 - .string "POKéMON LEAGUE$" - -gUnknown_841B277:: @ 841B277 - .string "CERULEAN CAVE$" + .include "data/text/quest_log.inc" gUnknown_841B285:: @ 841B285 .incbin "baserom.gba", 0x41B285, 0xE diff --git a/data/text/quest_log.inc b/data/text/quest_log.inc new file mode 100644 index 000000000..58c9cf66e --- /dev/null +++ b/data/text/quest_log.inc @@ -0,0 +1,481 @@ +gUnknown_841A155:: @ 841A155 + .string "Previously on your quest…$" + +gUnknown_841A16F:: @ 841A16F + .string "{PLAYER} switched the POKéMON\n" + .string "{STR_VAR_1} with {STR_VAR_2}.$" + +gUnknown_841A193:: @ 841A193 + .string "Took the item {STR_VAR_2} from\n" + .string "{STR_VAR_1} and gave it the item\n" + .string "{STR_VAR_3} to hold.$" + +gUnknown_841A1CD:: @ 841A1CD + .string "Took the item {STR_VAR_2} from\n" + .string "{STR_VAR_1}.$" + +gUnknown_841A1E7:: @ 841A1E7 + .string "Used the item {STR_VAR_1} on {STR_VAR_2}\n" + .string "at this location.$" + +gUnknown_841A210:: @ 841A210 + .string "{PLAYER} used the\n" + .string "{STR_VAR_1}.$" + +gUnknown_841A220:: @ 841A220 + .string "Used the item {STR_VAR_1}, which was\n" + .string "in the KEY ITEMS POCKET.$" + +gUnknown_841A255:: @ 841A255 + .string "{STR_VAR_1} learned the move\n" + .string "{STR_VAR_2} from a TM.$" + +gUnknown_841A277:: @ 841A277 + .string "{STR_VAR_1} learned the move\n" + .string "{STR_VAR_2} from a TM and forgot\n" + .string "the move {STR_VAR_3}.$" + +gUnknown_841A2B0:: @ 841A2B0 + .string "POKéMON were fully restored\n" + .string "at a POKéMON CENTER.$" + +gUnknown_841A2E1:: @ 841A2E1 + .string "{UNKNOWN_F7 0x00} had a marvelous battle\n" + .string "with the CHAMPION, {UNKNOWN_F7 0x01}.$" + +gUnknown_841A312:: @ 841A312 + .string "In the end, {UNKNOWN_F7 0x00} sent out {UNKNOWN_F7 0x01}\n" + .string "while {UNKNOWN_F7 0x02} countered with\n" + .string "{UNKNOWN_F7 0x03}.$" + +gUnknown_841A349:: @ 841A349 + .string "And, as a result of battling with every\n" + .string "bit of power, {UNKNOWN_F7 0x00} won\n" + .string "the match.$" + +gUnknown_841A391:: @ 841A391 + .string "Removed the item {STR_VAR_1} from\n" + .string "the BAG’s ITEMS POCKET and stored it\n" + .string "on the PC.$" + +gUnknown_841A3DA:: @ 841A3DA + .string "{PLAYER} withdrew the item {STR_VAR_1}\n" + .string "from the PC.$" + +gUnknown_841A3FF:: @ 841A3FF + .string "Traded {STR_VAR_3} in exchange for\n" + .string "{STR_VAR_1}’s {STR_VAR_2}.$" + +gUnknown_841A422:: @ 841A422 + .string "Took on {UNKNOWN_F7 0x00} in a SINGLE BATTLE.\n" + .string "It was a hotly contested match that\n" + .string "resulted in a {UNKNOWN_F7 0x01}.$" + +gUnknown_841A477:: @ 841A477 + .string "Took on {UNKNOWN_F7 0x00} in a DOUBLE BATTLE.\n" + .string "It was an extended match that resulted\n" + .string "in a {UNKNOWN_F7 0x01}.$" + +gUnknown_841A4C6:: @ 841A4C6 + .string "{UNKNOWN_F7 0x00} and {UNKNOWN_F7 0x01} took on\n" + .string "{UNKNOWN_F7 0x02} and {UNKNOWN_F7 0x03} in a\n" + .string "MULTI BATTLE and got a {UNKNOWN_F7 0x04}.$" + +gUnknown_841A502:: + .string "win$" + +gUnknown_841A506:: + .string "loss$" + +gUnknown_841A50B:: @ 841A50B + .string "Mingled with other TRAINERS in\n" + .string "the UNION ROOM.$" + +gUnknown_841A53A:: + .string "Departed {STR_VAR_2}\n" + .string "in {STR_VAR_1} for the next\n" + .string "destination.$" + +gUnknown_841A566:: @ 841A566 + .string "After consideration, switched\n" + .string "{UNKNOWN_F7 0x01} in {UNKNOWN_F7 0x00} with\n" + .string "{UNKNOWN_F7 0x03} in {UNKNOWN_F7 0x02}.$" + +gUnknown_841A59C:: @ 841A59C + .string "After deep thought, switched\n" + .string "{UNKNOWN_F7 0x01} in BOX “{UNKNOWN_F7 0x00}†to\n" + .string "the BOX “{UNKNOWN_F7 0x02}.â€$" + +gUnknown_841A5D9:: @ 841A5D9 + .string "Switched around {UNKNOWN_F7 0x01} and\n" + .string "{UNKNOWN_F7 0x02} in {UNKNOWN_F7 0x00}.$" + +gUnknown_841A5FA:: @ 841A5FA + .string "Moved {UNKNOWN_F7 0x01} in {UNKNOWN_F7 0x00}.$" + +gUnknown_841A60A:: @ 841A60A + .string "Switched {UNKNOWN_F7 0x01} in {UNKNOWN_F7 0x00}\n" + .string "with {UNKNOWN_F7 0x02} in the party.$" + +gUnknown_841A632:: @ 841A632 + .string "Added {UNKNOWN_F7 0x01} in {UNKNOWN_F7 0x00}\n" + .string "to the party.$" + +gUnknown_841A64F:: @ 841A64F + .string "Moved {UNKNOWN_F7 0x00} from the party\n" + .string "to {UNKNOWN_F7 0x01}.$" + +gUnknown_841A66E:: @ 841A66E + .string "Moved a group of POKéMON in\n" + .string "{UNKNOWN_F7 0x00} to {UNKNOWN_F7 0x01}.$" + +gUnknown_841A694:: @ 841A694 + .string "a different spot$" + +gUnknown_841A6A5:: @ 841A6A5 + .string "Removed the item {STR_VAR_1} from\n" + .string "{PLAYER}’s PC and gave it to {STR_VAR_2}\n" + .string "to hold.$" + +gUnknown_841A6E1:: @ 841A6E1 + .string "Removed the item {STR_VAR_1} from\n" + .string "a PC, gave it to {STR_VAR_2}, and put\n" + .string "the {STR_VAR_3} it held in the BAG.$" + +gUnknown_841A732:: @ 841A732 + .string "Chatted with many TRAINERS.$" + +gUnknown_841A74E:: + .string "handily$" + +gUnknown_841A756:: + .string "tenaciously$" + +gUnknown_841A762:: + .string "somehow$" + +gUnknown_841A76A:: @ 841A76A + .string "Met and traded with {STR_VAR_1}.\n" + .string "Obtained the TRAINER’s {STR_VAR_2} in\n" + .string "exchange for {STR_VAR_3}.$" + +gUnknown_841A7B0:: @ 841A7B0 + .string "Met and battled {STR_VAR_1}.\n" + .string "The match ended in a {STR_VAR_2}.$" + +gUnknown_841A7DD:: @ 841A7DD + .string "Went to the POKéMON MART in\n" + .string "{UNKNOWN_F7 0x00} and bought one \n" + .string "{UNKNOWN_F7 0x01}.$" + +gUnknown_841A810:: @ 841A810 + .string "Went to the POKéMON MART in\n" + .string "{UNKNOWN_F7 0x00} and spent Â¥{UNKNOWN_F7 0x02} for\n" + .string "items including {UNKNOWN_F7 0x01}(s).$" + +gUnknown_841A858:: @ 841A858 + .string "{UNKNOWN_F7 0x00} went to the POKéMON MART in\n" + .string "{UNKNOWN_F7 0x01} and sold {UNKNOWN_F7 0x03} of\n" + .string "the item {UNKNOWN_F7 0x02}.$" + +gUnknown_841A896:: @ 841A896 + .string "Sold items including {UNKNOWN_F7 0x01} at\n" + .string "the POKéMON MART in {UNKNOWN_F7 0x00},\n" + .string "worth Â¥{UNKNOWN_F7 0x02}.$" + +gUnknown_841A8D4:: @ 841A8D4 + .string "just one$" + +gUnknown_841A8DD:: @ 841A8DD + .string "{UNKNOWN_F7 0x04}$" + +gUnknown_841A8E0:: @ 841A8E0 + .string "{STR_VAR_1} shared its HP using the move\n" + .string "SOFTBOILED.$" + +gUnknown_841A90C:: @ 841A90C + .string "{STR_VAR_1} shared its HP using the move\n" + .string "MILK DRINK.$" + +gUnknown_841A938:: @ 841A938 + .string "{STR_VAR_1} securely learned the move\n" + .string "{STR_VAR_2} using an HM.$" + +gUnknown_841A965:: @ 841A965 + .string "{STR_VAR_1} securely learned the move\n" + .string "{STR_VAR_2} using an HM and forgot\n" + .string "the move {STR_VAR_3}.$" + +gUnknown_841A9A9:: @ 841A9A9 + .string "{UNKNOWN_F7 0x05} managed to defeat the POKéMON\n" + .string "{UNKNOWN_F7 0x01} in {UNKNOWN_F7 0x00}.$" + +gUnknown_841A9D4:: @ 841A9D4 + .string "Defeated {UNKNOWN_F7 0x02} wild POKéMON including\n" + .string "{UNKNOWN_F7 0x01} in {UNKNOWN_F7 0x00}.$" + +gUnknown_841AA01:: @ 841AA01 + .string "{UNKNOWN_F7 0x05} managed to catch the POKéMON\n" + .string "{UNKNOWN_F7 0x03} in {UNKNOWN_F7 0x00}.$" + +gUnknown_841AA2B:: @ 841AA2B + .string "Threw POKé BALLS in a frenzy, catching\n" + .string "{UNKNOWN_F7 0x04} POKéMON including {UNKNOWN_F7 0x03} here\n" + .string "in {UNKNOWN_F7 0x00}.$" + +gUnknown_841AA76:: @ 841AA76 + .string "{UNKNOWN_F7 0x05} defeated the POKéMON\n" + .string "{UNKNOWN_F7 0x01} and caught one {UNKNOWN_F7 0x03}\n" + .string "in {UNKNOWN_F7 0x00}.$" + +gUnknown_841AAAA:: @ 841AAAA + .string "Defeated the POKéMON {UNKNOWN_F7 0x01}\n" + .string "and caught {UNKNOWN_F7 0x04} POKéMON including\n" + .string "{UNKNOWN_F7 0x03} in {UNKNOWN_F7 0x00}.$" + +gUnknown_841AAEC:: @ 841AAEC + .string "{UNKNOWN_F7 0x05} defeated {UNKNOWN_F7 0x02} POKéMON including\n" + .string "{UNKNOWN_F7 0x01} and caught one {UNKNOWN_F7 0x03}\n" + .string "in {UNKNOWN_F7 0x00}.$" + +gUnknown_841AB29:: @ 841AB29 + .string "Defeated {UNKNOWN_F7 0x02} POKéMON including\n" + .string "{UNKNOWN_F7 0x01} and caught {UNKNOWN_F7 0x04} POKéMON\n" + .string "including {UNKNOWN_F7 0x03} in {UNKNOWN_F7 0x00}.$" + +gUnknown_841AB74:: @ 841AB74 + .string "Made {STR_VAR_1} hold the item\n" + .string "{STR_VAR_2}.$" + +gUnknown_841AB8E:: @ 841AB8E + .string "{PLAYER} made {STR_VAR_1} hold the item\n" + .string "{STR_VAR_2}.$" + +gUnknown_841ABAB:: @ 841ABAB + .string "{STR_VAR_1} used the Hidden Move\n" + .string "CUT here.$" + +gUnknown_841ABCD:: @ 841ABCD + .string "{STR_VAR_1} used the Hidden Move\n" + .string "FLY and flew to {STR_VAR_2}.$" + +gUnknown_841ABF9:: @ 841ABF9 + .string "{STR_VAR_1} used the Hidden Move\n" + .string "SURF and rode the waves.$" + +gUnknown_841AC2A:: @ 841AC2A + .string "{STR_VAR_1} used the Hidden Move\n" + .string "STRENGTH here.$" + +gUnknown_841AC51:: @ 841AC51 + .string "{STR_VAR_1} used the Hidden Move\n" + .string "FLASH and illuminated a pitch-black\n" + .string "cave.$" + +gUnknown_841AC93:: @ 841AC93 + .string "{STR_VAR_1} used the Hidden Move\n" + .string "ROCK SMASH here.$" + +gUnknown_841ACBC:: @ 841ACBC + .string "{STR_VAR_1} used the Hidden Move\n" + .string "WATERFALL to scale a raging torrent.$" + +gUnknown_841ACF9:: @ 841ACF9 + .string "{STR_VAR_1}è êÉà Ñ㓪& òã–Ã\n" + .string "éã§+ã‚ã–\n" + .string "ダ¡ビング& ÚÉã£Å’!$" + +gUnknown_841AD1D:: @ 841AD1D + .string "{STR_VAR_1} used DIG to escape from\n" + .string "{STR_VAR_2}.$" + +gUnknown_841AD3C:: @ 841AD3C + .string "{STR_VAR_1} used SWEET SCENT to attract\n" + .string "wild POKéMON.$" + +gUnknown_841AD69:: @ 841AD69 + .string "{STR_VAR_1} used TELEPORT, transporting\n" + .string "the party to {STR_VAR_2}’s\n" + .string "{STR_VAR_3}.$" + +gUnknown_841AD9E:: @ 841AD9E + .string "{PLAYER} left {STR_VAR_1}’s\n" + .string "{STR_VAR_2} for the next\n" + .string "destination.$" + +gUnknown_841ADC8:: @ 841ADC8 + .string "Played a lot of games at the ROCKET\n" + .string "GAME CORNER in {STR_VAR_1}.$" + +gUnknown_841ADFF:: @ 841ADFF + .string "{PLAYER} rested comfortably at home.$" + +gUnknown_841AE1E:: @ 841AE1E + .string "{PLAYER} left PROF. OAK’s POKéMON\n" + .string "RESEARCH LAB.$" + +gUnknown_841AE48:: @ 841AE48 + .string "The GYM in {STR_VAR_1} was full of\n" + .string "tough TRAINERS…\n" + .string "Preparations had to be made.$" + +gUnknown_841AE8F:: @ 841AE8F + .string "Departed the GYM in {STR_VAR_1}.$" + +gUnknown_841AEA7:: @ 841AEA7 + .string "{PLAYER} had a great time with POKéMON\n" + .string "in the SAFARI ZONE.$" + +gUnknown_841AEDC:: @ 841AEDC + .string "Managed to get out of {STR_VAR_2}\n" + .string "after wandering about.$" + +gUnknown_841AF0C:: @ 841AF0C + .string "Took on {UNKNOWN_F7 0x00} GYM LEADER\n" + .string "{UNKNOWN_F7 0x01}’s {UNKNOWN_F7 0x02} with {UNKNOWN_F7 0x03}\n" + .string "and won {UNKNOWN_F7 0x04}!$" + +gUnknown_841AF3E:: @ 841AF3E + .string "Took on ELITE FOUR {UNKNOWN_F7 0x00}’s\n" + .string "{UNKNOWN_F7 0x01} with {UNKNOWN_F7 0x02} and\n" + .string "won {UNKNOWN_F7 0x03}!$" + +gUnknown_841AF6D:: @ 841AF6D + .string "In {UNKNOWN_F7 0x00}, took on\n" + .string "{UNKNOWN_F7 0x01}’s {UNKNOWN_F7 0x02} with {UNKNOWN_F7 0x03}\n" + .string "and won {UNKNOWN_F7 0x04}!$" + +gUnknown_841AF98:: @ 841AF98 + .string "coolly$" + +gUnknown_841AF9F:: @ 841AF9F + .string "barely$" + +gUnknown_841AFA6:: @ 841AFA6 + .string "{PLAYER} used an ESCAPE ROPE to get\n" + .string "out from {STR_VAR_2}.$" + +gUnknown_841AFD1:: @ 841AFD1 + .string "draw$" + +gUnknown_841AFD6:: @ 841AFD6 + .string "Departed from the {STR_VAR_2}\n" + .string "for the next destination.$" + +gUnknown_841B005:: @ 841B005 + .string "{PLAYER} departed from\n" + .string "{STR_VAR_2} and made way\n" + .string "to the next destination.$" + +gUnknown_841B03F:: @ 841B03F + .string "Here in {STR_VAR_1}, {PLAYER}\n" + .string "obtained the item {STR_VAR_2}.$" + +gUnknown_841B064:: @ 841B064 + .string "Arrived in {STR_VAR_1}.$" + +gUnknown_841B073:: @ 841B073 + .string "And {PLAYER} saved the game at this\n" + .string "location: {STR_VAR_1}.$" + +gUnknown_841B09F:: @ 841B09F + .string "HOME$" + +gUnknown_841B0A4:: @ 841B0A4 + .string "OAK RESEARCH LAB$" + +gUnknown_841B0B5:: @ 841B0B5 + .string "GYM$" + +gUnknown_841B0B9:: @ 841B0B9 + .string "POKéMON LEAGUE GATE$" + +gUnknown_841B0CD:: @ 841B0CD + .string "VIRIDIAN FOREST$" + +gUnknown_841B0DD:: @ 841B0DD + .string "PEWTER MUSEUM OF SCIENCE$" + +gUnknown_841B0F6:: @ 841B0F6 + .string "MT. MOON$" + +gUnknown_841B0FF:: @ 841B0FF + .string "BIKE SHOP$" + +gUnknown_841B109:: @ 841B109 + .string "BILL’S HOUSE$" + +gUnknown_841B116:: @ 841B116 + .string "DAY CARE$" + +gUnknown_841B11F:: @ 841B11F + .string "UNDERGROUND PATH$" + +gUnknown_841B130:: @ 841B130 + .string "POKéMON FAN CLUB$" + +gUnknown_841B141:: @ 841B141 + .string "S.S. ANNE$" + +gUnknown_841B14B:: @ 841B14B + .string "DIGLETT’S CAVE$" + +gUnknown_841B15A:: @ 841B15A + .string "ROCK TUNNEL$" + +gUnknown_841B166:: @ 841B166 + .string "POWER PLANT$" + +gUnknown_841B172:: @ 841B172 + .string "POKéMON TOWER$" + +gUnknown_841B180:: @ 841B180 + .string "VOLUNTEER HOUSE$" + +gUnknown_841B190:: @ 841B190 + .string "NAME RATER’S HOUSE$" + +gUnknown_841B1A3:: @ 841B1A3 + .string "CELADON DEPT. STORE$" + +gUnknown_841B1B7:: @ 841B1B7 + .string "CELADON MANSION$" + +gUnknown_841B1C7:: @ 841B1C7 + .string "ROCKET GAME CORNER$" + +gUnknown_841B1DA:: @ 841B1DA + .string "RESTAURANT$" + +gUnknown_841B1E5:: @ 841B1E5 + .string "ROCKET HIDEOUT$" + +gUnknown_841B1F4:: @ 841B1F4 + .string "SAFARI ZONE$" + +gUnknown_841B200:: @ 841B200 + .string "WARDEN’S HOME$" + +gUnknown_841B20E:: @ 841B20E + .string "FIGHTING DOJO$" + +gUnknown_841B21C:: @ 841B21C + .string "SILPH CO.$" + +gUnknown_841B226:: @ 841B226 + .string "SEAFOAM ISLANDS$" + +gUnknown_841B236:: @ 841B236 + .string "POKéMON MANSION$" + +gUnknown_841B246:: @ 841B246 + .string "POKéMON RESEARCH LAB$" + +gUnknown_841B25B:: @ 841B25B + .string "VICTORY ROAD$" + +gUnknown_841B268:: @ 841B268 + .string "POKéMON LEAGUE$" + +gUnknown_841B277:: @ 841B277 + .string "CERULEAN CAVE$" diff --git a/src/quest_log.c b/src/quest_log.c index 8131e1937..1b37e074c 100644 --- a/src/quest_log.c +++ b/src/quest_log.c @@ -3527,7 +3527,7 @@ u16 * sub_8113E88(u16 a0, u16 * a1) // TODO: delete this declaration once data_83FECCC.s is decompiled extern const u8 gText_EggNickname[]; -void QuestLog_AutoGetSpeciesname(u16 a0, u8 * a1, u8 a2) +void QuestLog_AutoGetSpeciesName(u16 a0, u8 * a1, u8 a2) { if (a1 != NULL) { @@ -3559,8 +3559,8 @@ u16 * sub_8113F14(u16 * a0, u16 * a1) u16 * sub_8113F3C(u16 * a0) { u16 * r4 = sub_8113E88(3, a0); - QuestLog_AutoGetSpeciesname(r4[0], gStringVar1, 0); - QuestLog_AutoGetSpeciesname(r4[1], gStringVar2, 0); + QuestLog_AutoGetSpeciesName(r4[0], gStringVar1, 0); + QuestLog_AutoGetSpeciesName(r4[1], gStringVar2, 0); StringExpandPlaceholders(gStringVar4, gUnknown_841A16F); r4 += 2; return r4; @@ -3599,7 +3599,7 @@ u16 * sub_8113FBC(u16 * a0) } else if (r5[1] != 0xFFFF) { - QuestLog_AutoGetSpeciesname(r5[1], gStringVar2, 0); + QuestLog_AutoGetSpeciesName(r5[1], gStringVar2, 0); StringExpandPlaceholders(gStringVar4, gUnknown_841A1E7); } else @@ -3612,7 +3612,7 @@ u16 * sub_8113FBC(u16 * a0) StringExpandPlaceholders(gStringVar4, gUnknown_841A220); break; case POCKET_TM_CASE: - QuestLog_AutoGetSpeciesname(r5[1], gStringVar1, 0); + QuestLog_AutoGetSpeciesName(r5[1], gStringVar1, 0); StringCopy(gStringVar2, gMoveNames[ItemIdToBattleMoveId(r5[0])]); if (r5[2] != 0xFFFF) { -- cgit v1.2.3 From 10900139e3731cf76ec94c96fa90f8355f3162b3 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Thu, 8 Nov 2018 15:23:15 -0500 Subject: through sub_8114324 --- asm/quest_log.s | 277 -------------------------------------------------------- src/quest_log.c | 225 ++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 221 insertions(+), 281 deletions(-) diff --git a/asm/quest_log.s b/asm/quest_log.s index cd3812b47..5aa5019b2 100644 --- a/asm/quest_log.s +++ b/asm/quest_log.s @@ -5,283 +5,6 @@ .text - thumb_func_start sub_811414C -sub_811414C: @ 811414C - push {r4,lr} - adds r4, r2, 0 - lsls r0, 16 - lsrs r0, 16 - bl sub_8113DE0 - adds r1, r0, 0 - cmp r1, 0 - beq _0811416A - ldrh r0, [r4] - strh r0, [r1] - ldrh r0, [r4, 0x4] - strh r0, [r1, 0x2] - adds r0, r1, 0x4 - b _0811416C -_0811416A: - movs r0, 0 -_0811416C: - pop {r4} - pop {r1} - bx r1 - thumb_func_end sub_811414C - - thumb_func_start sub_8114174 -sub_8114174: @ 8114174 - push {lr} - adds r3, r0, 0 - adds r2, r1, 0 - movs r0, 0x5 - adds r1, r3, 0 - bl sub_811414C - pop {r1} - bx r1 - thumb_func_end sub_8114174 - - thumb_func_start sub_8114188 -sub_8114188: @ 8114188 - push {r4,r5,lr} - adds r1, r0, 0 - movs r0, 0x5 - bl sub_8113E88 - adds r4, r0, 0 - ldrh r0, [r4, 0x2] - ldr r1, _081141C0 @ =gStringVar1 - movs r2, 0 - bl QuestLog_AutoGetSpeciesName - ldr r5, _081141C4 @ =gStringVar2 - ldrh r0, [r4] - bl ItemId_GetItem - adds r1, r0, 0 - adds r0, r5, 0 - bl StringCopy - ldr r0, _081141C8 @ =gStringVar4 - ldr r1, _081141CC @ =gUnknown_841AB74 - bl StringExpandPlaceholders - adds r4, 0x4 - adds r0, r4, 0 - pop {r4,r5} - pop {r1} - bx r1 - .align 2, 0 -_081141C0: .4byte gStringVar1 -_081141C4: .4byte gStringVar2 -_081141C8: .4byte gStringVar4 -_081141CC: .4byte gUnknown_841AB74 - thumb_func_end sub_8114188 - - thumb_func_start sub_81141D0 -sub_81141D0: @ 81141D0 - push {lr} - adds r3, r0, 0 - adds r2, r1, 0 - movs r0, 0x6 - adds r1, r3, 0 - bl sub_811414C - pop {r1} - bx r1 - thumb_func_end sub_81141D0 - - thumb_func_start sub_81141E4 -sub_81141E4: @ 81141E4 - push {r4,r5,lr} - adds r1, r0, 0 - movs r0, 0x6 - bl sub_8113E88 - adds r4, r0, 0 - ldrh r0, [r4, 0x2] - ldr r1, _0811421C @ =gStringVar1 - movs r2, 0 - bl QuestLog_AutoGetSpeciesName - ldr r5, _08114220 @ =gStringVar2 - ldrh r0, [r4] - bl ItemId_GetItem - adds r1, r0, 0 - adds r0, r5, 0 - bl StringCopy - ldr r0, _08114224 @ =gStringVar4 - ldr r1, _08114228 @ =gUnknown_841AB8E - bl StringExpandPlaceholders - adds r4, 0x4 - adds r0, r4, 0 - pop {r4,r5} - pop {r1} - bx r1 - .align 2, 0 -_0811421C: .4byte gStringVar1 -_08114220: .4byte gStringVar2 -_08114224: .4byte gStringVar4 -_08114228: .4byte gUnknown_841AB8E - thumb_func_end sub_81141E4 - - thumb_func_start sub_811422C -sub_811422C: @ 811422C - push {lr} - adds r3, r0, 0 - adds r2, r1, 0 - movs r0, 0x7 - adds r1, r3, 0 - bl sub_811414C - pop {r1} - bx r1 - thumb_func_end sub_811422C - - thumb_func_start sub_8114240 -sub_8114240: @ 8114240 - push {r4,r5,lr} - adds r1, r0, 0 - movs r0, 0x7 - bl sub_8113E88 - adds r4, r0, 0 - ldrh r0, [r4, 0x2] - ldr r1, _08114278 @ =gStringVar2 - movs r2, 0 - bl QuestLog_AutoGetSpeciesName - ldr r5, _0811427C @ =gStringVar1 - ldrh r0, [r4] - bl ItemId_GetItem - adds r1, r0, 0 - adds r0, r5, 0 - bl StringCopy - ldr r0, _08114280 @ =gStringVar4 - ldr r1, _08114284 @ =gUnknown_841A6A5 - bl StringExpandPlaceholders - adds r4, 0x4 - adds r0, r4, 0 - pop {r4,r5} - pop {r1} - bx r1 - .align 2, 0 -_08114278: .4byte gStringVar2 -_0811427C: .4byte gStringVar1 -_08114280: .4byte gStringVar4 -_08114284: .4byte gUnknown_841A6A5 - thumb_func_end sub_8114240 - - thumb_func_start sub_8114288 -sub_8114288: @ 8114288 - push {lr} - adds r3, r0, 0 - adds r2, r1, 0 - movs r0, 0x8 - adds r1, r3, 0 - bl sub_811414C - pop {r1} - bx r1 - thumb_func_end sub_8114288 - - thumb_func_start sub_811429C -sub_811429C: @ 811429C - push {r4,r5,lr} - adds r1, r0, 0 - movs r0, 0x8 - bl sub_8113E88 - adds r4, r0, 0 - ldrh r0, [r4, 0x2] - ldr r1, _081142D4 @ =gStringVar1 - movs r2, 0 - bl QuestLog_AutoGetSpeciesName - ldr r5, _081142D8 @ =gStringVar2 - ldrh r0, [r4] - bl ItemId_GetItem - adds r1, r0, 0 - adds r0, r5, 0 - bl StringCopy - ldr r0, _081142DC @ =gStringVar4 - ldr r1, _081142E0 @ =gUnknown_841A1CD - bl StringExpandPlaceholders - adds r4, 0x4 - adds r0, r4, 0 - pop {r4,r5} - pop {r1} - bx r1 - .align 2, 0 -_081142D4: .4byte gStringVar1 -_081142D8: .4byte gStringVar2 -_081142DC: .4byte gStringVar4 -_081142E0: .4byte gUnknown_841A1CD - thumb_func_end sub_811429C - - thumb_func_start sub_81142E4 -sub_81142E4: @ 81142E4 - push {r4,lr} - adds r4, r2, 0 - lsls r0, 16 - lsrs r0, 16 - bl sub_8113DE0 - adds r1, r0, 0 - cmp r1, 0 - beq _08114306 - ldrh r0, [r4] - strh r0, [r1] - ldrh r0, [r4, 0x2] - strh r0, [r1, 0x2] - ldrh r0, [r4, 0x4] - strh r0, [r1, 0x4] - adds r0, r1, 0x6 - b _08114308 -_08114306: - movs r0, 0 -_08114308: - pop {r4} - pop {r1} - bx r1 - thumb_func_end sub_81142E4 - - thumb_func_start sub_8114310 -sub_8114310: @ 8114310 - push {lr} - adds r3, r0, 0 - adds r2, r1, 0 - movs r0, 0x9 - adds r1, r3, 0 - bl sub_81142E4 - pop {r1} - bx r1 - thumb_func_end sub_8114310 - - thumb_func_start sub_8114324 -sub_8114324: @ 8114324 - push {r4,r5,lr} - adds r1, r0, 0 - movs r0, 0x9 - bl sub_8113E88 - adds r4, r0, 0 - ldrh r0, [r4, 0x4] - ldr r1, _0811436C @ =gStringVar1 - movs r2, 0 - bl QuestLog_AutoGetSpeciesName - ldr r5, _08114370 @ =gStringVar2 - ldrh r0, [r4] - bl ItemId_GetItem - adds r1, r0, 0 - adds r0, r5, 0 - bl StringCopy - ldr r5, _08114374 @ =gStringVar3 - ldrh r0, [r4, 0x2] - bl ItemId_GetItem - adds r1, r0, 0 - adds r0, r5, 0 - bl StringCopy - ldr r0, _08114378 @ =gStringVar4 - ldr r1, _0811437C @ =gUnknown_841A193 - bl StringExpandPlaceholders - adds r4, 0x6 - adds r0, r4, 0 - pop {r4,r5} - pop {r1} - bx r1 - .align 2, 0 -_0811436C: .4byte gStringVar1 -_08114370: .4byte gStringVar2 -_08114374: .4byte gStringVar3 -_08114378: .4byte gStringVar4 -_0811437C: .4byte gUnknown_841A193 - thumb_func_end sub_8114324 - thumb_func_start sub_8114380 sub_8114380: @ 8114380 push {lr} diff --git a/src/quest_log.c b/src/quest_log.c index 1b37e074c..68678c6e5 100644 --- a/src/quest_log.c +++ b/src/quest_log.c @@ -276,15 +276,130 @@ bool8 sub_81153E4(u16, void*); extern const u8 gUnknown_841A155[]; extern const u8 gUnknown_841A16F[]; -extern const u8 gUnknown_841B073[]; -extern const u8 gUnknown_841AFA6[]; +extern const u8 gUnknown_841A193[]; +extern const u8 gUnknown_841A1CD[]; extern const u8 gUnknown_841A1E7[]; extern const u8 gUnknown_841A210[]; extern const u8 gUnknown_841A220[]; -extern const u8 gUnknown_841A965[]; +extern const u8 gUnknown_841A255[]; extern const u8 gUnknown_841A277[]; +extern const u8 gUnknown_841A2B0[]; +extern const u8 gUnknown_841A2E1[]; +extern const u8 gUnknown_841A312[]; +extern const u8 gUnknown_841A349[]; +extern const u8 gUnknown_841A391[]; +extern const u8 gUnknown_841A3DA[]; +extern const u8 gUnknown_841A3FF[]; +extern const u8 gUnknown_841A422[]; +extern const u8 gUnknown_841A477[]; +extern const u8 gUnknown_841A4C6[]; +extern const u8 gUnknown_841A502[]; +extern const u8 gUnknown_841A506[]; +extern const u8 gUnknown_841A50B[]; +extern const u8 gUnknown_841A53A[]; +extern const u8 gUnknown_841A566[]; +extern const u8 gUnknown_841A59C[]; +extern const u8 gUnknown_841A5D9[]; +extern const u8 gUnknown_841A5FA[]; +extern const u8 gUnknown_841A60A[]; +extern const u8 gUnknown_841A632[]; +extern const u8 gUnknown_841A64F[]; +extern const u8 gUnknown_841A66E[]; +extern const u8 gUnknown_841A694[]; +extern const u8 gUnknown_841A6A5[]; +extern const u8 gUnknown_841A6E1[]; +extern const u8 gUnknown_841A732[]; +extern const u8 gUnknown_841A74E[]; +extern const u8 gUnknown_841A756[]; +extern const u8 gUnknown_841A762[]; +extern const u8 gUnknown_841A76A[]; +extern const u8 gUnknown_841A7B0[]; +extern const u8 gUnknown_841A7DD[]; +extern const u8 gUnknown_841A810[]; +extern const u8 gUnknown_841A858[]; +extern const u8 gUnknown_841A896[]; +extern const u8 gUnknown_841A8D4[]; +extern const u8 gUnknown_841A8DD[]; +extern const u8 gUnknown_841A8E0[]; +extern const u8 gUnknown_841A90C[]; extern const u8 gUnknown_841A938[]; -extern const u8 gUnknown_841A255[]; +extern const u8 gUnknown_841A965[]; +extern const u8 gUnknown_841A9A9[]; +extern const u8 gUnknown_841A9D4[]; +extern const u8 gUnknown_841AA01[]; +extern const u8 gUnknown_841AA2B[]; +extern const u8 gUnknown_841AA76[]; +extern const u8 gUnknown_841AAAA[]; +extern const u8 gUnknown_841AAEC[]; +extern const u8 gUnknown_841AB29[]; +extern const u8 gUnknown_841AB74[]; +extern const u8 gUnknown_841AB8E[]; +extern const u8 gUnknown_841ABAB[]; +extern const u8 gUnknown_841ABCD[]; +extern const u8 gUnknown_841ABF9[]; +extern const u8 gUnknown_841AC2A[]; +extern const u8 gUnknown_841AC51[]; +extern const u8 gUnknown_841AC93[]; +extern const u8 gUnknown_841ACBC[]; +extern const u8 gUnknown_841ACF9[]; +extern const u8 gUnknown_841AD1D[]; +extern const u8 gUnknown_841AD3C[]; +extern const u8 gUnknown_841AD69[]; +extern const u8 gUnknown_841AD9E[]; +extern const u8 gUnknown_841ADC8[]; +extern const u8 gUnknown_841ADFF[]; +extern const u8 gUnknown_841AE1E[]; +extern const u8 gUnknown_841AE48[]; +extern const u8 gUnknown_841AE8F[]; +extern const u8 gUnknown_841AEA7[]; +extern const u8 gUnknown_841AEDC[]; +extern const u8 gUnknown_841AF0C[]; +extern const u8 gUnknown_841AF3E[]; +extern const u8 gUnknown_841AF6D[]; +extern const u8 gUnknown_841AF98[]; +extern const u8 gUnknown_841AF9F[]; +extern const u8 gUnknown_841AFA6[]; +extern const u8 gUnknown_841AFD1[]; +extern const u8 gUnknown_841AFD6[]; +extern const u8 gUnknown_841B005[]; +extern const u8 gUnknown_841B03F[]; +extern const u8 gUnknown_841B064[]; +extern const u8 gUnknown_841B073[]; +extern const u8 gUnknown_841B09F[]; +extern const u8 gUnknown_841B0A4[]; +extern const u8 gUnknown_841B0B5[]; +extern const u8 gUnknown_841B0B9[]; +extern const u8 gUnknown_841B0CD[]; +extern const u8 gUnknown_841B0DD[]; +extern const u8 gUnknown_841B0F6[]; +extern const u8 gUnknown_841B0FF[]; +extern const u8 gUnknown_841B109[]; +extern const u8 gUnknown_841B116[]; +extern const u8 gUnknown_841B11F[]; +extern const u8 gUnknown_841B130[]; +extern const u8 gUnknown_841B141[]; +extern const u8 gUnknown_841B14B[]; +extern const u8 gUnknown_841B15A[]; +extern const u8 gUnknown_841B166[]; +extern const u8 gUnknown_841B172[]; +extern const u8 gUnknown_841B180[]; +extern const u8 gUnknown_841B190[]; +extern const u8 gUnknown_841B1A3[]; +extern const u8 gUnknown_841B1B7[]; +extern const u8 gUnknown_841B1C7[]; +extern const u8 gUnknown_841B1DA[]; +extern const u8 gUnknown_841B1E5[]; +extern const u8 gUnknown_841B1F4[]; +extern const u8 gUnknown_841B200[]; +extern const u8 gUnknown_841B20E[]; +extern const u8 gUnknown_841B21C[]; +extern const u8 gUnknown_841B226[]; +extern const u8 gUnknown_841B236[]; +extern const u8 gUnknown_841B246[]; +extern const u8 gUnknown_841B25B[]; +extern const u8 gUnknown_841B268[]; +extern const u8 gUnknown_841B277[]; + const struct WindowTemplate gUnknown_845661C[3] = { { 0, 0, 0, 30, 2, 15, 0x0e9 }, @@ -3633,3 +3748,105 @@ u16 * sub_8113FBC(u16 * a0) } return r5 + 3; } + +u16 * sub_811414C(u16 a0, u16 * a1, u16 * a2) +{ + u16 * r1 = sub_8113DE0(a0, a1); + if (r1 == NULL) + return NULL; + + r1[0] = a2[0]; + r1[1] = a2[2]; + return r1 + 2; +} + +u16 * sub_8114174(u16 * a0, u16 * a1) +{ + return sub_811414C(5, a0, a1); +} + +u16 * sub_8114188(u16 * a0) +{ + u16 * r4 = sub_8113E88(5, a0); + QuestLog_AutoGetSpeciesName(r4[1], gStringVar1, 0); + StringCopy(gStringVar2, ItemId_GetItem(r4[0])->name); + StringExpandPlaceholders(gStringVar4, gUnknown_841AB74); + r4 += 2; + return r4; +} + +u16 * sub_81141D0(u16 * a0, u16 * a1) +{ + return sub_811414C(6, a0, a1); +} + +u16 * sub_81141E4(u16 * a0) +{ + u16 * r4 = sub_8113E88(6, a0); + + QuestLog_AutoGetSpeciesName(r4[1], gStringVar1, 0); + StringCopy(gStringVar2, ItemId_GetItem(r4[0])->name); + StringExpandPlaceholders(gStringVar4, gUnknown_841AB8E); + r4 += 2; + return r4; +} + +u16 * sub_811422C(u16 * a0, u16 * a1) +{ + return sub_811414C(7, a0, a1); +} + +u16 * sub_8114240(u16 * a0) +{ + u16 * r4 = sub_8113E88(7, a0); + + QuestLog_AutoGetSpeciesName(r4[1], gStringVar2, 0); + StringCopy(gStringVar1, ItemId_GetItem(r4[0])->name); + StringExpandPlaceholders(gStringVar4, gUnknown_841A6A5); + r4 += 2; + return r4; +} + +u16 * sub_8114288(u16 * a0, u16 * a1) +{ + return sub_811414C(8, a0, a1); +} + +u16 * sub_811429C(u16 * a0) +{ + u16 * r4 = sub_8113E88(8, a0); + + QuestLog_AutoGetSpeciesName(r4[1], gStringVar1, 0); + StringCopy(gStringVar2, ItemId_GetItem(r4[0])->name); + StringExpandPlaceholders(gStringVar4, gUnknown_841A1CD); + r4 += 2; + return r4; +} + +u16 * sub_81142E4(u16 a0, u16 * a1, u16 * a2) +{ + u16 * r1 = sub_8113DE0(a0, a1); + if (r1 == NULL) + return NULL; + + r1[0] = a2[0]; + r1[1] = a2[1]; + r1[2] = a2[2]; + return r1 + 3; +} + +u16 * sub_8114310(u16 * a0, u16 * a1) +{ + return sub_81142E4(9, a0, a1); +} + +u16 * sub_8114324(u16 * a0) +{ + u16 * r4 = sub_8113E88(9, a0); + QuestLog_AutoGetSpeciesName(r4[2], gStringVar1, 0); + StringCopy(gStringVar2, ItemId_GetItem(r4[0])->name); + StringCopy(gStringVar3, ItemId_GetItem(r4[1])->name); + StringExpandPlaceholders(gStringVar4, gUnknown_841A193); + r4 += 3; + return r4; +} -- cgit v1.2.3 From 3e638ddb4bd45f991ffed10e3103dee6560cccdf Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Thu, 8 Nov 2018 16:38:49 -0500 Subject: through sub_8114518 --- asm/quest_log.s | 243 ------------------------------------------ data/quest_log.s | 15 --- src/quest_log.c | 317 +++++++++++++++++++++++++++++++++++++------------------ 3 files changed, 213 insertions(+), 362 deletions(-) diff --git a/asm/quest_log.s b/asm/quest_log.s index 5aa5019b2..afc89e1ab 100644 --- a/asm/quest_log.s +++ b/asm/quest_log.s @@ -5,249 +5,6 @@ .text - thumb_func_start sub_8114380 -sub_8114380: @ 8114380 - push {lr} - adds r3, r0, 0 - adds r2, r1, 0 - movs r0, 0xA - adds r1, r3, 0 - bl sub_81142E4 - pop {r1} - bx r1 - thumb_func_end sub_8114380 - - thumb_func_start sub_8114394 -sub_8114394: @ 8114394 - push {r4,r5,lr} - adds r1, r0, 0 - movs r0, 0xA - bl sub_8113E88 - adds r4, r0, 0 - ldrh r0, [r4, 0x4] - ldr r1, _081143DC @ =gStringVar2 - movs r2, 0 - bl QuestLog_AutoGetSpeciesName - ldr r5, _081143E0 @ =gStringVar3 - ldrh r0, [r4] - bl ItemId_GetItem - adds r1, r0, 0 - adds r0, r5, 0 - bl StringCopy - ldr r5, _081143E4 @ =gStringVar1 - ldrh r0, [r4, 0x2] - bl ItemId_GetItem - adds r1, r0, 0 - adds r0, r5, 0 - bl StringCopy - ldr r0, _081143E8 @ =gStringVar4 - ldr r1, _081143EC @ =gUnknown_841A6E1 - bl StringExpandPlaceholders - adds r4, 0x6 - adds r0, r4, 0 - pop {r4,r5} - pop {r1} - bx r1 - .align 2, 0 -_081143DC: .4byte gStringVar2 -_081143E0: .4byte gStringVar3 -_081143E4: .4byte gStringVar1 -_081143E8: .4byte gStringVar4 -_081143EC: .4byte gUnknown_841A6E1 - thumb_func_end sub_8114394 - - thumb_func_start sub_81143F0 -sub_81143F0: @ 81143F0 - push {r4,lr} - adds r4, r0, 0 - adds r2, r4, 0 - ldr r1, _08114408 @ =gUnknown_203B044 - ldrb r0, [r1] - cmp r0, 0xB - bne _0811440C - ldrb r0, [r1, 0x1] - cmp r0, 0 - beq _0811440C - adds r0, r4, 0 - b _08114436 - .align 2, 0 -_08114408: .4byte gUnknown_203B044 -_0811440C: - ldr r0, _0811442C @ =gUnknown_8456AA0 - ldrb r1, [r0, 0xB] - adds r0, r2, 0 - bl sub_8110944 - lsls r0, 24 - cmp r0, 0 - beq _08114434 - movs r0, 0xB - strh r0, [r4] - ldr r0, _08114430 @ =gUnknown_203AF98 - ldrh r0, [r0] - strh r0, [r4, 0x2] - adds r0, r4, 0x4 - b _08114436 - .align 2, 0 -_0811442C: .4byte gUnknown_8456AA0 -_08114430: .4byte gUnknown_203AF98 -_08114434: - movs r0, 0 -_08114436: - pop {r4} - pop {r1} - bx r1 - thumb_func_end sub_81143F0 - - thumb_func_start sub_811443C -sub_811443C: @ 811443C - push {r4,lr} - adds r4, r0, 0 - ldr r0, _08114454 @ =gStringVar4 - ldr r1, _08114458 @ =gUnknown_841A2B0 - bl StringExpandPlaceholders - adds r4, 0x4 - adds r0, r4, 0 - pop {r4} - pop {r1} - bx r1 - .align 2, 0 -_08114454: .4byte gStringVar4 -_08114458: .4byte gUnknown_841A2B0 - thumb_func_end sub_811443C - - thumb_func_start sub_811445C -sub_811445C: @ 811445C - push {r4,lr} - adds r4, r0, 0 - adds r4, 0x8 - movs r2, 0xC - strh r2, [r0] - ldr r2, _08114488 @ =gUnknown_203AF98 - ldrh r2, [r2] - strh r2, [r0, 0x2] - ldrh r2, [r1] - strh r2, [r0, 0x4] - ldrh r2, [r1, 0x2] - strh r2, [r0, 0x6] - adds r1, 0x4 - adds r0, r4, 0 - movs r2, 0x7 - bl memcpy - adds r4, 0x8 - adds r0, r4, 0 - pop {r4} - pop {r1} - bx r1 - .align 2, 0 -_08114488: .4byte gUnknown_203AF98 - thumb_func_end sub_811445C - - thumb_func_start sub_811448C -sub_811448C: @ 811448C - push {r4-r6,lr} - adds r5, r0, 0 - adds r6, r5, 0 - adds r6, 0x8 - ldr r4, _081144D8 @ =gStringVar1 - adds r0, r4, 0 - movs r1, 0xFF - movs r2, 0x8 - bl memset - adds r0, r4, 0 - adds r1, r6, 0 - movs r2, 0x7 - bl memcpy - adds r0, r4, 0 - bl sub_8115834 - ldrh r0, [r5, 0x6] - ldr r1, _081144DC @ =gStringVar2 - movs r2, 0 - bl QuestLog_AutoGetSpeciesName - ldrh r0, [r5, 0x4] - ldr r1, _081144E0 @ =gStringVar3 - movs r2, 0 - bl QuestLog_AutoGetSpeciesName - ldr r0, _081144E4 @ =gStringVar4 - ldr r1, _081144E8 @ =gUnknown_841A3FF - bl StringExpandPlaceholders - adds r6, 0x8 - adds r0, r6, 0 - pop {r4-r6} - pop {r1} - bx r1 - .align 2, 0 -_081144D8: .4byte gStringVar1 -_081144DC: .4byte gStringVar2 -_081144E0: .4byte gStringVar3 -_081144E4: .4byte gStringVar4 -_081144E8: .4byte gUnknown_841A3FF - thumb_func_end sub_811448C - - thumb_func_start sub_81144EC -sub_81144EC: @ 81144EC - push {r4,lr} - adds r4, r0, 0 - movs r0, 0xD - strh r0, [r4] - ldr r0, _08114514 @ =gUnknown_203AF98 - ldrh r0, [r0] - strh r0, [r4, 0x2] - ldrb r0, [r1] - strb r0, [r4, 0x4] - adds r0, r4, 0x5 - adds r1, 0x1 - movs r2, 0x7 - bl memcpy - adds r4, 0xC - adds r0, r4, 0 - pop {r4} - pop {r1} - bx r1 - .align 2, 0 -_08114514: .4byte gUnknown_203AF98 - thumb_func_end sub_81144EC - - thumb_func_start sub_8114518 -sub_8114518: @ 8114518 - push {r4,r5,lr} - adds r5, r0, 0 - bl UnkTextUtil_Reset - ldr r4, _08114568 @ =gStringVar1 - adds r0, r4, 0 - movs r1, 0xFF - movs r2, 0x8 - bl memset - adds r1, r5, 0x5 - adds r0, r4, 0 - movs r2, 0x7 - bl memcpy - adds r0, r4, 0 - bl sub_8115834 - movs r0, 0 - adds r1, r4, 0 - bl UnkTextUtil_SetPtrI - ldr r1, _0811456C @ =gUnknown_8456AE4 - ldrb r0, [r5, 0x4] - lsls r0, 2 - adds r0, r1 - ldr r1, [r0] - movs r0, 0x1 - bl UnkTextUtil_SetPtrI - ldr r0, _08114570 @ =gStringVar4 - ldr r1, _08114574 @ =gUnknown_841A422 - bl UnkTextUtil_StringExpandPlaceholders - adds r5, 0xC - adds r0, r5, 0 - pop {r4,r5} - pop {r1} - bx r1 - .align 2, 0 -_08114568: .4byte gStringVar1 -_0811456C: .4byte gUnknown_8456AE4 -_08114570: .4byte gStringVar4 -_08114574: .4byte gUnknown_841A422 - thumb_func_end sub_8114518 - thumb_func_start sub_8114578 sub_8114578: @ 8114578 push {r4,lr} diff --git a/data/quest_log.s b/data/quest_log.s index bd28fd62b..0bb7cb3fb 100644 --- a/data/quest_log.s +++ b/data/quest_log.s @@ -1,21 +1,6 @@ .section .rodata .align 2 -gUnknown_8456ACC:: @ 8456ACC - .4byte gUnknown_841A74E - .4byte gUnknown_841A756 - .4byte gUnknown_841A762 - -gUnknown_8456AD8:: @ 8456AD8 - .4byte gUnknown_841AF98 - .4byte gUnknown_841A762 - .4byte gUnknown_841AF9F - -gUnknown_8456AE4:: @ 8456AE4 - .4byte gUnknown_841A502 - .4byte gUnknown_841A506 - .4byte gUnknown_841AFD1 - gUnknown_8456AF0:: @ 8456AF0 .4byte gUnknown_841B09F .4byte gUnknown_841B0A4 diff --git a/src/quest_log.c b/src/quest_log.c index 68678c6e5..57e5ac0b9 100644 --- a/src/quest_log.c +++ b/src/quest_log.c @@ -194,83 +194,84 @@ u16 * sub_8113CC8(u16 *, struct UnkStruct_203AE98 *); u16 * sub_8113D08(u16 *, struct UnkStruct_203AE98 *); u16 * sub_8113D48(u16 *, struct UnkStruct_203AE98 *); u16 * sub_8113D94(u16 *, struct UnkStruct_203AE98 *); -u16 *sub_8113F14(u16 *, u16 *); -u16 *sub_8113F3C(u16 *); -u16 *sub_8113F80(u16 *, u16 *); -u16 *sub_8113FBC(u16 *); -u16 *sub_8114174(u16 *, u16 *); -u16 *sub_8114188(u16 *); -u16 *sub_81141D0(u16 *, u16 *); -u16 *sub_81141E4(u16 *); -u16 *sub_811422C(u16 *, u16 *); -u16 *sub_8114240(u16 *); -u16 *sub_8114288(u16 *, u16 *); -u16 *sub_811429C(u16 *); -u16 *sub_8114310(u16 *, u16 *); -u16 *sub_8114324(u16 *); -u16 *sub_8114380(u16 *, u16 *); -u16 *sub_8114394(u16 *); -u16 *sub_81143F0(u16 *, u16 *); -u16 *sub_811443C(u16 *); -u16 *sub_811445C(u16 *, u16 *); -u16 *sub_811448C(u16 *); -u16 *sub_81144EC(u16 *, u16 *); -u16 *sub_8114518(u16 *); -u16 *sub_8114578(u16 *, u16 *); -u16 *sub_81145A4(u16 *); -u16 *sub_8114604(u16 *, u16 *); -u16 *sub_811464C(u16 *); -u16 *sub_8114710(u16 *, u16 *); -u16 *sub_8114724(u16 *); -u16 *sub_8114744(u16 *, u16 *); -u16 *sub_8114758(u16 *); -u16 *sub_8114778(u16 *, u16 *); -u16 *sub_81147A8(u16 *); -u16 *sub_8114808(u16 *, u16 *); -u16 *sub_8114834(u16 *); -u16 *sub_811488C(u16 *, u16 *); -u16 *sub_81148BC(u16 *); -u16 *sub_8114918(u16 *, u16 *); -u16 *sub_8114944(u16 *); -u16 *sub_8114990(u16 *, u16 *); -u16 *sub_81149D0(u16 *); -u16 *sub_8114A1C(u16 *, u16 *); -u16 *sub_8114A4C(u16 *); -u16 *sub_8114AA0(u16 *, u16 *); -u16 *sub_8114AC8(u16 *); -u16 *sub_8114B0C(u16 *, u16 *); -u16 *sub_8114B34(u16 *); -u16 *sub_8114B78(u16 *, u16 *); -u16 *sub_8114BA0(u16 *); -u16 *sub_8114BE4(u16 *, u16 *); -u16 *sub_8114C0C(u16 *); -u16 *sub_8114C68(u16 *, u16 *); -u16 *sub_8114C8C(u16 *); -u16 *sub_8114CC0(u16 *, u16 *); -u16 *sub_8114CE4(u16 *); -u16 *sub_8114D4C(u16 *, u16 *); -u16 *sub_8114D68(u16 *); -u16 *sub_8114DE8(u16 *, u16 *); -u16 *sub_8114E68(u16 *); +u16 * sub_8113F14(u16 *, const u16 *); +const u16 * sub_8113F3C(const u16 *); +u16 * sub_8113F80(u16 *, const u16 *); +const u16 * sub_8113FBC(const u16 *); +u16 * sub_8114174(u16 *, const u16 *); +const u16 * sub_8114188(const u16 *); +u16 * sub_81141D0(u16 *, const u16 *); +const u16 * sub_81141E4(const u16 *); +u16 * sub_811422C(u16 *, const u16 *); +const u16 * sub_8114240(const u16 *); +u16 * sub_8114288(u16 *, const u16 *); +const u16 * sub_811429C(const u16 *); +u16 * sub_8114310(u16 *, const u16 *); +const u16 * sub_8114324(const u16 *); +u16 * sub_8114380(u16 *, const u16 *); +const u16 * sub_8114394(const u16 *); +u16 * sub_81143F0(u16 *, const u16 *); +const u16 * sub_811443C(const u16 *); +u16 * sub_811445C(u16 *, const u16 *); +const u16 * sub_811448C(const u16 *); +u16 * sub_81144EC(u16 *, const u16 *); +const u16 * sub_8114518(const u16 *); +u16 * sub_8114578(u16 *, const u16 *); +const u16 * sub_81145A4(const u16 *); +u16 * sub_8114604(u16 *, const u16 *); +const u16 * sub_811464C(const u16 *); +u16 * sub_8114710(u16 *, const u16 *); +const u16 * sub_8114724(const u16 *); +u16 * sub_8114744(u16 *, const u16 *); +const u16 * sub_8114758(const u16 *); +u16 * sub_8114778(u16 *, const u16 *); +const u16 * sub_81147A8(const u16 *); +u16 * sub_8114808(u16 *, const u16 *); +const u16 * sub_8114834(const u16 *); +u16 * sub_811488C(u16 *, const u16 *); +const u16 * sub_81148BC(const u16 *); +u16 * sub_8114918(u16 *, const u16 *); +const u16 * sub_8114944(const u16 *); +u16 * sub_8114990(u16 *, const u16 *); +const u16 * sub_81149D0(const u16 *); +u16 * sub_8114A1C(u16 *, const u16 *); +const u16 * sub_8114A4C(const u16 *); +u16 * sub_8114AA0(u16 *, const u16 *); +const u16 * sub_8114AC8(const u16 *); +u16 * sub_8114B0C(u16 *, const u16 *); +const u16 * sub_8114B34(const u16 *); +u16 * sub_8114B78(u16 *, const u16 *); +const u16 * sub_8114BA0(const u16 *); +u16 * sub_8114BE4(u16 *, const u16 *); +const u16 * sub_8114C0C(const u16 *); +u16 * sub_8114C68(u16 *, const u16 *); +const u16 * sub_8114C8C(const u16 *); +u16 * sub_8114CC0(u16 *, const u16 *); +const u16 * sub_8114CE4(const u16 *); +u16 * sub_8114D4C(u16 *, const u16 *); +const u16 * sub_8114D68(const u16 *); +u16 * sub_8114DE8(u16 *, const u16 *); +const u16 * sub_8114E68(const u16 *); bool8 sub_8114FBC(u16); -u16 *sub_8114FF0(u16 *, u16 *); -u16 *sub_811500C(u16 *); -u16 *sub_8115078(u16 *, u16 *); -u16 *sub_81150CC(u16 *); -u16 *sub_81151C0(u16 *, u16 *); -u16 *sub_81151DC(u16 *); -u16 *sub_8115280(u16 *, u16 *); -u16 *sub_81152BC(u16 *); -u16 *sub_8115410(u16 *, u16 *); -u16 *sub_8115460(u16 *); -u16 *sub_81154DC(u16 *, u16 *); -u16 *sub_8115518(u16 *); -u16 *sub_81155A4(u16 *, u16 *); -u16 *sub_81155E0(u16 *); -u16 *sub_81156D8(u16 *, u16 *); -u16 *sub_8115700(u16 *); -u16 *sub_81157DC(u16 *, u16 *); -u16 *sub_8115800(u16 *); +u16 * sub_8114FF0(u16 *, const u16 *); +const u16 * sub_811500C(const u16 *); +u16 * sub_8115078(u16 *, const u16 *); +const u16 * sub_81150CC(const u16 *); +u16 * sub_81151C0(u16 *, const u16 *); +const u16 * sub_81151DC(const u16 *); +u16 * sub_8115280(u16 *, const u16 *); +const u16 * sub_81152BC(const u16 *); +u16 * sub_8115410(u16 *, const u16 *); +const u16 * sub_8115460(const u16 *); +u16 * sub_81154DC(u16 *, const u16 *); +const u16 * sub_8115518(const u16 *); +u16 * sub_81155A4(u16 *, const u16 *); +const u16 * sub_81155E0(const u16 *); +u16 * sub_81156D8(u16 *, const u16 *); +const u16 * sub_8115700(const u16 *); +u16 * sub_81157DC(u16 *, const u16 *); +const u16 * sub_8115800(const u16 *); +void sub_8115834(u8 *); bool8 sub_81153A8(u16, void*); bool8 sub_81153E4(u16, void*); @@ -2771,7 +2772,7 @@ u8 sub_8113530(void) return sub_8113114(VAR_0x4038_STRUCT, gUnknown_20370C0); } -static u16 * (*const sQuestLogStorageCBs[])(u16 *, u16 *) = { +static u16 * (*const sQuestLogStorageCBs[])(u16 *, const u16 *) = { NULL, NULL, NULL, @@ -2905,7 +2906,7 @@ void sub_8113550(u16 a0, u16 * a1) } #else NAKED -void sub_8113550(u16 a0, u16 * a1) +void sub_8113550(u16 a0, const u16 * a1) { asm_unified("\tpush {r4,r5,lr}\n" "\tadds r5, r1, 0\n" @@ -3267,7 +3268,7 @@ bool8 sub_8113A44(u16 a0, u16 *a1) return FALSE; } -static u16 * (*const sQuestLogScriptParsingCBs[])(u16 *) = { +static const u16 * (*const sQuestLogScriptParsingCBs[])(const u16 *) = { NULL, NULL, NULL, @@ -3633,9 +3634,9 @@ u16 * sub_8113DE0(u16 a0, u16 * a1) return r5; } -u16 * sub_8113E88(u16 a0, u16 * a1) +const u16 * sub_8113E88(u16 a0, const u16 * a1) { - a1 = (void *)a1 + (gUnknown_203B044.unk_2 * (gUnknown_8456AA0[a0] - 4) + 4); + a1 = (const void *)a1 + (gUnknown_203B044.unk_2 * (gUnknown_8456AA0[a0] - 4) + 4); return a1; } @@ -3660,7 +3661,7 @@ void QuestLog_AutoGetSpeciesName(u16 a0, u8 * a1, u8 a2) } } -u16 * sub_8113F14(u16 * a0, u16 * a1) +u16 * sub_8113F14(u16 * a0, const u16 * a1) { u16 * r2 = sub_8113DE0(3, a0); if (r2 == NULL) @@ -3671,9 +3672,9 @@ u16 * sub_8113F14(u16 * a0, u16 * a1) return r2 + 2; } -u16 * sub_8113F3C(u16 * a0) +const u16 * sub_8113F3C(const u16 * a0) { - u16 * r4 = sub_8113E88(3, a0); + const u16 * r4 = sub_8113E88(3, a0); QuestLog_AutoGetSpeciesName(r4[0], gStringVar1, 0); QuestLog_AutoGetSpeciesName(r4[1], gStringVar2, 0); StringExpandPlaceholders(gStringVar4, gUnknown_841A16F); @@ -3681,7 +3682,7 @@ u16 * sub_8113F3C(u16 * a0) return r4; } -u16 * sub_8113F80(u16 * a0, u16 * a1) +u16 * sub_8113F80(u16 * a0, const u16 * a1) { u16 * r2 = sub_8113DE0(4, a0); if (r2 == NULL) @@ -3697,9 +3698,9 @@ u16 * sub_8113F80(u16 * a0, u16 * a1) return r2 + 3; } -u16 * sub_8113FBC(u16 * a0) +const u16 * sub_8113FBC(const u16 * a0) { - u16 * r5 = sub_8113E88(4, a0); + const u16 * r5 = sub_8113E88(4, a0); switch (ItemId_GetPocket(r5[0])) { @@ -3749,7 +3750,7 @@ u16 * sub_8113FBC(u16 * a0) return r5 + 3; } -u16 * sub_811414C(u16 a0, u16 * a1, u16 * a2) +u16 * sub_811414C(u16 a0, u16 * a1, const u16 * a2) { u16 * r1 = sub_8113DE0(a0, a1); if (r1 == NULL) @@ -3760,14 +3761,14 @@ u16 * sub_811414C(u16 a0, u16 * a1, u16 * a2) return r1 + 2; } -u16 * sub_8114174(u16 * a0, u16 * a1) +u16 * sub_8114174(u16 * a0, const u16 * a1) { return sub_811414C(5, a0, a1); } -u16 * sub_8114188(u16 * a0) +const u16 * sub_8114188(const u16 * a0) { - u16 * r4 = sub_8113E88(5, a0); + const u16 * r4 = sub_8113E88(5, a0); QuestLog_AutoGetSpeciesName(r4[1], gStringVar1, 0); StringCopy(gStringVar2, ItemId_GetItem(r4[0])->name); StringExpandPlaceholders(gStringVar4, gUnknown_841AB74); @@ -3775,14 +3776,14 @@ u16 * sub_8114188(u16 * a0) return r4; } -u16 * sub_81141D0(u16 * a0, u16 * a1) +u16 * sub_81141D0(u16 * a0, const u16 * a1) { return sub_811414C(6, a0, a1); } -u16 * sub_81141E4(u16 * a0) +const u16 * sub_81141E4(const u16 * a0) { - u16 * r4 = sub_8113E88(6, a0); + const u16 * r4 = sub_8113E88(6, a0); QuestLog_AutoGetSpeciesName(r4[1], gStringVar1, 0); StringCopy(gStringVar2, ItemId_GetItem(r4[0])->name); @@ -3791,14 +3792,14 @@ u16 * sub_81141E4(u16 * a0) return r4; } -u16 * sub_811422C(u16 * a0, u16 * a1) +u16 * sub_811422C(u16 * a0, const u16 * a1) { return sub_811414C(7, a0, a1); } -u16 * sub_8114240(u16 * a0) +const u16 * sub_8114240(const u16 * a0) { - u16 * r4 = sub_8113E88(7, a0); + const u16 * r4 = sub_8113E88(7, a0); QuestLog_AutoGetSpeciesName(r4[1], gStringVar2, 0); StringCopy(gStringVar1, ItemId_GetItem(r4[0])->name); @@ -3807,14 +3808,14 @@ u16 * sub_8114240(u16 * a0) return r4; } -u16 * sub_8114288(u16 * a0, u16 * a1) +u16 * sub_8114288(u16 * a0, const u16 * a1) { return sub_811414C(8, a0, a1); } -u16 * sub_811429C(u16 * a0) +const u16 * sub_811429C(const u16 * a0) { - u16 * r4 = sub_8113E88(8, a0); + const u16 * r4 = sub_8113E88(8, a0); QuestLog_AutoGetSpeciesName(r4[1], gStringVar1, 0); StringCopy(gStringVar2, ItemId_GetItem(r4[0])->name); @@ -3823,7 +3824,7 @@ u16 * sub_811429C(u16 * a0) return r4; } -u16 * sub_81142E4(u16 a0, u16 * a1, u16 * a2) +u16 * sub_81142E4(u16 a0, u16 * a1, const u16 * a2) { u16 * r1 = sub_8113DE0(a0, a1); if (r1 == NULL) @@ -3835,14 +3836,14 @@ u16 * sub_81142E4(u16 a0, u16 * a1, u16 * a2) return r1 + 3; } -u16 * sub_8114310(u16 * a0, u16 * a1) +u16 * sub_8114310(u16 * a0, const u16 * a1) { return sub_81142E4(9, a0, a1); } -u16 * sub_8114324(u16 * a0) +const u16 * sub_8114324(const u16 * a0) { - u16 * r4 = sub_8113E88(9, a0); + const u16 * r4 = sub_8113E88(9, a0); QuestLog_AutoGetSpeciesName(r4[2], gStringVar1, 0); StringCopy(gStringVar2, ItemId_GetItem(r4[0])->name); StringCopy(gStringVar3, ItemId_GetItem(r4[1])->name); @@ -3850,3 +3851,111 @@ u16 * sub_8114324(u16 * a0) r4 += 3; return r4; } + +u16 * sub_8114380(u16 * a0, const u16 * a1) +{ + return sub_81142E4(10, a0, a1); +} + +const u16 * sub_8114394(const u16 * a0) +{ + const u16 * r4 = sub_8113E88(10, a0); + QuestLog_AutoGetSpeciesName(r4[2], gStringVar2, 0); + StringCopy(gStringVar3, ItemId_GetItem(r4[0])->name); + StringCopy(gStringVar1, ItemId_GetItem(r4[1])->name); + StringExpandPlaceholders(gStringVar4, gUnknown_841A6E1); + r4 += 3; + return r4; +} + +u16 * sub_81143F0(u16 * a0, const u16 * a1) +{ + u16 * r4 = a0; + if (gUnknown_203B044.unk_0 == 11 && gUnknown_203B044.unk_1 != 0) + return r4; + + if (!sub_8110944(a0, gUnknown_8456AA0[11])) + return NULL; + + r4[0] = 11; + r4[1] = gUnknown_203AF98; + return r4 + 2; +} + +const u16 * sub_811443C(const u16 * a0) +{ + StringExpandPlaceholders(gStringVar4, gUnknown_841A2B0); + a0 += 2; + return a0; +} + +u16 * sub_811445C(u16 * a0, const u16 * a1) +{ + u16 * r4 = a0 + 4; + + a0[0] = 12; + a0[1] = gUnknown_203AF98; + a0[2] = a1[0]; + a0[3] = a1[1]; + a1 += 2; + memcpy(r4, a1, 7); + r4 += 4; + return r4; +} + +const u16 * sub_811448C(const u16 * a0) +{ + const u16 * r6 = a0 + 4; + + memset(gStringVar1, EOS, 8); + memcpy(gStringVar1, r6, 7); + + sub_8115834(gStringVar1); + QuestLog_AutoGetSpeciesName(a0[3], gStringVar2, 0); + QuestLog_AutoGetSpeciesName(a0[2], gStringVar3, 0); + StringExpandPlaceholders(gStringVar4, gUnknown_841A3FF); + r6 += 4; + return r6; +} + +u16 * sub_81144EC(u16 * a0, const u16 * a1) +{ + a0[0] = 13; + a0[1] = gUnknown_203AF98; + *((u8 *)a0 + 4) = *((const u8 *)a1 + 0); + memcpy((u8 *)a0 + 5, (const u8 *)a1 + 1, 7); + a0 += 6; + return a0; +} + +const u8 *const gUnknown_8456ACC[] = { + gUnknown_841A74E, + gUnknown_841A756, + gUnknown_841A762 +}; + +const u8 *const gUnknown_8456AD8[] = { + gUnknown_841AF98, + gUnknown_841A762, + gUnknown_841AF9F +}; + +const u8 *const gUnknown_8456AE4[] = { + gUnknown_841A502, + gUnknown_841A506, + gUnknown_841AFD1 +}; + +const u16 * sub_8114518(const u16 * a0) +{ + UnkTextUtil_Reset(); + + memset(gStringVar1, EOS, 8); + memcpy(gStringVar1, (const u8 *)a0 + 5, 7); + sub_8115834(gStringVar1); + UnkTextUtil_SetPtrI(0, gStringVar1); + UnkTextUtil_SetPtrI(1, gUnknown_8456AE4[((const u8 *)a0)[4]]); + UnkTextUtil_StringExpandPlaceholders(gStringVar4, gUnknown_841A422); + a0 += 6; + return a0; +} -- cgit v1.2.3 From e3a2a2fa85b23a73fc595bd81733989ae2d1ba4d Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Thu, 8 Nov 2018 17:01:10 -0500 Subject: through sub_8114758 --- asm/quest_log.s | 241 -------------------------------------------------------- src/quest_log.c | 107 ++++++++++++++++++++++--- 2 files changed, 97 insertions(+), 251 deletions(-) diff --git a/asm/quest_log.s b/asm/quest_log.s index afc89e1ab..8f47698ad 100644 --- a/asm/quest_log.s +++ b/asm/quest_log.s @@ -5,247 +5,6 @@ .text - thumb_func_start sub_8114578 -sub_8114578: @ 8114578 - push {r4,lr} - adds r4, r0, 0 - movs r0, 0xE - strh r0, [r4] - ldr r0, _081145A0 @ =gUnknown_203AF98 - ldrh r0, [r0] - strh r0, [r4, 0x2] - ldrb r0, [r1] - strb r0, [r4, 0x4] - adds r0, r4, 0x5 - adds r1, 0x1 - movs r2, 0x7 - bl memcpy - adds r4, 0xC - adds r0, r4, 0 - pop {r4} - pop {r1} - bx r1 - .align 2, 0 -_081145A0: .4byte gUnknown_203AF98 - thumb_func_end sub_8114578 - - thumb_func_start sub_81145A4 -sub_81145A4: @ 81145A4 - push {r4,r5,lr} - adds r5, r0, 0 - bl UnkTextUtil_Reset - ldr r4, _081145F4 @ =gStringVar1 - adds r0, r4, 0 - movs r1, 0xFF - movs r2, 0x8 - bl memset - adds r1, r5, 0x5 - adds r0, r4, 0 - movs r2, 0x7 - bl memcpy - adds r0, r4, 0 - bl sub_8115834 - movs r0, 0 - adds r1, r4, 0 - bl UnkTextUtil_SetPtrI - ldr r1, _081145F8 @ =gUnknown_8456AE4 - ldrb r0, [r5, 0x4] - lsls r0, 2 - adds r0, r1 - ldr r1, [r0] - movs r0, 0x1 - bl UnkTextUtil_SetPtrI - ldr r0, _081145FC @ =gStringVar4 - ldr r1, _08114600 @ =gUnknown_841A477 - bl UnkTextUtil_StringExpandPlaceholders - adds r5, 0xC - adds r0, r5, 0 - pop {r4,r5} - pop {r1} - bx r1 - .align 2, 0 -_081145F4: .4byte gStringVar1 -_081145F8: .4byte gUnknown_8456AE4 -_081145FC: .4byte gStringVar4 -_08114600: .4byte gUnknown_841A477 - thumb_func_end sub_81145A4 - - thumb_func_start sub_8114604 -sub_8114604: @ 8114604 - push {r4,r5,lr} - adds r4, r0, 0 - adds r5, r1, 0 - movs r0, 0xF - strh r0, [r4] - ldr r0, _08114648 @ =gUnknown_203AF98 - ldrh r0, [r0] - strh r0, [r4, 0x2] - ldrb r0, [r5] - strb r0, [r4, 0x4] - adds r0, r4, 0x5 - adds r1, r5, 0x1 - movs r2, 0x7 - bl memcpy - adds r0, r4, 0 - adds r0, 0xC - adds r1, r5, 0 - adds r1, 0x8 - movs r2, 0x7 - bl memcpy - adds r0, r4, 0 - adds r0, 0x13 - adds r5, 0xF - adds r1, r5, 0 - movs r2, 0x7 - bl memcpy - adds r4, 0x1A - adds r0, r4, 0 - pop {r4,r5} - pop {r1} - bx r1 - .align 2, 0 -_08114648: .4byte gUnknown_203AF98 - thumb_func_end sub_8114604 - - thumb_func_start sub_811464C -sub_811464C: @ 811464C - push {r4-r6,lr} - mov r6, r8 - push {r6} - adds r4, r0, 0 - bl UnkTextUtil_Reset - ldr r0, _081146F4 @ =gStringVar1 - mov r8, r0 - movs r1, 0xFF - movs r2, 0x8 - bl memset - ldr r6, _081146F8 @ =gStringVar2 - adds r0, r6, 0 - movs r1, 0xFF - movs r2, 0x8 - bl memset - ldr r5, _081146FC @ =gStringVar3 - adds r0, r5, 0 - movs r1, 0xFF - movs r2, 0x8 - bl memset - adds r1, r4, 0x5 - mov r0, r8 - bl StringCopy7 - adds r1, r4, 0 - adds r1, 0xC - adds r0, r6, 0 - bl StringCopy7 - adds r1, r4, 0 - adds r1, 0x13 - adds r0, r5, 0 - bl StringCopy7 - mov r0, r8 - bl sub_8115834 - adds r0, r6, 0 - bl sub_8115834 - adds r0, r5, 0 - bl sub_8115834 - ldr r0, _08114700 @ =gSaveBlock2Ptr - ldr r1, [r0] - movs r0, 0 - bl UnkTextUtil_SetPtrI - movs r0, 0x1 - mov r1, r8 - bl UnkTextUtil_SetPtrI - movs r0, 0x2 - adds r1, r6, 0 - bl UnkTextUtil_SetPtrI - movs r0, 0x3 - adds r1, r5, 0 - bl UnkTextUtil_SetPtrI - ldr r1, _08114704 @ =gUnknown_8456AE4 - ldrb r0, [r4, 0x4] - lsls r0, 2 - adds r0, r1 - ldr r1, [r0] - movs r0, 0x4 - bl UnkTextUtil_SetPtrI - ldr r0, _08114708 @ =gStringVar4 - ldr r1, _0811470C @ =gUnknown_841A4C6 - bl UnkTextUtil_StringExpandPlaceholders - adds r4, 0x1A - adds r0, r4, 0 - pop {r3} - mov r8, r3 - pop {r4-r6} - pop {r1} - bx r1 - .align 2, 0 -_081146F4: .4byte gStringVar1 -_081146F8: .4byte gStringVar2 -_081146FC: .4byte gStringVar3 -_08114700: .4byte gSaveBlock2Ptr -_08114704: .4byte gUnknown_8456AE4 -_08114708: .4byte gStringVar4 -_0811470C: .4byte gUnknown_841A4C6 - thumb_func_end sub_811464C - - thumb_func_start sub_8114710 -sub_8114710: @ 8114710 - movs r1, 0x10 - strh r1, [r0] - ldr r1, _08114720 @ =gUnknown_203AF98 - ldrh r1, [r1] - strh r1, [r0, 0x2] - adds r0, 0x4 - bx lr - .align 2, 0 -_08114720: .4byte gUnknown_203AF98 - thumb_func_end sub_8114710 - - thumb_func_start sub_8114724 -sub_8114724: @ 8114724 - push {r4,lr} - adds r4, r0, 0 - ldr r0, _0811473C @ =gStringVar4 - ldr r1, _08114740 @ =gUnknown_841A50B - bl StringExpandPlaceholders - adds r4, 0x4 - adds r0, r4, 0 - pop {r4} - pop {r1} - bx r1 - .align 2, 0 -_0811473C: .4byte gStringVar4 -_08114740: .4byte gUnknown_841A50B - thumb_func_end sub_8114724 - - thumb_func_start sub_8114744 -sub_8114744: @ 8114744 - movs r1, 0x11 - strh r1, [r0] - ldr r1, _08114754 @ =gUnknown_203AF98 - ldrh r1, [r1] - strh r1, [r0, 0x2] - adds r0, 0x4 - bx lr - .align 2, 0 -_08114754: .4byte gUnknown_203AF98 - thumb_func_end sub_8114744 - - thumb_func_start sub_8114758 -sub_8114758: @ 8114758 - push {r4,lr} - adds r4, r0, 0 - ldr r0, _08114770 @ =gStringVar4 - ldr r1, _08114774 @ =gUnknown_841A732 - bl StringExpandPlaceholders - adds r4, 0x4 - adds r0, r4, 0 - pop {r4} - pop {r1} - bx r1 - .align 2, 0 -_08114770: .4byte gStringVar4 -_08114774: .4byte gUnknown_841A732 - thumb_func_end sub_8114758 - thumb_func_start sub_8114778 sub_8114778: @ 8114778 push {r4,lr} diff --git a/src/quest_log.c b/src/quest_log.c index 57e5ac0b9..d664f3e25 100644 --- a/src/quest_log.c +++ b/src/quest_log.c @@ -3918,16 +3918,6 @@ const u16 * sub_811448C(const u16 * a0) return r6; } -u16 * sub_81144EC(u16 * a0, const u16 * a1) -{ - a0[0] = 13; - a0[1] = gUnknown_203AF98; - *((u8 *)a0 + 4) = *((const u8 *)a1 + 0); - memcpy((u8 *)a0 + 5, (const u8 *)a1 + 1, 7); - a0 += 6; - return a0; -} - const u8 *const gUnknown_8456ACC[] = { gUnknown_841A74E, gUnknown_841A756, @@ -3946,6 +3936,16 @@ const u8 *const gUnknown_8456AE4[] = { gUnknown_841AFD1 }; +u16 * sub_81144EC(u16 * a0, const u16 * a1) +{ + a0[0] = 13; + a0[1] = gUnknown_203AF98; + *((u8 *)a0 + 4) = *((const u8 *)a1 + 0); + memcpy((u8 *)a0 + 5, (const u8 *)a1 + 1, 7); + a0 += 6; + return a0; +} + const u16 * sub_8114518(const u16 * a0) { UnkTextUtil_Reset(); @@ -3959,3 +3959,90 @@ const u16 * sub_8114518(const u16 * a0) a0 += 6; return a0; } + +u16 * sub_8114578(u16 * a0, const u16 * a1) +{ + a0[0] = 14; + a0[1] = gUnknown_203AF98; + *((u8 *)a0 + 4) = *((const u8 *)a1 + 0); + memcpy((u8 *)a0 + 5, (const u8 *)a1 + 1, 7); + a0 += 6; + return a0; +} + +const u16 * sub_81145A4(const u16 * a0) +{ + UnkTextUtil_Reset(); + + memset(gStringVar1, EOS, 8); + memcpy(gStringVar1, (const u8 *)a0 + 5, 7); + sub_8115834(gStringVar1); + UnkTextUtil_SetPtrI(0, gStringVar1); + UnkTextUtil_SetPtrI(1, gUnknown_8456AE4[((const u8 *)a0)[4]]); + UnkTextUtil_StringExpandPlaceholders(gStringVar4, gUnknown_841A477); + a0 += 6; + return a0; +} + +u16 * sub_8114604(u16 * a0, const u16 * a1) +{ + a0[0] = 15; + a0[1] = gUnknown_203AF98; + *((u8 *)a0 + 4) = *((const u8 *)a1 + 0); + memcpy((u8 *)a0 + 5, (const u8 *)a1 + 1, 7); + memcpy((u8 *)a0 + 12, (const u8 *)a1 + 8, 7); + memcpy((u8 *)a0 + 19, (const u8 *)a1 + 15, 7); + a0 += 13; + return a0; +} + +const u16 * sub_811464C(const u16 * a0) +{ + UnkTextUtil_Reset(); + + memset(gStringVar1, EOS, 8); + memset(gStringVar2, EOS, 8); + memset(gStringVar3, EOS, 8); + StringCopy7(gStringVar1, (const u8 *)a0 + 5); + StringCopy7(gStringVar2, (const u8 *)a0 + 12); + StringCopy7(gStringVar3, (const u8 *)a0 + 19); + sub_8115834(gStringVar1); + sub_8115834(gStringVar2); + sub_8115834(gStringVar3); + UnkTextUtil_SetPtrI(0, gSaveBlock2Ptr->playerName); + UnkTextUtil_SetPtrI(1, gStringVar1); + UnkTextUtil_SetPtrI(2, gStringVar2); + UnkTextUtil_SetPtrI(3, gStringVar3); + UnkTextUtil_SetPtrI(4, gUnknown_8456AE4[((const u8 *)a0)[4]]); + UnkTextUtil_StringExpandPlaceholders(gStringVar4, gUnknown_841A4C6); + a0 += 13; + return a0; +} + +u16 * sub_8114710(u16 * a0, const u16 * a1) +{ + a0[0] = 16; + a0[1] = gUnknown_203AF98; + return a0 + 2; +} + +const u16 * sub_8114724(const u16 * a0) +{ + StringExpandPlaceholders(gStringVar4, gUnknown_841A50B); + a0 += 2; + return a0; +} + +u16 * sub_8114744(u16 * a0, const u16 * a1) +{ + a0[0] = 17; + a0[1] = gUnknown_203AF98; + return a0 + 2; +} + +const u16 * sub_8114758(const u16 * a0) +{ + StringExpandPlaceholders(gStringVar4, gUnknown_841A732); + a0 += 2; + return a0; +} -- cgit v1.2.3 From 4ee3c03a697b9520d365fa17ed43602e68852468 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Thu, 8 Nov 2018 17:52:02 -0500 Subject: through sub_8114834 --- asm/quest_log.s | 130 -------------------------------------------------------- src/quest_log.c | 46 ++++++++++++++++++++ 2 files changed, 46 insertions(+), 130 deletions(-) diff --git a/asm/quest_log.s b/asm/quest_log.s index 8f47698ad..a5b8ae30e 100644 --- a/asm/quest_log.s +++ b/asm/quest_log.s @@ -5,136 +5,6 @@ .text - thumb_func_start sub_8114778 -sub_8114778: @ 8114778 - push {r4,lr} - adds r4, r0, 0 - adds r4, 0x8 - movs r2, 0x12 - strh r2, [r0] - ldr r2, _081147A4 @ =gUnknown_203AF98 - ldrh r2, [r2] - strh r2, [r0, 0x2] - ldrh r2, [r1] - strh r2, [r0, 0x4] - ldrh r2, [r1, 0x2] - strh r2, [r0, 0x6] - adds r1, 0x4 - adds r0, r4, 0 - movs r2, 0x7 - bl memcpy - adds r4, 0x8 - adds r0, r4, 0 - pop {r4} - pop {r1} - bx r1 - .align 2, 0 -_081147A4: .4byte gUnknown_203AF98 - thumb_func_end sub_8114778 - - thumb_func_start sub_81147A8 -sub_81147A8: @ 81147A8 - push {r4-r6,lr} - adds r5, r0, 0 - adds r6, r5, 0 - adds r6, 0x8 - ldr r4, _081147F4 @ =gStringVar1 - adds r0, r4, 0 - movs r1, 0xFF - movs r2, 0x8 - bl memset - adds r0, r4, 0 - adds r1, r6, 0 - movs r2, 0x7 - bl memcpy - adds r0, r4, 0 - bl sub_8115834 - ldrh r0, [r5, 0x6] - ldr r1, _081147F8 @ =gStringVar2 - movs r2, 0 - bl QuestLog_AutoGetSpeciesName - ldrh r0, [r5, 0x4] - ldr r1, _081147FC @ =gStringVar3 - movs r2, 0 - bl QuestLog_AutoGetSpeciesName - ldr r0, _08114800 @ =gStringVar4 - ldr r1, _08114804 @ =gUnknown_841A76A - bl StringExpandPlaceholders - adds r6, 0x8 - adds r0, r6, 0 - pop {r4-r6} - pop {r1} - bx r1 - .align 2, 0 -_081147F4: .4byte gStringVar1 -_081147F8: .4byte gStringVar2 -_081147FC: .4byte gStringVar3 -_08114800: .4byte gStringVar4 -_08114804: .4byte gUnknown_841A76A - thumb_func_end sub_81147A8 - - thumb_func_start sub_8114808 -sub_8114808: @ 8114808 - push {r4,lr} - adds r4, r0, 0 - movs r0, 0x13 - strh r0, [r4] - ldr r0, _08114830 @ =gUnknown_203AF98 - ldrh r0, [r0] - strh r0, [r4, 0x2] - ldrb r0, [r1] - strb r0, [r4, 0x4] - adds r0, r4, 0x5 - adds r1, 0x1 - movs r2, 0x7 - bl memcpy - adds r4, 0xC - adds r0, r4, 0 - pop {r4} - pop {r1} - bx r1 - .align 2, 0 -_08114830: .4byte gUnknown_203AF98 - thumb_func_end sub_8114808 - - thumb_func_start sub_8114834 -sub_8114834: @ 8114834 - push {r4,r5,lr} - adds r5, r0, 0 - ldr r4, _08114878 @ =gStringVar1 - adds r0, r4, 0 - movs r1, 0xFF - movs r2, 0x8 - bl memset - adds r1, r5, 0x5 - adds r0, r4, 0 - movs r2, 0x7 - bl memcpy - adds r0, r4, 0 - bl sub_8115834 - ldr r0, _0811487C @ =gStringVar2 - ldr r2, _08114880 @ =gUnknown_8456AE4 - ldrb r1, [r5, 0x4] - lsls r1, 2 - adds r1, r2 - ldr r1, [r1] - bl StringCopy - ldr r0, _08114884 @ =gStringVar4 - ldr r1, _08114888 @ =gUnknown_841A7B0 - bl StringExpandPlaceholders - adds r5, 0xC - adds r0, r5, 0 - pop {r4,r5} - pop {r1} - bx r1 - .align 2, 0 -_08114878: .4byte gStringVar1 -_0811487C: .4byte gStringVar2 -_08114880: .4byte gUnknown_8456AE4 -_08114884: .4byte gStringVar4 -_08114888: .4byte gUnknown_841A7B0 - thumb_func_end sub_8114834 - thumb_func_start sub_811488C sub_811488C: @ 811488C push {r4,lr} diff --git a/src/quest_log.c b/src/quest_log.c index d664f3e25..e146c92e7 100644 --- a/src/quest_log.c +++ b/src/quest_log.c @@ -4046,3 +4046,49 @@ const u16 * sub_8114758(const u16 * a0) a0 += 2; return a0; } + +u16 * sub_8114778(u16 * a0, const u16 * a1) +{ + u8 * r4 = (u8 *)(a0 + 4); + a0[0] = 18; + a0[1] = gUnknown_203AF98; + a0[2] = a1[0]; + a0[3] = a1[1]; + memcpy(r4, a1 + 2, 7); + r4 += 8; + return (u16 *)r4; +} + +const u16 * sub_81147A8(const u16 * a0) +{ + const u8 * r6 = (const u8 *)(a0 + 4); + memset(gStringVar1, EOS, 8); + memcpy(gStringVar1, r6, 7); + sub_8115834(gStringVar1); + QuestLog_AutoGetSpeciesName(a0[3], gStringVar2, 0); + QuestLog_AutoGetSpeciesName(a0[2], gStringVar3, 0); + StringExpandPlaceholders(gStringVar4, gUnknown_841A76A); + r6 += 8; + return (const u16 *)r6; +} + +u16 * sub_8114808(u16 * a0, const u16 * a1) +{ + a0[0] = 19; + a0[1] = gUnknown_203AF98; + *(u8 *)&a0[2] = *(const u8 *)&a1[0]; + memcpy((u8 *)a0 + 5, (const u8 *)a1 + 1, 7); + a0 += 6; + return a0; +} + +const u16 * sub_8114834(const u16 * a0) +{ + memset(gStringVar1, EOS, 8); + memcpy(gStringVar1, (const u8 *)a0 + 5, 7); + sub_8115834(gStringVar1); + StringCopy(gStringVar2, gUnknown_8456AE4[*(const u8 *)&a0[2]]); + StringExpandPlaceholders(gStringVar4, gUnknown_841A7B0); + a0 += 6; + return a0; +} -- cgit v1.2.3 From 6317f0180e191fb7c426eaf38b2dd631d9694146 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Fri, 9 Nov 2018 08:28:39 -0500 Subject: Start to refactor some of the data components --- include/global.h | 29 +++++++++++++++++------------ src/quest_log.c | 14 +++++++------- 2 files changed, 24 insertions(+), 19 deletions(-) diff --git a/include/global.h b/include/global.h index 6a178feb6..11c0e61e3 100644 --- a/include/global.h +++ b/include/global.h @@ -503,24 +503,29 @@ struct QuestLogNPCData u32 movementType:8; }; -struct UnkStruct_203B024_Sub1 +struct UnkStruct_203B024 { - u8 unk_00; - u8 unk_01; - u8 filler_02[26]; + u16 unk_00; + u16 unk_02; + u16 unk_04[14]; }; -union UnkUnion_203B024 +union QuestLogScene { - struct UnkStruct_203B024_Sub1 type1; - u8 filler[28]; + u8 allocation[32]; + u16 ident; }; -struct UnkStruct_203B024 +typedef union QuestLogScene QuestLogScene; + +union QuestLogMovement; +union QuestLogMovement { - u16 unk_00; - u16 unk_02; - union UnkUnion_203B024 unk_04; + u16 ident_raw; + struct { + u16 ident:12; + u16 flags:4; + } ident_struct; }; struct QuestLog @@ -535,7 +540,7 @@ struct QuestLog /*0x0148*/ u8 unk_148[0x120]; /*0x02c8*/ u8 unk_268[0x200]; /*0x0468*/ struct QuestLogNPCData npcData[64]; - /*0x0568*/ struct UnkStruct_203B024 unk_568[8]; + /*0x0568*/ u16 unk_568[128]; /*0x0668*/ u16 end[0]; }; diff --git a/src/quest_log.c b/src/quest_log.c index e146c92e7..06780ff21 100644 --- a/src/quest_log.c +++ b/src/quest_log.c @@ -537,7 +537,7 @@ void sub_8110AEC(u16 a0) sub_81108F0(gUnknown_203ADF8); sub_8113B88(); - gUnknown_203AE08 = (u16 *)gSaveBlock1Ptr->questLog[gUnknown_203ADF8].unk_568; + gUnknown_203AE08 = gSaveBlock1Ptr->questLog[gUnknown_203ADF8].unk_568; if ((a0 >= 12 && a0 < 20) || a0 == 35) gSaveBlock1Ptr->questLog[gUnknown_203ADF8].unk_000 = 2; else @@ -1172,7 +1172,7 @@ void sub_811175C(u8 a0, struct UnkStruct_203AE98 * a1) gUnknown_203AE0C[i] = NULL; } - r4 = (u16 *)gSaveBlock1Ptr->questLog[a0].unk_568; + r4 = gSaveBlock1Ptr->questLog[a0].unk_568; for (i = 0; i < 32; i++) { switch (r4[0] & 0xFFF) @@ -3191,9 +3191,9 @@ bool8 sub_81138A0(u16 a0, u16 * a1) if (a0 < 16 || a0 > 17) { if (a0 == 12 || a0 == 18) - memcpy(&gUnknown_203B024.unk_04, a1, 12); + memcpy(gUnknown_203B024.unk_04, a1, 12); else - memcpy(&gUnknown_203B024.unk_04, a1, 24); + memcpy(gUnknown_203B024.unk_04, a1, 24); } return TRUE; } @@ -3210,7 +3210,7 @@ void sub_811390C(void) u16 * resp; gUnknown_203B04A = 0; sub_8110AEC(gUnknown_203B024.unk_00); - resp = sQuestLogStorageCBs[gUnknown_203B024.unk_00](gUnknown_203AE08, (u16 *)&gUnknown_203B024.unk_04); + resp = sQuestLogStorageCBs[gUnknown_203B024.unk_00](gUnknown_203AE08, gUnknown_203B024.unk_04); gUnknown_203AE08 = resp; sub_81138F8(); } @@ -3224,7 +3224,7 @@ bool8 sub_8113954(u16 a0, u16 * a1) if (gUnknown_3005E88 || FlagGet(0x82C) || sub_81137E4(a0, a1) != TRUE) { gUnknown_203B024.unk_00 = a0; - memcpy(&gUnknown_203B024.unk_04, a1, 8); + memcpy(gUnknown_203B024.unk_04, a1, 8); } return TRUE; } @@ -3240,7 +3240,7 @@ void sub_81139BC(void) sub_8110AEC(gUnknown_203B024.unk_00); } sub_8113B94(gUnknown_203B024.unk_00); - resp = sQuestLogStorageCBs[gUnknown_203B024.unk_00](gUnknown_203AE08, (u16 *)&gUnknown_203B024.unk_04); + resp = sQuestLogStorageCBs[gUnknown_203B024.unk_00](gUnknown_203AE08, gUnknown_203B024.unk_04); gUnknown_203AE08 = resp; sub_8113A1C(1); sub_81138F8(); -- cgit v1.2.3 From d6233c5b3b7539469e028838b1e548b6c39ce784 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Fri, 9 Nov 2018 12:33:20 -0500 Subject: Fix C/C++ errors generated by CLion IDE --- include/battle.h | 2 ++ include/battle_2.h | 2 ++ include/battle_ai_script_commands.h | 2 ++ include/battle_ai_switch_items.h | 2 ++ include/battle_anim.h | 6 ++++++ include/battle_controllers.h | 2 ++ include/battle_dome_cards.h | 2 ++ include/battle_interface.h | 1 + include/battle_message.h | 2 ++ include/battle_script_commands.h | 2 ++ include/battle_scripts.h | 2 ++ include/battle_setup.h | 2 ++ include/battle_string_ids.h | 2 ++ include/battle_tower.h | 2 ++ include/battle_transition.h | 2 ++ include/battle_util.h | 2 ++ include/battle_util2.h | 2 ++ include/berry.h | 2 ++ include/bg.h | 2 ++ include/blend_palette.h | 2 ++ include/calculate_base_damage.h | 2 ++ include/coins.h | 2 ++ include/config.h | 2 ++ include/data2.h | 2 ++ include/daycare.h | 2 ++ include/decompress.h | 2 ++ include/diploma.h | 2 ++ include/dma3.h | 2 ++ include/easy_chat.h | 2 ++ include/egg_hatch.h | 2 ++ include/event_data.h | 2 ++ include/event_scripts.h | 2 ++ include/evolution_graphics.h | 2 ++ include/evolution_scene.h | 2 ++ include/field_camera.h | 2 ++ include/field_control_avatar.h | 2 ++ include/field_door.h | 2 ++ include/field_effect.h | 2 ++ include/field_effect_helpers.h | 2 ++ include/field_fadetransition.h | 2 ++ include/field_ground_effect.h | 2 ++ include/field_map_obj.h | 2 ++ include/field_map_obj_helpers.h | 2 ++ include/field_message_box.h | 2 ++ include/field_player_avatar.h | 2 ++ include/field_poison.h | 2 ++ include/field_screen.h | 2 ++ include/field_screen_effect.h | 2 ++ include/field_specials.h | 2 ++ include/field_tasks.h | 2 ++ include/field_weather.h | 2 ++ include/fieldmap.h | 2 ++ include/fldeff_80F9BCC.h | 2 ++ include/global.berry.h | 2 ++ include/global.fieldmap.h | 2 ++ include/global.h | 29 +++++++++++++++++++++++------ include/gpu_regs.h | 2 ++ include/graphics.h | 2 ++ include/hall_of_fame.h | 2 ++ include/heal_location.h | 2 ++ include/help_system.h | 2 ++ include/international_string_util.h | 2 ++ include/item_icon.h | 2 ++ include/item_menu.h | 2 ++ include/item_menu_icons.h | 2 ++ include/link.h | 2 ++ include/list_menu.h | 2 ++ include/load_save.h | 2 ++ include/m4a.h | 2 ++ include/mail.h | 2 ++ include/mail_data.h | 2 ++ include/main.h | 2 ++ include/malloc.h | 2 ++ include/map_name_popup.h | 2 ++ include/map_obj_80688E4.h | 2 ++ include/map_obj_8097404.h | 2 ++ include/map_obj_lock.h | 2 ++ include/menews_jisan.h | 2 ++ include/menu.h | 2 ++ include/menu_helpers.h | 2 ++ include/menu_indicators.h | 2 ++ include/metatile_behavior.h | 2 ++ include/mevent.h | 2 ++ include/money.h | 2 ++ include/multiboot.h | 2 ++ include/mystery_event_script.h | 2 ++ include/naming_screen.h | 2 ++ include/new_game.h | 2 ++ include/new_menu_helpers.h | 2 ++ include/overworld.h | 2 ++ include/palette.h | 2 ++ include/party_menu.h | 2 ++ include/play_time.h | 2 ++ include/player_pc.h | 2 ++ include/pokeball.h | 2 ++ include/pokedex.h | 2 ++ include/pokemon.h | 8 ++++++++ include/pokemon_3.h | 2 ++ include/pokemon_icon.h | 2 ++ include/pokemon_item_effects.h | 2 +- include/pokemon_size_record.h | 2 ++ include/pokemon_storage_system.h | 2 ++ include/pokenav.h | 2 ++ include/quest_log.h | 2 ++ include/quest_log_8150454.h | 2 ++ include/random.h | 2 ++ include/region_map.h | 2 ++ include/reshow_battle_screen.h | 2 ++ include/roamer.h | 2 ++ include/rom6.h | 2 ++ include/rom_818CFC8.h | 2 ++ include/rom_81BE66C.h | 2 ++ include/safari_zone.h | 2 ++ include/save.h | 2 ++ include/save_location.h | 2 ++ include/script.h | 2 ++ include/script_menu.h | 2 ++ include/script_movement.h | 2 ++ include/script_pokemon_80F8.h | 2 ++ include/script_pokemon_81B9.h | 2 ++ include/shop.h | 2 ++ include/slot_machine.h | 2 ++ include/songs.h | 2 ++ include/sound.h | 2 ++ include/sprite.h | 2 ++ include/start_menu.h | 2 ++ include/string_util.h | 2 ++ include/strings.h | 2 ++ include/task.h | 2 ++ include/text.h | 2 ++ include/text_window.h | 2 ++ include/tilesets.h | 2 ++ include/trainer_classes.h | 2 ++ include/trainer_front_sprites.h | 6 ++++-- include/trainer_ids.h | 2 ++ include/trainer_see.h | 2 ++ include/trig.h | 2 ++ include/unk_8159F40.h | 2 ++ include/unk_text_util.h | 2 ++ include/unknown_task.h | 2 ++ include/util.h | 2 ++ include/wild_encounter.h | 2 ++ include/window.h | 2 ++ src/pokemon.c | 2 ++ src/quest_log.c | 8 ++++---- src/text.c | 6 +++--- 146 files changed, 326 insertions(+), 16 deletions(-) diff --git a/include/battle.h b/include/battle.h index d89db4656..e2f7ddb44 100644 --- a/include/battle.h +++ b/include/battle.h @@ -1,6 +1,8 @@ #ifndef GUARD_BATTLE_H #define GUARD_BATTLE_H +#include "global.h" + // should they be included here or included individually by every file? #include "constants/battle.h" #include "battle_util.h" diff --git a/include/battle_2.h b/include/battle_2.h index ee61efd9b..ca8b78805 100644 --- a/include/battle_2.h +++ b/include/battle_2.h @@ -1,6 +1,8 @@ #ifndef GUARD_BATTLE_2_H #define GUARD_BATTLE_2_H +#include "global.h" + void CB2_InitBattle(void); void BattleMainCB2(void); void CB2_QuitRecordedBattle(void); diff --git a/include/battle_ai_script_commands.h b/include/battle_ai_script_commands.h index 5fb422b41..5f8c4419b 100644 --- a/include/battle_ai_script_commands.h +++ b/include/battle_ai_script_commands.h @@ -1,6 +1,8 @@ #ifndef GUARD_BATTLE_AI_SCRIPT_COMMANDS_H #define GUARD_BATTLE_AI_SCRIPT_COMMANDS_H +#include "global.h" + void BattleAI_HandleItemUseBeforeAISetup(u8 defaultScoreMoves); void BattleAI_SetupAIData(u8 defaultScoreMoves); u8 BattleAI_ChooseMoveOrAction(void); diff --git a/include/battle_ai_switch_items.h b/include/battle_ai_switch_items.h index 0a230e7f6..d0461319d 100644 --- a/include/battle_ai_switch_items.h +++ b/include/battle_ai_switch_items.h @@ -1,6 +1,8 @@ #ifndef GUARD_BATTLE_AI_SWITCH_ITEMS_H #define GUARD_BATTLE_AI_SWITCH_ITEMS_H +#include "global.h" + enum { AI_ITEM_FULL_RESTORE = 1, diff --git a/include/battle_anim.h b/include/battle_anim.h index 9fb7ccd53..4ea3bdead 100644 --- a/include/battle_anim.h +++ b/include/battle_anim.h @@ -1,6 +1,12 @@ #ifndef GUARD_BATTLE_ANIM_H #define GUARD_BATTLE_ANIM_H +#include "global.h" + +#ifndef BATTLE_BANKS_COUNT +#define BATTLE_BANKS_COUNT 4 +#endif // BATTLE_BANKS_COUNT + enum { ANIM_BANK_ATTACKER, diff --git a/include/battle_controllers.h b/include/battle_controllers.h index 66984b453..df00c3526 100644 --- a/include/battle_controllers.h +++ b/include/battle_controllers.h @@ -1,6 +1,8 @@ #ifndef GUARD_BATTLE_CONTROLLERS_H #define GUARD_BATTLE_CONTROLLERS_H +#include "global.h" + enum { REQUEST_ALL_BATTLE, diff --git a/include/battle_dome_cards.h b/include/battle_dome_cards.h index a0696d156..48d165e9c 100644 --- a/include/battle_dome_cards.h +++ b/include/battle_dome_cards.h @@ -1,6 +1,8 @@ #ifndef GUARD_BATTLE_DOME_CARDS_H #define GUARD_BATTLE_DOME_CARDS_H +#include "global.h" + bool16 dp13_810BB8C(void); u16 sub_818D3E4(u16 species, u32 otId, u32 personality, u8 flags, s16 x, s16 y, u8 paletteSlot, u16 paletteTag); u16 sub_818D7D8(u16 species, u32 otId, u32 personality, bool8 isFrontPic, s16 x, s16 y, u8 paletteSlot, u16 paletteTag); diff --git a/include/battle_interface.h b/include/battle_interface.h index b2d3b1b97..27f93a3c2 100644 --- a/include/battle_interface.h +++ b/include/battle_interface.h @@ -1,6 +1,7 @@ #ifndef GUARD_BATTLE_INTERFACE_H #define GUARD_BATTLE_INTERFACE_H +#include "global.h" #include "battle_controllers.h" enum diff --git a/include/battle_message.h b/include/battle_message.h index 30ddca469..27ae88b01 100644 --- a/include/battle_message.h +++ b/include/battle_message.h @@ -1,6 +1,8 @@ #ifndef GUARD_BATTLE_MESSAGE_H #define GUARD_BATTLE_MESSAGE_H +#include "global.h" + // for 0xFD #define B_TXT_BUFF1 0x0 diff --git a/include/battle_script_commands.h b/include/battle_script_commands.h index 80fabaa64..d4cb75e91 100644 --- a/include/battle_script_commands.h +++ b/include/battle_script_commands.h @@ -1,6 +1,8 @@ #ifndef GUARD_BATTLE_SCRIPT_COMMANDS_H #define GUARD_BATTLE_SCRIPT_COMMANDS_H +#include "global.h" + #define NO_ACC_CALC 0xFFFE #define NO_ACC_CALC_CHECK_LOCK_ON 0xFFFF #define ACC_CURR_MOVE 0 diff --git a/include/battle_scripts.h b/include/battle_scripts.h index 2e31a37c5..69edacae6 100644 --- a/include/battle_scripts.h +++ b/include/battle_scripts.h @@ -1,6 +1,8 @@ #ifndef GUARD_BATTLE_SCRIPTS_H #define GUARD_BATTLE_SCRIPTS_H +#include "global.h" + extern const u8 BattleScript_HitFromCritCalc[]; extern const u8 BattleScript_MoveEnd[]; extern const u8 BattleScript_MakeMoveMissed[]; diff --git a/include/battle_setup.h b/include/battle_setup.h index 0168022cc..b4c0201a3 100644 --- a/include/battle_setup.h +++ b/include/battle_setup.h @@ -1,6 +1,8 @@ #ifndef GUARD_BATTLE_SETUP_H #define GUARD_BATTLE_SETUP_H +#include "global.h" + void BattleSetup_StartScriptedWildBattle(void); u8 BattleSetup_GetTerrainId(void); u8 *BattleSetup_ConfigureTrainerBattle(const u8 *data); diff --git a/include/battle_string_ids.h b/include/battle_string_ids.h index f242284b0..a030a7b48 100644 --- a/include/battle_string_ids.h +++ b/include/battle_string_ids.h @@ -1,6 +1,8 @@ #ifndef GUARD_BATTLE_STRING_IDS_H #define GUARD_BATTLE_STRING_IDS_H +#include "global.h" + #define BATTLESTRINGS_COUNT 369 #define BATTLESTRINGS_ID_ADDER 12 // all battlestrings have its ID + 12, because first 5 are reserved diff --git a/include/battle_tower.h b/include/battle_tower.h index 25b439c1b..120ab9a99 100644 --- a/include/battle_tower.h +++ b/include/battle_tower.h @@ -1,6 +1,8 @@ #ifndef GUARD_BATTLE_TOWER_H #define GUARD_BATTLE_TOWER_H +#include "global.h" + u16 sub_8164FCC(u8, u8); #endif //GUARD_BATTLE_TOWER_H diff --git a/include/battle_transition.h b/include/battle_transition.h index 1603f5c93..eba76fd61 100644 --- a/include/battle_transition.h +++ b/include/battle_transition.h @@ -1,6 +1,8 @@ #ifndef GUARD_BATTLE_TRANSITION_H #define GUARD_BATTLE_TRANSITION_H +#include "global.h" + void sub_8149DFC(u8 a1); #endif // GUARD_BATTLE_TRANSITION_H diff --git a/include/battle_util.h b/include/battle_util.h index 25e26719b..ed070720d 100644 --- a/include/battle_util.h +++ b/include/battle_util.h @@ -1,6 +1,8 @@ #ifndef GUARD_BATTLE_UTIL_H #define GUARD_BATTLE_UTIL_H +#include "global.h" + #define MOVE_LIMITATION_ZEROMOVE (1 << 0) #define MOVE_LIMITATION_PP (1 << 1) #define MOVE_LIMITATION_DISABLED (1 << 2) diff --git a/include/battle_util2.h b/include/battle_util2.h index 3954e42dc..3b8a6f817 100644 --- a/include/battle_util2.h +++ b/include/battle_util2.h @@ -1,6 +1,8 @@ #ifndef GUARD_BATTLE_UTIL2_H #define GUARD_BATTLE_UTIL2_H +#include "global.h" + void AllocateBattleResources(void); void FreeBattleResources(void); void AdjustFriendshipOnBattleFaint(u8 bank); diff --git a/include/berry.h b/include/berry.h index 425a664c9..40715868b 100644 --- a/include/berry.h +++ b/include/berry.h @@ -1,6 +1,8 @@ #ifndef GUARD_BERRY_H #define GUARD_BERRY_H +#include "global.h" + enum { BERRY_FIRMNESS_UNKNOWN, diff --git a/include/bg.h b/include/bg.h index 0700e2d23..55927a5a4 100644 --- a/include/bg.h +++ b/include/bg.h @@ -1,6 +1,8 @@ #ifndef GUARD_BG_H #define GUARD_BG_H +#include "global.h" + struct BGCntrlBitfield // for the I/O registers { volatile u16 priority:2; diff --git a/include/blend_palette.h b/include/blend_palette.h index 1db3f4eb0..4ece15d69 100644 --- a/include/blend_palette.h +++ b/include/blend_palette.h @@ -1,6 +1,8 @@ #ifndef GUARD_BLEND_PALETTE_H #define GUARD_BLEND_PALETTE_H +#include "global.h" + // Exported type declarations // Exported RAM declarations diff --git a/include/calculate_base_damage.h b/include/calculate_base_damage.h index e9146c188..8079031e8 100644 --- a/include/calculate_base_damage.h +++ b/include/calculate_base_damage.h @@ -1,6 +1,8 @@ #ifndef GUARD_CALCULATE_BASE_DAMAGE_H #define GUARD_CALCULATE_BASE_DAMAGE_H +#include "global.h" + s32 CalculateBaseDamage(struct BattlePokemon *attacker, struct BattlePokemon *defender, u32 move, u16 sideStatus, u16 powerOverride, u8 typeOverride, u8 bankAtk, u8 bankDef); #endif // GUARD_CALCULATE_BASE_DAMAGE_H diff --git a/include/coins.h b/include/coins.h index 996519605..83ad7d611 100644 --- a/include/coins.h +++ b/include/coins.h @@ -1,6 +1,8 @@ #ifndef GUARD_COINS_H #define GUARD_COINS_H +#include "global.h" + void PrintCoinsString(u32 coinAmount); void ShowCoinsWindow(u32 coinAmount, u8 x, u8 y); void HideCoinsWindow(void); diff --git a/include/config.h b/include/config.h index 756fd1ebd..f094c95bd 100644 --- a/include/config.h +++ b/include/config.h @@ -1,6 +1,8 @@ #ifndef GUARD_CONFIG_H #define GUARD_CONFIG_H +#include "global.h" + // In the Generation 3 games, Asserts were used in various debug builds. // Ruby/Sapphire and Emerald do not have these asserts while Fire Red // still has them in the ROM. This is because the developers forgot diff --git a/include/data2.h b/include/data2.h index be0f33ab8..e383b1c9a 100644 --- a/include/data2.h +++ b/include/data2.h @@ -1,6 +1,8 @@ #ifndef GUARD_DATA2_H #define GUARD_DATA2_H +#include "global.h" + struct MonCoords { // This would use a bitfield, but some function diff --git a/include/daycare.h b/include/daycare.h index 7db44e024..6544ba21a 100644 --- a/include/daycare.h +++ b/include/daycare.h @@ -1,6 +1,8 @@ #ifndef GUARD_DAYCARE_H #define GUARD_DAYCARE_H +#include "global.h" + #define EGG_HATCH_LEVEL 5 u8 *GetMonNick(struct Pokemon *mon, u8 *dest); diff --git a/include/decompress.h b/include/decompress.h index 34a678cda..5f3863dc7 100644 --- a/include/decompress.h +++ b/include/decompress.h @@ -1,6 +1,8 @@ #ifndef GUARD_DECOMPRESS_H #define GUARD_DECOMPRESS_H +#include "global.h" + #include "sprite.h" extern u8 gDecompressionBuffer[0x4000]; diff --git a/include/diploma.h b/include/diploma.h index 8d730fa05..8477e70fc 100644 --- a/include/diploma.h +++ b/include/diploma.h @@ -1,6 +1,8 @@ #ifndef GUARD_DIPLOMA_H #define GUARD_DIPLOMA_H +#include "global.h" + void CB2_ShowDiploma(void); #endif // GUARD_DIPLOMA_H diff --git a/include/dma3.h b/include/dma3.h index 265b47824..fcd7bae43 100644 --- a/include/dma3.h +++ b/include/dma3.h @@ -1,6 +1,8 @@ #ifndef GUARD_DMA3_H #define GUARD_DMA3_H +#include "global.h" + void ClearDma3Requests(void); void ProcessDma3Requests(void); int RequestDma3Copy(const void *src, void *dest, u16 size, u8 mode); diff --git a/include/easy_chat.h b/include/easy_chat.h index f0ac51c22..2b5664420 100644 --- a/include/easy_chat.h +++ b/include/easy_chat.h @@ -1,6 +1,8 @@ #ifndef GUARD_EASYCHAT_H #define GUARD_EASYCHAT_H +#include "global.h" + // Taken from Pokeruby, check if it's correct enum { diff --git a/include/egg_hatch.h b/include/egg_hatch.h index 862d33947..9945284e1 100644 --- a/include/egg_hatch.h +++ b/include/egg_hatch.h @@ -1,6 +1,8 @@ #ifndef GUARD_EGG_HATCH_H #define GUARD_EGG_HATCH_H +#include "global.h" + void ScriptHatchMon(void); bool8 sub_8071614(void); void EggHatch(void); diff --git a/include/event_data.h b/include/event_data.h index 398e03264..2e340f073 100644 --- a/include/event_data.h +++ b/include/event_data.h @@ -1,6 +1,8 @@ #ifndef GUARD_EVENT_DATA_H #define GUARD_EVENT_DATA_H +#include "global.h" + #include "constants/flags.h" #include "constants/vars.h" diff --git a/include/event_scripts.h b/include/event_scripts.h index 6b9025ec2..900755108 100644 --- a/include/event_scripts.h +++ b/include/event_scripts.h @@ -5,6 +5,8 @@ #ifndef GUARD_EVENT_SCRIPTS_H #define GUARD_EVENT_SCRIPTS_H +#include "global.h" + extern const u8 gUnknown_0823B4E8[]; extern const u8 gUnknown_0823B5E9[]; extern const u8 EventScript_275BB7[]; diff --git a/include/evolution_graphics.h b/include/evolution_graphics.h index f52105815..21f133872 100644 --- a/include/evolution_graphics.h +++ b/include/evolution_graphics.h @@ -1,6 +1,8 @@ #ifndef GUARD_EVOLUTION_GRAPHICS_H #define GUARD_EVOLUTION_GRAPHICS_H +#include "global.h" + void LoadEvoSparkleSpriteAndPal(void); u8 LaunchTask_PreEvoSparklesSet1(u16 arg0); diff --git a/include/evolution_scene.h b/include/evolution_scene.h index 5f8c534b9..1d87ceb76 100644 --- a/include/evolution_scene.h +++ b/include/evolution_scene.h @@ -1,6 +1,8 @@ #ifndef GUARD_EVOLUTION_SCENE_H #define GUARD_EVOLUTION_SCENE_H +#include "global.h" + void BeginEvolutionScene(struct Pokemon* mon, u16 speciesToEvolve, bool8 canStopEvo, u8 partyID); void EvolutionScene(struct Pokemon* mon, u16 speciesToEvolve, bool8 canStopEvo, u8 partyID); void TradeEvolutionScene(struct Pokemon* mon, u16 speciesToEvolve, u8 preEvoSpriteID, u8 partyID); diff --git a/include/field_camera.h b/include/field_camera.h index a8559e1c2..53d734081 100644 --- a/include/field_camera.h +++ b/include/field_camera.h @@ -1,6 +1,8 @@ #ifndef GUARD_FIELD_CAMERA_H #define GUARD_FIELD_CAMERA_H +#include "global.h" + // Exported type declarations struct CameraObject diff --git a/include/field_control_avatar.h b/include/field_control_avatar.h index 5b2184561..0a33138b3 100644 --- a/include/field_control_avatar.h +++ b/include/field_control_avatar.h @@ -1,6 +1,8 @@ #ifndef GUARD_FIELD_CONTROL_AVATAR_H #define GUARD_FIELD_CONTROL_AVATAR_H +#include "global.h" + extern u32 gUnknown_3005078; #endif //GUARD_FIELD_CONTROL_AVATAR_H diff --git a/include/field_door.h b/include/field_door.h index f1dfc551d..0059cbe1a 100644 --- a/include/field_door.h +++ b/include/field_door.h @@ -1,6 +1,8 @@ #ifndef GUARD_FIELDDOOR_H #define GUARD_FIELDDOOR_H +#include "global.h" + void FieldSetDoorOpened(u32, u32); void FieldSetDoorClosed(u32, u32); s8 FieldAnimateDoorClose(u32, u32); diff --git a/include/field_effect.h b/include/field_effect.h index 629ae07c7..8d96e4929 100644 --- a/include/field_effect.h +++ b/include/field_effect.h @@ -1,6 +1,8 @@ #ifndef GUARD_FIELD_EFFECTS_H #define GUARD_FIELD_EFFECTS_H +#include "global.h" + enum FieldEffectScriptIdx { FLDEFF_EXCLAMATION_MARK_ICON_1, diff --git a/include/field_effect_helpers.h b/include/field_effect_helpers.h index e80daf3bd..33c4d5bbc 100644 --- a/include/field_effect_helpers.h +++ b/include/field_effect_helpers.h @@ -5,6 +5,8 @@ #ifndef GUARD_FIELD_EFFECT_HELPERS_H #define GUARD_FIELD_EFFECT_HELPERS_H +#include "global.h" + // Exported type declarations // Exported RAM declarations diff --git a/include/field_fadetransition.h b/include/field_fadetransition.h index 2cd01601e..051865210 100644 --- a/include/field_fadetransition.h +++ b/include/field_fadetransition.h @@ -1,6 +1,8 @@ #ifndef GUARD_FIELD_FADETRANSITION_H #define GUARD_FIELD_FADETRANSITION_H +#include "global.h" + void sub_80AF734(void); void sp13E_warp_to_last_warp(void); void sub_80AF7D0(void); diff --git a/include/field_ground_effect.h b/include/field_ground_effect.h index 63b67ceaf..49448db6a 100644 --- a/include/field_ground_effect.h +++ b/include/field_ground_effect.h @@ -5,6 +5,8 @@ #ifndef GUARD_FIELD_GROUND_EFFECT_H #define GUARD_FIELD_GROUND_EFFECT_H +#include "global.h" + // Exported type declarations // Exported RAM declarations diff --git a/include/field_map_obj.h b/include/field_map_obj.h index 22d2d4a78..ebe68ea01 100644 --- a/include/field_map_obj.h +++ b/include/field_map_obj.h @@ -1,6 +1,8 @@ #ifndef GUARD_FIELD_MAP_OBJ_H #define GUARD_FIELD_MAP_OBJ_H +#include "global.h" + #define NUM_OBJECT_GRAPHICS_INFO 239 #define SPRITE_VAR 240 diff --git a/include/field_map_obj_helpers.h b/include/field_map_obj_helpers.h index ba797ec98..2d3f69d95 100644 --- a/include/field_map_obj_helpers.h +++ b/include/field_map_obj_helpers.h @@ -1,6 +1,8 @@ #ifndef GUARD_FIELDMAPOBJHELP_H #define GUARD_FIELDMAPOBJHELP_H +#include "global.h" + void UnfreezeMapObjects(void); void sub_8097B78(u8, u8); diff --git a/include/field_message_box.h b/include/field_message_box.h index 432c9078b..5777921b7 100644 --- a/include/field_message_box.h +++ b/include/field_message_box.h @@ -1,6 +1,8 @@ #ifndef GUARD_FIELD_MESSAGE_BOX_H #define GUARD_FIELD_MESSAGE_BOX_H +#include "global.h" + bool8 ShowFieldMessage(const u8 *message); bool8 sub_8098238(const u8 *message); bool8 ShowFieldAutoScrollMessage(const u8 *message); diff --git a/include/field_player_avatar.h b/include/field_player_avatar.h index 4bbc197aa..9b7fcde38 100644 --- a/include/field_player_avatar.h +++ b/include/field_player_avatar.h @@ -1,6 +1,8 @@ #ifndef GUARD_FIELD_PLAYER_AVATAR_H #define GUARD_FIELD_PLAYER_AVATAR_H +#include "global.h" + void ClearPlayerAvatarInfo(void); void SetPlayerAvatarExtraStateTransition(u8, u8); u8 GetPlayerAvatarGenderByGraphicsId(u8); diff --git a/include/field_poison.h b/include/field_poison.h index d1a4c823b..fcfb71cf5 100644 --- a/include/field_poison.h +++ b/include/field_poison.h @@ -1,6 +1,8 @@ #ifndef GUARD_FIELD_POISON_H #define GUARD_FIELD_POISON_H +#include "global.h" + // Exported type declarations // Exported RAM declarations diff --git a/include/field_screen.h b/include/field_screen.h index cfc0d081f..a11aa0041 100644 --- a/include/field_screen.h +++ b/include/field_screen.h @@ -1,6 +1,8 @@ #ifndef GUARD_FIELD_SCREEN_H #define GUARD_FIELD_SCREEN_H +#include "global.h" + // Exported type declarations // Exported RAM declarations diff --git a/include/field_screen_effect.h b/include/field_screen_effect.h index ef81c2f9e..add61d57c 100644 --- a/include/field_screen_effect.h +++ b/include/field_screen_effect.h @@ -1,6 +1,8 @@ #ifndef GUARD_FIELD_SCREEN_EFFECT_H #define GUARD_FIELD_SCREEN_EFFECT_H +#include "global.h" + void sub_80AF79C(void); void sub_80B009C(u8); void sub_80B0244(void); diff --git a/include/field_specials.h b/include/field_specials.h index 1f8fbf147..fbe004355 100644 --- a/include/field_specials.h +++ b/include/field_specials.h @@ -1,6 +1,8 @@ #ifndef GUARD_FIELD_SPECIALS_H #define GUARD_FIELD_SPECIALS_H +#include "global.h" + u8 GetLeadMonIndex(void); #endif // GUARD_FIELD_SPECIALS_H diff --git a/include/field_tasks.h b/include/field_tasks.h index 2a2a772d8..aba2a9eee 100644 --- a/include/field_tasks.h +++ b/include/field_tasks.h @@ -1,6 +1,8 @@ #ifndef GUARD_FIELD_TASKS_H #define GUARD_FIELD_TASKS_H +#include "global.h" + void ActivatePerStepCallback(u8); #endif // GUARD_FIELD_TASKS_H diff --git a/include/field_weather.h b/include/field_weather.h index 3f7741f00..b896259e9 100644 --- a/include/field_weather.h +++ b/include/field_weather.h @@ -1,6 +1,8 @@ #ifndef GUARD_WEATHER_H #define GUARD_WEATHER_H +#include "global.h" + void fade_screen(u8, s8); void SetSav1Weather(u32); diff --git a/include/fieldmap.h b/include/fieldmap.h index 06cb7cc77..c5abdb2e1 100644 --- a/include/fieldmap.h +++ b/include/fieldmap.h @@ -1,6 +1,8 @@ #ifndef GUARD_FIELDMAP_H #define GUARD_FIELDMAP_H +#include "global.h" + extern struct MapCoords { int width; int height; diff --git a/include/fldeff_80F9BCC.h b/include/fldeff_80F9BCC.h index d57665c68..3960c6c65 100644 --- a/include/fldeff_80F9BCC.h +++ b/include/fldeff_80F9BCC.h @@ -1,6 +1,8 @@ #ifndef GUARD_FLDEFF_80F9BCC_H #define GUARD_FLDEFF_80F9BCC_H +#include "global.h" + // Exported type declarations // Exported RAM declarations diff --git a/include/global.berry.h b/include/global.berry.h index 5c8a43a02..f9e27b186 100644 --- a/include/global.berry.h +++ b/include/global.berry.h @@ -1,6 +1,8 @@ #ifndef GUARD_GLOBAL_BERRY_H #define GUARD_GLOBAL_BERRY_H +#include "global.h" + #define BERRY_NAME_COUNT 7 #define BERRY_ITEM_EFFECT_COUNT 18 diff --git a/include/global.fieldmap.h b/include/global.fieldmap.h index ed5054b7d..98077d8d4 100644 --- a/include/global.fieldmap.h +++ b/include/global.fieldmap.h @@ -1,6 +1,8 @@ #ifndef GUARD_GLOBAL_FIELDMAP_H #define GUARD_GLOBAL_FIELDMAP_H +#include "global.h" + #define NUM_FIELD_OBJECTS 16 enum diff --git a/include/global.h b/include/global.h index 11c0e61e3..9db1443c2 100644 --- a/include/global.h +++ b/include/global.h @@ -3,6 +3,7 @@ #include "config.h" #include "gba/gba.h" +#include // Prevent cross-jump optimization. #define BLOCK_CROSS_JUMP asm(""); @@ -12,10 +13,18 @@ #define asm_unified(x) asm(".syntax unified\n" x "\n.syntax divided") #if defined (__APPLE__) || defined (__CYGWIN__) -void *memset(void *, int, size_t); -void *memcpy(void *, const void *, size_t); -int strcmp(const char *s1, const char *s2); -char* strcpy(char *dst0, const char *src0); +// Get the IDE to stfu + +// We define it this way to fool preproc. +#define INCBIN(x) {0} +#define INCBIN_U8 INCBIN +#define INCBIN_U16 INCBIN +#define INCBIN_U32 INCBIN +#define INCBIN_S8 INCBIN +#define INCBIN_S16 INCBIN +#define INCBIN_S32 INCBIN +#define _(x) (x) +#define __(x) (x) #endif // __APPLE__ #define ARRAY_COUNT(array) (sizeof(array) / sizeof((array)[0])) @@ -518,7 +527,12 @@ union QuestLogScene typedef union QuestLogScene QuestLogScene; +// This name is a complete guess and may change. + +// Declare here so that it can be recursively referenced. union QuestLogMovement; + +// Define here union QuestLogMovement { u16 ident_raw; @@ -537,8 +551,11 @@ struct QuestLog /*0x0004*/ s16 unk_004; /*0x0006*/ s16 unk_006; /*0x0008*/ u8 filler_008[0x140]; - /*0x0148*/ u8 unk_148[0x120]; - /*0x02c8*/ u8 unk_268[0x200]; + + // These arrays hold the game state for + // playing back the quest log + /*0x0148*/ u8 flags[0x120]; + /*0x02c8*/ u16 vars[0x100]; /*0x0468*/ struct QuestLogNPCData npcData[64]; /*0x0568*/ u16 unk_568[128]; /*0x0668*/ u16 end[0]; diff --git a/include/gpu_regs.h b/include/gpu_regs.h index 89e0cb64b..3930f6809 100644 --- a/include/gpu_regs.h +++ b/include/gpu_regs.h @@ -1,6 +1,8 @@ #ifndef GUARD_GPU_REGS_H #define GUARD_GPU_REGS_H +#include "global.h" + // Exported type declarations // Exported RAM declarations diff --git a/include/graphics.h b/include/graphics.h index aad5c0190..9888d2f7c 100644 --- a/include/graphics.h +++ b/include/graphics.h @@ -5,6 +5,8 @@ #ifndef GUARD_GRAPHICS_H #define GUARD_GRAPHICS_H +#include "global.h" + extern const u8 gInterfaceGfx_PokeBall[]; extern const u8 gInterfacePal_PokeBall[]; extern const u8 gInterfaceGfx_GreatBall[]; diff --git a/include/hall_of_fame.h b/include/hall_of_fame.h index d35ecf268..2dc9fae41 100644 --- a/include/hall_of_fame.h +++ b/include/hall_of_fame.h @@ -1,6 +1,8 @@ #ifndef GUARD_HALL_OF_FAME_H #define GUARD_HALL_OF_FAME_H +#include "global.h" + void CB2_DoHallOfFameScreen(void); void CB2_DoHallOfFameScreenDontSaveData(void); void CB2_DoHallOfFamePC(void); diff --git a/include/heal_location.h b/include/heal_location.h index 1f966f1ae..0143b8158 100644 --- a/include/heal_location.h +++ b/include/heal_location.h @@ -1,6 +1,8 @@ #ifndef GUARD_HEAL_LOCATION_H #define GUARD_HEAL_LOCATION_H +#include "global.h" + // Exported type declarations struct UnkStruct_0859F534 { diff --git a/include/help_system.h b/include/help_system.h index 3a4c52f2e..3f6a741c6 100644 --- a/include/help_system.h +++ b/include/help_system.h @@ -1,6 +1,8 @@ #ifndef GUARD_HELP_SYSTEM_H #define GUARD_HELP_SYSTEM_H +#include "global.h" + extern bool8 gUnknown_3005ECC; #endif //GUARD_HELP_SYSTEM_H diff --git a/include/international_string_util.h b/include/international_string_util.h index e7876162e..2b922676d 100644 --- a/include/international_string_util.h +++ b/include/international_string_util.h @@ -1,6 +1,8 @@ #ifndef GUARD_INTERNATIONAL_STRING_UTIL_H #define GUARD_INTERNATIONAL_STRING_UTIL_H +#include "global.h" + #include "menu.h" void sub_81DB52C(const u8 *src); diff --git a/include/item_icon.h b/include/item_icon.h index a43b72f39..75e2475f3 100644 --- a/include/item_icon.h +++ b/include/item_icon.h @@ -5,6 +5,8 @@ #ifndef GUARD_ITEM_ICON_H #define GUARD_ITEM_ICON_H +#include "global.h" + extern EWRAM_DATA void *gUnknown_0203CEBC; extern EWRAM_DATA void *gUnknown_0203CEC0; diff --git a/include/item_menu.h b/include/item_menu.h index 85655e9d5..24f700918 100644 --- a/include/item_menu.h +++ b/include/item_menu.h @@ -1,6 +1,8 @@ #ifndef GUARD_item_menu_H #define GUARD_item_menu_H +#include "global.h" + // Exported type declarations // Exported RAM declarations diff --git a/include/item_menu_icons.h b/include/item_menu_icons.h index 553e7c262..7fcd6d5e1 100644 --- a/include/item_menu_icons.h +++ b/include/item_menu_icons.h @@ -1,6 +1,8 @@ #ifndef GUARD_ITEM_MENU_ICONS #define GUARD_ITEM_MENU_ICONS +#include "global.h" + u8 sub_80D511C(u8 a0, u8 a1, u8 a2, u8 a3); #endif // GUARD_ITEM_MENU_ICONS diff --git a/include/link.h b/include/link.h index 352386523..239a59b71 100644 --- a/include/link.h +++ b/include/link.h @@ -1,6 +1,8 @@ #ifndef GUARD_LINK_H #define GUARD_LINK_H +#include "global.h" + #define MAX_LINK_PLAYERS 4 #define MAX_RFU_PLAYERS 5 #define CMD_LENGTH 8 diff --git a/include/list_menu.h b/include/list_menu.h index 0249b06af..f547801bd 100644 --- a/include/list_menu.h +++ b/include/list_menu.h @@ -1,6 +1,8 @@ #ifndef GUARD_LIST_MENU_H #define GUARD_LIST_MENU_H +#include "global.h" + // Exported type declarations // Exported RAM declarations diff --git a/include/load_save.h b/include/load_save.h index b3e9fe49c..064e6dff2 100644 --- a/include/load_save.h +++ b/include/load_save.h @@ -1,6 +1,8 @@ #ifndef GUARD_LOAD_SAVE_H #define GUARD_LOAD_SAVE_H +#include "global.h" + extern bool32 gFlashMemoryPresent; void ClearSav2(void); diff --git a/include/m4a.h b/include/m4a.h index 8c3380dd8..24b454104 100644 --- a/include/m4a.h +++ b/include/m4a.h @@ -1,6 +1,8 @@ #ifndef GUARD_M4A_H #define GUARD_M4A_H +#include "global.h" + #include "gba/m4a_internal.h" void m4aSoundVSync(void); diff --git a/include/mail.h b/include/mail.h index 0a70237bf..5d6ad559b 100644 --- a/include/mail.h +++ b/include/mail.h @@ -1,6 +1,8 @@ #ifndef GUARD_MAIL_H #define GUARD_MAIL_H +#include "global.h" + #define IS_ITEM_MAIL(itemId)((itemId == ITEM_ORANGE_MAIL \ || itemId == ITEM_HARBOR_MAIL \ || itemId == ITEM_GLITTER_MAIL \ diff --git a/include/mail_data.h b/include/mail_data.h index bf6540bad..bbe695203 100644 --- a/include/mail_data.h +++ b/include/mail_data.h @@ -1,6 +1,8 @@ #ifndef GUARD_MAIL_DATA_H #define GUARD_MAIL_DATA_H +#include "global.h" + // Exported type declarations // Exported RAM declarations diff --git a/include/main.h b/include/main.h index 82f85f881..84d356692 100644 --- a/include/main.h +++ b/include/main.h @@ -3,6 +3,8 @@ #include "global.h" +#include "global.h" + typedef void (*MainCallback)(void); typedef void (*IntrCallback)(void); typedef void (*IntrFunc)(void); diff --git a/include/malloc.h b/include/malloc.h index 6efa8fbef..ae66aecb1 100644 --- a/include/malloc.h +++ b/include/malloc.h @@ -1,6 +1,8 @@ #ifndef GUARD_MALLOC_H #define GUARD_MALLOC_H +#include "global.h" + #define HEAP_SIZE 0x1C000 #define malloc Alloc #define calloc(ct, sz) AllocZeroed((ct) * (sz)) diff --git a/include/map_name_popup.h b/include/map_name_popup.h index 0cb0c49ad..cf9b005d9 100644 --- a/include/map_name_popup.h +++ b/include/map_name_popup.h @@ -1,6 +1,8 @@ #ifndef GUARD_MAP_NAME_POPUP_H #define GUARD_MAP_NAME_POPUP_H +#include "global.h" + // Exported type declarations // Exported RAM declarations diff --git a/include/map_obj_80688E4.h b/include/map_obj_80688E4.h index b131a1a54..9ab76646d 100644 --- a/include/map_obj_80688E4.h +++ b/include/map_obj_80688E4.h @@ -1,6 +1,8 @@ #ifndef GUARD_MAP_OBJ_80688E4_H #define GUARD_MAP_OBJ_80688E4_H +#include "global.h" + void player_bitmagic(void); #endif //GUARD_MAP_OBJ_80688E4_H diff --git a/include/map_obj_8097404.h b/include/map_obj_8097404.h index 27ffd18cb..ad90bed9c 100644 --- a/include/map_obj_8097404.h +++ b/include/map_obj_8097404.h @@ -5,6 +5,8 @@ #ifndef GUARD_MAP_OBJ_8097404_H #define GUARD_MAP_OBJ_8097404_H +#include "global.h" + // Exported type declarations // Exported RAM declarations diff --git a/include/map_obj_lock.h b/include/map_obj_lock.h index cf1f714d7..c8e075658 100644 --- a/include/map_obj_lock.h +++ b/include/map_obj_lock.h @@ -1,6 +1,8 @@ #ifndef GUARD_MAP_OBJ_LOCK_H #define GUARD_MAP_OBJ_LOCK_H +#include "global.h" + bool8 sub_80983C4(void); void ScriptFreezeMapObjects(void); bool8 sub_809847C(void); diff --git a/include/menews_jisan.h b/include/menews_jisan.h index 8dc1d0a99..4db5a7be2 100644 --- a/include/menews_jisan.h +++ b/include/menews_jisan.h @@ -1,6 +1,8 @@ #ifndef GUARD_MENEWS_JISAN_H #define GUARD_MENEWS_JISAN_H +#include "global.h" + void sub_8146C30(u32 a0); void sub_8146C88(void); void sub_8146CA4(void); diff --git a/include/menu.h b/include/menu.h index 2d28218b6..b932693f7 100644 --- a/include/menu.h +++ b/include/menu.h @@ -1,6 +1,8 @@ #ifndef GUARD_MENU_H #define GUARD_MENU_H +#include "global.h" + #include "text.h" #include "window.h" diff --git a/include/menu_helpers.h b/include/menu_helpers.h index e88385f94..b193388e5 100644 --- a/include/menu_helpers.h +++ b/include/menu_helpers.h @@ -1,6 +1,8 @@ #ifndef GUARD_MENU_HELPERS_H #define GUARD_MENU_HELPERS_H +#include "global.h" + // Exported type declarations struct YesNoFuncTable { diff --git a/include/menu_indicators.h b/include/menu_indicators.h index d0baac810..2350e2502 100644 --- a/include/menu_indicators.h +++ b/include/menu_indicators.h @@ -1,6 +1,8 @@ #ifndef GUARD_MENU_INDICATORS_H #define GUARD_MENU_INDICATORS_H +#include "global.h" + // Exported type declarations // Exported RAM declarations diff --git a/include/metatile_behavior.h b/include/metatile_behavior.h index d6743b788..973d96cbb 100644 --- a/include/metatile_behavior.h +++ b/include/metatile_behavior.h @@ -1,6 +1,8 @@ #ifndef GUARD_METATILE_BEHAVIOR #define GUARD_METATILE_BEHAVIOR +#include "global.h" + bool8 ShouldDoJumpLandingDustEffect(u8); bool8 MetatileBehavior_IsEncounterTile(u8); bool8 MetatileBehavior_IsJumpEast(u8); diff --git a/include/mevent.h b/include/mevent.h index a611a98a8..7df669da3 100644 --- a/include/mevent.h +++ b/include/mevent.h @@ -1,6 +1,8 @@ #ifndef GUARD_MEVENT_H #define GUARD_MEVENT_H +#include "global.h" + struct MysteryEventStruct * sub_8143D94(void); bool32 sub_8143E1C(void); diff --git a/include/money.h b/include/money.h index 48b15db76..fa63e321c 100644 --- a/include/money.h +++ b/include/money.h @@ -1,6 +1,8 @@ #ifndef GUARD_MONEY_H #define GUARD_MONEY_H +#include "global.h" + u32 GetMoney(u32* moneyPtr); void SetMoney(u32* moneyPtr, u32 newValue); bool8 IsEnoughMoney(u32* moneyPtr, u32 cost); diff --git a/include/multiboot.h b/include/multiboot.h index d4700ff4e..4b4a3693a 100644 --- a/include/multiboot.h +++ b/include/multiboot.h @@ -1,6 +1,8 @@ #ifndef GUARD_MULTIBOOT_H #define GUARD_MULTIBOOT_H +#include "global.h" + #define MULTIBOOT_MASTER_INFO 0x62 #define MULTIBOOT_CLIENT_INFO 0x72 #define MULTIBOOT_MASTER_START_PROBE 0x61 diff --git a/include/mystery_event_script.h b/include/mystery_event_script.h index ab23a8d00..1ba1464fa 100644 --- a/include/mystery_event_script.h +++ b/include/mystery_event_script.h @@ -1,6 +1,8 @@ #ifndef GUARD_MYSTERY_EVENT_SCRIPT_H #define GUARD_MYSTERY_EVENT_SCRIPT_H +#include "global.h" + u32 RunMysteryEventScript(u8 *); void SetMysteryEventScriptStatus(u32 val); u16 GetRecordMixingGift(void); diff --git a/include/naming_screen.h b/include/naming_screen.h index 3d69b834f..be2cf34f8 100644 --- a/include/naming_screen.h +++ b/include/naming_screen.h @@ -1,6 +1,8 @@ #ifndef GUARD_NAMING_SCREEN_H #define GUARD_NAMING_SCREEN_H +#include "global.h" + #define NAMING_SCREEN_PLAYER 0 #define NAMING_SCREEN_BOX 1 #define NAMING_SCREEN_CAUGHT_MON 2 diff --git a/include/new_game.h b/include/new_game.h index 2088d1826..c495a9585 100644 --- a/include/new_game.h +++ b/include/new_game.h @@ -1,6 +1,8 @@ #ifndef GUARD_NEW_GAME_H #define GUARD_NEW_GAME_H +#include "global.h" + void WriteUnalignedWord(u32 var, u8 *dataPtr); u32 ReadUnalignedWord(u8* dataPtr); void CopyUnalignedWord(u8 *copyTo, u8 *copyFrom); diff --git a/include/new_menu_helpers.h b/include/new_menu_helpers.h index c52184972..ffe5c2e3f 100644 --- a/include/new_menu_helpers.h +++ b/include/new_menu_helpers.h @@ -1,6 +1,8 @@ #ifndef GUARD_NEW_MENU_HELPERS_H #define GUARD_NEW_MENU_HELPERS_H +#include "global.h" + #include "text.h" #include "task.h" diff --git a/include/overworld.h b/include/overworld.h index d497ddbe1..05ff5e03c 100644 --- a/include/overworld.h +++ b/include/overworld.h @@ -1,6 +1,8 @@ #ifndef GUARD_ROM4_H #define GUARD_ROM4_H +#include "global.h" + #include "main.h" struct UnkPlayerStruct diff --git a/include/palette.h b/include/palette.h index 90112947a..3af0d5d7b 100644 --- a/include/palette.h +++ b/include/palette.h @@ -3,6 +3,8 @@ #include "global.h" +#include "global.h" + #define gPaletteFade_selectedPalettes (gPaletteFade.multipurpose1) // normal and fast fade #define gPaletteFade_blendCnt (gPaletteFade.multipurpose1) // hardware fade #define gPaletteFade_delay (gPaletteFade.multipurpose2) // normal and hardware fade diff --git a/include/party_menu.h b/include/party_menu.h index 75a1645c4..19e1f7d4e 100644 --- a/include/party_menu.h +++ b/include/party_menu.h @@ -1,6 +1,8 @@ #ifndef GUARD_PARTY_MENU_H #define GUARD_PARTY_MENU_H +#include "global.h" + enum { AILMENT_NONE, AILMENT_PSN, diff --git a/include/play_time.h b/include/play_time.h index 49091f4b1..233dbadda 100644 --- a/include/play_time.h +++ b/include/play_time.h @@ -1,6 +1,8 @@ #ifndef GUARD_PLAY_TIME_H #define GUARD_PLAY_TIME_H +#include "global.h" + void PlayTimeCounter_Reset(void); void PlayTimeCounter_Start(void); void PlayTimeCounter_Stop(void); diff --git a/include/player_pc.h b/include/player_pc.h index b14d1ede3..e14e5e9da 100644 --- a/include/player_pc.h +++ b/include/player_pc.h @@ -1,6 +1,8 @@ #ifndef GUARD_PLAYER_PC_H #define GUARD_PLAYER_PC_H +#include "global.h" + // Exported type declarations // Exported RAM declarations diff --git a/include/pokeball.h b/include/pokeball.h index 84178b5b2..10a9529b9 100644 --- a/include/pokeball.h +++ b/include/pokeball.h @@ -1,6 +1,8 @@ #ifndef GUARD_POKEBALL_H #define GUARD_POKEBALL_H +#include "global.h" + enum { BALL_POKE, diff --git a/include/pokedex.h b/include/pokedex.h index 236feac45..ca642ed1a 100644 --- a/include/pokedex.h +++ b/include/pokedex.h @@ -1,6 +1,8 @@ #ifndef GUARD_POKEDEX_H #define GUARD_POKEDEX_H +#include "global.h" + void ResetPokedex(void); void CopyMonCategoryText(u16 species, u8 *dst); u16 GetPokedexHeightWeight(u16 dexNum, u8 data); diff --git a/include/pokemon.h b/include/pokemon.h index e15172dd5..e8782af98 100644 --- a/include/pokemon.h +++ b/include/pokemon.h @@ -1,6 +1,8 @@ #ifndef GUARD_POKEMON_H #define GUARD_POKEMON_H +#include "global.h" + #define MON_DATA_PERSONALITY 0 #define MON_DATA_OT_ID 1 #define MON_DATA_NICKNAME 2 @@ -570,8 +572,14 @@ void DecryptBoxMon(struct BoxPokemon *boxMon); // but they are not used since some code erroneously omits the third arg. // u32 GetMonData(struct Pokemon *mon, s32 field, u8 *data); // u32 GetBoxMonData(struct BoxPokemon *boxMon, s32 field, u8 *data); + +#ifdef IS_POKEMON_C +u32 GetMonData(struct Pokemon *, s32, u8 *); +u32 GetBoxMonData(struct BoxPokemon *, s32, u8 *); +#else u32 GetMonData(); u32 GetBoxMonData(); +#endif // IS_POKEMON_C void SetMonData(struct Pokemon *mon, s32 field, const void *data); void SetBoxMonData(struct BoxPokemon *boxMon, s32 field, const void *data); diff --git a/include/pokemon_3.h b/include/pokemon_3.h index 5c9862d57..cffc9780b 100644 --- a/include/pokemon_3.h +++ b/include/pokemon_3.h @@ -1,6 +1,8 @@ #ifndef GUARD_POKEMON_3_H #define GUARD_POKEMON_3_H +#include "global.h" + const u8* GetTrainerClassNameFromId(u16 trainerId); const u8* GetTrainerNameFromId(u16 trainerId); diff --git a/include/pokemon_icon.h b/include/pokemon_icon.h index b6d21823e..da58a2d83 100644 --- a/include/pokemon_icon.h +++ b/include/pokemon_icon.h @@ -1,6 +1,8 @@ #ifndef GUARD_POKEMON_ICON_H #define GUARD_POKEMON_ICON_H +#include "global.h" + const u8 *GetMonIconPtr(u16 speciesId, u32 personality, u32 frameNo); const u16 *GetValidMonIconPalettePtr(u16 speciesId); u16 sub_80D2E84(u16 speciesId); diff --git a/include/pokemon_item_effects.h b/include/pokemon_item_effects.h index 505cc0f25..e02d976b2 100644 --- a/include/pokemon_item_effects.h +++ b/include/pokemon_item_effects.h @@ -55,8 +55,8 @@ struct PokemonItemEffect /*field 6 u8 value; }; -*/ bool8 ExecuteTableBasedItemEffect(struct Pokemon *mon, u16 itemId, u8 partyId, u8 monMoveIndex, u8 a5); +*/ #endif // GUARD_POKEMON_ITEM_EFFECTS diff --git a/include/pokemon_size_record.h b/include/pokemon_size_record.h index f61286bd4..3fa448cbb 100644 --- a/include/pokemon_size_record.h +++ b/include/pokemon_size_record.h @@ -1,6 +1,8 @@ #ifndef GUARD_POKEMON_SIZE_RECORD_H #define GUARD_POKEMON_SIZE_RECORD_H +#include "global.h" + void InitSeedotSizeRecord(void); void GetSeedotSizeRecordInfo(void); void CompareSeedotSize(void); diff --git a/include/pokemon_storage_system.h b/include/pokemon_storage_system.h index 04d739314..5b2d2052b 100644 --- a/include/pokemon_storage_system.h +++ b/include/pokemon_storage_system.h @@ -1,6 +1,8 @@ #ifndef GUARD_POKEMON_STORAGE_SYSTEM_H #define GUARD_POKEMON_STORAGE_SYSTEM_H +#include "global.h" + #define TOTAL_BOXES_COUNT 14 #define IN_BOX_COUNT 30 diff --git a/include/pokenav.h b/include/pokenav.h index 06676610a..ad95873b1 100644 --- a/include/pokenav.h +++ b/include/pokenav.h @@ -1,6 +1,8 @@ #ifndef GUARD_POKENAV_H #define GUARD_POKENAV_H +#include "global.h" + bool8 sub_81D5C18(void); #endif //GUARD_POKENAV_H diff --git a/include/quest_log.h b/include/quest_log.h index f3fc04f41..90eb290ca 100644 --- a/include/quest_log.h +++ b/include/quest_log.h @@ -1,6 +1,8 @@ #ifndef GUARD_QUEST_LOG_H #define GUARD_QUEST_LOG_H +#include "global.h" + struct UnkStruct_3005E90 { u8 unk_0; diff --git a/include/quest_log_8150454.h b/include/quest_log_8150454.h index 05bebdd75..adf5d193e 100644 --- a/include/quest_log_8150454.h +++ b/include/quest_log_8150454.h @@ -1,6 +1,8 @@ #ifndef GUARD_QUEST_LOG_8150454_H #define GUARD_QUEST_LOG_8150454_H +#include "global.h" + void sub_8150454(void); #endif //GUARD_QUEST_LOG_8150454_H diff --git a/include/random.h b/include/random.h index 79a9d71dc..139316f9d 100644 --- a/include/random.h +++ b/include/random.h @@ -1,6 +1,8 @@ #ifndef GUARD_RANDOM_H #define GUARD_RANDOM_H +#include "global.h" + extern u32 gRngValue; extern u32 gRng2Value; diff --git a/include/region_map.h b/include/region_map.h index eb84a71b1..93ad5541d 100644 --- a/include/region_map.h +++ b/include/region_map.h @@ -1,6 +1,8 @@ #ifndef GUARD_REGION_MAP_H #define GUARD_REGION_MAP_H +#include "global.h" + #include "bg.h" // Exported type declarations diff --git a/include/reshow_battle_screen.h b/include/reshow_battle_screen.h index c22135280..9d1ec30f2 100644 --- a/include/reshow_battle_screen.h +++ b/include/reshow_battle_screen.h @@ -1,6 +1,8 @@ #ifndef GUARD_RESHOW_BATTLE_SCREEN_H #define GUARD_RESHOW_BATTLE_SCREEN_H +#include "global.h" + void nullsub_35(void); void ReshowBattleScreenAfterMenu(void); diff --git a/include/roamer.h b/include/roamer.h index ba1b09b54..5ec0a17fc 100644 --- a/include/roamer.h +++ b/include/roamer.h @@ -1,6 +1,8 @@ #ifndef GUARD_ROAMER_H #define GUARD_ROAMER_H +#include "global.h" + void ClearRoamerData(void); void ClearRoamerLocationData(void); void InitRoamer(void); diff --git a/include/rom6.h b/include/rom6.h index 6d20752e2..753c07305 100644 --- a/include/rom6.h +++ b/include/rom6.h @@ -1,6 +1,8 @@ #ifndef GUARD_ROM6_H #define GUARD_ROM6_H +#include "global.h" + void sub_81357FC(u8, void(void)); u8 GetLeadMonIndex(void); u8 GetSSTidalLocation(u8 *grp, u8 *num, s16 *x, s16 *y); diff --git a/include/rom_818CFC8.h b/include/rom_818CFC8.h index 1d0626b2b..048825778 100644 --- a/include/rom_818CFC8.h +++ b/include/rom_818CFC8.h @@ -5,6 +5,8 @@ #ifndef GUARD_ROM_818CFC8_H #define GUARD_ROM_818CFC8_H +#include "global.h" + bool8 InBattlePyramid(void); u8 sub_81AAA40(void); diff --git a/include/rom_81BE66C.h b/include/rom_81BE66C.h index 5b4f80249..fa439d8da 100644 --- a/include/rom_81BE66C.h +++ b/include/rom_81BE66C.h @@ -5,6 +5,8 @@ #ifndef GUARD_ROM_81BE66C_H #define GUARD_ROM_81BE66C_H +#include "global.h" + bool32 InTrainerHill(void); bool8 FieldObjectIsFarawayIslandMew(struct MapObject *); u32 sub_81D427C(void); diff --git a/include/safari_zone.h b/include/safari_zone.h index 9a81894b8..b20555a8c 100644 --- a/include/safari_zone.h +++ b/include/safari_zone.h @@ -1,6 +1,8 @@ #ifndef GUARD_SAFARI_ZONE_H #define GUARD_SAFARI_ZONE_H +#include "global.h" + extern u8 gNumSafariBalls; bool32 GetSafariZoneFlag(void); diff --git a/include/save.h b/include/save.h index 29524a7e2..f547230b9 100644 --- a/include/save.h +++ b/include/save.h @@ -1,6 +1,8 @@ #ifndef GUARD_SAVE_H #define GUARD_SAVE_H +#include "global.h" + #define NUM_SECTORS 32 // defined in agb_flash but not in a header #define SAVE_STATUS_EMPTY 0 diff --git a/include/save_location.h b/include/save_location.h index 95b3a7d7d..69b39ea53 100644 --- a/include/save_location.h +++ b/include/save_location.h @@ -1,6 +1,8 @@ #ifndef GUARD_SAVE_LOCATION_H #define GUARD_SAVE_LOCATION_H +#include "global.h" + bool32 sub_81AFCEC(void); void TrySetMapSaveWarpStatus(void); void sub_81AFDA0(void); diff --git a/include/script.h b/include/script.h index 2b5f8c2ce..9e26b8a28 100644 --- a/include/script.h +++ b/include/script.h @@ -1,6 +1,8 @@ #ifndef GUARD_SCRIPT_H #define GUARD_SCRIPT_H +#include "global.h" + struct ScriptContext; typedef bool8 (*ScrCmdFunc)(struct ScriptContext *); diff --git a/include/script_menu.h b/include/script_menu.h index 717eda041..1e95570b3 100644 --- a/include/script_menu.h +++ b/include/script_menu.h @@ -1,6 +1,8 @@ #ifndef GUARD_SCRIPT_MENU_H #define GUARD_SCRIPT_MENU_H +#include "global.h" + extern const u8 *const gUnknown_0858BAF0[9]; bool8 ScriptMenu_Multichoice(u8 left, u8 top, u8 var3, u8 var4); diff --git a/include/script_movement.h b/include/script_movement.h index 4c3fa6002..ae446812e 100644 --- a/include/script_movement.h +++ b/include/script_movement.h @@ -1,6 +1,8 @@ #ifndef GUARD_SCRIPT_MOVEMENT_H #define GUARD_SCRIPT_MOVEMENT_H +#include "global.h" + bool8 ScriptMovement_StartObjectMovementScript(u8, u8, u8, const u8 *); bool8 ScriptMovement_IsObjectMovementFinished(u8, u8, u8); void sub_80D338C(void); diff --git a/include/script_pokemon_80F8.h b/include/script_pokemon_80F8.h index 8dd7ed0c0..8a5bb12e1 100644 --- a/include/script_pokemon_80F8.h +++ b/include/script_pokemon_80F8.h @@ -1,6 +1,8 @@ #ifndef GUARD_SCRIPTPOKE80F8_H #define GUARD_SCRIPTPOKE80F8_H +#include "global.h" + void ShowContestWinner(void); u8 ScriptGiveMon(u16, u8, u16, u32, u32, u8); u8 ScriptGiveEgg(u16); diff --git a/include/script_pokemon_81B9.h b/include/script_pokemon_81B9.h index 1b8563ee6..d49095fcc 100644 --- a/include/script_pokemon_81B9.h +++ b/include/script_pokemon_81B9.h @@ -1,6 +1,8 @@ #ifndef GUARD_SCRIPTPOKE81B9_H #define GUARD_SCRIPTPOKE81B9_H +#include "global.h" + void sub_81B9404(void); #endif diff --git a/include/shop.h b/include/shop.h index d3e86408c..1046a590a 100644 --- a/include/shop.h +++ b/include/shop.h @@ -1,6 +1,8 @@ #ifndef GUARD_SHOP_H #define GUARD_SHOP_H +#include "global.h" + extern EWRAM_DATA struct ItemSlot gUnknown_02039F80[3]; void CreatePokemartMenu(const u16 *); diff --git a/include/slot_machine.h b/include/slot_machine.h index 8334e56fc..5c96384fa 100644 --- a/include/slot_machine.h +++ b/include/slot_machine.h @@ -1,6 +1,8 @@ #ifndef GUARD_SLOT_MACHINE_H #define GUARD_SLOT_MACHINE_H +#include "global.h" + void PlaySlotMachine(u8, void *); #endif // GUARD_SLOT_MACHINE_H diff --git a/include/songs.h b/include/songs.h index 5a1fff00c..f8d0fbf5b 100644 --- a/include/songs.h +++ b/include/songs.h @@ -1,6 +1,8 @@ #ifndef GUARD_SONGS_H #define GUARD_SONGS_H +#include "global.h" + enum { /*0x00*/ SE_STOP, diff --git a/include/sound.h b/include/sound.h index 7d47b7456..34fdfc839 100644 --- a/include/sound.h +++ b/include/sound.h @@ -1,6 +1,8 @@ #ifndef GUARD_SOUND_H #define GUARD_SOUND_H +#include "global.h" + void InitMapMusic(void); void MapMusicMain(void); void ResetMapMusic(void); diff --git a/include/sprite.h b/include/sprite.h index 170d77c3f..bc47f7100 100644 --- a/include/sprite.h +++ b/include/sprite.h @@ -1,6 +1,8 @@ #ifndef GUARD_SPRITE_H #define GUARD_SPRITE_H +#include "global.h" + #define MAX_SPRITES 64 struct SpriteSheet diff --git a/include/start_menu.h b/include/start_menu.h index 6c7cb3237..f5b38ee5e 100644 --- a/include/start_menu.h +++ b/include/start_menu.h @@ -1,6 +1,8 @@ #ifndef GUARD_START_MENU_H #define GUARD_START_MENU_H +#include "global.h" + void AppendToList(u8* list, u8* pos, u8 newEntry); #endif // GUARD_START_MENU_H diff --git a/include/string_util.h b/include/string_util.h index 2354c9ded..32e74e031 100644 --- a/include/string_util.h +++ b/include/string_util.h @@ -1,6 +1,8 @@ #ifndef GUARD_STRING_UTIL_H #define GUARD_STRING_UTIL_H +#include "global.h" + enum StringConvertMode { STR_CONV_MODE_LEFT_ALIGN, diff --git a/include/strings.h b/include/strings.h index 8b218e1e9..90c84c9b9 100644 --- a/include/strings.h +++ b/include/strings.h @@ -1,6 +1,8 @@ #ifndef GUARD_STRINGS_H #define GUARD_STRINGS_H +#include "global.h" + // Exported type declarations // Exported RAM declarations diff --git a/include/task.h b/include/task.h index a199ba128..cd3deb544 100644 --- a/include/task.h +++ b/include/task.h @@ -1,6 +1,8 @@ #ifndef GUARD_TASK_H #define GUARD_TASK_H +#include "global.h" + #define NUM_TASKS 16 typedef void (*TaskFunc)(u8 taskId); diff --git a/include/text.h b/include/text.h index 7853598f8..2bda590c1 100644 --- a/include/text.h +++ b/include/text.h @@ -1,6 +1,8 @@ #ifndef GUARD_TEXT_H #define GUARD_TEXT_H +#include "global.h" + #define CHAR_SPACE 0x00 #define CHAR_0 0xA1 #define CHAR_QUESTION_MARK 0xAC diff --git a/include/text_window.h b/include/text_window.h index 3514296c1..72ce50efc 100644 --- a/include/text_window.h +++ b/include/text_window.h @@ -1,6 +1,8 @@ #ifndef GUARD_TEXT_WINDOW_H #define GUARD_TEXT_WINDOW_H +#include "global.h" + struct TilesPal { u32* tiles; diff --git a/include/tilesets.h b/include/tilesets.h index 70609c046..03274be60 100644 --- a/include/tilesets.h +++ b/include/tilesets.h @@ -1,6 +1,8 @@ #ifndef GUARD_tilesets_H #define GUARD_tilesets_H +#include "global.h" + // Exported type declarations // Exported RAM declarations diff --git a/include/trainer_classes.h b/include/trainer_classes.h index e5e26b359..3b93c3814 100644 --- a/include/trainer_classes.h +++ b/include/trainer_classes.h @@ -1,6 +1,8 @@ #ifndef GUARD_TRAINER_CLASSES_H #define GUARD_TRAINER_CLASSES_H +#include "global.h" + enum { CLASS_PKMN_TRAINER0, // 0 diff --git a/include/trainer_front_sprites.h b/include/trainer_front_sprites.h index 3259bec88..8855041a5 100644 --- a/include/trainer_front_sprites.h +++ b/include/trainer_front_sprites.h @@ -1,6 +1,8 @@ #ifndef GUARD_TRAINER_FRONT_SPRITES_H #define GUARD_TRAINER_FRONT_SPRITES_H +#include "global.h" + enum { TRAINER_FRONT_PIC_HIKER, @@ -54,8 +56,8 @@ enum TRAINER_FRONT_PIC_SCHOOL_KID_M, TRAINER_FRONT_PIC_SCHOOL_KID_F, TRAINER_FRONT_PIC_SR_JR, - TRAINER_FRONT_PIC_POKÉFAN_M, - TRAINER_FRONT_PIC_POKÉFAN_F, + TRAINER_FRONT_PIC_POKéFAN_M, + TRAINER_FRONT_PIC_POKéFAN_F, TRAINER_FRONT_PIC_YOUNGSTER, TRAINER_FRONT_PIC_WALLACE, TRAINER_FRONT_PIC_FISHERMAN, diff --git a/include/trainer_ids.h b/include/trainer_ids.h index 65c80187f..ebcb6e4e5 100644 --- a/include/trainer_ids.h +++ b/include/trainer_ids.h @@ -1,6 +1,8 @@ #ifndef GUARD_TRAINER_IDS_H #define GUARD_TRAINER_IDS_H +#include "global.h" + #define NO_OF_TRAINERS 854 #define TRAINER_ID_STEVEN 804 diff --git a/include/trainer_see.h b/include/trainer_see.h index ab035d9f8..f87189377 100644 --- a/include/trainer_see.h +++ b/include/trainer_see.h @@ -1,6 +1,8 @@ #ifndef GUARD_TRAINER_SEE_H #define GUARD_TRAINER_SEE_H +#include "global.h" + void sub_80B4578(struct MapObject *); u8 sub_80B47BC(void); void sub_8155D78(struct MapObject *); diff --git a/include/trig.h b/include/trig.h index a2f98a3e6..92388e05c 100644 --- a/include/trig.h +++ b/include/trig.h @@ -1,6 +1,8 @@ #ifndef GUARD_TRIG_H #define GUARD_TRIG_H +#include "global.h" + extern const s16 gSineTable[]; s16 Sin(s16 index, s16 amplitude); diff --git a/include/unk_8159F40.h b/include/unk_8159F40.h index b7666766f..f0e85d416 100644 --- a/include/unk_8159F40.h +++ b/include/unk_8159F40.h @@ -1,6 +1,8 @@ #ifndef GUARD_UNK_8159F40_H #define GUARD_UNK_8159F40_H +#include "global.h" + void sub_815A008(struct QuestLog *); void sub_815A1F8(struct QuestLog *, struct MapObjectTemplate *); diff --git a/include/unk_text_util.h b/include/unk_text_util.h index 72243a90e..750c0541e 100644 --- a/include/unk_text_util.h +++ b/include/unk_text_util.h @@ -1,6 +1,8 @@ #ifndef GUARD_UNK_TEXT_UTIL_H #define GUARD_UNK_TEXT_UTIL_H +#include "global.h" + void UnkTextUtil_Reset(void); void UnkTextUtil_SetPtrI(u8 idx, const u8 *ptr); u8 *UnkTextUtil_StringExpandPlaceholders(u8 *dest, const u8 *src); diff --git a/include/unknown_task.h b/include/unknown_task.h index 9c6968c30..429e58aad 100644 --- a/include/unknown_task.h +++ b/include/unknown_task.h @@ -1,6 +1,8 @@ #ifndef GUARD_unknown_task_H #define GUARD_unknown_task_H +#include "global.h" + // Exported type declarations struct UnknownTaskStruct { diff --git a/include/util.h b/include/util.h index 63887b13f..a22cc77fa 100644 --- a/include/util.h +++ b/include/util.h @@ -1,6 +1,8 @@ #ifndef GUARD_UTIL_H #define GUARD_UTIL_H +#include "global.h" + #include "sprite.h" extern const u8 gMiscBlank_Gfx[]; // unused in Emerald diff --git a/include/wild_encounter.h b/include/wild_encounter.h index a1e26fe45..2186e0b4f 100644 --- a/include/wild_encounter.h +++ b/include/wild_encounter.h @@ -1,6 +1,8 @@ #ifndef GUARD_WILD_ENCOUNTER_H #define GUARD_WILD_ENCOUNTER_H +#include "global.h" + #define LAND_WILD_COUNT 12 #define WATER_WILD_COUNT 5 #define ROCK_WILD_COUNT 5 diff --git a/include/window.h b/include/window.h index 1e29119ea..2705a7895 100644 --- a/include/window.h +++ b/include/window.h @@ -1,6 +1,8 @@ #ifndef GUARD_WINDOW_H #define GUARD_WINDOW_H +#include "global.h" + enum { WINDOW_PRIORITY, diff --git a/src/pokemon.c b/src/pokemon.c index ff7c907ca..5cd2cd2d7 100644 --- a/src/pokemon.c +++ b/src/pokemon.c @@ -1,3 +1,5 @@ +#define IS_POKEMON_C + #include "global.h" #include "pokemon.h" #include "random.h" diff --git a/src/quest_log.c b/src/quest_log.c index 06780ff21..5cc458e26 100644 --- a/src/quest_log.c +++ b/src/quest_log.c @@ -769,8 +769,8 @@ void sub_8110D48(u8 a0) { struct QuestLog * questLog = &gSaveBlock1Ptr->questLog[a0]; - CpuCopy16(gSaveBlock1Ptr->flags, questLog->unk_148, FLAGS_COUNT * sizeof(u8)); - CpuCopy16(gSaveBlock1Ptr->vars, questLog->unk_268, VARS_COUNT * sizeof(u16)); + CpuCopy16(gSaveBlock1Ptr->flags, questLog->flags, FLAGS_COUNT * sizeof(u8)); + CpuCopy16(gSaveBlock1Ptr->vars, questLog->vars, VARS_COUNT * sizeof(u16)); } void sub_8110D94(void) @@ -1005,8 +1005,8 @@ void sub_81113E4(void) { struct QuestLog * questLog = &gSaveBlock1Ptr->questLog[gUnknown_203ADF8]; - CpuCopy16(questLog->unk_148, gSaveBlock1Ptr->flags, FLAGS_COUNT * sizeof(u8)); - CpuCopy16(questLog->unk_268, gSaveBlock1Ptr->vars, VARS_COUNT * sizeof(u16)); + CpuCopy16(questLog->flags, gSaveBlock1Ptr->flags, FLAGS_COUNT * sizeof(u8)); + CpuCopy16(questLog->vars, gSaveBlock1Ptr->vars, VARS_COUNT * sizeof(u16)); sub_8111688(); } diff --git a/src/text.c b/src/text.c index 7fb0ab034..d4d25b5aa 100644 --- a/src/text.c +++ b/src/text.c @@ -1479,17 +1479,17 @@ u32 GetStringWidthFixedWidthFont(const u8 *str, u8 fontId, u8 letterSpacing) return (u8)(GetFontAttribute(fontId, 0) + letterSpacing) * width; } -u32 (*GetFontWidthFunc(u8 glyphId))(u16, bool32) +u32 (*GetFontWidthFunc(u8 glyphId))(u16 _glyphId, bool32 _isJapanese) { u32 i; for (i = 0; i < 7; ++i) { if (glyphId == gGlyphWidthFuncs[i].font_id) - return gGlyphWidthFuncs[i].func; + return *gGlyphWidthFuncs[i].func; } - return 0; + return NULL; } u32 GetStringWidth(u8 fontId, const u8 *str, s16 letterSpacing) -- cgit v1.2.3 From a6b5d09ddfa6bd047848e023d50124e4aff86e5e Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sat, 10 Nov 2018 18:28:24 -0500 Subject: More changes for modern gcc compat --- Makefile | 5 ----- ld_script.txt | 2 ++ src/dma3_manager.c | 2 +- src/quest_log.c | 4 ++-- src/script.c | 22 +++++++++++----------- src/sound.c | 10 +++++----- sym_bss.txt | 7 ++----- sym_ewram.txt | 3 +-- 8 files changed, 24 insertions(+), 31 deletions(-) diff --git a/Makefile b/Makefile index 0b83cb5c5..b5429de2c 100644 --- a/Makefile +++ b/Makefile @@ -108,11 +108,6 @@ sound/%.bin: sound/%.aif ; $(AIF) $< $@ sound/songs/%.s: sound/songs/%.mid cd $(@D) && ../../$(MID) $( Date: Mon, 19 Nov 2018 17:54:14 -0500 Subject: through sub_8114A4C --- asm/quest_log.s | 267 -------------------------------------------------------- src/quest_log.c | 113 ++++++++++++++++++++++++ 2 files changed, 113 insertions(+), 267 deletions(-) diff --git a/asm/quest_log.s b/asm/quest_log.s index a5b8ae30e..f9b059837 100644 --- a/asm/quest_log.s +++ b/asm/quest_log.s @@ -5,273 +5,6 @@ .text - thumb_func_start sub_811488C -sub_811488C: @ 811488C - push {r4,lr} - adds r2, r0, 0 - adds r4, r1, 0 - movs r0, 0x14 - adds r1, r2, 0 - bl sub_8113DE0 - adds r2, r0, 0 - cmp r2, 0 - beq _081148B4 - ldrh r0, [r4] - strh r0, [r2] - ldrh r0, [r4, 0x2] - strh r0, [r2, 0x2] - ldrb r0, [r4, 0x4] - strb r0, [r2, 0x4] - ldrb r0, [r4, 0x5] - strb r0, [r2, 0x5] - adds r0, r2, 0x6 - b _081148B6 -_081148B4: - movs r0, 0 -_081148B6: - pop {r4} - pop {r1} - bx r1 - thumb_func_end sub_811488C - - thumb_func_start sub_81148BC -sub_81148BC: @ 81148BC - push {r4,r5,lr} - adds r1, r0, 0 - movs r0, 0x14 - bl sub_8113E88 - adds r4, r0, 0 - adds r5, r4, 0x4 - bl UnkTextUtil_Reset - ldrb r0, [r4, 0x4] - bl GetBoxNamePtr - adds r1, r0, 0 - movs r0, 0 - bl UnkTextUtil_SetPtrI - ldrh r0, [r4] - movs r1, 0 - movs r2, 0x1 - bl QuestLog_AutoGetSpeciesName - ldrb r0, [r5, 0x1] - bl GetBoxNamePtr - adds r1, r0, 0 - movs r0, 0x2 - bl UnkTextUtil_SetPtrI - ldrh r0, [r4, 0x2] - movs r1, 0 - movs r2, 0x3 - bl QuestLog_AutoGetSpeciesName - ldr r0, _08114910 @ =gStringVar4 - ldr r1, _08114914 @ =gUnknown_841A566 - bl UnkTextUtil_StringExpandPlaceholders - adds r4, 0x6 - adds r0, r4, 0 - pop {r4,r5} - pop {r1} - bx r1 - .align 2, 0 -_08114910: .4byte gStringVar4 -_08114914: .4byte gUnknown_841A566 - thumb_func_end sub_81148BC - - thumb_func_start sub_8114918 -sub_8114918: @ 8114918 - push {r4,lr} - adds r2, r0, 0 - adds r4, r1, 0 - movs r0, 0x15 - adds r1, r2, 0 - bl sub_8113DE0 - adds r2, r0, 0 - cmp r2, 0 - beq _0811493C - ldrh r0, [r4] - strh r0, [r2] - ldrh r0, [r4, 0x2] - strh r0, [r2, 0x2] - ldrb r0, [r4, 0x4] - strb r0, [r2, 0x4] - adds r0, r2, 0x6 - b _0811493E -_0811493C: - movs r0, 0 -_0811493E: - pop {r4} - pop {r1} - bx r1 - thumb_func_end sub_8114918 - - thumb_func_start sub_8114944 -sub_8114944: @ 8114944 - push {r4,lr} - adds r1, r0, 0 - movs r0, 0x15 - bl sub_8113E88 - adds r4, r0, 0 - bl UnkTextUtil_Reset - ldrb r0, [r4, 0x4] - bl GetBoxNamePtr - adds r1, r0, 0 - movs r0, 0 - bl UnkTextUtil_SetPtrI - ldrh r0, [r4] - movs r1, 0 - movs r2, 0x1 - bl QuestLog_AutoGetSpeciesName - ldrh r0, [r4, 0x2] - movs r1, 0 - movs r2, 0x2 - bl QuestLog_AutoGetSpeciesName - ldr r0, _08114988 @ =gStringVar4 - ldr r1, _0811498C @ =gUnknown_841A5D9 - bl UnkTextUtil_StringExpandPlaceholders - adds r4, 0x6 - adds r0, r4, 0 - pop {r4} - pop {r1} - bx r1 - .align 2, 0 -_08114988: .4byte gStringVar4 -_0811498C: .4byte gUnknown_841A5D9 - thumb_func_end sub_8114944 - - thumb_func_start sub_8114990 -sub_8114990: @ 8114990 - push {r4,lr} - adds r2, r0, 0 - adds r4, r1, 0 - movs r0, 0x16 - adds r1, r2, 0 - bl sub_8113DE0 - adds r2, r0, 0 - cmp r2, 0 - bne _081149A8 - movs r0, 0 - b _081149CA -_081149A8: - adds r1, r2, 0x4 - ldrb r0, [r4, 0x4] - cmp r0, 0xE - bne _081149BC - ldrh r0, [r4, 0x2] - strh r0, [r2] - ldrh r0, [r4] - strh r0, [r2, 0x2] - ldrb r0, [r4, 0x5] - b _081149C6 -_081149BC: - ldrh r0, [r4] - strh r0, [r2] - ldrh r0, [r4, 0x2] - strh r0, [r2, 0x2] - ldrb r0, [r4, 0x4] -_081149C6: - strb r0, [r2, 0x4] - adds r0, r1, 0x2 -_081149CA: - pop {r4} - pop {r1} - bx r1 - thumb_func_end sub_8114990 - - thumb_func_start sub_81149D0 -sub_81149D0: @ 81149D0 - push {r4,lr} - adds r1, r0, 0 - movs r0, 0x16 - bl sub_8113E88 - adds r4, r0, 0 - bl UnkTextUtil_Reset - ldrb r0, [r4, 0x4] - bl GetBoxNamePtr - adds r1, r0, 0 - movs r0, 0 - bl UnkTextUtil_SetPtrI - ldrh r0, [r4] - movs r1, 0 - movs r2, 0x1 - bl QuestLog_AutoGetSpeciesName - ldrh r0, [r4, 0x2] - movs r1, 0 - movs r2, 0x2 - bl QuestLog_AutoGetSpeciesName - ldr r0, _08114A14 @ =gStringVar4 - ldr r1, _08114A18 @ =gUnknown_841A60A - bl UnkTextUtil_StringExpandPlaceholders - adds r4, 0x6 - adds r0, r4, 0 - pop {r4} - pop {r1} - bx r1 - .align 2, 0 -_08114A14: .4byte gStringVar4 -_08114A18: .4byte gUnknown_841A60A - thumb_func_end sub_81149D0 - - thumb_func_start sub_8114A1C -sub_8114A1C: @ 8114A1C - push {r4,lr} - adds r2, r0, 0 - adds r4, r1, 0 - movs r0, 0x17 - adds r1, r2, 0 - bl sub_8113DE0 - adds r2, r0, 0 - cmp r2, 0 - beq _08114A42 - ldrh r0, [r4] - strh r0, [r2] - adds r0, r2, 0x2 - ldrb r1, [r4, 0x4] - strb r1, [r2, 0x2] - ldrb r1, [r4, 0x5] - strb r1, [r0, 0x1] - adds r0, 0x2 - b _08114A44 -_08114A42: - movs r0, 0 -_08114A44: - pop {r4} - pop {r1} - bx r1 - thumb_func_end sub_8114A1C - - thumb_func_start sub_8114A4C -sub_8114A4C: @ 8114A4C - push {r4,r5,lr} - adds r1, r0, 0 - movs r0, 0x17 - bl sub_8113E88 - adds r4, r0, 0 - adds r5, r4, 0x2 - bl UnkTextUtil_Reset - ldrb r0, [r4, 0x2] - bl GetBoxNamePtr - adds r1, r0, 0 - movs r0, 0 - bl UnkTextUtil_SetPtrI - ldrh r0, [r4] - movs r1, 0 - movs r2, 0x1 - bl QuestLog_AutoGetSpeciesName - ldrb r0, [r5, 0x1] - bl GetBoxNamePtr - adds r1, r0, 0 - movs r0, 0x2 - bl UnkTextUtil_SetPtrI - ldr r0, _08114A98 @ =gStringVar4 - ldr r1, _08114A9C @ =gUnknown_841A59C - bl UnkTextUtil_StringExpandPlaceholders - adds r5, 0x2 - adds r0, r5, 0 - pop {r4,r5} - pop {r1} - bx r1 - .align 2, 0 -_08114A98: .4byte gStringVar4 -_08114A9C: .4byte gUnknown_841A59C - thumb_func_end sub_8114A4C - thumb_func_start sub_8114AA0 sub_8114AA0: @ 8114AA0 push {r4,lr} diff --git a/src/quest_log.c b/src/quest_log.c index 3388d9012..4dccdb890 100644 --- a/src/quest_log.c +++ b/src/quest_log.c @@ -4092,3 +4092,116 @@ const u16 * sub_8114834(const u16 * a0) a0 += 6; return a0; } + +u16 * sub_811488C(u16 * a0, const u16 * a1) +{ + a0 = sub_8113DE0(20, a0); + if (a0 == NULL) + return NULL; + a0[0] = a1[0]; + a0[1] = a1[1]; + *((u8 *)a0 + 4) = *((const u8 *)a1 + 4); + *((u8 *)a0 + 5) = *((const u8 *)a1 + 5); + return a0 + 3; +} + +const u16 * sub_81148BC(const u16 * a0) +{ + const u8 * boxIdxs; + a0 = sub_8113E88(20, a0); + boxIdxs = (const u8 *)a0 + 4; + UnkTextUtil_Reset(); + UnkTextUtil_SetPtrI(0, GetBoxNamePtr(boxIdxs[0])); + QuestLog_AutoGetSpeciesName(a0[0], NULL, 1); + UnkTextUtil_SetPtrI(2, GetBoxNamePtr(boxIdxs[1])); + QuestLog_AutoGetSpeciesName(a0[1], NULL, 3); + UnkTextUtil_StringExpandPlaceholders(gStringVar4, gUnknown_841A566); + return a0 + 3; +} + +u16 * sub_8114918(u16 * a0, const u16 * a1) +{ + a0 = sub_8113DE0(21, a0); + if (a0 == NULL) + return NULL; + a0[0] = a1[0]; + a0[1] = a1[1]; + *((u8 *)a0 + 4) = *((const u8 *)a1 + 4); + return a0 + 3; +} + +const u16 * sub_8114944(const u16 * a0) +{ + const u8 * boxIdxs; + a0 = sub_8113E88(21, a0); + boxIdxs = (const u8 *)a0 + 4; + UnkTextUtil_Reset(); + UnkTextUtil_SetPtrI(0, GetBoxNamePtr(boxIdxs[0])); + QuestLog_AutoGetSpeciesName(a0[0], NULL, 1); + QuestLog_AutoGetSpeciesName(a0[1], NULL, 2); + UnkTextUtil_StringExpandPlaceholders(gStringVar4, gUnknown_841A5D9); + return a0 + 3; +} + +u16 * sub_8114990(u16 * a0, const u16 * a1) +{ + u16 * r2; + u16 * ret; + r2 = sub_8113DE0(22, a0); + if (r2 == NULL) + return NULL; + ret = r2 + 2; + if (*((const u8 *)a1 + 4) == TOTAL_BOXES_COUNT) + { + r2[0] = a1[1]; + r2[1] = a1[0]; + *((u8 *)r2 + 4) = *((const u8 *)a1 + 5); + } + else + { + r2[0] = a1[0]; + r2[1] = a1[1]; + *((u8 *)r2 + 4) = *((const u8 *)a1 + 4); + } + return ret + 1; +} + +const u16 * sub_81149D0(const u16 * a0) +{ + const u8 * boxIdxs; + a0 = sub_8113E88(22, a0); + boxIdxs = (const u8 *)a0 + 4; + UnkTextUtil_Reset(); + UnkTextUtil_SetPtrI(0, GetBoxNamePtr(boxIdxs[0])); + QuestLog_AutoGetSpeciesName(a0[0], NULL, 1); + QuestLog_AutoGetSpeciesName(a0[1], NULL, 2); + UnkTextUtil_StringExpandPlaceholders(gStringVar4, gUnknown_841A60A); + return a0 + 3; +} + +u16 * sub_8114A1C(u16 * a0, const u16 * a1) +{ + u16 * r2; + u16 * ret; + r2 = sub_8113DE0(23, a0); + if (r2 == NULL) + return NULL; + r2[0] = a1[0]; + ret = r2 + 1; + *((u8 *)ret + 0) = *((const u8 *)a1 + 4); + *((u8 *)ret + 1) = *((const u8 *)a1 + 5); + return ret + 1; +} + +const u16 * sub_8114A4C(const u16 * a0) +{ + const u8 * boxIdxs; + a0 = sub_8113E88(23, a0); + boxIdxs = (const u8 *)a0 + 2; + UnkTextUtil_Reset(); + UnkTextUtil_SetPtrI(0, GetBoxNamePtr(boxIdxs[0])); + QuestLog_AutoGetSpeciesName(a0[0], NULL, 1); + UnkTextUtil_SetPtrI(2, GetBoxNamePtr(boxIdxs[1])); + UnkTextUtil_StringExpandPlaceholders(gStringVar4, gUnknown_841A59C); + return (const u16 *)boxIdxs + 1; +} -- cgit v1.2.3 From 251d031ec98c599dab50b28f0fe57c035e273dd1 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Mon, 19 Nov 2018 18:14:31 -0500 Subject: through sub_8114CE4 --- asm/quest_log.s | 329 -------------------------------------------------------- include/item.h | 1 + src/quest_log.c | 127 ++++++++++++++++++++++ 3 files changed, 128 insertions(+), 329 deletions(-) diff --git a/asm/quest_log.s b/asm/quest_log.s index f9b059837..2b2b22c14 100644 --- a/asm/quest_log.s +++ b/asm/quest_log.s @@ -5,335 +5,6 @@ .text - thumb_func_start sub_8114AA0 -sub_8114AA0: @ 8114AA0 - push {r4,lr} - adds r2, r0, 0 - adds r4, r1, 0 - movs r0, 0x18 - adds r1, r2, 0 - bl sub_8113DE0 - adds r2, r0, 0 - cmp r2, 0 - beq _08114AC0 - ldrh r0, [r4] - strh r0, [r2] - ldrb r0, [r4, 0x4] - strb r0, [r2, 0x2] - adds r0, r2, 0x4 - b _08114AC2 -_08114AC0: - movs r0, 0 -_08114AC2: - pop {r4} - pop {r1} - bx r1 - thumb_func_end sub_8114AA0 - - thumb_func_start sub_8114AC8 -sub_8114AC8: @ 8114AC8 - push {r4,r5,lr} - adds r1, r0, 0 - movs r0, 0x18 - bl sub_8113E88 - adds r4, r0, 0 - adds r5, r4, 0x2 - bl UnkTextUtil_Reset - ldrb r0, [r4, 0x2] - bl GetBoxNamePtr - adds r1, r0, 0 - movs r0, 0 - bl UnkTextUtil_SetPtrI - ldrh r0, [r4] - movs r1, 0 - movs r2, 0x1 - bl QuestLog_AutoGetSpeciesName - ldr r0, _08114B04 @ =gStringVar4 - ldr r1, _08114B08 @ =gUnknown_841A5FA - bl UnkTextUtil_StringExpandPlaceholders - adds r5, 0x2 - adds r0, r5, 0 - pop {r4,r5} - pop {r1} - bx r1 - .align 2, 0 -_08114B04: .4byte gStringVar4 -_08114B08: .4byte gUnknown_841A5FA - thumb_func_end sub_8114AC8 - - thumb_func_start sub_8114B0C -sub_8114B0C: @ 8114B0C - push {r4,lr} - adds r2, r0, 0 - adds r4, r1, 0 - movs r0, 0x19 - adds r1, r2, 0 - bl sub_8113DE0 - adds r2, r0, 0 - cmp r2, 0 - beq _08114B2C - ldrh r0, [r4] - strh r0, [r2] - ldrb r0, [r4, 0x4] - strb r0, [r2, 0x2] - adds r0, r2, 0x4 - b _08114B2E -_08114B2C: - movs r0, 0 -_08114B2E: - pop {r4} - pop {r1} - bx r1 - thumb_func_end sub_8114B0C - - thumb_func_start sub_8114B34 -sub_8114B34: @ 8114B34 - push {r4,r5,lr} - adds r1, r0, 0 - movs r0, 0x19 - bl sub_8113E88 - adds r4, r0, 0 - adds r5, r4, 0x2 - bl UnkTextUtil_Reset - ldrb r0, [r4, 0x2] - bl GetBoxNamePtr - adds r1, r0, 0 - movs r0, 0 - bl UnkTextUtil_SetPtrI - ldrh r0, [r4] - movs r1, 0 - movs r2, 0x1 - bl QuestLog_AutoGetSpeciesName - ldr r0, _08114B70 @ =gStringVar4 - ldr r1, _08114B74 @ =gUnknown_841A632 - bl UnkTextUtil_StringExpandPlaceholders - adds r5, 0x2 - adds r0, r5, 0 - pop {r4,r5} - pop {r1} - bx r1 - .align 2, 0 -_08114B70: .4byte gStringVar4 -_08114B74: .4byte gUnknown_841A632 - thumb_func_end sub_8114B34 - - thumb_func_start sub_8114B78 -sub_8114B78: @ 8114B78 - push {r4,lr} - adds r2, r0, 0 - adds r4, r1, 0 - movs r0, 0x1A - adds r1, r2, 0 - bl sub_8113DE0 - adds r2, r0, 0 - cmp r2, 0 - beq _08114B98 - ldrh r0, [r4] - strh r0, [r2] - ldrb r0, [r4, 0x4] - strb r0, [r2, 0x2] - adds r0, r2, 0x4 - b _08114B9A -_08114B98: - movs r0, 0 -_08114B9A: - pop {r4} - pop {r1} - bx r1 - thumb_func_end sub_8114B78 - - thumb_func_start sub_8114BA0 -sub_8114BA0: @ 8114BA0 - push {r4,r5,lr} - adds r1, r0, 0 - movs r0, 0x1A - bl sub_8113E88 - adds r4, r0, 0 - adds r5, r4, 0x2 - bl UnkTextUtil_Reset - ldrh r0, [r4] - movs r1, 0 - movs r2, 0 - bl QuestLog_AutoGetSpeciesName - ldrb r0, [r4, 0x2] - bl GetBoxNamePtr - adds r1, r0, 0 - movs r0, 0x1 - bl UnkTextUtil_SetPtrI - ldr r0, _08114BDC @ =gStringVar4 - ldr r1, _08114BE0 @ =gUnknown_841A64F - bl UnkTextUtil_StringExpandPlaceholders - adds r5, 0x2 - adds r0, r5, 0 - pop {r4,r5} - pop {r1} - bx r1 - .align 2, 0 -_08114BDC: .4byte gStringVar4 -_08114BE0: .4byte gUnknown_841A64F - thumb_func_end sub_8114BA0 - - thumb_func_start sub_8114BE4 -sub_8114BE4: @ 8114BE4 - push {r4,lr} - adds r2, r0, 0 - adds r4, r1, 0 - movs r0, 0x1B - adds r1, r2, 0 - bl sub_8113DE0 - adds r2, r0, 0 - cmp r2, 0 - beq _08114C04 - ldrb r0, [r4, 0x4] - strb r0, [r2] - ldrb r0, [r4, 0x5] - strb r0, [r2, 0x1] - adds r0, r2, 0x2 - b _08114C06 -_08114C04: - movs r0, 0 -_08114C06: - pop {r4} - pop {r1} - bx r1 - thumb_func_end sub_8114BE4 - - thumb_func_start sub_8114C0C -sub_8114C0C: @ 8114C0C - push {r4,lr} - adds r1, r0, 0 - movs r0, 0x1B - bl sub_8113E88 - adds r4, r0, 0 - bl UnkTextUtil_Reset - ldrb r0, [r4] - bl GetBoxNamePtr - adds r1, r0, 0 - movs r0, 0 - bl UnkTextUtil_SetPtrI - ldrb r0, [r4] - ldrb r1, [r4, 0x1] - cmp r0, r1 - bne _08114C40 - ldr r1, _08114C3C @ =gUnknown_841A694 - movs r0, 0x1 - bl UnkTextUtil_SetPtrI - b _08114C4E - .align 2, 0 -_08114C3C: .4byte gUnknown_841A694 -_08114C40: - ldrb r0, [r4, 0x1] - bl GetBoxNamePtr - adds r1, r0, 0 - movs r0, 0x1 - bl UnkTextUtil_SetPtrI -_08114C4E: - ldr r0, _08114C60 @ =gStringVar4 - ldr r1, _08114C64 @ =gUnknown_841A66E - bl UnkTextUtil_StringExpandPlaceholders - adds r0, r4, 0x2 - pop {r4} - pop {r1} - bx r1 - .align 2, 0 -_08114C60: .4byte gStringVar4 -_08114C64: .4byte gUnknown_841A66E - thumb_func_end sub_8114C0C - - thumb_func_start sub_8114C68 -sub_8114C68: @ 8114C68 - push {r4,lr} - adds r2, r0, 0 - adds r4, r1, 0 - movs r0, 0x1C - adds r1, r2, 0 - bl sub_8113DE0 - adds r2, r0, 0 - cmp r2, 0 - beq _08114C84 - ldrh r0, [r4] - strh r0, [r2] - adds r0, r2, 0x2 - b _08114C86 -_08114C84: - movs r0, 0 -_08114C86: - pop {r4} - pop {r1} - bx r1 - thumb_func_end sub_8114C68 - - thumb_func_start sub_8114C8C -sub_8114C8C: @ 8114C8C - push {r4,lr} - adds r1, r0, 0 - movs r0, 0x1C - bl sub_8113E88 - adds r4, r0, 0 - ldrh r0, [r4] - ldr r1, _08114CB4 @ =gStringVar1 - bl sub_8099E90 - ldr r0, _08114CB8 @ =gStringVar4 - ldr r1, _08114CBC @ =gUnknown_841A391 - bl StringExpandPlaceholders - adds r4, 0x2 - adds r0, r4, 0 - pop {r4} - pop {r1} - bx r1 - .align 2, 0 -_08114CB4: .4byte gStringVar1 -_08114CB8: .4byte gStringVar4 -_08114CBC: .4byte gUnknown_841A391 - thumb_func_end sub_8114C8C - - thumb_func_start sub_8114CC0 -sub_8114CC0: @ 8114CC0 - push {r4,lr} - adds r2, r0, 0 - adds r4, r1, 0 - movs r0, 0x1D - adds r1, r2, 0 - bl sub_8113DE0 - adds r2, r0, 0 - cmp r2, 0 - beq _08114CDC - ldrh r0, [r4] - strh r0, [r2] - adds r0, r2, 0x2 - b _08114CDE -_08114CDC: - movs r0, 0 -_08114CDE: - pop {r4} - pop {r1} - bx r1 - thumb_func_end sub_8114CC0 - - thumb_func_start sub_8114CE4 -sub_8114CE4: @ 8114CE4 - push {r4,lr} - adds r1, r0, 0 - movs r0, 0x1D - bl sub_8113E88 - adds r4, r0, 0 - ldrh r0, [r4] - ldr r1, _08114D0C @ =gStringVar1 - bl sub_8099E90 - ldr r0, _08114D10 @ =gStringVar4 - ldr r1, _08114D14 @ =gUnknown_841A3DA - bl StringExpandPlaceholders - adds r4, 0x2 - adds r0, r4, 0 - pop {r4} - pop {r1} - bx r1 - .align 2, 0 -_08114D0C: .4byte gStringVar1 -_08114D10: .4byte gStringVar4 -_08114D14: .4byte gUnknown_841A3DA - thumb_func_end sub_8114CE4 - thumb_func_start sub_8114D18 sub_8114D18: @ 8114D18 push {r4,lr} diff --git a/include/item.h b/include/item.h index 199b3b65e..75c56c94d 100644 --- a/include/item.h +++ b/include/item.h @@ -62,5 +62,6 @@ u8 ItemId_GetSecondaryId(u16 itemId); u16 itemid_get_market_price(u16 itemId); void sub_809A2DC(void); void sub_809A2A4(void); +void sub_8099E90(u16, u8 *); #endif // ITEM_H diff --git a/src/quest_log.c b/src/quest_log.c index 4dccdb890..f4b964d96 100644 --- a/src/quest_log.c +++ b/src/quest_log.c @@ -4205,3 +4205,130 @@ const u16 * sub_8114A4C(const u16 * a0) UnkTextUtil_StringExpandPlaceholders(gStringVar4, gUnknown_841A59C); return (const u16 *)boxIdxs + 1; } + +u16 * sub_8114AA0(u16 * a0, const u16 * a1) +{ + u16 * r2; + r2 = sub_8113DE0(24, a0); + if (r2 == NULL) + return NULL; + r2[0] = a1[0]; + *((u8 *)r2 + 2) = *((const u8 *)a1 + 4); + return r2 + 2; +} + +const u16 * sub_8114AC8(const u16 * a0) +{ + const u8 * boxIdxs; + a0 = sub_8113E88(24, a0); + boxIdxs = (const u8 *)a0 + 2; + UnkTextUtil_Reset(); + UnkTextUtil_SetPtrI(0, GetBoxNamePtr(boxIdxs[0])); + QuestLog_AutoGetSpeciesName(a0[0], NULL, 1); + UnkTextUtil_StringExpandPlaceholders(gStringVar4, gUnknown_841A5FA); + return (const u16 *)boxIdxs + 1; +} + +u16 * sub_8114B0C(u16 * a0, const u16 * a1) +{ + u16 * r2; + r2 = sub_8113DE0(25, a0); + if (r2 == NULL) + return NULL; + r2[0] = a1[0]; + *((u8 *)r2 + 2) = *((const u8 *)a1 + 4); + return r2 + 2; +} + +const u16 * sub_8114B34(const u16 * a0) +{ + const u8 * boxIdxs; + a0 = sub_8113E88(25, a0); + boxIdxs = (const u8 *)a0 + 2; + UnkTextUtil_Reset(); + UnkTextUtil_SetPtrI(0, GetBoxNamePtr(boxIdxs[0])); + QuestLog_AutoGetSpeciesName(a0[0], NULL, 1); + UnkTextUtil_StringExpandPlaceholders(gStringVar4, gUnknown_841A632); + return (const u16 *)boxIdxs + 1; +} + +u16 * sub_8114B78(u16 * a0, const u16 * a1) +{ + u16 * r2; + r2 = sub_8113DE0(26, a0); + if (r2 == NULL) + return NULL; + r2[0] = a1[0]; + *((u8 *)r2 + 2) = *((const u8 *)a1 + 4); + return r2 + 2; +} + +const u16 * sub_8114BA0(const u16 * a0) +{ + const u8 * boxIdxs; + a0 = sub_8113E88(26, a0); + boxIdxs = (const u8 *)a0 + 2; + UnkTextUtil_Reset(); + QuestLog_AutoGetSpeciesName(a0[0], NULL, 0); + UnkTextUtil_SetPtrI(1, GetBoxNamePtr(boxIdxs[0])); + UnkTextUtil_StringExpandPlaceholders(gStringVar4, gUnknown_841A64F); + return (const u16 *)boxIdxs + 1; +} + +u16 * sub_8114BE4(u16 * a0, const u16 * a1) +{ + u16 * r2; + r2 = sub_8113DE0(27, a0); + if (r2 == NULL) + return NULL; + *((u8 *)r2 + 0) = *((const u8 *)a1 + 4); + *((u8 *)r2 + 1) = *((const u8 *)a1 + 5); + return r2 + 1; +} + +const u16 * sub_8114C0C(const u16 * a0) +{ + const u16 *r4 = sub_8113E88(27, a0); + UnkTextUtil_Reset(); + UnkTextUtil_SetPtrI(0, GetBoxNamePtr(*((const u8 *)r4 + 0))); + if (*((const u8 *)r4 + 0) == *((const u8 *)r4 + 1)) + UnkTextUtil_SetPtrI(1, gUnknown_841A694); + else + UnkTextUtil_SetPtrI(1, GetBoxNamePtr(*((const u8 *)r4 + 1))); + UnkTextUtil_StringExpandPlaceholders(gStringVar4, gUnknown_841A66E); + return r4 + 1; +} + +u16 * sub_8114C68(u16 * a0, const u16 * a1) +{ + a0 = sub_8113DE0(28, a0); + if (a0 == NULL) + return NULL; + a0[0] = a1[0]; + return a0 + 1; +} + +const u16 * sub_8114C8C(const u16 * a0) +{ + const u16 *r4 = sub_8113E88(28, a0); + sub_8099E90(r4[0], gStringVar1); + StringExpandPlaceholders(gStringVar4, gUnknown_841A391); + return r4 + 1; +} + +u16 * sub_8114CC0(u16 * a0, const u16 * a1) +{ + a0 = sub_8113DE0(29, a0); + if (a0 == NULL) + return NULL; + a0[0] = a1[0]; + return a0 + 1; +} + +const u16 * sub_8114CE4(const u16 * a0) +{ + const u16 *r4 = sub_8113E88(29, a0); + sub_8099E90(r4[0], gStringVar1); + StringExpandPlaceholders(gStringVar4, gUnknown_841A3DA); + return r4 + 1; +} -- cgit v1.2.3 From a38bbb8604f9927c5eeb45dfa57a133a69b952ae Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Mon, 19 Nov 2018 18:28:02 -0500 Subject: through sub_8114D68 --- asm/quest_log.s | 103 -------------------------------------------------------- src/quest_log.c | 35 +++++++++++++++++++ 2 files changed, 35 insertions(+), 103 deletions(-) diff --git a/asm/quest_log.s b/asm/quest_log.s index 2b2b22c14..ddde56738 100644 --- a/asm/quest_log.s +++ b/asm/quest_log.s @@ -5,109 +5,6 @@ .text - thumb_func_start sub_8114D18 -sub_8114D18: @ 8114D18 - push {r4,lr} - adds r4, r2, 0 - lsls r0, 16 - lsrs r0, 16 - bl sub_8113DE0 - adds r1, r0, 0 - cmp r1, 0 - beq _08114D44 - ldrh r0, [r4, 0x2] - strh r0, [r1] - ldrh r0, [r4, 0x4] - strh r0, [r1, 0x2] - ldrh r0, [r4] - strh r0, [r1, 0x4] - ldrb r0, [r4, 0x7] - strb r0, [r1, 0x6] - ldrb r0, [r4, 0x6] - strb r0, [r1, 0x7] - adds r0, r1, 0 - adds r0, 0x8 - b _08114D46 -_08114D44: - movs r0, 0 -_08114D46: - pop {r4} - pop {r1} - bx r1 - thumb_func_end sub_8114D18 - - thumb_func_start sub_8114D4C -sub_8114D4C: @ 8114D4C - push {lr} - adds r3, r0, 0 - adds r2, r1, 0 - ldr r1, _08114D64 @ =gUnknown_203B048 - movs r0, 0x1 - strb r0, [r1] - movs r0, 0x1E - adds r1, r3, 0 - bl sub_8114D18 - pop {r1} - bx r1 - .align 2, 0 -_08114D64: .4byte gUnknown_203B048 - thumb_func_end sub_8114D4C - - thumb_func_start sub_8114D68 -sub_8114D68: @ 8114D68 - push {r4-r6,lr} - adds r1, r0, 0 - movs r0, 0x1E - bl sub_8113E88 - adds r4, r0, 0 - adds r6, r4, 0x6 - bl UnkTextUtil_Reset - ldr r5, _08114DD4 @ =gStringVar1 - ldrb r1, [r4, 0x6] - adds r0, r5, 0 - bl sub_80C4DF8 - movs r0, 0 - adds r1, r5, 0 - bl UnkTextUtil_SetPtrI - ldrh r0, [r4, 0x4] - lsls r1, r0, 2 - adds r1, r0 - lsls r1, 3 - ldr r0, _08114DD8 @ =gTrainers+0x4 - adds r1, r0 - movs r0, 0x1 - bl UnkTextUtil_SetPtrI - ldrh r0, [r4] - movs r1, 0 - movs r2, 0x2 - bl QuestLog_AutoGetSpeciesName - ldrh r0, [r4, 0x2] - movs r1, 0 - movs r2, 0x3 - bl QuestLog_AutoGetSpeciesName - ldr r1, _08114DDC @ =gUnknown_8456ACC - ldrb r0, [r6, 0x1] - lsls r0, 2 - adds r0, r1 - ldr r1, [r0] - movs r0, 0x4 - bl UnkTextUtil_SetPtrI - ldr r0, _08114DE0 @ =gStringVar4 - ldr r1, _08114DE4 @ =gUnknown_841AF0C - bl UnkTextUtil_StringExpandPlaceholders - adds r4, 0x8 - adds r0, r4, 0 - pop {r4-r6} - pop {r1} - bx r1 - .align 2, 0 -_08114DD4: .4byte gStringVar1 -_08114DD8: .4byte gTrainers+0x4 -_08114DDC: .4byte gUnknown_8456ACC -_08114DE0: .4byte gStringVar4 -_08114DE4: .4byte gUnknown_841AF0C - thumb_func_end sub_8114D68 - thumb_func_start sub_8114DE8 sub_8114DE8: @ 8114DE8 push {r4-r6,lr} diff --git a/src/quest_log.c b/src/quest_log.c index f4b964d96..d43027e57 100644 --- a/src/quest_log.c +++ b/src/quest_log.c @@ -4332,3 +4332,38 @@ const u16 * sub_8114CE4(const u16 * a0) StringExpandPlaceholders(gStringVar4, gUnknown_841A3DA); return r4 + 1; } + +u16 * sub_8114D18(u16 a0, u16 * a1, const u16 * a2) +{ + a1 = sub_8113DE0(a0, a1); + if (a1 == NULL) + return NULL; + a1[0] = a2[1]; + a1[1] = a2[2]; + a1[2] = a2[0]; + *((u8 *)a1 + 6) = *((const u8 *)a2 + 7); + *((u8 *)a1 + 7) = *((const u8 *)a2 + 6); + return a1 + 4; +} + +u16 * sub_8114D4C(u16 * a0, const u16 * a1) +{ + gUnknown_203B048 = TRUE; + return sub_8114D18(30, a0, a1); +} + +const u16 * sub_8114D68(const u16 * a0) +{ + const u8 * r6; + a0 = sub_8113E88(30, a0); + r6 = (const u8 *)a0 + 6; + UnkTextUtil_Reset(); + sub_80C4DF8(gStringVar1, r6[0]); + UnkTextUtil_SetPtrI(0, gStringVar1); + UnkTextUtil_SetPtrI(1, gTrainers[a0[2]].trainerName); + QuestLog_AutoGetSpeciesName(a0[0], 0, 2); + QuestLog_AutoGetSpeciesName(a0[1], 0, 3); + UnkTextUtil_SetPtrI(4, gUnknown_8456ACC[r6[1]]); + UnkTextUtil_StringExpandPlaceholders(gStringVar4, gUnknown_841AF0C); + return a0 + 4; +} -- cgit v1.2.3 From c7439253be8a79bfb628640276135c174c8fad11 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Mon, 19 Nov 2018 18:36:05 -0500 Subject: sub_8114DE8 --- asm/quest_log.s | 73 --------------------------------------------------------- src/quest_log.c | 23 ++++++++++++++++++ 2 files changed, 23 insertions(+), 73 deletions(-) diff --git a/asm/quest_log.s b/asm/quest_log.s index ddde56738..a28cba2dc 100644 --- a/asm/quest_log.s +++ b/asm/quest_log.s @@ -5,79 +5,6 @@ .text - thumb_func_start sub_8114DE8 -sub_8114DE8: @ 8114DE8 - push {r4-r6,lr} - adds r6, r1, 0 - adds r4, r0, 0 - adds r5, r4, 0 - adds r5, 0x8 - ldr r0, _08114E08 @ =gUnknown_8456AA0 - ldrb r1, [r0, 0x1F] - adds r0, r4, 0 - bl sub_8110944 - lsls r0, 24 - cmp r0, 0 - bne _08114E0C - movs r0, 0 - b _08114E5E - .align 2, 0 -_08114E08: .4byte gUnknown_8456AA0 -_08114E0C: - ldrb r0, [r4, 0x8] - cmp r0, 0 - bne _08114E22 - ldrb r0, [r5, 0x1] - cmp r0, 0 - bne _08114E22 - movs r0, 0x1F - strh r0, [r4] - ldr r0, _08114E64 @ =gUnknown_203AF98 - ldrh r0, [r0] - strh r0, [r4, 0x2] -_08114E22: - ldrh r0, [r6] - adds r2, r0, 0 - cmp r2, 0 - beq _08114E2C - strh r0, [r4, 0x4] -_08114E2C: - ldrh r0, [r6, 0x2] - adds r1, r0, 0 - cmp r1, 0 - beq _08114E36 - strh r1, [r4, 0x6] -_08114E36: - cmp r2, 0 - beq _08114E46 - ldrb r2, [r5] - adds r0, r2, 0 - cmp r0, 0xFF - beq _08114E46 - adds r0, r2, 0x1 - strb r0, [r5] -_08114E46: - lsls r0, r1, 16 - cmp r0, 0 - beq _08114E58 - ldrb r1, [r5, 0x1] - adds r0, r1, 0 - cmp r0, 0xFF - beq _08114E58 - adds r0, r1, 0x1 - strb r0, [r5, 0x1] -_08114E58: - ldrb r0, [r6, 0x4] - strb r0, [r5, 0x2] - adds r0, r5, 0x4 -_08114E5E: - pop {r4-r6} - pop {r1} - bx r1 - .align 2, 0 -_08114E64: .4byte gUnknown_203AF98 - thumb_func_end sub_8114DE8 - thumb_func_start sub_8114E68 sub_8114E68: @ 8114E68 push {r4-r6,lr} diff --git a/src/quest_log.c b/src/quest_log.c index d43027e57..593585aac 100644 --- a/src/quest_log.c +++ b/src/quest_log.c @@ -4367,3 +4367,26 @@ const u16 * sub_8114D68(const u16 * a0) UnkTextUtil_StringExpandPlaceholders(gStringVar4, gUnknown_841AF0C); return a0 + 4; } + +u16 * sub_8114DE8(u16 * a0, const u16 * a1) +{ + u16 * r4 = a0; + u8 * r5 = (u8 *)a0 + 8; + if (!sub_8110944(r4, gUnknown_8456AA0[31])) + return NULL; + if (r5[0] == 0 && r5[1] == 0) + { + r4[0] = 31; + r4[1] = gUnknown_203AF98; + } + if (a1[0]) + r4[2] = a1[0]; + if (a1[1]) + r4[3] = a1[1]; + if (a1[0] && r5[0] != 0xFF) + r5[0]++; + if (a1[1] && r5[1] != 0xFF) + r5[1]++; + r5[2] = *((const u8 *)a1 + 4); + return (u16 *)(r5 + 4); +} -- cgit v1.2.3 From ccc245601756237b4cd452b421506922be944d21 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Mon, 19 Nov 2018 21:32:13 -0500 Subject: through sub_81150CC --- asm/quest_log.s | 397 -------------------------------------------------------- src/quest_log.c | 129 +++++++++++++++++- 2 files changed, 127 insertions(+), 399 deletions(-) diff --git a/asm/quest_log.s b/asm/quest_log.s index a28cba2dc..e6d9448f1 100644 --- a/asm/quest_log.s +++ b/asm/quest_log.s @@ -5,403 +5,6 @@ .text - thumb_func_start sub_8114E68 -sub_8114E68: @ 8114E68 - push {r4-r6,lr} - adds r5, r0, 0 - ldr r0, _08114E80 @ =gUnknown_8456AA0 - ldrb r1, [r0, 0x1F] - adds r0, r5, 0 - bl sub_8110944 - lsls r0, 24 - cmp r0, 0 - bne _08114E84 - movs r0, 0 - b _08114FAE - .align 2, 0 -_08114E80: .4byte gUnknown_8456AA0 -_08114E84: - adds r6, r5, 0 - adds r6, 0x8 - bl UnkTextUtil_Reset - ldr r4, _08114F00 @ =gStringVar1 - ldrb r1, [r6, 0x2] - adds r0, r4, 0 - bl sub_80C4DF8 - movs r0, 0 - adds r1, r4, 0 - bl UnkTextUtil_SetPtrI - ldrh r0, [r5, 0x4] - movs r1, 0 - movs r2, 0x1 - bl QuestLog_AutoGetSpeciesName - ldr r4, _08114F04 @ =gStringVar2 - ldrb r1, [r5, 0x8] - adds r0, r4, 0 - movs r2, 0 - movs r3, 0x3 - bl ConvertIntToDecimalStringN - movs r0, 0x2 - adds r1, r4, 0 - bl UnkTextUtil_SetPtrI - ldrh r0, [r5, 0x6] - movs r1, 0 - movs r2, 0x3 - bl QuestLog_AutoGetSpeciesName - ldr r4, _08114F08 @ =gStringVar3 - ldrb r1, [r6, 0x1] - adds r0, r4, 0 - movs r2, 0 - movs r3, 0x3 - bl ConvertIntToDecimalStringN - movs r0, 0x4 - adds r1, r4, 0 - bl UnkTextUtil_SetPtrI - ldr r0, _08114F0C @ =gSaveBlock2Ptr - ldr r1, [r0] - movs r0, 0x5 - bl UnkTextUtil_SetPtrI - ldrb r0, [r5, 0x8] - cmp r0, 0 - bne _08114F2C - ldrb r0, [r6, 0x1] - cmp r0, 0x1 - bne _08114F18 - ldr r0, _08114F10 @ =gStringVar4 - ldr r1, _08114F14 @ =gUnknown_841AA01 - bl UnkTextUtil_StringExpandPlaceholders - b _08114FAC - .align 2, 0 -_08114F00: .4byte gStringVar1 -_08114F04: .4byte gStringVar2 -_08114F08: .4byte gStringVar3 -_08114F0C: .4byte gSaveBlock2Ptr -_08114F10: .4byte gStringVar4 -_08114F14: .4byte gUnknown_841AA01 -_08114F18: - ldr r0, _08114F24 @ =gStringVar4 - ldr r1, _08114F28 @ =gUnknown_841AA2B - bl UnkTextUtil_StringExpandPlaceholders - b _08114FAC - .align 2, 0 -_08114F24: .4byte gStringVar4 -_08114F28: .4byte gUnknown_841AA2B -_08114F2C: - ldrb r1, [r6, 0x1] - cmp r1, 0 - bne _08114F5C - cmp r0, 0x1 - bne _08114F48 - ldr r0, _08114F40 @ =gStringVar4 - ldr r1, _08114F44 @ =gUnknown_841A9A9 - bl UnkTextUtil_StringExpandPlaceholders - b _08114FAC - .align 2, 0 -_08114F40: .4byte gStringVar4 -_08114F44: .4byte gUnknown_841A9A9 -_08114F48: - ldr r0, _08114F54 @ =gStringVar4 - ldr r1, _08114F58 @ =gUnknown_841A9D4 - bl UnkTextUtil_StringExpandPlaceholders - b _08114FAC - .align 2, 0 -_08114F54: .4byte gStringVar4 -_08114F58: .4byte gUnknown_841A9D4 -_08114F5C: - cmp r0, 0x1 - bne _08114F8C - cmp r1, 0x1 - bne _08114F78 - ldr r0, _08114F70 @ =gStringVar4 - ldr r1, _08114F74 @ =gUnknown_841AA76 - bl UnkTextUtil_StringExpandPlaceholders - b _08114FAC - .align 2, 0 -_08114F70: .4byte gStringVar4 -_08114F74: .4byte gUnknown_841AA76 -_08114F78: - ldr r0, _08114F84 @ =gStringVar4 - ldr r1, _08114F88 @ =gUnknown_841AAAA - bl UnkTextUtil_StringExpandPlaceholders - b _08114FAC - .align 2, 0 -_08114F84: .4byte gStringVar4 -_08114F88: .4byte gUnknown_841AAAA -_08114F8C: - cmp r1, 0x1 - bne _08114FA4 - ldr r0, _08114F9C @ =gStringVar4 - ldr r1, _08114FA0 @ =gUnknown_841AAEC - bl UnkTextUtil_StringExpandPlaceholders - b _08114FAC - .align 2, 0 -_08114F9C: .4byte gStringVar4 -_08114FA0: .4byte gUnknown_841AAEC -_08114FA4: - ldr r0, _08114FB4 @ =gStringVar4 - ldr r1, _08114FB8 @ =gUnknown_841AB29 - bl UnkTextUtil_StringExpandPlaceholders -_08114FAC: - adds r0, r6, 0x4 -_08114FAE: - pop {r4-r6} - pop {r1} - bx r1 - .align 2, 0 -_08114FB4: .4byte gStringVar4 -_08114FB8: .4byte gUnknown_841AB29 - thumb_func_end sub_8114E68 - - thumb_func_start sub_8114FBC -sub_8114FBC: @ 8114FBC - push {lr} - lsls r0, 16 - lsrs r0, 16 - adds r1, r0, 0 - cmp r0, 0x96 - beq _08114FE6 - cmp r0, 0x96 - bgt _08114FD6 - cmp r0, 0x92 - bgt _08114FEA - cmp r0, 0x8F - blt _08114FEA - b _08114FE6 -_08114FD6: - cmp r1, 0xF9 - blt _08114FEA - cmp r1, 0xFA - ble _08114FE6 - movs r0, 0xCD - lsls r0, 1 - cmp r1, r0 - bne _08114FEA -_08114FE6: - movs r0, 0x1 - b _08114FEC -_08114FEA: - movs r0, 0 -_08114FEC: - pop {r1} - bx r1 - thumb_func_end sub_8114FBC - - thumb_func_start sub_8114FF0 -sub_8114FF0: @ 8114FF0 - push {lr} - adds r3, r0, 0 - adds r2, r1, 0 - ldr r1, _08115008 @ =gUnknown_203B048 - movs r0, 0x1 - strb r0, [r1] - movs r0, 0x20 - adds r1, r3, 0 - bl sub_8114D18 - pop {r1} - bx r1 - .align 2, 0 -_08115008: .4byte gUnknown_203B048 - thumb_func_end sub_8114FF0 - - thumb_func_start sub_811500C -sub_811500C: @ 811500C - push {r4,r5,lr} - adds r1, r0, 0 - movs r0, 0x20 - bl sub_8113E88 - adds r4, r0, 0 - adds r5, r4, 0x6 - bl UnkTextUtil_Reset - ldrh r0, [r4, 0x4] - lsls r1, r0, 2 - adds r1, r0 - lsls r1, 3 - ldr r0, _08115068 @ =gTrainers+0x4 - adds r1, r0 - movs r0, 0 - bl UnkTextUtil_SetPtrI - ldrh r0, [r4] - movs r1, 0 - movs r2, 0x1 - bl QuestLog_AutoGetSpeciesName - ldrh r0, [r4, 0x2] - movs r1, 0 - movs r2, 0x2 - bl QuestLog_AutoGetSpeciesName - ldr r1, _0811506C @ =gUnknown_8456ACC - ldrb r0, [r5, 0x1] - lsls r0, 2 - adds r0, r1 - ldr r1, [r0] - movs r0, 0x3 - bl UnkTextUtil_SetPtrI - ldr r0, _08115070 @ =gStringVar4 - ldr r1, _08115074 @ =gUnknown_841AF3E - bl UnkTextUtil_StringExpandPlaceholders - adds r4, 0x8 - adds r0, r4, 0 - pop {r4,r5} - pop {r1} - bx r1 - .align 2, 0 -_08115068: .4byte gTrainers+0x4 -_0811506C: .4byte gUnknown_8456ACC -_08115070: .4byte gStringVar4 -_08115074: .4byte gUnknown_841AF3E - thumb_func_end sub_811500C - - thumb_func_start sub_8115078 -sub_8115078: @ 8115078 - push {r4,r5,lr} - adds r4, r0, 0 - adds r5, r1, 0 - ldr r0, _081150B4 @ =gUnknown_8456AA0 - adds r0, 0x21 - ldrb r1, [r0] - adds r0, r4, 0 - bl sub_8110944 - lsls r0, 24 - cmp r0, 0 - beq _081150C4 - ldr r1, _081150B8 @ =0x00002021 - adds r0, r1, 0 - strh r0, [r4] - ldr r0, _081150BC @ =gUnknown_203AF98 - ldrh r0, [r0] - strh r0, [r4, 0x2] - ldrh r0, [r5, 0x2] - strh r0, [r4, 0x4] - ldrh r0, [r5, 0x4] - strh r0, [r4, 0x6] - ldrb r0, [r5, 0x6] - strb r0, [r4, 0x8] - ldr r1, _081150C0 @ =gUnknown_203B048 - movs r0, 0x1 - strb r0, [r1] - adds r0, r4, 0 - adds r0, 0xA - b _081150C6 - .align 2, 0 -_081150B4: .4byte gUnknown_8456AA0 -_081150B8: .4byte 0x00002021 -_081150BC: .4byte gUnknown_203AF98 -_081150C0: .4byte gUnknown_203B048 -_081150C4: - movs r0, 0 -_081150C6: - pop {r4,r5} - pop {r1} - bx r1 - thumb_func_end sub_8115078 - - thumb_func_start sub_81150CC -sub_81150CC: @ 81150CC - push {r4,r5,lr} - adds r4, r0, 0 - ldr r0, _081150E8 @ =gUnknown_8456AA0 - adds r0, 0x21 - ldrb r1, [r0] - adds r0, r4, 0 - bl sub_8110944 - lsls r0, 24 - cmp r0, 0 - bne _081150EC - movs r0, 0 - b _081151AE - .align 2, 0 -_081150E8: .4byte gUnknown_8456AA0 -_081150EC: - adds r5, r4, 0 - adds r5, 0x8 - bl UnkTextUtil_Reset - ldr r0, _08115108 @ =gUnknown_203B044 - ldrh r0, [r0, 0x2] - cmp r0, 0x1 - beq _08115148 - cmp r0, 0x1 - bgt _0811510C - cmp r0, 0 - beq _08115112 - b _081151AC - .align 2, 0 -_08115108: .4byte gUnknown_203B044 -_0811510C: - cmp r0, 0x2 - beq _08115194 - b _081151AC -_08115112: - ldr r0, _08115134 @ =gSaveBlock2Ptr - ldr r1, [r0] - movs r0, 0 - bl UnkTextUtil_SetPtrI - ldr r0, _08115138 @ =gSaveBlock1Ptr - ldr r1, [r0] - ldr r0, _0811513C @ =0x00003a4c - adds r1, r0 - movs r0, 0x1 - bl UnkTextUtil_SetPtrI - ldr r0, _08115140 @ =gStringVar4 - ldr r1, _08115144 @ =gUnknown_841A2E1 - bl UnkTextUtil_StringExpandPlaceholders - b _081151AC - .align 2, 0 -_08115134: .4byte gSaveBlock2Ptr -_08115138: .4byte gSaveBlock1Ptr -_0811513C: .4byte 0x00003a4c -_08115140: .4byte gStringVar4 -_08115144: .4byte gUnknown_841A2E1 -_08115148: - ldr r0, _08115180 @ =gSaveBlock1Ptr - ldr r1, [r0] - ldr r0, _08115184 @ =0x00003a4c - adds r1, r0 - movs r0, 0 - bl UnkTextUtil_SetPtrI - ldrh r0, [r4, 0x4] - movs r1, 0 - movs r2, 0x1 - bl QuestLog_AutoGetSpeciesName - ldr r0, _08115188 @ =gSaveBlock2Ptr - ldr r1, [r0] - movs r0, 0x2 - bl UnkTextUtil_SetPtrI - ldrh r0, [r4, 0x6] - movs r1, 0 - movs r2, 0x3 - bl QuestLog_AutoGetSpeciesName - ldr r0, _0811518C @ =gStringVar4 - ldr r1, _08115190 @ =gUnknown_841A312 - bl UnkTextUtil_StringExpandPlaceholders - b _081151AC - .align 2, 0 -_08115180: .4byte gSaveBlock1Ptr -_08115184: .4byte 0x00003a4c -_08115188: .4byte gSaveBlock2Ptr -_0811518C: .4byte gStringVar4 -_08115190: .4byte gUnknown_841A312 -_08115194: - ldr r1, _081151B4 @ =gUnknown_8456AD8 - ldrb r0, [r4, 0x8] - lsls r0, 2 - adds r0, r1 - ldr r1, [r0] - movs r0, 0 - bl UnkTextUtil_SetPtrI - ldr r0, _081151B8 @ =gStringVar4 - ldr r1, _081151BC @ =gUnknown_841A349 - bl UnkTextUtil_StringExpandPlaceholders -_081151AC: - adds r0, r5, 0x2 -_081151AE: - pop {r4,r5} - pop {r1} - bx r1 - .align 2, 0 -_081151B4: .4byte gUnknown_8456AD8 -_081151B8: .4byte gStringVar4 -_081151BC: .4byte gUnknown_841A349 - thumb_func_end sub_81150CC - thumb_func_start sub_81151C0 sub_81151C0: @ 81151C0 push {lr} diff --git a/src/quest_log.c b/src/quest_log.c index 593585aac..9bd7d6227 100644 --- a/src/quest_log.c +++ b/src/quest_log.c @@ -462,12 +462,12 @@ void sub_811092C(void) gUnknown_203AE8C(); } -bool8 sub_8110944(void * a0, size_t a1) +bool8 sub_8110944(const void * a0, size_t a1) { void * r2 = gSaveBlock1Ptr->questLog[gUnknown_203ADF8].unk_568; void * r0 = gSaveBlock1Ptr->questLog[gUnknown_203ADF8].end; r0 -= a1; - if ((void *)a0 < r2 || (void *)a0 > r0) + if ((const void *)a0 < r2 || (const void *)a0 > r0) return FALSE; return TRUE; } @@ -4390,3 +4390,128 @@ u16 * sub_8114DE8(u16 * a0, const u16 * a1) r5[2] = *((const u8 *)a1 + 4); return (u16 *)(r5 + 4); } + +const u16 * sub_8114E68(const u16 * a0) +{ + const u8 * r6; + if (!sub_8110944(a0, gUnknown_8456AA0[31])) + return NULL; + + r6 = (const u8 *)a0 + 8; + UnkTextUtil_Reset(); + sub_80C4DF8(gStringVar1, r6[2]); + UnkTextUtil_SetPtrI(0, gStringVar1); + QuestLog_AutoGetSpeciesName(a0[2], NULL, 1); + ConvertIntToDecimalStringN(gStringVar2, r6[0], STR_CONV_MODE_LEFT_ALIGN, 3); + UnkTextUtil_SetPtrI(2, gStringVar2); + QuestLog_AutoGetSpeciesName(a0[3], NULL, 3); + ConvertIntToDecimalStringN(gStringVar3, r6[1], STR_CONV_MODE_LEFT_ALIGN, 3); + UnkTextUtil_SetPtrI(4, gStringVar3); + UnkTextUtil_SetPtrI(5, gSaveBlock2Ptr->playerName); + if (r6[0] == 0) + { + if (r6[1] == 1) + UnkTextUtil_StringExpandPlaceholders(gStringVar4, gUnknown_841AA01); + else + UnkTextUtil_StringExpandPlaceholders(gStringVar4, gUnknown_841AA2B); + } + else if (r6[1] == 0) + { + if (r6[0] == 1) + UnkTextUtil_StringExpandPlaceholders(gStringVar4, gUnknown_841A9A9); + else + UnkTextUtil_StringExpandPlaceholders(gStringVar4, gUnknown_841A9D4); + } + else if (r6[0] == 1) + { + if (r6[1] == 1) + UnkTextUtil_StringExpandPlaceholders(gStringVar4, gUnknown_841AA76); + else + UnkTextUtil_StringExpandPlaceholders(gStringVar4, gUnknown_841AAAA); + } + else + { + if (r6[1] == 1) + UnkTextUtil_StringExpandPlaceholders(gStringVar4, gUnknown_841AAEC); + else + UnkTextUtil_StringExpandPlaceholders(gStringVar4, gUnknown_841AB29); + } + return (const u16 *)(r6 + 4); +} + +bool8 sub_8114FBC(u16 a0) +{ + switch (a0) + { + case 0x96: + case 0x8F ... 0x92: + case 0xF9 ... 0xFA: + case 0x19A: + return TRUE; + } + return FALSE; +} + +u16 * sub_8114FF0(u16 * a0, const u16 * a1) +{ + gUnknown_203B048 = TRUE; + return sub_8114D18(32, a0, a1); +} + +const u16 * sub_811500C(const u16 * a0) +{ + const u8 * r5; + a0 = sub_8113E88(32, a0); + r5 = (const u8 *)a0 + 6; + UnkTextUtil_Reset(); + UnkTextUtil_SetPtrI(0, gTrainers[a0[2]].trainerName); + QuestLog_AutoGetSpeciesName(a0[0], NULL, 1); + QuestLog_AutoGetSpeciesName(a0[1], NULL, 2); + UnkTextUtil_SetPtrI(3, gUnknown_8456ACC[r5[1]]); + UnkTextUtil_StringExpandPlaceholders(gStringVar4, gUnknown_841AF3E); + return a0 + 4; +} + +u16 * sub_8115078(u16 * a0, const u16 * a1) +{ + if (!sub_8110944(a0, gUnknown_8456AA0[33])) + return NULL; + a0[0] = 0x2021; + a0[1] = gUnknown_203AF98; + a0[2] = a1[1]; + a0[3] = a1[2]; + *((u8 *)a0 + 8) = *((const u8 *)a1 + 6); + gUnknown_203B048 = TRUE; + return a0 + 5; +} + +const u16 * sub_81150CC(const u16 * a0) +{ + const u8 * r5; + if (!sub_8110944(a0, gUnknown_8456AA0[33])) + return NULL; + + r5 = (const u8 *)a0 + 8; + UnkTextUtil_Reset(); + + switch (gUnknown_203B044.unk_2) + { + case 0: + UnkTextUtil_SetPtrI(0, gSaveBlock2Ptr->playerName); + UnkTextUtil_SetPtrI(1, gSaveBlock1Ptr->rivalName); + UnkTextUtil_StringExpandPlaceholders(gStringVar4, gUnknown_841A2E1); + break; + case 1: + UnkTextUtil_SetPtrI(0, gSaveBlock1Ptr->rivalName); + QuestLog_AutoGetSpeciesName(a0[2], NULL, 1); + UnkTextUtil_SetPtrI(2, gSaveBlock2Ptr->playerName); + QuestLog_AutoGetSpeciesName(a0[3], NULL, 3); + UnkTextUtil_StringExpandPlaceholders(gStringVar4, gUnknown_841A312); + break; + case 2: + UnkTextUtil_SetPtrI(0, gUnknown_8456AD8[r5[0]]); + UnkTextUtil_StringExpandPlaceholders(gStringVar4, gUnknown_841A349); + break; + } + return (const u16 *)(r5 + 2); +} -- cgit v1.2.3 From 8e5da871440bf340fcea5edf9db8ffe4cb794509 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Mon, 19 Nov 2018 21:45:40 -0500 Subject: through sub_81151DC --- asm/quest_log.s | 90 --------------------------------------------------------- src/quest_log.c | 28 ++++++++++++++++++ 2 files changed, 28 insertions(+), 90 deletions(-) diff --git a/asm/quest_log.s b/asm/quest_log.s index e6d9448f1..3ed9101ed 100644 --- a/asm/quest_log.s +++ b/asm/quest_log.s @@ -5,96 +5,6 @@ .text - thumb_func_start sub_81151C0 -sub_81151C0: @ 81151C0 - push {lr} - adds r3, r0, 0 - adds r2, r1, 0 - ldr r1, _081151D8 @ =gUnknown_203B048 - movs r0, 0x1 - strb r0, [r1] - movs r0, 0x22 - adds r1, r3, 0 - bl sub_8114D18 - pop {r1} - bx r1 - .align 2, 0 -_081151D8: .4byte gUnknown_203B048 - thumb_func_end sub_81151C0 - - thumb_func_start sub_81151DC -sub_81151DC: @ 81151DC - push {r4-r6,lr} - adds r1, r0, 0 - movs r0, 0x22 - bl sub_8113E88 - adds r5, r0, 0 - adds r6, r5, 0x6 - bl UnkTextUtil_Reset - ldr r4, _0811522C @ =gStringVar1 - ldrb r1, [r5, 0x6] - adds r0, r4, 0 - bl sub_80C4DF8 - movs r0, 0 - adds r1, r4, 0 - bl UnkTextUtil_SetPtrI - ldr r3, _08115230 @ =gTrainers - ldrh r1, [r5, 0x4] - lsls r0, r1, 2 - adds r0, r1 - lsls r2, r0, 3 - adds r0, r2, r3 - ldrb r0, [r0, 0x1] - cmp r0, 0x51 - beq _0811521A - cmp r0, 0x59 - beq _0811521A - cmp r0, 0x5A - bne _08115234 -_0811521A: - movs r0, 0x6 - bl GetExpandedPlaceholder - adds r1, r0, 0 - movs r0, 0x1 - bl UnkTextUtil_SetPtrI - b _0811523E - .align 2, 0 -_0811522C: .4byte gStringVar1 -_08115230: .4byte gTrainers -_08115234: - adds r1, r3, 0x4 - adds r1, r2, r1 - movs r0, 0x1 - bl UnkTextUtil_SetPtrI -_0811523E: - ldrh r0, [r5] - movs r1, 0 - movs r2, 0x2 - bl QuestLog_AutoGetSpeciesName - ldrh r0, [r5, 0x2] - movs r1, 0 - movs r2, 0x3 - bl QuestLog_AutoGetSpeciesName - ldr r1, _08115274 @ =gUnknown_8456ACC - ldrb r0, [r6, 0x1] - lsls r0, 2 - adds r0, r1 - ldr r1, [r0] - movs r0, 0x4 - bl UnkTextUtil_SetPtrI - ldr r0, _08115278 @ =gStringVar4 - ldr r1, _0811527C @ =gUnknown_841AF6D - bl UnkTextUtil_StringExpandPlaceholders - adds r0, r6, 0x2 - pop {r4-r6} - pop {r1} - bx r1 - .align 2, 0 -_08115274: .4byte gUnknown_8456ACC -_08115278: .4byte gStringVar4 -_0811527C: .4byte gUnknown_841AF6D - thumb_func_end sub_81151DC - thumb_func_start sub_8115280 sub_8115280: @ 8115280 push {r4,lr} diff --git a/src/quest_log.c b/src/quest_log.c index 9bd7d6227..08fb1fb37 100644 --- a/src/quest_log.c +++ b/src/quest_log.c @@ -4515,3 +4515,31 @@ const u16 * sub_81150CC(const u16 * a0) } return (const u16 *)(r5 + 2); } + +u16 * sub_81151C0(u16 * a0, const u16 * a1) +{ + gUnknown_203B048 = TRUE; + return sub_8114D18(34, a0, a1); +} + +const u16 * sub_81151DC(const u16 * a0) +{ + const u16 * r5 = sub_8113E88(34, a0); + const u8 * r6 = (const u8 *)r5 + 6; + UnkTextUtil_Reset(); + sub_80C4DF8(gStringVar1, r6[0]); + UnkTextUtil_SetPtrI(0, gStringVar1); + if ( + gTrainers[r5[2]].trainerClass == 0x51 + || gTrainers[r5[2]].trainerClass == 0x59 + || gTrainers[r5[2]].trainerClass == 0x5A + ) + UnkTextUtil_SetPtrI(1, GetExpandedPlaceholder(6)); + else + UnkTextUtil_SetPtrI(1, gTrainers[r5[2]].trainerName); + QuestLog_AutoGetSpeciesName(r5[0], NULL, 2); + QuestLog_AutoGetSpeciesName(r5[1], NULL, 3); + UnkTextUtil_SetPtrI(4, gUnknown_8456ACC[r6[1]]); + UnkTextUtil_StringExpandPlaceholders(gStringVar4, gUnknown_841AF6D); + return (const u16 *)(r6 + 2); +} -- cgit v1.2.3 From fb3d416283a44390efd57bf9fa0b637927806602 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Tue, 20 Nov 2018 08:52:28 -0500 Subject: through wip sub_81152BC --- asm/quest_log.s | 35 ---------- data/quest_log.s | 144 ----------------------------------------- src/quest_log.c | 190 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 190 insertions(+), 179 deletions(-) diff --git a/asm/quest_log.s b/asm/quest_log.s index 3ed9101ed..a17383c00 100644 --- a/asm/quest_log.s +++ b/asm/quest_log.s @@ -5,41 +5,6 @@ .text - thumb_func_start sub_8115280 -sub_8115280: @ 8115280 - push {r4,lr} - adds r2, r0, 0 - adds r4, r1, 0 - movs r0, 0x23 - adds r1, r2, 0 - bl sub_8113DE0 - adds r2, r0, 0 - cmp r2, 0 - bne _08115298 - movs r0, 0 - b _081152B0 -_08115298: - ldrb r0, [r4] - strb r0, [r2] - ldrb r0, [r4, 0x1] - strb r0, [r2, 0x1] - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x24 - bne _081152AE - ldr r1, _081152B8 @ =gUnknown_203B048 - movs r0, 0x1 - strb r0, [r1] -_081152AE: - adds r0, r2, 0x2 -_081152B0: - pop {r4} - pop {r1} - bx r1 - .align 2, 0 -_081152B8: .4byte gUnknown_203B048 - thumb_func_end sub_8115280 - thumb_func_start sub_81152BC sub_81152BC: @ 81152BC push {r4-r7,lr} diff --git a/data/quest_log.s b/data/quest_log.s index 0bb7cb3fb..a4d3dd16c 100644 --- a/data/quest_log.s +++ b/data/quest_log.s @@ -1,149 +1,5 @@ .section .rodata - .align 2 -gUnknown_8456AF0:: @ 8456AF0 - .4byte gUnknown_841B09F - .4byte gUnknown_841B0A4 - .4byte gUnknown_841B0B5 - .4byte gUnknown_841B0B9 - .4byte gUnknown_841B0B9 - .4byte gUnknown_841B0CD - .4byte gUnknown_841B0CD - .4byte gUnknown_841B0DD - .4byte gUnknown_841B0B5 - .4byte gUnknown_841B0F6 - .4byte gUnknown_841B0F6 - .4byte gUnknown_841B0B5 - .4byte gUnknown_841B0FF - .4byte gUnknown_841B109 - .4byte gUnknown_841B116 - .4byte gUnknown_841B11F - .4byte gUnknown_841B11F - .4byte gUnknown_841B130 - .4byte gUnknown_841B0B5 - .4byte gUnknown_841B141 - .4byte gUnknown_841B14B - .4byte gUnknown_841B14B - .4byte gUnknown_841B15A - .4byte gUnknown_841B15A - .4byte gUnknown_841B166 - .4byte gUnknown_841B172 - .4byte gUnknown_841B180 - .4byte gUnknown_841B190 - .4byte gUnknown_841B11F - .4byte gUnknown_841B11F - .4byte gUnknown_841B1A3 - .4byte gUnknown_841B1B7 - .4byte gUnknown_841B1C7 - .4byte gUnknown_841B0B5 - .4byte gUnknown_841B1DA - .4byte gUnknown_841B1E5 - .4byte gUnknown_841B1F4 - .4byte gUnknown_841B0B5 - .4byte gUnknown_841B200 - .4byte gUnknown_841B20E - .4byte gUnknown_841B0B5 - .4byte gUnknown_841B21C - .4byte gUnknown_841B226 - .4byte gUnknown_841B226 - .4byte gUnknown_841B236 - .4byte gUnknown_841B0B5 - .4byte gUnknown_841B246 - .4byte gUnknown_841B25B - .4byte gUnknown_841B25B - .4byte gUnknown_841B268 - .4byte gUnknown_841B277 - -gUnknown_8456BBC:: @ 8456BBC - .4byte gUnknown_841A53A - .4byte gUnknown_841AD9E - .4byte gUnknown_841ADC8 - .4byte gUnknown_841ADFF - .4byte gUnknown_841AE1E - .4byte gUnknown_841AE48 - .4byte gUnknown_841AEA7 - .4byte gUnknown_841AEDC - .4byte gUnknown_841AFD6 - .4byte gUnknown_841B005 - -gUnknown_8456BE4:: @ 8456BE4 - .byte 0x03 - .byte 0x04 - .byte 0x05 - .byte 0x08 - .byte 0x08 - .byte 0x07 - .byte 0x07 - .byte 0x01 - .byte 0x05 - .byte 0x07 - .byte 0x07 - .byte 0x05 - .byte 0x00 - .byte 0x00 - .byte 0x00 - .byte 0x08 - .byte 0x08 - .byte 0x00 - .byte 0x05 - .byte 0x08 - .byte 0x07 - .byte 0x07 - .byte 0x07 - .byte 0x07 - .byte 0x08 - .byte 0x08 - .byte 0x00 - .byte 0x00 - .byte 0x08 - .byte 0x08 - .byte 0x00 - .byte 0x00 - .byte 0x02 - .byte 0x05 - .byte 0x00 - .byte 0x08 - .byte 0x06 - .byte 0x05 - .byte 0x00 - .byte 0x00 - .byte 0x05 - .byte 0x09 - .byte 0x07 - .byte 0x07 - .byte 0x09 - .byte 0x05 - .byte 0x00 - .byte 0x07 - .byte 0x07 - .byte 0x08 - .byte 0x07 - -gUnknown_8456C17:: @ 8456C17 - .byte 0x5a - .byte 0x5b - .byte 0x5d - .byte 0x5e - .byte 0x5f - .byte 0x62 - .byte 0x60 - .byte 0x59 - .byte 0x00 - -gUnknown_8456C20:: @ 8456C20 - .4byte gUnknown_841AC51 - .4byte gUnknown_841ABAB - .4byte gUnknown_841ABCD - .4byte gUnknown_841AC2A - .4byte gUnknown_841ABF9 - .4byte gUnknown_841AC93 - .4byte gUnknown_841ACBC - .4byte gUnknown_841AD69 - .4byte gUnknown_841AD1D - .4byte gUnknown_841A90C - .4byte gUnknown_841A8E0 - .4byte gUnknown_841AD3C - gUnknown_8456C50:: @ 8456C50 .2byte 0x0891 .2byte 0x0892 diff --git a/src/quest_log.c b/src/quest_log.c index 08fb1fb37..048fe289a 100644 --- a/src/quest_log.c +++ b/src/quest_log.c @@ -4543,3 +4543,193 @@ const u16 * sub_81151DC(const u16 * a0) UnkTextUtil_StringExpandPlaceholders(gStringVar4, gUnknown_841AF6D); return (const u16 *)(r6 + 2); } + +const u8 *const gUnknown_8456AF0[] = { + gUnknown_841B09F, + gUnknown_841B0A4, + gUnknown_841B0B5, + gUnknown_841B0B9, + gUnknown_841B0B9, + gUnknown_841B0CD, + gUnknown_841B0CD, + gUnknown_841B0DD, + gUnknown_841B0B5, + gUnknown_841B0F6, + gUnknown_841B0F6, + gUnknown_841B0B5, + gUnknown_841B0FF, + gUnknown_841B109, + gUnknown_841B116, + gUnknown_841B11F, + gUnknown_841B11F, + gUnknown_841B130, + gUnknown_841B0B5, + gUnknown_841B141, + gUnknown_841B14B, + gUnknown_841B14B, + gUnknown_841B15A, + gUnknown_841B15A, + gUnknown_841B166, + gUnknown_841B172, + gUnknown_841B180, + gUnknown_841B190, + gUnknown_841B11F, + gUnknown_841B11F, + gUnknown_841B1A3, + gUnknown_841B1B7, + gUnknown_841B1C7, + gUnknown_841B0B5, + gUnknown_841B1DA, + gUnknown_841B1E5, + gUnknown_841B1F4, + gUnknown_841B0B5, + gUnknown_841B200, + gUnknown_841B20E, + gUnknown_841B0B5, + gUnknown_841B21C, + gUnknown_841B226, + gUnknown_841B226, + gUnknown_841B236, + gUnknown_841B0B5, + gUnknown_841B246, + gUnknown_841B25B, + gUnknown_841B25B, + gUnknown_841B268, + gUnknown_841B277 +}; + +const u8 *const gUnknown_8456BBC[] = { + gUnknown_841A53A, + gUnknown_841AD9E, + gUnknown_841ADC8, + gUnknown_841ADFF, + gUnknown_841AE1E, + gUnknown_841AE48, + gUnknown_841AEA7, + gUnknown_841AEDC, + gUnknown_841AFD6, + gUnknown_841B005 +}; + +const u8 gUnknown_8456BE4[] = { + 0x03, + 0x04, + 0x05, + 0x08, + 0x08, + 0x07, + 0x07, + 0x01, + 0x05, + 0x07, + 0x07, + 0x05, + 0x00, + 0x00, + 0x00, + 0x08, + 0x08, + 0x00, + 0x05, + 0x08, + 0x07, + 0x07, + 0x07, + 0x07, + 0x08, + 0x08, + 0x00, + 0x00, + 0x08, + 0x08, + 0x00, + 0x00, + 0x02, + 0x05, + 0x00, + 0x08, + 0x06, + 0x05, + 0x00, + 0x00, + 0x05, + 0x09, + 0x07, + 0x07, + 0x09, + 0x05, + 0x00, + 0x07, + 0x07, + 0x08, + 0x07 +}; + +const u8 gUnknown_8456C17[] = { + 0x5a, + 0x5b, + 0x5d, + 0x5e, + 0x5f, + 0x62, + 0x60, + 0x59, + 0x00 +}; + +const u8 *const gUnknown_8456C20[] = { + gUnknown_841AC51, + gUnknown_841ABAB, + gUnknown_841ABCD, + gUnknown_841AC2A, + gUnknown_841ABF9, + gUnknown_841AC93, + gUnknown_841ACBC, + gUnknown_841AD69, + gUnknown_841AD1D, + gUnknown_841A90C, + gUnknown_841A8E0, + gUnknown_841AD3C +}; + +u16 * sub_8115280(u16 * a0, const u16 * a1) +{ + u16 * r2 = sub_8113DE0(35, a0); + if (r2 == NULL) + return NULL; + *((u8 *)r2 + 0) = *((const u8 *)a1 + 0); + if ((*((u8 *)r2 + 1) = *((const u8 *)a1 + 1)) == 0x24) + gUnknown_203B048 = TRUE; + return r2 + 1; +} + +/* +const u16 * sub_81152BC(const u16 * a0) +{ + u8 r4; + const u16 * r5 = sub_8113E88(35, a0); + const u8 * r5_2 = (const u8 *)r5 + 0; + sub_80C4DF8(gStringVar1, r5_2[1]); + StringCopy(gStringVar2, gUnknown_8456AF0[r5_2[1]]); + if (gUnknown_8456BE4[r5_2[1]] == 5) + { + for (r4 = 0; r4 < 8; r4++) + { + if (r5_2[0] == gUnknown_8456C17[r4]) + { + if (FlagGet(0x820) != TRUE) + StringExpandPlaceholders(gStringVar4, gUnknown_841AE48); + else + StringExpandPlaceholders(gStringVar4, gUnknown_841AE8F); + break; + } + } + if (r4 == 8) + StringExpandPlaceholders(gStringVar4, gUnknown_8456BBC[gUnknown_8456BE4[r5_2[1]]]); + } + else + StringExpandPlaceholders(gStringVar4, gUnknown_8456BBC[gUnknown_8456BE4[r5_2[1]]]); + + return r5 + 1; +} + */ -- cgit v1.2.3 From 374352c3cf1c307ecd7d4cedcd1b7815a3e9e4bf Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Tue, 20 Nov 2018 21:41:35 -0500 Subject: Match sub_81152BC --- asm/quest_log.s | 101 -------------------------------------------------------- src/quest_log.c | 37 ++++++++++----------- 2 files changed, 17 insertions(+), 121 deletions(-) diff --git a/asm/quest_log.s b/asm/quest_log.s index a17383c00..72ba6e0bc 100644 --- a/asm/quest_log.s +++ b/asm/quest_log.s @@ -5,107 +5,6 @@ .text - thumb_func_start sub_81152BC -sub_81152BC: @ 81152BC - push {r4-r7,lr} - adds r1, r0, 0 - movs r0, 0x23 - bl sub_8113E88 - adds r5, r0, 0 - ldrb r6, [r5, 0x1] - ldr r0, _08115318 @ =gStringVar1 - ldrb r1, [r5] - bl sub_80C4DF8 - ldr r0, _0811531C @ =gStringVar2 - ldr r2, _08115320 @ =gUnknown_8456AF0 - lsls r1, r6, 2 - adds r1, r2 - ldr r1, [r1] - bl StringCopy - ldr r0, _08115324 @ =gUnknown_8456BE4 - adds r1, r6, r0 - ldrb r0, [r1] - cmp r0, 0x5 - bne _08115378 - movs r4, 0 - ldr r2, _08115328 @ =gUnknown_8456C17 - adds r7, r5, 0x2 - ldrb r1, [r5] -_081152F2: - adds r0, r4, r2 - ldrb r0, [r0] - cmp r1, r0 - bne _08115334 - movs r1, 0x82 - lsls r1, 4 - adds r0, r4, r1 - bl FlagGet - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x1 - beq _08115364 - ldr r0, _0811532C @ =gStringVar4 - ldr r1, _08115330 @ =gUnknown_841AE48 - bl StringExpandPlaceholders - b _0811533E - .align 2, 0 -_08115318: .4byte gStringVar1 -_0811531C: .4byte gStringVar2 -_08115320: .4byte gUnknown_8456AF0 -_08115324: .4byte gUnknown_8456BE4 -_08115328: .4byte gUnknown_8456C17 -_0811532C: .4byte gStringVar4 -_08115330: .4byte gUnknown_841AE48 -_08115334: - adds r0, r4, 0x1 - lsls r0, 24 - lsrs r4, r0, 24 - cmp r4, 0x7 - bls _081152F2 -_0811533E: - cmp r4, 0x8 - bne _0811538A - ldr r0, _08115358 @ =gStringVar4 - ldr r2, _0811535C @ =gUnknown_8456BBC - ldr r1, _08115360 @ =gUnknown_8456BE4 - adds r1, r6, r1 - ldrb r1, [r1] - lsls r1, 2 - adds r1, r2 - ldr r1, [r1] - bl StringExpandPlaceholders - b _0811538A - .align 2, 0 -_08115358: .4byte gStringVar4 -_0811535C: .4byte gUnknown_8456BBC -_08115360: .4byte gUnknown_8456BE4 -_08115364: - ldr r0, _08115370 @ =gStringVar4 - ldr r1, _08115374 @ =gUnknown_841AE8F - bl StringExpandPlaceholders - b _0811533E - .align 2, 0 -_08115370: .4byte gStringVar4 -_08115374: .4byte gUnknown_841AE8F -_08115378: - ldr r0, _08115394 @ =gStringVar4 - ldr r2, _08115398 @ =gUnknown_8456BBC - ldrb r1, [r1] - lsls r1, 2 - adds r1, r2 - ldr r1, [r1] - bl StringExpandPlaceholders - adds r7, r5, 0x2 -_0811538A: - adds r0, r7, 0 - pop {r4-r7} - pop {r1} - bx r1 - .align 2, 0 -_08115394: .4byte gStringVar4 -_08115398: .4byte gUnknown_8456BBC - thumb_func_end sub_81152BC - thumb_func_start sub_811539C sub_811539C: @ 811539C ldr r1, _081153A4 @ =gUnknown_203B04B diff --git a/src/quest_log.c b/src/quest_log.c index 048fe289a..d88bc04a4 100644 --- a/src/quest_log.c +++ b/src/quest_log.c @@ -4673,8 +4673,7 @@ const u8 gUnknown_8456C17[] = { 0x5f, 0x62, 0x60, - 0x59, - 0x00 + 0x59 }; const u8 *const gUnknown_8456C20[] = { @@ -4703,33 +4702,31 @@ u16 * sub_8115280(u16 * a0, const u16 * a1) return r2 + 1; } -/* const u16 * sub_81152BC(const u16 * a0) { - u8 r4; + u8 r4, r6; const u16 * r5 = sub_8113E88(35, a0); const u8 * r5_2 = (const u8 *)r5 + 0; - sub_80C4DF8(gStringVar1, r5_2[1]); - StringCopy(gStringVar2, gUnknown_8456AF0[r5_2[1]]); - if (gUnknown_8456BE4[r5_2[1]] == 5) + r6 = r5_2[1]; + sub_80C4DF8(gStringVar1, r5_2[0]); + StringCopy(gStringVar2, gUnknown_8456AF0[r6]); + if (gUnknown_8456BE4[r6] == 5) { - for (r4 = 0; r4 < 8; r4++) + for (r4 = 0; r4 < ARRAY_COUNT(gUnknown_8456C17); r4++) { - if (r5_2[0] == gUnknown_8456C17[r4]) - { - if (FlagGet(0x820) != TRUE) - StringExpandPlaceholders(gStringVar4, gUnknown_841AE48); - else - StringExpandPlaceholders(gStringVar4, gUnknown_841AE8F); - break; - } + if (r5_2[0] != gUnknown_8456C17[r4]) + continue; + if (FlagGet(0x820 + r4) == TRUE) + StringExpandPlaceholders(gStringVar4, gUnknown_841AE8F); + else + StringExpandPlaceholders(gStringVar4, gUnknown_841AE48); + break; } if (r4 == 8) - StringExpandPlaceholders(gStringVar4, gUnknown_8456BBC[gUnknown_8456BE4[r5_2[1]]]); + StringExpandPlaceholders(gStringVar4, gUnknown_8456BBC[gUnknown_8456BE4[r6]]); } else - StringExpandPlaceholders(gStringVar4, gUnknown_8456BBC[gUnknown_8456BE4[r5_2[1]]]); + StringExpandPlaceholders(gStringVar4, gUnknown_8456BBC[gUnknown_8456BE4[r6]]); - return r5 + 1; + return (const u16 *)(r5_2 + 2); } - */ -- cgit v1.2.3 From eb98d02443e7433dd594e35e92edda3b8fa5d499 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Wed, 21 Nov 2018 07:55:42 -0500 Subject: through sub_8115518; finish quest_log rodata --- asm/quest_log.s | 270 ---------------------------------------------------- data/data_83FECCC.s | 5 +- data/quest_log.s | 23 ----- ld_script.txt | 1 - src/quest_log.c | 122 +++++++++++++++++++++++- 5 files changed, 124 insertions(+), 297 deletions(-) delete mode 100644 data/quest_log.s diff --git a/asm/quest_log.s b/asm/quest_log.s index 72ba6e0bc..f5992a824 100644 --- a/asm/quest_log.s +++ b/asm/quest_log.s @@ -5,276 +5,6 @@ .text - thumb_func_start sub_811539C -sub_811539C: @ 811539C - ldr r1, _081153A4 @ =gUnknown_203B04B - movs r0, 0x1 - strb r0, [r1] - bx lr - .align 2, 0 -_081153A4: .4byte gUnknown_203B04B - thumb_func_end sub_811539C - - thumb_func_start sub_81153A8 -sub_81153A8: @ 81153A8 - push {lr} - adds r2, r1, 0 - lsls r0, 16 - lsrs r0, 16 - cmp r0, 0x23 - beq _081153C4 - ldr r1, _081153C0 @ =gUnknown_203B04A - movs r0, 0 - strb r0, [r1] - movs r0, 0x1 - b _081153DE - .align 2, 0 -_081153C0: .4byte gUnknown_203B04A -_081153C4: - ldr r3, _081153D8 @ =gUnknown_203B04A - ldrb r1, [r3] - ldrb r0, [r2, 0x1] - adds r0, 0x1 - cmp r1, r0 - beq _081153DC - strb r0, [r3] - movs r0, 0x1 - b _081153DE - .align 2, 0 -_081153D8: .4byte gUnknown_203B04A -_081153DC: - movs r0, 0 -_081153DE: - pop {r1} - bx r1 - thumb_func_end sub_81153A8 - - thumb_func_start sub_81153E4 -sub_81153E4: @ 81153E4 - push {lr} - lsls r0, 16 - lsrs r0, 16 - cmp r0, 0x23 - bne _08115408 - ldrb r0, [r1, 0x1] - ldr r1, _08115400 @ =gUnknown_203B04B - cmp r0, 0x20 - bne _08115404 - ldrb r0, [r1] - cmp r0, 0 - bne _08115404 - movs r0, 0 - b _0811540A - .align 2, 0 -_08115400: .4byte gUnknown_203B04B -_08115404: - movs r0, 0 - strb r0, [r1] -_08115408: - movs r0, 0x1 -_0811540A: - pop {r1} - bx r1 - thumb_func_end sub_81153E4 - - thumb_func_start sub_8115410 -sub_8115410: @ 8115410 - push {r4,lr} - adds r2, r0, 0 - adds r4, r1, 0 - movs r0, 0x24 - adds r1, r2, 0 - bl sub_8113DE0 - adds r2, r0, 0 - cmp r2, 0 - bne _08115428 - movs r0, 0 - b _08115454 -_08115428: - ldrh r0, [r4] - strh r0, [r2] - adds r3, r2, 0x2 - ldrb r0, [r4, 0x2] - strb r0, [r2, 0x2] - ldrb r0, [r4, 0x3] - strb r0, [r3, 0x1] - ldrb r0, [r2, 0x2] - subs r0, 0x7 - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x1 - bhi _0811544C - ldr r1, _08115448 @ =gUnknown_203B048 - movs r0, 0x2 - b _08115450 - .align 2, 0 -_08115448: .4byte gUnknown_203B048 -_0811544C: - ldr r1, _0811545C @ =gUnknown_203B048 - movs r0, 0x1 -_08115450: - strb r0, [r1] - adds r0, r3, 0x2 -_08115454: - pop {r4} - pop {r1} - bx r1 - .align 2, 0 -_0811545C: .4byte gUnknown_203B048 - thumb_func_end sub_8115410 - - thumb_func_start sub_8115460 -sub_8115460: @ 8115460 - push {r4,r5,lr} - adds r1, r0, 0 - movs r0, 0x24 - bl sub_8113E88 - adds r4, r0, 0 - adds r5, r4, 0x2 - ldrh r0, [r4] - ldr r1, _0811549C @ =gStringVar1 - movs r2, 0 - bl QuestLog_AutoGetSpeciesName - ldrb r0, [r5, 0x1] - cmp r0, 0xFF - beq _08115486 - ldr r0, _081154A0 @ =gStringVar2 - ldrb r1, [r5, 0x1] - bl sub_80C4DF8 -_08115486: - ldrb r0, [r4, 0x2] - cmp r0, 0x7 - bne _081154B4 - ldrb r0, [r5, 0x1] - cmp r0, 0x58 - bne _081154AC - ldr r0, _081154A4 @ =gStringVar3 - ldr r1, _081154A8 @ =gUnknown_841B09F - bl StringCopy - b _081154B4 - .align 2, 0 -_0811549C: .4byte gStringVar1 -_081154A0: .4byte gStringVar2 -_081154A4: .4byte gStringVar3 -_081154A8: .4byte gUnknown_841B09F -_081154AC: - ldr r0, _081154CC @ =gStringVar3 - ldr r1, _081154D0 @ =gUnknown_8418C1B - bl StringCopy -_081154B4: - ldr r0, _081154D4 @ =gStringVar4 - ldr r2, _081154D8 @ =gUnknown_8456C20 - ldrb r1, [r5] - lsls r1, 2 - adds r1, r2 - ldr r1, [r1] - bl StringExpandPlaceholders - adds r0, r5, 0x2 - pop {r4,r5} - pop {r1} - bx r1 - .align 2, 0 -_081154CC: .4byte gStringVar3 -_081154D0: .4byte gUnknown_8418C1B -_081154D4: .4byte gStringVar4 -_081154D8: .4byte gUnknown_8456C20 - thumb_func_end sub_8115460 - - thumb_func_start sub_81154DC -sub_81154DC: @ 81154DC - push {r4,lr} - adds r2, r0, 0 - adds r4, r1, 0 - movs r0, 0x25 - adds r1, r2, 0 - bl sub_8113DE0 - adds r2, r0, 0 - cmp r2, 0 - beq _0811550E - ldrh r0, [r4, 0x4] - strh r0, [r2] - ldrh r0, [r4, 0x6] - strh r0, [r2, 0x2] - ldr r1, [r4] - lsrs r0, r1, 16 - strh r0, [r2, 0x4] - strh r1, [r2, 0x6] - ldrb r0, [r4, 0x8] - strb r0, [r2, 0x8] - movs r0, 0x1 - strb r0, [r2, 0x9] - adds r0, r2, 0 - adds r0, 0xA - b _08115510 -_0811550E: - movs r0, 0 -_08115510: - pop {r4} - pop {r1} - bx r1 - thumb_func_end sub_81154DC - - thumb_func_start sub_8115518 -sub_8115518: @ 8115518 - push {r4-r7,lr} - adds r1, r0, 0 - movs r0, 0x25 - bl sub_8113E88 - adds r4, r0, 0 - adds r7, r4, 0 - adds r7, 0x8 - ldrh r0, [r4, 0x4] - lsls r0, 16 - ldrh r1, [r4, 0x6] - adds r6, r0, r1 - bl UnkTextUtil_Reset - ldr r5, _08115564 @ =gStringVar1 - ldrb r1, [r4, 0x8] - adds r0, r5, 0 - bl sub_80C4DF8 - movs r0, 0 - adds r1, r5, 0 - bl UnkTextUtil_SetPtrI - ldrh r0, [r4] - bl ItemId_GetItem - adds r1, r0, 0 - movs r0, 0x1 - bl UnkTextUtil_SetPtrI - ldrh r0, [r4, 0x2] - cmp r0, 0x1 - bhi _08115570 - ldr r0, _08115568 @ =gStringVar4 - ldr r1, _0811556C @ =gUnknown_841A7DD - bl UnkTextUtil_StringExpandPlaceholders - b _0811558E - .align 2, 0 -_08115564: .4byte gStringVar1 -_08115568: .4byte gStringVar4 -_0811556C: .4byte gUnknown_841A7DD -_08115570: - ldr r4, _08115598 @ =gStringVar2 - adds r0, r4, 0 - adds r1, r6, 0 - movs r2, 0 - movs r3, 0x6 - bl ConvertIntToDecimalStringN - movs r0, 0x2 - adds r1, r4, 0 - bl UnkTextUtil_SetPtrI - ldr r0, _0811559C @ =gStringVar4 - ldr r1, _081155A0 @ =gUnknown_841A810 - bl UnkTextUtil_StringExpandPlaceholders -_0811558E: - adds r0, r7, 0x2 - pop {r4-r7} - pop {r1} - bx r1 - .align 2, 0 -_08115598: .4byte gStringVar2 -_0811559C: .4byte gStringVar4 -_081155A0: .4byte gUnknown_841A810 - thumb_func_end sub_8115518 - thumb_func_start sub_81155A4 sub_81155A4: @ 81155A4 push {r4,lr} diff --git a/data/data_83FECCC.s b/data/data_83FECCC.s index bdcf0a201..2ce441e4e 100644 --- a/data/data_83FECCC.s +++ b/data/data_83FECCC.s @@ -1265,7 +1265,10 @@ gUnknown_84189EE:: @ 84189EE .incbin "baserom.gba", 0x4189EE, 0x22D gUnknown_8418C1B:: @ 8418C1B - .incbin "baserom.gba", 0x418C1B, 0x68 + .string "POKéMON CENTER$" + +gUnknown_8418C2A:: @ 8418C2A + .incbin "baserom.gba", 0x418C2A, 0x59 gUnknown_8418C83:: @ 8418C83 .incbin "baserom.gba", 0x418C83, 0x56 diff --git a/data/quest_log.s b/data/quest_log.s deleted file mode 100644 index a4d3dd16c..000000000 --- a/data/quest_log.s +++ /dev/null @@ -1,23 +0,0 @@ - .section .rodata - -gUnknown_8456C50:: @ 8456C50 - .2byte 0x0891 - .2byte 0x0892 - .2byte 0x0893 - .2byte 0x0894 - .2byte 0x0895 - .2byte 0x0896 - .2byte 0x0897 - .2byte 0x0898 - .2byte 0x0899 - .2byte 0x089a - .2byte 0x089b - .2byte 0x089c - .2byte 0x089d - .2byte 0x089e - .2byte 0x089f - .2byte 0x08a0 - .2byte 0x08a1 - .2byte 0x0000 - - diff --git a/ld_script.txt b/ld_script.txt index 28abe99ca..2087ea35b 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -371,7 +371,6 @@ SECTIONS { src/save.o(.rodata); data/data_83FECCC.o(.rodata); src/quest_log.o(.rodata); - data/quest_log.o(.rodata); data/data_83FECCC.o(.rodata.8456C74); src/menews_jisan.o(.rodata); src/menews_jisan.o(.rodata.str1.4); diff --git a/src/quest_log.c b/src/quest_log.c index d88bc04a4..eac9486d2 100644 --- a/src/quest_log.c +++ b/src/quest_log.c @@ -272,8 +272,8 @@ const u16 * sub_8115700(const u16 *); u16 * sub_81157DC(u16 *, const u16 *); const u16 * sub_8115800(const u16 *); void sub_8115834(u8 *); -bool8 sub_81153A8(u16, void*); -bool8 sub_81153E4(u16, void*); +bool8 sub_81153A8(u16, u16 *); +bool8 sub_81153E4(u16, u16 *); extern const u8 gUnknown_841A155[]; extern const u8 gUnknown_841A16F[]; @@ -400,6 +400,7 @@ extern const u8 gUnknown_841B246[]; extern const u8 gUnknown_841B25B[]; extern const u8 gUnknown_841B268[]; extern const u8 gUnknown_841B277[]; +extern const u8 gUnknown_8418C1B[]; const struct WindowTemplate gUnknown_845661C[3] = { @@ -4730,3 +4731,120 @@ const u16 * sub_81152BC(const u16 * a0) return (const u16 *)(r5_2 + 2); } + +void sub_811539C(void) +{ + gUnknown_203B04B = TRUE; +} + +bool8 sub_81153A8(u16 a0, u16 * a1) +{ + if (a0 != 35) + { + gUnknown_203B04A = 0; + return TRUE; + } + if (gUnknown_203B04A == *((u8 *)a1 + 1) + 1) + return FALSE; + gUnknown_203B04A = *((u8 *)a1 + 1) + 1; + return TRUE; +} + +bool8 sub_81153E4(u16 a0, u16 * a1) +{ + if (a0 != 35) + return TRUE; + if (*((u8 *)a1 + 1) == 32 && gUnknown_203B04B == 0) + return FALSE; + gUnknown_203B04B = 0; + return TRUE; +} + +u16 * sub_8115410(u16 * a0, const u16 * a1) +{ + u8 * r3; + a0 = sub_8113DE0(36, a0); + if (a0 == NULL) + return NULL; + a0[0] = a1[0]; + r3 = (u8 *)a0 + 2; + r3[0] = *((const u8 *)a1 + 2); + r3[1] = *((const u8 *)a1 + 3); + if (r3[0] == 7 || r3[0] == 8) + gUnknown_203B048 = 2; + else + gUnknown_203B048 = 1; + return (u16 *)(r3 + 2); +} + +const u16 * sub_8115460(const u16 * a0) +{ + const u16 * r4 = sub_8113E88(36, a0); + const u8 * r5 = (const u8 *)r4 + 2; + QuestLog_AutoGetSpeciesName(r4[0], gStringVar1, 0); + if (r5[1] != 0xFF) + sub_80C4DF8(gStringVar2, r5[1]); + if (r5[0] == 7) + { + if (r5[1] == 0x58) + StringCopy(gStringVar3, gUnknown_841B09F); + else + StringCopy(gStringVar3, gUnknown_8418C1B); + } + StringExpandPlaceholders(gStringVar4, gUnknown_8456C20[r5[0]]); + return (const u16 *)(r5 + 2); +} + +u16 * sub_81154DC(u16 * a0, const u16 * a1) +{ + a0 = sub_8113DE0(37, a0); + if (a0 == NULL) + return NULL; + a0[0] = a1[2]; + a0[1] = a1[3]; + a0[2] = *((const u32 *)a1) >> 16; + a0[3] = *((const u32 *)a1); + *((u8 *)a0 + 8) = *((const u8 *)a1 + 8); + *((u8 *)a0 + 9) = 1; + return a0 + 5; +} + +const u16 * sub_8115518(const u16 * a0) +{ + const u16 * r4 = sub_8113E88(37, a0); + const u8 * r7 = (const u8 *)r4 + 8; + u32 r6 = (r4[2] << 16) + r4[3]; + UnkTextUtil_Reset(); + sub_80C4DF8(gStringVar1, r7[0]); + UnkTextUtil_SetPtrI(0, gStringVar1); + UnkTextUtil_SetPtrI(1, ItemId_GetItem(r4[0])->name); + if (r4[1] < 2) + UnkTextUtil_StringExpandPlaceholders(gStringVar4, gUnknown_841A7DD); + else + { + ConvertIntToDecimalStringN(gStringVar2, r6, STR_CONV_MODE_LEFT_ALIGN, 6); + UnkTextUtil_SetPtrI(2, gStringVar2); + UnkTextUtil_StringExpandPlaceholders(gStringVar4, gUnknown_841A810); + } + return (const u16 *)(r7 + 2); +} + +const u16 gUnknown_8456C50[] = { + 0x0891, + 0x0892, + 0x0893, + 0x0894, + 0x0895, + 0x0896, + 0x0897, + 0x0898, + 0x0899, + 0x089a, + 0x089b, + 0x089c, + 0x089d, + 0x089e, + 0x089f, + 0x08a0, + 0x08a1 +}; -- cgit v1.2.3 From 6bcabeab1ec976284da95c34b57615fc9fa44970 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Wed, 21 Nov 2018 08:52:01 -0500 Subject: Complete decomp of quest_log --- asm/quest_log.s | 367 -------------------------------------------------------- ld_script.txt | 1 - src/quest_log.c | 181 +++++++++++++++++++++++++++- 3 files changed, 179 insertions(+), 370 deletions(-) delete mode 100644 asm/quest_log.s diff --git a/asm/quest_log.s b/asm/quest_log.s deleted file mode 100644 index f5992a824..000000000 --- a/asm/quest_log.s +++ /dev/null @@ -1,367 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .syntax unified - - .text - - thumb_func_start sub_81155A4 -sub_81155A4: @ 81155A4 - push {r4,lr} - adds r2, r0, 0 - adds r4, r1, 0 - movs r0, 0x26 - adds r1, r2, 0 - bl sub_8113DE0 - adds r2, r0, 0 - cmp r2, 0 - beq _081155D6 - ldrh r0, [r4, 0x4] - strh r0, [r2] - ldrh r0, [r4, 0x6] - strh r0, [r2, 0x2] - ldr r1, [r4] - lsrs r0, r1, 16 - strh r0, [r2, 0x4] - strh r1, [r2, 0x6] - ldrb r0, [r4, 0x8] - strb r0, [r2, 0x8] - ldrb r0, [r4, 0x9] - strb r0, [r2, 0x9] - adds r0, r2, 0 - adds r0, 0xA - b _081155D8 -_081155D6: - movs r0, 0 -_081155D8: - pop {r4} - pop {r1} - bx r1 - thumb_func_end sub_81155A4 - - thumb_func_start sub_81155E0 -sub_81155E0: @ 81155E0 - push {r4-r7,lr} - adds r1, r0, 0 - movs r0, 0x26 - bl sub_8113E88 - adds r5, r0, 0 - adds r7, r5, 0 - adds r7, 0x8 - ldrh r0, [r5, 0x4] - lsls r0, 16 - ldrh r1, [r5, 0x6] - adds r6, r0, r1 - bl UnkTextUtil_Reset - ldr r4, _0811563C @ =gStringVar1 - ldrb r1, [r5, 0x8] - adds r0, r4, 0 - bl sub_80C4DF8 - ldrb r0, [r7, 0x1] - cmp r0, 0 - bne _08115690 - ldr r0, _08115640 @ =gSaveBlock2Ptr - ldr r1, [r0] - movs r0, 0 - bl UnkTextUtil_SetPtrI - movs r0, 0x1 - adds r1, r4, 0 - bl UnkTextUtil_SetPtrI - ldrh r0, [r5] - bl ItemId_GetItem - adds r1, r0, 0 - movs r0, 0x2 - bl UnkTextUtil_SetPtrI - ldrh r0, [r5, 0x2] - cmp r0, 0x1 - bne _08115648 - ldr r1, _08115644 @ =gUnknown_841A8D4 - movs r0, 0x3 - bl UnkTextUtil_SetPtrI - b _08115670 - .align 2, 0 -_0811563C: .4byte gStringVar1 -_08115640: .4byte gSaveBlock2Ptr -_08115644: .4byte gUnknown_841A8D4 -_08115648: - ldr r4, _0811567C @ =gStringVar2 - ldrh r1, [r5, 0x2] - adds r0, r4, 0 - movs r2, 0 - movs r3, 0x3 - bl ConvertIntToDecimalStringN - movs r0, 0x4 - adds r1, r4, 0 - bl UnkTextUtil_SetPtrI - ldr r4, _08115680 @ =gStringVar3 - ldr r1, _08115684 @ =gUnknown_841A8DD - adds r0, r4, 0 - bl UnkTextUtil_StringExpandPlaceholders - movs r0, 0x3 - adds r1, r4, 0 - bl UnkTextUtil_SetPtrI -_08115670: - ldr r0, _08115688 @ =gStringVar4 - ldr r1, _0811568C @ =gUnknown_841A858 - bl UnkTextUtil_StringExpandPlaceholders - b _081156C4 - .align 2, 0 -_0811567C: .4byte gStringVar2 -_08115680: .4byte gStringVar3 -_08115684: .4byte gUnknown_841A8DD -_08115688: .4byte gStringVar4 -_0811568C: .4byte gUnknown_841A858 -_08115690: - movs r0, 0 - adds r1, r4, 0 - bl UnkTextUtil_SetPtrI - ldrh r0, [r5] - bl ItemId_GetItem - adds r1, r0, 0 - movs r0, 0x1 - bl UnkTextUtil_SetPtrI - ldr r4, _081156CC @ =gStringVar2 - adds r0, r4, 0 - adds r1, r6, 0 - movs r2, 0 - movs r3, 0x6 - bl ConvertIntToDecimalStringN - movs r0, 0x2 - adds r1, r4, 0 - bl UnkTextUtil_SetPtrI - ldr r0, _081156D0 @ =gStringVar4 - ldr r1, _081156D4 @ =gUnknown_841A896 - bl UnkTextUtil_StringExpandPlaceholders -_081156C4: - adds r0, r7, 0x2 - pop {r4-r7} - pop {r1} - bx r1 - .align 2, 0 -_081156CC: .4byte gStringVar2 -_081156D0: .4byte gStringVar4 -_081156D4: .4byte gUnknown_841A896 - thumb_func_end sub_81155E0 - - thumb_func_start sub_81156D8 -sub_81156D8: @ 81156D8 - push {r4,lr} - adds r2, r0, 0 - adds r4, r1, 0 - movs r0, 0x28 - adds r1, r2, 0 - bl sub_8113DE0 - adds r2, r0, 0 - cmp r2, 0 - beq _081156F8 - ldrh r0, [r4] - strh r0, [r2] - ldrb r0, [r4, 0x2] - strb r0, [r2, 0x2] - adds r0, r2, 0x4 - b _081156FA -_081156F8: - movs r0, 0 -_081156FA: - pop {r4} - pop {r1} - bx r1 - thumb_func_end sub_81156D8 - - thumb_func_start sub_8115700 -sub_8115700: @ 8115700 - push {r4-r6,lr} - adds r1, r0, 0 - movs r0, 0x28 - bl sub_8113E88 - adds r4, r0, 0 - adds r5, r4, 0x2 - ldr r0, _08115738 @ =gStringVar1 - ldrb r1, [r4, 0x2] - bl sub_80C4DF8 - ldr r6, _0811573C @ =gStringVar2 - ldrh r0, [r4] - bl ItemId_GetItem - adds r1, r0, 0 - adds r0, r6, 0 - bl StringCopy - ldr r0, _08115740 @ =gStringVar4 - ldr r1, _08115744 @ =gUnknown_841B03F - bl StringExpandPlaceholders - adds r5, 0x2 - adds r0, r5, 0 - pop {r4-r6} - pop {r1} - bx r1 - .align 2, 0 -_08115738: .4byte gStringVar1 -_0811573C: .4byte gStringVar2 -_08115740: .4byte gStringVar4 -_08115744: .4byte gUnknown_841B03F - thumb_func_end sub_8115700 - - thumb_func_start sub_8115748 -sub_8115748: @ 8115748 - push {r4,lr} - lsls r0, 16 - lsrs r2, r0, 16 - ldr r0, _08115764 @ =gUnknown_203ADFA - ldrb r0, [r0] - subs r0, 0x2 - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x1 - bls _08115792 - movs r1, 0 - ldr r4, _08115768 @ =gUnknown_203B049 - ldr r0, _0811576C @ =gUnknown_8456C50 - b _08115778 - .align 2, 0 -_08115764: .4byte gUnknown_203ADFA -_08115768: .4byte gUnknown_203B049 -_0811576C: .4byte gUnknown_8456C50 -_08115770: - movs r0, 0 - b _08115790 -_08115774: - adds r0, 0x2 - adds r1, 0x1 -_08115778: - cmp r1, 0x10 - bgt _08115792 - ldrh r3, [r0] - cmp r2, r3 - bne _08115774 - adds r0, r2, 0 - bl FlagGet - lsls r0, 24 - cmp r0, 0 - bne _08115770 - movs r0, 0x1 -_08115790: - strb r0, [r4] -_08115792: - pop {r4} - pop {r0} - bx r0 - thumb_func_end sub_8115748 - - thumb_func_start sub_8115798 -sub_8115798: @ 8115798 - push {r4,lr} - sub sp, 0x4 - ldr r0, _081157D0 @ =gUnknown_203ADFA - ldrb r0, [r0] - subs r0, 0x2 - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x1 - bls _081157C6 - ldr r4, _081157D4 @ =gUnknown_203B049 - ldrb r0, [r4] - cmp r0, 0 - beq _081157C6 - ldr r0, _081157D8 @ =gMapHeader - ldrb r1, [r0, 0x14] - mov r0, sp - strh r1, [r0] - movs r0, 0x2A - mov r1, sp - bl sub_8113550 - movs r0, 0 - strb r0, [r4] -_081157C6: - add sp, 0x4 - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_081157D0: .4byte gUnknown_203ADFA -_081157D4: .4byte gUnknown_203B049 -_081157D8: .4byte gMapHeader - thumb_func_end sub_8115798 - - thumb_func_start sub_81157DC -sub_81157DC: @ 81157DC - push {r4,lr} - adds r2, r0, 0 - adds r4, r1, 0 - movs r0, 0x2A - adds r1, r2, 0 - bl sub_8113DE0 - adds r2, r0, 0 - cmp r2, 0 - beq _081157F8 - ldrh r0, [r4] - strh r0, [r2] - adds r0, r2, 0x2 - b _081157FA -_081157F8: - movs r0, 0 -_081157FA: - pop {r4} - pop {r1} - bx r1 - thumb_func_end sub_81157DC - - thumb_func_start sub_8115800 -sub_8115800: @ 8115800 - push {r4,lr} - adds r1, r0, 0 - movs r0, 0x2A - bl sub_8113E88 - adds r4, r0, 0 - ldr r0, _08115828 @ =gStringVar1 - ldrb r1, [r4] - bl sub_80C4DF8 - ldr r0, _0811582C @ =gStringVar4 - ldr r1, _08115830 @ =gUnknown_841B064 - bl StringExpandPlaceholders - adds r4, 0x2 - adds r0, r4, 0 - pop {r4} - pop {r1} - bx r1 - .align 2, 0 -_08115828: .4byte gStringVar1 -_0811582C: .4byte gStringVar4 -_08115830: .4byte gUnknown_841B064 - thumb_func_end sub_8115800 - - thumb_func_start sub_8115834 -sub_8115834: @ 8115834 - push {lr} - adds r1, r0, 0 - ldrb r0, [r1] - adds r1, 0x1 - cmp r0, 0xFC - bne _08115868 - ldrb r0, [r1] - adds r1, 0x1 - cmp r0, 0x15 - bne _08115868 - movs r2, 0 - b _08115854 -_0811584C: - adds r1, 0x1 - adds r2, 0x1 - cmp r2, 0x4 - bgt _0811585A -_08115854: - ldrb r0, [r1] - cmp r0, 0xFC - bne _0811584C -_0811585A: - movs r0, 0xFC - strb r0, [r1] - adds r1, 0x1 - movs r0, 0x16 - strb r0, [r1] - movs r0, 0xFF - strb r0, [r1, 0x1] -_08115868: - pop {r0} - bx r0 - thumb_func_end sub_8115834 - - .align 2, 0 @ Don't pad with nop. diff --git a/ld_script.txt b/ld_script.txt index 2087ea35b..c1a32fcbf 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -220,7 +220,6 @@ SECTIONS { asm/mailbox_pc.o(.text); asm/menu.o(.text); src/quest_log.o(.text); - asm/quest_log.o(.text); asm/link_rfu_3.o(.text); asm/pokemon_special_anim.o(.text); asm/party_menu.o(.text); diff --git a/src/quest_log.c b/src/quest_log.c index eac9486d2..ed7214bdd 100644 --- a/src/quest_log.c +++ b/src/quest_log.c @@ -261,6 +261,8 @@ u16 * sub_81151C0(u16 *, const u16 *); const u16 * sub_81151DC(const u16 *); u16 * sub_8115280(u16 *, const u16 *); const u16 * sub_81152BC(const u16 *); +bool8 sub_81153A8(u16, u16 *); +bool8 sub_81153E4(u16, u16 *); u16 * sub_8115410(u16 *, const u16 *); const u16 * sub_8115460(const u16 *); u16 * sub_81154DC(u16 *, const u16 *); @@ -272,8 +274,6 @@ const u16 * sub_8115700(const u16 *); u16 * sub_81157DC(u16 *, const u16 *); const u16 * sub_8115800(const u16 *); void sub_8115834(u8 *); -bool8 sub_81153A8(u16, u16 *); -bool8 sub_81153E4(u16, u16 *); extern const u8 gUnknown_841A155[]; extern const u8 gUnknown_841A16F[]; @@ -4829,6 +4829,72 @@ const u16 * sub_8115518(const u16 * a0) return (const u16 *)(r7 + 2); } +u16 * sub_81155A4(u16 * a0, const u16 * a1) +{ + a0 = sub_8113DE0(38, a0); + if (a0 == NULL) + return NULL; + a0[0] = a1[2]; + a0[1] = a1[3]; + a0[2] = *((const u32 *)a1) >> 16; + a0[3] = *((const u32 *)a1); + *((u8 *)a0 + 8) = *((const u8 *)a1 + 8); + *((u8 *)a0 + 9) = *((const u8 *)a1 + 9); + return a0 + 5; +} + +const u16 * sub_81155E0(const u16 * a0) { + const u16 *r5 = sub_8113E88(38, a0); + const u8 *r7 = (const u8 *) r5 + 8; + u32 r6 = (r5[2] << 16) + r5[3]; + UnkTextUtil_Reset(); + sub_80C4DF8(gStringVar1, r7[0]); + if (r7[1] == 0) { + UnkTextUtil_SetPtrI(0, gSaveBlock2Ptr->playerName); + UnkTextUtil_SetPtrI(1, gStringVar1); + UnkTextUtil_SetPtrI(2, ItemId_GetItem(r5[0])->name); + if (r5[1] == 1) + UnkTextUtil_SetPtrI(3, gUnknown_841A8D4); + else + { + ConvertIntToDecimalStringN(gStringVar2, r5[1], STR_CONV_MODE_LEFT_ALIGN, 3); + UnkTextUtil_SetPtrI(4, gStringVar2); + UnkTextUtil_StringExpandPlaceholders(gStringVar3, gUnknown_841A8DD); + UnkTextUtil_SetPtrI(3, gStringVar3); + } + UnkTextUtil_StringExpandPlaceholders(gStringVar4, gUnknown_841A858); + } + else + { + UnkTextUtil_SetPtrI(0, gStringVar1); + UnkTextUtil_SetPtrI(1, ItemId_GetItem(r5[0])->name); + ConvertIntToDecimalStringN(gStringVar2, r6, STR_CONV_MODE_LEFT_ALIGN, 6); + UnkTextUtil_SetPtrI(2, gStringVar2); + UnkTextUtil_StringExpandPlaceholders(gStringVar4, gUnknown_841A896); + } + return (const u16 *)(r7 + 2); +} + +u16 * sub_81156D8(u16 * a0, const u16 * a1) +{ + a0 = sub_8113DE0(40, a0); + if (a0 == NULL) + return NULL; + a0[0] = a1[0]; + *((u8 *)a0 + 2) = *((const u8 *)a1 + 2); + return a0 + 2; +} + +const u16 * sub_8115700(const u16 * a0) +{ + const u16 * r4 = sub_8113E88(40, a0); + const u8 * r5 = (const u8 *)r4 + 2; + sub_80C4DF8(gStringVar1, r5[0]); + StringCopy(gStringVar2, ItemId_GetItem(r4[0])->name); + StringExpandPlaceholders(gStringVar4, gUnknown_841B03F); + return (const u16 *)(r5 + 2); +} + const u16 gUnknown_8456C50[] = { 0x0891, 0x0892, @@ -4848,3 +4914,114 @@ const u16 gUnknown_8456C50[] = { 0x08a0, 0x08a1 }; + +#ifdef NONMATCHING +void sub_8115748(u16 a0) +{ + s32 i; + if (gUnknown_203ADFA == 2 || gUnknown_203ADFA == 3) + return; + for (i = 0; i < 17; i++) + { + if (a0 != gUnknown_8456C50[i]) + continue; + if (!FlagGet(a0)) + gUnknown_203B049 = TRUE; + else + gUnknown_203B049 = FALSE; + break; + } +} +#else +NAKED +void sub_8115748(u16 a0) +{ + asm_unified("\tpush {r4,lr}\n" + "\tlsls r0, 16\n" + "\tlsrs r2, r0, 16\n" + "\tldr r0, =gUnknown_203ADFA\n" + "\tldrb r0, [r0]\n" + "\tsubs r0, 0x2\n" + "\tlsls r0, 24\n" + "\tlsrs r0, 24\n" + "\tcmp r0, 0x1\n" + "\tbls _08115792\n" + "\tmovs r1, 0\n" + "\tldr r4, =gUnknown_203B049\n" + "\tldr r0, =gUnknown_8456C50\n" + "\tb _08115778\n" + "\t.pool\n" + "_08115770:\n" + "\tmovs r0, 0\n" + "\tb _08115790\n" + "_08115774:\n" + "\tadds r0, 0x2\n" + "\tadds r1, 0x1\n" + "_08115778:\n" + "\tcmp r1, 0x10\n" + "\tbgt _08115792\n" + "\tldrh r3, [r0]\n" + "\tcmp r2, r3\n" + "\tbne _08115774\n" + "\tadds r0, r2, 0\n" + "\tbl FlagGet\n" + "\tlsls r0, 24\n" + "\tcmp r0, 0\n" + "\tbne _08115770\n" + "\tmovs r0, 0x1\n" + "_08115790:\n" + "\tstrb r0, [r4]\n" + "_08115792:\n" + "\tpop {r4}\n" + "\tpop {r0}\n" + "\tbx r0"); +} +#endif // NONMATCHING + +void sub_8115798(void) +{ + u16 sp0; + if (gUnknown_203ADFA != 2 && gUnknown_203ADFA != 3) + { + if (gUnknown_203B049) + { + sp0 = gMapHeader.regionMapSectionId; + sub_8113550(42, &sp0); + gUnknown_203B049 = FALSE; + } + } +} + +u16 * sub_81157DC(u16 * a0, const u16 * a1) +{ + a0 = sub_8113DE0(42, a0); + if (a0 == NULL) + return NULL; + a0[0] = a1[0]; + return a0 + 1; +} + +const u16 * sub_8115800(const u16 * a0) +{ + const u16 * r4 = sub_8113E88(42, a0); + sub_80C4DF8(gStringVar1, r4[0]); + StringExpandPlaceholders(gStringVar4, gUnknown_841B064); + return r4 + 1; +} + +void sub_8115834(u8 * a0) +{ + s32 i; + if (*a0++ == EXT_CTRL_CODE_BEGIN && *a0++ == EXT_CTRL_CODE_JPN) + { + for (i = 0; i < 5; i++) + { + if (*a0 == EXT_CTRL_CODE_BEGIN) + break; + a0++; + } + *a0++ = EXT_CTRL_CODE_BEGIN; + *a0++ = EXT_CTRL_CODE_ENG; + *a0++ = EOS; + } +} -- cgit v1.2.3 From 76f0c361edf91c3825b7a4344186150de0ce3469 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Wed, 21 Nov 2018 20:11:12 -0500 Subject: Try and guess what some of this stuff in crt0.s is --- asm/crt0.s | 31 ++++++++++--------- include/global.h | 94 +++++++++++++++++++++++++++++++++----------------------- 2 files changed, 71 insertions(+), 54 deletions(-) diff --git a/asm/crt0.s b/asm/crt0.s index 37c7ef502..a2e9cd75f 100644 --- a/asm/crt0.s +++ b/asm/crt0.s @@ -60,11 +60,11 @@ GPIOPortReadEnable: @ 80000C8 .4byte 0x8245EE0 @ gSpeciesNames .4byte 0x8247094 @ gMoveNames .4byte 0x84556F8 @ gDecorations - .4byte 0xEE0 - .4byte 0x1000 - .4byte 0x18 - .4byte 0x5F8 - .4byte 0x3A18 + .4byte 0xEE0 @ offsetof(struct SaveBlock1, flags) + .4byte 0x1000 @ offsetof(struct SaveBlock1, vars) + .4byte 0x18 @ offsetof(struct SaveBlock2, pokedex) + .4byte 0x5F8 @ offsetof(struct SaveBlock1, seen1) + .4byte 0x3A18 @ offsetof(struct SaveBlock1, seen2) .4byte 0x3C .4byte 0x838 .4byte 0x839 @@ -74,16 +74,17 @@ GPIOPortReadEnable: @ 80000C8 .4byte 0xC121006 .4byte 0x8010B0F .4byte 0xC - .4byte 0xF24 - .4byte 0x3D68 - .4byte 0x34 - .4byte 0x38 - .4byte 9 - .4byte 0xA - .4byte 0 - .4byte 8 - .4byte 0xAD - .4byte 0xAD + .4byte 0xF24 @ sizeof(struct SaveBlock2) + .4byte 0x3D68 @ sizeof(struct SaveBlock1) + .4byte 0x34 @ offsetof(struct SaveBlock1, playerPartyCount) + .4byte 0x38 @ offsetof(struct SaveBlock1, playerParty) + .4byte 9 @ offsetof(struct SaveBlock2, specialSaveWarp) + .4byte 0xA @ offsetof(struct SaveBlock2, playerTrainerId) + .4byte 0 @ offsetof(struct SaveBlock2, playerName) + .4byte 8 @ offsetof(struct SaveBlock2, playerGender) + + .4byte 0xAD @ offsetof(struct SaveBlock2, ?????? (0xAD)) + .4byte 0xAD @ offsetof(struct SaveBlock2, ?????? (0xAD)) .4byte 0x30BB .4byte 0x30A7 .4byte 0 diff --git a/include/global.h b/include/global.h index 9db1443c2..050e200f9 100644 --- a/include/global.h +++ b/include/global.h @@ -155,6 +155,8 @@ struct Time /*0x04*/ s8 seconds; }; +#define DEX_FLAGS_NO ((POKEMON_SLOTS_NUMBER / 8) + ((POKEMON_SLOTS_NUMBER % 8) ? 1 : 0)) + struct Pokedex { /*0x00*/ u8 order; @@ -164,8 +166,8 @@ struct Pokedex /*0x04*/ u32 unownPersonality; // set when you first see Unown /*0x08*/ u32 spindaPersonality; // set when you first see Spinda /*0x0C*/ u32 unknown3; - /*0x10*/ u8 owned[52]; - /*0x44*/ u8 seen[52]; + /*0x10*/ u8 owned[DEX_FLAGS_NO]; + /*0x44*/ u8 seen[DEX_FLAGS_NO]; }; struct PokemonJumpResults // possibly used in the game itself? @@ -514,9 +516,9 @@ struct QuestLogNPCData struct UnkStruct_203B024 { - u16 unk_00; - u16 unk_02; - u16 unk_04[14]; + u16 unk_00; + u16 unk_02; + u16 unk_04[14]; }; union QuestLogScene @@ -535,11 +537,11 @@ union QuestLogMovement; // Define here union QuestLogMovement { - u16 ident_raw; - struct { - u16 ident:12; - u16 flags:4; - } ident_struct; + u16 ident_raw; + struct { + u16 ident:12; + u16 flags:4; + } ident_struct; }; struct QuestLog @@ -571,30 +573,31 @@ struct SaveBlock1 { /*0x0000*/ struct Coords16 pos; /*0x0004*/ struct WarpData location; - /*0x0C*/ struct WarpData warp1; - /*0x14*/ struct WarpData warp2; - /*0x1C*/ struct WarpData lastHealLocation; - /*0x24*/ struct WarpData warp4; - /*0x2C*/ u16 savedMusic; - /*0x2E*/ u8 weather; - /*0x2F*/ u8 filler_2F; - /*0x30*/ u8 flashLevel; - /*0x32*/ u16 mapDataId; - /*0x234*/ u8 playerPartyCount; - /*0x238*/ struct Pokemon playerParty[PARTY_SIZE]; - /*0x490*/ u32 money; - /*0x494*/ u16 coins; - /*0x496*/ u16 registeredItem; // registered for use with SELECT button - /*0x0298*/ u8 filler298[0x78]; - /*0x0310*/ struct ItemSlot bagPocket_Items[BAG_ITEMS_COUNT]; - /*0x????*/ struct ItemSlot bagPocket_KeyItems[BAG_KEYITEMS_COUNT]; - /*0x????*/ struct ItemSlot bagPocket_PokeBalls[BAG_POKEBALLS_COUNT]; - /*0x????*/ struct ItemSlot bagPocket_TMHM[BAG_TMHM_COUNT]; - /*0x????*/ struct ItemSlot bagPocket_Berries[BAG_BERRIES_COUNT]; - /*0x05F8*/ u8 filler5F8[0x40]; - /*0x638*/ u8 trainerRematchStepCounter; - u8 filler_639; - /*0x63A*/ u8 trainerRematches[100]; + /*0x000C*/ struct WarpData warp1; + /*0x0014*/ struct WarpData warp2; + /*0x001C*/ struct WarpData lastHealLocation; + /*0x0024*/ struct WarpData warp4; + /*0x002C*/ u16 savedMusic; + /*0x002E*/ u8 weather; + /*0x002F*/ u8 filler_2F; + /*0x0030*/ u8 flashLevel; + /*0x0032*/ u16 mapDataId; + /*0x0034*/ u8 playerPartyCount; + /*0x0038*/ struct Pokemon playerParty[PARTY_SIZE]; + /*0x0290*/ u32 money; + /*0x0294*/ u16 coins; + /*0x0296*/ u16 registeredItem; // registered for use with SELECT button + /*0x0298*/ u8 filler298[0x78]; + /*0x0310*/ struct ItemSlot bagPocket_Items[BAG_ITEMS_COUNT]; + /*0x03b8*/ struct ItemSlot bagPocket_KeyItems[BAG_KEYITEMS_COUNT]; + /*0x0430*/ struct ItemSlot bagPocket_PokeBalls[BAG_POKEBALLS_COUNT]; + /*0x0464*/ struct ItemSlot bagPocket_TMHM[BAG_TMHM_COUNT]; + /*0x054c*/ struct ItemSlot bagPocket_Berries[BAG_BERRIES_COUNT]; + /*0x05F8*/ u8 seen1[DEX_FLAGS_NO]; + /*0x062C*/ u8 filler_062c[12]; + /*0x0638*/ u8 trainerRematchStepCounter; + u8 filler_639; + /*0x063A*/ u8 trainerRematches[100]; /*0x06A0*/ struct MapObject mapObjects[MAP_OBJECTS_COUNT]; /*0x08E0*/ struct MapObjectTemplate mapObjectTemplates[64]; /*0x0EE0*/ u8 flags[FLAGS_COUNT]; @@ -602,14 +605,27 @@ struct SaveBlock1 /*0x1200*/ u8 filler1200[0x100]; /*0x1300*/ struct QuestLog questLog[4]; /*0x2CA0*/ u8 filler2CA0[0x30]; - /*0x2CD0*/ struct MailStruct mail[MAIL_COUNT]; - /*0x2F10*/ u8 filler2F10[0x1DA]; - /*0x30EC*/ struct EnigmaBerry enigmaBerry; - /*0x3120*/ u8 filler3120[0x340]; + /*0x2CD0*/ struct MailStruct mail[MAIL_COUNT]; + /*0x2F10*/ u8 filler2F10[0x184]; + struct { + /*0x3094*/ u8 unknown1[8]; + /*0x309C*/ u8 giftRibbons[11]; + /*0x30A7*/ u8 unknown2[8]; + /*0x30AF*/ u32 currentPokeCoupons; + /*0x30B3*/ u32 totalEarnedPokeCoupons; + /*0x30B7*/ u8 unknown3[6]; + /*0x30BD*/ u8 receivedWishmakerJirachi; + /*0x30BE*/ u8 unknown4[18]; + } __attribute__((packed)) externalReservedData; + /*0x30D0*/ struct Roamer roamer; + /*0x30EC*/ struct EnigmaBerry enigmaBerry; + /*0x3120*/ u8 filler3120[0x340]; /*0x3460*/ struct MysteryEventStruct unk_3460; /*0x3464*/ u8 filler_3464[0x1b8]; /*0x361C*/ struct RamScript ramScript; - /*0x3A08*/ u8 filler3A08[0x44]; + /*0x3A08*/ u8 filler3A08[12]; + /*0x3A14*/ u8 seen2[DEX_FLAGS_NO]; + /*0x3A48*/ u8 filler_3a48[4]; /*0x3A4C*/ u8 rivalName[PLAYER_NAME_LENGTH]; /*0x3A54*/ u8 filler3A54[0x2E4]; u32 unkArray[4][3]; -- cgit v1.2.3 From d347a95390a5cb61416f0148e9a9661b1ffddde7 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Fri, 23 Nov 2018 15:17:38 -0500 Subject: quest_log_8150454 --- asm/battle_transition.s | 8 +- asm/field_effect.s | 80 +++---- asm/field_effect_helpers.s | 108 ++++----- asm/field_ground_effect.s | 48 ++-- asm/field_map_obj.s | 28 +-- asm/field_player_avatar.s | 4 +- asm/field_specials.s | 4 +- asm/fldeff_cut.s | 8 +- asm/fldeff_flash.s | 4 +- asm/fldeff_strength.s | 8 +- asm/fldeff_sweetscent.s | 4 +- asm/fldeff_teleport.s | 4 +- asm/map_obj_80688E4.s | 8 +- asm/party_menu.s | 12 +- asm/quest_log_8150454.s | 482 ----------------------------------------- asm/rom6.s | 12 +- asm/scrcmd.s | 4 +- asm/trainer_see.s | 16 +- data/data_8468C98.s | 366 ------------------------------- data/data_8471F00.s | 368 +++++++++++++++++++++++++++++++ include/bike.h | 6 + include/field_effect_helpers.h | 1 + include/field_map_obj.h | 3 + include/field_player_avatar.h | 4 + include/quest_log.h | 2 + ld_script.txt | 4 +- src/quest_log_8150454.c | 197 +++++++++++++++++ sym_ewram.txt | 2 +- 28 files changed, 765 insertions(+), 1030 deletions(-) delete mode 100644 asm/quest_log_8150454.s create mode 100644 data/data_8471F00.s create mode 100644 include/bike.h create mode 100644 src/quest_log_8150454.c diff --git a/asm/battle_transition.s b/asm/battle_transition.s index 931c7788c..ae1c7fa08 100644 --- a/asm/battle_transition.s +++ b/asm/battle_transition.s @@ -1522,7 +1522,7 @@ Phase2_Transition_PokeballsTrail_Func2: @ 80D144C ands r5, r0 movs r1, 0 mov r8, r4 - ldr r6, _080D14D4 @ =gUnknown_20386E0 + ldr r6, _080D14D4 @ =gFieldEffectArguments _080D147A: lsls r5, 16 asrs r5, 16 @@ -1567,7 +1567,7 @@ _080D147A: .align 2, 0 _080D14CC: .4byte gUnknown_83FA400 _080D14D0: .4byte gUnknown_83FA404 -_080D14D4: .4byte gUnknown_20386E0 +_080D14D4: .4byte gFieldEffectArguments thumb_func_end Phase2_Transition_PokeballsTrail_Func2 thumb_func_start Phase2_Transition_PokeballsTrail_Func3 @@ -1596,7 +1596,7 @@ _080D1500: .4byte sub_80D13C8 FldEff_Pokeball: @ 80D1504 push {r4,r5,lr} ldr r0, _080D1560 @ =gUnknown_83FA5CC - ldr r5, _080D1564 @ =gUnknown_20386E0 + ldr r5, _080D1564 @ =gFieldEffectArguments movs r2, 0 ldrsh r1, [r5, r2] movs r3, 0x4 @@ -1639,7 +1639,7 @@ FldEff_Pokeball: @ 80D1504 bx r1 .align 2, 0 _080D1560: .4byte gUnknown_83FA5CC -_080D1564: .4byte gUnknown_20386E0 +_080D1564: .4byte gFieldEffectArguments _080D1568: .4byte gSprites _080D156C: .4byte 0x0000ffff thumb_func_end FldEff_Pokeball diff --git a/asm/field_effect.s b/asm/field_effect.s index 4245e711b..1cbdc8214 100644 --- a/asm/field_effect.s +++ b/asm/field_effect.s @@ -2019,7 +2019,7 @@ task00_8084310: @ 8084310 cmp r0, 0 beq _08084376 bl GetCursorSelectionMonId - ldr r1, _08084380 @ =gUnknown_20386E0 + ldr r1, _08084380 @ =gFieldEffectArguments lsls r0, 24 lsrs r0, 24 str r0, [r1] @@ -2053,7 +2053,7 @@ _08084376: bx r0 .align 2, 0 _0808437C: .4byte gTasks -_08084380: .4byte gUnknown_20386E0 +_08084380: .4byte gFieldEffectArguments _08084384: .4byte sub_805671C _08084388: .4byte gUnknown_3005020 _0808438C: .4byte mapldr_08084390 @@ -3238,7 +3238,7 @@ oei_waterfall: @ 8084CA0 adds r1, r0 lsls r1, 3 adds r1, r2 - ldr r2, _08084CD4 @ =gUnknown_20386E0 + ldr r2, _08084CD4 @ =gFieldEffectArguments ldr r2, [r2] strh r2, [r1, 0xA] bl _call_via_r4 @@ -3249,7 +3249,7 @@ oei_waterfall: @ 8084CA0 .align 2, 0 _08084CCC: .4byte sub_8084CD8 _08084CD0: .4byte gTasks -_08084CD4: .4byte gUnknown_20386E0 +_08084CD4: .4byte gFieldEffectArguments thumb_func_end oei_waterfall thumb_func_start sub_8084CD8 @@ -3323,7 +3323,7 @@ waterfall_1_do_anim_probably: @ 8084D44 bne _08084D74 adds r0, r5, 0 bl FieldObjectClearAnimIfSpecialAnimFinished - ldr r1, _08084D7C @ =gUnknown_20386E0 + ldr r1, _08084D7C @ =gFieldEffectArguments movs r2, 0xA ldrsh r0, [r4, r2] str r0, [r1] @@ -3338,7 +3338,7 @@ _08084D74: pop {r1} bx r1 .align 2, 0 -_08084D7C: .4byte gUnknown_20386E0 +_08084D7C: .4byte gFieldEffectArguments thumb_func_end waterfall_1_do_anim_probably thumb_func_start waterfall_2_wait_anim_finish_probably @@ -3442,7 +3442,7 @@ FldEff_UseDive: @ 8084E24 adds r1, r0 lsls r1, 3 adds r1, r2 - ldr r3, _08084E5C @ =gUnknown_20386E0 + ldr r3, _08084E5C @ =gFieldEffectArguments ldr r2, [r3] strh r2, [r1, 0x26] ldr r2, [r3, 0x4] @@ -3455,7 +3455,7 @@ FldEff_UseDive: @ 8084E24 .align 2, 0 _08084E54: .4byte sub_8084E60 _08084E58: .4byte gTasks -_08084E5C: .4byte gUnknown_20386E0 +_08084E5C: .4byte gFieldEffectArguments thumb_func_end FldEff_UseDive thumb_func_start sub_8084E60 @@ -3507,7 +3507,7 @@ dive_2_unknown: @ 8084EAC push {r4,lr} adds r4, r0, 0 bl ScriptContext2_Enable - ldr r1, _08084ED0 @ =gUnknown_20386E0 + ldr r1, _08084ED0 @ =gFieldEffectArguments movs r2, 0x26 ldrsh r0, [r4, r2] str r0, [r1] @@ -3521,7 +3521,7 @@ dive_2_unknown: @ 8084EAC pop {r1} bx r1 .align 2, 0 -_08084ED0: .4byte gUnknown_20386E0 +_08084ED0: .4byte gFieldEffectArguments thumb_func_end dive_2_unknown thumb_func_start dive_3_unknown @@ -3691,7 +3691,7 @@ sub_808500C: @ 808500C strh r0, [r2, 0x26] movs r0, 0x1 strh r0, [r4, 0xE] - ldr r3, _08085054 @ =gUnknown_20386E0 + ldr r3, _08085054 @ =gFieldEffectArguments movs r5, 0x10 ldrsh r0, [r1, r5] str r0, [r3] @@ -3719,7 +3719,7 @@ sub_808500C: @ 808500C pop {r1} bx r1 .align 2, 0 -_08085054: .4byte gUnknown_20386E0 +_08085054: .4byte gFieldEffectArguments thumb_func_end sub_808500C thumb_func_start sub_8085058 @@ -4006,7 +4006,7 @@ sub_8085274: @ 8085274 lsls r0, 24 cmp r0, 0 beq _080852B4 - ldr r1, _080852BC @ =gUnknown_20386E0 + ldr r1, _080852BC @ =gFieldEffectArguments movs r2, 0x10 ldrsh r0, [r5, r2] str r0, [r1] @@ -4034,7 +4034,7 @@ _080852B4: pop {r1} bx r1 .align 2, 0 -_080852BC: .4byte gUnknown_20386E0 +_080852BC: .4byte gFieldEffectArguments thumb_func_end sub_8085274 thumb_func_start sub_80852C0 @@ -4110,7 +4110,7 @@ _08085348: .4byte sub_80851E8 thumb_func_start FldEff_LavaridgeGymWarp FldEff_LavaridgeGymWarp: @ 808534C push {r4,lr} - ldr r4, _080853A4 @ =gUnknown_20386E0 + ldr r4, _080853A4 @ =gFieldEffectArguments adds r1, r4, 0x4 adds r0, r4, 0 movs r2, 0x8 @@ -4151,7 +4151,7 @@ FldEff_LavaridgeGymWarp: @ 808534C pop {r1} bx r1 .align 2, 0 -_080853A4: .4byte gUnknown_20386E0 +_080853A4: .4byte gFieldEffectArguments _080853A8: .4byte gUnknown_83A0010 _080853AC: .4byte gSprites thumb_func_end FldEff_LavaridgeGymWarp @@ -4275,7 +4275,7 @@ sub_8085470: @ 8085470 ldrsh r0, [r5, r2] cmp r0, 0x3 ble _080854C4 - ldr r1, _080854C0 @ =gUnknown_20386E0 + ldr r1, _080854C0 @ =gFieldEffectArguments movs r2, 0x10 ldrsh r0, [r4, r2] str r0, [r1] @@ -4299,7 +4299,7 @@ sub_8085470: @ 8085470 strh r0, [r5, 0x8] b _080854E4 .align 2, 0 -_080854C0: .4byte gUnknown_20386E0 +_080854C0: .4byte gFieldEffectArguments _080854C4: adds r0, r1, 0x1 strh r0, [r5, 0xA] @@ -4414,7 +4414,7 @@ _0808559C: .4byte sub_80853E4 thumb_func_start FldEff_PopOutOfAsh FldEff_PopOutOfAsh: @ 80855A0 push {r4,lr} - ldr r4, _080855F8 @ =gUnknown_20386E0 + ldr r4, _080855F8 @ =gFieldEffectArguments adds r1, r4, 0x4 adds r0, r4, 0 movs r2, 0x8 @@ -4455,7 +4455,7 @@ FldEff_PopOutOfAsh: @ 80855A0 pop {r1} bx r1 .align 2, 0 -_080855F8: .4byte gUnknown_20386E0 +_080855F8: .4byte gFieldEffectArguments _080855FC: .4byte gUnknown_83A0010 _08085600: .4byte gSprites thumb_func_end FldEff_PopOutOfAsh @@ -5777,7 +5777,7 @@ _0808604A: bl CreateTask lsls r0, 24 lsrs r4, r0, 24 - ldr r2, _0808607C @ =gUnknown_20386E0 + ldr r2, _0808607C @ =gFieldEffectArguments ldr r0, [r2] ldr r1, [r2, 0x4] ldr r2, [r2, 0x8] @@ -5796,14 +5796,14 @@ _0808604A: bx r1 .align 2, 0 _08086078: .4byte sub_8086468 -_0808607C: .4byte gUnknown_20386E0 +_0808607C: .4byte gFieldEffectArguments _08086080: .4byte gTasks thumb_func_end FldEff_FieldMoveShowMon thumb_func_start FldEff_FieldMoveShowMonInit FldEff_FieldMoveShowMonInit: @ 8086084 push {r4-r6,lr} - ldr r5, _080860D8 @ =gUnknown_20386E0 + ldr r5, _080860D8 @ =gFieldEffectArguments ldr r0, [r5] movs r6, 0x80 lsls r6, 24 @@ -5839,7 +5839,7 @@ FldEff_FieldMoveShowMonInit: @ 8086084 pop {r1} bx r1 .align 2, 0 -_080860D8: .4byte gUnknown_20386E0 +_080860D8: .4byte gFieldEffectArguments _080860DC: .4byte gPlayerParty thumb_func_end FldEff_FieldMoveShowMonInit @@ -6945,7 +6945,7 @@ sub_8086944: @ 8086944 adds r1, r0 lsls r1, 3 adds r1, r2 - ldr r0, _08086988 @ =gUnknown_20386E0 + ldr r0, _08086988 @ =gFieldEffectArguments ldr r0, [r0] strh r0, [r1, 0x26] bl sav1_reset_battle_music_maybe @@ -6964,7 +6964,7 @@ _08086978: .align 2, 0 _08086980: .4byte sub_8086990 _08086984: .4byte gTasks -_08086988: .4byte gUnknown_20386E0 +_08086988: .4byte gFieldEffectArguments _0808698C: .4byte 0x00000131 thumb_func_end sub_8086944 @@ -7091,7 +7091,7 @@ sub_8086A6C: @ 8086A6C lsls r0, 24 cmp r0, 0 beq _08086AA2 - ldr r2, _08086AB0 @ =gUnknown_20386E0 + ldr r2, _08086AB0 @ =gFieldEffectArguments movs r1, 0x26 ldrsh r0, [r4, r1] movs r1, 0x80 @@ -7110,7 +7110,7 @@ _08086AA2: .align 2, 0 _08086AA8: .4byte gPlayerAvatar _08086AAC: .4byte gMapObjects -_08086AB0: .4byte gUnknown_20386E0 +_08086AB0: .4byte gFieldEffectArguments thumb_func_end sub_8086A6C thumb_func_start sub_8086AB4 @@ -7146,7 +7146,7 @@ sub_8086AB4: @ 8086AB4 lsrs r1, 24 adds r0, r4, 0 bl sub_8063CA4 - ldr r1, _08086B2C @ =gUnknown_20386E0 + ldr r1, _08086B2C @ =gFieldEffectArguments movs r2, 0xA ldrsh r0, [r6, r2] str r0, [r1] @@ -7168,7 +7168,7 @@ _08086B1E: .align 2, 0 _08086B24: .4byte gPlayerAvatar _08086B28: .4byte gMapObjects -_08086B2C: .4byte gUnknown_20386E0 +_08086B2C: .4byte gFieldEffectArguments thumb_func_end sub_8086AB4 thumb_func_start sub_8086B30 @@ -7456,7 +7456,7 @@ sub_8086D38: @ 8086D38 strb r0, [r2, 0x5] ldr r0, _08086D8C @ =sub_8086D94 str r0, [r2, 0x1C] - ldr r0, _08086D90 @ =gUnknown_20386E0 + ldr r0, _08086D90 @ =gFieldEffectArguments ldr r0, [r0] strh r0, [r2, 0x30] movs r0, 0x97 @@ -7469,7 +7469,7 @@ sub_8086D38: @ 8086D38 _08086D84: .4byte gUnknown_83A0010 _08086D88: .4byte gSprites _08086D8C: .4byte sub_8086D94 -_08086D90: .4byte gUnknown_20386E0 +_08086D90: .4byte gFieldEffectArguments thumb_func_end sub_8086D38 thumb_func_start sub_8086D94 @@ -7550,7 +7550,7 @@ FldEff_UseFly: @ 8086E10 adds r1, r0 lsls r1, 3 adds r1, r2 - ldr r0, _08086E3C @ =gUnknown_20386E0 + ldr r0, _08086E3C @ =gFieldEffectArguments ldr r0, [r0] strh r0, [r1, 0xA] movs r0, 0 @@ -7559,7 +7559,7 @@ FldEff_UseFly: @ 8086E10 .align 2, 0 _08086E34: .4byte sub_8086E40 _08086E38: .4byte gTasks -_08086E3C: .4byte gUnknown_20386E0 +_08086E3C: .4byte gFieldEffectArguments thumb_func_end FldEff_UseFly thumb_func_start sub_8086E40 @@ -7648,7 +7648,7 @@ sub_8086EC8: @ 8086EC8 ldrh r0, [r4, 0x8] adds r0, 0x1 strh r0, [r4, 0x8] - ldr r1, _08086F08 @ =gUnknown_20386E0 + ldr r1, _08086F08 @ =gFieldEffectArguments movs r2, 0xA ldrsh r0, [r4, r2] str r0, [r1] @@ -7661,7 +7661,7 @@ _08086EF8: .align 2, 0 _08086F00: .4byte gPlayerAvatar _08086F04: .4byte gMapObjects -_08086F08: .4byte gUnknown_20386E0 +_08086F08: .4byte gFieldEffectArguments thumb_func_end sub_8086EC8 thumb_func_start sub_8086F0C @@ -8977,7 +8977,7 @@ _08087920: .4byte sub_80872F0 sub_8087924: @ 8087924 push {r4-r7,lr} sub sp, 0x4 - ldr r7, _080879C4 @ =gUnknown_20386E0 + ldr r7, _080879C4 @ =gFieldEffectArguments ldrb r0, [r7] ldrb r1, [r7, 0x4] ldrb r2, [r7, 0x8] @@ -9054,7 +9054,7 @@ _080879BA: pop {r1} bx r1 .align 2, 0 -_080879C4: .4byte gUnknown_20386E0 +_080879C4: .4byte gFieldEffectArguments _080879C8: .4byte gMapObjects _080879CC: .4byte sub_80879D8 _080879D0: .4byte gTasks @@ -9176,7 +9176,7 @@ _08087AB0: .4byte gMapObjects sub_8087AB4: @ 8087AB4 push {r4,lr} sub sp, 0x4 - ldr r4, _08087AF8 @ =gUnknown_20386E0 + ldr r4, _08087AF8 @ =gFieldEffectArguments ldrb r0, [r4] ldrb r1, [r4, 0x4] ldrb r2, [r4, 0x8] @@ -9206,7 +9206,7 @@ sub_8087AB4: @ 8087AB4 strh r0, [r1, 0x18] b _08087B0A .align 2, 0 -_08087AF8: .4byte gUnknown_20386E0 +_08087AF8: .4byte gFieldEffectArguments _08087AFC: .4byte sub_8087BC0 _08087B00: .4byte gTasks _08087B04: diff --git a/asm/field_effect_helpers.s b/asm/field_effect_helpers.s index bfeb2b942..ed746de25 100644 --- a/asm/field_effect_helpers.s +++ b/asm/field_effect_helpers.s @@ -580,7 +580,7 @@ _080DB1D8: .4byte gSprites thumb_func_start oei_shadow oei_shadow: @ 80DB1DC push {r4,r5,lr} - ldr r5, _080DB268 @ =gUnknown_20386E0 + ldr r5, _080DB268 @ =gFieldEffectArguments ldrb r0, [r5] ldrb r1, [r5, 0x4] ldrb r2, [r5, 0x8] @@ -648,7 +648,7 @@ _080DB260: pop {r1} bx r1 .align 2, 0 -_080DB268: .4byte gUnknown_20386E0 +_080DB268: .4byte gFieldEffectArguments _080DB26C: .4byte gMapObjects _080DB270: .4byte gUnknown_83A0010 _080DB274: .4byte gUnknown_83FECD2 @@ -757,7 +757,7 @@ _080DB344: .4byte 0x00400001 oei_grass_normal: @ 80DB348 push {r4,r5,lr} sub sp, 0x4 - ldr r5, _080DB3E0 @ =gUnknown_20386E0 + ldr r5, _080DB3E0 @ =gFieldEffectArguments ldrh r1, [r5] mov r0, sp strh r1, [r0] @@ -829,7 +829,7 @@ _080DB3D4: pop {r1} bx r1 .align 2, 0 -_080DB3E0: .4byte gUnknown_20386E0 +_080DB3E0: .4byte gFieldEffectArguments _080DB3E4: .4byte gUnknown_83A0010 _080DB3E8: .4byte gSprites thumb_func_end oei_grass_normal @@ -972,7 +972,7 @@ _080DB4F0: .4byte gMapObjects thumb_func_start FldEff_JumpTallGrass FldEff_JumpTallGrass: @ 80DB4F4 push {r4,lr} - ldr r4, _080DB558 @ =gUnknown_20386E0 + ldr r4, _080DB558 @ =gFieldEffectArguments adds r1, r4, 0x4 adds r0, r4, 0 movs r2, 0x8 @@ -1021,7 +1021,7 @@ _080DB550: pop {r1} bx r1 .align 2, 0 -_080DB558: .4byte gUnknown_20386E0 +_080DB558: .4byte gFieldEffectArguments _080DB55C: .4byte gUnknown_83A0010 _080DB560: .4byte gSprites thumb_func_end FldEff_JumpTallGrass @@ -1107,7 +1107,7 @@ _080DB5E8: FldEff_LongGrass: @ 80DB5F4 push {r4,r5,lr} sub sp, 0x4 - ldr r5, _080DB690 @ =gUnknown_20386E0 + ldr r5, _080DB690 @ =gFieldEffectArguments ldrh r1, [r5] mov r0, sp strh r1, [r0] @@ -1180,7 +1180,7 @@ _080DB684: pop {r1} bx r1 .align 2, 0 -_080DB690: .4byte gUnknown_20386E0 +_080DB690: .4byte gFieldEffectArguments _080DB694: .4byte gUnknown_83A0010 _080DB698: .4byte gSprites thumb_func_end FldEff_LongGrass @@ -1315,7 +1315,7 @@ _080DB794: .4byte gMapObjects thumb_func_start FldEff_JumpLongGrass FldEff_JumpLongGrass: @ 80DB798 push {r4,lr} - ldr r4, _080DB7FC @ =gUnknown_20386E0 + ldr r4, _080DB7FC @ =gFieldEffectArguments adds r1, r4, 0x4 adds r0, r4, 0 movs r2, 0x8 @@ -1364,7 +1364,7 @@ _080DB7F4: pop {r1} bx r1 .align 2, 0 -_080DB7FC: .4byte gUnknown_20386E0 +_080DB7FC: .4byte gFieldEffectArguments _080DB800: .4byte gUnknown_83A0010 _080DB804: .4byte gSprites thumb_func_end FldEff_JumpLongGrass @@ -1372,7 +1372,7 @@ _080DB804: .4byte gSprites thumb_func_start sub_80DB808 sub_80DB808: @ 80DB808 push {r4-r6,lr} - ldr r6, _080DB89C @ =gUnknown_20386E0 + ldr r6, _080DB89C @ =gFieldEffectArguments ldrb r0, [r6] ldrb r1, [r6, 0x4] ldrb r2, [r6, 0x8] @@ -1445,7 +1445,7 @@ _080DB894: pop {r1} bx r1 .align 2, 0 -_080DB89C: .4byte gUnknown_20386E0 +_080DB89C: .4byte gFieldEffectArguments _080DB8A0: .4byte gMapObjects _080DB8A4: .4byte gUnknown_83A0010 _080DB8A8: .4byte gSprites @@ -1579,7 +1579,7 @@ _080DB99C: .4byte gSprites thumb_func_start FldEff_SandFootprints FldEff_SandFootprints: @ 80DB9A0 push {r4,lr} - ldr r4, _080DBA08 @ =gUnknown_20386E0 + ldr r4, _080DBA08 @ =gFieldEffectArguments adds r1, r4, 0x4 adds r0, r4, 0 movs r2, 0x8 @@ -1628,7 +1628,7 @@ _080DB9FE: pop {r1} bx r1 .align 2, 0 -_080DBA08: .4byte gUnknown_20386E0 +_080DBA08: .4byte gFieldEffectArguments _080DBA0C: .4byte gUnknown_83A0010 _080DBA10: .4byte gSprites thumb_func_end FldEff_SandFootprints @@ -1636,7 +1636,7 @@ _080DBA10: .4byte gSprites thumb_func_start FldEff_DeepSandFootprints FldEff_DeepSandFootprints: @ 80DBA14 push {r4,r5,lr} - ldr r4, _080DBA7C @ =gUnknown_20386E0 + ldr r4, _080DBA7C @ =gFieldEffectArguments adds r1, r4, 0x4 adds r0, r4, 0 movs r2, 0x8 @@ -1686,7 +1686,7 @@ _080DBA74: pop {r1} bx r1 .align 2, 0 -_080DBA7C: .4byte gUnknown_20386E0 +_080DBA7C: .4byte gFieldEffectArguments _080DBA80: .4byte gUnknown_83A0010 _080DBA84: .4byte gSprites thumb_func_end FldEff_DeepSandFootprints @@ -1694,7 +1694,7 @@ _080DBA84: .4byte gSprites thumb_func_start FldEff_BikeTireTracks FldEff_BikeTireTracks: @ 80DBA88 push {r4,r5,lr} - ldr r4, _080DBAF0 @ =gUnknown_20386E0 + ldr r4, _080DBAF0 @ =gFieldEffectArguments adds r1, r4, 0x4 adds r0, r4, 0 movs r2, 0x8 @@ -1744,7 +1744,7 @@ _080DBAE8: pop {r1} bx r1 .align 2, 0 -_080DBAF0: .4byte gUnknown_20386E0 +_080DBAF0: .4byte gFieldEffectArguments _080DBAF4: .4byte gUnknown_83A0010 _080DBAF8: .4byte gSprites thumb_func_end FldEff_BikeTireTracks @@ -1829,7 +1829,7 @@ _080DBB80: thumb_func_start FldEff_Splash FldEff_Splash: @ 80DBB88 push {r4-r6,lr} - ldr r6, _080DBC1C @ =gUnknown_20386E0 + ldr r6, _080DBC1C @ =gFieldEffectArguments ldrb r0, [r6] ldrb r1, [r6, 0x4] ldrb r2, [r6, 0x8] @@ -1899,7 +1899,7 @@ _080DBC12: pop {r1} bx r1 .align 2, 0 -_080DBC1C: .4byte gUnknown_20386E0 +_080DBC1C: .4byte gFieldEffectArguments _080DBC20: .4byte gMapObjects _080DBC24: .4byte gUnknown_83A0010 _080DBC28: .4byte gSprites @@ -1980,7 +1980,7 @@ _080DBCB4: .4byte gMapObjects thumb_func_start FldEff_JumpSmallSplash FldEff_JumpSmallSplash: @ 80DBCB8 push {r4,lr} - ldr r4, _080DBD1C @ =gUnknown_20386E0 + ldr r4, _080DBD1C @ =gFieldEffectArguments adds r1, r4, 0x4 adds r0, r4, 0 movs r2, 0x8 @@ -2029,7 +2029,7 @@ _080DBD14: pop {r1} bx r1 .align 2, 0 -_080DBD1C: .4byte gUnknown_20386E0 +_080DBD1C: .4byte gFieldEffectArguments _080DBD20: .4byte gUnknown_83A0010 _080DBD24: .4byte gSprites thumb_func_end FldEff_JumpSmallSplash @@ -2037,7 +2037,7 @@ _080DBD24: .4byte gSprites thumb_func_start oei_water_drop_tall oei_water_drop_tall: @ 80DBD28 push {r4,lr} - ldr r4, _080DBD8C @ =gUnknown_20386E0 + ldr r4, _080DBD8C @ =gFieldEffectArguments adds r1, r4, 0x4 adds r0, r4, 0 movs r2, 0x8 @@ -2086,7 +2086,7 @@ _080DBD84: pop {r1} bx r1 .align 2, 0 -_080DBD8C: .4byte gUnknown_20386E0 +_080DBD8C: .4byte gFieldEffectArguments _080DBD90: .4byte gUnknown_83A0010 _080DBD94: .4byte gSprites thumb_func_end oei_water_drop_tall @@ -2094,7 +2094,7 @@ _080DBD94: .4byte gSprites thumb_func_start FldEff_FeetInFlowingWater FldEff_FeetInFlowingWater: @ 80DBD98 push {r4-r7,lr} - ldr r7, _080DBE38 @ =gUnknown_20386E0 + ldr r7, _080DBE38 @ =gFieldEffectArguments ldrb r0, [r7] ldrb r1, [r7, 0x4] ldrb r2, [r7, 0x8] @@ -2170,7 +2170,7 @@ _080DBE2E: pop {r1} bx r1 .align 2, 0 -_080DBE38: .4byte gUnknown_20386E0 +_080DBE38: .4byte gFieldEffectArguments _080DBE3C: .4byte gMapObjects _080DBE40: .4byte gUnknown_83A0010 _080DBE44: .4byte gSprites @@ -2265,7 +2265,7 @@ oei_ripples: @ 80DBEF0 push {r4,lr} ldr r0, _080DBF44 @ =gUnknown_83A0010 ldr r0, [r0, 0x14] - ldr r4, _080DBF48 @ =gUnknown_20386E0 + ldr r4, _080DBF48 @ =gFieldEffectArguments movs r2, 0 ldrsh r1, [r4, r2] movs r3, 0x4 @@ -2306,14 +2306,14 @@ _080DBF3C: bx r1 .align 2, 0 _080DBF44: .4byte gUnknown_83A0010 -_080DBF48: .4byte gUnknown_20386E0 +_080DBF48: .4byte gFieldEffectArguments _080DBF4C: .4byte gSprites thumb_func_end oei_ripples thumb_func_start sub_80DBF50 sub_80DBF50: @ 80DBF50 push {r4-r6,lr} - ldr r6, _080DBFE4 @ =gUnknown_20386E0 + ldr r6, _080DBFE4 @ =gFieldEffectArguments ldrb r0, [r6] ldrb r1, [r6, 0x4] ldrb r2, [r6, 0x8] @@ -2386,7 +2386,7 @@ _080DBFDC: pop {r1} bx r1 .align 2, 0 -_080DBFE4: .4byte gUnknown_20386E0 +_080DBFE4: .4byte gFieldEffectArguments _080DBFE8: .4byte gMapObjects _080DBFEC: .4byte gUnknown_83A0010 _080DBFF0: .4byte gSprites @@ -2474,7 +2474,7 @@ _080DC088: .4byte gSprites thumb_func_start FldEff_Unknown19 FldEff_Unknown19: @ 80DC08C push {r4,lr} - ldr r4, _080DC0EC @ =gUnknown_20386E0 + ldr r4, _080DC0EC @ =gFieldEffectArguments adds r1, r4, 0x4 adds r0, r4, 0 movs r2, 0x8 @@ -2521,7 +2521,7 @@ _080DC0E4: pop {r1} bx r1 .align 2, 0 -_080DC0EC: .4byte gUnknown_20386E0 +_080DC0EC: .4byte gFieldEffectArguments _080DC0F0: .4byte gUnknown_83A0010 _080DC0F4: .4byte gSprites thumb_func_end FldEff_Unknown19 @@ -2529,7 +2529,7 @@ _080DC0F4: .4byte gSprites thumb_func_start FldEff_Unknown20 FldEff_Unknown20: @ 80DC0F8 push {r4,lr} - ldr r4, _080DC158 @ =gUnknown_20386E0 + ldr r4, _080DC158 @ =gFieldEffectArguments adds r1, r4, 0x4 adds r0, r4, 0 movs r2, 0x8 @@ -2576,7 +2576,7 @@ _080DC150: pop {r1} bx r1 .align 2, 0 -_080DC158: .4byte gUnknown_20386E0 +_080DC158: .4byte gFieldEffectArguments _080DC15C: .4byte gUnknown_83A0010 _080DC160: .4byte gSprites thumb_func_end FldEff_Unknown20 @@ -2584,7 +2584,7 @@ _080DC160: .4byte gSprites thumb_func_start FldEff_Unknown21 FldEff_Unknown21: @ 80DC164 push {r4,lr} - ldr r4, _080DC1C4 @ =gUnknown_20386E0 + ldr r4, _080DC1C4 @ =gFieldEffectArguments adds r1, r4, 0x4 adds r0, r4, 0 movs r2, 0x8 @@ -2631,7 +2631,7 @@ _080DC1BC: pop {r1} bx r1 .align 2, 0 -_080DC1C4: .4byte gUnknown_20386E0 +_080DC1C4: .4byte gFieldEffectArguments _080DC1C8: .4byte gUnknown_83A0010 _080DC1CC: .4byte gSprites thumb_func_end FldEff_Unknown21 @@ -2639,7 +2639,7 @@ _080DC1CC: .4byte gSprites thumb_func_start FldEff_Unknown22 FldEff_Unknown22: @ 80DC1D0 push {r4,lr} - ldr r4, _080DC230 @ =gUnknown_20386E0 + ldr r4, _080DC230 @ =gFieldEffectArguments adds r1, r4, 0x4 adds r0, r4, 0 movs r2, 0x8 @@ -2686,7 +2686,7 @@ _080DC228: pop {r1} bx r1 .align 2, 0 -_080DC230: .4byte gUnknown_20386E0 +_080DC230: .4byte gFieldEffectArguments _080DC234: .4byte gUnknown_83A0010 _080DC238: .4byte gSprites thumb_func_end FldEff_Unknown22 @@ -2696,7 +2696,7 @@ ash: @ 80DC23C push {r4,lr} lsls r2, 16 lsrs r2, 16 - ldr r4, _080DC26C @ =gUnknown_20386E0 + ldr r4, _080DC26C @ =gFieldEffectArguments lsls r0, 16 asrs r0, 16 str r0, [r4] @@ -2717,14 +2717,14 @@ ash: @ 80DC23C pop {r0} bx r0 .align 2, 0 -_080DC26C: .4byte gUnknown_20386E0 +_080DC26C: .4byte gFieldEffectArguments thumb_func_end ash thumb_func_start oei_ash oei_ash: @ 80DC270 push {r4,r5,lr} sub sp, 0x4 - ldr r5, _080DC2F0 @ =gUnknown_20386E0 + ldr r5, _080DC2F0 @ =gFieldEffectArguments ldrh r1, [r5] mov r0, sp strh r1, [r0] @@ -2786,7 +2786,7 @@ _080DC2E6: pop {r1} bx r1 .align 2, 0 -_080DC2F0: .4byte gUnknown_20386E0 +_080DC2F0: .4byte gFieldEffectArguments _080DC2F4: .4byte gUnknown_83A0010 _080DC2F8: .4byte gSprites thumb_func_end oei_ash @@ -2909,7 +2909,7 @@ _080DC3C8: thumb_func_start sub_80DC3D0 sub_80DC3D0: @ 80DC3D0 push {r4,r5,lr} - ldr r4, _080DC43C @ =gUnknown_20386E0 + ldr r4, _080DC43C @ =gFieldEffectArguments adds r1, r4, 0x4 adds r0, r4, 0 movs r2, 0x8 @@ -2960,7 +2960,7 @@ _080DC42C: pop {r1} bx r1 .align 2, 0 -_080DC43C: .4byte gUnknown_20386E0 +_080DC43C: .4byte gFieldEffectArguments _080DC440: .4byte gUnknown_83A0010 _080DC444: .4byte gSprites _080DC448: .4byte 0x0000ffff @@ -3387,7 +3387,7 @@ _080DC73C: .4byte gSprites thumb_func_start FldEff_Dust FldEff_Dust: @ 80DC740 push {r4,lr} - ldr r4, _080DC7A4 @ =gUnknown_20386E0 + ldr r4, _080DC7A4 @ =gFieldEffectArguments adds r1, r4, 0x4 adds r0, r4, 0 movs r2, 0x8 @@ -3436,7 +3436,7 @@ _080DC79C: pop {r1} bx r1 .align 2, 0 -_080DC7A4: .4byte gUnknown_20386E0 +_080DC7A4: .4byte gFieldEffectArguments _080DC7A8: .4byte gUnknown_83A0010 _080DC7AC: .4byte gSprites thumb_func_end FldEff_Dust @@ -3444,7 +3444,7 @@ _080DC7AC: .4byte gSprites thumb_func_start FldEff_SandPile FldEff_SandPile: @ 80DC7B0 push {r4-r7,lr} - ldr r7, _080DC85C @ =gUnknown_20386E0 + ldr r7, _080DC85C @ =gFieldEffectArguments ldrb r0, [r7] ldrb r1, [r7, 0x4] ldrb r2, [r7, 0x8] @@ -3527,7 +3527,7 @@ _080DC854: pop {r1} bx r1 .align 2, 0 -_080DC85C: .4byte gUnknown_20386E0 +_080DC85C: .4byte gFieldEffectArguments _080DC860: .4byte gMapObjects _080DC864: .4byte gUnknown_83A0010 _080DC868: .4byte gSprites @@ -3641,7 +3641,7 @@ _080DC934: .4byte gMapObjects thumb_func_start FldEff_Bubbles FldEff_Bubbles: @ 80DC938 push {r4,lr} - ldr r4, _080DC990 @ =gUnknown_20386E0 + ldr r4, _080DC990 @ =gFieldEffectArguments adds r1, r4, 0x4 adds r0, r4, 0 movs r2, 0x8 @@ -3684,7 +3684,7 @@ _080DC988: pop {r1} bx r1 .align 2, 0 -_080DC990: .4byte gUnknown_20386E0 +_080DC990: .4byte gFieldEffectArguments _080DC994: .4byte gUnknown_83A0010 _080DC998: .4byte gSprites thumb_func_end FldEff_Bubbles @@ -3775,7 +3775,7 @@ ShowDisguiseFieldEffect: @ 80DCA10 lsrs r6, r1, 24 lsls r2, 24 lsrs r7, r2, 24 - ldr r5, _080DCA44 @ =gUnknown_20386E0 + ldr r5, _080DCA44 @ =gFieldEffectArguments ldrb r0, [r5] ldrb r1, [r5, 0x4] ldrb r2, [r5, 0x8] @@ -3789,7 +3789,7 @@ ShowDisguiseFieldEffect: @ 80DCA10 movs r0, 0x40 b _080DCAB4 .align 2, 0 -_080DCA44: .4byte gUnknown_20386E0 +_080DCA44: .4byte gFieldEffectArguments _080DCA48: ldr r1, _080DCAC0 @ =gUnknown_83A0010 lsls r0, r6, 2 @@ -4043,7 +4043,7 @@ _080DCC18: thumb_func_start FldEff_Sparkle FldEff_Sparkle: @ 80DCC1C push {r4,lr} - ldr r4, _080DCC84 @ =gUnknown_20386E0 + ldr r4, _080DCC84 @ =gFieldEffectArguments ldr r0, [r4] adds r0, 0x7 str r0, [r4] @@ -4094,7 +4094,7 @@ _080DCC7C: pop {r1} bx r1 .align 2, 0 -_080DCC84: .4byte gUnknown_20386E0 +_080DCC84: .4byte gFieldEffectArguments _080DCC88: .4byte gUnknown_83A0010 _080DCC8C: .4byte gSprites thumb_func_end FldEff_Sparkle diff --git a/asm/field_ground_effect.s b/asm/field_ground_effect.s index 62bc54815..56af66346 100644 --- a/asm/field_ground_effect.s +++ b/asm/field_ground_effect.s @@ -1139,7 +1139,7 @@ _08068378: thumb_func_start GroundEffect_SpawnOnTallGrass GroundEffect_SpawnOnTallGrass: @ 806837C push {lr} - ldr r3, _080683C0 @ =gUnknown_20386E0 + ldr r3, _080683C0 @ =gFieldEffectArguments movs r2, 0x10 ldrsh r1, [r0, r2] str r1, [r3] @@ -1172,14 +1172,14 @@ GroundEffect_SpawnOnTallGrass: @ 806837C pop {r0} bx r0 .align 2, 0 -_080683C0: .4byte gUnknown_20386E0 +_080683C0: .4byte gFieldEffectArguments _080683C4: .4byte gSaveBlock1Ptr thumb_func_end GroundEffect_SpawnOnTallGrass thumb_func_start GroundEffect_StepOnTallGrass GroundEffect_StepOnTallGrass: @ 80683C8 push {lr} - ldr r3, _0806840C @ =gUnknown_20386E0 + ldr r3, _0806840C @ =gFieldEffectArguments movs r2, 0x10 ldrsh r1, [r0, r2] str r1, [r3] @@ -1212,14 +1212,14 @@ GroundEffect_StepOnTallGrass: @ 80683C8 pop {r0} bx r0 .align 2, 0 -_0806840C: .4byte gUnknown_20386E0 +_0806840C: .4byte gFieldEffectArguments _08068410: .4byte gSaveBlock1Ptr thumb_func_end GroundEffect_StepOnTallGrass thumb_func_start GroundEffect_SpawnOnLongGrass GroundEffect_SpawnOnLongGrass: @ 8068414 push {lr} - ldr r3, _08068458 @ =gUnknown_20386E0 + ldr r3, _08068458 @ =gFieldEffectArguments movs r2, 0x10 ldrsh r1, [r0, r2] str r1, [r3] @@ -1252,14 +1252,14 @@ GroundEffect_SpawnOnLongGrass: @ 8068414 pop {r0} bx r0 .align 2, 0 -_08068458: .4byte gUnknown_20386E0 +_08068458: .4byte gFieldEffectArguments _0806845C: .4byte gSaveBlock1Ptr thumb_func_end GroundEffect_SpawnOnLongGrass thumb_func_start GroundEffect_StepOnLongGrass GroundEffect_StepOnLongGrass: @ 8068460 push {lr} - ldr r3, _080684A4 @ =gUnknown_20386E0 + ldr r3, _080684A4 @ =gFieldEffectArguments movs r2, 0x10 ldrsh r1, [r0, r2] str r1, [r3] @@ -1292,7 +1292,7 @@ GroundEffect_StepOnLongGrass: @ 8068460 pop {r0} bx r0 .align 2, 0 -_080684A4: .4byte gUnknown_20386E0 +_080684A4: .4byte gFieldEffectArguments _080684A8: .4byte gSaveBlock1Ptr thumb_func_end GroundEffect_StepOnLongGrass @@ -1386,7 +1386,7 @@ DoTracksGroundEffect_Footprints: @ 8068530 mov r0, sp movs r2, 0x4 bl memcpy - ldr r1, _0806857C @ =gUnknown_20386E0 + ldr r1, _0806857C @ =gFieldEffectArguments movs r2, 0x14 ldrsh r0, [r5, r2] str r0, [r1] @@ -1412,7 +1412,7 @@ DoTracksGroundEffect_Footprints: @ 8068530 bx r0 .align 2, 0 _08068578: .4byte gUnknown_83A70A8 -_0806857C: .4byte gUnknown_20386E0 +_0806857C: .4byte gFieldEffectArguments thumb_func_end DoTracksGroundEffect_Footprints thumb_func_start DoTracksGroundEffect_BikeTireTracks @@ -1423,7 +1423,7 @@ DoTracksGroundEffect_BikeTireTracks: @ 8068580 ldr r0, [r4, 0x14] cmp r1, r0 beq _080685C2 - ldr r2, _080685C8 @ =gUnknown_20386E0 + ldr r2, _080685C8 @ =gFieldEffectArguments movs r1, 0x14 ldrsh r0, [r4, r1] str r0, [r2] @@ -1454,7 +1454,7 @@ _080685C2: pop {r0} bx r0 .align 2, 0 -_080685C8: .4byte gUnknown_20386E0 +_080685C8: .4byte gFieldEffectArguments _080685CC: .4byte gUnknown_83A70AC thumb_func_end DoTracksGroundEffect_BikeTireTracks @@ -1492,7 +1492,7 @@ GroundEffect_JumpOnTallGrass: @ 80685FC sub sp, 0x4 adds r5, r0, 0 adds r6, r1, 0 - ldr r1, _08068650 @ =gUnknown_20386E0 + ldr r1, _08068650 @ =gFieldEffectArguments movs r2, 0x10 ldrsh r0, [r5, r2] str r0, [r1] @@ -1528,13 +1528,13 @@ _08068646: pop {r0} bx r0 .align 2, 0 -_08068650: .4byte gUnknown_20386E0 +_08068650: .4byte gFieldEffectArguments thumb_func_end GroundEffect_JumpOnTallGrass thumb_func_start GroundEffect_JumpOnLongGrass GroundEffect_JumpOnLongGrass: @ 8068654 push {lr} - ldr r2, _08068678 @ =gUnknown_20386E0 + ldr r2, _08068678 @ =gFieldEffectArguments movs r3, 0x10 ldrsh r1, [r0, r3] str r1, [r2] @@ -1551,13 +1551,13 @@ GroundEffect_JumpOnLongGrass: @ 8068654 pop {r0} bx r0 .align 2, 0 -_08068678: .4byte gUnknown_20386E0 +_08068678: .4byte gFieldEffectArguments thumb_func_end GroundEffect_JumpOnLongGrass thumb_func_start GroundEffect_JumpOnShallowWater GroundEffect_JumpOnShallowWater: @ 806867C push {r4,lr} - ldr r3, _080686A8 @ =gUnknown_20386E0 + ldr r3, _080686A8 @ =gFieldEffectArguments movs r4, 0x10 ldrsh r2, [r0, r4] str r2, [r3] @@ -1577,13 +1577,13 @@ GroundEffect_JumpOnShallowWater: @ 806867C pop {r0} bx r0 .align 2, 0 -_080686A8: .4byte gUnknown_20386E0 +_080686A8: .4byte gFieldEffectArguments thumb_func_end GroundEffect_JumpOnShallowWater thumb_func_start GroundEffect_JumpOnWater GroundEffect_JumpOnWater: @ 80686AC push {r4,lr} - ldr r3, _080686D8 @ =gUnknown_20386E0 + ldr r3, _080686D8 @ =gFieldEffectArguments movs r4, 0x10 ldrsh r2, [r0, r4] str r2, [r3] @@ -1603,13 +1603,13 @@ GroundEffect_JumpOnWater: @ 80686AC pop {r0} bx r0 .align 2, 0 -_080686D8: .4byte gUnknown_20386E0 +_080686D8: .4byte gFieldEffectArguments thumb_func_end GroundEffect_JumpOnWater thumb_func_start GroundEffect_JumpLandingDust GroundEffect_JumpLandingDust: @ 80686DC push {r4,lr} - ldr r3, _08068708 @ =gUnknown_20386E0 + ldr r3, _08068708 @ =gFieldEffectArguments movs r4, 0x10 ldrsh r2, [r0, r4] str r2, [r3] @@ -1629,7 +1629,7 @@ GroundEffect_JumpLandingDust: @ 80686DC pop {r0} bx r0 .align 2, 0 -_08068708: .4byte gUnknown_20386E0 +_08068708: .4byte gFieldEffectArguments thumb_func_end GroundEffect_JumpLandingDust thumb_func_start GroundEffect_ShortGrass @@ -1655,7 +1655,7 @@ GroundEffect_HotSprings: @ 806871C thumb_func_start GroundEffect_Seaweed GroundEffect_Seaweed: @ 806872C push {lr} - ldr r2, _08068748 @ =gUnknown_20386E0 + ldr r2, _08068748 @ =gFieldEffectArguments movs r3, 0x10 ldrsh r1, [r0, r3] str r1, [r2] @@ -1667,7 +1667,7 @@ GroundEffect_Seaweed: @ 806872C pop {r0} bx r0 .align 2, 0 -_08068748: .4byte gUnknown_20386E0 +_08068748: .4byte gFieldEffectArguments thumb_func_end GroundEffect_Seaweed thumb_func_start DoFlaggedGroundEffects diff --git a/asm/field_map_obj.s b/asm/field_map_obj.s index d82f467dc..308421098 100644 --- a/asm/field_map_obj.s +++ b/asm/field_map_obj.s @@ -11168,7 +11168,7 @@ FieldObjectCB_TreeDisguise: @ 8062F08 cmp r0, 0 bne _08062F50 _08062F30: - ldr r1, _08062F70 @ =gUnknown_20386E0 + ldr r1, _08062F70 @ =gFieldEffectArguments adds r2, r1, 0x4 adds r3, r1, 0 adds r3, 0x8 @@ -11198,7 +11198,7 @@ _08062F50: bx r0 .align 2, 0 _08062F6C: .4byte gMapObjects -_08062F70: .4byte gUnknown_20386E0 +_08062F70: .4byte gFieldEffectArguments _08062F74: .4byte sub_8062F78 thumb_func_end FieldObjectCB_TreeDisguise @@ -11234,7 +11234,7 @@ FieldObjectCB_MountainDisguise: @ 8062F84 cmp r0, 0 bne _08062FCC _08062FAC: - ldr r1, _08062FEC @ =gUnknown_20386E0 + ldr r1, _08062FEC @ =gFieldEffectArguments adds r2, r1, 0x4 adds r3, r1, 0 adds r3, 0x8 @@ -11264,7 +11264,7 @@ _08062FCC: bx r0 .align 2, 0 _08062FE8: .4byte gMapObjects -_08062FEC: .4byte gUnknown_20386E0 +_08062FEC: .4byte gFieldEffectArguments _08062FF0: .4byte sub_8062F78 thumb_func_end FieldObjectCB_MountainDisguise @@ -19462,7 +19462,7 @@ sub_8066910: @ 8066910 do_exclamation_mark_bubble_1: @ 8066920 push {r4,lr} adds r4, r1, 0 - ldr r1, _08066940 @ =gUnknown_20386E0 + ldr r1, _08066940 @ =gFieldEffectArguments adds r2, r1, 0x4 adds r3, r1, 0 adds r3, 0x8 @@ -19475,14 +19475,14 @@ do_exclamation_mark_bubble_1: @ 8066920 pop {r1} bx r1 .align 2, 0 -_08066940: .4byte gUnknown_20386E0 +_08066940: .4byte gFieldEffectArguments thumb_func_end do_exclamation_mark_bubble_1 thumb_func_start do_exclamation_mark_bubble_2 do_exclamation_mark_bubble_2: @ 8066944 push {r4,lr} adds r4, r1, 0 - ldr r1, _08066964 @ =gUnknown_20386E0 + ldr r1, _08066964 @ =gFieldEffectArguments adds r2, r1, 0x4 adds r3, r1, 0 adds r3, 0x8 @@ -19495,14 +19495,14 @@ do_exclamation_mark_bubble_2: @ 8066944 pop {r1} bx r1 .align 2, 0 -_08066964: .4byte gUnknown_20386E0 +_08066964: .4byte gFieldEffectArguments thumb_func_end do_exclamation_mark_bubble_2 thumb_func_start do_heart_bubble do_heart_bubble: @ 8066968 push {r4,lr} adds r4, r1, 0 - ldr r1, _08066988 @ =gUnknown_20386E0 + ldr r1, _08066988 @ =gFieldEffectArguments adds r2, r1, 0x4 adds r3, r1, 0 adds r3, 0x8 @@ -19515,14 +19515,14 @@ do_heart_bubble: @ 8066968 pop {r1} bx r1 .align 2, 0 -_08066988: .4byte gUnknown_20386E0 +_08066988: .4byte gFieldEffectArguments thumb_func_end do_heart_bubble thumb_func_start sub_806698C sub_806698C: @ 806698C push {r4,lr} adds r4, r1, 0 - ldr r1, _080669AC @ =gUnknown_20386E0 + ldr r1, _080669AC @ =gFieldEffectArguments adds r2, r1, 0x4 adds r3, r1, 0 adds r3, 0x8 @@ -19535,14 +19535,14 @@ sub_806698C: @ 806698C pop {r1} bx r1 .align 2, 0 -_080669AC: .4byte gUnknown_20386E0 +_080669AC: .4byte gFieldEffectArguments thumb_func_end sub_806698C thumb_func_start sub_80669B0 sub_80669B0: @ 80669B0 push {r4,lr} adds r4, r1, 0 - ldr r1, _080669D0 @ =gUnknown_20386E0 + ldr r1, _080669D0 @ =gFieldEffectArguments adds r2, r1, 0x4 adds r3, r1, 0 adds r3, 0x8 @@ -19555,7 +19555,7 @@ sub_80669B0: @ 80669B0 pop {r1} bx r1 .align 2, 0 -_080669D0: .4byte gUnknown_20386E0 +_080669D0: .4byte gFieldEffectArguments thumb_func_end sub_80669B0 thumb_func_start sub_80669D4 diff --git a/asm/field_player_avatar.s b/asm/field_player_avatar.s index 65d56af88..aa68c6ef2 100644 --- a/asm/field_player_avatar.s +++ b/asm/field_player_avatar.s @@ -3559,7 +3559,7 @@ sub_805CD84: @ 805CD84 lsrs r1, 24 adds r0, r4, 0 bl sub_805C0A4 - ldr r2, _0805CE18 @ =gUnknown_20386E0 + ldr r2, _0805CE18 @ =gFieldEffectArguments movs r1, 0x10 ldrsh r0, [r4, r1] str r0, [r2] @@ -3592,7 +3592,7 @@ _0805CE0E: pop {r1} bx r1 .align 2, 0 -_0805CE18: .4byte gUnknown_20386E0 +_0805CE18: .4byte gFieldEffectArguments _0805CE1C: .4byte gSprites thumb_func_end sub_805CD84 diff --git a/asm/field_specials.s b/asm/field_specials.s index 0a0bbb7ec..c6df3442d 100644 --- a/asm/field_specials.s +++ b/asm/field_specials.s @@ -5338,7 +5338,7 @@ _080CCF32: ldr r0, _080CCF64 @ =sub_80CCF98 movs r1, 0x8 bl CreateTask - ldr r3, _080CCF68 @ =gUnknown_20386E0 + ldr r3, _080CCF68 @ =gFieldEffectArguments movs r0, 0x1 str r0, [r3] movs r0, 0x38 @@ -5361,7 +5361,7 @@ _080CCF32: b _080CCF72 .align 2, 0 _080CCF64: .4byte sub_80CCF98 -_080CCF68: .4byte gUnknown_20386E0 +_080CCF68: .4byte gFieldEffectArguments _080CCF6C: .4byte gUnknown_83F6366 _080CCF70: movs r0, 0x5 diff --git a/asm/fldeff_cut.s b/asm/fldeff_cut.s index 5710a320e..2497c695d 100644 --- a/asm/fldeff_cut.s +++ b/asm/fldeff_cut.s @@ -146,14 +146,14 @@ sub_8097984: @ 8097984 movs r0, 0x1 bl FieldEffectStart bl GetCursorSelectionMonId - ldr r1, _0809799C @ =gUnknown_20386E0 + ldr r1, _0809799C @ =gFieldEffectArguments lsls r0, 24 lsrs r0, 24 str r0, [r1] pop {r0} bx r0 .align 2, 0 -_0809799C: .4byte gUnknown_20386E0 +_0809799C: .4byte gFieldEffectArguments thumb_func_end sub_8097984 thumb_func_start sub_80979A0 @@ -185,7 +185,7 @@ _080979CC: .4byte sub_8097A20 sub_80979D0: @ 80979D0 push {lr} bl GetCursorSelectionMonId - ldr r1, _080979E8 @ =gUnknown_20386E0 + ldr r1, _080979E8 @ =gFieldEffectArguments lsls r0, 24 lsrs r0, 24 str r0, [r1] @@ -194,7 +194,7 @@ sub_80979D0: @ 80979D0 pop {r0} bx r0 .align 2, 0 -_080979E8: .4byte gUnknown_20386E0 +_080979E8: .4byte gFieldEffectArguments _080979EC: .4byte gUnknown_81BDF6B thumb_func_end sub_80979D0 diff --git a/asm/fldeff_flash.s b/asm/fldeff_flash.s index 8fc9af0e3..6466c706e 100644 --- a/asm/fldeff_flash.s +++ b/asm/fldeff_flash.s @@ -47,7 +47,7 @@ sub_80C9B74: @ 80C9B74 lsls r4, 24 lsrs r4, 24 bl GetCursorSelectionMonId - ldr r1, _080C9BA4 @ =gUnknown_20386E0 + ldr r1, _080C9BA4 @ =gFieldEffectArguments lsls r0, 24 lsrs r0, 24 str r0, [r1] @@ -64,7 +64,7 @@ sub_80C9B74: @ 80C9B74 pop {r0} bx r0 .align 2, 0 -_080C9BA4: .4byte gUnknown_20386E0 +_080C9BA4: .4byte gFieldEffectArguments _080C9BA8: .4byte gTasks _080C9BAC: .4byte sub_80C9BB0 thumb_func_end sub_80C9B74 diff --git a/asm/fldeff_strength.s b/asm/fldeff_strength.s index e74be1bd3..0c70bdf36 100644 --- a/asm/fldeff_strength.s +++ b/asm/fldeff_strength.s @@ -51,7 +51,7 @@ _080D083C: .4byte sub_80D0840 sub_80D0840: @ 80D0840 push {lr} bl GetCursorSelectionMonId - ldr r1, _080D0858 @ =gUnknown_20386E0 + ldr r1, _080D0858 @ =gFieldEffectArguments lsls r0, 24 lsrs r0, 24 str r0, [r1] @@ -60,7 +60,7 @@ sub_80D0840: @ 80D0840 pop {r0} bx r0 .align 2, 0 -_080D0858: .4byte gUnknown_20386E0 +_080D0858: .4byte gFieldEffectArguments _080D085C: .4byte gUnknown_81BE16E thumb_func_end sub_80D0840 @@ -79,7 +79,7 @@ sub_80D0860: @ 80D0860 lsrs r0, r2, 16 strh r0, [r1, 0x18] strh r2, [r1, 0x1A] - ldr r0, _080D089C @ =gUnknown_20386E0 + ldr r0, _080D089C @ =gFieldEffectArguments ldr r1, [r0] movs r0, 0x64 muls r0, r1 @@ -93,7 +93,7 @@ sub_80D0860: @ 80D0860 .align 2, 0 _080D0894: .4byte gTasks _080D0898: .4byte sub_80D08A8 -_080D089C: .4byte gUnknown_20386E0 +_080D089C: .4byte gFieldEffectArguments _080D08A0: .4byte gPlayerParty _080D08A4: .4byte gStringVar1 thumb_func_end sub_80D0860 diff --git a/asm/fldeff_sweetscent.s b/asm/fldeff_sweetscent.s index 34a8ee372..47b9ef390 100644 --- a/asm/fldeff_sweetscent.s +++ b/asm/fldeff_sweetscent.s @@ -41,14 +41,14 @@ hm2_sweet_scent: @ 80DE0E8 movs r0, 0x33 bl FieldEffectStart bl GetCursorSelectionMonId - ldr r1, _080DE100 @ =gUnknown_20386E0 + ldr r1, _080DE100 @ =gFieldEffectArguments lsls r0, 24 lsrs r0, 24 str r0, [r1] pop {r0} bx r0 .align 2, 0 -_080DE100: .4byte gUnknown_20386E0 +_080DE100: .4byte gFieldEffectArguments thumb_func_end hm2_sweet_scent thumb_func_start FldEff_SweetScent diff --git a/asm/fldeff_teleport.s b/asm/fldeff_teleport.s index 0ac09c3f1..698ad4c23 100644 --- a/asm/fldeff_teleport.s +++ b/asm/fldeff_teleport.s @@ -44,14 +44,14 @@ hm_teleport_run_dp02scr: @ 80F6730 movs r0, 0x3F bl FieldEffectStart bl GetCursorSelectionMonId - ldr r1, _080F674C @ =gUnknown_20386E0 + ldr r1, _080F674C @ =gFieldEffectArguments lsls r0, 24 lsrs r0, 24 str r0, [r1] pop {r0} bx r0 .align 2, 0 -_080F674C: .4byte gUnknown_20386E0 +_080F674C: .4byte gFieldEffectArguments thumb_func_end hm_teleport_run_dp02scr thumb_func_start FldEff_UseTeleport diff --git a/asm/map_obj_80688E4.s b/asm/map_obj_80688E4.s index 7b3fd584e..bc06896bc 100644 --- a/asm/map_obj_80688E4.s +++ b/asm/map_obj_80688E4.s @@ -1437,7 +1437,7 @@ oe_exec_and_other_stuff: @ 80692C8 adds r0, r1, 0 lsls r4, 24 lsrs r4, 24 - ldr r1, _080692EC @ =gUnknown_20386E0 + ldr r1, _080692EC @ =gFieldEffectArguments adds r2, r1, 0x4 adds r3, r1, 0 adds r3, 0x8 @@ -1448,7 +1448,7 @@ oe_exec_and_other_stuff: @ 80692C8 pop {r1} bx r1 .align 2, 0 -_080692EC: .4byte gUnknown_20386E0 +_080692EC: .4byte gFieldEffectArguments thumb_func_end oe_exec_and_other_stuff thumb_func_start DoShadowFieldEffect @@ -1475,7 +1475,7 @@ DoRippleFieldEffect: @ 806930C adds r4, r1, 0 ldrb r0, [r0, 0x5] bl GetFieldObjectGraphicsInfo - ldr r2, _08069344 @ =gUnknown_20386E0 + ldr r2, _08069344 @ =gFieldEffectArguments movs r3, 0x20 ldrsh r1, [r4, r3] str r1, [r2] @@ -1497,7 +1497,7 @@ DoRippleFieldEffect: @ 806930C pop {r0} bx r0 .align 2, 0 -_08069344: .4byte gUnknown_20386E0 +_08069344: .4byte gFieldEffectArguments thumb_func_end DoRippleFieldEffect .align 2, 0 @ Don't pad with nop. diff --git a/asm/party_menu.s b/asm/party_menu.s index d9504245a..e58f3f0d2 100644 --- a/asm/party_menu.s +++ b/asm/party_menu.s @@ -11984,7 +11984,7 @@ task_launch_hm_phase_2: @ 81248C8 cmp r0, 0x1 bne _081248F4 bl brm_get_selected_species - ldr r1, _081248FC @ =gUnknown_20386E0 + ldr r1, _081248FC @ =gFieldEffectArguments lsls r0, 16 lsrs r0, 16 str r0, [r1] @@ -11998,7 +11998,7 @@ _081248F4: pop {r0} bx r0 .align 2, 0 -_081248FC: .4byte gUnknown_20386E0 +_081248FC: .4byte gFieldEffectArguments _08124900: .4byte gUnknown_203B0C4 thumb_func_end task_launch_hm_phase_2 @@ -12074,7 +12074,7 @@ _08124976: hm_surf_run_dp02scr: @ 812497C push {lr} bl GetCursorSelectionMonId - ldr r1, _08124994 @ =gUnknown_20386E0 + ldr r1, _08124994 @ =gFieldEffectArguments lsls r0, 24 lsrs r0, 24 str r0, [r1] @@ -12083,7 +12083,7 @@ hm_surf_run_dp02scr: @ 812497C pop {r0} bx r0 .align 2, 0 -_08124994: .4byte gUnknown_20386E0 +_08124994: .4byte gFieldEffectArguments thumb_func_end hm_surf_run_dp02scr thumb_func_start sub_8124998 @@ -12250,7 +12250,7 @@ _08124AD8: .4byte sub_80568A8 hm2_waterfall: @ 8124ADC push {lr} bl GetCursorSelectionMonId - ldr r1, _08124AF4 @ =gUnknown_20386E0 + ldr r1, _08124AF4 @ =gFieldEffectArguments lsls r0, 24 lsrs r0, 24 str r0, [r1] @@ -12259,7 +12259,7 @@ hm2_waterfall: @ 8124ADC pop {r0} bx r0 .align 2, 0 -_08124AF4: .4byte gUnknown_20386E0 +_08124AF4: .4byte gFieldEffectArguments thumb_func_end hm2_waterfall thumb_func_start hm_prepare_waterfall diff --git a/asm/quest_log_8150454.s b/asm/quest_log_8150454.s deleted file mode 100644 index ac59263d7..000000000 --- a/asm/quest_log_8150454.s +++ /dev/null @@ -1,482 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .syntax unified - - .text - - thumb_func_start sub_8150454 -sub_8150454: @ 8150454 - push {lr} - lsls r0, 24 - lsrs r1, r0, 24 - cmp r1, 0x8 - bhi _0815046A - ldr r0, _08150470 @ =gUnknown_8471EDC - lsls r1, 2 - adds r1, r0 - ldr r0, [r1] - bl _call_via_r0 -_0815046A: - pop {r0} - bx r0 - .align 2, 0 -_08150470: .4byte gUnknown_8471EDC - thumb_func_end sub_8150454 - - thumb_func_start sub_8150474 -sub_8150474: @ 8150474 - push {lr} - lsls r0, 24 - lsrs r1, r0, 24 - ldr r0, _08150488 @ =gUnknown_3005E88 - ldrb r0, [r0] - cmp r0, 0x2 - beq _0815048C - movs r0, 0 - b _08150494 - .align 2, 0 -_08150488: .4byte gUnknown_3005E88 -_0815048C: - adds r0, r1, 0 - bl sub_8112720 - movs r0, 0x1 -_08150494: - pop {r1} - bx r1 - thumb_func_end sub_8150474 - - thumb_func_start sub_8150498 -sub_8150498: @ 8150498 - push {lr} - lsls r0, 24 - lsrs r0, 24 - bl sub_8150454 - pop {r0} - bx r0 - thumb_func_end sub_8150498 - - thumb_func_start sub_81504A8 -sub_81504A8: @ 81504A8 - push {r4,lr} - ldr r0, _081504E0 @ =gPlayerAvatar - ldrb r0, [r0, 0x5] - lsls r4, r0, 3 - adds r4, r0 - lsls r4, 2 - ldr r0, _081504E4 @ =gMapObjects - adds r4, r0 - movs r0, 0 - bl sub_805C808 - adds r1, r0, 0 - lsls r1, 24 - lsrs r1, 24 - adds r0, r4, 0 - bl sub_81507BC - ldrb r1, [r4, 0x18] - lsrs r1, 4 - adds r0, r4, 0 - bl FieldObjectTurn - movs r0, 0x1 - bl SetPlayerAvatarStateMask - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_081504E0: .4byte gPlayerAvatar -_081504E4: .4byte gMapObjects - thumb_func_end sub_81504A8 - - thumb_func_start sub_81504E8 -sub_81504E8: @ 81504E8 - push {r4,lr} - ldr r0, _08150528 @ =gPlayerAvatar - ldrb r0, [r0, 0x5] - lsls r4, r0, 3 - adds r4, r0 - lsls r4, 2 - ldr r0, _0815052C @ =gMapObjects - adds r4, r0 - movs r0, 0x1 - bl sub_805C808 - adds r1, r0, 0 - lsls r1, 24 - lsrs r1, 24 - adds r0, r4, 0 - bl sub_81507BC - ldrb r1, [r4, 0x18] - lsrs r1, 4 - adds r0, r4, 0 - bl FieldObjectTurn - movs r0, 0x2 - bl SetPlayerAvatarStateMask - movs r0, 0 - movs r1, 0 - bl sub_80BD620 - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_08150528: .4byte gPlayerAvatar -_0815052C: .4byte gMapObjects - thumb_func_end sub_81504E8 - - thumb_func_start sub_8150530 -sub_8150530: @ 8150530 - push {r4-r6,lr} - ldr r6, _0815057C @ =gPlayerAvatar - ldrb r1, [r6, 0x5] - lsls r0, r1, 3 - adds r0, r1 - lsls r0, 2 - ldr r1, _08150580 @ =gMapObjects - adds r4, r0, r1 - ldrb r1, [r4, 0x4] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - ldr r1, _08150584 @ =gSprites - adds r5, r0, r1 - ldr r0, _08150588 @ =gUnknown_3005E88 - ldrb r0, [r0] - cmp r0, 0x1 - beq _08150558 - cmp r0, 0x3 - bne _08150594 -_08150558: - bl ScriptContext2_Enable - movs r4, 0 - movs r0, 0x1 - strb r0, [r6, 0x6] - ldr r0, _0815058C @ =sub_81505C4 - movs r1, 0xFF - bl CreateTask - lsls r0, 24 - lsrs r0, 24 - ldr r2, _08150590 @ =gTasks - lsls r1, r0, 2 - adds r1, r0 - lsls r1, 3 - adds r1, r2 - strh r4, [r1, 0x8] - b _081505BC - .align 2, 0 -_0815057C: .4byte gPlayerAvatar -_08150580: .4byte gMapObjects -_08150584: .4byte gSprites -_08150588: .4byte gUnknown_3005E88 -_0815058C: .4byte sub_81505C4 -_08150590: .4byte gTasks -_08150594: - movs r0, 0x4 - bl sub_805C808 - adds r1, r0, 0 - lsls r1, 24 - lsrs r1, 24 - adds r0, r4, 0 - bl sub_81507BC - ldrb r0, [r4, 0x18] - lsls r0, 28 - lsrs r0, 28 - bl sub_80634F0 - adds r1, r0, 0 - lsls r1, 24 - lsrs r1, 24 - adds r0, r5, 0 - bl StartSpriteAnim -_081505BC: - pop {r4-r6} - pop {r0} - bx r0 - thumb_func_end sub_8150530 - - thumb_func_start sub_81505C4 -sub_81505C4: @ 81505C4 - push {r4-r7,lr} - mov r7, r9 - mov r6, r8 - push {r6,r7} - lsls r0, 24 - lsrs r0, 24 - mov r8, r0 - ldr r0, _0815060C @ =gPlayerAvatar - mov r9, r0 - ldrb r1, [r0, 0x5] - lsls r0, r1, 3 - adds r0, r1 - lsls r0, 2 - ldr r1, _08150610 @ =gMapObjects - adds r5, r0, r1 - ldrb r1, [r5, 0x4] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - ldr r1, _08150614 @ =gSprites - adds r7, r0, r1 - ldr r1, _08150618 @ =gTasks - mov r2, r8 - lsls r0, r2, 2 - add r0, r8 - lsls r0, 3 - adds r4, r0, r1 - movs r0, 0x8 - ldrsh r6, [r4, r0] - cmp r6, 0x1 - beq _08150666 - cmp r6, 0x1 - bgt _0815061C - cmp r6, 0 - beq _08150626 - b _081506FC - .align 2, 0 -_0815060C: .4byte gPlayerAvatar -_08150610: .4byte gMapObjects -_08150614: .4byte gSprites -_08150618: .4byte gTasks -_0815061C: - cmp r6, 0x2 - beq _0815067C - cmp r6, 0x3 - beq _0815069C - b _081506FC -_08150626: - adds r0, r5, 0 - bl FieldObjectClearAnimIfSpecialAnimActive - ldrb r0, [r5, 0x1] - movs r1, 0x8 - orrs r0, r1 - strb r0, [r5, 0x1] - movs r0, 0x4 - bl sub_805C808 - adds r1, r0, 0 - lsls r1, 24 - lsrs r1, 24 - adds r0, r5, 0 - bl sub_81507BC - ldrb r0, [r5, 0x18] - lsls r0, 28 - lsrs r0, 28 - bl sub_80634F0 - adds r1, r0, 0 - lsls r1, 24 - lsrs r1, 24 - adds r0, r7, 0 - bl StartSpriteAnim - ldrh r0, [r4, 0x8] - adds r0, 0x1 - strh r0, [r4, 0x8] - strh r6, [r4, 0xA] - b _081506FC -_08150666: - adds r0, r7, 0 - bl sub_805D9C4 - ldrh r1, [r4, 0xA] - movs r2, 0xA - ldrsh r0, [r4, r2] - cmp r0, 0x3B - bgt _08150694 - adds r0, r1, 0x1 - strh r0, [r4, 0xA] - b _081506FC -_0815067C: - bl player_get_direction_lower_nybble - lsls r0, 24 - lsrs r0, 24 - bl sub_8063500 - adds r1, r0, 0 - lsls r1, 24 - lsrs r1, 24 - adds r0, r7, 0 - bl StartSpriteAnim -_08150694: - ldrh r0, [r4, 0x8] - adds r0, 0x1 - strh r0, [r4, 0x8] - b _081506FC -_0815069C: - adds r0, r7, 0 - bl sub_805D9C4 - adds r0, r7, 0 - adds r0, 0x3F - ldrb r1, [r0] - movs r0, 0x10 - ands r0, r1 - cmp r0, 0 - beq _081506FC - mov r0, r9 - ldrb r1, [r0] - movs r0, 0x8 - ands r0, r1 - cmp r0, 0 - bne _081506D0 - movs r0, 0 - bl sub_805C808 - adds r1, r0, 0 - lsls r1, 24 - lsrs r1, 24 - adds r0, r5, 0 - bl sub_81507BC - b _081506E2 -_081506D0: - movs r0, 0x2 - bl sub_805C808 - adds r1, r0, 0 - lsls r1, 24 - lsrs r1, 24 - adds r0, r5, 0 - bl sub_81507BC -_081506E2: - ldrb r1, [r5, 0x18] - lsrs r1, 4 - adds r0, r5, 0 - bl FieldObjectTurn - movs r0, 0 - strh r0, [r7, 0x24] - strh r0, [r7, 0x26] - bl ScriptContext2_Disable - mov r0, r8 - bl DestroyTask -_081506FC: - pop {r3,r4} - mov r8, r3 - mov r9, r4 - pop {r4-r7} - pop {r0} - bx r0 - thumb_func_end sub_81505C4 - - thumb_func_start sub_8150708 -sub_8150708: @ 8150708 - push {r4,r5,lr} - ldr r5, _08150770 @ =gPlayerAvatar - ldrb r1, [r5, 0x5] - lsls r0, r1, 3 - adds r0, r1 - lsls r0, 2 - ldr r1, _08150774 @ =gMapObjects - adds r4, r0, r1 - ldrb r1, [r5] - movs r0, 0x8 - ands r0, r1 - cmp r0, 0 - bne _08150768 - movs r0, 0x2 - bl sub_805C808 - adds r1, r0, 0 - lsls r1, 24 - lsrs r1, 24 - adds r0, r4, 0 - bl sub_81507BC - ldrb r1, [r4, 0x18] - lsrs r1, 4 - adds r0, r4, 0 - bl FieldObjectTurn - movs r0, 0x8 - bl SetPlayerAvatarStateMask - ldr r1, _08150778 @ =gUnknown_20386E0 - movs r2, 0x10 - ldrsh r0, [r4, r2] - str r0, [r1] - movs r2, 0x12 - ldrsh r0, [r4, r2] - str r0, [r1, 0x4] - ldrb r0, [r5, 0x5] - str r0, [r1, 0x8] - movs r0, 0x8 - bl FieldEffectStart - lsls r0, 24 - lsrs r0, 24 - strb r0, [r4, 0x1A] - movs r1, 0x1 - bl sub_80DC44C -_08150768: - pop {r4,r5} - pop {r0} - bx r0 - .align 2, 0 -_08150770: .4byte gPlayerAvatar -_08150774: .4byte gMapObjects -_08150778: .4byte gUnknown_20386E0 - thumb_func_end sub_8150708 - - thumb_func_start sub_815077C -sub_815077C: @ 815077C - push {lr} - movs r0, 0x41 - bl FieldEffectStart - ldr r0, _08150790 @ =sub_8150794 - movs r1, 0 - bl CreateTask - pop {r0} - bx r0 - .align 2, 0 -_08150790: .4byte sub_8150794 - thumb_func_end sub_815077C - - thumb_func_start sub_8150794 -sub_8150794: @ 8150794 - push {r4,lr} - lsls r0, 24 - lsrs r4, r0, 24 - movs r0, 0x41 - bl FieldEffectActiveListContains - lsls r0, 24 - cmp r0, 0 - bne _081507B4 - bl UnfreezeMapObjects - bl ScriptContext2_Disable - adds r0, r4, 0 - bl DestroyTask -_081507B4: - pop {r4} - pop {r0} - bx r0 - thumb_func_end sub_8150794 - - thumb_func_start sub_81507BC -sub_81507BC: @ 81507BC - push {lr} - lsls r1, 24 - lsrs r1, 24 - bl sub_805F060 - pop {r0} - bx r0 - thumb_func_end sub_81507BC - - thumb_func_start sub_81507CC -sub_81507CC: @ 81507CC - push {lr} - movs r0, 0x1 - bl sub_805D154 - pop {r0} - bx r0 - thumb_func_end sub_81507CC - - thumb_func_start sub_81507D8 -sub_81507D8: @ 81507D8 - push {lr} - movs r0, 0x2 - bl sub_805D154 - pop {r0} - bx r0 - thumb_func_end sub_81507D8 - - thumb_func_start sub_81507E4 -sub_81507E4: @ 81507E4 - push {lr} - movs r0, 0x3 - bl sub_805D154 - pop {r0} - bx r0 - thumb_func_end sub_81507E4 - - thumb_func_start sub_81507F0 -sub_81507F0: @ 81507F0 - push {lr} - movs r0, 0x4 - bl sub_805D154 - pop {r0} - bx r0 - thumb_func_end sub_81507F0 - - .align 2, 0 @ Don't pad with nop. diff --git a/asm/rom6.s b/asm/rom6.s index 8d5e76f8a..6d4ef8bc2 100644 --- a/asm/rom6.s +++ b/asm/rom6.s @@ -183,7 +183,7 @@ sub_80C98FC: @ 80C98FC cmp r4, 0 bne _080C9980 bl player_get_direction_lower_nybble - ldr r6, _080C9988 @ =gUnknown_20386E0 + ldr r6, _080C9988 @ =gFieldEffectArguments lsls r0, 24 lsrs r0, 24 str r0, [r6, 0x4] @@ -242,7 +242,7 @@ _080C9980: pop {r0} bx r0 .align 2, 0 -_080C9988: .4byte gUnknown_20386E0 +_080C9988: .4byte gFieldEffectArguments _080C998C: .4byte gPlayerAvatar _080C9990: .4byte gMapObjects _080C9994: .4byte gSprites @@ -312,7 +312,7 @@ _080C9A0C: .4byte sub_80C9A10 sub_80C9A10: @ 80C9A10 push {lr} bl GetCursorSelectionMonId - ldr r1, _080C9A28 @ =gUnknown_20386E0 + ldr r1, _080C9A28 @ =gFieldEffectArguments lsls r0, 24 lsrs r0, 24 str r0, [r1] @@ -321,7 +321,7 @@ sub_80C9A10: @ 80C9A10 pop {r0} bx r0 .align 2, 0 -_080C9A28: .4byte gUnknown_20386E0 +_080C9A28: .4byte gFieldEffectArguments _080C9A2C: .4byte gUnknown_81BE064 thumb_func_end sub_80C9A10 @@ -397,14 +397,14 @@ hm2_dig: @ 80C9AAC movs r0, 0x26 bl FieldEffectStart bl GetCursorSelectionMonId - ldr r1, _080C9AC8 @ =gUnknown_20386E0 + ldr r1, _080C9AC8 @ =gFieldEffectArguments lsls r0, 24 lsrs r0, 24 str r0, [r1] pop {r0} bx r0 .align 2, 0 -_080C9AC8: .4byte gUnknown_20386E0 +_080C9AC8: .4byte gFieldEffectArguments thumb_func_end hm2_dig thumb_func_start sub_80C9ACC diff --git a/asm/scrcmd.s b/asm/scrcmd.s index 6fd8d83a5..b4f3678de 100644 --- a/asm/scrcmd.s +++ b/asm/scrcmd.s @@ -5060,7 +5060,7 @@ ScrCmd_setfieldeffectarg: @ 806C458 lsls r0, 16 lsrs r0, 16 bl VarGet - ldr r1, _0806C484 @ =gUnknown_20386E0 + ldr r1, _0806C484 @ =gFieldEffectArguments lsls r4, 2 adds r4, r1 lsls r0, 16 @@ -5071,7 +5071,7 @@ ScrCmd_setfieldeffectarg: @ 806C458 pop {r1} bx r1 .align 2, 0 -_0806C484: .4byte gUnknown_20386E0 +_0806C484: .4byte gFieldEffectArguments thumb_func_end ScrCmd_setfieldeffectarg thumb_func_start WaitForFieldEffectFinish diff --git a/asm/trainer_see.s b/asm/trainer_see.s index 91dc077d7..6cc322609 100644 --- a/asm/trainer_see.s +++ b/asm/trainer_see.s @@ -585,7 +585,7 @@ sub_8081F38: @ 8081F38 movs r0, 0xC b _08081F82 _08081F54: - ldr r1, _08081F8C @ =gUnknown_20386E0 + ldr r1, _08081F8C @ =gFieldEffectArguments adds r2, r1, 0x4 adds r3, r1, 0 adds r3, 0x8 @@ -611,7 +611,7 @@ _08081F82: pop {r1} bx r1 .align 2, 0 -_08081F8C: .4byte gUnknown_20386E0 +_08081F8C: .4byte gFieldEffectArguments thumb_func_end sub_8081F38 thumb_func_start sub_8081F90 @@ -888,7 +888,7 @@ sub_8082184: @ 8082184 lsls r0, 24 cmp r0, 0 beq _080821CA - ldr r2, _080821D4 @ =gUnknown_20386E0 + ldr r2, _080821D4 @ =gFieldEffectArguments movs r1, 0x10 ldrsh r0, [r4, r1] str r0, [r2] @@ -919,7 +919,7 @@ _080821CA: pop {r1} bx r1 .align 2, 0 -_080821D4: .4byte gUnknown_20386E0 +_080821D4: .4byte gFieldEffectArguments _080821D8: .4byte gSprites thumb_func_end sub_8082184 @@ -1113,7 +1113,7 @@ _08082312: _08082348: .4byte gSaveBlock1Ptr _0808234C: .4byte gMapObjects _08082350: - ldr r1, _08082378 @ =gUnknown_20386E0 + ldr r1, _08082378 @ =gFieldEffectArguments adds r2, r1, 0x4 adds r3, r1, 0 adds r3, 0x8 @@ -1133,7 +1133,7 @@ _0808236E: pop {r1} bx r1 .align 2, 0 -_08082378: .4byte gUnknown_20386E0 +_08082378: .4byte gFieldEffectArguments thumb_func_end sub_80822CC thumb_func_start sub_808237C @@ -1525,7 +1525,7 @@ sub_808265C: @ 808265C orrs r3, r4 mov r4, r12 strb r3, [r4] - ldr r4, _080826A0 @ =gUnknown_20386E0 + ldr r4, _080826A0 @ =gFieldEffectArguments ldr r3, [r4] strh r3, [r0, 0x2E] ldr r3, [r4, 0x4] @@ -1541,7 +1541,7 @@ sub_808265C: @ 808265C pop {r0} bx r0 .align 2, 0 -_080826A0: .4byte gUnknown_20386E0 +_080826A0: .4byte gFieldEffectArguments _080826A4: .4byte 0x0000fffb thumb_func_end sub_808265C diff --git a/data/data_8468C98.s b/data/data_8468C98.s index 26a638f61..f850fe141 100644 --- a/data/data_8468C98.s +++ b/data/data_8468C98.s @@ -321,369 +321,3 @@ gUnknown_8471DEC:: @ 8471DEC gUnknown_8471E8C:: @ 8471E8C .incbin "baserom.gba", 0x471E8C, 0x50 - -gUnknown_8471EDC:: @ 8471EDC - .incbin "baserom.gba", 0x471EDC, 0x74 - -gUnknown_8471F50:: @ 8471F50 - .incbin "baserom.gba", 0x471F50, 0x113 - -gUnknown_8472063:: @ 8472063 - .incbin "baserom.gba", 0x472063, 0x4B - -gUnknown_84720AE:: @ 84720AE - .incbin "baserom.gba", 0x4720AE, 0x4E - -gUnknown_84720FC:: @ 84720FC - .incbin "baserom.gba", 0x4720FC, 0x37 - -gUnknown_8472133:: @ 8472133 - .incbin "baserom.gba", 0x472133, 0x3409 - -gUnknown_847553C:: @ 847553C - .incbin "baserom.gba", 0x47553C, 0xC - -gUnknown_8475548:: @ 8475548 - .incbin "baserom.gba", 0x475548, 0x8 - -gUnknown_8475550:: @ 8475550 - .incbin "baserom.gba", 0x475550, 0x8 - -gUnknown_8475558:: @ 8475558 - .incbin "baserom.gba", 0x475558, 0x20 - -gUnknown_8475578:: @ 8475578 - .incbin "baserom.gba", 0x475578, 0x30 - -gUnknown_84755A8:: @ 84755A8 - .incbin "baserom.gba", 0x4755A8, 0x30 - -gUnknown_84755D8:: @ 84755D8 - .incbin "baserom.gba", 0x4755D8, 0x8 - -gUnknown_84755E0:: @ 84755E0 - .incbin "baserom.gba", 0x4755E0, 0x8 - -gUnknown_84755E8:: @ 84755E8 - .incbin "baserom.gba", 0x4755E8, 0x10 - -gUnknown_84755F8:: @ 84755F8 - .incbin "baserom.gba", 0x4755F8, 0x4 - -gUnknown_84755FC:: @ 84755FC - .incbin "baserom.gba", 0x4755FC, 0x6 - -gUnknown_8475602:: @ 8475602 - .incbin "baserom.gba", 0x475602, 0x6 - -gUnknown_8475608:: @ 8475608 - .incbin "baserom.gba", 0x475608, 0x40 - -gUnknown_8475648:: @ 8475648 - .incbin "baserom.gba", 0x475648, 0x14 - -gUnknown_847565C:: @ 847565C - .incbin "baserom.gba", 0x47565C, 0x18 - -gUnknown_8475674:: @ 8475674 - .incbin "baserom.gba", 0x475674, 0x10 - -gUnknown_8475684:: @ 8475684 - .incbin "baserom.gba", 0x475684, 0x8 - -gUnknown_847568C:: @ 847568C - .incbin "baserom.gba", 0x47568C, 0x10 - -gUnknown_847569C:: @ 847569C - .incbin "baserom.gba", 0x47569C, 0x8 - -gUnknown_84756A4:: @ 84756A4 - .incbin "baserom.gba", 0x4756A4, 0x204 - -gUnknown_84758A8:: @ 84758A8 - .incbin "baserom.gba", 0x4758A8, 0xC0 - -gUnknown_8475968:: @ 8475968 - .incbin "baserom.gba", 0x475968, 0x1D4 - -gUnknown_8475B3C:: @ 8475B3C - .incbin "baserom.gba", 0x475B3C, 0x890 - -gUnknown_84763CC:: @ 84763CC - .incbin "baserom.gba", 0x4763CC, 0xDCC - -gUnknown_8477198:: @ 8477198 - .incbin "baserom.gba", 0x477198, 0x94 - -gUnknown_847722C:: @ 847722C - .incbin "baserom.gba", 0x47722C, 0x148 - -gUnknown_8477374:: @ 8477374 - .incbin "baserom.gba", 0x477374, 0x121C - -gUnknown_8478590:: @ 8478590 - .incbin "baserom.gba", 0x478590, 0x26C - -gUnknown_84787FC:: @ 84787FC - .incbin "baserom.gba", 0x4787FC, 0x250 - -gUnknown_8478A4C:: @ 8478A4C - .incbin "baserom.gba", 0x478A4C, 0x24C - -gUnknown_8478C98:: @ 8478C98 - .incbin "baserom.gba", 0x478C98, 0x48 - -gUnknown_8478CE0:: @ 8478CE0 - .incbin "baserom.gba", 0x478CE0, 0xB0 - -gUnknown_8478D90:: @ 8478D90 - .incbin "baserom.gba", 0x478D90, 0x8 - -gUnknown_8478D98:: @ 8478D98 - .incbin "baserom.gba", 0x478D98, 0x8 - -gUnknown_8478DA0:: @ 8478DA0 - .incbin "baserom.gba", 0x478DA0, 0x8 - -gUnknown_8478DA8:: @ 8478DA8 - .incbin "baserom.gba", 0x478DA8, 0x24 - -gUnknown_8478DCC:: @ 8478DCC - .incbin "baserom.gba", 0x478DCC, 0x8 - -gUnknown_8478DD4:: @ 8478DD4 - .incbin "baserom.gba", 0x478DD4, 0x8 - -gUnknown_8478DDC:: @ 8478DDC - .incbin "baserom.gba", 0x478DDC, 0x18 - -gUnknown_8478DF4:: @ 8478DF4 - .incbin "baserom.gba", 0x478DF4, 0x18 - -gUnknown_8478E0C:: @ 8478E0C - .incbin "baserom.gba", 0x478E0C, 0x2 - -gUnknown_8478E0E:: @ 8478E0E - .incbin "baserom.gba", 0x478E0E, 0xA - -gUnknown_8478E18:: @ 8478E18 - .incbin "baserom.gba", 0x478E18, 0x8 - -gUnknown_8478E20:: @ 8478E20 - .incbin "baserom.gba", 0x478E20, 0x18 - -gUnknown_8478E38:: @ 8478E38 - .incbin "baserom.gba", 0x478E38, 0x3 - -gUnknown_8478E3B:: @ 8478E3B - .incbin "baserom.gba", 0x478E3B, 0x45 - -gUnknown_8478E80:: @ 8478E80 - .incbin "baserom.gba", 0x478E80, 0x14 - -gUnknown_8478E94:: @ 8478E94 - .incbin "baserom.gba", 0x478E94, 0x14 - -gUnknown_8478EA8:: @ 8478EA8 - .incbin "baserom.gba", 0x478EA8, 0x8 - -gUnknown_8478EB0:: @ 8478EB0 - .incbin "baserom.gba", 0x478EB0, 0xA - -gUnknown_8478EBA:: @ 8478EBA - .incbin "baserom.gba", 0x478EBA, 0xA - -gUnknown_8478EC4:: @ 8478EC4 - .incbin "baserom.gba", 0x478EC4, 0x50 - -gUnknown_8478F14:: @ 8478F14 - .incbin "baserom.gba", 0x478F14, 0x8 - -gUnknown_8478F1C:: @ 8478F1C - .incbin "baserom.gba", 0x478F1C, 0x144 - -gUnknown_8479060:: @ 8479060 - .incbin "baserom.gba", 0x479060, 0x78 - -gUnknown_84790D8:: @ 84790D8 - .incbin "baserom.gba", 0x4790D8, 0xC0 - -gUnknown_8479198:: @ 8479198 - .incbin "baserom.gba", 0x479198, 0x10 - -gUnknown_84791A8:: @ 84791A8 - .incbin "baserom.gba", 0x4791A8, 0x10 - -gUnknown_84791B8:: @ 84791B8 - .incbin "baserom.gba", 0x4791B8, 0x14 - -gUnknown_84791CC:: @ 84791CC - .incbin "baserom.gba", 0x4791CC, 0x1C - -gUnknown_84791E8:: @ 84791E8 - .incbin "baserom.gba", 0x4791E8, 0xE8 - -gUnknown_84792D0:: @ 84792D0 - .incbin "baserom.gba", 0x4792D0, 0x10 - -gUnknown_84792E0:: @ 84792E0 - .incbin "baserom.gba", 0x4792E0, 0x10 - -gUnknown_84792F0:: @ 84792F0 - .incbin "baserom.gba", 0x4792F0, 0x50 - -gUnknown_8479340:: @ 8479340 - .incbin "baserom.gba", 0x479340, 0x28 - -gUnknown_8479368:: @ 8479368 - .incbin "baserom.gba", 0x479368, 0x18 - -gUnknown_8479380:: @ 8479380 - .incbin "baserom.gba", 0x479380, 0x10 - -gUnknown_8479390:: @ 8479390 - .incbin "baserom.gba", 0x479390, 0x1B8 - -gUnknown_8479548:: @ 8479548 - .incbin "baserom.gba", 0x479548, 0x18 - -gUnknown_8479560:: @ 8479560 - .incbin "baserom.gba", 0x479560, 0x18 - -gUnknown_8479578:: @ 8479578 - .incbin "baserom.gba", 0x479578, 0x18 - -gUnknown_8479590:: @ 8479590 - .incbin "baserom.gba", 0x479590, 0x28 - -gUnknown_84795B8:: @ 84795B8 - .incbin "baserom.gba", 0x4795B8, 0x10 - -gUnknown_84795C8:: @ 84795C8 - .incbin "baserom.gba", 0x4795C8, 0x90 - -gUnknown_8479658:: @ 8479658 - .incbin "baserom.gba", 0x479658, 0x600 - -gUnknown_8479C58:: @ 8479C58 - .incbin "baserom.gba", 0x479C58, 0x30 - -gUnknown_8479C88:: @ 8479C88 - .incbin "baserom.gba", 0x479C88, 0x38 - -gUnknown_8479CC0:: @ 8479CC0 - .incbin "baserom.gba", 0x479CC0, 0x18 - - .align 2 -gUnknown_8479CD8:: @ 8479CD8 - .asciz "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/cereader_tool.c" - - .align 2 -gUnknown_8479D10:: @ 8479D10 - .asciz "ttdata->dummy == 0" - - .align 2 -gUnknown_8479D24:: @ 8479D24 - .asciz "ttdata->id == 0" - -gUnknown_8479D34:: @ 8479D34 - .incbin "baserom.gba", 0x479D34, 0x4 - -gUnknown_8479D38:: @ 8479D38 - .incbin "baserom.gba", 0x479D38, 0x8 - -gUnknown_8479D40:: @ 8479D40 - .incbin "baserom.gba", 0x479D40, 0x8 - -gUnknown_8479D48:: @ 8479D48 - .incbin "baserom.gba", 0x479D48, 0x190 - -gUnknown_8479ED8:: @ 8479ED8 - .incbin "baserom.gba", 0x479ED8, 0x14C - -gUnknown_847A024:: @ 847A024 - .incbin "baserom.gba", 0x47A024, 0x50 - -gUnknown_847A074:: @ 847A074 - .incbin "baserom.gba", 0x47A074, 0x1A4 - -gUnknown_847A218:: @ 847A218 - .incbin "baserom.gba", 0x47A218, 0x14 - -gUnknown_847A22C:: @ 847A22C - .incbin "baserom.gba", 0x47A22C, 0x4 - -gUnknown_847A230:: @ 847A230 - .incbin "baserom.gba", 0x47A230, 0x54 - -gUnknown_847A284:: @ 847A284 - .incbin "baserom.gba", 0x47A284, 0x30 - -gUnknown_847A2B4:: @ 847A2B4 - .incbin "baserom.gba", 0x47A2B4, 0x1E - -gUnknown_847A2D2:: @ 847A2D2 - .incbin "baserom.gba", 0x47A2D2, 0x1C - -gUnknown_847A2EE:: @ 847A2EE - .incbin "baserom.gba", 0x47A2EE, 0x10 - -gUnknown_847A2FE:: @ 847A2FE - .incbin "baserom.gba", 0x47A2FE, 0x10 - -gUnknown_847A30E:: @ 847A30E - .incbin "baserom.gba", 0x47A30E, 0x48E - -gUnknown_847A79C:: @ 847A79C - .incbin "baserom.gba", 0x47A79C, 0x8 - -gUnknown_847A7A4:: @ 847A7A4 - .incbin "baserom.gba", 0x47A7A4, 0xBC - -gUnknown_847A860:: @ 847A860 - .incbin "baserom.gba", 0x47A860, 0x18 - -gUnknown_847A878:: @ 847A878 - .incbin "baserom.gba", 0x47A878, 0x18 - -gUnknown_847A890:: @ 847A890 - .incbin "baserom.gba", 0x47A890, 0x7F1C - -gUnknown_84827AC:: @ 84827AC - .incbin "baserom.gba", 0x4827AC, 0x8 - -gUnknown_84827B4:: @ 84827B4 - .incbin "baserom.gba", 0x4827B4, 0x5F34 - -gUnknown_84886E8:: @ 84886E8 - .incbin "baserom.gba", 0x4886E8, 0x588 - -gUnknown_8488C70:: @ 8488C70 - .incbin "baserom.gba", 0x488C70, 0x32 - -gUnknown_8488CA2:: @ 8488CA2 - .incbin "baserom.gba", 0x488CA2, 0x2C - -gUnknown_8488CCE:: @ 8488CCE - .incbin "baserom.gba", 0x488CCE, 0x28 - -gUnknown_8488CF6:: @ 8488CF6 - .incbin "baserom.gba", 0x488CF6, 0x34 - -gUnknown_8488D2A:: @ 8488D2A - .incbin "baserom.gba", 0x488D2A, 0x36 - -gUnknown_8488D60:: @ 8488D60 - .incbin "baserom.gba", 0x488D60, 0x1C - -gUnknown_8488D7C:: @ 8488D7C - .incbin "baserom.gba", 0x488D7C, 0x12 - -gUnknown_8488D8E:: @ 8488D8E - .incbin "baserom.gba", 0x488D8E, 0x2F - -gUnknown_8488DBD:: @ 8488DBD - .incbin "baserom.gba", 0x488DBD, 0x40 - -gUnknown_8488DFD:: @ 8488DFD - .incbin "baserom.gba", 0x488DFD, 0xB6B diff --git a/data/data_8471F00.s b/data/data_8471F00.s new file mode 100644 index 000000000..b9767d933 --- /dev/null +++ b/data/data_8471F00.s @@ -0,0 +1,368 @@ + .section .rodata + + .align 2 +gUnknown_8471F00:: + .incbin "baserom.gba", 0x471F00, 0x50 + +gUnknown_8471F50:: @ 8471F50 + .incbin "baserom.gba", 0x471F50, 0x113 + +gUnknown_8472063:: @ 8472063 + .incbin "baserom.gba", 0x472063, 0x4B + +gUnknown_84720AE:: @ 84720AE + .incbin "baserom.gba", 0x4720AE, 0x4E + +gUnknown_84720FC:: @ 84720FC + .incbin "baserom.gba", 0x4720FC, 0x37 + +gUnknown_8472133:: @ 8472133 + .incbin "baserom.gba", 0x472133, 0x3409 + +gUnknown_847553C:: @ 847553C + .incbin "baserom.gba", 0x47553C, 0xC + +gUnknown_8475548:: @ 8475548 + .incbin "baserom.gba", 0x475548, 0x8 + +gUnknown_8475550:: @ 8475550 + .incbin "baserom.gba", 0x475550, 0x8 + +gUnknown_8475558:: @ 8475558 + .incbin "baserom.gba", 0x475558, 0x20 + +gUnknown_8475578:: @ 8475578 + .incbin "baserom.gba", 0x475578, 0x30 + +gUnknown_84755A8:: @ 84755A8 + .incbin "baserom.gba", 0x4755A8, 0x30 + +gUnknown_84755D8:: @ 84755D8 + .incbin "baserom.gba", 0x4755D8, 0x8 + +gUnknown_84755E0:: @ 84755E0 + .incbin "baserom.gba", 0x4755E0, 0x8 + +gUnknown_84755E8:: @ 84755E8 + .incbin "baserom.gba", 0x4755E8, 0x10 + +gUnknown_84755F8:: @ 84755F8 + .incbin "baserom.gba", 0x4755F8, 0x4 + +gUnknown_84755FC:: @ 84755FC + .incbin "baserom.gba", 0x4755FC, 0x6 + +gUnknown_8475602:: @ 8475602 + .incbin "baserom.gba", 0x475602, 0x6 + +gUnknown_8475608:: @ 8475608 + .incbin "baserom.gba", 0x475608, 0x40 + +gUnknown_8475648:: @ 8475648 + .incbin "baserom.gba", 0x475648, 0x14 + +gUnknown_847565C:: @ 847565C + .incbin "baserom.gba", 0x47565C, 0x18 + +gUnknown_8475674:: @ 8475674 + .incbin "baserom.gba", 0x475674, 0x10 + +gUnknown_8475684:: @ 8475684 + .incbin "baserom.gba", 0x475684, 0x8 + +gUnknown_847568C:: @ 847568C + .incbin "baserom.gba", 0x47568C, 0x10 + +gUnknown_847569C:: @ 847569C + .incbin "baserom.gba", 0x47569C, 0x8 + +gUnknown_84756A4:: @ 84756A4 + .incbin "baserom.gba", 0x4756A4, 0x204 + +gUnknown_84758A8:: @ 84758A8 + .incbin "baserom.gba", 0x4758A8, 0xC0 + +gUnknown_8475968:: @ 8475968 + .incbin "baserom.gba", 0x475968, 0x1D4 + +gUnknown_8475B3C:: @ 8475B3C + .incbin "baserom.gba", 0x475B3C, 0x890 + +gUnknown_84763CC:: @ 84763CC + .incbin "baserom.gba", 0x4763CC, 0xDCC + +gUnknown_8477198:: @ 8477198 + .incbin "baserom.gba", 0x477198, 0x94 + +gUnknown_847722C:: @ 847722C + .incbin "baserom.gba", 0x47722C, 0x148 + +gUnknown_8477374:: @ 8477374 + .incbin "baserom.gba", 0x477374, 0x121C + +gUnknown_8478590:: @ 8478590 + .incbin "baserom.gba", 0x478590, 0x26C + +gUnknown_84787FC:: @ 84787FC + .incbin "baserom.gba", 0x4787FC, 0x250 + +gUnknown_8478A4C:: @ 8478A4C + .incbin "baserom.gba", 0x478A4C, 0x24C + +gUnknown_8478C98:: @ 8478C98 + .incbin "baserom.gba", 0x478C98, 0x48 + +gUnknown_8478CE0:: @ 8478CE0 + .incbin "baserom.gba", 0x478CE0, 0xB0 + +gUnknown_8478D90:: @ 8478D90 + .incbin "baserom.gba", 0x478D90, 0x8 + +gUnknown_8478D98:: @ 8478D98 + .incbin "baserom.gba", 0x478D98, 0x8 + +gUnknown_8478DA0:: @ 8478DA0 + .incbin "baserom.gba", 0x478DA0, 0x8 + +gUnknown_8478DA8:: @ 8478DA8 + .incbin "baserom.gba", 0x478DA8, 0x24 + +gUnknown_8478DCC:: @ 8478DCC + .incbin "baserom.gba", 0x478DCC, 0x8 + +gUnknown_8478DD4:: @ 8478DD4 + .incbin "baserom.gba", 0x478DD4, 0x8 + +gUnknown_8478DDC:: @ 8478DDC + .incbin "baserom.gba", 0x478DDC, 0x18 + +gUnknown_8478DF4:: @ 8478DF4 + .incbin "baserom.gba", 0x478DF4, 0x18 + +gUnknown_8478E0C:: @ 8478E0C + .incbin "baserom.gba", 0x478E0C, 0x2 + +gUnknown_8478E0E:: @ 8478E0E + .incbin "baserom.gba", 0x478E0E, 0xA + +gUnknown_8478E18:: @ 8478E18 + .incbin "baserom.gba", 0x478E18, 0x8 + +gUnknown_8478E20:: @ 8478E20 + .incbin "baserom.gba", 0x478E20, 0x18 + +gUnknown_8478E38:: @ 8478E38 + .incbin "baserom.gba", 0x478E38, 0x3 + +gUnknown_8478E3B:: @ 8478E3B + .incbin "baserom.gba", 0x478E3B, 0x45 + +gUnknown_8478E80:: @ 8478E80 + .incbin "baserom.gba", 0x478E80, 0x14 + +gUnknown_8478E94:: @ 8478E94 + .incbin "baserom.gba", 0x478E94, 0x14 + +gUnknown_8478EA8:: @ 8478EA8 + .incbin "baserom.gba", 0x478EA8, 0x8 + +gUnknown_8478EB0:: @ 8478EB0 + .incbin "baserom.gba", 0x478EB0, 0xA + +gUnknown_8478EBA:: @ 8478EBA + .incbin "baserom.gba", 0x478EBA, 0xA + +gUnknown_8478EC4:: @ 8478EC4 + .incbin "baserom.gba", 0x478EC4, 0x50 + +gUnknown_8478F14:: @ 8478F14 + .incbin "baserom.gba", 0x478F14, 0x8 + +gUnknown_8478F1C:: @ 8478F1C + .incbin "baserom.gba", 0x478F1C, 0x144 + +gUnknown_8479060:: @ 8479060 + .incbin "baserom.gba", 0x479060, 0x78 + +gUnknown_84790D8:: @ 84790D8 + .incbin "baserom.gba", 0x4790D8, 0xC0 + +gUnknown_8479198:: @ 8479198 + .incbin "baserom.gba", 0x479198, 0x10 + +gUnknown_84791A8:: @ 84791A8 + .incbin "baserom.gba", 0x4791A8, 0x10 + +gUnknown_84791B8:: @ 84791B8 + .incbin "baserom.gba", 0x4791B8, 0x14 + +gUnknown_84791CC:: @ 84791CC + .incbin "baserom.gba", 0x4791CC, 0x1C + +gUnknown_84791E8:: @ 84791E8 + .incbin "baserom.gba", 0x4791E8, 0xE8 + +gUnknown_84792D0:: @ 84792D0 + .incbin "baserom.gba", 0x4792D0, 0x10 + +gUnknown_84792E0:: @ 84792E0 + .incbin "baserom.gba", 0x4792E0, 0x10 + +gUnknown_84792F0:: @ 84792F0 + .incbin "baserom.gba", 0x4792F0, 0x50 + +gUnknown_8479340:: @ 8479340 + .incbin "baserom.gba", 0x479340, 0x28 + +gUnknown_8479368:: @ 8479368 + .incbin "baserom.gba", 0x479368, 0x18 + +gUnknown_8479380:: @ 8479380 + .incbin "baserom.gba", 0x479380, 0x10 + +gUnknown_8479390:: @ 8479390 + .incbin "baserom.gba", 0x479390, 0x1B8 + +gUnknown_8479548:: @ 8479548 + .incbin "baserom.gba", 0x479548, 0x18 + +gUnknown_8479560:: @ 8479560 + .incbin "baserom.gba", 0x479560, 0x18 + +gUnknown_8479578:: @ 8479578 + .incbin "baserom.gba", 0x479578, 0x18 + +gUnknown_8479590:: @ 8479590 + .incbin "baserom.gba", 0x479590, 0x28 + +gUnknown_84795B8:: @ 84795B8 + .incbin "baserom.gba", 0x4795B8, 0x10 + +gUnknown_84795C8:: @ 84795C8 + .incbin "baserom.gba", 0x4795C8, 0x90 + +gUnknown_8479658:: @ 8479658 + .incbin "baserom.gba", 0x479658, 0x600 + +gUnknown_8479C58:: @ 8479C58 + .incbin "baserom.gba", 0x479C58, 0x30 + +gUnknown_8479C88:: @ 8479C88 + .incbin "baserom.gba", 0x479C88, 0x38 + +gUnknown_8479CC0:: @ 8479CC0 + .incbin "baserom.gba", 0x479CC0, 0x18 + + .align 2 +gUnknown_8479CD8:: @ 8479CD8 + .asciz "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/cereader_tool.c" + + .align 2 +gUnknown_8479D10:: @ 8479D10 + .asciz "ttdata->dummy == 0" + + .align 2 +gUnknown_8479D24:: @ 8479D24 + .asciz "ttdata->id == 0" + +gUnknown_8479D34:: @ 8479D34 + .incbin "baserom.gba", 0x479D34, 0x4 + +gUnknown_8479D38:: @ 8479D38 + .incbin "baserom.gba", 0x479D38, 0x8 + +gUnknown_8479D40:: @ 8479D40 + .incbin "baserom.gba", 0x479D40, 0x8 + +gUnknown_8479D48:: @ 8479D48 + .incbin "baserom.gba", 0x479D48, 0x190 + +gUnknown_8479ED8:: @ 8479ED8 + .incbin "baserom.gba", 0x479ED8, 0x14C + +gUnknown_847A024:: @ 847A024 + .incbin "baserom.gba", 0x47A024, 0x50 + +gUnknown_847A074:: @ 847A074 + .incbin "baserom.gba", 0x47A074, 0x1A4 + +gUnknown_847A218:: @ 847A218 + .incbin "baserom.gba", 0x47A218, 0x14 + +gUnknown_847A22C:: @ 847A22C + .incbin "baserom.gba", 0x47A22C, 0x4 + +gUnknown_847A230:: @ 847A230 + .incbin "baserom.gba", 0x47A230, 0x54 + +gUnknown_847A284:: @ 847A284 + .incbin "baserom.gba", 0x47A284, 0x30 + +gUnknown_847A2B4:: @ 847A2B4 + .incbin "baserom.gba", 0x47A2B4, 0x1E + +gUnknown_847A2D2:: @ 847A2D2 + .incbin "baserom.gba", 0x47A2D2, 0x1C + +gUnknown_847A2EE:: @ 847A2EE + .incbin "baserom.gba", 0x47A2EE, 0x10 + +gUnknown_847A2FE:: @ 847A2FE + .incbin "baserom.gba", 0x47A2FE, 0x10 + +gUnknown_847A30E:: @ 847A30E + .incbin "baserom.gba", 0x47A30E, 0x48E + +gUnknown_847A79C:: @ 847A79C + .incbin "baserom.gba", 0x47A79C, 0x8 + +gUnknown_847A7A4:: @ 847A7A4 + .incbin "baserom.gba", 0x47A7A4, 0xBC + +gUnknown_847A860:: @ 847A860 + .incbin "baserom.gba", 0x47A860, 0x18 + +gUnknown_847A878:: @ 847A878 + .incbin "baserom.gba", 0x47A878, 0x18 + +gUnknown_847A890:: @ 847A890 + .incbin "baserom.gba", 0x47A890, 0x7F1C + +gUnknown_84827AC:: @ 84827AC + .incbin "baserom.gba", 0x4827AC, 0x8 + +gUnknown_84827B4:: @ 84827B4 + .incbin "baserom.gba", 0x4827B4, 0x5F34 + +gUnknown_84886E8:: @ 84886E8 + .incbin "baserom.gba", 0x4886E8, 0x588 + +gUnknown_8488C70:: @ 8488C70 + .incbin "baserom.gba", 0x488C70, 0x32 + +gUnknown_8488CA2:: @ 8488CA2 + .incbin "baserom.gba", 0x488CA2, 0x2C + +gUnknown_8488CCE:: @ 8488CCE + .incbin "baserom.gba", 0x488CCE, 0x28 + +gUnknown_8488CF6:: @ 8488CF6 + .incbin "baserom.gba", 0x488CF6, 0x34 + +gUnknown_8488D2A:: @ 8488D2A + .incbin "baserom.gba", 0x488D2A, 0x36 + +gUnknown_8488D60:: @ 8488D60 + .incbin "baserom.gba", 0x488D60, 0x1C + +gUnknown_8488D7C:: @ 8488D7C + .incbin "baserom.gba", 0x488D7C, 0x12 + +gUnknown_8488D8E:: @ 8488D8E + .incbin "baserom.gba", 0x488D8E, 0x2F + +gUnknown_8488DBD:: @ 8488DBD + .incbin "baserom.gba", 0x488DBD, 0x40 + +gUnknown_8488DFD:: @ 8488DFD + .incbin "baserom.gba", 0x488DFD, 0xB6B diff --git a/include/bike.h b/include/bike.h new file mode 100644 index 000000000..468c48273 --- /dev/null +++ b/include/bike.h @@ -0,0 +1,6 @@ +#ifndef GUARD_BIKE_H +#define GUARD_BIKE_H + +void sub_80BD620(u32 unkC, u32 unk10); + +#endif //GUARD_BIKE_H diff --git a/include/field_effect_helpers.h b/include/field_effect_helpers.h index 33c4d5bbc..5cd29fc5b 100644 --- a/include/field_effect_helpers.h +++ b/include/field_effect_helpers.h @@ -14,5 +14,6 @@ // Exported ROM declarations u8 sub_8154228(void); bool8 sub_8155DA0(struct MapObject *); +void sub_80DC44C(u8, u8); #endif //GUARD_FIELD_EFFECT_HELPERS_H diff --git a/include/field_map_obj.h b/include/field_map_obj.h index 9ff5ecedc..ded970a83 100644 --- a/include/field_map_obj.h +++ b/include/field_map_obj.h @@ -83,6 +83,9 @@ void sub_8063CA4(struct MapObject *, u8); void npc_coords_shift_still(struct MapObject *); void sub_805FE7C(struct MapObject *, u8); void npc_set_running_behaviour_etc(struct MapObject *, u8); +u8 sub_80634F0(u8 direction); +u8 sub_8063500(u8 a0); +void sub_805F060(struct MapObject *mapObject, u8 a1); // Exported data declarations diff --git a/include/field_player_avatar.h b/include/field_player_avatar.h index 9b7fcde38..297d66441 100644 --- a/include/field_player_avatar.h +++ b/include/field_player_avatar.h @@ -16,5 +16,9 @@ void sub_808D074(u8); void sub_805C270(); void sub_805C780(); void GetXYCoordsOneStepInFrontOfPlayer(s16 *xPtr, s16 *yPtr); +u8 sub_805C808(u8); +void SetPlayerAvatarStateMask(u8 mask); +void sub_805D9C4(struct Sprite *sprite); +void sub_805D154(u8 direction); #endif //GUARD_FIELD_PLAYER_AVATAR_H diff --git a/include/quest_log.h b/include/quest_log.h index 90eb290ca..b2a750725 100644 --- a/include/quest_log.h +++ b/include/quest_log.h @@ -19,4 +19,6 @@ extern u16 gUnknown_3005E8C; extern struct UnkStruct_3005E90 gUnknown_3005E90; extern struct UnkStruct_203AE98 * gUnknown_3005E94; +void sub_8112720(u8); + #endif //GUARD_QUEST_LOG_H diff --git a/ld_script.txt b/ld_script.txt index 4643cf8b0..3d59b2459 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -256,7 +256,7 @@ SECTIONS { asm/wireless_communication_status_screen.o(.text); asm/braille_text.o(.text); asm/text_window.o(.text); - asm/quest_log_8150454.o(.text); + src/quest_log_8150454.o(.text); asm/unk_81507FC.o(.text); asm/battle_controller_pokedude.o(.text); asm/unk_8159F40.o(.text); @@ -379,6 +379,8 @@ SECTIONS { src/menews_jisan.o(.rodata); src/menews_jisan.o(.rodata.str1.4); data/data_8468C98.o(.rodata); + src/quest_log_8150454.o(.rodata); + data/data_8471F00.o(.rodata); src/m4a_tables.o(.rodata); data/sound_data.o(.rodata); } =0 diff --git a/src/quest_log_8150454.c b/src/quest_log_8150454.c new file mode 100644 index 000000000..8af516e3a --- /dev/null +++ b/src/quest_log_8150454.c @@ -0,0 +1,197 @@ +#include "global.h" +#include "bike.h" +#include "script.h" +#include "task.h" +#include "field_player_avatar.h" +#include "field_map_obj.h" +#include "field_map_obj_helpers.h" +#include "field_effect.h" +#include "field_effect_helpers.h" +#include "quest_log.h" + +void sub_81504A8(void); +void sub_81504E8(void); +void sub_8150530(void); +void sub_81505C4(u8 taskId); +void sub_8150708(void); +void sub_815077C(void); +void sub_8150794(u8 taskId); +void sub_81507CC(void); +void sub_81507D8(void); +void sub_81507E4(void); +void sub_81507F0(void); +void sub_81507BC(struct MapObject *a0, u8 a1); + +void (*const gUnknown_8471EDC[])(void) = { + sub_81504A8, + sub_81504E8, + sub_8150530, + sub_8150708, + sub_81507CC, + sub_81507D8, + sub_81507E4, + sub_81507F0, + sub_815077C +}; + +void sub_8150454(u8 a0) +{ + if (a0 < ARRAY_COUNT(gUnknown_8471EDC)) + gUnknown_8471EDC[a0](); +} + +bool8 sub_8150474(u8 a0) +{ + if (gUnknown_3005E88 == 2) + { + sub_8112720(a0); + return TRUE; + } + return FALSE; +} + +void sub_8150498(u8 a0) +{ + return sub_8150454(a0); +} + +void sub_81504A8(void) +{ + struct MapObject *mapObject = &gMapObjects[gPlayerAvatar.mapObjectId]; + sub_81507BC(mapObject, sub_805C808(0)); + FieldObjectTurn(mapObject, mapObject->placeholder18); + SetPlayerAvatarStateMask(0x01); +} + +void sub_81504E8(void) +{ + struct MapObject *mapObject = &gMapObjects[gPlayerAvatar.mapObjectId]; + sub_81507BC(mapObject, sub_805C808(1)); + FieldObjectTurn(mapObject, mapObject->placeholder18); + SetPlayerAvatarStateMask(0x02); + sub_80BD620(0, 0); +} + +void sub_8150530(void) +{ + struct MapObject *mapObject = &gMapObjects[gPlayerAvatar.mapObjectId]; + struct Sprite *sprite = &gSprites[mapObject->spriteId]; + + if (gUnknown_3005E88 == 1 || gUnknown_3005E88 == 3) + { + u8 taskId; + ScriptContext2_Enable(); + gPlayerAvatar.unk6 = 1; + taskId = CreateTask(sub_81505C4, 0xFF); + gTasks[taskId].data[0] = 0; + } + else + { + sub_81507BC(mapObject, sub_805C808(4)); + StartSpriteAnim(sprite, sub_80634F0(mapObject->mapobj_unk_18)); + } +} + +void sub_81505C4(u8 taskId) +{ + struct MapObject *mapObject = &gMapObjects[gPlayerAvatar.mapObjectId]; + struct Sprite *sprite = &gSprites[mapObject->spriteId]; + + switch (gTasks[taskId].data[0]) + { + case 0: + FieldObjectClearAnimIfSpecialAnimActive(mapObject); + mapObject->mapobj_bit_11 = TRUE; + sub_81507BC(mapObject, sub_805C808(4)); + StartSpriteAnim(sprite, sub_80634F0(mapObject->mapobj_unk_18)); + gTasks[taskId].data[0]++; + gTasks[taskId].data[1] = 0; + break; + case 1: + sub_805D9C4(sprite); + if (gTasks[taskId].data[1] < 60) + gTasks[taskId].data[1]++; + else + gTasks[taskId].data[0]++; + break; + case 2: + StartSpriteAnim(sprite, sub_8063500(player_get_direction_lower_nybble())); + gTasks[taskId].data[0]++; + break; + case 3: + sub_805D9C4(sprite); + if (sprite->animEnded) + { + if (!(gPlayerAvatar.flags & 8)) + sub_81507BC(mapObject, sub_805C808(0)); + else + sub_81507BC(mapObject, sub_805C808(2)); + FieldObjectTurn(mapObject, mapObject->placeholder18); + sprite->pos2.x = 0; + sprite->pos2.y = 0; + ScriptContext2_Disable(); + DestroyTask(taskId); + } + break; + } +} + +void sub_8150708(void) +{ + struct MapObject *mapObject = &gMapObjects[gPlayerAvatar.mapObjectId]; + u8 fieldEffectId; + + if (!(gPlayerAvatar.flags & 0x08)) + { + sub_81507BC(mapObject, sub_805C808(2)); + FieldObjectTurn(mapObject, mapObject->placeholder18); + SetPlayerAvatarStateMask(0x08); + gFieldEffectArguments[0] = mapObject->coords2.x; + gFieldEffectArguments[1] = mapObject->coords2.y; + gFieldEffectArguments[2] = gPlayerAvatar.mapObjectId; + fieldEffectId = FieldEffectStart(0x08); + mapObject->mapobj_unk_1A = fieldEffectId; + sub_80DC44C(fieldEffectId, 1); + } +} + +void sub_815077C(void) +{ + FieldEffectStart(0x41); + CreateTask(sub_8150794, 0x00); +} + +void sub_8150794(u8 taskId) +{ + if (!FieldEffectActiveListContains(0x41)) + { + UnfreezeMapObjects(); + ScriptContext2_Disable(); + DestroyTask(taskId); + } +} + +void sub_81507BC(struct MapObject * a0, u8 a1) +{ + sub_805F060(a0, a1); +} + +void sub_81507CC(void) +{ + sub_805D154(1); +} + +void sub_81507D8(void) +{ + sub_805D154(2); +} + +void sub_81507E4(void) +{ + sub_805D154(3); +} + +void sub_81507F0(void) +{ + sub_805D154(4); +} diff --git a/sym_ewram.txt b/sym_ewram.txt index 1e0ed2e60..ee83526af 100644 --- a/sym_ewram.txt +++ b/sym_ewram.txt @@ -895,7 +895,7 @@ gUnknown_20386D0: @ 20386D0 gUnknown_20386DC: @ 20386DC .space 0x4 -gUnknown_20386E0: @ 20386E0 +gFieldEffectArguments: @ 20386E0 .space 0x20 gUnknown_2038700: @ 2038700 -- cgit v1.2.3 From 91bfbfb9fb2bbdecfc33e76fca7aa6ff5a2c8a34 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Fri, 23 Nov 2018 21:22:31 -0500 Subject: quest_log_battle, 1 --- asm/quest_log_battle.s | 286 ------------------------------------------------- include/overworld.h | 3 +- include/quest_log.h | 1 + ld_script.txt | 1 + src/quest_log.c | 2 +- src/quest_log_battle.c | 97 +++++++++++++++++ 6 files changed, 102 insertions(+), 288 deletions(-) create mode 100644 src/quest_log_battle.c diff --git a/asm/quest_log_battle.s b/asm/quest_log_battle.s index 1870395e9..1afadbf5f 100644 --- a/asm/quest_log_battle.s +++ b/asm/quest_log_battle.s @@ -5,292 +5,6 @@ .text - thumb_func_start sub_812BFDC -sub_812BFDC: @ 812BFDC - push {r4-r7,lr} - mov r7, r10 - mov r6, r9 - mov r5, r8 - push {r5-r7} - ldr r4, _0812C03C @ =gBattleTypeFlags - ldr r0, [r4] - ldr r1, _0812C040 @ =0x00010202 - ands r0, r1 - cmp r0, 0 - beq _0812BFF4 - b _0812C212 -_0812BFF4: - ldr r5, _0812C044 @ =gUnknown_2023E8A - ldrb r0, [r5] - cmp r0, 0x1 - beq _0812C002 - cmp r0, 0x7 - beq _0812C002 - b _0812C212 -_0812C002: - movs r0, 0x8 - bl Alloc - adds r7, r0, 0 - movs r0, 0x8 - bl Alloc - mov r9, r0 - ldr r4, [r4] - movs r0, 0x8 - ands r4, r0 - cmp r4, 0 - bne _0812C01E - b _0812C1CC -_0812C01E: - ldr r3, _0812C048 @ =gTrainers - ldr r2, _0812C04C @ =gTrainerBattleOpponent_A - ldrh r1, [r2] - lsls r0, r1, 2 - adds r0, r1 - lsls r0, 3 - adds r0, r3 - ldrb r1, [r0, 0x1] - cmp r1, 0x57 - beq _0812C060 - cmp r1, 0x57 - bgt _0812C050 - cmp r1, 0x54 - beq _0812C056 - b _0812C066 - .align 2, 0 -_0812C03C: .4byte gBattleTypeFlags -_0812C040: .4byte 0x00010202 -_0812C044: .4byte gUnknown_2023E8A -_0812C048: .4byte gTrainers -_0812C04C: .4byte gTrainerBattleOpponent_A -_0812C050: - cmp r1, 0x5A - beq _0812C05C - b _0812C066 -_0812C056: - movs r0, 0x1E - mov r10, r0 - b _0812C06A -_0812C05C: - movs r1, 0x21 - b _0812C068 -_0812C060: - movs r0, 0x20 - mov r10, r0 - b _0812C06A -_0812C066: - movs r1, 0x22 -_0812C068: - mov r10, r1 -_0812C06A: - ldrh r0, [r2] - strh r0, [r7] - ldr r0, _0812C0AC @ =gBattleTypeFlags - ldr r0, [r0] - movs r1, 0x1 - ands r0, r1 - cmp r0, 0 - beq _0812C150 - ldr r0, _0812C0B0 @ =gBattleResults - ldrh r0, [r0, 0x20] - strh r0, [r7, 0x2] - ldr r4, _0812C0B4 @ =gBattleStruct - ldr r0, [r4] - movs r1, 0xC1 - lsls r1, 1 - adds r0, r1 - ldrb r0, [r0] - bl GetBattlerSide - lsls r0, 24 - cmp r0, 0 - bne _0812C0BC - ldr r2, _0812C0B8 @ =gBattleMons - ldr r0, [r4] - movs r1, 0xC1 - lsls r1, 1 - adds r0, r1 - ldrb r1, [r0] - movs r0, 0x58 - muls r0, r1 - adds r0, r2 - b _0812C0EA - .align 2, 0 -_0812C0AC: .4byte gBattleTypeFlags -_0812C0B0: .4byte gBattleResults -_0812C0B4: .4byte gBattleStruct -_0812C0B8: .4byte gBattleMons -_0812C0BC: - ldr r5, _0812C0D8 @ =gBattleMons - movs r0, 0 - bl GetBattlerAtPosition - lsls r0, 24 - lsrs r0, 24 - movs r4, 0x58 - muls r0, r4 - adds r0, r5 - ldrh r0, [r0, 0x28] - cmp r0, 0 - beq _0812C0DC - movs r0, 0 - b _0812C0DE - .align 2, 0 -_0812C0D8: .4byte gBattleMons -_0812C0DC: - movs r0, 0x2 -_0812C0DE: - bl GetBattlerAtPosition - lsls r0, 24 - lsrs r0, 24 - muls r0, r4 - adds r0, r5 -_0812C0EA: - ldrh r0, [r0] - strh r0, [r7, 0x4] - movs r0, 0 - bl GetBattlerAtPosition - adds r4, r0, 0 - movs r0, 0x2 - bl GetBattlerAtPosition - ldr r6, _0812C14C @ =gBattleMons - lsls r4, 24 - lsrs r4, 24 - movs r5, 0x58 - adds r1, r4, 0 - muls r1, r5 - adds r1, r6 - lsls r0, 24 - lsrs r0, 24 - muls r0, r5 - adds r0, r6 - ldrh r0, [r0, 0x28] - ldrh r1, [r1, 0x28] - adds r0, r1 - lsls r0, 16 - lsrs r0, 16 - mov r8, r0 - movs r0, 0 - bl GetBattlerAtPosition - adds r4, r0, 0 - movs r0, 0x2 - bl GetBattlerAtPosition - lsls r4, 24 - lsrs r4, 24 - adds r1, r4, 0 - muls r1, r5 - adds r1, r6 - lsls r0, 24 - lsrs r0, 24 - muls r0, r5 - adds r0, r6 - ldrh r0, [r0, 0x2C] - ldrh r1, [r1, 0x2C] - adds r0, r1 - lsls r0, 16 - lsrs r4, r0, 16 - b _0812C18E - .align 2, 0 -_0812C14C: .4byte gBattleMons -_0812C150: - ldr r0, _0812C1C4 @ =gBattleResults - ldrh r0, [r0, 0x20] - strh r0, [r7, 0x2] - movs r0, 0 - bl GetBattlerAtPosition - ldr r5, _0812C1C8 @ =gBattleMons - lsls r0, 24 - lsrs r0, 24 - movs r4, 0x58 - muls r0, r4 - adds r0, r5 - ldrh r0, [r0] - strh r0, [r7, 0x4] - movs r0, 0 - bl GetBattlerAtPosition - lsls r0, 24 - lsrs r0, 24 - muls r0, r4 - adds r0, r5 - ldrh r0, [r0, 0x28] - mov r8, r0 - movs r0, 0 - bl GetBattlerAtPosition - lsls r0, 24 - lsrs r0, 24 - muls r0, r4 - adds r0, r5 - ldrh r4, [r0, 0x2C] -_0812C18E: - bl sav1_map_get_name - movs r1, 0 - strb r0, [r7, 0x7] - strb r1, [r7, 0x6] - adds r0, r4, 0 - movs r1, 0x3 - bl __udivsi3 - lsls r0, 16 - lsrs r1, r0, 16 - lsls r0, r1, 1 - cmp r8, r0 - bge _0812C1AE - movs r0, 0x1 - strb r0, [r7, 0x6] -_0812C1AE: - cmp r8, r1 - bcs _0812C1B8 - ldrb r0, [r7, 0x6] - adds r0, 0x1 - strb r0, [r7, 0x6] -_0812C1B8: - mov r0, r10 - adds r1, r7, 0 - bl sub_8113550 - b _0812C206 - .align 2, 0 -_0812C1C4: .4byte gBattleResults -_0812C1C8: .4byte gBattleMons -_0812C1CC: - ldrb r0, [r5] - cmp r0, 0x1 - bne _0812C1E8 - ldr r0, _0812C1E4 @ =gEnemyParty - movs r1, 0xB - bl GetMonData - mov r1, r9 - strh r0, [r1] - strh r4, [r1, 0x2] - b _0812C1F8 - .align 2, 0 -_0812C1E4: .4byte gEnemyParty -_0812C1E8: - mov r0, r9 - strh r4, [r0] - ldr r0, _0812C220 @ =gEnemyParty - movs r1, 0xB - bl GetMonData - mov r1, r9 - strh r0, [r1, 0x2] -_0812C1F8: - bl sav1_map_get_name - mov r1, r9 - strb r0, [r1, 0x4] - movs r0, 0x1F - bl sub_8113550 -_0812C206: - adds r0, r7, 0 - bl Free - mov r0, r9 - bl Free -_0812C212: - pop {r3-r5} - mov r8, r3 - mov r9, r4 - mov r10, r5 - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_0812C220: .4byte gEnemyParty - thumb_func_end sub_812BFDC - thumb_func_start sub_812C224 sub_812C224: @ 812C224 push {r4-r7,lr} diff --git a/include/overworld.h b/include/overworld.h index 05ff5e03c..8cae07bdc 100644 --- a/include/overworld.h +++ b/include/overworld.h @@ -70,7 +70,6 @@ void c2_load_new_map(void); void copy_saved_warp2_bank_and_enter_x_to_warp1(u8 unused); void mapldr_default(void); -void IncrementGameStat(u8); u32 GetGameStat(u8); void sub_8056938(void); @@ -80,6 +79,8 @@ void sub_805726C(void); void sub_8057430(void); void sub_8055DC4(void); +u8 sav1_map_get_name(void); + extern u8 gUnknown_2031DD8; extern u8 gUnknown_2036E28; diff --git a/include/quest_log.h b/include/quest_log.h index b2a750725..9f8a0ea21 100644 --- a/include/quest_log.h +++ b/include/quest_log.h @@ -20,5 +20,6 @@ extern struct UnkStruct_3005E90 gUnknown_3005E90; extern struct UnkStruct_203AE98 * gUnknown_3005E94; void sub_8112720(u8); +void sub_8113550(u16, const u16 *); #endif //GUARD_QUEST_LOG_H diff --git a/ld_script.txt b/ld_script.txt index 3d59b2459..070eb444a 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -225,6 +225,7 @@ SECTIONS { asm/party_menu.o(.text); asm/union_room_chat.o(.text); asm/help_system_812B1E0.o(.text); + src/quest_log_battle.o(.text); asm/quest_log_battle.o(.text); asm/fame_checker.o(.text); asm/menu2.o(.text); diff --git a/src/quest_log.c b/src/quest_log.c index ed7214bdd..546ff6e05 100644 --- a/src/quest_log.c +++ b/src/quest_log.c @@ -2820,7 +2820,7 @@ static u16 * (*const sQuestLogStorageCBs[])(u16 *, const u16 *) = { }; #ifdef NONMATCHING -void sub_8113550(u16 a0, u16 * a1) +void sub_8113550(u16 a0, const u16 * a1) { u16 * r1; diff --git a/src/quest_log_battle.c b/src/quest_log_battle.c new file mode 100644 index 000000000..c5d8ec2af --- /dev/null +++ b/src/quest_log_battle.c @@ -0,0 +1,97 @@ +#include "global.h" +#include "constants/species.h" +#include "malloc.h" +#include "battle.h" +#include "overworld.h" +#include "quest_log.h" + +struct QuestLogStruct_01 +{ + u16 v0; + u16 v2; + u16 v4; + u8 v6; + u8 v7; +}; + +struct QuestLogStruct_02 +{ + u16 v0; + u16 v2; + u8 v4; +}; + +void sub_812BFDC(void) +{ + if (!(gBattleTypeFlags & (BATTLE_TYPE_LINK | BATTLE_TYPE_WALLY_TUTORIAL | BATTLE_TYPE_DOME)) && (gUnknown_2023E8A == 1 || gUnknown_2023E8A == 7)) + { + struct QuestLogStruct_01 * questLogTrainerBattleRecord = Alloc(sizeof(struct QuestLogStruct_01)); + struct QuestLogStruct_02 * questLogWildBattleRecord = Alloc(sizeof(struct QuestLogStruct_02)); + u16 questLogMessageType; + u16 playerEndingHP; + u16 playerMaxHP; + + if (gBattleTypeFlags & BATTLE_TYPE_TRAINER) + { + switch (gTrainers[gTrainerBattleOpponent_A].trainerClass) + { + case 0x54: + questLogMessageType = 30; + break; + case 0x5a: + questLogMessageType = 33; + break; + case 0x57: + questLogMessageType = 32; + break; + default: + questLogMessageType = 34; + break; + } + questLogTrainerBattleRecord->v0 = gTrainerBattleOpponent_A; + if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE) + { + questLogTrainerBattleRecord->v2 = gBattleResults.lastOpponentSpecies; + if (GetBattlerSide(gBattleStruct->field_182) == B_SIDE_PLAYER) + questLogTrainerBattleRecord->v4 = gBattleMons[gBattleStruct->field_182].species; + else if (gBattleMons[GetBattlerAtPosition(0)].hp != 0) + questLogTrainerBattleRecord->v4 = gBattleMons[GetBattlerAtPosition(0)].species; + else + questLogTrainerBattleRecord->v4 = gBattleMons[GetBattlerAtPosition(2)].species; + playerEndingHP = gBattleMons[GetBattlerAtPosition(0)].hp + gBattleMons[GetBattlerAtPosition(2)].hp; + playerMaxHP = gBattleMons[GetBattlerAtPosition(0)].maxHP + gBattleMons[GetBattlerAtPosition(2)].maxHP; + } + else + { + questLogTrainerBattleRecord->v2 = gBattleResults.lastOpponentSpecies; + questLogTrainerBattleRecord->v4 = gBattleMons[GetBattlerAtPosition(0)].species; + playerEndingHP = gBattleMons[GetBattlerAtPosition(0)].hp; + playerMaxHP = gBattleMons[GetBattlerAtPosition(0)].maxHP; + } + questLogTrainerBattleRecord->v7 = sav1_map_get_name(); + questLogTrainerBattleRecord->v6 = 0; + if (playerEndingHP < playerMaxHP / 3 * 2) + questLogTrainerBattleRecord->v6 = 1; + if (playerEndingHP < playerMaxHP / 3) + questLogTrainerBattleRecord->v6++; + sub_8113550(questLogMessageType, (const u16 *)questLogTrainerBattleRecord); + } + else + { + if (gUnknown_2023E8A == 1) + { + questLogWildBattleRecord->v0 = GetMonData(gEnemyParty + 0, MON_DATA_SPECIES); + questLogWildBattleRecord->v2 = SPECIES_NONE; + } + else + { + questLogWildBattleRecord->v0 = SPECIES_NONE; + questLogWildBattleRecord->v2 = GetMonData(gEnemyParty + 0, MON_DATA_SPECIES); + } + questLogWildBattleRecord->v4 = sav1_map_get_name(); + sub_8113550(31, (const u16 *)questLogWildBattleRecord); + } + Free(questLogTrainerBattleRecord); + Free(questLogWildBattleRecord); + } +} -- cgit v1.2.3 From d5d220bc5c952aae723a0c0849bfbbdb17dff70a Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Fri, 23 Nov 2018 21:55:21 -0500 Subject: quest_log_battle, 2 --- asm/battle_1.s | 4 +- asm/battle_message.s | 8 +-- asm/cable_club.s | 4 +- asm/link_rfu_2.s | 4 +- asm/link_rfu_3.s | 8 +-- asm/link_rfu_4.s | 12 ++--- asm/quest_log_battle.s | 137 ------------------------------------------------- asm/trade.s | 28 +++++----- asm/unk_8147AA8.s | 4 +- asm/unk_814B6F0.s | 4 +- asm/unk_81507FC.s | 8 +-- include/battle.h | 6 ++- src/quest_log_battle.c | 61 ++++++++++++++++++++-- sym_ewram.txt | 8 +-- 14 files changed, 105 insertions(+), 191 deletions(-) diff --git a/asm/battle_1.s b/asm/battle_1.s index b91c32c7d..02ffb8fea 100644 --- a/asm/battle_1.s +++ b/asm/battle_1.s @@ -703,7 +703,7 @@ _0800F734: movs r5, 0 movs r6, 0x3 _0800F744: - ldr r0, _0800F760 @ =gUnknown_2022744 + ldr r0, _0800F760 @ =gLinkPlayers + 8 adds r1, r5, r0 subs r0, 0x8 adds r4, r5, r0 @@ -717,7 +717,7 @@ _0800F744: b _0800F7C2 .align 2, 0 _0800F75C: .4byte gBattleTypeFlags -_0800F760: .4byte gUnknown_2022744 +_0800F760: .4byte gLinkPlayers + 8 _0800F764: cmp r0, 0x2 beq _0800F790 diff --git a/asm/battle_message.s b/asm/battle_message.s index ecfd738f1..029ff9ed0 100644 --- a/asm/battle_message.s +++ b/asm/battle_message.s @@ -1834,11 +1834,11 @@ _080D8162: lsls r0, r7, 3 subs r0, r7 lsls r0, 2 - ldr r1, _080D8170 @ =gUnknown_2022744 + ldr r1, _080D8170 @ =gLinkPlayers + 8 adds r4, r0, r1 b _080D8382 .align 2, 0 -_080D8170: .4byte gUnknown_2022744 +_080D8170: .4byte gLinkPlayers + 8 _080D8174: ldr r4, _080D8184 @ =gLinkPlayers lsls r0, r7, 3 @@ -1888,12 +1888,12 @@ _080D81C8: lsls r1, r0, 3 subs r1, r0 lsls r1, 2 - ldr r0, _080D81D8 @ =gUnknown_2022744 + ldr r0, _080D81D8 @ =gLinkPlayers + 8 adds r4, r1, r0 b _080D8382 .align 2, 0 _080D81D4: .4byte gBattleScripting -_080D81D8: .4byte gUnknown_2022744 +_080D81D8: .4byte gLinkPlayers + 8 _080D81DC: ldr r0, _080D81E4 @ =gSaveBlock2Ptr ldr r4, [r0] diff --git a/asm/cable_club.s b/asm/cable_club.s index ae09830e6..1d49bfcaa 100644 --- a/asm/cable_club.s +++ b/asm/cable_club.s @@ -2408,7 +2408,7 @@ sub_8081A34: @ 8081A34 lsls r1, r4, 3 subs r1, r4 lsls r1, 2 - ldr r2, _08081A7C @ =gUnknown_2022744 + ldr r2, _08081A7C @ =gLinkPlayers + 8 adds r1, r2 bl StringCopy adds r0, r4, 0 @@ -2429,7 +2429,7 @@ sub_8081A34: @ 8081A34 .align 2, 0 _08081A74: .4byte gUnknown_20370C4 _08081A78: .4byte gStringVar1 -_08081A7C: .4byte gUnknown_2022744 +_08081A7C: .4byte gLinkPlayers + 8 _08081A80: .4byte gStringVar2 _08081A84: .4byte gUnknown_83C6AB8 _08081A88: diff --git a/asm/link_rfu_2.s b/asm/link_rfu_2.s index b606854a3..f59f1ea87 100644 --- a/asm/link_rfu_2.s +++ b/asm/link_rfu_2.s @@ -9954,7 +9954,7 @@ _080FD1C8: subs r0, r4 lsls r0, 2 str r0, [sp, 0x1C] - ldr r2, _080FD24C @ =gUnknown_2022744 + ldr r2, _080FD24C @ =gLinkPlayers + 8 mov r10, r2 ldr r6, _080FD250 @ =0x00003ba8 movs r4, 0 @@ -10007,7 +10007,7 @@ _080FD22C: ldr r6, [sp, 0x14] b _080FD2A4 .align 2, 0 -_080FD24C: .4byte gUnknown_2022744 +_080FD24C: .4byte gLinkPlayers + 8 _080FD250: .4byte 0x00003ba8 _080FD254: .4byte gSaveBlock1Ptr _080FD258: diff --git a/asm/link_rfu_3.s b/asm/link_rfu_3.s index ec3e2e5a4..d67176ed4 100644 --- a/asm/link_rfu_3.s +++ b/asm/link_rfu_3.s @@ -6293,7 +6293,7 @@ _08118ED6: lsls r1, r0, 3 subs r1, r0 lsls r1, 2 - ldr r4, _08118F24 @ =gUnknown_2022744 + ldr r4, _08118F24 @ =gLinkPlayers + 8 adds r1, r4 adds r0, r5, 0 bl StringCopy @@ -6312,7 +6312,7 @@ _08118ED6: bl _081198DA .align 2, 0 _08118F20: .4byte gStringVar1 -_08118F24: .4byte gUnknown_2022744 +_08118F24: .4byte gLinkPlayers + 8 _08118F28: .4byte gStringVar4 _08118F2C: .4byte gUnknown_8457C20 _08118F30: @@ -6543,7 +6543,7 @@ _08119122: movs r0, 0x21 strb r0, [r6, 0x14] ldr r0, _08119154 @ =gStringVar1 - ldr r4, _08119158 @ =gUnknown_2022760 + ldr r4, _08119158 @ =gLinkPlayers + 0x24 adds r1, r4, 0 bl StringCopy adds r0, r4, 0 @@ -6562,7 +6562,7 @@ _08119122: .align 2, 0 _08119150: .4byte sub_8117280 _08119154: .4byte gStringVar1 -_08119158: .4byte gUnknown_2022760 +_08119158: .4byte gLinkPlayers + 0x24 _0811915C: .4byte gStringVar4 _08119160: .4byte gUnknown_8457BCC _08119164: diff --git a/asm/link_rfu_4.s b/asm/link_rfu_4.s index 4749a278a..f8917e197 100644 --- a/asm/link_rfu_4.s +++ b/asm/link_rfu_4.s @@ -1731,12 +1731,12 @@ _0814315C: movs r0, 0xB strb r0, [r5, 0x8] ldr r0, _0814316C @ =gStringVar1 - ldr r1, _08143170 @ =gUnknown_2022744 + ldr r1, _08143170 @ =gLinkPlayers + 8 bl StringCopy b _081435C6 .align 2, 0 _0814316C: .4byte gStringVar1 -_08143170: .4byte gUnknown_2022744 +_08143170: .4byte gLinkPlayers + 8 _08143174: adds r4, r5, 0 adds r4, 0x9 @@ -1847,7 +1847,7 @@ _08143242: cmp r0, 0x1 bne _08143250 ldr r0, _0814325C @ =gStringVar1 - ldr r1, _08143260 @ =gUnknown_2022744 + ldr r1, _08143260 @ =gLinkPlayers + 8 bl StringCopy _08143250: movs r0, 0xF @@ -1856,7 +1856,7 @@ _08143250: .align 2, 0 _08143258: .4byte gUnknown_841E7A3 _0814325C: .4byte gStringVar1 -_08143260: .4byte gUnknown_2022744 +_08143260: .4byte gLinkPlayers + 8 _08143264: ldrb r1, [r5, 0xC] ldrb r2, [r5, 0xD] @@ -2229,14 +2229,14 @@ _08143514: _08143528: bl task_add_05_task_del_08FA224_when_no_RfuFunc ldr r0, _0814353C @ =gStringVar1 - ldr r1, _08143540 @ =gUnknown_2022760 + ldr r1, _08143540 @ =gLinkPlayers + 0x24 bl StringCopy movs r0, 0x22 strb r0, [r5, 0x8] b _081435C6 .align 2, 0 _0814353C: .4byte gStringVar1 -_08143540: .4byte gUnknown_2022760 +_08143540: .4byte gLinkPlayers + 0x24 _08143544: bl sub_80FA4F8 lsls r0, 24 diff --git a/asm/quest_log_battle.s b/asm/quest_log_battle.s index 1afadbf5f..2219633bb 100644 --- a/asm/quest_log_battle.s +++ b/asm/quest_log_battle.s @@ -5,143 +5,6 @@ .text - thumb_func_start sub_812C224 -sub_812C224: @ 812C224 - push {r4-r7,lr} - mov r7, r9 - mov r6, r8 - push {r6,r7} - sub sp, 0xC - ldr r4, _0812C2B8 @ =gBattleTypeFlags - ldr r0, [r4] - movs r1, 0x2 - ands r0, r1 - cmp r0, 0 - beq _0812C31C - movs r0, 0x18 - bl Alloc - adds r5, r0, 0 - ldr r0, _0812C2BC @ =gUnknown_2023E8A - ldrb r0, [r0] - subs r0, 0x1 - strb r0, [r5] - ldr r1, [r4] - movs r0, 0x40 - ands r0, r1 - cmp r0, 0 - beq _0812C2C4 - movs r0, 0xF - mov r8, r0 - add r4, sp, 0x4 - mov r0, sp - adds r1, r4, 0 - bl sub_812C334 - movs r3, 0 - mov r9, r4 - adds r1, r5, 0x1 - mov r12, r1 - adds r7, r5, 0 - adds r7, 0x8 - adds r6, r5, 0 - adds r6, 0xF - ldr r4, _0812C2C0 @ =gUnknown_2022744 -_0812C274: - mov r0, r12 - adds r2, r0, r3 - ldr r1, [sp] - lsls r0, r1, 3 - subs r0, r1 - lsls r0, 2 - adds r0, r3, r0 - adds r0, r4 - ldrb r0, [r0] - strb r0, [r2] - adds r2, r7, r3 - ldr r1, [sp, 0x4] - lsls r0, r1, 3 - subs r0, r1 - lsls r0, 2 - adds r0, r3, r0 - adds r0, r4 - ldrb r0, [r0] - strb r0, [r2] - adds r2, r6, r3 - mov r0, r9 - ldr r1, [r0, 0x4] - lsls r0, r1, 3 - subs r0, r1 - lsls r0, 2 - adds r0, r3, r0 - adds r0, r4 - ldrb r0, [r0] - strb r0, [r2] - adds r3, 0x1 - cmp r3, 0x6 - ble _0812C274 - b _0812C30E - .align 2, 0 -_0812C2B8: .4byte gBattleTypeFlags -_0812C2BC: .4byte gUnknown_2023E8A -_0812C2C0: .4byte gUnknown_2022744 -_0812C2C4: - movs r0, 0x1 - ands r1, r0 - cmp r1, 0 - beq _0812C2D2 - movs r1, 0xE - mov r8, r1 - b _0812C2E2 -_0812C2D2: - bl InUnionRoom - movs r1, 0xD - mov r8, r1 - cmp r0, 0x1 - bne _0812C2E2 - movs r0, 0x13 - mov r8, r0 -_0812C2E2: - movs r3, 0 - adds r4, r5, 0x1 - ldr r1, _0812C32C @ =gUnknown_2022744 - mov r12, r1 - ldr r7, _0812C330 @ =gBattleStruct - movs r6, 0x1 -_0812C2EE: - adds r2, r4, r3 - ldr r0, [r7] - adds r0, 0xB5 - ldrb r0, [r0] - adds r1, r6, 0 - eors r1, r0 - lsls r0, r1, 3 - subs r0, r1 - lsls r0, 2 - adds r0, r3, r0 - add r0, r12 - ldrb r0, [r0] - strb r0, [r2] - adds r3, 0x1 - cmp r3, 0x6 - ble _0812C2EE -_0812C30E: - mov r0, r8 - adds r1, r5, 0 - bl sub_8113550 - adds r0, r5, 0 - bl Free -_0812C31C: - add sp, 0xC - pop {r3,r4} - mov r8, r3 - mov r9, r4 - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_0812C32C: .4byte gUnknown_2022744 -_0812C330: .4byte gBattleStruct - thumb_func_end sub_812C224 - thumb_func_start sub_812C334 sub_812C334: @ 812C334 push {r4-r6,lr} diff --git a/asm/trade.s b/asm/trade.s index cb15185e9..b5d1dcac6 100644 --- a/asm/trade.s +++ b/asm/trade.s @@ -664,7 +664,7 @@ _0804CB9C: lsls r0, r1, 3 subs r0, r1 lsls r0, 2 - ldr r1, _0804CC20 @ =gUnknown_2022744 + ldr r1, _0804CC20 @ =gLinkPlayers + 8 adds r0, r1 ldr r1, [r6, 0xC] str r5, [sp] @@ -702,7 +702,7 @@ _0804CB9C: _0804CC14: .4byte gSaveBlock2Ptr _0804CC18: .4byte gUnknown_2031C94 _0804CC1C: .4byte gDecompressionBuffer -_0804CC20: .4byte gUnknown_2022744 +_0804CC20: .4byte gLinkPlayers + 8 _0804CC24: .4byte gUnknown_8261ECC _0804CC28: .4byte gMain _0804CC2C: .4byte gUnknown_2031DA8 @@ -762,7 +762,7 @@ _0804CC62: lsls r0, r1, 3 subs r0, r1 lsls r0, 2 - ldr r1, _0804CD08 @ =gUnknown_2022744 + ldr r1, _0804CD08 @ =gLinkPlayers + 8 adds r1, r0, r1 movs r0, 0x1 movs r2, 0 @@ -811,7 +811,7 @@ _0804CCC6: _0804CCFC: .4byte gSaveBlock2Ptr _0804CD00: .4byte gUnknown_8261E8A _0804CD04: .4byte gUnknown_8261CC8 -_0804CD08: .4byte gUnknown_2022744 +_0804CD08: .4byte gLinkPlayers + 8 _0804CD0C: .4byte gMain _0804CD10: ldr r4, _0804CDCC @ =gUnknown_8261CC8 @@ -1354,7 +1354,7 @@ _0804D19C: lsls r0, r1, 3 subs r0, r1 lsls r0, 2 - ldr r1, _0804D220 @ =gUnknown_2022744 + ldr r1, _0804D220 @ =gLinkPlayers + 8 adds r0, r1 ldr r1, [r6, 0xC] str r5, [sp] @@ -1393,7 +1393,7 @@ _0804D200: _0804D214: .4byte gSaveBlock2Ptr _0804D218: .4byte gUnknown_2031C94 _0804D21C: .4byte gDecompressionBuffer -_0804D220: .4byte gUnknown_2022744 +_0804D220: .4byte gLinkPlayers + 8 _0804D224: .4byte gUnknown_8261ECC _0804D228: .4byte gMain _0804D22C: .4byte gUnknown_2031DA8 @@ -1459,7 +1459,7 @@ _0804D270: lsls r0, r1, 3 subs r0, r1 lsls r0, 2 - ldr r1, _0804D318 @ =gUnknown_2022744 + ldr r1, _0804D318 @ =gLinkPlayers + 8 adds r1, r0, r1 movs r0, 0x1 movs r2, 0 @@ -1508,7 +1508,7 @@ _0804D2D4: _0804D30C: .4byte gSaveBlock2Ptr _0804D310: .4byte gUnknown_8261E8A _0804D314: .4byte gUnknown_8261CC8 -_0804D318: .4byte gUnknown_2022744 +_0804D318: .4byte gLinkPlayers + 8 _0804D31C: .4byte gMain _0804D320: ldr r4, _0804D3B0 @ =gUnknown_8261CC8 @@ -7706,7 +7706,7 @@ _0805039C: lsls r1, r0, 3 subs r1, r0 lsls r1, 2 - ldr r0, _08050428 @ =gUnknown_2022744 + ldr r0, _08050428 @ =gLinkPlayers + 8 adds r1, r0 adds r0, r4, 0 movs r2, 0x7 @@ -7721,7 +7721,7 @@ _08050418: .4byte gUnknown_2031DA4 _0805041C: .4byte gPlayerParty _08050420: .4byte gUnknown_2031DAC _08050424: .4byte gEnemyParty -_08050428: .4byte gUnknown_2022744 +_08050428: .4byte gLinkPlayers + 8 _0805042C: .4byte gMain _08050430: bl sub_805049C @@ -7947,7 +7947,7 @@ _08050628: strb r0, [r1] movs r0, 0x6 strb r0, [r1, 0x1] - ldr r4, _080506D4 @ =gUnknown_2022744 + ldr r4, _080506D4 @ =gLinkPlayers + 8 ldr r0, _080506D8 @ =gSaveBlock2Ptr ldr r1, [r0] adds r0, r4, 0 @@ -8014,7 +8014,7 @@ _08050628: .align 2, 0 _080506CC: .4byte gUnknown_2031DA4 _080506D0: .4byte gSpecialVar_0x8005 -_080506D4: .4byte gUnknown_2022744 +_080506D4: .4byte gLinkPlayers + 8 _080506D8: .4byte gSaveBlock2Ptr _080506DC: .4byte gEnemyParty _080506E0: .4byte gUnknown_2031DAC @@ -8871,7 +8871,7 @@ sub_8050E24: @ 8050E24 lsls r1, r2, 3 subs r1, r2 lsls r1, 2 - ldr r0, _08050E9C @ =gUnknown_2022744 + ldr r0, _08050E9C @ =gLinkPlayers + 8 adds r1, r0 adds r0, r3, 0 bl StringCopy @@ -8905,7 +8905,7 @@ sub_8050E24: @ 8050E24 .align 2, 0 _08050E94: .4byte gUnknown_2031DAC _08050E98: .4byte gStringVar1 -_08050E9C: .4byte gUnknown_2022744 +_08050E9C: .4byte gLinkPlayers + 8 _08050EA0: .4byte gUnknown_2031DA4 _08050EA4: .4byte gEnemyParty _08050EA8: .4byte gStringVar3 diff --git a/asm/unk_8147AA8.s b/asm/unk_8147AA8.s index 3f52d5a6a..1b06167f8 100644 --- a/asm/unk_8147AA8.s +++ b/asm/unk_8147AA8.s @@ -2687,7 +2687,7 @@ _08148EFA: ldr r2, [sp] cmp r0, 0 beq _08148F34 - ldr r1, _08148F58 @ =gUnknown_2022744 + ldr r1, _08148F58 @ =gLinkPlayers + 8 add r1, r9 adds r0, r7, 0 bl StringCopy @@ -2723,7 +2723,7 @@ _08148F44: bx r0 .align 2, 0 _08148F54: .4byte 0x000082a8 -_08148F58: .4byte gUnknown_2022744 +_08148F58: .4byte gLinkPlayers + 8 thumb_func_end sub_8148E80 thumb_func_start sub_8148F5C diff --git a/asm/unk_814B6F0.s b/asm/unk_814B6F0.s index 2e3d2e112..cfc756cf8 100644 --- a/asm/unk_814B6F0.s +++ b/asm/unk_814B6F0.s @@ -508,7 +508,7 @@ _0814BAC4: lsls r1, r5, 3 subs r1, r5 lsls r1, 2 - ldr r2, _0814BB2C @ =gUnknown_2022744 + ldr r2, _0814BB2C @ =gLinkPlayers + 8 adds r1, r2 bl StringCopy adds r4, r6, r4 @@ -555,7 +555,7 @@ _0814BB14: beq _0814BB3A b _0814BB46 .align 2, 0 -_0814BB2C: .4byte gUnknown_2022744 +_0814BB2C: .4byte gLinkPlayers + 8 _0814BB30: .4byte gSaveBlock2Ptr _0814BB34: cmp r0, 0x2 diff --git a/asm/unk_81507FC.s b/asm/unk_81507FC.s index 534804769..205bb7a85 100644 --- a/asm/unk_81507FC.s +++ b/asm/unk_81507FC.s @@ -5763,13 +5763,13 @@ _081533F0: lsls r0, r2, 3 subs r0, r2 lsls r0, 2 - ldr r1, _08153400 @ =gUnknown_2022744 + ldr r1, _08153400 @ =gLinkPlayers + 8 _081533F8: adds r0, r1 pop {r1} bx r1 .align 2, 0 -_08153400: .4byte gUnknown_2022744 +_08153400: .4byte gLinkPlayers + 8 thumb_func_end sub_81533C4 thumb_func_start sub_8153404 @@ -6605,7 +6605,7 @@ _08153A14: lsls r0, r4, 3 subs r0, r4 lsls r0, 2 - ldr r1, _08153A94 @ =gUnknown_2022744 + ldr r1, _08153A94 @ =gLinkPlayers + 8 adds r0, r1 lsls r1, r4, 2 adds r1, r5 @@ -6668,7 +6668,7 @@ _08153A7E: .align 2, 0 _08153A8C: .4byte gUnknown_203F3E0 _08153A90: .4byte gUnknown_8475648 -_08153A94: .4byte gUnknown_2022744 +_08153A94: .4byte gLinkPlayers + 8 _08153A98: .4byte gUnknown_8475608 thumb_func_end sub_8153A04 diff --git a/include/battle.h b/include/battle.h index e2f7ddb44..c86bc9232 100644 --- a/include/battle.h +++ b/include/battle.h @@ -604,7 +604,11 @@ struct BattleStruct u8 hpScale; u8 synchronizeMoveEffect; u8 field_B3; - void (*savedCallback)(void); + u8 field_B4; + u8 field_B5; + u8 field_B6; + u8 field_B7; + // void (*savedCallback)(void); u16 usedHeldItems[BATTLE_BANKS_COUNT]; u8 chosenItem[4]; // why is this an u8? u8 AI_itemType[2]; diff --git a/src/quest_log_battle.c b/src/quest_log_battle.c index c5d8ec2af..b6d6c88f3 100644 --- a/src/quest_log_battle.c +++ b/src/quest_log_battle.c @@ -2,10 +2,11 @@ #include "constants/species.h" #include "malloc.h" #include "battle.h" +#include "link.h" #include "overworld.h" #include "quest_log.h" -struct QuestLogStruct_01 +struct QuestLogStruct_TrainerBattleRecord { u16 v0; u16 v2; @@ -14,19 +15,21 @@ struct QuestLogStruct_01 u8 v7; }; -struct QuestLogStruct_02 +struct QuestLogStruct_WildBattleRecord { u16 v0; u16 v2; u8 v4; }; +void sub_812C334(u32 *, u32 *); + void sub_812BFDC(void) { if (!(gBattleTypeFlags & (BATTLE_TYPE_LINK | BATTLE_TYPE_WALLY_TUTORIAL | BATTLE_TYPE_DOME)) && (gUnknown_2023E8A == 1 || gUnknown_2023E8A == 7)) { - struct QuestLogStruct_01 * questLogTrainerBattleRecord = Alloc(sizeof(struct QuestLogStruct_01)); - struct QuestLogStruct_02 * questLogWildBattleRecord = Alloc(sizeof(struct QuestLogStruct_02)); + struct QuestLogStruct_TrainerBattleRecord * questLogTrainerBattleRecord = Alloc(sizeof(struct QuestLogStruct_TrainerBattleRecord)); + struct QuestLogStruct_WildBattleRecord * questLogWildBattleRecord = Alloc(sizeof(struct QuestLogStruct_WildBattleRecord)); u16 questLogMessageType; u16 playerEndingHP; u16 playerMaxHP; @@ -95,3 +98,53 @@ void sub_812BFDC(void) Free(questLogWildBattleRecord); } } + +struct QuestLogStruct_LinkBattleRecord +{ + u8 v0; + u8 v1[3][7]; +}; + +void sub_812C224(void) +{ + u32 sp0; + u32 sp4[2]; + u16 r8; + s32 r3; + u32 r0; + + if (gBattleTypeFlags & BATTLE_TYPE_LINK) + { + struct QuestLogStruct_LinkBattleRecord * r5 = Alloc(sizeof(struct QuestLogStruct_LinkBattleRecord)); + r5->v0 = gUnknown_2023E8A - 1; + if (gBattleTypeFlags & BATTLE_TYPE_MULTI) + { + r8 = 15; + sub_812C334(&sp0, sp4); + for (r3 = 0; r3 < 7; r3++) + { + r5->v1[0][r3] = gLinkPlayers[sp0].name[r3]; + r5->v1[1][r3] = gLinkPlayers[sp4[0]].name[r3]; + r5->v1[2][r3] = gLinkPlayers[sp4[1]].name[r3]; + } + } + else + { + if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE) + r8 = 14; + else + { + r0 = InUnionRoom(); + r8 = 13; + if (r0 == TRUE) + r8 = 19; + } + for (r3 = 0; r3 < 7; r3++) + { + r5->v1[0][r3] = gLinkPlayers[gBattleStruct->field_B5 ^ 1].name[r3]; + } + } + sub_8113550(r8, (const u16 *)r5); + Free(r5); + } +} diff --git a/sym_ewram.txt b/sym_ewram.txt index ee83526af..16a1e7ddd 100644 --- a/sym_ewram.txt +++ b/sym_ewram.txt @@ -80,13 +80,7 @@ gUnknown_2022720: @ 2022720 .space 0x1C gLinkPlayers: @ 202273C - .space 0x8 - -gUnknown_2022744: @ 2022744 - .space 0x1C - -gUnknown_2022760: @ 2022760 - .space 0x68 + .space 0x8C gUnknown_20227C8: @ 20227C8 .space 0x8C -- cgit v1.2.3 From b3f1b2c2541b6ec3a8b5af2d4a3ca151f69839e4 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Fri, 23 Nov 2018 22:17:31 -0500 Subject: quest_log_battle, 3 (nonmatching) --- asm/quest_log_battle.s | 51 --------------------------------------- ld_script.txt | 1 - src/quest_log_battle.c | 65 +++++++++++++++++++++++++++++++++++++++++++++++--- 3 files changed, 62 insertions(+), 55 deletions(-) delete mode 100644 asm/quest_log_battle.s diff --git a/asm/quest_log_battle.s b/asm/quest_log_battle.s deleted file mode 100644 index 2219633bb..000000000 --- a/asm/quest_log_battle.s +++ /dev/null @@ -1,51 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .syntax unified - - .text - - thumb_func_start sub_812C334 -sub_812C334: @ 812C334 - push {r4-r6,lr} - adds r6, r0, 0 - ldr r3, _0812C35C @ =gLinkPlayers - ldr r4, _0812C360 @ =gBattleStruct - ldr r0, [r4] - adds r0, 0xB5 - ldrb r2, [r0] - lsls r0, r2, 3 - subs r0, r2 - lsls r0, 2 - adds r0, r3 - ldrb r2, [r0, 0x18] - movs r0, 0x2 - movs r5, 0 - eors r2, r0 -_0812C352: - ldrh r0, [r3, 0x18] - cmp r2, r0 - bne _0812C364 - str r5, [r6] - b _0812C370 - .align 2, 0 -_0812C35C: .4byte gLinkPlayers -_0812C360: .4byte gBattleStruct -_0812C364: - ldr r0, [r4] - adds r0, 0xB5 - ldrb r0, [r0] - cmp r5, r0 - beq _0812C370 - stm r1!, {r5} -_0812C370: - adds r3, 0x1C - adds r5, 0x1 - cmp r5, 0x3 - ble _0812C352 - pop {r4-r6} - pop {r0} - bx r0 - thumb_func_end sub_812C334 - - .align 2, 0 @ Don't pad with nop. diff --git a/ld_script.txt b/ld_script.txt index 070eb444a..67f21c48f 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -226,7 +226,6 @@ SECTIONS { asm/union_room_chat.o(.text); asm/help_system_812B1E0.o(.text); src/quest_log_battle.o(.text); - asm/quest_log_battle.o(.text); asm/fame_checker.o(.text); asm/menu2.o(.text); asm/oak_speech.o(.text); diff --git a/src/quest_log_battle.c b/src/quest_log_battle.c index b6d6c88f3..f4d66f4b7 100644 --- a/src/quest_log_battle.c +++ b/src/quest_log_battle.c @@ -22,7 +22,7 @@ struct QuestLogStruct_WildBattleRecord u8 v4; }; -void sub_812C334(u32 *, u32 *); +void sub_812C334(s32 *, s32 *); void sub_812BFDC(void) { @@ -107,8 +107,8 @@ struct QuestLogStruct_LinkBattleRecord void sub_812C224(void) { - u32 sp0; - u32 sp4[2]; + s32 sp0; + s32 sp4[2]; u16 r8; s32 r3; u32 r0; @@ -148,3 +148,62 @@ void sub_812C224(void) Free(r5); } } + +#ifdef NONMATCHING +void sub_812C334(s32 * a0, s32 * a1) +{ + s32 r5; + u8 r2 = gLinkPlayers[gBattleStruct->field_B5].id; + for (r5 = 0; r5 < 4; r5++) + { + if ((r2 ^ 2) == gLinkPlayers[r5].id) + *a0 = r5; + else if (r5 != gBattleStruct->field_B5) + *a1++ = r5; + } +} +#else +NAKED +void sub_812C334(s32 * a0, s32 * a1) +{ + asm_unified("\tpush {r4-r6,lr}\n" + "\tadds r6, r0, 0\n" + "\tldr r3, _0812C35C @ =gLinkPlayers\n" + "\tldr r4, _0812C360 @ =gBattleStruct\n" + "\tldr r0, [r4]\n" + "\tadds r0, 0xB5\n" + "\tldrb r2, [r0]\n" + "\tlsls r0, r2, 3\n" + "\tsubs r0, r2\n" + "\tlsls r0, 2\n" + "\tadds r0, r3\n" + "\tldrb r2, [r0, 0x18]\n" + "\tmovs r0, 0x2\n" + "\tmovs r5, 0\n" + "\teors r2, r0\n" + "_0812C352:\n" + "\tldrh r0, [r3, 0x18]\n" + "\tcmp r2, r0\n" + "\tbne _0812C364\n" + "\tstr r5, [r6]\n" + "\tb _0812C370\n" + "\t.align 2, 0\n" + "_0812C35C: .4byte gLinkPlayers\n" + "_0812C360: .4byte gBattleStruct\n" + "_0812C364:\n" + "\tldr r0, [r4]\n" + "\tadds r0, 0xB5\n" + "\tldrb r0, [r0]\n" + "\tcmp r5, r0\n" + "\tbeq _0812C370\n" + "\tstm r1!, {r5}\n" + "_0812C370:\n" + "\tadds r3, 0x1C\n" + "\tadds r5, 0x1\n" + "\tcmp r5, 0x3\n" + "\tble _0812C352\n" + "\tpop {r4-r6}\n" + "\tpop {r0}\n" + "\tbx r0"); +} +#endif // NONMATCHING -- cgit v1.2.3 From 9b79707eeef69e7521c8e1e5057fe2ebd020656a Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sat, 24 Nov 2018 11:20:51 -0500 Subject: match sub_812C334 --- src/quest_log_battle.c | 60 +++++++++----------------------------------------- 1 file changed, 10 insertions(+), 50 deletions(-) diff --git a/src/quest_log_battle.c b/src/quest_log_battle.c index f4d66f4b7..17b989951 100644 --- a/src/quest_log_battle.c +++ b/src/quest_log_battle.c @@ -149,61 +149,21 @@ void sub_812C224(void) } } -#ifdef NONMATCHING void sub_812C334(s32 * a0, s32 * a1) { s32 r5; - u8 r2 = gLinkPlayers[gBattleStruct->field_B5].id; + s32 _optimized_out = 0; + u8 r2 = gLinkPlayers[gBattleStruct->field_B5].id ^ 2; for (r5 = 0; r5 < 4; r5++) { - if ((r2 ^ 2) == gLinkPlayers[r5].id) - *a0 = r5; + if (r2 == gLinkPlayers[r5].id) + { + a0[0] = r5; + } else if (r5 != gBattleStruct->field_B5) - *a1++ = r5; + { + a1[_optimized_out] = r5; + _optimized_out++; + } } } -#else -NAKED -void sub_812C334(s32 * a0, s32 * a1) -{ - asm_unified("\tpush {r4-r6,lr}\n" - "\tadds r6, r0, 0\n" - "\tldr r3, _0812C35C @ =gLinkPlayers\n" - "\tldr r4, _0812C360 @ =gBattleStruct\n" - "\tldr r0, [r4]\n" - "\tadds r0, 0xB5\n" - "\tldrb r2, [r0]\n" - "\tlsls r0, r2, 3\n" - "\tsubs r0, r2\n" - "\tlsls r0, 2\n" - "\tadds r0, r3\n" - "\tldrb r2, [r0, 0x18]\n" - "\tmovs r0, 0x2\n" - "\tmovs r5, 0\n" - "\teors r2, r0\n" - "_0812C352:\n" - "\tldrh r0, [r3, 0x18]\n" - "\tcmp r2, r0\n" - "\tbne _0812C364\n" - "\tstr r5, [r6]\n" - "\tb _0812C370\n" - "\t.align 2, 0\n" - "_0812C35C: .4byte gLinkPlayers\n" - "_0812C360: .4byte gBattleStruct\n" - "_0812C364:\n" - "\tldr r0, [r4]\n" - "\tadds r0, 0xB5\n" - "\tldrb r0, [r0]\n" - "\tcmp r5, r0\n" - "\tbeq _0812C370\n" - "\tstm r1!, {r5}\n" - "_0812C370:\n" - "\tadds r3, 0x1C\n" - "\tadds r5, 0x1\n" - "\tcmp r5, 0x3\n" - "\tble _0812C352\n" - "\tpop {r4-r6}\n" - "\tpop {r0}\n" - "\tbx r0"); -} -#endif // NONMATCHING -- cgit v1.2.3 From bc6416ddd96182d5f786add8d1c1945a2f82f2b9 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sat, 24 Nov 2018 11:25:24 -0500 Subject: A bit of cleanup --- src/quest_log_battle.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/src/quest_log_battle.c b/src/quest_log_battle.c index 17b989951..c702b6a5c 100644 --- a/src/quest_log_battle.c +++ b/src/quest_log_battle.c @@ -157,13 +157,8 @@ void sub_812C334(s32 * a0, s32 * a1) for (r5 = 0; r5 < 4; r5++) { if (r2 == gLinkPlayers[r5].id) - { a0[0] = r5; - } else if (r5 != gBattleStruct->field_B5) - { - a1[_optimized_out] = r5; - _optimized_out++; - } + a1[_optimized_out++] = r5; } } -- cgit v1.2.3 From a136c5203c4327c6aa46f93a35f9160e255c63e6 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sat, 24 Nov 2018 11:33:29 -0500 Subject: Add note about baserom to INSTALL.md --- INSTALL.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/INSTALL.md b/INSTALL.md index db4f80aba..5ba0ee484 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -50,3 +50,9 @@ If the command for building pokefirered.gba does not work, run `nproc` and use t ## Windows 10 Install the [Windows Subsystem for Linux](https://docs.microsoft.com/windows/wsl/install-win10), then install [devkitARM](https://devkitpro.org/wiki/Getting_Started) inside the subsystem, and run the commands. + +## Important note for all users + +Until further notice, this repository is dependent on `baserom.gba`, which is a copy of Pokémon FireRed (U)(1.0) bearing the SHA1 sum `41cb23d8dccc8ebd7c649cd8fbb58eeace6e2fdc`. If you attempt to build and get the following error or similar, it's because `baserom.gba` is missing. + + No rule to make target 'build/firered/data/librfu_rodata.o', needed by 'pokefirered.elf'. Stop. -- cgit v1.2.3 From 351ee943db92ac091197512921a0e58b286b7bb4 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sat, 24 Nov 2018 12:22:36 -0500 Subject: Fame Checker START --- asm/fame_checker.s | 57 ------------------------------------------------------ ld_script.txt | 1 + src/fame_checker.c | 51 ++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 52 insertions(+), 57 deletions(-) create mode 100644 src/fame_checker.c diff --git a/asm/fame_checker.s b/asm/fame_checker.s index 9e352e8ae..d0236d696 100644 --- a/asm/fame_checker.s +++ b/asm/fame_checker.s @@ -5,63 +5,6 @@ .text - thumb_func_start sub_812C380 -sub_812C380: @ 812C380 - push {lr} - bl LoadOam - bl ProcessSpriteCopyRequests - bl TransferPlttBuffer - pop {r0} - bx r0 - thumb_func_end sub_812C380 - - thumb_func_start sub_812C394 -sub_812C394: @ 812C394 - push {lr} - bl RunTasks - bl AnimateSprites - bl BuildOamBuffer - bl UpdatePaletteFade - pop {r0} - bx r0 - thumb_func_end sub_812C394 - - thumb_func_start sub_812C3AC -sub_812C3AC: @ 812C3AC - push {r4,r5,lr} - adds r5, r0, 0 - movs r0, 0 - bl SetVBlankCallback - ldr r4, _0812C3F0 @ =gUnknown_203B0FC - movs r0, 0x24 - bl AllocZeroed - str r0, [r4] - str r5, [r0] - movs r1, 0 - strb r1, [r0, 0x9] - ldr r0, [r4] - strb r1, [r0, 0xA] - ldr r0, [r4] - strb r1, [r0, 0xB] - ldr r1, [r4] - adds r1, 0x23 - ldrb r2, [r1] - movs r0, 0x2 - negs r0, r0 - ands r0, r2 - strb r0, [r1] - movs r0, 0xC7 - bl PlaySE - ldr r0, _0812C3F4 @ =sub_812C3F8 - bl SetMainCallback2 - pop {r4,r5} - pop {r0} - bx r0 - .align 2, 0 -_0812C3F0: .4byte gUnknown_203B0FC -_0812C3F4: .4byte sub_812C3F8 - thumb_func_end sub_812C3AC - thumb_func_start sub_812C3F8 sub_812C3F8: @ 812C3F8 push {r4-r6,lr} diff --git a/ld_script.txt b/ld_script.txt index 67f21c48f..e821a34ca 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -226,6 +226,7 @@ SECTIONS { asm/union_room_chat.o(.text); asm/help_system_812B1E0.o(.text); src/quest_log_battle.o(.text); + src/fame_checker.o(.text); asm/fame_checker.o(.text); asm/menu2.o(.text); asm/oak_speech.o(.text); diff --git a/src/fame_checker.c b/src/fame_checker.c new file mode 100644 index 000000000..889b96214 --- /dev/null +++ b/src/fame_checker.c @@ -0,0 +1,51 @@ +#include "global.h" +#include "constants/songs.h" +#include "palette.h" +#include "task.h" +#include "malloc.h" +#include "main.h" +#include "sound.h" + +struct FameCheckerData +{ + u32 unk_00; + u8 filler_04[5]; + u8 unk_09; + u8 unk_0A; + u8 unk_0B; + u8 filler_0C[23]; + u8 unk_23_0:1; + u8 unk_23_1:7; +}; + +EWRAM_DATA struct FameCheckerData * gUnknown_203B0FC = NULL; + +void sub_812C3F8(void); + +void sub_812C380(void) +{ + LoadOam(); + ProcessSpriteCopyRequests(); + TransferPlttBuffer(); +} + +void sub_812C394(void) +{ + RunTasks(); + AnimateSprites(); + BuildOamBuffer(); + UpdatePaletteFade(); +} + +void sub_812C3AC(u32 a0) +{ + SetVBlankCallback(NULL); + gUnknown_203B0FC = AllocZeroed(sizeof(struct FameCheckerData)); + gUnknown_203B0FC->unk_00 = a0; + gUnknown_203B0FC->unk_09 = 0; + gUnknown_203B0FC->unk_0A = 0; + gUnknown_203B0FC->unk_0B = 0; + gUnknown_203B0FC->unk_23_0 = FALSE; + PlaySE(SE_W202); + SetMainCallback2(sub_812C3F8); +} -- cgit v1.2.3 From 5a262eec73614998a87f3466a0c0924c7317be36 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sat, 24 Nov 2018 13:08:18 -0500 Subject: sub_812C3F8 --- asm/fame_checker.s | 241 ----------------------------------------------------- include/bg.h | 6 +- src/bg.c | 18 ++-- src/fame_checker.c | 118 +++++++++++++++++++++++++- sym_ewram.txt | 18 +--- 5 files changed, 130 insertions(+), 271 deletions(-) diff --git a/asm/fame_checker.s b/asm/fame_checker.s index d0236d696..949de51f9 100644 --- a/asm/fame_checker.s +++ b/asm/fame_checker.s @@ -5,247 +5,6 @@ .text - thumb_func_start sub_812C3F8 -sub_812C3F8: @ 812C3F8 - push {r4-r6,lr} - mov r6, r8 - push {r6} - sub sp, 0xC - ldr r0, _0812C41C @ =gMain - movs r1, 0x87 - lsls r1, 3 - adds r0, r1 - ldrb r0, [r0] - cmp r0, 0x7 - bls _0812C410 - b _0812C626 -_0812C410: - lsls r0, 2 - ldr r1, _0812C420 @ =_0812C424 - adds r0, r1 - ldr r0, [r0] - mov pc, r0 - .align 2, 0 -_0812C41C: .4byte gMain -_0812C420: .4byte _0812C424 - .align 2, 0 -_0812C424: - .4byte _0812C444 - .4byte _0812C450 - .4byte _0812C456 - .4byte _0812C4C0 - .4byte _0812C540 - .4byte _0812C578 - .4byte _0812C5A0 - .4byte _0812C5D4 -_0812C444: - movs r0, 0 - bl SetVBlankCallback - bl sub_812D420 - b _0812C5BE -_0812C450: - bl sub_812D558 - b _0812C5BE -_0812C456: - ldr r6, _0812C4B0 @ =gUnknown_203B0F0 - movs r4, 0x80 - lsls r4, 4 - adds r0, r4, 0 - bl AllocZeroed - str r0, [r6] - ldr r1, _0812C4B4 @ =gUnknown_203B0F4 - mov r8, r1 - movs r0, 0x80 - lsls r0, 5 - bl AllocZeroed - mov r1, r8 - str r0, [r1] - ldr r5, _0812C4B8 @ =gUnknown_203B0F8 - adds r0, r4, 0 - bl AllocZeroed - str r0, [r5] - movs r0, 0 - bl ResetBgsAndClearDma3BusyFlags - ldr r1, _0812C4BC @ =gUnknown_845FBF4 - movs r0, 0 - movs r2, 0x4 - bl InitBgsFromTemplates - ldr r1, [r6] - movs r0, 0x3 - bl SetBgTilemapBuffer - ldr r1, [r5] - movs r0, 0x2 - bl SetBgTilemapBuffer - mov r0, r8 - ldr r1, [r0] - movs r0, 0x1 - bl SetBgTilemapBuffer - bl sub_812D594 - b _0812C5BE - .align 2, 0 -_0812C4B0: .4byte gUnknown_203B0F0 -_0812C4B4: .4byte gUnknown_203B0F4 -_0812C4B8: .4byte gUnknown_203B0F8 -_0812C4BC: .4byte gUnknown_845FBF4 -_0812C4C0: - ldr r1, _0812C52C @ =gUnknown_8E9F260 - movs r2, 0xA5 - lsls r2, 5 - movs r0, 0x3 - movs r3, 0 - bl LoadBgTiles - ldr r1, _0812C530 @ =gUnknown_8EA0700 - movs r5, 0x20 - str r5, [sp] - str r5, [sp, 0x4] - movs r0, 0x3 - movs r2, 0 - movs r3, 0 - bl CopyToBgTilemapBufferRect - ldr r4, _0812C534 @ =gUnknown_8E9F220 - adds r0, r4, 0 - movs r1, 0 - movs r2, 0x40 - bl LoadPalette - adds r4, 0x20 - adds r0, r4, 0 - movs r1, 0x10 - movs r2, 0x20 - bl LoadPalette - ldr r1, _0812C538 @ =gUnknown_8EA0F00 - str r5, [sp] - str r5, [sp, 0x4] - movs r0, 0x2 - movs r2, 0 - movs r3, 0 - bl CopyToBgTilemapBufferRect - ldr r1, _0812C53C @ =gUnknown_845C600 - str r5, [sp] - str r5, [sp, 0x4] - movs r0, 0x11 - str r0, [sp, 0x8] - movs r0, 0x1 - movs r2, 0x1E - movs r3, 0 - bl CopyToBgTilemapBufferRect_ChangePalette - movs r0, 0x2 - bl stdpal_get - movs r1, 0xF0 - movs r2, 0x20 - bl LoadPalette - b _0812C5BE - .align 2, 0 -_0812C52C: .4byte gUnknown_8E9F260 -_0812C530: .4byte gUnknown_8EA0700 -_0812C534: .4byte gUnknown_8E9F220 -_0812C538: .4byte gUnknown_8EA0F00 -_0812C53C: .4byte gUnknown_845C600 -_0812C540: - bl IsDma3ManagerBusyWithBgCopy - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x1 - beq _0812C626 - movs r0, 0 - bl ShowBg - movs r0, 0x1 - bl ShowBg - movs r0, 0x2 - bl ShowBg - movs r0, 0x3 - bl ShowBg - movs r0, 0x3 - bl CopyBgTilemapBufferToVram - movs r0, 0x2 - bl CopyBgTilemapBufferToVram - movs r0, 0x1 - bl CopyBgTilemapBufferToVram - b _0812C5BE -_0812C578: - ldr r0, _0812C598 @ =gUnknown_845FC04 - bl InitWindows - bl DeactivateAllTextPrinters - bl sub_812CEC0 - ldr r4, _0812C59C @ =gUnknown_203B100 - movs r0, 0x88 - bl AllocZeroed - str r0, [r4] - bl sub_812DB28 - b _0812C5BE - .align 2, 0 -_0812C598: .4byte gUnknown_845FC04 -_0812C59C: .4byte gUnknown_203B100 -_0812C5A0: - bl sub_812C648 - movs r0, 0 - bl sub_812D1A8 - bl sub_812CE9C - movs r0, 0x1 - negs r0, r0 - movs r1, 0 - str r1, [sp] - movs r2, 0x10 - movs r3, 0 - bl BeginNormalPaletteFade -_0812C5BE: - ldr r1, _0812C5D0 @ =gMain - movs r0, 0x87 - lsls r0, 3 - adds r1, r0 - ldrb r0, [r1] - adds r0, 0x1 - strb r0, [r1] - b _0812C626 - .align 2, 0 -_0812C5D0: .4byte gMain -_0812C5D4: - bl sub_812D584 - movs r1, 0xFD - lsls r1, 6 - movs r0, 0x50 - bl SetGpuReg - movs r0, 0x52 - movs r1, 0x7 - bl SetGpuReg - movs r0, 0x54 - movs r1, 0x8 - bl SetGpuReg - ldr r0, _0812C634 @ =sub_812C380 - bl SetVBlankCallback - ldr r0, _0812C638 @ =gUnknown_203B0FC - ldr r1, [r0] - movs r4, 0 - movs r0, 0 - strh r0, [r1, 0x4] - bl sub_812E000 - movs r0, 0x1 - movs r1, 0x4 - bl sub_812E178 - ldr r0, _0812C63C @ =sub_812C664 - movs r1, 0x8 - bl CreateTask - ldr r0, _0812C640 @ =sub_812C394 - bl SetMainCallback2 - ldr r0, _0812C644 @ =gMain - movs r1, 0x87 - lsls r1, 3 - adds r0, r1 - strb r4, [r0] -_0812C626: - add sp, 0xC - pop {r3} - mov r8, r3 - pop {r4-r6} - pop {r0} - bx r0 - .align 2, 0 -_0812C634: .4byte sub_812C380 -_0812C638: .4byte gUnknown_203B0FC -_0812C63C: .4byte sub_812C664 -_0812C640: .4byte sub_812C394 -_0812C644: .4byte gMain - thumb_func_end sub_812C3F8 - thumb_func_start sub_812C648 sub_812C648: @ 812C648 push {lr} diff --git a/include/bg.h b/include/bg.h index 55927a5a4..003ffc916 100644 --- a/include/bg.h +++ b/include/bg.h @@ -77,9 +77,9 @@ void UnsetBgTilemapBuffer(u8 bg); void* GetBgTilemapBuffer(u8 bg); void CopyToBgTilemapBuffer(u8 bg, const void *src, u16 mode, u16 destOffset); void CopyBgTilemapBufferToVram(u8 bg); -void CopyToBgTilemapBufferRect(u8 bg, void* src, u8 destX, u8 destY, u8 width, u8 height); -void CopyToBgTilemapBufferRect_ChangePalette(u8 bg, void *src, u8 destX, u8 destY, u8 rectWidth, u8 rectHeight, u8 palette); -void CopyRectToBgTilemapBufferRect(u8 bg, void* src, u8 srcX, u8 srcY, u8 srcWidth, u8 srcHeight, u8 destX, u8 destY, u8 rectWidth, u8 rectHeight, u8 palette1, u16 tileOffset, u16 palette2); +void CopyToBgTilemapBufferRect(u8 bg, const void* src, u8 destX, u8 destY, u8 width, u8 height); +void CopyToBgTilemapBufferRect_ChangePalette(u8 bg, const void *src, u8 destX, u8 destY, u8 rectWidth, u8 rectHeight, u8 palette); +void CopyRectToBgTilemapBufferRect(u8 bg, const void* src, u8 srcX, u8 srcY, u8 srcWidth, u8 srcHeight, u8 destX, u8 destY, u8 rectWidth, u8 rectHeight, u8 palette1, u16 tileOffset, u16 palette2); void FillBgTilemapBufferRect_Palette0(u8 bg, u16 tileNum, u8 x, u8 y, u8 width, u8 height); void FillBgTilemapBufferRect(u8 bg, u16 tileNum, u8 x, u8 y, u8 width, u8 height, u8 palette); void WriteSequenceToBgTilemapBuffer(u8 bg, u16 firstTileNum, u8 x, u8 y, u8 width, u8 height, u8 paletteSlot, s16 tileNumDelta); diff --git a/src/bg.c b/src/bg.c index df91e9d4a..5cbd7658e 100644 --- a/src/bg.c +++ b/src/bg.c @@ -391,7 +391,7 @@ void InitBgsFromTemplates(u8 bgMode, const struct BgTemplate *templates, u8 numT } } #else -__attribute__((naked)) +NAKED void InitBgsFromTemplates(u8 bgMode, const struct BgTemplate *templates, u8 numTemplates) { asm(".syntax unified\n\ @@ -634,7 +634,7 @@ bool8 IsDma3ManagerBusyWithBgCopy(void) return FALSE; } #else -__attribute__((naked)) +NAKED bool8 IsDma3ManagerBusyWithBgCopy(void) { asm("push {r4-r7,lr}\n\ @@ -1065,7 +1065,7 @@ void CopyBgTilemapBufferToVram(u8 bg) } } -void CopyToBgTilemapBufferRect(u8 bg, void* src, u8 destX, u8 destY, u8 width, u8 height) +void CopyToBgTilemapBufferRect(u8 bg, const void* src, u8 destX, u8 destY, u8 width, u8 height) { u16 destX16; u16 destY16; @@ -1077,7 +1077,7 @@ void CopyToBgTilemapBufferRect(u8 bg, void* src, u8 destX, u8 destY, u8 width, u { case 0: { - u16 * srcCopy = src; + const u16 * srcCopy = src; for (destY16 = destY; destY16 < (destY + height); destY16++) { for (destX16 = destX; destX16 < (destX + width); destX16++) @@ -1089,7 +1089,7 @@ void CopyToBgTilemapBufferRect(u8 bg, void* src, u8 destX, u8 destY, u8 width, u } case 1: { - u8 * srcCopy = src; + const u8 * srcCopy = src; mode = GetBgMetricAffineMode(bg, 0x1); for (destY16 = destY; destY16 < (destY + height); destY16++) { @@ -1104,7 +1104,7 @@ void CopyToBgTilemapBufferRect(u8 bg, void* src, u8 destX, u8 destY, u8 width, u } } -void CopyToBgTilemapBufferRect_ChangePalette(u8 bg, void *src, u8 destX, u8 destY, u8 rectWidth, u8 rectHeight, u8 palette) +void CopyToBgTilemapBufferRect_ChangePalette(u8 bg, const void *src, u8 destX, u8 destY, u8 rectWidth, u8 rectHeight, u8 palette) { CopyRectToBgTilemapBufferRect(bg, src, 0, 0, rectWidth, rectHeight, destX, destY, rectWidth, rectHeight, palette, 0, 0); } @@ -1151,8 +1151,8 @@ void CopyRectToBgTilemapBufferRect(u8 bg, void* src, u8 srcX, u8 srcY, u8 srcWid } } }*/ -__attribute__((naked)) -void CopyRectToBgTilemapBufferRect(u8 bg, void* src, u8 srcX, u8 srcY, u8 srcWidth, u8 srcHeight, u8 destX, u8 destY, u8 rectWidth, u8 rectHeight, u8 palette1, u16 tileOffset, u16 palette2) +NAKED +void CopyRectToBgTilemapBufferRect(u8 bg, const void* src, u8 srcX, u8 srcY, u8 srcWidth, u8 srcHeight, u8 destX, u8 destY, u8 rectWidth, u8 rectHeight, u8 palette1, u16 tileOffset, u16 palette2) { asm("push {r4-r7,lr}\n\ mov r7, r10\n\ @@ -1598,7 +1598,7 @@ void CopyTileMapEntry(u16 *src, u16 *dest, s32 palette1, u32 tileOffset, u32 pal *dest = test; } #else -__attribute__((naked)) +NAKED void CopyTileMapEntry(u16 *src, u16 *dest, s32 palette1, u32 tileOffset, u32 palette2) { asm("push {r4-r6,lr}\n\ diff --git a/src/fame_checker.c b/src/fame_checker.c index 889b96214..d311ecb94 100644 --- a/src/fame_checker.c +++ b/src/fame_checker.c @@ -1,15 +1,21 @@ #include "global.h" #include "constants/songs.h" +#include "bg.h" +#include "gpu_regs.h" #include "palette.h" #include "task.h" #include "malloc.h" #include "main.h" #include "sound.h" +#include "text.h" +#include "window.h" +#include "text_window.h" struct FameCheckerData { u32 unk_00; - u8 filler_04[5]; + u16 unk_04; + u8 filler_06[3]; u8 unk_09; u8 unk_0A; u8 unk_0B; @@ -18,9 +24,40 @@ struct FameCheckerData u8 unk_23_1:7; }; +struct FameCheckerData2 +{ + u8 filler_00[0x88]; +}; + +EWRAM_DATA u16 * gUnknown_203B0F0 = NULL; +EWRAM_DATA u16 * gUnknown_203B0F4 = NULL; +EWRAM_DATA u16 * gUnknown_203B0F8 = NULL; EWRAM_DATA struct FameCheckerData * gUnknown_203B0FC = NULL; +EWRAM_DATA struct FameCheckerData2 * gUnknown_203B100 = NULL; +EWRAM_DATA u32 gUnknown_203B104 = 0; void sub_812C3F8(void); +void sub_812C648(void); +void sub_812C664(u8 taskId); +void sub_812CE9C(void); +void sub_812CEC0(void); +void sub_812D1A8(u8 a0); +void sub_812D420(void); +void sub_812D558(void); +void sub_812D584(void); +void sub_812D594(void); +void sub_812DB28(void); +void sub_812E000(void); +void sub_812E178(u8 a0, s16 a1); + +extern const struct BgTemplate gUnknown_845FBF4[4]; +extern const struct WindowTemplate gUnknown_845FC04[]; +extern const u16 gUnknown_845C600[0x40]; + +extern const u16 gUnknown_8E9F220[0x30]; +extern const u16 gUnknown_8E9F260[0xa50]; +extern const u16 gUnknown_8EA0700[0x400]; +extern const u16 gUnknown_8EA0F00[0x400]; void sub_812C380(void) { @@ -49,3 +86,82 @@ void sub_812C3AC(u32 a0) PlaySE(SE_W202); SetMainCallback2(sub_812C3F8); } + +void sub_812C3F8(void) +{ + switch (gMain.state) + { + case 0: + SetVBlankCallback(NULL); + sub_812D420(); + gMain.state++; + break; + case 1: + sub_812D558(); + gMain.state++; + break; + case 2: + gUnknown_203B0F0 = AllocZeroed(0x800); + gUnknown_203B0F4 = AllocZeroed(0x1000); + gUnknown_203B0F8 = AllocZeroed(0x800); + ResetBgsAndClearDma3BusyFlags(0); + InitBgsFromTemplates(0, gUnknown_845FBF4, ARRAY_COUNT(gUnknown_845FBF4)); + SetBgTilemapBuffer(3, gUnknown_203B0F0); + SetBgTilemapBuffer(2, gUnknown_203B0F8); + SetBgTilemapBuffer(1, gUnknown_203B0F4); + sub_812D594(); + gMain.state++; + break; + case 3: + LoadBgTiles(3, gUnknown_8E9F260, sizeof(gUnknown_8E9F260), 0); + CopyToBgTilemapBufferRect(3, gUnknown_8EA0700, 0, 0, 32, 32); + LoadPalette(gUnknown_8E9F220 + 0x00, 0x00, 0x40); + LoadPalette(gUnknown_8E9F220 + 0x10, 0x10, 0x20); + CopyToBgTilemapBufferRect(2, gUnknown_8EA0F00, 0, 0, 32, 32); + CopyToBgTilemapBufferRect_ChangePalette(1, gUnknown_845C600, 30, 0, 32, 32, 0x11); + LoadPalette(stdpal_get(2), 0xF0, 0x20); + gMain.state++; + break; + case 4: + if (IsDma3ManagerBusyWithBgCopy() != TRUE) + { + ShowBg(0); + ShowBg(1); + ShowBg(2); + ShowBg(3); + CopyBgTilemapBufferToVram(3); + CopyBgTilemapBufferToVram(2); + CopyBgTilemapBufferToVram(1); + gMain.state++; + } + break; + case 5: + InitWindows(gUnknown_845FC04); + DeactivateAllTextPrinters(); + sub_812CEC0(); + gUnknown_203B100 = AllocZeroed(sizeof(struct FameCheckerData2)); + sub_812DB28(); + gMain.state++; + break; + case 6: + sub_812C648(); + sub_812D1A8(0); + sub_812CE9C(); + BeginNormalPaletteFade(0xFFFFFFFF,0, 16, 0, 0); + gMain.state++; + break; + case 7: + sub_812D584(); + SetGpuReg(REG_OFFSET_BLDCNT, BLDCNT_EFFECT_BLEND | BLDCNT_TGT2_BG0 | BLDCNT_TGT2_BG1 | BLDCNT_TGT2_BG2 | BLDCNT_TGT2_BG3 | BLDCNT_TGT2_OBJ | BLDCNT_TGT2_BD); + SetGpuReg(REG_OFFSET_BLDALPHA, 0x07); + SetGpuReg(REG_OFFSET_BLDY, 0x08); + SetVBlankCallback(sub_812C380); + gUnknown_203B0FC->unk_04 = 0; + sub_812E000(); + sub_812E178(1, 4); + CreateTask(sub_812C664, 0x08); + SetMainCallback2(sub_812C394); + gMain.state = 0; + break; + } +} diff --git a/sym_ewram.txt b/sym_ewram.txt index 16a1e7ddd..83fdcf763 100644 --- a/sym_ewram.txt +++ b/sym_ewram.txt @@ -1556,23 +1556,7 @@ gUnknown_203B0EC: @ 203B0EC gUnknown_203B0EE: @ 203B0EE .space 0x2 -gUnknown_203B0F0: @ 203B0F0 - .space 0x4 - -gUnknown_203B0F4: @ 203B0F4 - .space 0x4 - -gUnknown_203B0F8: @ 203B0F8 - .space 0x4 - -gUnknown_203B0FC: @ 203B0FC - .space 0x4 - -gUnknown_203B100: @ 203B100 - .space 0x4 - -gUnknown_203B104: @ 203B104 - .space 0x4 + .include "src/fame_checker.o" gUnknown_203B108: @ 203B108 .space 0x4 -- cgit v1.2.3 From 2571ba516cb0f21c19405e943c53eebf5d19ab7a Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sat, 24 Nov 2018 15:51:55 -0500 Subject: through sub_812C694 --- asm/fame_checker.s | 324 ------------------ common_syms/fame_checker.txt | 2 + data/data_83FECCC.s | 773 ------------------------------------------- data/data_845FD54.s | 686 ++++++++++++++++++++++++++++++++++++++ data/fame_checker.s | 92 +++++ include/graphics.h | 7 + include/item_menu.h | 1 + ld_script.txt | 3 + src/fame_checker.c | 136 +++++++- sym_common.txt | 6 +- 10 files changed, 918 insertions(+), 1112 deletions(-) create mode 100644 common_syms/fame_checker.txt create mode 100644 data/data_845FD54.s create mode 100644 data/fame_checker.s diff --git a/asm/fame_checker.s b/asm/fame_checker.s index 949de51f9..059b19291 100644 --- a/asm/fame_checker.s +++ b/asm/fame_checker.s @@ -5,330 +5,6 @@ .text - thumb_func_start sub_812C648 -sub_812C648: @ 812C648 - push {lr} - ldr r0, _0812C65C @ =gUnknown_845FB9C - bl LoadSpriteSheets - ldr r0, _0812C660 @ =gUnknown_845FBDC - bl LoadSpritePalettes - pop {r0} - bx r0 - .align 2, 0 -_0812C65C: .4byte gUnknown_845FB9C -_0812C660: .4byte gUnknown_845FBDC - thumb_func_end sub_812C648 - - thumb_func_start sub_812C664 -sub_812C664: @ 812C664 - push {lr} - lsls r0, 24 - lsrs r2, r0, 24 - ldr r0, _0812C688 @ =gPaletteFade - ldrb r1, [r0, 0x7] - movs r0, 0x80 - ands r0, r1 - cmp r0, 0 - bne _0812C684 - ldr r0, _0812C68C @ =gTasks - lsls r1, r2, 2 - adds r1, r2 - lsls r1, 3 - adds r1, r0 - ldr r0, _0812C690 @ =sub_812C694 - str r0, [r1] -_0812C684: - pop {r0} - bx r0 - .align 2, 0 -_0812C688: .4byte gPaletteFade -_0812C68C: .4byte gTasks -_0812C690: .4byte sub_812C694 - thumb_func_end sub_812C664 - - thumb_func_start sub_812C694 -sub_812C694: @ 812C694 - push {r4-r7,lr} - mov r7, r8 - push {r7} - sub sp, 0x8 - lsls r0, 24 - lsrs r5, r0, 24 - lsls r1, r5, 2 - adds r1, r5 - lsls r1, 3 - ldr r0, _0812C714 @ =gTasks - adds r7, r1, r0 - adds r0, 0x8 - adds r1, r0 - mov r8, r1 - ldr r0, _0812C718 @ =sub_812E110 - bl FindTaskIdByFunc - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0xFF - beq _0812C6C0 - b _0812C8EA -_0812C6C0: - bl RunTextPrinters - ldr r0, _0812C71C @ =gMain - ldrh r1, [r0, 0x2E] - movs r0, 0x4 - ands r0, r1 - cmp r0, 0 - beq _0812C6E8 - ldr r0, _0812C720 @ =gUnknown_203B0FC - ldr r2, [r0] - ldrb r1, [r2, 0x7] - movs r0, 0x2 - ands r0, r1 - cmp r0, 0 - bne _0812C6E8 - ldr r1, [r2] - ldr r0, _0812C724 @ =sub_8107EB8 - cmp r1, r0 - beq _0812C6E8 - b _0812C8DA -_0812C6E8: - ldr r0, _0812C71C @ =gMain - ldrh r1, [r0, 0x2E] - movs r0, 0x8 - ands r0, r1 - cmp r0, 0 - beq _0812C7DC - bl sub_812E064 - lsls r0, 16 - lsrs r4, r0, 16 - adds r0, r5, 0 - bl sub_812C8F8 - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x1 - bne _0812C728 - movs r0, 0xCB - bl PlaySE - b _0812C8EA - .align 2, 0 -_0812C714: .4byte gTasks -_0812C718: .4byte sub_812E110 -_0812C71C: .4byte gMain -_0812C720: .4byte gUnknown_203B0FC -_0812C724: .4byte sub_8107EB8 -_0812C728: - ldr r5, _0812C7D0 @ =gUnknown_203B0FC - ldr r0, [r5] - ldrb r0, [r0, 0x7] - lsrs r0, 2 - subs r0, 0x1 - cmp r4, r0 - bne _0812C738 - b _0812C8EA -_0812C738: - movs r0, 0xCB - bl PlaySE - movs r0, 0x58 - str r0, [sp] - movs r0, 0x20 - str r0, [sp, 0x4] - movs r0, 0x3 - movs r1, 0 - movs r2, 0 - movs r3, 0 - bl FillWindowPixelRect - movs r0, 0x3 - bl sub_812CEE0 - movs r0, 0x2 - movs r1, 0x4 - bl sub_812E178 - movs r0, 0x1 - movs r1, 0x5 - bl sub_812E178 - movs r0, 0x1 - bl sub_812D0F4 - ldr r0, [r5] - adds r0, 0xC - adds r0, r4 - ldrb r0, [r0] - bl sub_812D888 - lsls r0, 24 - lsrs r0, 24 - strh r0, [r7, 0xC] - ldr r4, _0812C7D4 @ =gSprites - movs r0, 0xC - ldrsh r1, [r7, r0] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - adds r0, r4 - movs r6, 0xF0 - strh r6, [r0, 0x24] - movs r3, 0xC - ldrsh r1, [r7, r3] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - adds r0, r4 - movs r5, 0x1 - strh r5, [r0, 0x2E] - bl sub_812D7E4 - lsls r0, 24 - lsrs r0, 24 - strh r0, [r7, 0xE] - movs r0, 0xE - ldrsh r1, [r7, r0] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - adds r0, r4 - strh r6, [r0, 0x24] - movs r3, 0xE - ldrsh r1, [r7, r3] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - adds r0, r4 - strh r5, [r0, 0x2E] - ldr r0, _0812C7D8 @ =sub_812C9BC - str r0, [r7] - b _0812C8EA - .align 2, 0 -_0812C7D0: .4byte gUnknown_203B0FC -_0812C7D4: .4byte gSprites -_0812C7D8: .4byte sub_812C9BC -_0812C7DC: - movs r6, 0x1 - adds r0, r6, 0 - ands r0, r1 - cmp r0, 0 - beq _0812C8C4 - movs r0, 0 - bl ListMenuHandleInput - lsls r0, 16 - lsrs r4, r0, 16 - ldr r0, _0812C824 @ =gUnknown_203B0FC - ldr r0, [r0] - ldrb r1, [r0, 0x7] - lsrs r0, r1, 2 - subs r0, 0x1 - cmp r4, r0 - beq _0812C8DA - movs r0, 0x2 - ands r0, r1 - cmp r0, 0 - beq _0812C828 - movs r0, 0x2 - bl IsTextPrinterActive - lsls r0, 16 - cmp r0, 0 - bne _0812C8EA - bl sub_812D6B4 - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x1 - bne _0812C8EA - bl sub_812CD3C - b _0812C8EA - .align 2, 0 -_0812C824: .4byte gUnknown_203B0FC -_0812C828: - adds r0, r6, 0 - ands r0, r1 - cmp r0, 0 - beq _0812C8EA - movs r0, 0x5 - bl PlaySE - movs r1, 0xA - ldrsh r0, [r7, r1] - bl sub_812D724 - lsls r0, 24 - lsrs r0, 24 - strh r0, [r7, 0x8] - movs r4, 0 -_0812C846: - movs r3, 0xA - ldrsh r0, [r7, r3] - cmp r4, r0 - beq _0812C85E - ldr r0, _0812C8B4 @ =gUnknown_203B0FC - ldr r0, [r0] - adds r0, 0x1D - adds r0, r4 - ldrb r0, [r0] - movs r1, 0x1 - bl sub_812CEFC -_0812C85E: - adds r0, r4, 0x1 - lsls r0, 24 - lsrs r4, r0, 24 - cmp r4, 0x5 - bls _0812C846 - ldr r1, _0812C8B8 @ =gUnknown_3005EC8 - movs r0, 0xFF - strb r0, [r1] - movs r0, 0 - bl sub_812E4A4 - movs r0, 0x2 - bl sub_812D0F4 - ldr r2, _0812C8BC @ =gSprites - ldr r0, _0812C8B4 @ =gUnknown_203B0FC - ldr r0, [r0] - movs r3, 0xA - ldrsh r1, [r7, r3] - adds r0, 0x1D - adds r0, r1 - ldrb r1, [r0] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - adds r0, r2 - movs r1, 0x30 - ldrsh r0, [r0, r1] - cmp r0, 0xFF - beq _0812C8A8 - adds r0, r5, 0 - bl sub_812CE04 - mov r3, r8 - ldrb r0, [r3, 0x2] - bl sub_812DA14 -_0812C8A8: - bl sub_812E048 - ldr r0, _0812C8C0 @ =sub_812CAD8 - str r0, [r7] - b _0812C8EA - .align 2, 0 -_0812C8B4: .4byte gUnknown_203B0FC -_0812C8B8: .4byte gUnknown_3005EC8 -_0812C8BC: .4byte gSprites -_0812C8C0: .4byte sub_812CAD8 -_0812C8C4: - movs r0, 0x2 - ands r0, r1 - cmp r0, 0 - beq _0812C8E4 - adds r0, r5, 0 - bl sub_812C8F8 - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x1 - beq _0812C8EA -_0812C8DA: - ldr r0, _0812C8E0 @ =sub_812CF3C - str r0, [r7] - b _0812C8EA - .align 2, 0 -_0812C8E0: .4byte sub_812CF3C -_0812C8E4: - movs r0, 0 - bl ListMenuHandleInput -_0812C8EA: - add sp, 0x8 - pop {r3} - mov r8, r3 - pop {r4-r7} - pop {r0} - bx r0 - thumb_func_end sub_812C694 - thumb_func_start sub_812C8F8 sub_812C8F8: @ 812C8F8 push {r4,r5,lr} diff --git a/common_syms/fame_checker.txt b/common_syms/fame_checker.txt new file mode 100644 index 000000000..22330180e --- /dev/null +++ b/common_syms/fame_checker.txt @@ -0,0 +1,2 @@ +gUnknown_3005EB0 +gUnknown_3005EC8 diff --git a/data/data_83FECCC.s b/data/data_83FECCC.s index dfa4bee5d..ed542acc9 100644 --- a/data/data_83FECCC.s +++ b/data/data_83FECCC.s @@ -3549,776 +3549,3 @@ gUnknown_845C5BC:: @ 845C5BC gUnknown_845C5CE:: @ 845C5CE .incbin "baserom.gba", 0x45C5CE, 0x32 - -gUnknown_845C600:: @ 845C600 - .incbin "baserom.gba", 0x45C600, 0x1720 - -gUnknown_845DD20:: @ 845DD20 - .incbin "baserom.gba", 0x45DD20, 0x820 - -gUnknown_845E540:: @ 845E540 - .incbin "baserom.gba", 0x45E540, 0x820 - -gUnknown_845ED60:: @ 845ED60 - .incbin "baserom.gba", 0x45ED60, 0x820 - -gUnknown_845F580:: @ 845F580 - .incbin "baserom.gba", 0x45F580, 0x40 - -gUnknown_845F5C0:: @ 845F5C0 - .incbin "baserom.gba", 0x45F5C0, 0x20 - -gUnknown_845F5E0:: @ 845F5E0 - .incbin "baserom.gba", 0x45F5E0, 0x3 - -gUnknown_845F5E3:: @ 845F5E3 - .incbin "baserom.gba", 0x45F5E3, 0x3 - -gUnknown_845F5E6:: @ 845F5E6 - .incbin "baserom.gba", 0x45F5E6, 0x4 - -gUnknown_845F5EA:: @ 845F5EA - .incbin "baserom.gba", 0x45F5EA, 0x22 - -gUnknown_845F60C:: @ 845F60C - .incbin "baserom.gba", 0x45F60C, 0x10 - -gUnknown_845F61C:: @ 845F61C - .incbin "baserom.gba", 0x45F61C, 0x20 - -gUnknown_845F63C:: @ 845F63C - .incbin "baserom.gba", 0x45F63C, 0x80 - -gUnknown_845F6BC:: @ 845F6BC - .incbin "baserom.gba", 0x45F6BC, 0x180 - -gUnknown_845F83C:: @ 845F83C - .incbin "baserom.gba", 0x45F83C, 0x60 - -gUnknown_845F89C:: @ 845F89C - .incbin "baserom.gba", 0x45F89C, 0x180 - -gUnknown_845FA1C:: @ 845FA1C - .incbin "baserom.gba", 0x45FA1C, 0x180 - -gUnknown_845FB9C:: @ 845FB9C - .incbin "baserom.gba", 0x45FB9C, 0x40 - -gUnknown_845FBDC:: @ 845FBDC - .incbin "baserom.gba", 0x45FBDC, 0x18 - -gUnknown_845FBF4:: @ 845FBF4 - .incbin "baserom.gba", 0x45FBF4, 0x10 - -gUnknown_845FC04:: @ 845FC04 - .incbin "baserom.gba", 0x45FC04, 0x40 - -gUnknown_845FC44:: @ 845FC44 - .incbin "baserom.gba", 0x45FC44, 0x34 - -gUnknown_845FC78:: @ 845FC78 - .incbin "baserom.gba", 0x45FC78, 0x40 - -gUnknown_845FCB8:: @ 845FCB8 - .incbin "baserom.gba", 0x45FCB8, 0x2C - -gUnknown_845FCE4:: @ 845FCE4 - .incbin "baserom.gba", 0x45FCE4, 0x18 - -gUnknown_845FCFC:: @ 845FCFC - .incbin "baserom.gba", 0x45FCFC, 0x18 - -gUnknown_845FD14:: @ 845FD14 - .incbin "baserom.gba", 0x45FD14, 0x18 - -gUnknown_845FD2C:: @ 845FD2C - .incbin "baserom.gba", 0x45FD2C, 0x18 - -gUnknown_845FD44:: @ 845FD44 - .incbin "baserom.gba", 0x45FD44, 0x10 - -gUnknown_845FD54:: @ 845FD54 - .incbin "baserom.gba", 0x45FD54, 0x814 - -gUnknown_8460568:: @ 8460568 - .incbin "baserom.gba", 0x460568, 0x80 - -gUnknown_84605E8:: @ 84605E8 - .incbin "baserom.gba", 0x4605E8, 0x5C0 - -gUnknown_8460BA8:: @ 8460BA8 - .incbin "baserom.gba", 0x460BA8, 0xFC - -gUnknown_8460CA4:: @ 8460CA4 - .incbin "baserom.gba", 0x460CA4, 0x44 - -gUnknown_8460CE8:: @ 8460CE8 - .incbin "baserom.gba", 0x460CE8, 0xAC - -gUnknown_8460D94:: @ 8460D94 - .incbin "baserom.gba", 0x460D94, 0xA0 - -gUnknown_8460E34:: @ 8460E34 - .incbin "baserom.gba", 0x460E34, 0xA0 - -gUnknown_8460ED4:: @ 8460ED4 - .incbin "baserom.gba", 0x460ED4, 0x40 - -gUnknown_8460F14:: @ 8460F14 - .incbin "baserom.gba", 0x460F14, 0x6E8 - -gUnknown_84615FC:: @ 84615FC - .incbin "baserom.gba", 0x4615FC, 0x40 - -gUnknown_846163C:: @ 846163C - .incbin "baserom.gba", 0x46163C, 0x698 - -gUnknown_8461CD4:: @ 8461CD4 - .incbin "baserom.gba", 0x461CD4, 0x40 - -gUnknown_8461D14:: @ 8461D14 - .incbin "baserom.gba", 0x461D14, 0x698 - -gUnknown_84623AC:: @ 84623AC - .incbin "baserom.gba", 0x4623AC, 0x40 - -gUnknown_84623EC:: @ 84623EC - .incbin "baserom.gba", 0x4623EC, 0xA6C - -gUnknown_8462E58:: @ 8462E58 - .incbin "baserom.gba", 0x462E58, 0x5C - -gUnknown_8462EB4:: @ 8462EB4 - .incbin "baserom.gba", 0x462EB4, 0xC - -gUnknown_8462EC0:: @ 8462EC0 - .incbin "baserom.gba", 0x462EC0, 0x8 - -gUnknown_8462EC8:: @ 8462EC8 - .incbin "baserom.gba", 0x462EC8, 0x8 - -gUnknown_8462ED0:: @ 8462ED0 - .incbin "baserom.gba", 0x462ED0, 0x8 - -gUnknown_8462ED8:: @ 8462ED8 - .incbin "baserom.gba", 0x462ED8, 0x10 - -gUnknown_8462EE8:: @ 8462EE8 - .incbin "baserom.gba", 0x462EE8, 0x4 - -gUnknown_8462EEC:: @ 8462EEC - .incbin "baserom.gba", 0x462EEC, 0x4 - -gUnknown_8462EF0:: @ 8462EF0 - .incbin "baserom.gba", 0x462EF0, 0xC - -gUnknown_8462EFC:: @ 8462EFC - .incbin "baserom.gba", 0x462EFC, 0x18 - -gUnknown_8462F14:: @ 8462F14 - .incbin "baserom.gba", 0x462F14, 0x8 - -gUnknown_8462F1C:: @ 8462F1C - .incbin "baserom.gba", 0x462F1C, 0x8 - -gUnknown_8462F24:: @ 8462F24 - .incbin "baserom.gba", 0x462F24, 0x2C - -gUnknown_8462F50:: @ 8462F50 - .incbin "baserom.gba", 0x462F50, 0xDC - -gUnknown_846302C:: @ 846302C - .incbin "baserom.gba", 0x46302C, 0x48 - -gUnknown_8463074:: @ 8463074 - .incbin "baserom.gba", 0x463074, 0x18 - -gUnknown_846308C:: @ 846308C - .incbin "baserom.gba", 0x46308C, 0x4C - -gUnknown_84630D8:: @ 84630D8 - .incbin "baserom.gba", 0x4630D8, 0x4C - -gUnknown_8463124:: @ 8463124 - .incbin "baserom.gba", 0x463124, 0x10 - -gUnknown_8463134:: @ 8463134 - .incbin "baserom.gba", 0x463134, 0xC - -gUnknown_8463140:: @ 8463140 - .incbin "baserom.gba", 0x463140, 0x10 - -gUnknown_8463150:: @ 8463150 - .incbin "baserom.gba", 0x463150, 0x18 - -gUnknown_8463168:: @ 8463168 - .incbin "baserom.gba", 0x463168, 0x3 - -gUnknown_846316B:: @ 846316B - .incbin "baserom.gba", 0x46316B, 0x5 - -gUnknown_8463170:: @ 8463170 - .incbin "baserom.gba", 0x463170, 0x8 - -gUnknown_8463178:: @ 8463178 - .incbin "baserom.gba", 0x463178, 0x4 - -gUnknown_846317C:: @ 846317C - .incbin "baserom.gba", 0x46317C, 0x4 - -gUnknown_8463180:: @ 8463180 - .incbin "baserom.gba", 0x463180, 0x4 - -gUnknown_8463184:: @ 8463184 - .incbin "baserom.gba", 0x463184, 0xC - -gUnknown_8463190:: @ 8463190 - .incbin "baserom.gba", 0x463190, 0x50 - -gUnknown_84631E0:: @ 84631E0 - .incbin "baserom.gba", 0x4631E0, 0x8 - -gUnknown_84631E8:: @ 84631E8 - .incbin "baserom.gba", 0x4631E8, 0x30 - -gUnknown_8463218:: @ 8463218 - .incbin "baserom.gba", 0x463218, 0x8 - -gUnknown_8463220:: @ 8463220 - .incbin "baserom.gba", 0x463220, 0x18 - -gUnknown_8463238:: @ 8463238 - .incbin "baserom.gba", 0x463238, 0x24 - -gUnknown_846325C:: @ 846325C - .incbin "baserom.gba", 0x46325C, 0x48 - -gUnknown_84632A4:: @ 84632A4 - .incbin "baserom.gba", 0x4632A4, 0x18 - -gUnknown_84632BC:: @ 84632BC - .incbin "baserom.gba", 0x4632BC, 0x4 - -gUnknown_84632C0:: @ 84632C0 - .incbin "baserom.gba", 0x4632C0, 0x4 - -gUnknown_84632C4:: @ 84632C4 - .incbin "baserom.gba", 0x4632C4, 0x4 - -gUnknown_84632C8:: @ 84632C8 - .incbin "baserom.gba", 0x4632C8, 0x4 - -gUnknown_84632CC:: @ 84632CC - .incbin "baserom.gba", 0x4632CC, 0x4 - -gUnknown_84632D0:: @ 84632D0 - .incbin "baserom.gba", 0x4632D0, 0x4 - -gUnknown_84632D4:: @ 84632D4 - .incbin "baserom.gba", 0x4632D4, 0x4 - -gUnknown_84632D8:: @ 84632D8 - .incbin "baserom.gba", 0x4632D8, 0x18 - -gUnknown_84632F0:: @ 84632F0 - .incbin "baserom.gba", 0x4632F0, 0x18 - -gUnknown_8463308:: @ 8463308 - .incbin "baserom.gba", 0x463308, 0x20 - -gUnknown_8463328:: @ 8463328 - .incbin "baserom.gba", 0x463328, 0x70 - -gUnknown_8463398:: @ 8463398 - .incbin "baserom.gba", 0x463398, 0x40 - -gUnknown_84633D8:: @ 84633D8 - .incbin "baserom.gba", 0x4633D8, 0x44 - -gUnknown_846341C:: @ 846341C - .incbin "baserom.gba", 0x46341C, 0x20 - -gUnknown_846343C:: @ 846343C - .incbin "baserom.gba", 0x46343C, 0x128 - -gUnknown_8463564:: @ 8463564 - .incbin "baserom.gba", 0x463564, 0x1C - -gUnknown_8463580:: @ 8463580 - .incbin "baserom.gba", 0x463580, 0x140 - -gUnknown_84636C0:: @ 84636C0 - .incbin "baserom.gba", 0x4636C0, 0x20 - -gUnknown_84636E0:: @ 84636E0 - .incbin "baserom.gba", 0x4636E0, 0x20 - -gUnknown_8463700:: @ 8463700 - .incbin "baserom.gba", 0x463700, 0x20 - -gUnknown_8463720:: @ 8463720 - .incbin "baserom.gba", 0x463720, 0x20 - -gUnknown_8463740:: @ 8463740 - .incbin "baserom.gba", 0x463740, 0x12C - -gUnknown_846386C:: @ 846386C - .incbin "baserom.gba", 0x46386C, 0x120 - -gUnknown_846398C:: @ 846398C - .incbin "baserom.gba", 0x46398C, 0x18 - -gUnknown_84639A4:: @ 84639A4 - .incbin "baserom.gba", 0x4639A4, 0x8 - -gUnknown_84639AC:: @ 84639AC - .incbin "baserom.gba", 0x4639AC, 0x48 - -gUnknown_84639F4:: @ 84639F4 - .incbin "baserom.gba", 0x4639F4, 0x20 - -gUnknown_8463A14:: @ 8463A14 - .incbin "baserom.gba", 0x463A14, 0x68 - -gUnknown_8463A7C:: @ 8463A7C - .incbin "baserom.gba", 0x463A7C, 0x70 - -gUnknown_8463AEC:: @ 8463AEC - .incbin "baserom.gba", 0x463AEC, 0x10 - -gUnknown_8463AFC:: @ 8463AFC - .incbin "baserom.gba", 0x463AFC, 0x4 - -gUnknown_8463B00:: @ 8463B00 - .incbin "baserom.gba", 0x463B00, 0x20 - -gUnknown_8463B20:: @ 8463B20 - .incbin "baserom.gba", 0x463B20, 0x10 - -gUnknown_8463B30:: @ 8463B30 - .incbin "baserom.gba", 0x463B30, 0x10 - -gUnknown_8463B40:: @ 8463B40 - .incbin "baserom.gba", 0x463B40, 0x4 - -gUnknown_8463B44:: @ 8463B44 - .incbin "baserom.gba", 0x463B44, 0x20 - -gUnknown_8463B64:: @ 8463B64 - .incbin "baserom.gba", 0x463B64, 0x24 - -gUnknown_8463B88:: @ 8463B88 - .incbin "baserom.gba", 0x463B88, 0xF8 - -gUnknown_8463C80:: @ 8463C80 - .incbin "baserom.gba", 0x463C80, 0x1E0 - -gUnknown_8463E60:: @ 8463E60 - .incbin "baserom.gba", 0x463E60, 0x64 - -gUnknown_8463EC4:: @ 8463EC4 - .incbin "baserom.gba", 0x463EC4, 0x10 - -gUnknown_8463ED4:: @ 8463ED4 - .incbin "baserom.gba", 0x463ED4, 0x1C - -gUnknown_8463EF0:: @ 8463EF0 - .incbin "baserom.gba", 0x463EF0, 0xC - -gUnknown_8463EFC:: @ 8463EFC - .incbin "baserom.gba", 0x463EFC, 0x10 - -gUnknown_8463F0C:: @ 8463F0C - .incbin "baserom.gba", 0x463F0C, 0x18 - -gUnknown_8463F24:: @ 8463F24 - .incbin "baserom.gba", 0x463F24, 0x18 - -gUnknown_8463F3C:: @ 8463F3C - .incbin "baserom.gba", 0x463F3C, 0x20 - -gUnknown_8463F5C:: @ 8463F5C - .incbin "baserom.gba", 0x463F5C, 0x20 - -gUnknown_8463F7C:: @ 8463F7C - .incbin "baserom.gba", 0x463F7C, 0x20 - -gUnknown_8463F9C:: @ 8463F9C - .incbin "baserom.gba", 0x463F9C, 0x8 - -gUnknown_8463FA4:: @ 8463FA4 - .incbin "baserom.gba", 0x463FA4, 0x3 - -gUnknown_8463FA7:: @ 8463FA7 - .incbin "baserom.gba", 0x463FA7, 0x11 - -gUnknown_8463FB8:: @ 8463FB8 - .incbin "baserom.gba", 0x463FB8, 0x6 - -gUnknown_8463FBE:: @ 8463FBE - .incbin "baserom.gba", 0x463FBE, 0x3 - -gUnknown_8463FC1:: @ 8463FC1 - .incbin "baserom.gba", 0x463FC1, 0x5 - -gUnknown_8463FC6:: @ 8463FC6 - .incbin "baserom.gba", 0x463FC6, 0x7 - -gUnknown_8463FCD:: @ 8463FCD - .incbin "baserom.gba", 0x463FCD, 0x7 - -gUnknown_8463FD4:: @ 8463FD4 - .incbin "baserom.gba", 0x463FD4, 0xB - -gUnknown_8463FDF:: @ 8463FDF - .incbin "baserom.gba", 0x463FDF, 0xB - -gUnknown_8463FEA:: @ 8463FEA - .incbin "baserom.gba", 0x463FEA, 0x12 - -gUnknown_8463FFC:: @ 8463FFC - .incbin "baserom.gba", 0x463FFC, 0xC - -gUnknown_8464008:: @ 8464008 - .incbin "baserom.gba", 0x464008, 0x120 - -gUnknown_8464128:: @ 8464128 - .incbin "baserom.gba", 0x464128, 0x20 - -gUnknown_8464148:: @ 8464148 - .incbin "baserom.gba", 0x464148, 0x174 - -gUnknown_84642BC:: @ 84642BC - .incbin "baserom.gba", 0x4642BC, 0x4 - -gUnknown_84642C0:: @ 84642C0 - .incbin "baserom.gba", 0x4642C0, 0x34 - -gUnknown_84642F4:: @ 84642F4 - .incbin "baserom.gba", 0x4642F4, 0xC - -gUnknown_8464300:: @ 8464300 - .incbin "baserom.gba", 0x464300, 0x4C - -gUnknown_846434C:: @ 846434C - .incbin "baserom.gba", 0x46434C, 0xC - -gUnknown_8464358:: @ 8464358 - .incbin "baserom.gba", 0x464358, 0x14 - -gUnknown_846436C:: @ 846436C - .incbin "baserom.gba", 0x46436C, 0x8 - -gUnknown_8464374:: @ 8464374 - .incbin "baserom.gba", 0x464374, 0x8 - -gUnknown_846437C:: @ 846437C - .incbin "baserom.gba", 0x46437C, 0x28 - -gUnknown_84643A4:: @ 84643A4 - .incbin "baserom.gba", 0x4643A4, 0x4 - -gUnknown_84643A8:: @ 84643A8 - .incbin "baserom.gba", 0x4643A8, 0x4 - -gUnknown_84643AC:: @ 84643AC - .incbin "baserom.gba", 0x4643AC, 0x4 - -gUnknown_84643B0:: @ 84643B0 - .incbin "baserom.gba", 0x4643B0, 0x4 - -gUnknown_84643B4:: @ 84643B4 - .incbin "baserom.gba", 0x4643B4, 0x4 - -gUnknown_84643B8:: @ 84643B8 - .incbin "baserom.gba", 0x4643B8, 0x20 - -gUnknown_84643D8:: @ 84643D8 - .incbin "baserom.gba", 0x4643D8, 0x18 - -gUnknown_84643F0:: @ 84643F0 - .incbin "baserom.gba", 0x4643F0, 0x8 - -gUnknown_84643F8:: @ 84643F8 - .incbin "baserom.gba", 0x4643F8, 0x8 - -gUnknown_8464400:: @ 8464400 - .incbin "baserom.gba", 0x464400, 0x48 - -gUnknown_8464448:: @ 8464448 - .incbin "baserom.gba", 0x464448, 0x60 - -gUnknown_84644A8:: @ 84644A8 - .incbin "baserom.gba", 0x4644A8, 0x8 - -gUnknown_84644B0:: @ 84644B0 - .incbin "baserom.gba", 0x4644B0, 0x8 - -gUnknown_84644B8:: @ 84644B8 - .incbin "baserom.gba", 0x4644B8, 0x32C - -gUnknown_84647E4:: @ 84647E4 - .incbin "baserom.gba", 0x4647E4, 0x18 - -gUnknown_84647FC:: @ 84647FC - .incbin "baserom.gba", 0x4647FC, 0x8 - -gUnknown_8464804:: @ 8464804 - .incbin "baserom.gba", 0x464804, 0x38 - -gUnknown_846483C:: @ 846483C - .incbin "baserom.gba", 0x46483C, 0x40 - -gUnknown_846487C:: @ 846487C - .incbin "baserom.gba", 0x46487C, 0x8 - -gUnknown_8464884:: @ 8464884 - .incbin "baserom.gba", 0x464884, 0xC - -gUnknown_8464890:: @ 8464890 - .incbin "baserom.gba", 0x464890, 0x1E - -gUnknown_84648AE:: @ 84648AE - .incbin "baserom.gba", 0x4648AE, 0xF - -gUnknown_84648BD:: @ 84648BD - .incbin "baserom.gba", 0x4648BD, 0x15 - -gUnknown_84648D2:: @ 84648D2 - .incbin "baserom.gba", 0x4648D2, 0x54 - -gUnknown_8464926:: @ 8464926 - .incbin "baserom.gba", 0x464926, 0x40 - -gUnknown_8464966:: @ 8464966 - .incbin "baserom.gba", 0x464966, 0xC4A - -gUnknown_84655B0:: @ 84655B0 - .incbin "baserom.gba", 0x4655B0, 0x18 - -gUnknown_84655C8:: @ 84655C8 - .incbin "baserom.gba", 0x4655C8, 0x40 - -gUnknown_8465608:: @ 8465608 - .incbin "baserom.gba", 0x465608, 0xE - -gUnknown_8465616:: @ 8465616 - .incbin "baserom.gba", 0x465616, 0xC0 - -gUnknown_84656D6:: @ 84656D6 - .incbin "baserom.gba", 0x4656D6, 0x10E - -gUnknown_84657E4:: @ 84657E4 - .incbin "baserom.gba", 0x4657E4, 0x98 - -gUnknown_846587C:: @ 846587C - .incbin "baserom.gba", 0x46587C, 0x5C - -gUnknown_84658D8:: @ 84658D8 - .incbin "baserom.gba", 0x4658D8, 0x18 - -gUnknown_84658F0:: @ 84658F0 - .incbin "baserom.gba", 0x4658F0, 0x40 - -gUnknown_8465930:: @ 8465930 - .incbin "baserom.gba", 0x465930, 0x20 - -gUnknown_8465950:: @ 8465950 - .incbin "baserom.gba", 0x465950, 0x80 - -gUnknown_84659D0:: @ 84659D0 - .incbin "baserom.gba", 0x4659D0, 0x804 - -gUnknown_84661D4:: @ 84661D4 - .incbin "baserom.gba", 0x4661D4, 0x2E8 - -gUnknown_84664BC:: @ 84664BC - .incbin "baserom.gba", 0x4664BC, 0x20 - -gUnknown_84664DC:: @ 84664DC - .incbin "baserom.gba", 0x4664DC, 0x60 - -gUnknown_846653C:: @ 846653C - .incbin "baserom.gba", 0x46653C, 0x84 - -gUnknown_84665C0:: @ 84665C0 - .incbin "baserom.gba", 0x4665C0, 0x60 - -gUnknown_8466620:: @ 8466620 - .incbin "baserom.gba", 0x466620, 0x378 - -gUnknown_8466998:: @ 8466998 - .incbin "baserom.gba", 0x466998, 0x178 - -gUnknown_8466B10:: @ 8466B10 - .incbin "baserom.gba", 0x466B10, 0x10 - -gUnknown_8466B20:: @ 8466B20 - .incbin "baserom.gba", 0x466B20, 0xEC - -gUnknown_8466C0C:: @ 8466C0C - .incbin "baserom.gba", 0x466C0C, 0x28 - -gUnknown_8466C34:: @ 8466C34 - .incbin "baserom.gba", 0x466C34, 0x4 - -gUnknown_8466C38:: @ 8466C38 - .incbin "baserom.gba", 0x466C38, 0x8 - -gUnknown_8466C40:: @ 8466C40 - .incbin "baserom.gba", 0x466C40, 0x18 - -gUnknown_8466C58:: @ 8466C58 - .incbin "baserom.gba", 0x466C58, 0xB8 - -gUnknown_8466D10:: @ 8466D10 - .incbin "baserom.gba", 0x466D10, 0x20 - -gUnknown_8466D30:: @ 8466D30 - .incbin "baserom.gba", 0x466D30, 0x30 - -gUnknown_8466D60:: @ 8466D60 - .incbin "baserom.gba", 0x466D60, 0x10 - -gUnknown_8466D70:: @ 8466D70 - .incbin "baserom.gba", 0x466D70, 0x20 - -gUnknown_8466D90:: @ 8466D90 - .incbin "baserom.gba", 0x466D90, 0x8 - -gUnknown_8466D98:: @ 8466D98 - .incbin "baserom.gba", 0x466D98, 0x8 - -gUnknown_8466DA0:: @ 8466DA0 - .incbin "baserom.gba", 0x466DA0, 0x8 - -gUnknown_8466DA8:: @ 8466DA8 - .incbin "baserom.gba", 0x466DA8, 0x8 - -gUnknown_8466DB0:: @ 8466DB0 - .incbin "baserom.gba", 0x466DB0, 0x8 - -gUnknown_8466DB8:: @ 8466DB8 - .incbin "baserom.gba", 0x466DB8, 0x8 - -gUnknown_8466DC0:: @ 8466DC0 - .incbin "baserom.gba", 0x466DC0, 0x8 - -gUnknown_8466DC8:: @ 8466DC8 - .incbin "baserom.gba", 0x466DC8, 0x8 - -gUnknown_8466DD0:: @ 8466DD0 - .incbin "baserom.gba", 0x466DD0, 0x18 - -gUnknown_8466DE8:: @ 8466DE8 - .incbin "baserom.gba", 0x466DE8, 0x18 - -gUnknown_8466E00:: @ 8466E00 - .incbin "baserom.gba", 0x466E00, 0x78 - -gUnknown_8466E78:: @ 8466E78 - .incbin "baserom.gba", 0x466E78, 0x18 - -gUnknown_8466E90:: @ 8466E90 - .incbin "baserom.gba", 0x466E90, 0x18 - -gUnknown_8466EA8:: @ 8466EA8 - .incbin "baserom.gba", 0x466EA8, 0x18 - -gUnknown_8466EC0:: @ 8466EC0 - .incbin "baserom.gba", 0x466EC0, 0x28 - -gUnknown_8466EE8:: @ 8466EE8 - .incbin "baserom.gba", 0x466EE8, 0x8 - -gUnknown_8466EF0:: @ 8466EF0 - .incbin "baserom.gba", 0x466EF0, 0x10 - -gUnknown_8466F00:: @ 8466F00 - .incbin "baserom.gba", 0x466F00, 0x28 - - .align 2 -gUnknown_8466F28:: @ 8466F28 - .asciz "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/mevent.c" - - .align 2 -gUnknown_8466F5C:: @ 8466F5C - .asciz "0" - - .align 2 -gUnknown_8466F60:: @ 8466F60 - .incbin "baserom.gba", 0x466F60, 0x20 - - .align 2 -gUnknown_8466F80:: @ 8466F80 - .asciz "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/mevent_server.c" - - .align 2 -gUnknown_8466FB8:: @ 8466FB8 - .asciz "size <= ME_SEND_BUF_SIZE" - - .align 2 -gUnknown_8466FD4:: @ 8466FD4 - .asciz "cmd->parameter == NULL" - - .align 2 -gUnknown_8466FEC:: @ 8466FEC - .asciz "cmd->flag == FALSE" - - .align 2 -gUnknown_8467000:: @ 8467000 - .asciz "cmd->flag == FALSE && cmd->parameter == NULL" - - .align 2 -gUnknown_8467030:: @ 8467030 - .incbin "baserom.gba", 0x467030, 0x14 - - .align 2 -gUnknown_8467044:: @ 8467044 - .asciz "svr->mainseqno < NELEMS(func_tbl)" - - .align 2 -gUnknown_8467068:: @ 8467068 - .incbin "baserom.gba", 0x467068, 0x8 - -gUnknown_8467070:: @ 8467070 - .incbin "baserom.gba", 0x467070, 0x4 - -gUnknown_8467074:: @ 8467074 - .incbin "baserom.gba", 0x467074, 0xEE4 - -gUnknown_8467F58:: @ 8467F58 - .incbin "baserom.gba", 0x467F58, 0x8 - -gUnknown_8467F60:: @ 8467F60 - .incbin "baserom.gba", 0x467F60, 0x40 - -gUnknown_8467FA0:: @ 8467FA0 - .incbin "baserom.gba", 0x467FA0, 0x18 - -gUnknown_8467FB8:: @ 8467FB8 - .incbin "baserom.gba", 0x467FB8, 0x80 - -gUnknown_8468038:: @ 8468038 - .incbin "baserom.gba", 0x468038, 0x8 - -gUnknown_8468040:: @ 8468040 - .incbin "baserom.gba", 0x468040, 0x10 - -gUnknown_8468050:: @ 8468050 - .incbin "baserom.gba", 0x468050, 0x6D0 - -gUnknown_8468720:: @ 8468720 - .incbin "baserom.gba", 0x468720, 0xC0 - -gUnknown_84687E0:: @ 84687E0 - .incbin "baserom.gba", 0x4687E0, 0x38C - -gUnknown_8468B6C:: @ 8468B6C - .incbin "baserom.gba", 0x468B6C, 0x60 - -gUnknown_8468BCC:: @ 8468BCC - .incbin "baserom.gba", 0x468BCC, 0x90 - - - diff --git a/data/data_845FD54.s b/data/data_845FD54.s new file mode 100644 index 000000000..d2b52192d --- /dev/null +++ b/data/data_845FD54.s @@ -0,0 +1,686 @@ + .section .rodata + + .align 2 + // oak_speech +gUnknown_845FD54:: @ 845FD54 + .incbin "baserom.gba", 0x45FD54, 0x814 + +gUnknown_8460568:: @ 8460568 + .incbin "baserom.gba", 0x460568, 0x80 + +gUnknown_84605E8:: @ 84605E8 + .incbin "baserom.gba", 0x4605E8, 0x5C0 + +gUnknown_8460BA8:: @ 8460BA8 + .incbin "baserom.gba", 0x460BA8, 0xFC + +gUnknown_8460CA4:: @ 8460CA4 + .incbin "baserom.gba", 0x460CA4, 0x44 + +gUnknown_8460CE8:: @ 8460CE8 + .incbin "baserom.gba", 0x460CE8, 0xAC + +gUnknown_8460D94:: @ 8460D94 + .incbin "baserom.gba", 0x460D94, 0xA0 + +gUnknown_8460E34:: @ 8460E34 + .incbin "baserom.gba", 0x460E34, 0xA0 + +gUnknown_8460ED4:: @ 8460ED4 + .incbin "baserom.gba", 0x460ED4, 0x40 + +gUnknown_8460F14:: @ 8460F14 + .incbin "baserom.gba", 0x460F14, 0x6E8 + +gUnknown_84615FC:: @ 84615FC + .incbin "baserom.gba", 0x4615FC, 0x40 + +gUnknown_846163C:: @ 846163C + .incbin "baserom.gba", 0x46163C, 0x698 + +gUnknown_8461CD4:: @ 8461CD4 + .incbin "baserom.gba", 0x461CD4, 0x40 + +gUnknown_8461D14:: @ 8461D14 + .incbin "baserom.gba", 0x461D14, 0x698 + +gUnknown_84623AC:: @ 84623AC + .incbin "baserom.gba", 0x4623AC, 0x40 + +gUnknown_84623EC:: @ 84623EC + .incbin "baserom.gba", 0x4623EC, 0xA6C + +gUnknown_8462E58:: @ 8462E58 + .incbin "baserom.gba", 0x462E58, 0x5C + +gUnknown_8462EB4:: @ 8462EB4 + .incbin "baserom.gba", 0x462EB4, 0xC + +gUnknown_8462EC0:: @ 8462EC0 + .incbin "baserom.gba", 0x462EC0, 0x8 + +gUnknown_8462EC8:: @ 8462EC8 + .incbin "baserom.gba", 0x462EC8, 0x8 + +gUnknown_8462ED0:: @ 8462ED0 + .incbin "baserom.gba", 0x462ED0, 0x8 + +gUnknown_8462ED8:: @ 8462ED8 + .incbin "baserom.gba", 0x462ED8, 0x10 + +gUnknown_8462EE8:: @ 8462EE8 + .incbin "baserom.gba", 0x462EE8, 0x4 + +gUnknown_8462EEC:: @ 8462EEC + .incbin "baserom.gba", 0x462EEC, 0x4 + +gUnknown_8462EF0:: @ 8462EF0 + .incbin "baserom.gba", 0x462EF0, 0xC + +gUnknown_8462EFC:: @ 8462EFC + .incbin "baserom.gba", 0x462EFC, 0x18 + +gUnknown_8462F14:: @ 8462F14 + .incbin "baserom.gba", 0x462F14, 0x8 + +gUnknown_8462F1C:: @ 8462F1C + .incbin "baserom.gba", 0x462F1C, 0x8 + +gUnknown_8462F24:: @ 8462F24 + .incbin "baserom.gba", 0x462F24, 0x2C + +gUnknown_8462F50:: @ 8462F50 + .incbin "baserom.gba", 0x462F50, 0xDC + +gUnknown_846302C:: @ 846302C + .incbin "baserom.gba", 0x46302C, 0x48 + +gUnknown_8463074:: @ 8463074 + .incbin "baserom.gba", 0x463074, 0x18 + +gUnknown_846308C:: @ 846308C + .incbin "baserom.gba", 0x46308C, 0x4C + +gUnknown_84630D8:: @ 84630D8 + .incbin "baserom.gba", 0x4630D8, 0x4C + +gUnknown_8463124:: @ 8463124 + .incbin "baserom.gba", 0x463124, 0x10 + +gUnknown_8463134:: @ 8463134 + .incbin "baserom.gba", 0x463134, 0xC + +gUnknown_8463140:: @ 8463140 + .incbin "baserom.gba", 0x463140, 0x10 + +gUnknown_8463150:: @ 8463150 + .incbin "baserom.gba", 0x463150, 0x18 + +gUnknown_8463168:: @ 8463168 + .incbin "baserom.gba", 0x463168, 0x3 + +gUnknown_846316B:: @ 846316B + .incbin "baserom.gba", 0x46316B, 0x5 + +gUnknown_8463170:: @ 8463170 + .incbin "baserom.gba", 0x463170, 0x8 + +gUnknown_8463178:: @ 8463178 + .incbin "baserom.gba", 0x463178, 0x4 + +gUnknown_846317C:: @ 846317C + .incbin "baserom.gba", 0x46317C, 0x4 + +gUnknown_8463180:: @ 8463180 + .incbin "baserom.gba", 0x463180, 0x4 + +gUnknown_8463184:: @ 8463184 + .incbin "baserom.gba", 0x463184, 0xC + +gUnknown_8463190:: @ 8463190 + .incbin "baserom.gba", 0x463190, 0x50 + +gUnknown_84631E0:: @ 84631E0 + .incbin "baserom.gba", 0x4631E0, 0x8 + +gUnknown_84631E8:: @ 84631E8 + .incbin "baserom.gba", 0x4631E8, 0x30 + +gUnknown_8463218:: @ 8463218 + .incbin "baserom.gba", 0x463218, 0x8 + +gUnknown_8463220:: @ 8463220 + .incbin "baserom.gba", 0x463220, 0x18 + +gUnknown_8463238:: @ 8463238 + .incbin "baserom.gba", 0x463238, 0x24 + +gUnknown_846325C:: @ 846325C + .incbin "baserom.gba", 0x46325C, 0x48 + +gUnknown_84632A4:: @ 84632A4 + .incbin "baserom.gba", 0x4632A4, 0x18 + +gUnknown_84632BC:: @ 84632BC + .incbin "baserom.gba", 0x4632BC, 0x4 + +gUnknown_84632C0:: @ 84632C0 + .incbin "baserom.gba", 0x4632C0, 0x4 + +gUnknown_84632C4:: @ 84632C4 + .incbin "baserom.gba", 0x4632C4, 0x4 + +gUnknown_84632C8:: @ 84632C8 + .incbin "baserom.gba", 0x4632C8, 0x4 + +gUnknown_84632CC:: @ 84632CC + .incbin "baserom.gba", 0x4632CC, 0x4 + +gUnknown_84632D0:: @ 84632D0 + .incbin "baserom.gba", 0x4632D0, 0x4 + +gUnknown_84632D4:: @ 84632D4 + .incbin "baserom.gba", 0x4632D4, 0x4 + +gUnknown_84632D8:: @ 84632D8 + .incbin "baserom.gba", 0x4632D8, 0x18 + +gUnknown_84632F0:: @ 84632F0 + .incbin "baserom.gba", 0x4632F0, 0x18 + +gUnknown_8463308:: @ 8463308 + .incbin "baserom.gba", 0x463308, 0x20 + +gUnknown_8463328:: @ 8463328 + .incbin "baserom.gba", 0x463328, 0x70 + +gUnknown_8463398:: @ 8463398 + .incbin "baserom.gba", 0x463398, 0x40 + +gUnknown_84633D8:: @ 84633D8 + .incbin "baserom.gba", 0x4633D8, 0x44 + +gUnknown_846341C:: @ 846341C + .incbin "baserom.gba", 0x46341C, 0x20 + +gUnknown_846343C:: @ 846343C + .incbin "baserom.gba", 0x46343C, 0x128 + +gUnknown_8463564:: @ 8463564 + .incbin "baserom.gba", 0x463564, 0x1C + +gUnknown_8463580:: @ 8463580 + .incbin "baserom.gba", 0x463580, 0x140 + +gUnknown_84636C0:: @ 84636C0 + .incbin "baserom.gba", 0x4636C0, 0x20 + +gUnknown_84636E0:: @ 84636E0 + .incbin "baserom.gba", 0x4636E0, 0x20 + +gUnknown_8463700:: @ 8463700 + .incbin "baserom.gba", 0x463700, 0x20 + +gUnknown_8463720:: @ 8463720 + .incbin "baserom.gba", 0x463720, 0x20 + +gUnknown_8463740:: @ 8463740 + .incbin "baserom.gba", 0x463740, 0x12C + +gUnknown_846386C:: @ 846386C + .incbin "baserom.gba", 0x46386C, 0x120 + +gUnknown_846398C:: @ 846398C + .incbin "baserom.gba", 0x46398C, 0x18 + +gUnknown_84639A4:: @ 84639A4 + .incbin "baserom.gba", 0x4639A4, 0x8 + +gUnknown_84639AC:: @ 84639AC + .incbin "baserom.gba", 0x4639AC, 0x48 + +gUnknown_84639F4:: @ 84639F4 + .incbin "baserom.gba", 0x4639F4, 0x20 + +gUnknown_8463A14:: @ 8463A14 + .incbin "baserom.gba", 0x463A14, 0x68 + +gUnknown_8463A7C:: @ 8463A7C + .incbin "baserom.gba", 0x463A7C, 0x70 + +gUnknown_8463AEC:: @ 8463AEC + .incbin "baserom.gba", 0x463AEC, 0x10 + +gUnknown_8463AFC:: @ 8463AFC + .incbin "baserom.gba", 0x463AFC, 0x4 + +gUnknown_8463B00:: @ 8463B00 + .incbin "baserom.gba", 0x463B00, 0x20 + +gUnknown_8463B20:: @ 8463B20 + .incbin "baserom.gba", 0x463B20, 0x10 + +gUnknown_8463B30:: @ 8463B30 + .incbin "baserom.gba", 0x463B30, 0x10 + +gUnknown_8463B40:: @ 8463B40 + .incbin "baserom.gba", 0x463B40, 0x4 + +gUnknown_8463B44:: @ 8463B44 + .incbin "baserom.gba", 0x463B44, 0x20 + +gUnknown_8463B64:: @ 8463B64 + .incbin "baserom.gba", 0x463B64, 0x24 + +gUnknown_8463B88:: @ 8463B88 + .incbin "baserom.gba", 0x463B88, 0xF8 + +gUnknown_8463C80:: @ 8463C80 + .incbin "baserom.gba", 0x463C80, 0x1E0 + +gUnknown_8463E60:: @ 8463E60 + .incbin "baserom.gba", 0x463E60, 0x64 + +gUnknown_8463EC4:: @ 8463EC4 + .incbin "baserom.gba", 0x463EC4, 0x10 + +gUnknown_8463ED4:: @ 8463ED4 + .incbin "baserom.gba", 0x463ED4, 0x1C + +gUnknown_8463EF0:: @ 8463EF0 + .incbin "baserom.gba", 0x463EF0, 0xC + +gUnknown_8463EFC:: @ 8463EFC + .incbin "baserom.gba", 0x463EFC, 0x10 + +gUnknown_8463F0C:: @ 8463F0C + .incbin "baserom.gba", 0x463F0C, 0x18 + +gUnknown_8463F24:: @ 8463F24 + .incbin "baserom.gba", 0x463F24, 0x18 + +gUnknown_8463F3C:: @ 8463F3C + .incbin "baserom.gba", 0x463F3C, 0x20 + +gUnknown_8463F5C:: @ 8463F5C + .incbin "baserom.gba", 0x463F5C, 0x20 + +gUnknown_8463F7C:: @ 8463F7C + .incbin "baserom.gba", 0x463F7C, 0x20 + +gUnknown_8463F9C:: @ 8463F9C + .incbin "baserom.gba", 0x463F9C, 0x8 + +gUnknown_8463FA4:: @ 8463FA4 + .incbin "baserom.gba", 0x463FA4, 0x3 + +gUnknown_8463FA7:: @ 8463FA7 + .incbin "baserom.gba", 0x463FA7, 0x11 + +gUnknown_8463FB8:: @ 8463FB8 + .incbin "baserom.gba", 0x463FB8, 0x6 + +gUnknown_8463FBE:: @ 8463FBE + .incbin "baserom.gba", 0x463FBE, 0x3 + +gUnknown_8463FC1:: @ 8463FC1 + .incbin "baserom.gba", 0x463FC1, 0x5 + +gUnknown_8463FC6:: @ 8463FC6 + .incbin "baserom.gba", 0x463FC6, 0x7 + +gUnknown_8463FCD:: @ 8463FCD + .incbin "baserom.gba", 0x463FCD, 0x7 + +gUnknown_8463FD4:: @ 8463FD4 + .incbin "baserom.gba", 0x463FD4, 0xB + +gUnknown_8463FDF:: @ 8463FDF + .incbin "baserom.gba", 0x463FDF, 0xB + +gUnknown_8463FEA:: @ 8463FEA + .incbin "baserom.gba", 0x463FEA, 0x12 + +gUnknown_8463FFC:: @ 8463FFC + .incbin "baserom.gba", 0x463FFC, 0xC + +gUnknown_8464008:: @ 8464008 + .incbin "baserom.gba", 0x464008, 0x120 + +gUnknown_8464128:: @ 8464128 + .incbin "baserom.gba", 0x464128, 0x20 + +gUnknown_8464148:: @ 8464148 + .incbin "baserom.gba", 0x464148, 0x174 + +gUnknown_84642BC:: @ 84642BC + .incbin "baserom.gba", 0x4642BC, 0x4 + +gUnknown_84642C0:: @ 84642C0 + .incbin "baserom.gba", 0x4642C0, 0x34 + +gUnknown_84642F4:: @ 84642F4 + .incbin "baserom.gba", 0x4642F4, 0xC + +gUnknown_8464300:: @ 8464300 + .incbin "baserom.gba", 0x464300, 0x4C + +gUnknown_846434C:: @ 846434C + .incbin "baserom.gba", 0x46434C, 0xC + +gUnknown_8464358:: @ 8464358 + .incbin "baserom.gba", 0x464358, 0x14 + +gUnknown_846436C:: @ 846436C + .incbin "baserom.gba", 0x46436C, 0x8 + +gUnknown_8464374:: @ 8464374 + .incbin "baserom.gba", 0x464374, 0x8 + +gUnknown_846437C:: @ 846437C + .incbin "baserom.gba", 0x46437C, 0x28 + +gUnknown_84643A4:: @ 84643A4 + .incbin "baserom.gba", 0x4643A4, 0x4 + +gUnknown_84643A8:: @ 84643A8 + .incbin "baserom.gba", 0x4643A8, 0x4 + +gUnknown_84643AC:: @ 84643AC + .incbin "baserom.gba", 0x4643AC, 0x4 + +gUnknown_84643B0:: @ 84643B0 + .incbin "baserom.gba", 0x4643B0, 0x4 + +gUnknown_84643B4:: @ 84643B4 + .incbin "baserom.gba", 0x4643B4, 0x4 + +gUnknown_84643B8:: @ 84643B8 + .incbin "baserom.gba", 0x4643B8, 0x20 + +gUnknown_84643D8:: @ 84643D8 + .incbin "baserom.gba", 0x4643D8, 0x18 + +gUnknown_84643F0:: @ 84643F0 + .incbin "baserom.gba", 0x4643F0, 0x8 + +gUnknown_84643F8:: @ 84643F8 + .incbin "baserom.gba", 0x4643F8, 0x8 + +gUnknown_8464400:: @ 8464400 + .incbin "baserom.gba", 0x464400, 0x48 + +gUnknown_8464448:: @ 8464448 + .incbin "baserom.gba", 0x464448, 0x60 + +gUnknown_84644A8:: @ 84644A8 + .incbin "baserom.gba", 0x4644A8, 0x8 + +gUnknown_84644B0:: @ 84644B0 + .incbin "baserom.gba", 0x4644B0, 0x8 + +gUnknown_84644B8:: @ 84644B8 + .incbin "baserom.gba", 0x4644B8, 0x32C + +gUnknown_84647E4:: @ 84647E4 + .incbin "baserom.gba", 0x4647E4, 0x18 + +gUnknown_84647FC:: @ 84647FC + .incbin "baserom.gba", 0x4647FC, 0x8 + +gUnknown_8464804:: @ 8464804 + .incbin "baserom.gba", 0x464804, 0x38 + +gUnknown_846483C:: @ 846483C + .incbin "baserom.gba", 0x46483C, 0x40 + +gUnknown_846487C:: @ 846487C + .incbin "baserom.gba", 0x46487C, 0x8 + +gUnknown_8464884:: @ 8464884 + .incbin "baserom.gba", 0x464884, 0xC + +gUnknown_8464890:: @ 8464890 + .incbin "baserom.gba", 0x464890, 0x1E + +gUnknown_84648AE:: @ 84648AE + .incbin "baserom.gba", 0x4648AE, 0xF + +gUnknown_84648BD:: @ 84648BD + .incbin "baserom.gba", 0x4648BD, 0x15 + +gUnknown_84648D2:: @ 84648D2 + .incbin "baserom.gba", 0x4648D2, 0x54 + +gUnknown_8464926:: @ 8464926 + .incbin "baserom.gba", 0x464926, 0x40 + +gUnknown_8464966:: @ 8464966 + .incbin "baserom.gba", 0x464966, 0xC4A + +gUnknown_84655B0:: @ 84655B0 + .incbin "baserom.gba", 0x4655B0, 0x18 + +gUnknown_84655C8:: @ 84655C8 + .incbin "baserom.gba", 0x4655C8, 0x40 + +gUnknown_8465608:: @ 8465608 + .incbin "baserom.gba", 0x465608, 0xE + +gUnknown_8465616:: @ 8465616 + .incbin "baserom.gba", 0x465616, 0xC0 + +gUnknown_84656D6:: @ 84656D6 + .incbin "baserom.gba", 0x4656D6, 0x10E + +gUnknown_84657E4:: @ 84657E4 + .incbin "baserom.gba", 0x4657E4, 0x98 + +gUnknown_846587C:: @ 846587C + .incbin "baserom.gba", 0x46587C, 0x5C + +gUnknown_84658D8:: @ 84658D8 + .incbin "baserom.gba", 0x4658D8, 0x18 + +gUnknown_84658F0:: @ 84658F0 + .incbin "baserom.gba", 0x4658F0, 0x40 + +gUnknown_8465930:: @ 8465930 + .incbin "baserom.gba", 0x465930, 0x20 + +gUnknown_8465950:: @ 8465950 + .incbin "baserom.gba", 0x465950, 0x80 + +gUnknown_84659D0:: @ 84659D0 + .incbin "baserom.gba", 0x4659D0, 0x804 + +gUnknown_84661D4:: @ 84661D4 + .incbin "baserom.gba", 0x4661D4, 0x2E8 + +gUnknown_84664BC:: @ 84664BC + .incbin "baserom.gba", 0x4664BC, 0x20 + +gUnknown_84664DC:: @ 84664DC + .incbin "baserom.gba", 0x4664DC, 0x60 + +gUnknown_846653C:: @ 846653C + .incbin "baserom.gba", 0x46653C, 0x84 + +gUnknown_84665C0:: @ 84665C0 + .incbin "baserom.gba", 0x4665C0, 0x60 + +gUnknown_8466620:: @ 8466620 + .incbin "baserom.gba", 0x466620, 0x378 + +gUnknown_8466998:: @ 8466998 + .incbin "baserom.gba", 0x466998, 0x178 + +gUnknown_8466B10:: @ 8466B10 + .incbin "baserom.gba", 0x466B10, 0x10 + +gUnknown_8466B20:: @ 8466B20 + .incbin "baserom.gba", 0x466B20, 0xEC + +gUnknown_8466C0C:: @ 8466C0C + .incbin "baserom.gba", 0x466C0C, 0x28 + +gUnknown_8466C34:: @ 8466C34 + .incbin "baserom.gba", 0x466C34, 0x4 + +gUnknown_8466C38:: @ 8466C38 + .incbin "baserom.gba", 0x466C38, 0x8 + +gUnknown_8466C40:: @ 8466C40 + .incbin "baserom.gba", 0x466C40, 0x18 + +gUnknown_8466C58:: @ 8466C58 + .incbin "baserom.gba", 0x466C58, 0xB8 + +gUnknown_8466D10:: @ 8466D10 + .incbin "baserom.gba", 0x466D10, 0x20 + +gUnknown_8466D30:: @ 8466D30 + .incbin "baserom.gba", 0x466D30, 0x30 + +gUnknown_8466D60:: @ 8466D60 + .incbin "baserom.gba", 0x466D60, 0x10 + +gUnknown_8466D70:: @ 8466D70 + .incbin "baserom.gba", 0x466D70, 0x20 + +gUnknown_8466D90:: @ 8466D90 + .incbin "baserom.gba", 0x466D90, 0x8 + +gUnknown_8466D98:: @ 8466D98 + .incbin "baserom.gba", 0x466D98, 0x8 + +gUnknown_8466DA0:: @ 8466DA0 + .incbin "baserom.gba", 0x466DA0, 0x8 + +gUnknown_8466DA8:: @ 8466DA8 + .incbin "baserom.gba", 0x466DA8, 0x8 + +gUnknown_8466DB0:: @ 8466DB0 + .incbin "baserom.gba", 0x466DB0, 0x8 + +gUnknown_8466DB8:: @ 8466DB8 + .incbin "baserom.gba", 0x466DB8, 0x8 + +gUnknown_8466DC0:: @ 8466DC0 + .incbin "baserom.gba", 0x466DC0, 0x8 + +gUnknown_8466DC8:: @ 8466DC8 + .incbin "baserom.gba", 0x466DC8, 0x8 + +gUnknown_8466DD0:: @ 8466DD0 + .incbin "baserom.gba", 0x466DD0, 0x18 + +gUnknown_8466DE8:: @ 8466DE8 + .incbin "baserom.gba", 0x466DE8, 0x18 + +gUnknown_8466E00:: @ 8466E00 + .incbin "baserom.gba", 0x466E00, 0x78 + +gUnknown_8466E78:: @ 8466E78 + .incbin "baserom.gba", 0x466E78, 0x18 + +gUnknown_8466E90:: @ 8466E90 + .incbin "baserom.gba", 0x466E90, 0x18 + +gUnknown_8466EA8:: @ 8466EA8 + .incbin "baserom.gba", 0x466EA8, 0x18 + +gUnknown_8466EC0:: @ 8466EC0 + .incbin "baserom.gba", 0x466EC0, 0x28 + +gUnknown_8466EE8:: @ 8466EE8 + .incbin "baserom.gba", 0x466EE8, 0x8 + +gUnknown_8466EF0:: @ 8466EF0 + .incbin "baserom.gba", 0x466EF0, 0x10 + +gUnknown_8466F00:: @ 8466F00 + .incbin "baserom.gba", 0x466F00, 0x28 + + .align 2 +gUnknown_8466F28:: @ 8466F28 + .asciz "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/mevent.c" + + .align 2 +gUnknown_8466F5C:: @ 8466F5C + .asciz "0" + + .align 2 +gUnknown_8466F60:: @ 8466F60 + .incbin "baserom.gba", 0x466F60, 0x20 + + .align 2 +gUnknown_8466F80:: @ 8466F80 + .asciz "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/mevent_server.c" + + .align 2 +gUnknown_8466FB8:: @ 8466FB8 + .asciz "size <= ME_SEND_BUF_SIZE" + + .align 2 +gUnknown_8466FD4:: @ 8466FD4 + .asciz "cmd->parameter == NULL" + + .align 2 +gUnknown_8466FEC:: @ 8466FEC + .asciz "cmd->flag == FALSE" + + .align 2 +gUnknown_8467000:: @ 8467000 + .asciz "cmd->flag == FALSE && cmd->parameter == NULL" + + .align 2 +gUnknown_8467030:: @ 8467030 + .incbin "baserom.gba", 0x467030, 0x14 + + .align 2 +gUnknown_8467044:: @ 8467044 + .asciz "svr->mainseqno < NELEMS(func_tbl)" + + .align 2 +gUnknown_8467068:: @ 8467068 + .incbin "baserom.gba", 0x467068, 0x8 + +gUnknown_8467070:: @ 8467070 + .incbin "baserom.gba", 0x467070, 0x4 + +gUnknown_8467074:: @ 8467074 + .incbin "baserom.gba", 0x467074, 0xEE4 + +gUnknown_8467F58:: @ 8467F58 + .incbin "baserom.gba", 0x467F58, 0x8 + +gUnknown_8467F60:: @ 8467F60 + .incbin "baserom.gba", 0x467F60, 0x40 + +gUnknown_8467FA0:: @ 8467FA0 + .incbin "baserom.gba", 0x467FA0, 0x18 + +gUnknown_8467FB8:: @ 8467FB8 + .incbin "baserom.gba", 0x467FB8, 0x80 + +gUnknown_8468038:: @ 8468038 + .incbin "baserom.gba", 0x468038, 0x8 + +gUnknown_8468040:: @ 8468040 + .incbin "baserom.gba", 0x468040, 0x10 + +gUnknown_8468050:: @ 8468050 + .incbin "baserom.gba", 0x468050, 0x6D0 + +gUnknown_8468720:: @ 8468720 + .incbin "baserom.gba", 0x468720, 0xC0 + +gUnknown_84687E0:: @ 84687E0 + .incbin "baserom.gba", 0x4687E0, 0x38C + +gUnknown_8468B6C:: @ 8468B6C + .incbin "baserom.gba", 0x468B6C, 0x60 + +gUnknown_8468BCC:: @ 8468BCC + .incbin "baserom.gba", 0x468BCC, 0x90 diff --git a/data/fame_checker.s b/data/fame_checker.s new file mode 100644 index 000000000..037891818 --- /dev/null +++ b/data/fame_checker.s @@ -0,0 +1,92 @@ + .include "asm/macros.inc" + .include "constants/constants.inc" + + .section .rodata + + .align 2 +gUnknown_845C600:: @ 845C600 + .incbin "baserom.gba", 0x45C600, 0x1720 + +gUnknown_845DD20:: @ 845DD20 + .incbin "baserom.gba", 0x45DD20, 0x820 + +gUnknown_845E540:: @ 845E540 + .incbin "baserom.gba", 0x45E540, 0x820 + +gUnknown_845ED60:: @ 845ED60 + .incbin "baserom.gba", 0x45ED60, 0x820 + +gUnknown_845F580:: @ 845F580 + .incbin "baserom.gba", 0x45F580, 0x40 + +gUnknown_845F5C0:: @ 845F5C0 + .incbin "baserom.gba", 0x45F5C0, 0x20 + +gUnknown_845F5E0:: @ 845F5E0 + .incbin "baserom.gba", 0x45F5E0, 0x3 + +gUnknown_845F5E3:: @ 845F5E3 + .incbin "baserom.gba", 0x45F5E3, 0x3 + +gUnknown_845F5E6:: @ 845F5E6 + .incbin "baserom.gba", 0x45F5E6, 0x4 + +gUnknown_845F5EA:: @ 845F5EA + .incbin "baserom.gba", 0x45F5EA, 0x22 + +gUnknown_845F60C:: @ 845F60C + .incbin "baserom.gba", 0x45F60C, 0x10 + +gUnknown_845F61C:: @ 845F61C + .incbin "baserom.gba", 0x45F61C, 0x20 + +gUnknown_845F63C:: @ 845F63C + .incbin "baserom.gba", 0x45F63C, 0x80 + +gUnknown_845F6BC:: @ 845F6BC + .incbin "baserom.gba", 0x45F6BC, 0x180 + +gUnknown_845F83C:: @ 845F83C + .incbin "baserom.gba", 0x45F83C, 0x60 + +gUnknown_845F89C:: @ 845F89C + .incbin "baserom.gba", 0x45F89C, 0x180 + +gUnknown_845FA1C:: @ 845FA1C + .incbin "baserom.gba", 0x45FA1C, 0x180 + +gUnknown_845FB9C:: @ 845FB9C + .incbin "baserom.gba", 0x45FB9C, 0x40 + +gUnknown_845FBDC:: @ 845FBDC + .incbin "baserom.gba", 0x45FBDC, 0x18 + +gUnknown_845FBF4:: @ 845FBF4 + .incbin "baserom.gba", 0x45FBF4, 0x10 + +gUnknown_845FC04:: @ 845FC04 + .incbin "baserom.gba", 0x45FC04, 0x40 + +gUnknown_845FC44:: @ 845FC44 + .incbin "baserom.gba", 0x45FC44, 0x34 + +gUnknown_845FC78:: @ 845FC78 + .incbin "baserom.gba", 0x45FC78, 0x40 + +gUnknown_845FCB8:: @ 845FCB8 + .incbin "baserom.gba", 0x45FCB8, 0x2C + +gUnknown_845FCE4:: @ 845FCE4 + .incbin "baserom.gba", 0x45FCE4, 0x18 + +gUnknown_845FCFC:: @ 845FCFC + .incbin "baserom.gba", 0x45FCFC, 0x18 + +gUnknown_845FD14:: @ 845FD14 + .incbin "baserom.gba", 0x45FD14, 0x18 + +gUnknown_845FD2C:: @ 845FD2C + .incbin "baserom.gba", 0x45FD2C, 0x18 + +gUnknown_845FD44:: @ 845FD44 + .incbin "baserom.gba", 0x45FD44, 0x10 diff --git a/include/graphics.h b/include/graphics.h index 9888d2f7c..c5544428e 100644 --- a/include/graphics.h +++ b/include/graphics.h @@ -143,4 +143,11 @@ extern const u8 gUnknown_08DDB020[]; extern const u8 gUnknown_08DDB2C4[]; extern const u16 gUnknown_08DDAFE0[]; +// fame_checker + +extern const u16 gUnknown_8E9F220[0x30]; +extern const u16 gUnknown_8E9F260[0xa50]; +extern const u16 gUnknown_8EA0700[0x400]; +extern const u16 gUnknown_8EA0F00[0x400]; + #endif //GUARD_GRAPHICS_H diff --git a/include/item_menu.h b/include/item_menu.h index 731c7cf2b..64cb2d762 100644 --- a/include/item_menu.h +++ b/include/item_menu.h @@ -12,5 +12,6 @@ extern u16 gUnknown_203AD30; // Exported ROM declarations void sub_81AAC50(void); void sub_81AAC70(void); +void sub_8107EB8(void); #endif //GUARD_ITEM_MENU_H diff --git a/ld_script.txt b/ld_script.txt index e821a34ca..cab20382b 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -377,6 +377,9 @@ SECTIONS { data/data_83FECCC.o(.rodata.8453F6C); src/quest_log.o(.rodata); data/data_83FECCC.o(.rodata.8456C74); + src/fame_checker.o(.rodata); + data/fame_checker.o(.rodata); + data/data_845FD54.o(.rodata); src/menews_jisan.o(.rodata); src/menews_jisan.o(.rodata.str1.4); data/data_8468C98.o(.rodata); diff --git a/src/fame_checker.c b/src/fame_checker.c index d311ecb94..0f047f612 100644 --- a/src/fame_checker.c +++ b/src/fame_checker.c @@ -1,6 +1,9 @@ #include "global.h" #include "constants/songs.h" #include "bg.h" +#include "graphics.h" +#include "item_menu.h" +#include "list_menu.h" #include "gpu_regs.h" #include "palette.h" #include "task.h" @@ -13,13 +16,18 @@ struct FameCheckerData { - u32 unk_00; + void (*unk_00)(void); u16 unk_04; - u8 filler_06[3]; + u8 filler_06[1]; + u8 unk_07_0:1; + u8 unk_07_1:1; + u8 unk_07_2:6; + u8 filler_08[1]; u8 unk_09; u8 unk_0A; u8 unk_0B; - u8 filler_0C[23]; + u8 unk_0C[17]; + u8 unk_1D[6]; u8 unk_23_0:1; u8 unk_23_1:7; }; @@ -36,28 +44,48 @@ EWRAM_DATA struct FameCheckerData * gUnknown_203B0FC = NULL; EWRAM_DATA struct FameCheckerData2 * gUnknown_203B100 = NULL; EWRAM_DATA u32 gUnknown_203B104 = 0; +struct ListMenuTemplate gUnknown_3005EB0; +u8 gUnknown_3005EC8; + void sub_812C3F8(void); void sub_812C648(void); void sub_812C664(u8 taskId); +void sub_812C694(u8 taskId); +bool8 sub_812C8F8(u8 taskId); +void sub_812C9BC(u8 taskId); +void sub_812CAD8(u8 taskId); +void sub_812CD3C(void); +void sub_812CE04(u8 taskId); void sub_812CE9C(void); void sub_812CEC0(void); +void sub_812CEE0(u8 windowId); +void sub_812CEFC(u8 taskId, u8 a1); +void sub_812CF3C(u8 taskId); +void sub_812D0F4(u8 a0); void sub_812D1A8(u8 a0); void sub_812D420(void); void sub_812D558(void); void sub_812D584(void); void sub_812D594(void); +bool8 sub_812D6B4(void); +u8 sub_812D724(s16 a0); +u8 sub_812D7E4(void); +u8 sub_812D888(u8 a0); +void sub_812DA14(u8 a0); void sub_812DB28(void); void sub_812E000(void); +void sub_812E048(void); +u16 sub_812E064(void); +void sub_812E110(u8 taskId); void sub_812E178(u8 a0, s16 a1); +void sub_812E4A4(u8 a0); + +extern const u16 gUnknown_845C600[]; extern const struct BgTemplate gUnknown_845FBF4[4]; +extern const struct SpriteSheet gUnknown_845FB9C[]; +extern const struct SpritePalette gUnknown_845FBDC[]; extern const struct WindowTemplate gUnknown_845FC04[]; -extern const u16 gUnknown_845C600[0x40]; - -extern const u16 gUnknown_8E9F220[0x30]; -extern const u16 gUnknown_8E9F260[0xa50]; -extern const u16 gUnknown_8EA0700[0x400]; -extern const u16 gUnknown_8EA0F00[0x400]; void sub_812C380(void) { @@ -74,7 +102,7 @@ void sub_812C394(void) UpdatePaletteFade(); } -void sub_812C3AC(u32 a0) +void sub_812C3AC(void (*a0)(void)) { SetVBlankCallback(NULL); gUnknown_203B0FC = AllocZeroed(sizeof(struct FameCheckerData)); @@ -165,3 +193,91 @@ void sub_812C3F8(void) break; } } + +void sub_812C648(void) +{ + LoadSpriteSheets(gUnknown_845FB9C); + LoadSpritePalettes(gUnknown_845FBDC); +} + +void sub_812C664(u8 taskId) +{ + if (!gPaletteFade.active) + gTasks[taskId].func = sub_812C694; +} + +void sub_812C694(u8 taskId) +{ + u16 r4; + u8 r4_2; + struct Task *task = &gTasks[taskId]; + s16 * data = gTasks[taskId].data; + if (FindTaskIdByFunc(sub_812E110) == 0xFF) + { + RunTextPrinters(); + if ((gMain.newKeys & SELECT_BUTTON) && !gUnknown_203B0FC->unk_07_1 && gUnknown_203B0FC->unk_00 != sub_8107EB8) + task->func = sub_812CF3C; + else if (gMain.newKeys & START_BUTTON) + { + r4 = sub_812E064(); + if (sub_812C8F8(taskId) == TRUE) + { + PlaySE(SE_W100); + } + else if (r4 != gUnknown_203B0FC->unk_07_2 - 1) + { + PlaySE(SE_W100); + FillWindowPixelRect(3, 0x00, 0, 0, 88, 32); + sub_812CEE0(3); + sub_812E178(2, 4); + sub_812E178(1, 5); + sub_812D0F4(1); + task->data[2] = sub_812D888(gUnknown_203B0FC->unk_0C[r4]); + gSprites[task->data[2]].pos2.x = 0xF0; + gSprites[task->data[2]].data[0] = 1; + task->data[3] = sub_812D7E4(); + gSprites[task->data[3]].pos2.x = 0xF0; + gSprites[task->data[3]].data[0] = 1; + task->func = sub_812C9BC; + } + } + else if (gMain.newKeys & A_BUTTON) + { + r4 = ListMenuHandleInput(0); + if (r4 == gUnknown_203B0FC->unk_07_2 - 1) + task->func = sub_812CF3C; + else if (gUnknown_203B0FC->unk_07_1) + { + if (!IsTextPrinterActive(2) && sub_812D6B4() == TRUE) + sub_812CD3C(); + } + else if (gUnknown_203B0FC->unk_07_0) + { + PlaySE(SE_SELECT); + task->data[0] = sub_812D724(task->data[1]); + for (r4_2 = 0; r4_2 < 6; r4_2++) + { + if (r4_2 != task->data[1]) + sub_812CEFC(gUnknown_203B0FC->unk_1D[r4_2], 1); + } + gUnknown_3005EC8 = 0xFF; + sub_812E4A4(0); + sub_812D0F4(2); + if (gSprites[gUnknown_203B0FC->unk_1D[task->data[1]]].data[1] != 0xFF) + { + sub_812CE04(taskId); + sub_812DA14(data[1]); + } + sub_812E048(); + task->func = sub_812CAD8; + } + } + else if (gMain.newKeys & B_BUTTON) + { + if (sub_812C8F8(taskId) != TRUE) + task->func = sub_812CF3C; + } + else + ListMenuHandleInput(0); + } +} diff --git a/sym_common.txt b/sym_common.txt index 6c213ca4d..af6d7ba4f 100644 --- a/sym_common.txt +++ b/sym_common.txt @@ -324,11 +324,7 @@ gUnknown_3005E9C: @ 3005E9C gUnknown_3005EA0: @ 3005EA0 .space 0x10 -gUnknown_3005EB0: @ 3005EB0 - .space 0x18 - -gUnknown_3005EC8: @ 3005EC8 - .space 0x4 + .include "fame_checker.o" gUnknown_3005ECC: @ 3005ECC .space 0x4 -- cgit v1.2.3 From 8ef1594d204e0b933fcfc048e17471191dfae720 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sat, 24 Nov 2018 16:28:05 -0500 Subject: through sub_812CA1C --- asm/fame_checker.s | 240 ----------------------------------------------------- src/fame_checker.c | 65 ++++++++++++++- 2 files changed, 64 insertions(+), 241 deletions(-) diff --git a/asm/fame_checker.s b/asm/fame_checker.s index 059b19291..f87b8622f 100644 --- a/asm/fame_checker.s +++ b/asm/fame_checker.s @@ -5,246 +5,6 @@ .text - thumb_func_start sub_812C8F8 -sub_812C8F8: @ 812C8F8 - push {r4,r5,lr} - lsls r0, 24 - lsrs r0, 24 - lsls r1, r0, 2 - adds r1, r0 - lsls r1, 3 - ldr r0, _0812C91C @ =gTasks - adds r4, r1, r0 - ldr r5, _0812C920 @ =gUnknown_203B0FC - ldr r0, [r5] - ldrb r1, [r0, 0x7] - movs r3, 0x2 - adds r0, r3, 0 - ands r0, r1 - cmp r0, 0 - bne _0812C924 - movs r0, 0 - b _0812C982 - .align 2, 0 -_0812C91C: .4byte gTasks -_0812C920: .4byte gUnknown_203B0FC -_0812C924: - ldr r2, _0812C988 @ =gSprites - movs r0, 0xC - ldrsh r1, [r4, r0] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - adds r0, r2 - strh r3, [r0, 0x2E] - movs r0, 0xC - ldrsh r1, [r4, r0] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - adds r0, r2 - ldrh r1, [r0, 0x24] - adds r1, 0xA - strh r1, [r0, 0x24] - movs r0, 0xE - ldrsh r1, [r4, r0] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - adds r0, r2 - strh r3, [r0, 0x2E] - movs r0, 0xE - ldrsh r1, [r4, r0] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - adds r0, r2 - ldrh r1, [r0, 0x24] - adds r1, 0xA - strh r1, [r0, 0x24] - bl sub_812CE9C - ldr r0, _0812C98C @ =sub_812CA1C - str r0, [r4] - bl sub_812C990 - ldr r1, [r5] - adds r1, 0x23 - ldrb r2, [r1] - movs r0, 0x5 - negs r0, r0 - ands r0, r2 - strb r0, [r1] - movs r0, 0x1 -_0812C982: - pop {r4,r5} - pop {r1} - bx r1 - .align 2, 0 -_0812C988: .4byte gSprites -_0812C98C: .4byte sub_812CA1C - thumb_func_end sub_812C8F8 - - thumb_func_start sub_812C990 -sub_812C990: @ 812C990 - push {lr} - sub sp, 0x10 - ldr r2, _0812C9B8 @ =gUnknown_84181E4 - movs r0, 0 - str r0, [sp] - movs r0, 0x2 - str r0, [sp, 0x4] - movs r0, 0x1 - str r0, [sp, 0x8] - movs r0, 0x3 - str r0, [sp, 0xC] - movs r0, 0x2 - movs r1, 0x2 - movs r3, 0 - bl AddTextPrinterParametrized - add sp, 0x10 - pop {r0} - bx r0 - .align 2, 0 -_0812C9B8: .4byte gUnknown_84181E4 - thumb_func_end sub_812C990 - - thumb_func_start sub_812C9BC -sub_812C9BC: @ 812C9BC - push {r4,lr} - lsls r0, 24 - lsrs r0, 24 - lsls r1, r0, 2 - adds r1, r0 - lsls r1, 3 - ldr r0, _0812C9F8 @ =gTasks - adds r4, r1, r0 - ldr r2, _0812C9FC @ =gSprites - movs r0, 0xC - ldrsh r1, [r4, r0] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - adds r0, r2 - movs r1, 0x2E - ldrsh r0, [r0, r1] - cmp r0, 0 - bne _0812CA08 - bl sub_812CD3C - ldr r0, _0812CA00 @ =gUnknown_203B0FC - ldr r2, [r0] - ldrb r0, [r2, 0x7] - movs r1, 0x2 - orrs r0, r1 - strb r0, [r2, 0x7] - ldr r0, _0812CA04 @ =sub_812C694 - str r0, [r4] - b _0812CA14 - .align 2, 0 -_0812C9F8: .4byte gTasks -_0812C9FC: .4byte gSprites -_0812CA00: .4byte gUnknown_203B0FC -_0812CA04: .4byte sub_812C694 -_0812CA08: - movs r1, 0xA0 - lsls r1, 4 - movs r0, 0x1 - movs r2, 0x1 - bl ChangeBgX -_0812CA14: - pop {r4} - pop {r0} - bx r0 - thumb_func_end sub_812C9BC - - thumb_func_start sub_812CA1C -sub_812CA1C: @ 812CA1C - push {r4-r7,lr} - lsls r0, 24 - lsrs r4, r0, 24 - lsls r0, r4, 2 - adds r0, r4 - lsls r0, 3 - ldr r1, _0812CA44 @ =gTasks - adds r5, r0, r1 - movs r0, 0x1 - bl GetBgX - cmp r0, 0 - beq _0812CA48 - movs r1, 0xA0 - lsls r1, 4 - movs r0, 0x1 - movs r2, 0x2 - bl ChangeBgX - b _0812CA52 - .align 2, 0 -_0812CA44: .4byte gTasks -_0812CA48: - movs r0, 0x1 - movs r1, 0 - movs r2, 0 - bl ChangeBgX -_0812CA52: - ldr r7, _0812CAC8 @ =gSprites - movs r1, 0xC - ldrsh r0, [r5, r1] - lsls r1, r0, 4 - adds r1, r0 - lsls r1, 2 - adds r1, r7 - movs r2, 0x2E - ldrsh r0, [r1, r2] - cmp r0, 0 - bne _0812CAC0 - ldr r6, _0812CACC @ =gUnknown_203B0FC - ldr r0, [r6] - ldrb r1, [r0, 0x7] - movs r0, 0x1 - ands r0, r1 - cmp r0, 0 - beq _0812CA7C - movs r0, 0 - bl sub_812D0F4 -_0812CA7C: - movs r0, 0x1 - movs r1, 0x4 - bl sub_812E178 - movs r0, 0x2 - movs r1, 0x2 - bl sub_812E178 - ldr r2, [r6] - ldrb r1, [r2, 0x7] - movs r0, 0x3 - negs r0, r0 - ands r0, r1 - strb r0, [r2, 0x7] - bl sub_812E064 - adds r1, r0, 0 - lsls r1, 16 - lsrs r1, 16 - adds r0, r4, 0 - bl sub_812D9A8 - ldr r0, _0812CAD0 @ =sub_812C694 - str r0, [r5] - movs r0, 0xE - ldrsh r1, [r5, r0] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - adds r1, r7, 0 - adds r1, 0x1C - adds r0, r1 - ldr r1, _0812CAD4 @ =sub_812D800 - str r1, [r0] -_0812CAC0: - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_0812CAC8: .4byte gSprites -_0812CACC: .4byte gUnknown_203B0FC -_0812CAD0: .4byte sub_812C694 -_0812CAD4: .4byte sub_812D800 - thumb_func_end sub_812CA1C - thumb_func_start sub_812CAD8 sub_812CAD8: @ 812CAD8 push {r4-r6,lr} diff --git a/src/fame_checker.c b/src/fame_checker.c index 0f047f612..81aeb7aee 100644 --- a/src/fame_checker.c +++ b/src/fame_checker.c @@ -2,6 +2,7 @@ #include "constants/songs.h" #include "bg.h" #include "graphics.h" +#include "new_menu_helpers.h" #include "item_menu.h" #include "list_menu.h" #include "gpu_regs.h" @@ -29,7 +30,8 @@ struct FameCheckerData u8 unk_0C[17]; u8 unk_1D[6]; u8 unk_23_0:1; - u8 unk_23_1:7; + u8 unk_23_1:1; + u8 unk_23_2:1; }; struct FameCheckerData2 @@ -52,7 +54,9 @@ void sub_812C648(void); void sub_812C664(u8 taskId); void sub_812C694(u8 taskId); bool8 sub_812C8F8(u8 taskId); +void sub_812C990(void); void sub_812C9BC(u8 taskId); +void sub_812CA1C(u8 taskId); void sub_812CAD8(u8 taskId); void sub_812CD3C(void); void sub_812CE04(u8 taskId); @@ -70,7 +74,9 @@ void sub_812D594(void); bool8 sub_812D6B4(void); u8 sub_812D724(s16 a0); u8 sub_812D7E4(void); +void sub_812D800(struct Sprite *sprite); u8 sub_812D888(u8 a0); +void sub_812D9A8(u8 a0, u16 a1); void sub_812DA14(u8 a0); void sub_812DB28(void); void sub_812E000(void); @@ -80,6 +86,7 @@ void sub_812E110(u8 taskId); void sub_812E178(u8 a0, s16 a1); void sub_812E4A4(u8 a0); +extern const u8 gUnknown_84181E4[]; extern const u16 gUnknown_845C600[]; extern const struct BgTemplate gUnknown_845FBF4[4]; @@ -281,3 +288,59 @@ void sub_812C694(u8 taskId) ListMenuHandleInput(0); } } + +bool8 sub_812C8F8(u8 taskId) +{ + struct Task *task = &gTasks[taskId]; + if (gUnknown_203B0FC->unk_07_1) + { + gSprites[task->data[2]].data[0] = 2; + gSprites[task->data[2]].pos2.x += 10; + gSprites[task->data[3]].data[0] = 2; + gSprites[task->data[3]].pos2.x += 10; + sub_812CE9C(); + task->func = sub_812CA1C; + sub_812C990(); + gUnknown_203B0FC->unk_23_2 = FALSE; + return TRUE; + } + return FALSE; +} + +void sub_812C990(void) +{ + AddTextPrinterParametrized(2, 2, gUnknown_84181E4, 0, NULL, 2, 1, 3); +} + +void sub_812C9BC(u8 taskId) +{ + struct Task *task = &gTasks[taskId]; + if (gSprites[task->data[2]].data[0] == 0) + { + sub_812CD3C(); + gUnknown_203B0FC->unk_07_1 = TRUE; + task->func = sub_812C694; + } + else + ChangeBgX(1, 0xA00, 1); +} + +void sub_812CA1C(u8 taskId) +{ + struct Task *task = &gTasks[taskId]; + if (GetBgX(1) != 0) + ChangeBgX(1, 0xA00, 2); + else + ChangeBgX(1, 0x000, 0); + if (gSprites[task->data[2]].data[0] == 0) + { + if (gUnknown_203B0FC->unk_07_0) + sub_812D0F4(0); + sub_812E178(1, 4); + sub_812E178(2, 2); + gUnknown_203B0FC->unk_07_1 = FALSE; + sub_812D9A8(taskId, sub_812E064()); + task->func = sub_812C694; + gSprites[task->data[3]].callback = sub_812D800; + } +} -- cgit v1.2.3 From 93f67f9557109d85e191283b171f7f5e8028b7bf Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sat, 24 Nov 2018 20:04:50 -0500 Subject: sub_812CAD8 New macro `PRESSED(x)` tests `gMain.newKeys & (x)`. The macro itself is inoptimal. However, its use is required to match this function. We suspect this macro may have been implemented globally, hence we put it in `global.h`. Propagating its use through the remainder of this project, as well as [Ruby](/pret/pokeruby) and [Emerald](/pret/pokeemerald), has been left as a to-do item. --- asm/fame_checker.s | 194 ----------------------------------------------------- include/global.h | 7 ++ src/fame_checker.c | 81 ++++++++++++++++++++-- 3 files changed, 84 insertions(+), 198 deletions(-) diff --git a/asm/fame_checker.s b/asm/fame_checker.s index f87b8622f..80c8fa2a8 100644 --- a/asm/fame_checker.s +++ b/asm/fame_checker.s @@ -5,200 +5,6 @@ .text - thumb_func_start sub_812CAD8 -sub_812CAD8: @ 812CAD8 - push {r4-r6,lr} - lsls r0, 24 - lsrs r4, r0, 24 - lsls r1, r4, 2 - adds r1, r4 - lsls r1, 3 - ldr r0, _0812CB9C @ =gTasks - adds r5, r1, r0 - adds r0, 0x8 - adds r6, r1, r0 - bl RunTextPrinters - ldr r0, _0812CBA0 @ =gMain - ldrh r1, [r0, 0x2E] - movs r0, 0x1 - ands r0, r1 - cmp r0, 0 - beq _0812CB2E - movs r0, 0x2 - bl IsTextPrinterActive - lsls r0, 16 - cmp r0, 0 - bne _0812CB2E - ldr r0, _0812CBA4 @ =gUnknown_203B0FC - ldr r0, [r0] - movs r2, 0x2 - ldrsh r1, [r6, r2] - adds r0, 0x1D - adds r0, r1 - ldrb r1, [r0] - ldr r2, _0812CBA8 @ =gSprites - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - adds r0, r2 - movs r1, 0x30 - ldrsh r0, [r0, r1] - cmp r0, 0xFF - beq _0812CB2E - adds r0, r4, 0 - bl sub_812CE04 -_0812CB2E: - ldr r0, _0812CBA0 @ =gMain - ldrh r1, [r0, 0x2E] - movs r0, 0x2 - ands r0, r1 - cmp r0, 0 - beq _0812CBB8 - movs r0, 0x5 - bl PlaySE - movs r4, 0 - ldr r6, _0812CBA4 @ =gUnknown_203B0FC -_0812CB44: - ldr r0, [r6] - adds r0, 0x1D - adds r0, r4 - ldrb r0, [r0] - movs r1, 0 - bl sub_812CEFC - adds r0, r4, 0x1 - lsls r0, 24 - lsrs r4, r0, 24 - cmp r4, 0x5 - bls _0812CB44 - bl sub_812CE9C - ldr r2, _0812CBA8 @ =gSprites - movs r0, 0x8 - ldrsh r1, [r5, r0] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - adds r2, 0x1C - adds r0, r2 - ldr r1, _0812CBAC @ =sub_812D764 - str r1, [r0] - ldr r0, _0812CBB0 @ =gUnknown_3005EC8 - ldrb r0, [r0] - cmp r0, 0xFF - beq _0812CB80 - bl sub_812DB10 -_0812CB80: - movs r0, 0x1 - bl sub_812E4A4 - movs r0, 0 - bl sub_812D0F4 - bl sub_812E000 - bl sub_812C990 - ldr r0, _0812CBB4 @ =sub_812C694 - str r0, [r5] - b _0812CC62 - .align 2, 0 -_0812CB9C: .4byte gTasks -_0812CBA0: .4byte gMain -_0812CBA4: .4byte gUnknown_203B0FC -_0812CBA8: .4byte gSprites -_0812CBAC: .4byte sub_812D764 -_0812CBB0: .4byte gUnknown_3005EC8 -_0812CBB4: .4byte sub_812C694 -_0812CBB8: - movs r0, 0x40 - ands r0, r1 - cmp r0, 0 - bne _0812CBC8 - movs r0, 0x80 - ands r0, r1 - cmp r0, 0 - beq _0812CBF4 -_0812CBC8: - ldrh r1, [r5, 0xA] - movs r2, 0xA - ldrsh r0, [r5, r2] - cmp r0, 0x2 - ble _0812CBE4 - subs r0, r1, 0x3 - strh r0, [r5, 0xA] - movs r2, 0x1B - negs r2, r2 - adds r0, r4, 0 - movs r1, 0 - bl sub_812CC68 - b _0812CC62 -_0812CBE4: - adds r0, r1, 0x3 - strh r0, [r5, 0xA] - adds r0, r4, 0 - movs r1, 0 - movs r2, 0x1B - bl sub_812CC68 - b _0812CC62 -_0812CBF4: - movs r0, 0x20 - ands r0, r1 - cmp r0, 0 - beq _0812CC26 - ldrh r6, [r5, 0xA] - movs r1, 0xA - ldrsh r0, [r5, r1] - cmp r0, 0 - beq _0812CC12 - movs r1, 0x3 - bl __modsi3 - lsls r0, 16 - cmp r0, 0 - bne _0812CC1C -_0812CC12: - adds r0, r6, 0x2 - strh r0, [r5, 0xA] - adds r0, r4, 0 - movs r1, 0x5E - b _0812CC4A -_0812CC1C: - subs r0, r6, 0x1 - strh r0, [r5, 0xA] - movs r1, 0x2F - negs r1, r1 - b _0812CC48 -_0812CC26: - movs r0, 0x10 - ands r0, r1 - cmp r0, 0 - beq _0812CC62 - movs r1, 0xA - ldrsh r0, [r5, r1] - adds r0, 0x1 - movs r1, 0x3 - bl __modsi3 - cmp r0, 0 - bne _0812CC52 - ldrh r0, [r5, 0xA] - subs r0, 0x2 - strh r0, [r5, 0xA] - movs r1, 0x5E - negs r1, r1 -_0812CC48: - adds r0, r4, 0 -_0812CC4A: - movs r2, 0 - bl sub_812CC68 - b _0812CC62 -_0812CC52: - ldrh r0, [r5, 0xA] - adds r0, 0x1 - strh r0, [r5, 0xA] - adds r0, r4, 0 - movs r1, 0x2F - movs r2, 0 - bl sub_812CC68 -_0812CC62: - pop {r4-r6} - pop {r0} - bx r0 - thumb_func_end sub_812CAD8 - thumb_func_start sub_812CC68 sub_812CC68: @ 812CC68 push {r4-r7,lr} diff --git a/include/global.h b/include/global.h index 050e200f9..3dc11bfbd 100644 --- a/include/global.h +++ b/include/global.h @@ -62,6 +62,13 @@ #define T2_READ_32(ptr) ((ptr)[0] + ((ptr)[1] << 8) + ((ptr)[2] << 16) + ((ptr)[3] << 24)) #define T2_READ_PTR(ptr) (void*) T2_READ_32(ptr) +// This macro is required to prevent the compiler from optimizing +// a dpad up/down check in sub_812CAD8 (fame_checker.c). +// We suspect it was used globally. +// GameFreak never ceases to amaze. +// TODO: Propagate use of this macro +#define PRESSED(button) ({gMain.newKeys & (button);}) + extern u8 gStringVar1[]; extern u8 gStringVar2[]; extern u8 gStringVar3[]; diff --git a/src/fame_checker.c b/src/fame_checker.c index 81aeb7aee..e83eaa301 100644 --- a/src/fame_checker.c +++ b/src/fame_checker.c @@ -1,5 +1,6 @@ #include "global.h" #include "constants/songs.h" +#include "sprite.h" #include "bg.h" #include "graphics.h" #include "new_menu_helpers.h" @@ -58,6 +59,7 @@ void sub_812C990(void); void sub_812C9BC(u8 taskId); void sub_812CA1C(u8 taskId); void sub_812CAD8(u8 taskId); +void sub_812CC68(u8 taskId, s8 dx, s8 dy); void sub_812CD3C(void); void sub_812CE04(u8 taskId); void sub_812CE9C(void); @@ -73,11 +75,13 @@ void sub_812D584(void); void sub_812D594(void); bool8 sub_812D6B4(void); u8 sub_812D724(s16 a0); +void sub_812D764(struct Sprite *sprite); u8 sub_812D7E4(void); void sub_812D800(struct Sprite *sprite); u8 sub_812D888(u8 a0); void sub_812D9A8(u8 a0, u16 a1); void sub_812DA14(u8 a0); +void sub_812DB10(void); void sub_812DB28(void); void sub_812E000(void); void sub_812E048(void); @@ -222,9 +226,9 @@ void sub_812C694(u8 taskId) if (FindTaskIdByFunc(sub_812E110) == 0xFF) { RunTextPrinters(); - if ((gMain.newKeys & SELECT_BUTTON) && !gUnknown_203B0FC->unk_07_1 && gUnknown_203B0FC->unk_00 != sub_8107EB8) + if ((PRESSED(SELECT_BUTTON)) && !gUnknown_203B0FC->unk_07_1 && gUnknown_203B0FC->unk_00 != sub_8107EB8) task->func = sub_812CF3C; - else if (gMain.newKeys & START_BUTTON) + else if (PRESSED(START_BUTTON)) { r4 = sub_812E064(); if (sub_812C8F8(taskId) == TRUE) @@ -248,7 +252,7 @@ void sub_812C694(u8 taskId) task->func = sub_812C9BC; } } - else if (gMain.newKeys & A_BUTTON) + else if (PRESSED(A_BUTTON)) { r4 = ListMenuHandleInput(0); if (r4 == gUnknown_203B0FC->unk_07_2 - 1) @@ -279,7 +283,7 @@ void sub_812C694(u8 taskId) task->func = sub_812CAD8; } } - else if (gMain.newKeys & B_BUTTON) + else if (PRESSED(B_BUTTON)) { if (sub_812C8F8(taskId) != TRUE) task->func = sub_812CF3C; @@ -344,3 +348,72 @@ void sub_812CA1C(u8 taskId) gSprites[task->data[3]].callback = sub_812D800; } } + +void sub_812CAD8(u8 taskId) +{ + struct Task *task = &gTasks[taskId]; + s16 *data = gTasks[taskId].data; + + RunTextPrinters(); + if (PRESSED(A_BUTTON) && !IsTextPrinterActive(2)) + { + u8 spriteId = gUnknown_203B0FC->unk_1D[data[1]]; + if (gSprites[spriteId].data[1] != 0xFF) + sub_812CE04(taskId); + } + if (PRESSED(B_BUTTON)) + { + u8 r4; + PlaySE(SE_SELECT); + for (r4 = 0; r4 < 6; r4++) + sub_812CEFC(gUnknown_203B0FC->unk_1D[r4], 0); + sub_812CE9C(); + gSprites[task->data[0]].callback = sub_812D764; + if (gUnknown_3005EC8 != 0xFF) + sub_812DB10(); + sub_812E4A4(1); + sub_812D0F4(0); + sub_812E000(); + sub_812C990(); + task->func = sub_812C694; + } + else if (PRESSED(DPAD_UP) || PRESSED(DPAD_DOWN)) + { + if (task->data[1] >= 3) + { + task->data[1] -= 3; + sub_812CC68(taskId, 0, -0x1b); + } + else + { + task->data[1] += 3; + sub_812CC68(taskId, 0, +0x1b); + } + } + else if (PRESSED(DPAD_LEFT)) + { + if (task->data[1] == 0 || task->data[1] % 3 == 0) + { + task->data[1] += 2; + sub_812CC68(taskId, +0x5e, 0); + } + else + { + task->data[1]--; + sub_812CC68(taskId, -0x2f, 0); + } + } + else if (PRESSED(DPAD_RIGHT)) + { + if ((task->data[1] + 1) % 3 == 0) + { + task->data[1] -= 2; + sub_812CC68(taskId, -0x5e, 0); + } + else + { + task->data[1]++; + sub_812CC68(taskId, +0x2f, 0); + } + } +} -- cgit v1.2.3 From c60b28011871abaf987a46a6da6823ce451fa66d Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sat, 24 Nov 2018 21:41:18 -0500 Subject: through sub_812CD3C --- asm/fame_checker.s | 197 --------------------------------------------- charmap.txt | 7 +- data/event_scripts.s | 7 +- data/fame_checker.s | 34 +++++++- data/text/fame_checker.inc | 185 ++++++++++++++++++++++++++++++++++++++++++ include/global.h | 8 +- include/new_menu_helpers.h | 1 + src/fame_checker.c | 44 +++++++++- 8 files changed, 281 insertions(+), 202 deletions(-) create mode 100644 data/text/fame_checker.inc diff --git a/asm/fame_checker.s b/asm/fame_checker.s index 80c8fa2a8..9cc4bf4ee 100644 --- a/asm/fame_checker.s +++ b/asm/fame_checker.s @@ -5,203 +5,6 @@ .text - thumb_func_start sub_812CC68 -sub_812CC68: @ 812CC68 - push {r4-r7,lr} - sub sp, 0x8 - adds r4, r1, 0 - adds r5, r2, 0 - lsls r0, 24 - lsrs r7, r0, 24 - lsls r4, 24 - lsrs r4, 24 - lsls r5, 24 - lsrs r5, 24 - lsls r0, r7, 2 - adds r0, r7 - lsls r0, 3 - ldr r1, _0812CD18 @ =gTasks+0x8 - adds r6, r0, r1 - movs r0, 0xBB - bl PlaySE - ldr r2, _0812CD1C @ =gSprites - movs r0, 0 - ldrsh r1, [r6, r0] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - adds r0, r2 - lsls r4, 24 - asrs r4, 24 - ldrh r1, [r0, 0x20] - adds r4, r1 - strh r4, [r0, 0x20] - movs r0, 0 - ldrsh r1, [r6, r0] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - adds r0, r2 - lsls r5, 24 - asrs r5, 24 - ldrh r1, [r0, 0x22] - adds r5, r1 - strh r5, [r0, 0x22] - movs r4, 0 - ldr r5, _0812CD20 @ =gUnknown_203B0FC -_0812CCBE: - ldr r0, [r5] - adds r0, 0x1D - adds r0, r4 - ldrb r0, [r0] - movs r1, 0x1 - bl sub_812CEFC - adds r0, r4, 0x1 - lsls r0, 24 - lsrs r4, r0, 24 - cmp r4, 0x5 - bls _0812CCBE - movs r0, 0xD0 - str r0, [sp] - movs r0, 0x20 - str r0, [sp, 0x4] - movs r0, 0x2 - movs r1, 0x11 - movs r2, 0 - movs r3, 0 - bl FillWindowPixelRect - bl sub_812C990 - ldr r0, _0812CD20 @ =gUnknown_203B0FC - ldr r0, [r0] - movs r2, 0x2 - ldrsh r1, [r6, r2] - adds r0, 0x1D - adds r0, r1 - ldrb r0, [r0] - movs r1, 0 - bl sub_812CEFC - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x1 - bne _0812CD24 - adds r0, r7, 0 - bl sub_812CE04 - ldrb r0, [r6, 0x2] - bl sub_812DA14 - b _0812CD30 - .align 2, 0 -_0812CD18: .4byte gTasks+0x8 -_0812CD1C: .4byte gSprites -_0812CD20: .4byte gUnknown_203B0FC -_0812CD24: - ldr r0, _0812CD38 @ =gUnknown_3005EC8 - ldrb r0, [r0] - cmp r0, 0xFF - beq _0812CD30 - bl sub_812DB10 -_0812CD30: - add sp, 0x8 - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_0812CD38: .4byte gUnknown_3005EC8 - thumb_func_end sub_812CC68 - - thumb_func_start sub_812CD3C -sub_812CD3C: @ 812CD3C - push {r4-r7,lr} - mov r7, r8 - push {r7} - sub sp, 0x10 - movs r0, 0 - mov r8, r0 - bl sub_812E064 - lsls r0, 16 - lsrs r0, 16 - adds r6, r0, 0 - ldr r0, _0812CD7C @ =gSaveBlock1Ptr - ldr r1, [r0] - ldr r7, _0812CD80 @ =gUnknown_203B0FC - ldr r0, [r7] - adds r0, 0xC - adds r0, r6 - ldrb r0, [r0] - lsls r0, 2 - adds r1, r0 - ldr r0, _0812CD84 @ =0x00003a54 - adds r1, r0 - ldrb r0, [r1] - lsls r0, 30 - lsrs r5, r0, 30 - cmp r5, 0x2 - beq _0812CD88 - bl sub_812CE9C - bl sub_812C990 - b _0812CDEE - .align 2, 0 -_0812CD7C: .4byte gSaveBlock1Ptr -_0812CD80: .4byte gUnknown_203B0FC -_0812CD84: .4byte 0x00003a54 -_0812CD88: - movs r0, 0xD0 - str r0, [sp] - movs r0, 0x20 - str r0, [sp, 0x4] - movs r0, 0x2 - movs r1, 0x11 - movs r2, 0 - movs r3, 0 - bl FillWindowPixelRect - bl sub_812D6B4 - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x1 - bne _0812CDAC - movs r0, 0x10 - mov r8, r0 -_0812CDAC: - ldr r4, _0812CDFC @ =gStringVar4 - ldr r1, _0812CE00 @ =gUnknown_845F63C - ldr r0, [r7] - adds r0, 0xC - adds r0, r6 - ldrb r0, [r0] - add r0, r8 - lsls r0, 2 - adds r0, r1 - ldr r1, [r0] - adds r0, r4, 0 - bl StringExpandPlaceholders - bl sub_80F78A8 - adds r3, r0, 0 - lsls r3, 24 - lsrs r3, 24 - movs r0, 0 - str r0, [sp] - str r5, [sp, 0x4] - movs r0, 0x1 - str r0, [sp, 0x8] - movs r0, 0x3 - str r0, [sp, 0xC] - movs r0, 0x2 - movs r1, 0x2 - adds r2, r4, 0 - bl AddTextPrinterParametrized - movs r0, 0x2 - bl sub_812CEE0 -_0812CDEE: - add sp, 0x10 - pop {r3} - mov r8, r3 - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_0812CDFC: .4byte gStringVar4 -_0812CE00: .4byte gUnknown_845F63C - thumb_func_end sub_812CD3C - thumb_func_start sub_812CE04 sub_812CE04: @ 812CE04 push {r4-r6,lr} diff --git a/charmap.txt b/charmap.txt index f89919509..fc9cbc0a8 100644 --- a/charmap.txt +++ b/charmap.txt @@ -383,6 +383,11 @@ ENG = FC 16 PAUSE_MUSIC = FC 17 RESUME_MUSIC = FC 18 +@ font sizes + +SMALL = FC 06 00 +BIG = FC 06 04 + @ colors TRANSPARENT = 00 @@ -393,7 +398,7 @@ BLUE = 04 YELLOW = 05 CYAN = 06 MAGENTA = 07 -LIGHT_GREY = 08 +LIGHT_GRAY = 08 BLACK = 09 BLACK2 = 0A @ duplicate of black? SILVER = 0B diff --git a/data/event_scripts.s b/data/event_scripts.s index 6bfa500cc..4161c97d7 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -226,7 +226,12 @@ gUnknown_81A8DD8:: @ 81A8DD8 .incbin "baserom.gba", 0x1A8DD8, 0x25 gUnknown_81A8DFD:: @ 81A8DFD - .incbin "baserom.gba", 0x1A8DFD, 0xA072 + .incbin "baserom.gba", 0x1A8DFD, 0x738b + + .include "data/text/fame_checker.inc" + +gUnknown_81B0C45:: @ 0x81B0C45 + .incbin "baserom.gba", 0x1B0C45, 0x222A gUnknown_81B2E6F:: @ 81B2E6F .incbin "baserom.gba", 0x1B2E6F, 0x15A diff --git a/data/fame_checker.s b/data/fame_checker.s index 037891818..7f58fde76 100644 --- a/data/fame_checker.s +++ b/data/fame_checker.s @@ -40,8 +40,40 @@ gUnknown_845F60C:: @ 845F60C gUnknown_845F61C:: @ 845F61C .incbin "baserom.gba", 0x45F61C, 0x20 + gUnknown_845F63C:: @ 845F63C - .incbin "baserom.gba", 0x45F63C, 0x80 + .4byte gUnknown_81B0188 + .4byte gUnknown_81B0251 + .4byte gUnknown_81B030F + .4byte gUnknown_81B03B3 + .4byte gUnknown_81B0446 + .4byte gUnknown_81B0504 + .4byte gUnknown_81B05C2 + .4byte gUnknown_81B0667 + .4byte gUnknown_81B06FB + .4byte gUnknown_81B079F + .4byte gUnknown_81B0845 + .4byte gUnknown_81B08EE + .4byte gUnknown_81B097F + .4byte gUnknown_81B0A45 + .4byte gUnknown_81B0AFF + .4byte gUnknown_81B0BA6 + .4byte gUnknown_81B0198 + .4byte gUnknown_81B025D + .4byte gUnknown_81B031B + .4byte gUnknown_81B03BF + .4byte gUnknown_81B0456 + .4byte gUnknown_81B0510 + .4byte gUnknown_81B05CD + .4byte gUnknown_81B0675 + .4byte gUnknown_81B0708 + .4byte gUnknown_81B07AD + .4byte gUnknown_81B0851 + .4byte gUnknown_81B08FB + .4byte gUnknown_81B098B + .4byte gUnknown_81B0A50 + .4byte gUnknown_81B0B0E + .4byte gUnknown_81B0BB5 gUnknown_845F6BC:: @ 845F6BC .incbin "baserom.gba", 0x45F6BC, 0x180 diff --git a/data/text/fame_checker.inc b/data/text/fame_checker.inc new file mode 100644 index 000000000..4462ce62f --- /dev/null +++ b/data/text/fame_checker.inc @@ -0,0 +1,185 @@ +gUnknown_81B0188:: @ 0x81B0188 + .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}PROF. OAK$" + +gUnknown_81B0198:: @ 0x81B0198 + .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}From: PROF. OAK\n" + .string "To: {PLAYER}\p" + .string "{SIZE 04}{COLOR RED}{SHADOW GREEN}Why do POKéMON compete and battle\n" + .string "so hard for you?\p" + .string "They do so because they can see\n" + .string "the love and trust you have\l" + .string "towards POKéMON.\p" + .string "Never forget that.$" + +gUnknown_81B0251:: @ 0x81B0251 + .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}DAISY$" + +gUnknown_81B025D:: @ 0x81B025D + .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}From: DAISY\n" + .string "To: {PLAYER}\p" + .string "{SIZE 05}{COLOR RED}{SHADOW GREEN}While I was comfortably enjoying\n" + .string "my tea breaks, you’ve grown very\l" + .string "skilled and powerful.\p" + .string "I hope you’ll remain a good rival\n" + .string "to my little brother.$" + +gUnknown_81B030F:: @ 0x81B030F + .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}BROCK$" + +gUnknown_81B031B:: @ 0x81B031B + .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}From: BROCK\n" + .string "To: {PLAYER}\p" + .string "{SIZE 04}{COLOR RED}{SHADOW GREEN}In this big world of ours, there\n" + .string "must be many tough TRAINERS.\p" + .string "Let’s both keep training and\n" + .string "making ourselves stronger!$" + +gUnknown_81B03B3:: @ 0x81B03B3 + .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}MISTY$" + +gUnknown_81B03BF:: @ 0x81B03BF + .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}From: MISTY\n" + .string "To: {PLAYER}\p" + .string "{SIZE 05}{COLOR RED}{SHADOW GREEN}I’m going to keep training here at\n" + .string "this GYM.\p" + .string "When I get better, I’d love to hit\n" + .string "the road and travel.$" + +gUnknown_81B0446:: @ 0x81B0446 + .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}LT. SURGE$" + +gUnknown_81B0456:: @ 0x81B0456 + .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}From: LT. SURGE\n" + .string "To: {PLAYER}\p" + .string "{SIZE 04}{COLOR RED}{SHADOW GREEN}Hey, kid!\n" + .string "You electrified me in our battle!\p" + .string "I didn’t know that there were\n" + .string "gutsy TRAINERS like you.\p" + .string "It made me change my mind about\n" + .string "you!$" + +gUnknown_81B0504:: @ 0x81B0504 + .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}ERIKA$" + +gUnknown_81B0510:: @ 0x81B0510 + .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}From: ERIKA\n" + .string "To: {PLAYER}\p" + .string "{SIZE 05}{COLOR RED}{SHADOW GREEN}I am so glad that there are strong\n" + .string "TRAINERS like you.\p" + .string "That awareness alone inspires and\n" + .string "motivates me to try harder.\p" + .string "Please visit me again.\n" + .string "Zzz…$" + +gUnknown_81B05C2:: @ 0x81B05C2 + .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}KOGA$" + +gUnknown_81B05CD:: @ 0x81B05CD + .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}From: KOGA\n" + .string "To: {PLAYER}\p" + .string "{SIZE 04}{COLOR RED}{SHADOW GREEN}You and I, we must both set our\n" + .string "sights higher and work towards\l" + .string "meeting our challenges.\p" + .string "Now, I must go train my daughter.$" + +gUnknown_81B0667:: @ 0x81B0667 + .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}SABRINA$" + +gUnknown_81B0675:: @ 0x81B0675 + .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}From: SABRINA\n" + .string "To: {PLAYER}\p" + .string "{SIZE 05}{COLOR RED}{SHADOW GREEN}The love you have towards your\n" + .string "POKéMON…\p" + .string "It was a power that was never\n" + .string "bested by my psychic power.$" + +gUnknown_81B06FB:: @ 0x81B06FB + .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}BLAINE$" + +gUnknown_81B0708:: @ 0x81B0708 + .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}From: BLAINE\n" + .string "To: {PLAYER}\p" + .string "{SIZE 04}{COLOR RED}{SHADOW GREEN}My fire POKéMON!\n" + .string "They’ll become even more powerful!\p" + .string "And now, a quiz. How many kinds of\n" + .string "FIRE-type POKéMON are there?$" + +gUnknown_81B079F:: @ 0x81B079F + .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}LORELEI$" + +gUnknown_81B07AD:: @ 0x81B07AD + .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}From: LORELEI\n" + .string "To: {PLAYER}\p" + .string "{SIZE 05}{COLOR RED}{SHADOW GREEN}I needed to thank you for your\n" + .string "help.\p" + .string "But that has nothing to do with our\n" + .string "battles.\p" + .string "You’d better watch out next time!$" + +gUnknown_81B0845:: @ 0x81B0845 + .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}BRUNO$" + +gUnknown_81B0851:: @ 0x81B0851 + .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}From: BRUNO\n" + .string "To: {PLAYER}\p" + .string "{SIZE 04}{COLOR RED}{SHADOW GREEN}The super power of your POKéMON\n" + .string "and you I’ve experienced myself.\p" + .string "Next time, maybe I should show you\n" + .string "how to train yourself.$" + +gUnknown_81B08EE:: @ 0x81B08EE + .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}AGATHA$" + +gUnknown_81B08FB:: @ 0x81B08FB + .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}From: AGATHA\n" + .string "To: {PLAYER}\p" + .string "{SIZE 05}{COLOR RED}{SHADOW GREEN}When you grow older, don’t you\n" + .string "dare go soft like that coot OAK!\p" + .string "Be like me and keep battling on!$" + +gUnknown_81B097F:: @ 0x81B097F + .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}LANCE$" + +gUnknown_81B098B:: @ 0x81B098B + .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}From: LANCE\n" + .string "To: {PLAYER}\p" + .string "{SIZE 04}{COLOR RED}{SHADOW GREEN}I’m considering going back to my\n" + .string "hometown.\p" + .string "I want to retrain my DRAGON-type\n" + .string "POKéMON and strengthen them.\p" + .string "I’d like to invite you to my\n" + .string "hometown one day.$" + +gUnknown_81B0A45:: @ 0x81B0A45 + .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}BILL$" + +gUnknown_81B0A50:: @ 0x81B0A50 + .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}From: BILL\n" + .string "To: {PLAYER}\p" + .string "{SIZE 04}{COLOR RED}{SHADOW GREEN}Hey, there! CELIO had nothing but\n" + .string "praise for you.\p" + .string "Hearing that makes me happy.\p" + .string "When you catch some rare POKéMON,\n" + .string "come show me, okay? Promise!$" + +gUnknown_81B0AFF:: @ 0x81B0AFF + .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}MR. FUJI$" + +gUnknown_81B0B0E:: @ 0x81B0B0E + .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}From: MR. FUJI\n" + .string "To: {PLAYER}\p" + .string "{SIZE 04}{COLOR RED}{SHADOW GREEN}Instead of hoping for the happiness\n" + .string "of just your POKéMON…\p" + .string "…Can I get you to wish for the\n" + .string "happiness of all POKéMON?$" + +gUnknown_81B0BA6:: @ 0x81B0BA6 + .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}GIOVANNI$" + +gUnknown_81B0BB5:: @ 0x81B0BB5 + .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}From: GIOVANNI\n" + .string "To: {PLAYER}\p" + .string "{SIZE 04}{COLOR RED}{SHADOW GREEN}There is nothing that I wish to say\n" + .string "to you.\p" + .string "I will concentrate solely on\n" + .string "bettering myself, and none other.$" diff --git a/include/global.h b/include/global.h index 3dc11bfbd..568ece2be 100644 --- a/include/global.h +++ b/include/global.h @@ -570,6 +570,11 @@ struct QuestLog /*0x0668*/ u16 end[0]; }; +struct FameCheckerSaveData +{ + /*3a54*/ u8 unk_0_0:2; +}; + #define MAP_OBJECTS_COUNT 16 #define BERRY_TREES_COUNT 128 #define FLAGS_COUNT 288 // 300 @@ -634,7 +639,8 @@ struct SaveBlock1 /*0x3A14*/ u8 seen2[DEX_FLAGS_NO]; /*0x3A48*/ u8 filler_3a48[4]; /*0x3A4C*/ u8 rivalName[PLAYER_NAME_LENGTH]; - /*0x3A54*/ u8 filler3A54[0x2E4]; + /*0x3A54*/ struct FameCheckerSaveData fameChecker[17]; + /*0x3A98*/ u8 filler3A94[0x2A0]; u32 unkArray[4][3]; }; diff --git a/include/new_menu_helpers.h b/include/new_menu_helpers.h index 639395941..432d06c81 100644 --- a/include/new_menu_helpers.h +++ b/include/new_menu_helpers.h @@ -16,5 +16,6 @@ void SetStandardWindowBorderStyle(u8 a0, u8 a1); void sub_8197930(void); u8 GetPlayerTextSpeed(void); void sub_80F6F54(u8, u8); +u8 sub_80F78A8(void); #endif // GUARD_NEW_MENU_HELPERS_H diff --git a/src/fame_checker.c b/src/fame_checker.c index e83eaa301..70fad0094 100644 --- a/src/fame_checker.c +++ b/src/fame_checker.c @@ -14,6 +14,7 @@ #include "sound.h" #include "text.h" #include "window.h" +#include "string_util.h" #include "text_window.h" struct FameCheckerData @@ -65,7 +66,7 @@ void sub_812CE04(u8 taskId); void sub_812CE9C(void); void sub_812CEC0(void); void sub_812CEE0(u8 windowId); -void sub_812CEFC(u8 taskId, u8 a1); +bool8 sub_812CEFC(u8 taskId, u8 a1); void sub_812CF3C(u8 taskId); void sub_812D0F4(u8 a0); void sub_812D1A8(u8 a0); @@ -93,6 +94,7 @@ void sub_812E4A4(u8 a0); extern const u8 gUnknown_84181E4[]; extern const u16 gUnknown_845C600[]; +extern const u8 *const gUnknown_845F63C[]; extern const struct BgTemplate gUnknown_845FBF4[4]; extern const struct SpriteSheet gUnknown_845FB9C[]; extern const struct SpritePalette gUnknown_845FBDC[]; @@ -417,3 +419,43 @@ void sub_812CAD8(u8 taskId) } } } + +void sub_812CC68(u8 taskId, s8 dx, s8 dy) +{ + u8 i; + s16 *data = gTasks[taskId].data; + PlaySE(SE_W155); + gSprites[data[0]].pos1.x += dx; + gSprites[data[0]].pos1.y += dy; + for (i = 0; i < 6; i++) + sub_812CEFC(gUnknown_203B0FC->unk_1D[i], 1); + FillWindowPixelRect(2, 0x11, 0, 0, 0xd0, 0x20); + sub_812C990(); + if (sub_812CEFC(gUnknown_203B0FC->unk_1D[data[1]], 0) == TRUE) + { + sub_812CE04(taskId); + sub_812DA14(data[1]); + } + else if (gUnknown_3005EC8 != 0xFF) + sub_812DB10(); +} + +void sub_812CD3C(void) +{ + u8 r8 = 0; + u16 r6 = sub_812E064(); + if (gSaveBlock1Ptr->fameChecker[gUnknown_203B0FC->unk_0C[r6]].unk_0_0 != 2) + { + sub_812CE9C(); + sub_812C990(); + } + else + { + FillWindowPixelRect(2, 0x11, 0, 0, 0xd0, 0x20); + if (sub_812D6B4() == TRUE) + r8 = 16; + StringExpandPlaceholders(gStringVar4, gUnknown_845F63C[gUnknown_203B0FC->unk_0C[r6] + r8]); + AddTextPrinterParametrized(2, 2, gStringVar4, sub_80F78A8(), 0, 2, 1, 3); + sub_812CEE0(2); + } +} -- cgit v1.2.3 From 3bbaaa4a737193294499176cce4638100c0941f5 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sat, 24 Nov 2018 22:13:10 -0500 Subject: sub_812CE04 --- asm/fame_checker.s | 71 ------ data/event_scripts.s | 2 +- data/fame_checker.s | 97 ++++++- data/text/fame_checker.inc | 613 +++++++++++++++++++++++++++++++++++++++++++++ src/fame_checker.c | 13 +- 5 files changed, 722 insertions(+), 74 deletions(-) diff --git a/asm/fame_checker.s b/asm/fame_checker.s index 9cc4bf4ee..5a8b79754 100644 --- a/asm/fame_checker.s +++ b/asm/fame_checker.s @@ -5,77 +5,6 @@ .text - thumb_func_start sub_812CE04 -sub_812CE04: @ 812CE04 - push {r4-r6,lr} - sub sp, 0x10 - lsls r0, 24 - lsrs r0, 24 - lsls r4, r0, 2 - adds r4, r0 - lsls r4, 3 - ldr r0, _0812CE8C @ =gTasks+0x8 - adds r4, r0 - bl sub_812E064 - adds r5, r0, 0 - lsls r5, 16 - lsrs r5, 16 - movs r0, 0xD0 - str r0, [sp] - movs r0, 0x20 - str r0, [sp, 0x4] - movs r0, 0x2 - movs r1, 0x11 - movs r2, 0 - movs r3, 0 - bl FillWindowPixelRect - ldr r6, _0812CE90 @ =gStringVar4 - ldr r2, _0812CE94 @ =gUnknown_845F6BC - ldr r0, _0812CE98 @ =gUnknown_203B0FC - ldr r0, [r0] - adds r0, 0xC - adds r0, r5 - ldrb r1, [r0] - lsls r0, r1, 1 - adds r0, r1 - lsls r0, 1 - movs r3, 0x2 - ldrsh r1, [r4, r3] - adds r0, r1 - lsls r0, 2 - adds r0, r2 - ldr r1, [r0] - adds r0, r6, 0 - bl StringExpandPlaceholders - bl sub_80F78A8 - adds r3, r0, 0 - lsls r3, 24 - lsrs r3, 24 - movs r0, 0 - str r0, [sp] - movs r0, 0x2 - str r0, [sp, 0x4] - movs r0, 0x1 - str r0, [sp, 0x8] - movs r0, 0x3 - str r0, [sp, 0xC] - movs r0, 0x2 - movs r1, 0x2 - adds r2, r6, 0 - bl AddTextPrinterParametrized - movs r0, 0x2 - bl sub_812CEE0 - add sp, 0x10 - pop {r4-r6} - pop {r0} - bx r0 - .align 2, 0 -_0812CE8C: .4byte gTasks+0x8 -_0812CE90: .4byte gStringVar4 -_0812CE94: .4byte gUnknown_845F6BC -_0812CE98: .4byte gUnknown_203B0FC - thumb_func_end sub_812CE04 - thumb_func_start sub_812CE9C sub_812CE9C: @ 812CE9C push {lr} diff --git a/data/event_scripts.s b/data/event_scripts.s index 4161c97d7..764de7637 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -226,7 +226,7 @@ gUnknown_81A8DD8:: @ 81A8DD8 .incbin "baserom.gba", 0x1A8DD8, 0x25 gUnknown_81A8DFD:: @ 81A8DFD - .incbin "baserom.gba", 0x1A8DFD, 0x738b + .incbin "baserom.gba", 0x1A8DFD, 0x4309 .include "data/text/fame_checker.inc" diff --git a/data/fame_checker.s b/data/fame_checker.s index 7f58fde76..e1659f86b 100644 --- a/data/fame_checker.s +++ b/data/fame_checker.s @@ -76,7 +76,102 @@ gUnknown_845F63C:: @ 845F63C .4byte gUnknown_81B0BB5 gUnknown_845F6BC:: @ 845F6BC - .incbin "baserom.gba", 0x45F6BC, 0x180 + .4byte gUnknown_81AD106 + .4byte gUnknown_81AD145 + .4byte gUnknown_81AD1BB + .4byte gUnknown_81AD258 + .4byte gUnknown_81AD2B9 + .4byte gUnknown_81AD377 + .4byte gUnknown_81AD40C + .4byte gUnknown_81AD4AE + .4byte gUnknown_81AD516 + .4byte gUnknown_81AD5A7 + .4byte gUnknown_81AD608 + .4byte gUnknown_81AD69F + .4byte gUnknown_81AD705 + .4byte gUnknown_81AD771 + .4byte gUnknown_81AD840 + .4byte gUnknown_81AD908 + .4byte gUnknown_81AD99A + .4byte gUnknown_81ADA27 + .4byte gUnknown_81ADA91 + .4byte gUnknown_81ADAF6 + .4byte gUnknown_81ADB5A + .4byte gUnknown_81ADBD9 + .4byte gUnknown_81ADC72 + .4byte gUnknown_81ADCEB + .4byte gUnknown_81ADD3C + .4byte gUnknown_81ADDA7 + .4byte gUnknown_81ADE0B + .4byte gUnknown_81ADE82 + .4byte gUnknown_81ADEEC + .4byte gUnknown_81ADF6A + .4byte gUnknown_81AE009 + .4byte gUnknown_81AE072 + .4byte gUnknown_81AE0F3 + .4byte gUnknown_81AE15B + .4byte gUnknown_81AE1E5 + .4byte gUnknown_81AE247 + .4byte gUnknown_81AE2B6 + .4byte gUnknown_81AE31D + .4byte gUnknown_81AE37D + .4byte gUnknown_81AE407 + .4byte gUnknown_81AE48D + .4byte gUnknown_81AE51B + .4byte gUnknown_81AE5E8 + .4byte gUnknown_81AE656 + .4byte gUnknown_81AE6D7 + .4byte gUnknown_81AE762 + .4byte gUnknown_81AE7CB + .4byte gUnknown_81AE841 + .4byte gUnknown_81AE89E + .4byte gUnknown_81AE90A + .4byte gUnknown_81AE990 + .4byte gUnknown_81AEA59 + .4byte gUnknown_81AEAEE + .4byte gUnknown_81AEB69 + .4byte gUnknown_81AEBDF + .4byte gUnknown_81AEC28 + .4byte gUnknown_81AEC82 + .4byte gUnknown_81AED27 + .4byte gUnknown_81AEDAA + .4byte gUnknown_81AEE51 + .4byte gUnknown_81AEF25 + .4byte gUnknown_81AEF6C + .4byte gUnknown_81AEFC6 + .4byte gUnknown_81AF04C + .4byte gUnknown_81AF0F0 + .4byte gUnknown_81AF19A + .4byte gUnknown_81AF200 + .4byte gUnknown_81AF248 + .4byte gUnknown_81AF2B7 + .4byte gUnknown_81AF34E + .4byte gUnknown_81AF3BE + .4byte gUnknown_81AF47C + .4byte gUnknown_81AF4FD + .4byte gUnknown_81AF567 + .4byte gUnknown_81AF641 + .4byte gUnknown_81AF6BA + .4byte gUnknown_81AF758 + .4byte gUnknown_81AF7CB + .4byte gUnknown_81AF83E + .4byte gUnknown_81AF8CA + .4byte gUnknown_81AF929 + .4byte gUnknown_81AF998 + .4byte gUnknown_81AFA20 + .4byte gUnknown_81AFAB9 + .4byte gUnknown_81AFB0C + .4byte gUnknown_81AFB76 + .4byte gUnknown_81AFC38 + .4byte gUnknown_81AFCE9 + .4byte gUnknown_81AFD49 + .4byte gUnknown_81AFDC4 + .4byte gUnknown_81AFE68 + .4byte gUnknown_81AFF23 + .4byte gUnknown_81AFFA8 + .4byte gUnknown_81B0022 + .4byte gUnknown_81B00A6 + .4byte gUnknown_81B0106 gUnknown_845F83C:: @ 845F83C .incbin "baserom.gba", 0x45F83C, 0x60 diff --git a/data/text/fame_checker.inc b/data/text/fame_checker.inc index 4462ce62f..fd4864dc8 100644 --- a/data/text/fame_checker.inc +++ b/data/text/fame_checker.inc @@ -1,3 +1,616 @@ +gUnknown_81AD106:: @ 0x81AD106 + .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}What does this person do?\p" + .string "{COLOR RED}{SHADOW GREEN}OAK POKéMON RESEARCH LAB$" + +gUnknown_81AD145:: @ 0x81AD145 + .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}What is this person like?\p" + .string "{SIZE 04}{COLOR RED}{SHADOW GREEN}To make a complete guide on all\n" + .string "the POKéMON in the world…\p" + .string "That was my dream!$" + +gUnknown_81AD1BB:: @ 0x81AD1BB + .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}What is this person like?\p" + .string "{SIZE 05}{COLOR RED}{SHADOW GREEN}PROF. OAK may not look like much,\n" + .string "but he’s the authority on POKéMON.\p" + .string "Many POKéMON TRAINERS hold him in\n" + .string "high regard.$" + +gUnknown_81AD258:: @ 0x81AD258 + .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}Family and friends?\p" + .string "{COLOR RED}{SHADOW GREEN}PROF. OAK reportedly lives with his\n" + .string "grandchildren, DAISY and {RIVAL}.$" + +gUnknown_81AD2B9:: @ 0x81AD2B9 + .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}Family and friends?\p" + .string "{SIZE 05}{COLOR RED}{SHADOW GREEN}I hear OAK’s taken a lot of\n" + .string "interest in you, child.\p" + .string "That old duff was once tough and\n" + .string "handsome.\p" + .string "But that was decades ago.\n" + .string "He’s a shadow of his former self.$" + +gUnknown_81AD377:: @ 0x81AD377 + .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}What does this person do?\p" + .string "{SIZE 04}{COLOR RED}{SHADOW GREEN}PROF. OAK is going to have his own\n" + .string "radio show soon.\p" + .string "The program will be called PROF.\n" + .string "OAK’S POKéMON SEMINAR.$" + +gUnknown_81AD40C:: @ 0x81AD40C + .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}What does this person do?\p" + .string "{SIZE 04}{COLOR RED}{SHADOW GREEN}If you show DAISY your POKéMON,\n" + .string "she can tell how much it likes you.\p" + .string "Occasionally, she will even groom\n" + .string "a POKéMON for you.$" + +gUnknown_81AD4AE:: @ 0x81AD4AE + .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}What is this person like?\p" + .string "{SIZE 05}{COLOR RED}{SHADOW GREEN}But the person who is most liked by\n" + .string "POKéMON is DAISY, I think.$" + +gUnknown_81AD516:: @ 0x81AD516 + .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}What is this person like?\p" + .string "{SIZE 04}{COLOR RED}{SHADOW GREEN}She was gently grooming POKéMON…\n" + .string "She was a little angel.\p" + .string "That little girl’s name…\n" + .string "I think it was DAISY.$" + +gUnknown_81AD5A7:: @ 0x81AD5A7 + .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}Family and friends?\p" + .string "{COLOR RED}{SHADOW GREEN}PROF. OAK reportedly lives with his\n" + .string "grandchildren, DAISY and {RIVAL}.$" + +gUnknown_81AD608:: @ 0x81AD608 + .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}What is this person like?\p" + .string "{SIZE 05}{COLOR RED}{SHADOW GREEN}A girl from PALLET TOWN, DAISY,\n" + .string "she enjoys TEA every day.\p" + .string "She visits the CELADON DEPT. STORE\n" + .string "to buy some TEA.$" + +gUnknown_81AD69F:: @ 0x81AD69F + .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}There’s a rumor…\p" + .string "{COLOR RED}{SHADOW GREEN}The Spring POKéMON CONTEST’s\n" + .string "Grand Champion is DAISY OAK of\l" + .string "PALLET TOWN!$" + +gUnknown_81AD705:: @ 0x81AD705 + .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}What does this person do?\p" + .string "{COLOR RED}{SHADOW GREEN}PEWTER CITY POKéMON GYM\n" + .string "LEADER: BROCK\l" + .string "The Rock-Solid POKéMON TRAINER!$" + +gUnknown_81AD771:: @ 0x81AD771 + .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}Favorite kind of POKéMON?\p" + .string "{SIZE 04}{COLOR RED}{SHADOW GREEN}My rock-hard willpower is evident\n" + .string "in even my POKéMON.\p" + .string "My POKéMON are all rock hard and\n" + .string "have true-grit determination.\p" + .string "That’s right - my POKéMON are all\n" + .string "the ROCK type!$" + +gUnknown_81AD840:: @ 0x81AD840 + .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}What is this person like?\p" + .string "{SIZE 04}{COLOR RED}{SHADOW GREEN}There aren’t many serious POKéMON\n" + .string "TRAINERS here.\p" + .string "They’re all like BUG CATCHERS,\n" + .string "you know, just hobbyists.\p" + .string "But PEWTER GYM’s BROCK isn’t like\n" + .string "that, not one bit.$" + +gUnknown_81AD908:: @ 0x81AD908 + .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}What is this person like?\p" + .string "{SIZE 04}{COLOR RED}{SHADOW GREEN}BROCK is cool. He’s not just tough.\n" + .string "People like and respect him.\p" + .string "I want to become a GYM LEADER\n" + .string "like him.$" + +gUnknown_81AD99A:: @ 0x81AD99A + .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}What does this person do?\p" + .string "{SIZE 04}{COLOR RED}{SHADOW GREEN}Hi, I’m excavating for fossils here\n" + .string "under MT. MOON.\p" + .string "Sometimes, BROCK of PEWTER GYM\n" + .string "lends me a hand.$" + +gUnknown_81ADA27:: @ 0x81ADA27 + .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}What is this person like?\p" + .string "{COLOR RED}{SHADOW GREEN}BROCK rarely laughs, but is said to\n" + .string "be unable to stop if he starts.$" + +gUnknown_81ADA91:: @ 0x81ADA91 + .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}What does this person do?\p" + .string "{COLOR RED}{SHADOW GREEN}CERULEAN CITY POKéMON GYM\n" + .string "LEADER: MISTY\l" + .string "The Tomboyish Mermaid!$" + +gUnknown_81ADAF6:: @ 0x81ADAF6 + .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}Favorite kind of POKéMON?\p" + .string "{SIZE 05}{COLOR RED}{SHADOW GREEN}My policy is an all-out offensive\n" + .string "with WATER-type POKéMON!$" + +gUnknown_81ADB5A:: @ 0x81ADB5A + .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}What is this person like?\p" + .string "{SIZE 04}{COLOR RED}{SHADOW GREEN}MISTY is a TRAINER who’s going to\n" + .string "keep improving.\p" + .string "She won’t lose to someone like you!$" + +gUnknown_81ADBD9:: @ 0x81ADBD9 + .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}There’s a rumor…\p" + .string "{SIZE 04}{COLOR RED}{SHADOW GREEN}Strong TRAINERS and WATER POKéMON\n" + .string "are common sights in these parts.\p" + .string "They say that MISTY of the\n" + .string "CERULEAN GYM trains here.$" + +gUnknown_81ADC72:: @ 0x81ADC72 + .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}There’s a rumor…\p" + .string "{SIZE 05}{COLOR RED}{SHADOW GREEN}This cape is a famous date spot.\p" + .string "MISTY, the GYM LEADER, has high\n" + .string "hopes about this place.$" + +gUnknown_81ADCEB:: @ 0x81ADCEB + .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}There’s a rumor…\p" + .string "{COLOR RED}{SHADOW GREEN}MISTY is said to worship LORELEI\n" + .string "of the ELITE FOUR.$" + +gUnknown_81ADD3C:: @ 0x81ADD3C + .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}What does this person do?\p" + .string "{COLOR RED}{SHADOW GREEN}VERMILION CITY POKéMON GYM\n" + .string "LEADER: LT. SURGE\l" + .string "The Lightning American!$" + +gUnknown_81ADDA7:: @ 0x81ADDA7 + .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}Favorite kind of POKéMON?\p" + .string "{SIZE 04}{COLOR RED}{SHADOW GREEN}I tell you, kid, electric POKéMON\n" + .string "saved me during the war!$" + +gUnknown_81ADE0B:: @ 0x81ADE0B + .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}What is this person like?\p" + .string "{SIZE 04}{COLOR RED}{SHADOW GREEN}When I was in the Army, LT. SURGE\n" + .string "was my strict CO.\p" + .string "He was a hard taskmaster.$" + +gUnknown_81ADE82:: @ 0x81ADE82 + .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}What is this person like?\p" + .string "{SIZE 04}{COLOR RED}{SHADOW GREEN}LT. SURGE was always famous for\n" + .string "his cautious nature in the Army.$" + +gUnknown_81ADEEC:: @ 0x81ADEEC + .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}What is this person like?\p" + .string "{SIZE 04}{COLOR RED}{SHADOW GREEN}LT. SURGE installed the traps in\n" + .string "the GYM himself.\p" + .string "He set up double locks everywhere.$" + +gUnknown_81ADF6A:: @ 0x81ADF6A + .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}There’s a rumor…\p" + .string "{COLOR RED}{SHADOW GREEN}LT. SURGE is rumored to have been\n" + .string "a pilot while home in America.\p" + .string "He used the electricity generated\n" + .string "by POKéMON to power his plane.$" + +gUnknown_81AE009:: @ 0x81AE009 + .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}What does this person do?\p" + .string "{COLOR RED}{SHADOW GREEN}CELADON CITY POKéMON GYM\n" + .string "LEADER: ERIKA\l" + .string "The Nature-Loving Princess!$" + +gUnknown_81AE072:: @ 0x81AE072 + .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}Favorite kind of POKéMON?\p" + .string "{SIZE 05}{COLOR RED}{SHADOW GREEN}I am a student of the art of\n" + .string "flower arranging.\p" + .string "My POKéMON are solely of the\n" + .string "GRASS type.$" + +gUnknown_81AE0F3:: @ 0x81AE0F3 + .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}What is this person like?\p" + .string "{SIZE 05}{COLOR RED}{SHADOW GREEN}Our LEADER ERIKA might be quiet,\n" + .string "but she’s famous around here.$" + +gUnknown_81AE15B:: @ 0x81AE15B + .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}What is this person like?\p" + .string "{SIZE 05}{COLOR RED}{SHADOW GREEN}We only use GRASS-type POKéMON at\n" + .string "our GYM.\p" + .string "Why? We also use them for making\n" + .string "flower arrangements!$" + +gUnknown_81AE1E5:: @ 0x81AE1E5 + .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}Favorite kind of POKéMON?\p" + .string "{SIZE 05}{COLOR RED}{SHADOW GREEN}I would never collect POKéMON if\n" + .string "they were unattractive.$" + +gUnknown_81AE247:: @ 0x81AE247 + .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}There’s a rumor…\p" + .string "{COLOR RED}{SHADOW GREEN}Rumor has it that if you peek into\n" + .string "CELADON GYM, you can often\l" + .string "see ERIKA snoozing.$" + +gUnknown_81AE2B6:: @ 0x81AE2B6 + .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}What does this person do?\p" + .string "{COLOR RED}{SHADOW GREEN}FUCHSIA CITY POKéMON GYM\n" + .string "LEADER: KOGA\l" + .string "The Poisonous Ninja Master$" + +gUnknown_81AE31D:: @ 0x81AE31D + .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}Favorite kind of POKéMON?\p" + .string "{SIZE 04}{COLOR RED}{SHADOW GREEN}Despair to the creeping horror of\n" + .string "POISON-type POKéMON!$" + +gUnknown_81AE37D:: @ 0x81AE37D + .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}What is this person like?\p" + .string "{SIZE 04}{COLOR RED}{SHADOW GREEN}Even though I’ve lost, I will keep\n" + .string "training according to the teachings\l" + .string "of KOGA, my ninja master.$" + +gUnknown_81AE407:: @ 0x81AE407 + .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}Family and friends?\p" + .string "{SIZE 05}{COLOR RED}{SHADOW GREEN}My father is the GYM LEADER of\n" + .string "this town.\p" + .string "I’m training to use POISON POKéMON\n" + .string "as well as my father.$" + +gUnknown_81AE48D:: @ 0x81AE48D + .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}There’s a rumor…\p" + .string "{COLOR RED}{SHADOW GREEN}KOGA is said to have a thorough\n" + .string "knowledge of medicine.\p" + .string "He even concocts medicine to nurse\n" + .string "his POKéMON to health.$" + +gUnknown_81AE51B:: @ 0x81AE51B + .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}What does this person do?\p" + .string "{SIZE 04}{COLOR RED}{SHADOW GREEN}The SAFARI ZONE’s huge, wouldn’t\n" + .string "you say?\p" + .string "FUCHSIA’s GYM LEADER, KOGA, \n" + .string "patrols the grounds every so often.\p" + .string "Thanks to him, we can play here\n" + .string "knowing that we’re safe.$" + +gUnknown_81AE5E8:: @ 0x81AE5E8 + .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}What does this person do?\p" + .string "{COLOR RED}{SHADOW GREEN}SAFFRON CITY POKéMON GYM\n" + .string "LEADER: SABRINA\l" + .string "The Master of PSYCHIC POKéMON!$" + +gUnknown_81AE656:: @ 0x81AE656 + .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}Favorite kind of POKéMON?\p" + .string "{SIZE 04}{COLOR RED}{SHADOW GREEN}You know about a girl GYM LEADER\n" + .string "in SAFFRON CITY?\p" + .string "She uses PSYCHIC-type POKéMON,\n" + .string "right?$" + +gUnknown_81AE6D7:: @ 0x81AE6D7 + .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}What is this person like?\p" + .string "{SIZE 05}{COLOR RED}{SHADOW GREEN}I have had psychic powers since\n" + .string "I was a child.\p" + .string "It started when a spoon I\n" + .string "carelessly tossed, bent.$" + +gUnknown_81AE762:: @ 0x81AE762 + .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}What is this person like?\p" + .string "{SIZE 05}{COLOR RED}{SHADOW GREEN}I dislike battling, but if you wish,\n" + .string "I will show you my powers!$" + +gUnknown_81AE7CB:: @ 0x81AE7CB + .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}There’s a rumor…\p" + .string "{COLOR RED}{SHADOW GREEN}People say that SABRINA can\n" + .string "communicate with her POKéMON\l" + .string "during battle without speaking.$" + +gUnknown_81AE841:: @ 0x81AE841 + .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}What is this person like?\p" + .string "{SIZE 04}{COLOR RED}{SHADOW GREEN}SABRINA just wiped out the KARATE\n" + .string "MASTER next door.$" + +gUnknown_81AE89E:: @ 0x81AE89E + .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}What does this person do?\p" + .string "{COLOR RED}{SHADOW GREEN}CINNABAR ISLAND POKéMON GYM\n" + .string "LEADER: BLAINE\l" + .string "The Hotheaded Quiz Master!$" + +gUnknown_81AE90A:: @ 0x81AE90A + .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}Favorite kind of POKéMON?\p" + .string "{SIZE 04}{COLOR RED}{SHADOW GREEN}My fiery POKéMON are all rough\n" + .string "and ready with intense heat!\p" + .string "They incinerate all challengers!$" + +gUnknown_81AE990:: @ 0x81AE990 + .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}Favorite kind of POKéMON?\p" + .string "{SIZE 04}{COLOR RED}{SHADOW GREEN}Our LEADER, BLAINE, became lost\n" + .string "in the mountains but good.\p" + .string "Night fell when a fiery bird\n" + .string "POKéMON appeared.\p" + .string "Its light allowed BLAINE to find\n" + .string "his way down safely.$" + +gUnknown_81AEA59:: @ 0x81AEA59 + .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}What is this person like?\p" + .string "{SIZE 05}{COLOR RED}{SHADOW GREEN}CINNABAR GYM’s BLAINE is quite the\n" + .string "odd fellow.\p" + .string "He’s lived on the island since way\n" + .string "before the LAB was built.$" + +gUnknown_81AEAEE:: @ 0x81AEAEE + .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}Family and friends?\p" + .string "{COLOR RED}{SHADOW GREEN}It’s a photo of BLAINE and\n" + .string "MR. FUJI.\p" + .string "They’re standing shoulder to\n" + .string "shoulder with big grins.$" + +gUnknown_81AEB69:: @ 0x81AEB69 + .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}There’s a rumor…\p" + .string "{COLOR RED}{SHADOW GREEN}BLAINE is said to remove his dark\n" + .string "shades only when he is thinking up\l" + .string "new quiz questions.$" + +gUnknown_81AEBDF:: @ 0x81AEBDF + .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}What does this person do?\p" + .string "{SIZE 05}{COLOR RED}{SHADOW GREEN}I am LORELEI of the ELITE FOUR.$" + +gUnknown_81AEC28:: @ 0x81AEC28 + .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}Favorite kind of POKéMON?\p" + .string "{SIZE 05}{COLOR RED}{SHADOW GREEN}No one can best me when it comes\n" + .string "to icy POKéMON.$" + +gUnknown_81AEC82:: @ 0x81AEC82 + .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}Where was this person born?\p" + .string "{SIZE 04}{COLOR RED}{SHADOW GREEN}We’ve had a great and powerful\n" + .string "TRAINER grow up on this island.\p" + .string "I bet even you’d know her.\n" + .string "It’s LORELEI of the ELITE FOUR!$" + +gUnknown_81AED27:: @ 0x81AED27 + .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}What is this person like?\p" + .string "{COLOR RED}{SHADOW GREEN}Known for her logical, calculated,\n" + .string "and cool battling style, LORELEI\l" + .string "has a surprising secret!$" + +gUnknown_81AEDAA:: @ 0x81AEDAA + .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}What is this person like?\p" + .string "{SIZE 05}{COLOR RED}{SHADOW GREEN}Did you know that LORELEI has lots\n" + .string "and lots of stuffed dolls?\p" + .string "Every time she comes back to\n" + .string "FOUR ISLAND, her collection grows!$" + +gUnknown_81AEE51:: @ 0x81AEE51 + .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}Favorite kind of POKéMON?\p" + .string "{SIZE 05}{COLOR RED}{SHADOW GREEN}The LAPRAS she has, I imagine it\n" + .string "to be the one she met as a child.\p" + .string "I believe it was in ICEFALL CAVE\n" + .string "that she caught it.\p" + .string "Perhaps that POKéMON has been with\n" + .string "her ever since.$" + +gUnknown_81AEF25:: @ 0x81AEF25 + .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}What does this person do?\p" + .string "{SIZE 04}{COLOR RED}{SHADOW GREEN}I am BRUNO of the ELITE FOUR!$" + +gUnknown_81AEF6C:: @ 0x81AEF6C + .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}Favorite kind of POKéMON?\p" + .string "{SIZE 04}{COLOR RED}{SHADOW GREEN}I’ve lived and trained with my\n" + .string "fighting POKéMON!$" + +gUnknown_81AEFC6:: @ 0x81AEFC6 + .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}What is this person like?\p" + .string "{COLOR RED}{SHADOW GREEN}BRUNO apparently joined the ELITE\n" + .string "FOUR out of his burning ambition to\l" + .string "battle the best TRAINERS.$" + +gUnknown_81AF04C:: @ 0x81AF04C + .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}What is this person like?\p" + .string "{SIZE 04}{COLOR RED}{SHADOW GREEN}BRUNO, who’s a senior ahead of me,\n" + .string "visits the SPA on occasion.\p" + .string "He comes to rehab injuries, both\n" + .string "his own and his POKéMON’s.$" + +gUnknown_81AF0F0:: @ 0x81AF0F0 + .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}There’s a rumor…\p" + .string "{SIZE 05}{COLOR RED}{SHADOW GREEN}He’s one of the ELITE FOUR.\n" + .string "His name is BRUNO.\p" + .string "He went away disappointed when he\n" + .string "found out that they were all sold\l" + .string "out of Rage Candybars.$" + +gUnknown_81AF19A:: @ 0x81AF19A + .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}Family and friends?\p" + .string "{SIZE 04}{COLOR RED}{SHADOW GREEN}Even BRUNO…\n" + .string "He trained with a fellow by the\l" + .string "name of BRAWLY before.$" + +gUnknown_81AF200:: @ 0x81AF200 + .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}What does this person do?\p" + .string "{SIZE 05}{COLOR RED}{SHADOW GREEN}I am AGATHA of the ELITE FOUR.$" + +gUnknown_81AF248:: @ 0x81AF248 + .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}Favorite kind of POKéMON?\p" + .string "{SIZE 04}{COLOR RED}{SHADOW GREEN}AGATHA’s GHOST-type POKéMON are\n" + .string "horrifically terrifying in toughness.$" + +gUnknown_81AF2B7:: @ 0x81AF2B7 + .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}What is this person like?\p" + .string "{SIZE 04}{COLOR RED}{SHADOW GREEN}That old lady’s also got a really\n" + .string "short fuse, too.\p" + .string "It doesn’t take anything to get\n" + .string "that scary lady hollering.$" + +gUnknown_81AF34E:: @ 0x81AF34E + .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}There’s a rumor…\p" + .string "{COLOR RED}{SHADOW GREEN}In her youth, AGATHA and PROF.\n" + .string "OAK were rivals who vied for\l" + .string "supremacy as TRAINERS.$" + +gUnknown_81AF3BE:: @ 0x81AF3BE + .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}Family and friends?\p" + .string "{SIZE 05}{COLOR RED}{SHADOW GREEN}I hear OAK’s taken a lot of\n" + .string "interest in you, child.\p" + .string "That old duff was once tough and\n" + .string "handsome.\p" + .string "But that was decades ago.\n" + .string "He’s a shadow of his former self.$" + +gUnknown_81AF47C:: @ 0x81AF47C + .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}What is this person like?\p" + .string "{SIZE 05}{COLOR RED}{SHADOW GREEN}Take AGATHA, for example.\p" + .string "She set a record for being the\n" + .string "oldest-ever ELITE FOUR member.$" + +gUnknown_81AF4FD:: @ 0x81AF4FD + .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}What does this person do?\p" + .string "{SIZE 04}{COLOR RED}{SHADOW GREEN}I lead the ELITE FOUR.\p" + .string "You can call me LANCE the dragon\n" + .string "TRAINER.$" + +gUnknown_81AF567:: @ 0x81AF567 + .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}Favorite kind of POKéMON?\p" + .string "{SIZE 04}{COLOR RED}{SHADOW GREEN}You know that dragons are\n" + .string "mythical POKéMON.\p" + .string "They’re hard to catch and raise,\n" + .string "but their powers are superior.\p" + .string "They’re virtually indestructible.\n" + .string "There’s no being clever with them.$" + +gUnknown_81AF641:: @ 0x81AF641 + .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}What is this person like?\p" + .string "{SIZE 05}{COLOR RED}{SHADOW GREEN}He stands for justice!\n" + .string "He’s cool, and yet passionate!\l" + .string "He’s the greatest, LANCE!$" + +gUnknown_81AF6BA:: @ 0x81AF6BA + .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}There’s a rumor…\p" + .string "{SIZE 05}{COLOR RED}{SHADOW GREEN}We have a customer, LANCE, who\n" + .string "occasionally comes.\p" + .string "He always buys capes.\p" + .string "I wonder… Does he have many\n" + .string "identical capes at home?$" + +gUnknown_81AF758:: @ 0x81AF758 + .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}Family and friends?\p" + .string "{COLOR RED}{SHADOW GREEN}LANCE’s grandfather is thought to\n" + .string "be the elder of a famous clan of\l" + .string "dragon masters.$" + +gUnknown_81AF7CB:: @ 0x81AF7CB + .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}Family and friends?\p" + .string "{SIZE 04}{COLOR RED}{SHADOW GREEN}From what I’ve heard, LANCE has\n" + .string "a cousin who’s a GYM LEADER\l" + .string "somewhere far away.$" + +gUnknown_81AF83E:: @ 0x81AF83E + .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}What does this person do?\p" + .string "{SIZE 04}{COLOR RED}{SHADOW GREEN}After all, BILL’s world-famous as a\n" + .string "POKéMANIAC.\p" + .string "He invented the POKéMON Storage\n" + .string "System on PC, too.$" + +gUnknown_81AF8CA:: @ 0x81AF8CA + .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}Favorite kind of POKéMON?\p" + .string "{SIZE 04}{COLOR RED}{SHADOW GREEN}BILL has lots of POKéMON!\n" + .string "He collects rare ones, too!$" + +gUnknown_81AF929:: @ 0x81AF929 + .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}What is this person like?\p" + .string "{SIZE 04}{COLOR RED}{SHADOW GREEN}He’s my grandson!\p" + .string "He always liked collecting things,\n" + .string "even as a child!$" + +gUnknown_81AF998:: @ 0x81AF998 + .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}Favorite kind of POKéMON?\p" + .string "{SIZE 04}{COLOR RED}{SHADOW GREEN}BILL is a POKéMANIAC, so he loves\n" + .string "every kind.\p" + .string "Apparently, the first one he caught\n" + .string "was an ABRA.$" + +gUnknown_81AFA20:: @ 0x81AFA20 + .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}Family and friends?\p" + .string "{SIZE 04}{COLOR RED}{SHADOW GREEN}BILL’s hometown is GOLDENROD CITY,\n" + .string "where his folks still live.\p" + .string "I’ve heard that it’s quite the\n" + .string "festive, bustling city.$" + +gUnknown_81AFAB9:: @ 0x81AFAB9 + .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}There’s a rumor…\p" + .string "{SIZE 04}{COLOR RED}{SHADOW GREEN}Apparently, BILL simply can’t\n" + .string "stomach milk at all.$" + +gUnknown_81AFB0C:: @ 0x81AFB0C + .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}What does this person do?\p" + .string "{SIZE 05}{COLOR RED}{SHADOW GREEN}He’s really kind.\p" + .string "He looks after abandoned and\n" + .string "orphaned POKéMON.$" + +gUnknown_81AFB76:: @ 0x81AFB76 + .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}What is this person like?\p" + .string "{SIZE 04}{COLOR RED}{SHADOW GREEN}This old guy marched right up to\n" + .string "our HIDEOUT.\p" + .string "Then, he starts ranting about how\n" + .string "TEAM ROCKET’s abusing POKéMON.\p" + .string "So, we’re just talking it over as\n" + .string "adults.$" + +gUnknown_81AFC38:: @ 0x81AFC38 + .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}What is this person like?\p" + .string "{COLOR RED}{SHADOW GREEN}POKéMON FAN MAGAZINE\n" + .string "Monthly Grand Prize Drawing!\p" + .string "The application form is…\p" + .string "Gone! It’s been clipped out.\n" + .string "Someone must have applied already.$" + +gUnknown_81AFCE9:: @ 0x81AFCE9 + .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}There’s a rumor…\p" + .string "{SIZE 04}{COLOR RED}{SHADOW GREEN}I hear that MR. FUJI’s not from\n" + .string "these parts originally, either.$" + +gUnknown_81AFD49:: @ 0x81AFD49 + .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}Family and friends?\p" + .string "{COLOR RED}{SHADOW GREEN}It’s a photo of BLAINE and\n" + .string "MR. FUJI.\p" + .string "They’re standing shoulder to\n" + .string "shoulder with big grins.$" + +gUnknown_81AFDC4:: @ 0x81AFDC4 + .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}What is this person like?\p" + .string "{COLOR RED}{SHADOW GREEN}Editor: The shy MR. FUJI turned\n" + .string "down our interview requests.\p" + .string "He is a kindly man who is adored\n" + .string "and respected in LAVENDER TOWN.$" + +gUnknown_81AFE68:: @ 0x81AFE68 + .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}What does this person do?\p" + .string "{SIZE 04}{COLOR RED}{SHADOW GREEN}TEAM ROCKET captures POKéMON from\n" + .string "around the world.\p" + .string "They’re important tools for keeping\n" + .string "our criminal enterprise going.\p" + .string "I am the leader, GIOVANNI!$" + +gUnknown_81AFF23:: @ 0x81AFF23 + .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}Favorite kind of POKéMON?\p" + .string "{SIZE 04}{COLOR RED}{SHADOW GREEN}Those thugs that took over our\n" + .string "building…\p" + .string "Their BOSS said he was looking for\n" + .string "strong POKéMON.$" + +gUnknown_81AFFA8:: @ 0x81AFFA8 + .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}What is this person like?\p" + .string "{SIZE 04}{COLOR RED}{SHADOW GREEN}TEAM ROCKET’s BOSS is terribly\n" + .string "cruel!\p" + .string "To him, POKéMON are just tools to\n" + .string "be used.$" + +gUnknown_81B0022:: @ 0x81B0022 + .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}What does this person do?\p" + .string "{SIZE 04}{COLOR RED}{SHADOW GREEN}Welcome to my hideout!\p" + .string "It shall be so until I can restore\n" + .string "TEAM ROCKET to its former glory.$" + +gUnknown_81B00A6:: @ 0x81B00A6 + .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}What does this person do?\p" + .string "{SIZE 04}{COLOR RED}{SHADOW GREEN}Blow me away! GIOVANNI was the\n" + .string "GYM LEADER of VIRIDIAN?$" + +gUnknown_81B0106:: @ 0x81B0106 + .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}Family and friends?\p" + .string "{SIZE 04}{COLOR RED}{SHADOW GREEN}You… You’re not GIOVANNI’s kid,\n" + .string "are you?\p" + .string "No, that can’t be right.\n" + .string "GIOVANNI’s kid has red hair.$" + + gUnknown_81B0188:: @ 0x81B0188 .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}PROF. OAK$" diff --git a/src/fame_checker.c b/src/fame_checker.c index 70fad0094..a7feb0cf8 100644 --- a/src/fame_checker.c +++ b/src/fame_checker.c @@ -95,6 +95,7 @@ extern const u8 gUnknown_84181E4[]; extern const u16 gUnknown_845C600[]; extern const u8 *const gUnknown_845F63C[]; +extern const u8 *const gUnknown_845F6BC[]; extern const struct BgTemplate gUnknown_845FBF4[4]; extern const struct SpriteSheet gUnknown_845FB9C[]; extern const struct SpritePalette gUnknown_845FBDC[]; @@ -455,7 +456,17 @@ void sub_812CD3C(void) if (sub_812D6B4() == TRUE) r8 = 16; StringExpandPlaceholders(gStringVar4, gUnknown_845F63C[gUnknown_203B0FC->unk_0C[r6] + r8]); - AddTextPrinterParametrized(2, 2, gStringVar4, sub_80F78A8(), 0, 2, 1, 3); + AddTextPrinterParametrized(2, 2, gStringVar4, sub_80F78A8(), NULL, 2, 1, 3); sub_812CEE0(2); } } + +void sub_812CE04(u8 taskId) +{ + s16 *data = gTasks[taskId].data; + u16 r5 = sub_812E064(); + FillWindowPixelRect(2, 0x11, 0, 0, 0xd0, 0x20); + StringExpandPlaceholders(gStringVar4, gUnknown_845F6BC[gUnknown_203B0FC->unk_0C[r5] * 6 + data[1]]); + AddTextPrinterParametrized(2, 2, gStringVar4, sub_80F78A8(), NULL, 2, 1, 3); + sub_812CEE0(2); +} -- cgit v1.2.3 From 8f9ec933264a3ecfe204b653c508feacde3c976d Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sat, 24 Nov 2018 23:02:38 -0500 Subject: through sub_812D094 --- asm/fame_checker.s | 258 --------------------------------------------- include/list_menu.h | 1 + include/new_menu_helpers.h | 2 + src/fame_checker.c | 102 ++++++++++++++++-- 4 files changed, 98 insertions(+), 265 deletions(-) diff --git a/asm/fame_checker.s b/asm/fame_checker.s index 5a8b79754..a99054d8b 100644 --- a/asm/fame_checker.s +++ b/asm/fame_checker.s @@ -5,264 +5,6 @@ .text - thumb_func_start sub_812CE9C -sub_812CE9C: @ 812CE9C - push {lr} - sub sp, 0x8 - movs r0, 0xD0 - str r0, [sp] - movs r0, 0x20 - str r0, [sp, 0x4] - movs r0, 0x2 - movs r1, 0x11 - movs r2, 0 - movs r3, 0 - bl FillWindowPixelRect - movs r0, 0x2 - bl sub_812CEE0 - add sp, 0x8 - pop {r0} - bx r0 - thumb_func_end sub_812CE9C - - thumb_func_start sub_812CEC0 -sub_812CEC0: @ 812CEC0 - push {lr} - bl sub_80F6E9C - movs r0, 0x2 - movs r1, 0x1 - bl sub_80F6EE4 - movs r0, 0x2 - bl sub_812CEE0 - movs r0, 0 - bl sub_812CEE0 - pop {r0} - bx r0 - thumb_func_end sub_812CEC0 - - thumb_func_start sub_812CEE0 -sub_812CEE0: @ 812CEE0 - push {r4,lr} - adds r4, r0, 0 - lsls r4, 24 - lsrs r4, 24 - adds r0, r4, 0 - bl PutWindowTilemap - adds r0, r4, 0 - movs r1, 0x3 - bl CopyWindowToVram - pop {r4} - pop {r0} - bx r0 - thumb_func_end sub_812CEE0 - - thumb_func_start sub_812CEFC -sub_812CEFC: @ 812CEFC - push {r4,lr} - lsls r0, 24 - lsrs r0, 24 - lsls r1, 24 - lsrs r4, r1, 24 - ldr r2, _0812CF1C @ =gSprites - lsls r1, r0, 4 - adds r1, r0 - lsls r1, 2 - adds r3, r1, r2 - movs r1, 0x30 - ldrsh r0, [r3, r1] - cmp r0, 0xFF - bne _0812CF20 - movs r0, 0 - b _0812CF36 - .align 2, 0 -_0812CF1C: .4byte gSprites -_0812CF20: - movs r0, 0x3 - adds r1, r4, 0 - ands r1, r0 - lsls r1, 2 - ldrb r2, [r3, 0x1] - movs r0, 0xD - negs r0, r0 - ands r0, r2 - orrs r0, r1 - strb r0, [r3, 0x1] - movs r0, 0x1 -_0812CF36: - pop {r4} - pop {r1} - bx r1 - thumb_func_end sub_812CEFC - - thumb_func_start sub_812CF3C -sub_812CF3C: @ 812CF3C - push {r4,lr} - sub sp, 0x4 - adds r4, r0, 0 - lsls r4, 24 - lsrs r4, 24 - movs r0, 0xC7 - bl PlaySE - movs r0, 0x1 - negs r0, r0 - movs r1, 0 - str r1, [sp] - movs r2, 0 - movs r3, 0x10 - bl BeginNormalPaletteFade - ldr r1, _0812CF74 @ =gTasks - lsls r0, r4, 2 - adds r0, r4 - lsls r0, 3 - adds r0, r1 - ldr r1, _0812CF78 @ =sub_812CF7C - str r1, [r0] - add sp, 0x4 - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_0812CF74: .4byte gTasks -_0812CF78: .4byte sub_812CF7C - thumb_func_end sub_812CF3C - - thumb_func_start sub_812CF7C -sub_812CF7C: @ 812CF7C - push {r4-r6,lr} - lsls r0, 24 - lsrs r6, r0, 24 - ldr r0, _0812D074 @ =gPaletteFade - ldrb r1, [r0, 0x7] - movs r0, 0x80 - ands r0, r1 - cmp r0, 0 - bne _0812D06C - ldr r0, _0812D078 @ =gUnknown_203B0FC - ldr r0, [r0] - ldrb r1, [r0, 0x7] - movs r0, 0x2 - ands r0, r1 - cmp r0, 0 - beq _0812CFD8 - bl sub_812E064 - adds r1, r0, 0 - lsls r1, 16 - lsrs r1, 16 - adds r0, r6, 0 - bl sub_812D9A8 - ldr r0, _0812D07C @ =gTasks - lsls r4, r6, 2 - adds r4, r6 - lsls r4, 3 - adds r4, r0 - movs r0, 0xE - ldrsh r1, [r4, r0] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - ldr r5, _0812D080 @ =gSprites - adds r0, r5 - bl FreeSpriteOamMatrix - movs r0, 0xE - ldrsh r1, [r4, r0] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - adds r0, r5 - bl DestroySprite -_0812CFD8: - movs r4, 0 -_0812CFDA: - ldr r5, _0812D078 @ =gUnknown_203B0FC - ldr r0, [r5] - adds r0, 0x1D - adds r0, r4 - ldrb r1, [r0] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - ldr r1, _0812D080 @ =gSprites - adds r0, r1 - bl DestroySprite - adds r0, r4, 0x1 - lsls r0, 24 - lsrs r4, r0, 24 - cmp r4, 0x5 - bls _0812CFDA - bl sub_812D814 - bl sub_812D7C8 - bl sub_812D70C - bl sub_812D770 - bl sub_812E048 - ldr r0, [r5] - ldr r0, [r0] - bl SetMainCallback2 - ldr r0, [r5] - ldrb r0, [r0, 0x8] - movs r1, 0 - movs r2, 0 - bl sub_810713C - ldr r0, _0812D084 @ =gUnknown_203B0F0 - ldr r0, [r0] - bl Free - ldr r0, _0812D088 @ =gUnknown_203B0F4 - ldr r0, [r0] - bl Free - ldr r0, _0812D08C @ =gUnknown_203B0F8 - ldr r0, [r0] - bl Free - ldr r0, [r5] - bl Free - ldr r0, _0812D090 @ =gUnknown_203B100 - ldr r0, [r0] - bl Free - movs r0, 0 - bl sub_812D094 - movs r0, 0x1 - bl sub_812D094 - movs r0, 0x2 - bl sub_812D094 - movs r0, 0x3 - bl sub_812D094 - bl FreeAllWindowBuffers - adds r0, r6, 0 - bl DestroyTask -_0812D06C: - pop {r4-r6} - pop {r0} - bx r0 - .align 2, 0 -_0812D074: .4byte gPaletteFade -_0812D078: .4byte gUnknown_203B0FC -_0812D07C: .4byte gTasks -_0812D080: .4byte gSprites -_0812D084: .4byte gUnknown_203B0F0 -_0812D088: .4byte gUnknown_203B0F4 -_0812D08C: .4byte gUnknown_203B0F8 -_0812D090: .4byte gUnknown_203B100 - thumb_func_end sub_812CF7C - - thumb_func_start sub_812D094 -sub_812D094: @ 812D094 - push {r4,lr} - adds r4, r0, 0 - lsls r4, 24 - lsrs r4, 24 - adds r0, r4, 0 - movs r1, 0 - bl FillWindowPixelBuffer - adds r0, r4, 0 - bl ClearWindowTilemap - adds r0, r4, 0 - movs r1, 0x2 - bl CopyWindowToVram - adds r0, r4, 0 - bl RemoveWindow - pop {r4} - pop {r0} - bx r0 - thumb_func_end sub_812D094 - thumb_func_start sub_812D0C0 sub_812D0C0: @ 812D0C0 push {r4,lr} diff --git a/include/list_menu.h b/include/list_menu.h index f547801bd..89adeaba0 100644 --- a/include/list_menu.h +++ b/include/list_menu.h @@ -54,5 +54,6 @@ u8 ListMenuInit(struct ListMenuTemplate *template, u16 a1, u16 a2); s32 ListMenuHandleInput(u8 id); void get_coro_args_x18_x1A(u8 a0, u16 *a1, u16 *a2); void sub_81AE6C8(u8 a0, u16 *a1, u16 *a2); +void sub_810713C(u8, u8, u8); #endif //GUARD_LIST_MENU_H diff --git a/include/new_menu_helpers.h b/include/new_menu_helpers.h index 432d06c81..2ff20eb39 100644 --- a/include/new_menu_helpers.h +++ b/include/new_menu_helpers.h @@ -17,5 +17,7 @@ void sub_8197930(void); u8 GetPlayerTextSpeed(void); void sub_80F6F54(u8, u8); u8 sub_80F78A8(void); +void sub_80F6E9C(void); +void sub_80F6EE4(u8, u8); #endif // GUARD_NEW_MENU_HELPERS_H diff --git a/src/fame_checker.c b/src/fame_checker.c index a7feb0cf8..bb2fe29b5 100644 --- a/src/fame_checker.c +++ b/src/fame_checker.c @@ -19,13 +19,13 @@ struct FameCheckerData { - void (*unk_00)(void); + MainCallback unk_00; u16 unk_04; u8 filler_06[1]; u8 unk_07_0:1; u8 unk_07_1:1; u8 unk_07_2:6; - u8 filler_08[1]; + u8 unk_08; u8 unk_09; u8 unk_0A; u8 unk_0B; @@ -66,8 +66,10 @@ void sub_812CE04(u8 taskId); void sub_812CE9C(void); void sub_812CEC0(void); void sub_812CEE0(u8 windowId); -bool8 sub_812CEFC(u8 taskId, u8 a1); +bool8 sub_812CEFC(u8 taskId, u8 objMode); void sub_812CF3C(u8 taskId); +void sub_812CF7C(u8 taskId); +void sub_812D094(u8 windowId); void sub_812D0F4(u8 a0); void sub_812D1A8(u8 a0); void sub_812D420(void); @@ -75,10 +77,14 @@ void sub_812D558(void); void sub_812D584(void); void sub_812D594(void); bool8 sub_812D6B4(void); +void sub_812D70C(void); u8 sub_812D724(s16 a0); void sub_812D764(struct Sprite *sprite); +void sub_812D770(void); +void sub_812D7C8(void); u8 sub_812D7E4(void); void sub_812D800(struct Sprite *sprite); +void sub_812D814(void); u8 sub_812D888(u8 a0); void sub_812D9A8(u8 a0, u16 a1); void sub_812DA14(u8 a0); @@ -272,7 +278,7 @@ void sub_812C694(u8 taskId) for (r4_2 = 0; r4_2 < 6; r4_2++) { if (r4_2 != task->data[1]) - sub_812CEFC(gUnknown_203B0FC->unk_1D[r4_2], 1); + sub_812CEFC(gUnknown_203B0FC->unk_1D[r4_2], ST_OAM_OBJ_BLEND); } gUnknown_3005EC8 = 0xFF; sub_812E4A4(0); @@ -369,7 +375,7 @@ void sub_812CAD8(u8 taskId) u8 r4; PlaySE(SE_SELECT); for (r4 = 0; r4 < 6; r4++) - sub_812CEFC(gUnknown_203B0FC->unk_1D[r4], 0); + sub_812CEFC(gUnknown_203B0FC->unk_1D[r4], ST_OAM_OBJ_NORMAL); sub_812CE9C(); gSprites[task->data[0]].callback = sub_812D764; if (gUnknown_3005EC8 != 0xFF) @@ -429,10 +435,10 @@ void sub_812CC68(u8 taskId, s8 dx, s8 dy) gSprites[data[0]].pos1.x += dx; gSprites[data[0]].pos1.y += dy; for (i = 0; i < 6; i++) - sub_812CEFC(gUnknown_203B0FC->unk_1D[i], 1); + sub_812CEFC(gUnknown_203B0FC->unk_1D[i], ST_OAM_OBJ_BLEND); FillWindowPixelRect(2, 0x11, 0, 0, 0xd0, 0x20); sub_812C990(); - if (sub_812CEFC(gUnknown_203B0FC->unk_1D[data[1]], 0) == TRUE) + if (sub_812CEFC(gUnknown_203B0FC->unk_1D[data[1]], ST_OAM_OBJ_NORMAL) == TRUE) { sub_812CE04(taskId); sub_812DA14(data[1]); @@ -470,3 +476,85 @@ void sub_812CE04(u8 taskId) AddTextPrinterParametrized(2, 2, gStringVar4, sub_80F78A8(), NULL, 2, 1, 3); sub_812CEE0(2); } + +void sub_812CE9C(void) +{ + FillWindowPixelRect(2, 0x11, 0, 0, 0xd0, 0x20); + sub_812CEE0(2); +} + +void sub_812CEC0(void) +{ + sub_80F6E9C(); + sub_80F6EE4(2, 1); + sub_812CEE0(2); + sub_812CEE0(0); +} + +void sub_812CEE0(u8 windowId) +{ + PutWindowTilemap(windowId); + CopyWindowToVram(windowId, 3); +} + +bool8 sub_812CEFC(u8 spriteId, u8 objMode) +{ + if (gSprites[spriteId].data[1] != 0xFF) + { + gSprites[spriteId].oam.objMode = objMode; + return TRUE; + } + return FALSE; +} + +void sub_812CF3C(u8 taskId) +{ + PlaySE(SE_W202); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, 0); + gTasks[taskId].func = sub_812CF7C; +} + +void sub_812CF7C(u8 taskId) +{ + u8 r4; + + if (!gPaletteFade.active) + { + if (gUnknown_203B0FC->unk_07_1) + { + sub_812D9A8(taskId, sub_812E064()); + FreeSpriteOamMatrix(&gSprites[gTasks[taskId].data[3]]); + DestroySprite(&gSprites[gTasks[taskId].data[3]]); + } + for (r4 = 0; r4 < 6; r4++) + { + DestroySprite(&gSprites[gUnknown_203B0FC->unk_1D[r4]]); + } + sub_812D814(); + sub_812D7C8(); + sub_812D70C(); + sub_812D770(); + sub_812E048(); + SetMainCallback2(gUnknown_203B0FC->unk_00); + sub_810713C(gUnknown_203B0FC->unk_08, 0, 0); + Free(gUnknown_203B0F0); + Free(gUnknown_203B0F4); + Free(gUnknown_203B0F8); + Free(gUnknown_203B0FC); + Free(gUnknown_203B100); + sub_812D094(0); + sub_812D094(1); + sub_812D094(2); + sub_812D094(3); + FreeAllWindowBuffers(); + DestroyTask(taskId); + } +} + +void sub_812D094(u8 windowId) +{ + FillWindowPixelBuffer(windowId, 0); + ClearWindowTilemap(windowId); + CopyWindowToVram(windowId, 2); + RemoveWindow(windowId); +} -- cgit v1.2.3 From b09bbc65bed4716bc944306f64b89301dcaaffe6 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sat, 24 Nov 2018 23:41:08 -0500 Subject: through sub_812D174 --- asm/fame_checker.s | 121 ----------------------------------------------------- src/fame_checker.c | 43 +++++++++++++++++++ 2 files changed, 43 insertions(+), 121 deletions(-) diff --git a/asm/fame_checker.s b/asm/fame_checker.s index a99054d8b..49226ae15 100644 --- a/asm/fame_checker.s +++ b/asm/fame_checker.s @@ -5,127 +5,6 @@ .text - thumb_func_start sub_812D0C0 -sub_812D0C0: @ 812D0C0 - push {r4,lr} - lsls r0, 24 - lsrs r4, r0, 24 - movs r0, 0xAF - lsls r0, 1 - bl HasTrainerAlreadyBeenFought - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x1 - bne _0812D0EA - cmp r4, 0x9 - bne _0812D0DE - movs r0, 0xF - b _0812D0EC -_0812D0DE: - cmp r4, 0x9 - bls _0812D0EA - subs r0, r4, 0x1 - lsls r0, 24 - lsrs r0, 24 - b _0812D0EC -_0812D0EA: - adds r0, r4, 0 -_0812D0EC: - pop {r4} - pop {r1} - bx r1 - thumb_func_end sub_812D0C0 - - thumb_func_start sub_812D0F4 -sub_812D0F4: @ 812D0F4 - push {r4,r5,lr} - sub sp, 0x14 - lsls r0, 24 - lsrs r0, 24 - ldr r5, _0812D164 @ =gUnknown_841E5A4 - cmp r0, 0 - beq _0812D10A - ldr r5, _0812D168 @ =gUnknown_841E5D2 - cmp r0, 0x1 - bne _0812D10A - ldr r5, _0812D16C @ =gUnknown_841E5B9 -_0812D10A: - movs r0, 0 - adds r1, r5, 0 - movs r2, 0 - bl GetStringWidth - adds r4, r0, 0 - movs r0, 0xC0 - str r0, [sp] - movs r0, 0x10 - str r0, [sp, 0x4] - movs r0, 0x1 - movs r1, 0 - movs r2, 0 - movs r3, 0 - bl FillWindowPixelRect - movs r0, 0x44 - negs r0, r0 - adds r2, r0, 0 - subs r2, r4 - lsls r2, 24 - lsrs r2, 24 - movs r0, 0 - str r0, [sp] - movs r0, 0x2 - str r0, [sp, 0x4] - ldr r0, _0812D170 @ =gUnknown_845F5E0 - str r0, [sp, 0x8] - movs r0, 0x1 - negs r0, r0 - str r0, [sp, 0xC] - str r5, [sp, 0x10] - movs r0, 0x1 - movs r1, 0 - movs r3, 0 - bl AddTextPrinterParametrized2 - movs r0, 0x1 - bl sub_812CEE0 - add sp, 0x14 - pop {r4,r5} - pop {r0} - bx r0 - .align 2, 0 -_0812D164: .4byte gUnknown_841E5A4 -_0812D168: .4byte gUnknown_841E5D2 -_0812D16C: .4byte gUnknown_841E5B9 -_0812D170: .4byte gUnknown_845F5E0 - thumb_func_end sub_812D0F4 - - thumb_func_start sub_812D174 -sub_812D174: @ 812D174 - push {r4,lr} - movs r4, 0 -_0812D178: - ldr r0, _0812D1A0 @ =gUnknown_203B0FC - ldr r0, [r0] - adds r0, 0x1D - adds r0, r4 - ldrb r1, [r0] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - ldr r1, _0812D1A4 @ =gSprites - adds r0, r1 - bl DestroySprite - adds r0, r4, 0x1 - lsls r0, 24 - lsrs r4, r0, 24 - cmp r4, 0x5 - bls _0812D178 - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_0812D1A0: .4byte gUnknown_203B0FC -_0812D1A4: .4byte gSprites - thumb_func_end sub_812D174 - thumb_func_start sub_812D1A8 sub_812D1A8: @ 812D1A8 push {r4-r7,lr} diff --git a/src/fame_checker.c b/src/fame_checker.c index bb2fe29b5..ed7544d98 100644 --- a/src/fame_checker.c +++ b/src/fame_checker.c @@ -3,6 +3,8 @@ #include "sprite.h" #include "bg.h" #include "graphics.h" +#include "battle_setup.h" +#include "menu.h" #include "new_menu_helpers.h" #include "item_menu.h" #include "list_menu.h" @@ -98,9 +100,13 @@ void sub_812E178(u8 a0, s16 a1); void sub_812E4A4(u8 a0); extern const u8 gUnknown_84181E4[]; +extern const u8 gUnknown_841E5A4[]; +extern const u8 gUnknown_841E5B9[]; +extern const u8 gUnknown_841E5D2[]; extern const u16 gUnknown_845C600[]; extern const u8 *const gUnknown_845F63C[]; +extern const struct TextColor gUnknown_845F5E0; extern const u8 *const gUnknown_845F6BC[]; extern const struct BgTemplate gUnknown_845FBF4[4]; extern const struct SpriteSheet gUnknown_845FB9C[]; @@ -558,3 +564,40 @@ void sub_812D094(u8 windowId) CopyWindowToVram(windowId, 2); RemoveWindow(windowId); } + +u8 sub_812D0C0(u8 a0) +{ + if (HasTrainerAlreadyBeenFought(0x15e) == TRUE) + { + if (a0 == 9) + return 15; + if (a0 > 9) + return a0 - 1; + } + return a0; +} + +void sub_812D0F4(u8 a0) +{ + const u8 * r5 = gUnknown_841E5A4; + s32 width; + if (a0 != 0) + { + r5 = gUnknown_841E5D2; + if (a0 == 1) + r5 = gUnknown_841E5B9; + } + width = GetStringWidth(0, r5, 0); + FillWindowPixelRect(1, 0x00, 0, 0, 0xc0, 0x10); + AddTextPrinterParametrized2(1, 0, 188 - width, 0, 0, 2, &gUnknown_845F5E0, -1, r5); + sub_812CEE0(1); +} + +void sub_812D174(void) +{ + u8 r4; + for (r4 = 0; r4 < 6; r4++) + { + DestroySprite(&gSprites[gUnknown_203B0FC->unk_1D[r4]]); + } +} -- cgit v1.2.3 From 5b30b664bebb2ba890b86cd09f40c7c53da05659 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sun, 25 Nov 2018 08:21:08 -0500 Subject: sub_812D1A8 --- asm/fame_checker.s | 169 ------------------------------------------------ include/field_map_obj.h | 1 + include/global.h | 3 +- src/fame_checker.c | 47 +++++++++++++- 4 files changed, 49 insertions(+), 171 deletions(-) diff --git a/asm/fame_checker.s b/asm/fame_checker.s index 49226ae15..6104d97bd 100644 --- a/asm/fame_checker.s +++ b/asm/fame_checker.s @@ -5,175 +5,6 @@ .text - thumb_func_start sub_812D1A8 -sub_812D1A8: @ 812D1A8 - push {r4-r7,lr} - mov r7, r8 - push {r7} - lsls r0, 24 - lsrs r0, 24 - mov r8, r0 - movs r5, 0 - movs r6, 0 - ldr r7, _0812D238 @ =gUnknown_203B0FC -_0812D1BA: - ldr r0, _0812D23C @ =gSaveBlock1Ptr - ldr r1, [r0] - ldr r0, [r7] - adds r0, 0xC - add r0, r8 - ldrb r2, [r0] - lsls r0, r2, 2 - adds r1, r0 - ldr r0, _0812D240 @ =0x00003a54 - adds r1, r0 - ldrh r0, [r1] - lsls r0, 18 - lsrs r0, 20 - asrs r0, r6 - movs r1, 0x1 - ands r0, r1 - cmp r0, 0 - beq _0812D248 - ldr r1, _0812D244 @ =gUnknown_845F83C - lsls r0, r2, 1 - adds r0, r2 - lsls r0, 1 - adds r0, r6 - adds r0, r1 - ldrb r5, [r0] - adds r0, r6, 0 - movs r1, 0x3 - bl __umodsi3 - lsls r0, 24 - lsrs r0, 24 - lsls r4, r0, 1 - adds r4, r0 - lsls r4, 4 - subs r4, r0 - adds r4, 0x72 - lsls r4, 16 - asrs r4, 16 - adds r0, r6, 0 - movs r1, 0x3 - bl __udivsi3 - lsls r0, 24 - lsrs r0, 24 - lsls r3, r0, 3 - subs r3, r0 - lsls r3, 2 - subs r3, r0 - adds r3, 0x2F - lsls r3, 16 - asrs r3, 16 - adds r0, r5, 0 - adds r1, r6, 0 - adds r2, r4, 0 - bl sub_805EB44 - ldr r1, [r7] - adds r1, 0x1D - adds r1, r6 - strb r0, [r1] - movs r5, 0x1 - b _0812D2A0 - .align 2, 0 -_0812D238: .4byte gUnknown_203B0FC -_0812D23C: .4byte gSaveBlock1Ptr -_0812D240: .4byte 0x00003a54 -_0812D244: .4byte gUnknown_845F83C -_0812D248: - adds r0, r6, 0 - movs r1, 0x3 - bl __umodsi3 - lsls r0, 24 - lsrs r0, 24 - lsls r4, r0, 1 - adds r4, r0 - lsls r4, 4 - subs r4, r0 - adds r4, 0x72 - lsls r4, 24 - lsrs r4, 24 - adds r0, r6, 0 - movs r1, 0x3 - bl __udivsi3 - lsls r0, 24 - lsrs r0, 24 - lsls r1, r0, 3 - subs r1, r0 - lsls r1, 2 - subs r1, r0 - adds r1, 0x1F - lsls r1, 24 - lsrs r1, 24 - adds r0, r4, 0 - bl sub_812D780 - ldr r1, [r7] - adds r1, 0x1D - adds r1, r6 - strb r0, [r1] - ldr r2, _0812D2D0 @ =gSprites - ldr r0, [r7] - adds r0, 0x1D - adds r0, r6 - ldrb r1, [r0] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - adds r0, r2 - movs r1, 0xFF - strh r1, [r0, 0x30] -_0812D2A0: - adds r0, r6, 0x1 - lsls r0, 24 - lsrs r6, r0, 24 - cmp r6, 0x5 - bls _0812D1BA - cmp r5, 0x1 - bne _0812D2E0 - ldr r3, _0812D2D4 @ =gUnknown_203B0FC - ldr r2, [r3] - ldrb r0, [r2, 0x7] - movs r1, 0x1 - orrs r0, r1 - strb r0, [r2, 0x7] - ldr r0, [r3] - ldrb r1, [r0, 0x7] - movs r0, 0x2 - ands r0, r1 - cmp r0, 0 - beq _0812D2D8 - movs r0, 0x1 - bl sub_812D0F4 - b _0812D2F4 - .align 2, 0 -_0812D2D0: .4byte gSprites -_0812D2D4: .4byte gUnknown_203B0FC -_0812D2D8: - movs r0, 0 - bl sub_812D0F4 - b _0812D2F4 -_0812D2E0: - ldr r0, _0812D300 @ =gUnknown_203B0FC - ldr r2, [r0] - ldrb r1, [r2, 0x7] - movs r0, 0x2 - negs r0, r0 - ands r0, r1 - strb r0, [r2, 0x7] - movs r0, 0x1 - bl sub_812D0F4 -_0812D2F4: - adds r0, r5, 0 - pop {r3} - mov r8, r3 - pop {r4-r7} - pop {r1} - bx r1 - .align 2, 0 -_0812D300: .4byte gUnknown_203B0FC - thumb_func_end sub_812D1A8 - thumb_func_start sub_812D304 sub_812D304: @ 812D304 push {r4-r7,lr} diff --git a/include/field_map_obj.h b/include/field_map_obj.h index ded970a83..685701e89 100644 --- a/include/field_map_obj.h +++ b/include/field_map_obj.h @@ -86,6 +86,7 @@ void npc_set_running_behaviour_etc(struct MapObject *, u8); u8 sub_80634F0(u8 direction); u8 sub_8063500(u8 a0); void sub_805F060(struct MapObject *mapObject, u8 a1); +u8 sub_805EB44(u8, u8, s16, s16); // Exported data declarations diff --git a/include/global.h b/include/global.h index 568ece2be..31bb77f9f 100644 --- a/include/global.h +++ b/include/global.h @@ -572,7 +572,8 @@ struct QuestLog struct FameCheckerSaveData { - /*3a54*/ u8 unk_0_0:2; + /*3a54*/ u16 unk_0_0:2; + u16 unk_0_2:12; }; #define MAP_OBJECTS_COUNT 16 diff --git a/src/fame_checker.c b/src/fame_checker.c index ed7544d98..e13fc1913 100644 --- a/src/fame_checker.c +++ b/src/fame_checker.c @@ -17,6 +17,7 @@ #include "text.h" #include "window.h" #include "string_util.h" +#include "field_map_obj.h" #include "text_window.h" struct FameCheckerData @@ -73,7 +74,7 @@ void sub_812CF3C(u8 taskId); void sub_812CF7C(u8 taskId); void sub_812D094(u8 windowId); void sub_812D0F4(u8 a0); -void sub_812D1A8(u8 a0); +bool8 sub_812D1A8(u8 a0); void sub_812D420(void); void sub_812D558(void); void sub_812D584(void); @@ -83,6 +84,7 @@ void sub_812D70C(void); u8 sub_812D724(s16 a0); void sub_812D764(struct Sprite *sprite); void sub_812D770(void); +u8 sub_812D780(u8, u8); void sub_812D7C8(void); u8 sub_812D7E4(void); void sub_812D800(struct Sprite *sprite); @@ -108,6 +110,7 @@ extern const u16 gUnknown_845C600[]; extern const u8 *const gUnknown_845F63C[]; extern const struct TextColor gUnknown_845F5E0; extern const u8 *const gUnknown_845F6BC[]; +extern const u8 gUnknown_845F83C[]; extern const struct BgTemplate gUnknown_845FBF4[4]; extern const struct SpriteSheet gUnknown_845FB9C[]; extern const struct SpritePalette gUnknown_845FBDC[]; @@ -601,3 +604,45 @@ void sub_812D174(void) DestroySprite(&gSprites[gUnknown_203B0FC->unk_1D[r4]]); } } + +bool8 sub_812D1A8(u8 a0) +{ + // r8 <- a0 + bool8 r5 = FALSE; + u8 r6; + for (r6 = 0; r6 < 6; r6++) + { + if ((gSaveBlock1Ptr->fameChecker[gUnknown_203B0FC->unk_0C[a0]].unk_0_2 >> r6) & 1) + { + gUnknown_203B0FC->unk_1D[r6] = sub_805EB44( + gUnknown_845F83C[gUnknown_203B0FC->unk_0C[a0] * 6 + r6], + r6, + 47 * (r6 % 3) + 0x72, + 27 * (r6 / 3) + 0x2F + ); + r5 = TRUE; + } + else + { + gUnknown_203B0FC->unk_1D[r6] = sub_812D780( + 47 * (r6 % 3) + 0x72, + 27 * (r6 / 3) + 0x1F + ); + gSprites[gUnknown_203B0FC->unk_1D[r6]].data[1] = 0xFF; + } + } + if (r5 == TRUE) + { + gUnknown_203B0FC->unk_07_0 = TRUE; + if (gUnknown_203B0FC->unk_07_1) + sub_812D0F4(TRUE); + else + sub_812D0F4(FALSE); + } + else + { + gUnknown_203B0FC->unk_07_0 = FALSE; + sub_812D0F4(TRUE); + } + return r5; +} -- cgit v1.2.3 From 83dc744b85346386dea95ba70323917ca1e2a3ed Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sun, 25 Nov 2018 18:32:21 -0500 Subject: through sub_812D388 --- asm/fame_checker.s | 146 ----------------------------------------------------- include/global.h | 5 +- src/fame_checker.c | 25 +++++++++ 3 files changed, 28 insertions(+), 148 deletions(-) diff --git a/asm/fame_checker.s b/asm/fame_checker.s index 6104d97bd..49b957eb3 100644 --- a/asm/fame_checker.s +++ b/asm/fame_checker.s @@ -5,152 +5,6 @@ .text - thumb_func_start sub_812D304 -sub_812D304: @ 812D304 - push {r4-r7,lr} - mov r7, r9 - mov r6, r8 - push {r6,r7} - movs r4, 0 - ldr r0, _0812D378 @ =gSaveBlock1Ptr - mov r9, r0 - mov r6, r9 - ldr r5, _0812D37C @ =0x00003a54 - movs r0, 0x4 - negs r0, r0 - mov r8, r0 - ldr r0, _0812D380 @ =0xffffc003 - mov r12, r0 - ldr r7, _0812D384 @ =0x00003a55 -_0812D322: - ldr r1, [r6] - lsls r3, r4, 2 - adds r1, r3 - adds r1, r5 - ldrb r2, [r1] - mov r0, r8 - ands r0, r2 - strb r0, [r1] - ldr r1, [r6] - adds r1, r3 - adds r3, r1, r5 - ldrh r2, [r3] - mov r0, r12 - ands r0, r2 - strh r0, [r3] - adds r1, r7 - ldrb r2, [r1] - movs r0, 0x3F - ands r0, r2 - strb r0, [r1] - adds r0, r4, 0x1 - lsls r0, 24 - lsrs r4, r0, 24 - cmp r4, 0xF - bls _0812D322 - mov r0, r9 - ldr r2, [r0] - ldr r0, _0812D37C @ =0x00003a54 - adds r2, r0 - ldrb r1, [r2] - movs r0, 0x4 - negs r0, r0 - ands r0, r1 - movs r1, 0x2 - orrs r0, r1 - strb r0, [r2] - pop {r3,r4} - mov r8, r3 - mov r9, r4 - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_0812D378: .4byte gSaveBlock1Ptr -_0812D37C: .4byte 0x00003a54 -_0812D380: .4byte 0xffffc003 -_0812D384: .4byte 0x00003a55 - thumb_func_end sub_812D304 - - thumb_func_start sub_812D388 -sub_812D388: @ 812D388 - push {r4-r7,lr} - mov r7, r10 - mov r6, r9 - mov r5, r8 - push {r5-r7} - sub sp, 0x4 - movs r5, 0 - ldr r0, _0812D410 @ =gSaveBlock1Ptr - mov r12, r0 - ldr r7, _0812D414 @ =0x00003a54 - movs r1, 0x4 - negs r1, r1 - mov r10, r1 - ldr r6, _0812D418 @ =0xffffc003 - mov r9, r6 - movs r0, 0x1 - mov r8, r0 -_0812D3AA: - mov r1, r12 - ldr r2, [r1] - lsls r3, r5, 2 - adds r2, r3 - adds r2, r7 - ldrb r1, [r2] - mov r0, r10 - ands r0, r1 - movs r1, 0x2 - orrs r0, r1 - strb r0, [r2] - movs r4, 0 - adds r5, 0x1 - str r5, [sp] - adds r5, r3, 0 -_0812D3C8: - mov r6, r12 - ldr r2, [r6] - adds r2, r5 - adds r2, r7 - ldrh r3, [r2] - lsls r0, r3, 18 - lsrs r0, 20 - mov r1, r8 - lsls r1, r4 - orrs r1, r0 - ldr r6, _0812D41C @ =0x00000fff - adds r0, r6, 0 - ands r1, r0 - lsls r1, 2 - mov r0, r9 - ands r0, r3 - orrs r0, r1 - strh r0, [r2] - adds r0, r4, 0x1 - lsls r0, 24 - lsrs r4, r0, 24 - cmp r4, 0x5 - bls _0812D3C8 - ldr r1, [sp] - lsls r0, r1, 24 - lsrs r5, r0, 24 - cmp r5, 0xF - bls _0812D3AA - add sp, 0x4 - pop {r3-r5} - mov r8, r3 - mov r9, r4 - mov r10, r5 - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_0812D410: .4byte gSaveBlock1Ptr -_0812D414: .4byte 0x00003a54 -_0812D418: .4byte 0xffffc003 -_0812D41C: .4byte 0x00000fff - thumb_func_end sub_812D388 - thumb_func_start sub_812D420 sub_812D420: @ 812D420 push {r4-r7,lr} diff --git a/include/global.h b/include/global.h index 31bb77f9f..9fb7703cd 100644 --- a/include/global.h +++ b/include/global.h @@ -574,6 +574,7 @@ struct FameCheckerSaveData { /*3a54*/ u16 unk_0_0:2; u16 unk_0_2:12; + u16 unk_0_E:2; }; #define MAP_OBJECTS_COUNT 16 @@ -640,8 +641,8 @@ struct SaveBlock1 /*0x3A14*/ u8 seen2[DEX_FLAGS_NO]; /*0x3A48*/ u8 filler_3a48[4]; /*0x3A4C*/ u8 rivalName[PLAYER_NAME_LENGTH]; - /*0x3A54*/ struct FameCheckerSaveData fameChecker[17]; - /*0x3A98*/ u8 filler3A94[0x2A0]; + /*0x3A54*/ struct FameCheckerSaveData fameChecker[16]; + /*0x3A94*/ u8 filler3A94[0x2A4]; u32 unkArray[4][3]; }; diff --git a/src/fame_checker.c b/src/fame_checker.c index e13fc1913..436e60b3a 100644 --- a/src/fame_checker.c +++ b/src/fame_checker.c @@ -646,3 +646,28 @@ bool8 sub_812D1A8(u8 a0) } return r5; } + +void sub_812D304(void) +{ + u8 r4; + for (r4 = 0; r4 < 16; r4++) + { + gSaveBlock1Ptr->fameChecker[r4].unk_0_0 = 0; + gSaveBlock1Ptr->fameChecker[r4].unk_0_2 = 0; + gSaveBlock1Ptr->fameChecker[r4].unk_0_E = 0; + } + gSaveBlock1Ptr->fameChecker[0].unk_0_0 = 2; +} + +void sub_812D388(void) +{ + u8 r5, r4; + for (r5 = 0; r5 < 16; r5++) + { + gSaveBlock1Ptr->fameChecker[r5].unk_0_0 = 2; + for (r4 = 0; r4 < 6; r4++) + { + gSaveBlock1Ptr->fameChecker[r5].unk_0_2 |= (1 << r4); + } + } +} -- cgit v1.2.3 From 5090c3fab25806fd972fd47360fef30ab095317d Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sun, 25 Nov 2018 18:46:32 -0500 Subject: sub_812D420 --- asm/fame_checker.s | 140 ---------------------------------------------------- include/gba/macro.h | 3 ++ src/fame_checker.c | 28 +++++++++++ 3 files changed, 31 insertions(+), 140 deletions(-) diff --git a/asm/fame_checker.s b/asm/fame_checker.s index 49b957eb3..f04455117 100644 --- a/asm/fame_checker.s +++ b/asm/fame_checker.s @@ -5,146 +5,6 @@ .text - thumb_func_start sub_812D420 -sub_812D420: @ 812D420 - push {r4-r7,lr} - mov r7, r8 - push {r7} - sub sp, 0x8 - movs r3, 0xC0 - lsls r3, 19 - movs r4, 0xC0 - lsls r4, 9 - add r0, sp, 0x4 - mov r8, r0 - mov r2, sp - movs r6, 0 - ldr r1, _0812D550 @ =0x040000d4 - movs r5, 0x80 - lsls r5, 5 - ldr r7, _0812D554 @ =0x81000800 - movs r0, 0x81 - lsls r0, 24 - mov r12, r0 -_0812D446: - strh r6, [r2] - mov r0, sp - str r0, [r1] - str r3, [r1, 0x4] - str r7, [r1, 0x8] - ldr r0, [r1, 0x8] - adds r3, r5 - subs r4, r5 - cmp r4, r5 - bhi _0812D446 - strh r6, [r2] - mov r2, sp - str r2, [r1] - str r3, [r1, 0x4] - lsrs r0, r4, 1 - mov r2, r12 - orrs r0, r2 - str r0, [r1, 0x8] - ldr r0, [r1, 0x8] - movs r0, 0xE0 - lsls r0, 19 - movs r3, 0x80 - lsls r3, 3 - movs r4, 0 - str r4, [sp, 0x4] - ldr r2, _0812D550 @ =0x040000d4 - mov r1, r8 - str r1, [r2] - str r0, [r2, 0x4] - lsrs r0, r3, 2 - movs r1, 0x85 - lsls r1, 24 - orrs r0, r1 - str r0, [r2, 0x8] - ldr r0, [r2, 0x8] - movs r1, 0xA0 - lsls r1, 19 - mov r0, sp - strh r4, [r0] - str r0, [r2] - str r1, [r2, 0x4] - lsrs r3, 1 - movs r0, 0x81 - lsls r0, 24 - orrs r3, r0 - str r3, [r2, 0x8] - ldr r0, [r2, 0x8] - movs r0, 0 - movs r1, 0 - bl SetGpuReg - movs r0, 0x8 - movs r1, 0 - bl SetGpuReg - movs r0, 0x10 - movs r1, 0 - bl SetGpuReg - movs r0, 0x12 - movs r1, 0 - bl SetGpuReg - movs r0, 0xA - movs r1, 0 - bl SetGpuReg - movs r0, 0x14 - movs r1, 0 - bl SetGpuReg - movs r0, 0x16 - movs r1, 0 - bl SetGpuReg - movs r0, 0xC - movs r1, 0 - bl SetGpuReg - movs r0, 0x18 - movs r1, 0 - bl SetGpuReg - movs r0, 0x1A - movs r1, 0 - bl SetGpuReg - movs r0, 0xE - movs r1, 0 - bl SetGpuReg - movs r0, 0x1C - movs r1, 0 - bl SetGpuReg - movs r0, 0x1E - movs r1, 0 - bl SetGpuReg - movs r0, 0x40 - movs r1, 0 - bl SetGpuReg - movs r0, 0x44 - movs r1, 0 - bl SetGpuReg - movs r0, 0x48 - movs r1, 0 - bl SetGpuReg - movs r0, 0x4A - movs r1, 0 - bl SetGpuReg - movs r0, 0x50 - movs r1, 0 - bl SetGpuReg - movs r0, 0x52 - movs r1, 0 - bl SetGpuReg - movs r0, 0x54 - movs r1, 0 - bl SetGpuReg - add sp, 0x8 - pop {r3} - mov r8, r3 - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_0812D550: .4byte 0x040000d4 -_0812D554: .4byte 0x81000800 - thumb_func_end sub_812D420 - thumb_func_start sub_812D558 sub_812D558: @ 812D558 push {lr} diff --git a/include/gba/macro.h b/include/gba/macro.h index 462d3589d..c0a4e481b 100644 --- a/include/gba/macro.h +++ b/include/gba/macro.h @@ -125,6 +125,9 @@ #define DmaCopyLarge32(dmaNum, src, dest, size, block) DmaCopyLarge(dmaNum, src, dest, size, block, 32) +#define DmaClearLarge16(dmaNum, dest, size, block) DmaClearLarge(dmaNum, dest, size, block, 16) +#define DmaClearLarge32(dmaNum, dest, size, block) DmaClearLarge(dmaNum, dest, size, block, 32) + #define DmaCopyDefvars(dmaNum, src, dest, size, bit) \ { \ const void *_src = src; \ diff --git a/src/fame_checker.c b/src/fame_checker.c index 436e60b3a..543fd8b87 100644 --- a/src/fame_checker.c +++ b/src/fame_checker.c @@ -671,3 +671,31 @@ void sub_812D388(void) } } } + +void sub_812D420(void) +{ + void * vram = (void *)VRAM; + DmaClearLarge16(3, vram, VRAM_SIZE, 0x1000); + DmaClear32(3, OAM, OAM_SIZE); + DmaClear16(3, PLTT, PLTT_SIZE); + SetGpuReg(REG_OFFSET_DISPCNT, 0); + SetGpuReg(REG_OFFSET_BG0CNT, 0); + SetGpuReg(REG_OFFSET_BG0HOFS, 0); + SetGpuReg(REG_OFFSET_BG0VOFS, 0); + SetGpuReg(REG_OFFSET_BG1CNT, 0); + SetGpuReg(REG_OFFSET_BG1HOFS, 0); + SetGpuReg(REG_OFFSET_BG1VOFS, 0); + SetGpuReg(REG_OFFSET_BG2CNT, 0); + SetGpuReg(REG_OFFSET_BG2HOFS, 0); + SetGpuReg(REG_OFFSET_BG2VOFS, 0); + SetGpuReg(REG_OFFSET_BG3CNT, 0); + SetGpuReg(REG_OFFSET_BG3HOFS, 0); + SetGpuReg(REG_OFFSET_BG3VOFS, 0); + SetGpuReg(REG_OFFSET_WIN0H, 0); + SetGpuReg(REG_OFFSET_WIN0V, 0); + SetGpuReg(REG_OFFSET_WININ, 0); + SetGpuReg(REG_OFFSET_WINOUT, 0); + SetGpuReg(REG_OFFSET_BLDCNT, 0); + SetGpuReg(REG_OFFSET_BLDALPHA, 0); + SetGpuReg(REG_OFFSET_BLDY, 0); +} -- cgit v1.2.3 From f05f41b89a0de0e0c32a06d6477de0d5e2fad243 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sun, 25 Nov 2018 19:21:05 -0500 Subject: through sub_812D5EC --- asm/fame_checker.s | 118 ---------------------------------------------- include/field_map_obj.h | 1 + include/scanline_effect.h | 6 +++ src/fame_checker.c | 43 +++++++++++++++++ 4 files changed, 50 insertions(+), 118 deletions(-) create mode 100644 include/scanline_effect.h diff --git a/asm/fame_checker.s b/asm/fame_checker.s index f04455117..37bce8ba5 100644 --- a/asm/fame_checker.s +++ b/asm/fame_checker.s @@ -5,124 +5,6 @@ .text - thumb_func_start sub_812D558 -sub_812D558: @ 812D558 - push {lr} - bl remove_some_task - bl ResetTasks - bl ResetSpriteData - bl dp13_810BB8C - bl ResetPaletteFade - movs r0, 0 - bl npc_paltag_set_load - ldr r1, _0812D580 @ =gReservedSpritePaletteCount - movs r0, 0x7 - strb r0, [r1] - pop {r0} - bx r0 - .align 2, 0 -_0812D580: .4byte gReservedSpritePaletteCount - thumb_func_end sub_812D558 - - thumb_func_start sub_812D584 -sub_812D584: @ 812D584 - push {lr} - movs r1, 0xFA - lsls r1, 5 - movs r0, 0 - bl SetGpuReg - pop {r0} - bx r0 - thumb_func_end sub_812D584 - - thumb_func_start sub_812D594 -sub_812D594: @ 812D594 - push {lr} - movs r0, 0 - movs r1, 0 - movs r2, 0 - bl ChangeBgX - movs r0, 0 - movs r1, 0 - movs r2, 0 - bl ChangeBgY - movs r0, 0x1 - movs r1, 0 - movs r2, 0 - bl ChangeBgX - movs r0, 0x1 - movs r1, 0 - movs r2, 0 - bl ChangeBgY - movs r0, 0x2 - movs r1, 0 - movs r2, 0 - bl ChangeBgX - movs r0, 0x2 - movs r1, 0 - movs r2, 0 - bl ChangeBgY - movs r0, 0x3 - movs r1, 0 - movs r2, 0 - bl ChangeBgX - movs r0, 0x3 - movs r1, 0 - movs r2, 0 - bl ChangeBgY - pop {r0} - bx r0 - thumb_func_end sub_812D594 - - thumb_func_start sub_812D5EC -sub_812D5EC: @ 812D5EC - push {r4-r6,lr} - ldr r1, _0812D638 @ =gUnknown_20370C0 - ldrh r0, [r1] - cmp r0, 0xF - bhi _0812D632 - ldr r5, _0812D63C @ =gSpecialVar_0x8005 - ldrh r0, [r5] - cmp r0, 0x5 - bhi _0812D632 - ldr r0, _0812D640 @ =gSaveBlock1Ptr - ldr r2, [r0] - ldrh r0, [r1] - lsls r0, 2 - adds r2, r0 - ldr r0, _0812D644 @ =0x00003a54 - adds r2, r0 - ldrh r3, [r2] - lsls r0, r3, 18 - lsrs r0, 20 - movs r4, 0x1 - adds r1, r4, 0 - ldrh r6, [r5] - lsls r1, r6 - orrs r1, r0 - ldr r6, _0812D648 @ =0x00000fff - adds r0, r6, 0 - ands r1, r0 - lsls r1, 2 - ldr r0, _0812D64C @ =0xffffc003 - ands r0, r3 - orrs r0, r1 - strh r0, [r2] - strh r4, [r5] - bl sub_812D650 -_0812D632: - pop {r4-r6} - pop {r0} - bx r0 - .align 2, 0 -_0812D638: .4byte gUnknown_20370C0 -_0812D63C: .4byte gSpecialVar_0x8005 -_0812D640: .4byte gSaveBlock1Ptr -_0812D644: .4byte 0x00003a54 -_0812D648: .4byte 0x00000fff -_0812D64C: .4byte 0xffffc003 - thumb_func_end sub_812D5EC - thumb_func_start sub_812D650 sub_812D650: @ 812D650 push {r4,lr} diff --git a/include/field_map_obj.h b/include/field_map_obj.h index 685701e89..d2ec58979 100644 --- a/include/field_map_obj.h +++ b/include/field_map_obj.h @@ -87,6 +87,7 @@ u8 sub_80634F0(u8 direction); u8 sub_8063500(u8 a0); void sub_805F060(struct MapObject *mapObject, u8 a1); u8 sub_805EB44(u8, u8, s16, s16); +void npc_paltag_set_load(u8 mode); // Exported data declarations diff --git a/include/scanline_effect.h b/include/scanline_effect.h new file mode 100644 index 000000000..d49f5b4d6 --- /dev/null +++ b/include/scanline_effect.h @@ -0,0 +1,6 @@ +#ifndef GUARD_SCANLINE_EFFECT_H +#define GUARD_SCANLINE_EFFECT_H + +void remove_some_task(void); + +#endif //GUARD_SCANLINE_EFFECT_H diff --git a/src/fame_checker.c b/src/fame_checker.c index 543fd8b87..d309e59a3 100644 --- a/src/fame_checker.c +++ b/src/fame_checker.c @@ -2,9 +2,12 @@ #include "constants/songs.h" #include "sprite.h" #include "bg.h" +#include "event_data.h" #include "graphics.h" #include "battle_setup.h" #include "menu.h" +#include "battle_dome_cards.h" +#include "scanline_effect.h" #include "new_menu_helpers.h" #include "item_menu.h" #include "list_menu.h" @@ -79,6 +82,7 @@ void sub_812D420(void); void sub_812D558(void); void sub_812D584(void); void sub_812D594(void); +void sub_812D650(void); bool8 sub_812D6B4(void); void sub_812D70C(void); u8 sub_812D724(s16 a0); @@ -699,3 +703,42 @@ void sub_812D420(void) SetGpuReg(REG_OFFSET_BLDALPHA, 0); SetGpuReg(REG_OFFSET_BLDY, 0); } + +void sub_812D558(void) +{ + remove_some_task(); + ResetTasks(); + ResetSpriteData(); + dp13_810BB8C(); + ResetPaletteFade(); + npc_paltag_set_load(0); + gReservedSpritePaletteCount = 7; + +} + +void sub_812D584(void) +{ + SetGpuReg(REG_OFFSET_DISPCNT, DISPCNT_MODE_0 | DISPCNT_OBJ_1D_MAP | DISPCNT_BG_ALL_ON | DISPCNT_OBJ_ON); +} + +void sub_812D594(void) +{ + ChangeBgX(0, 0, 0); + ChangeBgY(0, 0, 0); + ChangeBgX(1, 0, 0); + ChangeBgY(1, 0, 0); + ChangeBgX(2, 0, 0); + ChangeBgY(2, 0, 0); + ChangeBgX(3, 0, 0); + ChangeBgY(3, 0, 0); +} + +void sub_812D5EC(void) +{ + if (gUnknown_20370C0 < 16 && gSpecialVar_0x8005 < 6) + { + gSaveBlock1Ptr->fameChecker[gUnknown_20370C0].unk_0_2 |= (1 << gSpecialVar_0x8005); + gSpecialVar_0x8005 = 1; + sub_812D650(); + } +} -- cgit v1.2.3 From 1f9c58abedd92168b75e2d44abd6521fd82c78b2 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sun, 25 Nov 2018 20:14:34 -0500 Subject: through sub_812D814 --- asm/fame_checker.s | 267 ----------------------------------------------------- src/fame_checker.c | 91 ++++++++++++++++++ 2 files changed, 91 insertions(+), 267 deletions(-) diff --git a/asm/fame_checker.s b/asm/fame_checker.s index 37bce8ba5..f907c448e 100644 --- a/asm/fame_checker.s +++ b/asm/fame_checker.s @@ -5,273 +5,6 @@ .text - thumb_func_start sub_812D650 -sub_812D650: @ 812D650 - push {r4,lr} - ldr r1, _0812D6A4 @ =gUnknown_20370C0 - ldrh r0, [r1] - cmp r0, 0xF - bhi _0812D69E - ldr r0, _0812D6A8 @ =gSpecialVar_0x8005 - ldrh r4, [r0] - adds r0, r4, 0 - cmp r0, 0x2 - bhi _0812D69E - cmp r0, 0 - beq _0812D69E - ldr r2, _0812D6AC @ =gSaveBlock1Ptr - ldrh r3, [r1] - cmp r0, 0x1 - bne _0812D684 - ldr r0, [r2] - lsls r1, r3, 2 - adds r0, r1 - ldr r1, _0812D6B0 @ =0x00003a54 - adds r0, r1 - ldrb r0, [r0] - lsls r0, 30 - lsrs r0, 30 - cmp r0, 0x2 - beq _0812D69E -_0812D684: - ldr r2, [r2] - lsls r0, r3, 2 - adds r2, r0 - ldr r0, _0812D6B0 @ =0x00003a54 - adds r2, r0 - movs r1, 0x3 - ands r1, r4 - ldrb r3, [r2] - movs r0, 0x4 - negs r0, r0 - ands r0, r3 - orrs r0, r1 - strb r0, [r2] -_0812D69E: - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_0812D6A4: .4byte gUnknown_20370C0 -_0812D6A8: .4byte gSpecialVar_0x8005 -_0812D6AC: .4byte gSaveBlock1Ptr -_0812D6B0: .4byte 0x00003a54 - thumb_func_end sub_812D650 - - thumb_func_start sub_812D6B4 -sub_812D6B4: @ 812D6B4 - push {r4,lr} - ldr r0, _0812D6EC @ =gUnknown_203B0FC - ldr r4, [r0] - bl sub_812E064 - lsls r0, 16 - lsrs r0, 16 - adds r4, 0xC - adds r4, r0 - ldrb r1, [r4] - movs r2, 0 - ldr r0, _0812D6F0 @ =gSaveBlock1Ptr - ldr r0, [r0] - lsls r1, 2 - adds r0, r1 - ldr r1, _0812D6F4 @ =0x00003a54 - adds r0, r1 - ldrh r0, [r0] - lsls r1, r0, 18 - movs r3, 0x1 -_0812D6DC: - lsrs r0, r1, 20 - asrs r0, r2 - ands r0, r3 - cmp r0, 0 - bne _0812D6F8 - movs r0, 0 - b _0812D704 - .align 2, 0 -_0812D6EC: .4byte gUnknown_203B0FC -_0812D6F0: .4byte gSaveBlock1Ptr -_0812D6F4: .4byte 0x00003a54 -_0812D6F8: - adds r0, r2, 0x1 - lsls r0, 24 - lsrs r2, r0, 24 - cmp r2, 0x5 - bls _0812D6DC - movs r0, 0x1 -_0812D704: - pop {r4} - pop {r1} - bx r1 - thumb_func_end sub_812D6B4 - - thumb_func_start sub_812D70C -sub_812D70C: @ 812D70C - push {r4,lr} - movs r4, 0xFA - lsls r4, 2 - adds r0, r4, 0 - bl FreeSpriteTilesByTag - adds r0, r4, 0 - bl FreeSpritePaletteByTag - pop {r4} - pop {r0} - bx r0 - thumb_func_end sub_812D70C - - thumb_func_start sub_812D724 -sub_812D724: @ 812D724 - push {r4,lr} - lsls r0, 16 - asrs r0, 16 - movs r4, 0x22 - cmp r0, 0x2 - ble _0812D732 - movs r4, 0x3D -_0812D732: - movs r1, 0x3 - bl __modsi3 - lsls r0, 16 - asrs r0, 16 - lsls r1, r0, 1 - adds r1, r0 - lsls r1, 4 - subs r1, r0 - adds r1, 0x72 - ldr r0, _0812D760 @ =gUnknown_845FC44 - lsls r1, 16 - asrs r1, 16 - adds r2, r4, 0 - movs r3, 0 - bl CreateSprite - lsls r0, 24 - lsrs r0, 24 - pop {r4} - pop {r1} - bx r1 - .align 2, 0 -_0812D760: .4byte gUnknown_845FC44 - thumb_func_end sub_812D724 - - thumb_func_start sub_812D764 -sub_812D764: @ 812D764 - push {lr} - bl DestroySprite - pop {r0} - bx r0 - thumb_func_end sub_812D764 - - thumb_func_start sub_812D770 -sub_812D770: @ 812D770 - push {lr} - ldr r0, _0812D77C @ =0x000003e9 - bl FreeSpriteTilesByTag - pop {r0} - bx r0 - .align 2, 0 -_0812D77C: .4byte 0x000003e9 - thumb_func_end sub_812D770 - - thumb_func_start sub_812D780 -sub_812D780: @ 812D780 - push {lr} - adds r3, r0, 0 - adds r2, r1, 0 - lsls r3, 24 - lsrs r3, 24 - lsls r2, 24 - lsrs r2, 24 - ldr r0, _0812D7C0 @ =gUnknown_845FC78 - adds r1, r3, 0 - movs r3, 0x8 - bl CreateSprite - lsls r0, 24 - lsrs r0, 24 - ldr r1, _0812D7C4 @ =gSprites - lsls r2, r0, 4 - adds r2, r0 - lsls r2, 2 - adds r2, r1 - ldrb r3, [r2, 0x5] - movs r1, 0xD - negs r1, r1 - ands r1, r3 - movs r3, 0x8 - orrs r1, r3 - movs r3, 0xF - ands r1, r3 - movs r3, 0x20 - orrs r1, r3 - strb r1, [r2, 0x5] - pop {r1} - bx r1 - .align 2, 0 -_0812D7C0: .4byte gUnknown_845FC78 -_0812D7C4: .4byte gSprites - thumb_func_end sub_812D780 - - thumb_func_start sub_812D7C8 -sub_812D7C8: @ 812D7C8 - push {r4,lr} - ldr r4, _0812D7E0 @ =0x000003ea - adds r0, r4, 0 - bl FreeSpriteTilesByTag - adds r0, r4, 0 - bl FreeSpritePaletteByTag - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_0812D7E0: .4byte 0x000003ea - thumb_func_end sub_812D7C8 - - thumb_func_start sub_812D7E4 -sub_812D7E4: @ 812D7E4 - push {lr} - ldr r0, _0812D7FC @ =gUnknown_845FCB8 - movs r1, 0xE2 - movs r2, 0x42 - movs r3, 0 - bl CreateSprite - lsls r0, 24 - lsrs r0, 24 - pop {r1} - bx r1 - .align 2, 0 -_0812D7FC: .4byte gUnknown_845FCB8 - thumb_func_end sub_812D7E4 - - thumb_func_start sub_812D800 -sub_812D800: @ 812D800 - push {r4,lr} - adds r4, r0, 0 - bl FreeSpriteOamMatrix - adds r0, r4, 0 - bl DestroySprite - pop {r4} - pop {r0} - bx r0 - thumb_func_end sub_812D800 - - thumb_func_start sub_812D814 -sub_812D814: @ 812D814 - push {lr} - ldr r0, _0812D834 @ =0x000003ee - bl FreeSpriteTilesByTag - ldr r0, _0812D838 @ =0x000003ef - bl FreeSpriteTilesByTag - movs r0, 0xFC - lsls r0, 2 - bl FreeSpriteTilesByTag - ldr r0, _0812D83C @ =0x000003f1 - bl FreeSpriteTilesByTag - pop {r0} - bx r0 - .align 2, 0 -_0812D834: .4byte 0x000003ee -_0812D838: .4byte 0x000003ef -_0812D83C: .4byte 0x000003f1 - thumb_func_end sub_812D814 - thumb_func_start sub_812D840 sub_812D840: @ 812D840 push {lr} diff --git a/src/fame_checker.c b/src/fame_checker.c index d309e59a3..c5039fa5f 100644 --- a/src/fame_checker.c +++ b/src/fame_checker.c @@ -23,6 +23,14 @@ #include "field_map_obj.h" #include "text_window.h" +#define SPRITETAG_1000 1000 +#define SPRITETAG_1001 1001 +#define SPRITETAG_1002 1002 +#define SPRITETAG_1006 1006 +#define SPRITETAG_1007 1007 +#define SPRITETAG_1008 1008 +#define SPRITETAG_1009 1009 + struct FameCheckerData { MainCallback unk_00; @@ -119,6 +127,9 @@ extern const struct BgTemplate gUnknown_845FBF4[4]; extern const struct SpriteSheet gUnknown_845FB9C[]; extern const struct SpritePalette gUnknown_845FBDC[]; extern const struct WindowTemplate gUnknown_845FC04[]; +extern const struct SpriteTemplate gUnknown_845FC44; +extern const struct SpriteTemplate gUnknown_845FC78; +extern const struct SpriteTemplate gUnknown_845FCB8; void sub_812C380(void) { @@ -742,3 +753,83 @@ void sub_812D5EC(void) sub_812D650(); } } + +void sub_812D650(void) +{ + if (gUnknown_20370C0 < 16 && gSpecialVar_0x8005 < 3) + { + if (gSpecialVar_0x8005 == 0) + return; + if (gSpecialVar_0x8005 == 1 && gSaveBlock1Ptr->fameChecker[gUnknown_20370C0].unk_0_0 == 2) + return; + gSaveBlock1Ptr->fameChecker[gUnknown_20370C0].unk_0_0 = gSpecialVar_0x8005; + } +} + +bool8 sub_812D6B4(void) +{ + u8 r2; + u8 r1 = gUnknown_203B0FC->unk_0C[sub_812E064()]; + for (r2 = 0; r2 < 6; r2++) + { + if (!((gSaveBlock1Ptr->fameChecker[r1].unk_0_2 >> r2) & 1)) + return FALSE; + } + return TRUE; +} + +void sub_812D70C(void) +{ + FreeSpriteTilesByTag(SPRITETAG_1000); + FreeSpritePaletteByTag(SPRITETAG_1000); +} + +u8 sub_812D724(s16 a0) +{ + s16 r4 = a0 >= 3 ? 61 : 34; + s16 r1 = 47 * (a0 % 3) + 0x72; + return CreateSprite(&gUnknown_845FC44, r1, r4, 0); +} + +void sub_812D764(struct Sprite * sprite) +{ + DestroySprite(sprite); +} + +void sub_812D770(void) +{ + FreeSpriteTilesByTag(SPRITETAG_1001); +} + +u8 sub_812D780(u8 x, u8 y) +{ + u8 spriteId = CreateSprite(&gUnknown_845FC78, x, y, 8); + gSprites[spriteId].oam.priority = 2; + gSprites[spriteId].oam.paletteNum = 2; + return spriteId; +} + +void sub_812D7C8(void) +{ + FreeSpriteTilesByTag(SPRITETAG_1002); + FreeSpritePaletteByTag(SPRITETAG_1002); +} + +u8 sub_812D7E4(void) +{ + return CreateSprite(&gUnknown_845FCB8, 0xe2, 0x42, 0); +} + +void sub_812D800(struct Sprite * sprite) +{ + FreeSpriteOamMatrix(sprite); + DestroySprite(sprite); +} + +void sub_812D814(void) +{ + FreeSpriteTilesByTag(SPRITETAG_1006); + FreeSpriteTilesByTag(SPRITETAG_1007); + FreeSpriteTilesByTag(SPRITETAG_1008); + FreeSpriteTilesByTag(SPRITETAG_1009); +} -- cgit v1.2.3 From 5c013a089798efa1819986528de4af8470a9c329 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sun, 25 Nov 2018 21:12:07 -0500 Subject: through sub_812DA14 --- asm/fame_checker.s | 355 -------------------------------------------- include/battle_dome_cards.h | 2 + include/text.h | 24 +-- src/fame_checker.c | 108 +++++++++++++- src/text.c | 22 +-- 5 files changed, 132 insertions(+), 379 deletions(-) diff --git a/asm/fame_checker.s b/asm/fame_checker.s index f907c448e..aa0cb17c4 100644 --- a/asm/fame_checker.s +++ b/asm/fame_checker.s @@ -5,361 +5,6 @@ .text - thumb_func_start sub_812D840 -sub_812D840: @ 812D840 - push {lr} - adds r2, r0, 0 - movs r1, 0x2E - ldrsh r0, [r2, r1] - cmp r0, 0x1 - bne _0812D864 - movs r3, 0x24 - ldrsh r0, [r2, r3] - subs r0, 0xA - cmp r0, 0 - bge _0812D85E - movs r0, 0 - strh r0, [r2, 0x24] - strh r0, [r2, 0x2E] - b _0812D882 -_0812D85E: - ldrh r0, [r2, 0x24] - subs r0, 0xA - b _0812D880 -_0812D864: - cmp r0, 0x2 - bne _0812D882 - ldrh r1, [r2, 0x24] - movs r3, 0x24 - ldrsh r0, [r2, r3] - cmp r0, 0xF0 - ble _0812D87C - movs r1, 0 - movs r0, 0xF0 - strh r0, [r2, 0x24] - strh r1, [r2, 0x2E] - b _0812D882 -_0812D87C: - adds r0, r1, 0 - adds r0, 0xA -_0812D880: - strh r0, [r2, 0x24] -_0812D882: - pop {r0} - bx r0 - thumb_func_end sub_812D840 - - thumb_func_start sub_812D888 -sub_812D888: @ 812D888 - push {r4,r5,lr} - sub sp, 0x8 - lsls r0, 24 - lsrs r5, r0, 24 - cmp r5, 0x1 - bne _0812D8B0 - ldr r0, _0812D8A8 @ =gUnknown_845FCE4 - movs r1, 0x94 - movs r2, 0x42 - movs r3, 0 - bl CreateSprite - lsls r0, 24 - lsrs r4, r0, 24 - ldr r0, _0812D8AC @ =gUnknown_845ED60 - b _0812D906 - .align 2, 0 -_0812D8A8: .4byte gUnknown_845FCE4 -_0812D8AC: .4byte gUnknown_845ED60 -_0812D8B0: - cmp r5, 0xE - bne _0812D8D0 - ldr r0, _0812D8C8 @ =gUnknown_845FCFC - movs r1, 0x94 - movs r2, 0x42 - movs r3, 0 - bl CreateSprite - lsls r0, 24 - lsrs r4, r0, 24 - ldr r0, _0812D8CC @ =gUnknown_845DD20 - b _0812D906 - .align 2, 0 -_0812D8C8: .4byte gUnknown_845FCFC -_0812D8CC: .4byte gUnknown_845DD20 -_0812D8D0: - cmp r5, 0 - bne _0812D8F0 - ldr r0, _0812D8E8 @ =gUnknown_845FD14 - movs r1, 0x94 - movs r2, 0x42 - movs r3, 0 - bl CreateSprite - lsls r0, 24 - lsrs r4, r0, 24 - ldr r0, _0812D8EC @ =gUnknown_845F580 - b _0812D906 - .align 2, 0 -_0812D8E8: .4byte gUnknown_845FD14 -_0812D8EC: .4byte gUnknown_845F580 -_0812D8F0: - cmp r5, 0xD - bne _0812D934 - ldr r0, _0812D928 @ =gUnknown_845FD2C - movs r1, 0x94 - movs r2, 0x42 - movs r3, 0 - bl CreateSprite - lsls r0, 24 - lsrs r4, r0, 24 - ldr r0, _0812D92C @ =gUnknown_845E540 -_0812D906: - movs r1, 0xB0 - lsls r1, 1 - movs r2, 0x20 - bl LoadPalette - ldr r1, _0812D930 @ =gSprites - lsls r0, r4, 4 - adds r0, r4 - lsls r0, 2 - adds r0, r1 - ldrb r2, [r0, 0x5] - movs r1, 0xF - ands r1, r2 - movs r2, 0x60 - orrs r1, r2 - strb r1, [r0, 0x5] - b _0812D950 - .align 2, 0 -_0812D928: .4byte gUnknown_845FD2C -_0812D92C: .4byte gUnknown_845E540 -_0812D930: .4byte gSprites -_0812D934: - ldr r0, _0812D98C @ =gUnknown_845F61C - adds r0, r5, r0 - ldrb r0, [r0] - movs r1, 0x6 - str r1, [sp] - ldr r1, _0812D990 @ =0x0000ffff - str r1, [sp, 0x4] - movs r1, 0x1 - movs r2, 0x94 - movs r3, 0x42 - bl sub_810C2A4 - lsls r0, 24 - lsrs r4, r0, 24 -_0812D950: - ldr r1, _0812D994 @ =gSprites - lsls r0, r4, 4 - adds r0, r4 - lsls r0, 2 - adds r1, 0x1C - adds r0, r1 - ldr r1, _0812D998 @ =sub_812D840 - str r1, [r0] - ldr r0, _0812D99C @ =gSaveBlock1Ptr - ldr r0, [r0] - lsls r1, r5, 2 - adds r0, r1 - ldr r1, _0812D9A0 @ =0x00003a54 - adds r0, r1 - ldrb r0, [r0] - lsls r0, 30 - lsrs r0, 30 - cmp r0, 0x1 - bne _0812D982 - ldr r0, _0812D9A4 @ =gUnknown_845F5C0 - movs r1, 0xB0 - lsls r1, 1 - movs r2, 0x20 - bl LoadPalette -_0812D982: - adds r0, r4, 0 - add sp, 0x8 - pop {r4,r5} - pop {r1} - bx r1 - .align 2, 0 -_0812D98C: .4byte gUnknown_845F61C -_0812D990: .4byte 0x0000ffff -_0812D994: .4byte gSprites -_0812D998: .4byte sub_812D840 -_0812D99C: .4byte gSaveBlock1Ptr -_0812D9A0: .4byte 0x00003a54 -_0812D9A4: .4byte gUnknown_845F5C0 - thumb_func_end sub_812D888 - - thumb_func_start sub_812D9A8 -sub_812D9A8: @ 812D9A8 - push {r4,lr} - lsls r0, 24 - lsrs r0, 24 - lsls r1, 16 - lsls r2, r0, 2 - adds r2, r0 - lsls r2, 3 - ldr r0, _0812D9FC @ =gTasks+0x8 - adds r4, r2, r0 - lsrs r1, 16 - ldr r0, _0812DA00 @ =gUnknown_203B0FC - ldr r2, [r0] - ldrb r0, [r2, 0x7] - lsrs r3, r0, 2 - subs r0, r3, 0x1 - cmp r1, r0 - bne _0812D9D0 - subs r0, r3, 0x2 - lsls r0, 16 - lsrs r1, r0, 16 -_0812D9D0: - adds r0, r2, 0 - adds r0, 0xC - adds r0, r1 - ldrb r0, [r0] - cmp r0, 0x1 - beq _0812D9E8 - cmp r0, 0xE - beq _0812D9E8 - cmp r0, 0 - beq _0812D9E8 - cmp r0, 0xD - bne _0812DA08 -_0812D9E8: - movs r0, 0x4 - ldrsh r1, [r4, r0] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - ldr r1, _0812DA04 @ =gSprites - adds r0, r1 - bl DestroySprite - b _0812DA0E - .align 2, 0 -_0812D9FC: .4byte gTasks+0x8 -_0812DA00: .4byte gUnknown_203B0FC -_0812DA04: .4byte gSprites -_0812DA08: - ldrh r0, [r4, 0x4] - bl sub_810C2E8 -_0812DA0E: - pop {r4} - pop {r0} - bx r0 - thumb_func_end sub_812D9A8 - - thumb_func_start sub_812DA14 -sub_812DA14: @ 812DA14 - push {r4-r7,lr} - mov r7, r10 - mov r6, r9 - mov r5, r8 - push {r5-r7} - sub sp, 0x14 - adds r4, r0, 0 - lsls r4, 24 - lsrs r4, 24 - bl sub_812E064 - ldr r1, _0812DAF8 @ =gUnknown_203B0FC - ldr r1, [r1] - lsls r0, 16 - lsrs r0, 16 - adds r1, 0xC - adds r1, r0 - ldrb r0, [r1] - lsls r5, r0, 1 - adds r5, r0 - lsls r5, 1 - adds r5, r4 - movs r0, 0x1 - bl sub_812E094 - ldr r1, _0812DAFC @ =gUnknown_3005EC8 - movs r0, 0x1 - strb r0, [r1] - movs r0, 0x58 - str r0, [sp] - movs r0, 0x20 - str r0, [sp, 0x4] - movs r0, 0x3 - movs r1, 0 - movs r2, 0 - movs r3, 0 - bl FillWindowPixelRect - ldr r0, _0812DB00 @ =gUnknown_845F89C - lsls r5, 2 - adds r0, r5, r0 - ldr r6, [r0] - movs r0, 0 - adds r1, r6, 0 - movs r2, 0 - bl GetStringWidth - movs r4, 0x54 - subs r0, r4, r0 - lsrs r1, r0, 31 - adds r0, r1 - asrs r0, 1 - lsls r2, r0, 24 - lsrs r2, 24 - movs r7, 0 - str r7, [sp] - movs r0, 0x2 - mov r10, r0 - str r0, [sp, 0x4] - ldr r0, _0812DB04 @ =gUnknown_845F5E3 - mov r9, r0 - str r0, [sp, 0x8] - movs r0, 0x1 - negs r0, r0 - mov r8, r0 - str r0, [sp, 0xC] - str r6, [sp, 0x10] - movs r0, 0x3 - movs r1, 0 - movs r3, 0 - bl AddTextPrinterParametrized2 - ldr r6, _0812DB08 @ =gStringVar1 - ldr r0, _0812DB0C @ =gUnknown_845FA1C - adds r5, r0 - ldr r1, [r5] - adds r0, r6, 0 - bl StringExpandPlaceholders - movs r0, 0 - adds r1, r6, 0 - movs r2, 0 - bl GetStringWidth - subs r4, r0 - lsrs r0, r4, 31 - adds r4, r0 - asrs r0, r4, 1 - lsls r2, r0, 24 - lsrs r2, 24 - str r7, [sp] - mov r0, r10 - str r0, [sp, 0x4] - mov r0, r9 - str r0, [sp, 0x8] - mov r0, r8 - str r0, [sp, 0xC] - str r6, [sp, 0x10] - movs r0, 0x3 - movs r1, 0 - movs r3, 0xA - bl AddTextPrinterParametrized2 - movs r0, 0x3 - bl sub_812CEE0 - add sp, 0x14 - pop {r3-r5} - mov r8, r3 - mov r9, r4 - mov r10, r5 - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_0812DAF8: .4byte gUnknown_203B0FC -_0812DAFC: .4byte gUnknown_3005EC8 -_0812DB00: .4byte gUnknown_845F89C -_0812DB04: .4byte gUnknown_845F5E3 -_0812DB08: .4byte gStringVar1 -_0812DB0C: .4byte gUnknown_845FA1C - thumb_func_end sub_812DA14 - thumb_func_start sub_812DB10 sub_812DB10: @ 812DB10 push {lr} diff --git a/include/battle_dome_cards.h b/include/battle_dome_cards.h index 48d165e9c..94c9876f3 100644 --- a/include/battle_dome_cards.h +++ b/include/battle_dome_cards.h @@ -11,5 +11,7 @@ u16 sub_818D8AC(u16 species, bool8 isFrontPic, s16 x, s16 y, u8 paletteSlot, u16 u16 sub_818D8F0(u16 spriteId); u16 sub_818D938(u16 species, bool8 isFrontPic, u16 destX, u16 destY, u8 paletteSlot, u8 windowId); u8 sub_818D97C(u8 a0, u8 a1); +u8 sub_810C2A4(u16, u8, s16, s16, u8, u16); +void sub_810C2E8(u16); #endif //GUARD_BATTLE_DOME_CARDS_H diff --git a/include/text.h b/include/text.h index 2bda590c1..e127f103a 100644 --- a/include/text.h +++ b/include/text.h @@ -161,7 +161,7 @@ extern const struct FontInfo *gFonts; struct GlyphWidthFunc { u32 font_id; - u32 (*func)(u16 glyphId, bool32 isJapanese); + s32 (*func)(u16 glyphId, bool32 isJapanese); }; struct KeypadIcon @@ -224,9 +224,9 @@ bool16 TextPrinterWaitWithDownArrow(struct TextPrinter *textPrinter); bool16 TextPrinterWait(struct TextPrinter *textPrinter); void DrawDownArrow(u8 windowId, u16 x, u16 y, u8 bgColor, bool8 drawArrow, u8 *counter, u8 *yCoordIndex); u16 RenderText(struct TextPrinter *textPrinter); -u32 GetStringWidthFixedWidthFont(const u8 *str, u8 fontId, u8 letterSpacing); -u32 (*GetFontWidthFunc(u8 glyphId))(u16, bool32); -u32 GetStringWidth(u8 fontId, const u8 *str, s16 letterSpacing); +s32 GetStringWidthFixedWidthFont(const u8 *str, u8 fontId, u8 letterSpacing); +s32 (*GetFontWidthFunc(u8 glyphId))(u16, bool32); +s32 GetStringWidth(u8 fontId, const u8 *str, s16 letterSpacing); u8 RenderTextFont9(u8 *pixels, u8 fontId, u8 *str); u8 DrawKeypadIcon(u8 windowId, u8 keypadIconId, u16 x, u16 y); u8 GetKeypadIconTileOffset(u8 keypadIconId); @@ -236,19 +236,19 @@ void SetDefaultFontsPointer(void); u8 GetFontAttribute(u8 fontId, u8 attributeId); u8 GetMenuCursorDimensionByFont(u8 fontId, u8 whichDimension); void DecompressGlyphFont0(u16 glyphId, bool32 isJapanese); -u32 GetGlyphWidthFont0(u16 glyphId, bool32 isJapanese); +s32 GetGlyphWidthFont0(u16 glyphId, bool32 isJapanese); void DecompressGlyphFont7(u16 glyphId, bool32 isJapanese); -u32 GetGlyphWidthFont7(u16 glyphId, bool32 isJapanese); +s32 GetGlyphWidthFont7(u16 glyphId, bool32 isJapanese); void DecompressGlyphFont8(u16 glyphId, bool32 isJapanese); -u32 GetGlyphWidthFont8(u16 glyphId, bool32 isJapanese); +s32 GetGlyphWidthFont8(u16 glyphId, bool32 isJapanese); void DecompressGlyphFont2(u16 glyphId, bool32 isJapanese); -u32 GetGlyphWidthFont2(u16 glyphId, bool32 isJapanese); +s32 GetGlyphWidthFont2(u16 glyphId, bool32 isJapanese); void DecompressGlyphFont1(u16 glyphId, bool32 isJapanese); -u32 GetGlyphWidthFont1(u16 glyphId, bool32 isJapanese); +s32 GetGlyphWidthFont1(u16 glyphId, bool32 isJapanese); void DecompressGlyphFont9(u16 glyphId); -u32 GetGlyphWidthFont3(u16 glyphId, bool32 isJapanese); -u32 GetGlyphWidthFont4(u16 glyphId, bool32 isJapanese); -u32 GetGlyphWidthFont5(u16 glyphId, bool32 isJapanese); +s32 GetGlyphWidthFont3(u16 glyphId, bool32 isJapanese); +s32 GetGlyphWidthFont4(u16 glyphId, bool32 isJapanese); +s32 GetGlyphWidthFont5(u16 glyphId, bool32 isJapanese); void sub_80062B0(struct Sprite *sprite); #endif // GUARD_TEXT_H diff --git a/src/fame_checker.c b/src/fame_checker.c index c5039fa5f..0c7072fb4 100644 --- a/src/fame_checker.c +++ b/src/fame_checker.c @@ -109,6 +109,7 @@ void sub_812DB28(void); void sub_812E000(void); void sub_812E048(void); u16 sub_812E064(void); +void sub_812E094(u8); void sub_812E110(u8 taskId); void sub_812E178(u8 a0, s16 a1); void sub_812E4A4(u8 a0); @@ -119,9 +120,18 @@ extern const u8 gUnknown_841E5B9[]; extern const u8 gUnknown_841E5D2[]; extern const u16 gUnknown_845C600[]; -extern const u8 *const gUnknown_845F63C[]; +extern const u16 gUnknown_845DD20[]; +extern const u16 gUnknown_845E540[]; +extern const u16 gUnknown_845ED60[]; +extern const u16 gUnknown_845F580[]; +extern const u16 gUnknown_845F5C0[]; extern const struct TextColor gUnknown_845F5E0; +extern const struct TextColor gUnknown_845F5E3; +extern const u8 gUnknown_845F61C[]; +extern const u8 *const gUnknown_845F63C[]; extern const u8 *const gUnknown_845F6BC[]; +extern const u8 *const gUnknown_845F89C[]; +extern const u8 *const gUnknown_845FA1C[]; extern const u8 gUnknown_845F83C[]; extern const struct BgTemplate gUnknown_845FBF4[4]; extern const struct SpriteSheet gUnknown_845FB9C[]; @@ -130,6 +140,10 @@ extern const struct WindowTemplate gUnknown_845FC04[]; extern const struct SpriteTemplate gUnknown_845FC44; extern const struct SpriteTemplate gUnknown_845FC78; extern const struct SpriteTemplate gUnknown_845FCB8; +extern const struct SpriteTemplate gUnknown_845FCE4; +extern const struct SpriteTemplate gUnknown_845FCFC; +extern const struct SpriteTemplate gUnknown_845FD14; +extern const struct SpriteTemplate gUnknown_845FD2C; void sub_812C380(void) { @@ -833,3 +847,95 @@ void sub_812D814(void) FreeSpriteTilesByTag(SPRITETAG_1008); FreeSpriteTilesByTag(SPRITETAG_1009); } + +void sub_812D840(struct Sprite * sprite) +{ + if (sprite->data[0] == 1) + { + if (sprite->pos2.x - 10 < 0) + { + sprite->pos2.x = 0; + sprite->data[0] = 0; + } + else + sprite->pos2.x -= 10; + } + else if (sprite->data[0] == 2) + { + if (sprite->pos2.x > 240) + { + sprite->pos2.x = 240; + sprite->data[0] = 0; + } + else + sprite->pos2.x += 10; + } +} + +u8 sub_812D888(u8 a0) +{ + u8 r4; + if (a0 == 1) + { + r4 = CreateSprite(&gUnknown_845FCE4, 0x94, 0x42, 0); + LoadPalette(gUnknown_845ED60, 0x160, 0x20); + gSprites[r4].oam.paletteNum = 6; + } + else if (a0 == 14) + { + r4 = CreateSprite(&gUnknown_845FCFC, 0x94, 0x42, 0); + LoadPalette(gUnknown_845DD20, 0x160, 0x20); + gSprites[r4].oam.paletteNum = 6; + } + else if (a0 == 0) + { + r4 = CreateSprite(&gUnknown_845FD14, 0x94, 0x42, 0); + LoadPalette(gUnknown_845F580, 0x160, 0x20); + gSprites[r4].oam.paletteNum = 6; + } + else if (a0 == 13) + { + r4 = CreateSprite(&gUnknown_845FD2C, 0x94, 0x42, 0); + LoadPalette(gUnknown_845E540, 0x160, 0x20); + gSprites[r4].oam.paletteNum = 6; + } + else + { + r4 = sub_810C2A4(gUnknown_845F61C[a0], 1, 0x94, 0x42, 6, 0xFFFF); + } + gSprites[r4].callback = sub_812D840; + if (gSaveBlock1Ptr->fameChecker[a0].unk_0_0 == 1) + LoadPalette(gUnknown_845F5C0, 0x160, 0x20); + return r4; +} + +void sub_812D9A8(u8 taskId, u16 a1) +{ + s16 * data = gTasks[taskId].data; + u16 r1 = a1; + if (a1 == gUnknown_203B0FC->unk_07_2 - 1) + r1 = a1 - 1; + if ( gUnknown_203B0FC->unk_0C[r1] == 1 + || gUnknown_203B0FC->unk_0C[r1] == 14 + || gUnknown_203B0FC->unk_0C[r1] == 0 + || gUnknown_203B0FC->unk_0C[r1] == 13 + ) + DestroySprite(&gSprites[data[2]]); + else + sub_810C2E8(data[2]); +} + +void sub_812DA14(u8 a0) +{ + s32 width; + u32 r5 = 6 * gUnknown_203B0FC->unk_0C[sub_812E064()] + a0; + sub_812E094(1); + gUnknown_3005EC8 = 1; + FillWindowPixelRect(3, 0x00, 0, 0, 0x58, 0x20); + width = (0x54 - GetStringWidth(0, gUnknown_845F89C[r5], 0)) / 2; + AddTextPrinterParametrized2(3, 0, width, 0, 0, 2, &gUnknown_845F5E3, -1, gUnknown_845F89C[r5]); + StringExpandPlaceholders(gStringVar1, gUnknown_845FA1C[r5]); + width = (0x54 - GetStringWidth(0, gStringVar1, 0)) / 2; + AddTextPrinterParametrized2(3, 0, width, 10, 0, 2, &gUnknown_845F5E3, -1, gStringVar1); + sub_812CEE0(3); +} diff --git a/src/text.c b/src/text.c index d4d25b5aa..874e12fd5 100644 --- a/src/text.c +++ b/src/text.c @@ -17,7 +17,7 @@ extern void BlitBitmapRectToWindow(u8 windowId, const u8 *pixels, u16 srcX, u16 extern u8 GetKeypadIconWidth(u8 keypadIconId); extern void CopyWindowToVram(u8 windowId, u8 mode); extern u16 Font6Func(struct TextPrinter *textPrinter); -extern u32 GetGlyphWidthFont6(u16 glyphId, bool32 isJapanese); +extern s32 GetGlyphWidthFont6(u16 glyphId, bool32 isJapanese); extern void PlaySE(u16 songNum); extern u8* UnkTextUtil_GetPtrI(u8 a1); @@ -1388,7 +1388,7 @@ _08005D6A:\n\ .syntax divided"); } -u32 GetStringWidthFixedWidthFont(const u8 *str, u8 fontId, u8 letterSpacing) +s32 GetStringWidthFixedWidthFont(const u8 *str, u8 fontId, u8 letterSpacing) { int i; u8 width; @@ -1479,7 +1479,7 @@ u32 GetStringWidthFixedWidthFont(const u8 *str, u8 fontId, u8 letterSpacing) return (u8)(GetFontAttribute(fontId, 0) + letterSpacing) * width; } -u32 (*GetFontWidthFunc(u8 glyphId))(u16 _glyphId, bool32 _isJapanese) +s32 (*GetFontWidthFunc(u8 glyphId))(u16 _glyphId, bool32 _isJapanese) { u32 i; @@ -1492,11 +1492,11 @@ u32 (*GetFontWidthFunc(u8 glyphId))(u16 _glyphId, bool32 _isJapanese) return NULL; } -u32 GetStringWidth(u8 fontId, const u8 *str, s16 letterSpacing) +s32 GetStringWidth(u8 fontId, const u8 *str, s16 letterSpacing) { bool8 isJapanese; int minGlyphWidth; - u32 (*func)(u16 glyphId, bool32 isJapanese); + s32 (*func)(u16 glyphId, bool32 isJapanese); int localLetterSpacing; register u32 lineWidth asm("r5"); u8 *bufferPointer; @@ -1863,7 +1863,7 @@ void DecompressGlyphFont0(u16 glyphId, bool32 isJapanese) } } -u32 GetGlyphWidthFont0(u16 glyphId, bool32 isJapanese) +s32 GetGlyphWidthFont0(u16 glyphId, bool32 isJapanese) { if (isJapanese == TRUE) return 8; @@ -1896,7 +1896,7 @@ void DecompressGlyphFont1(u16 glyphId, bool32 isJapanese) } } -u32 GetGlyphWidthFont1(u16 glyphId, bool32 isJapanese) +s32 GetGlyphWidthFont1(u16 glyphId, bool32 isJapanese) { if (isJapanese == TRUE) return 8; @@ -1962,7 +1962,7 @@ void DecompressGlyphFont2(u16 glyphId, bool32 isJapanese) } } -u32 GetGlyphWidthFont2(u16 glyphId, bool32 isJapanese) +s32 GetGlyphWidthFont2(u16 glyphId, bool32 isJapanese) { if (isJapanese == TRUE) { @@ -2012,7 +2012,7 @@ void DecompressGlyphFont3(u16 glyphId, bool32 isJapanese) DecompressGlyphFont2(glyphId, isJapanese); } -u32 GetGlyphWidthFont3(u16 glyphId, bool32 isJapanese) +s32 GetGlyphWidthFont3(u16 glyphId, bool32 isJapanese) { if(isJapanese == TRUE) return 10; @@ -2078,7 +2078,7 @@ void DecompressGlyphFont4(u16 glyphId, bool32 isJapanese) } } -u32 GetGlyphWidthFont4(u16 glyphId, bool32 isJapanese) +s32 GetGlyphWidthFont4(u16 glyphId, bool32 isJapanese) { if(isJapanese == TRUE) { @@ -2149,7 +2149,7 @@ void DecompressGlyphFont5(u16 glyphId, bool32 isJapanese) } } -u32 GetGlyphWidthFont5(u16 glyphId, bool32 isJapanese) +s32 GetGlyphWidthFont5(u16 glyphId, bool32 isJapanese) { if(isJapanese == TRUE) { -- cgit v1.2.3 From 82c7bd49aa07293c840254bccc144836057f2c65 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sun, 25 Nov 2018 21:58:52 -0500 Subject: through sub_812DB64 --- asm/fame_checker.s | 91 ----------------------------------------------------- include/list_menu.h | 29 ++++++++--------- src/fame_checker.c | 49 ++++++++++++++++++++++++----- 3 files changed, 57 insertions(+), 112 deletions(-) diff --git a/asm/fame_checker.s b/asm/fame_checker.s index aa0cb17c4..471e9921b 100644 --- a/asm/fame_checker.s +++ b/asm/fame_checker.s @@ -5,97 +5,6 @@ .text - thumb_func_start sub_812DB10 -sub_812DB10: @ 812DB10 - push {lr} - movs r0, 0 - bl sub_812E094 - ldr r1, _0812DB24 @ =gUnknown_3005EC8 - movs r0, 0xFF - strb r0, [r1] - pop {r0} - bx r0 - .align 2, 0 -_0812DB24: .4byte gUnknown_3005EC8 - thumb_func_end sub_812DB10 - - thumb_func_start sub_812DB28 -sub_812DB28: @ 812DB28 - push {r4,lr} - bl sub_812DB64 - bl sub_812DEF0 - ldr r4, _0812DB5C @ =gUnknown_203B0FC - ldr r3, [r4] - lsls r0, 2 - ldrb r2, [r3, 0x7] - movs r1, 0x3 - ands r1, r2 - orrs r1, r0 - strb r1, [r3, 0x7] - ldr r0, _0812DB60 @ =gUnknown_3005EB0 - movs r1, 0 - movs r2, 0 - bl ListMenuInit - ldr r1, [r4] - strb r0, [r1, 0x8] - movs r0, 0 - bl sub_812DFE4 - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_0812DB5C: .4byte gUnknown_203B0FC -_0812DB60: .4byte gUnknown_3005EB0 - thumb_func_end sub_812DB28 - - thumb_func_start sub_812DB64 -sub_812DB64: @ 812DB64 - ldr r2, _0812DBB4 @ =gUnknown_3005EB0 - ldr r0, _0812DBB8 @ =gUnknown_203B100 - ldr r0, [r0] - str r0, [r2] - ldr r0, _0812DBBC @ =sub_812DBC0 - str r0, [r2, 0x4] - movs r0, 0 - str r0, [r2, 0x8] - movs r1, 0 - movs r0, 0x1 - strh r0, [r2, 0xC] - strh r0, [r2, 0xE] - strb r1, [r2, 0x10] - strb r1, [r2, 0x11] - movs r0, 0x8 - strb r0, [r2, 0x12] - strb r1, [r2, 0x13] - ldrb r1, [r2, 0x14] - subs r0, 0x18 - ands r0, r1 - movs r1, 0x4 - orrs r0, r1 - movs r1, 0xF - ands r0, r1 - movs r1, 0x20 - orrs r0, r1 - strb r0, [r2, 0x14] - movs r0, 0x30 - strb r0, [r2, 0x15] - movs r3, 0x3F - movs r0, 0 - strb r0, [r2, 0x16] - ldrb r1, [r2, 0x17] - subs r0, 0x40 - ands r0, r1 - movs r1, 0x2 - orrs r0, r1 - ands r0, r3 - strb r0, [r2, 0x17] - bx lr - .align 2, 0 -_0812DBB4: .4byte gUnknown_3005EB0 -_0812DBB8: .4byte gUnknown_203B100 -_0812DBBC: .4byte sub_812DBC0 - thumb_func_end sub_812DB64 - thumb_func_start sub_812DBC0 sub_812DBC0: @ 812DBC0 push {r4-r7,lr} diff --git a/include/list_menu.h b/include/list_menu.h index 89adeaba0..fc829940e 100644 --- a/include/list_menu.h +++ b/include/list_menu.h @@ -18,22 +18,23 @@ struct ListMenu; struct ListMenuTemplate { const struct ListMenuItem *items; - void (* unk_04)(u32, bool8, struct ListMenu *); - void (* unk_08)(u8, s32, u8); + void (* moveCursorFunc)(s32 itemIndex, bool8 onInit, struct ListMenu *list); + void (* itemPrintFunc)(u8 windowId, s32 itemId, u8 y); u16 totalItems; u16 maxShowed; - u8 unk_10; - u8 unk_11; - u8 unk_12; - u8 cursor_Y; - u32 upText_Y:4; // x1, x2, x4, x8 = xF - u32 cursorColor:4; // x10, x20, x40, x80 = xF0 - u32 fillColor:4; // x100, x200, x400, x800 = xF00 - u32 cursorShadowColor:4; // x1000, x2000, x4000, x8000 = xF000 - u32 unk_16_0:1; // x10000 - u32 spaceBetweenItems:6; // x20000, x40000, x80000, x100000, x200000, x400000 = x7E0000 - u32 unk_16_7:1; // x800000 - u32 unk_17_0:6; // x1000000, x2000000, x4000000, x8000000, x10000000, x20000000 = x3F000000 + u8 windowId; + u8 header_X; + u8 item_X; + u8 cursor_X; + u8 upText_Y:4; // x1, x2, x4, x8 = xF + u8 cursorPal:4; // x10, x20, x40, x80 = xF0 + u8 fillValue:4; // x1, x2, x4, x8 = xF + u8 cursorShadowPal:4; // x10, x20, x40, x80 = xF0 + u8 lettersSpacing:3; + u8 itemVerticalPadding:3; + u8 scrollMultiple:2; // x40, x80 = xC0 + u8 fontId:6; // x1, x2, x4, x8, x10, x20 = x3F + u8 cursorKind:2; // x40, x80 }; struct ListMenu { diff --git a/src/fame_checker.c b/src/fame_checker.c index 0c7072fb4..203d1ca6c 100644 --- a/src/fame_checker.c +++ b/src/fame_checker.c @@ -50,16 +50,11 @@ struct FameCheckerData u8 unk_23_2:1; }; -struct FameCheckerData2 -{ - u8 filler_00[0x88]; -}; - EWRAM_DATA u16 * gUnknown_203B0F0 = NULL; EWRAM_DATA u16 * gUnknown_203B0F4 = NULL; EWRAM_DATA u16 * gUnknown_203B0F8 = NULL; EWRAM_DATA struct FameCheckerData * gUnknown_203B0FC = NULL; -EWRAM_DATA struct FameCheckerData2 * gUnknown_203B100 = NULL; +EWRAM_DATA struct ListMenuItem * gUnknown_203B100 = NULL; EWRAM_DATA u32 gUnknown_203B104 = 0; struct ListMenuTemplate gUnknown_3005EB0; @@ -106,6 +101,10 @@ void sub_812D9A8(u8 a0, u16 a1); void sub_812DA14(u8 a0); void sub_812DB10(void); void sub_812DB28(void); +void sub_812DB64(void); +void sub_812DBC0(s32, bool8, struct ListMenu *); +u8 sub_812DEF0(void); +void sub_812DFE4(u8); void sub_812E000(void); void sub_812E048(void); u16 sub_812E064(void); @@ -225,7 +224,7 @@ void sub_812C3F8(void) InitWindows(gUnknown_845FC04); DeactivateAllTextPrinters(); sub_812CEC0(); - gUnknown_203B100 = AllocZeroed(sizeof(struct FameCheckerData2)); + gUnknown_203B100 = AllocZeroed(17 * sizeof(struct ListMenuItem)); sub_812DB28(); gMain.state++; break; @@ -939,3 +938,39 @@ void sub_812DA14(u8 a0) AddTextPrinterParametrized2(3, 0, width, 10, 0, 2, &gUnknown_845F5E3, -1, gStringVar1); sub_812CEE0(3); } + +void sub_812DB10(void) +{ + sub_812E094(0); + gUnknown_3005EC8 = 0xFF; +} + +void sub_812DB28(void) +{ + sub_812DB64(); + gUnknown_203B0FC->unk_07_2 = sub_812DEF0(); + gUnknown_203B0FC->unk_08 = ListMenuInit(&gUnknown_3005EB0, 0, 0); + sub_812DFE4(0); +} + +void sub_812DB64(void) +{ + gUnknown_3005EB0.items = gUnknown_203B100; + gUnknown_3005EB0.moveCursorFunc = sub_812DBC0; + gUnknown_3005EB0.itemPrintFunc = NULL; + gUnknown_3005EB0.totalItems = 1; + gUnknown_3005EB0.maxShowed = 1; + gUnknown_3005EB0.windowId = 0; + gUnknown_3005EB0.header_X = 0; + gUnknown_3005EB0.item_X = 8; + gUnknown_3005EB0.cursor_X = 0; + gUnknown_3005EB0.upText_Y = 4; + gUnknown_3005EB0.cursorPal = 2; + gUnknown_3005EB0.fillValue = 0; + gUnknown_3005EB0.cursorShadowPal = 3; + gUnknown_3005EB0.lettersSpacing = 0; + gUnknown_3005EB0.itemVerticalPadding = 0; + gUnknown_3005EB0.scrollMultiple = 0; + gUnknown_3005EB0.fontId = 2; + gUnknown_3005EB0.cursorKind = 0; +} -- cgit v1.2.3 From 03af56b30e397e432f8815ba66de173a5be6501b Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Mon, 26 Nov 2018 08:48:14 -0500 Subject: nonmatching sub_812DBC0 --- asm/fame_checker.s | 195 -------------------------------------- src/fame_checker.c | 270 ++++++++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 269 insertions(+), 196 deletions(-) diff --git a/asm/fame_checker.s b/asm/fame_checker.s index 471e9921b..b0a357af1 100644 --- a/asm/fame_checker.s +++ b/asm/fame_checker.s @@ -5,201 +5,6 @@ .text - thumb_func_start sub_812DBC0 -sub_812DBC0: @ 812DBC0 - push {r4-r7,lr} - mov r7, r10 - mov r6, r9 - mov r5, r8 - push {r5-r7} - sub sp, 0xC - adds r7, r0, 0 - lsls r1, 24 - lsrs r1, 24 - ldr r0, _0812DC68 @ =gUnknown_203B104 - mov r10, r0 - movs r2, 0 - mov r8, r2 - str r2, [r0] - ldr r6, _0812DC6C @ =gUnknown_203B0FC - ldr r0, [r6] - ldrb r2, [r0, 0xA] - ldrb r0, [r0, 0xB] - adds r2, r0 - mov r9, r2 - adds r0, r7, 0 - bl sub_812DDF0 - ldr r0, _0812DC70 @ =sub_812C694 - bl FindTaskIdByFunc - lsls r0, 24 - lsrs r4, r0, 24 - cmp r4, 0xFF - bne _0812DBFE - b _0812DD3A -_0812DBFE: - lsls r0, r4, 2 - adds r0, r4 - lsls r0, 3 - ldr r1, _0812DC74 @ =gTasks - adds r5, r0, r1 - movs r0, 0x5 - bl PlaySE - mov r0, r8 - strh r0, [r5, 0xA] - ldr r0, [r6] - ldrb r0, [r0, 0x8] - add r1, sp, 0x8 - movs r2, 0 - bl get_coro_args_x18_x1A - ldr r1, [r6] - add r0, sp, 0x8 - ldrh r0, [r0] - strh r0, [r1, 0x4] - ldrb r0, [r1, 0x7] - lsrs r0, 2 - subs r0, 0x1 - cmp r7, r0 - beq _0812DCD8 - bl sub_812D174 - lsls r0, r7, 24 - lsrs r0, 24 - bl sub_812D1A8 - ldr r2, [r6] - ldrb r1, [r2, 0x7] - movs r0, 0x2 - ands r0, r1 - cmp r0, 0 - beq _0812DCBC - adds r0, r2, 0 - adds r0, 0x23 - ldrb r1, [r0] - movs r0, 0x4 - ands r0, r1 - cmp r0, 0 - bne _0812DC7C - adds r0, r4, 0 - mov r1, r9 - bl sub_812D9A8 - mov r1, r10 - str r7, [r1] - ldr r0, _0812DC78 @ =sub_812DD50 - str r0, [r5] - b _0812DD3A - .align 2, 0 -_0812DC68: .4byte gUnknown_203B104 -_0812DC6C: .4byte gUnknown_203B0FC -_0812DC70: .4byte sub_812C694 -_0812DC74: .4byte gTasks -_0812DC78: .4byte sub_812DD50 -_0812DC7C: - ldr r4, _0812DCB8 @ =gSprites - movs r2, 0xC - ldrsh r0, [r5, r2] - lsls r1, r0, 4 - adds r1, r0 - lsls r1, 2 - adds r1, r4 - adds r1, 0x3E - ldrb r3, [r1] - movs r2, 0x5 - negs r2, r2 - adds r0, r2, 0 - ands r0, r3 - strb r0, [r1] - ldr r0, [r6] - adds r0, 0x23 - ldrb r1, [r0] - ands r2, r1 - strb r2, [r0] - movs r0, 0xC - ldrsh r1, [r5, r0] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - adds r0, r4 - mov r1, r8 - strh r1, [r0, 0x2E] - bl sub_812CD3C - b _0812DD3A - .align 2, 0 -_0812DCB8: .4byte gSprites -_0812DCBC: - movs r0, 0xD0 - str r0, [sp] - movs r0, 0x20 - str r0, [sp, 0x4] - movs r0, 0x2 - movs r1, 0x11 - movs r2, 0 - movs r3, 0 - bl FillWindowPixelRect - movs r0, 0x2 - bl sub_812CEE0 - b _0812DD3A -_0812DCD8: - bl sub_812DDAC - ldr r0, [r6] - ldrb r1, [r0, 0x7] - movs r0, 0x2 - ands r0, r1 - cmp r0, 0 - beq _0812DD10 - ldr r2, _0812DD0C @ =gSprites - movs r0, 0xC - ldrsh r1, [r5, r0] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - adds r0, r2 - adds r0, 0x3E - ldrb r1, [r0] - movs r2, 0x4 - orrs r1, r2 - strb r1, [r0] - ldr r1, [r6] - adds r1, 0x23 - ldrb r0, [r1] - orrs r0, r2 - strb r0, [r1] - b _0812DD3A - .align 2, 0 -_0812DD0C: .4byte gSprites -_0812DD10: - movs r2, 0 - ldr r5, _0812DD4C @ =gSprites - adds r4, r6, 0 - movs r3, 0x4 -_0812DD18: - ldr r0, [r4] - adds r0, 0x1D - adds r0, r2 - ldrb r1, [r0] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - adds r0, r5 - adds r0, 0x3E - ldrb r1, [r0] - orrs r1, r3 - strb r1, [r0] - adds r0, r2, 0x1 - lsls r0, 24 - lsrs r2, r0, 24 - cmp r2, 0x5 - bls _0812DD18 -_0812DD3A: - add sp, 0xC - pop {r3-r5} - mov r8, r3 - mov r9, r4 - mov r10, r5 - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_0812DD4C: .4byte gSprites - thumb_func_end sub_812DBC0 - thumb_func_start sub_812DD50 sub_812DD50: @ 812DD50 push {r4,lr} diff --git a/src/fame_checker.c b/src/fame_checker.c index 203d1ca6c..02afdc937 100644 --- a/src/fame_checker.c +++ b/src/fame_checker.c @@ -55,7 +55,7 @@ EWRAM_DATA u16 * gUnknown_203B0F4 = NULL; EWRAM_DATA u16 * gUnknown_203B0F8 = NULL; EWRAM_DATA struct FameCheckerData * gUnknown_203B0FC = NULL; EWRAM_DATA struct ListMenuItem * gUnknown_203B100 = NULL; -EWRAM_DATA u32 gUnknown_203B104 = 0; +EWRAM_DATA s32 gUnknown_203B104 = 0; struct ListMenuTemplate gUnknown_3005EB0; u8 gUnknown_3005EC8; @@ -103,6 +103,9 @@ void sub_812DB10(void); void sub_812DB28(void); void sub_812DB64(void); void sub_812DBC0(s32, bool8, struct ListMenu *); +void sub_812DD50(u8 taskId); +void sub_812DDAC(void); +void sub_812DDF0(s32 itemIndex, bool8 onInit); u8 sub_812DEF0(void); void sub_812DFE4(u8); void sub_812E000(void); @@ -974,3 +977,268 @@ void sub_812DB64(void) gUnknown_3005EB0.fontId = 2; gUnknown_3005EB0.cursorKind = 0; } + +#ifdef NONMATCHING +void sub_812DBC0(s32 itemIndex, bool8 onInit, struct ListMenu *list) +{ + u16 sp8[2]; + u8 taskId; + s32 r9; + gUnknown_203B104 = 0; + r9 = gUnknown_203B0FC->unk_0A + gUnknown_203B0FC->unk_0B; + sub_812DDF0(itemIndex, onInit); + taskId = FindTaskIdByFunc(sub_812C694); + if (taskId != 0xFF) + { + struct Task *task = &gTasks[taskId]; + PlaySE(SE_SELECT); + task->data[1] = 0; + get_coro_args_x18_x1A(gUnknown_203B0FC->unk_08, sp8, NULL); + gUnknown_203B0FC->unk_04 = sp8[0]; + if (itemIndex != gUnknown_203B0FC->unk_07_2 - 1) + { + sub_812D174(); + sub_812D1A8(itemIndex); + if (gUnknown_203B0FC->unk_07_1) + { + if (!gUnknown_203B0FC->unk_23_2) + { + /* + * The following two instructions compile in the wrong order: + * adds r0, r4, 0 + * mov r1, r9 + */ + sub_812D9A8(taskId, r9); + gUnknown_203B104 = itemIndex; + task->func = sub_812DD50; + } + else + { + gSprites[task->data[2]].invisible = FALSE; + gUnknown_203B0FC->unk_23_2 = FALSE; + gSprites[task->data[2]].data[0] = 0; + sub_812CD3C(); + } + } + else + { + FillWindowPixelRect(2, 0x11, 0, 0, 0xd0, 0x20); + sub_812CEE0(2); + } + } + else + { + sub_812DDAC(); + if (gUnknown_203B0FC->unk_07_1) + { + gSprites[task->data[2]].invisible = TRUE; + gUnknown_203B0FC->unk_23_2 = TRUE; + } + else + { + u8 r2; + for (r2 = 0; r2 < 6; r2++) + { + gSprites[gUnknown_203B0FC->unk_1D[r2]].invisible = TRUE; + } + } + } + } +} +#else +NAKED +void sub_812DBC0(s32 itemIndex, bool8 onInit, struct ListMenu * list) +{ + asm_unified( "push {r4-r7,lr}\n" + "\tmov r7, r10\n" + "\tmov r6, r9\n" + "\tmov r5, r8\n" + "\tpush {r5-r7}\n" + "\tsub sp, 0xC\n" + "\tadds r7, r0, 0\n" + "\tlsls r1, 24\n" + "\tlsrs r1, 24\n" + "\tldr r0, _0812DC68 @ =gUnknown_203B104\n" + "\tmov r10, r0\n" + "\tmovs r2, 0\n" + "\tmov r8, r2\n" + "\tstr r2, [r0]\n" + "\tldr r6, _0812DC6C @ =gUnknown_203B0FC\n" + "\tldr r0, [r6]\n" + "\tldrb r2, [r0, 0xA]\n" + "\tldrb r0, [r0, 0xB]\n" + "\tadds r2, r0\n" + "\tmov r9, r2\n" + "\tadds r0, r7, 0\n" + "\tbl sub_812DDF0\n" + "\tldr r0, _0812DC70 @ =sub_812C694\n" + "\tbl FindTaskIdByFunc\n" + "\tlsls r0, 24\n" + "\tlsrs r4, r0, 24\n" + "\tcmp r4, 0xFF\n" + "\tbne _0812DBFE\n" + "\tb _0812DD3A\n" + "_0812DBFE:\n" + "\tlsls r0, r4, 2\n" + "\tadds r0, r4\n" + "\tlsls r0, 3\n" + "\tldr r1, _0812DC74 @ =gTasks\n" + "\tadds r5, r0, r1\n" + "\tmovs r0, 0x5\n" + "\tbl PlaySE\n" + "\tmov r0, r8\n" + "\tstrh r0, [r5, 0xA]\n" + "\tldr r0, [r6]\n" + "\tldrb r0, [r0, 0x8]\n" + "\tadd r1, sp, 0x8\n" + "\tmovs r2, 0\n" + "\tbl get_coro_args_x18_x1A\n" + "\tldr r1, [r6]\n" + "\tadd r0, sp, 0x8\n" + "\tldrh r0, [r0]\n" + "\tstrh r0, [r1, 0x4]\n" + "\tldrb r0, [r1, 0x7]\n" + "\tlsrs r0, 2\n" + "\tsubs r0, 0x1\n" + "\tcmp r7, r0\n" + "\tbeq _0812DCD8\n" + "\tbl sub_812D174\n" + "\tlsls r0, r7, 24\n" + "\tlsrs r0, 24\n" + "\tbl sub_812D1A8\n" + "\tldr r2, [r6]\n" + "\tldrb r1, [r2, 0x7]\n" + "\tmovs r0, 0x2\n" + "\tands r0, r1\n" + "\tcmp r0, 0\n" + "\tbeq _0812DCBC\n" + "\tadds r0, r2, 0\n" + "\tadds r0, 0x23\n" + "\tldrb r1, [r0]\n" + "\tmovs r0, 0x4\n" + "\tands r0, r1\n" + "\tcmp r0, 0\n" + "\tbne _0812DC7C\n" + "\tadds r0, r4, 0\n" + "\tmov r1, r9\n" + "\tbl sub_812D9A8\n" + "\tmov r1, r10\n" + "\tstr r7, [r1]\n" + "\tldr r0, _0812DC78 @ =sub_812DD50\n" + "\tstr r0, [r5]\n" + "\tb _0812DD3A\n" + "\t.align 2, 0\n" + "_0812DC68: .4byte gUnknown_203B104\n" + "_0812DC6C: .4byte gUnknown_203B0FC\n" + "_0812DC70: .4byte sub_812C694\n" + "_0812DC74: .4byte gTasks\n" + "_0812DC78: .4byte sub_812DD50\n" + "_0812DC7C:\n" + "\tldr r4, _0812DCB8 @ =gSprites\n" + "\tmovs r2, 0xC\n" + "\tldrsh r0, [r5, r2]\n" + "\tlsls r1, r0, 4\n" + "\tadds r1, r0\n" + "\tlsls r1, 2\n" + "\tadds r1, r4\n" + "\tadds r1, 0x3E\n" + "\tldrb r3, [r1]\n" + "\tmovs r2, 0x5\n" + "\tnegs r2, r2\n" + "\tadds r0, r2, 0\n" + "\tands r0, r3\n" + "\tstrb r0, [r1]\n" + "\tldr r0, [r6]\n" + "\tadds r0, 0x23\n" + "\tldrb r1, [r0]\n" + "\tands r2, r1\n" + "\tstrb r2, [r0]\n" + "\tmovs r0, 0xC\n" + "\tldrsh r1, [r5, r0]\n" + "\tlsls r0, r1, 4\n" + "\tadds r0, r1\n" + "\tlsls r0, 2\n" + "\tadds r0, r4\n" + "\tmov r1, r8\n" + "\tstrh r1, [r0, 0x2E]\n" + "\tbl sub_812CD3C\n" + "\tb _0812DD3A\n" + "\t.align 2, 0\n" + "_0812DCB8: .4byte gSprites\n" + "_0812DCBC:\n" + "\tmovs r0, 0xD0\n" + "\tstr r0, [sp]\n" + "\tmovs r0, 0x20\n" + "\tstr r0, [sp, 0x4]\n" + "\tmovs r0, 0x2\n" + "\tmovs r1, 0x11\n" + "\tmovs r2, 0\n" + "\tmovs r3, 0\n" + "\tbl FillWindowPixelRect\n" + "\tmovs r0, 0x2\n" + "\tbl sub_812CEE0\n" + "\tb _0812DD3A\n" + "_0812DCD8:\n" + "\tbl sub_812DDAC\n" + "\tldr r0, [r6]\n" + "\tldrb r1, [r0, 0x7]\n" + "\tmovs r0, 0x2\n" + "\tands r0, r1\n" + "\tcmp r0, 0\n" + "\tbeq _0812DD10\n" + "\tldr r2, _0812DD0C @ =gSprites\n" + "\tmovs r0, 0xC\n" + "\tldrsh r1, [r5, r0]\n" + "\tlsls r0, r1, 4\n" + "\tadds r0, r1\n" + "\tlsls r0, 2\n" + "\tadds r0, r2\n" + "\tadds r0, 0x3E\n" + "\tldrb r1, [r0]\n" + "\tmovs r2, 0x4\n" + "\torrs r1, r2\n" + "\tstrb r1, [r0]\n" + "\tldr r1, [r6]\n" + "\tadds r1, 0x23\n" + "\tldrb r0, [r1]\n" + "\torrs r0, r2\n" + "\tstrb r0, [r1]\n" + "\tb _0812DD3A\n" + "\t.align 2, 0\n" + "_0812DD0C: .4byte gSprites\n" + "_0812DD10:\n" + "\tmovs r2, 0\n" + "\tldr r5, _0812DD4C @ =gSprites\n" + "\tadds r4, r6, 0\n" + "\tmovs r3, 0x4\n" + "_0812DD18:\n" + "\tldr r0, [r4]\n" + "\tadds r0, 0x1D\n" + "\tadds r0, r2\n" + "\tldrb r1, [r0]\n" + "\tlsls r0, r1, 4\n" + "\tadds r0, r1\n" + "\tlsls r0, 2\n" + "\tadds r0, r5\n" + "\tadds r0, 0x3E\n" + "\tldrb r1, [r0]\n" + "\torrs r1, r3\n" + "\tstrb r1, [r0]\n" + "\tadds r0, r2, 0x1\n" + "\tlsls r0, 24\n" + "\tlsrs r2, r0, 24\n" + "\tcmp r2, 0x5\n" + "\tbls _0812DD18\n" + "_0812DD3A:\n" + "\tadd sp, 0xC\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\n" + "\t.align 2, 0\n" + "_0812DD4C: .4byte gSprites"); +} +#endif // NONMATCHING -- cgit v1.2.3 From 840f8037e77885b664470910b072ee8dc4cd140d Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Mon, 26 Nov 2018 09:28:23 -0500 Subject: through sub_812DDAC; match sub_812DBC0 --- asm/fame_checker.s | 79 ------------------- src/fame_checker.c | 218 ++++------------------------------------------------- 2 files changed, 16 insertions(+), 281 deletions(-) diff --git a/asm/fame_checker.s b/asm/fame_checker.s index b0a357af1..fc6489bdd 100644 --- a/asm/fame_checker.s +++ b/asm/fame_checker.s @@ -5,85 +5,6 @@ .text - thumb_func_start sub_812DD50 -sub_812DD50: @ 812DD50 - push {r4,lr} - lsls r0, 24 - lsrs r0, 24 - lsls r4, r0, 2 - adds r4, r0 - lsls r4, 3 - ldr r0, _0812DD98 @ =gTasks - adds r4, r0 - ldr r0, _0812DD9C @ =gUnknown_203B0FC - ldr r0, [r0] - ldr r1, _0812DDA0 @ =gUnknown_203B104 - adds r0, 0xC - ldr r1, [r1] - adds r0, r1 - ldrb r0, [r0] - bl sub_812D888 - lsls r0, 24 - lsrs r0, 24 - movs r3, 0 - strh r0, [r4, 0xC] - ldr r2, _0812DDA4 @ =gSprites - movs r0, 0xC - ldrsh r1, [r4, r0] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - adds r0, r2 - strh r3, [r0, 0x2E] - bl sub_812CD3C - ldr r0, _0812DDA8 @ =sub_812C694 - str r0, [r4] - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_0812DD98: .4byte gTasks -_0812DD9C: .4byte gUnknown_203B0FC -_0812DDA0: .4byte gUnknown_203B104 -_0812DDA4: .4byte gSprites -_0812DDA8: .4byte sub_812C694 - thumb_func_end sub_812DD50 - - thumb_func_start sub_812DDAC -sub_812DDAC: @ 812DDAC - push {lr} - sub sp, 0x10 - movs r0, 0xD0 - str r0, [sp] - movs r0, 0x20 - str r0, [sp, 0x4] - movs r0, 0x2 - movs r1, 0x11 - movs r2, 0 - movs r3, 0 - bl FillWindowPixelRect - ldr r2, _0812DDEC @ =gUnknown_84181C3 - movs r0, 0 - str r0, [sp] - movs r0, 0x2 - str r0, [sp, 0x4] - movs r0, 0x1 - str r0, [sp, 0x8] - movs r0, 0x3 - str r0, [sp, 0xC] - movs r0, 0x2 - movs r1, 0x2 - movs r3, 0 - bl AddTextPrinterParametrized - movs r0, 0x2 - bl sub_812CEE0 - add sp, 0x10 - pop {r0} - bx r0 - .align 2, 0 -_0812DDEC: .4byte gUnknown_84181C3 - thumb_func_end sub_812DDAC - thumb_func_start sub_812DDF0 sub_812DDF0: @ 812DDF0 push {r4-r7,lr} diff --git a/src/fame_checker.c b/src/fame_checker.c index 02afdc937..8637f6e86 100644 --- a/src/fame_checker.c +++ b/src/fame_checker.c @@ -116,6 +116,7 @@ void sub_812E110(u8 taskId); void sub_812E178(u8 a0, s16 a1); void sub_812E4A4(u8 a0); +extern const u8 gUnknown_84181C3[]; extern const u8 gUnknown_84181E4[]; extern const u8 gUnknown_841E5A4[]; extern const u8 gUnknown_841E5B9[]; @@ -978,12 +979,11 @@ void sub_812DB64(void) gUnknown_3005EB0.cursorKind = 0; } -#ifdef NONMATCHING void sub_812DBC0(s32 itemIndex, bool8 onInit, struct ListMenu *list) { u16 sp8[2]; u8 taskId; - s32 r9; + u16 r9; gUnknown_203B104 = 0; r9 = gUnknown_203B0FC->unk_0A + gUnknown_203B0FC->unk_0B; sub_812DDF0(itemIndex, onInit); @@ -1003,11 +1003,6 @@ void sub_812DBC0(s32 itemIndex, bool8 onInit, struct ListMenu *list) { if (!gUnknown_203B0FC->unk_23_2) { - /* - * The following two instructions compile in the wrong order: - * adds r0, r4, 0 - * mov r1, r9 - */ sub_812D9A8(taskId, r9); gUnknown_203B104 = itemIndex; task->func = sub_812DD50; @@ -1045,200 +1040,19 @@ void sub_812DBC0(s32 itemIndex, bool8 onInit, struct ListMenu *list) } } } -#else -NAKED -void sub_812DBC0(s32 itemIndex, bool8 onInit, struct ListMenu * list) + +void sub_812DD50(u8 taskId) +{ + struct Task * task = &gTasks[taskId]; + task->data[2] = sub_812D888(gUnknown_203B0FC->unk_0C[gUnknown_203B104]); + gSprites[task->data[2]].data[0] = 0; + sub_812CD3C(); + task->func = sub_812C694; +} + +void sub_812DDAC(void) { - asm_unified( "push {r4-r7,lr}\n" - "\tmov r7, r10\n" - "\tmov r6, r9\n" - "\tmov r5, r8\n" - "\tpush {r5-r7}\n" - "\tsub sp, 0xC\n" - "\tadds r7, r0, 0\n" - "\tlsls r1, 24\n" - "\tlsrs r1, 24\n" - "\tldr r0, _0812DC68 @ =gUnknown_203B104\n" - "\tmov r10, r0\n" - "\tmovs r2, 0\n" - "\tmov r8, r2\n" - "\tstr r2, [r0]\n" - "\tldr r6, _0812DC6C @ =gUnknown_203B0FC\n" - "\tldr r0, [r6]\n" - "\tldrb r2, [r0, 0xA]\n" - "\tldrb r0, [r0, 0xB]\n" - "\tadds r2, r0\n" - "\tmov r9, r2\n" - "\tadds r0, r7, 0\n" - "\tbl sub_812DDF0\n" - "\tldr r0, _0812DC70 @ =sub_812C694\n" - "\tbl FindTaskIdByFunc\n" - "\tlsls r0, 24\n" - "\tlsrs r4, r0, 24\n" - "\tcmp r4, 0xFF\n" - "\tbne _0812DBFE\n" - "\tb _0812DD3A\n" - "_0812DBFE:\n" - "\tlsls r0, r4, 2\n" - "\tadds r0, r4\n" - "\tlsls r0, 3\n" - "\tldr r1, _0812DC74 @ =gTasks\n" - "\tadds r5, r0, r1\n" - "\tmovs r0, 0x5\n" - "\tbl PlaySE\n" - "\tmov r0, r8\n" - "\tstrh r0, [r5, 0xA]\n" - "\tldr r0, [r6]\n" - "\tldrb r0, [r0, 0x8]\n" - "\tadd r1, sp, 0x8\n" - "\tmovs r2, 0\n" - "\tbl get_coro_args_x18_x1A\n" - "\tldr r1, [r6]\n" - "\tadd r0, sp, 0x8\n" - "\tldrh r0, [r0]\n" - "\tstrh r0, [r1, 0x4]\n" - "\tldrb r0, [r1, 0x7]\n" - "\tlsrs r0, 2\n" - "\tsubs r0, 0x1\n" - "\tcmp r7, r0\n" - "\tbeq _0812DCD8\n" - "\tbl sub_812D174\n" - "\tlsls r0, r7, 24\n" - "\tlsrs r0, 24\n" - "\tbl sub_812D1A8\n" - "\tldr r2, [r6]\n" - "\tldrb r1, [r2, 0x7]\n" - "\tmovs r0, 0x2\n" - "\tands r0, r1\n" - "\tcmp r0, 0\n" - "\tbeq _0812DCBC\n" - "\tadds r0, r2, 0\n" - "\tadds r0, 0x23\n" - "\tldrb r1, [r0]\n" - "\tmovs r0, 0x4\n" - "\tands r0, r1\n" - "\tcmp r0, 0\n" - "\tbne _0812DC7C\n" - "\tadds r0, r4, 0\n" - "\tmov r1, r9\n" - "\tbl sub_812D9A8\n" - "\tmov r1, r10\n" - "\tstr r7, [r1]\n" - "\tldr r0, _0812DC78 @ =sub_812DD50\n" - "\tstr r0, [r5]\n" - "\tb _0812DD3A\n" - "\t.align 2, 0\n" - "_0812DC68: .4byte gUnknown_203B104\n" - "_0812DC6C: .4byte gUnknown_203B0FC\n" - "_0812DC70: .4byte sub_812C694\n" - "_0812DC74: .4byte gTasks\n" - "_0812DC78: .4byte sub_812DD50\n" - "_0812DC7C:\n" - "\tldr r4, _0812DCB8 @ =gSprites\n" - "\tmovs r2, 0xC\n" - "\tldrsh r0, [r5, r2]\n" - "\tlsls r1, r0, 4\n" - "\tadds r1, r0\n" - "\tlsls r1, 2\n" - "\tadds r1, r4\n" - "\tadds r1, 0x3E\n" - "\tldrb r3, [r1]\n" - "\tmovs r2, 0x5\n" - "\tnegs r2, r2\n" - "\tadds r0, r2, 0\n" - "\tands r0, r3\n" - "\tstrb r0, [r1]\n" - "\tldr r0, [r6]\n" - "\tadds r0, 0x23\n" - "\tldrb r1, [r0]\n" - "\tands r2, r1\n" - "\tstrb r2, [r0]\n" - "\tmovs r0, 0xC\n" - "\tldrsh r1, [r5, r0]\n" - "\tlsls r0, r1, 4\n" - "\tadds r0, r1\n" - "\tlsls r0, 2\n" - "\tadds r0, r4\n" - "\tmov r1, r8\n" - "\tstrh r1, [r0, 0x2E]\n" - "\tbl sub_812CD3C\n" - "\tb _0812DD3A\n" - "\t.align 2, 0\n" - "_0812DCB8: .4byte gSprites\n" - "_0812DCBC:\n" - "\tmovs r0, 0xD0\n" - "\tstr r0, [sp]\n" - "\tmovs r0, 0x20\n" - "\tstr r0, [sp, 0x4]\n" - "\tmovs r0, 0x2\n" - "\tmovs r1, 0x11\n" - "\tmovs r2, 0\n" - "\tmovs r3, 0\n" - "\tbl FillWindowPixelRect\n" - "\tmovs r0, 0x2\n" - "\tbl sub_812CEE0\n" - "\tb _0812DD3A\n" - "_0812DCD8:\n" - "\tbl sub_812DDAC\n" - "\tldr r0, [r6]\n" - "\tldrb r1, [r0, 0x7]\n" - "\tmovs r0, 0x2\n" - "\tands r0, r1\n" - "\tcmp r0, 0\n" - "\tbeq _0812DD10\n" - "\tldr r2, _0812DD0C @ =gSprites\n" - "\tmovs r0, 0xC\n" - "\tldrsh r1, [r5, r0]\n" - "\tlsls r0, r1, 4\n" - "\tadds r0, r1\n" - "\tlsls r0, 2\n" - "\tadds r0, r2\n" - "\tadds r0, 0x3E\n" - "\tldrb r1, [r0]\n" - "\tmovs r2, 0x4\n" - "\torrs r1, r2\n" - "\tstrb r1, [r0]\n" - "\tldr r1, [r6]\n" - "\tadds r1, 0x23\n" - "\tldrb r0, [r1]\n" - "\torrs r0, r2\n" - "\tstrb r0, [r1]\n" - "\tb _0812DD3A\n" - "\t.align 2, 0\n" - "_0812DD0C: .4byte gSprites\n" - "_0812DD10:\n" - "\tmovs r2, 0\n" - "\tldr r5, _0812DD4C @ =gSprites\n" - "\tadds r4, r6, 0\n" - "\tmovs r3, 0x4\n" - "_0812DD18:\n" - "\tldr r0, [r4]\n" - "\tadds r0, 0x1D\n" - "\tadds r0, r2\n" - "\tldrb r1, [r0]\n" - "\tlsls r0, r1, 4\n" - "\tadds r0, r1\n" - "\tlsls r0, 2\n" - "\tadds r0, r5\n" - "\tadds r0, 0x3E\n" - "\tldrb r1, [r0]\n" - "\torrs r1, r3\n" - "\tstrb r1, [r0]\n" - "\tadds r0, r2, 0x1\n" - "\tlsls r0, 24\n" - "\tlsrs r2, r0, 24\n" - "\tcmp r2, 0x5\n" - "\tbls _0812DD18\n" - "_0812DD3A:\n" - "\tadd sp, 0xC\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\n" - "\t.align 2, 0\n" - "_0812DD4C: .4byte gSprites"); + FillWindowPixelRect(2, 0x11, 0, 0, 0xd0, 0x20); + AddTextPrinterParametrized(2, 2, gUnknown_84181C3, 0, NULL, 2, 1, 3); + sub_812CEE0(2); } -#endif // NONMATCHING -- cgit v1.2.3 From eb8dface178fed90656ea7a7726b6835ee5a1229 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Mon, 26 Nov 2018 10:26:12 -0500 Subject: through sub_812E064 --- asm/fame_checker.s | 345 ---------------------------------------------- include/menu_indicators.h | 9 ++ src/fame_checker.c | 103 +++++++++++++- 3 files changed, 108 insertions(+), 349 deletions(-) diff --git a/asm/fame_checker.s b/asm/fame_checker.s index fc6489bdd..9807f15dc 100644 --- a/asm/fame_checker.s +++ b/asm/fame_checker.s @@ -5,351 +5,6 @@ .text - thumb_func_start sub_812DDF0 -sub_812DDF0: @ 812DDF0 - push {r4-r7,lr} - mov r7, r8 - push {r7} - sub sp, 0x18 - mov r8, r0 - lsls r5, r1, 24 - lsrs r5, 24 - ldr r7, _0812DE68 @ =gUnknown_203B0FC - ldr r0, [r7] - ldrb r0, [r0, 0x8] - mov r4, sp - adds r4, 0x16 - add r1, sp, 0x14 - adds r2, r4, 0 - bl get_coro_args_x18_x1A - add r1, sp, 0x14 - ldrh r0, [r4] - ldrh r1, [r1] - adds r0, r1 - lsls r0, 16 - lsrs r6, r0, 16 - ldrh r0, [r4] - lsls r3, r0, 3 - subs r3, r0 - lsls r3, 25 - movs r0, 0x80 - lsls r0, 19 - adds r3, r0 - lsrs r3, 24 - movs r1, 0 - str r1, [sp] - str r1, [sp, 0x4] - ldr r0, _0812DE6C @ =gUnknown_845F5E6 - str r0, [sp, 0x8] - str r1, [sp, 0xC] - ldr r0, _0812DE70 @ =gUnknown_203B100 - ldr r1, [r0] - mov r2, r8 - lsls r0, r2, 3 - adds r0, r1 - ldr r0, [r0] - str r0, [sp, 0x10] - movs r0, 0 - movs r1, 0x2 - movs r2, 0x8 - bl AddTextPrinterParametrized2 - cmp r5, 0 - bne _0812DEC0 - add r0, sp, 0x14 - ldr r1, [r7] - ldrh r2, [r0] - ldrb r0, [r1, 0xA] - cmp r2, r0 - bcs _0812DE74 - ldrb r0, [r1, 0xB] - adds r0, 0x1 - b _0812DE86 - .align 2, 0 -_0812DE68: .4byte gUnknown_203B0FC -_0812DE6C: .4byte gUnknown_845F5E6 -_0812DE70: .4byte gUnknown_203B100 -_0812DE74: - cmp r2, r0 - bls _0812DE88 - ldrb r0, [r1, 0x7] - lsrs r0, 2 - subs r0, 0x1 - cmp r6, r0 - beq _0812DE88 - ldrb r0, [r1, 0xB] - subs r0, 0x1 -_0812DE86: - strb r0, [r1, 0xB] -_0812DE88: - ldr r0, _0812DEE4 @ =gUnknown_203B0FC - ldr r2, [r0] - ldrb r0, [r2, 0xB] - lsls r3, r0, 3 - subs r3, r0 - lsls r3, 25 - movs r0, 0x80 - lsls r0, 19 - adds r3, r0 - lsrs r3, 24 - movs r1, 0 - str r1, [sp] - str r1, [sp, 0x4] - ldr r0, _0812DEE8 @ =gUnknown_845F5E3 - str r0, [sp, 0x8] - str r1, [sp, 0xC] - ldrb r0, [r2, 0x9] - ldr r1, _0812DEEC @ =gUnknown_203B100 - ldr r1, [r1] - lsls r0, 3 - adds r0, r1 - ldr r0, [r0] - str r0, [sp, 0x10] - movs r0, 0 - movs r1, 0x2 - movs r2, 0x8 - bl AddTextPrinterParametrized2 -_0812DEC0: - ldr r1, _0812DEE4 @ =gUnknown_203B0FC - ldr r0, [r1] - mov r2, r8 - strb r2, [r0, 0x9] - ldr r2, [r1] - ldrh r0, [r4] - strb r0, [r2, 0xB] - ldr r1, [r1] - add r0, sp, 0x14 - ldrh r0, [r0] - strb r0, [r1, 0xA] - add sp, 0x18 - pop {r3} - mov r8, r3 - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_0812DEE4: .4byte gUnknown_203B0FC -_0812DEE8: .4byte gUnknown_845F5E3 -_0812DEEC: .4byte gUnknown_203B100 - thumb_func_end sub_812DDF0 - - thumb_func_start sub_812DEF0 -sub_812DEF0: @ 812DEF0 - push {r4-r7,lr} - mov r7, r8 - push {r7} - movs r4, 0 - movs r6, 0 - ldr r0, _0812DF44 @ =0x0000fdff - mov r8, r0 - ldr r7, _0812DF48 @ =gUnknown_845F60C -_0812DF00: - adds r0, r6, 0 - bl sub_812D0C0 - lsls r0, 24 - lsrs r5, r0, 24 - ldr r0, _0812DF4C @ =gSaveBlock1Ptr - ldr r0, [r0] - lsls r1, r5, 2 - adds r0, r1 - ldr r1, _0812DF50 @ =0x00003a54 - adds r0, r1 - ldrb r0, [r0] - lsls r0, 30 - cmp r0, 0 - beq _0812DF88 - ldr r0, _0812DF54 @ =gUnknown_845F5EA - lsls r1, r5, 1 - adds r3, r1, r0 - ldrh r0, [r3] - cmp r0, r8 - bhi _0812DF60 - ldr r0, _0812DF58 @ =gUnknown_203B100 - ldr r0, [r0] - lsls r2, r4, 3 - adds r2, r0 - ldrh r1, [r3] - lsls r0, r1, 2 - adds r0, r1 - lsls r0, 3 - ldr r1, _0812DF5C @ =gTrainers+0x4 - adds r0, r1 - str r0, [r2] - str r4, [r2, 0x4] - b _0812DF78 - .align 2, 0 -_0812DF44: .4byte 0x0000fdff -_0812DF48: .4byte gUnknown_845F60C -_0812DF4C: .4byte gSaveBlock1Ptr -_0812DF50: .4byte 0x00003a54 -_0812DF54: .4byte gUnknown_845F5EA -_0812DF58: .4byte gUnknown_203B100 -_0812DF5C: .4byte gTrainers+0x4 -_0812DF60: - ldr r0, _0812DFC0 @ =gUnknown_203B100 - ldr r0, [r0] - lsls r1, r4, 3 - adds r1, r0 - ldrh r0, [r3] - ldr r2, _0812DFC4 @ =0xffff0200 - adds r0, r2 - lsls r0, 2 - adds r0, r7 - ldr r0, [r0] - str r0, [r1] - str r4, [r1, 0x4] -_0812DF78: - ldr r0, _0812DFC8 @ =gUnknown_203B0FC - ldr r0, [r0] - adds r0, 0xC - adds r0, r4 - strb r5, [r0] - adds r0, r4, 0x1 - lsls r0, 24 - lsrs r4, r0, 24 -_0812DF88: - adds r0, r6, 0x1 - lsls r0, 24 - lsrs r6, r0, 24 - cmp r6, 0xF - bls _0812DF00 - ldr r0, _0812DFC0 @ =gUnknown_203B100 - ldr r1, [r0] - lsls r0, r4, 3 - adds r0, r1 - ldr r1, _0812DFCC @ =gUnknown_84161C1 - str r1, [r0] - str r4, [r0, 0x4] - ldr r0, _0812DFC8 @ =gUnknown_203B0FC - ldr r0, [r0] - adds r0, 0xC - adds r0, r4 - movs r1, 0xFF - strb r1, [r0] - adds r0, r4, 0x1 - lsls r0, 24 - lsrs r4, r0, 24 - ldr r1, _0812DFD0 @ =gUnknown_3005EB0 - strh r4, [r1, 0xC] - cmp r4, 0x4 - bhi _0812DFD4 - strh r4, [r1, 0xE] - b _0812DFD8 - .align 2, 0 -_0812DFC0: .4byte gUnknown_203B100 -_0812DFC4: .4byte 0xffff0200 -_0812DFC8: .4byte gUnknown_203B0FC -_0812DFCC: .4byte gUnknown_84161C1 -_0812DFD0: .4byte gUnknown_3005EB0 -_0812DFD4: - movs r0, 0x5 - strh r0, [r1, 0xE] -_0812DFD8: - adds r0, r4, 0 - pop {r3} - mov r8, r3 - pop {r4-r7} - pop {r1} - bx r1 - thumb_func_end sub_812DEF0 - - thumb_func_start sub_812DFE4 -sub_812DFE4: @ 812DFE4 - push {r4,lr} - adds r4, r0, 0 - lsls r4, 24 - lsrs r4, 24 - adds r0, r4, 0 - bl PutWindowTilemap - adds r0, r4, 0 - movs r1, 0x3 - bl CopyWindowToVram - pop {r4} - pop {r0} - bx r0 - thumb_func_end sub_812DFE4 - - thumb_func_start sub_812E000 -sub_812E000: @ 812E000 - push {r4,lr} - sub sp, 0x10 - mov r1, sp - ldr r0, _0812E040 @ =gUnknown_845FD44 - ldm r0!, {r2-r4} - stm r1!, {r2-r4} - ldr r0, [r0] - str r0, [r1] - ldr r4, _0812E044 @ =gUnknown_203B0FC - ldr r2, [r4] - ldrb r0, [r2, 0x7] - lsrs r0, 2 - cmp r0, 0x5 - bls _0812E036 - mov r1, sp - movs r0, 0 - strh r0, [r1, 0x6] - ldrb r0, [r2, 0x7] - lsrs r0, 2 - subs r0, 0x5 - strh r0, [r1, 0x8] - adds r1, r2, 0x4 - mov r0, sp - bl AddScrollIndicatorArrowPair - ldr r1, [r4] - strb r0, [r1, 0x6] -_0812E036: - add sp, 0x10 - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_0812E040: .4byte gUnknown_845FD44 -_0812E044: .4byte gUnknown_203B0FC - thumb_func_end sub_812E000 - - thumb_func_start sub_812E048 -sub_812E048: @ 812E048 - push {lr} - ldr r0, _0812E060 @ =gUnknown_203B0FC - ldr r1, [r0] - ldrb r0, [r1, 0x7] - lsrs r0, 2 - cmp r0, 0x5 - bls _0812E05C - ldrb r0, [r1, 0x6] - bl RemoveScrollIndicatorArrowPair -_0812E05C: - pop {r0} - bx r0 - .align 2, 0 -_0812E060: .4byte gUnknown_203B0FC - thumb_func_end sub_812E048 - - thumb_func_start sub_812E064 -sub_812E064: @ 812E064 - push {r4,lr} - sub sp, 0x4 - ldr r0, _0812E090 @ =gUnknown_203B0FC - ldr r0, [r0] - ldrb r0, [r0, 0x8] - mov r4, sp - adds r4, 0x2 - mov r1, sp - adds r2, r4, 0 - bl get_coro_args_x18_x1A - mov r1, sp - ldrh r0, [r4] - ldrh r1, [r1] - adds r0, r1 - lsls r0, 16 - lsrs r0, 16 - add sp, 0x4 - pop {r4} - pop {r1} - bx r1 - .align 2, 0 -_0812E090: .4byte gUnknown_203B0FC - thumb_func_end sub_812E064 - thumb_func_start sub_812E094 sub_812E094: @ 812E094 push {r4-r6,lr} diff --git a/include/menu_indicators.h b/include/menu_indicators.h index 2350e2502..f88fd5549 100644 --- a/include/menu_indicators.h +++ b/include/menu_indicators.h @@ -7,8 +7,17 @@ // Exported RAM declarations +struct ScrollIndicatorArrowPairTemplate +{ + u8 filler_00[6]; + u16 unk_06; + u16 unk_08; + u8 filler_0a[6]; +}; + // Exported ROM declarations u8 AddScrollIndicatorArrowPairParametrized(u8, u8, u8, u8, s32, u16, u16, u16 *); +u8 AddScrollIndicatorArrowPair(const struct ScrollIndicatorArrowPairTemplate * template, u16 * a1); void RemoveScrollIndicatorArrowPair(u8); #endif //GUARD_MENU_INDICATORS_H diff --git a/src/fame_checker.c b/src/fame_checker.c index 8637f6e86..9535b6556 100644 --- a/src/fame_checker.c +++ b/src/fame_checker.c @@ -4,6 +4,7 @@ #include "bg.h" #include "event_data.h" #include "graphics.h" +#include "battle.h" #include "battle_setup.h" #include "menu.h" #include "battle_dome_cards.h" @@ -21,6 +22,7 @@ #include "window.h" #include "string_util.h" #include "field_map_obj.h" +#include "menu_indicators.h" #include "text_window.h" #define SPRITETAG_1000 1000 @@ -35,7 +37,7 @@ struct FameCheckerData { MainCallback unk_00; u16 unk_04; - u8 filler_06[1]; + u8 unk_06; u8 unk_07_0:1; u8 unk_07_1:1; u8 unk_07_2:6; @@ -121,6 +123,7 @@ extern const u8 gUnknown_84181E4[]; extern const u8 gUnknown_841E5A4[]; extern const u8 gUnknown_841E5B9[]; extern const u8 gUnknown_841E5D2[]; +extern const u8 gUnknown_84161C1[]; extern const u16 gUnknown_845C600[]; extern const u16 gUnknown_845DD20[]; @@ -130,7 +133,10 @@ extern const u16 gUnknown_845F580[]; extern const u16 gUnknown_845F5C0[]; extern const struct TextColor gUnknown_845F5E0; extern const struct TextColor gUnknown_845F5E3; +extern const struct TextColor gUnknown_845F5E6; +extern const u16 gUnknown_845F5EA[]; extern const u8 gUnknown_845F61C[]; +extern const u8 *const gUnknown_845F60C[]; extern const u8 *const gUnknown_845F63C[]; extern const u8 *const gUnknown_845F6BC[]; extern const u8 *const gUnknown_845F89C[]; @@ -147,6 +153,7 @@ extern const struct SpriteTemplate gUnknown_845FCE4; extern const struct SpriteTemplate gUnknown_845FCFC; extern const struct SpriteTemplate gUnknown_845FD14; extern const struct SpriteTemplate gUnknown_845FD2C; +extern const struct ScrollIndicatorArrowPairTemplate gUnknown_845FD44; void sub_812C380(void) { @@ -981,7 +988,7 @@ void sub_812DB64(void) void sub_812DBC0(s32 itemIndex, bool8 onInit, struct ListMenu *list) { - u16 sp8[2]; + u16 sp8; u8 taskId; u16 r9; gUnknown_203B104 = 0; @@ -993,8 +1000,8 @@ void sub_812DBC0(s32 itemIndex, bool8 onInit, struct ListMenu *list) struct Task *task = &gTasks[taskId]; PlaySE(SE_SELECT); task->data[1] = 0; - get_coro_args_x18_x1A(gUnknown_203B0FC->unk_08, sp8, NULL); - gUnknown_203B0FC->unk_04 = sp8[0]; + get_coro_args_x18_x1A(gUnknown_203B0FC->unk_08, &sp8, NULL); + gUnknown_203B0FC->unk_04 = sp8; if (itemIndex != gUnknown_203B0FC->unk_07_2 - 1) { sub_812D174(); @@ -1056,3 +1063,91 @@ void sub_812DDAC(void) AddTextPrinterParametrized(2, 2, gUnknown_84181C3, 0, NULL, 2, 1, 3); sub_812CEE0(2); } + +void sub_812DDF0(s32 itemIndex, bool8 onInit) +{ + u16 sp14; + u16 sp16; + u16 r6; + get_coro_args_x18_x1A(gUnknown_203B0FC->unk_08, &sp14, &sp16); + r6 = sp14 + sp16; + AddTextPrinterParametrized2(0, 2, 8, 14 * sp16 + 4, 0, 0, &gUnknown_845F5E6, 0, gUnknown_203B100[itemIndex].unk_00); + if (!onInit) + { + if (sp14 < gUnknown_203B0FC->unk_0A) + gUnknown_203B0FC->unk_0B++; + else if (sp14 > gUnknown_203B0FC->unk_0A && r6 != gUnknown_203B0FC->unk_07_2 - 1) + gUnknown_203B0FC->unk_0B--; + AddTextPrinterParametrized2(0, 2, 8, 14 * gUnknown_203B0FC->unk_0B + 4, 0, 0, &gUnknown_845F5E3, 0, gUnknown_203B100[gUnknown_203B0FC->unk_09].unk_00); + + } + gUnknown_203B0FC->unk_09 = itemIndex; + gUnknown_203B0FC->unk_0B = sp16; + gUnknown_203B0FC->unk_0A = sp14; +} + +u8 sub_812DEF0(void) +{ + u8 r4 = 0; + u8 r6; + + for (r6 = 0; r6 < 16; r6++) + { + u8 r5 = sub_812D0C0(r6); + if (gSaveBlock1Ptr->fameChecker[r5].unk_0_0 != 0) + { + if (gUnknown_845F5EA[r5] < 0xFE00) + { + gUnknown_203B100[r4].unk_00 = gTrainers[gUnknown_845F5EA[r5]].trainerName; + gUnknown_203B100[r4].unk_04 = r4; + } + else + { + gUnknown_203B100[r4].unk_00 = gUnknown_845F60C[gUnknown_845F5EA[r5] - 0xFE00]; + gUnknown_203B100[r4].unk_04 = r4; + } + gUnknown_203B0FC->unk_0C[r4] = r5; + r4++; + } + } + gUnknown_203B100[r4].unk_00 = gUnknown_84161C1; + gUnknown_203B100[r4].unk_04 = r4; + gUnknown_203B0FC->unk_0C[r4] = 0xFF; + r4++; + gUnknown_3005EB0.totalItems = r4; + if (r4 < 5) + gUnknown_3005EB0.maxShowed = r4; + else + gUnknown_3005EB0.maxShowed = 5; + return r4; +} + +void sub_812DFE4(u8 windowId) +{ + PutWindowTilemap(windowId); + CopyWindowToVram(windowId, 3); +} + +void sub_812E000(void) +{ + struct ScrollIndicatorArrowPairTemplate sp0 = gUnknown_845FD44; + if (gUnknown_203B0FC->unk_07_2 > 5) + { + sp0.unk_06 = 0; + sp0.unk_08 = gUnknown_203B0FC->unk_07_2 - 5; + gUnknown_203B0FC->unk_06 = AddScrollIndicatorArrowPair(&sp0, &gUnknown_203B0FC->unk_04); + } +} + +void sub_812E048(void) +{ + if (gUnknown_203B0FC->unk_07_2 > 5) + RemoveScrollIndicatorArrowPair(gUnknown_203B0FC->unk_06); +} + +u16 sub_812E064(void) +{ + u16 sp0, sp2; + get_coro_args_x18_x1A(gUnknown_203B0FC->unk_08, &sp0, &sp2); + return sp0 + sp2; +} -- cgit v1.2.3 From f75453388c6f9e1123915707f6d69c3373f761f6 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Mon, 26 Nov 2018 10:54:41 -0500 Subject: Finish decomp of fame_checker(.text) --- asm/fame_checker.s | 563 ---------------------------------------------------- include/list_menu.h | 1 + ld_script.txt | 1 - src/fame_checker.c | 119 ++++++++++- 4 files changed, 119 insertions(+), 565 deletions(-) delete mode 100644 asm/fame_checker.s diff --git a/asm/fame_checker.s b/asm/fame_checker.s deleted file mode 100644 index 9807f15dc..000000000 --- a/asm/fame_checker.s +++ /dev/null @@ -1,563 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .syntax unified - - .text - - thumb_func_start sub_812E094 -sub_812E094: @ 812E094 - push {r4-r6,lr} - lsls r0, 24 - lsrs r0, 24 - adds r4, r0, 0 - ldr r6, _0812E0EC @ =gUnknown_203B0FC - ldr r0, [r6] - adds r0, 0x23 - ldrb r0, [r0] - lsls r0, 31 - lsrs r0, 31 - cmp r0, r4 - beq _0812E108 - ldr r5, _0812E0F0 @ =sub_812E110 - adds r0, r5, 0 - bl FindTaskIdByFunc - lsls r0, 24 - lsrs r2, r0, 24 - cmp r2, 0xFF - bne _0812E0C8 - adds r0, r5, 0 - movs r1, 0x8 - bl CreateTask - lsls r0, 24 - lsrs r2, r0, 24 -_0812E0C8: - ldr r0, _0812E0F4 @ =gTasks - lsls r1, r2, 2 - adds r1, r2 - lsls r1, 3 - adds r1, r0 - movs r0, 0 - strh r0, [r1, 0x8] - movs r0, 0x4 - strh r0, [r1, 0xA] - cmp r4, 0x1 - bne _0812E0F8 - strh r4, [r1, 0xC] - ldr r0, [r6] - adds r0, 0x23 - ldrb r1, [r0] - movs r2, 0x1 - orrs r1, r2 - b _0812E106 - .align 2, 0 -_0812E0EC: .4byte gUnknown_203B0FC -_0812E0F0: .4byte sub_812E110 -_0812E0F4: .4byte gTasks -_0812E0F8: - strh r0, [r1, 0xC] - ldr r0, [r6] - adds r0, 0x23 - ldrb r2, [r0] - movs r1, 0x2 - negs r1, r1 - ands r1, r2 -_0812E106: - strb r1, [r0] -_0812E108: - pop {r4-r6} - pop {r0} - bx r0 - thumb_func_end sub_812E094 - - thumb_func_start sub_812E110 -sub_812E110: @ 812E110 - push {r4,r5,lr} - lsls r0, 24 - lsrs r5, r0, 24 - lsls r0, r5, 2 - adds r0, r5 - lsls r0, 3 - ldr r1, _0812E130 @ =gTasks - adds r4, r0, r1 - movs r1, 0x8 - ldrsh r0, [r4, r1] - cmp r0, 0 - beq _0812E134 - cmp r0, 0x1 - beq _0812E154 - b _0812E170 - .align 2, 0 -_0812E130: .4byte gTasks -_0812E134: - ldrh r0, [r4, 0xA] - subs r0, 0x1 - strh r0, [r4, 0xA] - lsls r0, 16 - cmp r0, 0 - bne _0812E170 - movs r0, 0x1 - movs r1, 0 - bl sub_812E178 - movs r0, 0x4 - strh r0, [r4, 0xA] - ldrh r0, [r4, 0x8] - adds r0, 0x1 - strh r0, [r4, 0x8] - b _0812E170 -_0812E154: - ldrh r0, [r4, 0xA] - subs r0, 0x1 - strh r0, [r4, 0xA] - lsls r0, 16 - cmp r0, 0 - bne _0812E170 - movs r0, 0xC - ldrsh r1, [r4, r0] - movs r0, 0x1 - bl sub_812E178 - adds r0, r5, 0 - bl DestroyTask -_0812E170: - pop {r4,r5} - pop {r0} - bx r0 - thumb_func_end sub_812E110 - - thumb_func_start sub_812E178 -sub_812E178: @ 812E178 - push {r4-r6,lr} - sub sp, 0xC - lsls r0, 24 - lsrs r6, r0, 24 - lsls r1, 16 - asrs r5, r1, 16 - cmp r5, 0 - beq _0812E18C - cmp r5, 0x3 - bne _0812E252 -_0812E18C: - movs r4, 0x1 - str r4, [sp] - str r4, [sp, 0x4] - str r4, [sp, 0x8] - adds r0, r6, 0 - movs r1, 0x8C - movs r2, 0xE - movs r3, 0xA - bl FillBgTilemapBufferRect - movs r5, 0xA - str r5, [sp] - str r4, [sp, 0x4] - str r4, [sp, 0x8] - adds r0, r6, 0 - movs r1, 0xA1 - movs r2, 0xF - movs r3, 0xA - bl FillBgTilemapBufferRect - str r4, [sp] - str r4, [sp, 0x4] - str r4, [sp, 0x8] - adds r0, r6, 0 - movs r1, 0x8D - movs r2, 0x19 - movs r3, 0xA - bl FillBgTilemapBufferRect - str r4, [sp] - str r4, [sp, 0x4] - str r4, [sp, 0x8] - adds r0, r6, 0 - movs r1, 0x8E - movs r2, 0x1A - movs r3, 0xA - bl FillBgTilemapBufferRect - str r4, [sp] - str r4, [sp, 0x4] - str r4, [sp, 0x8] - adds r0, r6, 0 - movs r1, 0x8F - movs r2, 0xE - movs r3, 0xB - bl FillBgTilemapBufferRect - movs r0, 0xB - str r0, [sp] - str r4, [sp, 0x4] - str r4, [sp, 0x8] - adds r0, r6, 0 - movs r1, 0 - movs r2, 0xF - movs r3, 0xB - bl FillBgTilemapBufferRect - str r4, [sp] - str r4, [sp, 0x4] - str r4, [sp, 0x8] - adds r0, r6, 0 - movs r1, 0x90 - movs r2, 0x1A - movs r3, 0xB - bl FillBgTilemapBufferRect - str r4, [sp] - str r4, [sp, 0x4] - str r4, [sp, 0x8] - adds r0, r6, 0 - movs r1, 0x91 - movs r2, 0xE - movs r3, 0xC - bl FillBgTilemapBufferRect - str r5, [sp] - str r4, [sp, 0x4] - str r4, [sp, 0x8] - adds r0, r6, 0 - movs r1, 0xA3 - movs r2, 0xF - movs r3, 0xC - bl FillBgTilemapBufferRect - str r4, [sp] - str r4, [sp, 0x4] - str r4, [sp, 0x8] - adds r0, r6, 0 - movs r1, 0x92 - movs r2, 0x19 - movs r3, 0xC - bl FillBgTilemapBufferRect - str r4, [sp] - str r4, [sp, 0x4] - str r4, [sp, 0x8] - adds r0, r6, 0 - movs r1, 0x93 - b _0812E470 -_0812E252: - cmp r5, 0x1 - bne _0812E2F4 - str r5, [sp] - str r5, [sp, 0x4] - str r5, [sp, 0x8] - adds r0, r6, 0 - movs r1, 0x9B - movs r2, 0xE - movs r3, 0xA - bl FillBgTilemapBufferRect - movs r4, 0xB - str r4, [sp] - str r5, [sp, 0x4] - str r5, [sp, 0x8] - adds r0, r6, 0 - movs r1, 0x9C - movs r2, 0xF - movs r3, 0xA - bl FillBgTilemapBufferRect - str r5, [sp] - str r5, [sp, 0x4] - str r5, [sp, 0x8] - adds r0, r6, 0 - movs r1, 0x96 - movs r2, 0x1A - movs r3, 0xA - bl FillBgTilemapBufferRect - str r5, [sp] - str r5, [sp, 0x4] - str r5, [sp, 0x8] - adds r0, r6, 0 - movs r1, 0x9D - movs r2, 0xE - movs r3, 0xB - bl FillBgTilemapBufferRect - str r4, [sp] - str r5, [sp, 0x4] - str r5, [sp, 0x8] - adds r0, r6, 0 - movs r1, 0 - movs r2, 0xF - movs r3, 0xB - bl FillBgTilemapBufferRect - str r5, [sp] - str r5, [sp, 0x4] - str r5, [sp, 0x8] - adds r0, r6, 0 - movs r1, 0x90 - movs r2, 0x1A - movs r3, 0xB - bl FillBgTilemapBufferRect - str r5, [sp] - str r5, [sp, 0x4] - str r5, [sp, 0x8] - adds r0, r6, 0 - movs r1, 0x9E - movs r2, 0xE - movs r3, 0xC - bl FillBgTilemapBufferRect - str r4, [sp] - str r5, [sp, 0x4] - str r5, [sp, 0x8] - adds r0, r6, 0 - movs r1, 0x9F - movs r2, 0xF - movs r3, 0xC - bl FillBgTilemapBufferRect - str r5, [sp] - str r5, [sp, 0x4] - str r5, [sp, 0x8] - adds r0, r6, 0 - movs r1, 0x99 - b _0812E470 -_0812E2F4: - cmp r5, 0x2 - bne _0812E398 - movs r4, 0x1 - str r4, [sp] - str r4, [sp, 0x4] - str r4, [sp, 0x8] - adds r0, r6, 0 - movs r1, 0x94 - movs r2, 0xE - movs r3, 0xA - bl FillBgTilemapBufferRect - movs r5, 0xB - str r5, [sp] - str r4, [sp, 0x4] - str r4, [sp, 0x8] - adds r0, r6, 0 - movs r1, 0x95 - movs r2, 0xF - movs r3, 0xA - bl FillBgTilemapBufferRect - str r4, [sp] - str r4, [sp, 0x4] - str r4, [sp, 0x8] - adds r0, r6, 0 - movs r1, 0x96 - movs r2, 0x1A - movs r3, 0xA - bl FillBgTilemapBufferRect - str r4, [sp] - str r4, [sp, 0x4] - str r4, [sp, 0x8] - adds r0, r6, 0 - movs r1, 0x8F - movs r2, 0xE - movs r3, 0xB - bl FillBgTilemapBufferRect - str r5, [sp] - str r4, [sp, 0x4] - str r4, [sp, 0x8] - adds r0, r6, 0 - movs r1, 0x9A - movs r2, 0xF - movs r3, 0xB - bl FillBgTilemapBufferRect - str r4, [sp] - str r4, [sp, 0x4] - str r4, [sp, 0x8] - adds r0, r6, 0 - movs r1, 0x90 - movs r2, 0x1A - movs r3, 0xB - bl FillBgTilemapBufferRect - str r4, [sp] - str r4, [sp, 0x4] - str r4, [sp, 0x8] - adds r0, r6, 0 - movs r1, 0x97 - movs r2, 0xE - movs r3, 0xC - bl FillBgTilemapBufferRect - str r5, [sp] - str r4, [sp, 0x4] - str r4, [sp, 0x8] - adds r0, r6, 0 - movs r1, 0x98 - movs r2, 0xF - movs r3, 0xC - bl FillBgTilemapBufferRect - str r4, [sp] - str r4, [sp, 0x4] - str r4, [sp, 0x8] - adds r0, r6, 0 - movs r1, 0x99 - b _0812E470 -_0812E398: - cmp r5, 0x4 - bne _0812E47A - movs r4, 0x1 - str r4, [sp] - str r4, [sp, 0x4] - str r4, [sp, 0x8] - adds r0, r6, 0 - movs r1, 0x83 - movs r2, 0xE - movs r3, 0xA - bl FillBgTilemapBufferRect - movs r5, 0xA - str r5, [sp] - str r4, [sp, 0x4] - str r4, [sp, 0x8] - adds r0, r6, 0 - movs r1, 0xA0 - movs r2, 0xF - movs r3, 0xA - bl FillBgTilemapBufferRect - str r4, [sp] - str r4, [sp, 0x4] - str r4, [sp, 0x8] - adds r0, r6, 0 - movs r1, 0x84 - movs r2, 0x19 - movs r3, 0xA - bl FillBgTilemapBufferRect - str r4, [sp] - str r4, [sp, 0x4] - str r4, [sp, 0x8] - adds r0, r6, 0 - movs r1, 0x85 - movs r2, 0x1A - movs r3, 0xA - bl FillBgTilemapBufferRect - str r4, [sp] - str r4, [sp, 0x4] - str r4, [sp, 0x8] - adds r0, r6, 0 - movs r1, 0x86 - movs r2, 0xE - movs r3, 0xB - bl FillBgTilemapBufferRect - str r5, [sp] - str r4, [sp, 0x4] - str r4, [sp, 0x8] - adds r0, r6, 0 - movs r1, 0xA2 - movs r2, 0xF - movs r3, 0xB - bl FillBgTilemapBufferRect - str r4, [sp] - str r4, [sp, 0x4] - str r4, [sp, 0x8] - adds r0, r6, 0 - movs r1, 0x87 - movs r2, 0x19 - movs r3, 0xB - bl FillBgTilemapBufferRect - str r4, [sp] - str r4, [sp, 0x4] - str r4, [sp, 0x8] - adds r0, r6, 0 - movs r1, 0x88 - movs r2, 0x1A - movs r3, 0xB - bl FillBgTilemapBufferRect - str r4, [sp] - str r4, [sp, 0x4] - str r4, [sp, 0x8] - adds r0, r6, 0 - movs r1, 0x83 - movs r2, 0xE - movs r3, 0xC - bl FillBgTilemapBufferRect - str r5, [sp] - str r4, [sp, 0x4] - str r4, [sp, 0x8] - adds r0, r6, 0 - movs r1, 0xA0 - movs r2, 0xF - movs r3, 0xC - bl FillBgTilemapBufferRect - str r4, [sp] - str r4, [sp, 0x4] - str r4, [sp, 0x8] - adds r0, r6, 0 - movs r1, 0x84 - movs r2, 0x19 - movs r3, 0xC - bl FillBgTilemapBufferRect - str r4, [sp] - str r4, [sp, 0x4] - str r4, [sp, 0x8] - adds r0, r6, 0 - movs r1, 0x85 -_0812E470: - movs r2, 0x1A - movs r3, 0xC - bl FillBgTilemapBufferRect - b _0812E496 -_0812E47A: - cmp r5, 0x5 - bne _0812E496 - movs r0, 0xD - str r0, [sp] - movs r0, 0x3 - str r0, [sp, 0x4] - movs r0, 0x1 - str r0, [sp, 0x8] - adds r0, r6, 0 - movs r1, 0 - movs r2, 0xE - movs r3, 0xA - bl FillBgTilemapBufferRect -_0812E496: - adds r0, r6, 0 - bl CopyBgTilemapBufferToVram - add sp, 0xC - pop {r4-r6} - pop {r0} - bx r0 - thumb_func_end sub_812E178 - - thumb_func_start sub_812E4A4 -sub_812E4A4: @ 812E4A4 - push {r4,lr} - sub sp, 0x14 - adds r4, r0, 0 - lsls r4, 24 - lsrs r4, 24 - ldr r0, _0812E4E0 @ =gUnknown_203B0FC - ldr r0, [r0] - ldrb r0, [r0, 0x8] - bl ListMenuGetYCoordForPrintingArrowCursor - lsls r0, 16 - lsrs r0, 16 - cmp r4, 0x1 - bne _0812E4EC - lsls r3, r0, 24 - lsrs r3, 24 - movs r1, 0 - str r1, [sp] - str r1, [sp, 0x4] - ldr r0, _0812E4E4 @ =gUnknown_845F5E3 - str r0, [sp, 0x8] - str r1, [sp, 0xC] - ldr r0, _0812E4E8 @ =gUnknown_841623B - str r0, [sp, 0x10] - movs r0, 0 - movs r1, 0x2 - movs r2, 0 - bl AddTextPrinterParametrized2 - b _0812E50A - .align 2, 0 -_0812E4E0: .4byte gUnknown_203B0FC -_0812E4E4: .4byte gUnknown_845F5E3 -_0812E4E8: .4byte gUnknown_841623B -_0812E4EC: - lsls r3, r0, 24 - lsrs r3, 24 - movs r1, 0 - str r1, [sp] - str r1, [sp, 0x4] - ldr r0, _0812E514 @ =gUnknown_845F5E0 - str r0, [sp, 0x8] - str r1, [sp, 0xC] - ldr r0, _0812E518 @ =gUnknown_841623B - str r0, [sp, 0x10] - movs r0, 0 - movs r1, 0x2 - movs r2, 0 - bl AddTextPrinterParametrized2 -_0812E50A: - add sp, 0x14 - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_0812E514: .4byte gUnknown_845F5E0 -_0812E518: .4byte gUnknown_841623B - thumb_func_end sub_812E4A4 - - .align 2, 0 @ Don't pad with nop. diff --git a/include/list_menu.h b/include/list_menu.h index fc829940e..8834e5215 100644 --- a/include/list_menu.h +++ b/include/list_menu.h @@ -56,5 +56,6 @@ s32 ListMenuHandleInput(u8 id); void get_coro_args_x18_x1A(u8 a0, u16 *a1, u16 *a2); void sub_81AE6C8(u8 a0, u16 *a1, u16 *a2); void sub_810713C(u8, u8, u8); +u16 ListMenuGetYCoordForPrintingArrowCursor(u8); #endif //GUARD_LIST_MENU_H diff --git a/ld_script.txt b/ld_script.txt index cab20382b..bbebf21b1 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -227,7 +227,6 @@ SECTIONS { asm/help_system_812B1E0.o(.text); src/quest_log_battle.o(.text); src/fame_checker.o(.text); - asm/fame_checker.o(.text); asm/menu2.o(.text); asm/oak_speech.o(.text); asm/tm_case.o(.text); diff --git a/src/fame_checker.c b/src/fame_checker.c index 9535b6556..2f455c462 100644 --- a/src/fame_checker.c +++ b/src/fame_checker.c @@ -118,12 +118,13 @@ void sub_812E110(u8 taskId); void sub_812E178(u8 a0, s16 a1); void sub_812E4A4(u8 a0); +extern const u8 gUnknown_84161C1[]; +extern const u8 gUnknown_841623B[]; extern const u8 gUnknown_84181C3[]; extern const u8 gUnknown_84181E4[]; extern const u8 gUnknown_841E5A4[]; extern const u8 gUnknown_841E5B9[]; extern const u8 gUnknown_841E5D2[]; -extern const u8 gUnknown_84161C1[]; extern const u16 gUnknown_845C600[]; extern const u16 gUnknown_845DD20[]; @@ -1151,3 +1152,119 @@ u16 sub_812E064(void) get_coro_args_x18_x1A(gUnknown_203B0FC->unk_08, &sp0, &sp2); return sp0 + sp2; } + +void sub_812E094(u8 a0) +{ + if (gUnknown_203B0FC->unk_23_0 != a0) + { + u8 taskId = FindTaskIdByFunc(sub_812E110); + if (taskId == 0xFF) + taskId = CreateTask(sub_812E110, 8); + gTasks[taskId].data[0] = 0; + gTasks[taskId].data[1] = 4; + if (a0 == TRUE) + { + gTasks[taskId].data[2] = 1; + gUnknown_203B0FC->unk_23_0 = TRUE; + } + else + { + gTasks[taskId].data[2] = 4; + gUnknown_203B0FC->unk_23_0 = FALSE; + } + } +} + +void sub_812E110(u8 taskId) +{ + struct Task * task = &gTasks[taskId]; + switch (task->data[0]) + { + case 0: + if (--task->data[1] == 0) + { + sub_812E178(1, 0); + task->data[1] = 4; + task->data[0]++; + } + break; + case 1: + if (--task->data[1] == 0) + { + sub_812E178(1, task->data[2]); + DestroyTask(taskId); + } + break; + } +} + +void sub_812E178(u8 bg, s16 a1) +{ + if (a1 == 0 || a1 == 3) + { + FillBgTilemapBufferRect(bg, 0x8C, 14, 10, 1, 1, 1); + FillBgTilemapBufferRect(bg, 0xA1, 15, 10, 10, 1, 1); + FillBgTilemapBufferRect(bg, 0x8D, 25, 10, 1, 1, 1); + FillBgTilemapBufferRect(bg, 0x8E, 26, 10, 1, 1, 1); + FillBgTilemapBufferRect(bg, 0x8F, 14, 11, 1, 1, 1); + FillBgTilemapBufferRect(bg, 0x00, 15, 11, 11, 1, 1); + FillBgTilemapBufferRect(bg, 0x90, 26, 11, 1, 1, 1); + FillBgTilemapBufferRect(bg, 0x91, 14, 12, 1, 1, 1); + FillBgTilemapBufferRect(bg, 0xA3, 15, 12, 10, 1, 1); + FillBgTilemapBufferRect(bg, 0x92, 25, 12, 1, 1, 1); + FillBgTilemapBufferRect(bg, 0x93, 26, 12, 1, 1, 1); + } + else if (a1 == 1) + { + FillBgTilemapBufferRect(bg, 0x9B, 14, 10, 1, 1, 1); + FillBgTilemapBufferRect(bg, 0x9C, 15, 10, 11, 1, 1); + FillBgTilemapBufferRect(bg, 0x96, 26, 10, 1, 1, 1); + FillBgTilemapBufferRect(bg, 0x9D, 14, 11, 1, 1, 1); + FillBgTilemapBufferRect(bg, 0x00, 15, 11, 11, 1, 1); + FillBgTilemapBufferRect(bg, 0x90, 26, 11, 1, 1, 1); + FillBgTilemapBufferRect(bg, 0x9E, 14, 12, 1, 1, 1); + FillBgTilemapBufferRect(bg, 0x9F, 15, 12, 11, 1, 1); + FillBgTilemapBufferRect(bg, 0x99, 26, 12, 1, 1, 1); + } + else if (a1 == 2) + { + FillBgTilemapBufferRect(bg, 0x94, 14, 10, 1, 1, 1); + FillBgTilemapBufferRect(bg, 0x95, 15, 10, 11, 1, 1); + FillBgTilemapBufferRect(bg, 0x96, 26, 10, 1, 1, 1); + FillBgTilemapBufferRect(bg, 0x8F, 14, 11, 1, 1, 1); + FillBgTilemapBufferRect(bg, 0x9A, 15, 11, 11, 1, 1); + FillBgTilemapBufferRect(bg, 0x90, 26, 11, 1, 1, 1); + FillBgTilemapBufferRect(bg, 0x97, 14, 12, 1, 1, 1); + FillBgTilemapBufferRect(bg, 0x98, 15, 12, 11, 1, 1); + FillBgTilemapBufferRect(bg, 0x99, 26, 12, 1, 1, 1); + } + else if (a1 == 4) + { + FillBgTilemapBufferRect(bg, 0x83, 14, 10, 1, 1, 1); + FillBgTilemapBufferRect(bg, 0xA0, 15, 10, 10, 1, 1); + FillBgTilemapBufferRect(bg, 0x84, 25, 10, 1, 1, 1); + FillBgTilemapBufferRect(bg, 0x85, 26, 10, 1, 1, 1); + FillBgTilemapBufferRect(bg, 0x86, 14, 11, 1, 1, 1); + FillBgTilemapBufferRect(bg, 0xA2, 15, 11, 10, 1, 1); + FillBgTilemapBufferRect(bg, 0x87, 25, 11, 1, 1, 1); + FillBgTilemapBufferRect(bg, 0x88, 26, 11, 1, 1, 1); + FillBgTilemapBufferRect(bg, 0x83, 14, 12, 1, 1, 1); + FillBgTilemapBufferRect(bg, 0xA0, 15, 12, 10, 1, 1); + FillBgTilemapBufferRect(bg, 0x84, 25, 12, 1, 1, 1); + FillBgTilemapBufferRect(bg, 0x85, 26, 12, 1, 1, 1); + } + else if (a1 == 5) + { + FillBgTilemapBufferRect(bg, 0x00, 14, 10, 13, 3, 1); + } + CopyBgTilemapBufferToVram(bg); +} + +void sub_812E4A4(u8 a0) +{ + u16 cursorY = ListMenuGetYCoordForPrintingArrowCursor(gUnknown_203B0FC->unk_08); + if (a0 == 1) + AddTextPrinterParametrized2(0, 2, 0, cursorY, 0, 0, &gUnknown_845F5E3, 0, gUnknown_841623B); + else + AddTextPrinterParametrized2(0, 2, 0, cursorY, 0, 0, &gUnknown_845F5E0, 0, gUnknown_841623B); +} -- cgit v1.2.3 From 4590f0f378ec8af6be075b7e8347b98609f3fdb0 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Mon, 26 Nov 2018 12:11:11 -0500 Subject: Start decompiling some more data --- data/fame_checker.s | 32 ++++++++++++++++++++++---------- data/fame_checker/img_845dd40.png | Bin 0 -> 629 bytes data/fame_checker/img_845e560.png | Bin 0 -> 517 bytes data/fame_checker/img_845ed80.png | Bin 0 -> 761 bytes data/fame_checker/pal_45dd20.pal | 19 +++++++++++++++++++ data/fame_checker/pal_45e540.pal | 19 +++++++++++++++++++ data/fame_checker/pal_45ed60.pal | 19 +++++++++++++++++++ data/fame_checker/pal_45f580.pal | 19 +++++++++++++++++++ data/fame_checker/pal_45f5c0.pal | 19 +++++++++++++++++++ data/fame_checker/pal_845dd20.pal | 19 +++++++++++++++++++ data/fame_checker/pal_845e540.pal | 19 +++++++++++++++++++ data/fame_checker/pal_845ed60.pal | 19 +++++++++++++++++++ data/fame_checker/pal_845f580.pal | 19 +++++++++++++++++++ data/fame_checker/pal_845f5a0.pal | 19 +++++++++++++++++++ data/fame_checker/pal_845f5c0.pal | 19 +++++++++++++++++++ data/fame_checker/tilemap_845c600.bin | Bin 0 -> 5920 bytes 16 files changed, 231 insertions(+), 10 deletions(-) create mode 100644 data/fame_checker/img_845dd40.png create mode 100644 data/fame_checker/img_845e560.png create mode 100644 data/fame_checker/img_845ed80.png create mode 100644 data/fame_checker/pal_45dd20.pal create mode 100644 data/fame_checker/pal_45e540.pal create mode 100644 data/fame_checker/pal_45ed60.pal create mode 100644 data/fame_checker/pal_45f580.pal create mode 100644 data/fame_checker/pal_45f5c0.pal create mode 100644 data/fame_checker/pal_845dd20.pal create mode 100644 data/fame_checker/pal_845e540.pal create mode 100644 data/fame_checker/pal_845ed60.pal create mode 100644 data/fame_checker/pal_845f580.pal create mode 100644 data/fame_checker/pal_845f5a0.pal create mode 100644 data/fame_checker/pal_845f5c0.pal create mode 100644 data/fame_checker/tilemap_845c600.bin diff --git a/data/fame_checker.s b/data/fame_checker.s index e1659f86b..444de0ffa 100644 --- a/data/fame_checker.s +++ b/data/fame_checker.s @@ -5,32 +5,45 @@ .align 2 gUnknown_845C600:: @ 845C600 - .incbin "baserom.gba", 0x45C600, 0x1720 + .incbin "data/fame_checker/tilemap_845c600.bin" gUnknown_845DD20:: @ 845DD20 - .incbin "baserom.gba", 0x45DD20, 0x820 + .incbin "data/fame_checker/pal_845dd20.gbapal" + +gUnknown_845DD40:: @ 845DD40 + .incbin "data/fame_checker/img_845dd40.4bpp" gUnknown_845E540:: @ 845E540 - .incbin "baserom.gba", 0x45E540, 0x820 + .incbin "data/fame_checker/pal_845e540.gbapal" + +gUnknown_845E560:: @ 845E560 + .incbin "data/fame_checker/img_845e560.4bpp" gUnknown_845ED60:: @ 845ED60 - .incbin "baserom.gba", 0x45ED60, 0x820 + .incbin "data/fame_checker/pal_845ed60.gbapal" + +gUnknown_845ED80:: @ 845ED80 + .incbin "data/fame_checker/img_845ed80.4bpp" gUnknown_845F580:: @ 845F580 - .incbin "baserom.gba", 0x45F580, 0x40 + .incbin "data/fame_checker/pal_845f580.gbapal" + +gUnknown_845F5A0:: @ 845F5A0 + .incbin "data/fame_checker/pal_845f5a0.gbapal" gUnknown_845F5C0:: @ 845F5C0 - .incbin "baserom.gba", 0x45F5C0, 0x20 + .incbin "data/fame_checker/pal_845f5c0.gbapal" gUnknown_845F5E0:: @ 845F5E0 - .incbin "baserom.gba", 0x45F5E0, 0x3 + .byte 0x00, 0x01, 0x02 gUnknown_845F5E3:: @ 845F5E3 - .incbin "baserom.gba", 0x45F5E3, 0x3 + .byte 0x00, 0x02, 0x03 gUnknown_845F5E6:: @ 845F5E6 - .incbin "baserom.gba", 0x45F5E6, 0x4 + .byte 0x00, 0x06, 0x07 + .align 1 gUnknown_845F5EA:: @ 845F5EA .incbin "baserom.gba", 0x45F5EA, 0x22 @@ -40,7 +53,6 @@ gUnknown_845F60C:: @ 845F60C gUnknown_845F61C:: @ 845F61C .incbin "baserom.gba", 0x45F61C, 0x20 - gUnknown_845F63C:: @ 845F63C .4byte gUnknown_81B0188 .4byte gUnknown_81B0251 diff --git a/data/fame_checker/img_845dd40.png b/data/fame_checker/img_845dd40.png new file mode 100644 index 000000000..21f2a9d11 Binary files /dev/null and b/data/fame_checker/img_845dd40.png differ diff --git a/data/fame_checker/img_845e560.png b/data/fame_checker/img_845e560.png new file mode 100644 index 000000000..0cd201fc1 Binary files /dev/null and b/data/fame_checker/img_845e560.png differ diff --git a/data/fame_checker/img_845ed80.png b/data/fame_checker/img_845ed80.png new file mode 100644 index 000000000..b4a82f3d0 Binary files /dev/null and b/data/fame_checker/img_845ed80.png differ diff --git a/data/fame_checker/pal_45dd20.pal b/data/fame_checker/pal_45dd20.pal new file mode 100644 index 000000000..e6dcabf2f --- /dev/null +++ b/data/fame_checker/pal_45dd20.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 197 164 +255 222 205 +238 180 148 +197 139 106 +115 90 65 +222 164 82 +180 139 65 +148 106 57 +172 164 189 +255 230 131 +230 205 106 +238 131 90 +90 90 106 +213 205 213 +255 255 255 +0 0 0 diff --git a/data/fame_checker/pal_45e540.pal b/data/fame_checker/pal_45e540.pal new file mode 100644 index 000000000..485e27c48 --- /dev/null +++ b/data/fame_checker/pal_45e540.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 197 164 +255 230 205 +230 189 156 +205 156 115 +106 74 57 +180 139 213 +139 98 172 +98 65 106 +213 189 131 +189 164 98 +139 123 74 +180 139 115 +156 106 82 +90 74 49 +255 255 255 +0 0 0 diff --git a/data/fame_checker/pal_45ed60.pal b/data/fame_checker/pal_45ed60.pal new file mode 100644 index 000000000..adf46bf14 --- /dev/null +++ b/data/fame_checker/pal_45ed60.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 197 164 +255 222 205 +238 180 148 +197 139 106 +172 123 98 +213 172 115 +156 123 74 +90 82 65 +205 115 98 +164 213 156 +115 172 106 +90 123 82 +222 230 255 +164 172 197 +255 255 255 +0 0 0 diff --git a/data/fame_checker/pal_45f580.pal b/data/fame_checker/pal_45f580.pal new file mode 100644 index 000000000..eb6f2f18b --- /dev/null +++ b/data/fame_checker/pal_45f580.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 197 164 +255 222 205 +238 180 148 +197 139 106 +106 74 74 +139 156 164 +205 164 205 +164 123 164 +82 82 57 +213 213 222 +123 123 82 +115 115 115 +197 189 131 +156 156 90 +255 255 255 +0 0 0 diff --git a/data/fame_checker/pal_45f5c0.pal b/data/fame_checker/pal_45f5c0.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/fame_checker/pal_45f5c0.pal @@ -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 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/fame_checker/pal_845dd20.pal b/data/fame_checker/pal_845dd20.pal new file mode 100644 index 000000000..e6dcabf2f --- /dev/null +++ b/data/fame_checker/pal_845dd20.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 197 164 +255 222 205 +238 180 148 +197 139 106 +115 90 65 +222 164 82 +180 139 65 +148 106 57 +172 164 189 +255 230 131 +230 205 106 +238 131 90 +90 90 106 +213 205 213 +255 255 255 +0 0 0 diff --git a/data/fame_checker/pal_845e540.pal b/data/fame_checker/pal_845e540.pal new file mode 100644 index 000000000..485e27c48 --- /dev/null +++ b/data/fame_checker/pal_845e540.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 197 164 +255 230 205 +230 189 156 +205 156 115 +106 74 57 +180 139 213 +139 98 172 +98 65 106 +213 189 131 +189 164 98 +139 123 74 +180 139 115 +156 106 82 +90 74 49 +255 255 255 +0 0 0 diff --git a/data/fame_checker/pal_845ed60.pal b/data/fame_checker/pal_845ed60.pal new file mode 100644 index 000000000..adf46bf14 --- /dev/null +++ b/data/fame_checker/pal_845ed60.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 197 164 +255 222 205 +238 180 148 +197 139 106 +172 123 98 +213 172 115 +156 123 74 +90 82 65 +205 115 98 +164 213 156 +115 172 106 +90 123 82 +222 230 255 +164 172 197 +255 255 255 +0 0 0 diff --git a/data/fame_checker/pal_845f580.pal b/data/fame_checker/pal_845f580.pal new file mode 100644 index 000000000..eb6f2f18b --- /dev/null +++ b/data/fame_checker/pal_845f580.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 197 164 +255 222 205 +238 180 148 +197 139 106 +106 74 74 +139 156 164 +205 164 205 +164 123 164 +82 82 57 +213 213 222 +123 123 82 +115 115 115 +197 189 131 +156 156 90 +255 255 255 +0 0 0 diff --git a/data/fame_checker/pal_845f5a0.pal b/data/fame_checker/pal_845f5a0.pal new file mode 100644 index 000000000..25a3ac1d2 --- /dev/null +++ b/data/fame_checker/pal_845f5a0.pal @@ -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 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/fame_checker/pal_845f5c0.pal b/data/fame_checker/pal_845f5c0.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/fame_checker/pal_845f5c0.pal @@ -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 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/fame_checker/tilemap_845c600.bin b/data/fame_checker/tilemap_845c600.bin new file mode 100644 index 000000000..4272a1b41 Binary files /dev/null and b/data/fame_checker/tilemap_845c600.bin differ -- cgit v1.2.3 From c9c25baf72c1b64788cf2c249ecb83a856d626a8 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Mon, 26 Nov 2018 12:12:04 -0500 Subject: Fix png palettes --- data/fame_checker/img_845dd40.png | Bin 629 -> 629 bytes data/fame_checker/img_845e560.png | Bin 517 -> 517 bytes data/fame_checker/img_845ed80.png | Bin 761 -> 761 bytes 3 files changed, 0 insertions(+), 0 deletions(-) diff --git a/data/fame_checker/img_845dd40.png b/data/fame_checker/img_845dd40.png index 21f2a9d11..7e3a7b39b 100644 Binary files a/data/fame_checker/img_845dd40.png and b/data/fame_checker/img_845dd40.png differ diff --git a/data/fame_checker/img_845e560.png b/data/fame_checker/img_845e560.png index 0cd201fc1..1abf1a63e 100644 Binary files a/data/fame_checker/img_845e560.png and b/data/fame_checker/img_845e560.png differ diff --git a/data/fame_checker/img_845ed80.png b/data/fame_checker/img_845ed80.png index b4a82f3d0..5e2a19aed 100644 Binary files a/data/fame_checker/img_845ed80.png and b/data/fame_checker/img_845ed80.png differ -- cgit v1.2.3 From ae8b4043c1690d6b3cb62f89372c7f7e6d45348b Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Mon, 26 Nov 2018 12:34:22 -0500 Subject: More data decomp --- charmap.txt | 1 + data/data_83FECCC.s | 26 +++++- data/fame_checker.s | 181 -------------------------------------- include/event_scripts.h | 132 ++++++++++++++++++++++++++++ src/fame_checker.c | 229 +++++++++++++++++++++++++++++++++++++++++++++--- 5 files changed, 373 insertions(+), 196 deletions(-) diff --git a/charmap.txt b/charmap.txt index fc9cbc0a8..9441532b4 100644 --- a/charmap.txt +++ b/charmap.txt @@ -323,6 +323,7 @@ TALL_PLUS = FC 0C FB @ TODO: Identify and declare F7 control codes UNKNOWN_F7 = F7 +UNKNOWN_F8 = F8 UNKNOWN_F9 = F9 STRING = FD diff --git a/data/data_83FECCC.s b/data/data_83FECCC.s index ed542acc9..7c2d85f03 100644 --- a/data/data_83FECCC.s +++ b/data/data_83FECCC.s @@ -2097,7 +2097,31 @@ gUnknown_841E5B9:: @ 841E5B9 .incbin "baserom.gba", 0x41E5B9, 0x19 gUnknown_841E5D2:: @ 841E5D2 - .incbin "baserom.gba", 0x41E5D2, 0xCF + .string "{UNKNOWN_F8 0x0C}PICK {UNKNOWN_F8 0x00}READ {UNKNOWN_F8 0x01}CANCEL$" + +gUnknown_841E5E9:: @ 841E5E9 + .string "OAK$" + +gUnknown_841E5ED:: @ 841E5ED + .string "DAISY$" + +gUnknown_841E5F3:: @ 841E5F3 + .string "BILL$" + +gUnknown_841E5F8:: @ 841E5F8 + .string "FUJI$" + +gUnknown_841E5FD:: @ 841E5FD + .string "A variety of events will be imported\nover Wireless Communication.$" + +gUnknown_841E63F:: @ 841E63F + .string "Read the WONDER CARDS in your\npossession.$" + +gUnknown_841E669:: @ 841E669 + .string "Read the NEWS that arrived.$" + +gUnknown_841E685:: @ 841E685 + .string "Return to the title screen.$" gUnknown_841E6A1:: @ 841E6A1 .incbin "baserom.gba", 0x41E6A1, 0x3B diff --git a/data/fame_checker.s b/data/fame_checker.s index 444de0ffa..55042293a 100644 --- a/data/fame_checker.s +++ b/data/fame_checker.s @@ -4,187 +4,6 @@ .section .rodata .align 2 -gUnknown_845C600:: @ 845C600 - .incbin "data/fame_checker/tilemap_845c600.bin" - -gUnknown_845DD20:: @ 845DD20 - .incbin "data/fame_checker/pal_845dd20.gbapal" - -gUnknown_845DD40:: @ 845DD40 - .incbin "data/fame_checker/img_845dd40.4bpp" - -gUnknown_845E540:: @ 845E540 - .incbin "data/fame_checker/pal_845e540.gbapal" - -gUnknown_845E560:: @ 845E560 - .incbin "data/fame_checker/img_845e560.4bpp" - -gUnknown_845ED60:: @ 845ED60 - .incbin "data/fame_checker/pal_845ed60.gbapal" - -gUnknown_845ED80:: @ 845ED80 - .incbin "data/fame_checker/img_845ed80.4bpp" - -gUnknown_845F580:: @ 845F580 - .incbin "data/fame_checker/pal_845f580.gbapal" - -gUnknown_845F5A0:: @ 845F5A0 - .incbin "data/fame_checker/pal_845f5a0.gbapal" - -gUnknown_845F5C0:: @ 845F5C0 - .incbin "data/fame_checker/pal_845f5c0.gbapal" - -gUnknown_845F5E0:: @ 845F5E0 - .byte 0x00, 0x01, 0x02 - -gUnknown_845F5E3:: @ 845F5E3 - .byte 0x00, 0x02, 0x03 - -gUnknown_845F5E6:: @ 845F5E6 - .byte 0x00, 0x06, 0x07 - - .align 1 -gUnknown_845F5EA:: @ 845F5EA - .incbin "baserom.gba", 0x45F5EA, 0x22 - -gUnknown_845F60C:: @ 845F60C - .incbin "baserom.gba", 0x45F60C, 0x10 - -gUnknown_845F61C:: @ 845F61C - .incbin "baserom.gba", 0x45F61C, 0x20 - -gUnknown_845F63C:: @ 845F63C - .4byte gUnknown_81B0188 - .4byte gUnknown_81B0251 - .4byte gUnknown_81B030F - .4byte gUnknown_81B03B3 - .4byte gUnknown_81B0446 - .4byte gUnknown_81B0504 - .4byte gUnknown_81B05C2 - .4byte gUnknown_81B0667 - .4byte gUnknown_81B06FB - .4byte gUnknown_81B079F - .4byte gUnknown_81B0845 - .4byte gUnknown_81B08EE - .4byte gUnknown_81B097F - .4byte gUnknown_81B0A45 - .4byte gUnknown_81B0AFF - .4byte gUnknown_81B0BA6 - .4byte gUnknown_81B0198 - .4byte gUnknown_81B025D - .4byte gUnknown_81B031B - .4byte gUnknown_81B03BF - .4byte gUnknown_81B0456 - .4byte gUnknown_81B0510 - .4byte gUnknown_81B05CD - .4byte gUnknown_81B0675 - .4byte gUnknown_81B0708 - .4byte gUnknown_81B07AD - .4byte gUnknown_81B0851 - .4byte gUnknown_81B08FB - .4byte gUnknown_81B098B - .4byte gUnknown_81B0A50 - .4byte gUnknown_81B0B0E - .4byte gUnknown_81B0BB5 - -gUnknown_845F6BC:: @ 845F6BC - .4byte gUnknown_81AD106 - .4byte gUnknown_81AD145 - .4byte gUnknown_81AD1BB - .4byte gUnknown_81AD258 - .4byte gUnknown_81AD2B9 - .4byte gUnknown_81AD377 - .4byte gUnknown_81AD40C - .4byte gUnknown_81AD4AE - .4byte gUnknown_81AD516 - .4byte gUnknown_81AD5A7 - .4byte gUnknown_81AD608 - .4byte gUnknown_81AD69F - .4byte gUnknown_81AD705 - .4byte gUnknown_81AD771 - .4byte gUnknown_81AD840 - .4byte gUnknown_81AD908 - .4byte gUnknown_81AD99A - .4byte gUnknown_81ADA27 - .4byte gUnknown_81ADA91 - .4byte gUnknown_81ADAF6 - .4byte gUnknown_81ADB5A - .4byte gUnknown_81ADBD9 - .4byte gUnknown_81ADC72 - .4byte gUnknown_81ADCEB - .4byte gUnknown_81ADD3C - .4byte gUnknown_81ADDA7 - .4byte gUnknown_81ADE0B - .4byte gUnknown_81ADE82 - .4byte gUnknown_81ADEEC - .4byte gUnknown_81ADF6A - .4byte gUnknown_81AE009 - .4byte gUnknown_81AE072 - .4byte gUnknown_81AE0F3 - .4byte gUnknown_81AE15B - .4byte gUnknown_81AE1E5 - .4byte gUnknown_81AE247 - .4byte gUnknown_81AE2B6 - .4byte gUnknown_81AE31D - .4byte gUnknown_81AE37D - .4byte gUnknown_81AE407 - .4byte gUnknown_81AE48D - .4byte gUnknown_81AE51B - .4byte gUnknown_81AE5E8 - .4byte gUnknown_81AE656 - .4byte gUnknown_81AE6D7 - .4byte gUnknown_81AE762 - .4byte gUnknown_81AE7CB - .4byte gUnknown_81AE841 - .4byte gUnknown_81AE89E - .4byte gUnknown_81AE90A - .4byte gUnknown_81AE990 - .4byte gUnknown_81AEA59 - .4byte gUnknown_81AEAEE - .4byte gUnknown_81AEB69 - .4byte gUnknown_81AEBDF - .4byte gUnknown_81AEC28 - .4byte gUnknown_81AEC82 - .4byte gUnknown_81AED27 - .4byte gUnknown_81AEDAA - .4byte gUnknown_81AEE51 - .4byte gUnknown_81AEF25 - .4byte gUnknown_81AEF6C - .4byte gUnknown_81AEFC6 - .4byte gUnknown_81AF04C - .4byte gUnknown_81AF0F0 - .4byte gUnknown_81AF19A - .4byte gUnknown_81AF200 - .4byte gUnknown_81AF248 - .4byte gUnknown_81AF2B7 - .4byte gUnknown_81AF34E - .4byte gUnknown_81AF3BE - .4byte gUnknown_81AF47C - .4byte gUnknown_81AF4FD - .4byte gUnknown_81AF567 - .4byte gUnknown_81AF641 - .4byte gUnknown_81AF6BA - .4byte gUnknown_81AF758 - .4byte gUnknown_81AF7CB - .4byte gUnknown_81AF83E - .4byte gUnknown_81AF8CA - .4byte gUnknown_81AF929 - .4byte gUnknown_81AF998 - .4byte gUnknown_81AFA20 - .4byte gUnknown_81AFAB9 - .4byte gUnknown_81AFB0C - .4byte gUnknown_81AFB76 - .4byte gUnknown_81AFC38 - .4byte gUnknown_81AFCE9 - .4byte gUnknown_81AFD49 - .4byte gUnknown_81AFDC4 - .4byte gUnknown_81AFE68 - .4byte gUnknown_81AFF23 - .4byte gUnknown_81AFFA8 - .4byte gUnknown_81B0022 - .4byte gUnknown_81B00A6 - .4byte gUnknown_81B0106 - gUnknown_845F83C:: @ 845F83C .incbin "baserom.gba", 0x45F83C, 0x60 diff --git a/include/event_scripts.h b/include/event_scripts.h index ebfdb4fe3..28106d9d4 100644 --- a/include/event_scripts.h +++ b/include/event_scripts.h @@ -381,4 +381,136 @@ extern const u8 gUnknown_84178DA[]; extern const u8 gUnknown_81C137C[]; extern const u8 gUnknown_81C13D6[]; extern const u8 gUnknown_81C1429[]; + +// fame_checker + +extern const u8 gUnknown_81AD106[]; +extern const u8 gUnknown_81AD145[]; +extern const u8 gUnknown_81AD1BB[]; +extern const u8 gUnknown_81AD258[]; +extern const u8 gUnknown_81AD2B9[]; +extern const u8 gUnknown_81AD377[]; +extern const u8 gUnknown_81AD40C[]; +extern const u8 gUnknown_81AD4AE[]; +extern const u8 gUnknown_81AD516[]; +extern const u8 gUnknown_81AD5A7[]; +extern const u8 gUnknown_81AD608[]; +extern const u8 gUnknown_81AD69F[]; +extern const u8 gUnknown_81AD705[]; +extern const u8 gUnknown_81AD771[]; +extern const u8 gUnknown_81AD840[]; +extern const u8 gUnknown_81AD908[]; +extern const u8 gUnknown_81AD99A[]; +extern const u8 gUnknown_81ADA27[]; +extern const u8 gUnknown_81ADA91[]; +extern const u8 gUnknown_81ADAF6[]; +extern const u8 gUnknown_81ADB5A[]; +extern const u8 gUnknown_81ADBD9[]; +extern const u8 gUnknown_81ADC72[]; +extern const u8 gUnknown_81ADCEB[]; +extern const u8 gUnknown_81ADD3C[]; +extern const u8 gUnknown_81ADDA7[]; +extern const u8 gUnknown_81ADE0B[]; +extern const u8 gUnknown_81ADE82[]; +extern const u8 gUnknown_81ADEEC[]; +extern const u8 gUnknown_81ADF6A[]; +extern const u8 gUnknown_81AE009[]; +extern const u8 gUnknown_81AE072[]; +extern const u8 gUnknown_81AE0F3[]; +extern const u8 gUnknown_81AE15B[]; +extern const u8 gUnknown_81AE1E5[]; +extern const u8 gUnknown_81AE247[]; +extern const u8 gUnknown_81AE2B6[]; +extern const u8 gUnknown_81AE31D[]; +extern const u8 gUnknown_81AE37D[]; +extern const u8 gUnknown_81AE407[]; +extern const u8 gUnknown_81AE48D[]; +extern const u8 gUnknown_81AE51B[]; +extern const u8 gUnknown_81AE5E8[]; +extern const u8 gUnknown_81AE656[]; +extern const u8 gUnknown_81AE6D7[]; +extern const u8 gUnknown_81AE762[]; +extern const u8 gUnknown_81AE7CB[]; +extern const u8 gUnknown_81AE841[]; +extern const u8 gUnknown_81AE89E[]; +extern const u8 gUnknown_81AE90A[]; +extern const u8 gUnknown_81AE990[]; +extern const u8 gUnknown_81AEA59[]; +extern const u8 gUnknown_81AEAEE[]; +extern const u8 gUnknown_81AEB69[]; +extern const u8 gUnknown_81AEBDF[]; +extern const u8 gUnknown_81AEC28[]; +extern const u8 gUnknown_81AEC82[]; +extern const u8 gUnknown_81AED27[]; +extern const u8 gUnknown_81AEDAA[]; +extern const u8 gUnknown_81AEE51[]; +extern const u8 gUnknown_81AEF25[]; +extern const u8 gUnknown_81AEF6C[]; +extern const u8 gUnknown_81AEFC6[]; +extern const u8 gUnknown_81AF04C[]; +extern const u8 gUnknown_81AF0F0[]; +extern const u8 gUnknown_81AF19A[]; +extern const u8 gUnknown_81AF200[]; +extern const u8 gUnknown_81AF248[]; +extern const u8 gUnknown_81AF2B7[]; +extern const u8 gUnknown_81AF34E[]; +extern const u8 gUnknown_81AF3BE[]; +extern const u8 gUnknown_81AF47C[]; +extern const u8 gUnknown_81AF4FD[]; +extern const u8 gUnknown_81AF567[]; +extern const u8 gUnknown_81AF641[]; +extern const u8 gUnknown_81AF6BA[]; +extern const u8 gUnknown_81AF758[]; +extern const u8 gUnknown_81AF7CB[]; +extern const u8 gUnknown_81AF83E[]; +extern const u8 gUnknown_81AF8CA[]; +extern const u8 gUnknown_81AF929[]; +extern const u8 gUnknown_81AF998[]; +extern const u8 gUnknown_81AFA20[]; +extern const u8 gUnknown_81AFAB9[]; +extern const u8 gUnknown_81AFB0C[]; +extern const u8 gUnknown_81AFB76[]; +extern const u8 gUnknown_81AFC38[]; +extern const u8 gUnknown_81AFCE9[]; +extern const u8 gUnknown_81AFD49[]; +extern const u8 gUnknown_81AFDC4[]; +extern const u8 gUnknown_81AFE68[]; +extern const u8 gUnknown_81AFF23[]; +extern const u8 gUnknown_81AFFA8[]; +extern const u8 gUnknown_81B0022[]; +extern const u8 gUnknown_81B00A6[]; +extern const u8 gUnknown_81B0106[]; +extern const u8 gUnknown_81B0188[]; +extern const u8 gUnknown_81B0198[]; +extern const u8 gUnknown_81B0251[]; +extern const u8 gUnknown_81B025D[]; +extern const u8 gUnknown_81B030F[]; +extern const u8 gUnknown_81B031B[]; +extern const u8 gUnknown_81B03B3[]; +extern const u8 gUnknown_81B03BF[]; +extern const u8 gUnknown_81B0446[]; +extern const u8 gUnknown_81B0456[]; +extern const u8 gUnknown_81B0504[]; +extern const u8 gUnknown_81B0510[]; +extern const u8 gUnknown_81B05C2[]; +extern const u8 gUnknown_81B05CD[]; +extern const u8 gUnknown_81B0667[]; +extern const u8 gUnknown_81B0675[]; +extern const u8 gUnknown_81B06FB[]; +extern const u8 gUnknown_81B0708[]; +extern const u8 gUnknown_81B079F[]; +extern const u8 gUnknown_81B07AD[]; +extern const u8 gUnknown_81B0845[]; +extern const u8 gUnknown_81B0851[]; +extern const u8 gUnknown_81B08EE[]; +extern const u8 gUnknown_81B08FB[]; +extern const u8 gUnknown_81B097F[]; +extern const u8 gUnknown_81B098B[]; +extern const u8 gUnknown_81B0A45[]; +extern const u8 gUnknown_81B0A50[]; +extern const u8 gUnknown_81B0AFF[]; +extern const u8 gUnknown_81B0B0E[]; +extern const u8 gUnknown_81B0BA6[]; +extern const u8 gUnknown_81B0BB5[]; + #endif //GUARD_EVENT_SCRIPTS_H diff --git a/src/fame_checker.c b/src/fame_checker.c index 2f455c462..11bb637b7 100644 --- a/src/fame_checker.c +++ b/src/fame_checker.c @@ -3,6 +3,7 @@ #include "sprite.h" #include "bg.h" #include "event_data.h" +#include "event_scripts.h" #include "graphics.h" #include "battle.h" #include "battle_setup.h" @@ -125,21 +126,221 @@ extern const u8 gUnknown_84181E4[]; extern const u8 gUnknown_841E5A4[]; extern const u8 gUnknown_841E5B9[]; extern const u8 gUnknown_841E5D2[]; +extern const u8 gUnknown_841E5E9[]; +extern const u8 gUnknown_841E5ED[]; +extern const u8 gUnknown_841E5F3[]; +extern const u8 gUnknown_841E5F8[]; + +const u16 gUnknown_845C600[] = INCBIN_U16("data/fame_checker/tilemap_845c600.bin"); +const u16 gUnknown_845DD20[] = INCBIN_U16("data/fame_checker/pal_845dd20.gbapal"); +const u16 gUnknown_845DD40[] = INCBIN_U16("data/fame_checker/img_845dd40.4bpp"); +const u16 gUnknown_845E540[] = INCBIN_U16("data/fame_checker/pal_845e540.gbapal"); +const u16 gUnknown_845E560[] = INCBIN_U16("data/fame_checker/img_845e560.4bpp"); +const u16 gUnknown_845ED60[] = INCBIN_U16("data/fame_checker/pal_845ed60.gbapal"); +const u16 gUnknown_845ED80[] = INCBIN_U16("data/fame_checker/img_845ed80.4bpp"); +const u16 gUnknown_845F580[] = INCBIN_U16("data/fame_checker/pal_845f580.gbapal"); +const u16 gUnknown_845F5A0[] = INCBIN_U16("data/fame_checker/pal_845f5a0.gbapal"); +const u16 gUnknown_845F5C0[] = INCBIN_U16("data/fame_checker/pal_845f5c0.gbapal"); + +const struct TextColor gUnknown_845F5E0 = {0x00, 0x01, 0x02}; +const struct TextColor gUnknown_845F5E3 = {0x00, 0x02, 0x03}; +const struct TextColor gUnknown_845F5E6 = {0x00, 0x06, 0x07}; + +const u16 gUnknown_845F5EA[] = { + 0xfe00, + 0xfe01, + 0x019e, + 0x019f, + 0x01a0, + 0x01a1, + 0x01a2, + 0x01a4, + 0x01a3, + 0x019a, + 0x019b, + 0x019c, + 0x019d, + 0xfe02, + 0xfe03, + 0x015c +}; + +const u8 *const gUnknown_845F60C[] = { + gUnknown_841E5E9, + gUnknown_841E5ED, + gUnknown_841E5F3, + gUnknown_841E5F8 +}; + +const u8 gUnknown_845F61C[] = { + 0x56, + 0x54, + 0x74, + 0x75, + 0x76, + 0x77, + 0x78, + 0x7a, + 0x79, + 0x70, + 0x71, + 0x72, + 0x73, + 0x64, + 0x7b, + 0x6c, + 0x00, + 0x01, + 0x00, + 0x01, + 0x00, + 0x01, + 0x00, + 0x01, + 0x00, + 0x01, + 0x00, + 0x01, + 0x00, + 0x00, + 0x00, + 0x00 +}; + +const u8 *const gUnknown_845F63C[] = { + gUnknown_81B0188, + gUnknown_81B0251, + gUnknown_81B030F, + gUnknown_81B03B3, + gUnknown_81B0446, + gUnknown_81B0504, + gUnknown_81B05C2, + gUnknown_81B0667, + gUnknown_81B06FB, + gUnknown_81B079F, + gUnknown_81B0845, + gUnknown_81B08EE, + gUnknown_81B097F, + gUnknown_81B0A45, + gUnknown_81B0AFF, + gUnknown_81B0BA6, + gUnknown_81B0198, + gUnknown_81B025D, + gUnknown_81B031B, + gUnknown_81B03BF, + gUnknown_81B0456, + gUnknown_81B0510, + gUnknown_81B05CD, + gUnknown_81B0675, + gUnknown_81B0708, + gUnknown_81B07AD, + gUnknown_81B0851, + gUnknown_81B08FB, + gUnknown_81B098B, + gUnknown_81B0A50, + gUnknown_81B0B0E, + gUnknown_81B0BB5 +}; + +const u8 *const gUnknown_845F6BC[] = { + gUnknown_81AD106, + gUnknown_81AD145, + gUnknown_81AD1BB, + gUnknown_81AD258, + gUnknown_81AD2B9, + gUnknown_81AD377, + gUnknown_81AD40C, + gUnknown_81AD4AE, + gUnknown_81AD516, + gUnknown_81AD5A7, + gUnknown_81AD608, + gUnknown_81AD69F, + gUnknown_81AD705, + gUnknown_81AD771, + gUnknown_81AD840, + gUnknown_81AD908, + gUnknown_81AD99A, + gUnknown_81ADA27, + gUnknown_81ADA91, + gUnknown_81ADAF6, + gUnknown_81ADB5A, + gUnknown_81ADBD9, + gUnknown_81ADC72, + gUnknown_81ADCEB, + gUnknown_81ADD3C, + gUnknown_81ADDA7, + gUnknown_81ADE0B, + gUnknown_81ADE82, + gUnknown_81ADEEC, + gUnknown_81ADF6A, + gUnknown_81AE009, + gUnknown_81AE072, + gUnknown_81AE0F3, + gUnknown_81AE15B, + gUnknown_81AE1E5, + gUnknown_81AE247, + gUnknown_81AE2B6, + gUnknown_81AE31D, + gUnknown_81AE37D, + gUnknown_81AE407, + gUnknown_81AE48D, + gUnknown_81AE51B, + gUnknown_81AE5E8, + gUnknown_81AE656, + gUnknown_81AE6D7, + gUnknown_81AE762, + gUnknown_81AE7CB, + gUnknown_81AE841, + gUnknown_81AE89E, + gUnknown_81AE90A, + gUnknown_81AE990, + gUnknown_81AEA59, + gUnknown_81AEAEE, + gUnknown_81AEB69, + gUnknown_81AEBDF, + gUnknown_81AEC28, + gUnknown_81AEC82, + gUnknown_81AED27, + gUnknown_81AEDAA, + gUnknown_81AEE51, + gUnknown_81AEF25, + gUnknown_81AEF6C, + gUnknown_81AEFC6, + gUnknown_81AF04C, + gUnknown_81AF0F0, + gUnknown_81AF19A, + gUnknown_81AF200, + gUnknown_81AF248, + gUnknown_81AF2B7, + gUnknown_81AF34E, + gUnknown_81AF3BE, + gUnknown_81AF47C, + gUnknown_81AF4FD, + gUnknown_81AF567, + gUnknown_81AF641, + gUnknown_81AF6BA, + gUnknown_81AF758, + gUnknown_81AF7CB, + gUnknown_81AF83E, + gUnknown_81AF8CA, + gUnknown_81AF929, + gUnknown_81AF998, + gUnknown_81AFA20, + gUnknown_81AFAB9, + gUnknown_81AFB0C, + gUnknown_81AFB76, + gUnknown_81AFC38, + gUnknown_81AFCE9, + gUnknown_81AFD49, + gUnknown_81AFDC4, + gUnknown_81AFE68, + gUnknown_81AFF23, + gUnknown_81AFFA8, + gUnknown_81B0022, + gUnknown_81B00A6, + gUnknown_81B0106 +}; -extern const u16 gUnknown_845C600[]; -extern const u16 gUnknown_845DD20[]; -extern const u16 gUnknown_845E540[]; -extern const u16 gUnknown_845ED60[]; -extern const u16 gUnknown_845F580[]; -extern const u16 gUnknown_845F5C0[]; -extern const struct TextColor gUnknown_845F5E0; -extern const struct TextColor gUnknown_845F5E3; -extern const struct TextColor gUnknown_845F5E6; -extern const u16 gUnknown_845F5EA[]; -extern const u8 gUnknown_845F61C[]; -extern const u8 *const gUnknown_845F60C[]; -extern const u8 *const gUnknown_845F63C[]; -extern const u8 *const gUnknown_845F6BC[]; extern const u8 *const gUnknown_845F89C[]; extern const u8 *const gUnknown_845FA1C[]; extern const u8 gUnknown_845F83C[]; -- cgit v1.2.3 From 6fb78b0885d4dacf83df09eb48bb97d3c75b6680 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Mon, 26 Nov 2018 12:51:56 -0500 Subject: more text dism --- data/event_scripts.s | 3 - data/fame_checker.s | 6 - data/text/fame_checker.inc | 902 +++++++++++++++++++++++++++++++++++++++++++++ include/event_scripts.h | 96 +++++ src/fame_checker.c | 152 +++----- 5 files changed, 1052 insertions(+), 107 deletions(-) diff --git a/data/event_scripts.s b/data/event_scripts.s index 764de7637..c27df1946 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -230,9 +230,6 @@ gUnknown_81A8DFD:: @ 81A8DFD .include "data/text/fame_checker.inc" -gUnknown_81B0C45:: @ 0x81B0C45 - .incbin "baserom.gba", 0x1B0C45, 0x222A - gUnknown_81B2E6F:: @ 81B2E6F .incbin "baserom.gba", 0x1B2E6F, 0x15A diff --git a/data/fame_checker.s b/data/fame_checker.s index 55042293a..e85c384bb 100644 --- a/data/fame_checker.s +++ b/data/fame_checker.s @@ -4,12 +4,6 @@ .section .rodata .align 2 -gUnknown_845F83C:: @ 845F83C - .incbin "baserom.gba", 0x45F83C, 0x60 - -gUnknown_845F89C:: @ 845F89C - .incbin "baserom.gba", 0x45F89C, 0x180 - gUnknown_845FA1C:: @ 845FA1C .incbin "baserom.gba", 0x45FA1C, 0x180 diff --git a/data/text/fame_checker.inc b/data/text/fame_checker.inc index fd4864dc8..975960e4e 100644 --- a/data/text/fame_checker.inc +++ b/data/text/fame_checker.inc @@ -796,3 +796,905 @@ gUnknown_81B0BB5:: @ 0x81B0BB5 .string "to you.\p" .string "I will concentrate solely on\n" .string "bettering myself, and none other.$" + +gUnknown_81B0C45:: @ 0x81B0C45 + .string "PALLET TOWN$" + +gUnknown_81B0C51:: @ 81B0C51 + .string "RESEARCH LAB$" + +gUnknown_81B0C5E:: @ 81B0C5E + .string "RESEARCH LAB$" + +gUnknown_81B0C6B:: @ 81B0C6B + .string "VIRIDIAN CITY$" + +gUnknown_81B0C79:: @ 81B0C79 + .string "POKéMON LEAGUE$" + +gUnknown_81B0C88:: @ 81B0C88 + .string "RESEARCH LAB$" + +gUnknown_81B0C95:: @ 81B0C95 + .string "RESEARCH LAB$" + +gUnknown_81B0CA2:: @ 81B0CA2 + .string "VERMILION CITY$" + +gUnknown_81B0CB1:: @ 81B0CB1 + .string "WATER LABYRINTH$" + +gUnknown_81B0CC1:: @ 81B0CC1 + .string "VIRIDIAN CITY$" + +gUnknown_81B0CCF:: @ 81B0CCF + .string "CELADON MANSION$" + +gUnknown_81B0CDF:: @ 81B0CDF + .string "FOUR ISLAND$" + +gUnknown_81B0CEB:: @ 81B0CEB + .string "PEWTER CITY$" + +gUnknown_81B0CF7:: @ 81B0CF7 + .string "PEWTER GYM$" + +gUnknown_81B0D02:: @ 81B0D02 + .string "PEWTER CITY$" + +gUnknown_81B0D0E:: @ 81B0D0E + .string "ROUTE 4$" + +gUnknown_81B0D16:: @ 81B0D16 + .string "MT. MOON$" + +gUnknown_81B0D1F:: @ 81B0D1F + .string "PEWTER MUSEUM$" + +gUnknown_81B0D2D:: @ 81B0D2D + .string "CERULEAN CITY$" + +gUnknown_81B0D3B:: @ 81B0D3B + .string "CERULEAN GYM$" + +gUnknown_81B0D48:: @ 81B0D48 + .string "CERULEAN GYM$" + +gUnknown_81B0D55:: @ 81B0D55 + .string "SEAFOAM ISLANDS$" + +gUnknown_81B0D65:: @ 81B0D65 + .string "CERULEAN CAPE$" + +gUnknown_81B0D73:: @ 81B0D73 + .string "CERULEAN CITY$" + +gUnknown_81B0D81:: @ 81B0D81 + .string "VERMILION CITY$" + +gUnknown_81B0D90:: @ 81B0D90 + .string "VERMILION GYM$" + +gUnknown_81B0D9E:: @ 81B0D9E + .string "VERMILION GYM$" + +gUnknown_81B0DAC:: @ 81B0DAC + .string "VERMILION GYM$" + +gUnknown_81B0DBA:: @ 81B0DBA + .string "VERMILION GYM$" + +gUnknown_81B0DC8:: @ 81B0DC8 + .string "VERMILION CITY$" + +gUnknown_81B0DD7:: @ 81B0DD7 + .string "CELADON CITY$" + +gUnknown_81B0DE4:: @ 81B0DE4 + .string "CELADON GYM$" + +gUnknown_81B0DF0:: @ 81B0DF0 + .string "CELADON GYM$" + +gUnknown_81B0DFC:: @ 81B0DFC + .string "CELADON GYM$" + +gUnknown_81B0E08:: @ 81B0E08 + .string "CELADON GYM$" + +gUnknown_81B0E14:: @ 81B0E14 + .string "CELADON MANSION$" + +gUnknown_81B0E24:: @ 81B0E24 + .string "FUCHSIA CITY$" + +gUnknown_81B0E31:: @ 81B0E31 + .string "FUCHSIA GYM$" + +gUnknown_81B0E3D:: @ 81B0E3D + .string "FUCHSIA GYM$" + +gUnknown_81B0E49:: @ 81B0E49 + .string "FUCHSIA CITY$" + +gUnknown_81B0E56:: @ 81B0E56 + .string "FUCHSIA CITY$" + +gUnknown_81B0E63:: @ 81B0E63 + .string "SAFARI ZONE$" + +gUnknown_81B0E6F:: @ 81B0E6F + .string "SAFFRON CITY$" + +gUnknown_81B0E7C:: @ 81B0E7C + .string "THREE ISLAND$" + +gUnknown_81B0E89:: @ 81B0E89 + .string "SAFFRON GYM$" + +gUnknown_81B0E95:: @ 81B0E95 + .string "SAFFRON GYM$" + +gUnknown_81B0EA1:: @ 81B0EA1 + .string "SAFFRON CITY$" + +gUnknown_81B0EAE:: @ 81B0EAE + .string "SAFFRON GYM$" + +gUnknown_81B0EBA:: @ 81B0EBA + .string "CINNABAR ISLAND$" + +gUnknown_81B0ECA:: @ 81B0ECA + .string "CINNABAR GYM$" + +gUnknown_81B0ED7:: @ 81B0ED7 + .string "CINNABAR GYM$" + +gUnknown_81B0EE4:: @ 81B0EE4 + .string "CINNABAR ISLAND$" + +gUnknown_81B0EF4:: @ 81B0EF4 + .string "CINNABAR GYM$" + +gUnknown_81B0F01:: @ 81B0F01 + .string "RESORT GORGEOUS$" + +gUnknown_81B0F11:: @ 81B0F11 + .string "POKéMON LEAGUE$" + +gUnknown_81B0F20:: @ 81B0F20 + .string "POKéMON LEAGUE$" + +gUnknown_81B0F2F:: @ 81B0F2F + .string "FOUR ISLAND$" + +gUnknown_81B0F3B:: @ 81B0F3B + .string "FIVE ISLAND$" + +gUnknown_81B0F47:: @ 81B0F47 + .string "FOUR ISLAND$" + +gUnknown_81B0F53:: @ 81B0F53 + .string "FOUR ISLAND$" + +gUnknown_81B0F5F:: @ 81B0F5F + .string "POKéMON LEAGUE$" + +gUnknown_81B0F6E:: @ 81B0F6E + .string "POKéMON LEAGUE$" + +gUnknown_81B0F7D:: @ 81B0F7D + .string "SAFFRON CITY$" + +gUnknown_81B0F8A:: @ 81B0F8A + .string "EMBER SPA$" + +gUnknown_81B0F94:: @ 81B0F94 + .string "TWO ISLAND$" + +gUnknown_81B0F9F:: @ 81B0F9F + .string "SEVAULT CANYON$" + +gUnknown_81B0FAE:: @ 81B0FAE + .string "POKéMON LEAGUE$" + +gUnknown_81B0FBD:: @ 81B0FBD + .string "INDIGO PLATEAU$" + +gUnknown_81B0FCC:: @ 81B0FCC + .string "INDIGO PLATEAU$" + +gUnknown_81B0FDB:: @ 81B0FDB + .string "SEVEN ISLAND$" + +gUnknown_81B0FE8:: @ 81B0FE8 + .string "POKéMON LEAGUE$" + +gUnknown_81B0FF7:: @ 81B0FF7 + .string "SIX ISLAND$" + +gUnknown_81B1002:: @ 81B1002 + .string "POKéMON LEAGUE$" + +gUnknown_81B1011:: @ 81B1011 + .string "POKéMON LEAGUE$" + +gUnknown_81B1020:: @ 81B1020 + .string "SAFFRON CITY$" + +gUnknown_81B102D:: @ 81B102D + .string "CELADON DEPT.$" + +gUnknown_81B103B:: @ 81B103B + .string "INDIGO PLATEAU$" + +gUnknown_81B104A:: @ 81B104A + .string "INDIGO PLATEAU$" + +gUnknown_81B1059:: @ 81B1059 + .string "CERULEAN CITY$" + +gUnknown_81B1067:: @ 81B1067 + .string "CERULEAN CITY$" + +gUnknown_81B1075:: @ 81B1075 + .string "FUCHSIA CITY$" + +gUnknown_81B1082:: @ 81B1082 + .string "ONE ISLAND$" + +gUnknown_81B108D:: @ 81B108D + .string "ONE ISLAND$" + +gUnknown_81B1098:: @ 81B1098 + .string "ONE ISLAND$" + +gUnknown_81B10A3:: @ 81B10A3 + .string "LAVENDER TOWN$" + +gUnknown_81B10B1:: @ 81B10B1 + .string "POKéMON TOWER$" + +gUnknown_81B10BF:: @ 81B10BF + .string "LAVENDER TOWN$" + +gUnknown_81B10CD:: @ 81B10CD + .string "LAVENDER TOWN$" + +gUnknown_81B10DB:: @ 81B10DB + .string "CINNABAR GYM$" + +gUnknown_81B10E8:: @ 81B10E8 + .string "CINNABAR ISLAND$" + +gUnknown_81B10F8:: @ 81B10F8 + .string "ROCKET HIDEOUT$" + +gUnknown_81B1107:: @ 81B1107 + .string "SILPH CO.$" + +gUnknown_81B1111:: @ 81B1111 + .string "SILPH CO.$" + +gUnknown_81B111B:: @ 81B111B + .string "VIRIDIAN GYM$" + +gUnknown_81B1128:: @ 81B1128 + .string "VIRIDIAN GYM$" + +gUnknown_81B1135:: @ 81B1135 + .string "ROCKET WAREHOUSE$" + +gUnknown_81B1146:: @ 81B1146 + .string "SIGN$" + +gUnknown_81B114B:: @ 81B114B + .string "PROF. OAK$" + +gUnknown_81B1155:: @ 81B1155 + .string "AIDE$" + +gUnknown_81B115A:: @ 81B115A + .string "POKéMON JOURNAL$" + +gUnknown_81B116A:: @ 81B116A + .string "AGATHA$" + +gUnknown_81B1171:: @ 81B1171 + .string "AIDE$" + +gUnknown_81B1176:: @ 81B1176 + .string "AIDE$" + +gUnknown_81B117B:: @ 81B117B + .string "WOMAN$" + +gUnknown_81B1181:: @ 81B1181 + .string "MAN$" + +gUnknown_81B1185:: @ 81B1185 + .string "POKéMON JOURNAL$" + +gUnknown_81B1195:: @ 81B1195 + .string "OLD LADY$" + +gUnknown_81B119E:: @ 81B119E + .string "POKéMON JOURNAL$" + +gUnknown_81B11AE:: @ 81B11AE + .string "SIGN$" + +gUnknown_81B11B3:: @ 81B11B3 + .string "BROCK$" + +gUnknown_81B11B9:: @ 81B11B9 + .string "YOUNG MAN$" + +gUnknown_81B11C3:: @ 81B11C3 + .string "BOY$" + +gUnknown_81B11C7:: @ 81B11C7 + .string "MAN$" + +gUnknown_81B11CB:: @ 81B11CB + .string "POKéMON JOURNAL$" + +gUnknown_81B11DB:: @ 81B11DB + .string "SIGN$" + +gUnknown_81B11E0:: @ 81B11E0 + .string "MISTY$" + +gUnknown_81B11E6:: @ 81B11E6 + .string "LUIS$" + +gUnknown_81B11EB:: @ 81B11EB + .string "YOUNG MAN$" + +gUnknown_81B11F5:: @ 81B11F5 + .string "DAME$" + +gUnknown_81B11FA:: @ 81B11FA + .string "POKéMON JOURNAL$" + +gUnknown_81B120A:: @ 81B120A + .string "SIGN$" + +gUnknown_81B120F:: @ 81B120F + .string "LT. SURGE$" + +gUnknown_81B1219:: @ 81B1219 + .string "TUCKER$" + +gUnknown_81B1220:: @ 81B1220 + .string "TUCKER$" + +gUnknown_81B1227:: @ 81B1227 + .string "DWAYNE$" + +gUnknown_81B122E:: @ 81B122E + .string "POKéMON JOURNAL$" + +gUnknown_81B123E:: @ 81B123E + .string "SIGN$" + +gUnknown_81B1243:: @ 81B1243 + .string "ERIKA$" + +gUnknown_81B1249:: @ 81B1249 + .string "LOLA$" + +gUnknown_81B124E:: @ 81B124E + .string "TAMIA$" + +gUnknown_81B1254:: @ 81B1254 + .string "ERIKA$" + +gUnknown_81B125A:: @ 81B125A + .string "POKéMON JOURNAL$" + +gUnknown_81B126A:: @ 81B126A + .string "SIGN$" + +gUnknown_81B126F:: @ 81B126F + .string "KOGA$" + +gUnknown_81B1274:: @ 81B1274 + .string "KIRK$" + +gUnknown_81B1279:: @ 81B1279 + .string "CHARINE$" + +gUnknown_81B1281:: @ 81B1281 + .string "POKéMON JOURNAL$" + +gUnknown_81B1291:: @ 81B1291 + .string "MAN$" + +gUnknown_81B1295:: @ 81B1295 + .string "SIGN$" + +gUnknown_81B129A:: @ 81B129A + .string "YOUNG MAN$" + +gUnknown_81B12A4:: @ 81B12A4 + .string "SABRINA$" + +gUnknown_81B12AC:: @ 81B12AC + .string "SABRINA$" + +gUnknown_81B12B4:: @ 81B12B4 + .string "POKéMON JOURNAL$" + +gUnknown_81B12C4:: @ 81B12C4 + .string "TYRON$" + +gUnknown_81B12CA:: @ 81B12CA + .string "SIGN$" + +gUnknown_81B12CF:: @ 81B12CF + .string "BLAINE$" + +gUnknown_81B12D6:: @ 81B12D6 + .string "DEREK$" + +gUnknown_81B12DC:: @ 81B12DC + .string "WOMAN$" + +gUnknown_81B12E2:: @ 81B12E2 + .string "PHOTO$" + +gUnknown_81B12E8:: @ 81B12E8 + .string "POKéMON JOURNAL$" + +gUnknown_81B12F8:: @ 81B12F8 + .string "LORELEI$" + +gUnknown_81B1300:: @ 81B1300 + .string "LORELEI$" + +gUnknown_81B1308:: @ 81B1308 + .string "OLD MAN$" + +gUnknown_81B1310:: @ 81B1310 + .string "POKéMON JOURNAL$" + +gUnknown_81B1320:: @ 81B1320 + .string "LITTLE GIRL$" + +gUnknown_81B132C:: @ 81B132C + .string "OLD LADY$" + +gUnknown_81B1335:: @ 81B1335 + .string "BRUNO$" + +gUnknown_81B133B:: @ 81B133B + .string "BRUNO$" + +gUnknown_81B1341:: @ 81B1341 + .string "POKéMON JOURNAL$" + +gUnknown_81B1351:: @ 81B1351 + .string "CRUSHER$" + +gUnknown_81B1359:: @ 81B1359 + .string "WOMAN$" + +gUnknown_81B135F:: @ 81B135F + .string "CRUSHER$" + +gUnknown_81B1367:: @ 81B1367 + .string "AGATHA$" + +gUnknown_81B136E:: @ 81B136E + .string "CRUSHER$" + +gUnknown_81B1376:: @ 81B1376 + .string "CRUSHER$" + +gUnknown_81B137E:: @ 81B137E + .string "POKéMON JOURNAL$" + +gUnknown_81B138E:: @ 81B138E + .string "AGATHA$" + +gUnknown_81B1395:: @ 81B1395 + .string "OLD LADY$" + +gUnknown_81B139E:: @ 81B139E + .string "LANCE$" + +gUnknown_81B13A4:: @ 81B13A4 + .string "LANCE$" + +gUnknown_81B13AA:: @ 81B13AA + .string "WOMAN$" + +gUnknown_81B13B0:: @ 81B13B0 + .string "LITTLE GIRL$" + +gUnknown_81B13BC:: @ 81B13BC + .string "POKéMON JOURNAL$" + +gUnknown_81B13CC:: @ 81B13CC + .string "YOUNG MAN$" + +gUnknown_81B13D6:: @ 81B13D6 + .string "{RIVAL}$" + +gUnknown_81B13D9:: @ 81B13D9 + .string "LITTLE BOY$" + +gUnknown_81B13E4:: @ 81B13E4 + .string "OLD MAN$" + +gUnknown_81B13EC:: @ 81B13EC + .string "CELIO$" + +gUnknown_81B13F2:: @ 81B13F2 + .string "CELIO$" + +gUnknown_81B13F8:: @ 81B13F8 + .string "CELIO$" + +gUnknown_81B13FE:: @ 81B13FE + .string "LITTLE GIRL$" + +gUnknown_81B140A:: @ 81B140A + .string "TEAM ROCKET$" + +gUnknown_81B1416:: @ 81B1416 + .string "MAGAZINE$" + +gUnknown_81B141F:: @ 81B141F + .string "MAN$" + +gUnknown_81B1423:: @ 81B1423 + .string "PHOTO$" + +gUnknown_81B1429:: @ 81B1429 + .string "POKéMON JOURNAL$" + +gUnknown_81B1439:: @ 81B1439 + .string "GIOVANNI$" + +gUnknown_81B1442:: @ 81B1442 + .string "SCIENTIST$" + +gUnknown_81B144C:: @ 81B144C + .string "SCIENTIST$" + +gUnknown_81B1456:: @ 81B1456 + .string "GIOVANNI$" + +gUnknown_81B145F:: @ 81B145F + .string "MAN$" + +gUnknown_81B1463:: @ 81B1463 + .string "GIDEON$" + +gUnknown_81B146A:: @ 81B146A + .string "POKéMON JOURNAL\p" + .string "Special Feature: PEWTER GYM\n" + .string "LEADER BROCK!\p" + .string "BROCK rarely laughs, but is said to\n" + .string "be unable to stop if he starts.$" + +gUnknown_81B14E8:: @ 81B14E8 + .string "POKéMON JOURNAL\p" + .string "Special Feature: CERULEAN GYM\n" + .string "LEADER MISTY!\p" + .string "MISTY is said to worship LORELEI\n" + .string "of the ELITE FOUR.$" + +gUnknown_81B1558:: @ 81B1558 + .string "POKéMON JOURNAL\p" + .string "Special Feature: VERMILION GYM\n" + .string "LEADER LT. SURGE!\p" + .string "LT. SURGE is rumored to have been\n" + .string "a pilot while home in America.\p" + .string "He used the electricity generated\n" + .string "by POKéMON to power his plane.$" + +gUnknown_81B161B:: @ 81B161B + .string "POKéMON JOURNAL\p" + .string "Special Feature: CELADON GYM\n" + .string "LEADER ERIKA!\p" + .string "Rumor has it that if you peek into\n" + .string "CELADON GYM, you can often\l" + .string "see ERIKA snoozing.$" + +gUnknown_81B16A8:: @ 81B16A8 + .string "POKéMON JOURNAL\p" + .string "Special Feature: FUCHSIA GYM\n" + .string "LEADER KOGA!\p" + .string "KOGA is said to have a thorough\n" + .string "knowledge of medicine.\p" + .string "He even concocts medicine to nurse\n" + .string "his POKéMON to health.$" + +gUnknown_81B1753:: @ 81B1753 + .string "POKéMON JOURNAL\p" + .string "Special Feature: SAFFRON GYM\n" + .string "LEADER SABRINA!\p" + .string "People say that SABRINA can\n" + .string "communicate with her POKéMON\l" + .string "during battle without speaking.$" + +gUnknown_81B17E9:: @ 81B17E9 + .string "POKéMON JOURNAL\p" + .string "Special Feature: CINNABAR GYM\n" + .string "LEADER BLAINE!\p" + .string "BLAINE is said to remove his dark\n" + .string "shades only when he is thinking up\l" + .string "new quiz questions.$" + +gUnknown_81B187F:: @ 81B187F + .string "POKéMON JOURNAL\p" + .string "Special Feature:\n" + .string "ELITE FOUR’s LORELEI!\p" + .string "Known for her logical, calculated,\n" + .string "and cool battling style, LORELEI\l" + .string "has a surprising secret!$" + +gUnknown_81B1913:: @ 81B1913 + .string "POKéMON JOURNAL\p" + .string "Special Feature:\n" + .string "ELITE FOUR’s BRUNO!\p" + .string "BRUNO apparently joined the ELITE\n" + .string "FOUR out of his burning ambition to\l" + .string "battle the best TRAINERS.$" + +gUnknown_81B19A8:: @ 81B19A8 + .string "POKéMON JOURNAL\p" + .string "Special Feature:\n" + .string "ELITE FOUR’s AGATHA!\p" + .string "In her youth, AGATHA and PROF.\n" + .string "OAK were rivals who vied for\l" + .string "supremacy as TRAINERS.$" + +gUnknown_81B1A31:: @ 81B1A31 + .string "POKéMON JOURNAL\p" + .string "Special Feature:\n" + .string "ELITE FOUR’s LANCE!\p" + .string "LANCE’s grandfather is thought to\n" + .string "be the elder of a famous clan of\l" + .string "dragon masters.$" + +gUnknown_81B1AB9:: @ 81B1AB9 + .string "POKéMON JOURNAL\p" + .string "Special Feature: PROF. OAK,\n" + .string "the POKéMON Researcher!\p" + .string "PROF. OAK reportedly lives with his\n" + .string "grandchildren DAISY and {RIVAL}.$" + +gUnknown_81B1B3D:: @ 81B1B3D + .string "This is a POKéMON JOURNAL from\n" + .string "years ago…\p" + .string "POKéMON JOURNAL\n" + .string "CONTEST Special!\p" + .string "The Spring POKéMON CONTEST’s\n" + .string "Grand Champion is DAISY OAK of\l" + .string "PALLET TOWN!$" + +gUnknown_81B1BD1:: @ 81B1BD1 + .string "POKéMON JOURNAL\p" + .string "Special Feature:\n" + .string "MR. FUJI of POKéMON HOUSE!\p" + .string "Editor: The shy MR. FUJI turned\n" + .string "down our interview requests.\p" + .string "He is a kindly man who is adored\n" + .string "and respected in LAVENDER TOWN.$" + +gUnknown_81B1C8B:: @ 81B1C8B + .string "Hmm…\n" + .string "Is that right…$" + +gUnknown_81B1C9F:: @ 81B1C9F + .string "Oh!\n" + .string "Look, look!$" + +gUnknown_81B1CAF:: @ 81B1CAF + .string "Read it, read it!$" + +gUnknown_81B1CC1:: @ 81B1CC1 + .string "TRAINER TIPS\p" + .string "Press START to open the MENU!$" + +gUnknown_81B1CEC:: @ 81B1CEC + .string "Signs are useful, aren’t they?$" + +gUnknown_81B1D0B:: @ 81B1D0B + .string "Look, look!\p" + .string "I copied what it said on one of\n" + .string "those TRAINER TIPS signs!$" + +gUnknown_81B1D51:: @ 81B1D51 + .string "TRAINER TIPS!\p" + .string "Press START to open the MENU!$" + +gUnknown_81B1D7D:: @ 81B1D7D + .string "It’s a POKéMON PRINTER!\p" + .string "It can put a print of your POKéMON\n" + .string "on the back of your TRAINER CARD.\p" + .string "It costs only Â¥50.\n" + .string "Would you like to try it?$" + +gUnknown_81B1E07:: @ 81B1E07 + .string "You don’t have enough money.$" + +gUnknown_81B1E24:: @ 81B1E24 + .string "Please choose the print type.$" + +gUnknown_81B1E42:: @ 81B1E42 + .string "A big smile for the photo, please!\n" + .string "Three… Two… One…\p" + .string "Flash!$" + +gUnknown_81B1E7D:: @ 81B1E7D + .string "Your POKéMON print is ready!\n" + .string "Check your TRAINER CARD.$" + +gUnknown_81B1EB3:: @ 81B1EB3 + .string "Giggle…\n" + .string "I collected a ton of STICKERS.\l" + .string "I wish I could show them off…$" + +gUnknown_81B1EF8:: @ 81B1EF8 + .string "Oh, excellent!\n" + .string "You’ve come to the right place!\p" + .string "Look, look! See? See?\n" + .string "These are my STICKERS!\l" + .string "Look how many I got!\p" + .string "I bet you want some.\n" + .string "I bet you do!\p" + .string "I’ll give a STICKER if you can tell\n" + .string "me something awesome about\l" + .string "yourself.\p" + .string "What will you brag about?$" + +gUnknown_81B1FEF:: @ 81B1FEF + .string "Brag about something for me.\n" + .string "I’ll give you a STICKER.$" + +gUnknown_81B2025:: @ 81B2025 + .string "Oh, hi!\n" + .string "Here comes the braggart.\p" + .string "What are you going to brag about\n" + .string "today?$" + +gUnknown_81B206E:: @ 81B206E + .string "Oh, wow, you made it into the\n" + .string "HALL OF FAME.\p" + .string "That’s pretty good, yup!\n" + .string "I’ll give you one of these.$" + +gUnknown_81B20CF:: @ 81B20CF + .string "Oh, wow, you’ve entered the\n" + .string "HALL OF FAME often!\p" + .string "That’s impressive, yup!\n" + .string "I’ll give you one of these.$" + +gUnknown_81B2133:: @ 81B2133 + .string "Whoa! You’ve made it into the\n" + .string "HALL OF FAME that often?\l" + .string "That’s seriously incredible, yup!\p" + .string "You own the POKéMON LEAGUE!\n" + .string "I’ll give you one of these.$" + +gUnknown_81B21C4:: @ 81B21C4 + .string "No way! You’ve gone into the\n" + .string "HALL OF FAME that many times?\p" + .string "You’re beyond incredible, yup!\n" + .string "That’s it, I have to give you this.$" + +gUnknown_81B2242:: @ 81B2242 + .string "The HALL OF FAME STICKER was\n" + .string "applied to the TRAINER CARD.$" + +gUnknown_81B227C:: @ 81B227C + .string "Hmm…\p" + .string "Come back with a better story next\n" + .string "time, okay?$" + +gUnknown_81B22B0:: @ 81B22B0 + .string "Oh, no, no can do.\p" + .string "You’re practically a living legend.\n" + .string "I have no SITCKERS left to give.$" + +gUnknown_81B2308:: @ 81B2308 + .string "Oh, wow, there are POKéMON EGGS?\n" + .string "I didn’t know that!\p" + .string "That’s pretty good, yup!\n" + .string "I’ll give you one of these.$" + +gUnknown_81B2372:: @ 81B2372 + .string "You’ve hatched that many EGGS?\n" + .string "You really must like them!\p" + .string "That’s impressive, yup!\n" + .string "I’ll give you one of these.$" + +gUnknown_81B23E0:: @ 81B23E0 + .string "Whoa! You’ve hatched a whole\n" + .string "bunch of EGGS!\p" + .string "You’re an EGG-hatching machine!\n" + .string "I’ll give you one of these.$" + +gUnknown_81B2448:: @ 81B2448 + .string "Wh… You hatched that many EGGS?\p" + .string "What’s behind your love of EGGS?\n" + .string "It’s beyond incredible, yup!\p" + .string "You’re too awesome, I tell you.\n" + .string "That’s it, I have to give you this.$" + +gUnknown_81B24EA:: @ 81B24EA + .string "The EGG STICKER was applied\n" + .string "to the TRAINER CARD.$" + +gUnknown_81B251B:: @ 81B251B + .string "Hmm…\p" + .string "Come back with a better story next\n" + .string "time, okay?$" + +gUnknown_81B254F:: @ 81B254F + .string "Oh, no, no can do.\p" + .string "You’re practically a living legend.\n" + .string "I have no SITCKERS left to give.$" + +gUnknown_81B25A7:: @ 81B25A7 + .string "Oh, wow, you’ve had success\n" + .string "link battling?\p" + .string "You’re pretty strong, yup!\n" + .string "I’ll give you one of these.$" + +gUnknown_81B2609:: @ 81B2609 + .string "You’ve beaten your friends a lot\n" + .string "link battling, huh?\p" + .string "You’re impressively strong, yup!\n" + .string "I’ll give you one of these.$" + +gUnknown_81B267B:: @ 81B267B + .string "Whoa! You’ve beaten your friends\n" + .string "a frightful number of times.\p" + .string "Have you lost friends over this?\n" + .string "I’ll give you one of these.$" + +gUnknown_81B26F6:: @ 81B26F6 + .string "Wh… Wickedly whoa!\n" + .string "You’ve won mind-blowingly often!\p" + .string "It just knocks me out thinking\n" + .string "about how tough you are.\p" + .string "You’re the stuff of nightmares!\n" + .string "That’s it, I have to give you this.$" + +gUnknown_81B27A6:: @ 81B27A6 + .string "The VICTORY STICKER was applied\n" + .string "to the TRAINER CARD.$" + +gUnknown_81B27DB:: @ 81B27DB + .string "Hmm…\p" + .string "Come back with a better story next\n" + .string "time, okay?$" + +gUnknown_81B280F:: @ 81B280F + .string "Oh, no, no can do.\p" + .string "You’re practically a living legend.\n" + .string "I have no SITCKERS left to give.$" + +gUnknown_81B2867:: @ 81B2867 + +gUnknown_81B2E1C:: @ 81B2E1C + .incbin "baserom.gba", 0x001b2867, 0x5b5 + .string "How do I do this?$" + +gUnknown_81B2E2E:: @ 81B2E2E + .string "What does this term mean?$" + +gUnknown_81B2E48:: @ 81B2E48 + .string "About this game$" + +gUnknown_81B2E58:: @ 81B2E58 + .string "Type Matchup List$" + +gUnknown_81B2E6A:: @ 81B2E6A + .string "EXIT$" diff --git a/include/event_scripts.h b/include/event_scripts.h index 28106d9d4..2aec4a406 100644 --- a/include/event_scripts.h +++ b/include/event_scripts.h @@ -512,5 +512,101 @@ extern const u8 gUnknown_81B0AFF[]; extern const u8 gUnknown_81B0B0E[]; extern const u8 gUnknown_81B0BA6[]; extern const u8 gUnknown_81B0BB5[]; +extern const u8 gUnknown_81B0C45[]; +extern const u8 gUnknown_81B0C51[]; +extern const u8 gUnknown_81B0C5E[]; +extern const u8 gUnknown_81B0C6B[]; +extern const u8 gUnknown_81B0C79[]; +extern const u8 gUnknown_81B0C88[]; +extern const u8 gUnknown_81B0C95[]; +extern const u8 gUnknown_81B0CA2[]; +extern const u8 gUnknown_81B0CB1[]; +extern const u8 gUnknown_81B0CC1[]; +extern const u8 gUnknown_81B0CCF[]; +extern const u8 gUnknown_81B0CDF[]; +extern const u8 gUnknown_81B0CEB[]; +extern const u8 gUnknown_81B0CF7[]; +extern const u8 gUnknown_81B0D02[]; +extern const u8 gUnknown_81B0D0E[]; +extern const u8 gUnknown_81B0D16[]; +extern const u8 gUnknown_81B0D1F[]; +extern const u8 gUnknown_81B0D2D[]; +extern const u8 gUnknown_81B0D3B[]; +extern const u8 gUnknown_81B0D48[]; +extern const u8 gUnknown_81B0D55[]; +extern const u8 gUnknown_81B0D65[]; +extern const u8 gUnknown_81B0D73[]; +extern const u8 gUnknown_81B0D81[]; +extern const u8 gUnknown_81B0D90[]; +extern const u8 gUnknown_81B0D9E[]; +extern const u8 gUnknown_81B0DAC[]; +extern const u8 gUnknown_81B0DBA[]; +extern const u8 gUnknown_81B0DC8[]; +extern const u8 gUnknown_81B0DD7[]; +extern const u8 gUnknown_81B0DE4[]; +extern const u8 gUnknown_81B0DF0[]; +extern const u8 gUnknown_81B0DFC[]; +extern const u8 gUnknown_81B0E08[]; +extern const u8 gUnknown_81B0E14[]; +extern const u8 gUnknown_81B0E24[]; +extern const u8 gUnknown_81B0E31[]; +extern const u8 gUnknown_81B0E3D[]; +extern const u8 gUnknown_81B0E49[]; +extern const u8 gUnknown_81B0E56[]; +extern const u8 gUnknown_81B0E63[]; +extern const u8 gUnknown_81B0E6F[]; +extern const u8 gUnknown_81B0E7C[]; +extern const u8 gUnknown_81B0E89[]; +extern const u8 gUnknown_81B0E95[]; +extern const u8 gUnknown_81B0EA1[]; +extern const u8 gUnknown_81B0EAE[]; +extern const u8 gUnknown_81B0EBA[]; +extern const u8 gUnknown_81B0ECA[]; +extern const u8 gUnknown_81B0ED7[]; +extern const u8 gUnknown_81B0EE4[]; +extern const u8 gUnknown_81B0EF4[]; +extern const u8 gUnknown_81B0F01[]; +extern const u8 gUnknown_81B0F11[]; +extern const u8 gUnknown_81B0F20[]; +extern const u8 gUnknown_81B0F2F[]; +extern const u8 gUnknown_81B0F3B[]; +extern const u8 gUnknown_81B0F47[]; +extern const u8 gUnknown_81B0F53[]; +extern const u8 gUnknown_81B0F5F[]; +extern const u8 gUnknown_81B0F6E[]; +extern const u8 gUnknown_81B0F7D[]; +extern const u8 gUnknown_81B0F8A[]; +extern const u8 gUnknown_81B0F94[]; +extern const u8 gUnknown_81B0F9F[]; +extern const u8 gUnknown_81B0FAE[]; +extern const u8 gUnknown_81B0FBD[]; +extern const u8 gUnknown_81B0FCC[]; +extern const u8 gUnknown_81B0FDB[]; +extern const u8 gUnknown_81B0FE8[]; +extern const u8 gUnknown_81B0FF7[]; +extern const u8 gUnknown_81B1002[]; +extern const u8 gUnknown_81B1011[]; +extern const u8 gUnknown_81B1020[]; +extern const u8 gUnknown_81B102D[]; +extern const u8 gUnknown_81B103B[]; +extern const u8 gUnknown_81B104A[]; +extern const u8 gUnknown_81B1059[]; +extern const u8 gUnknown_81B1067[]; +extern const u8 gUnknown_81B1075[]; +extern const u8 gUnknown_81B1082[]; +extern const u8 gUnknown_81B108D[]; +extern const u8 gUnknown_81B1098[]; +extern const u8 gUnknown_81B10A3[]; +extern const u8 gUnknown_81B10B1[]; +extern const u8 gUnknown_81B10BF[]; +extern const u8 gUnknown_81B10CD[]; +extern const u8 gUnknown_81B10DB[]; +extern const u8 gUnknown_81B10E8[]; +extern const u8 gUnknown_81B10F8[]; +extern const u8 gUnknown_81B1107[]; +extern const u8 gUnknown_81B1111[]; +extern const u8 gUnknown_81B111B[]; +extern const u8 gUnknown_81B1128[]; +extern const u8 gUnknown_81B1135[]; #endif //GUARD_EVENT_SCRIPTS_H diff --git a/src/fame_checker.c b/src/fame_checker.c index 11bb637b7..985492d6b 100644 --- a/src/fame_checker.c +++ b/src/fame_checker.c @@ -243,107 +243,63 @@ const u8 *const gUnknown_845F63C[] = { }; const u8 *const gUnknown_845F6BC[] = { - gUnknown_81AD106, - gUnknown_81AD145, - gUnknown_81AD1BB, - gUnknown_81AD258, - gUnknown_81AD2B9, - gUnknown_81AD377, - gUnknown_81AD40C, - gUnknown_81AD4AE, - gUnknown_81AD516, - gUnknown_81AD5A7, - gUnknown_81AD608, - gUnknown_81AD69F, - gUnknown_81AD705, - gUnknown_81AD771, - gUnknown_81AD840, - gUnknown_81AD908, - gUnknown_81AD99A, - gUnknown_81ADA27, - gUnknown_81ADA91, - gUnknown_81ADAF6, - gUnknown_81ADB5A, - gUnknown_81ADBD9, - gUnknown_81ADC72, - gUnknown_81ADCEB, - gUnknown_81ADD3C, - gUnknown_81ADDA7, - gUnknown_81ADE0B, - gUnknown_81ADE82, - gUnknown_81ADEEC, - gUnknown_81ADF6A, - gUnknown_81AE009, - gUnknown_81AE072, - gUnknown_81AE0F3, - gUnknown_81AE15B, - gUnknown_81AE1E5, - gUnknown_81AE247, - gUnknown_81AE2B6, - gUnknown_81AE31D, - gUnknown_81AE37D, - gUnknown_81AE407, - gUnknown_81AE48D, - gUnknown_81AE51B, - gUnknown_81AE5E8, - gUnknown_81AE656, - gUnknown_81AE6D7, - gUnknown_81AE762, - gUnknown_81AE7CB, - gUnknown_81AE841, - gUnknown_81AE89E, - gUnknown_81AE90A, - gUnknown_81AE990, - gUnknown_81AEA59, - gUnknown_81AEAEE, - gUnknown_81AEB69, - gUnknown_81AEBDF, - gUnknown_81AEC28, - gUnknown_81AEC82, - gUnknown_81AED27, - gUnknown_81AEDAA, - gUnknown_81AEE51, - gUnknown_81AEF25, - gUnknown_81AEF6C, - gUnknown_81AEFC6, - gUnknown_81AF04C, - gUnknown_81AF0F0, - gUnknown_81AF19A, - gUnknown_81AF200, - gUnknown_81AF248, - gUnknown_81AF2B7, - gUnknown_81AF34E, - gUnknown_81AF3BE, - gUnknown_81AF47C, - gUnknown_81AF4FD, - gUnknown_81AF567, - gUnknown_81AF641, - gUnknown_81AF6BA, - gUnknown_81AF758, - gUnknown_81AF7CB, - gUnknown_81AF83E, - gUnknown_81AF8CA, - gUnknown_81AF929, - gUnknown_81AF998, - gUnknown_81AFA20, - gUnknown_81AFAB9, - gUnknown_81AFB0C, - gUnknown_81AFB76, - gUnknown_81AFC38, - gUnknown_81AFCE9, - gUnknown_81AFD49, - gUnknown_81AFDC4, - gUnknown_81AFE68, - gUnknown_81AFF23, - gUnknown_81AFFA8, - gUnknown_81B0022, - gUnknown_81B00A6, - gUnknown_81B0106 + gUnknown_81AD106, gUnknown_81AD145, gUnknown_81AD1BB, gUnknown_81AD258, gUnknown_81AD2B9, gUnknown_81AD377, + gUnknown_81AD40C, gUnknown_81AD4AE, gUnknown_81AD516, gUnknown_81AD5A7, gUnknown_81AD608, gUnknown_81AD69F, + gUnknown_81AD705, gUnknown_81AD771, gUnknown_81AD840, gUnknown_81AD908, gUnknown_81AD99A, gUnknown_81ADA27, + gUnknown_81ADA91, gUnknown_81ADAF6, gUnknown_81ADB5A, gUnknown_81ADBD9, gUnknown_81ADC72, gUnknown_81ADCEB, + gUnknown_81ADD3C, gUnknown_81ADDA7, gUnknown_81ADE0B, gUnknown_81ADE82, gUnknown_81ADEEC, gUnknown_81ADF6A, + gUnknown_81AE009, gUnknown_81AE072, gUnknown_81AE0F3, gUnknown_81AE15B, gUnknown_81AE1E5, gUnknown_81AE247, + gUnknown_81AE2B6, gUnknown_81AE31D, gUnknown_81AE37D, gUnknown_81AE407, gUnknown_81AE48D, gUnknown_81AE51B, + gUnknown_81AE5E8, gUnknown_81AE656, gUnknown_81AE6D7, gUnknown_81AE762, gUnknown_81AE7CB, gUnknown_81AE841, + gUnknown_81AE89E, gUnknown_81AE90A, gUnknown_81AE990, gUnknown_81AEA59, gUnknown_81AEAEE, gUnknown_81AEB69, + gUnknown_81AEBDF, gUnknown_81AEC28, gUnknown_81AEC82, gUnknown_81AED27, gUnknown_81AEDAA, gUnknown_81AEE51, + gUnknown_81AEF25, gUnknown_81AEF6C, gUnknown_81AEFC6, gUnknown_81AF04C, gUnknown_81AF0F0, gUnknown_81AF19A, + gUnknown_81AF200, gUnknown_81AF248, gUnknown_81AF2B7, gUnknown_81AF34E, gUnknown_81AF3BE, gUnknown_81AF47C, + gUnknown_81AF4FD, gUnknown_81AF567, gUnknown_81AF641, gUnknown_81AF6BA, gUnknown_81AF758, gUnknown_81AF7CB, + gUnknown_81AF83E, gUnknown_81AF8CA, gUnknown_81AF929, gUnknown_81AF998, gUnknown_81AFA20, gUnknown_81AFAB9, + gUnknown_81AFB0C, gUnknown_81AFB76, gUnknown_81AFC38, gUnknown_81AFCE9, gUnknown_81AFD49, gUnknown_81AFDC4, + gUnknown_81AFE68, gUnknown_81AFF23, gUnknown_81AFFA8, gUnknown_81B0022, gUnknown_81B00A6, gUnknown_81B0106 +}; + +const u8 gUnknown_845F83C[] = { + 0x67, 0x47, 0x30, 0x69, 0x4b, 0x37, + 0x37, 0x30, 0x3d, 0x69, 0x23, 0x69, + 0x66, 0x50, 0x1b, 0x13, 0x1e, 0x69, + 0x66, 0x51, 0x2b, 0x27, 0x1d, 0x69, + 0x66, 0x52, 0x3d, 0x3d, 0x3e, 0x69, + 0x66, 0x53, 0x16, 0x1d, 0x53, 0x69, + 0x66, 0x54, 0x1a, 0x16, 0x69, 0x1e, + 0x66, 0x19, 0x55, 0x55, 0x69, 0x29, + 0x66, 0x56, 0x37, 0x1c, 0x69, 0x69, + 0x4d, 0x4d, 0x20, 0x69, 0x11, 0x23, + 0x4f, 0x4f, 0x69, 0x36, 0x1d, 0x36, + 0x4b, 0x36, 0x36, 0x69, 0x4b, 0x23, + 0x4a, 0x4a, 0x18, 0x17, 0x69, 0x29, + 0x48, 0x12, 0x20, 0x59, 0x59, 0x59, + 0x11, 0x31, 0x69, 0x1e, 0x69, 0x69, + 0x57, 0x37, 0x37, 0x57, 0x5b, 0x37 +}; + +const u8 *const gUnknown_845F89C[] = { + gUnknown_81B0C45, gUnknown_81B0C51, gUnknown_81B0C5E, gUnknown_81B0C6B, gUnknown_81B0C79, gUnknown_81B0C88, + gUnknown_81B0C95, gUnknown_81B0CA2, gUnknown_81B0CB1, gUnknown_81B0CC1, gUnknown_81B0CCF, gUnknown_81B0CDF, + gUnknown_81B0CEB, gUnknown_81B0CF7, gUnknown_81B0D02, gUnknown_81B0D0E, gUnknown_81B0D16, gUnknown_81B0D1F, + gUnknown_81B0D2D, gUnknown_81B0D3B, gUnknown_81B0D48, gUnknown_81B0D55, gUnknown_81B0D65, gUnknown_81B0D73, + gUnknown_81B0D81, gUnknown_81B0D90, gUnknown_81B0D9E, gUnknown_81B0DAC, gUnknown_81B0DBA, gUnknown_81B0DC8, + gUnknown_81B0DD7, gUnknown_81B0DE4, gUnknown_81B0DF0, gUnknown_81B0DFC, gUnknown_81B0E08, gUnknown_81B0E14, + gUnknown_81B0E24, gUnknown_81B0E31, gUnknown_81B0E3D, gUnknown_81B0E49, gUnknown_81B0E56, gUnknown_81B0E63, + gUnknown_81B0E6F, gUnknown_81B0E7C, gUnknown_81B0E89, gUnknown_81B0E95, gUnknown_81B0EA1, gUnknown_81B0EAE, + gUnknown_81B0EBA, gUnknown_81B0ECA, gUnknown_81B0ED7, gUnknown_81B0EE4, gUnknown_81B0EF4, gUnknown_81B0F01, + gUnknown_81B0F11, gUnknown_81B0F20, gUnknown_81B0F2F, gUnknown_81B0F3B, gUnknown_81B0F47, gUnknown_81B0F53, + gUnknown_81B0F5F, gUnknown_81B0F6E, gUnknown_81B0F7D, gUnknown_81B0F8A, gUnknown_81B0F94, gUnknown_81B0F9F, + gUnknown_81B0FAE, gUnknown_81B0FBD, gUnknown_81B0FCC, gUnknown_81B0FDB, gUnknown_81B0FE8, gUnknown_81B0FF7, + gUnknown_81B1002, gUnknown_81B1011, gUnknown_81B1020, gUnknown_81B102D, gUnknown_81B103B, gUnknown_81B104A, + gUnknown_81B1059, gUnknown_81B1067, gUnknown_81B1075, gUnknown_81B1082, gUnknown_81B108D, gUnknown_81B1098, + gUnknown_81B10A3, gUnknown_81B10B1, gUnknown_81B10BF, gUnknown_81B10CD, gUnknown_81B10DB, gUnknown_81B10E8, + gUnknown_81B10F8, gUnknown_81B1107, gUnknown_81B1111, gUnknown_81B111B, gUnknown_81B1128, gUnknown_81B1135 }; -extern const u8 *const gUnknown_845F89C[]; extern const u8 *const gUnknown_845FA1C[]; -extern const u8 gUnknown_845F83C[]; extern const struct BgTemplate gUnknown_845FBF4[4]; extern const struct SpriteSheet gUnknown_845FB9C[]; extern const struct SpritePalette gUnknown_845FBDC[]; -- cgit v1.2.3 From e85ce728372d4c03deef73e41d883b04062a415a Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Mon, 26 Nov 2018 12:57:24 -0500 Subject: Another text pointer table decomped --- data/fame_checker.s | 3 -- include/event_scripts.h | 96 +++++++++++++++++++++++++++++++++++++++++++++++++ src/fame_checker.c | 20 ++++++++++- 3 files changed, 115 insertions(+), 4 deletions(-) diff --git a/data/fame_checker.s b/data/fame_checker.s index e85c384bb..206be0d0b 100644 --- a/data/fame_checker.s +++ b/data/fame_checker.s @@ -4,9 +4,6 @@ .section .rodata .align 2 -gUnknown_845FA1C:: @ 845FA1C - .incbin "baserom.gba", 0x45FA1C, 0x180 - gUnknown_845FB9C:: @ 845FB9C .incbin "baserom.gba", 0x45FB9C, 0x40 diff --git a/include/event_scripts.h b/include/event_scripts.h index 2aec4a406..4405b831d 100644 --- a/include/event_scripts.h +++ b/include/event_scripts.h @@ -608,5 +608,101 @@ extern const u8 gUnknown_81B1111[]; extern const u8 gUnknown_81B111B[]; extern const u8 gUnknown_81B1128[]; extern const u8 gUnknown_81B1135[]; +extern const u8 gUnknown_81B1146[]; +extern const u8 gUnknown_81B114B[]; +extern const u8 gUnknown_81B1155[]; +extern const u8 gUnknown_81B115A[]; +extern const u8 gUnknown_81B116A[]; +extern const u8 gUnknown_81B1171[]; +extern const u8 gUnknown_81B1176[]; +extern const u8 gUnknown_81B117B[]; +extern const u8 gUnknown_81B1181[]; +extern const u8 gUnknown_81B1185[]; +extern const u8 gUnknown_81B1195[]; +extern const u8 gUnknown_81B119E[]; +extern const u8 gUnknown_81B11AE[]; +extern const u8 gUnknown_81B11B3[]; +extern const u8 gUnknown_81B11B9[]; +extern const u8 gUnknown_81B11C3[]; +extern const u8 gUnknown_81B11C7[]; +extern const u8 gUnknown_81B11CB[]; +extern const u8 gUnknown_81B11DB[]; +extern const u8 gUnknown_81B11E0[]; +extern const u8 gUnknown_81B11E6[]; +extern const u8 gUnknown_81B11EB[]; +extern const u8 gUnknown_81B11F5[]; +extern const u8 gUnknown_81B11FA[]; +extern const u8 gUnknown_81B120A[]; +extern const u8 gUnknown_81B120F[]; +extern const u8 gUnknown_81B1219[]; +extern const u8 gUnknown_81B1220[]; +extern const u8 gUnknown_81B1227[]; +extern const u8 gUnknown_81B122E[]; +extern const u8 gUnknown_81B123E[]; +extern const u8 gUnknown_81B1243[]; +extern const u8 gUnknown_81B1249[]; +extern const u8 gUnknown_81B124E[]; +extern const u8 gUnknown_81B1254[]; +extern const u8 gUnknown_81B125A[]; +extern const u8 gUnknown_81B126A[]; +extern const u8 gUnknown_81B126F[]; +extern const u8 gUnknown_81B1274[]; +extern const u8 gUnknown_81B1279[]; +extern const u8 gUnknown_81B1281[]; +extern const u8 gUnknown_81B1291[]; +extern const u8 gUnknown_81B1295[]; +extern const u8 gUnknown_81B129A[]; +extern const u8 gUnknown_81B12A4[]; +extern const u8 gUnknown_81B12AC[]; +extern const u8 gUnknown_81B12B4[]; +extern const u8 gUnknown_81B12C4[]; +extern const u8 gUnknown_81B12CA[]; +extern const u8 gUnknown_81B12CF[]; +extern const u8 gUnknown_81B12D6[]; +extern const u8 gUnknown_81B12DC[]; +extern const u8 gUnknown_81B12E2[]; +extern const u8 gUnknown_81B12E8[]; +extern const u8 gUnknown_81B12F8[]; +extern const u8 gUnknown_81B1300[]; +extern const u8 gUnknown_81B1308[]; +extern const u8 gUnknown_81B1310[]; +extern const u8 gUnknown_81B1320[]; +extern const u8 gUnknown_81B132C[]; +extern const u8 gUnknown_81B1335[]; +extern const u8 gUnknown_81B133B[]; +extern const u8 gUnknown_81B1341[]; +extern const u8 gUnknown_81B1351[]; +extern const u8 gUnknown_81B1359[]; +extern const u8 gUnknown_81B135F[]; +extern const u8 gUnknown_81B1367[]; +extern const u8 gUnknown_81B136E[]; +extern const u8 gUnknown_81B1376[]; +extern const u8 gUnknown_81B137E[]; +extern const u8 gUnknown_81B138E[]; +extern const u8 gUnknown_81B1395[]; +extern const u8 gUnknown_81B139E[]; +extern const u8 gUnknown_81B13A4[]; +extern const u8 gUnknown_81B13AA[]; +extern const u8 gUnknown_81B13B0[]; +extern const u8 gUnknown_81B13BC[]; +extern const u8 gUnknown_81B13CC[]; +extern const u8 gUnknown_81B13D6[]; +extern const u8 gUnknown_81B13D9[]; +extern const u8 gUnknown_81B13E4[]; +extern const u8 gUnknown_81B13EC[]; +extern const u8 gUnknown_81B13F2[]; +extern const u8 gUnknown_81B13F8[]; +extern const u8 gUnknown_81B13FE[]; +extern const u8 gUnknown_81B140A[]; +extern const u8 gUnknown_81B1416[]; +extern const u8 gUnknown_81B141F[]; +extern const u8 gUnknown_81B1423[]; +extern const u8 gUnknown_81B1429[]; +extern const u8 gUnknown_81B1439[]; +extern const u8 gUnknown_81B1442[]; +extern const u8 gUnknown_81B144C[]; +extern const u8 gUnknown_81B1456[]; +extern const u8 gUnknown_81B145F[]; +extern const u8 gUnknown_81B1463[]; #endif //GUARD_EVENT_SCRIPTS_H diff --git a/src/fame_checker.c b/src/fame_checker.c index 985492d6b..40c406c18 100644 --- a/src/fame_checker.c +++ b/src/fame_checker.c @@ -299,7 +299,25 @@ const u8 *const gUnknown_845F89C[] = { gUnknown_81B10F8, gUnknown_81B1107, gUnknown_81B1111, gUnknown_81B111B, gUnknown_81B1128, gUnknown_81B1135 }; -extern const u8 *const gUnknown_845FA1C[]; +const u8 *const gUnknown_845FA1C[] = { + gUnknown_81B1146, gUnknown_81B114B, gUnknown_81B1155, gUnknown_81B115A, gUnknown_81B116A, gUnknown_81B1171, + gUnknown_81B1176, gUnknown_81B117B, gUnknown_81B1181, gUnknown_81B1185, gUnknown_81B1195, gUnknown_81B119E, + gUnknown_81B11AE, gUnknown_81B11B3, gUnknown_81B11B9, gUnknown_81B11C3, gUnknown_81B11C7, gUnknown_81B11CB, + gUnknown_81B11DB, gUnknown_81B11E0, gUnknown_81B11E6, gUnknown_81B11EB, gUnknown_81B11F5, gUnknown_81B11FA, + gUnknown_81B120A, gUnknown_81B120F, gUnknown_81B1219, gUnknown_81B1220, gUnknown_81B1227, gUnknown_81B122E, + gUnknown_81B123E, gUnknown_81B1243, gUnknown_81B1249, gUnknown_81B124E, gUnknown_81B1254, gUnknown_81B125A, + gUnknown_81B126A, gUnknown_81B126F, gUnknown_81B1274, gUnknown_81B1279, gUnknown_81B1281, gUnknown_81B1291, + gUnknown_81B1295, gUnknown_81B129A, gUnknown_81B12A4, gUnknown_81B12AC, gUnknown_81B12B4, gUnknown_81B12C4, + gUnknown_81B12CA, gUnknown_81B12CF, gUnknown_81B12D6, gUnknown_81B12DC, gUnknown_81B12E2, gUnknown_81B12E8, + gUnknown_81B12F8, gUnknown_81B1300, gUnknown_81B1308, gUnknown_81B1310, gUnknown_81B1320, gUnknown_81B132C, + gUnknown_81B1335, gUnknown_81B133B, gUnknown_81B1341, gUnknown_81B1351, gUnknown_81B1359, gUnknown_81B135F, + gUnknown_81B1367, gUnknown_81B136E, gUnknown_81B1376, gUnknown_81B137E, gUnknown_81B138E, gUnknown_81B1395, + gUnknown_81B139E, gUnknown_81B13A4, gUnknown_81B13AA, gUnknown_81B13B0, gUnknown_81B13BC, gUnknown_81B13CC, + gUnknown_81B13D6, gUnknown_81B13D9, gUnknown_81B13E4, gUnknown_81B13EC, gUnknown_81B13F2, gUnknown_81B13F8, + gUnknown_81B13FE, gUnknown_81B140A, gUnknown_81B1416, gUnknown_81B141F, gUnknown_81B1423, gUnknown_81B1429, + gUnknown_81B1439, gUnknown_81B1442, gUnknown_81B144C, gUnknown_81B1456, gUnknown_81B145F, gUnknown_81B1463 +}; + extern const struct BgTemplate gUnknown_845FBF4[4]; extern const struct SpriteSheet gUnknown_845FB9C[]; extern const struct SpritePalette gUnknown_845FBDC[]; -- cgit v1.2.3 From 031baf97af3da3a23719a9089dfaa088aa6b66a1 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Mon, 26 Nov 2018 14:39:26 -0500 Subject: Decomp sprite sheets and additional graphics --- data/fame_checker.s | 3 --- data/fame_checker/img_845ce00.png | Bin 0 -> 129 bytes data/fame_checker/img_845cf00.png | Bin 0 -> 240 bytes data/fame_checker/img_845d100.png | Bin 0 -> 177 bytes data/fame_checker/img_845d520.png | Bin 0 -> 726 bytes data/fame_checker/pal_45dd20.pal | 19 ------------------- data/fame_checker/pal_45e540.pal | 19 ------------------- data/fame_checker/pal_45ed60.pal | 19 ------------------- data/fame_checker/pal_45f580.pal | 19 ------------------- data/fame_checker/pal_45f5c0.pal | 19 ------------------- data/fame_checker/pal_845d0e0.pal | 19 +++++++++++++++++++ data/fame_checker/pal_845d500.pal | 19 +++++++++++++++++++ data/fame_checker/tilemap_845c600.bin | Bin 5920 -> 2048 bytes graphics_file_rules.mk | 4 ++++ src/fame_checker.c | 26 +++++++++++++++++++++----- 15 files changed, 63 insertions(+), 103 deletions(-) create mode 100644 data/fame_checker/img_845ce00.png create mode 100644 data/fame_checker/img_845cf00.png create mode 100644 data/fame_checker/img_845d100.png create mode 100644 data/fame_checker/img_845d520.png delete mode 100644 data/fame_checker/pal_45dd20.pal delete mode 100644 data/fame_checker/pal_45e540.pal delete mode 100644 data/fame_checker/pal_45ed60.pal delete mode 100644 data/fame_checker/pal_45f580.pal delete mode 100644 data/fame_checker/pal_45f5c0.pal create mode 100644 data/fame_checker/pal_845d0e0.pal create mode 100644 data/fame_checker/pal_845d500.pal diff --git a/data/fame_checker.s b/data/fame_checker.s index 206be0d0b..3aaaf84dc 100644 --- a/data/fame_checker.s +++ b/data/fame_checker.s @@ -4,9 +4,6 @@ .section .rodata .align 2 -gUnknown_845FB9C:: @ 845FB9C - .incbin "baserom.gba", 0x45FB9C, 0x40 - gUnknown_845FBDC:: @ 845FBDC .incbin "baserom.gba", 0x45FBDC, 0x18 diff --git a/data/fame_checker/img_845ce00.png b/data/fame_checker/img_845ce00.png new file mode 100644 index 000000000..b0a170e09 Binary files /dev/null and b/data/fame_checker/img_845ce00.png differ diff --git a/data/fame_checker/img_845cf00.png b/data/fame_checker/img_845cf00.png new file mode 100644 index 000000000..2d25bb1b3 Binary files /dev/null and b/data/fame_checker/img_845cf00.png differ diff --git a/data/fame_checker/img_845d100.png b/data/fame_checker/img_845d100.png new file mode 100644 index 000000000..4cc3e200d Binary files /dev/null and b/data/fame_checker/img_845d100.png differ diff --git a/data/fame_checker/img_845d520.png b/data/fame_checker/img_845d520.png new file mode 100644 index 000000000..4d23c4c87 Binary files /dev/null and b/data/fame_checker/img_845d520.png differ diff --git a/data/fame_checker/pal_45dd20.pal b/data/fame_checker/pal_45dd20.pal deleted file mode 100644 index e6dcabf2f..000000000 --- a/data/fame_checker/pal_45dd20.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -115 197 164 -255 222 205 -238 180 148 -197 139 106 -115 90 65 -222 164 82 -180 139 65 -148 106 57 -172 164 189 -255 230 131 -230 205 106 -238 131 90 -90 90 106 -213 205 213 -255 255 255 -0 0 0 diff --git a/data/fame_checker/pal_45e540.pal b/data/fame_checker/pal_45e540.pal deleted file mode 100644 index 485e27c48..000000000 --- a/data/fame_checker/pal_45e540.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -115 197 164 -255 230 205 -230 189 156 -205 156 115 -106 74 57 -180 139 213 -139 98 172 -98 65 106 -213 189 131 -189 164 98 -139 123 74 -180 139 115 -156 106 82 -90 74 49 -255 255 255 -0 0 0 diff --git a/data/fame_checker/pal_45ed60.pal b/data/fame_checker/pal_45ed60.pal deleted file mode 100644 index adf46bf14..000000000 --- a/data/fame_checker/pal_45ed60.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -115 197 164 -255 222 205 -238 180 148 -197 139 106 -172 123 98 -213 172 115 -156 123 74 -90 82 65 -205 115 98 -164 213 156 -115 172 106 -90 123 82 -222 230 255 -164 172 197 -255 255 255 -0 0 0 diff --git a/data/fame_checker/pal_45f580.pal b/data/fame_checker/pal_45f580.pal deleted file mode 100644 index eb6f2f18b..000000000 --- a/data/fame_checker/pal_45f580.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -115 197 164 -255 222 205 -238 180 148 -197 139 106 -106 74 74 -139 156 164 -205 164 205 -164 123 164 -82 82 57 -213 213 222 -123 123 82 -115 115 115 -197 189 131 -156 156 90 -255 255 255 -0 0 0 diff --git a/data/fame_checker/pal_45f5c0.pal b/data/fame_checker/pal_45f5c0.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/data/fame_checker/pal_45f5c0.pal +++ /dev/null @@ -1,19 +0,0 @@ -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 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/data/fame_checker/pal_845d0e0.pal b/data/fame_checker/pal_845d0e0.pal new file mode 100644 index 000000000..dac232f78 --- /dev/null +++ b/data/fame_checker/pal_845d0e0.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +106 106 106 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +139 139 139 +189 189 189 +205 205 205 +238 238 238 +230 230 230 +222 222 222 +180 180 180 +255 255 255 +106 106 106 diff --git a/data/fame_checker/pal_845d500.pal b/data/fame_checker/pal_845d500.pal new file mode 100644 index 000000000..212d9eb69 --- /dev/null +++ b/data/fame_checker/pal_845d500.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +246 222 82 +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 +246 148 41 +255 82 0 diff --git a/data/fame_checker/tilemap_845c600.bin b/data/fame_checker/tilemap_845c600.bin index 4272a1b41..8ff09b289 100644 Binary files a/data/fame_checker/tilemap_845c600.bin and b/data/fame_checker/tilemap_845c600.bin differ diff --git a/graphics_file_rules.mk b/graphics_file_rules.mk index 876262eb2..d511ce7d9 100644 --- a/graphics_file_rules.mk +++ b/graphics_file_rules.mk @@ -1,4 +1,5 @@ FONTGFXDIR := data/graphics/fonts +FAMECHECKERGFXDIR := data/fame_checker $(FONTGFXDIR)/font0_latin.latfont: $(FONTGFXDIR)/font0_latin.png $(GFX) $< $@ @@ -32,3 +33,6 @@ $(FONTGFXDIR)/font5_jap.fwjpnfont: $(FONTGFXDIR)/font5_jap.png $(FONTGFXDIR)/font9_jap.fwjpnfont: $(FONTGFXDIR)/font9_jap.png $(GFX) $< $@ + +$(FAMECHECKERGFXDIR)/img_845cf00.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 15 diff --git a/src/fame_checker.c b/src/fame_checker.c index 40c406c18..82cb25812 100644 --- a/src/fame_checker.c +++ b/src/fame_checker.c @@ -132,12 +132,18 @@ extern const u8 gUnknown_841E5F3[]; extern const u8 gUnknown_841E5F8[]; const u16 gUnknown_845C600[] = INCBIN_U16("data/fame_checker/tilemap_845c600.bin"); +const u8 gUnknown_845CE00[] = INCBIN_U8("data/fame_checker/img_845ce00.4bpp"); +const u8 gUnknown_845CF00[] = INCBIN_U8("data/fame_checker/img_845cf00.4bpp"); +const u16 gUnknown_845D0E0[] = INCBIN_U16("data/fame_checker/pal_845d0e0.gbapal"); +const u8 gUnknown_845D100[] = INCBIN_U8("data/fame_checker/img_845d100.4bpp"); +const u16 gUnknown_845D500[] = INCBIN_U16("data/fame_checker/pal_845d500.gbapal"); +const u8 gUnknown_845D520[] = INCBIN_U8("data/fame_checker/img_845d520.4bpp"); const u16 gUnknown_845DD20[] = INCBIN_U16("data/fame_checker/pal_845dd20.gbapal"); -const u16 gUnknown_845DD40[] = INCBIN_U16("data/fame_checker/img_845dd40.4bpp"); +const u8 gUnknown_845DD40[] = INCBIN_U8("data/fame_checker/img_845dd40.4bpp"); const u16 gUnknown_845E540[] = INCBIN_U16("data/fame_checker/pal_845e540.gbapal"); -const u16 gUnknown_845E560[] = INCBIN_U16("data/fame_checker/img_845e560.4bpp"); +const u8 gUnknown_845E560[] = INCBIN_U8("data/fame_checker/img_845e560.4bpp"); const u16 gUnknown_845ED60[] = INCBIN_U16("data/fame_checker/pal_845ed60.gbapal"); -const u16 gUnknown_845ED80[] = INCBIN_U16("data/fame_checker/img_845ed80.4bpp"); +const u8 gUnknown_845ED80[] = INCBIN_U8("data/fame_checker/img_845ed80.4bpp"); const u16 gUnknown_845F580[] = INCBIN_U16("data/fame_checker/pal_845f580.gbapal"); const u16 gUnknown_845F5A0[] = INCBIN_U16("data/fame_checker/pal_845f5a0.gbapal"); const u16 gUnknown_845F5C0[] = INCBIN_U16("data/fame_checker/pal_845f5c0.gbapal"); @@ -318,9 +324,19 @@ const u8 *const gUnknown_845FA1C[] = { gUnknown_81B1439, gUnknown_81B1442, gUnknown_81B144C, gUnknown_81B1456, gUnknown_81B145F, gUnknown_81B1463 }; -extern const struct BgTemplate gUnknown_845FBF4[4]; -extern const struct SpriteSheet gUnknown_845FB9C[]; +const struct SpriteSheet gUnknown_845FB9C[] = { + {gUnknown_845D100, 0x400, SPRITETAG_1000}, + {gUnknown_845CE00, 0x100, SPRITETAG_1001}, + {gUnknown_845CF00, 0x1e0, SPRITETAG_1002}, + {gUnknown_845E560, 0x800, SPRITETAG_1006}, + {gUnknown_845D520, 0x800, SPRITETAG_1007}, + {gUnknown_845ED80, 0x800, SPRITETAG_1008}, + {gUnknown_845DD40, 0x800, SPRITETAG_1009}, + {} +}; + extern const struct SpritePalette gUnknown_845FBDC[]; +extern const struct BgTemplate gUnknown_845FBF4[4]; extern const struct WindowTemplate gUnknown_845FC04[]; extern const struct SpriteTemplate gUnknown_845FC44; extern const struct SpriteTemplate gUnknown_845FC78; -- cgit v1.2.3 From 2e1ce30d8b72348d818287215ee1a55d89524a16 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Mon, 26 Nov 2018 15:22:21 -0500 Subject: First pass disassembly of fame_checker sprite templates --- data/fame_checker.s | 64 +++++++++++++++++++++++++++++++++++++++++------------ src/fame_checker.c | 52 ++++++++++++++++++++++++++++++++++++++++--- 2 files changed, 99 insertions(+), 17 deletions(-) diff --git a/data/fame_checker.s b/data/fame_checker.s index 3aaaf84dc..38639c70b 100644 --- a/data/fame_checker.s +++ b/data/fame_checker.s @@ -4,35 +4,71 @@ .section .rodata .align 2 -gUnknown_845FBDC:: @ 845FBDC - .incbin "baserom.gba", 0x45FBDC, 0x18 +gUnknown_845FC2C:: @ 845FC2C + .4byte 0x000f0000, 0x000f0010, 0x0000fffe -gUnknown_845FBF4:: @ 845FBF4 - .incbin "baserom.gba", 0x45FBF4, 0x10 +gUnknown_845FC38:: + .4byte gUnknown_845FC2C -gUnknown_845FC04:: @ 845FC04 - .incbin "baserom.gba", 0x45FC04, 0x40 +gOamData_845FC3C:: + .4byte 0x80000000, 0x00000800 gUnknown_845FC44:: @ 845FC44 - .incbin "baserom.gba", 0x45FC44, 0x34 + spr_template 1000, 1000, gOamData_845FC3C, gUnknown_845FC38, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy + +gUnknown_845FC5C:: + .4byte 0x00000000, 0x00000000 + +gOamData_845FC64:: + .4byte 0x80008000, 0x00000800 + +gUnknown_845FC6C:: + .4byte 0x000a0000, 0x0000ffff + +gUnknown_845FC74:: + .4byte gUnknown_845FC6C gUnknown_845FC78:: @ 845FC78 - .incbin "baserom.gba", 0x45FC78, 0x40 + spr_template 1001, 0xffff, gOamData_845FC64, gUnknown_845FC74, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy + +gUnknown_845FC90:: @ 845FC90 + .4byte 0x000a0000, 0x0000ffff + +gUnknown_845FC98:: + .4byte gUnknown_845FC90 + +gOamData_845FC9C:: + .4byte 0x80000100, 0x00000000 + +gUnknown_845FCA4:: + .4byte 0x00000000, 0x00001404, 0x00007ffe, 0x00000000 + +gUnknown_845FCB4:: @ 845FCB4 + .4byte gUnknown_845FCA4 gUnknown_845FCB8:: @ 845FCB8 - .incbin "baserom.gba", 0x45FCB8, 0x2C + spr_template 1002, 1002, gOamData_845FC9C, gUnknown_845FC98, NULL, gUnknown_845FCB4, sub_812D840 + +gUnknown_845FCD0:: @ 845FCD0 + .4byte 0x000f0000, 0x0000ffff + +gUnknown_845FCD8:: + .4byte gUnknown_845FCD0 + +gOamData_845FCDC:: + .4byte 0xc0000000, 0x00000000 gUnknown_845FCE4:: @ 845FCE4 - .incbin "baserom.gba", 0x45FCE4, 0x18 + spr_template 1006, 0xffff, gOamData_845FCDC, gUnknown_845FCD8, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy gUnknown_845FCFC:: @ 845FCFC - .incbin "baserom.gba", 0x45FCFC, 0x18 + spr_template 1007, 0xffff, gOamData_845FCDC, gUnknown_845FCD8, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy gUnknown_845FD14:: @ 845FD14 - .incbin "baserom.gba", 0x45FD14, 0x18 + spr_template 1008, 0xffff, gOamData_845FCDC, gUnknown_845FCD8, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy gUnknown_845FD2C:: @ 845FD2C - .incbin "baserom.gba", 0x45FD2C, 0x18 + spr_template 1009, 0xffff, gOamData_845FCDC, gUnknown_845FCD8, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy gUnknown_845FD44:: @ 845FD44 - .incbin "baserom.gba", 0x45FD44, 0x10 + .byte 0x02, 0x28, 0x1a, 0x03, 0x28, 0x64, 0x00, 0x00, 0x00, 0x00, 0xec, 0x03, 0xff, 0xff, 0x01, 0x00 diff --git a/src/fame_checker.c b/src/fame_checker.c index 82cb25812..ac01f172f 100644 --- a/src/fame_checker.c +++ b/src/fame_checker.c @@ -335,9 +335,55 @@ const struct SpriteSheet gUnknown_845FB9C[] = { {} }; -extern const struct SpritePalette gUnknown_845FBDC[]; -extern const struct BgTemplate gUnknown_845FBF4[4]; -extern const struct WindowTemplate gUnknown_845FC04[]; +const struct SpritePalette gUnknown_845FBDC[] = { + {gUnknown_845D500, SPRITETAG_1000}, + {gUnknown_845D0E0, SPRITETAG_1002}, + {} +}; + +const struct BgTemplate gUnknown_845FBF4[4] = { + { + .bg = 3, + .charBaseIndex = 0x03, + .mapBaseIndex = 0x1e, + .screenSize = 0, + .paletteMode = FALSE, + .priority = 3, + .baseTile = 0x000}, + { + .bg = 2, + .charBaseIndex = 0x03, + .mapBaseIndex = 0x1b, + .screenSize = 0, + .paletteMode = FALSE, + .priority = 2, + .baseTile = 0x000}, + { + .bg = 1, + .charBaseIndex = 0x03, + .mapBaseIndex = 0x1c, + .screenSize = 1, + .paletteMode = FALSE, + .priority = 0, + .baseTile = 0x000}, + { + .bg = 0, + .charBaseIndex = 0x00, + .mapBaseIndex = 0x1f, + .screenSize = 0, + .paletteMode = FALSE, + .priority = 2, + .baseTile = 0x000}, +}; + +const struct WindowTemplate gUnknown_845FC04[] = { + {0x00, 0x01, 0x03, 0x08, 0x0a, 0x0f, 0x0014}, + {0x00, 0x06, 0x00, 0x18, 0x02, 0x0f, 0x0064}, + {0x00, 0x02, 0x0f, 0x1a, 0x04, 0x0f, 0x0094}, + {0x00, 0x0f, 0x0a, 0x0b, 0x04, 0x0f, 0x00fc}, + DUMMY_WIN_TEMPLATE +}; + extern const struct SpriteTemplate gUnknown_845FC44; extern const struct SpriteTemplate gUnknown_845FC78; extern const struct SpriteTemplate gUnknown_845FCB8; -- cgit v1.2.3 From e88def5ab1f84d5aad5485d47975ea0d01e878c5 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Mon, 26 Nov 2018 15:39:30 -0500 Subject: Decompile remaining sprite templates --- data/fame_checker.s | 66 --------------------------------- src/fame_checker.c | 104 ++++++++++++++++++++++++++++++++++++++++++++++++---- 2 files changed, 97 insertions(+), 73 deletions(-) diff --git a/data/fame_checker.s b/data/fame_checker.s index 38639c70b..7e2ff471e 100644 --- a/data/fame_checker.s +++ b/data/fame_checker.s @@ -4,71 +4,5 @@ .section .rodata .align 2 -gUnknown_845FC2C:: @ 845FC2C - .4byte 0x000f0000, 0x000f0010, 0x0000fffe - -gUnknown_845FC38:: - .4byte gUnknown_845FC2C - -gOamData_845FC3C:: - .4byte 0x80000000, 0x00000800 - -gUnknown_845FC44:: @ 845FC44 - spr_template 1000, 1000, gOamData_845FC3C, gUnknown_845FC38, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy - -gUnknown_845FC5C:: - .4byte 0x00000000, 0x00000000 - -gOamData_845FC64:: - .4byte 0x80008000, 0x00000800 - -gUnknown_845FC6C:: - .4byte 0x000a0000, 0x0000ffff - -gUnknown_845FC74:: - .4byte gUnknown_845FC6C - -gUnknown_845FC78:: @ 845FC78 - spr_template 1001, 0xffff, gOamData_845FC64, gUnknown_845FC74, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy - -gUnknown_845FC90:: @ 845FC90 - .4byte 0x000a0000, 0x0000ffff - -gUnknown_845FC98:: - .4byte gUnknown_845FC90 - -gOamData_845FC9C:: - .4byte 0x80000100, 0x00000000 - -gUnknown_845FCA4:: - .4byte 0x00000000, 0x00001404, 0x00007ffe, 0x00000000 - -gUnknown_845FCB4:: @ 845FCB4 - .4byte gUnknown_845FCA4 - -gUnknown_845FCB8:: @ 845FCB8 - spr_template 1002, 1002, gOamData_845FC9C, gUnknown_845FC98, NULL, gUnknown_845FCB4, sub_812D840 - -gUnknown_845FCD0:: @ 845FCD0 - .4byte 0x000f0000, 0x0000ffff - -gUnknown_845FCD8:: - .4byte gUnknown_845FCD0 - -gOamData_845FCDC:: - .4byte 0xc0000000, 0x00000000 - -gUnknown_845FCE4:: @ 845FCE4 - spr_template 1006, 0xffff, gOamData_845FCDC, gUnknown_845FCD8, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy - -gUnknown_845FCFC:: @ 845FCFC - spr_template 1007, 0xffff, gOamData_845FCDC, gUnknown_845FCD8, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy - -gUnknown_845FD14:: @ 845FD14 - spr_template 1008, 0xffff, gOamData_845FCDC, gUnknown_845FCD8, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy - -gUnknown_845FD2C:: @ 845FD2C - spr_template 1009, 0xffff, gOamData_845FCDC, gUnknown_845FCD8, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy - gUnknown_845FD44:: @ 845FD44 .byte 0x02, 0x28, 0x1a, 0x03, 0x28, 0x64, 0x00, 0x00, 0x00, 0x00, 0xec, 0x03, 0xff, 0xff, 0x01, 0x00 diff --git a/src/fame_checker.c b/src/fame_checker.c index ac01f172f..0efd60057 100644 --- a/src/fame_checker.c +++ b/src/fame_checker.c @@ -104,6 +104,7 @@ void sub_812D9A8(u8 a0, u16 a1); void sub_812DA14(u8 a0); void sub_812DB10(void); void sub_812DB28(void); +void sub_812D840(struct Sprite * sprite); void sub_812DB64(void); void sub_812DBC0(s32, bool8, struct ListMenu *); void sub_812DD50(u8 taskId); @@ -384,13 +385,102 @@ const struct WindowTemplate gUnknown_845FC04[] = { DUMMY_WIN_TEMPLATE }; -extern const struct SpriteTemplate gUnknown_845FC44; -extern const struct SpriteTemplate gUnknown_845FC78; -extern const struct SpriteTemplate gUnknown_845FCB8; -extern const struct SpriteTemplate gUnknown_845FCE4; -extern const struct SpriteTemplate gUnknown_845FCFC; -extern const struct SpriteTemplate gUnknown_845FD14; -extern const struct SpriteTemplate gUnknown_845FD2C; +const union AnimCmd gUnknown_845FC2C[] = { + ANIMCMD_FRAME( 0, 15), + ANIMCMD_FRAME(16, 15), + ANIMCMD_JUMP(0) +}; + +const union AnimCmd *const gUnknown_845FC38[] = { + gUnknown_845FC2C +}; + +const struct OamData gOamData_845FC3C = { + .size = 2, + .priority = 2 +}; + +const struct SpriteTemplate gUnknown_845FC44 = { + SPRITETAG_1000, SPRITETAG_1000, &gOamData_845FC3C, gUnknown_845FC38, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy +}; + +const u8 filler_845FC5C[8] = {}; + +const struct OamData gOamData_845FC64 = { + .shape = ST_OAM_V_RECTANGLE, + .size = 2, + .priority = 2 +}; + +const union AnimCmd gUnknown_845FC6C[] = { + ANIMCMD_FRAME( 0, 10), + ANIMCMD_END +}; + +const union AnimCmd *const gUnknown_845FC74[] = { + gUnknown_845FC6C +}; + +const struct SpriteTemplate gUnknown_845FC78 = { + SPRITETAG_1001, 0xffff, &gOamData_845FC64, gUnknown_845FC74, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy +}; + +const union AnimCmd gUnknown_845FC90[] = { + ANIMCMD_FRAME( 0, 10), + ANIMCMD_END +}; + +const union AnimCmd *const gUnknown_845FC98[] = { + gUnknown_845FC90 +}; + +const struct OamData gOamData_845FC9C = { + .affineMode = ST_OAM_AFFINE_NORMAL, + .size = 2 +}; + +const union AffineAnimCmd gUnknown_845FCA4[] = { + AFFINEANIMCMD_FRAME(0, 0, 4, 20), + AFFINEANIMCMD_JUMP(0) +}; + +const union AffineAnimCmd *const gUnknown_845FCB4[] = { + gUnknown_845FCA4 +}; + +const struct SpriteTemplate gUnknown_845FCB8 = { + SPRITETAG_1002, SPRITETAG_1002, &gOamData_845FC9C, gUnknown_845FC98, NULL, gUnknown_845FCB4, sub_812D840 +}; + +const union AnimCmd gUnknown_845FCD0[] = { + ANIMCMD_FRAME( 0, 15), + ANIMCMD_END +}; + +const union AnimCmd *const gUnknown_845FCD8[] = { + gUnknown_845FCD0 +}; + +const struct OamData gOamData_845FCDC = { + .size = 3 +}; + +const struct SpriteTemplate gUnknown_845FCE4 = { + SPRITETAG_1006, 0xffff, &gOamData_845FCDC, gUnknown_845FCD8, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy +}; + +const struct SpriteTemplate gUnknown_845FCFC = { + SPRITETAG_1007, 0xffff, &gOamData_845FCDC, gUnknown_845FCD8, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy +}; + +const struct SpriteTemplate gUnknown_845FD14 = { + SPRITETAG_1008, 0xffff, &gOamData_845FCDC, gUnknown_845FCD8, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy +}; + +const struct SpriteTemplate gUnknown_845FD2C = { + SPRITETAG_1009, 0xffff, &gOamData_845FCDC, gUnknown_845FCD8, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy +}; + extern const struct ScrollIndicatorArrowPairTemplate gUnknown_845FD44; void sub_812C380(void) -- cgit v1.2.3 From a2b7b3ebf2f5460c4f5ab076e5dcb06935f61d25 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Mon, 26 Nov 2018 15:47:50 -0500 Subject: Finish data decomp --- data/fame_checker.s | 8 -------- include/menu_indicators.h | 12 ++++++++++-- ld_script.txt | 1 - src/fame_checker.c | 18 +++++++++++++++--- 4 files changed, 25 insertions(+), 14 deletions(-) delete mode 100644 data/fame_checker.s diff --git a/data/fame_checker.s b/data/fame_checker.s deleted file mode 100644 index 7e2ff471e..000000000 --- a/data/fame_checker.s +++ /dev/null @@ -1,8 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .section .rodata - - .align 2 -gUnknown_845FD44:: @ 845FD44 - .byte 0x02, 0x28, 0x1a, 0x03, 0x28, 0x64, 0x00, 0x00, 0x00, 0x00, 0xec, 0x03, 0xff, 0xff, 0x01, 0x00 diff --git a/include/menu_indicators.h b/include/menu_indicators.h index f88fd5549..f195ceb6d 100644 --- a/include/menu_indicators.h +++ b/include/menu_indicators.h @@ -9,10 +9,18 @@ struct ScrollIndicatorArrowPairTemplate { - u8 filler_00[6]; + u8 unk_00; + u8 unk_01; + u8 unk_02; + u8 unk_03; + u8 unk_04; + u8 unk_05; u16 unk_06; u16 unk_08; - u8 filler_0a[6]; + u16 unk_0a; + u16 unk_0c; + u16 unk_0e_0:4; + u16 unk_0e_4:12; }; // Exported ROM declarations diff --git a/ld_script.txt b/ld_script.txt index bbebf21b1..2a42825c9 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -377,7 +377,6 @@ SECTIONS { src/quest_log.o(.rodata); data/data_83FECCC.o(.rodata.8456C74); src/fame_checker.o(.rodata); - data/fame_checker.o(.rodata); data/data_845FD54.o(.rodata); src/menews_jisan.o(.rodata); src/menews_jisan.o(.rodata.str1.4); diff --git a/src/fame_checker.c b/src/fame_checker.c index 0efd60057..dfece6720 100644 --- a/src/fame_checker.c +++ b/src/fame_checker.c @@ -481,8 +481,6 @@ const struct SpriteTemplate gUnknown_845FD2C = { SPRITETAG_1009, 0xffff, &gOamData_845FCDC, gUnknown_845FCD8, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy }; -extern const struct ScrollIndicatorArrowPairTemplate gUnknown_845FD44; - void sub_812C380(void) { LoadOam(); @@ -1458,7 +1456,21 @@ void sub_812DFE4(u8 windowId) void sub_812E000(void) { - struct ScrollIndicatorArrowPairTemplate sp0 = gUnknown_845FD44; + struct ScrollIndicatorArrowPairTemplate sp0 = { + 2, + 40, + 26, + 3, + 40, + 100, + 0, + 0, + 1004, + 0xFFFF, + 1, + 0 + }; + if (gUnknown_203B0FC->unk_07_2 > 5) { sp0.unk_06 = 0; -- cgit v1.2.3 From 9750849c69899b0faaa156f397ff63dd086ab40c Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Mon, 26 Nov 2018 16:47:19 -0500 Subject: Genericize PRESSED macro --- include/global.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/include/global.h b/include/global.h index 9fb7703cd..2b9b00d5c 100644 --- a/include/global.h +++ b/include/global.h @@ -67,7 +67,9 @@ // We suspect it was used globally. // GameFreak never ceases to amaze. // TODO: Propagate use of this macro -#define PRESSED(button) ({gMain.newKeys & (button);}) +#define TEST_BUTTON(field, button) ({(field) & (button);}) +#define PRESSED(button) TEST_BUTTON(gMain.newKeys, button) +#define PUSHED(button) TEST_BUTTON(gMain.heldKeys, button) extern u8 gStringVar1[]; extern u8 gStringVar2[]; -- cgit v1.2.3 From 69106536eb68653a47f31c7bd9f8755087ce7b43 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Mon, 26 Nov 2018 18:12:17 -0500 Subject: Start documenting stuff; make objects static where possible --- asm/item_use.s | 4 +- asm/new_game.s | 2 +- include/fame_checker.h | 9 ++ src/fame_checker.c | 430 ++++++++++++++++++++++++------------------------- 4 files changed, 227 insertions(+), 218 deletions(-) create mode 100644 include/fame_checker.h diff --git a/asm/item_use.s b/asm/item_use.s index a7f7b1b7c..49d517eb5 100644 --- a/asm/item_use.s +++ b/asm/item_use.s @@ -1731,7 +1731,7 @@ _080A1D54: .4byte sub_80A1D68 sub_80A1D58: @ 80A1D58 push {lr} ldr r0, _080A1D64 @ =sub_8107EB8 - bl sub_812C3AC + bl UseFameChecker pop {r0} bx r0 .align 2, 0 @@ -1752,7 +1752,7 @@ sub_80A1D68: @ 80A1D68 bl sub_80563F0 bl sub_80A1184 ldr r0, _080A1D98 @ =c2_exit_to_overworld_2_switch - bl sub_812C3AC + bl UseFameChecker adds r0, r4, 0 bl DestroyTask _080A1D8E: diff --git a/asm/new_game.s b/asm/new_game.s index 80affe1cb..cec2b2c9a 100644 --- a/asm/new_game.s +++ b/asm/new_game.s @@ -241,7 +241,7 @@ sub_8054A60: @ 8054A60 bl PlayTimeCounter_Reset bl sub_80549AC bl sub_806E0D0 - bl sub_812D304 + bl ResetFameChecker ldr r0, [r6] movs r1, 0xA4 lsls r1, 2 diff --git a/include/fame_checker.h b/include/fame_checker.h new file mode 100644 index 000000000..7e95a7224 --- /dev/null +++ b/include/fame_checker.h @@ -0,0 +1,9 @@ +#ifndef GUARD_FAME_CHECKER_H +#define GUARD_FAME_CHECKER_H + +#include "main.h" + +void ResetFameChecker(void); +void UseFameChecker(MainCallback savedCallback); + +#endif //GUARD_FAME_CHECKER_H diff --git a/src/fame_checker.c b/src/fame_checker.c index dfece6720..b2fe20c9b 100644 --- a/src/fame_checker.c +++ b/src/fame_checker.c @@ -36,18 +36,18 @@ struct FameCheckerData { - MainCallback unk_00; + MainCallback savedCallback; u16 unk_04; u8 unk_06; u8 unk_07_0:1; u8 unk_07_1:1; u8 unk_07_2:6; - u8 unk_08; + u8 scrollIndicatorArrowObjectTaskId; u8 unk_09; u8 unk_0A; u8 unk_0B; - u8 unk_0C[17]; - u8 unk_1D[6]; + u8 unlockedPersons[17]; + u8 spriteIds[6]; u8 unk_23_0:1; u8 unk_23_1:1; u8 unk_23_2:1; @@ -63,62 +63,62 @@ EWRAM_DATA s32 gUnknown_203B104 = 0; struct ListMenuTemplate gUnknown_3005EB0; u8 gUnknown_3005EC8; -void sub_812C3F8(void); -void sub_812C648(void); -void sub_812C664(u8 taskId); -void sub_812C694(u8 taskId); -bool8 sub_812C8F8(u8 taskId); -void sub_812C990(void); -void sub_812C9BC(u8 taskId); -void sub_812CA1C(u8 taskId); -void sub_812CAD8(u8 taskId); -void sub_812CC68(u8 taskId, s8 dx, s8 dy); -void sub_812CD3C(void); -void sub_812CE04(u8 taskId); -void sub_812CE9C(void); -void sub_812CEC0(void); -void sub_812CEE0(u8 windowId); -bool8 sub_812CEFC(u8 taskId, u8 objMode); -void sub_812CF3C(u8 taskId); -void sub_812CF7C(u8 taskId); -void sub_812D094(u8 windowId); -void sub_812D0F4(u8 a0); -bool8 sub_812D1A8(u8 a0); -void sub_812D420(void); -void sub_812D558(void); -void sub_812D584(void); -void sub_812D594(void); -void sub_812D650(void); -bool8 sub_812D6B4(void); -void sub_812D70C(void); -u8 sub_812D724(s16 a0); -void sub_812D764(struct Sprite *sprite); -void sub_812D770(void); -u8 sub_812D780(u8, u8); -void sub_812D7C8(void); -u8 sub_812D7E4(void); -void sub_812D800(struct Sprite *sprite); -void sub_812D814(void); -u8 sub_812D888(u8 a0); -void sub_812D9A8(u8 a0, u16 a1); -void sub_812DA14(u8 a0); -void sub_812DB10(void); -void sub_812DB28(void); -void sub_812D840(struct Sprite * sprite); -void sub_812DB64(void); -void sub_812DBC0(s32, bool8, struct ListMenu *); -void sub_812DD50(u8 taskId); -void sub_812DDAC(void); -void sub_812DDF0(s32 itemIndex, bool8 onInit); -u8 sub_812DEF0(void); -void sub_812DFE4(u8); -void sub_812E000(void); -void sub_812E048(void); -u16 sub_812E064(void); -void sub_812E094(u8); -void sub_812E110(u8 taskId); -void sub_812E178(u8 a0, s16 a1); -void sub_812E4A4(u8 a0); +static void sub_812C3F8(void); +static void sub_812C648(void); +static void sub_812C664(u8 taskId); +static void sub_812C694(u8 taskId); +static bool8 sub_812C8F8(u8 taskId); +static void sub_812C990(void); +static void sub_812C9BC(u8 taskId); +static void sub_812CA1C(u8 taskId); +static void sub_812CAD8(u8 taskId); +static void sub_812CC68(u8 taskId, s8 dx, s8 dy); +static void sub_812CD3C(void); +static void sub_812CE04(u8 taskId); +static void sub_812CE9C(void); +static void sub_812CEC0(void); +static void sub_812CEE0(u8 windowId); +static bool8 sub_812CEFC(u8 taskId, u8 objMode); +static void sub_812CF3C(u8 taskId); +static void sub_812CF7C(u8 taskId); +static void sub_812D094(u8 windowId); +static void sub_812D0F4(u8 a0); +static bool8 sub_812D1A8(u8 a0); +static void sub_812D420(void); +static void sub_812D558(void); +static void sub_812D584(void); +static void sub_812D594(void); +static void sub_812D650(void); +static bool8 sub_812D6B4(void); +static void sub_812D70C(void); +static u8 sub_812D724(s16 a0); +static void sub_812D764(struct Sprite *sprite); +static void sub_812D770(void); +static u8 sub_812D780(u8, u8); +static void sub_812D7C8(void); +static u8 sub_812D7E4(void); +static void sub_812D800(struct Sprite *sprite); +static void sub_812D814(void); +static u8 sub_812D888(u8 a0); +static void sub_812D9A8(u8 a0, u16 a1); +static void sub_812DA14(u8 a0); +static void sub_812DB10(void); +static void sub_812DB28(void); +static void sub_812D840(struct Sprite * sprite); +static void sub_812DB64(void); +static void sub_812DBC0(s32, bool8, struct ListMenu *); +static void sub_812DD50(u8 taskId); +static void sub_812DDAC(void); +static void sub_812DDF0(s32 itemIndex, bool8 onInit); +static u8 sub_812DEF0(void); +static void sub_812DFE4(u8); +static void sub_812E000(void); +static void sub_812E048(void); +static u16 sub_812E064(void); +static void sub_812E094(u8); +static void sub_812E110(u8 taskId); +static void sub_812E178(u8 a0, s16 a1); +static void sub_812E4A4(u8 a0); extern const u8 gUnknown_84161C1[]; extern const u8 gUnknown_841623B[]; @@ -132,28 +132,28 @@ extern const u8 gUnknown_841E5ED[]; extern const u8 gUnknown_841E5F3[]; extern const u8 gUnknown_841E5F8[]; -const u16 gUnknown_845C600[] = INCBIN_U16("data/fame_checker/tilemap_845c600.bin"); -const u8 gUnknown_845CE00[] = INCBIN_U8("data/fame_checker/img_845ce00.4bpp"); -const u8 gUnknown_845CF00[] = INCBIN_U8("data/fame_checker/img_845cf00.4bpp"); -const u16 gUnknown_845D0E0[] = INCBIN_U16("data/fame_checker/pal_845d0e0.gbapal"); -const u8 gUnknown_845D100[] = INCBIN_U8("data/fame_checker/img_845d100.4bpp"); -const u16 gUnknown_845D500[] = INCBIN_U16("data/fame_checker/pal_845d500.gbapal"); -const u8 gUnknown_845D520[] = INCBIN_U8("data/fame_checker/img_845d520.4bpp"); -const u16 gUnknown_845DD20[] = INCBIN_U16("data/fame_checker/pal_845dd20.gbapal"); -const u8 gUnknown_845DD40[] = INCBIN_U8("data/fame_checker/img_845dd40.4bpp"); -const u16 gUnknown_845E540[] = INCBIN_U16("data/fame_checker/pal_845e540.gbapal"); -const u8 gUnknown_845E560[] = INCBIN_U8("data/fame_checker/img_845e560.4bpp"); -const u16 gUnknown_845ED60[] = INCBIN_U16("data/fame_checker/pal_845ed60.gbapal"); -const u8 gUnknown_845ED80[] = INCBIN_U8("data/fame_checker/img_845ed80.4bpp"); -const u16 gUnknown_845F580[] = INCBIN_U16("data/fame_checker/pal_845f580.gbapal"); -const u16 gUnknown_845F5A0[] = INCBIN_U16("data/fame_checker/pal_845f5a0.gbapal"); -const u16 gUnknown_845F5C0[] = INCBIN_U16("data/fame_checker/pal_845f5c0.gbapal"); - -const struct TextColor gUnknown_845F5E0 = {0x00, 0x01, 0x02}; -const struct TextColor gUnknown_845F5E3 = {0x00, 0x02, 0x03}; -const struct TextColor gUnknown_845F5E6 = {0x00, 0x06, 0x07}; - -const u16 gUnknown_845F5EA[] = { +static const u16 gUnknown_845C600[] = INCBIN_U16("data/fame_checker/tilemap_845c600.bin"); +static const u8 gUnknown_845CE00[] = INCBIN_U8("data/fame_checker/img_845ce00.4bpp"); +static const u8 gUnknown_845CF00[] = INCBIN_U8("data/fame_checker/img_845cf00.4bpp"); +static const u16 gUnknown_845D0E0[] = INCBIN_U16("data/fame_checker/pal_845d0e0.gbapal"); +static const u8 gUnknown_845D100[] = INCBIN_U8("data/fame_checker/img_845d100.4bpp"); +static const u16 gUnknown_845D500[] = INCBIN_U16("data/fame_checker/pal_845d500.gbapal"); +static const u8 gUnknown_845D520[] = INCBIN_U8("data/fame_checker/img_845d520.4bpp"); +static const u16 gUnknown_845DD20[] = INCBIN_U16("data/fame_checker/pal_845dd20.gbapal"); +static const u8 gUnknown_845DD40[] = INCBIN_U8("data/fame_checker/img_845dd40.4bpp"); +static const u16 gUnknown_845E540[] = INCBIN_U16("data/fame_checker/pal_845e540.gbapal"); +static const u8 gUnknown_845E560[] = INCBIN_U8("data/fame_checker/img_845e560.4bpp"); +static const u16 gUnknown_845ED60[] = INCBIN_U16("data/fame_checker/pal_845ed60.gbapal"); +static const u8 gUnknown_845ED80[] = INCBIN_U8("data/fame_checker/img_845ed80.4bpp"); +static const u16 gUnknown_845F580[] = INCBIN_U16("data/fame_checker/pal_845f580.gbapal"); +static const u16 gUnknown_845F5A0[] = INCBIN_U16("data/fame_checker/pal_845f5a0.gbapal"); +static const u16 gUnknown_845F5C0[] = INCBIN_U16("data/fame_checker/pal_845f5c0.gbapal"); + +static const struct TextColor gUnknown_845F5E0 = {0x00, 0x01, 0x02}; +static const struct TextColor gUnknown_845F5E3 = {0x00, 0x02, 0x03}; +static const struct TextColor gUnknown_845F5E6 = {0x00, 0x06, 0x07}; + +static const u16 gUnknown_845F5EA[] = { 0xfe00, 0xfe01, 0x019e, @@ -172,14 +172,14 @@ const u16 gUnknown_845F5EA[] = { 0x015c }; -const u8 *const gUnknown_845F60C[] = { +static const u8 *const gUnknown_845F60C[] = { gUnknown_841E5E9, gUnknown_841E5ED, gUnknown_841E5F3, gUnknown_841E5F8 }; -const u8 gUnknown_845F61C[] = { +static const u8 gUnknown_845F61C[] = { 0x56, 0x54, 0x74, @@ -214,7 +214,7 @@ const u8 gUnknown_845F61C[] = { 0x00 }; -const u8 *const gUnknown_845F63C[] = { +static const u8 *const gUnknown_845F63C[] = { gUnknown_81B0188, gUnknown_81B0251, gUnknown_81B030F, @@ -249,7 +249,7 @@ const u8 *const gUnknown_845F63C[] = { gUnknown_81B0BB5 }; -const u8 *const gUnknown_845F6BC[] = { +static const u8 *const gUnknown_845F6BC[] = { gUnknown_81AD106, gUnknown_81AD145, gUnknown_81AD1BB, gUnknown_81AD258, gUnknown_81AD2B9, gUnknown_81AD377, gUnknown_81AD40C, gUnknown_81AD4AE, gUnknown_81AD516, gUnknown_81AD5A7, gUnknown_81AD608, gUnknown_81AD69F, gUnknown_81AD705, gUnknown_81AD771, gUnknown_81AD840, gUnknown_81AD908, gUnknown_81AD99A, gUnknown_81ADA27, @@ -268,7 +268,7 @@ const u8 *const gUnknown_845F6BC[] = { gUnknown_81AFE68, gUnknown_81AFF23, gUnknown_81AFFA8, gUnknown_81B0022, gUnknown_81B00A6, gUnknown_81B0106 }; -const u8 gUnknown_845F83C[] = { +static const u8 gUnknown_845F83C[] = { 0x67, 0x47, 0x30, 0x69, 0x4b, 0x37, 0x37, 0x30, 0x3d, 0x69, 0x23, 0x69, 0x66, 0x50, 0x1b, 0x13, 0x1e, 0x69, @@ -287,7 +287,7 @@ const u8 gUnknown_845F83C[] = { 0x57, 0x37, 0x37, 0x57, 0x5b, 0x37 }; -const u8 *const gUnknown_845F89C[] = { +static const u8 *const gUnknown_845F89C[] = { gUnknown_81B0C45, gUnknown_81B0C51, gUnknown_81B0C5E, gUnknown_81B0C6B, gUnknown_81B0C79, gUnknown_81B0C88, gUnknown_81B0C95, gUnknown_81B0CA2, gUnknown_81B0CB1, gUnknown_81B0CC1, gUnknown_81B0CCF, gUnknown_81B0CDF, gUnknown_81B0CEB, gUnknown_81B0CF7, gUnknown_81B0D02, gUnknown_81B0D0E, gUnknown_81B0D16, gUnknown_81B0D1F, @@ -306,7 +306,7 @@ const u8 *const gUnknown_845F89C[] = { gUnknown_81B10F8, gUnknown_81B1107, gUnknown_81B1111, gUnknown_81B111B, gUnknown_81B1128, gUnknown_81B1135 }; -const u8 *const gUnknown_845FA1C[] = { +static const u8 *const gUnknown_845FA1C[] = { gUnknown_81B1146, gUnknown_81B114B, gUnknown_81B1155, gUnknown_81B115A, gUnknown_81B116A, gUnknown_81B1171, gUnknown_81B1176, gUnknown_81B117B, gUnknown_81B1181, gUnknown_81B1185, gUnknown_81B1195, gUnknown_81B119E, gUnknown_81B11AE, gUnknown_81B11B3, gUnknown_81B11B9, gUnknown_81B11C3, gUnknown_81B11C7, gUnknown_81B11CB, @@ -325,7 +325,7 @@ const u8 *const gUnknown_845FA1C[] = { gUnknown_81B1439, gUnknown_81B1442, gUnknown_81B144C, gUnknown_81B1456, gUnknown_81B145F, gUnknown_81B1463 }; -const struct SpriteSheet gUnknown_845FB9C[] = { +static const struct SpriteSheet gUnknown_845FB9C[] = { {gUnknown_845D100, 0x400, SPRITETAG_1000}, {gUnknown_845CE00, 0x100, SPRITETAG_1001}, {gUnknown_845CF00, 0x1e0, SPRITETAG_1002}, @@ -336,13 +336,13 @@ const struct SpriteSheet gUnknown_845FB9C[] = { {} }; -const struct SpritePalette gUnknown_845FBDC[] = { +static const struct SpritePalette gUnknown_845FBDC[] = { {gUnknown_845D500, SPRITETAG_1000}, {gUnknown_845D0E0, SPRITETAG_1002}, {} }; -const struct BgTemplate gUnknown_845FBF4[4] = { +static const struct BgTemplate gUnknown_845FBF4[4] = { { .bg = 3, .charBaseIndex = 0x03, @@ -377,7 +377,7 @@ const struct BgTemplate gUnknown_845FBF4[4] = { .baseTile = 0x000}, }; -const struct WindowTemplate gUnknown_845FC04[] = { +static const struct WindowTemplate gUnknown_845FC04[] = { {0x00, 0x01, 0x03, 0x08, 0x0a, 0x0f, 0x0014}, {0x00, 0x06, 0x00, 0x18, 0x02, 0x0f, 0x0064}, {0x00, 0x02, 0x0f, 0x1a, 0x04, 0x0f, 0x0094}, @@ -385,110 +385,110 @@ const struct WindowTemplate gUnknown_845FC04[] = { DUMMY_WIN_TEMPLATE }; -const union AnimCmd gUnknown_845FC2C[] = { +static const union AnimCmd gUnknown_845FC2C[] = { ANIMCMD_FRAME( 0, 15), ANIMCMD_FRAME(16, 15), ANIMCMD_JUMP(0) }; -const union AnimCmd *const gUnknown_845FC38[] = { +static const union AnimCmd *const gUnknown_845FC38[] = { gUnknown_845FC2C }; -const struct OamData gOamData_845FC3C = { +static const struct OamData gOamData_845FC3C = { .size = 2, .priority = 2 }; -const struct SpriteTemplate gUnknown_845FC44 = { +static const struct SpriteTemplate gUnknown_845FC44 = { SPRITETAG_1000, SPRITETAG_1000, &gOamData_845FC3C, gUnknown_845FC38, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy }; -const u8 filler_845FC5C[8] = {}; +static const u8 filler_845FC5C[8] = {}; -const struct OamData gOamData_845FC64 = { +static const struct OamData gOamData_845FC64 = { .shape = ST_OAM_V_RECTANGLE, .size = 2, .priority = 2 }; -const union AnimCmd gUnknown_845FC6C[] = { +static const union AnimCmd gUnknown_845FC6C[] = { ANIMCMD_FRAME( 0, 10), ANIMCMD_END }; -const union AnimCmd *const gUnknown_845FC74[] = { +static const union AnimCmd *const gUnknown_845FC74[] = { gUnknown_845FC6C }; -const struct SpriteTemplate gUnknown_845FC78 = { +static const struct SpriteTemplate gUnknown_845FC78 = { SPRITETAG_1001, 0xffff, &gOamData_845FC64, gUnknown_845FC74, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy }; -const union AnimCmd gUnknown_845FC90[] = { +static const union AnimCmd gUnknown_845FC90[] = { ANIMCMD_FRAME( 0, 10), ANIMCMD_END }; -const union AnimCmd *const gUnknown_845FC98[] = { +static const union AnimCmd *const gUnknown_845FC98[] = { gUnknown_845FC90 }; -const struct OamData gOamData_845FC9C = { +static const struct OamData gOamData_845FC9C = { .affineMode = ST_OAM_AFFINE_NORMAL, .size = 2 }; -const union AffineAnimCmd gUnknown_845FCA4[] = { +static const union AffineAnimCmd gUnknown_845FCA4[] = { AFFINEANIMCMD_FRAME(0, 0, 4, 20), AFFINEANIMCMD_JUMP(0) }; -const union AffineAnimCmd *const gUnknown_845FCB4[] = { +static const union AffineAnimCmd *const gUnknown_845FCB4[] = { gUnknown_845FCA4 }; -const struct SpriteTemplate gUnknown_845FCB8 = { +static const struct SpriteTemplate gUnknown_845FCB8 = { SPRITETAG_1002, SPRITETAG_1002, &gOamData_845FC9C, gUnknown_845FC98, NULL, gUnknown_845FCB4, sub_812D840 }; -const union AnimCmd gUnknown_845FCD0[] = { +static const union AnimCmd gUnknown_845FCD0[] = { ANIMCMD_FRAME( 0, 15), ANIMCMD_END }; -const union AnimCmd *const gUnknown_845FCD8[] = { +static const union AnimCmd *const gUnknown_845FCD8[] = { gUnknown_845FCD0 }; -const struct OamData gOamData_845FCDC = { +static const struct OamData gOamData_845FCDC = { .size = 3 }; -const struct SpriteTemplate gUnknown_845FCE4 = { +static const struct SpriteTemplate gUnknown_845FCE4 = { SPRITETAG_1006, 0xffff, &gOamData_845FCDC, gUnknown_845FCD8, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy }; -const struct SpriteTemplate gUnknown_845FCFC = { +static const struct SpriteTemplate gUnknown_845FCFC = { SPRITETAG_1007, 0xffff, &gOamData_845FCDC, gUnknown_845FCD8, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy }; -const struct SpriteTemplate gUnknown_845FD14 = { +static const struct SpriteTemplate gUnknown_845FD14 = { SPRITETAG_1008, 0xffff, &gOamData_845FCDC, gUnknown_845FCD8, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy }; -const struct SpriteTemplate gUnknown_845FD2C = { +static const struct SpriteTemplate gUnknown_845FD2C = { SPRITETAG_1009, 0xffff, &gOamData_845FCDC, gUnknown_845FCD8, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy }; -void sub_812C380(void) +static void sub_812C380(void) { LoadOam(); ProcessSpriteCopyRequests(); TransferPlttBuffer(); } -void sub_812C394(void) +static void sub_812C394(void) { RunTasks(); AnimateSprites(); @@ -496,11 +496,11 @@ void sub_812C394(void) UpdatePaletteFade(); } -void sub_812C3AC(void (*a0)(void)) +void UseFameChecker(MainCallback savedCallback) { SetVBlankCallback(NULL); gUnknown_203B0FC = AllocZeroed(sizeof(struct FameCheckerData)); - gUnknown_203B0FC->unk_00 = a0; + gUnknown_203B0FC->savedCallback = savedCallback; gUnknown_203B0FC->unk_09 = 0; gUnknown_203B0FC->unk_0A = 0; gUnknown_203B0FC->unk_0B = 0; @@ -509,7 +509,7 @@ void sub_812C3AC(void (*a0)(void)) SetMainCallback2(sub_812C3F8); } -void sub_812C3F8(void) +static void sub_812C3F8(void) { switch (gMain.state) { @@ -588,19 +588,19 @@ void sub_812C3F8(void) } } -void sub_812C648(void) +static void sub_812C648(void) { LoadSpriteSheets(gUnknown_845FB9C); LoadSpritePalettes(gUnknown_845FBDC); } -void sub_812C664(u8 taskId) +static void sub_812C664(u8 taskId) { if (!gPaletteFade.active) gTasks[taskId].func = sub_812C694; } -void sub_812C694(u8 taskId) +static void sub_812C694(u8 taskId) { u16 r4; u8 r4_2; @@ -609,7 +609,7 @@ void sub_812C694(u8 taskId) if (FindTaskIdByFunc(sub_812E110) == 0xFF) { RunTextPrinters(); - if ((PRESSED(SELECT_BUTTON)) && !gUnknown_203B0FC->unk_07_1 && gUnknown_203B0FC->unk_00 != sub_8107EB8) + if ((PRESSED(SELECT_BUTTON)) && !gUnknown_203B0FC->unk_07_1 && gUnknown_203B0FC->savedCallback != sub_8107EB8) task->func = sub_812CF3C; else if (PRESSED(START_BUTTON)) { @@ -626,7 +626,7 @@ void sub_812C694(u8 taskId) sub_812E178(2, 4); sub_812E178(1, 5); sub_812D0F4(1); - task->data[2] = sub_812D888(gUnknown_203B0FC->unk_0C[r4]); + task->data[2] = sub_812D888(gUnknown_203B0FC->unlockedPersons[r4]); gSprites[task->data[2]].pos2.x = 0xF0; gSprites[task->data[2]].data[0] = 1; task->data[3] = sub_812D7E4(); @@ -652,12 +652,12 @@ void sub_812C694(u8 taskId) for (r4_2 = 0; r4_2 < 6; r4_2++) { if (r4_2 != task->data[1]) - sub_812CEFC(gUnknown_203B0FC->unk_1D[r4_2], ST_OAM_OBJ_BLEND); + sub_812CEFC(gUnknown_203B0FC->spriteIds[r4_2], ST_OAM_OBJ_BLEND); } gUnknown_3005EC8 = 0xFF; sub_812E4A4(0); sub_812D0F4(2); - if (gSprites[gUnknown_203B0FC->unk_1D[task->data[1]]].data[1] != 0xFF) + if (gSprites[gUnknown_203B0FC->spriteIds[task->data[1]]].data[1] != 0xFF) { sub_812CE04(taskId); sub_812DA14(data[1]); @@ -676,7 +676,7 @@ void sub_812C694(u8 taskId) } } -bool8 sub_812C8F8(u8 taskId) +static bool8 sub_812C8F8(u8 taskId) { struct Task *task = &gTasks[taskId]; if (gUnknown_203B0FC->unk_07_1) @@ -694,12 +694,12 @@ bool8 sub_812C8F8(u8 taskId) return FALSE; } -void sub_812C990(void) +static void sub_812C990(void) { AddTextPrinterParametrized(2, 2, gUnknown_84181E4, 0, NULL, 2, 1, 3); } -void sub_812C9BC(u8 taskId) +static void sub_812C9BC(u8 taskId) { struct Task *task = &gTasks[taskId]; if (gSprites[task->data[2]].data[0] == 0) @@ -712,7 +712,7 @@ void sub_812C9BC(u8 taskId) ChangeBgX(1, 0xA00, 1); } -void sub_812CA1C(u8 taskId) +static void sub_812CA1C(u8 taskId) { struct Task *task = &gTasks[taskId]; if (GetBgX(1) != 0) @@ -732,7 +732,7 @@ void sub_812CA1C(u8 taskId) } } -void sub_812CAD8(u8 taskId) +static void sub_812CAD8(u8 taskId) { struct Task *task = &gTasks[taskId]; s16 *data = gTasks[taskId].data; @@ -740,7 +740,7 @@ void sub_812CAD8(u8 taskId) RunTextPrinters(); if (PRESSED(A_BUTTON) && !IsTextPrinterActive(2)) { - u8 spriteId = gUnknown_203B0FC->unk_1D[data[1]]; + u8 spriteId = gUnknown_203B0FC->spriteIds[data[1]]; if (gSprites[spriteId].data[1] != 0xFF) sub_812CE04(taskId); } @@ -749,7 +749,7 @@ void sub_812CAD8(u8 taskId) u8 r4; PlaySE(SE_SELECT); for (r4 = 0; r4 < 6; r4++) - sub_812CEFC(gUnknown_203B0FC->unk_1D[r4], ST_OAM_OBJ_NORMAL); + sub_812CEFC(gUnknown_203B0FC->spriteIds[r4], ST_OAM_OBJ_NORMAL); sub_812CE9C(); gSprites[task->data[0]].callback = sub_812D764; if (gUnknown_3005EC8 != 0xFF) @@ -801,7 +801,7 @@ void sub_812CAD8(u8 taskId) } } -void sub_812CC68(u8 taskId, s8 dx, s8 dy) +static void sub_812CC68(u8 taskId, s8 dx, s8 dy) { u8 i; s16 *data = gTasks[taskId].data; @@ -809,10 +809,10 @@ void sub_812CC68(u8 taskId, s8 dx, s8 dy) gSprites[data[0]].pos1.x += dx; gSprites[data[0]].pos1.y += dy; for (i = 0; i < 6; i++) - sub_812CEFC(gUnknown_203B0FC->unk_1D[i], ST_OAM_OBJ_BLEND); + sub_812CEFC(gUnknown_203B0FC->spriteIds[i], ST_OAM_OBJ_BLEND); FillWindowPixelRect(2, 0x11, 0, 0, 0xd0, 0x20); sub_812C990(); - if (sub_812CEFC(gUnknown_203B0FC->unk_1D[data[1]], ST_OAM_OBJ_NORMAL) == TRUE) + if (sub_812CEFC(gUnknown_203B0FC->spriteIds[data[1]], ST_OAM_OBJ_NORMAL) == TRUE) { sub_812CE04(taskId); sub_812DA14(data[1]); @@ -821,11 +821,11 @@ void sub_812CC68(u8 taskId, s8 dx, s8 dy) sub_812DB10(); } -void sub_812CD3C(void) +static void sub_812CD3C(void) { u8 r8 = 0; u16 r6 = sub_812E064(); - if (gSaveBlock1Ptr->fameChecker[gUnknown_203B0FC->unk_0C[r6]].unk_0_0 != 2) + if (gSaveBlock1Ptr->fameChecker[gUnknown_203B0FC->unlockedPersons[r6]].unk_0_0 != 2) { sub_812CE9C(); sub_812C990(); @@ -835,29 +835,29 @@ void sub_812CD3C(void) FillWindowPixelRect(2, 0x11, 0, 0, 0xd0, 0x20); if (sub_812D6B4() == TRUE) r8 = 16; - StringExpandPlaceholders(gStringVar4, gUnknown_845F63C[gUnknown_203B0FC->unk_0C[r6] + r8]); + StringExpandPlaceholders(gStringVar4, gUnknown_845F63C[gUnknown_203B0FC->unlockedPersons[r6] + r8]); AddTextPrinterParametrized(2, 2, gStringVar4, sub_80F78A8(), NULL, 2, 1, 3); sub_812CEE0(2); } } -void sub_812CE04(u8 taskId) +static void sub_812CE04(u8 taskId) { s16 *data = gTasks[taskId].data; u16 r5 = sub_812E064(); FillWindowPixelRect(2, 0x11, 0, 0, 0xd0, 0x20); - StringExpandPlaceholders(gStringVar4, gUnknown_845F6BC[gUnknown_203B0FC->unk_0C[r5] * 6 + data[1]]); + StringExpandPlaceholders(gStringVar4, gUnknown_845F6BC[gUnknown_203B0FC->unlockedPersons[r5] * 6 + data[1]]); AddTextPrinterParametrized(2, 2, gStringVar4, sub_80F78A8(), NULL, 2, 1, 3); sub_812CEE0(2); } -void sub_812CE9C(void) +static void sub_812CE9C(void) { FillWindowPixelRect(2, 0x11, 0, 0, 0xd0, 0x20); sub_812CEE0(2); } -void sub_812CEC0(void) +static void sub_812CEC0(void) { sub_80F6E9C(); sub_80F6EE4(2, 1); @@ -865,13 +865,13 @@ void sub_812CEC0(void) sub_812CEE0(0); } -void sub_812CEE0(u8 windowId) +static void sub_812CEE0(u8 windowId) { PutWindowTilemap(windowId); CopyWindowToVram(windowId, 3); } -bool8 sub_812CEFC(u8 spriteId, u8 objMode) +static bool8 sub_812CEFC(u8 spriteId, u8 objMode) { if (gSprites[spriteId].data[1] != 0xFF) { @@ -881,14 +881,14 @@ bool8 sub_812CEFC(u8 spriteId, u8 objMode) return FALSE; } -void sub_812CF3C(u8 taskId) +static void sub_812CF3C(u8 taskId) { PlaySE(SE_W202); BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, 0); gTasks[taskId].func = sub_812CF7C; } -void sub_812CF7C(u8 taskId) +static void sub_812CF7C(u8 taskId) { u8 r4; @@ -902,15 +902,15 @@ void sub_812CF7C(u8 taskId) } for (r4 = 0; r4 < 6; r4++) { - DestroySprite(&gSprites[gUnknown_203B0FC->unk_1D[r4]]); + DestroySprite(&gSprites[gUnknown_203B0FC->spriteIds[r4]]); } sub_812D814(); sub_812D7C8(); sub_812D70C(); sub_812D770(); sub_812E048(); - SetMainCallback2(gUnknown_203B0FC->unk_00); - sub_810713C(gUnknown_203B0FC->unk_08, 0, 0); + SetMainCallback2(gUnknown_203B0FC->savedCallback); + sub_810713C(gUnknown_203B0FC->scrollIndicatorArrowObjectTaskId, 0, 0); Free(gUnknown_203B0F0); Free(gUnknown_203B0F4); Free(gUnknown_203B0F8); @@ -925,7 +925,7 @@ void sub_812CF7C(u8 taskId) } } -void sub_812D094(u8 windowId) +static void sub_812D094(u8 windowId) { FillWindowPixelBuffer(windowId, 0); ClearWindowTilemap(windowId); @@ -933,7 +933,7 @@ void sub_812D094(u8 windowId) RemoveWindow(windowId); } -u8 sub_812D0C0(u8 a0) +static u8 sub_812D0C0(u8 a0) { if (HasTrainerAlreadyBeenFought(0x15e) == TRUE) { @@ -945,7 +945,7 @@ u8 sub_812D0C0(u8 a0) return a0; } -void sub_812D0F4(u8 a0) +static void sub_812D0F4(u8 a0) { const u8 * r5 = gUnknown_841E5A4; s32 width; @@ -961,26 +961,26 @@ void sub_812D0F4(u8 a0) sub_812CEE0(1); } -void sub_812D174(void) +static void sub_812D174(void) { u8 r4; for (r4 = 0; r4 < 6; r4++) { - DestroySprite(&gSprites[gUnknown_203B0FC->unk_1D[r4]]); + DestroySprite(&gSprites[gUnknown_203B0FC->spriteIds[r4]]); } } -bool8 sub_812D1A8(u8 a0) +static bool8 sub_812D1A8(u8 a0) { // r8 <- a0 bool8 r5 = FALSE; u8 r6; for (r6 = 0; r6 < 6; r6++) { - if ((gSaveBlock1Ptr->fameChecker[gUnknown_203B0FC->unk_0C[a0]].unk_0_2 >> r6) & 1) + if ((gSaveBlock1Ptr->fameChecker[gUnknown_203B0FC->unlockedPersons[a0]].unk_0_2 >> r6) & 1) { - gUnknown_203B0FC->unk_1D[r6] = sub_805EB44( - gUnknown_845F83C[gUnknown_203B0FC->unk_0C[a0] * 6 + r6], + gUnknown_203B0FC->spriteIds[r6] = sub_805EB44( + gUnknown_845F83C[gUnknown_203B0FC->unlockedPersons[a0] * 6 + r6], r6, 47 * (r6 % 3) + 0x72, 27 * (r6 / 3) + 0x2F @@ -989,11 +989,11 @@ bool8 sub_812D1A8(u8 a0) } else { - gUnknown_203B0FC->unk_1D[r6] = sub_812D780( + gUnknown_203B0FC->spriteIds[r6] = sub_812D780( 47 * (r6 % 3) + 0x72, 27 * (r6 / 3) + 0x1F ); - gSprites[gUnknown_203B0FC->unk_1D[r6]].data[1] = 0xFF; + gSprites[gUnknown_203B0FC->spriteIds[r6]].data[1] = 0xFF; } } if (r5 == TRUE) @@ -1012,7 +1012,7 @@ bool8 sub_812D1A8(u8 a0) return r5; } -void sub_812D304(void) +void ResetFameChecker(void) { u8 r4; for (r4 = 0; r4 < 16; r4++) @@ -1024,7 +1024,7 @@ void sub_812D304(void) gSaveBlock1Ptr->fameChecker[0].unk_0_0 = 2; } -void sub_812D388(void) +static void sub_812D388(void) { u8 r5, r4; for (r5 = 0; r5 < 16; r5++) @@ -1037,7 +1037,7 @@ void sub_812D388(void) } } -void sub_812D420(void) +static void sub_812D420(void) { void * vram = (void *)VRAM; DmaClearLarge16(3, vram, VRAM_SIZE, 0x1000); @@ -1065,7 +1065,7 @@ void sub_812D420(void) SetGpuReg(REG_OFFSET_BLDY, 0); } -void sub_812D558(void) +static void sub_812D558(void) { remove_some_task(); ResetTasks(); @@ -1077,12 +1077,12 @@ void sub_812D558(void) } -void sub_812D584(void) +static void sub_812D584(void) { SetGpuReg(REG_OFFSET_DISPCNT, DISPCNT_MODE_0 | DISPCNT_OBJ_1D_MAP | DISPCNT_BG_ALL_ON | DISPCNT_OBJ_ON); } -void sub_812D594(void) +static void sub_812D594(void) { ChangeBgX(0, 0, 0); ChangeBgY(0, 0, 0); @@ -1094,7 +1094,7 @@ void sub_812D594(void) ChangeBgY(3, 0, 0); } -void sub_812D5EC(void) +static void sub_812D5EC(void) { if (gUnknown_20370C0 < 16 && gSpecialVar_0x8005 < 6) { @@ -1104,7 +1104,7 @@ void sub_812D5EC(void) } } -void sub_812D650(void) +static void sub_812D650(void) { if (gUnknown_20370C0 < 16 && gSpecialVar_0x8005 < 3) { @@ -1116,10 +1116,10 @@ void sub_812D650(void) } } -bool8 sub_812D6B4(void) +static bool8 sub_812D6B4(void) { u8 r2; - u8 r1 = gUnknown_203B0FC->unk_0C[sub_812E064()]; + u8 r1 = gUnknown_203B0FC->unlockedPersons[sub_812E064()]; for (r2 = 0; r2 < 6; r2++) { if (!((gSaveBlock1Ptr->fameChecker[r1].unk_0_2 >> r2) & 1)) @@ -1128,30 +1128,30 @@ bool8 sub_812D6B4(void) return TRUE; } -void sub_812D70C(void) +static void sub_812D70C(void) { FreeSpriteTilesByTag(SPRITETAG_1000); FreeSpritePaletteByTag(SPRITETAG_1000); } -u8 sub_812D724(s16 a0) +static u8 sub_812D724(s16 a0) { s16 r4 = a0 >= 3 ? 61 : 34; s16 r1 = 47 * (a0 % 3) + 0x72; return CreateSprite(&gUnknown_845FC44, r1, r4, 0); } -void sub_812D764(struct Sprite * sprite) +static void sub_812D764(struct Sprite * sprite) { DestroySprite(sprite); } -void sub_812D770(void) +static void sub_812D770(void) { FreeSpriteTilesByTag(SPRITETAG_1001); } -u8 sub_812D780(u8 x, u8 y) +static u8 sub_812D780(u8 x, u8 y) { u8 spriteId = CreateSprite(&gUnknown_845FC78, x, y, 8); gSprites[spriteId].oam.priority = 2; @@ -1159,24 +1159,24 @@ u8 sub_812D780(u8 x, u8 y) return spriteId; } -void sub_812D7C8(void) +static void sub_812D7C8(void) { FreeSpriteTilesByTag(SPRITETAG_1002); FreeSpritePaletteByTag(SPRITETAG_1002); } -u8 sub_812D7E4(void) +static u8 sub_812D7E4(void) { return CreateSprite(&gUnknown_845FCB8, 0xe2, 0x42, 0); } -void sub_812D800(struct Sprite * sprite) +static void sub_812D800(struct Sprite * sprite) { FreeSpriteOamMatrix(sprite); DestroySprite(sprite); } -void sub_812D814(void) +static void sub_812D814(void) { FreeSpriteTilesByTag(SPRITETAG_1006); FreeSpriteTilesByTag(SPRITETAG_1007); @@ -1184,7 +1184,7 @@ void sub_812D814(void) FreeSpriteTilesByTag(SPRITETAG_1009); } -void sub_812D840(struct Sprite * sprite) +static void sub_812D840(struct Sprite * sprite) { if (sprite->data[0] == 1) { @@ -1208,7 +1208,7 @@ void sub_812D840(struct Sprite * sprite) } } -u8 sub_812D888(u8 a0) +static u8 sub_812D888(u8 a0) { u8 r4; if (a0 == 1) @@ -1245,26 +1245,26 @@ u8 sub_812D888(u8 a0) return r4; } -void sub_812D9A8(u8 taskId, u16 a1) +static void sub_812D9A8(u8 taskId, u16 a1) { s16 * data = gTasks[taskId].data; u16 r1 = a1; if (a1 == gUnknown_203B0FC->unk_07_2 - 1) r1 = a1 - 1; - if ( gUnknown_203B0FC->unk_0C[r1] == 1 - || gUnknown_203B0FC->unk_0C[r1] == 14 - || gUnknown_203B0FC->unk_0C[r1] == 0 - || gUnknown_203B0FC->unk_0C[r1] == 13 + if ( gUnknown_203B0FC->unlockedPersons[r1] == 1 + || gUnknown_203B0FC->unlockedPersons[r1] == 14 + || gUnknown_203B0FC->unlockedPersons[r1] == 0 + || gUnknown_203B0FC->unlockedPersons[r1] == 13 ) DestroySprite(&gSprites[data[2]]); else sub_810C2E8(data[2]); } -void sub_812DA14(u8 a0) +static void sub_812DA14(u8 a0) { s32 width; - u32 r5 = 6 * gUnknown_203B0FC->unk_0C[sub_812E064()] + a0; + u32 r5 = 6 * gUnknown_203B0FC->unlockedPersons[sub_812E064()] + a0; sub_812E094(1); gUnknown_3005EC8 = 1; FillWindowPixelRect(3, 0x00, 0, 0, 0x58, 0x20); @@ -1276,21 +1276,21 @@ void sub_812DA14(u8 a0) sub_812CEE0(3); } -void sub_812DB10(void) +static void sub_812DB10(void) { sub_812E094(0); gUnknown_3005EC8 = 0xFF; } -void sub_812DB28(void) +static void sub_812DB28(void) { sub_812DB64(); gUnknown_203B0FC->unk_07_2 = sub_812DEF0(); - gUnknown_203B0FC->unk_08 = ListMenuInit(&gUnknown_3005EB0, 0, 0); + gUnknown_203B0FC->scrollIndicatorArrowObjectTaskId = ListMenuInit(&gUnknown_3005EB0, 0, 0); sub_812DFE4(0); } -void sub_812DB64(void) +static void sub_812DB64(void) { gUnknown_3005EB0.items = gUnknown_203B100; gUnknown_3005EB0.moveCursorFunc = sub_812DBC0; @@ -1312,7 +1312,7 @@ void sub_812DB64(void) gUnknown_3005EB0.cursorKind = 0; } -void sub_812DBC0(s32 itemIndex, bool8 onInit, struct ListMenu *list) +static void sub_812DBC0(s32 itemIndex, bool8 onInit, struct ListMenu *list) { u16 sp8; u8 taskId; @@ -1326,7 +1326,7 @@ void sub_812DBC0(s32 itemIndex, bool8 onInit, struct ListMenu *list) struct Task *task = &gTasks[taskId]; PlaySE(SE_SELECT); task->data[1] = 0; - get_coro_args_x18_x1A(gUnknown_203B0FC->unk_08, &sp8, NULL); + get_coro_args_x18_x1A(gUnknown_203B0FC->scrollIndicatorArrowObjectTaskId, &sp8, NULL); gUnknown_203B0FC->unk_04 = sp8; if (itemIndex != gUnknown_203B0FC->unk_07_2 - 1) { @@ -1367,35 +1367,35 @@ void sub_812DBC0(s32 itemIndex, bool8 onInit, struct ListMenu *list) u8 r2; for (r2 = 0; r2 < 6; r2++) { - gSprites[gUnknown_203B0FC->unk_1D[r2]].invisible = TRUE; + gSprites[gUnknown_203B0FC->spriteIds[r2]].invisible = TRUE; } } } } } -void sub_812DD50(u8 taskId) +static void sub_812DD50(u8 taskId) { struct Task * task = &gTasks[taskId]; - task->data[2] = sub_812D888(gUnknown_203B0FC->unk_0C[gUnknown_203B104]); + task->data[2] = sub_812D888(gUnknown_203B0FC->unlockedPersons[gUnknown_203B104]); gSprites[task->data[2]].data[0] = 0; sub_812CD3C(); task->func = sub_812C694; } -void sub_812DDAC(void) +static void sub_812DDAC(void) { FillWindowPixelRect(2, 0x11, 0, 0, 0xd0, 0x20); AddTextPrinterParametrized(2, 2, gUnknown_84181C3, 0, NULL, 2, 1, 3); sub_812CEE0(2); } -void sub_812DDF0(s32 itemIndex, bool8 onInit) +static void sub_812DDF0(s32 itemIndex, bool8 onInit) { u16 sp14; u16 sp16; u16 r6; - get_coro_args_x18_x1A(gUnknown_203B0FC->unk_08, &sp14, &sp16); + get_coro_args_x18_x1A(gUnknown_203B0FC->scrollIndicatorArrowObjectTaskId, &sp14, &sp16); r6 = sp14 + sp16; AddTextPrinterParametrized2(0, 2, 8, 14 * sp16 + 4, 0, 0, &gUnknown_845F5E6, 0, gUnknown_203B100[itemIndex].unk_00); if (!onInit) @@ -1412,7 +1412,7 @@ void sub_812DDF0(s32 itemIndex, bool8 onInit) gUnknown_203B0FC->unk_0A = sp14; } -u8 sub_812DEF0(void) +static u8 sub_812DEF0(void) { u8 r4 = 0; u8 r6; @@ -1432,13 +1432,13 @@ u8 sub_812DEF0(void) gUnknown_203B100[r4].unk_00 = gUnknown_845F60C[gUnknown_845F5EA[r5] - 0xFE00]; gUnknown_203B100[r4].unk_04 = r4; } - gUnknown_203B0FC->unk_0C[r4] = r5; + gUnknown_203B0FC->unlockedPersons[r4] = r5; r4++; } } gUnknown_203B100[r4].unk_00 = gUnknown_84161C1; gUnknown_203B100[r4].unk_04 = r4; - gUnknown_203B0FC->unk_0C[r4] = 0xFF; + gUnknown_203B0FC->unlockedPersons[r4] = 0xFF; r4++; gUnknown_3005EB0.totalItems = r4; if (r4 < 5) @@ -1448,13 +1448,13 @@ u8 sub_812DEF0(void) return r4; } -void sub_812DFE4(u8 windowId) +static void sub_812DFE4(u8 windowId) { PutWindowTilemap(windowId); CopyWindowToVram(windowId, 3); } -void sub_812E000(void) +static void sub_812E000(void) { struct ScrollIndicatorArrowPairTemplate sp0 = { 2, @@ -1479,20 +1479,20 @@ void sub_812E000(void) } } -void sub_812E048(void) +static void sub_812E048(void) { if (gUnknown_203B0FC->unk_07_2 > 5) RemoveScrollIndicatorArrowPair(gUnknown_203B0FC->unk_06); } -u16 sub_812E064(void) +static u16 sub_812E064(void) { u16 sp0, sp2; - get_coro_args_x18_x1A(gUnknown_203B0FC->unk_08, &sp0, &sp2); + get_coro_args_x18_x1A(gUnknown_203B0FC->scrollIndicatorArrowObjectTaskId, &sp0, &sp2); return sp0 + sp2; } -void sub_812E094(u8 a0) +static void sub_812E094(u8 a0) { if (gUnknown_203B0FC->unk_23_0 != a0) { @@ -1514,7 +1514,7 @@ void sub_812E094(u8 a0) } } -void sub_812E110(u8 taskId) +static void sub_812E110(u8 taskId) { struct Task * task = &gTasks[taskId]; switch (task->data[0]) @@ -1537,7 +1537,7 @@ void sub_812E110(u8 taskId) } } -void sub_812E178(u8 bg, s16 a1) +static void sub_812E178(u8 bg, s16 a1) { if (a1 == 0 || a1 == 3) { @@ -1599,9 +1599,9 @@ void sub_812E178(u8 bg, s16 a1) CopyBgTilemapBufferToVram(bg); } -void sub_812E4A4(u8 a0) +static void sub_812E4A4(u8 a0) { - u16 cursorY = ListMenuGetYCoordForPrintingArrowCursor(gUnknown_203B0FC->unk_08); + u16 cursorY = ListMenuGetYCoordForPrintingArrowCursor(gUnknown_203B0FC->scrollIndicatorArrowObjectTaskId); if (a0 == 1) AddTextPrinterParametrized2(0, 2, 0, cursorY, 0, 0, &gUnknown_845F5E3, 0, gUnknown_841623B); else -- cgit v1.2.3 From 3c409e3cd2a9da797a8b5ecb06e40cb003ce21e3 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Mon, 26 Nov 2018 18:20:29 -0500 Subject: Make ewram symbols static too --- common_syms/fame_checker.txt | 2 +- src/fame_checker.c | 262 +++++++++++++++++++++---------------------- 2 files changed, 132 insertions(+), 132 deletions(-) diff --git a/common_syms/fame_checker.txt b/common_syms/fame_checker.txt index 22330180e..a590c1cbb 100644 --- a/common_syms/fame_checker.txt +++ b/common_syms/fame_checker.txt @@ -1,2 +1,2 @@ -gUnknown_3005EB0 +gFameChecker_ListMenuTemplate gUnknown_3005EC8 diff --git a/src/fame_checker.c b/src/fame_checker.c index b2fe20c9b..e15768e4b 100644 --- a/src/fame_checker.c +++ b/src/fame_checker.c @@ -53,14 +53,14 @@ struct FameCheckerData u8 unk_23_2:1; }; -EWRAM_DATA u16 * gUnknown_203B0F0 = NULL; -EWRAM_DATA u16 * gUnknown_203B0F4 = NULL; -EWRAM_DATA u16 * gUnknown_203B0F8 = NULL; -EWRAM_DATA struct FameCheckerData * gUnknown_203B0FC = NULL; -EWRAM_DATA struct ListMenuItem * gUnknown_203B100 = NULL; -EWRAM_DATA s32 gUnknown_203B104 = 0; - -struct ListMenuTemplate gUnknown_3005EB0; +static EWRAM_DATA u16 * sBg3TilemapBuffer = NULL; +static EWRAM_DATA u16 * sBg1TilemapBuffer = NULL; +static EWRAM_DATA u16 * sBg2TilemapBuffer = NULL; +static EWRAM_DATA struct FameCheckerData * sFameCheckerData = NULL; +static EWRAM_DATA struct ListMenuItem * sListMenuItems = NULL; +static EWRAM_DATA s32 sLastMenuIdx = 0; + +struct ListMenuTemplate gFameChecker_ListMenuTemplate; u8 gUnknown_3005EC8; static void sub_812C3F8(void); @@ -499,12 +499,12 @@ static void sub_812C394(void) void UseFameChecker(MainCallback savedCallback) { SetVBlankCallback(NULL); - gUnknown_203B0FC = AllocZeroed(sizeof(struct FameCheckerData)); - gUnknown_203B0FC->savedCallback = savedCallback; - gUnknown_203B0FC->unk_09 = 0; - gUnknown_203B0FC->unk_0A = 0; - gUnknown_203B0FC->unk_0B = 0; - gUnknown_203B0FC->unk_23_0 = FALSE; + sFameCheckerData = AllocZeroed(sizeof(struct FameCheckerData)); + sFameCheckerData->savedCallback = savedCallback; + sFameCheckerData->unk_09 = 0; + sFameCheckerData->unk_0A = 0; + sFameCheckerData->unk_0B = 0; + sFameCheckerData->unk_23_0 = FALSE; PlaySE(SE_W202); SetMainCallback2(sub_812C3F8); } @@ -523,14 +523,14 @@ static void sub_812C3F8(void) gMain.state++; break; case 2: - gUnknown_203B0F0 = AllocZeroed(0x800); - gUnknown_203B0F4 = AllocZeroed(0x1000); - gUnknown_203B0F8 = AllocZeroed(0x800); + sBg3TilemapBuffer = AllocZeroed(0x800); + sBg1TilemapBuffer = AllocZeroed(0x1000); + sBg2TilemapBuffer = AllocZeroed(0x800); ResetBgsAndClearDma3BusyFlags(0); InitBgsFromTemplates(0, gUnknown_845FBF4, ARRAY_COUNT(gUnknown_845FBF4)); - SetBgTilemapBuffer(3, gUnknown_203B0F0); - SetBgTilemapBuffer(2, gUnknown_203B0F8); - SetBgTilemapBuffer(1, gUnknown_203B0F4); + SetBgTilemapBuffer(3, sBg3TilemapBuffer); + SetBgTilemapBuffer(2, sBg2TilemapBuffer); + SetBgTilemapBuffer(1, sBg1TilemapBuffer); sub_812D594(); gMain.state++; break; @@ -561,7 +561,7 @@ static void sub_812C3F8(void) InitWindows(gUnknown_845FC04); DeactivateAllTextPrinters(); sub_812CEC0(); - gUnknown_203B100 = AllocZeroed(17 * sizeof(struct ListMenuItem)); + sListMenuItems = AllocZeroed(17 * sizeof(struct ListMenuItem)); sub_812DB28(); gMain.state++; break; @@ -578,7 +578,7 @@ static void sub_812C3F8(void) SetGpuReg(REG_OFFSET_BLDALPHA, 0x07); SetGpuReg(REG_OFFSET_BLDY, 0x08); SetVBlankCallback(sub_812C380); - gUnknown_203B0FC->unk_04 = 0; + sFameCheckerData->unk_04 = 0; sub_812E000(); sub_812E178(1, 4); CreateTask(sub_812C664, 0x08); @@ -609,7 +609,7 @@ static void sub_812C694(u8 taskId) if (FindTaskIdByFunc(sub_812E110) == 0xFF) { RunTextPrinters(); - if ((PRESSED(SELECT_BUTTON)) && !gUnknown_203B0FC->unk_07_1 && gUnknown_203B0FC->savedCallback != sub_8107EB8) + if ((PRESSED(SELECT_BUTTON)) && !sFameCheckerData->unk_07_1 && sFameCheckerData->savedCallback != sub_8107EB8) task->func = sub_812CF3C; else if (PRESSED(START_BUTTON)) { @@ -618,7 +618,7 @@ static void sub_812C694(u8 taskId) { PlaySE(SE_W100); } - else if (r4 != gUnknown_203B0FC->unk_07_2 - 1) + else if (r4 != sFameCheckerData->unk_07_2 - 1) { PlaySE(SE_W100); FillWindowPixelRect(3, 0x00, 0, 0, 88, 32); @@ -626,7 +626,7 @@ static void sub_812C694(u8 taskId) sub_812E178(2, 4); sub_812E178(1, 5); sub_812D0F4(1); - task->data[2] = sub_812D888(gUnknown_203B0FC->unlockedPersons[r4]); + task->data[2] = sub_812D888(sFameCheckerData->unlockedPersons[r4]); gSprites[task->data[2]].pos2.x = 0xF0; gSprites[task->data[2]].data[0] = 1; task->data[3] = sub_812D7E4(); @@ -638,26 +638,26 @@ static void sub_812C694(u8 taskId) else if (PRESSED(A_BUTTON)) { r4 = ListMenuHandleInput(0); - if (r4 == gUnknown_203B0FC->unk_07_2 - 1) + if (r4 == sFameCheckerData->unk_07_2 - 1) task->func = sub_812CF3C; - else if (gUnknown_203B0FC->unk_07_1) + else if (sFameCheckerData->unk_07_1) { if (!IsTextPrinterActive(2) && sub_812D6B4() == TRUE) sub_812CD3C(); } - else if (gUnknown_203B0FC->unk_07_0) + else if (sFameCheckerData->unk_07_0) { PlaySE(SE_SELECT); task->data[0] = sub_812D724(task->data[1]); for (r4_2 = 0; r4_2 < 6; r4_2++) { if (r4_2 != task->data[1]) - sub_812CEFC(gUnknown_203B0FC->spriteIds[r4_2], ST_OAM_OBJ_BLEND); + sub_812CEFC(sFameCheckerData->spriteIds[r4_2], ST_OAM_OBJ_BLEND); } gUnknown_3005EC8 = 0xFF; sub_812E4A4(0); sub_812D0F4(2); - if (gSprites[gUnknown_203B0FC->spriteIds[task->data[1]]].data[1] != 0xFF) + if (gSprites[sFameCheckerData->spriteIds[task->data[1]]].data[1] != 0xFF) { sub_812CE04(taskId); sub_812DA14(data[1]); @@ -679,7 +679,7 @@ static void sub_812C694(u8 taskId) static bool8 sub_812C8F8(u8 taskId) { struct Task *task = &gTasks[taskId]; - if (gUnknown_203B0FC->unk_07_1) + if (sFameCheckerData->unk_07_1) { gSprites[task->data[2]].data[0] = 2; gSprites[task->data[2]].pos2.x += 10; @@ -688,7 +688,7 @@ static bool8 sub_812C8F8(u8 taskId) sub_812CE9C(); task->func = sub_812CA1C; sub_812C990(); - gUnknown_203B0FC->unk_23_2 = FALSE; + sFameCheckerData->unk_23_2 = FALSE; return TRUE; } return FALSE; @@ -705,7 +705,7 @@ static void sub_812C9BC(u8 taskId) if (gSprites[task->data[2]].data[0] == 0) { sub_812CD3C(); - gUnknown_203B0FC->unk_07_1 = TRUE; + sFameCheckerData->unk_07_1 = TRUE; task->func = sub_812C694; } else @@ -721,11 +721,11 @@ static void sub_812CA1C(u8 taskId) ChangeBgX(1, 0x000, 0); if (gSprites[task->data[2]].data[0] == 0) { - if (gUnknown_203B0FC->unk_07_0) + if (sFameCheckerData->unk_07_0) sub_812D0F4(0); sub_812E178(1, 4); sub_812E178(2, 2); - gUnknown_203B0FC->unk_07_1 = FALSE; + sFameCheckerData->unk_07_1 = FALSE; sub_812D9A8(taskId, sub_812E064()); task->func = sub_812C694; gSprites[task->data[3]].callback = sub_812D800; @@ -740,7 +740,7 @@ static void sub_812CAD8(u8 taskId) RunTextPrinters(); if (PRESSED(A_BUTTON) && !IsTextPrinterActive(2)) { - u8 spriteId = gUnknown_203B0FC->spriteIds[data[1]]; + u8 spriteId = sFameCheckerData->spriteIds[data[1]]; if (gSprites[spriteId].data[1] != 0xFF) sub_812CE04(taskId); } @@ -749,7 +749,7 @@ static void sub_812CAD8(u8 taskId) u8 r4; PlaySE(SE_SELECT); for (r4 = 0; r4 < 6; r4++) - sub_812CEFC(gUnknown_203B0FC->spriteIds[r4], ST_OAM_OBJ_NORMAL); + sub_812CEFC(sFameCheckerData->spriteIds[r4], ST_OAM_OBJ_NORMAL); sub_812CE9C(); gSprites[task->data[0]].callback = sub_812D764; if (gUnknown_3005EC8 != 0xFF) @@ -809,10 +809,10 @@ static void sub_812CC68(u8 taskId, s8 dx, s8 dy) gSprites[data[0]].pos1.x += dx; gSprites[data[0]].pos1.y += dy; for (i = 0; i < 6; i++) - sub_812CEFC(gUnknown_203B0FC->spriteIds[i], ST_OAM_OBJ_BLEND); + sub_812CEFC(sFameCheckerData->spriteIds[i], ST_OAM_OBJ_BLEND); FillWindowPixelRect(2, 0x11, 0, 0, 0xd0, 0x20); sub_812C990(); - if (sub_812CEFC(gUnknown_203B0FC->spriteIds[data[1]], ST_OAM_OBJ_NORMAL) == TRUE) + if (sub_812CEFC(sFameCheckerData->spriteIds[data[1]], ST_OAM_OBJ_NORMAL) == TRUE) { sub_812CE04(taskId); sub_812DA14(data[1]); @@ -825,7 +825,7 @@ static void sub_812CD3C(void) { u8 r8 = 0; u16 r6 = sub_812E064(); - if (gSaveBlock1Ptr->fameChecker[gUnknown_203B0FC->unlockedPersons[r6]].unk_0_0 != 2) + if (gSaveBlock1Ptr->fameChecker[sFameCheckerData->unlockedPersons[r6]].unk_0_0 != 2) { sub_812CE9C(); sub_812C990(); @@ -835,7 +835,7 @@ static void sub_812CD3C(void) FillWindowPixelRect(2, 0x11, 0, 0, 0xd0, 0x20); if (sub_812D6B4() == TRUE) r8 = 16; - StringExpandPlaceholders(gStringVar4, gUnknown_845F63C[gUnknown_203B0FC->unlockedPersons[r6] + r8]); + StringExpandPlaceholders(gStringVar4, gUnknown_845F63C[sFameCheckerData->unlockedPersons[r6] + r8]); AddTextPrinterParametrized(2, 2, gStringVar4, sub_80F78A8(), NULL, 2, 1, 3); sub_812CEE0(2); } @@ -846,7 +846,7 @@ static void sub_812CE04(u8 taskId) s16 *data = gTasks[taskId].data; u16 r5 = sub_812E064(); FillWindowPixelRect(2, 0x11, 0, 0, 0xd0, 0x20); - StringExpandPlaceholders(gStringVar4, gUnknown_845F6BC[gUnknown_203B0FC->unlockedPersons[r5] * 6 + data[1]]); + StringExpandPlaceholders(gStringVar4, gUnknown_845F6BC[sFameCheckerData->unlockedPersons[r5] * 6 + data[1]]); AddTextPrinterParametrized(2, 2, gStringVar4, sub_80F78A8(), NULL, 2, 1, 3); sub_812CEE0(2); } @@ -894,7 +894,7 @@ static void sub_812CF7C(u8 taskId) if (!gPaletteFade.active) { - if (gUnknown_203B0FC->unk_07_1) + if (sFameCheckerData->unk_07_1) { sub_812D9A8(taskId, sub_812E064()); FreeSpriteOamMatrix(&gSprites[gTasks[taskId].data[3]]); @@ -902,20 +902,20 @@ static void sub_812CF7C(u8 taskId) } for (r4 = 0; r4 < 6; r4++) { - DestroySprite(&gSprites[gUnknown_203B0FC->spriteIds[r4]]); + DestroySprite(&gSprites[sFameCheckerData->spriteIds[r4]]); } sub_812D814(); sub_812D7C8(); sub_812D70C(); sub_812D770(); sub_812E048(); - SetMainCallback2(gUnknown_203B0FC->savedCallback); - sub_810713C(gUnknown_203B0FC->scrollIndicatorArrowObjectTaskId, 0, 0); - Free(gUnknown_203B0F0); - Free(gUnknown_203B0F4); - Free(gUnknown_203B0F8); - Free(gUnknown_203B0FC); - Free(gUnknown_203B100); + SetMainCallback2(sFameCheckerData->savedCallback); + sub_810713C(sFameCheckerData->scrollIndicatorArrowObjectTaskId, 0, 0); + Free(sBg3TilemapBuffer); + Free(sBg1TilemapBuffer); + Free(sBg2TilemapBuffer); + Free(sFameCheckerData); + Free(sListMenuItems); sub_812D094(0); sub_812D094(1); sub_812D094(2); @@ -966,7 +966,7 @@ static void sub_812D174(void) u8 r4; for (r4 = 0; r4 < 6; r4++) { - DestroySprite(&gSprites[gUnknown_203B0FC->spriteIds[r4]]); + DestroySprite(&gSprites[sFameCheckerData->spriteIds[r4]]); } } @@ -977,10 +977,10 @@ static bool8 sub_812D1A8(u8 a0) u8 r6; for (r6 = 0; r6 < 6; r6++) { - if ((gSaveBlock1Ptr->fameChecker[gUnknown_203B0FC->unlockedPersons[a0]].unk_0_2 >> r6) & 1) + if ((gSaveBlock1Ptr->fameChecker[sFameCheckerData->unlockedPersons[a0]].unk_0_2 >> r6) & 1) { - gUnknown_203B0FC->spriteIds[r6] = sub_805EB44( - gUnknown_845F83C[gUnknown_203B0FC->unlockedPersons[a0] * 6 + r6], + sFameCheckerData->spriteIds[r6] = sub_805EB44( + gUnknown_845F83C[sFameCheckerData->unlockedPersons[a0] * 6 + r6], r6, 47 * (r6 % 3) + 0x72, 27 * (r6 / 3) + 0x2F @@ -989,24 +989,24 @@ static bool8 sub_812D1A8(u8 a0) } else { - gUnknown_203B0FC->spriteIds[r6] = sub_812D780( + sFameCheckerData->spriteIds[r6] = sub_812D780( 47 * (r6 % 3) + 0x72, 27 * (r6 / 3) + 0x1F ); - gSprites[gUnknown_203B0FC->spriteIds[r6]].data[1] = 0xFF; + gSprites[sFameCheckerData->spriteIds[r6]].data[1] = 0xFF; } } if (r5 == TRUE) { - gUnknown_203B0FC->unk_07_0 = TRUE; - if (gUnknown_203B0FC->unk_07_1) + sFameCheckerData->unk_07_0 = TRUE; + if (sFameCheckerData->unk_07_1) sub_812D0F4(TRUE); else sub_812D0F4(FALSE); } else { - gUnknown_203B0FC->unk_07_0 = FALSE; + sFameCheckerData->unk_07_0 = FALSE; sub_812D0F4(TRUE); } return r5; @@ -1119,7 +1119,7 @@ static void sub_812D650(void) static bool8 sub_812D6B4(void) { u8 r2; - u8 r1 = gUnknown_203B0FC->unlockedPersons[sub_812E064()]; + u8 r1 = sFameCheckerData->unlockedPersons[sub_812E064()]; for (r2 = 0; r2 < 6; r2++) { if (!((gSaveBlock1Ptr->fameChecker[r1].unk_0_2 >> r2) & 1)) @@ -1249,12 +1249,12 @@ static void sub_812D9A8(u8 taskId, u16 a1) { s16 * data = gTasks[taskId].data; u16 r1 = a1; - if (a1 == gUnknown_203B0FC->unk_07_2 - 1) + if (a1 == sFameCheckerData->unk_07_2 - 1) r1 = a1 - 1; - if ( gUnknown_203B0FC->unlockedPersons[r1] == 1 - || gUnknown_203B0FC->unlockedPersons[r1] == 14 - || gUnknown_203B0FC->unlockedPersons[r1] == 0 - || gUnknown_203B0FC->unlockedPersons[r1] == 13 + if ( sFameCheckerData->unlockedPersons[r1] == 1 + || sFameCheckerData->unlockedPersons[r1] == 14 + || sFameCheckerData->unlockedPersons[r1] == 0 + || sFameCheckerData->unlockedPersons[r1] == 13 ) DestroySprite(&gSprites[data[2]]); else @@ -1264,7 +1264,7 @@ static void sub_812D9A8(u8 taskId, u16 a1) static void sub_812DA14(u8 a0) { s32 width; - u32 r5 = 6 * gUnknown_203B0FC->unlockedPersons[sub_812E064()] + a0; + u32 r5 = 6 * sFameCheckerData->unlockedPersons[sub_812E064()] + a0; sub_812E094(1); gUnknown_3005EC8 = 1; FillWindowPixelRect(3, 0x00, 0, 0, 0x58, 0x20); @@ -1285,31 +1285,31 @@ static void sub_812DB10(void) static void sub_812DB28(void) { sub_812DB64(); - gUnknown_203B0FC->unk_07_2 = sub_812DEF0(); - gUnknown_203B0FC->scrollIndicatorArrowObjectTaskId = ListMenuInit(&gUnknown_3005EB0, 0, 0); + sFameCheckerData->unk_07_2 = sub_812DEF0(); + sFameCheckerData->scrollIndicatorArrowObjectTaskId = ListMenuInit(&gFameChecker_ListMenuTemplate, 0, 0); sub_812DFE4(0); } static void sub_812DB64(void) { - gUnknown_3005EB0.items = gUnknown_203B100; - gUnknown_3005EB0.moveCursorFunc = sub_812DBC0; - gUnknown_3005EB0.itemPrintFunc = NULL; - gUnknown_3005EB0.totalItems = 1; - gUnknown_3005EB0.maxShowed = 1; - gUnknown_3005EB0.windowId = 0; - gUnknown_3005EB0.header_X = 0; - gUnknown_3005EB0.item_X = 8; - gUnknown_3005EB0.cursor_X = 0; - gUnknown_3005EB0.upText_Y = 4; - gUnknown_3005EB0.cursorPal = 2; - gUnknown_3005EB0.fillValue = 0; - gUnknown_3005EB0.cursorShadowPal = 3; - gUnknown_3005EB0.lettersSpacing = 0; - gUnknown_3005EB0.itemVerticalPadding = 0; - gUnknown_3005EB0.scrollMultiple = 0; - gUnknown_3005EB0.fontId = 2; - gUnknown_3005EB0.cursorKind = 0; + gFameChecker_ListMenuTemplate.items = sListMenuItems; + gFameChecker_ListMenuTemplate.moveCursorFunc = sub_812DBC0; + gFameChecker_ListMenuTemplate.itemPrintFunc = NULL; + gFameChecker_ListMenuTemplate.totalItems = 1; + gFameChecker_ListMenuTemplate.maxShowed = 1; + gFameChecker_ListMenuTemplate.windowId = 0; + gFameChecker_ListMenuTemplate.header_X = 0; + gFameChecker_ListMenuTemplate.item_X = 8; + gFameChecker_ListMenuTemplate.cursor_X = 0; + gFameChecker_ListMenuTemplate.upText_Y = 4; + gFameChecker_ListMenuTemplate.cursorPal = 2; + gFameChecker_ListMenuTemplate.fillValue = 0; + gFameChecker_ListMenuTemplate.cursorShadowPal = 3; + gFameChecker_ListMenuTemplate.lettersSpacing = 0; + gFameChecker_ListMenuTemplate.itemVerticalPadding = 0; + gFameChecker_ListMenuTemplate.scrollMultiple = 0; + gFameChecker_ListMenuTemplate.fontId = 2; + gFameChecker_ListMenuTemplate.cursorKind = 0; } static void sub_812DBC0(s32 itemIndex, bool8 onInit, struct ListMenu *list) @@ -1317,8 +1317,8 @@ static void sub_812DBC0(s32 itemIndex, bool8 onInit, struct ListMenu *list) u16 sp8; u8 taskId; u16 r9; - gUnknown_203B104 = 0; - r9 = gUnknown_203B0FC->unk_0A + gUnknown_203B0FC->unk_0B; + sLastMenuIdx = 0; + r9 = sFameCheckerData->unk_0A + sFameCheckerData->unk_0B; sub_812DDF0(itemIndex, onInit); taskId = FindTaskIdByFunc(sub_812C694); if (taskId != 0xFF) @@ -1326,24 +1326,24 @@ static void sub_812DBC0(s32 itemIndex, bool8 onInit, struct ListMenu *list) struct Task *task = &gTasks[taskId]; PlaySE(SE_SELECT); task->data[1] = 0; - get_coro_args_x18_x1A(gUnknown_203B0FC->scrollIndicatorArrowObjectTaskId, &sp8, NULL); - gUnknown_203B0FC->unk_04 = sp8; - if (itemIndex != gUnknown_203B0FC->unk_07_2 - 1) + get_coro_args_x18_x1A(sFameCheckerData->scrollIndicatorArrowObjectTaskId, &sp8, NULL); + sFameCheckerData->unk_04 = sp8; + if (itemIndex != sFameCheckerData->unk_07_2 - 1) { sub_812D174(); sub_812D1A8(itemIndex); - if (gUnknown_203B0FC->unk_07_1) + if (sFameCheckerData->unk_07_1) { - if (!gUnknown_203B0FC->unk_23_2) + if (!sFameCheckerData->unk_23_2) { sub_812D9A8(taskId, r9); - gUnknown_203B104 = itemIndex; + sLastMenuIdx = itemIndex; task->func = sub_812DD50; } else { gSprites[task->data[2]].invisible = FALSE; - gUnknown_203B0FC->unk_23_2 = FALSE; + sFameCheckerData->unk_23_2 = FALSE; gSprites[task->data[2]].data[0] = 0; sub_812CD3C(); } @@ -1357,17 +1357,17 @@ static void sub_812DBC0(s32 itemIndex, bool8 onInit, struct ListMenu *list) else { sub_812DDAC(); - if (gUnknown_203B0FC->unk_07_1) + if (sFameCheckerData->unk_07_1) { gSprites[task->data[2]].invisible = TRUE; - gUnknown_203B0FC->unk_23_2 = TRUE; + sFameCheckerData->unk_23_2 = TRUE; } else { u8 r2; for (r2 = 0; r2 < 6; r2++) { - gSprites[gUnknown_203B0FC->spriteIds[r2]].invisible = TRUE; + gSprites[sFameCheckerData->spriteIds[r2]].invisible = TRUE; } } } @@ -1377,7 +1377,7 @@ static void sub_812DBC0(s32 itemIndex, bool8 onInit, struct ListMenu *list) static void sub_812DD50(u8 taskId) { struct Task * task = &gTasks[taskId]; - task->data[2] = sub_812D888(gUnknown_203B0FC->unlockedPersons[gUnknown_203B104]); + task->data[2] = sub_812D888(sFameCheckerData->unlockedPersons[sLastMenuIdx]); gSprites[task->data[2]].data[0] = 0; sub_812CD3C(); task->func = sub_812C694; @@ -1395,21 +1395,21 @@ static void sub_812DDF0(s32 itemIndex, bool8 onInit) u16 sp14; u16 sp16; u16 r6; - get_coro_args_x18_x1A(gUnknown_203B0FC->scrollIndicatorArrowObjectTaskId, &sp14, &sp16); + get_coro_args_x18_x1A(sFameCheckerData->scrollIndicatorArrowObjectTaskId, &sp14, &sp16); r6 = sp14 + sp16; - AddTextPrinterParametrized2(0, 2, 8, 14 * sp16 + 4, 0, 0, &gUnknown_845F5E6, 0, gUnknown_203B100[itemIndex].unk_00); + AddTextPrinterParametrized2(0, 2, 8, 14 * sp16 + 4, 0, 0, &gUnknown_845F5E6, 0, sListMenuItems[itemIndex].unk_00); if (!onInit) { - if (sp14 < gUnknown_203B0FC->unk_0A) - gUnknown_203B0FC->unk_0B++; - else if (sp14 > gUnknown_203B0FC->unk_0A && r6 != gUnknown_203B0FC->unk_07_2 - 1) - gUnknown_203B0FC->unk_0B--; - AddTextPrinterParametrized2(0, 2, 8, 14 * gUnknown_203B0FC->unk_0B + 4, 0, 0, &gUnknown_845F5E3, 0, gUnknown_203B100[gUnknown_203B0FC->unk_09].unk_00); + if (sp14 < sFameCheckerData->unk_0A) + sFameCheckerData->unk_0B++; + else if (sp14 > sFameCheckerData->unk_0A && r6 != sFameCheckerData->unk_07_2 - 1) + sFameCheckerData->unk_0B--; + AddTextPrinterParametrized2(0, 2, 8, 14 * sFameCheckerData->unk_0B + 4, 0, 0, &gUnknown_845F5E3, 0, sListMenuItems[sFameCheckerData->unk_09].unk_00); } - gUnknown_203B0FC->unk_09 = itemIndex; - gUnknown_203B0FC->unk_0B = sp16; - gUnknown_203B0FC->unk_0A = sp14; + sFameCheckerData->unk_09 = itemIndex; + sFameCheckerData->unk_0B = sp16; + sFameCheckerData->unk_0A = sp14; } static u8 sub_812DEF0(void) @@ -1424,27 +1424,27 @@ static u8 sub_812DEF0(void) { if (gUnknown_845F5EA[r5] < 0xFE00) { - gUnknown_203B100[r4].unk_00 = gTrainers[gUnknown_845F5EA[r5]].trainerName; - gUnknown_203B100[r4].unk_04 = r4; + sListMenuItems[r4].unk_00 = gTrainers[gUnknown_845F5EA[r5]].trainerName; + sListMenuItems[r4].unk_04 = r4; } else { - gUnknown_203B100[r4].unk_00 = gUnknown_845F60C[gUnknown_845F5EA[r5] - 0xFE00]; - gUnknown_203B100[r4].unk_04 = r4; + sListMenuItems[r4].unk_00 = gUnknown_845F60C[gUnknown_845F5EA[r5] - 0xFE00]; + sListMenuItems[r4].unk_04 = r4; } - gUnknown_203B0FC->unlockedPersons[r4] = r5; + sFameCheckerData->unlockedPersons[r4] = r5; r4++; } } - gUnknown_203B100[r4].unk_00 = gUnknown_84161C1; - gUnknown_203B100[r4].unk_04 = r4; - gUnknown_203B0FC->unlockedPersons[r4] = 0xFF; + sListMenuItems[r4].unk_00 = gUnknown_84161C1; + sListMenuItems[r4].unk_04 = r4; + sFameCheckerData->unlockedPersons[r4] = 0xFF; r4++; - gUnknown_3005EB0.totalItems = r4; + gFameChecker_ListMenuTemplate.totalItems = r4; if (r4 < 5) - gUnknown_3005EB0.maxShowed = r4; + gFameChecker_ListMenuTemplate.maxShowed = r4; else - gUnknown_3005EB0.maxShowed = 5; + gFameChecker_ListMenuTemplate.maxShowed = 5; return r4; } @@ -1471,30 +1471,30 @@ static void sub_812E000(void) 0 }; - if (gUnknown_203B0FC->unk_07_2 > 5) + if (sFameCheckerData->unk_07_2 > 5) { sp0.unk_06 = 0; - sp0.unk_08 = gUnknown_203B0FC->unk_07_2 - 5; - gUnknown_203B0FC->unk_06 = AddScrollIndicatorArrowPair(&sp0, &gUnknown_203B0FC->unk_04); + sp0.unk_08 = sFameCheckerData->unk_07_2 - 5; + sFameCheckerData->unk_06 = AddScrollIndicatorArrowPair(&sp0, &sFameCheckerData->unk_04); } } static void sub_812E048(void) { - if (gUnknown_203B0FC->unk_07_2 > 5) - RemoveScrollIndicatorArrowPair(gUnknown_203B0FC->unk_06); + if (sFameCheckerData->unk_07_2 > 5) + RemoveScrollIndicatorArrowPair(sFameCheckerData->unk_06); } static u16 sub_812E064(void) { u16 sp0, sp2; - get_coro_args_x18_x1A(gUnknown_203B0FC->scrollIndicatorArrowObjectTaskId, &sp0, &sp2); + get_coro_args_x18_x1A(sFameCheckerData->scrollIndicatorArrowObjectTaskId, &sp0, &sp2); return sp0 + sp2; } static void sub_812E094(u8 a0) { - if (gUnknown_203B0FC->unk_23_0 != a0) + if (sFameCheckerData->unk_23_0 != a0) { u8 taskId = FindTaskIdByFunc(sub_812E110); if (taskId == 0xFF) @@ -1504,12 +1504,12 @@ static void sub_812E094(u8 a0) if (a0 == TRUE) { gTasks[taskId].data[2] = 1; - gUnknown_203B0FC->unk_23_0 = TRUE; + sFameCheckerData->unk_23_0 = TRUE; } else { gTasks[taskId].data[2] = 4; - gUnknown_203B0FC->unk_23_0 = FALSE; + sFameCheckerData->unk_23_0 = FALSE; } } } @@ -1601,7 +1601,7 @@ static void sub_812E178(u8 bg, s16 a1) static void sub_812E4A4(u8 a0) { - u16 cursorY = ListMenuGetYCoordForPrintingArrowCursor(gUnknown_203B0FC->scrollIndicatorArrowObjectTaskId); + u16 cursorY = ListMenuGetYCoordForPrintingArrowCursor(sFameCheckerData->scrollIndicatorArrowObjectTaskId); if (a0 == 1) AddTextPrinterParametrized2(0, 2, 0, cursorY, 0, 0, &gUnknown_845F5E3, 0, gUnknown_841623B); else -- cgit v1.2.3 From de72615a5428c5996b5c92d368cfb350816ed51e Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Mon, 26 Nov 2018 18:22:57 -0500 Subject: This is a sprite tag right here --- src/fame_checker.c | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/src/fame_checker.c b/src/fame_checker.c index e15768e4b..3b5576923 100644 --- a/src/fame_checker.c +++ b/src/fame_checker.c @@ -29,6 +29,7 @@ #define SPRITETAG_1000 1000 #define SPRITETAG_1001 1001 #define SPRITETAG_1002 1002 +#define SPRITETAG_1004 1004 #define SPRITETAG_1006 1006 #define SPRITETAG_1007 1007 #define SPRITETAG_1008 1008 @@ -1457,18 +1458,18 @@ static void sub_812DFE4(u8 windowId) static void sub_812E000(void) { struct ScrollIndicatorArrowPairTemplate sp0 = { - 2, - 40, - 26, - 3, - 40, - 100, - 0, - 0, - 1004, - 0xFFFF, - 1, - 0 + 2, + 40, + 26, + 3, + 40, + 100, + 0, + 0, + SPRITETAG_1004, + 0xFFFF, + 1, + 0 }; if (sFameCheckerData->unk_07_2 > 5) -- cgit v1.2.3 From b21c50675b8b143608b39b26b53788e4807bbc9e Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Mon, 26 Nov 2018 18:24:17 -0500 Subject: PRESSED-->JOY_NEW, PUSHED-->JOY_HELD --- include/global.h | 4 ++-- src/fame_checker.c | 18 +++++++++--------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/include/global.h b/include/global.h index 2b9b00d5c..84597dba0 100644 --- a/include/global.h +++ b/include/global.h @@ -68,8 +68,8 @@ // GameFreak never ceases to amaze. // TODO: Propagate use of this macro #define TEST_BUTTON(field, button) ({(field) & (button);}) -#define PRESSED(button) TEST_BUTTON(gMain.newKeys, button) -#define PUSHED(button) TEST_BUTTON(gMain.heldKeys, button) +#define JOY_NEW(button) TEST_BUTTON(gMain.newKeys, button) +#define JOY_HELD(button) TEST_BUTTON(gMain.heldKeys, button) extern u8 gStringVar1[]; extern u8 gStringVar2[]; diff --git a/src/fame_checker.c b/src/fame_checker.c index 3b5576923..8150c58ef 100644 --- a/src/fame_checker.c +++ b/src/fame_checker.c @@ -610,9 +610,9 @@ static void sub_812C694(u8 taskId) if (FindTaskIdByFunc(sub_812E110) == 0xFF) { RunTextPrinters(); - if ((PRESSED(SELECT_BUTTON)) && !sFameCheckerData->unk_07_1 && sFameCheckerData->savedCallback != sub_8107EB8) + if ((JOY_NEW(SELECT_BUTTON)) && !sFameCheckerData->unk_07_1 && sFameCheckerData->savedCallback != sub_8107EB8) task->func = sub_812CF3C; - else if (PRESSED(START_BUTTON)) + else if (JOY_NEW(START_BUTTON)) { r4 = sub_812E064(); if (sub_812C8F8(taskId) == TRUE) @@ -636,7 +636,7 @@ static void sub_812C694(u8 taskId) task->func = sub_812C9BC; } } - else if (PRESSED(A_BUTTON)) + else if (JOY_NEW(A_BUTTON)) { r4 = ListMenuHandleInput(0); if (r4 == sFameCheckerData->unk_07_2 - 1) @@ -667,7 +667,7 @@ static void sub_812C694(u8 taskId) task->func = sub_812CAD8; } } - else if (PRESSED(B_BUTTON)) + else if (JOY_NEW(B_BUTTON)) { if (sub_812C8F8(taskId) != TRUE) task->func = sub_812CF3C; @@ -739,13 +739,13 @@ static void sub_812CAD8(u8 taskId) s16 *data = gTasks[taskId].data; RunTextPrinters(); - if (PRESSED(A_BUTTON) && !IsTextPrinterActive(2)) + if (JOY_NEW(A_BUTTON) && !IsTextPrinterActive(2)) { u8 spriteId = sFameCheckerData->spriteIds[data[1]]; if (gSprites[spriteId].data[1] != 0xFF) sub_812CE04(taskId); } - if (PRESSED(B_BUTTON)) + if (JOY_NEW(B_BUTTON)) { u8 r4; PlaySE(SE_SELECT); @@ -761,7 +761,7 @@ static void sub_812CAD8(u8 taskId) sub_812C990(); task->func = sub_812C694; } - else if (PRESSED(DPAD_UP) || PRESSED(DPAD_DOWN)) + else if (JOY_NEW(DPAD_UP) || JOY_NEW(DPAD_DOWN)) { if (task->data[1] >= 3) { @@ -774,7 +774,7 @@ static void sub_812CAD8(u8 taskId) sub_812CC68(taskId, 0, +0x1b); } } - else if (PRESSED(DPAD_LEFT)) + else if (JOY_NEW(DPAD_LEFT)) { if (task->data[1] == 0 || task->data[1] % 3 == 0) { @@ -787,7 +787,7 @@ static void sub_812CAD8(u8 taskId) sub_812CC68(taskId, -0x2f, 0); } } - else if (PRESSED(DPAD_RIGHT)) + else if (JOY_NEW(DPAD_RIGHT)) { if ((task->data[1] + 1) % 3 == 0) { -- cgit v1.2.3 From 7e684b32f108bc484f3f8ba66b209d3f633e8acd Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Mon, 26 Nov 2018 22:27:19 -0500 Subject: More documentation of fame checker --- asm/item_menu.s | 6 +- asm/item_use.s | 24 ++--- asm/start_menu.s | 4 +- asm/teachy_tv.s | 4 +- charmap.txt | 6 ++ data/data_83FECCC.s | 6 +- data/fame_checker/img_845cf00.png | Bin 240 -> 297 bytes include/fame_checker.h | 19 ++++ include/item_menu.h | 2 +- src/fame_checker.c | 211 ++++++++++++++++---------------------- 10 files changed, 139 insertions(+), 143 deletions(-) diff --git a/asm/item_menu.s b/asm/item_menu.s index 5ad6b8b5c..16d1cfce2 100644 --- a/asm/item_menu.s +++ b/asm/item_menu.s @@ -138,8 +138,8 @@ _08107EB0: .4byte gUnknown_203AD10 _08107EB4: .4byte gUnknown_203ACFC thumb_func_end sub_8107DB4 - thumb_func_start sub_8107EB8 -sub_8107EB8: @ 8107EB8 + thumb_func_start UseFameCheckerFromMenu +UseFameCheckerFromMenu: @ 8107EB8 push {lr} ldr r2, _08107EC8 @ =sub_80568A8 movs r0, 0 @@ -149,7 +149,7 @@ sub_8107EB8: @ 8107EB8 bx r0 .align 2, 0 _08107EC8: .4byte sub_80568A8 - thumb_func_end sub_8107EB8 + thumb_func_end UseFameCheckerFromMenu thumb_func_start sub_8107ECC sub_8107ECC: @ 8107ECC diff --git a/asm/item_use.s b/asm/item_use.s index 49d517eb5..f653247d9 100644 --- a/asm/item_use.s +++ b/asm/item_use.s @@ -320,7 +320,7 @@ sub_80A1208: @ 80A1208 ldr r0, _080A1224 @ =gUnknown_203AD30 ldrh r0, [r0] strh r0, [r1, 0x20] - ldr r1, _080A1228 @ =sub_8107EB8 + ldr r1, _080A1228 @ =UseFameCheckerFromMenu mov r0, sp movs r2, 0 bl sub_80BEBEC @@ -329,7 +329,7 @@ sub_80A1208: @ 80A1208 bx r0 .align 2, 0 _080A1224: .4byte gUnknown_203AD30 -_080A1228: .4byte sub_8107EB8 +_080A1228: .4byte UseFameCheckerFromMenu thumb_func_end sub_80A1208 thumb_func_start sub_80A122C @@ -1045,14 +1045,14 @@ _080A17D0: .4byte sub_80A17E8 thumb_func_start sub_80A17D4 sub_80A17D4: @ 80A17D4 push {lr} - ldr r1, _080A17E4 @ =sub_8107EB8 + ldr r1, _080A17E4 @ =UseFameCheckerFromMenu movs r0, 0 movs r2, 0 bl sub_81317F8 pop {r0} bx r0 .align 2, 0 -_080A17E4: .4byte sub_8107EB8 +_080A17E4: .4byte UseFameCheckerFromMenu thumb_func_end sub_80A17D4 thumb_func_start sub_80A17E8 @@ -1123,14 +1123,14 @@ _080A1868: .4byte sub_80A1880 thumb_func_start sub_80A186C sub_80A186C: @ 80A186C push {lr} - ldr r1, _080A187C @ =sub_8107EB8 + ldr r1, _080A187C @ =UseFameCheckerFromMenu movs r0, 0 movs r2, 0 bl sub_813CD50 pop {r0} bx r0 .align 2, 0 -_080A187C: .4byte sub_8107EB8 +_080A187C: .4byte UseFameCheckerFromMenu thumb_func_end sub_80A186C thumb_func_start sub_80A1880 @@ -1239,13 +1239,13 @@ _080A1948: .4byte sub_80A1960 thumb_func_start sub_80A194C sub_80A194C: @ 80A194C push {lr} - ldr r1, _080A195C @ =sub_8107EB8 + ldr r1, _080A195C @ =UseFameCheckerFromMenu movs r0, 0 bl sub_815ABC4 pop {r0} bx r0 .align 2, 0 -_080A195C: .4byte sub_8107EB8 +_080A195C: .4byte UseFameCheckerFromMenu thumb_func_end sub_80A194C thumb_func_start sub_80A1960 @@ -1646,13 +1646,13 @@ _080A1CA8: .4byte sub_80A1CC0 thumb_func_start sub_80A1CAC sub_80A1CAC: @ 80A1CAC push {lr} - ldr r1, _080A1CBC @ =sub_8107EB8 + ldr r1, _080A1CBC @ =UseFameCheckerFromMenu movs r0, 0 bl sub_80BFF50 pop {r0} bx r0 .align 2, 0 -_080A1CBC: .4byte sub_8107EB8 +_080A1CBC: .4byte UseFameCheckerFromMenu thumb_func_end sub_80A1CAC thumb_func_start sub_80A1CC0 @@ -1730,12 +1730,12 @@ _080A1D54: .4byte sub_80A1D68 thumb_func_start sub_80A1D58 sub_80A1D58: @ 80A1D58 push {lr} - ldr r0, _080A1D64 @ =sub_8107EB8 + ldr r0, _080A1D64 @ =UseFameCheckerFromMenu bl UseFameChecker pop {r0} bx r0 .align 2, 0 -_080A1D64: .4byte sub_8107EB8 +_080A1D64: .4byte UseFameCheckerFromMenu thumb_func_end sub_80A1D58 thumb_func_start sub_80A1D68 diff --git a/asm/start_menu.s b/asm/start_menu.s index 55dbb7357..43155b5da 100644 --- a/asm/start_menu.s +++ b/asm/start_menu.s @@ -911,14 +911,14 @@ _0806F498: bl play_some_sound bl sub_806EF18 bl sub_80563F0 - ldr r0, _0806F4B0 @ =sub_8107EB8 + ldr r0, _0806F4B0 @ =UseFameCheckerFromMenu bl SetMainCallback2 movs r0, 0x1 _0806F4AC: pop {r1} bx r1 .align 2, 0 -_0806F4B0: .4byte sub_8107EB8 +_0806F4B0: .4byte UseFameCheckerFromMenu thumb_func_end sub_806F480 thumb_func_start sub_806F4B4 diff --git a/asm/teachy_tv.s b/asm/teachy_tv.s index 55f403f8a..48f98a2b4 100644 --- a/asm/teachy_tv.s +++ b/asm/teachy_tv.s @@ -915,7 +915,7 @@ sub_815B2C0: @ 815B2C0 beq _0815B30A subs r0, r4, 0x6 ldr r1, [r0] - ldr r0, _0815B32C @ =sub_8107EB8 + ldr r0, _0815B32C @ =UseFameCheckerFromMenu cmp r1, r0 bne _0815B330 _0815B30A: @@ -932,7 +932,7 @@ _0815B31C: .4byte gTasks+0x8 _0815B320: .4byte gPaletteFade _0815B324: .4byte gUnknown_203F44A _0815B328: .4byte gMain -_0815B32C: .4byte sub_8107EB8 +_0815B32C: .4byte UseFameCheckerFromMenu _0815B330: movs r0, 0x5 bl PlaySE diff --git a/charmap.txt b/charmap.txt index 9441532b4..ad4062731 100644 --- a/charmap.txt +++ b/charmap.txt @@ -326,6 +326,12 @@ UNKNOWN_F7 = F7 UNKNOWN_F8 = F8 UNKNOWN_F9 = F9 +KEYGFX_A_BUTTON = F8 00 +KEYGFX_B_BUTTON = F8 01 +KEYGFX_START_BUTTON = F8 04 +KEYGFX_DPAD_UP_DOWN = F8 0A +KEYGFX_DPAD_ANY = F8 0C + STRING = FD @ string placeholders diff --git a/data/data_83FECCC.s b/data/data_83FECCC.s index 7c2d85f03..402cd6704 100644 --- a/data/data_83FECCC.s +++ b/data/data_83FECCC.s @@ -2091,13 +2091,13 @@ gUnknown_841E58D:: @ 841E58D .incbin "baserom.gba", 0x41E58D, 0x17 gUnknown_841E5A4:: @ 841E5A4 - .incbin "baserom.gba", 0x41E5A4, 0x15 + .string "{KEYGFX_START_BUTTON}PICK {KEYGFX_DPAD_UP_DOWN}SELECT {KEYGFX_A_BUTTON}OK$" gUnknown_841E5B9:: @ 841E5B9 - .incbin "baserom.gba", 0x41E5B9, 0x19 + .string "{KEYGFX_START_BUTTON}PICK {KEYGFX_DPAD_UP_DOWN}SELECT {KEYGFX_B_BUTTON}CANCEL$" gUnknown_841E5D2:: @ 841E5D2 - .string "{UNKNOWN_F8 0x0C}PICK {UNKNOWN_F8 0x00}READ {UNKNOWN_F8 0x01}CANCEL$" + .string "{KEYGFX_DPAD_ANY}PICK {KEYGFX_A_BUTTON}READ {UNKNOWN_F8 0x01}CANCEL$" gUnknown_841E5E9:: @ 841E5E9 .string "OAK$" diff --git a/data/fame_checker/img_845cf00.png b/data/fame_checker/img_845cf00.png index 2d25bb1b3..0d692439a 100644 Binary files a/data/fame_checker/img_845cf00.png and b/data/fame_checker/img_845cf00.png differ diff --git a/include/fame_checker.h b/include/fame_checker.h index 7e95a7224..bc653740e 100644 --- a/include/fame_checker.h +++ b/include/fame_checker.h @@ -3,6 +3,25 @@ #include "main.h" +enum { + FAMECHECKER_OAK, + FAMECHECKER_DAISY, + FAMECHECKER_BROCK, + FAMECHECKER_MISTY, + FAMECHECKER_LTSURGE, + FAMECHECKER_ERIKA, + FAMECHECKER_KOGA, + FAMECHECKER_SABRINA, + FAMECHECKER_BLAINE, + FAMECHECKER_LORELEI, + FAMECHECKER_BRUNO, + FAMECHECKER_AGATHA, + FAMECHECKER_LANCE, + FAMECHECKER_BILL, + FAMECHECKER_MRFUJI, + FAMECHECKER_GIOVANNI +}; + void ResetFameChecker(void); void UseFameChecker(MainCallback savedCallback); diff --git a/include/item_menu.h b/include/item_menu.h index 64cb2d762..2482aa51f 100644 --- a/include/item_menu.h +++ b/include/item_menu.h @@ -12,6 +12,6 @@ extern u16 gUnknown_203AD30; // Exported ROM declarations void sub_81AAC50(void); void sub_81AAC70(void); -void sub_8107EB8(void); +void UseFameCheckerFromMenu(void); #endif //GUARD_ITEM_MENU_H diff --git a/src/fame_checker.c b/src/fame_checker.c index 8150c58ef..2bff79146 100644 --- a/src/fame_checker.c +++ b/src/fame_checker.c @@ -25,6 +25,7 @@ #include "field_map_obj.h" #include "menu_indicators.h" #include "text_window.h" +#include "fame_checker.h" #define SPRITETAG_1000 1000 #define SPRITETAG_1001 1001 @@ -41,8 +42,8 @@ struct FameCheckerData u16 unk_04; u8 unk_06; u8 unk_07_0:1; - u8 unk_07_1:1; - u8 unk_07_2:6; + u8 inPickMode:1; + u8 numUnlockedPersons:6; u8 scrollIndicatorArrowObjectTaskId; u8 unk_09; u8 unk_0A; @@ -95,7 +96,7 @@ static void sub_812D70C(void); static u8 sub_812D724(s16 a0); static void sub_812D764(struct Sprite *sprite); static void sub_812D770(void); -static u8 sub_812D780(u8, u8); +static u8 PlaceQuestionMarkTile(u8, u8); static void sub_812D7C8(void); static u8 sub_812D7E4(void); static void sub_812D800(struct Sprite *sprite); @@ -115,7 +116,7 @@ static u8 sub_812DEF0(void); static void sub_812DFE4(u8); static void sub_812E000(void); static void sub_812E048(void); -static u16 sub_812E064(void); +static u16 FameCheckerGetCursorY(void); static void sub_812E094(u8); static void sub_812E110(u8 taskId); static void sub_812E178(u8 a0, s16 a1); @@ -125,28 +126,28 @@ extern const u8 gUnknown_84161C1[]; extern const u8 gUnknown_841623B[]; extern const u8 gUnknown_84181C3[]; extern const u8 gUnknown_84181E4[]; -extern const u8 gUnknown_841E5A4[]; -extern const u8 gUnknown_841E5B9[]; -extern const u8 gUnknown_841E5D2[]; -extern const u8 gUnknown_841E5E9[]; -extern const u8 gUnknown_841E5ED[]; -extern const u8 gUnknown_841E5F3[]; -extern const u8 gUnknown_841E5F8[]; - -static const u16 gUnknown_845C600[] = INCBIN_U16("data/fame_checker/tilemap_845c600.bin"); -static const u8 gUnknown_845CE00[] = INCBIN_U8("data/fame_checker/img_845ce00.4bpp"); -static const u8 gUnknown_845CF00[] = INCBIN_U8("data/fame_checker/img_845cf00.4bpp"); -static const u16 gUnknown_845D0E0[] = INCBIN_U16("data/fame_checker/pal_845d0e0.gbapal"); -static const u8 gUnknown_845D100[] = INCBIN_U8("data/fame_checker/img_845d100.4bpp"); -static const u16 gUnknown_845D500[] = INCBIN_U16("data/fame_checker/pal_845d500.gbapal"); -static const u8 gUnknown_845D520[] = INCBIN_U8("data/fame_checker/img_845d520.4bpp"); -static const u16 gUnknown_845DD20[] = INCBIN_U16("data/fame_checker/pal_845dd20.gbapal"); -static const u8 gUnknown_845DD40[] = INCBIN_U8("data/fame_checker/img_845dd40.4bpp"); -static const u16 gUnknown_845E540[] = INCBIN_U16("data/fame_checker/pal_845e540.gbapal"); -static const u8 gUnknown_845E560[] = INCBIN_U8("data/fame_checker/img_845e560.4bpp"); -static const u16 gUnknown_845ED60[] = INCBIN_U16("data/fame_checker/pal_845ed60.gbapal"); -static const u8 gUnknown_845ED80[] = INCBIN_U8("data/fame_checker/img_845ed80.4bpp"); -static const u16 gUnknown_845F580[] = INCBIN_U16("data/fame_checker/pal_845f580.gbapal"); +extern const u8 gUnknown_841E5A4[]; // "{KEYGFX_START_BUTTON}PICK {KEYGFX_DPAD_UP_DOWN}SELECT {KEYGFX_A_BUTTON}OK$" +extern const u8 gUnknown_841E5B9[]; // "{KEYGFX_START_BUTTON}PICK {KEYGFX_DPAD_UP_DOWN}SELECT {KEYGFX_B_BUTTON}CANCEL$" +extern const u8 gUnknown_841E5D2[]; // "{KEYGFX_DPAD_ANY}PICK {KEYGFX_A_BUTTON}READ {UNKNOWN_F8 0x01}CANCEL$" +extern const u8 gUnknown_841E5E9[]; // "OAK$" +extern const u8 gUnknown_841E5ED[]; // "DAISY$" +extern const u8 gUnknown_841E5F3[]; // "BILL$" +extern const u8 gUnknown_841E5F8[]; // "FUJI$" + +static const u16 sFameCheckerTilemap[] = INCBIN_U16("data/fame_checker/tilemap_845c600.bin"); +static const u8 sQuestionMarkSpriteGfx[] = INCBIN_U8("data/fame_checker/img_845ce00.4bpp"); +static const u8 sSpinningPokeballSpriteGfx[] = INCBIN_U8("data/fame_checker/img_845cf00.4bpp"); +static const u16 sSpinningPokeballSpritePalette[] = INCBIN_U16("data/fame_checker/pal_845d0e0.gbapal"); +static const u8 sSelectorCursorSpriteGfx[] = INCBIN_U8("data/fame_checker/img_845d100.4bpp"); +static const u16 sSelectorCursorSpritePalette[] = INCBIN_U16("data/fame_checker/pal_845d500.gbapal"); +static const u8 sFujiSpriteGfx[] = INCBIN_U8("data/fame_checker/img_845d520.4bpp"); +static const u16 sFujiSpritePalette[] = INCBIN_U16("data/fame_checker/pal_845dd20.gbapal"); +static const u8 sBillSpriteGfx[] = INCBIN_U8("data/fame_checker/img_845dd40.4bpp"); +static const u16 sBillSpritePalette[] = INCBIN_U16("data/fame_checker/pal_845e540.gbapal"); +static const u8 sDaisySpriteGfx[] = INCBIN_U8("data/fame_checker/img_845e560.4bpp"); +static const u16 sDaisySpritePalette[] = INCBIN_U16("data/fame_checker/pal_845ed60.gbapal"); +static const u8 sOakSpriteGfx[] = INCBIN_U8("data/fame_checker/img_845ed80.4bpp"); +static const u16 sOakSpritePalette[] = INCBIN_U16("data/fame_checker/pal_845f580.gbapal"); static const u16 gUnknown_845F5A0[] = INCBIN_U16("data/fame_checker/pal_845f5a0.gbapal"); static const u16 gUnknown_845F5C0[] = INCBIN_U16("data/fame_checker/pal_845f5c0.gbapal"); @@ -181,38 +182,8 @@ static const u8 *const gUnknown_845F60C[] = { }; static const u8 gUnknown_845F61C[] = { - 0x56, - 0x54, - 0x74, - 0x75, - 0x76, - 0x77, - 0x78, - 0x7a, - 0x79, - 0x70, - 0x71, - 0x72, - 0x73, - 0x64, - 0x7b, - 0x6c, - 0x00, - 0x01, - 0x00, - 0x01, - 0x00, - 0x01, - 0x00, - 0x01, - 0x00, - 0x01, - 0x00, - 0x01, - 0x00, - 0x00, - 0x00, - 0x00 + 0x56, 0x54, 0x74, 0x75, 0x76, 0x77, 0x78, 0x7a, 0x79, 0x70, 0x71, 0x72, 0x73, 0x64, 0x7b, 0x6c, + 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00 }; static const u8 *const gUnknown_845F63C[] = { @@ -269,7 +240,7 @@ static const u8 *const gUnknown_845F6BC[] = { gUnknown_81AFE68, gUnknown_81AFF23, gUnknown_81AFFA8, gUnknown_81B0022, gUnknown_81B00A6, gUnknown_81B0106 }; -static const u8 gUnknown_845F83C[] = { +static const u8 sFameCheckerArrayNpcGraphicsIds[] = { 0x67, 0x47, 0x30, 0x69, 0x4b, 0x37, 0x37, 0x30, 0x3d, 0x69, 0x23, 0x69, 0x66, 0x50, 0x1b, 0x13, 0x1e, 0x69, @@ -327,19 +298,19 @@ static const u8 *const gUnknown_845FA1C[] = { }; static const struct SpriteSheet gUnknown_845FB9C[] = { - {gUnknown_845D100, 0x400, SPRITETAG_1000}, - {gUnknown_845CE00, 0x100, SPRITETAG_1001}, - {gUnknown_845CF00, 0x1e0, SPRITETAG_1002}, - {gUnknown_845E560, 0x800, SPRITETAG_1006}, - {gUnknown_845D520, 0x800, SPRITETAG_1007}, - {gUnknown_845ED80, 0x800, SPRITETAG_1008}, - {gUnknown_845DD40, 0x800, SPRITETAG_1009}, + {sSelectorCursorSpriteGfx, 0x400, SPRITETAG_1000}, + {sQuestionMarkSpriteGfx, 0x100, SPRITETAG_1001}, + {sSpinningPokeballSpriteGfx, 0x1e0, SPRITETAG_1002}, + {sDaisySpriteGfx, 0x800, SPRITETAG_1006}, + {sFujiSpriteGfx, 0x800, SPRITETAG_1007}, + {sOakSpriteGfx, 0x800, SPRITETAG_1008}, + {sBillSpriteGfx, 0x800, SPRITETAG_1009}, {} }; static const struct SpritePalette gUnknown_845FBDC[] = { - {gUnknown_845D500, SPRITETAG_1000}, - {gUnknown_845D0E0, SPRITETAG_1002}, + {sSelectorCursorSpritePalette, SPRITETAG_1000}, + {sSpinningPokeballSpritePalette, SPRITETAG_1002}, {} }; @@ -449,7 +420,7 @@ static const union AffineAnimCmd *const gUnknown_845FCB4[] = { gUnknown_845FCA4 }; -static const struct SpriteTemplate gUnknown_845FCB8 = { +static const struct SpriteTemplate sSpinningPokeballSpriteTemplate = { SPRITETAG_1002, SPRITETAG_1002, &gOamData_845FC9C, gUnknown_845FC98, NULL, gUnknown_845FCB4, sub_812D840 }; @@ -466,19 +437,19 @@ static const struct OamData gOamData_845FCDC = { .size = 3 }; -static const struct SpriteTemplate gUnknown_845FCE4 = { +static const struct SpriteTemplate sDaisySpriteTemplate = { SPRITETAG_1006, 0xffff, &gOamData_845FCDC, gUnknown_845FCD8, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy }; -static const struct SpriteTemplate gUnknown_845FCFC = { +static const struct SpriteTemplate sFujiSpriteTemplate = { SPRITETAG_1007, 0xffff, &gOamData_845FCDC, gUnknown_845FCD8, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy }; -static const struct SpriteTemplate gUnknown_845FD14 = { +static const struct SpriteTemplate sOakSpriteTemplate = { SPRITETAG_1008, 0xffff, &gOamData_845FCDC, gUnknown_845FCD8, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy }; -static const struct SpriteTemplate gUnknown_845FD2C = { +static const struct SpriteTemplate sBillSpriteTemplate = { SPRITETAG_1009, 0xffff, &gOamData_845FCDC, gUnknown_845FCD8, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy }; @@ -541,7 +512,7 @@ static void sub_812C3F8(void) LoadPalette(gUnknown_8E9F220 + 0x00, 0x00, 0x40); LoadPalette(gUnknown_8E9F220 + 0x10, 0x10, 0x20); CopyToBgTilemapBufferRect(2, gUnknown_8EA0F00, 0, 0, 32, 32); - CopyToBgTilemapBufferRect_ChangePalette(1, gUnknown_845C600, 30, 0, 32, 32, 0x11); + CopyToBgTilemapBufferRect_ChangePalette(1, sFameCheckerTilemap, 30, 0, 32, 32, 0x11); LoadPalette(stdpal_get(2), 0xF0, 0x20); gMain.state++; break; @@ -610,16 +581,16 @@ static void sub_812C694(u8 taskId) if (FindTaskIdByFunc(sub_812E110) == 0xFF) { RunTextPrinters(); - if ((JOY_NEW(SELECT_BUTTON)) && !sFameCheckerData->unk_07_1 && sFameCheckerData->savedCallback != sub_8107EB8) + if ((JOY_NEW(SELECT_BUTTON)) && !sFameCheckerData->inPickMode && sFameCheckerData->savedCallback != UseFameCheckerFromMenu) task->func = sub_812CF3C; else if (JOY_NEW(START_BUTTON)) { - r4 = sub_812E064(); + r4 = FameCheckerGetCursorY(); if (sub_812C8F8(taskId) == TRUE) { PlaySE(SE_W100); } - else if (r4 != sFameCheckerData->unk_07_2 - 1) + else if (r4 != sFameCheckerData->numUnlockedPersons - 1) { PlaySE(SE_W100); FillWindowPixelRect(3, 0x00, 0, 0, 88, 32); @@ -639,9 +610,9 @@ static void sub_812C694(u8 taskId) else if (JOY_NEW(A_BUTTON)) { r4 = ListMenuHandleInput(0); - if (r4 == sFameCheckerData->unk_07_2 - 1) + if (r4 == sFameCheckerData->numUnlockedPersons - 1) task->func = sub_812CF3C; - else if (sFameCheckerData->unk_07_1) + else if (sFameCheckerData->inPickMode) { if (!IsTextPrinterActive(2) && sub_812D6B4() == TRUE) sub_812CD3C(); @@ -680,7 +651,7 @@ static void sub_812C694(u8 taskId) static bool8 sub_812C8F8(u8 taskId) { struct Task *task = &gTasks[taskId]; - if (sFameCheckerData->unk_07_1) + if (sFameCheckerData->inPickMode) { gSprites[task->data[2]].data[0] = 2; gSprites[task->data[2]].pos2.x += 10; @@ -706,7 +677,7 @@ static void sub_812C9BC(u8 taskId) if (gSprites[task->data[2]].data[0] == 0) { sub_812CD3C(); - sFameCheckerData->unk_07_1 = TRUE; + sFameCheckerData->inPickMode = TRUE; task->func = sub_812C694; } else @@ -726,8 +697,8 @@ static void sub_812CA1C(u8 taskId) sub_812D0F4(0); sub_812E178(1, 4); sub_812E178(2, 2); - sFameCheckerData->unk_07_1 = FALSE; - sub_812D9A8(taskId, sub_812E064()); + sFameCheckerData->inPickMode = FALSE; + sub_812D9A8(taskId, FameCheckerGetCursorY()); task->func = sub_812C694; gSprites[task->data[3]].callback = sub_812D800; } @@ -825,7 +796,7 @@ static void sub_812CC68(u8 taskId, s8 dx, s8 dy) static void sub_812CD3C(void) { u8 r8 = 0; - u16 r6 = sub_812E064(); + u16 r6 = FameCheckerGetCursorY(); if (gSaveBlock1Ptr->fameChecker[sFameCheckerData->unlockedPersons[r6]].unk_0_0 != 2) { sub_812CE9C(); @@ -845,7 +816,7 @@ static void sub_812CD3C(void) static void sub_812CE04(u8 taskId) { s16 *data = gTasks[taskId].data; - u16 r5 = sub_812E064(); + u16 r5 = FameCheckerGetCursorY(); FillWindowPixelRect(2, 0x11, 0, 0, 0xd0, 0x20); StringExpandPlaceholders(gStringVar4, gUnknown_845F6BC[sFameCheckerData->unlockedPersons[r5] * 6 + data[1]]); AddTextPrinterParametrized(2, 2, gStringVar4, sub_80F78A8(), NULL, 2, 1, 3); @@ -895,9 +866,9 @@ static void sub_812CF7C(u8 taskId) if (!gPaletteFade.active) { - if (sFameCheckerData->unk_07_1) + if (sFameCheckerData->inPickMode) { - sub_812D9A8(taskId, sub_812E064()); + sub_812D9A8(taskId, FameCheckerGetCursorY()); FreeSpriteOamMatrix(&gSprites[gTasks[taskId].data[3]]); DestroySprite(&gSprites[gTasks[taskId].data[3]]); } @@ -981,7 +952,7 @@ static bool8 sub_812D1A8(u8 a0) if ((gSaveBlock1Ptr->fameChecker[sFameCheckerData->unlockedPersons[a0]].unk_0_2 >> r6) & 1) { sFameCheckerData->spriteIds[r6] = sub_805EB44( - gUnknown_845F83C[sFameCheckerData->unlockedPersons[a0] * 6 + r6], + sFameCheckerArrayNpcGraphicsIds[sFameCheckerData->unlockedPersons[a0] * 6 + r6], r6, 47 * (r6 % 3) + 0x72, 27 * (r6 / 3) + 0x2F @@ -990,7 +961,7 @@ static bool8 sub_812D1A8(u8 a0) } else { - sFameCheckerData->spriteIds[r6] = sub_812D780( + sFameCheckerData->spriteIds[r6] = PlaceQuestionMarkTile( 47 * (r6 % 3) + 0x72, 27 * (r6 / 3) + 0x1F ); @@ -1000,7 +971,7 @@ static bool8 sub_812D1A8(u8 a0) if (r5 == TRUE) { sFameCheckerData->unk_07_0 = TRUE; - if (sFameCheckerData->unk_07_1) + if (sFameCheckerData->inPickMode) sub_812D0F4(TRUE); else sub_812D0F4(FALSE); @@ -1120,7 +1091,7 @@ static void sub_812D650(void) static bool8 sub_812D6B4(void) { u8 r2; - u8 r1 = sFameCheckerData->unlockedPersons[sub_812E064()]; + u8 r1 = sFameCheckerData->unlockedPersons[FameCheckerGetCursorY()]; for (r2 = 0; r2 < 6; r2++) { if (!((gSaveBlock1Ptr->fameChecker[r1].unk_0_2 >> r2) & 1)) @@ -1152,7 +1123,7 @@ static void sub_812D770(void) FreeSpriteTilesByTag(SPRITETAG_1001); } -static u8 sub_812D780(u8 x, u8 y) +static u8 PlaceQuestionMarkTile(u8 x, u8 y) { u8 spriteId = CreateSprite(&gUnknown_845FC78, x, y, 8); gSprites[spriteId].oam.priority = 2; @@ -1168,7 +1139,7 @@ static void sub_812D7C8(void) static u8 sub_812D7E4(void) { - return CreateSprite(&gUnknown_845FCB8, 0xe2, 0x42, 0); + return CreateSprite(&sSpinningPokeballSpriteTemplate, 0xe2, 0x42, 0); } static void sub_812D800(struct Sprite * sprite) @@ -1212,28 +1183,28 @@ static void sub_812D840(struct Sprite * sprite) static u8 sub_812D888(u8 a0) { u8 r4; - if (a0 == 1) + if (a0 == FAMECHECKER_DAISY) { - r4 = CreateSprite(&gUnknown_845FCE4, 0x94, 0x42, 0); - LoadPalette(gUnknown_845ED60, 0x160, 0x20); + r4 = CreateSprite(&sDaisySpriteTemplate, 0x94, 0x42, 0); + LoadPalette(sDaisySpritePalette, 0x160, 0x20); gSprites[r4].oam.paletteNum = 6; } - else if (a0 == 14) + else if (a0 == FAMECHECKER_MRFUJI) { - r4 = CreateSprite(&gUnknown_845FCFC, 0x94, 0x42, 0); - LoadPalette(gUnknown_845DD20, 0x160, 0x20); + r4 = CreateSprite(&sFujiSpriteTemplate, 0x94, 0x42, 0); + LoadPalette(sFujiSpritePalette, 0x160, 0x20); gSprites[r4].oam.paletteNum = 6; } - else if (a0 == 0) + else if (a0 == FAMECHECKER_OAK) { - r4 = CreateSprite(&gUnknown_845FD14, 0x94, 0x42, 0); - LoadPalette(gUnknown_845F580, 0x160, 0x20); + r4 = CreateSprite(&sOakSpriteTemplate, 0x94, 0x42, 0); + LoadPalette(sOakSpritePalette, 0x160, 0x20); gSprites[r4].oam.paletteNum = 6; } - else if (a0 == 13) + else if (a0 == FAMECHECKER_BILL) { - r4 = CreateSprite(&gUnknown_845FD2C, 0x94, 0x42, 0); - LoadPalette(gUnknown_845E540, 0x160, 0x20); + r4 = CreateSprite(&sBillSpriteTemplate, 0x94, 0x42, 0); + LoadPalette(sBillSpritePalette, 0x160, 0x20); gSprites[r4].oam.paletteNum = 6; } else @@ -1250,12 +1221,12 @@ static void sub_812D9A8(u8 taskId, u16 a1) { s16 * data = gTasks[taskId].data; u16 r1 = a1; - if (a1 == sFameCheckerData->unk_07_2 - 1) + if (a1 == sFameCheckerData->numUnlockedPersons - 1) r1 = a1 - 1; - if ( sFameCheckerData->unlockedPersons[r1] == 1 - || sFameCheckerData->unlockedPersons[r1] == 14 - || sFameCheckerData->unlockedPersons[r1] == 0 - || sFameCheckerData->unlockedPersons[r1] == 13 + if ( sFameCheckerData->unlockedPersons[r1] == FAMECHECKER_DAISY + || sFameCheckerData->unlockedPersons[r1] == FAMECHECKER_MRFUJI + || sFameCheckerData->unlockedPersons[r1] == FAMECHECKER_OAK + || sFameCheckerData->unlockedPersons[r1] == FAMECHECKER_BILL ) DestroySprite(&gSprites[data[2]]); else @@ -1265,7 +1236,7 @@ static void sub_812D9A8(u8 taskId, u16 a1) static void sub_812DA14(u8 a0) { s32 width; - u32 r5 = 6 * sFameCheckerData->unlockedPersons[sub_812E064()] + a0; + u32 r5 = 6 * sFameCheckerData->unlockedPersons[FameCheckerGetCursorY()] + a0; sub_812E094(1); gUnknown_3005EC8 = 1; FillWindowPixelRect(3, 0x00, 0, 0, 0x58, 0x20); @@ -1286,7 +1257,7 @@ static void sub_812DB10(void) static void sub_812DB28(void) { sub_812DB64(); - sFameCheckerData->unk_07_2 = sub_812DEF0(); + sFameCheckerData->numUnlockedPersons = sub_812DEF0(); sFameCheckerData->scrollIndicatorArrowObjectTaskId = ListMenuInit(&gFameChecker_ListMenuTemplate, 0, 0); sub_812DFE4(0); } @@ -1329,11 +1300,11 @@ static void sub_812DBC0(s32 itemIndex, bool8 onInit, struct ListMenu *list) task->data[1] = 0; get_coro_args_x18_x1A(sFameCheckerData->scrollIndicatorArrowObjectTaskId, &sp8, NULL); sFameCheckerData->unk_04 = sp8; - if (itemIndex != sFameCheckerData->unk_07_2 - 1) + if (itemIndex != sFameCheckerData->numUnlockedPersons - 1) { sub_812D174(); sub_812D1A8(itemIndex); - if (sFameCheckerData->unk_07_1) + if (sFameCheckerData->inPickMode) { if (!sFameCheckerData->unk_23_2) { @@ -1358,7 +1329,7 @@ static void sub_812DBC0(s32 itemIndex, bool8 onInit, struct ListMenu *list) else { sub_812DDAC(); - if (sFameCheckerData->unk_07_1) + if (sFameCheckerData->inPickMode) { gSprites[task->data[2]].invisible = TRUE; sFameCheckerData->unk_23_2 = TRUE; @@ -1403,7 +1374,7 @@ static void sub_812DDF0(s32 itemIndex, bool8 onInit) { if (sp14 < sFameCheckerData->unk_0A) sFameCheckerData->unk_0B++; - else if (sp14 > sFameCheckerData->unk_0A && r6 != sFameCheckerData->unk_07_2 - 1) + else if (sp14 > sFameCheckerData->unk_0A && r6 != sFameCheckerData->numUnlockedPersons - 1) sFameCheckerData->unk_0B--; AddTextPrinterParametrized2(0, 2, 8, 14 * sFameCheckerData->unk_0B + 4, 0, 0, &gUnknown_845F5E3, 0, sListMenuItems[sFameCheckerData->unk_09].unk_00); @@ -1472,21 +1443,21 @@ static void sub_812E000(void) 0 }; - if (sFameCheckerData->unk_07_2 > 5) + if (sFameCheckerData->numUnlockedPersons > 5) { sp0.unk_06 = 0; - sp0.unk_08 = sFameCheckerData->unk_07_2 - 5; + sp0.unk_08 = sFameCheckerData->numUnlockedPersons - 5; sFameCheckerData->unk_06 = AddScrollIndicatorArrowPair(&sp0, &sFameCheckerData->unk_04); } } static void sub_812E048(void) { - if (sFameCheckerData->unk_07_2 > 5) + if (sFameCheckerData->numUnlockedPersons > 5) RemoveScrollIndicatorArrowPair(sFameCheckerData->unk_06); } -static u16 sub_812E064(void) +static u16 FameCheckerGetCursorY(void) { u16 sp0, sp2; get_coro_args_x18_x1A(sFameCheckerData->scrollIndicatorArrowObjectTaskId, &sp0, &sp2); -- cgit v1.2.3 From a738e3dca5563355df0b31323a95e017ce9205d6 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Tue, 27 Nov 2018 08:44:24 -0500 Subject: More documentation and enums --- include/fame_checker.h | 6 ++++ include/global.berry.h | 2 -- include/global.fieldmap.h | 2 -- include/global.h | 4 +-- src/fame_checker.c | 74 +++++++++++++++++++++++------------------------ 5 files changed, 45 insertions(+), 43 deletions(-) diff --git a/include/fame_checker.h b/include/fame_checker.h index bc653740e..fad629108 100644 --- a/include/fame_checker.h +++ b/include/fame_checker.h @@ -22,6 +22,12 @@ enum { FAMECHECKER_GIOVANNI }; +enum { + FCPICKSTATE_NO_DRAW, + FCPICKSTATE_SILHOUETTE, + FCPICKSTATE_COLORED +}; + void ResetFameChecker(void); void UseFameChecker(MainCallback savedCallback); diff --git a/include/global.berry.h b/include/global.berry.h index f9e27b186..5c8a43a02 100644 --- a/include/global.berry.h +++ b/include/global.berry.h @@ -1,8 +1,6 @@ #ifndef GUARD_GLOBAL_BERRY_H #define GUARD_GLOBAL_BERRY_H -#include "global.h" - #define BERRY_NAME_COUNT 7 #define BERRY_ITEM_EFFECT_COUNT 18 diff --git a/include/global.fieldmap.h b/include/global.fieldmap.h index 98077d8d4..ed5054b7d 100644 --- a/include/global.fieldmap.h +++ b/include/global.fieldmap.h @@ -1,8 +1,6 @@ #ifndef GUARD_GLOBAL_FIELDMAP_H #define GUARD_GLOBAL_FIELDMAP_H -#include "global.h" - #define NUM_FIELD_OBJECTS 16 enum diff --git a/include/global.h b/include/global.h index 84597dba0..d99f912ae 100644 --- a/include/global.h +++ b/include/global.h @@ -574,8 +574,8 @@ struct QuestLog struct FameCheckerSaveData { - /*3a54*/ u16 unk_0_0:2; - u16 unk_0_2:12; + /*3a54*/ u16 pickState:2; + u16 flavorTextFlags:12; u16 unk_0_E:2; }; diff --git a/src/fame_checker.c b/src/fame_checker.c index 2bff79146..723fffefe 100644 --- a/src/fame_checker.c +++ b/src/fame_checker.c @@ -39,15 +39,15 @@ struct FameCheckerData { MainCallback savedCallback; - u16 unk_04; + u16 listMenuTopIdx; u8 unk_06; - u8 unk_07_0:1; + u8 personHasUnlockedPanels:1; u8 inPickMode:1; u8 numUnlockedPersons:6; u8 scrollIndicatorArrowObjectTaskId; - u8 unk_09; - u8 unk_0A; - u8 unk_0B; + u8 listMenuCurIdx; + u8 listMenuTopIdx2; + u8 listMenuDrawnSelIdx; u8 unlockedPersons[17]; u8 spriteIds[6]; u8 unk_23_0:1; @@ -473,9 +473,9 @@ void UseFameChecker(MainCallback savedCallback) SetVBlankCallback(NULL); sFameCheckerData = AllocZeroed(sizeof(struct FameCheckerData)); sFameCheckerData->savedCallback = savedCallback; - sFameCheckerData->unk_09 = 0; - sFameCheckerData->unk_0A = 0; - sFameCheckerData->unk_0B = 0; + sFameCheckerData->listMenuCurIdx = 0; + sFameCheckerData->listMenuTopIdx2 = 0; + sFameCheckerData->listMenuDrawnSelIdx = 0; sFameCheckerData->unk_23_0 = FALSE; PlaySE(SE_W202); SetMainCallback2(sub_812C3F8); @@ -550,7 +550,7 @@ static void sub_812C3F8(void) SetGpuReg(REG_OFFSET_BLDALPHA, 0x07); SetGpuReg(REG_OFFSET_BLDY, 0x08); SetVBlankCallback(sub_812C380); - sFameCheckerData->unk_04 = 0; + sFameCheckerData->listMenuTopIdx = 0; sub_812E000(); sub_812E178(1, 4); CreateTask(sub_812C664, 0x08); @@ -617,7 +617,7 @@ static void sub_812C694(u8 taskId) if (!IsTextPrinterActive(2) && sub_812D6B4() == TRUE) sub_812CD3C(); } - else if (sFameCheckerData->unk_07_0) + else if (sFameCheckerData->personHasUnlockedPanels) { PlaySE(SE_SELECT); task->data[0] = sub_812D724(task->data[1]); @@ -693,7 +693,7 @@ static void sub_812CA1C(u8 taskId) ChangeBgX(1, 0x000, 0); if (gSprites[task->data[2]].data[0] == 0) { - if (sFameCheckerData->unk_07_0) + if (sFameCheckerData->personHasUnlockedPanels) sub_812D0F4(0); sub_812E178(1, 4); sub_812E178(2, 2); @@ -797,7 +797,7 @@ static void sub_812CD3C(void) { u8 r8 = 0; u16 r6 = FameCheckerGetCursorY(); - if (gSaveBlock1Ptr->fameChecker[sFameCheckerData->unlockedPersons[r6]].unk_0_0 != 2) + if (gSaveBlock1Ptr->fameChecker[sFameCheckerData->unlockedPersons[r6]].pickState != FCPICKSTATE_COLORED) { sub_812CE9C(); sub_812C990(); @@ -949,7 +949,7 @@ static bool8 sub_812D1A8(u8 a0) u8 r6; for (r6 = 0; r6 < 6; r6++) { - if ((gSaveBlock1Ptr->fameChecker[sFameCheckerData->unlockedPersons[a0]].unk_0_2 >> r6) & 1) + if ((gSaveBlock1Ptr->fameChecker[sFameCheckerData->unlockedPersons[a0]].flavorTextFlags >> r6) & 1) { sFameCheckerData->spriteIds[r6] = sub_805EB44( sFameCheckerArrayNpcGraphicsIds[sFameCheckerData->unlockedPersons[a0] * 6 + r6], @@ -970,7 +970,7 @@ static bool8 sub_812D1A8(u8 a0) } if (r5 == TRUE) { - sFameCheckerData->unk_07_0 = TRUE; + sFameCheckerData->personHasUnlockedPanels = TRUE; if (sFameCheckerData->inPickMode) sub_812D0F4(TRUE); else @@ -978,7 +978,7 @@ static bool8 sub_812D1A8(u8 a0) } else { - sFameCheckerData->unk_07_0 = FALSE; + sFameCheckerData->personHasUnlockedPanels = FALSE; sub_812D0F4(TRUE); } return r5; @@ -989,11 +989,11 @@ void ResetFameChecker(void) u8 r4; for (r4 = 0; r4 < 16; r4++) { - gSaveBlock1Ptr->fameChecker[r4].unk_0_0 = 0; - gSaveBlock1Ptr->fameChecker[r4].unk_0_2 = 0; + gSaveBlock1Ptr->fameChecker[r4].pickState = FCPICKSTATE_NO_DRAW; + gSaveBlock1Ptr->fameChecker[r4].flavorTextFlags = 0; gSaveBlock1Ptr->fameChecker[r4].unk_0_E = 0; } - gSaveBlock1Ptr->fameChecker[0].unk_0_0 = 2; + gSaveBlock1Ptr->fameChecker[0].pickState = FCPICKSTATE_COLORED; } static void sub_812D388(void) @@ -1001,10 +1001,10 @@ static void sub_812D388(void) u8 r5, r4; for (r5 = 0; r5 < 16; r5++) { - gSaveBlock1Ptr->fameChecker[r5].unk_0_0 = 2; + gSaveBlock1Ptr->fameChecker[r5].pickState = FCPICKSTATE_COLORED; for (r4 = 0; r4 < 6; r4++) { - gSaveBlock1Ptr->fameChecker[r5].unk_0_2 |= (1 << r4); + gSaveBlock1Ptr->fameChecker[r5].flavorTextFlags |= (1 << r4); } } } @@ -1070,7 +1070,7 @@ static void sub_812D5EC(void) { if (gUnknown_20370C0 < 16 && gSpecialVar_0x8005 < 6) { - gSaveBlock1Ptr->fameChecker[gUnknown_20370C0].unk_0_2 |= (1 << gSpecialVar_0x8005); + gSaveBlock1Ptr->fameChecker[gUnknown_20370C0].flavorTextFlags |= (1 << gSpecialVar_0x8005); gSpecialVar_0x8005 = 1; sub_812D650(); } @@ -1082,9 +1082,9 @@ static void sub_812D650(void) { if (gSpecialVar_0x8005 == 0) return; - if (gSpecialVar_0x8005 == 1 && gSaveBlock1Ptr->fameChecker[gUnknown_20370C0].unk_0_0 == 2) + if (gSpecialVar_0x8005 == 1 && gSaveBlock1Ptr->fameChecker[gUnknown_20370C0].pickState == FCPICKSTATE_COLORED) return; - gSaveBlock1Ptr->fameChecker[gUnknown_20370C0].unk_0_0 = gSpecialVar_0x8005; + gSaveBlock1Ptr->fameChecker[gUnknown_20370C0].pickState = gSpecialVar_0x8005; } } @@ -1094,7 +1094,7 @@ static bool8 sub_812D6B4(void) u8 r1 = sFameCheckerData->unlockedPersons[FameCheckerGetCursorY()]; for (r2 = 0; r2 < 6; r2++) { - if (!((gSaveBlock1Ptr->fameChecker[r1].unk_0_2 >> r2) & 1)) + if (!((gSaveBlock1Ptr->fameChecker[r1].flavorTextFlags >> r2) & 1)) return FALSE; } return TRUE; @@ -1212,7 +1212,7 @@ static u8 sub_812D888(u8 a0) r4 = sub_810C2A4(gUnknown_845F61C[a0], 1, 0x94, 0x42, 6, 0xFFFF); } gSprites[r4].callback = sub_812D840; - if (gSaveBlock1Ptr->fameChecker[a0].unk_0_0 == 1) + if (gSaveBlock1Ptr->fameChecker[a0].pickState == FCPICKSTATE_SILHOUETTE) LoadPalette(gUnknown_845F5C0, 0x160, 0x20); return r4; } @@ -1290,7 +1290,7 @@ static void sub_812DBC0(s32 itemIndex, bool8 onInit, struct ListMenu *list) u8 taskId; u16 r9; sLastMenuIdx = 0; - r9 = sFameCheckerData->unk_0A + sFameCheckerData->unk_0B; + r9 = sFameCheckerData->listMenuTopIdx2 + sFameCheckerData->listMenuDrawnSelIdx; sub_812DDF0(itemIndex, onInit); taskId = FindTaskIdByFunc(sub_812C694); if (taskId != 0xFF) @@ -1299,7 +1299,7 @@ static void sub_812DBC0(s32 itemIndex, bool8 onInit, struct ListMenu *list) PlaySE(SE_SELECT); task->data[1] = 0; get_coro_args_x18_x1A(sFameCheckerData->scrollIndicatorArrowObjectTaskId, &sp8, NULL); - sFameCheckerData->unk_04 = sp8; + sFameCheckerData->listMenuTopIdx = sp8; if (itemIndex != sFameCheckerData->numUnlockedPersons - 1) { sub_812D174(); @@ -1372,16 +1372,16 @@ static void sub_812DDF0(s32 itemIndex, bool8 onInit) AddTextPrinterParametrized2(0, 2, 8, 14 * sp16 + 4, 0, 0, &gUnknown_845F5E6, 0, sListMenuItems[itemIndex].unk_00); if (!onInit) { - if (sp14 < sFameCheckerData->unk_0A) - sFameCheckerData->unk_0B++; - else if (sp14 > sFameCheckerData->unk_0A && r6 != sFameCheckerData->numUnlockedPersons - 1) - sFameCheckerData->unk_0B--; - AddTextPrinterParametrized2(0, 2, 8, 14 * sFameCheckerData->unk_0B + 4, 0, 0, &gUnknown_845F5E3, 0, sListMenuItems[sFameCheckerData->unk_09].unk_00); + if (sp14 < sFameCheckerData->listMenuTopIdx2) + sFameCheckerData->listMenuDrawnSelIdx++; + else if (sp14 > sFameCheckerData->listMenuTopIdx2 && r6 != sFameCheckerData->numUnlockedPersons - 1) + sFameCheckerData->listMenuDrawnSelIdx--; + AddTextPrinterParametrized2(0, 2, 8, 14 * sFameCheckerData->listMenuDrawnSelIdx + 4, 0, 0, &gUnknown_845F5E3, 0, sListMenuItems[sFameCheckerData->listMenuCurIdx].unk_00); } - sFameCheckerData->unk_09 = itemIndex; - sFameCheckerData->unk_0B = sp16; - sFameCheckerData->unk_0A = sp14; + sFameCheckerData->listMenuCurIdx = itemIndex; + sFameCheckerData->listMenuDrawnSelIdx = sp16; + sFameCheckerData->listMenuTopIdx2 = sp14; } static u8 sub_812DEF0(void) @@ -1392,7 +1392,7 @@ static u8 sub_812DEF0(void) for (r6 = 0; r6 < 16; r6++) { u8 r5 = sub_812D0C0(r6); - if (gSaveBlock1Ptr->fameChecker[r5].unk_0_0 != 0) + if (gSaveBlock1Ptr->fameChecker[r5].pickState != FCPICKSTATE_NO_DRAW) { if (gUnknown_845F5EA[r5] < 0xFE00) { @@ -1447,7 +1447,7 @@ static void sub_812E000(void) { sp0.unk_06 = 0; sp0.unk_08 = sFameCheckerData->numUnlockedPersons - 5; - sFameCheckerData->unk_06 = AddScrollIndicatorArrowPair(&sp0, &sFameCheckerData->unk_04); + sFameCheckerData->unk_06 = AddScrollIndicatorArrowPair(&sp0, &sFameCheckerData->listMenuTopIdx); } } -- cgit v1.2.3 From d2bd51c49f0654a7cb37a6aeb0f50b8b2d2470b1 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Tue, 27 Nov 2018 16:50:10 -0500 Subject: Rename most assets and functions in fame_checker --- asm/berry_pouch.s | 4 +- asm/help_system.s | 4 +- asm/item_menu.s | 8 +- asm/item_pc.s | 8 +- asm/learn_move.s | 6 +- asm/list_menu.s | 4 +- asm/mailbox_pc.s | 4 +- asm/menu.s | 8 +- asm/party_menu.s | 4 +- asm/pokemon_summary_screen.s | 4 +- asm/shop.s | 8 +- asm/tm_case.s | 4 +- asm/unk_81507FC.s | 8 +- data/data_83FECCC.s | 33 +- data/text/fame_checker.inc | 640 ++++++++++++------------ include/event_scripts.h | 640 ++++++++++++------------ include/fame_checker.h | 13 +- include/global.h | 4 +- include/new_menu_helpers.h | 2 +- src/fame_checker.c | 1095 ++++++++++++++++++++---------------------- 20 files changed, 1245 insertions(+), 1256 deletions(-) diff --git a/asm/berry_pouch.s b/asm/berry_pouch.s index 323921f8b..304efdd74 100644 --- a/asm/berry_pouch.s +++ b/asm/berry_pouch.s @@ -948,7 +948,7 @@ sub_813D4D0: @ 813D4D0 bl CopyWindowToVram b _0813D52A _0813D514: - ldr r2, _0813D534 @ =gUnknown_841623B + ldr r2, _0813D534 @ =gFameCheckerText_ListMenuCursor str r5, [sp] movs r0, 0 str r0, [sp, 0x4] @@ -964,7 +964,7 @@ _0813D52A: pop {r0} bx r0 .align 2, 0 -_0813D534: .4byte gUnknown_841623B +_0813D534: .4byte gFameCheckerText_ListMenuCursor thumb_func_end sub_813D4D0 thumb_func_start sub_813D538 diff --git a/asm/help_system.s b/asm/help_system.s index b0d5c5f34..7026c65d5 100644 --- a/asm/help_system.s +++ b/asm/help_system.s @@ -2040,14 +2040,14 @@ sub_813C828: @ 813C828 adds r2, r3 lsls r2, 24 lsrs r2, 24 - ldr r0, _0813C85C @ =gUnknown_841623B + ldr r0, _0813C85C @ =gFameCheckerText_ListMenuCursor bl sub_813C4CC pop {r4} pop {r0} bx r0 .align 2, 0 _0813C858: .4byte gUnknown_203F190 -_0813C85C: .4byte gUnknown_841623B +_0813C85C: .4byte gFameCheckerText_ListMenuCursor thumb_func_end sub_813C828 thumb_func_start sub_813C860 diff --git a/asm/item_menu.s b/asm/item_menu.s index 16d1cfce2..8650e912d 100644 --- a/asm/item_menu.s +++ b/asm/item_menu.s @@ -871,7 +871,7 @@ _0810848C: bl StringCopy ldr r0, [r5] adds r0, r4 - ldr r1, _08108550 @ =gUnknown_84161C1 + ldr r1, _08108550 @ =gFameCheckerText_Cancel bl StringAppend ldr r0, _08108548 @ =gUnknown_203AD18 ldr r2, [r0] @@ -951,7 +951,7 @@ _08108540: .4byte gUnknown_203AD10 _08108544: .4byte gUnknown_203AD1C _08108548: .4byte gUnknown_203AD18 _0810854C: .4byte gUnknown_8452F60 -_08108550: .4byte gUnknown_84161C1 +_08108550: .4byte gFameCheckerText_Cancel _08108554: .4byte gUnknown_3005E70 _08108558: .4byte sub_81085A4 _0810855C: .4byte sub_8108654 @@ -1257,7 +1257,7 @@ bag_menu_print_cursor: @ 810878C bl FillWindowPixelRect b _081087DE _081087C8: - ldr r2, _081087E8 @ =gUnknown_841623B + ldr r2, _081087E8 @ =gFameCheckerText_ListMenuCursor str r5, [sp] movs r0, 0 str r0, [sp, 0x4] @@ -1273,7 +1273,7 @@ _081087DE: pop {r0} bx r0 .align 2, 0 -_081087E8: .4byte gUnknown_841623B +_081087E8: .4byte gFameCheckerText_ListMenuCursor thumb_func_end bag_menu_print_cursor thumb_func_start sub_81087EC diff --git a/asm/item_pc.s b/asm/item_pc.s index 8e71d9dc3..b222b9ca2 100644 --- a/asm/item_pc.s +++ b/asm/item_pc.s @@ -589,7 +589,7 @@ _0810D8A4: ldr r3, [r0] lsls r0, r4, 3 adds r0, r3 - ldr r1, _0810D944 @ =gUnknown_84161C1 + ldr r1, _0810D944 @ =gFameCheckerText_Cancel str r1, [r0] movs r1, 0x2 negs r1, r1 @@ -657,7 +657,7 @@ _0810D8A4: _0810D938: .4byte gSaveBlock1Ptr _0810D93C: .4byte gUnknown_203ADC4 _0810D940: .4byte gUnknown_203ADBC -_0810D944: .4byte gUnknown_84161C1 +_0810D944: .4byte gFameCheckerText_Cancel _0810D948: .4byte gUnknown_3005E70 _0810D94C: .4byte sub_810D954 _0810D950: .4byte sub_810DA20 @@ -879,7 +879,7 @@ sub_810DAD4: @ 810DAD4 bl FillWindowPixelRect b _0810DB26 _0810DB10: - ldr r2, _0810DB30 @ =gUnknown_841623B + ldr r2, _0810DB30 @ =gFameCheckerText_ListMenuCursor str r5, [sp] movs r0, 0 str r0, [sp, 0x4] @@ -895,7 +895,7 @@ _0810DB26: pop {r0} bx r0 .align 2, 0 -_0810DB30: .4byte gUnknown_841623B +_0810DB30: .4byte gFameCheckerText_ListMenuCursor thumb_func_end sub_810DAD4 thumb_func_start sub_810DB34 diff --git a/asm/learn_move.s b/asm/learn_move.s index f3f472847..fec6928d3 100644 --- a/asm/learn_move.s +++ b/asm/learn_move.s @@ -1331,7 +1331,7 @@ _080E513C: lsls r7, 1 adds r1, r7 adds r0, r1 - ldr r1, _080E51F8 @ =gUnknown_84161C1 + ldr r1, _080E51F8 @ =gFameCheckerText_Cancel bl StringCopy ldr r1, [r4] ldrb r0, [r1, 0x1A] @@ -1367,7 +1367,7 @@ _080E51AA: adds r0, r2, 0 adds r0, 0x20 adds r0, r3 - ldr r1, _080E51F8 @ =gUnknown_84161C1 + ldr r1, _080E51F8 @ =gFameCheckerText_Cancel str r1, [r0] adds r2, 0x24 adds r2, r3 @@ -1396,7 +1396,7 @@ _080E51E8: .4byte gUnknown_203AAB4 _080E51EC: .4byte gPlayerParty _080E51F0: .4byte gMoveNames _080E51F4: .4byte gStringVar1 -_080E51F8: .4byte gUnknown_84161C1 +_080E51F8: .4byte gFameCheckerText_Cancel _080E51FC: .4byte gUnknown_3005E70 _080E5200: .4byte gUnknown_83FFA94 thumb_func_end sub_80E50CC diff --git a/asm/list_menu.s b/asm/list_menu.s index 760c55311..3475b0914 100644 --- a/asm/list_menu.s +++ b/asm/list_menu.s @@ -969,14 +969,14 @@ _081075DA: beq _08107640 b _08107680 _081075E4: - ldr r1, _081075F4 @ =gUnknown_841623B + ldr r1, _081075F4 @ =gFameCheckerText_ListMenuCursor adds r0, r6, 0 mov r2, r8 adds r3, r7, 0 bl ListMenuPrint b _08107680 .align 2, 0 -_081075F4: .4byte gUnknown_841623B +_081075F4: .4byte gFameCheckerText_ListMenuCursor _081075F8: ldrb r0, [r6, 0x1E] cmp r0, 0xFF diff --git a/asm/mailbox_pc.s b/asm/mailbox_pc.s index d2933aa8b..d2cc06070 100644 --- a/asm/mailbox_pc.s +++ b/asm/mailbox_pc.s @@ -174,7 +174,7 @@ sub_810EC98: @ 810EC98 adds r6, r0, 0 movs r3, 0 ldr r7, _0810ED50 @ =gUnknown_203ADE0 - ldr r0, _0810ED54 @ =gUnknown_84161C1 + ldr r0, _0810ED54 @ =gFameCheckerText_Cancel mov r12, r0 ldr r5, _0810ED58 @ =gUnknown_3005E70 ldr r1, _0810ED5C @ =gUnknown_203ADDC @@ -262,7 +262,7 @@ _0810ECCE: bx r1 .align 2, 0 _0810ED50: .4byte gUnknown_203ADE0 -_0810ED54: .4byte gUnknown_84161C1 +_0810ED54: .4byte gFameCheckerText_Cancel _0810ED58: .4byte gUnknown_3005E70 _0810ED5C: .4byte gUnknown_203ADDC _0810ED60: .4byte gUnknown_8454003 diff --git a/asm/menu.s b/asm/menu.s index 8bea8e86f..e593eef1c 100644 --- a/asm/menu.s +++ b/asm/menu.s @@ -1391,7 +1391,7 @@ RedrawMenuCursor: @ 810F874 bl FillWindowPixelRect ldrb r0, [r5, 0x5] ldrb r1, [r5, 0x6] - ldr r2, _0810F900 @ =gUnknown_841623B + ldr r2, _0810F900 @ =gFameCheckerText_ListMenuCursor ldrb r3, [r5] ldrb r4, [r5, 0x8] mov r6, r8 @@ -1415,7 +1415,7 @@ RedrawMenuCursor: @ 810F874 bx r0 .align 2, 0 _0810F8FC: .4byte gUnknown_203ADE4 -_0810F900: .4byte gUnknown_841623B +_0810F900: .4byte gFameCheckerText_ListMenuCursor thumb_func_end RedrawMenuCursor thumb_func_start MoveMenuCursor @@ -2893,7 +2893,7 @@ sub_811037C: @ 811037C lsrs r3, 24 ldrb r0, [r5, 0x5] ldrb r1, [r5, 0x6] - ldr r2, _0811044C @ =gUnknown_841623B + ldr r2, _0811044C @ =gFameCheckerText_ListMenuCursor str r3, [sp] movs r3, 0 str r3, [sp, 0x4] @@ -2910,7 +2910,7 @@ sub_811037C: @ 811037C bx r0 .align 2, 0 _08110448: .4byte gUnknown_203ADE4 -_0811044C: .4byte gUnknown_841623B +_0811044C: .4byte gFameCheckerText_ListMenuCursor thumb_func_end sub_811037C thumb_func_start sub_8110450 diff --git a/asm/party_menu.s b/asm/party_menu.s index e58f3f0d2..55dd4059c 100644 --- a/asm/party_menu.s +++ b/asm/party_menu.s @@ -5118,7 +5118,7 @@ _08121194: ands r0, r1 cmp r0, 0xA beq _081211F0 - ldr r4, _081211E8 @ =gUnknown_84161C1 + ldr r4, _081211E8 @ =gFameCheckerText_Cancel movs r0, 0 adds r1, r4, 0 movs r2, 0 @@ -5146,7 +5146,7 @@ _08121194: .align 2, 0 _081211E0: .4byte gUnknown_845A108 _081211E4: .4byte gUnknown_203B0A0 -_081211E8: .4byte gUnknown_84161C1 +_081211E8: .4byte gFameCheckerText_Cancel _081211EC: .4byte gUnknown_8459FFC _081211F0: ldr r4, _08121240 @ =gUnknown_84161C8 diff --git a/asm/pokemon_summary_screen.s b/asm/pokemon_summary_screen.s index 073727d7f..05256c776 100644 --- a/asm/pokemon_summary_screen.s +++ b/asm/pokemon_summary_screen.s @@ -5401,7 +5401,7 @@ _081372B0: movs r1, 0x1 negs r1, r1 str r1, [sp, 0x4] - ldr r1, _081372E0 @ =gUnknown_84161C1 + ldr r1, _081372E0 @ =gFameCheckerText_Cancel str r1, [sp, 0x8] movs r1, 0x2 movs r2, 0x3 @@ -5415,7 +5415,7 @@ _081372CE: .align 2, 0 _081372D8: .4byte 0x00003003 _081372DC: .4byte gUnknown_8463EF0 -_081372E0: .4byte gUnknown_84161C1 +_081372E0: .4byte gFameCheckerText_Cancel thumb_func_end sub_8137270 thumb_func_start sub_81372E4 diff --git a/asm/shop.s b/asm/shop.s index a732c8656..263e5b3c5 100644 --- a/asm/shop.s +++ b/asm/shop.s @@ -892,7 +892,7 @@ _0809B1F2: muls r4, r0 ldr r0, [r5] adds r0, r4 - ldr r1, _0809B2CC @ =gUnknown_84161C1 + ldr r1, _0809B2CC @ =gFameCheckerText_Cancel bl StringCopy ldr r0, _0809B2D0 @ =gUnknown_2039964 ldr r2, [r0] @@ -990,7 +990,7 @@ _0809B2BC: b _0809B2E6 .align 2, 0 _0809B2C8: .4byte gUnknown_2039968 -_0809B2CC: .4byte gUnknown_84161C1 +_0809B2CC: .4byte gFameCheckerText_Cancel _0809B2D0: .4byte gUnknown_2039964 _0809B2D4: .4byte gUnknown_3005E70 _0809B2D8: .4byte gUnknown_2039934 @@ -1378,7 +1378,7 @@ sub_809B59C: @ 809B59C bl CopyWindowToVram b _0809B5F8 _0809B5E0: - ldr r2, _0809B600 @ =gUnknown_841623B + ldr r2, _0809B600 @ =gFameCheckerText_ListMenuCursor str r5, [sp] movs r0, 0 str r0, [sp, 0x4] @@ -1395,7 +1395,7 @@ _0809B5F8: pop {r0} bx r0 .align 2, 0 -_0809B600: .4byte gUnknown_841623B +_0809B600: .4byte gFameCheckerText_ListMenuCursor thumb_func_end sub_809B59C thumb_func_start sub_809B604 diff --git a/asm/tm_case.s b/asm/tm_case.s index d3bf0cbf2..7ab09953f 100644 --- a/asm/tm_case.s +++ b/asm/tm_case.s @@ -963,7 +963,7 @@ sub_8131FB0: @ 8131FB0 bl CopyWindowToVram b _0813200A _08131FF4: - ldr r2, _08132014 @ =gUnknown_841623B + ldr r2, _08132014 @ =gFameCheckerText_ListMenuCursor str r5, [sp] movs r0, 0 str r0, [sp, 0x4] @@ -979,7 +979,7 @@ _0813200A: pop {r0} bx r0 .align 2, 0 -_08132014: .4byte gUnknown_841623B +_08132014: .4byte gFameCheckerText_ListMenuCursor thumb_func_end sub_8131FB0 thumb_func_start sub_8132018 diff --git a/asm/unk_81507FC.s b/asm/unk_81507FC.s index 205bb7a85..40d5a13b0 100644 --- a/asm/unk_81507FC.s +++ b/asm/unk_81507FC.s @@ -10348,7 +10348,7 @@ _0815579C: ldr r0, [r3] adds r0, r7 ldrb r0, [r0] - ldr r2, _08155860 @ =gUnknown_841623B + ldr r2, _08155860 @ =gFameCheckerText_ListMenuCursor mov r1, r9 str r1, [sp] str r5, [sp, 0x4] @@ -10379,7 +10379,7 @@ _08155850: .4byte 0x00003009 _08155854: .4byte gUnknown_841CDD7 _08155858: .4byte gUnknown_8417938 _0815585C: .4byte gUnknown_841793C -_08155860: .4byte gUnknown_841623B +_08155860: .4byte gFameCheckerText_ListMenuCursor _08155864: .4byte 0x00003014 _08155868: bl IsDma3ManagerBusyWithBgCopy @@ -10453,7 +10453,7 @@ _081558B0: ldr r0, [r1] adds r0, r4 ldrb r1, [r0] - ldr r2, _0815591C @ =gUnknown_841623B + ldr r2, _0815591C @ =gFameCheckerText_ListMenuCursor cmp r7, 0x1 bne _08155920 mov r3, r8 @@ -10464,7 +10464,7 @@ _0815590C: .4byte 0x00003020 _08155910: .4byte 0x00003009 _08155914: .4byte gUnknown_8417938 _08155918: .4byte gUnknown_841793C -_0815591C: .4byte gUnknown_841623B +_0815591C: .4byte gFameCheckerText_ListMenuCursor _08155920: str r6, [sp] _08155922: diff --git a/data/data_83FECCC.s b/data/data_83FECCC.s index 402cd6704..2e5c0e6c7 100644 --- a/data/data_83FECCC.s +++ b/data/data_83FECCC.s @@ -721,8 +721,8 @@ gUnknown_8416188:: @ 8416188 gUnknown_8416190:: @ 8416190 .incbin "baserom.gba", 0x416190, 0x31 -gUnknown_84161C1:: @ 84161C1 - .incbin "baserom.gba", 0x4161C1, 0x7 +gFameCheckerText_Cancel:: @ 84161C1 + .string "CANCEL$" gUnknown_84161C8:: @ 84161C8 .incbin "baserom.gba", 0x4161C8, 0x5 @@ -766,8 +766,8 @@ gUnknown_8416226:: @ 8416226 gUnknown_8416238:: @ 8416238 .incbin "baserom.gba", 0x416238, 0x3 -gUnknown_841623B:: @ 841623B - .incbin "baserom.gba", 0x41623B, 0x2 +gFameCheckerText_ListMenuCursor:: @ 841623B + .string "â–¶$" gUnknown_841623D:: @ 841623D .incbin "baserom.gba", 0x41623D, 0x25 @@ -1237,11 +1237,14 @@ gUnknown_84181B6:: @ 84181B6 gUnknown_84181BE:: @ 84181BE .incbin "baserom.gba", 0x4181BE, 0x5 -gUnknown_84181C3:: @ 84181C3 - .incbin "baserom.gba", 0x4181C3, 0x21 +gFameCheckerText_FameCheckerWillBeClosed:: @ 84181C3 + .string "The FAME CHECKER will be closed.$" -gUnknown_84181E4:: @ 84181E4 - .incbin "baserom.gba", 0x4181E4, 0x4AC +gFameCheckerText_ClearTextbox:: @ 84181E4 + .string "\n $" + +gUnknown_8418204:: @ 8418204 + .incbin "baserom.gba", 0x00418204, 0x48c gUnknown_8418690:: @ 8418690 .incbin "baserom.gba", 0x418690, 0x20 @@ -2090,25 +2093,25 @@ gUnknown_841E572:: @ 841E572 gUnknown_841E58D:: @ 841E58D .incbin "baserom.gba", 0x41E58D, 0x17 -gUnknown_841E5A4:: @ 841E5A4 +gFameCheckerText_MainScreenUI:: @ 841E5A4 .string "{KEYGFX_START_BUTTON}PICK {KEYGFX_DPAD_UP_DOWN}SELECT {KEYGFX_A_BUTTON}OK$" -gUnknown_841E5B9:: @ 841E5B9 +gFameCheckerText_PickScreenUI:: @ 841E5B9 .string "{KEYGFX_START_BUTTON}PICK {KEYGFX_DPAD_UP_DOWN}SELECT {KEYGFX_B_BUTTON}CANCEL$" -gUnknown_841E5D2:: @ 841E5D2 +gFameCheckerText_FlavorTextUI:: @ 841E5D2 .string "{KEYGFX_DPAD_ANY}PICK {KEYGFX_A_BUTTON}READ {UNKNOWN_F8 0x01}CANCEL$" -gUnknown_841E5E9:: @ 841E5E9 +gFameCheckerOakName:: @ 841E5E9 .string "OAK$" -gUnknown_841E5ED:: @ 841E5ED +gFameCheckerDaisyName:: @ 841E5ED .string "DAISY$" -gUnknown_841E5F3:: @ 841E5F3 +gFameCheckerBillName:: @ 841E5F3 .string "BILL$" -gUnknown_841E5F8:: @ 841E5F8 +gFameCheckerMrFujiName:: @ 841E5F8 .string "FUJI$" gUnknown_841E5FD:: @ 841E5FD diff --git a/data/text/fame_checker.inc b/data/text/fame_checker.inc index 975960e4e..d73c05dbd 100644 --- a/data/text/fame_checker.inc +++ b/data/text/fame_checker.inc @@ -1,26 +1,26 @@ -gUnknown_81AD106:: @ 0x81AD106 +gFameCheckerFlavorText_ProfOak0:: @ 0x81AD106 .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}What does this person do?\p" .string "{COLOR RED}{SHADOW GREEN}OAK POKéMON RESEARCH LAB$" -gUnknown_81AD145:: @ 0x81AD145 +gFameCheckerFlavorText_ProfOak1:: @ 0x81AD145 .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}What is this person like?\p" .string "{SIZE 04}{COLOR RED}{SHADOW GREEN}To make a complete guide on all\n" .string "the POKéMON in the world…\p" .string "That was my dream!$" -gUnknown_81AD1BB:: @ 0x81AD1BB +gFameCheckerFlavorText_ProfOak2:: @ 0x81AD1BB .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}What is this person like?\p" .string "{SIZE 05}{COLOR RED}{SHADOW GREEN}PROF. OAK may not look like much,\n" .string "but he’s the authority on POKéMON.\p" .string "Many POKéMON TRAINERS hold him in\n" .string "high regard.$" -gUnknown_81AD258:: @ 0x81AD258 +gFameCheckerFlavorText_ProfOak3:: @ 0x81AD258 .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}Family and friends?\p" .string "{COLOR RED}{SHADOW GREEN}PROF. OAK reportedly lives with his\n" .string "grandchildren, DAISY and {RIVAL}.$" -gUnknown_81AD2B9:: @ 0x81AD2B9 +gFameCheckerFlavorText_ProfOak4:: @ 0x81AD2B9 .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}Family and friends?\p" .string "{SIZE 05}{COLOR RED}{SHADOW GREEN}I hear OAK’s taken a lot of\n" .string "interest in you, child.\p" @@ -29,57 +29,57 @@ gUnknown_81AD2B9:: @ 0x81AD2B9 .string "But that was decades ago.\n" .string "He’s a shadow of his former self.$" -gUnknown_81AD377:: @ 0x81AD377 +gFameCheckerFlavorText_ProfOak5:: @ 0x81AD377 .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}What does this person do?\p" .string "{SIZE 04}{COLOR RED}{SHADOW GREEN}PROF. OAK is going to have his own\n" .string "radio show soon.\p" .string "The program will be called PROF.\n" .string "OAK’S POKéMON SEMINAR.$" -gUnknown_81AD40C:: @ 0x81AD40C +gFameCheckerFlavorText_Daisy0:: @ 0x81AD40C .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}What does this person do?\p" .string "{SIZE 04}{COLOR RED}{SHADOW GREEN}If you show DAISY your POKéMON,\n" .string "she can tell how much it likes you.\p" .string "Occasionally, she will even groom\n" .string "a POKéMON for you.$" -gUnknown_81AD4AE:: @ 0x81AD4AE +gFameCheckerFlavorText_Daisy1:: @ 0x81AD4AE .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}What is this person like?\p" .string "{SIZE 05}{COLOR RED}{SHADOW GREEN}But the person who is most liked by\n" .string "POKéMON is DAISY, I think.$" -gUnknown_81AD516:: @ 0x81AD516 +gFameCheckerFlavorText_Daisy2:: @ 0x81AD516 .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}What is this person like?\p" .string "{SIZE 04}{COLOR RED}{SHADOW GREEN}She was gently grooming POKéMON…\n" .string "She was a little angel.\p" .string "That little girl’s name…\n" .string "I think it was DAISY.$" -gUnknown_81AD5A7:: @ 0x81AD5A7 +gFameCheckerFlavorText_Daisy3:: @ 0x81AD5A7 .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}Family and friends?\p" .string "{COLOR RED}{SHADOW GREEN}PROF. OAK reportedly lives with his\n" .string "grandchildren, DAISY and {RIVAL}.$" -gUnknown_81AD608:: @ 0x81AD608 +gFameCheckerFlavorText_Daisy4:: @ 0x81AD608 .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}What is this person like?\p" .string "{SIZE 05}{COLOR RED}{SHADOW GREEN}A girl from PALLET TOWN, DAISY,\n" .string "she enjoys TEA every day.\p" .string "She visits the CELADON DEPT. STORE\n" .string "to buy some TEA.$" -gUnknown_81AD69F:: @ 0x81AD69F +gFameCheckerFlavorText_Daisy5:: @ 0x81AD69F .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}There’s a rumor…\p" .string "{COLOR RED}{SHADOW GREEN}The Spring POKéMON CONTEST’s\n" .string "Grand Champion is DAISY OAK of\l" .string "PALLET TOWN!$" -gUnknown_81AD705:: @ 0x81AD705 +gFameCheckerFlavorText_Brock0:: @ 0x81AD705 .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}What does this person do?\p" .string "{COLOR RED}{SHADOW GREEN}PEWTER CITY POKéMON GYM\n" .string "LEADER: BROCK\l" .string "The Rock-Solid POKéMON TRAINER!$" -gUnknown_81AD771:: @ 0x81AD771 +gFameCheckerFlavorText_Brock1:: @ 0x81AD771 .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}Favorite kind of POKéMON?\p" .string "{SIZE 04}{COLOR RED}{SHADOW GREEN}My rock-hard willpower is evident\n" .string "in even my POKéMON.\p" @@ -88,7 +88,7 @@ gUnknown_81AD771:: @ 0x81AD771 .string "That’s right - my POKéMON are all\n" .string "the ROCK type!$" -gUnknown_81AD840:: @ 0x81AD840 +gFameCheckerFlavorText_Brock2:: @ 0x81AD840 .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}What is this person like?\p" .string "{SIZE 04}{COLOR RED}{SHADOW GREEN}There aren’t many serious POKéMON\n" .string "TRAINERS here.\p" @@ -97,163 +97,163 @@ gUnknown_81AD840:: @ 0x81AD840 .string "But PEWTER GYM’s BROCK isn’t like\n" .string "that, not one bit.$" -gUnknown_81AD908:: @ 0x81AD908 +gFameCheckerFlavorText_Brock3:: @ 0x81AD908 .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}What is this person like?\p" .string "{SIZE 04}{COLOR RED}{SHADOW GREEN}BROCK is cool. He’s not just tough.\n" .string "People like and respect him.\p" .string "I want to become a GYM LEADER\n" .string "like him.$" -gUnknown_81AD99A:: @ 0x81AD99A +gFameCheckerFlavorText_Brock4:: @ 0x81AD99A .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}What does this person do?\p" .string "{SIZE 04}{COLOR RED}{SHADOW GREEN}Hi, I’m excavating for fossils here\n" .string "under MT. MOON.\p" .string "Sometimes, BROCK of PEWTER GYM\n" .string "lends me a hand.$" -gUnknown_81ADA27:: @ 0x81ADA27 +gFameCheckerFlavorText_Brock5:: @ 0x81ADA27 .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}What is this person like?\p" .string "{COLOR RED}{SHADOW GREEN}BROCK rarely laughs, but is said to\n" .string "be unable to stop if he starts.$" -gUnknown_81ADA91:: @ 0x81ADA91 +gFameCheckerFlavorText_Misty0:: @ 0x81ADA91 .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}What does this person do?\p" .string "{COLOR RED}{SHADOW GREEN}CERULEAN CITY POKéMON GYM\n" .string "LEADER: MISTY\l" .string "The Tomboyish Mermaid!$" -gUnknown_81ADAF6:: @ 0x81ADAF6 +gFameCheckerFlavorText_Misty1:: @ 0x81ADAF6 .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}Favorite kind of POKéMON?\p" .string "{SIZE 05}{COLOR RED}{SHADOW GREEN}My policy is an all-out offensive\n" .string "with WATER-type POKéMON!$" -gUnknown_81ADB5A:: @ 0x81ADB5A +gFameCheckerFlavorText_Misty2:: @ 0x81ADB5A .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}What is this person like?\p" .string "{SIZE 04}{COLOR RED}{SHADOW GREEN}MISTY is a TRAINER who’s going to\n" .string "keep improving.\p" .string "She won’t lose to someone like you!$" -gUnknown_81ADBD9:: @ 0x81ADBD9 +gFameCheckerFlavorText_Misty3:: @ 0x81ADBD9 .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}There’s a rumor…\p" .string "{SIZE 04}{COLOR RED}{SHADOW GREEN}Strong TRAINERS and WATER POKéMON\n" .string "are common sights in these parts.\p" .string "They say that MISTY of the\n" .string "CERULEAN GYM trains here.$" -gUnknown_81ADC72:: @ 0x81ADC72 +gFameCheckerFlavorText_Misty4:: @ 0x81ADC72 .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}There’s a rumor…\p" .string "{SIZE 05}{COLOR RED}{SHADOW GREEN}This cape is a famous date spot.\p" .string "MISTY, the GYM LEADER, has high\n" .string "hopes about this place.$" -gUnknown_81ADCEB:: @ 0x81ADCEB +gFameCheckerFlavorText_Misty5:: @ 0x81ADCEB .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}There’s a rumor…\p" .string "{COLOR RED}{SHADOW GREEN}MISTY is said to worship LORELEI\n" .string "of the ELITE FOUR.$" -gUnknown_81ADD3C:: @ 0x81ADD3C +gFameCheckerFlavorText_LtSurge0:: @ 0x81ADD3C .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}What does this person do?\p" .string "{COLOR RED}{SHADOW GREEN}VERMILION CITY POKéMON GYM\n" .string "LEADER: LT. SURGE\l" .string "The Lightning American!$" -gUnknown_81ADDA7:: @ 0x81ADDA7 +gFameCheckerFlavorText_LtSurge1:: @ 0x81ADDA7 .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}Favorite kind of POKéMON?\p" .string "{SIZE 04}{COLOR RED}{SHADOW GREEN}I tell you, kid, electric POKéMON\n" .string "saved me during the war!$" -gUnknown_81ADE0B:: @ 0x81ADE0B +gFameCheckerFlavorText_LtSurge2:: @ 0x81ADE0B .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}What is this person like?\p" .string "{SIZE 04}{COLOR RED}{SHADOW GREEN}When I was in the Army, LT. SURGE\n" .string "was my strict CO.\p" .string "He was a hard taskmaster.$" -gUnknown_81ADE82:: @ 0x81ADE82 +gFameCheckerFlavorText_LtSurge3:: @ 0x81ADE82 .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}What is this person like?\p" .string "{SIZE 04}{COLOR RED}{SHADOW GREEN}LT. SURGE was always famous for\n" .string "his cautious nature in the Army.$" -gUnknown_81ADEEC:: @ 0x81ADEEC +gFameCheckerFlavorText_LtSurge4:: @ 0x81ADEEC .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}What is this person like?\p" .string "{SIZE 04}{COLOR RED}{SHADOW GREEN}LT. SURGE installed the traps in\n" .string "the GYM himself.\p" .string "He set up double locks everywhere.$" -gUnknown_81ADF6A:: @ 0x81ADF6A +gFameCheckerFlavorText_LtSurge5:: @ 0x81ADF6A .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}There’s a rumor…\p" .string "{COLOR RED}{SHADOW GREEN}LT. SURGE is rumored to have been\n" .string "a pilot while home in America.\p" .string "He used the electricity generated\n" .string "by POKéMON to power his plane.$" -gUnknown_81AE009:: @ 0x81AE009 +gFameCheckerFlavorText_Erika0:: @ 0x81AE009 .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}What does this person do?\p" .string "{COLOR RED}{SHADOW GREEN}CELADON CITY POKéMON GYM\n" .string "LEADER: ERIKA\l" .string "The Nature-Loving Princess!$" -gUnknown_81AE072:: @ 0x81AE072 +gFameCheckerFlavorText_Erika1:: @ 0x81AE072 .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}Favorite kind of POKéMON?\p" .string "{SIZE 05}{COLOR RED}{SHADOW GREEN}I am a student of the art of\n" .string "flower arranging.\p" .string "My POKéMON are solely of the\n" .string "GRASS type.$" -gUnknown_81AE0F3:: @ 0x81AE0F3 +gFameCheckerFlavorText_Erika2:: @ 0x81AE0F3 .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}What is this person like?\p" .string "{SIZE 05}{COLOR RED}{SHADOW GREEN}Our LEADER ERIKA might be quiet,\n" .string "but she’s famous around here.$" -gUnknown_81AE15B:: @ 0x81AE15B +gFameCheckerFlavorText_Erika3:: @ 0x81AE15B .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}What is this person like?\p" .string "{SIZE 05}{COLOR RED}{SHADOW GREEN}We only use GRASS-type POKéMON at\n" .string "our GYM.\p" .string "Why? We also use them for making\n" .string "flower arrangements!$" -gUnknown_81AE1E5:: @ 0x81AE1E5 +gFameCheckerFlavorText_Erika4:: @ 0x81AE1E5 .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}Favorite kind of POKéMON?\p" .string "{SIZE 05}{COLOR RED}{SHADOW GREEN}I would never collect POKéMON if\n" .string "they were unattractive.$" -gUnknown_81AE247:: @ 0x81AE247 +gFameCheckerFlavorText_Erika5:: @ 0x81AE247 .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}There’s a rumor…\p" .string "{COLOR RED}{SHADOW GREEN}Rumor has it that if you peek into\n" .string "CELADON GYM, you can often\l" .string "see ERIKA snoozing.$" -gUnknown_81AE2B6:: @ 0x81AE2B6 +gFameCheckerFlavorText_Koga0:: @ 0x81AE2B6 .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}What does this person do?\p" .string "{COLOR RED}{SHADOW GREEN}FUCHSIA CITY POKéMON GYM\n" .string "LEADER: KOGA\l" .string "The Poisonous Ninja Master$" -gUnknown_81AE31D:: @ 0x81AE31D +gFameCheckerFlavorText_Koga1:: @ 0x81AE31D .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}Favorite kind of POKéMON?\p" .string "{SIZE 04}{COLOR RED}{SHADOW GREEN}Despair to the creeping horror of\n" .string "POISON-type POKéMON!$" -gUnknown_81AE37D:: @ 0x81AE37D +gFameCheckerFlavorText_Koga2:: @ 0x81AE37D .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}What is this person like?\p" .string "{SIZE 04}{COLOR RED}{SHADOW GREEN}Even though I’ve lost, I will keep\n" .string "training according to the teachings\l" .string "of KOGA, my ninja master.$" -gUnknown_81AE407:: @ 0x81AE407 +gFameCheckerFlavorText_Koga3:: @ 0x81AE407 .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}Family and friends?\p" .string "{SIZE 05}{COLOR RED}{SHADOW GREEN}My father is the GYM LEADER of\n" .string "this town.\p" .string "I’m training to use POISON POKéMON\n" .string "as well as my father.$" -gUnknown_81AE48D:: @ 0x81AE48D +gFameCheckerFlavorText_Koga4:: @ 0x81AE48D .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}There’s a rumor…\p" .string "{COLOR RED}{SHADOW GREEN}KOGA is said to have a thorough\n" .string "knowledge of medicine.\p" .string "He even concocts medicine to nurse\n" .string "his POKéMON to health.$" -gUnknown_81AE51B:: @ 0x81AE51B +gFameCheckerFlavorText_Koga5:: @ 0x81AE51B .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}What does this person do?\p" .string "{SIZE 04}{COLOR RED}{SHADOW GREEN}The SAFARI ZONE’s huge, wouldn’t\n" .string "you say?\p" @@ -262,55 +262,55 @@ gUnknown_81AE51B:: @ 0x81AE51B .string "Thanks to him, we can play here\n" .string "knowing that we’re safe.$" -gUnknown_81AE5E8:: @ 0x81AE5E8 +gFameCheckerFlavorText_Sabrina0:: @ 0x81AE5E8 .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}What does this person do?\p" .string "{COLOR RED}{SHADOW GREEN}SAFFRON CITY POKéMON GYM\n" .string "LEADER: SABRINA\l" .string "The Master of PSYCHIC POKéMON!$" -gUnknown_81AE656:: @ 0x81AE656 +gFameCheckerFlavorText_Sabrina1:: @ 0x81AE656 .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}Favorite kind of POKéMON?\p" .string "{SIZE 04}{COLOR RED}{SHADOW GREEN}You know about a girl GYM LEADER\n" .string "in SAFFRON CITY?\p" .string "She uses PSYCHIC-type POKéMON,\n" .string "right?$" -gUnknown_81AE6D7:: @ 0x81AE6D7 +gFameCheckerFlavorText_Sabrina2:: @ 0x81AE6D7 .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}What is this person like?\p" .string "{SIZE 05}{COLOR RED}{SHADOW GREEN}I have had psychic powers since\n" .string "I was a child.\p" .string "It started when a spoon I\n" .string "carelessly tossed, bent.$" -gUnknown_81AE762:: @ 0x81AE762 +gFameCheckerFlavorText_Sabrina3:: @ 0x81AE762 .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}What is this person like?\p" .string "{SIZE 05}{COLOR RED}{SHADOW GREEN}I dislike battling, but if you wish,\n" .string "I will show you my powers!$" -gUnknown_81AE7CB:: @ 0x81AE7CB +gFameCheckerFlavorText_Sabrina4:: @ 0x81AE7CB .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}There’s a rumor…\p" .string "{COLOR RED}{SHADOW GREEN}People say that SABRINA can\n" .string "communicate with her POKéMON\l" .string "during battle without speaking.$" -gUnknown_81AE841:: @ 0x81AE841 +gFameCheckerFlavorText_Sabrina5:: @ 0x81AE841 .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}What is this person like?\p" .string "{SIZE 04}{COLOR RED}{SHADOW GREEN}SABRINA just wiped out the KARATE\n" .string "MASTER next door.$" -gUnknown_81AE89E:: @ 0x81AE89E +gFameCheckerFlavorText_Blaine0:: @ 0x81AE89E .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}What does this person do?\p" .string "{COLOR RED}{SHADOW GREEN}CINNABAR ISLAND POKéMON GYM\n" .string "LEADER: BLAINE\l" .string "The Hotheaded Quiz Master!$" -gUnknown_81AE90A:: @ 0x81AE90A +gFameCheckerFlavorText_Blaine1:: @ 0x81AE90A .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}Favorite kind of POKéMON?\p" .string "{SIZE 04}{COLOR RED}{SHADOW GREEN}My fiery POKéMON are all rough\n" .string "and ready with intense heat!\p" .string "They incinerate all challengers!$" -gUnknown_81AE990:: @ 0x81AE990 +gFameCheckerFlavorText_Blaine2:: @ 0x81AE990 .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}Favorite kind of POKéMON?\p" .string "{SIZE 04}{COLOR RED}{SHADOW GREEN}Our LEADER, BLAINE, became lost\n" .string "in the mountains but good.\p" @@ -319,56 +319,56 @@ gUnknown_81AE990:: @ 0x81AE990 .string "Its light allowed BLAINE to find\n" .string "his way down safely.$" -gUnknown_81AEA59:: @ 0x81AEA59 +gFameCheckerFlavorText_Blaine3:: @ 0x81AEA59 .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}What is this person like?\p" .string "{SIZE 05}{COLOR RED}{SHADOW GREEN}CINNABAR GYM’s BLAINE is quite the\n" .string "odd fellow.\p" .string "He’s lived on the island since way\n" .string "before the LAB was built.$" -gUnknown_81AEAEE:: @ 0x81AEAEE +gFameCheckerFlavorText_Blaine4:: @ 0x81AEAEE .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}Family and friends?\p" .string "{COLOR RED}{SHADOW GREEN}It’s a photo of BLAINE and\n" .string "MR. FUJI.\p" .string "They’re standing shoulder to\n" .string "shoulder with big grins.$" -gUnknown_81AEB69:: @ 0x81AEB69 +gFameCheckerFlavorText_Blaine5:: @ 0x81AEB69 .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}There’s a rumor…\p" .string "{COLOR RED}{SHADOW GREEN}BLAINE is said to remove his dark\n" .string "shades only when he is thinking up\l" .string "new quiz questions.$" -gUnknown_81AEBDF:: @ 0x81AEBDF +gFameCheckerFlavorText_Lorelei0:: @ 0x81AEBDF .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}What does this person do?\p" .string "{SIZE 05}{COLOR RED}{SHADOW GREEN}I am LORELEI of the ELITE FOUR.$" -gUnknown_81AEC28:: @ 0x81AEC28 +gFameCheckerFlavorText_Lorelei1:: @ 0x81AEC28 .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}Favorite kind of POKéMON?\p" .string "{SIZE 05}{COLOR RED}{SHADOW GREEN}No one can best me when it comes\n" .string "to icy POKéMON.$" -gUnknown_81AEC82:: @ 0x81AEC82 +gFameCheckerFlavorText_Lorelei2:: @ 0x81AEC82 .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}Where was this person born?\p" .string "{SIZE 04}{COLOR RED}{SHADOW GREEN}We’ve had a great and powerful\n" .string "TRAINER grow up on this island.\p" .string "I bet even you’d know her.\n" .string "It’s LORELEI of the ELITE FOUR!$" -gUnknown_81AED27:: @ 0x81AED27 +gFameCheckerFlavorText_Lorelei3:: @ 0x81AED27 .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}What is this person like?\p" .string "{COLOR RED}{SHADOW GREEN}Known for her logical, calculated,\n" .string "and cool battling style, LORELEI\l" .string "has a surprising secret!$" -gUnknown_81AEDAA:: @ 0x81AEDAA +gFameCheckerFlavorText_Lorelei4:: @ 0x81AEDAA .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}What is this person like?\p" .string "{SIZE 05}{COLOR RED}{SHADOW GREEN}Did you know that LORELEI has lots\n" .string "and lots of stuffed dolls?\p" .string "Every time she comes back to\n" .string "FOUR ISLAND, her collection grows!$" -gUnknown_81AEE51:: @ 0x81AEE51 +gFameCheckerFlavorText_Lorelei5:: @ 0x81AEE51 .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}Favorite kind of POKéMON?\p" .string "{SIZE 05}{COLOR RED}{SHADOW GREEN}The LAPRAS she has, I imagine it\n" .string "to be the one she met as a child.\p" @@ -377,29 +377,29 @@ gUnknown_81AEE51:: @ 0x81AEE51 .string "Perhaps that POKéMON has been with\n" .string "her ever since.$" -gUnknown_81AEF25:: @ 0x81AEF25 +gFameCheckerFlavorText_Bruno0:: @ 0x81AEF25 .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}What does this person do?\p" .string "{SIZE 04}{COLOR RED}{SHADOW GREEN}I am BRUNO of the ELITE FOUR!$" -gUnknown_81AEF6C:: @ 0x81AEF6C +gFameCheckerFlavorText_Bruno1:: @ 0x81AEF6C .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}Favorite kind of POKéMON?\p" .string "{SIZE 04}{COLOR RED}{SHADOW GREEN}I’ve lived and trained with my\n" .string "fighting POKéMON!$" -gUnknown_81AEFC6:: @ 0x81AEFC6 +gFameCheckerFlavorText_Bruno2:: @ 0x81AEFC6 .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}What is this person like?\p" .string "{COLOR RED}{SHADOW GREEN}BRUNO apparently joined the ELITE\n" .string "FOUR out of his burning ambition to\l" .string "battle the best TRAINERS.$" -gUnknown_81AF04C:: @ 0x81AF04C +gFameCheckerFlavorText_Bruno3:: @ 0x81AF04C .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}What is this person like?\p" .string "{SIZE 04}{COLOR RED}{SHADOW GREEN}BRUNO, who’s a senior ahead of me,\n" .string "visits the SPA on occasion.\p" .string "He comes to rehab injuries, both\n" .string "his own and his POKéMON’s.$" -gUnknown_81AF0F0:: @ 0x81AF0F0 +gFameCheckerFlavorText_Bruno4:: @ 0x81AF0F0 .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}There’s a rumor…\p" .string "{SIZE 05}{COLOR RED}{SHADOW GREEN}He’s one of the ELITE FOUR.\n" .string "His name is BRUNO.\p" @@ -407,35 +407,35 @@ gUnknown_81AF0F0:: @ 0x81AF0F0 .string "found out that they were all sold\l" .string "out of Rage Candybars.$" -gUnknown_81AF19A:: @ 0x81AF19A +gFameCheckerFlavorText_Bruno5:: @ 0x81AF19A .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}Family and friends?\p" .string "{SIZE 04}{COLOR RED}{SHADOW GREEN}Even BRUNO…\n" .string "He trained with a fellow by the\l" .string "name of BRAWLY before.$" -gUnknown_81AF200:: @ 0x81AF200 +gFameCheckerFlavorText_Agatha0:: @ 0x81AF200 .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}What does this person do?\p" .string "{SIZE 05}{COLOR RED}{SHADOW GREEN}I am AGATHA of the ELITE FOUR.$" -gUnknown_81AF248:: @ 0x81AF248 +gFameCheckerFlavorText_Agatha1:: @ 0x81AF248 .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}Favorite kind of POKéMON?\p" .string "{SIZE 04}{COLOR RED}{SHADOW GREEN}AGATHA’s GHOST-type POKéMON are\n" .string "horrifically terrifying in toughness.$" -gUnknown_81AF2B7:: @ 0x81AF2B7 +gFameCheckerFlavorText_Agatha2:: @ 0x81AF2B7 .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}What is this person like?\p" .string "{SIZE 04}{COLOR RED}{SHADOW GREEN}That old lady’s also got a really\n" .string "short fuse, too.\p" .string "It doesn’t take anything to get\n" .string "that scary lady hollering.$" -gUnknown_81AF34E:: @ 0x81AF34E +gFameCheckerFlavorText_Agatha3:: @ 0x81AF34E .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}There’s a rumor…\p" .string "{COLOR RED}{SHADOW GREEN}In her youth, AGATHA and PROF.\n" .string "OAK were rivals who vied for\l" .string "supremacy as TRAINERS.$" -gUnknown_81AF3BE:: @ 0x81AF3BE +gFameCheckerFlavorText_Agatha4:: @ 0x81AF3BE .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}Family and friends?\p" .string "{SIZE 05}{COLOR RED}{SHADOW GREEN}I hear OAK’s taken a lot of\n" .string "interest in you, child.\p" @@ -444,19 +444,19 @@ gUnknown_81AF3BE:: @ 0x81AF3BE .string "But that was decades ago.\n" .string "He’s a shadow of his former self.$" -gUnknown_81AF47C:: @ 0x81AF47C +gFameCheckerFlavorText_Agatha5:: @ 0x81AF47C .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}What is this person like?\p" .string "{SIZE 05}{COLOR RED}{SHADOW GREEN}Take AGATHA, for example.\p" .string "She set a record for being the\n" .string "oldest-ever ELITE FOUR member.$" -gUnknown_81AF4FD:: @ 0x81AF4FD +gFameCheckerFlavorText_Lance0:: @ 0x81AF4FD .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}What does this person do?\p" .string "{SIZE 04}{COLOR RED}{SHADOW GREEN}I lead the ELITE FOUR.\p" .string "You can call me LANCE the dragon\n" .string "TRAINER.$" -gUnknown_81AF567:: @ 0x81AF567 +gFameCheckerFlavorText_Lance1:: @ 0x81AF567 .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}Favorite kind of POKéMON?\p" .string "{SIZE 04}{COLOR RED}{SHADOW GREEN}You know that dragons are\n" .string "mythical POKéMON.\p" @@ -465,13 +465,13 @@ gUnknown_81AF567:: @ 0x81AF567 .string "They’re virtually indestructible.\n" .string "There’s no being clever with them.$" -gUnknown_81AF641:: @ 0x81AF641 +gFameCheckerFlavorText_Lance2:: @ 0x81AF641 .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}What is this person like?\p" .string "{SIZE 05}{COLOR RED}{SHADOW GREEN}He stands for justice!\n" .string "He’s cool, and yet passionate!\l" .string "He’s the greatest, LANCE!$" -gUnknown_81AF6BA:: @ 0x81AF6BA +gFameCheckerFlavorText_Lance3:: @ 0x81AF6BA .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}There’s a rumor…\p" .string "{SIZE 05}{COLOR RED}{SHADOW GREEN}We have a customer, LANCE, who\n" .string "occasionally comes.\p" @@ -479,62 +479,62 @@ gUnknown_81AF6BA:: @ 0x81AF6BA .string "I wonder… Does he have many\n" .string "identical capes at home?$" -gUnknown_81AF758:: @ 0x81AF758 +gFameCheckerFlavorText_Lance4:: @ 0x81AF758 .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}Family and friends?\p" .string "{COLOR RED}{SHADOW GREEN}LANCE’s grandfather is thought to\n" .string "be the elder of a famous clan of\l" .string "dragon masters.$" -gUnknown_81AF7CB:: @ 0x81AF7CB +gFameCheckerFlavorText_Lance5:: @ 0x81AF7CB .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}Family and friends?\p" .string "{SIZE 04}{COLOR RED}{SHADOW GREEN}From what I’ve heard, LANCE has\n" .string "a cousin who’s a GYM LEADER\l" .string "somewhere far away.$" -gUnknown_81AF83E:: @ 0x81AF83E +gFameCheckerFlavorText_Bill0:: @ 0x81AF83E .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}What does this person do?\p" .string "{SIZE 04}{COLOR RED}{SHADOW GREEN}After all, BILL’s world-famous as a\n" .string "POKéMANIAC.\p" .string "He invented the POKéMON Storage\n" .string "System on PC, too.$" -gUnknown_81AF8CA:: @ 0x81AF8CA +gFameCheckerFlavorText_Bill1:: @ 0x81AF8CA .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}Favorite kind of POKéMON?\p" .string "{SIZE 04}{COLOR RED}{SHADOW GREEN}BILL has lots of POKéMON!\n" .string "He collects rare ones, too!$" -gUnknown_81AF929:: @ 0x81AF929 +gFameCheckerFlavorText_Bill2:: @ 0x81AF929 .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}What is this person like?\p" .string "{SIZE 04}{COLOR RED}{SHADOW GREEN}He’s my grandson!\p" .string "He always liked collecting things,\n" .string "even as a child!$" -gUnknown_81AF998:: @ 0x81AF998 +gFameCheckerFlavorText_Bill3:: @ 0x81AF998 .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}Favorite kind of POKéMON?\p" .string "{SIZE 04}{COLOR RED}{SHADOW GREEN}BILL is a POKéMANIAC, so he loves\n" .string "every kind.\p" .string "Apparently, the first one he caught\n" .string "was an ABRA.$" -gUnknown_81AFA20:: @ 0x81AFA20 +gFameCheckerFlavorText_Bill4:: @ 0x81AFA20 .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}Family and friends?\p" .string "{SIZE 04}{COLOR RED}{SHADOW GREEN}BILL’s hometown is GOLDENROD CITY,\n" .string "where his folks still live.\p" .string "I’ve heard that it’s quite the\n" .string "festive, bustling city.$" -gUnknown_81AFAB9:: @ 0x81AFAB9 +gFameCheckerFlavorText_Bill5:: @ 0x81AFAB9 .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}There’s a rumor…\p" .string "{SIZE 04}{COLOR RED}{SHADOW GREEN}Apparently, BILL simply can’t\n" .string "stomach milk at all.$" -gUnknown_81AFB0C:: @ 0x81AFB0C +gFameCheckerFlavorText_MrFuji0:: @ 0x81AFB0C .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}What does this person do?\p" .string "{SIZE 05}{COLOR RED}{SHADOW GREEN}He’s really kind.\p" .string "He looks after abandoned and\n" .string "orphaned POKéMON.$" -gUnknown_81AFB76:: @ 0x81AFB76 +gFameCheckerFlavorText_MrFuji1:: @ 0x81AFB76 .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}What is this person like?\p" .string "{SIZE 04}{COLOR RED}{SHADOW GREEN}This old guy marched right up to\n" .string "our HIDEOUT.\p" @@ -543,7 +543,7 @@ gUnknown_81AFB76:: @ 0x81AFB76 .string "So, we’re just talking it over as\n" .string "adults.$" -gUnknown_81AFC38:: @ 0x81AFC38 +gFameCheckerFlavorText_MrFuji2:: @ 0x81AFC38 .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}What is this person like?\p" .string "{COLOR RED}{SHADOW GREEN}POKéMON FAN MAGAZINE\n" .string "Monthly Grand Prize Drawing!\p" @@ -551,26 +551,26 @@ gUnknown_81AFC38:: @ 0x81AFC38 .string "Gone! It’s been clipped out.\n" .string "Someone must have applied already.$" -gUnknown_81AFCE9:: @ 0x81AFCE9 +gFameCheckerFlavorText_MrFuji3:: @ 0x81AFCE9 .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}There’s a rumor…\p" .string "{SIZE 04}{COLOR RED}{SHADOW GREEN}I hear that MR. FUJI’s not from\n" .string "these parts originally, either.$" -gUnknown_81AFD49:: @ 0x81AFD49 +gFameCheckerFlavorText_MrFuji4:: @ 0x81AFD49 .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}Family and friends?\p" .string "{COLOR RED}{SHADOW GREEN}It’s a photo of BLAINE and\n" .string "MR. FUJI.\p" .string "They’re standing shoulder to\n" .string "shoulder with big grins.$" -gUnknown_81AFDC4:: @ 0x81AFDC4 +gFameCheckerFlavorText_MrFuji5:: @ 0x81AFDC4 .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}What is this person like?\p" .string "{COLOR RED}{SHADOW GREEN}Editor: The shy MR. FUJI turned\n" .string "down our interview requests.\p" .string "He is a kindly man who is adored\n" .string "and respected in LAVENDER TOWN.$" -gUnknown_81AFE68:: @ 0x81AFE68 +gFameCheckerFlavorText_Giovanni0:: @ 0x81AFE68 .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}What does this person do?\p" .string "{SIZE 04}{COLOR RED}{SHADOW GREEN}TEAM ROCKET captures POKéMON from\n" .string "around the world.\p" @@ -578,32 +578,32 @@ gUnknown_81AFE68:: @ 0x81AFE68 .string "our criminal enterprise going.\p" .string "I am the leader, GIOVANNI!$" -gUnknown_81AFF23:: @ 0x81AFF23 +gFameCheckerFlavorText_Giovanni1:: @ 0x81AFF23 .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}Favorite kind of POKéMON?\p" .string "{SIZE 04}{COLOR RED}{SHADOW GREEN}Those thugs that took over our\n" .string "building…\p" .string "Their BOSS said he was looking for\n" .string "strong POKéMON.$" -gUnknown_81AFFA8:: @ 0x81AFFA8 +gFameCheckerFlavorText_Giovanni2:: @ 0x81AFFA8 .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}What is this person like?\p" .string "{SIZE 04}{COLOR RED}{SHADOW GREEN}TEAM ROCKET’s BOSS is terribly\n" .string "cruel!\p" .string "To him, POKéMON are just tools to\n" .string "be used.$" -gUnknown_81B0022:: @ 0x81B0022 +gFameCheckerFlavorText_Giovanni3:: @ 0x81B0022 .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}What does this person do?\p" .string "{SIZE 04}{COLOR RED}{SHADOW GREEN}Welcome to my hideout!\p" .string "It shall be so until I can restore\n" .string "TEAM ROCKET to its former glory.$" -gUnknown_81B00A6:: @ 0x81B00A6 +gFameCheckerFlavorText_Giovanni4:: @ 0x81B00A6 .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}What does this person do?\p" .string "{SIZE 04}{COLOR RED}{SHADOW GREEN}Blow me away! GIOVANNI was the\n" .string "GYM LEADER of VIRIDIAN?$" -gUnknown_81B0106:: @ 0x81B0106 +gFameCheckerFlavorText_Giovanni5:: @ 0x81B0106 .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}Family and friends?\p" .string "{SIZE 04}{COLOR RED}{SHADOW GREEN}You… You’re not GIOVANNI’s kid,\n" .string "are you?\p" @@ -611,10 +611,10 @@ gUnknown_81B0106:: @ 0x81B0106 .string "GIOVANNI’s kid has red hair.$" -gUnknown_81B0188:: @ 0x81B0188 +gFameCheckerPersonName_ProfOak:: @ 0x81B0188 .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}PROF. OAK$" -gUnknown_81B0198:: @ 0x81B0198 +gFameCheckerPersonQuote_ProfOak:: @ 0x81B0198 .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}From: PROF. OAK\n" .string "To: {PLAYER}\p" .string "{SIZE 04}{COLOR RED}{SHADOW GREEN}Why do POKéMON compete and battle\n" @@ -624,10 +624,10 @@ gUnknown_81B0198:: @ 0x81B0198 .string "towards POKéMON.\p" .string "Never forget that.$" -gUnknown_81B0251:: @ 0x81B0251 +gFameCheckerPersonName_Daisy:: @ 0x81B0251 .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}DAISY$" -gUnknown_81B025D:: @ 0x81B025D +gFameCheckerPersonQuote_Daisy:: @ 0x81B025D .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}From: DAISY\n" .string "To: {PLAYER}\p" .string "{SIZE 05}{COLOR RED}{SHADOW GREEN}While I was comfortably enjoying\n" @@ -636,10 +636,10 @@ gUnknown_81B025D:: @ 0x81B025D .string "I hope you’ll remain a good rival\n" .string "to my little brother.$" -gUnknown_81B030F:: @ 0x81B030F +gFameCheckerPersonName_Brock:: @ 0x81B030F .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}BROCK$" -gUnknown_81B031B:: @ 0x81B031B +gFameCheckerPersonQuote_Brock:: @ 0x81B031B .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}From: BROCK\n" .string "To: {PLAYER}\p" .string "{SIZE 04}{COLOR RED}{SHADOW GREEN}In this big world of ours, there\n" @@ -647,10 +647,10 @@ gUnknown_81B031B:: @ 0x81B031B .string "Let’s both keep training and\n" .string "making ourselves stronger!$" -gUnknown_81B03B3:: @ 0x81B03B3 +gFameCheckerPersonName_Misty:: @ 0x81B03B3 .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}MISTY$" -gUnknown_81B03BF:: @ 0x81B03BF +gFameCheckerPersonQuote_Misty:: @ 0x81B03BF .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}From: MISTY\n" .string "To: {PLAYER}\p" .string "{SIZE 05}{COLOR RED}{SHADOW GREEN}I’m going to keep training here at\n" @@ -658,10 +658,10 @@ gUnknown_81B03BF:: @ 0x81B03BF .string "When I get better, I’d love to hit\n" .string "the road and travel.$" -gUnknown_81B0446:: @ 0x81B0446 +gFameCheckerPersonName_LtSurge:: @ 0x81B0446 .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}LT. SURGE$" -gUnknown_81B0456:: @ 0x81B0456 +gFameCheckerPersonQuote_LtSurge:: @ 0x81B0456 .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}From: LT. SURGE\n" .string "To: {PLAYER}\p" .string "{SIZE 04}{COLOR RED}{SHADOW GREEN}Hey, kid!\n" @@ -671,10 +671,10 @@ gUnknown_81B0456:: @ 0x81B0456 .string "It made me change my mind about\n" .string "you!$" -gUnknown_81B0504:: @ 0x81B0504 +gFameCheckerPersonName_Erika:: @ 0x81B0504 .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}ERIKA$" -gUnknown_81B0510:: @ 0x81B0510 +gFameCheckerPersonQuote_Erika:: @ 0x81B0510 .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}From: ERIKA\n" .string "To: {PLAYER}\p" .string "{SIZE 05}{COLOR RED}{SHADOW GREEN}I am so glad that there are strong\n" @@ -684,10 +684,10 @@ gUnknown_81B0510:: @ 0x81B0510 .string "Please visit me again.\n" .string "Zzz…$" -gUnknown_81B05C2:: @ 0x81B05C2 +gFameCheckerPersonName_Koga:: @ 0x81B05C2 .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}KOGA$" -gUnknown_81B05CD:: @ 0x81B05CD +gFameCheckerPersonQuote_Koga:: @ 0x81B05CD .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}From: KOGA\n" .string "To: {PLAYER}\p" .string "{SIZE 04}{COLOR RED}{SHADOW GREEN}You and I, we must both set our\n" @@ -695,10 +695,10 @@ gUnknown_81B05CD:: @ 0x81B05CD .string "meeting our challenges.\p" .string "Now, I must go train my daughter.$" -gUnknown_81B0667:: @ 0x81B0667 +gFameCheckerPersonName_Sabrina:: @ 0x81B0667 .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}SABRINA$" -gUnknown_81B0675:: @ 0x81B0675 +gFameCheckerPersonQuote_Sabrina:: @ 0x81B0675 .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}From: SABRINA\n" .string "To: {PLAYER}\p" .string "{SIZE 05}{COLOR RED}{SHADOW GREEN}The love you have towards your\n" @@ -706,10 +706,10 @@ gUnknown_81B0675:: @ 0x81B0675 .string "It was a power that was never\n" .string "bested by my psychic power.$" -gUnknown_81B06FB:: @ 0x81B06FB +gFameCheckerPersonName_Blaine:: @ 0x81B06FB .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}BLAINE$" -gUnknown_81B0708:: @ 0x81B0708 +gFameCheckerPersonQuote_Blaine:: @ 0x81B0708 .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}From: BLAINE\n" .string "To: {PLAYER}\p" .string "{SIZE 04}{COLOR RED}{SHADOW GREEN}My fire POKéMON!\n" @@ -717,10 +717,10 @@ gUnknown_81B0708:: @ 0x81B0708 .string "And now, a quiz. How many kinds of\n" .string "FIRE-type POKéMON are there?$" -gUnknown_81B079F:: @ 0x81B079F +gFameCheckerPersonName_Lorelei:: @ 0x81B079F .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}LORELEI$" -gUnknown_81B07AD:: @ 0x81B07AD +gFameCheckerPersonQuote_Lorelei:: @ 0x81B07AD .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}From: LORELEI\n" .string "To: {PLAYER}\p" .string "{SIZE 05}{COLOR RED}{SHADOW GREEN}I needed to thank you for your\n" @@ -729,10 +729,10 @@ gUnknown_81B07AD:: @ 0x81B07AD .string "battles.\p" .string "You’d better watch out next time!$" -gUnknown_81B0845:: @ 0x81B0845 +gFameCheckerPersonName_Bruno:: @ 0x81B0845 .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}BRUNO$" -gUnknown_81B0851:: @ 0x81B0851 +gFameCheckerPersonQuote_Bruno:: @ 0x81B0851 .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}From: BRUNO\n" .string "To: {PLAYER}\p" .string "{SIZE 04}{COLOR RED}{SHADOW GREEN}The super power of your POKéMON\n" @@ -740,20 +740,20 @@ gUnknown_81B0851:: @ 0x81B0851 .string "Next time, maybe I should show you\n" .string "how to train yourself.$" -gUnknown_81B08EE:: @ 0x81B08EE +gFameCheckerPersonName_Agatha:: @ 0x81B08EE .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}AGATHA$" -gUnknown_81B08FB:: @ 0x81B08FB +gFameCheckerPersonQuote_Agatha:: @ 0x81B08FB .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}From: AGATHA\n" .string "To: {PLAYER}\p" .string "{SIZE 05}{COLOR RED}{SHADOW GREEN}When you grow older, don’t you\n" .string "dare go soft like that coot OAK!\p" .string "Be like me and keep battling on!$" -gUnknown_81B097F:: @ 0x81B097F +gFameCheckerPersonName_Lance:: @ 0x81B097F .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}LANCE$" -gUnknown_81B098B:: @ 0x81B098B +gFameCheckerPersonQuote_Lance:: @ 0x81B098B .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}From: LANCE\n" .string "To: {PLAYER}\p" .string "{SIZE 04}{COLOR RED}{SHADOW GREEN}I’m considering going back to my\n" @@ -763,10 +763,10 @@ gUnknown_81B098B:: @ 0x81B098B .string "I’d like to invite you to my\n" .string "hometown one day.$" -gUnknown_81B0A45:: @ 0x81B0A45 +gFameCheckerPersonName_Bill:: @ 0x81B0A45 .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}BILL$" -gUnknown_81B0A50:: @ 0x81B0A50 +gFameCheckerPersonQuote_Bill:: @ 0x81B0A50 .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}From: BILL\n" .string "To: {PLAYER}\p" .string "{SIZE 04}{COLOR RED}{SHADOW GREEN}Hey, there! CELIO had nothing but\n" @@ -775,10 +775,10 @@ gUnknown_81B0A50:: @ 0x81B0A50 .string "When you catch some rare POKéMON,\n" .string "come show me, okay? Promise!$" -gUnknown_81B0AFF:: @ 0x81B0AFF +gFameCheckerPersonName_MrFuji:: @ 0x81B0AFF .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}MR. FUJI$" -gUnknown_81B0B0E:: @ 0x81B0B0E +gFameCheckerPersonQuote_MrFuji:: @ 0x81B0B0E .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}From: MR. FUJI\n" .string "To: {PLAYER}\p" .string "{SIZE 04}{COLOR RED}{SHADOW GREEN}Instead of hoping for the happiness\n" @@ -786,10 +786,10 @@ gUnknown_81B0B0E:: @ 0x81B0B0E .string "…Can I get you to wish for the\n" .string "happiness of all POKéMON?$" -gUnknown_81B0BA6:: @ 0x81B0BA6 +gFameCheckerPersonName_Giovanni:: @ 0x81B0BA6 .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}GIOVANNI$" -gUnknown_81B0BB5:: @ 0x81B0BB5 +gFameCheckerPersonQuote_Giovanni:: @ 0x81B0BB5 .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}From: GIOVANNI\n" .string "To: {PLAYER}\p" .string "{SIZE 04}{COLOR RED}{SHADOW GREEN}There is nothing that I wish to say\n" @@ -797,580 +797,580 @@ gUnknown_81B0BB5:: @ 0x81B0BB5 .string "I will concentrate solely on\n" .string "bettering myself, and none other.$" -gUnknown_81B0C45:: @ 0x81B0C45 +gFameCheckerFlavorTextOriginLocation_ProfOak0:: @ 0x81B0C45 .string "PALLET TOWN$" -gUnknown_81B0C51:: @ 81B0C51 +gFameCheckerFlavorTextOriginLocation_ProfOak1:: @ 81B0C51 .string "RESEARCH LAB$" -gUnknown_81B0C5E:: @ 81B0C5E +gFameCheckerFlavorTextOriginLocation_ProfOak2:: @ 81B0C5E .string "RESEARCH LAB$" -gUnknown_81B0C6B:: @ 81B0C6B +gFameCheckerFlavorTextOriginLocation_ProfOak3:: @ 81B0C6B .string "VIRIDIAN CITY$" -gUnknown_81B0C79:: @ 81B0C79 +gFameCheckerFlavorTextOriginLocation_ProfOak4:: @ 81B0C79 .string "POKéMON LEAGUE$" -gUnknown_81B0C88:: @ 81B0C88 +gFameCheckerFlavorTextOriginLocation_ProfOak5:: @ 81B0C88 .string "RESEARCH LAB$" -gUnknown_81B0C95:: @ 81B0C95 +gFameCheckerFlavorTextOriginLocation_Daisy0:: @ 81B0C95 .string "RESEARCH LAB$" -gUnknown_81B0CA2:: @ 81B0CA2 +gFameCheckerFlavorTextOriginLocation_Daisy1:: @ 81B0CA2 .string "VERMILION CITY$" -gUnknown_81B0CB1:: @ 81B0CB1 +gFameCheckerFlavorTextOriginLocation_Daisy2:: @ 81B0CB1 .string "WATER LABYRINTH$" -gUnknown_81B0CC1:: @ 81B0CC1 +gFameCheckerFlavorTextOriginLocation_Daisy3:: @ 81B0CC1 .string "VIRIDIAN CITY$" -gUnknown_81B0CCF:: @ 81B0CCF +gFameCheckerFlavorTextOriginLocation_Daisy4:: @ 81B0CCF .string "CELADON MANSION$" -gUnknown_81B0CDF:: @ 81B0CDF +gFameCheckerFlavorTextOriginLocation_Daisy5:: @ 81B0CDF .string "FOUR ISLAND$" -gUnknown_81B0CEB:: @ 81B0CEB +gFameCheckerFlavorTextOriginLocation_Brock0:: @ 81B0CEB .string "PEWTER CITY$" -gUnknown_81B0CF7:: @ 81B0CF7 +gFameCheckerFlavorTextOriginLocation_Brock1:: @ 81B0CF7 .string "PEWTER GYM$" -gUnknown_81B0D02:: @ 81B0D02 +gFameCheckerFlavorTextOriginLocation_Brock2:: @ 81B0D02 .string "PEWTER CITY$" -gUnknown_81B0D0E:: @ 81B0D0E +gFameCheckerFlavorTextOriginLocation_Brock3:: @ 81B0D0E .string "ROUTE 4$" -gUnknown_81B0D16:: @ 81B0D16 +gFameCheckerFlavorTextOriginLocation_Brock4:: @ 81B0D16 .string "MT. MOON$" -gUnknown_81B0D1F:: @ 81B0D1F +gFameCheckerFlavorTextOriginLocation_Brock5:: @ 81B0D1F .string "PEWTER MUSEUM$" -gUnknown_81B0D2D:: @ 81B0D2D +gFameCheckerFlavorTextOriginLocation_Misty0:: @ 81B0D2D .string "CERULEAN CITY$" -gUnknown_81B0D3B:: @ 81B0D3B +gFameCheckerFlavorTextOriginLocation_Misty1:: @ 81B0D3B .string "CERULEAN GYM$" -gUnknown_81B0D48:: @ 81B0D48 +gFameCheckerFlavorTextOriginLocation_Misty2:: @ 81B0D48 .string "CERULEAN GYM$" -gUnknown_81B0D55:: @ 81B0D55 +gFameCheckerFlavorTextOriginLocation_Misty3:: @ 81B0D55 .string "SEAFOAM ISLANDS$" -gUnknown_81B0D65:: @ 81B0D65 +gFameCheckerFlavorTextOriginLocation_Misty4:: @ 81B0D65 .string "CERULEAN CAPE$" -gUnknown_81B0D73:: @ 81B0D73 +gFameCheckerFlavorTextOriginLocation_Misty5:: @ 81B0D73 .string "CERULEAN CITY$" -gUnknown_81B0D81:: @ 81B0D81 +gFameCheckerFlavorTextOriginLocation_LtSurge0:: @ 81B0D81 .string "VERMILION CITY$" -gUnknown_81B0D90:: @ 81B0D90 +gFameCheckerFlavorTextOriginLocation_LtSurge1:: @ 81B0D90 .string "VERMILION GYM$" -gUnknown_81B0D9E:: @ 81B0D9E +gFameCheckerFlavorTextOriginLocation_LtSurge2:: @ 81B0D9E .string "VERMILION GYM$" -gUnknown_81B0DAC:: @ 81B0DAC +gFameCheckerFlavorTextOriginLocation_LtSurge3:: @ 81B0DAC .string "VERMILION GYM$" -gUnknown_81B0DBA:: @ 81B0DBA +gFameCheckerFlavorTextOriginLocation_LtSurge4:: @ 81B0DBA .string "VERMILION GYM$" -gUnknown_81B0DC8:: @ 81B0DC8 +gFameCheckerFlavorTextOriginLocation_LtSurge5:: @ 81B0DC8 .string "VERMILION CITY$" -gUnknown_81B0DD7:: @ 81B0DD7 +gFameCheckerFlavorTextOriginLocation_Erika0:: @ 81B0DD7 .string "CELADON CITY$" -gUnknown_81B0DE4:: @ 81B0DE4 +gFameCheckerFlavorTextOriginLocation_Erika1:: @ 81B0DE4 .string "CELADON GYM$" -gUnknown_81B0DF0:: @ 81B0DF0 +gFameCheckerFlavorTextOriginLocation_Erika2:: @ 81B0DF0 .string "CELADON GYM$" -gUnknown_81B0DFC:: @ 81B0DFC +gFameCheckerFlavorTextOriginLocation_Erika3:: @ 81B0DFC .string "CELADON GYM$" -gUnknown_81B0E08:: @ 81B0E08 +gFameCheckerFlavorTextOriginLocation_Erika4:: @ 81B0E08 .string "CELADON GYM$" -gUnknown_81B0E14:: @ 81B0E14 +gFameCheckerFlavorTextOriginLocation_Erika5:: @ 81B0E14 .string "CELADON MANSION$" -gUnknown_81B0E24:: @ 81B0E24 +gFameCheckerFlavorTextOriginLocation_Koga0:: @ 81B0E24 .string "FUCHSIA CITY$" -gUnknown_81B0E31:: @ 81B0E31 +gFameCheckerFlavorTextOriginLocation_Koga1:: @ 81B0E31 .string "FUCHSIA GYM$" -gUnknown_81B0E3D:: @ 81B0E3D +gFameCheckerFlavorTextOriginLocation_Koga2:: @ 81B0E3D .string "FUCHSIA GYM$" -gUnknown_81B0E49:: @ 81B0E49 +gFameCheckerFlavorTextOriginLocation_Koga3:: @ 81B0E49 .string "FUCHSIA CITY$" -gUnknown_81B0E56:: @ 81B0E56 +gFameCheckerFlavorTextOriginLocation_Koga4:: @ 81B0E56 .string "FUCHSIA CITY$" -gUnknown_81B0E63:: @ 81B0E63 +gFameCheckerFlavorTextOriginLocation_Koga5:: @ 81B0E63 .string "SAFARI ZONE$" -gUnknown_81B0E6F:: @ 81B0E6F +gFameCheckerFlavorTextOriginLocation_Sabrina0:: @ 81B0E6F .string "SAFFRON CITY$" -gUnknown_81B0E7C:: @ 81B0E7C +gFameCheckerFlavorTextOriginLocation_Sabrina1:: @ 81B0E7C .string "THREE ISLAND$" -gUnknown_81B0E89:: @ 81B0E89 +gFameCheckerFlavorTextOriginLocation_Sabrina2:: @ 81B0E89 .string "SAFFRON GYM$" -gUnknown_81B0E95:: @ 81B0E95 +gFameCheckerFlavorTextOriginLocation_Sabrina3:: @ 81B0E95 .string "SAFFRON GYM$" -gUnknown_81B0EA1:: @ 81B0EA1 +gFameCheckerFlavorTextOriginLocation_Sabrina4:: @ 81B0EA1 .string "SAFFRON CITY$" -gUnknown_81B0EAE:: @ 81B0EAE +gFameCheckerFlavorTextOriginLocation_Sabrina5:: @ 81B0EAE .string "SAFFRON GYM$" -gUnknown_81B0EBA:: @ 81B0EBA +gFameCheckerFlavorTextOriginLocation_Blaine0:: @ 81B0EBA .string "CINNABAR ISLAND$" -gUnknown_81B0ECA:: @ 81B0ECA +gFameCheckerFlavorTextOriginLocation_Blaine1:: @ 81B0ECA .string "CINNABAR GYM$" -gUnknown_81B0ED7:: @ 81B0ED7 +gFameCheckerFlavorTextOriginLocation_Blaine2:: @ 81B0ED7 .string "CINNABAR GYM$" -gUnknown_81B0EE4:: @ 81B0EE4 +gFameCheckerFlavorTextOriginLocation_Blaine3:: @ 81B0EE4 .string "CINNABAR ISLAND$" -gUnknown_81B0EF4:: @ 81B0EF4 +gFameCheckerFlavorTextOriginLocation_Blaine4:: @ 81B0EF4 .string "CINNABAR GYM$" -gUnknown_81B0F01:: @ 81B0F01 +gFameCheckerFlavorTextOriginLocation_Blaine5:: @ 81B0F01 .string "RESORT GORGEOUS$" -gUnknown_81B0F11:: @ 81B0F11 +gFameCheckerFlavorTextOriginLocation_Lorelei0:: @ 81B0F11 .string "POKéMON LEAGUE$" -gUnknown_81B0F20:: @ 81B0F20 +gFameCheckerFlavorTextOriginLocation_Lorelei1:: @ 81B0F20 .string "POKéMON LEAGUE$" -gUnknown_81B0F2F:: @ 81B0F2F +gFameCheckerFlavorTextOriginLocation_Lorelei2:: @ 81B0F2F .string "FOUR ISLAND$" -gUnknown_81B0F3B:: @ 81B0F3B +gFameCheckerFlavorTextOriginLocation_Lorelei3:: @ 81B0F3B .string "FIVE ISLAND$" -gUnknown_81B0F47:: @ 81B0F47 +gFameCheckerFlavorTextOriginLocation_Lorelei4:: @ 81B0F47 .string "FOUR ISLAND$" -gUnknown_81B0F53:: @ 81B0F53 +gFameCheckerFlavorTextOriginLocation_Lorelei5:: @ 81B0F53 .string "FOUR ISLAND$" -gUnknown_81B0F5F:: @ 81B0F5F +gFameCheckerFlavorTextOriginLocation_Bruno0:: @ 81B0F5F .string "POKéMON LEAGUE$" -gUnknown_81B0F6E:: @ 81B0F6E +gFameCheckerFlavorTextOriginLocation_Bruno1:: @ 81B0F6E .string "POKéMON LEAGUE$" -gUnknown_81B0F7D:: @ 81B0F7D +gFameCheckerFlavorTextOriginLocation_Bruno2:: @ 81B0F7D .string "SAFFRON CITY$" -gUnknown_81B0F8A:: @ 81B0F8A +gFameCheckerFlavorTextOriginLocation_Bruno3:: @ 81B0F8A .string "EMBER SPA$" -gUnknown_81B0F94:: @ 81B0F94 +gFameCheckerFlavorTextOriginLocation_Bruno4:: @ 81B0F94 .string "TWO ISLAND$" -gUnknown_81B0F9F:: @ 81B0F9F +gFameCheckerFlavorTextOriginLocation_Bruno5:: @ 81B0F9F .string "SEVAULT CANYON$" -gUnknown_81B0FAE:: @ 81B0FAE +gFameCheckerFlavorTextOriginLocation_Agatha0:: @ 81B0FAE .string "POKéMON LEAGUE$" -gUnknown_81B0FBD:: @ 81B0FBD +gFameCheckerFlavorTextOriginLocation_Agatha1:: @ 81B0FBD .string "INDIGO PLATEAU$" -gUnknown_81B0FCC:: @ 81B0FCC +gFameCheckerFlavorTextOriginLocation_Agatha2:: @ 81B0FCC .string "INDIGO PLATEAU$" -gUnknown_81B0FDB:: @ 81B0FDB +gFameCheckerFlavorTextOriginLocation_Agatha3:: @ 81B0FDB .string "SEVEN ISLAND$" -gUnknown_81B0FE8:: @ 81B0FE8 +gFameCheckerFlavorTextOriginLocation_Agatha4:: @ 81B0FE8 .string "POKéMON LEAGUE$" -gUnknown_81B0FF7:: @ 81B0FF7 +gFameCheckerFlavorTextOriginLocation_Agatha5:: @ 81B0FF7 .string "SIX ISLAND$" -gUnknown_81B1002:: @ 81B1002 +gFameCheckerFlavorTextOriginLocation_Lance0:: @ 81B1002 .string "POKéMON LEAGUE$" -gUnknown_81B1011:: @ 81B1011 +gFameCheckerFlavorTextOriginLocation_Lance1:: @ 81B1011 .string "POKéMON LEAGUE$" -gUnknown_81B1020:: @ 81B1020 +gFameCheckerFlavorTextOriginLocation_Lance2:: @ 81B1020 .string "SAFFRON CITY$" -gUnknown_81B102D:: @ 81B102D +gFameCheckerFlavorTextOriginLocation_Lance3:: @ 81B102D .string "CELADON DEPT.$" -gUnknown_81B103B:: @ 81B103B +gFameCheckerFlavorTextOriginLocation_Lance4:: @ 81B103B .string "INDIGO PLATEAU$" -gUnknown_81B104A:: @ 81B104A +gFameCheckerFlavorTextOriginLocation_Lance5:: @ 81B104A .string "INDIGO PLATEAU$" -gUnknown_81B1059:: @ 81B1059 +gFameCheckerFlavorTextOriginLocation_Bill0:: @ 81B1059 .string "CERULEAN CITY$" -gUnknown_81B1067:: @ 81B1067 +gFameCheckerFlavorTextOriginLocation_Bill1:: @ 81B1067 .string "CERULEAN CITY$" -gUnknown_81B1075:: @ 81B1075 +gFameCheckerFlavorTextOriginLocation_Bill2:: @ 81B1075 .string "FUCHSIA CITY$" -gUnknown_81B1082:: @ 81B1082 +gFameCheckerFlavorTextOriginLocation_Bill3:: @ 81B1082 .string "ONE ISLAND$" -gUnknown_81B108D:: @ 81B108D +gFameCheckerFlavorTextOriginLocation_Bill4:: @ 81B108D .string "ONE ISLAND$" -gUnknown_81B1098:: @ 81B1098 +gFameCheckerFlavorTextOriginLocation_Bill5:: @ 81B1098 .string "ONE ISLAND$" -gUnknown_81B10A3:: @ 81B10A3 +gFameCheckerFlavorTextOriginLocation_MrFuji0:: @ 81B10A3 .string "LAVENDER TOWN$" -gUnknown_81B10B1:: @ 81B10B1 +gFameCheckerFlavorTextOriginLocation_MrFuji1:: @ 81B10B1 .string "POKéMON TOWER$" -gUnknown_81B10BF:: @ 81B10BF +gFameCheckerFlavorTextOriginLocation_MrFuji2:: @ 81B10BF .string "LAVENDER TOWN$" -gUnknown_81B10CD:: @ 81B10CD +gFameCheckerFlavorTextOriginLocation_MrFuji3:: @ 81B10CD .string "LAVENDER TOWN$" -gUnknown_81B10DB:: @ 81B10DB +gFameCheckerFlavorTextOriginLocation_MrFuji4:: @ 81B10DB .string "CINNABAR GYM$" -gUnknown_81B10E8:: @ 81B10E8 +gFameCheckerFlavorTextOriginLocation_MrFuji5:: @ 81B10E8 .string "CINNABAR ISLAND$" -gUnknown_81B10F8:: @ 81B10F8 +gFameCheckerFlavorTextOriginLocation_Giovanni0:: @ 81B10F8 .string "ROCKET HIDEOUT$" -gUnknown_81B1107:: @ 81B1107 +gFameCheckerFlavorTextOriginLocation_Giovanni1:: @ 81B1107 .string "SILPH CO.$" -gUnknown_81B1111:: @ 81B1111 +gFameCheckerFlavorTextOriginLocation_Giovanni2:: @ 81B1111 .string "SILPH CO.$" -gUnknown_81B111B:: @ 81B111B +gFameCheckerFlavorTextOriginLocation_Giovanni3:: @ 81B111B .string "VIRIDIAN GYM$" -gUnknown_81B1128:: @ 81B1128 +gFameCheckerFlavorTextOriginLocation_Giovanni4:: @ 81B1128 .string "VIRIDIAN GYM$" -gUnknown_81B1135:: @ 81B1135 +gFameCheckerFlavorTextOriginLocation_Giovanni5:: @ 81B1135 .string "ROCKET WAREHOUSE$" -gUnknown_81B1146:: @ 81B1146 +gFameCheckerFlavorTextOriginObjectName_ProfOak0:: @ 81B1146 .string "SIGN$" -gUnknown_81B114B:: @ 81B114B +gFameCheckerFlavorTextOriginObjectName_ProfOak1:: @ 81B114B .string "PROF. OAK$" -gUnknown_81B1155:: @ 81B1155 +gFameCheckerFlavorTextOriginObjectName_ProfOak2:: @ 81B1155 .string "AIDE$" -gUnknown_81B115A:: @ 81B115A +gFameCheckerFlavorTextOriginObjectName_ProfOak3:: @ 81B115A .string "POKéMON JOURNAL$" -gUnknown_81B116A:: @ 81B116A +gFameCheckerFlavorTextOriginObjectName_ProfOak4:: @ 81B116A .string "AGATHA$" -gUnknown_81B1171:: @ 81B1171 +gFameCheckerFlavorTextOriginObjectName_ProfOak5:: @ 81B1171 .string "AIDE$" -gUnknown_81B1176:: @ 81B1176 +gFameCheckerFlavorTextOriginObjectName_Daisy0:: @ 81B1176 .string "AIDE$" -gUnknown_81B117B:: @ 81B117B +gFameCheckerFlavorTextOriginObjectName_Daisy1:: @ 81B117B .string "WOMAN$" -gUnknown_81B1181:: @ 81B1181 +gFameCheckerFlavorTextOriginObjectName_Daisy2:: @ 81B1181 .string "MAN$" -gUnknown_81B1185:: @ 81B1185 +gFameCheckerFlavorTextOriginObjectName_Daisy3:: @ 81B1185 .string "POKéMON JOURNAL$" -gUnknown_81B1195:: @ 81B1195 +gFameCheckerFlavorTextOriginObjectName_Daisy4:: @ 81B1195 .string "OLD LADY$" -gUnknown_81B119E:: @ 81B119E +gFameCheckerFlavorTextOriginObjectName_Daisy5:: @ 81B119E .string "POKéMON JOURNAL$" -gUnknown_81B11AE:: @ 81B11AE +gFameCheckerFlavorTextOriginObjectName_Brock0:: @ 81B11AE .string "SIGN$" -gUnknown_81B11B3:: @ 81B11B3 +gFameCheckerFlavorTextOriginObjectName_Brock1:: @ 81B11B3 .string "BROCK$" -gUnknown_81B11B9:: @ 81B11B9 +gFameCheckerFlavorTextOriginObjectName_Brock2:: @ 81B11B9 .string "YOUNG MAN$" -gUnknown_81B11C3:: @ 81B11C3 +gFameCheckerFlavorTextOriginObjectName_Brock3:: @ 81B11C3 .string "BOY$" -gUnknown_81B11C7:: @ 81B11C7 +gFameCheckerFlavorTextOriginObjectName_Brock4:: @ 81B11C7 .string "MAN$" -gUnknown_81B11CB:: @ 81B11CB +gFameCheckerFlavorTextOriginObjectName_Brock5:: @ 81B11CB .string "POKéMON JOURNAL$" -gUnknown_81B11DB:: @ 81B11DB +gFameCheckerFlavorTextOriginObjectName_Misty0:: @ 81B11DB .string "SIGN$" -gUnknown_81B11E0:: @ 81B11E0 +gFameCheckerFlavorTextOriginObjectName_Misty1:: @ 81B11E0 .string "MISTY$" -gUnknown_81B11E6:: @ 81B11E6 +gFameCheckerFlavorTextOriginObjectName_Misty2:: @ 81B11E6 .string "LUIS$" -gUnknown_81B11EB:: @ 81B11EB +gFameCheckerFlavorTextOriginObjectName_Misty3:: @ 81B11EB .string "YOUNG MAN$" -gUnknown_81B11F5:: @ 81B11F5 +gFameCheckerFlavorTextOriginObjectName_Misty4:: @ 81B11F5 .string "DAME$" -gUnknown_81B11FA:: @ 81B11FA +gFameCheckerFlavorTextOriginObjectName_Misty5:: @ 81B11FA .string "POKéMON JOURNAL$" -gUnknown_81B120A:: @ 81B120A +gFameCheckerFlavorTextOriginObjectName_LtSurge0:: @ 81B120A .string "SIGN$" -gUnknown_81B120F:: @ 81B120F +gFameCheckerFlavorTextOriginObjectName_LtSurge1:: @ 81B120F .string "LT. SURGE$" -gUnknown_81B1219:: @ 81B1219 +gFameCheckerFlavorTextOriginObjectName_LtSurge2:: @ 81B1219 .string "TUCKER$" -gUnknown_81B1220:: @ 81B1220 +gFameCheckerFlavorTextOriginObjectName_LtSurge3:: @ 81B1220 .string "TUCKER$" -gUnknown_81B1227:: @ 81B1227 +gFameCheckerFlavorTextOriginObjectName_LtSurge4:: @ 81B1227 .string "DWAYNE$" -gUnknown_81B122E:: @ 81B122E +gFameCheckerFlavorTextOriginObjectName_LtSurge5:: @ 81B122E .string "POKéMON JOURNAL$" -gUnknown_81B123E:: @ 81B123E +gFameCheckerFlavorTextOriginObjectName_Erika0:: @ 81B123E .string "SIGN$" -gUnknown_81B1243:: @ 81B1243 +gFameCheckerFlavorTextOriginObjectName_Erika1:: @ 81B1243 .string "ERIKA$" -gUnknown_81B1249:: @ 81B1249 +gFameCheckerFlavorTextOriginObjectName_Erika2:: @ 81B1249 .string "LOLA$" -gUnknown_81B124E:: @ 81B124E +gFameCheckerFlavorTextOriginObjectName_Erika3:: @ 81B124E .string "TAMIA$" -gUnknown_81B1254:: @ 81B1254 +gFameCheckerFlavorTextOriginObjectName_Erika4:: @ 81B1254 .string "ERIKA$" -gUnknown_81B125A:: @ 81B125A +gFameCheckerFlavorTextOriginObjectName_Erika5:: @ 81B125A .string "POKéMON JOURNAL$" -gUnknown_81B126A:: @ 81B126A +gFameCheckerFlavorTextOriginObjectName_Koga0:: @ 81B126A .string "SIGN$" -gUnknown_81B126F:: @ 81B126F +gFameCheckerFlavorTextOriginObjectName_Koga1:: @ 81B126F .string "KOGA$" -gUnknown_81B1274:: @ 81B1274 +gFameCheckerFlavorTextOriginObjectName_Koga2:: @ 81B1274 .string "KIRK$" -gUnknown_81B1279:: @ 81B1279 +gFameCheckerFlavorTextOriginObjectName_Koga3:: @ 81B1279 .string "CHARINE$" -gUnknown_81B1281:: @ 81B1281 +gFameCheckerFlavorTextOriginObjectName_Koga4:: @ 81B1281 .string "POKéMON JOURNAL$" -gUnknown_81B1291:: @ 81B1291 +gFameCheckerFlavorTextOriginObjectName_Koga5:: @ 81B1291 .string "MAN$" -gUnknown_81B1295:: @ 81B1295 +gFameCheckerFlavorTextOriginObjectName_Sabrina0:: @ 81B1295 .string "SIGN$" -gUnknown_81B129A:: @ 81B129A +gFameCheckerFlavorTextOriginObjectName_Sabrina1:: @ 81B129A .string "YOUNG MAN$" -gUnknown_81B12A4:: @ 81B12A4 +gFameCheckerFlavorTextOriginObjectName_Sabrina2:: @ 81B12A4 .string "SABRINA$" -gUnknown_81B12AC:: @ 81B12AC +gFameCheckerFlavorTextOriginObjectName_Sabrina3:: @ 81B12AC .string "SABRINA$" -gUnknown_81B12B4:: @ 81B12B4 +gFameCheckerFlavorTextOriginObjectName_Sabrina4:: @ 81B12B4 .string "POKéMON JOURNAL$" -gUnknown_81B12C4:: @ 81B12C4 +gFameCheckerFlavorTextOriginObjectName_Sabrina5:: @ 81B12C4 .string "TYRON$" -gUnknown_81B12CA:: @ 81B12CA +gFameCheckerFlavorTextOriginObjectName_Blaine0:: @ 81B12CA .string "SIGN$" -gUnknown_81B12CF:: @ 81B12CF +gFameCheckerFlavorTextOriginObjectName_Blaine1:: @ 81B12CF .string "BLAINE$" -gUnknown_81B12D6:: @ 81B12D6 +gFameCheckerFlavorTextOriginObjectName_Blaine2:: @ 81B12D6 .string "DEREK$" -gUnknown_81B12DC:: @ 81B12DC +gFameCheckerFlavorTextOriginObjectName_Blaine3:: @ 81B12DC .string "WOMAN$" -gUnknown_81B12E2:: @ 81B12E2 +gFameCheckerFlavorTextOriginObjectName_Blaine4:: @ 81B12E2 .string "PHOTO$" -gUnknown_81B12E8:: @ 81B12E8 +gFameCheckerFlavorTextOriginObjectName_Blaine5:: @ 81B12E8 .string "POKéMON JOURNAL$" -gUnknown_81B12F8:: @ 81B12F8 +gFameCheckerFlavorTextOriginObjectName_Lorelei0:: @ 81B12F8 .string "LORELEI$" -gUnknown_81B1300:: @ 81B1300 +gFameCheckerFlavorTextOriginObjectName_Lorelei1:: @ 81B1300 .string "LORELEI$" -gUnknown_81B1308:: @ 81B1308 +gFameCheckerFlavorTextOriginObjectName_Lorelei2:: @ 81B1308 .string "OLD MAN$" -gUnknown_81B1310:: @ 81B1310 +gFameCheckerFlavorTextOriginObjectName_Lorelei3:: @ 81B1310 .string "POKéMON JOURNAL$" -gUnknown_81B1320:: @ 81B1320 +gFameCheckerFlavorTextOriginObjectName_Lorelei4:: @ 81B1320 .string "LITTLE GIRL$" -gUnknown_81B132C:: @ 81B132C +gFameCheckerFlavorTextOriginObjectName_Lorelei5:: @ 81B132C .string "OLD LADY$" -gUnknown_81B1335:: @ 81B1335 +gFameCheckerFlavorTextOriginObjectName_Bruno0:: @ 81B1335 .string "BRUNO$" -gUnknown_81B133B:: @ 81B133B +gFameCheckerFlavorTextOriginObjectName_Bruno1:: @ 81B133B .string "BRUNO$" -gUnknown_81B1341:: @ 81B1341 +gFameCheckerFlavorTextOriginObjectName_Bruno2:: @ 81B1341 .string "POKéMON JOURNAL$" -gUnknown_81B1351:: @ 81B1351 +gFameCheckerFlavorTextOriginObjectName_Bruno3:: @ 81B1351 .string "CRUSHER$" -gUnknown_81B1359:: @ 81B1359 +gFameCheckerFlavorTextOriginObjectName_Bruno4:: @ 81B1359 .string "WOMAN$" -gUnknown_81B135F:: @ 81B135F +gFameCheckerFlavorTextOriginObjectName_Bruno5:: @ 81B135F .string "CRUSHER$" -gUnknown_81B1367:: @ 81B1367 +gFameCheckerFlavorTextOriginObjectName_Agatha0:: @ 81B1367 .string "AGATHA$" -gUnknown_81B136E:: @ 81B136E +gFameCheckerFlavorTextOriginObjectName_Agatha1:: @ 81B136E .string "CRUSHER$" -gUnknown_81B1376:: @ 81B1376 +gFameCheckerFlavorTextOriginObjectName_Agatha2:: @ 81B1376 .string "CRUSHER$" -gUnknown_81B137E:: @ 81B137E +gFameCheckerFlavorTextOriginObjectName_Agatha3:: @ 81B137E .string "POKéMON JOURNAL$" -gUnknown_81B138E:: @ 81B138E +gFameCheckerFlavorTextOriginObjectName_Agatha4:: @ 81B138E .string "AGATHA$" -gUnknown_81B1395:: @ 81B1395 +gFameCheckerFlavorTextOriginObjectName_Agatha5:: @ 81B1395 .string "OLD LADY$" -gUnknown_81B139E:: @ 81B139E +gFameCheckerFlavorTextOriginObjectName_Lance0:: @ 81B139E .string "LANCE$" -gUnknown_81B13A4:: @ 81B13A4 +gFameCheckerFlavorTextOriginObjectName_Lance1:: @ 81B13A4 .string "LANCE$" -gUnknown_81B13AA:: @ 81B13AA +gFameCheckerFlavorTextOriginObjectName_Lance2:: @ 81B13AA .string "WOMAN$" -gUnknown_81B13B0:: @ 81B13B0 +gFameCheckerFlavorTextOriginObjectName_Lance3:: @ 81B13B0 .string "LITTLE GIRL$" -gUnknown_81B13BC:: @ 81B13BC +gFameCheckerFlavorTextOriginObjectName_Lance4:: @ 81B13BC .string "POKéMON JOURNAL$" -gUnknown_81B13CC:: @ 81B13CC +gFameCheckerFlavorTextOriginObjectName_Lance5:: @ 81B13CC .string "YOUNG MAN$" -gUnknown_81B13D6:: @ 81B13D6 +gFameCheckerFlavorTextOriginObjectName_Bill0:: @ 81B13D6 .string "{RIVAL}$" -gUnknown_81B13D9:: @ 81B13D9 +gFameCheckerFlavorTextOriginObjectName_Bill1:: @ 81B13D9 .string "LITTLE BOY$" -gUnknown_81B13E4:: @ 81B13E4 +gFameCheckerFlavorTextOriginObjectName_Bill2:: @ 81B13E4 .string "OLD MAN$" -gUnknown_81B13EC:: @ 81B13EC +gFameCheckerFlavorTextOriginObjectName_Bill3:: @ 81B13EC .string "CELIO$" -gUnknown_81B13F2:: @ 81B13F2 +gFameCheckerFlavorTextOriginObjectName_Bill4:: @ 81B13F2 .string "CELIO$" -gUnknown_81B13F8:: @ 81B13F8 +gFameCheckerFlavorTextOriginObjectName_Bill5:: @ 81B13F8 .string "CELIO$" -gUnknown_81B13FE:: @ 81B13FE +gFameCheckerFlavorTextOriginObjectName_MrFuji0:: @ 81B13FE .string "LITTLE GIRL$" -gUnknown_81B140A:: @ 81B140A +gFameCheckerFlavorTextOriginObjectName_MrFuji1:: @ 81B140A .string "TEAM ROCKET$" -gUnknown_81B1416:: @ 81B1416 +gFameCheckerFlavorTextOriginObjectName_MrFuji2:: @ 81B1416 .string "MAGAZINE$" -gUnknown_81B141F:: @ 81B141F +gFameCheckerFlavorTextOriginObjectName_MrFuji3:: @ 81B141F .string "MAN$" -gUnknown_81B1423:: @ 81B1423 +gFameCheckerFlavorTextOriginObjectName_MrFuji4:: @ 81B1423 .string "PHOTO$" -gUnknown_81B1429:: @ 81B1429 +gFameCheckerFlavorTextOriginObjectName_MrFuji5:: @ 81B1429 .string "POKéMON JOURNAL$" -gUnknown_81B1439:: @ 81B1439 +gFameCheckerFlavorTextOriginObjectName_Giovanni0:: @ 81B1439 .string "GIOVANNI$" -gUnknown_81B1442:: @ 81B1442 +gFameCheckerFlavorTextOriginObjectName_Giovanni1:: @ 81B1442 .string "SCIENTIST$" -gUnknown_81B144C:: @ 81B144C +gFameCheckerFlavorTextOriginObjectName_Giovanni2:: @ 81B144C .string "SCIENTIST$" -gUnknown_81B1456:: @ 81B1456 +gFameCheckerFlavorTextOriginObjectName_Giovanni3:: @ 81B1456 .string "GIOVANNI$" -gUnknown_81B145F:: @ 81B145F +gFameCheckerFlavorTextOriginObjectName_Giovanni4:: @ 81B145F .string "MAN$" -gUnknown_81B1463:: @ 81B1463 +gFameCheckerFlavorTextOriginObjectName_Giovanni5:: @ 81B1463 .string "GIDEON$" gUnknown_81B146A:: @ 81B146A diff --git a/include/event_scripts.h b/include/event_scripts.h index 4405b831d..b909566d0 100644 --- a/include/event_scripts.h +++ b/include/event_scripts.h @@ -384,325 +384,325 @@ extern const u8 gUnknown_81C1429[]; // fame_checker -extern const u8 gUnknown_81AD106[]; -extern const u8 gUnknown_81AD145[]; -extern const u8 gUnknown_81AD1BB[]; -extern const u8 gUnknown_81AD258[]; -extern const u8 gUnknown_81AD2B9[]; -extern const u8 gUnknown_81AD377[]; -extern const u8 gUnknown_81AD40C[]; -extern const u8 gUnknown_81AD4AE[]; -extern const u8 gUnknown_81AD516[]; -extern const u8 gUnknown_81AD5A7[]; -extern const u8 gUnknown_81AD608[]; -extern const u8 gUnknown_81AD69F[]; -extern const u8 gUnknown_81AD705[]; -extern const u8 gUnknown_81AD771[]; -extern const u8 gUnknown_81AD840[]; -extern const u8 gUnknown_81AD908[]; -extern const u8 gUnknown_81AD99A[]; -extern const u8 gUnknown_81ADA27[]; -extern const u8 gUnknown_81ADA91[]; -extern const u8 gUnknown_81ADAF6[]; -extern const u8 gUnknown_81ADB5A[]; -extern const u8 gUnknown_81ADBD9[]; -extern const u8 gUnknown_81ADC72[]; -extern const u8 gUnknown_81ADCEB[]; -extern const u8 gUnknown_81ADD3C[]; -extern const u8 gUnknown_81ADDA7[]; -extern const u8 gUnknown_81ADE0B[]; -extern const u8 gUnknown_81ADE82[]; -extern const u8 gUnknown_81ADEEC[]; -extern const u8 gUnknown_81ADF6A[]; -extern const u8 gUnknown_81AE009[]; -extern const u8 gUnknown_81AE072[]; -extern const u8 gUnknown_81AE0F3[]; -extern const u8 gUnknown_81AE15B[]; -extern const u8 gUnknown_81AE1E5[]; -extern const u8 gUnknown_81AE247[]; -extern const u8 gUnknown_81AE2B6[]; -extern const u8 gUnknown_81AE31D[]; -extern const u8 gUnknown_81AE37D[]; -extern const u8 gUnknown_81AE407[]; -extern const u8 gUnknown_81AE48D[]; -extern const u8 gUnknown_81AE51B[]; -extern const u8 gUnknown_81AE5E8[]; -extern const u8 gUnknown_81AE656[]; -extern const u8 gUnknown_81AE6D7[]; -extern const u8 gUnknown_81AE762[]; -extern const u8 gUnknown_81AE7CB[]; -extern const u8 gUnknown_81AE841[]; -extern const u8 gUnknown_81AE89E[]; -extern const u8 gUnknown_81AE90A[]; -extern const u8 gUnknown_81AE990[]; -extern const u8 gUnknown_81AEA59[]; -extern const u8 gUnknown_81AEAEE[]; -extern const u8 gUnknown_81AEB69[]; -extern const u8 gUnknown_81AEBDF[]; -extern const u8 gUnknown_81AEC28[]; -extern const u8 gUnknown_81AEC82[]; -extern const u8 gUnknown_81AED27[]; -extern const u8 gUnknown_81AEDAA[]; -extern const u8 gUnknown_81AEE51[]; -extern const u8 gUnknown_81AEF25[]; -extern const u8 gUnknown_81AEF6C[]; -extern const u8 gUnknown_81AEFC6[]; -extern const u8 gUnknown_81AF04C[]; -extern const u8 gUnknown_81AF0F0[]; -extern const u8 gUnknown_81AF19A[]; -extern const u8 gUnknown_81AF200[]; -extern const u8 gUnknown_81AF248[]; -extern const u8 gUnknown_81AF2B7[]; -extern const u8 gUnknown_81AF34E[]; -extern const u8 gUnknown_81AF3BE[]; -extern const u8 gUnknown_81AF47C[]; -extern const u8 gUnknown_81AF4FD[]; -extern const u8 gUnknown_81AF567[]; -extern const u8 gUnknown_81AF641[]; -extern const u8 gUnknown_81AF6BA[]; -extern const u8 gUnknown_81AF758[]; -extern const u8 gUnknown_81AF7CB[]; -extern const u8 gUnknown_81AF83E[]; -extern const u8 gUnknown_81AF8CA[]; -extern const u8 gUnknown_81AF929[]; -extern const u8 gUnknown_81AF998[]; -extern const u8 gUnknown_81AFA20[]; -extern const u8 gUnknown_81AFAB9[]; -extern const u8 gUnknown_81AFB0C[]; -extern const u8 gUnknown_81AFB76[]; -extern const u8 gUnknown_81AFC38[]; -extern const u8 gUnknown_81AFCE9[]; -extern const u8 gUnknown_81AFD49[]; -extern const u8 gUnknown_81AFDC4[]; -extern const u8 gUnknown_81AFE68[]; -extern const u8 gUnknown_81AFF23[]; -extern const u8 gUnknown_81AFFA8[]; -extern const u8 gUnknown_81B0022[]; -extern const u8 gUnknown_81B00A6[]; -extern const u8 gUnknown_81B0106[]; -extern const u8 gUnknown_81B0188[]; -extern const u8 gUnknown_81B0198[]; -extern const u8 gUnknown_81B0251[]; -extern const u8 gUnknown_81B025D[]; -extern const u8 gUnknown_81B030F[]; -extern const u8 gUnknown_81B031B[]; -extern const u8 gUnknown_81B03B3[]; -extern const u8 gUnknown_81B03BF[]; -extern const u8 gUnknown_81B0446[]; -extern const u8 gUnknown_81B0456[]; -extern const u8 gUnknown_81B0504[]; -extern const u8 gUnknown_81B0510[]; -extern const u8 gUnknown_81B05C2[]; -extern const u8 gUnknown_81B05CD[]; -extern const u8 gUnknown_81B0667[]; -extern const u8 gUnknown_81B0675[]; -extern const u8 gUnknown_81B06FB[]; -extern const u8 gUnknown_81B0708[]; -extern const u8 gUnknown_81B079F[]; -extern const u8 gUnknown_81B07AD[]; -extern const u8 gUnknown_81B0845[]; -extern const u8 gUnknown_81B0851[]; -extern const u8 gUnknown_81B08EE[]; -extern const u8 gUnknown_81B08FB[]; -extern const u8 gUnknown_81B097F[]; -extern const u8 gUnknown_81B098B[]; -extern const u8 gUnknown_81B0A45[]; -extern const u8 gUnknown_81B0A50[]; -extern const u8 gUnknown_81B0AFF[]; -extern const u8 gUnknown_81B0B0E[]; -extern const u8 gUnknown_81B0BA6[]; -extern const u8 gUnknown_81B0BB5[]; -extern const u8 gUnknown_81B0C45[]; -extern const u8 gUnknown_81B0C51[]; -extern const u8 gUnknown_81B0C5E[]; -extern const u8 gUnknown_81B0C6B[]; -extern const u8 gUnknown_81B0C79[]; -extern const u8 gUnknown_81B0C88[]; -extern const u8 gUnknown_81B0C95[]; -extern const u8 gUnknown_81B0CA2[]; -extern const u8 gUnknown_81B0CB1[]; -extern const u8 gUnknown_81B0CC1[]; -extern const u8 gUnknown_81B0CCF[]; -extern const u8 gUnknown_81B0CDF[]; -extern const u8 gUnknown_81B0CEB[]; -extern const u8 gUnknown_81B0CF7[]; -extern const u8 gUnknown_81B0D02[]; -extern const u8 gUnknown_81B0D0E[]; -extern const u8 gUnknown_81B0D16[]; -extern const u8 gUnknown_81B0D1F[]; -extern const u8 gUnknown_81B0D2D[]; -extern const u8 gUnknown_81B0D3B[]; -extern const u8 gUnknown_81B0D48[]; -extern const u8 gUnknown_81B0D55[]; -extern const u8 gUnknown_81B0D65[]; -extern const u8 gUnknown_81B0D73[]; -extern const u8 gUnknown_81B0D81[]; -extern const u8 gUnknown_81B0D90[]; -extern const u8 gUnknown_81B0D9E[]; -extern const u8 gUnknown_81B0DAC[]; -extern const u8 gUnknown_81B0DBA[]; -extern const u8 gUnknown_81B0DC8[]; -extern const u8 gUnknown_81B0DD7[]; -extern const u8 gUnknown_81B0DE4[]; -extern const u8 gUnknown_81B0DF0[]; -extern const u8 gUnknown_81B0DFC[]; -extern const u8 gUnknown_81B0E08[]; -extern const u8 gUnknown_81B0E14[]; -extern const u8 gUnknown_81B0E24[]; -extern const u8 gUnknown_81B0E31[]; -extern const u8 gUnknown_81B0E3D[]; -extern const u8 gUnknown_81B0E49[]; -extern const u8 gUnknown_81B0E56[]; -extern const u8 gUnknown_81B0E63[]; -extern const u8 gUnknown_81B0E6F[]; -extern const u8 gUnknown_81B0E7C[]; -extern const u8 gUnknown_81B0E89[]; -extern const u8 gUnknown_81B0E95[]; -extern const u8 gUnknown_81B0EA1[]; -extern const u8 gUnknown_81B0EAE[]; -extern const u8 gUnknown_81B0EBA[]; -extern const u8 gUnknown_81B0ECA[]; -extern const u8 gUnknown_81B0ED7[]; -extern const u8 gUnknown_81B0EE4[]; -extern const u8 gUnknown_81B0EF4[]; -extern const u8 gUnknown_81B0F01[]; -extern const u8 gUnknown_81B0F11[]; -extern const u8 gUnknown_81B0F20[]; -extern const u8 gUnknown_81B0F2F[]; -extern const u8 gUnknown_81B0F3B[]; -extern const u8 gUnknown_81B0F47[]; -extern const u8 gUnknown_81B0F53[]; -extern const u8 gUnknown_81B0F5F[]; -extern const u8 gUnknown_81B0F6E[]; -extern const u8 gUnknown_81B0F7D[]; -extern const u8 gUnknown_81B0F8A[]; -extern const u8 gUnknown_81B0F94[]; -extern const u8 gUnknown_81B0F9F[]; -extern const u8 gUnknown_81B0FAE[]; -extern const u8 gUnknown_81B0FBD[]; -extern const u8 gUnknown_81B0FCC[]; -extern const u8 gUnknown_81B0FDB[]; -extern const u8 gUnknown_81B0FE8[]; -extern const u8 gUnknown_81B0FF7[]; -extern const u8 gUnknown_81B1002[]; -extern const u8 gUnknown_81B1011[]; -extern const u8 gUnknown_81B1020[]; -extern const u8 gUnknown_81B102D[]; -extern const u8 gUnknown_81B103B[]; -extern const u8 gUnknown_81B104A[]; -extern const u8 gUnknown_81B1059[]; -extern const u8 gUnknown_81B1067[]; -extern const u8 gUnknown_81B1075[]; -extern const u8 gUnknown_81B1082[]; -extern const u8 gUnknown_81B108D[]; -extern const u8 gUnknown_81B1098[]; -extern const u8 gUnknown_81B10A3[]; -extern const u8 gUnknown_81B10B1[]; -extern const u8 gUnknown_81B10BF[]; -extern const u8 gUnknown_81B10CD[]; -extern const u8 gUnknown_81B10DB[]; -extern const u8 gUnknown_81B10E8[]; -extern const u8 gUnknown_81B10F8[]; -extern const u8 gUnknown_81B1107[]; -extern const u8 gUnknown_81B1111[]; -extern const u8 gUnknown_81B111B[]; -extern const u8 gUnknown_81B1128[]; -extern const u8 gUnknown_81B1135[]; -extern const u8 gUnknown_81B1146[]; -extern const u8 gUnknown_81B114B[]; -extern const u8 gUnknown_81B1155[]; -extern const u8 gUnknown_81B115A[]; -extern const u8 gUnknown_81B116A[]; -extern const u8 gUnknown_81B1171[]; -extern const u8 gUnknown_81B1176[]; -extern const u8 gUnknown_81B117B[]; -extern const u8 gUnknown_81B1181[]; -extern const u8 gUnknown_81B1185[]; -extern const u8 gUnknown_81B1195[]; -extern const u8 gUnknown_81B119E[]; -extern const u8 gUnknown_81B11AE[]; -extern const u8 gUnknown_81B11B3[]; -extern const u8 gUnknown_81B11B9[]; -extern const u8 gUnknown_81B11C3[]; -extern const u8 gUnknown_81B11C7[]; -extern const u8 gUnknown_81B11CB[]; -extern const u8 gUnknown_81B11DB[]; -extern const u8 gUnknown_81B11E0[]; -extern const u8 gUnknown_81B11E6[]; -extern const u8 gUnknown_81B11EB[]; -extern const u8 gUnknown_81B11F5[]; -extern const u8 gUnknown_81B11FA[]; -extern const u8 gUnknown_81B120A[]; -extern const u8 gUnknown_81B120F[]; -extern const u8 gUnknown_81B1219[]; -extern const u8 gUnknown_81B1220[]; -extern const u8 gUnknown_81B1227[]; -extern const u8 gUnknown_81B122E[]; -extern const u8 gUnknown_81B123E[]; -extern const u8 gUnknown_81B1243[]; -extern const u8 gUnknown_81B1249[]; -extern const u8 gUnknown_81B124E[]; -extern const u8 gUnknown_81B1254[]; -extern const u8 gUnknown_81B125A[]; -extern const u8 gUnknown_81B126A[]; -extern const u8 gUnknown_81B126F[]; -extern const u8 gUnknown_81B1274[]; -extern const u8 gUnknown_81B1279[]; -extern const u8 gUnknown_81B1281[]; -extern const u8 gUnknown_81B1291[]; -extern const u8 gUnknown_81B1295[]; -extern const u8 gUnknown_81B129A[]; -extern const u8 gUnknown_81B12A4[]; -extern const u8 gUnknown_81B12AC[]; -extern const u8 gUnknown_81B12B4[]; -extern const u8 gUnknown_81B12C4[]; -extern const u8 gUnknown_81B12CA[]; -extern const u8 gUnknown_81B12CF[]; -extern const u8 gUnknown_81B12D6[]; -extern const u8 gUnknown_81B12DC[]; -extern const u8 gUnknown_81B12E2[]; -extern const u8 gUnknown_81B12E8[]; -extern const u8 gUnknown_81B12F8[]; -extern const u8 gUnknown_81B1300[]; -extern const u8 gUnknown_81B1308[]; -extern const u8 gUnknown_81B1310[]; -extern const u8 gUnknown_81B1320[]; -extern const u8 gUnknown_81B132C[]; -extern const u8 gUnknown_81B1335[]; -extern const u8 gUnknown_81B133B[]; -extern const u8 gUnknown_81B1341[]; -extern const u8 gUnknown_81B1351[]; -extern const u8 gUnknown_81B1359[]; -extern const u8 gUnknown_81B135F[]; -extern const u8 gUnknown_81B1367[]; -extern const u8 gUnknown_81B136E[]; -extern const u8 gUnknown_81B1376[]; -extern const u8 gUnknown_81B137E[]; -extern const u8 gUnknown_81B138E[]; -extern const u8 gUnknown_81B1395[]; -extern const u8 gUnknown_81B139E[]; -extern const u8 gUnknown_81B13A4[]; -extern const u8 gUnknown_81B13AA[]; -extern const u8 gUnknown_81B13B0[]; -extern const u8 gUnknown_81B13BC[]; -extern const u8 gUnknown_81B13CC[]; -extern const u8 gUnknown_81B13D6[]; -extern const u8 gUnknown_81B13D9[]; -extern const u8 gUnknown_81B13E4[]; -extern const u8 gUnknown_81B13EC[]; -extern const u8 gUnknown_81B13F2[]; -extern const u8 gUnknown_81B13F8[]; -extern const u8 gUnknown_81B13FE[]; -extern const u8 gUnknown_81B140A[]; -extern const u8 gUnknown_81B1416[]; -extern const u8 gUnknown_81B141F[]; -extern const u8 gUnknown_81B1423[]; -extern const u8 gUnknown_81B1429[]; -extern const u8 gUnknown_81B1439[]; -extern const u8 gUnknown_81B1442[]; -extern const u8 gUnknown_81B144C[]; -extern const u8 gUnknown_81B1456[]; -extern const u8 gUnknown_81B145F[]; -extern const u8 gUnknown_81B1463[]; +extern const u8 gFameCheckerFlavorText_ProfOak0[]; +extern const u8 gFameCheckerFlavorText_ProfOak1[]; +extern const u8 gFameCheckerFlavorText_ProfOak2[]; +extern const u8 gFameCheckerFlavorText_ProfOak3[]; +extern const u8 gFameCheckerFlavorText_ProfOak4[]; +extern const u8 gFameCheckerFlavorText_ProfOak5[]; +extern const u8 gFameCheckerFlavorText_Daisy0[]; +extern const u8 gFameCheckerFlavorText_Daisy1[]; +extern const u8 gFameCheckerFlavorText_Daisy2[]; +extern const u8 gFameCheckerFlavorText_Daisy3[]; +extern const u8 gFameCheckerFlavorText_Daisy4[]; +extern const u8 gFameCheckerFlavorText_Daisy5[]; +extern const u8 gFameCheckerFlavorText_Brock0[]; +extern const u8 gFameCheckerFlavorText_Brock1[]; +extern const u8 gFameCheckerFlavorText_Brock2[]; +extern const u8 gFameCheckerFlavorText_Brock3[]; +extern const u8 gFameCheckerFlavorText_Brock4[]; +extern const u8 gFameCheckerFlavorText_Brock5[]; +extern const u8 gFameCheckerFlavorText_Misty0[]; +extern const u8 gFameCheckerFlavorText_Misty1[]; +extern const u8 gFameCheckerFlavorText_Misty2[]; +extern const u8 gFameCheckerFlavorText_Misty3[]; +extern const u8 gFameCheckerFlavorText_Misty4[]; +extern const u8 gFameCheckerFlavorText_Misty5[]; +extern const u8 gFameCheckerFlavorText_LtSurge0[]; +extern const u8 gFameCheckerFlavorText_LtSurge1[]; +extern const u8 gFameCheckerFlavorText_LtSurge2[]; +extern const u8 gFameCheckerFlavorText_LtSurge3[]; +extern const u8 gFameCheckerFlavorText_LtSurge4[]; +extern const u8 gFameCheckerFlavorText_LtSurge5[]; +extern const u8 gFameCheckerFlavorText_Erika0[]; +extern const u8 gFameCheckerFlavorText_Erika1[]; +extern const u8 gFameCheckerFlavorText_Erika2[]; +extern const u8 gFameCheckerFlavorText_Erika3[]; +extern const u8 gFameCheckerFlavorText_Erika4[]; +extern const u8 gFameCheckerFlavorText_Erika5[]; +extern const u8 gFameCheckerFlavorText_Koga0[]; +extern const u8 gFameCheckerFlavorText_Koga1[]; +extern const u8 gFameCheckerFlavorText_Koga2[]; +extern const u8 gFameCheckerFlavorText_Koga3[]; +extern const u8 gFameCheckerFlavorText_Koga4[]; +extern const u8 gFameCheckerFlavorText_Koga5[]; +extern const u8 gFameCheckerFlavorText_Sabrina0[]; +extern const u8 gFameCheckerFlavorText_Sabrina1[]; +extern const u8 gFameCheckerFlavorText_Sabrina2[]; +extern const u8 gFameCheckerFlavorText_Sabrina3[]; +extern const u8 gFameCheckerFlavorText_Sabrina4[]; +extern const u8 gFameCheckerFlavorText_Sabrina5[]; +extern const u8 gFameCheckerFlavorText_Blaine0[]; +extern const u8 gFameCheckerFlavorText_Blaine1[]; +extern const u8 gFameCheckerFlavorText_Blaine2[]; +extern const u8 gFameCheckerFlavorText_Blaine3[]; +extern const u8 gFameCheckerFlavorText_Blaine4[]; +extern const u8 gFameCheckerFlavorText_Blaine5[]; +extern const u8 gFameCheckerFlavorText_Lorelei0[]; +extern const u8 gFameCheckerFlavorText_Lorelei1[]; +extern const u8 gFameCheckerFlavorText_Lorelei2[]; +extern const u8 gFameCheckerFlavorText_Lorelei3[]; +extern const u8 gFameCheckerFlavorText_Lorelei4[]; +extern const u8 gFameCheckerFlavorText_Lorelei5[]; +extern const u8 gFameCheckerFlavorText_Bruno0[]; +extern const u8 gFameCheckerFlavorText_Bruno1[]; +extern const u8 gFameCheckerFlavorText_Bruno2[]; +extern const u8 gFameCheckerFlavorText_Bruno3[]; +extern const u8 gFameCheckerFlavorText_Bruno4[]; +extern const u8 gFameCheckerFlavorText_Bruno5[]; +extern const u8 gFameCheckerFlavorText_Agatha0[]; +extern const u8 gFameCheckerFlavorText_Agatha1[]; +extern const u8 gFameCheckerFlavorText_Agatha2[]; +extern const u8 gFameCheckerFlavorText_Agatha3[]; +extern const u8 gFameCheckerFlavorText_Agatha4[]; +extern const u8 gFameCheckerFlavorText_Agatha5[]; +extern const u8 gFameCheckerFlavorText_Lance0[]; +extern const u8 gFameCheckerFlavorText_Lance1[]; +extern const u8 gFameCheckerFlavorText_Lance2[]; +extern const u8 gFameCheckerFlavorText_Lance3[]; +extern const u8 gFameCheckerFlavorText_Lance4[]; +extern const u8 gFameCheckerFlavorText_Lance5[]; +extern const u8 gFameCheckerFlavorText_Bill0[]; +extern const u8 gFameCheckerFlavorText_Bill1[]; +extern const u8 gFameCheckerFlavorText_Bill2[]; +extern const u8 gFameCheckerFlavorText_Bill3[]; +extern const u8 gFameCheckerFlavorText_Bill4[]; +extern const u8 gFameCheckerFlavorText_Bill5[]; +extern const u8 gFameCheckerFlavorText_MrFuji0[]; +extern const u8 gFameCheckerFlavorText_MrFuji1[]; +extern const u8 gFameCheckerFlavorText_MrFuji2[]; +extern const u8 gFameCheckerFlavorText_MrFuji3[]; +extern const u8 gFameCheckerFlavorText_MrFuji4[]; +extern const u8 gFameCheckerFlavorText_MrFuji5[]; +extern const u8 gFameCheckerFlavorText_Giovanni0[]; +extern const u8 gFameCheckerFlavorText_Giovanni1[]; +extern const u8 gFameCheckerFlavorText_Giovanni2[]; +extern const u8 gFameCheckerFlavorText_Giovanni3[]; +extern const u8 gFameCheckerFlavorText_Giovanni4[]; +extern const u8 gFameCheckerFlavorText_Giovanni5[]; +extern const u8 gFameCheckerPersonName_ProfOak[]; +extern const u8 gFameCheckerPersonQuote_ProfOak[]; +extern const u8 gFameCheckerPersonName_Daisy[]; +extern const u8 gFameCheckerPersonQuote_Daisy[]; +extern const u8 gFameCheckerPersonName_Brock[]; +extern const u8 gFameCheckerPersonQuote_Brock[]; +extern const u8 gFameCheckerPersonName_Misty[]; +extern const u8 gFameCheckerPersonQuote_Misty[]; +extern const u8 gFameCheckerPersonName_LtSurge[]; +extern const u8 gFameCheckerPersonQuote_LtSurge[]; +extern const u8 gFameCheckerPersonName_Erika[]; +extern const u8 gFameCheckerPersonQuote_Erika[]; +extern const u8 gFameCheckerPersonName_Koga[]; +extern const u8 gFameCheckerPersonQuote_Koga[]; +extern const u8 gFameCheckerPersonName_Sabrina[]; +extern const u8 gFameCheckerPersonQuote_Sabrina[]; +extern const u8 gFameCheckerPersonName_Blaine[]; +extern const u8 gFameCheckerPersonQuote_Blaine[]; +extern const u8 gFameCheckerPersonName_Lorelei[]; +extern const u8 gFameCheckerPersonQuote_Lorelei[]; +extern const u8 gFameCheckerPersonName_Bruno[]; +extern const u8 gFameCheckerPersonQuote_Bruno[]; +extern const u8 gFameCheckerPersonName_Agatha[]; +extern const u8 gFameCheckerPersonQuote_Agatha[]; +extern const u8 gFameCheckerPersonName_Lance[]; +extern const u8 gFameCheckerPersonQuote_Lance[]; +extern const u8 gFameCheckerPersonName_Bill[]; +extern const u8 gFameCheckerPersonQuote_Bill[]; +extern const u8 gFameCheckerPersonName_MrFuji[]; +extern const u8 gFameCheckerPersonQuote_MrFuji[]; +extern const u8 gFameCheckerPersonName_Giovanni[]; +extern const u8 gFameCheckerPersonQuote_Giovanni[]; +extern const u8 gFameCheckerFlavorTextOriginLocation_ProfOak0[]; +extern const u8 gFameCheckerFlavorTextOriginLocation_ProfOak1[]; +extern const u8 gFameCheckerFlavorTextOriginLocation_ProfOak2[]; +extern const u8 gFameCheckerFlavorTextOriginLocation_ProfOak3[]; +extern const u8 gFameCheckerFlavorTextOriginLocation_ProfOak4[]; +extern const u8 gFameCheckerFlavorTextOriginLocation_ProfOak5[]; +extern const u8 gFameCheckerFlavorTextOriginLocation_Daisy0[]; +extern const u8 gFameCheckerFlavorTextOriginLocation_Daisy1[]; +extern const u8 gFameCheckerFlavorTextOriginLocation_Daisy2[]; +extern const u8 gFameCheckerFlavorTextOriginLocation_Daisy3[]; +extern const u8 gFameCheckerFlavorTextOriginLocation_Daisy4[]; +extern const u8 gFameCheckerFlavorTextOriginLocation_Daisy5[]; +extern const u8 gFameCheckerFlavorTextOriginLocation_Brock0[]; +extern const u8 gFameCheckerFlavorTextOriginLocation_Brock1[]; +extern const u8 gFameCheckerFlavorTextOriginLocation_Brock2[]; +extern const u8 gFameCheckerFlavorTextOriginLocation_Brock3[]; +extern const u8 gFameCheckerFlavorTextOriginLocation_Brock4[]; +extern const u8 gFameCheckerFlavorTextOriginLocation_Brock5[]; +extern const u8 gFameCheckerFlavorTextOriginLocation_Misty0[]; +extern const u8 gFameCheckerFlavorTextOriginLocation_Misty1[]; +extern const u8 gFameCheckerFlavorTextOriginLocation_Misty2[]; +extern const u8 gFameCheckerFlavorTextOriginLocation_Misty3[]; +extern const u8 gFameCheckerFlavorTextOriginLocation_Misty4[]; +extern const u8 gFameCheckerFlavorTextOriginLocation_Misty5[]; +extern const u8 gFameCheckerFlavorTextOriginLocation_LtSurge0[]; +extern const u8 gFameCheckerFlavorTextOriginLocation_LtSurge1[]; +extern const u8 gFameCheckerFlavorTextOriginLocation_LtSurge2[]; +extern const u8 gFameCheckerFlavorTextOriginLocation_LtSurge3[]; +extern const u8 gFameCheckerFlavorTextOriginLocation_LtSurge4[]; +extern const u8 gFameCheckerFlavorTextOriginLocation_LtSurge5[]; +extern const u8 gFameCheckerFlavorTextOriginLocation_Erika0[]; +extern const u8 gFameCheckerFlavorTextOriginLocation_Erika1[]; +extern const u8 gFameCheckerFlavorTextOriginLocation_Erika2[]; +extern const u8 gFameCheckerFlavorTextOriginLocation_Erika3[]; +extern const u8 gFameCheckerFlavorTextOriginLocation_Erika4[]; +extern const u8 gFameCheckerFlavorTextOriginLocation_Erika5[]; +extern const u8 gFameCheckerFlavorTextOriginLocation_Koga0[]; +extern const u8 gFameCheckerFlavorTextOriginLocation_Koga1[]; +extern const u8 gFameCheckerFlavorTextOriginLocation_Koga2[]; +extern const u8 gFameCheckerFlavorTextOriginLocation_Koga3[]; +extern const u8 gFameCheckerFlavorTextOriginLocation_Koga4[]; +extern const u8 gFameCheckerFlavorTextOriginLocation_Koga5[]; +extern const u8 gFameCheckerFlavorTextOriginLocation_Sabrina0[]; +extern const u8 gFameCheckerFlavorTextOriginLocation_Sabrina1[]; +extern const u8 gFameCheckerFlavorTextOriginLocation_Sabrina2[]; +extern const u8 gFameCheckerFlavorTextOriginLocation_Sabrina3[]; +extern const u8 gFameCheckerFlavorTextOriginLocation_Sabrina4[]; +extern const u8 gFameCheckerFlavorTextOriginLocation_Sabrina5[]; +extern const u8 gFameCheckerFlavorTextOriginLocation_Blaine0[]; +extern const u8 gFameCheckerFlavorTextOriginLocation_Blaine1[]; +extern const u8 gFameCheckerFlavorTextOriginLocation_Blaine2[]; +extern const u8 gFameCheckerFlavorTextOriginLocation_Blaine3[]; +extern const u8 gFameCheckerFlavorTextOriginLocation_Blaine4[]; +extern const u8 gFameCheckerFlavorTextOriginLocation_Blaine5[]; +extern const u8 gFameCheckerFlavorTextOriginLocation_Lorelei0[]; +extern const u8 gFameCheckerFlavorTextOriginLocation_Lorelei1[]; +extern const u8 gFameCheckerFlavorTextOriginLocation_Lorelei2[]; +extern const u8 gFameCheckerFlavorTextOriginLocation_Lorelei3[]; +extern const u8 gFameCheckerFlavorTextOriginLocation_Lorelei4[]; +extern const u8 gFameCheckerFlavorTextOriginLocation_Lorelei5[]; +extern const u8 gFameCheckerFlavorTextOriginLocation_Bruno0[]; +extern const u8 gFameCheckerFlavorTextOriginLocation_Bruno1[]; +extern const u8 gFameCheckerFlavorTextOriginLocation_Bruno2[]; +extern const u8 gFameCheckerFlavorTextOriginLocation_Bruno3[]; +extern const u8 gFameCheckerFlavorTextOriginLocation_Bruno4[]; +extern const u8 gFameCheckerFlavorTextOriginLocation_Bruno5[]; +extern const u8 gFameCheckerFlavorTextOriginLocation_Agatha0[]; +extern const u8 gFameCheckerFlavorTextOriginLocation_Agatha1[]; +extern const u8 gFameCheckerFlavorTextOriginLocation_Agatha2[]; +extern const u8 gFameCheckerFlavorTextOriginLocation_Agatha3[]; +extern const u8 gFameCheckerFlavorTextOriginLocation_Agatha4[]; +extern const u8 gFameCheckerFlavorTextOriginLocation_Agatha5[]; +extern const u8 gFameCheckerFlavorTextOriginLocation_Lance0[]; +extern const u8 gFameCheckerFlavorTextOriginLocation_Lance1[]; +extern const u8 gFameCheckerFlavorTextOriginLocation_Lance2[]; +extern const u8 gFameCheckerFlavorTextOriginLocation_Lance3[]; +extern const u8 gFameCheckerFlavorTextOriginLocation_Lance4[]; +extern const u8 gFameCheckerFlavorTextOriginLocation_Lance5[]; +extern const u8 gFameCheckerFlavorTextOriginLocation_Bill0[]; +extern const u8 gFameCheckerFlavorTextOriginLocation_Bill1[]; +extern const u8 gFameCheckerFlavorTextOriginLocation_Bill2[]; +extern const u8 gFameCheckerFlavorTextOriginLocation_Bill3[]; +extern const u8 gFameCheckerFlavorTextOriginLocation_Bill4[]; +extern const u8 gFameCheckerFlavorTextOriginLocation_Bill5[]; +extern const u8 gFameCheckerFlavorTextOriginLocation_MrFuji0[]; +extern const u8 gFameCheckerFlavorTextOriginLocation_MrFuji1[]; +extern const u8 gFameCheckerFlavorTextOriginLocation_MrFuji2[]; +extern const u8 gFameCheckerFlavorTextOriginLocation_MrFuji3[]; +extern const u8 gFameCheckerFlavorTextOriginLocation_MrFuji4[]; +extern const u8 gFameCheckerFlavorTextOriginLocation_MrFuji5[]; +extern const u8 gFameCheckerFlavorTextOriginLocation_Giovanni0[]; +extern const u8 gFameCheckerFlavorTextOriginLocation_Giovanni1[]; +extern const u8 gFameCheckerFlavorTextOriginLocation_Giovanni2[]; +extern const u8 gFameCheckerFlavorTextOriginLocation_Giovanni3[]; +extern const u8 gFameCheckerFlavorTextOriginLocation_Giovanni4[]; +extern const u8 gFameCheckerFlavorTextOriginLocation_Giovanni5[]; +extern const u8 gFameCheckerFlavorTextOriginObjectName_ProfOak0[]; +extern const u8 gFameCheckerFlavorTextOriginObjectName_ProfOak1[]; +extern const u8 gFameCheckerFlavorTextOriginObjectName_ProfOak2[]; +extern const u8 gFameCheckerFlavorTextOriginObjectName_ProfOak3[]; +extern const u8 gFameCheckerFlavorTextOriginObjectName_ProfOak4[]; +extern const u8 gFameCheckerFlavorTextOriginObjectName_ProfOak5[]; +extern const u8 gFameCheckerFlavorTextOriginObjectName_Daisy0[]; +extern const u8 gFameCheckerFlavorTextOriginObjectName_Daisy1[]; +extern const u8 gFameCheckerFlavorTextOriginObjectName_Daisy2[]; +extern const u8 gFameCheckerFlavorTextOriginObjectName_Daisy3[]; +extern const u8 gFameCheckerFlavorTextOriginObjectName_Daisy4[]; +extern const u8 gFameCheckerFlavorTextOriginObjectName_Daisy5[]; +extern const u8 gFameCheckerFlavorTextOriginObjectName_Brock0[]; +extern const u8 gFameCheckerFlavorTextOriginObjectName_Brock1[]; +extern const u8 gFameCheckerFlavorTextOriginObjectName_Brock2[]; +extern const u8 gFameCheckerFlavorTextOriginObjectName_Brock3[]; +extern const u8 gFameCheckerFlavorTextOriginObjectName_Brock4[]; +extern const u8 gFameCheckerFlavorTextOriginObjectName_Brock5[]; +extern const u8 gFameCheckerFlavorTextOriginObjectName_Misty0[]; +extern const u8 gFameCheckerFlavorTextOriginObjectName_Misty1[]; +extern const u8 gFameCheckerFlavorTextOriginObjectName_Misty2[]; +extern const u8 gFameCheckerFlavorTextOriginObjectName_Misty3[]; +extern const u8 gFameCheckerFlavorTextOriginObjectName_Misty4[]; +extern const u8 gFameCheckerFlavorTextOriginObjectName_Misty5[]; +extern const u8 gFameCheckerFlavorTextOriginObjectName_LtSurge0[]; +extern const u8 gFameCheckerFlavorTextOriginObjectName_LtSurge1[]; +extern const u8 gFameCheckerFlavorTextOriginObjectName_LtSurge2[]; +extern const u8 gFameCheckerFlavorTextOriginObjectName_LtSurge3[]; +extern const u8 gFameCheckerFlavorTextOriginObjectName_LtSurge4[]; +extern const u8 gFameCheckerFlavorTextOriginObjectName_LtSurge5[]; +extern const u8 gFameCheckerFlavorTextOriginObjectName_Erika0[]; +extern const u8 gFameCheckerFlavorTextOriginObjectName_Erika1[]; +extern const u8 gFameCheckerFlavorTextOriginObjectName_Erika2[]; +extern const u8 gFameCheckerFlavorTextOriginObjectName_Erika3[]; +extern const u8 gFameCheckerFlavorTextOriginObjectName_Erika4[]; +extern const u8 gFameCheckerFlavorTextOriginObjectName_Erika5[]; +extern const u8 gFameCheckerFlavorTextOriginObjectName_Koga0[]; +extern const u8 gFameCheckerFlavorTextOriginObjectName_Koga1[]; +extern const u8 gFameCheckerFlavorTextOriginObjectName_Koga2[]; +extern const u8 gFameCheckerFlavorTextOriginObjectName_Koga3[]; +extern const u8 gFameCheckerFlavorTextOriginObjectName_Koga4[]; +extern const u8 gFameCheckerFlavorTextOriginObjectName_Koga5[]; +extern const u8 gFameCheckerFlavorTextOriginObjectName_Sabrina0[]; +extern const u8 gFameCheckerFlavorTextOriginObjectName_Sabrina1[]; +extern const u8 gFameCheckerFlavorTextOriginObjectName_Sabrina2[]; +extern const u8 gFameCheckerFlavorTextOriginObjectName_Sabrina3[]; +extern const u8 gFameCheckerFlavorTextOriginObjectName_Sabrina4[]; +extern const u8 gFameCheckerFlavorTextOriginObjectName_Sabrina5[]; +extern const u8 gFameCheckerFlavorTextOriginObjectName_Blaine0[]; +extern const u8 gFameCheckerFlavorTextOriginObjectName_Blaine1[]; +extern const u8 gFameCheckerFlavorTextOriginObjectName_Blaine2[]; +extern const u8 gFameCheckerFlavorTextOriginObjectName_Blaine3[]; +extern const u8 gFameCheckerFlavorTextOriginObjectName_Blaine4[]; +extern const u8 gFameCheckerFlavorTextOriginObjectName_Blaine5[]; +extern const u8 gFameCheckerFlavorTextOriginObjectName_Lorelei0[]; +extern const u8 gFameCheckerFlavorTextOriginObjectName_Lorelei1[]; +extern const u8 gFameCheckerFlavorTextOriginObjectName_Lorelei2[]; +extern const u8 gFameCheckerFlavorTextOriginObjectName_Lorelei3[]; +extern const u8 gFameCheckerFlavorTextOriginObjectName_Lorelei4[]; +extern const u8 gFameCheckerFlavorTextOriginObjectName_Lorelei5[]; +extern const u8 gFameCheckerFlavorTextOriginObjectName_Bruno0[]; +extern const u8 gFameCheckerFlavorTextOriginObjectName_Bruno1[]; +extern const u8 gFameCheckerFlavorTextOriginObjectName_Bruno2[]; +extern const u8 gFameCheckerFlavorTextOriginObjectName_Bruno3[]; +extern const u8 gFameCheckerFlavorTextOriginObjectName_Bruno4[]; +extern const u8 gFameCheckerFlavorTextOriginObjectName_Bruno5[]; +extern const u8 gFameCheckerFlavorTextOriginObjectName_Agatha0[]; +extern const u8 gFameCheckerFlavorTextOriginObjectName_Agatha1[]; +extern const u8 gFameCheckerFlavorTextOriginObjectName_Agatha2[]; +extern const u8 gFameCheckerFlavorTextOriginObjectName_Agatha3[]; +extern const u8 gFameCheckerFlavorTextOriginObjectName_Agatha4[]; +extern const u8 gFameCheckerFlavorTextOriginObjectName_Agatha5[]; +extern const u8 gFameCheckerFlavorTextOriginObjectName_Lance0[]; +extern const u8 gFameCheckerFlavorTextOriginObjectName_Lance1[]; +extern const u8 gFameCheckerFlavorTextOriginObjectName_Lance2[]; +extern const u8 gFameCheckerFlavorTextOriginObjectName_Lance3[]; +extern const u8 gFameCheckerFlavorTextOriginObjectName_Lance4[]; +extern const u8 gFameCheckerFlavorTextOriginObjectName_Lance5[]; +extern const u8 gFameCheckerFlavorTextOriginObjectName_Bill0[]; +extern const u8 gFameCheckerFlavorTextOriginObjectName_Bill1[]; +extern const u8 gFameCheckerFlavorTextOriginObjectName_Bill2[]; +extern const u8 gFameCheckerFlavorTextOriginObjectName_Bill3[]; +extern const u8 gFameCheckerFlavorTextOriginObjectName_Bill4[]; +extern const u8 gFameCheckerFlavorTextOriginObjectName_Bill5[]; +extern const u8 gFameCheckerFlavorTextOriginObjectName_MrFuji0[]; +extern const u8 gFameCheckerFlavorTextOriginObjectName_MrFuji1[]; +extern const u8 gFameCheckerFlavorTextOriginObjectName_MrFuji2[]; +extern const u8 gFameCheckerFlavorTextOriginObjectName_MrFuji3[]; +extern const u8 gFameCheckerFlavorTextOriginObjectName_MrFuji4[]; +extern const u8 gFameCheckerFlavorTextOriginObjectName_MrFuji5[]; +extern const u8 gFameCheckerFlavorTextOriginObjectName_Giovanni0[]; +extern const u8 gFameCheckerFlavorTextOriginObjectName_Giovanni1[]; +extern const u8 gFameCheckerFlavorTextOriginObjectName_Giovanni2[]; +extern const u8 gFameCheckerFlavorTextOriginObjectName_Giovanni3[]; +extern const u8 gFameCheckerFlavorTextOriginObjectName_Giovanni4[]; +extern const u8 gFameCheckerFlavorTextOriginObjectName_Giovanni5[]; #endif //GUARD_EVENT_SCRIPTS_H diff --git a/include/fame_checker.h b/include/fame_checker.h index fad629108..2849eef09 100644 --- a/include/fame_checker.h +++ b/include/fame_checker.h @@ -19,7 +19,8 @@ enum { FAMECHECKER_LANCE, FAMECHECKER_BILL, FAMECHECKER_MRFUJI, - FAMECHECKER_GIOVANNI + FAMECHECKER_GIOVANNI, + NUM_FAMECHECKER_PERSONS }; enum { @@ -28,7 +29,17 @@ enum { FCPICKSTATE_COLORED }; +enum { + FCWINDOWID_LIST, + FCWINDOWID_UIHELP, + FCWINDOWID_MSGBOX, + FCWINDOWID_ICONDESC +}; + void ResetFameChecker(void); +void FullyUnlockFameChecker(void); void UseFameChecker(MainCallback savedCallback); +void SetFlavorTextFlagFromSpecialVars(void); +void UpdatePickStateFromSpecialVar8005(void); #endif //GUARD_FAME_CHECKER_H diff --git a/include/global.h b/include/global.h index d99f912ae..b81b29381 100644 --- a/include/global.h +++ b/include/global.h @@ -572,6 +572,8 @@ struct QuestLog /*0x0668*/ u16 end[0]; }; +#include "fame_checker.h" + struct FameCheckerSaveData { /*3a54*/ u16 pickState:2; @@ -643,7 +645,7 @@ struct SaveBlock1 /*0x3A14*/ u8 seen2[DEX_FLAGS_NO]; /*0x3A48*/ u8 filler_3a48[4]; /*0x3A4C*/ u8 rivalName[PLAYER_NAME_LENGTH]; - /*0x3A54*/ struct FameCheckerSaveData fameChecker[16]; + /*0x3A54*/ struct FameCheckerSaveData fameChecker[NUM_FAMECHECKER_PERSONS]; /*0x3A94*/ u8 filler3A94[0x2A4]; u32 unkArray[4][3]; }; diff --git a/include/new_menu_helpers.h b/include/new_menu_helpers.h index 2ff20eb39..2a68a35e6 100644 --- a/include/new_menu_helpers.h +++ b/include/new_menu_helpers.h @@ -18,6 +18,6 @@ u8 GetPlayerTextSpeed(void); void sub_80F6F54(u8, u8); u8 sub_80F78A8(void); void sub_80F6E9C(void); -void sub_80F6EE4(u8, u8); +void sub_80F6EE4(u8 windowId, bool8 transfer); #endif // GUARD_NEW_MENU_HELPERS_H diff --git a/src/fame_checker.c b/src/fame_checker.c index 723fffefe..46c13c387 100644 --- a/src/fame_checker.c +++ b/src/fame_checker.c @@ -27,14 +27,16 @@ #include "text_window.h" #include "fame_checker.h" -#define SPRITETAG_1000 1000 -#define SPRITETAG_1001 1001 -#define SPRITETAG_1002 1002 -#define SPRITETAG_1004 1004 -#define SPRITETAG_1006 1006 -#define SPRITETAG_1007 1007 -#define SPRITETAG_1008 1008 -#define SPRITETAG_1009 1009 +#define SPRITETAG_SELECTOR_CURSOR 1000 +#define SPRITETAG_QUESTION_MARK 1001 +#define SPRITETAG_SPINNING_POKEBALL 1002 +#define SPRITETAG_SCROLL_INDICATORS 1004 +#define SPRITETAG_DAISY 1006 +#define SPRITETAG_FUJI 1007 +#define SPRITETAG_OAK 1008 +#define SPRITETAG_BILL 1009 + +#define FC_NONTRAINER_START 0xFE00 struct FameCheckerData { @@ -44,11 +46,11 @@ struct FameCheckerData u8 personHasUnlockedPanels:1; u8 inPickMode:1; u8 numUnlockedPersons:6; - u8 scrollIndicatorArrowObjectTaskId; + u8 listMenuTaskId; u8 listMenuCurIdx; u8 listMenuTopIdx2; u8 listMenuDrawnSelIdx; - u8 unlockedPersons[17]; + u8 unlockedPersons[NUM_FAMECHECKER_PERSONS + 1]; u8 spriteIds[6]; u8 unk_23_0:1; u8 unk_23_1:1; @@ -65,74 +67,73 @@ static EWRAM_DATA s32 sLastMenuIdx = 0; struct ListMenuTemplate gFameChecker_ListMenuTemplate; u8 gUnknown_3005EC8; -static void sub_812C3F8(void); -static void sub_812C648(void); -static void sub_812C664(u8 taskId); -static void sub_812C694(u8 taskId); -static bool8 sub_812C8F8(u8 taskId); -static void sub_812C990(void); -static void sub_812C9BC(u8 taskId); -static void sub_812CA1C(u8 taskId); -static void sub_812CAD8(u8 taskId); -static void sub_812CC68(u8 taskId, s8 dx, s8 dy); -static void sub_812CD3C(void); -static void sub_812CE04(u8 taskId); -static void sub_812CE9C(void); -static void sub_812CEC0(void); -static void sub_812CEE0(u8 windowId); -static bool8 sub_812CEFC(u8 taskId, u8 objMode); -static void sub_812CF3C(u8 taskId); -static void sub_812CF7C(u8 taskId); -static void sub_812D094(u8 windowId); -static void sub_812D0F4(u8 a0); -static bool8 sub_812D1A8(u8 a0); -static void sub_812D420(void); -static void sub_812D558(void); -static void sub_812D584(void); -static void sub_812D594(void); -static void sub_812D650(void); -static bool8 sub_812D6B4(void); -static void sub_812D70C(void); -static u8 sub_812D724(s16 a0); -static void sub_812D764(struct Sprite *sprite); -static void sub_812D770(void); +static void MainCB2_LoadFameChecker(void); +static void LoadUISpriteSheetsAndPalettes(void); +static void Task_WaitFadeOnInit(u8 taskId); +static void Task_TopMenuHandleInput(u8 taskId); +static bool8 TryExitPickMode(u8 taskId); +static void MessageBoxPrintEmptyText(void); +static void Task_EnterPickMode(u8 taskId); +static void Task_ExitPickMode(u8 taskId); +static void Task_FlavorTextDisplayHandleInput(u8 taskId); +static void FC_MoveSelectorCursor(u8 taskId, s8 dx, s8 dy); +static void GetPickModeText(void); +static void PrintSelectedNameInBrightGreen(u8 taskId); +static void WipeMsgBoxAndTransfer(void); +static void Setup_DrawMsgAndListBoxes(void); +static void FC_PutWindowTilemapAndCopyWindowToVramMode3(u8 windowId); +static bool8 SetMessageSelectorIconObjMode(u8 taskId, u8 objMode); +static void Task_StartToCloseFameChecker(u8 taskId); +static void Task_DestroyAssetsAndCloseFameChecker(u8 taskId); +static void FC_DestroyWindow(u8 windowId); +static void PrintUIHelp(u8 a0); +static bool8 CreateAllFlavorTextIcons(u8 a0); +static void FCSetup_ClearVideoRegisters(void); +static void FCSetup_ResetTasksAndSpriteResources(void); +static void FCSetup_TurnOnDisplay(void); +static void FCSetup_ResetBGCoords(void); +static bool8 HasUnlockedAllFlavorTextsForCurrentPerson(void); +static void FreeSelectionCursorSpriteResources(void); +static u8 CreateFlavorTextIconSelectorCursorSprite(s16 a0); +static void SpriteCB_DestroyFlavorTextIconSelectorCursor(struct Sprite *sprite); +static void FreeQuestionMarkSpriteResources(void); static u8 PlaceQuestionMarkTile(u8, u8); -static void sub_812D7C8(void); -static u8 sub_812D7E4(void); -static void sub_812D800(struct Sprite *sprite); -static void sub_812D814(void); -static u8 sub_812D888(u8 a0); -static void sub_812D9A8(u8 a0, u16 a1); -static void sub_812DA14(u8 a0); +static void FreeSpinningPokeballSpriteResources(void); +static u8 CreateSpinningPokeballSprite(void); +static void SpriteCB_DestroySpinningPokeball(struct Sprite *sprite); +static void FreeNonTrainerPicTiles(void); +static u8 CreatePersonPicSprite(u8 a0); +static void DestroyPersonPicSprite(u8 a0, u16 a1); +static void UpdateIconDescriptionBox(u8 a0); static void sub_812DB10(void); -static void sub_812DB28(void); -static void sub_812D840(struct Sprite * sprite); -static void sub_812DB64(void); -static void sub_812DBC0(s32, bool8, struct ListMenu *); +static void FC_CreateListMenu(void); +static void SpriteCB_FCSpinningPokeball(struct Sprite * sprite); +static void InitListMenuTemplate(void); +static void FC_MoveCursorFunc(s32, bool8, struct ListMenu *); static void sub_812DD50(u8 taskId); -static void sub_812DDAC(void); -static void sub_812DDF0(s32 itemIndex, bool8 onInit); -static u8 sub_812DEF0(void); -static void sub_812DFE4(u8); -static void sub_812E000(void); -static void sub_812E048(void); +static void PrintCancelDescription(void); +static void FC_DoMoveCursor(s32 itemIndex, bool8 onInit); +static u8 FC_PopulateListMenu(void); +static void FC_PutWindowTilemapAndCopyWindowToVramMode3_2(u8 windowId); +static void FC_CreateScrollIndicatorArrowPair(void); +static void FreeListMenuSelectorArrowPairResources(void); static u16 FameCheckerGetCursorY(void); -static void sub_812E094(u8); +static void FlipBitUnk23_0(bool8); static void sub_812E110(u8 taskId); static void sub_812E178(u8 a0, s16 a1); -static void sub_812E4A4(u8 a0); - -extern const u8 gUnknown_84161C1[]; -extern const u8 gUnknown_841623B[]; -extern const u8 gUnknown_84181C3[]; -extern const u8 gUnknown_84181E4[]; -extern const u8 gUnknown_841E5A4[]; // "{KEYGFX_START_BUTTON}PICK {KEYGFX_DPAD_UP_DOWN}SELECT {KEYGFX_A_BUTTON}OK$" -extern const u8 gUnknown_841E5B9[]; // "{KEYGFX_START_BUTTON}PICK {KEYGFX_DPAD_UP_DOWN}SELECT {KEYGFX_B_BUTTON}CANCEL$" -extern const u8 gUnknown_841E5D2[]; // "{KEYGFX_DPAD_ANY}PICK {KEYGFX_A_BUTTON}READ {UNKNOWN_F8 0x01}CANCEL$" -extern const u8 gUnknown_841E5E9[]; // "OAK$" -extern const u8 gUnknown_841E5ED[]; // "DAISY$" -extern const u8 gUnknown_841E5F3[]; // "BILL$" -extern const u8 gUnknown_841E5F8[]; // "FUJI$" +static void PlaceListMenuCursor(bool8 a0); + +extern const u8 gFameCheckerText_Cancel[]; +extern const u8 gFameCheckerText_ListMenuCursor[]; +extern const u8 gFameCheckerText_FameCheckerWillBeClosed[]; +extern const u8 gFameCheckerText_ClearTextbox[]; +extern const u8 gFameCheckerText_MainScreenUI[]; // "{KEYGFX_START_BUTTON}PICK {KEYGFX_DPAD_UP_DOWN}SELECT {KEYGFX_A_BUTTON}OK$" +extern const u8 gFameCheckerText_PickScreenUI[]; // "{KEYGFX_START_BUTTON}PICK {KEYGFX_DPAD_UP_DOWN}SELECT {KEYGFX_B_BUTTON}CANCEL$" +extern const u8 gFameCheckerText_FlavorTextUI[]; // "{KEYGFX_DPAD_ANY}PICK {KEYGFX_A_BUTTON}READ {UNKNOWN_F8 0x01}CANCEL$" +extern const u8 gFameCheckerOakName[]; // "OAK$" +extern const u8 gFameCheckerDaisyName[]; // "DAISY$" +extern const u8 gFameCheckerBillName[]; // "BILL$" +extern const u8 gFameCheckerMrFujiName[]; // "FUJI$" static const u16 sFameCheckerTilemap[] = INCBIN_U16("data/fame_checker/tilemap_845c600.bin"); static const u8 sQuestionMarkSpriteGfx[] = INCBIN_U8("data/fame_checker/img_845ce00.4bpp"); @@ -149,95 +150,65 @@ static const u16 sDaisySpritePalette[] = INCBIN_U16("data/fame_checker/pal_845ed static const u8 sOakSpriteGfx[] = INCBIN_U8("data/fame_checker/img_845ed80.4bpp"); static const u16 sOakSpritePalette[] = INCBIN_U16("data/fame_checker/pal_845f580.gbapal"); static const u16 gUnknown_845F5A0[] = INCBIN_U16("data/fame_checker/pal_845f5a0.gbapal"); -static const u16 gUnknown_845F5C0[] = INCBIN_U16("data/fame_checker/pal_845f5c0.gbapal"); - -static const struct TextColor gUnknown_845F5E0 = {0x00, 0x01, 0x02}; -static const struct TextColor gUnknown_845F5E3 = {0x00, 0x02, 0x03}; -static const struct TextColor gUnknown_845F5E6 = {0x00, 0x06, 0x07}; - -static const u16 gUnknown_845F5EA[] = { - 0xfe00, - 0xfe01, - 0x019e, - 0x019f, - 0x01a0, - 0x01a1, - 0x01a2, - 0x01a4, - 0x01a3, - 0x019a, - 0x019b, - 0x019c, - 0x019d, - 0xfe02, - 0xfe03, - 0x015c +static const u16 sSilhouettePalette[] = INCBIN_U16("data/fame_checker/pal_845f5c0.gbapal"); + +static const struct TextColor gUnknown_845F5E0 = {TEXT_COLOR_TRANSPARENT, TEXT_COLOR_WHITE, TEXT_COLOR_DARK_GREY}; +static const struct TextColor gUnknown_845F5E3 = {TEXT_COLOR_TRANSPARENT, TEXT_COLOR_DARK_GREY, 0x03}; +static const struct TextColor gUnknown_845F5E6 = {TEXT_COLOR_TRANSPARENT, 0x06, 0x07}; + +static const u16 sTrainerIdxs[] = { + FC_NONTRAINER_START + 0, // OAK + FC_NONTRAINER_START + 1, // DAISY + 0x019e, // BROCK + 0x019f, // MISTY + 0x01a0, // LTSURGE + 0x01a1, // ERIKA + 0x01a2, // KOGA + 0x01a4, // SABRINA + 0x01a3, // BLAINE + 0x019a, // LORELEI + 0x019b, // BRUNO + 0x019c, // AGATHA + 0x019d, // LANCE + FC_NONTRAINER_START + 2, // BILL + FC_NONTRAINER_START + 3, // MRFUJI + 0x015c // GIOVANNI }; -static const u8 *const gUnknown_845F60C[] = { - gUnknown_841E5E9, - gUnknown_841E5ED, - gUnknown_841E5F3, - gUnknown_841E5F8 +static const u8 *const sNonTrainerNamePointers[] = { + gFameCheckerOakName, + gFameCheckerDaisyName, + gFameCheckerBillName, + gFameCheckerMrFujiName }; -static const u8 gUnknown_845F61C[] = { +static const u8 sFameCheckerTrainerPicIdxs[] = { 0x56, 0x54, 0x74, 0x75, 0x76, 0x77, 0x78, 0x7a, 0x79, 0x70, 0x71, 0x72, 0x73, 0x64, 0x7b, 0x6c, - 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00 + 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00 // these values are unused }; -static const u8 *const gUnknown_845F63C[] = { - gUnknown_81B0188, - gUnknown_81B0251, - gUnknown_81B030F, - gUnknown_81B03B3, - gUnknown_81B0446, - gUnknown_81B0504, - gUnknown_81B05C2, - gUnknown_81B0667, - gUnknown_81B06FB, - gUnknown_81B079F, - gUnknown_81B0845, - gUnknown_81B08EE, - gUnknown_81B097F, - gUnknown_81B0A45, - gUnknown_81B0AFF, - gUnknown_81B0BA6, - gUnknown_81B0198, - gUnknown_81B025D, - gUnknown_81B031B, - gUnknown_81B03BF, - gUnknown_81B0456, - gUnknown_81B0510, - gUnknown_81B05CD, - gUnknown_81B0675, - gUnknown_81B0708, - gUnknown_81B07AD, - gUnknown_81B0851, - gUnknown_81B08FB, - gUnknown_81B098B, - gUnknown_81B0A50, - gUnknown_81B0B0E, - gUnknown_81B0BB5 +static const u8 *const sFameCheckerNameAndQuotesPointers[] = { + gFameCheckerPersonName_ProfOak, gFameCheckerPersonName_Daisy, gFameCheckerPersonName_Brock, gFameCheckerPersonName_Misty, gFameCheckerPersonName_LtSurge, gFameCheckerPersonName_Erika, gFameCheckerPersonName_Koga, gFameCheckerPersonName_Sabrina, gFameCheckerPersonName_Blaine, gFameCheckerPersonName_Lorelei, gFameCheckerPersonName_Bruno, gFameCheckerPersonName_Agatha, gFameCheckerPersonName_Lance, gFameCheckerPersonName_Bill, gFameCheckerPersonName_MrFuji, gFameCheckerPersonName_Giovanni, + gFameCheckerPersonQuote_ProfOak, gFameCheckerPersonQuote_Daisy, gFameCheckerPersonQuote_Brock, gFameCheckerPersonQuote_Misty, gFameCheckerPersonQuote_LtSurge, gFameCheckerPersonQuote_Erika, gFameCheckerPersonQuote_Koga, gFameCheckerPersonQuote_Sabrina, gFameCheckerPersonQuote_Blaine, gFameCheckerPersonQuote_Lorelei, gFameCheckerPersonQuote_Bruno, gFameCheckerPersonQuote_Agatha, gFameCheckerPersonQuote_Lance, gFameCheckerPersonQuote_Bill, gFameCheckerPersonQuote_MrFuji, gFameCheckerPersonQuote_Giovanni }; -static const u8 *const gUnknown_845F6BC[] = { - gUnknown_81AD106, gUnknown_81AD145, gUnknown_81AD1BB, gUnknown_81AD258, gUnknown_81AD2B9, gUnknown_81AD377, - gUnknown_81AD40C, gUnknown_81AD4AE, gUnknown_81AD516, gUnknown_81AD5A7, gUnknown_81AD608, gUnknown_81AD69F, - gUnknown_81AD705, gUnknown_81AD771, gUnknown_81AD840, gUnknown_81AD908, gUnknown_81AD99A, gUnknown_81ADA27, - gUnknown_81ADA91, gUnknown_81ADAF6, gUnknown_81ADB5A, gUnknown_81ADBD9, gUnknown_81ADC72, gUnknown_81ADCEB, - gUnknown_81ADD3C, gUnknown_81ADDA7, gUnknown_81ADE0B, gUnknown_81ADE82, gUnknown_81ADEEC, gUnknown_81ADF6A, - gUnknown_81AE009, gUnknown_81AE072, gUnknown_81AE0F3, gUnknown_81AE15B, gUnknown_81AE1E5, gUnknown_81AE247, - gUnknown_81AE2B6, gUnknown_81AE31D, gUnknown_81AE37D, gUnknown_81AE407, gUnknown_81AE48D, gUnknown_81AE51B, - gUnknown_81AE5E8, gUnknown_81AE656, gUnknown_81AE6D7, gUnknown_81AE762, gUnknown_81AE7CB, gUnknown_81AE841, - gUnknown_81AE89E, gUnknown_81AE90A, gUnknown_81AE990, gUnknown_81AEA59, gUnknown_81AEAEE, gUnknown_81AEB69, - gUnknown_81AEBDF, gUnknown_81AEC28, gUnknown_81AEC82, gUnknown_81AED27, gUnknown_81AEDAA, gUnknown_81AEE51, - gUnknown_81AEF25, gUnknown_81AEF6C, gUnknown_81AEFC6, gUnknown_81AF04C, gUnknown_81AF0F0, gUnknown_81AF19A, - gUnknown_81AF200, gUnknown_81AF248, gUnknown_81AF2B7, gUnknown_81AF34E, gUnknown_81AF3BE, gUnknown_81AF47C, - gUnknown_81AF4FD, gUnknown_81AF567, gUnknown_81AF641, gUnknown_81AF6BA, gUnknown_81AF758, gUnknown_81AF7CB, - gUnknown_81AF83E, gUnknown_81AF8CA, gUnknown_81AF929, gUnknown_81AF998, gUnknown_81AFA20, gUnknown_81AFAB9, - gUnknown_81AFB0C, gUnknown_81AFB76, gUnknown_81AFC38, gUnknown_81AFCE9, gUnknown_81AFD49, gUnknown_81AFDC4, - gUnknown_81AFE68, gUnknown_81AFF23, gUnknown_81AFFA8, gUnknown_81B0022, gUnknown_81B00A6, gUnknown_81B0106 +static const u8 *const sFameCheckerFlavorTextPointers[] = { + gFameCheckerFlavorText_ProfOak0, gFameCheckerFlavorText_ProfOak1, gFameCheckerFlavorText_ProfOak2, gFameCheckerFlavorText_ProfOak3, gFameCheckerFlavorText_ProfOak4, gFameCheckerFlavorText_ProfOak5, + gFameCheckerFlavorText_Daisy0, gFameCheckerFlavorText_Daisy1, gFameCheckerFlavorText_Daisy2, gFameCheckerFlavorText_Daisy3, gFameCheckerFlavorText_Daisy4, gFameCheckerFlavorText_Daisy5, + gFameCheckerFlavorText_Brock0, gFameCheckerFlavorText_Brock1, gFameCheckerFlavorText_Brock2, gFameCheckerFlavorText_Brock3, gFameCheckerFlavorText_Brock4, gFameCheckerFlavorText_Brock5, + gFameCheckerFlavorText_Misty0, gFameCheckerFlavorText_Misty1, gFameCheckerFlavorText_Misty2, gFameCheckerFlavorText_Misty3, gFameCheckerFlavorText_Misty4, gFameCheckerFlavorText_Misty5, + gFameCheckerFlavorText_LtSurge0, gFameCheckerFlavorText_LtSurge1, gFameCheckerFlavorText_LtSurge2, gFameCheckerFlavorText_LtSurge3, gFameCheckerFlavorText_LtSurge4, gFameCheckerFlavorText_LtSurge5, + gFameCheckerFlavorText_Erika0, gFameCheckerFlavorText_Erika1, gFameCheckerFlavorText_Erika2, gFameCheckerFlavorText_Erika3, gFameCheckerFlavorText_Erika4, gFameCheckerFlavorText_Erika5, + gFameCheckerFlavorText_Koga0, gFameCheckerFlavorText_Koga1, gFameCheckerFlavorText_Koga2, gFameCheckerFlavorText_Koga3, gFameCheckerFlavorText_Koga4, gFameCheckerFlavorText_Koga5, + gFameCheckerFlavorText_Sabrina0, gFameCheckerFlavorText_Sabrina1, gFameCheckerFlavorText_Sabrina2, gFameCheckerFlavorText_Sabrina3, gFameCheckerFlavorText_Sabrina4, gFameCheckerFlavorText_Sabrina5, + gFameCheckerFlavorText_Blaine0, gFameCheckerFlavorText_Blaine1, gFameCheckerFlavorText_Blaine2, gFameCheckerFlavorText_Blaine3, gFameCheckerFlavorText_Blaine4, gFameCheckerFlavorText_Blaine5, + gFameCheckerFlavorText_Lorelei0, gFameCheckerFlavorText_Lorelei1, gFameCheckerFlavorText_Lorelei2, gFameCheckerFlavorText_Lorelei3, gFameCheckerFlavorText_Lorelei4, gFameCheckerFlavorText_Lorelei5, + gFameCheckerFlavorText_Bruno0, gFameCheckerFlavorText_Bruno1, gFameCheckerFlavorText_Bruno2, gFameCheckerFlavorText_Bruno3, gFameCheckerFlavorText_Bruno4, gFameCheckerFlavorText_Bruno5, + gFameCheckerFlavorText_Agatha0, gFameCheckerFlavorText_Agatha1, gFameCheckerFlavorText_Agatha2, gFameCheckerFlavorText_Agatha3, gFameCheckerFlavorText_Agatha4, gFameCheckerFlavorText_Agatha5, + gFameCheckerFlavorText_Lance0, gFameCheckerFlavorText_Lance1, gFameCheckerFlavorText_Lance2, gFameCheckerFlavorText_Lance3, gFameCheckerFlavorText_Lance4, gFameCheckerFlavorText_Lance5, + gFameCheckerFlavorText_Bill0, gFameCheckerFlavorText_Bill1, gFameCheckerFlavorText_Bill2, gFameCheckerFlavorText_Bill3, gFameCheckerFlavorText_Bill4, gFameCheckerFlavorText_Bill5, + gFameCheckerFlavorText_MrFuji0, gFameCheckerFlavorText_MrFuji1, gFameCheckerFlavorText_MrFuji2, gFameCheckerFlavorText_MrFuji3, gFameCheckerFlavorText_MrFuji4, gFameCheckerFlavorText_MrFuji5, + gFameCheckerFlavorText_Giovanni0, gFameCheckerFlavorText_Giovanni1, gFameCheckerFlavorText_Giovanni2, gFameCheckerFlavorText_Giovanni3, gFameCheckerFlavorText_Giovanni4, gFameCheckerFlavorText_Giovanni5 }; static const u8 sFameCheckerArrayNpcGraphicsIds[] = { @@ -259,62 +230,62 @@ static const u8 sFameCheckerArrayNpcGraphicsIds[] = { 0x57, 0x37, 0x37, 0x57, 0x5b, 0x37 }; -static const u8 *const gUnknown_845F89C[] = { - gUnknown_81B0C45, gUnknown_81B0C51, gUnknown_81B0C5E, gUnknown_81B0C6B, gUnknown_81B0C79, gUnknown_81B0C88, - gUnknown_81B0C95, gUnknown_81B0CA2, gUnknown_81B0CB1, gUnknown_81B0CC1, gUnknown_81B0CCF, gUnknown_81B0CDF, - gUnknown_81B0CEB, gUnknown_81B0CF7, gUnknown_81B0D02, gUnknown_81B0D0E, gUnknown_81B0D16, gUnknown_81B0D1F, - gUnknown_81B0D2D, gUnknown_81B0D3B, gUnknown_81B0D48, gUnknown_81B0D55, gUnknown_81B0D65, gUnknown_81B0D73, - gUnknown_81B0D81, gUnknown_81B0D90, gUnknown_81B0D9E, gUnknown_81B0DAC, gUnknown_81B0DBA, gUnknown_81B0DC8, - gUnknown_81B0DD7, gUnknown_81B0DE4, gUnknown_81B0DF0, gUnknown_81B0DFC, gUnknown_81B0E08, gUnknown_81B0E14, - gUnknown_81B0E24, gUnknown_81B0E31, gUnknown_81B0E3D, gUnknown_81B0E49, gUnknown_81B0E56, gUnknown_81B0E63, - gUnknown_81B0E6F, gUnknown_81B0E7C, gUnknown_81B0E89, gUnknown_81B0E95, gUnknown_81B0EA1, gUnknown_81B0EAE, - gUnknown_81B0EBA, gUnknown_81B0ECA, gUnknown_81B0ED7, gUnknown_81B0EE4, gUnknown_81B0EF4, gUnknown_81B0F01, - gUnknown_81B0F11, gUnknown_81B0F20, gUnknown_81B0F2F, gUnknown_81B0F3B, gUnknown_81B0F47, gUnknown_81B0F53, - gUnknown_81B0F5F, gUnknown_81B0F6E, gUnknown_81B0F7D, gUnknown_81B0F8A, gUnknown_81B0F94, gUnknown_81B0F9F, - gUnknown_81B0FAE, gUnknown_81B0FBD, gUnknown_81B0FCC, gUnknown_81B0FDB, gUnknown_81B0FE8, gUnknown_81B0FF7, - gUnknown_81B1002, gUnknown_81B1011, gUnknown_81B1020, gUnknown_81B102D, gUnknown_81B103B, gUnknown_81B104A, - gUnknown_81B1059, gUnknown_81B1067, gUnknown_81B1075, gUnknown_81B1082, gUnknown_81B108D, gUnknown_81B1098, - gUnknown_81B10A3, gUnknown_81B10B1, gUnknown_81B10BF, gUnknown_81B10CD, gUnknown_81B10DB, gUnknown_81B10E8, - gUnknown_81B10F8, gUnknown_81B1107, gUnknown_81B1111, gUnknown_81B111B, gUnknown_81B1128, gUnknown_81B1135 +static const u8 *const sFlavorTextOriginLocationTexts[] = { + gFameCheckerFlavorTextOriginLocation_ProfOak0, gFameCheckerFlavorTextOriginLocation_ProfOak1, gFameCheckerFlavorTextOriginLocation_ProfOak2, gFameCheckerFlavorTextOriginLocation_ProfOak3, gFameCheckerFlavorTextOriginLocation_ProfOak4, gFameCheckerFlavorTextOriginLocation_ProfOak5, + gFameCheckerFlavorTextOriginLocation_Daisy0, gFameCheckerFlavorTextOriginLocation_Daisy1, gFameCheckerFlavorTextOriginLocation_Daisy2, gFameCheckerFlavorTextOriginLocation_Daisy3, gFameCheckerFlavorTextOriginLocation_Daisy4, gFameCheckerFlavorTextOriginLocation_Daisy5, + gFameCheckerFlavorTextOriginLocation_Brock0, gFameCheckerFlavorTextOriginLocation_Brock1, gFameCheckerFlavorTextOriginLocation_Brock2, gFameCheckerFlavorTextOriginLocation_Brock3, gFameCheckerFlavorTextOriginLocation_Brock4, gFameCheckerFlavorTextOriginLocation_Brock5, + gFameCheckerFlavorTextOriginLocation_Misty0, gFameCheckerFlavorTextOriginLocation_Misty1, gFameCheckerFlavorTextOriginLocation_Misty2, gFameCheckerFlavorTextOriginLocation_Misty3, gFameCheckerFlavorTextOriginLocation_Misty4, gFameCheckerFlavorTextOriginLocation_Misty5, + gFameCheckerFlavorTextOriginLocation_LtSurge0, gFameCheckerFlavorTextOriginLocation_LtSurge1, gFameCheckerFlavorTextOriginLocation_LtSurge2, gFameCheckerFlavorTextOriginLocation_LtSurge3, gFameCheckerFlavorTextOriginLocation_LtSurge4, gFameCheckerFlavorTextOriginLocation_LtSurge5, + gFameCheckerFlavorTextOriginLocation_Erika0, gFameCheckerFlavorTextOriginLocation_Erika1, gFameCheckerFlavorTextOriginLocation_Erika2, gFameCheckerFlavorTextOriginLocation_Erika3, gFameCheckerFlavorTextOriginLocation_Erika4, gFameCheckerFlavorTextOriginLocation_Erika5, + gFameCheckerFlavorTextOriginLocation_Koga0, gFameCheckerFlavorTextOriginLocation_Koga1, gFameCheckerFlavorTextOriginLocation_Koga2, gFameCheckerFlavorTextOriginLocation_Koga3, gFameCheckerFlavorTextOriginLocation_Koga4, gFameCheckerFlavorTextOriginLocation_Koga5, + gFameCheckerFlavorTextOriginLocation_Sabrina0, gFameCheckerFlavorTextOriginLocation_Sabrina1, gFameCheckerFlavorTextOriginLocation_Sabrina2, gFameCheckerFlavorTextOriginLocation_Sabrina3, gFameCheckerFlavorTextOriginLocation_Sabrina4, gFameCheckerFlavorTextOriginLocation_Sabrina5, + gFameCheckerFlavorTextOriginLocation_Blaine0, gFameCheckerFlavorTextOriginLocation_Blaine1, gFameCheckerFlavorTextOriginLocation_Blaine2, gFameCheckerFlavorTextOriginLocation_Blaine3, gFameCheckerFlavorTextOriginLocation_Blaine4, gFameCheckerFlavorTextOriginLocation_Blaine5, + gFameCheckerFlavorTextOriginLocation_Lorelei0, gFameCheckerFlavorTextOriginLocation_Lorelei1, gFameCheckerFlavorTextOriginLocation_Lorelei2, gFameCheckerFlavorTextOriginLocation_Lorelei3, gFameCheckerFlavorTextOriginLocation_Lorelei4, gFameCheckerFlavorTextOriginLocation_Lorelei5, + gFameCheckerFlavorTextOriginLocation_Bruno0, gFameCheckerFlavorTextOriginLocation_Bruno1, gFameCheckerFlavorTextOriginLocation_Bruno2, gFameCheckerFlavorTextOriginLocation_Bruno3, gFameCheckerFlavorTextOriginLocation_Bruno4, gFameCheckerFlavorTextOriginLocation_Bruno5, + gFameCheckerFlavorTextOriginLocation_Agatha0, gFameCheckerFlavorTextOriginLocation_Agatha1, gFameCheckerFlavorTextOriginLocation_Agatha2, gFameCheckerFlavorTextOriginLocation_Agatha3, gFameCheckerFlavorTextOriginLocation_Agatha4, gFameCheckerFlavorTextOriginLocation_Agatha5, + gFameCheckerFlavorTextOriginLocation_Lance0, gFameCheckerFlavorTextOriginLocation_Lance1, gFameCheckerFlavorTextOriginLocation_Lance2, gFameCheckerFlavorTextOriginLocation_Lance3, gFameCheckerFlavorTextOriginLocation_Lance4, gFameCheckerFlavorTextOriginLocation_Lance5, + gFameCheckerFlavorTextOriginLocation_Bill0, gFameCheckerFlavorTextOriginLocation_Bill1, gFameCheckerFlavorTextOriginLocation_Bill2, gFameCheckerFlavorTextOriginLocation_Bill3, gFameCheckerFlavorTextOriginLocation_Bill4, gFameCheckerFlavorTextOriginLocation_Bill5, + gFameCheckerFlavorTextOriginLocation_MrFuji0, gFameCheckerFlavorTextOriginLocation_MrFuji1, gFameCheckerFlavorTextOriginLocation_MrFuji2, gFameCheckerFlavorTextOriginLocation_MrFuji3, gFameCheckerFlavorTextOriginLocation_MrFuji4, gFameCheckerFlavorTextOriginLocation_MrFuji5, + gFameCheckerFlavorTextOriginLocation_Giovanni0, gFameCheckerFlavorTextOriginLocation_Giovanni1, gFameCheckerFlavorTextOriginLocation_Giovanni2, gFameCheckerFlavorTextOriginLocation_Giovanni3, gFameCheckerFlavorTextOriginLocation_Giovanni4, gFameCheckerFlavorTextOriginLocation_Giovanni5 }; -static const u8 *const gUnknown_845FA1C[] = { - gUnknown_81B1146, gUnknown_81B114B, gUnknown_81B1155, gUnknown_81B115A, gUnknown_81B116A, gUnknown_81B1171, - gUnknown_81B1176, gUnknown_81B117B, gUnknown_81B1181, gUnknown_81B1185, gUnknown_81B1195, gUnknown_81B119E, - gUnknown_81B11AE, gUnknown_81B11B3, gUnknown_81B11B9, gUnknown_81B11C3, gUnknown_81B11C7, gUnknown_81B11CB, - gUnknown_81B11DB, gUnknown_81B11E0, gUnknown_81B11E6, gUnknown_81B11EB, gUnknown_81B11F5, gUnknown_81B11FA, - gUnknown_81B120A, gUnknown_81B120F, gUnknown_81B1219, gUnknown_81B1220, gUnknown_81B1227, gUnknown_81B122E, - gUnknown_81B123E, gUnknown_81B1243, gUnknown_81B1249, gUnknown_81B124E, gUnknown_81B1254, gUnknown_81B125A, - gUnknown_81B126A, gUnknown_81B126F, gUnknown_81B1274, gUnknown_81B1279, gUnknown_81B1281, gUnknown_81B1291, - gUnknown_81B1295, gUnknown_81B129A, gUnknown_81B12A4, gUnknown_81B12AC, gUnknown_81B12B4, gUnknown_81B12C4, - gUnknown_81B12CA, gUnknown_81B12CF, gUnknown_81B12D6, gUnknown_81B12DC, gUnknown_81B12E2, gUnknown_81B12E8, - gUnknown_81B12F8, gUnknown_81B1300, gUnknown_81B1308, gUnknown_81B1310, gUnknown_81B1320, gUnknown_81B132C, - gUnknown_81B1335, gUnknown_81B133B, gUnknown_81B1341, gUnknown_81B1351, gUnknown_81B1359, gUnknown_81B135F, - gUnknown_81B1367, gUnknown_81B136E, gUnknown_81B1376, gUnknown_81B137E, gUnknown_81B138E, gUnknown_81B1395, - gUnknown_81B139E, gUnknown_81B13A4, gUnknown_81B13AA, gUnknown_81B13B0, gUnknown_81B13BC, gUnknown_81B13CC, - gUnknown_81B13D6, gUnknown_81B13D9, gUnknown_81B13E4, gUnknown_81B13EC, gUnknown_81B13F2, gUnknown_81B13F8, - gUnknown_81B13FE, gUnknown_81B140A, gUnknown_81B1416, gUnknown_81B141F, gUnknown_81B1423, gUnknown_81B1429, - gUnknown_81B1439, gUnknown_81B1442, gUnknown_81B144C, gUnknown_81B1456, gUnknown_81B145F, gUnknown_81B1463 +static const u8 *const sFlavorTextOriginObjectNameTexts[] = { + gFameCheckerFlavorTextOriginObjectName_ProfOak0, gFameCheckerFlavorTextOriginObjectName_ProfOak1, gFameCheckerFlavorTextOriginObjectName_ProfOak2, gFameCheckerFlavorTextOriginObjectName_ProfOak3, gFameCheckerFlavorTextOriginObjectName_ProfOak4, gFameCheckerFlavorTextOriginObjectName_ProfOak5, + gFameCheckerFlavorTextOriginObjectName_Daisy0, gFameCheckerFlavorTextOriginObjectName_Daisy1, gFameCheckerFlavorTextOriginObjectName_Daisy2, gFameCheckerFlavorTextOriginObjectName_Daisy3, gFameCheckerFlavorTextOriginObjectName_Daisy4, gFameCheckerFlavorTextOriginObjectName_Daisy5, + gFameCheckerFlavorTextOriginObjectName_Brock0, gFameCheckerFlavorTextOriginObjectName_Brock1, gFameCheckerFlavorTextOriginObjectName_Brock2, gFameCheckerFlavorTextOriginObjectName_Brock3, gFameCheckerFlavorTextOriginObjectName_Brock4, gFameCheckerFlavorTextOriginObjectName_Brock5, + gFameCheckerFlavorTextOriginObjectName_Misty0, gFameCheckerFlavorTextOriginObjectName_Misty1, gFameCheckerFlavorTextOriginObjectName_Misty2, gFameCheckerFlavorTextOriginObjectName_Misty3, gFameCheckerFlavorTextOriginObjectName_Misty4, gFameCheckerFlavorTextOriginObjectName_Misty5, + gFameCheckerFlavorTextOriginObjectName_LtSurge0, gFameCheckerFlavorTextOriginObjectName_LtSurge1, gFameCheckerFlavorTextOriginObjectName_LtSurge2, gFameCheckerFlavorTextOriginObjectName_LtSurge3, gFameCheckerFlavorTextOriginObjectName_LtSurge4, gFameCheckerFlavorTextOriginObjectName_LtSurge5, + gFameCheckerFlavorTextOriginObjectName_Erika0, gFameCheckerFlavorTextOriginObjectName_Erika1, gFameCheckerFlavorTextOriginObjectName_Erika2, gFameCheckerFlavorTextOriginObjectName_Erika3, gFameCheckerFlavorTextOriginObjectName_Erika4, gFameCheckerFlavorTextOriginObjectName_Erika5, + gFameCheckerFlavorTextOriginObjectName_Koga0, gFameCheckerFlavorTextOriginObjectName_Koga1, gFameCheckerFlavorTextOriginObjectName_Koga2, gFameCheckerFlavorTextOriginObjectName_Koga3, gFameCheckerFlavorTextOriginObjectName_Koga4, gFameCheckerFlavorTextOriginObjectName_Koga5, + gFameCheckerFlavorTextOriginObjectName_Sabrina0, gFameCheckerFlavorTextOriginObjectName_Sabrina1, gFameCheckerFlavorTextOriginObjectName_Sabrina2, gFameCheckerFlavorTextOriginObjectName_Sabrina3, gFameCheckerFlavorTextOriginObjectName_Sabrina4, gFameCheckerFlavorTextOriginObjectName_Sabrina5, + gFameCheckerFlavorTextOriginObjectName_Blaine0, gFameCheckerFlavorTextOriginObjectName_Blaine1, gFameCheckerFlavorTextOriginObjectName_Blaine2, gFameCheckerFlavorTextOriginObjectName_Blaine3, gFameCheckerFlavorTextOriginObjectName_Blaine4, gFameCheckerFlavorTextOriginObjectName_Blaine5, + gFameCheckerFlavorTextOriginObjectName_Lorelei0, gFameCheckerFlavorTextOriginObjectName_Lorelei1, gFameCheckerFlavorTextOriginObjectName_Lorelei2, gFameCheckerFlavorTextOriginObjectName_Lorelei3, gFameCheckerFlavorTextOriginObjectName_Lorelei4, gFameCheckerFlavorTextOriginObjectName_Lorelei5, + gFameCheckerFlavorTextOriginObjectName_Bruno0, gFameCheckerFlavorTextOriginObjectName_Bruno1, gFameCheckerFlavorTextOriginObjectName_Bruno2, gFameCheckerFlavorTextOriginObjectName_Bruno3, gFameCheckerFlavorTextOriginObjectName_Bruno4, gFameCheckerFlavorTextOriginObjectName_Bruno5, + gFameCheckerFlavorTextOriginObjectName_Agatha0, gFameCheckerFlavorTextOriginObjectName_Agatha1, gFameCheckerFlavorTextOriginObjectName_Agatha2, gFameCheckerFlavorTextOriginObjectName_Agatha3, gFameCheckerFlavorTextOriginObjectName_Agatha4, gFameCheckerFlavorTextOriginObjectName_Agatha5, + gFameCheckerFlavorTextOriginObjectName_Lance0, gFameCheckerFlavorTextOriginObjectName_Lance1, gFameCheckerFlavorTextOriginObjectName_Lance2, gFameCheckerFlavorTextOriginObjectName_Lance3, gFameCheckerFlavorTextOriginObjectName_Lance4, gFameCheckerFlavorTextOriginObjectName_Lance5, + gFameCheckerFlavorTextOriginObjectName_Bill0, gFameCheckerFlavorTextOriginObjectName_Bill1, gFameCheckerFlavorTextOriginObjectName_Bill2, gFameCheckerFlavorTextOriginObjectName_Bill3, gFameCheckerFlavorTextOriginObjectName_Bill4, gFameCheckerFlavorTextOriginObjectName_Bill5, + gFameCheckerFlavorTextOriginObjectName_MrFuji0, gFameCheckerFlavorTextOriginObjectName_MrFuji1, gFameCheckerFlavorTextOriginObjectName_MrFuji2, gFameCheckerFlavorTextOriginObjectName_MrFuji3, gFameCheckerFlavorTextOriginObjectName_MrFuji4, gFameCheckerFlavorTextOriginObjectName_MrFuji5, + gFameCheckerFlavorTextOriginObjectName_Giovanni0, gFameCheckerFlavorTextOriginObjectName_Giovanni1, gFameCheckerFlavorTextOriginObjectName_Giovanni2, gFameCheckerFlavorTextOriginObjectName_Giovanni3, gFameCheckerFlavorTextOriginObjectName_Giovanni4, gFameCheckerFlavorTextOriginObjectName_Giovanni5 }; -static const struct SpriteSheet gUnknown_845FB9C[] = { - {sSelectorCursorSpriteGfx, 0x400, SPRITETAG_1000}, - {sQuestionMarkSpriteGfx, 0x100, SPRITETAG_1001}, - {sSpinningPokeballSpriteGfx, 0x1e0, SPRITETAG_1002}, - {sDaisySpriteGfx, 0x800, SPRITETAG_1006}, - {sFujiSpriteGfx, 0x800, SPRITETAG_1007}, - {sOakSpriteGfx, 0x800, SPRITETAG_1008}, - {sBillSpriteGfx, 0x800, SPRITETAG_1009}, +static const struct SpriteSheet sUISpriteSheets[] = { + {sSelectorCursorSpriteGfx, 0x400, SPRITETAG_SELECTOR_CURSOR}, + {sQuestionMarkSpriteGfx, 0x100, SPRITETAG_QUESTION_MARK}, + {sSpinningPokeballSpriteGfx, 0x1e0, SPRITETAG_SPINNING_POKEBALL}, + {sDaisySpriteGfx, 0x800, SPRITETAG_DAISY}, + {sFujiSpriteGfx, 0x800, SPRITETAG_FUJI}, + {sOakSpriteGfx, 0x800, SPRITETAG_OAK}, + {sBillSpriteGfx, 0x800, SPRITETAG_BILL}, {} }; -static const struct SpritePalette gUnknown_845FBDC[] = { - {sSelectorCursorSpritePalette, SPRITETAG_1000}, - {sSpinningPokeballSpritePalette, SPRITETAG_1002}, +static const struct SpritePalette sUISpritePalettes[] = { + {sSelectorCursorSpritePalette, SPRITETAG_SELECTOR_CURSOR}, + {sSpinningPokeballSpritePalette, SPRITETAG_SPINNING_POKEBALL}, {} }; -static const struct BgTemplate gUnknown_845FBF4[4] = { +static const struct BgTemplate sUIBgTemplates[4] = { { .bg = 3, .charBaseIndex = 0x03, @@ -349,118 +320,118 @@ static const struct BgTemplate gUnknown_845FBF4[4] = { .baseTile = 0x000}, }; -static const struct WindowTemplate gUnknown_845FC04[] = { - {0x00, 0x01, 0x03, 0x08, 0x0a, 0x0f, 0x0014}, - {0x00, 0x06, 0x00, 0x18, 0x02, 0x0f, 0x0064}, - {0x00, 0x02, 0x0f, 0x1a, 0x04, 0x0f, 0x0094}, - {0x00, 0x0f, 0x0a, 0x0b, 0x04, 0x0f, 0x00fc}, +static const struct WindowTemplate sUIWindowTemplates[] = { + {0, 1, 3, 8, 10, 15, 0x014}, // List Menu + {0, 6, 0, 24, 2, 15, 0x064}, // UI across the top + {0, 2, 15, 26, 4, 15, 0x094}, // Textbox on the bottom + {0, 15, 10, 11, 4, 15, 0x0FC}, // Icon description DUMMY_WIN_TEMPLATE }; -static const union AnimCmd gUnknown_845FC2C[] = { +static const union AnimCmd sSelectorCursorAnim0[] = { ANIMCMD_FRAME( 0, 15), ANIMCMD_FRAME(16, 15), ANIMCMD_JUMP(0) }; -static const union AnimCmd *const gUnknown_845FC38[] = { - gUnknown_845FC2C +static const union AnimCmd *const sSelectorCursorAnims[] = { + sSelectorCursorAnim0 }; -static const struct OamData gOamData_845FC3C = { +static const struct OamData sSelectorCursorOamData = { .size = 2, .priority = 2 }; -static const struct SpriteTemplate gUnknown_845FC44 = { - SPRITETAG_1000, SPRITETAG_1000, &gOamData_845FC3C, gUnknown_845FC38, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy +static const struct SpriteTemplate sSpriteTemplate_SelectorCursor = { + SPRITETAG_SELECTOR_CURSOR, SPRITETAG_SELECTOR_CURSOR, &sSelectorCursorOamData, sSelectorCursorAnims, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy }; -static const u8 filler_845FC5C[8] = {}; +static const u8 filler_845FC5C[8] = {}; // ??? -static const struct OamData gOamData_845FC64 = { +static const struct OamData sQuestionMarkTileOamData = { .shape = ST_OAM_V_RECTANGLE, .size = 2, .priority = 2 }; -static const union AnimCmd gUnknown_845FC6C[] = { +static const union AnimCmd sQuestionMarkTileAnim0[] = { ANIMCMD_FRAME( 0, 10), ANIMCMD_END }; -static const union AnimCmd *const gUnknown_845FC74[] = { - gUnknown_845FC6C +static const union AnimCmd *const sQuestionMarkTileAnims[] = { + sQuestionMarkTileAnim0 }; -static const struct SpriteTemplate gUnknown_845FC78 = { - SPRITETAG_1001, 0xffff, &gOamData_845FC64, gUnknown_845FC74, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy +static const struct SpriteTemplate sQuestionMarkTileSpriteTemplate = { + SPRITETAG_QUESTION_MARK, 0xffff, &sQuestionMarkTileOamData, sQuestionMarkTileAnims, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy }; -static const union AnimCmd gUnknown_845FC90[] = { +static const union AnimCmd sSpinningPokeballAnim0[] = { ANIMCMD_FRAME( 0, 10), ANIMCMD_END }; -static const union AnimCmd *const gUnknown_845FC98[] = { - gUnknown_845FC90 +static const union AnimCmd *const sSpinningPokeballAnims[] = { + sSpinningPokeballAnim0 }; -static const struct OamData gOamData_845FC9C = { +static const struct OamData sSpinningPokeballOamData = { .affineMode = ST_OAM_AFFINE_NORMAL, .size = 2 }; -static const union AffineAnimCmd gUnknown_845FCA4[] = { +static const union AffineAnimCmd sSpinningPokeballAffineAnim0[] = { AFFINEANIMCMD_FRAME(0, 0, 4, 20), AFFINEANIMCMD_JUMP(0) }; -static const union AffineAnimCmd *const gUnknown_845FCB4[] = { - gUnknown_845FCA4 +static const union AffineAnimCmd *const sSpinningPokeballAffineAnims[] = { + sSpinningPokeballAffineAnim0 }; static const struct SpriteTemplate sSpinningPokeballSpriteTemplate = { - SPRITETAG_1002, SPRITETAG_1002, &gOamData_845FC9C, gUnknown_845FC98, NULL, gUnknown_845FCB4, sub_812D840 + SPRITETAG_SPINNING_POKEBALL, SPRITETAG_SPINNING_POKEBALL, &sSpinningPokeballOamData, sSpinningPokeballAnims, NULL, sSpinningPokeballAffineAnims, SpriteCB_FCSpinningPokeball }; -static const union AnimCmd gUnknown_845FCD0[] = { +static const union AnimCmd sDaisyFujiOakBillAnim0[] = { ANIMCMD_FRAME( 0, 15), ANIMCMD_END }; -static const union AnimCmd *const gUnknown_845FCD8[] = { - gUnknown_845FCD0 +static const union AnimCmd *const sDaisyFujiOakBillAnims[] = { + sDaisyFujiOakBillAnim0 }; -static const struct OamData gOamData_845FCDC = { +static const struct OamData sDaisyFujiOakBillOamData = { .size = 3 }; static const struct SpriteTemplate sDaisySpriteTemplate = { - SPRITETAG_1006, 0xffff, &gOamData_845FCDC, gUnknown_845FCD8, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy + SPRITETAG_DAISY, 0xffff, &sDaisyFujiOakBillOamData, sDaisyFujiOakBillAnims, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy }; static const struct SpriteTemplate sFujiSpriteTemplate = { - SPRITETAG_1007, 0xffff, &gOamData_845FCDC, gUnknown_845FCD8, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy + SPRITETAG_FUJI, 0xffff, &sDaisyFujiOakBillOamData, sDaisyFujiOakBillAnims, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy }; static const struct SpriteTemplate sOakSpriteTemplate = { - SPRITETAG_1008, 0xffff, &gOamData_845FCDC, gUnknown_845FCD8, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy + SPRITETAG_OAK, 0xffff, &sDaisyFujiOakBillOamData, sDaisyFujiOakBillAnims, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy }; static const struct SpriteTemplate sBillSpriteTemplate = { - SPRITETAG_1009, 0xffff, &gOamData_845FCDC, gUnknown_845FCD8, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy + SPRITETAG_BILL, 0xffff, &sDaisyFujiOakBillOamData, sDaisyFujiOakBillAnims, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy }; -static void sub_812C380(void) +static void FC_VBlankCallback(void) { LoadOam(); ProcessSpriteCopyRequests(); TransferPlttBuffer(); } -static void sub_812C394(void) +static void MainCB2_FameCheckerMain(void) { RunTasks(); AnimateSprites(); @@ -478,20 +449,20 @@ void UseFameChecker(MainCallback savedCallback) sFameCheckerData->listMenuDrawnSelIdx = 0; sFameCheckerData->unk_23_0 = FALSE; PlaySE(SE_W202); - SetMainCallback2(sub_812C3F8); + SetMainCallback2(MainCB2_LoadFameChecker); } -static void sub_812C3F8(void) +static void MainCB2_LoadFameChecker(void) { switch (gMain.state) { case 0: SetVBlankCallback(NULL); - sub_812D420(); + FCSetup_ClearVideoRegisters(); gMain.state++; break; case 1: - sub_812D558(); + FCSetup_ResetTasksAndSpriteResources(); gMain.state++; break; case 2: @@ -499,11 +470,11 @@ static void sub_812C3F8(void) sBg1TilemapBuffer = AllocZeroed(0x1000); sBg2TilemapBuffer = AllocZeroed(0x800); ResetBgsAndClearDma3BusyFlags(0); - InitBgsFromTemplates(0, gUnknown_845FBF4, ARRAY_COUNT(gUnknown_845FBF4)); + InitBgsFromTemplates(0, sUIBgTemplates, ARRAY_COUNT(sUIBgTemplates)); SetBgTilemapBuffer(3, sBg3TilemapBuffer); SetBgTilemapBuffer(2, sBg2TilemapBuffer); SetBgTilemapBuffer(1, sBg1TilemapBuffer); - sub_812D594(); + FCSetup_ResetBGCoords(); gMain.state++; break; case 3: @@ -530,125 +501,125 @@ static void sub_812C3F8(void) } break; case 5: - InitWindows(gUnknown_845FC04); + InitWindows(sUIWindowTemplates); DeactivateAllTextPrinters(); - sub_812CEC0(); + Setup_DrawMsgAndListBoxes(); sListMenuItems = AllocZeroed(17 * sizeof(struct ListMenuItem)); - sub_812DB28(); + FC_CreateListMenu(); gMain.state++; break; case 6: - sub_812C648(); - sub_812D1A8(0); - sub_812CE9C(); + LoadUISpriteSheetsAndPalettes(); + CreateAllFlavorTextIcons(0); + WipeMsgBoxAndTransfer(); BeginNormalPaletteFade(0xFFFFFFFF,0, 16, 0, 0); gMain.state++; break; case 7: - sub_812D584(); + FCSetup_TurnOnDisplay(); SetGpuReg(REG_OFFSET_BLDCNT, BLDCNT_EFFECT_BLEND | BLDCNT_TGT2_BG0 | BLDCNT_TGT2_BG1 | BLDCNT_TGT2_BG2 | BLDCNT_TGT2_BG3 | BLDCNT_TGT2_OBJ | BLDCNT_TGT2_BD); SetGpuReg(REG_OFFSET_BLDALPHA, 0x07); SetGpuReg(REG_OFFSET_BLDY, 0x08); - SetVBlankCallback(sub_812C380); + SetVBlankCallback(FC_VBlankCallback); sFameCheckerData->listMenuTopIdx = 0; - sub_812E000(); + FC_CreateScrollIndicatorArrowPair(); sub_812E178(1, 4); - CreateTask(sub_812C664, 0x08); - SetMainCallback2(sub_812C394); + CreateTask(Task_WaitFadeOnInit, 0x08); + SetMainCallback2(MainCB2_FameCheckerMain); gMain.state = 0; break; } } -static void sub_812C648(void) +static void LoadUISpriteSheetsAndPalettes(void) { - LoadSpriteSheets(gUnknown_845FB9C); - LoadSpritePalettes(gUnknown_845FBDC); + LoadSpriteSheets(sUISpriteSheets); + LoadSpritePalettes(sUISpritePalettes); } -static void sub_812C664(u8 taskId) +static void Task_WaitFadeOnInit(u8 taskId) { if (!gPaletteFade.active) - gTasks[taskId].func = sub_812C694; + gTasks[taskId].func = Task_TopMenuHandleInput; } -static void sub_812C694(u8 taskId) +static void Task_TopMenuHandleInput(u8 taskId) { - u16 r4; - u8 r4_2; + u16 cursorPos; + u8 i; struct Task *task = &gTasks[taskId]; s16 * data = gTasks[taskId].data; if (FindTaskIdByFunc(sub_812E110) == 0xFF) { RunTextPrinters(); if ((JOY_NEW(SELECT_BUTTON)) && !sFameCheckerData->inPickMode && sFameCheckerData->savedCallback != UseFameCheckerFromMenu) - task->func = sub_812CF3C; + task->func = Task_StartToCloseFameChecker; else if (JOY_NEW(START_BUTTON)) { - r4 = FameCheckerGetCursorY(); - if (sub_812C8F8(taskId) == TRUE) + cursorPos = FameCheckerGetCursorY(); + if (TryExitPickMode(taskId) == TRUE) { PlaySE(SE_W100); } - else if (r4 != sFameCheckerData->numUnlockedPersons - 1) + else if (cursorPos != sFameCheckerData->numUnlockedPersons - 1) // anything but CANCEL { PlaySE(SE_W100); - FillWindowPixelRect(3, 0x00, 0, 0, 88, 32); - sub_812CEE0(3); + FillWindowPixelRect(FCWINDOWID_ICONDESC, 0x00, 0, 0, 88, 32); + FC_PutWindowTilemapAndCopyWindowToVramMode3(FCWINDOWID_ICONDESC); sub_812E178(2, 4); sub_812E178(1, 5); - sub_812D0F4(1); - task->data[2] = sub_812D888(sFameCheckerData->unlockedPersons[r4]); + PrintUIHelp(1); + task->data[2] = CreatePersonPicSprite(sFameCheckerData->unlockedPersons[cursorPos]); gSprites[task->data[2]].pos2.x = 0xF0; gSprites[task->data[2]].data[0] = 1; - task->data[3] = sub_812D7E4(); + task->data[3] = CreateSpinningPokeballSprite(); gSprites[task->data[3]].pos2.x = 0xF0; gSprites[task->data[3]].data[0] = 1; - task->func = sub_812C9BC; + task->func = Task_EnterPickMode; } } else if (JOY_NEW(A_BUTTON)) { - r4 = ListMenuHandleInput(0); - if (r4 == sFameCheckerData->numUnlockedPersons - 1) - task->func = sub_812CF3C; + cursorPos = ListMenuHandleInput(0); + if (cursorPos == sFameCheckerData->numUnlockedPersons - 1) // CANCEL + task->func = Task_StartToCloseFameChecker; else if (sFameCheckerData->inPickMode) { - if (!IsTextPrinterActive(2) && sub_812D6B4() == TRUE) - sub_812CD3C(); + if (!IsTextPrinterActive(2) && HasUnlockedAllFlavorTextsForCurrentPerson() == TRUE) + GetPickModeText(); } else if (sFameCheckerData->personHasUnlockedPanels) { PlaySE(SE_SELECT); - task->data[0] = sub_812D724(task->data[1]); - for (r4_2 = 0; r4_2 < 6; r4_2++) + task->data[0] = CreateFlavorTextIconSelectorCursorSprite(task->data[1]); + for (i = 0; i < 6; i++) { - if (r4_2 != task->data[1]) - sub_812CEFC(sFameCheckerData->spriteIds[r4_2], ST_OAM_OBJ_BLEND); + if (i != task->data[1]) + SetMessageSelectorIconObjMode(sFameCheckerData->spriteIds[i], ST_OAM_OBJ_BLEND); } gUnknown_3005EC8 = 0xFF; - sub_812E4A4(0); - sub_812D0F4(2); - if (gSprites[sFameCheckerData->spriteIds[task->data[1]]].data[1] != 0xFF) + PlaceListMenuCursor(FALSE); + PrintUIHelp(2); + if (gSprites[sFameCheckerData->spriteIds[task->data[1]]].data[1] != 0xFF) // not a ? tile { - sub_812CE04(taskId); - sub_812DA14(data[1]); + PrintSelectedNameInBrightGreen(taskId); + UpdateIconDescriptionBox(data[1]); } - sub_812E048(); - task->func = sub_812CAD8; + FreeListMenuSelectorArrowPairResources(); + task->func = Task_FlavorTextDisplayHandleInput; } } else if (JOY_NEW(B_BUTTON)) { - if (sub_812C8F8(taskId) != TRUE) - task->func = sub_812CF3C; + if (TryExitPickMode(taskId) != TRUE) + task->func = Task_StartToCloseFameChecker; } else ListMenuHandleInput(0); } } -static bool8 sub_812C8F8(u8 taskId) +static bool8 TryExitPickMode(u8 taskId) { struct Task *task = &gTasks[taskId]; if (sFameCheckerData->inPickMode) @@ -657,34 +628,34 @@ static bool8 sub_812C8F8(u8 taskId) gSprites[task->data[2]].pos2.x += 10; gSprites[task->data[3]].data[0] = 2; gSprites[task->data[3]].pos2.x += 10; - sub_812CE9C(); - task->func = sub_812CA1C; - sub_812C990(); + WipeMsgBoxAndTransfer(); + task->func = Task_ExitPickMode; + MessageBoxPrintEmptyText(); sFameCheckerData->unk_23_2 = FALSE; return TRUE; } return FALSE; } -static void sub_812C990(void) +static void MessageBoxPrintEmptyText(void) { - AddTextPrinterParametrized(2, 2, gUnknown_84181E4, 0, NULL, 2, 1, 3); + AddTextPrinterParametrized(2, 2, gFameCheckerText_ClearTextbox, 0, NULL, 2, 1, 3); } -static void sub_812C9BC(u8 taskId) +static void Task_EnterPickMode(u8 taskId) { struct Task *task = &gTasks[taskId]; if (gSprites[task->data[2]].data[0] == 0) { - sub_812CD3C(); + GetPickModeText(); sFameCheckerData->inPickMode = TRUE; - task->func = sub_812C694; + task->func = Task_TopMenuHandleInput; } else ChangeBgX(1, 0xA00, 1); } -static void sub_812CA1C(u8 taskId) +static void Task_ExitPickMode(u8 taskId) { struct Task *task = &gTasks[taskId]; if (GetBgX(1) != 0) @@ -694,17 +665,17 @@ static void sub_812CA1C(u8 taskId) if (gSprites[task->data[2]].data[0] == 0) { if (sFameCheckerData->personHasUnlockedPanels) - sub_812D0F4(0); + PrintUIHelp(0); sub_812E178(1, 4); sub_812E178(2, 2); sFameCheckerData->inPickMode = FALSE; - sub_812D9A8(taskId, FameCheckerGetCursorY()); - task->func = sub_812C694; - gSprites[task->data[3]].callback = sub_812D800; + DestroyPersonPicSprite(taskId, FameCheckerGetCursorY()); + task->func = Task_TopMenuHandleInput; + gSprites[task->data[3]].callback = SpriteCB_DestroySpinningPokeball; } } -static void sub_812CAD8(u8 taskId) +static void Task_FlavorTextDisplayHandleInput(u8 taskId) { struct Task *task = &gTasks[taskId]; s16 *data = gTasks[taskId].data; @@ -714,35 +685,35 @@ static void sub_812CAD8(u8 taskId) { u8 spriteId = sFameCheckerData->spriteIds[data[1]]; if (gSprites[spriteId].data[1] != 0xFF) - sub_812CE04(taskId); + PrintSelectedNameInBrightGreen(taskId); } if (JOY_NEW(B_BUTTON)) { - u8 r4; + u8 i; PlaySE(SE_SELECT); - for (r4 = 0; r4 < 6; r4++) - sub_812CEFC(sFameCheckerData->spriteIds[r4], ST_OAM_OBJ_NORMAL); - sub_812CE9C(); - gSprites[task->data[0]].callback = sub_812D764; + for (i = 0; i < 6; i++) + SetMessageSelectorIconObjMode(sFameCheckerData->spriteIds[i], ST_OAM_OBJ_NORMAL); + WipeMsgBoxAndTransfer(); + gSprites[task->data[0]].callback = SpriteCB_DestroyFlavorTextIconSelectorCursor; if (gUnknown_3005EC8 != 0xFF) sub_812DB10(); - sub_812E4A4(1); - sub_812D0F4(0); - sub_812E000(); - sub_812C990(); - task->func = sub_812C694; + PlaceListMenuCursor(TRUE); + PrintUIHelp(0); + FC_CreateScrollIndicatorArrowPair(); + MessageBoxPrintEmptyText(); + task->func = Task_TopMenuHandleInput; } else if (JOY_NEW(DPAD_UP) || JOY_NEW(DPAD_DOWN)) { if (task->data[1] >= 3) { task->data[1] -= 3; - sub_812CC68(taskId, 0, -0x1b); + FC_MoveSelectorCursor(taskId, 0, -0x1b); } else { task->data[1] += 3; - sub_812CC68(taskId, 0, +0x1b); + FC_MoveSelectorCursor(taskId, 0, +0x1b); } } else if (JOY_NEW(DPAD_LEFT)) @@ -750,12 +721,12 @@ static void sub_812CAD8(u8 taskId) if (task->data[1] == 0 || task->data[1] % 3 == 0) { task->data[1] += 2; - sub_812CC68(taskId, +0x5e, 0); + FC_MoveSelectorCursor(taskId, +0x5e, 0); } else { task->data[1]--; - sub_812CC68(taskId, -0x2f, 0); + FC_MoveSelectorCursor(taskId, -0x2f, 0); } } else if (JOY_NEW(DPAD_RIGHT)) @@ -763,17 +734,17 @@ static void sub_812CAD8(u8 taskId) if ((task->data[1] + 1) % 3 == 0) { task->data[1] -= 2; - sub_812CC68(taskId, -0x5e, 0); + FC_MoveSelectorCursor(taskId, -0x5e, 0); } else { task->data[1]++; - sub_812CC68(taskId, +0x2f, 0); + FC_MoveSelectorCursor(taskId, +0x2f, 0); } } } -static void sub_812CC68(u8 taskId, s8 dx, s8 dy) +static void FC_MoveSelectorCursor(u8 taskId, s8 dx, s8 dy) { u8 i; s16 *data = gTasks[taskId].data; @@ -781,69 +752,69 @@ static void sub_812CC68(u8 taskId, s8 dx, s8 dy) gSprites[data[0]].pos1.x += dx; gSprites[data[0]].pos1.y += dy; for (i = 0; i < 6; i++) - sub_812CEFC(sFameCheckerData->spriteIds[i], ST_OAM_OBJ_BLEND); - FillWindowPixelRect(2, 0x11, 0, 0, 0xd0, 0x20); - sub_812C990(); - if (sub_812CEFC(sFameCheckerData->spriteIds[data[1]], ST_OAM_OBJ_NORMAL) == TRUE) + SetMessageSelectorIconObjMode(sFameCheckerData->spriteIds[i], ST_OAM_OBJ_BLEND); + FillWindowPixelRect(FCWINDOWID_MSGBOX, 0x11, 0, 0, 0xd0, 0x20); + MessageBoxPrintEmptyText(); + if (SetMessageSelectorIconObjMode(sFameCheckerData->spriteIds[data[1]], ST_OAM_OBJ_NORMAL) == TRUE) { - sub_812CE04(taskId); - sub_812DA14(data[1]); + PrintSelectedNameInBrightGreen(taskId); + UpdateIconDescriptionBox(data[1]); } else if (gUnknown_3005EC8 != 0xFF) sub_812DB10(); } -static void sub_812CD3C(void) +static void GetPickModeText(void) { u8 r8 = 0; u16 r6 = FameCheckerGetCursorY(); if (gSaveBlock1Ptr->fameChecker[sFameCheckerData->unlockedPersons[r6]].pickState != FCPICKSTATE_COLORED) { - sub_812CE9C(); - sub_812C990(); + WipeMsgBoxAndTransfer(); + MessageBoxPrintEmptyText(); } else { - FillWindowPixelRect(2, 0x11, 0, 0, 0xd0, 0x20); - if (sub_812D6B4() == TRUE) - r8 = 16; - StringExpandPlaceholders(gStringVar4, gUnknown_845F63C[sFameCheckerData->unlockedPersons[r6] + r8]); - AddTextPrinterParametrized(2, 2, gStringVar4, sub_80F78A8(), NULL, 2, 1, 3); - sub_812CEE0(2); + FillWindowPixelRect(FCWINDOWID_MSGBOX, 0x11, 0, 0, 0xd0, 0x20); + if (HasUnlockedAllFlavorTextsForCurrentPerson() == TRUE) + r8 = NUM_FAMECHECKER_PERSONS; + StringExpandPlaceholders(gStringVar4, sFameCheckerNameAndQuotesPointers[sFameCheckerData->unlockedPersons[r6] + r8]); + AddTextPrinterParametrized(FCWINDOWID_MSGBOX, 2, gStringVar4, sub_80F78A8(), NULL, 2, 1, 3); + FC_PutWindowTilemapAndCopyWindowToVramMode3(FCWINDOWID_MSGBOX); } } -static void sub_812CE04(u8 taskId) +static void PrintSelectedNameInBrightGreen(u8 taskId) { s16 *data = gTasks[taskId].data; - u16 r5 = FameCheckerGetCursorY(); - FillWindowPixelRect(2, 0x11, 0, 0, 0xd0, 0x20); - StringExpandPlaceholders(gStringVar4, gUnknown_845F6BC[sFameCheckerData->unlockedPersons[r5] * 6 + data[1]]); - AddTextPrinterParametrized(2, 2, gStringVar4, sub_80F78A8(), NULL, 2, 1, 3); - sub_812CEE0(2); + u16 cursorPos = FameCheckerGetCursorY(); + FillWindowPixelRect(FCWINDOWID_MSGBOX, 0x11, 0, 0, 0xd0, 0x20); + StringExpandPlaceholders(gStringVar4, sFameCheckerFlavorTextPointers[sFameCheckerData->unlockedPersons[cursorPos] * 6 + data[1]]); + AddTextPrinterParametrized(FCWINDOWID_MSGBOX, 2, gStringVar4, sub_80F78A8(), NULL, 2, 1, 3); + FC_PutWindowTilemapAndCopyWindowToVramMode3(FCWINDOWID_MSGBOX); } -static void sub_812CE9C(void) +static void WipeMsgBoxAndTransfer(void) { - FillWindowPixelRect(2, 0x11, 0, 0, 0xd0, 0x20); - sub_812CEE0(2); + FillWindowPixelRect(FCWINDOWID_MSGBOX, 0x11, 0, 0, 0xd0, 0x20); + FC_PutWindowTilemapAndCopyWindowToVramMode3(FCWINDOWID_MSGBOX); } -static void sub_812CEC0(void) +static void Setup_DrawMsgAndListBoxes(void) { sub_80F6E9C(); - sub_80F6EE4(2, 1); - sub_812CEE0(2); - sub_812CEE0(0); + sub_80F6EE4(FCWINDOWID_MSGBOX, TRUE); + FC_PutWindowTilemapAndCopyWindowToVramMode3(FCWINDOWID_MSGBOX); + FC_PutWindowTilemapAndCopyWindowToVramMode3(FCWINDOWID_LIST); } -static void sub_812CEE0(u8 windowId) +static void FC_PutWindowTilemapAndCopyWindowToVramMode3(u8 windowId) { PutWindowTilemap(windowId); CopyWindowToVram(windowId, 3); } -static bool8 sub_812CEFC(u8 spriteId, u8 objMode) +static bool8 SetMessageSelectorIconObjMode(u8 spriteId, u8 objMode) { if (gSprites[spriteId].data[1] != 0xFF) { @@ -853,14 +824,14 @@ static bool8 sub_812CEFC(u8 spriteId, u8 objMode) return FALSE; } -static void sub_812CF3C(u8 taskId) +static void Task_StartToCloseFameChecker(u8 taskId) { PlaySE(SE_W202); BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, 0); - gTasks[taskId].func = sub_812CF7C; + gTasks[taskId].func = Task_DestroyAssetsAndCloseFameChecker; } -static void sub_812CF7C(u8 taskId) +static void Task_DestroyAssetsAndCloseFameChecker(u8 taskId) { u8 r4; @@ -868,7 +839,7 @@ static void sub_812CF7C(u8 taskId) { if (sFameCheckerData->inPickMode) { - sub_812D9A8(taskId, FameCheckerGetCursorY()); + DestroyPersonPicSprite(taskId, FameCheckerGetCursorY()); FreeSpriteOamMatrix(&gSprites[gTasks[taskId].data[3]]); DestroySprite(&gSprites[gTasks[taskId].data[3]]); } @@ -876,28 +847,28 @@ static void sub_812CF7C(u8 taskId) { DestroySprite(&gSprites[sFameCheckerData->spriteIds[r4]]); } - sub_812D814(); - sub_812D7C8(); - sub_812D70C(); - sub_812D770(); - sub_812E048(); + FreeNonTrainerPicTiles(); + FreeSpinningPokeballSpriteResources(); + FreeSelectionCursorSpriteResources(); + FreeQuestionMarkSpriteResources(); + FreeListMenuSelectorArrowPairResources(); SetMainCallback2(sFameCheckerData->savedCallback); - sub_810713C(sFameCheckerData->scrollIndicatorArrowObjectTaskId, 0, 0); + sub_810713C(sFameCheckerData->listMenuTaskId, 0, 0); Free(sBg3TilemapBuffer); Free(sBg1TilemapBuffer); Free(sBg2TilemapBuffer); Free(sFameCheckerData); Free(sListMenuItems); - sub_812D094(0); - sub_812D094(1); - sub_812D094(2); - sub_812D094(3); + FC_DestroyWindow(0); + FC_DestroyWindow(1); + FC_DestroyWindow(2); + FC_DestroyWindow(3); FreeAllWindowBuffers(); DestroyTask(taskId); } } -static void sub_812D094(u8 windowId) +static void FC_DestroyWindow(u8 windowId) { FillWindowPixelBuffer(windowId, 0); ClearWindowTilemap(windowId); @@ -905,111 +876,111 @@ static void sub_812D094(u8 windowId) RemoveWindow(windowId); } -static u8 sub_812D0C0(u8 a0) +static u8 AdjustGiovanniIndexIfBeatenInGym(u8 a0) { if (HasTrainerAlreadyBeenFought(0x15e) == TRUE) { if (a0 == 9) - return 15; + return FAMECHECKER_GIOVANNI; if (a0 > 9) return a0 - 1; } return a0; } -static void sub_812D0F4(u8 a0) +static void PrintUIHelp(u8 state) { - const u8 * r5 = gUnknown_841E5A4; s32 width; - if (a0 != 0) + const u8 * src = gFameCheckerText_MainScreenUI; + if (state != 0) { - r5 = gUnknown_841E5D2; - if (a0 == 1) - r5 = gUnknown_841E5B9; + src = gFameCheckerText_FlavorTextUI; + if (state == 1) + src = gFameCheckerText_PickScreenUI; } - width = GetStringWidth(0, r5, 0); - FillWindowPixelRect(1, 0x00, 0, 0, 0xc0, 0x10); - AddTextPrinterParametrized2(1, 0, 188 - width, 0, 0, 2, &gUnknown_845F5E0, -1, r5); - sub_812CEE0(1); + width = GetStringWidth(0, src, 0); + FillWindowPixelRect(FCWINDOWID_UIHELP, 0x00, 0, 0, 0xc0, 0x10); + AddTextPrinterParametrized2(FCWINDOWID_UIHELP, 0, 188 - width, 0, 0, 2, &gUnknown_845F5E0, -1, src); + FC_PutWindowTilemapAndCopyWindowToVramMode3(FCWINDOWID_UIHELP); } -static void sub_812D174(void) +static void DestroyAllFlavorTextIcons(void) { - u8 r4; - for (r4 = 0; r4 < 6; r4++) + u8 i; + for (i = 0; i < 6; i++) { - DestroySprite(&gSprites[sFameCheckerData->spriteIds[r4]]); + DestroySprite(&gSprites[sFameCheckerData->spriteIds[i]]); } } -static bool8 sub_812D1A8(u8 a0) +static bool8 CreateAllFlavorTextIcons(u8 a0) { // r8 <- a0 - bool8 r5 = FALSE; - u8 r6; - for (r6 = 0; r6 < 6; r6++) + bool8 result = FALSE; + u8 i; + for (i = 0; i < 6; i++) { - if ((gSaveBlock1Ptr->fameChecker[sFameCheckerData->unlockedPersons[a0]].flavorTextFlags >> r6) & 1) + if ((gSaveBlock1Ptr->fameChecker[sFameCheckerData->unlockedPersons[a0]].flavorTextFlags >> i) & 1) { - sFameCheckerData->spriteIds[r6] = sub_805EB44( - sFameCheckerArrayNpcGraphicsIds[sFameCheckerData->unlockedPersons[a0] * 6 + r6], - r6, - 47 * (r6 % 3) + 0x72, - 27 * (r6 / 3) + 0x2F + sFameCheckerData->spriteIds[i] = sub_805EB44( + sFameCheckerArrayNpcGraphicsIds[sFameCheckerData->unlockedPersons[a0] * 6 + i], + i, + 47 * (i % 3) + 0x72, + 27 * (i / 3) + 0x2F ); - r5 = TRUE; + result = TRUE; } else { - sFameCheckerData->spriteIds[r6] = PlaceQuestionMarkTile( - 47 * (r6 % 3) + 0x72, - 27 * (r6 / 3) + 0x1F + sFameCheckerData->spriteIds[i] = PlaceQuestionMarkTile( + 47 * (i % 3) + 0x72, + 27 * (i / 3) + 0x1F ); - gSprites[sFameCheckerData->spriteIds[r6]].data[1] = 0xFF; + gSprites[sFameCheckerData->spriteIds[i]].data[1] = 0xFF; } } - if (r5 == TRUE) + if (result == TRUE) { sFameCheckerData->personHasUnlockedPanels = TRUE; if (sFameCheckerData->inPickMode) - sub_812D0F4(TRUE); + PrintUIHelp(1); else - sub_812D0F4(FALSE); + PrintUIHelp(0); } else { sFameCheckerData->personHasUnlockedPanels = FALSE; - sub_812D0F4(TRUE); + PrintUIHelp(1); } - return r5; + return result; } void ResetFameChecker(void) { - u8 r4; - for (r4 = 0; r4 < 16; r4++) + u8 i; + for (i = 0; i < NUM_FAMECHECKER_PERSONS; i++) { - gSaveBlock1Ptr->fameChecker[r4].pickState = FCPICKSTATE_NO_DRAW; - gSaveBlock1Ptr->fameChecker[r4].flavorTextFlags = 0; - gSaveBlock1Ptr->fameChecker[r4].unk_0_E = 0; + gSaveBlock1Ptr->fameChecker[i].pickState = FCPICKSTATE_NO_DRAW; + gSaveBlock1Ptr->fameChecker[i].flavorTextFlags = 0; + gSaveBlock1Ptr->fameChecker[i].unk_0_E = 0; } - gSaveBlock1Ptr->fameChecker[0].pickState = FCPICKSTATE_COLORED; + gSaveBlock1Ptr->fameChecker[FAMECHECKER_OAK].pickState = FCPICKSTATE_COLORED; } -static void sub_812D388(void) +void FullyUnlockFameChecker(void) { - u8 r5, r4; - for (r5 = 0; r5 < 16; r5++) + u8 i, j; + for (i = 0; i < NUM_FAMECHECKER_PERSONS; i++) { - gSaveBlock1Ptr->fameChecker[r5].pickState = FCPICKSTATE_COLORED; - for (r4 = 0; r4 < 6; r4++) + gSaveBlock1Ptr->fameChecker[i].pickState = FCPICKSTATE_COLORED; + for (j = 0; j < 6; j++) { - gSaveBlock1Ptr->fameChecker[r5].flavorTextFlags |= (1 << r4); + gSaveBlock1Ptr->fameChecker[i].flavorTextFlags |= (1 << j); } } } -static void sub_812D420(void) +static void FCSetup_ClearVideoRegisters(void) { void * vram = (void *)VRAM; DmaClearLarge16(3, vram, VRAM_SIZE, 0x1000); @@ -1037,7 +1008,7 @@ static void sub_812D420(void) SetGpuReg(REG_OFFSET_BLDY, 0); } -static void sub_812D558(void) +static void FCSetup_ResetTasksAndSpriteResources(void) { remove_some_task(); ResetTasks(); @@ -1049,12 +1020,12 @@ static void sub_812D558(void) } -static void sub_812D584(void) +static void FCSetup_TurnOnDisplay(void) { SetGpuReg(REG_OFFSET_DISPCNT, DISPCNT_MODE_0 | DISPCNT_OBJ_1D_MAP | DISPCNT_BG_ALL_ON | DISPCNT_OBJ_ON); } -static void sub_812D594(void) +static void FCSetup_ResetBGCoords(void) { ChangeBgX(0, 0, 0); ChangeBgY(0, 0, 0); @@ -1066,97 +1037,99 @@ static void sub_812D594(void) ChangeBgY(3, 0, 0); } -static void sub_812D5EC(void) +void SetFlavorTextFlagFromSpecialVars(void) { - if (gUnknown_20370C0 < 16 && gSpecialVar_0x8005 < 6) + if (gUnknown_20370C0 < NUM_FAMECHECKER_PERSONS && gSpecialVar_0x8005 < 6) { gSaveBlock1Ptr->fameChecker[gUnknown_20370C0].flavorTextFlags |= (1 << gSpecialVar_0x8005); - gSpecialVar_0x8005 = 1; - sub_812D650(); + gSpecialVar_0x8005 = FCPICKSTATE_SILHOUETTE; + UpdatePickStateFromSpecialVar8005(); } } -static void sub_812D650(void) +void UpdatePickStateFromSpecialVar8005(void) { - if (gUnknown_20370C0 < 16 && gSpecialVar_0x8005 < 3) + if (gUnknown_20370C0 < NUM_FAMECHECKER_PERSONS && gSpecialVar_0x8005 < 3) { - if (gSpecialVar_0x8005 == 0) + if (gSpecialVar_0x8005 == FCPICKSTATE_NO_DRAW) return; - if (gSpecialVar_0x8005 == 1 && gSaveBlock1Ptr->fameChecker[gUnknown_20370C0].pickState == FCPICKSTATE_COLORED) + if ( gSpecialVar_0x8005 == FCPICKSTATE_SILHOUETTE + && gSaveBlock1Ptr->fameChecker[gUnknown_20370C0].pickState == FCPICKSTATE_COLORED + ) return; gSaveBlock1Ptr->fameChecker[gUnknown_20370C0].pickState = gSpecialVar_0x8005; } } -static bool8 sub_812D6B4(void) +static bool8 HasUnlockedAllFlavorTextsForCurrentPerson(void) { - u8 r2; - u8 r1 = sFameCheckerData->unlockedPersons[FameCheckerGetCursorY()]; - for (r2 = 0; r2 < 6; r2++) + u8 i; + u8 who = sFameCheckerData->unlockedPersons[FameCheckerGetCursorY()]; + for (i = 0; i < 6; i++) { - if (!((gSaveBlock1Ptr->fameChecker[r1].flavorTextFlags >> r2) & 1)) + if (!((gSaveBlock1Ptr->fameChecker[who].flavorTextFlags >> i) & 1)) return FALSE; } return TRUE; } -static void sub_812D70C(void) +static void FreeSelectionCursorSpriteResources(void) { - FreeSpriteTilesByTag(SPRITETAG_1000); - FreeSpritePaletteByTag(SPRITETAG_1000); + FreeSpriteTilesByTag(SPRITETAG_SELECTOR_CURSOR); + FreeSpritePaletteByTag(SPRITETAG_SELECTOR_CURSOR); } -static u8 sub_812D724(s16 a0) +static u8 CreateFlavorTextIconSelectorCursorSprite(s16 where) { - s16 r4 = a0 >= 3 ? 61 : 34; - s16 r1 = 47 * (a0 % 3) + 0x72; - return CreateSprite(&gUnknown_845FC44, r1, r4, 0); + s16 y = 34 + 27 * (where >= 3); + s16 x = 114 + 47 * (where % 3); + return CreateSprite(&sSpriteTemplate_SelectorCursor, x, y, 0); } -static void sub_812D764(struct Sprite * sprite) +static void SpriteCB_DestroyFlavorTextIconSelectorCursor(struct Sprite * sprite) { DestroySprite(sprite); } -static void sub_812D770(void) +static void FreeQuestionMarkSpriteResources(void) { - FreeSpriteTilesByTag(SPRITETAG_1001); + FreeSpriteTilesByTag(SPRITETAG_QUESTION_MARK); } static u8 PlaceQuestionMarkTile(u8 x, u8 y) { - u8 spriteId = CreateSprite(&gUnknown_845FC78, x, y, 8); + u8 spriteId = CreateSprite(&sQuestionMarkTileSpriteTemplate, x, y, 8); gSprites[spriteId].oam.priority = 2; gSprites[spriteId].oam.paletteNum = 2; return spriteId; } -static void sub_812D7C8(void) +static void FreeSpinningPokeballSpriteResources(void) { - FreeSpriteTilesByTag(SPRITETAG_1002); - FreeSpritePaletteByTag(SPRITETAG_1002); + FreeSpriteTilesByTag(SPRITETAG_SPINNING_POKEBALL); + FreeSpritePaletteByTag(SPRITETAG_SPINNING_POKEBALL); } -static u8 sub_812D7E4(void) +static u8 CreateSpinningPokeballSprite(void) { return CreateSprite(&sSpinningPokeballSpriteTemplate, 0xe2, 0x42, 0); } -static void sub_812D800(struct Sprite * sprite) +static void SpriteCB_DestroySpinningPokeball(struct Sprite * sprite) { FreeSpriteOamMatrix(sprite); DestroySprite(sprite); } -static void sub_812D814(void) +static void FreeNonTrainerPicTiles(void) { - FreeSpriteTilesByTag(SPRITETAG_1006); - FreeSpriteTilesByTag(SPRITETAG_1007); - FreeSpriteTilesByTag(SPRITETAG_1008); - FreeSpriteTilesByTag(SPRITETAG_1009); + FreeSpriteTilesByTag(SPRITETAG_DAISY); + FreeSpriteTilesByTag(SPRITETAG_FUJI); + FreeSpriteTilesByTag(SPRITETAG_OAK); + FreeSpriteTilesByTag(SPRITETAG_BILL); } -static void sub_812D840(struct Sprite * sprite) +static void SpriteCB_FCSpinningPokeball(struct Sprite * sprite) { if (sprite->data[0] == 1) { @@ -1180,92 +1153,92 @@ static void sub_812D840(struct Sprite * sprite) } } -static u8 sub_812D888(u8 a0) +static u8 CreatePersonPicSprite(u8 fcPersonIdx) { - u8 r4; - if (a0 == FAMECHECKER_DAISY) + u8 spriteId; + if (fcPersonIdx == FAMECHECKER_DAISY) { - r4 = CreateSprite(&sDaisySpriteTemplate, 0x94, 0x42, 0); + spriteId = CreateSprite(&sDaisySpriteTemplate, 0x94, 0x42, 0); LoadPalette(sDaisySpritePalette, 0x160, 0x20); - gSprites[r4].oam.paletteNum = 6; + gSprites[spriteId].oam.paletteNum = 6; } - else if (a0 == FAMECHECKER_MRFUJI) + else if (fcPersonIdx == FAMECHECKER_MRFUJI) { - r4 = CreateSprite(&sFujiSpriteTemplate, 0x94, 0x42, 0); + spriteId = CreateSprite(&sFujiSpriteTemplate, 0x94, 0x42, 0); LoadPalette(sFujiSpritePalette, 0x160, 0x20); - gSprites[r4].oam.paletteNum = 6; + gSprites[spriteId].oam.paletteNum = 6; } - else if (a0 == FAMECHECKER_OAK) + else if (fcPersonIdx == FAMECHECKER_OAK) { - r4 = CreateSprite(&sOakSpriteTemplate, 0x94, 0x42, 0); + spriteId = CreateSprite(&sOakSpriteTemplate, 0x94, 0x42, 0); LoadPalette(sOakSpritePalette, 0x160, 0x20); - gSprites[r4].oam.paletteNum = 6; + gSprites[spriteId].oam.paletteNum = 6; } - else if (a0 == FAMECHECKER_BILL) + else if (fcPersonIdx == FAMECHECKER_BILL) { - r4 = CreateSprite(&sBillSpriteTemplate, 0x94, 0x42, 0); + spriteId = CreateSprite(&sBillSpriteTemplate, 0x94, 0x42, 0); LoadPalette(sBillSpritePalette, 0x160, 0x20); - gSprites[r4].oam.paletteNum = 6; + gSprites[spriteId].oam.paletteNum = 6; } else { - r4 = sub_810C2A4(gUnknown_845F61C[a0], 1, 0x94, 0x42, 6, 0xFFFF); + spriteId = sub_810C2A4(sFameCheckerTrainerPicIdxs[fcPersonIdx], 1, 0x94, 0x42, 6, 0xFFFF); } - gSprites[r4].callback = sub_812D840; - if (gSaveBlock1Ptr->fameChecker[a0].pickState == FCPICKSTATE_SILHOUETTE) - LoadPalette(gUnknown_845F5C0, 0x160, 0x20); - return r4; + gSprites[spriteId].callback = SpriteCB_FCSpinningPokeball; + if (gSaveBlock1Ptr->fameChecker[fcPersonIdx].pickState == FCPICKSTATE_SILHOUETTE) + LoadPalette(sSilhouettePalette, 0x160, 0x20); + return spriteId; } -static void sub_812D9A8(u8 taskId, u16 a1) +static void DestroyPersonPicSprite(u8 taskId, u16 who) { s16 * data = gTasks[taskId].data; - u16 r1 = a1; - if (a1 == sFameCheckerData->numUnlockedPersons - 1) - r1 = a1 - 1; - if ( sFameCheckerData->unlockedPersons[r1] == FAMECHECKER_DAISY - || sFameCheckerData->unlockedPersons[r1] == FAMECHECKER_MRFUJI - || sFameCheckerData->unlockedPersons[r1] == FAMECHECKER_OAK - || sFameCheckerData->unlockedPersons[r1] == FAMECHECKER_BILL + u16 who_copy = who; + if (who == sFameCheckerData->numUnlockedPersons - 1) + who_copy = who - 1; + if ( sFameCheckerData->unlockedPersons[who_copy] == FAMECHECKER_DAISY + || sFameCheckerData->unlockedPersons[who_copy] == FAMECHECKER_MRFUJI + || sFameCheckerData->unlockedPersons[who_copy] == FAMECHECKER_OAK + || sFameCheckerData->unlockedPersons[who_copy] == FAMECHECKER_BILL ) DestroySprite(&gSprites[data[2]]); else sub_810C2E8(data[2]); } -static void sub_812DA14(u8 a0) +static void UpdateIconDescriptionBox(u8 a0) { s32 width; - u32 r5 = 6 * sFameCheckerData->unlockedPersons[FameCheckerGetCursorY()] + a0; - sub_812E094(1); + u32 idx = 6 * sFameCheckerData->unlockedPersons[FameCheckerGetCursorY()] + a0; + FlipBitUnk23_0(TRUE); gUnknown_3005EC8 = 1; - FillWindowPixelRect(3, 0x00, 0, 0, 0x58, 0x20); - width = (0x54 - GetStringWidth(0, gUnknown_845F89C[r5], 0)) / 2; - AddTextPrinterParametrized2(3, 0, width, 0, 0, 2, &gUnknown_845F5E3, -1, gUnknown_845F89C[r5]); - StringExpandPlaceholders(gStringVar1, gUnknown_845FA1C[r5]); + FillWindowPixelRect(FCWINDOWID_ICONDESC, 0x00, 0, 0, 0x58, 0x20); + width = (0x54 - GetStringWidth(0, sFlavorTextOriginLocationTexts[idx], 0)) / 2; + AddTextPrinterParametrized2(FCWINDOWID_ICONDESC, 0, width, 0, 0, 2, &gUnknown_845F5E3, -1, sFlavorTextOriginLocationTexts[idx]); + StringExpandPlaceholders(gStringVar1, sFlavorTextOriginObjectNameTexts[idx]); width = (0x54 - GetStringWidth(0, gStringVar1, 0)) / 2; - AddTextPrinterParametrized2(3, 0, width, 10, 0, 2, &gUnknown_845F5E3, -1, gStringVar1); - sub_812CEE0(3); + AddTextPrinterParametrized2(FCWINDOWID_ICONDESC, 0, width, 10, 0, 2, &gUnknown_845F5E3, -1, gStringVar1); + FC_PutWindowTilemapAndCopyWindowToVramMode3(FCWINDOWID_ICONDESC); } static void sub_812DB10(void) { - sub_812E094(0); + FlipBitUnk23_0(FALSE); gUnknown_3005EC8 = 0xFF; } -static void sub_812DB28(void) +static void FC_CreateListMenu(void) { - sub_812DB64(); - sFameCheckerData->numUnlockedPersons = sub_812DEF0(); - sFameCheckerData->scrollIndicatorArrowObjectTaskId = ListMenuInit(&gFameChecker_ListMenuTemplate, 0, 0); - sub_812DFE4(0); + InitListMenuTemplate(); + sFameCheckerData->numUnlockedPersons = FC_PopulateListMenu(); + sFameCheckerData->listMenuTaskId = ListMenuInit(&gFameChecker_ListMenuTemplate, 0, 0); + FC_PutWindowTilemapAndCopyWindowToVramMode3_2(FCWINDOWID_LIST); } -static void sub_812DB64(void) +static void InitListMenuTemplate(void) { gFameChecker_ListMenuTemplate.items = sListMenuItems; - gFameChecker_ListMenuTemplate.moveCursorFunc = sub_812DBC0; + gFameChecker_ListMenuTemplate.moveCursorFunc = FC_MoveCursorFunc; gFameChecker_ListMenuTemplate.itemPrintFunc = NULL; gFameChecker_ListMenuTemplate.totalItems = 1; gFameChecker_ListMenuTemplate.maxShowed = 1; @@ -1284,31 +1257,31 @@ static void sub_812DB64(void) gFameChecker_ListMenuTemplate.cursorKind = 0; } -static void sub_812DBC0(s32 itemIndex, bool8 onInit, struct ListMenu *list) +static void FC_MoveCursorFunc(s32 itemIndex, bool8 onInit, struct ListMenu *list) { u16 sp8; u8 taskId; u16 r9; sLastMenuIdx = 0; r9 = sFameCheckerData->listMenuTopIdx2 + sFameCheckerData->listMenuDrawnSelIdx; - sub_812DDF0(itemIndex, onInit); - taskId = FindTaskIdByFunc(sub_812C694); + FC_DoMoveCursor(itemIndex, onInit); + taskId = FindTaskIdByFunc(Task_TopMenuHandleInput); if (taskId != 0xFF) { struct Task *task = &gTasks[taskId]; PlaySE(SE_SELECT); task->data[1] = 0; - get_coro_args_x18_x1A(sFameCheckerData->scrollIndicatorArrowObjectTaskId, &sp8, NULL); + get_coro_args_x18_x1A(sFameCheckerData->listMenuTaskId, &sp8, NULL); sFameCheckerData->listMenuTopIdx = sp8; if (itemIndex != sFameCheckerData->numUnlockedPersons - 1) { - sub_812D174(); - sub_812D1A8(itemIndex); + DestroyAllFlavorTextIcons(); + CreateAllFlavorTextIcons(itemIndex); if (sFameCheckerData->inPickMode) { if (!sFameCheckerData->unk_23_2) { - sub_812D9A8(taskId, r9); + DestroyPersonPicSprite(taskId, r9); sLastMenuIdx = itemIndex; task->func = sub_812DD50; } @@ -1317,18 +1290,18 @@ static void sub_812DBC0(s32 itemIndex, bool8 onInit, struct ListMenu *list) gSprites[task->data[2]].invisible = FALSE; sFameCheckerData->unk_23_2 = FALSE; gSprites[task->data[2]].data[0] = 0; - sub_812CD3C(); + GetPickModeText(); } } else { - FillWindowPixelRect(2, 0x11, 0, 0, 0xd0, 0x20); - sub_812CEE0(2); + FillWindowPixelRect(FCWINDOWID_MSGBOX, 0x11, 0, 0, 0xd0, 0x20); + FC_PutWindowTilemapAndCopyWindowToVramMode3(FCWINDOWID_MSGBOX); } } else { - sub_812DDAC(); + PrintCancelDescription(); if (sFameCheckerData->inPickMode) { gSprites[task->data[2]].invisible = TRUE; @@ -1349,34 +1322,34 @@ static void sub_812DBC0(s32 itemIndex, bool8 onInit, struct ListMenu *list) static void sub_812DD50(u8 taskId) { struct Task * task = &gTasks[taskId]; - task->data[2] = sub_812D888(sFameCheckerData->unlockedPersons[sLastMenuIdx]); + task->data[2] = CreatePersonPicSprite(sFameCheckerData->unlockedPersons[sLastMenuIdx]); gSprites[task->data[2]].data[0] = 0; - sub_812CD3C(); - task->func = sub_812C694; + GetPickModeText(); + task->func = Task_TopMenuHandleInput; } -static void sub_812DDAC(void) +static void PrintCancelDescription(void) { - FillWindowPixelRect(2, 0x11, 0, 0, 0xd0, 0x20); - AddTextPrinterParametrized(2, 2, gUnknown_84181C3, 0, NULL, 2, 1, 3); - sub_812CEE0(2); + FillWindowPixelRect(FCWINDOWID_MSGBOX, 0x11, 0, 0, 0xd0, 0x20); + AddTextPrinterParametrized(FCWINDOWID_MSGBOX, 2, gFameCheckerText_FameCheckerWillBeClosed, 0, NULL, 2, 1, 3); + FC_PutWindowTilemapAndCopyWindowToVramMode3(FCWINDOWID_MSGBOX); } -static void sub_812DDF0(s32 itemIndex, bool8 onInit) +static void FC_DoMoveCursor(s32 itemIndex, bool8 onInit) { u16 sp14; u16 sp16; u16 r6; - get_coro_args_x18_x1A(sFameCheckerData->scrollIndicatorArrowObjectTaskId, &sp14, &sp16); + get_coro_args_x18_x1A(sFameCheckerData->listMenuTaskId, &sp14, &sp16); r6 = sp14 + sp16; - AddTextPrinterParametrized2(0, 2, 8, 14 * sp16 + 4, 0, 0, &gUnknown_845F5E6, 0, sListMenuItems[itemIndex].unk_00); + AddTextPrinterParametrized2(FCWINDOWID_LIST, 2, 8, 14 * sp16 + 4, 0, 0, &gUnknown_845F5E6, 0, sListMenuItems[itemIndex].unk_00); if (!onInit) { if (sp14 < sFameCheckerData->listMenuTopIdx2) sFameCheckerData->listMenuDrawnSelIdx++; else if (sp14 > sFameCheckerData->listMenuTopIdx2 && r6 != sFameCheckerData->numUnlockedPersons - 1) sFameCheckerData->listMenuDrawnSelIdx--; - AddTextPrinterParametrized2(0, 2, 8, 14 * sFameCheckerData->listMenuDrawnSelIdx + 4, 0, 0, &gUnknown_845F5E3, 0, sListMenuItems[sFameCheckerData->listMenuCurIdx].unk_00); + AddTextPrinterParametrized2(FCWINDOWID_LIST, 2, 8, 14 * sFameCheckerData->listMenuDrawnSelIdx + 4, 0, 0, &gUnknown_845F5E3, 0, sListMenuItems[sFameCheckerData->listMenuCurIdx].unk_00); } sFameCheckerData->listMenuCurIdx = itemIndex; @@ -1384,63 +1357,63 @@ static void sub_812DDF0(s32 itemIndex, bool8 onInit) sFameCheckerData->listMenuTopIdx2 = sp14; } -static u8 sub_812DEF0(void) +static u8 FC_PopulateListMenu(void) { - u8 r4 = 0; - u8 r6; + u8 nitems = 0; + u8 i; - for (r6 = 0; r6 < 16; r6++) + for (i = 0; i < NUM_FAMECHECKER_PERSONS; i++) { - u8 r5 = sub_812D0C0(r6); - if (gSaveBlock1Ptr->fameChecker[r5].pickState != FCPICKSTATE_NO_DRAW) + u8 fameCheckerIdx = AdjustGiovanniIndexIfBeatenInGym(i); + if (gSaveBlock1Ptr->fameChecker[fameCheckerIdx].pickState != FCPICKSTATE_NO_DRAW) { - if (gUnknown_845F5EA[r5] < 0xFE00) + if (sTrainerIdxs[fameCheckerIdx] < FC_NONTRAINER_START) { - sListMenuItems[r4].unk_00 = gTrainers[gUnknown_845F5EA[r5]].trainerName; - sListMenuItems[r4].unk_04 = r4; + sListMenuItems[nitems].unk_00 = gTrainers[sTrainerIdxs[fameCheckerIdx]].trainerName; + sListMenuItems[nitems].unk_04 = nitems; } else { - sListMenuItems[r4].unk_00 = gUnknown_845F60C[gUnknown_845F5EA[r5] - 0xFE00]; - sListMenuItems[r4].unk_04 = r4; + sListMenuItems[nitems].unk_00 = sNonTrainerNamePointers[sTrainerIdxs[fameCheckerIdx] - FC_NONTRAINER_START]; + sListMenuItems[nitems].unk_04 = nitems; } - sFameCheckerData->unlockedPersons[r4] = r5; - r4++; + sFameCheckerData->unlockedPersons[nitems] = fameCheckerIdx; + nitems++; } } - sListMenuItems[r4].unk_00 = gUnknown_84161C1; - sListMenuItems[r4].unk_04 = r4; - sFameCheckerData->unlockedPersons[r4] = 0xFF; - r4++; - gFameChecker_ListMenuTemplate.totalItems = r4; - if (r4 < 5) - gFameChecker_ListMenuTemplate.maxShowed = r4; + sListMenuItems[nitems].unk_00 = gFameCheckerText_Cancel; + sListMenuItems[nitems].unk_04 = nitems; + sFameCheckerData->unlockedPersons[nitems] = 0xFF; + nitems++; + gFameChecker_ListMenuTemplate.totalItems = nitems; + if (nitems < 5) + gFameChecker_ListMenuTemplate.maxShowed = nitems; else gFameChecker_ListMenuTemplate.maxShowed = 5; - return r4; + return nitems; } -static void sub_812DFE4(u8 windowId) +static void FC_PutWindowTilemapAndCopyWindowToVramMode3_2(u8 windowId) { PutWindowTilemap(windowId); CopyWindowToVram(windowId, 3); } -static void sub_812E000(void) +static void FC_CreateScrollIndicatorArrowPair(void) { struct ScrollIndicatorArrowPairTemplate sp0 = { - 2, - 40, - 26, - 3, - 40, - 100, - 0, - 0, - SPRITETAG_1004, - 0xFFFF, - 1, - 0 + 2, + 40, + 26, + 3, + 40, + 100, + 0, + 0, + SPRITETAG_SCROLL_INDICATORS, + 0xFFFF, + 1, + 0 }; if (sFameCheckerData->numUnlockedPersons > 5) @@ -1451,7 +1424,7 @@ static void sub_812E000(void) } } -static void sub_812E048(void) +static void FreeListMenuSelectorArrowPairResources(void) { if (sFameCheckerData->numUnlockedPersons > 5) RemoveScrollIndicatorArrowPair(sFameCheckerData->unk_06); @@ -1460,11 +1433,11 @@ static void sub_812E048(void) static u16 FameCheckerGetCursorY(void) { u16 sp0, sp2; - get_coro_args_x18_x1A(sFameCheckerData->scrollIndicatorArrowObjectTaskId, &sp0, &sp2); + get_coro_args_x18_x1A(sFameCheckerData->listMenuTaskId, &sp0, &sp2); return sp0 + sp2; } -static void sub_812E094(u8 a0) +static void FlipBitUnk23_0(bool8 a0) { if (sFameCheckerData->unk_23_0 != a0) { @@ -1571,11 +1544,11 @@ static void sub_812E178(u8 bg, s16 a1) CopyBgTilemapBufferToVram(bg); } -static void sub_812E4A4(u8 a0) +static void PlaceListMenuCursor(bool8 isActive) { - u16 cursorY = ListMenuGetYCoordForPrintingArrowCursor(sFameCheckerData->scrollIndicatorArrowObjectTaskId); - if (a0 == 1) - AddTextPrinterParametrized2(0, 2, 0, cursorY, 0, 0, &gUnknown_845F5E3, 0, gUnknown_841623B); + u16 cursorY = ListMenuGetYCoordForPrintingArrowCursor(sFameCheckerData->listMenuTaskId); + if (isActive == TRUE) + AddTextPrinterParametrized2(FCWINDOWID_LIST, 2, 0, cursorY, 0, 0, &gUnknown_845F5E3, 0, gFameCheckerText_ListMenuCursor); else - AddTextPrinterParametrized2(0, 2, 0, cursorY, 0, 0, &gUnknown_845F5E0, 0, gUnknown_841623B); + AddTextPrinterParametrized2(FCWINDOWID_LIST, 2, 0, cursorY, 0, 0, &gUnknown_845F5E0, 0, gFameCheckerText_ListMenuCursor); } -- cgit v1.2.3 From 5f9edfe8e63127d2557f9f419ecdd9174d0a7ae8 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Tue, 27 Nov 2018 18:29:18 -0500 Subject: One more field renaming in fame_checker --- src/fame_checker.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/fame_checker.c b/src/fame_checker.c index 46c13c387..ec78b5f0e 100644 --- a/src/fame_checker.c +++ b/src/fame_checker.c @@ -42,7 +42,7 @@ struct FameCheckerData { MainCallback savedCallback; u16 listMenuTopIdx; - u8 unk_06; + u8 scrollIndicatorPairTaskId; u8 personHasUnlockedPanels:1; u8 inPickMode:1; u8 numUnlockedPersons:6; @@ -53,7 +53,7 @@ struct FameCheckerData u8 unlockedPersons[NUM_FAMECHECKER_PERSONS + 1]; u8 spriteIds[6]; u8 unk_23_0:1; - u8 unk_23_1:1; + u8 unk_23_1:1; // unused u8 unk_23_2:1; }; @@ -1420,14 +1420,14 @@ static void FC_CreateScrollIndicatorArrowPair(void) { sp0.unk_06 = 0; sp0.unk_08 = sFameCheckerData->numUnlockedPersons - 5; - sFameCheckerData->unk_06 = AddScrollIndicatorArrowPair(&sp0, &sFameCheckerData->listMenuTopIdx); + sFameCheckerData->scrollIndicatorPairTaskId = AddScrollIndicatorArrowPair(&sp0, &sFameCheckerData->listMenuTopIdx); } } static void FreeListMenuSelectorArrowPairResources(void) { if (sFameCheckerData->numUnlockedPersons > 5) - RemoveScrollIndicatorArrowPair(sFameCheckerData->unk_06); + RemoveScrollIndicatorArrowPair(sFameCheckerData->scrollIndicatorPairTaskId); } static u16 FameCheckerGetCursorY(void) -- cgit v1.2.3 From 66c7fc0d701ef5211114fdbdaa9588007beed3f2 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Wed, 28 Nov 2018 08:42:21 -0500 Subject: All functions and assets in fame_checker are named --- common_syms/fame_checker.txt | 2 +- include/fame_checker.h | 3 + src/fame_checker.c | 135 +++++++++++++++++++++---------------------- 3 files changed, 71 insertions(+), 69 deletions(-) diff --git a/common_syms/fame_checker.txt b/common_syms/fame_checker.txt index a590c1cbb..c23bd9a2a 100644 --- a/common_syms/fame_checker.txt +++ b/common_syms/fame_checker.txt @@ -1,2 +1,2 @@ gFameChecker_ListMenuTemplate -gUnknown_3005EC8 +gIconDescriptionBoxIsOpen diff --git a/include/fame_checker.h b/include/fame_checker.h index 2849eef09..257431d8b 100644 --- a/include/fame_checker.h +++ b/include/fame_checker.h @@ -36,6 +36,9 @@ enum { FCWINDOWID_ICONDESC }; +extern struct ListMenuTemplate gFameChecker_ListMenuTemplate; +extern u8 gIconDescriptionBoxIsOpen; + void ResetFameChecker(void); void FullyUnlockFameChecker(void); void UseFameChecker(MainCallback savedCallback); diff --git a/src/fame_checker.c b/src/fame_checker.c index ec78b5f0e..85cea3015 100644 --- a/src/fame_checker.c +++ b/src/fame_checker.c @@ -52,9 +52,9 @@ struct FameCheckerData u8 listMenuDrawnSelIdx; u8 unlockedPersons[NUM_FAMECHECKER_PERSONS + 1]; u8 spriteIds[6]; - u8 unk_23_0:1; + u8 viewingFlavorText:1; u8 unk_23_1:1; // unused - u8 unk_23_2:1; + u8 pickModeOverCancel:1; }; static EWRAM_DATA u16 * sBg3TilemapBuffer = NULL; @@ -65,7 +65,7 @@ static EWRAM_DATA struct ListMenuItem * sListMenuItems = NULL; static EWRAM_DATA s32 sLastMenuIdx = 0; struct ListMenuTemplate gFameChecker_ListMenuTemplate; -u8 gUnknown_3005EC8; +u8 gIconDescriptionBoxIsOpen; static void MainCB2_LoadFameChecker(void); static void LoadUISpriteSheetsAndPalettes(void); @@ -86,31 +86,31 @@ static bool8 SetMessageSelectorIconObjMode(u8 taskId, u8 objMode); static void Task_StartToCloseFameChecker(u8 taskId); static void Task_DestroyAssetsAndCloseFameChecker(u8 taskId); static void FC_DestroyWindow(u8 windowId); -static void PrintUIHelp(u8 a0); -static bool8 CreateAllFlavorTextIcons(u8 a0); +static void PrintUIHelp(u8 state); +static bool8 CreateAllFlavorTextIcons(u8 who); static void FCSetup_ClearVideoRegisters(void); static void FCSetup_ResetTasksAndSpriteResources(void); static void FCSetup_TurnOnDisplay(void); static void FCSetup_ResetBGCoords(void); static bool8 HasUnlockedAllFlavorTextsForCurrentPerson(void); static void FreeSelectionCursorSpriteResources(void); -static u8 CreateFlavorTextIconSelectorCursorSprite(s16 a0); +static u8 CreateFlavorTextIconSelectorCursorSprite(s16 where); static void SpriteCB_DestroyFlavorTextIconSelectorCursor(struct Sprite *sprite); static void FreeQuestionMarkSpriteResources(void); -static u8 PlaceQuestionMarkTile(u8, u8); +static u8 PlaceQuestionMarkTile(u8 x, u8 y); static void FreeSpinningPokeballSpriteResources(void); static u8 CreateSpinningPokeballSprite(void); static void SpriteCB_DestroySpinningPokeball(struct Sprite *sprite); static void FreeNonTrainerPicTiles(void); -static u8 CreatePersonPicSprite(u8 a0); -static void DestroyPersonPicSprite(u8 a0, u16 a1); -static void UpdateIconDescriptionBox(u8 a0); -static void sub_812DB10(void); +static u8 CreatePersonPicSprite(u8 fcPersonIdx); +static void DestroyPersonPicSprite(u8 taskId, u16 who); +static void UpdateIconDescriptionBox(u8 whichText); +static void UpdateIconDescriptionBoxOff(void); static void FC_CreateListMenu(void); static void SpriteCB_FCSpinningPokeball(struct Sprite * sprite); static void InitListMenuTemplate(void); -static void FC_MoveCursorFunc(s32, bool8, struct ListMenu *); -static void sub_812DD50(u8 taskId); +static void FC_MoveCursorFunc(s32 itemIndex, bool8 onInit, struct ListMenu * list); +static void Task_SwitchToPickMode(u8 taskId); static void PrintCancelDescription(void); static void FC_DoMoveCursor(s32 itemIndex, bool8 onInit); static u8 FC_PopulateListMenu(void); @@ -118,10 +118,10 @@ static void FC_PutWindowTilemapAndCopyWindowToVramMode3_2(u8 windowId); static void FC_CreateScrollIndicatorArrowPair(void); static void FreeListMenuSelectorArrowPairResources(void); static u16 FameCheckerGetCursorY(void); -static void FlipBitUnk23_0(bool8); -static void sub_812E110(u8 taskId); -static void sub_812E178(u8 a0, s16 a1); -static void PlaceListMenuCursor(bool8 a0); +static void HandleFlavorTextModeSwitch(bool8 state); +static void Task_FCOpenOrCloseInfoBox(u8 taskId); +static void UpdateInfoBoxTilemap(u8 bg, s16 state); +static void PlaceListMenuCursor(bool8 isActive); extern const u8 gFameCheckerText_Cancel[]; extern const u8 gFameCheckerText_ListMenuCursor[]; @@ -447,7 +447,7 @@ void UseFameChecker(MainCallback savedCallback) sFameCheckerData->listMenuCurIdx = 0; sFameCheckerData->listMenuTopIdx2 = 0; sFameCheckerData->listMenuDrawnSelIdx = 0; - sFameCheckerData->unk_23_0 = FALSE; + sFameCheckerData->viewingFlavorText = FALSE; PlaySE(SE_W202); SetMainCallback2(MainCB2_LoadFameChecker); } @@ -510,7 +510,7 @@ static void MainCB2_LoadFameChecker(void) break; case 6: LoadUISpriteSheetsAndPalettes(); - CreateAllFlavorTextIcons(0); + CreateAllFlavorTextIcons(FAMECHECKER_OAK); WipeMsgBoxAndTransfer(); BeginNormalPaletteFade(0xFFFFFFFF,0, 16, 0, 0); gMain.state++; @@ -523,7 +523,7 @@ static void MainCB2_LoadFameChecker(void) SetVBlankCallback(FC_VBlankCallback); sFameCheckerData->listMenuTopIdx = 0; FC_CreateScrollIndicatorArrowPair(); - sub_812E178(1, 4); + UpdateInfoBoxTilemap(1, 4); CreateTask(Task_WaitFadeOnInit, 0x08); SetMainCallback2(MainCB2_FameCheckerMain); gMain.state = 0; @@ -549,7 +549,7 @@ static void Task_TopMenuHandleInput(u8 taskId) u8 i; struct Task *task = &gTasks[taskId]; s16 * data = gTasks[taskId].data; - if (FindTaskIdByFunc(sub_812E110) == 0xFF) + if (FindTaskIdByFunc(Task_FCOpenOrCloseInfoBox) == 0xFF) { RunTextPrinters(); if ((JOY_NEW(SELECT_BUTTON)) && !sFameCheckerData->inPickMode && sFameCheckerData->savedCallback != UseFameCheckerFromMenu) @@ -566,8 +566,8 @@ static void Task_TopMenuHandleInput(u8 taskId) PlaySE(SE_W100); FillWindowPixelRect(FCWINDOWID_ICONDESC, 0x00, 0, 0, 88, 32); FC_PutWindowTilemapAndCopyWindowToVramMode3(FCWINDOWID_ICONDESC); - sub_812E178(2, 4); - sub_812E178(1, 5); + UpdateInfoBoxTilemap(2, 4); + UpdateInfoBoxTilemap(1, 5); PrintUIHelp(1); task->data[2] = CreatePersonPicSprite(sFameCheckerData->unlockedPersons[cursorPos]); gSprites[task->data[2]].pos2.x = 0xF0; @@ -597,7 +597,7 @@ static void Task_TopMenuHandleInput(u8 taskId) if (i != task->data[1]) SetMessageSelectorIconObjMode(sFameCheckerData->spriteIds[i], ST_OAM_OBJ_BLEND); } - gUnknown_3005EC8 = 0xFF; + gIconDescriptionBoxIsOpen = 0xFF; PlaceListMenuCursor(FALSE); PrintUIHelp(2); if (gSprites[sFameCheckerData->spriteIds[task->data[1]]].data[1] != 0xFF) // not a ? tile @@ -631,7 +631,7 @@ static bool8 TryExitPickMode(u8 taskId) WipeMsgBoxAndTransfer(); task->func = Task_ExitPickMode; MessageBoxPrintEmptyText(); - sFameCheckerData->unk_23_2 = FALSE; + sFameCheckerData->pickModeOverCancel = FALSE; return TRUE; } return FALSE; @@ -666,8 +666,8 @@ static void Task_ExitPickMode(u8 taskId) { if (sFameCheckerData->personHasUnlockedPanels) PrintUIHelp(0); - sub_812E178(1, 4); - sub_812E178(2, 2); + UpdateInfoBoxTilemap(1, 4); + UpdateInfoBoxTilemap(2, 2); sFameCheckerData->inPickMode = FALSE; DestroyPersonPicSprite(taskId, FameCheckerGetCursorY()); task->func = Task_TopMenuHandleInput; @@ -695,8 +695,8 @@ static void Task_FlavorTextDisplayHandleInput(u8 taskId) SetMessageSelectorIconObjMode(sFameCheckerData->spriteIds[i], ST_OAM_OBJ_NORMAL); WipeMsgBoxAndTransfer(); gSprites[task->data[0]].callback = SpriteCB_DestroyFlavorTextIconSelectorCursor; - if (gUnknown_3005EC8 != 0xFF) - sub_812DB10(); + if (gIconDescriptionBoxIsOpen != 0xFF) + UpdateIconDescriptionBoxOff(); PlaceListMenuCursor(TRUE); PrintUIHelp(0); FC_CreateScrollIndicatorArrowPair(); @@ -760,8 +760,8 @@ static void FC_MoveSelectorCursor(u8 taskId, s8 dx, s8 dy) PrintSelectedNameInBrightGreen(taskId); UpdateIconDescriptionBox(data[1]); } - else if (gUnknown_3005EC8 != 0xFF) - sub_812DB10(); + else if (gIconDescriptionBoxIsOpen != 0xFF) + UpdateIconDescriptionBoxOff(); } static void GetPickModeText(void) @@ -913,14 +913,13 @@ static void DestroyAllFlavorTextIcons(void) } } -static bool8 CreateAllFlavorTextIcons(u8 a0) +static bool8 CreateAllFlavorTextIcons(u8 who) { - // r8 <- a0 bool8 result = FALSE; u8 i; for (i = 0; i < 6; i++) { - if ((gSaveBlock1Ptr->fameChecker[sFameCheckerData->unlockedPersons[a0]].flavorTextFlags >> i) & 1) + if ((gSaveBlock1Ptr->fameChecker[sFameCheckerData->unlockedPersons[who]].flavorTextFlags >> i) & 1) { sFameCheckerData->spriteIds[i] = sub_805EB44( sFameCheckerArrayNpcGraphicsIds[sFameCheckerData->unlockedPersons[a0] * 6 + i], @@ -1206,12 +1205,12 @@ static void DestroyPersonPicSprite(u8 taskId, u16 who) sub_810C2E8(data[2]); } -static void UpdateIconDescriptionBox(u8 a0) +static void UpdateIconDescriptionBox(u8 whichText) { s32 width; - u32 idx = 6 * sFameCheckerData->unlockedPersons[FameCheckerGetCursorY()] + a0; - FlipBitUnk23_0(TRUE); - gUnknown_3005EC8 = 1; + u32 idx = 6 * sFameCheckerData->unlockedPersons[FameCheckerGetCursorY()] + whichText; + HandleFlavorTextModeSwitch(TRUE); + gIconDescriptionBoxIsOpen = 1; FillWindowPixelRect(FCWINDOWID_ICONDESC, 0x00, 0, 0, 0x58, 0x20); width = (0x54 - GetStringWidth(0, sFlavorTextOriginLocationTexts[idx], 0)) / 2; AddTextPrinterParametrized2(FCWINDOWID_ICONDESC, 0, width, 0, 0, 2, &gUnknown_845F5E3, -1, sFlavorTextOriginLocationTexts[idx]); @@ -1221,10 +1220,10 @@ static void UpdateIconDescriptionBox(u8 a0) FC_PutWindowTilemapAndCopyWindowToVramMode3(FCWINDOWID_ICONDESC); } -static void sub_812DB10(void) +static void UpdateIconDescriptionBoxOff(void) { - FlipBitUnk23_0(FALSE); - gUnknown_3005EC8 = 0xFF; + HandleFlavorTextModeSwitch(FALSE); + gIconDescriptionBoxIsOpen = 0xFF; } static void FC_CreateListMenu(void) @@ -1259,11 +1258,11 @@ static void InitListMenuTemplate(void) static void FC_MoveCursorFunc(s32 itemIndex, bool8 onInit, struct ListMenu *list) { - u16 sp8; + u16 listMenuTopIdx; u8 taskId; - u16 r9; + u16 personIdx; sLastMenuIdx = 0; - r9 = sFameCheckerData->listMenuTopIdx2 + sFameCheckerData->listMenuDrawnSelIdx; + personIdx = sFameCheckerData->listMenuTopIdx2 + sFameCheckerData->listMenuDrawnSelIdx; FC_DoMoveCursor(itemIndex, onInit); taskId = FindTaskIdByFunc(Task_TopMenuHandleInput); if (taskId != 0xFF) @@ -1271,24 +1270,24 @@ static void FC_MoveCursorFunc(s32 itemIndex, bool8 onInit, struct ListMenu *list struct Task *task = &gTasks[taskId]; PlaySE(SE_SELECT); task->data[1] = 0; - get_coro_args_x18_x1A(sFameCheckerData->listMenuTaskId, &sp8, NULL); - sFameCheckerData->listMenuTopIdx = sp8; + get_coro_args_x18_x1A(sFameCheckerData->listMenuTaskId, &listMenuTopIdx, NULL); + sFameCheckerData->listMenuTopIdx = listMenuTopIdx; if (itemIndex != sFameCheckerData->numUnlockedPersons - 1) { DestroyAllFlavorTextIcons(); CreateAllFlavorTextIcons(itemIndex); if (sFameCheckerData->inPickMode) { - if (!sFameCheckerData->unk_23_2) + if (!sFameCheckerData->pickModeOverCancel) { - DestroyPersonPicSprite(taskId, r9); + DestroyPersonPicSprite(taskId, personIdx); sLastMenuIdx = itemIndex; - task->func = sub_812DD50; + task->func = Task_SwitchToPickMode; } else { gSprites[task->data[2]].invisible = FALSE; - sFameCheckerData->unk_23_2 = FALSE; + sFameCheckerData->pickModeOverCancel = FALSE; gSprites[task->data[2]].data[0] = 0; GetPickModeText(); } @@ -1305,7 +1304,7 @@ static void FC_MoveCursorFunc(s32 itemIndex, bool8 onInit, struct ListMenu *list if (sFameCheckerData->inPickMode) { gSprites[task->data[2]].invisible = TRUE; - sFameCheckerData->unk_23_2 = TRUE; + sFameCheckerData->pickModeOverCancel = TRUE; } else { @@ -1319,7 +1318,7 @@ static void FC_MoveCursorFunc(s32 itemIndex, bool8 onInit, struct ListMenu *list } } -static void sub_812DD50(u8 taskId) +static void Task_SwitchToPickMode(u8 taskId) { struct Task * task = &gTasks[taskId]; task->data[2] = CreatePersonPicSprite(sFameCheckerData->unlockedPersons[sLastMenuIdx]); @@ -1437,29 +1436,29 @@ static u16 FameCheckerGetCursorY(void) return sp0 + sp2; } -static void FlipBitUnk23_0(bool8 a0) +static void HandleFlavorTextModeSwitch(bool8 state) { - if (sFameCheckerData->unk_23_0 != a0) + if (sFameCheckerData->viewingFlavorText != state) { - u8 taskId = FindTaskIdByFunc(sub_812E110); + u8 taskId = FindTaskIdByFunc(Task_FCOpenOrCloseInfoBox); if (taskId == 0xFF) - taskId = CreateTask(sub_812E110, 8); + taskId = CreateTask(Task_FCOpenOrCloseInfoBox, 8); gTasks[taskId].data[0] = 0; gTasks[taskId].data[1] = 4; - if (a0 == TRUE) + if (state == TRUE) { gTasks[taskId].data[2] = 1; - sFameCheckerData->unk_23_0 = TRUE; + sFameCheckerData->viewingFlavorText = TRUE; } else { gTasks[taskId].data[2] = 4; - sFameCheckerData->unk_23_0 = FALSE; + sFameCheckerData->viewingFlavorText = FALSE; } } } -static void sub_812E110(u8 taskId) +static void Task_FCOpenOrCloseInfoBox(u8 taskId) { struct Task * task = &gTasks[taskId]; switch (task->data[0]) @@ -1467,7 +1466,7 @@ static void sub_812E110(u8 taskId) case 0: if (--task->data[1] == 0) { - sub_812E178(1, 0); + UpdateInfoBoxTilemap(1, 0); task->data[1] = 4; task->data[0]++; } @@ -1475,16 +1474,16 @@ static void sub_812E110(u8 taskId) case 1: if (--task->data[1] == 0) { - sub_812E178(1, task->data[2]); + UpdateInfoBoxTilemap(1, task->data[2]); DestroyTask(taskId); } break; } } -static void sub_812E178(u8 bg, s16 a1) +static void UpdateInfoBoxTilemap(u8 bg, s16 state) { - if (a1 == 0 || a1 == 3) + if (state == 0 || state == 3) { FillBgTilemapBufferRect(bg, 0x8C, 14, 10, 1, 1, 1); FillBgTilemapBufferRect(bg, 0xA1, 15, 10, 10, 1, 1); @@ -1498,7 +1497,7 @@ static void sub_812E178(u8 bg, s16 a1) FillBgTilemapBufferRect(bg, 0x92, 25, 12, 1, 1, 1); FillBgTilemapBufferRect(bg, 0x93, 26, 12, 1, 1, 1); } - else if (a1 == 1) + else if (state == 1) { FillBgTilemapBufferRect(bg, 0x9B, 14, 10, 1, 1, 1); FillBgTilemapBufferRect(bg, 0x9C, 15, 10, 11, 1, 1); @@ -1510,7 +1509,7 @@ static void sub_812E178(u8 bg, s16 a1) FillBgTilemapBufferRect(bg, 0x9F, 15, 12, 11, 1, 1); FillBgTilemapBufferRect(bg, 0x99, 26, 12, 1, 1, 1); } - else if (a1 == 2) + else if (state == 2) { FillBgTilemapBufferRect(bg, 0x94, 14, 10, 1, 1, 1); FillBgTilemapBufferRect(bg, 0x95, 15, 10, 11, 1, 1); @@ -1522,7 +1521,7 @@ static void sub_812E178(u8 bg, s16 a1) FillBgTilemapBufferRect(bg, 0x98, 15, 12, 11, 1, 1); FillBgTilemapBufferRect(bg, 0x99, 26, 12, 1, 1, 1); } - else if (a1 == 4) + else if (state == 4) { FillBgTilemapBufferRect(bg, 0x83, 14, 10, 1, 1, 1); FillBgTilemapBufferRect(bg, 0xA0, 15, 10, 10, 1, 1); @@ -1537,7 +1536,7 @@ static void sub_812E178(u8 bg, s16 a1) FillBgTilemapBufferRect(bg, 0x84, 25, 12, 1, 1, 1); FillBgTilemapBufferRect(bg, 0x85, 26, 12, 1, 1, 1); } - else if (a1 == 5) + else if (state == 5) { FillBgTilemapBufferRect(bg, 0x00, 14, 10, 13, 3, 1); } -- cgit v1.2.3 From d7237d2cb74ea02b71742b09a1db2cf2721fb999 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Wed, 28 Nov 2018 08:47:47 -0500 Subject: Also name the text color assets --- src/fame_checker.c | 62 +++++++++++++++++++++++++++--------------------------- 1 file changed, 31 insertions(+), 31 deletions(-) diff --git a/src/fame_checker.c b/src/fame_checker.c index 85cea3015..67344edbc 100644 --- a/src/fame_checker.c +++ b/src/fame_checker.c @@ -149,12 +149,12 @@ static const u8 sDaisySpriteGfx[] = INCBIN_U8("data/fame_checker/img_845e560.4bp static const u16 sDaisySpritePalette[] = INCBIN_U16("data/fame_checker/pal_845ed60.gbapal"); static const u8 sOakSpriteGfx[] = INCBIN_U8("data/fame_checker/img_845ed80.4bpp"); static const u16 sOakSpritePalette[] = INCBIN_U16("data/fame_checker/pal_845f580.gbapal"); -static const u16 gUnknown_845F5A0[] = INCBIN_U16("data/fame_checker/pal_845f5a0.gbapal"); +static const u16 gUnknown_845F5A0[] = INCBIN_U16("data/fame_checker/pal_845f5a0.gbapal"); // unused? static const u16 sSilhouettePalette[] = INCBIN_U16("data/fame_checker/pal_845f5c0.gbapal"); -static const struct TextColor gUnknown_845F5E0 = {TEXT_COLOR_TRANSPARENT, TEXT_COLOR_WHITE, TEXT_COLOR_DARK_GREY}; -static const struct TextColor gUnknown_845F5E3 = {TEXT_COLOR_TRANSPARENT, TEXT_COLOR_DARK_GREY, 0x03}; -static const struct TextColor gUnknown_845F5E6 = {TEXT_COLOR_TRANSPARENT, 0x06, 0x07}; +static const struct TextColor sTextColor_White = {TEXT_COLOR_TRANSPARENT, TEXT_COLOR_WHITE, TEXT_COLOR_DARK_GREY}; +static const struct TextColor sTextColor_DkGrey = {TEXT_COLOR_TRANSPARENT, TEXT_COLOR_DARK_GREY, 0x03}; +static const struct TextColor sTextColor_Green = {TEXT_COLOR_TRANSPARENT, 0x06, 0x07}; static const u16 sTrainerIdxs[] = { FC_NONTRAINER_START + 0, // OAK @@ -766,9 +766,9 @@ static void FC_MoveSelectorCursor(u8 taskId, s8 dx, s8 dy) static void GetPickModeText(void) { - u8 r8 = 0; - u16 r6 = FameCheckerGetCursorY(); - if (gSaveBlock1Ptr->fameChecker[sFameCheckerData->unlockedPersons[r6]].pickState != FCPICKSTATE_COLORED) + u8 offset = 0; + u16 who = FameCheckerGetCursorY(); + if (gSaveBlock1Ptr->fameChecker[sFameCheckerData->unlockedPersons[who]].pickState != FCPICKSTATE_COLORED) { WipeMsgBoxAndTransfer(); MessageBoxPrintEmptyText(); @@ -777,8 +777,8 @@ static void GetPickModeText(void) { FillWindowPixelRect(FCWINDOWID_MSGBOX, 0x11, 0, 0, 0xd0, 0x20); if (HasUnlockedAllFlavorTextsForCurrentPerson() == TRUE) - r8 = NUM_FAMECHECKER_PERSONS; - StringExpandPlaceholders(gStringVar4, sFameCheckerNameAndQuotesPointers[sFameCheckerData->unlockedPersons[r6] + r8]); + offset = NUM_FAMECHECKER_PERSONS; + StringExpandPlaceholders(gStringVar4, sFameCheckerNameAndQuotesPointers[sFameCheckerData->unlockedPersons[who] + offset]); AddTextPrinterParametrized(FCWINDOWID_MSGBOX, 2, gStringVar4, sub_80F78A8(), NULL, 2, 1, 3); FC_PutWindowTilemapAndCopyWindowToVramMode3(FCWINDOWID_MSGBOX); } @@ -833,7 +833,7 @@ static void Task_StartToCloseFameChecker(u8 taskId) static void Task_DestroyAssetsAndCloseFameChecker(u8 taskId) { - u8 r4; + u8 i; if (!gPaletteFade.active) { @@ -843,9 +843,9 @@ static void Task_DestroyAssetsAndCloseFameChecker(u8 taskId) FreeSpriteOamMatrix(&gSprites[gTasks[taskId].data[3]]); DestroySprite(&gSprites[gTasks[taskId].data[3]]); } - for (r4 = 0; r4 < 6; r4++) + for (i = 0; i < 6; i++) { - DestroySprite(&gSprites[sFameCheckerData->spriteIds[r4]]); + DestroySprite(&gSprites[sFameCheckerData->spriteIds[i]]); } FreeNonTrainerPicTiles(); FreeSpinningPokeballSpriteResources(); @@ -900,7 +900,7 @@ static void PrintUIHelp(u8 state) } width = GetStringWidth(0, src, 0); FillWindowPixelRect(FCWINDOWID_UIHELP, 0x00, 0, 0, 0xc0, 0x10); - AddTextPrinterParametrized2(FCWINDOWID_UIHELP, 0, 188 - width, 0, 0, 2, &gUnknown_845F5E0, -1, src); + AddTextPrinterParametrized2(FCWINDOWID_UIHELP, 0, 188 - width, 0, 0, 2, &sTextColor_White, -1, src); FC_PutWindowTilemapAndCopyWindowToVramMode3(FCWINDOWID_UIHELP); } @@ -1213,10 +1213,10 @@ static void UpdateIconDescriptionBox(u8 whichText) gIconDescriptionBoxIsOpen = 1; FillWindowPixelRect(FCWINDOWID_ICONDESC, 0x00, 0, 0, 0x58, 0x20); width = (0x54 - GetStringWidth(0, sFlavorTextOriginLocationTexts[idx], 0)) / 2; - AddTextPrinterParametrized2(FCWINDOWID_ICONDESC, 0, width, 0, 0, 2, &gUnknown_845F5E3, -1, sFlavorTextOriginLocationTexts[idx]); + AddTextPrinterParametrized2(FCWINDOWID_ICONDESC, 0, width, 0, 0, 2, &sTextColor_DkGrey, -1, sFlavorTextOriginLocationTexts[idx]); StringExpandPlaceholders(gStringVar1, sFlavorTextOriginObjectNameTexts[idx]); width = (0x54 - GetStringWidth(0, gStringVar1, 0)) / 2; - AddTextPrinterParametrized2(FCWINDOWID_ICONDESC, 0, width, 10, 0, 2, &gUnknown_845F5E3, -1, gStringVar1); + AddTextPrinterParametrized2(FCWINDOWID_ICONDESC, 0, width, 10, 0, 2, &sTextColor_DkGrey, -1, gStringVar1); FC_PutWindowTilemapAndCopyWindowToVramMode3(FCWINDOWID_ICONDESC); } @@ -1308,10 +1308,10 @@ static void FC_MoveCursorFunc(s32 itemIndex, bool8 onInit, struct ListMenu *list } else { - u8 r2; - for (r2 = 0; r2 < 6; r2++) + u8 iwho; + for (iwho = 0; iwho < 6; iwho++) { - gSprites[sFameCheckerData->spriteIds[r2]].invisible = TRUE; + gSprites[sFameCheckerData->spriteIds[i]].invisible = TRUE; } } } @@ -1336,24 +1336,24 @@ static void PrintCancelDescription(void) static void FC_DoMoveCursor(s32 itemIndex, bool8 onInit) { - u16 sp14; - u16 sp16; - u16 r6; - get_coro_args_x18_x1A(sFameCheckerData->listMenuTaskId, &sp14, &sp16); - r6 = sp14 + sp16; - AddTextPrinterParametrized2(FCWINDOWID_LIST, 2, 8, 14 * sp16 + 4, 0, 0, &gUnknown_845F5E6, 0, sListMenuItems[itemIndex].unk_00); + u16 topIdx; + u16 drawnSelIdx; + u16 who; + get_coro_args_x18_x1A(sFameCheckerData->listMenuTaskId, &topIdx, &drawnSelIdx); + who = topIdx + drawnSelIdx; + AddTextPrinterParametrized2(FCWINDOWID_LIST, 2, 8, 14 * drawnSelIdx + 4, 0, 0, &sTextColor_Green, 0, sListMenuItems[itemIndex].unk_00); if (!onInit) { - if (sp14 < sFameCheckerData->listMenuTopIdx2) + if (topIdx < sFameCheckerData->listMenuTopIdx2) sFameCheckerData->listMenuDrawnSelIdx++; - else if (sp14 > sFameCheckerData->listMenuTopIdx2 && r6 != sFameCheckerData->numUnlockedPersons - 1) + else if (topIdx > sFameCheckerData->listMenuTopIdx2 && who != sFameCheckerData->numUnlockedPersons - 1) sFameCheckerData->listMenuDrawnSelIdx--; - AddTextPrinterParametrized2(FCWINDOWID_LIST, 2, 8, 14 * sFameCheckerData->listMenuDrawnSelIdx + 4, 0, 0, &gUnknown_845F5E3, 0, sListMenuItems[sFameCheckerData->listMenuCurIdx].unk_00); + AddTextPrinterParametrized2(FCWINDOWID_LIST, 2, 8, 14 * sFameCheckerData->listMenuDrawnSelIdx + 4, 0, 0, &sTextColor_DkGrey, 0, sListMenuItems[sFameCheckerData->listMenuCurIdx].unk_00); } sFameCheckerData->listMenuCurIdx = itemIndex; - sFameCheckerData->listMenuDrawnSelIdx = sp16; - sFameCheckerData->listMenuTopIdx2 = sp14; + sFameCheckerData->listMenuDrawnSelIdx = drawnSelIdx; + sFameCheckerData->listMenuTopIdx2 = topIdx; } static u8 FC_PopulateListMenu(void) @@ -1547,7 +1547,7 @@ static void PlaceListMenuCursor(bool8 isActive) { u16 cursorY = ListMenuGetYCoordForPrintingArrowCursor(sFameCheckerData->listMenuTaskId); if (isActive == TRUE) - AddTextPrinterParametrized2(FCWINDOWID_LIST, 2, 0, cursorY, 0, 0, &gUnknown_845F5E3, 0, gFameCheckerText_ListMenuCursor); + AddTextPrinterParametrized2(FCWINDOWID_LIST, 2, 0, cursorY, 0, 0, &sTextColor_DkGrey, 0, gFameCheckerText_ListMenuCursor); else - AddTextPrinterParametrized2(FCWINDOWID_LIST, 2, 0, cursorY, 0, 0, &gUnknown_845F5E0, 0, gFameCheckerText_ListMenuCursor); + AddTextPrinterParametrized2(FCWINDOWID_LIST, 2, 0, cursorY, 0, 0, &sTextColor_White, 0, gFameCheckerText_ListMenuCursor); } -- cgit v1.2.3 From cb9f24a9a9f71d711150c6c61e2b6e2b8f99a3d4 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Wed, 28 Nov 2018 10:15:08 -0500 Subject: Fix errors introduced in precious commit --- src/fame_checker.c | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/src/fame_checker.c b/src/fame_checker.c index 67344edbc..64a73c7a4 100644 --- a/src/fame_checker.c +++ b/src/fame_checker.c @@ -922,7 +922,7 @@ static bool8 CreateAllFlavorTextIcons(u8 who) if ((gSaveBlock1Ptr->fameChecker[sFameCheckerData->unlockedPersons[who]].flavorTextFlags >> i) & 1) { sFameCheckerData->spriteIds[i] = sub_805EB44( - sFameCheckerArrayNpcGraphicsIds[sFameCheckerData->unlockedPersons[a0] * 6 + i], + sFameCheckerArrayNpcGraphicsIds[sFameCheckerData->unlockedPersons[who] * 6 + i], i, 47 * (i % 3) + 0x72, 27 * (i / 3) + 0x2F @@ -1308,8 +1308,8 @@ static void FC_MoveCursorFunc(s32 itemIndex, bool8 onInit, struct ListMenu *list } else { - u8 iwho; - for (iwho = 0; iwho < 6; iwho++) + u8 i; + for (i = 0; i < 6; i++) { gSprites[sFameCheckerData->spriteIds[i]].invisible = TRUE; } @@ -1336,24 +1336,24 @@ static void PrintCancelDescription(void) static void FC_DoMoveCursor(s32 itemIndex, bool8 onInit) { - u16 topIdx; - u16 drawnSelIdx; + u16 listY; + u16 cursorY; u16 who; - get_coro_args_x18_x1A(sFameCheckerData->listMenuTaskId, &topIdx, &drawnSelIdx); - who = topIdx + drawnSelIdx; - AddTextPrinterParametrized2(FCWINDOWID_LIST, 2, 8, 14 * drawnSelIdx + 4, 0, 0, &sTextColor_Green, 0, sListMenuItems[itemIndex].unk_00); + get_coro_args_x18_x1A(sFameCheckerData->listMenuTaskId, &listY, &cursorY); + who = listY + cursorY; + AddTextPrinterParametrized2(FCWINDOWID_LIST, 2, 8, 14 * cursorY + 4, 0, 0, &sTextColor_Green, 0, sListMenuItems[itemIndex].unk_00); if (!onInit) { - if (topIdx < sFameCheckerData->listMenuTopIdx2) + if (listY < sFameCheckerData->listMenuTopIdx2) sFameCheckerData->listMenuDrawnSelIdx++; - else if (topIdx > sFameCheckerData->listMenuTopIdx2 && who != sFameCheckerData->numUnlockedPersons - 1) + else if (listY > sFameCheckerData->listMenuTopIdx2 && who != sFameCheckerData->numUnlockedPersons - 1) sFameCheckerData->listMenuDrawnSelIdx--; AddTextPrinterParametrized2(FCWINDOWID_LIST, 2, 8, 14 * sFameCheckerData->listMenuDrawnSelIdx + 4, 0, 0, &sTextColor_DkGrey, 0, sListMenuItems[sFameCheckerData->listMenuCurIdx].unk_00); } sFameCheckerData->listMenuCurIdx = itemIndex; - sFameCheckerData->listMenuDrawnSelIdx = drawnSelIdx; - sFameCheckerData->listMenuTopIdx2 = topIdx; + sFameCheckerData->listMenuDrawnSelIdx = cursorY; + sFameCheckerData->listMenuTopIdx2 = listY; } static u8 FC_PopulateListMenu(void) @@ -1400,7 +1400,7 @@ static void FC_PutWindowTilemapAndCopyWindowToVramMode3_2(u8 windowId) static void FC_CreateScrollIndicatorArrowPair(void) { - struct ScrollIndicatorArrowPairTemplate sp0 = { + struct ScrollIndicatorArrowPairTemplate template = { 2, 40, 26, @@ -1417,9 +1417,9 @@ static void FC_CreateScrollIndicatorArrowPair(void) if (sFameCheckerData->numUnlockedPersons > 5) { - sp0.unk_06 = 0; - sp0.unk_08 = sFameCheckerData->numUnlockedPersons - 5; - sFameCheckerData->scrollIndicatorPairTaskId = AddScrollIndicatorArrowPair(&sp0, &sFameCheckerData->listMenuTopIdx); + template.unk_06 = 0; + template.unk_08 = sFameCheckerData->numUnlockedPersons - 5; + sFameCheckerData->scrollIndicatorPairTaskId = AddScrollIndicatorArrowPair(&template, &sFameCheckerData->listMenuTopIdx); } } @@ -1431,9 +1431,9 @@ static void FreeListMenuSelectorArrowPairResources(void) static u16 FameCheckerGetCursorY(void) { - u16 sp0, sp2; - get_coro_args_x18_x1A(sFameCheckerData->listMenuTaskId, &sp0, &sp2); - return sp0 + sp2; + u16 listY, cursorY; + get_coro_args_x18_x1A(sFameCheckerData->listMenuTaskId, &listY, &cursorY); + return listY + cursorY; } static void HandleFlavorTextModeSwitch(bool8 state) -- cgit v1.2.3 From a538f77b552169d1a757281c8418281a7e8dc65a Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Wed, 28 Nov 2018 10:42:07 -0500 Subject: Dump fame checker bg graphics --- data/graphics.s | 6 +++--- data/graphics/fame_checker_bg.pal | 35 +++++++++++++++++++++++++++++++++ data/graphics/fame_checker_bg.png | Bin 0 -> 906 bytes data/graphics/fame_checker_tilemap.bin | Bin 0 -> 2048 bytes graphics_file_rules.mk | 6 +++++- 5 files changed, 43 insertions(+), 4 deletions(-) create mode 100644 data/graphics/fame_checker_bg.pal create mode 100644 data/graphics/fame_checker_bg.png create mode 100644 data/graphics/fame_checker_tilemap.bin diff --git a/data/graphics.s b/data/graphics.s index a81ff20c2..b35d5fa7d 100644 --- a/data/graphics.s +++ b/data/graphics.s @@ -394,13 +394,13 @@ gUnknown_8E9F1FC:: @ 8E9F1FC .incbin "baserom.gba", 0xE9F1FC, 0x24 gUnknown_8E9F220:: @ 8E9F220 - .incbin "baserom.gba", 0xE9F220, 0x40 + .incbin "data/graphics/fame_checker_bg.gbapal" gUnknown_8E9F260:: @ 8E9F260 - .incbin "baserom.gba", 0xE9F260, 0x14A0 + .incbin "data/graphics/fame_checker_bg.4bpp" gUnknown_8EA0700:: @ 8EA0700 - .incbin "baserom.gba", 0xEA0700, 0x800 + .incbin "data/graphics/fame_checker_tilemap.bin" gUnknown_8EA0F00:: @ 8EA0F00 .incbin "baserom.gba", 0xEA0F00, 0x800 diff --git a/data/graphics/fame_checker_bg.pal b/data/graphics/fame_checker_bg.pal new file mode 100644 index 000000000..9fc41db87 --- /dev/null +++ b/data/graphics/fame_checker_bg.pal @@ -0,0 +1,35 @@ +JASC-PAL +0100 +32 +246 222 82 +255 255 156 +246 222 82 +255 238 98 +255 255 213 +255 172 106 +222 148 74 +255 246 222 +156 148 164 +238 230 180 +255 255 213 +123 123 123 +213 213 213 +255 255 255 +106 106 106 +24 98 197 +246 222 82 +172 164 90 +148 156 230 +98 106 180 +123 131 205 +255 255 255 +213 213 213 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +115 0 0 +0 255 0 +205 213 213 +238 238 246 +106 106 106 diff --git a/data/graphics/fame_checker_bg.png b/data/graphics/fame_checker_bg.png new file mode 100644 index 000000000..ed1a9a0f8 Binary files /dev/null and b/data/graphics/fame_checker_bg.png differ diff --git a/data/graphics/fame_checker_tilemap.bin b/data/graphics/fame_checker_tilemap.bin new file mode 100644 index 000000000..fdf419278 Binary files /dev/null and b/data/graphics/fame_checker_tilemap.bin differ diff --git a/graphics_file_rules.mk b/graphics_file_rules.mk index d511ce7d9..957c7a52d 100644 --- a/graphics_file_rules.mk +++ b/graphics_file_rules.mk @@ -1,4 +1,5 @@ -FONTGFXDIR := data/graphics/fonts +GLOBALGFXDIR := data/graphics +FONTGFXDIR := $(GLOBALGFXDIR)/fonts FAMECHECKERGFXDIR := data/fame_checker $(FONTGFXDIR)/font0_latin.latfont: $(FONTGFXDIR)/font0_latin.png @@ -36,3 +37,6 @@ $(FONTGFXDIR)/font9_jap.fwjpnfont: $(FONTGFXDIR)/font9_jap.png $(FAMECHECKERGFXDIR)/img_845cf00.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 15 + +$(GLOBALGFXDIR)/fame_checker_bg.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 165 -- cgit v1.2.3 From 144027e4fad045d41afea0dfc8bd2bed27a64e6d Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Wed, 28 Nov 2018 10:50:41 -0500 Subject: Dump another fame checker tilemap --- data/graphics.s | 12 ++++++------ data/graphics/fame_checker_tilemap.bin | Bin 2048 -> 0 bytes data/graphics/fame_checker_tilemap2.bin | Bin 0 -> 2048 bytes data/graphics/fame_checker_tilemap3.bin | Bin 0 -> 2048 bytes include/graphics.h | 8 ++++---- src/fame_checker.c | 10 +++++----- 6 files changed, 15 insertions(+), 15 deletions(-) delete mode 100644 data/graphics/fame_checker_tilemap.bin create mode 100644 data/graphics/fame_checker_tilemap2.bin create mode 100644 data/graphics/fame_checker_tilemap3.bin diff --git a/data/graphics.s b/data/graphics.s index b35d5fa7d..f33d86355 100644 --- a/data/graphics.s +++ b/data/graphics.s @@ -393,17 +393,17 @@ gUnknown_8E9E9FC:: @ 8E9E9FC gUnknown_8E9F1FC:: @ 8E9F1FC .incbin "baserom.gba", 0xE9F1FC, 0x24 -gUnknown_8E9F220:: @ 8E9F220 +gFameCheckerBgPals:: @ 8E9F220 .incbin "data/graphics/fame_checker_bg.gbapal" -gUnknown_8E9F260:: @ 8E9F260 +gFameCheckerBgTiles:: @ 8E9F260 .incbin "data/graphics/fame_checker_bg.4bpp" -gUnknown_8EA0700:: @ 8EA0700 - .incbin "data/graphics/fame_checker_tilemap.bin" +gFameCheckerBg3Tilemap:: @ 8EA0700 + .incbin "data/graphics/fame_checker_tilemap3.bin" -gUnknown_8EA0F00:: @ 8EA0F00 - .incbin "baserom.gba", 0xEA0F00, 0x800 +gFameCheckerBg2Tilemap:: @ 8EA0F00 + .incbin "data/graphics/fame_checker_tilemap2.bin" gUnknown_8EA1700:: @ 8EA1700 .incbin "baserom.gba", 0xEA1700, 0x20 diff --git a/data/graphics/fame_checker_tilemap.bin b/data/graphics/fame_checker_tilemap.bin deleted file mode 100644 index fdf419278..000000000 Binary files a/data/graphics/fame_checker_tilemap.bin and /dev/null differ diff --git a/data/graphics/fame_checker_tilemap2.bin b/data/graphics/fame_checker_tilemap2.bin new file mode 100644 index 000000000..6e2eed695 Binary files /dev/null and b/data/graphics/fame_checker_tilemap2.bin differ diff --git a/data/graphics/fame_checker_tilemap3.bin b/data/graphics/fame_checker_tilemap3.bin new file mode 100644 index 000000000..fdf419278 Binary files /dev/null and b/data/graphics/fame_checker_tilemap3.bin differ diff --git a/include/graphics.h b/include/graphics.h index c5544428e..d249ece10 100644 --- a/include/graphics.h +++ b/include/graphics.h @@ -145,9 +145,9 @@ extern const u16 gUnknown_08DDAFE0[]; // fame_checker -extern const u16 gUnknown_8E9F220[0x30]; -extern const u16 gUnknown_8E9F260[0xa50]; -extern const u16 gUnknown_8EA0700[0x400]; -extern const u16 gUnknown_8EA0F00[0x400]; +extern const u16 gFameCheckerBgPals[0x30]; +extern const u16 gFameCheckerBgTiles[0xa50]; +extern const u16 gFameCheckerBg3Tilemap[0x400]; +extern const u16 gFameCheckerBg2Tilemap[0x400]; #endif //GUARD_GRAPHICS_H diff --git a/src/fame_checker.c b/src/fame_checker.c index 64a73c7a4..617ba1522 100644 --- a/src/fame_checker.c +++ b/src/fame_checker.c @@ -478,11 +478,11 @@ static void MainCB2_LoadFameChecker(void) gMain.state++; break; case 3: - LoadBgTiles(3, gUnknown_8E9F260, sizeof(gUnknown_8E9F260), 0); - CopyToBgTilemapBufferRect(3, gUnknown_8EA0700, 0, 0, 32, 32); - LoadPalette(gUnknown_8E9F220 + 0x00, 0x00, 0x40); - LoadPalette(gUnknown_8E9F220 + 0x10, 0x10, 0x20); - CopyToBgTilemapBufferRect(2, gUnknown_8EA0F00, 0, 0, 32, 32); + LoadBgTiles(3, gFameCheckerBgTiles, sizeof(gFameCheckerBgTiles), 0); + CopyToBgTilemapBufferRect(3, gFameCheckerBg3Tilemap, 0, 0, 32, 32); + LoadPalette(gFameCheckerBgPals + 0x00, 0x00, 0x40); + LoadPalette(gFameCheckerBgPals + 0x10, 0x10, 0x20); + CopyToBgTilemapBufferRect(2, gFameCheckerBg2Tilemap, 0, 0, 32, 32); CopyToBgTilemapBufferRect_ChangePalette(1, sFameCheckerTilemap, 30, 0, 32, 32, 0x11); LoadPalette(stdpal_get(2), 0xF0, 0x20); gMain.state++; -- cgit v1.2.3 From 013fcf86fbeccf8d527e43a4f5aaf44402daba48 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Wed, 28 Nov 2018 13:49:46 -0500 Subject: Fix spacing in globah.h --- include/global.h | 22 +++++++++++----------- src/fame_checker.c | 2 +- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/include/global.h b/include/global.h index b81b29381..30be4fd9f 100644 --- a/include/global.h +++ b/include/global.h @@ -616,8 +616,8 @@ struct SaveBlock1 /*0x0638*/ u8 trainerRematchStepCounter; u8 filler_639; /*0x063A*/ u8 trainerRematches[100]; - /*0x06A0*/ struct MapObject mapObjects[MAP_OBJECTS_COUNT]; - /*0x08E0*/ struct MapObjectTemplate mapObjectTemplates[64]; + /*0x06A0*/ struct MapObject mapObjects[MAP_OBJECTS_COUNT]; + /*0x08E0*/ struct MapObjectTemplate mapObjectTemplates[64]; /*0x0EE0*/ u8 flags[FLAGS_COUNT]; /*0x1000*/ u16 vars[VARS_COUNT]; /*0x1200*/ u8 filler1200[0x100]; @@ -626,15 +626,15 @@ struct SaveBlock1 /*0x2CD0*/ struct MailStruct mail[MAIL_COUNT]; /*0x2F10*/ u8 filler2F10[0x184]; struct { - /*0x3094*/ u8 unknown1[8]; - /*0x309C*/ u8 giftRibbons[11]; - /*0x30A7*/ u8 unknown2[8]; - /*0x30AF*/ u32 currentPokeCoupons; - /*0x30B3*/ u32 totalEarnedPokeCoupons; - /*0x30B7*/ u8 unknown3[6]; - /*0x30BD*/ u8 receivedWishmakerJirachi; - /*0x30BE*/ u8 unknown4[18]; - } __attribute__((packed)) externalReservedData; + /*0x3094*/ u8 unknown1[8]; + /*0x309C*/ u8 giftRibbons[11]; + /*0x30A7*/ u8 unknown2[8]; + /*0x30AF*/ u32 currentPokeCoupons; + /*0x30B3*/ u32 totalEarnedPokeCoupons; + /*0x30B7*/ u8 unknown3[6]; + /*0x30BD*/ u8 receivedWishmakerJirachi; + /*0x30BE*/ u8 unknown4[18]; + } __attribute__((packed)) externalReservedData; /*0x30D0*/ struct Roamer roamer; /*0x30EC*/ struct EnigmaBerry enigmaBerry; /*0x3120*/ u8 filler3120[0x340]; diff --git a/src/fame_checker.c b/src/fame_checker.c index 617ba1522..ed38406cb 100644 --- a/src/fame_checker.c +++ b/src/fame_checker.c @@ -129,7 +129,7 @@ extern const u8 gFameCheckerText_FameCheckerWillBeClosed[]; extern const u8 gFameCheckerText_ClearTextbox[]; extern const u8 gFameCheckerText_MainScreenUI[]; // "{KEYGFX_START_BUTTON}PICK {KEYGFX_DPAD_UP_DOWN}SELECT {KEYGFX_A_BUTTON}OK$" extern const u8 gFameCheckerText_PickScreenUI[]; // "{KEYGFX_START_BUTTON}PICK {KEYGFX_DPAD_UP_DOWN}SELECT {KEYGFX_B_BUTTON}CANCEL$" -extern const u8 gFameCheckerText_FlavorTextUI[]; // "{KEYGFX_DPAD_ANY}PICK {KEYGFX_A_BUTTON}READ {UNKNOWN_F8 0x01}CANCEL$" +extern const u8 gFameCheckerText_FlavorTextUI[]; // "{KEYGFX_DPAD_ANY}PICK {KEYGFX_A_BUTTON}READ {KEYGFX_B_BUTTON}CANCEL$" extern const u8 gFameCheckerOakName[]; // "OAK$" extern const u8 gFameCheckerDaisyName[]; // "DAISY$" extern const u8 gFameCheckerBillName[]; // "BILL$" -- cgit v1.2.3 From ff55777ac8d0ee55fbe629381a781f0519cb2d29 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Wed, 28 Nov 2018 14:15:29 -0500 Subject: Define the PC items allocation in SaveBlock1 --- include/global.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/include/global.h b/include/global.h index 30be4fd9f..97b179410 100644 --- a/include/global.h +++ b/include/global.h @@ -97,6 +97,7 @@ enum LanguageId { #define GAME_LANGUAGE (LANGUAGE_ENGLISH) +#define PC_ITEMS_COUNT 30 #define BAG_ITEMS_COUNT 42 #define BAG_KEYITEMS_COUNT 30 #define BAG_POKEBALLS_COUNT 13 @@ -605,7 +606,7 @@ struct SaveBlock1 /*0x0290*/ u32 money; /*0x0294*/ u16 coins; /*0x0296*/ u16 registeredItem; // registered for use with SELECT button - /*0x0298*/ u8 filler298[0x78]; + /*0x0298*/ struct ItemSlot pcItems[PC_ITEMS_COUNT]; /*0x0310*/ struct ItemSlot bagPocket_Items[BAG_ITEMS_COUNT]; /*0x03b8*/ struct ItemSlot bagPocket_KeyItems[BAG_KEYITEMS_COUNT]; /*0x0430*/ struct ItemSlot bagPocket_PokeBalls[BAG_POKEBALLS_COUNT]; -- cgit v1.2.3 From 592a0f03e8196e2851e00b4d891daef752e6edf0 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Wed, 28 Nov 2018 18:10:28 -0500 Subject: Name the game stats array --- include/global.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/global.h b/include/global.h index 97b179410..3ff57357e 100644 --- a/include/global.h +++ b/include/global.h @@ -621,7 +621,7 @@ struct SaveBlock1 /*0x08E0*/ struct MapObjectTemplate mapObjectTemplates[64]; /*0x0EE0*/ u8 flags[FLAGS_COUNT]; /*0x1000*/ u16 vars[VARS_COUNT]; - /*0x1200*/ u8 filler1200[0x100]; + /*0x1200*/ u32 gameStats[NUM_GAME_STATS]; /*0x1300*/ struct QuestLog questLog[4]; /*0x2CA0*/ u8 filler2CA0[0x30]; /*0x2CD0*/ struct MailStruct mail[MAIL_COUNT]; -- cgit v1.2.3 From c79a939d3d03d861769a5f54ec52c7b976c14a3b Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Wed, 28 Nov 2018 18:18:10 -0500 Subject: Identify easy chat arrays in save block 1 --- include/global.h | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/include/global.h b/include/global.h index 3ff57357e..5ad4e4f9d 100644 --- a/include/global.h +++ b/include/global.h @@ -623,7 +623,10 @@ struct SaveBlock1 /*0x1000*/ u16 vars[VARS_COUNT]; /*0x1200*/ u32 gameStats[NUM_GAME_STATS]; /*0x1300*/ struct QuestLog questLog[4]; - /*0x2CA0*/ u8 filler2CA0[0x30]; + /*0x2CA0*/ u16 unk2CA0[6]; + /*0x2CAC*/ u16 unk2CAC[6]; + /*0x2CB8*/ u16 unk2CB8[6]; + /*0x2CC4*/ u16 unk2CC4[6]; /*0x2CD0*/ struct MailStruct mail[MAIL_COUNT]; /*0x2F10*/ u8 filler2F10[0x184]; struct { -- cgit v1.2.3 From c6778caf1e36c2847314c5751e8181089c8c66ab Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Wed, 28 Nov 2018 18:55:55 -0500 Subject: Identify most of SaveBlock1 --- include/global.h | 29 +++++++++++++---------------- 1 file changed, 13 insertions(+), 16 deletions(-) diff --git a/include/global.h b/include/global.h index 5ad4e4f9d..d5bfc5241 100644 --- a/include/global.h +++ b/include/global.h @@ -489,8 +489,8 @@ struct DaycareMon struct DayCare { struct DaycareMon mons[DAYCARE_MON_COUNT]; - u32 offspringPersonality; - u8 stepCounter; + u16 unk_118; + u8 unk_11A; }; struct DayCareMail @@ -588,6 +588,9 @@ struct FameCheckerSaveData #define VARS_COUNT 256 #define MAIL_COUNT 16 +#define NUM_EASY_CHAT_EXTRA_PHRASES 33 +#define EASY_CHAT_EXTRA_PHRASES_SIZE ((NUM_EASY_CHAT_EXTRA_PHRASES >> 3) + (NUM_EASY_CHAT_EXTRA_PHRASES % 8 ? 1 : 0)) + struct SaveBlock1 { /*0x0000*/ struct Coords16 pos; @@ -613,10 +616,10 @@ struct SaveBlock1 /*0x0464*/ struct ItemSlot bagPocket_TMHM[BAG_TMHM_COUNT]; /*0x054c*/ struct ItemSlot bagPocket_Berries[BAG_BERRIES_COUNT]; /*0x05F8*/ u8 seen1[DEX_FLAGS_NO]; - /*0x062C*/ u8 filler_062c[12]; + /*0x062C*/ u16 berryBlenderRecords[3]; // unused + /*0x0632*/ u8 field_632[6]; // unused? /*0x0638*/ u8 trainerRematchStepCounter; - u8 filler_639; - /*0x063A*/ u8 trainerRematches[100]; + /*0x063A*/ u8 ALIGNED(2) trainerRematches[100]; /*0x06A0*/ struct MapObject mapObjects[MAP_OBJECTS_COUNT]; /*0x08E0*/ struct MapObjectTemplate mapObjectTemplates[64]; /*0x0EE0*/ u8 flags[FLAGS_COUNT]; @@ -628,17 +631,11 @@ struct SaveBlock1 /*0x2CB8*/ u16 unk2CB8[6]; /*0x2CC4*/ u16 unk2CC4[6]; /*0x2CD0*/ struct MailStruct mail[MAIL_COUNT]; - /*0x2F10*/ u8 filler2F10[0x184]; - struct { - /*0x3094*/ u8 unknown1[8]; - /*0x309C*/ u8 giftRibbons[11]; - /*0x30A7*/ u8 unknown2[8]; - /*0x30AF*/ u32 currentPokeCoupons; - /*0x30B3*/ u32 totalEarnedPokeCoupons; - /*0x30B7*/ u8 unknown3[6]; - /*0x30BD*/ u8 receivedWishmakerJirachi; - /*0x30BE*/ u8 unknown4[18]; - } __attribute__((packed)) externalReservedData; + /*0x2F10*/ u8 additionalPhrases[EASY_CHAT_EXTRA_PHRASES_SIZE]; + /*0x2F18*/ OldMan oldMan; // unused + /*0x2F54*/ struct EasyChatPair easyChatPairs[5]; // unused + /*0x2F80*/ struct DayCare daycare; + /*0x309C*/ u8 giftRibbons[52]; /*0x30D0*/ struct Roamer roamer; /*0x30EC*/ struct EnigmaBerry enigmaBerry; /*0x3120*/ u8 filler3120[0x340]; -- cgit v1.2.3 From 18303c4596f96eaa68bbf8ccbc4ba19f9a8fed88 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Wed, 28 Nov 2018 19:05:09 -0500 Subject: Further annotate that weird table in crt0.s --- asm/crt0.s | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/asm/crt0.s b/asm/crt0.s index a2e9cd75f..f2e28c9e1 100644 --- a/asm/crt0.s +++ b/asm/crt0.s @@ -88,22 +88,22 @@ GPIOPortReadEnable: @ 80000C8 .4byte 0x30BB .4byte 0x30A7 .4byte 0 - .4byte 0x8254784 - .4byte 0x824FC40 - .4byte 0x824FB08 - .4byte 0x83DB028 - .4byte 0x8250C04 - .4byte 0x826056C - .4byte 0x82605CC + .4byte 0x8254784 @ gBaseStats + .4byte 0x824FC40 @ gAbilityNames + .4byte 0x824FB08 @ gAbilityDescriptionPointers + .4byte 0x83DB028 @ gItems + .4byte 0x8250C04 @ gBattleMoves + .4byte 0x826056C @ gBallSpriteSheets + .4byte 0x82605CC @ gBallSpritePalettes .4byte 0xA8 .4byte 0x82C .4byte 0x83B .4byte 0x3A0D1E2A .4byte 0x1E2B - .4byte 0x298 - .4byte 0x309C - .4byte 0x30EC - .4byte 0x34 + .4byte 0x298 @ offsetof(struct SaveBlock1, pcItems) // maybe all items were in a struct together? + .4byte 0x309C @ offsetof(struct SaveBlock1, giftRibbons) + .4byte 0x30EC @ offsetof(struct SaveBlock1, enigmaBerry) + .4byte 0x34 @ size of SaveBlock1 map header reconstruction data? .4byte 0 .4byte 0xFFFFFFFF -- cgit v1.2.3 From 21a301b77d01851a9d019b594ff11c547cc6514f Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Wed, 28 Nov 2018 22:15:11 -0500 Subject: through sub_81436EC --- asm/mevent.s | 187 -------------------------------------------------- include/link.h | 5 ++ include/main.h | 3 + include/unk_815c27c.h | 11 +++ ld_script.txt | 1 + src/mevent.c | 75 ++++++++++++++++++++ 6 files changed, 95 insertions(+), 187 deletions(-) create mode 100644 include/unk_815c27c.h create mode 100644 src/mevent.c diff --git a/asm/mevent.s b/asm/mevent.s index 697266a39..2d1f06d88 100644 --- a/asm/mevent.s +++ b/asm/mevent.s @@ -5,193 +5,6 @@ .text - thumb_func_start sub_81435DC -sub_81435DC: @ 81435DC - push {r4-r6,lr} - mov r6, r8 - push {r6} - sub sp, 0x4 - adds r5, r0, 0 - adds r6, r1, 0 - mov r8, r2 - mov r1, sp - ldr r4, _08143630 @ =0x04000208 - ldrh r0, [r4] - strh r0, [r1] - movs r0, 0 - strh r0, [r4] - ldr r1, _08143634 @ =gIntrTable - ldr r0, _08143638 @ =sub_815C6D4 - str r0, [r1, 0x4] - ldr r0, _0814363C @ =sub_815C6C4 - str r0, [r1, 0x8] - bl sub_815C8C8 - bl sub_815C960 - ldr r2, _08143640 @ =0x04000200 - ldrh r0, [r2] - movs r1, 0x4 - orrs r0, r1 - strh r0, [r2] - mov r0, sp - ldrh r0, [r0] - strh r0, [r4] - movs r0, 0 - strh r0, [r5] - str r6, [r5, 0x4] - mov r0, r8 - str r0, [r5, 0x8] - add sp, 0x4 - pop {r3} - mov r8, r3 - pop {r4-r6} - pop {r0} - bx r0 - .align 2, 0 -_08143630: .4byte 0x04000208 -_08143634: .4byte gIntrTable -_08143638: .4byte sub_815C6D4 -_0814363C: .4byte sub_815C6C4 -_08143640: .4byte 0x04000200 - thumb_func_end sub_81435DC - - thumb_func_start sub_8143644 -sub_8143644: @ 8143644 - push {r4,lr} - sub sp, 0x4 - mov r1, sp - ldr r4, _08143670 @ =0x04000208 - ldrh r0, [r4] - strh r0, [r1] - movs r0, 0 - strh r0, [r4] - bl sub_815C960 - bl sub_815C91C - bl RestoreSerialTimer3IntrHandlers - mov r0, sp - ldrh r0, [r0] - strh r0, [r4] - add sp, 0x4 - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_08143670: .4byte 0x04000208 - thumb_func_end sub_8143644 - - thumb_func_start sub_8143674 -sub_8143674: @ 8143674 - push {r4,r5,lr} - adds r4, r0, 0 - movs r5, 0 - ldr r1, [r4, 0x4] - ldr r2, [r4, 0x8] - movs r0, 0x1 - movs r3, 0 - bl sub_815C498 - adds r1, r0, 0 - strh r1, [r4] - movs r0, 0x13 - ands r0, r1 - cmp r0, 0x10 - bne _08143694 - movs r5, 0x1 -_08143694: - movs r0, 0x8 - ands r0, r1 - cmp r0, 0 - beq _0814369E - movs r5, 0x2 -_0814369E: - movs r0, 0x4 - ands r0, r1 - cmp r0, 0 - beq _081436A8 - movs r5, 0x3 -_081436A8: - ldr r1, _081436B8 @ =gUnknown_3003F84 - movs r0, 0 - strb r0, [r1] - adds r0, r5, 0 - pop {r4,r5} - pop {r1} - bx r1 - .align 2, 0 -_081436B8: .4byte gUnknown_3003F84 - thumb_func_end sub_8143674 - - thumb_func_start sub_81436BC -sub_81436BC: @ 81436BC - push {lr} - ldr r0, _081436E0 @ =gDecompressionBuffer - movs r2, 0x80 - lsls r2, 6 - movs r1, 0 - bl memset - ldr r1, _081436E4 @ =gUnknown_202271A - ldr r2, _081436E8 @ =0x00005502 - adds r0, r2, 0 - strh r0, [r1] - bl sub_8009804 - movs r0, 0x1 - bl SetSuppressLinkErrorMessage - pop {r0} - bx r0 - .align 2, 0 -_081436E0: .4byte gDecompressionBuffer -_081436E4: .4byte gUnknown_202271A -_081436E8: .4byte 0x00005502 - thumb_func_end sub_81436BC - - thumb_func_start sub_81436EC -sub_81436EC: @ 81436EC - push {lr} - sub sp, 0xC - mov r1, sp - ldr r2, _08143730 @ =0x04000208 - ldrh r0, [r2] - strh r0, [r1] - movs r0, 0 - strh r0, [r2] - ldr r0, _08143734 @ =gUnknown_3003FB4 - ldr r1, [r0, 0x4] - ldr r0, [r0] - str r0, [sp, 0x4] - str r1, [sp, 0x8] - mov r0, sp - ldrh r0, [r0] - strh r0, [r2] - add r2, sp, 0x4 - ldrh r1, [r2] - ldr r0, _08143738 @ =0x0000b9a0 - cmp r1, r0 - bne _08143744 - ldrh r1, [r2, 0x2] - ldr r0, _0814373C @ =0x0000ccd0 - cmp r1, r0 - bne _08143744 - ldrh r1, [r2, 0x4] - ldr r0, _08143740 @ =0x0000ffff - cmp r1, r0 - bne _08143744 - ldrh r0, [r2, 0x6] - cmp r0, r1 - bne _08143744 - movs r0, 0x1 - b _08143746 - .align 2, 0 -_08143730: .4byte 0x04000208 -_08143734: .4byte gUnknown_3003FB4 -_08143738: .4byte 0x0000b9a0 -_0814373C: .4byte 0x0000ccd0 -_08143740: .4byte 0x0000ffff -_08143744: - movs r0, 0 -_08143746: - add sp, 0xC - pop {r1} - bx r1 - thumb_func_end sub_81436EC - thumb_func_start sub_814374C sub_814374C: @ 814374C push {lr} diff --git a/include/link.h b/include/link.h index 239a59b71..d015708b1 100644 --- a/include/link.h +++ b/include/link.h @@ -146,6 +146,10 @@ extern u16 word_3002910[]; extern bool8 gReceivedRemoteLinkPlayers; extern bool8 gLinkVSyncDisabled; +extern u8 gUnknown_3003F84; +extern u64 gUnknown_3003FB4; +extern u16 gUnknown_202271A; + void Task_DestroySelf(u8); void OpenLink(void); void CloseLink(void); @@ -196,5 +200,6 @@ void sub_8011BD0(void); u8 sub_800ABAC(void); u8 sub_800ABBC(void); void sub_800AC34(void); +void sub_8009804(void); #endif // GUARD_LINK_H diff --git a/include/main.h b/include/main.h index 84d356692..0fe138d1f 100644 --- a/include/main.h +++ b/include/main.h @@ -9,6 +9,8 @@ typedef void (*MainCallback)(void); typedef void (*IntrCallback)(void); typedef void (*IntrFunc)(void); +extern IntrFunc gIntrTable[]; + struct Main { /*0x000*/ MainCallback callback1; @@ -62,5 +64,6 @@ void SetSerialCallback(IntrCallback callback); void InitFlashTimer(void); void DoSoftReset(void); void ClearPokemonCrySongs(void); +void RestoreSerialTimer3IntrHandlers(void); #endif // GUARD_MAIN_H diff --git a/include/unk_815c27c.h b/include/unk_815c27c.h new file mode 100644 index 000000000..d5ddc7bdc --- /dev/null +++ b/include/unk_815c27c.h @@ -0,0 +1,11 @@ +#ifndef GUARD_UNK_815C27C_H +#define GUARD_UNK_815C27C_H + +void sub_815C6D4(void); +void sub_815C6C4(void); +void sub_815C8C8(void); +void sub_815C960(void); +void sub_815C91C(void); +u16 sub_815C498(u8, u32, u32, u8); + +#endif //GUARD_UNK_815C27C_H diff --git a/ld_script.txt b/ld_script.txt index 2a42825c9..bef37772a 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -243,6 +243,7 @@ SECTIONS { asm/roamer.o(.text); asm/mystery_gift_menu.o(.text); asm/link_rfu_4.o(.text); + src/mevent.o(.text); asm/mevent.o(.text); asm/mevent_server.o(.text); asm/mevent_8145654.o(.text); diff --git a/src/mevent.c b/src/mevent.c new file mode 100644 index 000000000..8b710e3f3 --- /dev/null +++ b/src/mevent.c @@ -0,0 +1,75 @@ +#include "global.h" +#include "main.h" +#include "decompress.h" +#include "link.h" +#include "unk_815c27c.h" + +struct MEvent_Str_1 +{ + u16 unk_000; + u32 unk_004; + u32 unk_008; +}; + +void sub_81435DC(struct MEvent_Str_1 *a0, u32 a1, u32 a2) +{ + vu16 imeBak = REG_IME; + REG_IME = 0; + gIntrTable[1] = sub_815C6D4; + gIntrTable[2] = sub_815C6C4; + sub_815C8C8(); + sub_815C960(); + REG_IE |= INTR_FLAG_VCOUNT; + REG_IME = imeBak; + a0->unk_000 = 0; + a0->unk_004 = a1; + a0->unk_008 = a2; +} + +void sub_8143644(void) +{ + vu16 imeBak = REG_IME; + REG_IME = 0; + sub_815C960(); + sub_815C91C(); + RestoreSerialTimer3IntrHandlers(); + REG_IME = imeBak; +} + +u8 sub_8143674(struct MEvent_Str_1 *a0) +{ + u8 resp = 0; + a0->unk_000 = sub_815C498(1, a0->unk_004, a0->unk_008, 0); + if ((a0->unk_000 & 0x13) == 0x10) + resp = 1; + if (a0->unk_000 & 8) + resp = 2; + if (a0->unk_000 & 4) + resp = 3; + gUnknown_3003F84 = 0; + return resp; +} + +void sub_81436BC(void) +{ + memset(gDecompressionBuffer, 0, 0x2000); + gUnknown_202271A = 0x5502; + sub_8009804(); + SetSuppressLinkErrorMessage(TRUE); +} + +bool8 sub_81436EC(void) +{ + vu16 imeBak = REG_IME; + u16 data[4]; + REG_IME = 0; + *(u64 *)data = gUnknown_3003FB4; + REG_IME = imeBak; + if ( data[0] == 0xB9A0 + && data[1] == 0xCCD0 + && data[2] == 0xFFFF + && data[3] == 0xFFFF + ) + return TRUE; + return FALSE; +} -- cgit v1.2.3 From 2943997dcbab30619e0410b294dc109fd3e08e83 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Thu, 29 Nov 2018 09:54:26 -0500 Subject: through sub_81438F0 --- Makefile | 2 +- asm/mevent.s | 241 --------------------------------------------------------- include/link.h | 4 + src/mevent.c | 146 ++++++++++++++++++++++++++++++++++ 4 files changed, 151 insertions(+), 242 deletions(-) diff --git a/Makefile b/Makefile index 4e81222f4..9f8b13141 100644 --- a/Makefile +++ b/Makefile @@ -164,7 +164,7 @@ $(OBJ_DIR)/ld_script.ld: ld_script.txt $(OBJ_DIR)/sym_bss.ld $(OBJ_DIR)/sym_comm cd $(OBJ_DIR) && sed -f ../../ld_script.sed ../../$< | sed "s#tools/#../../tools/#g" > ld_script.ld $(ELF): $(OBJ_DIR)/ld_script.ld $(OBJS) - cd $(OBJ_DIR) && $(LD) $(LDFLAGS) -T ld_script.ld -o ../../$@ $(OBJS_REL) $(LIB) + cd $(OBJ_DIR) && $(LD) $(LDFLAGS) -T ld_script.ld -o ../../$@ $(LIB) $(ROM): $(ELF) $(OBJCOPY) -O binary $< $@ diff --git a/asm/mevent.s b/asm/mevent.s index 2d1f06d88..234eb529e 100644 --- a/asm/mevent.s +++ b/asm/mevent.s @@ -5,247 +5,6 @@ .text - thumb_func_start sub_814374C -sub_814374C: @ 814374C - push {lr} - bl sub_800AA48 - lsls r0, 24 - cmp r0, 0 - beq _08143768 - bl GetLinkPlayerCount_2 - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x2 - bne _08143768 - movs r0, 0x1 - b _0814376A -_08143768: - movs r0, 0 -_0814376A: - pop {r1} - bx r1 - thumb_func_end sub_814374C - - thumb_func_start sub_8143770 -sub_8143770: @ 8143770 - push {r4,r5,lr} - adds r4, r0, 0 - adds r5, r1, 0 - ldrb r0, [r4] - subs r0, 0x3 - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x2 - bhi _08143794 - bl HasLinkErrorOccurred - lsls r0, 24 - cmp r0, 0 - beq _08143794 - movs r0, 0 - strb r0, [r4] - movs r0, 0x3 - b _0814389A -_08143794: - ldrb r0, [r4] - cmp r0, 0x5 - bls _0814379C - b _08143898 -_0814379C: - lsls r0, 2 - ldr r1, _081437A8 @ =_081437AC - adds r0, r1 - ldr r0, [r0] - mov pc, r0 - .align 2, 0 -_081437A8: .4byte _081437AC - .align 2, 0 -_081437AC: - .4byte _081437C4 - .4byte _081437E0 - .4byte _081437F8 - .4byte _0814382C - .4byte _08143878 - .4byte _08143884 -_081437C4: - bl sub_800AA48 - lsls r0, 24 - cmp r0, 0 - beq _08143814 - bl GetLinkPlayerCount_2 - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x1 - bls _08143814 - movs r0, 0x1 - strb r0, [r4] - b _08143898 -_081437E0: - ldrh r0, [r5] - adds r0, 0x1 - strh r0, [r5] - lsls r0, 16 - lsrs r0, 16 - cmp r0, 0x5 - bls _08143898 - movs r0, 0 - strh r0, [r5] - movs r0, 0x2 - strb r0, [r4] - b _08143898 -_081437F8: - bl GetLinkPlayerCount_2 - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x2 - bne _08143814 - movs r0, 0x42 - bl PlaySE - bl sub_800A5BC - movs r0, 0 - strh r0, [r5] - b _08143872 -_08143814: - ldr r0, _08143828 @ =gMain - ldrh r1, [r0, 0x2E] - movs r0, 0x2 - ands r0, r1 - cmp r0, 0 - beq _08143898 - movs r0, 0 - strb r0, [r4] - movs r0, 0x1 - b _0814389A - .align 2, 0 -_08143828: .4byte gMain -_0814382C: - ldrh r0, [r5] - adds r0, 0x1 - strh r0, [r5] - lsls r0, 16 - lsrs r0, 16 - cmp r0, 0x1E - bls _08143842 - movs r0, 0 - strb r0, [r4] - movs r0, 0x5 - b _0814389A -_08143842: - bl IsLinkConnectionEstablished - lsls r0, 24 - cmp r0, 0 - beq _08143898 - ldr r0, _08143868 @ =gUnknown_3003F64 - ldrb r0, [r0] - cmp r0, 0 - beq _08143872 - bl IsLinkPlayerDataExchangeComplete - lsls r0, 24 - cmp r0, 0 - beq _0814386C - movs r0, 0 - strb r0, [r4] - movs r0, 0x2 - b _0814389A - .align 2, 0 -_08143868: .4byte gUnknown_3003F64 -_0814386C: - movs r0, 0x4 - strb r0, [r4] - b _08143898 -_08143872: - movs r0, 0x3 - strb r0, [r4] - b _08143898 -_08143878: - movs r0, 0 - bl sub_800AA80 - movs r0, 0x5 - strb r0, [r4] - b _08143898 -_08143884: - ldr r0, _08143894 @ =gUnknown_3003F64 - ldrb r0, [r0] - cmp r0, 0 - bne _08143898 - strb r0, [r4] - movs r0, 0x4 - b _0814389A - .align 2, 0 -_08143894: .4byte gUnknown_3003F64 -_08143898: - movs r0, 0 -_0814389A: - pop {r4,r5} - pop {r1} - bx r1 - thumb_func_end sub_8143770 - - thumb_func_start sub_81438A0 -sub_81438A0: @ 81438A0 - push {r4,lr} - ldr r0, _081438E0 @ =sub_8143910 - movs r1, 0 - bl CreateTask - lsls r0, 24 - lsrs r0, 24 - lsls r4, r0, 2 - adds r4, r0 - lsls r4, 3 - ldr r0, _081438E4 @ =gTasks+0x8 - adds r4, r0 - movs r0, 0 - strb r0, [r4, 0x8] - strb r0, [r4, 0x9] - strb r0, [r4, 0xA] - strb r0, [r4, 0xB] - strb r0, [r4, 0xC] - strb r0, [r4, 0xD] - movs r1, 0 - strh r0, [r4] - strh r0, [r4, 0x2] - strh r0, [r4, 0x4] - strh r0, [r4, 0x6] - strb r1, [r4, 0xE] - movs r0, 0x40 - bl AllocZeroed - str r0, [r4, 0x10] - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_081438E0: .4byte sub_8143910 -_081438E4: .4byte gTasks+0x8 - thumb_func_end sub_81438A0 - - thumb_func_start sub_81438E8 -sub_81438E8: @ 81438E8 - movs r1, 0 - strh r1, [r0] - bx lr - thumb_func_end sub_81438E8 - - thumb_func_start sub_81438F0 -sub_81438F0: @ 81438F0 - push {lr} - adds r2, r0, 0 - lsls r1, 16 - ldrh r0, [r2] - adds r0, 0x1 - strh r0, [r2] - lsls r0, 16 - cmp r0, r1 - bhi _08143906 - movs r0, 0 - b _0814390C -_08143906: - movs r0, 0 - strh r0, [r2] - movs r0, 0x1 -_0814390C: - pop {r1} - bx r1 - thumb_func_end sub_81438F0 - thumb_func_start sub_8143910 sub_8143910: @ 8143910 push {r4,r5,lr} diff --git a/include/link.h b/include/link.h index d015708b1..92abf6e28 100644 --- a/include/link.h +++ b/include/link.h @@ -146,6 +146,7 @@ extern u16 word_3002910[]; extern bool8 gReceivedRemoteLinkPlayers; extern bool8 gLinkVSyncDisabled; +extern u8 gUnknown_3003F64; extern u8 gUnknown_3003F84; extern u64 gUnknown_3003FB4; extern u16 gUnknown_202271A; @@ -201,5 +202,8 @@ u8 sub_800ABAC(void); u8 sub_800ABBC(void); void sub_800AC34(void); void sub_8009804(void); +bool8 sub_800AA48(void); +void sub_800A5BC(void); +void sub_800AA80(u8); #endif // GUARD_LINK_H diff --git a/src/mevent.c b/src/mevent.c index 8b710e3f3..27abf65c3 100644 --- a/src/mevent.c +++ b/src/mevent.c @@ -1,5 +1,9 @@ #include "global.h" +#include "constants/songs.h" +#include "malloc.h" +#include "sound.h" #include "main.h" +#include "task.h" #include "decompress.h" #include "link.h" #include "unk_815c27c.h" @@ -11,6 +15,29 @@ struct MEvent_Str_1 u32 unk_008; }; +struct MEvent_Str_2 +{ + u8 fill_00[0x40]; +}; + +struct MEventTaskData1 +{ + u16 t00; + u16 t02; + u16 t04; + u16 t06; + u8 t08; + u8 t09; + u8 t0A; + u8 t0B; + u8 t0C; + u8 t0D; + u8 t0E; + struct MEvent_Str_2 *t10; +}; + +void sub_8143910(u8 taskId); + void sub_81435DC(struct MEvent_Str_1 *a0, u32 a1, u32 a2) { vu16 imeBak = REG_IME; @@ -73,3 +100,122 @@ bool8 sub_81436EC(void) return TRUE; return FALSE; } + +bool8 sub_814374C(void) +{ + if (sub_800AA48() && GetLinkPlayerCount_2() == 2) + return TRUE; + return FALSE; +} + +u8 sub_8143770(u8 * r4, u16 * r5) +{ + if ((*r4 == 3 || *r4 == 4 || *r4 == 5) && HasLinkErrorOccurred()) + { + *r4 = 0; + return 3; + } + switch (*r4) + { + case 0: + if (sub_800AA48() && GetLinkPlayerCount_2() > 1) + { + *r4 = 1; + ; + } + else if (gMain.newKeys & B_BUTTON) + { + *r4 = 0; + return 1; + } + break; + case 1: + if (++(*r5) > 5) + { + *r5 = 0; + *r4 = 2; + } + break; + case 2: + if (GetLinkPlayerCount_2() == 2) + { + PlaySE(SE_TOY_G); + sub_800A5BC(); + *r5 = 0; + *r4 = 3; + } + else if (gMain.newKeys & B_BUTTON) + { + *r4 = 0; + return 1; + } + break; + case 3: + if (++(*r5) > 30) + { + *r4 = 0; + return 5; + } + else if (IsLinkConnectionEstablished()) + { + if (gUnknown_3003F64) + { + if (IsLinkPlayerDataExchangeComplete()) + { + *r4 = 0; + return 2; + } + else + *r4 = 4; + } + else + *r4 = 3; + } + break; + case 4: + sub_800AA80(0); + *r4 = 5; + break; + case 5: + if (!gUnknown_3003F64) + { + *r4 = 0; + return 4; + } + break; + } + return 0; +} + +void sub_81438A0(void) +{ + u8 taskId = CreateTask(sub_8143910, 0); + struct MEventTaskData1 *data = (struct MEventTaskData1 *)gTasks[taskId].data; + data->t08 = 0; + data->t09 = 0; + data->t0A = 0; + data->t0B = 0; + data->t0C = 0; + data->t0D = 0; + data->t00 = 0; + data->t02 = 0; + data->t04 = 0; + data->t06 = 0; + data->t0E = 0; + data->t10 = AllocZeroed(sizeof(struct MEvent_Str_2)); +} + +void sub_81438E8(u16 *a0) +{ + *a0 = 0; +} + +bool8 sub_81438F0(u16 * a0, u16 a1) +{ + if (++(*a0) > a1) + { + *a0 = 0; + return TRUE; + } + return FALSE; +} -- cgit v1.2.3 From 746006911096730ea6d5f14bfff5957ef9b5bc2c Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Thu, 29 Nov 2018 11:35:31 -0500 Subject: sub_8143910 --- asm/mevent.s | 473 -------------------------------------------------- data/data_83FECCC.s | 63 ++++--- include/global.h | 12 ++ include/link.h | 2 + include/link_rfu_4.h | 6 + include/unk_815c27c.h | 2 +- src/mevent.c | 254 +++++++++++++++++++++++++-- 7 files changed, 307 insertions(+), 505 deletions(-) create mode 100644 include/link_rfu_4.h diff --git a/asm/mevent.s b/asm/mevent.s index 234eb529e..dbee188ee 100644 --- a/asm/mevent.s +++ b/asm/mevent.s @@ -5,479 +5,6 @@ .text - thumb_func_start sub_8143910 -sub_8143910: @ 8143910 - push {r4,r5,lr} - lsls r0, 24 - lsrs r5, r0, 24 - lsls r0, r5, 2 - adds r0, r5 - lsls r0, 3 - ldr r1, _08143934 @ =gTasks+0x8 - adds r4, r0, r1 - ldrb r0, [r4, 0x8] - cmp r0, 0x1A - bls _08143928 - b _08143D1A -_08143928: - lsls r0, 2 - ldr r1, _08143938 @ =_0814393C - adds r0, r1 - ldr r0, [r0] - mov pc, r0 - .align 2, 0 -_08143934: .4byte gTasks+0x8 -_08143938: .4byte _0814393C - .align 2, 0 -_0814393C: - .4byte _081439A8 - .4byte _081439C4 - .4byte _081439D4 - .4byte _081439E8 - .4byte _081439F8 - .4byte _08143A24 - .4byte _08143A5C - .4byte _08143AD8 - .4byte _08143AF4 - .4byte _08143B1C - .4byte _08143B38 - .4byte _08143B68 - .4byte _08143B7E - .4byte _08143B94 - .4byte _08143BF6 - .4byte _08143C1C - .4byte _08143C34 - .4byte _08143C52 - .4byte _08143C7E - .4byte _08143CA4 - .4byte _08143CD4 - .4byte _08143CE0 - .4byte _08143CEC - .4byte _08143CBC - .4byte _08143D1A - .4byte _08143D1A - .4byte _08143D04 -_081439A8: - adds r0, r4, 0 - adds r0, 0x9 - ldr r1, _081439C0 @ =gUnknown_841DE52 - bl mevent_0814257C - cmp r0, 0 - bne _081439B8 - b _08143D1A -_081439B8: - movs r0, 0x1 - strb r0, [r4, 0x8] - b _08143D1A - .align 2, 0 -_081439C0: .4byte gUnknown_841DE52 -_081439C4: - bl sub_81436BC - adds r0, r4, 0 - bl sub_81438E8 - movs r0, 0x2 - strb r0, [r4, 0x8] - b _08143D1A -_081439D4: - adds r0, r4, 0 - movs r1, 0xA - bl sub_81438F0 - cmp r0, 0 - bne _081439E2 - b _08143D1A -_081439E2: - movs r0, 0x3 - strb r0, [r4, 0x8] - b _08143D1A -_081439E8: - bl sub_814374C - cmp r0, 0 - beq _081439F2 - b _08143B88 -_081439F2: - bl sub_80098B8 - b _08143AE8 -_081439F8: - adds r0, r4, 0 - adds r0, 0x9 - ldr r1, _08143A1C @ =gUnknown_841DE53 - bl mevent_0814257C - cmp r0, 0 - bne _08143A08 - b _08143D1A -_08143A08: - ldr r0, _08143A20 @ =gUnknown_841DE54 - bl sub_8142504 - adds r0, r4, 0 - bl sub_81438E8 - movs r0, 0x5 - strb r0, [r4, 0x8] - b _08143D1A - .align 2, 0 -_08143A1C: .4byte gUnknown_841DE53 -_08143A20: .4byte gUnknown_841DE54 -_08143A24: - adds r0, r4, 0 - movs r1, 0x5A - bl sub_81438F0 - cmp r0, 0 - beq _08143A3A - bl sub_81436BC - movs r0, 0x6 - strb r0, [r4, 0x8] - b _08143D1A -_08143A3A: - ldr r0, _08143A58 @ =gMain - ldrh r1, [r0, 0x2E] - movs r0, 0x2 - ands r0, r1 - cmp r0, 0 - bne _08143A48 - b _08143D1A -_08143A48: - adds r0, r4, 0 - bl sub_81438E8 - movs r0, 0x5 - bl PlaySE - b _08143BE6 - .align 2, 0 -_08143A58: .4byte gMain -_08143A5C: - ldr r0, _08143A7C @ =gMain - ldrh r1, [r0, 0x2E] - movs r0, 0x2 - ands r0, r1 - cmp r0, 0 - beq _08143A80 - movs r0, 0x5 - bl PlaySE - bl sub_80098B8 - adds r0, r4, 0 - bl sub_81438E8 - b _08143BE6 - .align 2, 0 -_08143A7C: .4byte gMain -_08143A80: - bl GetLinkPlayerCount_2 - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x1 - bls _08143A9C - adds r0, r4, 0 - bl sub_81438E8 - bl sub_80098B8 - movs r0, 0x7 - strb r0, [r4, 0x8] - b _08143D1A -_08143A9C: - bl sub_81436EC - cmp r0, 0 - beq _08143ABA - movs r0, 0x5 - bl PlaySE - bl sub_80098B8 - adds r0, r4, 0 - bl sub_81438E8 - movs r0, 0x8 - strb r0, [r4, 0x8] - b _08143D1A -_08143ABA: - adds r0, r4, 0 - movs r1, 0xA - bl sub_81438F0 - cmp r0, 0 - bne _08143AC8 - b _08143D1A -_08143AC8: - bl sub_80098B8 - bl sub_81436BC - adds r0, r4, 0 - bl sub_81438E8 - b _08143D1A -_08143AD8: - adds r0, r4, 0 - adds r0, 0x9 - ldr r1, _08143AF0 @ =gUnknown_841DE7C - bl mevent_0814257C - cmp r0, 0 - bne _08143AE8 - b _08143D1A -_08143AE8: - movs r0, 0x4 - strb r0, [r4, 0x8] - b _08143D1A - .align 2, 0 -_08143AF0: .4byte gUnknown_841DE7C -_08143AF4: - ldr r0, _08143B0C @ =gUnknown_841DE95 - bl sub_8142504 - ldr r0, _08143B10 @ =gUnknown_3005ED0 - ldr r1, _08143B14 @ =gUnknownSerialData_End - ldr r2, _08143B18 @ =gUnknownSerialData_Start - subs r1, r2 - bl sub_81435DC - movs r0, 0x9 - strb r0, [r4, 0x8] - b _08143D1A - .align 2, 0 -_08143B0C: .4byte gUnknown_841DE95 -_08143B10: .4byte gUnknown_3005ED0 -_08143B14: .4byte gUnknownSerialData_End -_08143B18: .4byte gUnknownSerialData_Start -_08143B1C: - ldr r0, _08143B34 @ =gUnknown_3005ED0 - bl sub_8143674 - strb r0, [r4, 0xE] - lsls r0, 24 - cmp r0, 0 - bne _08143B2C - b _08143D1A -_08143B2C: - movs r0, 0xA - strb r0, [r4, 0x8] - b _08143D1A - .align 2, 0 -_08143B34: .4byte gUnknown_3005ED0 -_08143B38: - ldr r0, _08143B60 @ =gUnknown_3005ED0 - bl sub_8143644 - ldrb r0, [r4, 0xE] - cmp r0, 0x3 - bne _08143B46 - b _08143C4C -_08143B46: - cmp r0, 0x1 - beq _08143B4C - b _08143CFA -_08143B4C: - adds r0, r4, 0 - bl sub_81438E8 - ldr r0, _08143B64 @ =gUnknown_841DE9B - bl sub_8142504 - movs r0, 0xB - strb r0, [r4, 0x8] - b _08143D1A - .align 2, 0 -_08143B60: .4byte gUnknown_3005ED0 -_08143B64: .4byte gUnknown_841DE9B -_08143B68: - movs r1, 0xD2 - lsls r1, 2 - adds r0, r4, 0 - bl sub_81438F0 - cmp r0, 0 - bne _08143B78 - b _08143D1A -_08143B78: - movs r0, 0xC - strb r0, [r4, 0x8] - b _08143D1A -_08143B7E: - bl sub_81436BC - ldr r0, _08143B90 @ =gUnknown_841DE98 - bl sub_8142504 -_08143B88: - movs r0, 0xD - strb r0, [r4, 0x8] - b _08143D1A - .align 2, 0 -_08143B90: .4byte gUnknown_841DE98 -_08143B94: - adds r0, r4, 0 - adds r0, 0x9 - adds r1, r4, 0 - bl sub_8143770 - cmp r0, 0x5 - bls _08143BA4 - b _08143D1A -_08143BA4: - lsls r0, 2 - ldr r1, _08143BB0 @ =_08143BB4 - adds r0, r1 - ldr r0, [r0] - mov pc, r0 - .align 2, 0 -_08143BB0: .4byte _08143BB4 - .align 2, 0 -_08143BB4: - .4byte _08143D1A - .4byte _08143BDC - .4byte _08143BCC - .4byte _08143C00 - .4byte _08143C00 - .4byte _08143BEC -_08143BCC: - ldr r0, _08143BD8 @ =gUnknown_841DE95 - bl sub_8142504 - movs r0, 0xE - strb r0, [r4, 0x8] - b _08143D1A - .align 2, 0 -_08143BD8: .4byte gUnknown_841DE95 -_08143BDC: - movs r0, 0x5 - bl PlaySE - bl sub_80098B8 -_08143BE6: - movs r0, 0x17 - strb r0, [r4, 0x8] - b _08143D1A -_08143BEC: - bl sub_80098B8 - movs r0, 0x15 - strb r0, [r4, 0x8] - b _08143D1A -_08143BF6: - bl HasLinkErrorOccurred - lsls r0, 24 - cmp r0, 0 - beq _08143C06 -_08143C00: - bl sub_80098B8 - b _08143C4C -_08143C06: - bl GetBlockReceivedStatus - lsls r0, 24 - cmp r0, 0 - bne _08143C12 - b _08143D1A -_08143C12: - bl ResetBlockReceivedFlags - movs r0, 0xF - strb r0, [r4, 0x8] - b _08143D1A -_08143C1C: - ldr r0, _08143C30 @ =gDecompressionBuffer - bl sub_815D6B4 - strb r0, [r4, 0xE] - ldrb r0, [r4, 0xE] - bl sub_800AA80 - movs r0, 0x10 - strb r0, [r4, 0x8] - b _08143D1A - .align 2, 0 -_08143C30: .4byte gDecompressionBuffer -_08143C34: - ldr r0, _08143C48 @ =gUnknown_3003F64 - ldrb r0, [r0] - cmp r0, 0 - bne _08143D1A - ldrb r0, [r4, 0xE] - cmp r0, 0x1 - bne _08143C4C - movs r0, 0x11 - strb r0, [r4, 0x8] - b _08143D1A - .align 2, 0 -_08143C48: .4byte gUnknown_3003F64 -_08143C4C: - movs r0, 0x14 - strb r0, [r4, 0x8] - b _08143D1A -_08143C52: - ldr r0, _08143C70 @ =gDecompressionBuffer - bl sub_815D794 - cmp r0, 0 - beq _08143C78 - ldr r0, _08143C74 @ =gUnknown_841DE99 - bl sub_8142504 - adds r0, r4, 0 - bl sub_81438E8 - movs r0, 0x12 - strb r0, [r4, 0x8] - b _08143D1A - .align 2, 0 -_08143C70: .4byte gDecompressionBuffer -_08143C74: .4byte gUnknown_841DE99 -_08143C78: - movs r0, 0x16 - strb r0, [r4, 0x8] - b _08143D1A -_08143C7E: - adds r0, r4, 0 - movs r1, 0x78 - bl sub_81438F0 - cmp r0, 0 - beq _08143D1A - ldr r0, _08143CA0 @ =gUnknown_841DE9A - bl sub_8142504 - movs r0, 0x81 - lsls r0, 1 - bl PlayFanfare - movs r0, 0x13 - strb r0, [r4, 0x8] - b _08143D1A - .align 2, 0 -_08143CA0: .4byte gUnknown_841DE9A -_08143CA4: - bl IsFanfareTaskInactive - lsls r0, 24 - cmp r0, 0 - beq _08143D1A - ldr r0, _08143CB8 @ =gMain - ldrh r1, [r0, 0x2E] - movs r0, 0x3 - ands r0, r1 - b _08143CC6 - .align 2, 0 -_08143CB8: .4byte gMain -_08143CBC: - adds r0, r4, 0 - adds r0, 0x9 - ldr r1, _08143CD0 @ =gUnknown_841DE7D - bl mevent_0814257C -_08143CC6: - cmp r0, 0 - beq _08143D1A - movs r0, 0x1A - strb r0, [r4, 0x8] - b _08143D1A - .align 2, 0 -_08143CD0: .4byte gUnknown_841DE7D -_08143CD4: - adds r0, r4, 0 - adds r0, 0x9 - ldr r1, _08143CDC @ =gUnknown_841DE96 - b _08143CF2 - .align 2, 0 -_08143CDC: .4byte gUnknown_841DE96 -_08143CE0: - adds r0, r4, 0 - adds r0, 0x9 - ldr r1, _08143CE8 @ =gUnknown_841DE97 - b _08143CF2 - .align 2, 0 -_08143CE8: .4byte gUnknown_841DE97 -_08143CEC: - adds r0, r4, 0 - adds r0, 0x9 - ldr r1, _08143D00 @ =gUnknown_841DE9C -_08143CF2: - bl mevent_0814257C - cmp r0, 0 - beq _08143D1A -_08143CFA: - movs r0, 0 - strb r0, [r4, 0x8] - b _08143D1A - .align 2, 0 -_08143D00: .4byte gUnknown_841DE9C -_08143D04: - bl sub_812B484 - ldr r0, [r4, 0x10] - bl Free - adds r0, r5, 0 - bl DestroyTask - ldr r0, _08143D20 @ =sub_81422FC - bl SetMainCallback2 -_08143D1A: - pop {r4,r5} - pop {r0} - bx r0 - .align 2, 0 -_08143D20: .4byte sub_81422FC - thumb_func_end sub_8143910 - thumb_func_start sub_8143D24 sub_8143D24: @ 8143D24 push {lr} diff --git a/data/data_83FECCC.s b/data/data_83FECCC.s index 2e5c0e6c7..15416aed2 100644 --- a/data/data_83FECCC.s +++ b/data/data_83FECCC.s @@ -1956,67 +1956,88 @@ gUnknown_841D198:: @ 841D198 .incbin "baserom.gba", 0x41D198, 0xCB8 gUnknown_841DE50:: @ 841DE50 - .incbin "baserom.gba", 0x41DE50, 0x1 + .string "$" gUnknown_841DE51:: @ 841DE51 - .incbin "baserom.gba", 0x41DE51, 0x1 + .string "$" gUnknown_841DE52:: @ 841DE52 - .incbin "baserom.gba", 0x41DE52, 0x1 + .string "$" gUnknown_841DE53:: @ 841DE53 - .incbin "baserom.gba", 0x41DE53, 0x1 + .string "$" gUnknown_841DE54:: @ 841DE54 - .incbin "baserom.gba", 0x41DE54, 0x28 + .string "$" + +gUnknown_841DE55:: @ 841DE55 + .incbin "baserom.gba", 0x41DE55, 0x27 @ japanese gUnknown_841DE7C:: @ 841DE7C - .incbin "baserom.gba", 0x41DE7C, 0x1 + .string "$" gUnknown_841DE7D:: @ 841DE7D - .incbin "baserom.gba", 0x41DE7D, 0x18 + .string "$" + +gUnknown_841DE7E:: @ 841DE7E + .incbin "baserom.gba", 0x0041de7e, 0x17 @ japanese gUnknown_841DE95:: @ 841DE95 - .incbin "baserom.gba", 0x41DE95, 0x1 + .string "$" gUnknown_841DE96:: @ 841DE96 - .incbin "baserom.gba", 0x41DE96, 0x1 + .string "$" gUnknown_841DE97:: @ 841DE97 - .incbin "baserom.gba", 0x41DE97, 0x1 + .string "$" gUnknown_841DE98:: @ 841DE98 - .incbin "baserom.gba", 0x41DE98, 0x1 + .string "$" gUnknown_841DE99:: @ 841DE99 - .incbin "baserom.gba", 0x41DE99, 0x1 + .string "$" gUnknown_841DE9A:: @ 841DE9A - .incbin "baserom.gba", 0x41DE9A, 0x1 + .string "$" gUnknown_841DE9B:: @ 841DE9B - .incbin "baserom.gba", 0x41DE9B, 0x1 + .string "$" gUnknown_841DE9C:: @ 841DE9C - .incbin "baserom.gba", 0x41DE9C, 0x1 + .string "$" gUnknown_841DE9D:: @ 841DE9D - .incbin "baserom.gba", 0x41DE9D, 0x53 + .string "Communication error…\n" + .string "Please check all connections,\n" + .string "then turn the power OFF and ON.$" gUnknown_841DEF0:: @ 841DEF0 - .incbin "baserom.gba", 0x41DEF0, 0x15 + .string "Communication error…$" gUnknown_841DF05:: @ 841DF05 - .incbin "baserom.gba", 0x41DF05, 0x47 + .string "Move closer to your link partner(s).\n" + .string "Avoid obstacles between partners.$" gUnknown_841DF4C:: @ 841DF4C - .incbin "baserom.gba", 0x41DF4C, 0x1F + .string "A Button: Registration Counter$" gUnknown_841DF6B:: @ 841DF6B - .incbin "baserom.gba", 0x41DF6B, 0x17 + .string "A Button: Title Screen$" gUnknown_841DF82:: @ 841DF82 - .incbin "baserom.gba", 0x41DF82, 0x23 + .string "{STR_VAR_1}P LINK$" + +gUnknown_841DF8B:: @ 841DF8B + .string "BRONZE$" + +gUnknown_841DF92:: @ 841DF92 + .string "COPPER$" + +gUnknown_841DF99:: @ 841DF99 + .string "SILVER$" + +gUnknown_841DFA0:: @ 841DFA0 + .string "GOLD$" gUnknown_841DFA5:: @ 841DFA5 .incbin "baserom.gba", 0x41DFA5, 0x7 diff --git a/include/global.h b/include/global.h index d5bfc5241..899508993 100644 --- a/include/global.h +++ b/include/global.h @@ -591,6 +591,18 @@ struct FameCheckerSaveData #define NUM_EASY_CHAT_EXTRA_PHRASES 33 #define EASY_CHAT_EXTRA_PHRASES_SIZE ((NUM_EASY_CHAT_EXTRA_PHRASES >> 3) + (NUM_EASY_CHAT_EXTRA_PHRASES % 8 ? 1 : 0)) +struct MEventBuffer1 +{ + u32 crc; + u8 data[0x1bc]; +}; + +struct MEventBuffer2 +{ + u32 crc; + u8 data[0x14c]; +}; + struct SaveBlock1 { /*0x0000*/ struct Coords16 pos; diff --git a/include/link.h b/include/link.h index 92abf6e28..321a28d11 100644 --- a/include/link.h +++ b/include/link.h @@ -205,5 +205,7 @@ void sub_8009804(void); bool8 sub_800AA48(void); void sub_800A5BC(void); void sub_800AA80(u8); +void sub_80098D8(void); +void sub_80098B8(void); #endif // GUARD_LINK_H diff --git a/include/link_rfu_4.h b/include/link_rfu_4.h new file mode 100644 index 000000000..08bb3d7c5 --- /dev/null +++ b/include/link_rfu_4.h @@ -0,0 +1,6 @@ +#ifndef GUARD_LINK_RFU_4_H +#define GUARD_LINK_RFU_4_H + +bool32 mevent_0814257C(u8 * cmdPtr, const u8 * src); + +#endif //GUARD_LINK_RFU_4_H diff --git a/include/unk_815c27c.h b/include/unk_815c27c.h index d5ddc7bdc..cc1cbb7ce 100644 --- a/include/unk_815c27c.h +++ b/include/unk_815c27c.h @@ -6,6 +6,6 @@ void sub_815C6C4(void); void sub_815C8C8(void); void sub_815C960(void); void sub_815C91C(void); -u16 sub_815C498(u8, u32, u32, u8); +u16 sub_815C498(u8, size_t, const void *, u8); #endif //GUARD_UNK_815C27C_H diff --git a/src/mevent.c b/src/mevent.c index 27abf65c3..b2d8ba3f4 100644 --- a/src/mevent.c +++ b/src/mevent.c @@ -6,13 +6,14 @@ #include "task.h" #include "decompress.h" #include "link.h" +#include "link_rfu_4.h" #include "unk_815c27c.h" struct MEvent_Str_1 { u16 unk_000; - u32 unk_004; - u32 unk_008; + size_t unk_004; + const void * unk_008; }; struct MEvent_Str_2 @@ -37,8 +38,31 @@ struct MEventTaskData1 }; void sub_8143910(u8 taskId); +void sub_8142504(const u8 *str); +u8 sub_815D6B4(u8 *); +bool32 sub_815D794(u8 *); +void sub_812B484(void); +void sub_81422FC(void); -void sub_81435DC(struct MEvent_Str_1 *a0, u32 a1, u32 a2) +extern const u8 gUnknown_841DE52[]; +extern const u8 gUnknown_841DE53[]; +extern const u8 gUnknown_841DE54[]; +extern const u8 gUnknown_841DE7C[]; +extern const u8 gUnknown_841DE7D[]; +extern const u8 gUnknown_841DE95[]; +extern const u8 gUnknown_841DE96[]; +extern const u8 gUnknown_841DE97[]; +extern const u8 gUnknown_841DE98[]; +extern const u8 gUnknown_841DE99[]; +extern const u8 gUnknown_841DE9A[]; +extern const u8 gUnknown_841DE9B[]; +extern const u8 gUnknown_841DE9C[]; +extern const u8 gUnknownSerialData_Start[]; +extern const u8 gUnknownSerialData_End[]; + +struct MEvent_Str_1 gUnknown_3005ED0; + +void sub_81435DC(struct MEvent_Str_1 *a0, size_t a1, const void * a2) { vu16 imeBak = REG_IME; REG_IME = 0; @@ -53,7 +77,7 @@ void sub_81435DC(struct MEvent_Str_1 *a0, u32 a1, u32 a2) a0->unk_008 = a2; } -void sub_8143644(void) +void sub_8143644(struct MEvent_Str_1 *unused) { vu16 imeBak = REG_IME; REG_IME = 0; @@ -85,7 +109,7 @@ void sub_81436BC(void) SetSuppressLinkErrorMessage(TRUE); } -bool8 sub_81436EC(void) +bool32 sub_81436EC(void) { vu16 imeBak = REG_IME; u16 data[4]; @@ -101,14 +125,14 @@ bool8 sub_81436EC(void) return FALSE; } -bool8 sub_814374C(void) +bool32 sub_814374C(void) { if (sub_800AA48() && GetLinkPlayerCount_2() == 2) return TRUE; return FALSE; } -u8 sub_8143770(u8 * r4, u16 * r5) +u32 sub_8143770(u8 * r4, u16 * r5) { if ((*r4 == 3 || *r4 == 4 || *r4 == 5) && HasLinkErrorOccurred()) { @@ -123,7 +147,7 @@ u8 sub_8143770(u8 * r4, u16 * r5) *r4 = 1; ; } - else if (gMain.newKeys & B_BUTTON) + else if (JOY_NEW(B_BUTTON)) { *r4 = 0; return 1; @@ -144,7 +168,7 @@ u8 sub_8143770(u8 * r4, u16 * r5) *r5 = 0; *r4 = 3; } - else if (gMain.newKeys & B_BUTTON) + else if (JOY_NEW(B_BUTTON)) { *r4 = 0; return 1; @@ -210,7 +234,7 @@ void sub_81438E8(u16 *a0) *a0 = 0; } -bool8 sub_81438F0(u16 * a0, u16 a1) +bool32 sub_81438F0(u16 * a0, u16 a1) { if (++(*a0) > a1) { @@ -219,3 +243,213 @@ bool8 sub_81438F0(u16 * a0, u16 a1) } return FALSE; } + +void sub_8143910(u8 taskId) +{ + struct MEventTaskData1 *data = (struct MEventTaskData1 *)gTasks[taskId].data; + switch (data->t08) + { + case 0: + if (mevent_0814257C(&data->t09, gUnknown_841DE52)) + data->t08 = 1; + break; + case 1: + sub_81436BC(); + sub_81438E8(&data->t00); + data->t08 = 2; + break; + case 2: + if (sub_81438F0(&data->t00, 10)) + data->t08 = 3; + break; + case 3: + if (!sub_814374C()) + { + sub_80098B8(); + data->t08 = 4; + } + else + data->t08 = 13; + break; + case 4: + if (mevent_0814257C(&data->t09, gUnknown_841DE53)) + { + sub_8142504(gUnknown_841DE54); + sub_81438E8(&data->t00); + data->t08 = 5; + } + break; + case 5: + if (sub_81438F0(&data->t00, 90)) + { + sub_81436BC(); + data->t08 = 6; + } + else if (JOY_NEW(B_BUTTON)) + { + sub_81438E8(&data->t00); + PlaySE(SE_SELECT); + data->t08 = 23; + } + break; + case 6: + if (JOY_NEW(B_BUTTON)) + { + PlaySE(SE_SELECT); + sub_80098B8(); + sub_81438E8(&data->t00); + data->t08 = 23; + } + else if (GetLinkPlayerCount_2() > 1) + { + sub_81438E8(&data->t00); + sub_80098B8(); + data->t08 = 7; + } + else if (sub_81436EC()) + { + PlaySE(SE_SELECT); + sub_80098B8(); + sub_81438E8(&data->t00); + data->t08 = 8; + } + else if (sub_81438F0(&data->t00, 10)) + { + sub_80098B8(); + sub_81436BC(); + sub_81438E8(&data->t00); + } + break; + case 7: + if (mevent_0814257C(&data->t09, gUnknown_841DE7C)) + data->t08 = 4; + break; + case 8: + sub_8142504(gUnknown_841DE95); + sub_81435DC(&gUnknown_3005ED0, gUnknownSerialData_End - gUnknownSerialData_Start, gUnknownSerialData_Start); + data->t08 = 9; + break; + case 9: + data->t0E = sub_8143674(&gUnknown_3005ED0); + if (data->t0E != 0) + data->t08 = 10; + break; + case 10: + sub_8143644(&gUnknown_3005ED0); + if (data->t0E == 3) + data->t08 = 20; + else if (data->t0E == 1) + { + sub_81438E8(&data->t00); + sub_8142504(gUnknown_841DE9B); + data->t08 = 11; + } + else + data->t08 = 0; + break; + case 11: + if (sub_81438F0(&data->t00, 840)) + data->t08 = 12; + break; + case 12: + sub_81436BC(); + sub_8142504(gUnknown_841DE98); + data->t08 = 13; + break; + case 13: + switch (sub_8143770(&data->t09, &data->t00)) + { + case 0: + break; + case 2: + sub_8142504(gUnknown_841DE95); + data->t08 = 14; + break; + case 1: + PlaySE(SE_SELECT); + sub_80098B8(); + data->t08 = 23; + break; + case 5: + sub_80098B8(); + data->t08 = 21; + break; + case 3: + case 4: + sub_80098B8(); + data->t08 = 20; + break; + } + break; + case 14: + if (HasLinkErrorOccurred()) + { + sub_80098B8(); + data->t08 = 20; + } + else if (GetBlockReceivedStatus()) + { + ResetBlockReceivedFlags(); + data->t08 = 15; + } + break; + case 15: + data->t0E = sub_815D6B4(gDecompressionBuffer); + sub_800AA80(data->t0E); + data->t08 = 16; + break; + case 16: + if (!gUnknown_3003F64) + { + if (data->t0E == 1) + data->t08 = 17; + else + data->t08 = 20; + } + break; + case 17: + if (sub_815D794(gDecompressionBuffer)) + { + sub_8142504(gUnknown_841DE99); + sub_81438E8(&data->t00); + data->t08 = 18; + } + else + data->t08 = 22; + break; + case 18: + if (sub_81438F0(&data->t00, 120)) + { + sub_8142504(gUnknown_841DE9A); + PlayFanfare(258); + data->t08 = 19; + } + break; + case 19: + if (IsFanfareTaskInactive() &&JOY_NEW(A_BUTTON | B_BUTTON)) + data->t08 = 26; + break; + case 23: + if (mevent_0814257C(&data->t09, gUnknown_841DE7D)) + data->t08 = 26; + break; + case 20: + if (mevent_0814257C(&data->t09, gUnknown_841DE96)) + data->t08 = 0; + break; + case 21: + if (mevent_0814257C(&data->t09, gUnknown_841DE97)) + data->t08 = 0; + break; + case 22: + if (mevent_0814257C(&data->t09, gUnknown_841DE9C)) + data->t08 = 0; + break; + case 26: + sub_812B484(); + Free(data->t10); + DestroyTask(taskId); + SetMainCallback2(sub_81422FC); + break; + } +} -- cgit v1.2.3 From cec95ebfb41f8381feeb87ff889ebc1d89827ec6 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Thu, 29 Nov 2018 14:02:49 -0500 Subject: through sub_8143DBC --- asm/mevent.s | 92 ---------------------------------------------------- include/easy_chat.h | 1 + include/global.h | 29 +++++++++++++---- include/link_rfu_4.h | 1 + src/mevent.c | 43 ++++++++++++++++++++++-- 5 files changed, 65 insertions(+), 101 deletions(-) diff --git a/asm/mevent.s b/asm/mevent.s index dbee188ee..d2f093a4b 100644 --- a/asm/mevent.s +++ b/asm/mevent.s @@ -5,98 +5,6 @@ .text - thumb_func_start sub_8143D24 -sub_8143D24: @ 8143D24 - push {lr} - sub sp, 0x4 - movs r0, 0 - str r0, [sp] - ldr r0, _08143D4C @ =gSaveBlock1Ptr - ldr r1, [r0] - ldr r0, _08143D50 @ =0x00003120 - adds r1, r0 - ldr r2, _08143D54 @ =0x050000db - mov r0, sp - bl CpuSet - bl sub_8143ED0 - bl sub_80BDE28 - add sp, 0x4 - pop {r0} - bx r0 - .align 2, 0 -_08143D4C: .4byte gSaveBlock1Ptr -_08143D50: .4byte 0x00003120 -_08143D54: .4byte 0x050000db - thumb_func_end sub_8143D24 - - thumb_func_start sub_8143D58 -sub_8143D58: @ 8143D58 - ldr r0, _08143D64 @ =gSaveBlock1Ptr - ldr r0, [r0] - ldr r1, _08143D68 @ =0x00003124 - adds r0, r1 - bx lr - .align 2, 0 -_08143D64: .4byte gSaveBlock1Ptr -_08143D68: .4byte 0x00003124 - thumb_func_end sub_8143D58 - - thumb_func_start sav1_get_mevent_buffer_1 -sav1_get_mevent_buffer_1: @ 8143D6C - ldr r0, _08143D78 @ =gSaveBlock1Ptr - ldr r0, [r0] - ldr r1, _08143D7C @ =0x000032e4 - adds r0, r1 - bx lr - .align 2, 0 -_08143D78: .4byte gSaveBlock1Ptr -_08143D7C: .4byte 0x000032e4 - thumb_func_end sav1_get_mevent_buffer_1 - - thumb_func_start sav1_get_mevent_buffer_2 -sav1_get_mevent_buffer_2: @ 8143D80 - ldr r0, _08143D8C @ =gSaveBlock1Ptr - ldr r0, [r0] - ldr r1, _08143D90 @ =0x00003434 - adds r0, r1 - bx lr - .align 2, 0 -_08143D8C: .4byte gSaveBlock1Ptr -_08143D90: .4byte 0x00003434 - thumb_func_end sav1_get_mevent_buffer_2 - - thumb_func_start sub_8143D94 -sub_8143D94: @ 8143D94 - ldr r0, _08143DA0 @ =gSaveBlock1Ptr - ldr r0, [r0] - ldr r1, _08143DA4 @ =0x00003460 - adds r0, r1 - bx lr - .align 2, 0 -_08143DA0: .4byte gSaveBlock1Ptr -_08143DA4: .4byte 0x00003460 - thumb_func_end sub_8143D94 - - thumb_func_start sub_8143DA8 -sub_8143DA8: @ 8143DA8 - ldr r0, _08143DB4 @ =gSaveBlock1Ptr - ldr r0, [r0] - ldr r1, _08143DB8 @ =0x00003458 - adds r0, r1 - bx lr - .align 2, 0 -_08143DB4: .4byte gSaveBlock1Ptr -_08143DB8: .4byte 0x00003458 - thumb_func_end sub_8143DA8 - - thumb_func_start sub_8143DBC -sub_8143DBC: @ 8143DBC - push {lr} - bl sub_8143E9C - pop {r0} - bx r0 - thumb_func_end sub_8143DBC - thumb_func_start sub_8143DC8 sub_8143DC8: @ 8143DC8 push {r4-r7,lr} diff --git a/include/easy_chat.h b/include/easy_chat.h index 2b5664420..78e371cbb 100644 --- a/include/easy_chat.h +++ b/include/easy_chat.h @@ -37,5 +37,6 @@ bool32 sub_811F8D8(u16 word); void InitializeEasyChatWordArray(u16 *words, u16 length); void ConvertEasyChatWordsToString(u8 *dest, const u16 *src, u16 length1, u16 length2); bool8 ECWord_CheckIfOutsideOfValidRange(u16 word); +void sub_80BDE28(void); #endif // GUARD_EASYCHAT_H diff --git a/include/global.h b/include/global.h index 899508993..456f2c083 100644 --- a/include/global.h +++ b/include/global.h @@ -591,18 +591,34 @@ struct FameCheckerSaveData #define NUM_EASY_CHAT_EXTRA_PHRASES 33 #define EASY_CHAT_EXTRA_PHRASES_SIZE ((NUM_EASY_CHAT_EXTRA_PHRASES >> 3) + (NUM_EASY_CHAT_EXTRA_PHRASES % 8 ? 1 : 0)) -struct MEventBuffer1 +struct MEventBuffer_3120 { u32 crc; - u8 data[0x1bc]; + u16 data[222]; }; -struct MEventBuffer2 +struct MEventBuffer_32E0 { u32 crc; - u8 data[0x14c]; + u16 data[166]; }; +struct MEventBuffer_3430 +{ + u32 crc; + u16 data[18]; +}; + +struct MEventBuffers +{ + /*0x000 0x3120*/ struct MEventBuffer_3120 buffer_000; + /*0x1c0 0x32e0*/ struct MEventBuffer_32E0 buffer_1c0; + /*0x310 0x3430*/ struct MEventBuffer_3430 buffer_310; + /*0x338 0x3458*/ u16 unk_338[4]; + /*0x340 0x3460*/ struct MysteryEventStruct unk_340; + /*0x344 0x3464*/ u8 filler_344[0x28]; +}; // 0x36C 0x348C + struct SaveBlock1 { /*0x0000*/ struct Coords16 pos; @@ -650,9 +666,8 @@ struct SaveBlock1 /*0x309C*/ u8 giftRibbons[52]; /*0x30D0*/ struct Roamer roamer; /*0x30EC*/ struct EnigmaBerry enigmaBerry; - /*0x3120*/ u8 filler3120[0x340]; - /*0x3460*/ struct MysteryEventStruct unk_3460; - /*0x3464*/ u8 filler_3464[0x1b8]; + /*0x3120*/ struct MEventBuffers unk_3120; + /*0x348C*/ u8 filler_3464[0x190]; /*0x361C*/ struct RamScript ramScript; /*0x3A08*/ u8 filler3A08[12]; /*0x3A14*/ u8 seen2[DEX_FLAGS_NO]; diff --git a/include/link_rfu_4.h b/include/link_rfu_4.h index 08bb3d7c5..91ae86e4c 100644 --- a/include/link_rfu_4.h +++ b/include/link_rfu_4.h @@ -1,6 +1,7 @@ #ifndef GUARD_LINK_RFU_4_H #define GUARD_LINK_RFU_4_H +void sub_8142504(const u8 *str); bool32 mevent_0814257C(u8 * cmdPtr, const u8 * src); #endif //GUARD_LINK_RFU_4_H diff --git a/src/mevent.c b/src/mevent.c index b2d8ba3f4..c2a05f3c6 100644 --- a/src/mevent.c +++ b/src/mevent.c @@ -2,6 +2,7 @@ #include "constants/songs.h" #include "malloc.h" #include "sound.h" +#include "easy_chat.h" #include "main.h" #include "task.h" #include "decompress.h" @@ -38,11 +39,12 @@ struct MEventTaskData1 }; void sub_8143910(u8 taskId); -void sub_8142504(const u8 *str); u8 sub_815D6B4(u8 *); bool32 sub_815D794(u8 *); -void sub_812B484(void); void sub_81422FC(void); +void sub_812B484(void); +void sub_8143E9C(void); +void sub_8143ED0(void); extern const u8 gUnknown_841DE52[]; extern const u8 gUnknown_841DE53[]; @@ -453,3 +455,40 @@ void sub_8143910(u8 taskId) break; } } + +void sub_8143D24(void) +{ + CpuFill32(0, &gSaveBlock1Ptr->unk_3120, sizeof(gSaveBlock1Ptr->unk_3120)); + sub_8143ED0(); + sub_80BDE28(); +} + +u16 * sub_8143D58(void) +{ + return gSaveBlock1Ptr->unk_3120.buffer_000.data; +} + +u16 * sav1_get_mevent_buffer_1(void) +{ + return gSaveBlock1Ptr->unk_3120.buffer_1c0.data; +} + +u16 * sav1_get_mevent_buffer_2(void) +{ + return gSaveBlock1Ptr->unk_3120.buffer_310.data; +} + +struct MysteryEventStruct * sub_8143D94(void) +{ + return &gSaveBlock1Ptr->unk_3120.unk_340; +} + +u16 * sub_8143DA8(void) +{ + return gSaveBlock1Ptr->unk_3120.unk_338; +} + +void sub_8143DBC(void) +{ + sub_8143E9C(); +} -- cgit v1.2.3 From dfb6bcb6acdebfb3b7fe024148889361e9309dc4 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Thu, 29 Nov 2018 14:35:39 -0500 Subject: through sub_8143EF4 --- asm/mevent.s | 199 ----------------------------------------------------------- src/mevent.c | 63 +++++++++++++++++++ 2 files changed, 63 insertions(+), 199 deletions(-) diff --git a/asm/mevent.s b/asm/mevent.s index d2f093a4b..3b5012fa7 100644 --- a/asm/mevent.s +++ b/asm/mevent.s @@ -5,205 +5,6 @@ .text - thumb_func_start sub_8143DC8 -sub_8143DC8: @ 8143DC8 - push {r4-r7,lr} - adds r7, r0, 0 - bl sub_8143E64 - cmp r0, 0 - beq _08143E14 - bl sub_8143E9C - ldr r4, _08143E08 @ =gSaveBlock1Ptr - ldr r0, [r4] - ldr r5, _08143E0C @ =0x00003124 - adds r0, r5 - movs r6, 0xDE - lsls r6, 1 - adds r1, r7, 0 - adds r2, r6, 0 - bl memcpy - ldr r0, [r4] - adds r0, r5 - adds r1, r6, 0 - bl CalcCRC16WithTable - ldr r1, [r4] - ldr r2, _08143E10 @ =0x00003120 - adds r1, r2 - lsls r0, 16 - lsrs r0, 16 - str r0, [r1] - movs r0, 0x1 - b _08143E16 - .align 2, 0 -_08143E08: .4byte gSaveBlock1Ptr -_08143E0C: .4byte 0x00003124 -_08143E10: .4byte 0x00003120 -_08143E14: - movs r0, 0 -_08143E16: - pop {r4-r7} - pop {r1} - bx r1 - thumb_func_end sub_8143DC8 - - thumb_func_start sub_8143E1C -sub_8143E1C: @ 8143E1C - push {r4,lr} - ldr r4, _08143E50 @ =gSaveBlock1Ptr - ldr r0, [r4] - ldr r1, _08143E54 @ =0x00003124 - adds r0, r1 - movs r1, 0xDE - lsls r1, 1 - bl CalcCRC16WithTable - lsls r0, 16 - lsrs r0, 16 - ldr r4, [r4] - ldr r2, _08143E58 @ =0x00003120 - adds r1, r4, r2 - ldr r1, [r1] - cmp r0, r1 - bne _08143E5C - ldr r1, _08143E54 @ =0x00003124 - adds r0, r4, r1 - bl sub_8143E64 - cmp r0, 0 - beq _08143E5C - movs r0, 0x1 - b _08143E5E - .align 2, 0 -_08143E50: .4byte gSaveBlock1Ptr -_08143E54: .4byte 0x00003124 -_08143E58: .4byte 0x00003120 -_08143E5C: - movs r0, 0 -_08143E5E: - pop {r4} - pop {r1} - bx r1 - thumb_func_end sub_8143E1C - - thumb_func_start sub_8143E64 -sub_8143E64: @ 8143E64 - push {lr} - ldrh r0, [r0] - cmp r0, 0 - beq _08143E70 - movs r0, 0x1 - b _08143E72 -_08143E70: - movs r0, 0 -_08143E72: - pop {r1} - bx r1 - thumb_func_end sub_8143E64 - - thumb_func_start sub_8143E78 -sub_8143E78: @ 8143E78 - push {lr} - ldr r0, _08143E8C @ =gSaveBlock1Ptr - ldr r0, [r0] - ldr r1, _08143E90 @ =0x00003124 - adds r0, r1 - ldrb r0, [r0, 0x2] - cmp r0, 0 - beq _08143E94 - movs r0, 0x1 - b _08143E96 - .align 2, 0 -_08143E8C: .4byte gSaveBlock1Ptr -_08143E90: .4byte 0x00003124 -_08143E94: - movs r0, 0 -_08143E96: - pop {r1} - bx r1 - thumb_func_end sub_8143E78 - - thumb_func_start sub_8143E9C -sub_8143E9C: @ 8143E9C - push {r4,lr} - sub sp, 0x4 - movs r4, 0 - str r4, [sp] - bl sub_8143D58 - adds r1, r0, 0 - ldr r2, _08143EC4 @ =0x0500006f - mov r0, sp - bl CpuSet - ldr r0, _08143EC8 @ =gSaveBlock1Ptr - ldr r0, [r0] - ldr r1, _08143ECC @ =0x00003120 - adds r0, r1 - str r4, [r0] - add sp, 0x4 - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_08143EC4: .4byte 0x0500006f -_08143EC8: .4byte gSaveBlock1Ptr -_08143ECC: .4byte 0x00003120 - thumb_func_end sub_8143E9C - - thumb_func_start sub_8143ED0 -sub_8143ED0: @ 8143ED0 - push {lr} - sub sp, 0x4 - movs r0, 0 - str r0, [sp] - bl sub_8143D94 - adds r1, r0, 0 - ldr r2, _08143EF0 @ =0x05000001 - mov r0, sp - bl CpuSet - bl sub_8146C88 - add sp, 0x4 - pop {r0} - bx r0 - .align 2, 0 -_08143EF0: .4byte 0x05000001 - thumb_func_end sub_8143ED0 - - thumb_func_start sub_8143EF4 -sub_8143EF4: @ 8143EF4 - push {r4,r5,lr} - adds r5, r0, 0 - ldr r0, _08143F0C @ =gSaveBlock1Ptr - ldr r0, [r0] - ldr r1, _08143F10 @ =0x00003124 - adds r4, r0, r1 - bl sub_8143E1C - cmp r0, 0 - bne _08143F14 -_08143F08: - movs r0, 0 - b _08143F2C - .align 2, 0 -_08143F0C: .4byte gSaveBlock1Ptr -_08143F10: .4byte 0x00003124 -_08143F14: - movs r2, 0 - ldr r3, _08143F34 @ =0x000001bb -_08143F18: - adds r0, r4, r2 - adds r1, r5, r2 - ldrb r0, [r0] - ldrb r1, [r1] - cmp r0, r1 - bne _08143F08 - adds r2, 0x1 - cmp r2, r3 - bls _08143F18 - movs r0, 0x1 -_08143F2C: - pop {r4,r5} - pop {r1} - bx r1 - .align 2, 0 -_08143F34: .4byte 0x000001bb - thumb_func_end sub_8143EF4 - thumb_func_start sub_8143F38 sub_8143F38: @ 8143F38 push {lr} diff --git a/src/mevent.c b/src/mevent.c index c2a05f3c6..dd2891de0 100644 --- a/src/mevent.c +++ b/src/mevent.c @@ -9,6 +9,8 @@ #include "link.h" #include "link_rfu_4.h" #include "unk_815c27c.h" +#include "util.h" +#include "menews_jisan.h" struct MEvent_Str_1 { @@ -39,6 +41,7 @@ struct MEventTaskData1 }; void sub_8143910(u8 taskId); +bool32 sub_8143E64(const u16 * src); u8 sub_815D6B4(u8 *); bool32 sub_815D794(u8 *); void sub_81422FC(void); @@ -492,3 +495,63 @@ void sub_8143DBC(void) { sub_8143E9C(); } + +bool32 sub_8143DC8(const u16 * src) +{ + if (!sub_8143E64(src)) + return FALSE; + sub_8143E9C(); + memcpy(gSaveBlock1Ptr->unk_3120.buffer_000.data, src, sizeof(gSaveBlock1Ptr->unk_3120.buffer_000.data)); + gSaveBlock1Ptr->unk_3120.buffer_000.crc = CalcCRC16WithTable((void *)gSaveBlock1Ptr->unk_3120.buffer_000.data, sizeof(gSaveBlock1Ptr->unk_3120.buffer_000.data)); + return TRUE; +} + +bool32 sub_8143E1C(void) +{ + if (CalcCRC16WithTable((void *)gSaveBlock1Ptr->unk_3120.buffer_000.data, sizeof(gSaveBlock1Ptr->unk_3120.buffer_000.data)) != gSaveBlock1Ptr->unk_3120.buffer_000.crc) + return FALSE; + if (!sub_8143E64(gSaveBlock1Ptr->unk_3120.buffer_000.data)) + return FALSE; + return TRUE; +} + +bool32 sub_8143E64(const u16 * data) +{ + if (data[0] == 0) + return FALSE; + return TRUE; +} + +bool32 sub_8143E78(void) +{ + u16 * data = gSaveBlock1Ptr->unk_3120.buffer_000.data; + if (*(u8 *)&data[1] == 0) + return FALSE; + return TRUE; +} + +void sub_8143E9C(void) +{ + CpuFill32(0, sub_8143D58(), sizeof(gSaveBlock1Ptr->unk_3120.buffer_000.data)); + gSaveBlock1Ptr->unk_3120.buffer_000.crc = 0; +} + +void sub_8143ED0(void) +{ + CpuFill32(0, sub_8143D94(), sizeof(struct MysteryEventStruct)); + sub_8146C88(); +} + +bool32 sub_8143EF4(const u8 * src) +{ + const u8 * r5 = (const u8 *)gSaveBlock1Ptr->unk_3120.buffer_000.data; + u32 i; + if (!sub_8143E1C()) + return FALSE; + for (i = 0; i < sizeof(gSaveBlock1Ptr->unk_3120.buffer_000.data); i++) + { + if (r5[i] != src[i]) + return FALSE; + } + return TRUE; +} -- cgit v1.2.3 From 159f242e32532f14496abaa8d2f96e9c3d30d720 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Thu, 29 Nov 2018 15:33:58 -0500 Subject: through sub_8144018 --- asm/mevent.s | 145 ------------------------------------------------- include/battle_tower.h | 1 + include/event_data.h | 2 + include/global.h | 36 ++++++++++-- include/script.h | 1 + src/mevent.c | 101 +++++++++++++++++++++++++++------- 6 files changed, 116 insertions(+), 170 deletions(-) diff --git a/asm/mevent.s b/asm/mevent.s index 3b5012fa7..42d4f322b 100644 --- a/asm/mevent.s +++ b/asm/mevent.s @@ -5,151 +5,6 @@ .text - thumb_func_start sub_8143F38 -sub_8143F38: @ 8143F38 - push {lr} - bl sub_814407C - bl sub_81440B4 - bl sub_8144790 - bl ClearRamScript - bl sub_806E2D0 - bl sub_806E370 - ldr r0, _08143F64 @ =gSaveBlock2Ptr - ldr r0, [r0] - movs r1, 0x94 - lsls r1, 3 - adds r0, r1 - bl sub_80E7524 - pop {r0} - bx r0 - .align 2, 0 -_08143F64: .4byte gSaveBlock2Ptr - thumb_func_end sub_8143F38 - - thumb_func_start sub_8143F68 -sub_8143F68: @ 8143F68 - push {r4-r7,lr} - adds r7, r0, 0 - bl sub_8144018 - cmp r0, 0 - beq _08143FC0 - bl sub_8143F38 - ldr r4, _08143FB0 @ =gSaveBlock1Ptr - ldr r0, [r4] - ldr r5, _08143FB4 @ =0x000032e4 - adds r0, r5 - movs r6, 0xA6 - lsls r6, 1 - adds r1, r7, 0 - adds r2, r6, 0 - bl memcpy - ldr r0, [r4] - adds r0, r5 - adds r1, r6, 0 - bl CalcCRC16WithTable - ldr r1, [r4] - ldr r3, _08143FB8 @ =0x000032e0 - adds r2, r1, r3 - lsls r0, 16 - lsrs r0, 16 - str r0, [r2] - ldr r0, _08143FBC @ =0x00003434 - adds r2, r1, r0 - adds r1, r5 - ldrh r0, [r1, 0x2] - strh r0, [r2, 0x6] - movs r0, 0x1 - b _08143FC2 - .align 2, 0 -_08143FB0: .4byte gSaveBlock1Ptr -_08143FB4: .4byte 0x000032e4 -_08143FB8: .4byte 0x000032e0 -_08143FBC: .4byte 0x00003434 -_08143FC0: - movs r0, 0 -_08143FC2: - pop {r4-r7} - pop {r1} - bx r1 - thumb_func_end sub_8143F68 - - thumb_func_start sub_8143FC8 -sub_8143FC8: @ 8143FC8 - push {r4,r5,lr} - ldr r5, _08144004 @ =gSaveBlock1Ptr - ldr r0, [r5] - ldr r1, _08144008 @ =0x000032e0 - adds r4, r0, r1 - adds r1, 0x4 - adds r0, r1 - movs r1, 0xA6 - lsls r1, 1 - bl CalcCRC16WithTable - lsls r0, 16 - lsrs r0, 16 - ldr r1, [r4] - cmp r1, r0 - bne _08144010 - ldr r0, [r5] - ldr r1, _0814400C @ =0x000032e4 - adds r0, r1 - bl sub_8144018 - cmp r0, 0 - beq _08144010 - bl sub_8069DFC - cmp r0, 0 - beq _08144010 - movs r0, 0x1 - b _08144012 - .align 2, 0 -_08144004: .4byte gSaveBlock1Ptr -_08144008: .4byte 0x000032e0 -_0814400C: .4byte 0x000032e4 -_08144010: - movs r0, 0 -_08144012: - pop {r4,r5} - pop {r1} - bx r1 - thumb_func_end sub_8143FC8 - - thumb_func_start sub_8144018 -sub_8144018: @ 8144018 - push {lr} - adds r2, r0, 0 - ldrh r0, [r2] - cmp r0, 0 - beq _0814404E - ldrb r1, [r2, 0x8] - lsls r0, r1, 30 - lsrs r0, 30 - cmp r0, 0x2 - bhi _0814404E - movs r0, 0xC0 - ands r0, r1 - cmp r0, 0 - beq _0814403C - cmp r0, 0x40 - beq _0814403C - cmp r0, 0x80 - bne _0814404E -_0814403C: - lsls r0, r1, 26 - lsrs r0, 28 - cmp r0, 0x7 - bhi _0814404E - ldrb r0, [r2, 0x9] - cmp r0, 0x7 - bhi _0814404E - movs r0, 0x1 - b _08144050 -_0814404E: - movs r0, 0 -_08144050: - pop {r1} - bx r1 - thumb_func_end sub_8144018 - thumb_func_start sub_8144054 sub_8144054: @ 8144054 push {lr} diff --git a/include/battle_tower.h b/include/battle_tower.h index 120ab9a99..36d5eb1f7 100644 --- a/include/battle_tower.h +++ b/include/battle_tower.h @@ -4,5 +4,6 @@ #include "global.h" u16 sub_8164FCC(u8, u8); +void sub_80E7524(u32 *); #endif //GUARD_BATTLE_TOWER_H diff --git a/include/event_data.h b/include/event_data.h index 2e340f073..bced2a88f 100644 --- a/include/event_data.h +++ b/include/event_data.h @@ -34,6 +34,8 @@ bool8 FlagGet(u16 id); u16 * GetVarPointer(u16 id); bool32 sub_806E2BC(void); void sub_806E6FC(void); +void sub_806E2D0(void); +void sub_806E370(void); extern u16 gSpecialVar_0x8000; extern u16 gSpecialVar_0x8001; diff --git a/include/global.h b/include/global.h index 456f2c083..df2926d0b 100644 --- a/include/global.h +++ b/include/global.h @@ -264,7 +264,9 @@ struct SaveBlock2 /*0x098*/ struct Time localTimeOffset; /*0x0A0*/ struct Time lastBerryTreeUpdate; /*0x0A8*/ u32 field_A8; - /*0x0AC*/ u8 filler_AC[0x9ec]; + /*0x0AC*/ u8 filler_AC[0x3F4]; + /*0x4A0*/ u32 unk_4A0[0x2F]; + /*0x55c*/ u8 filler_55C[0x53C]; /*0xA98*/ u8 unk_A98[2][16]; /*0xAB8*/ u8 filler_AB8[0x468]; /*0xF20*/ u32 encryptionKey; @@ -591,22 +593,48 @@ struct FameCheckerSaveData #define NUM_EASY_CHAT_EXTRA_PHRASES 33 #define EASY_CHAT_EXTRA_PHRASES_SIZE ((NUM_EASY_CHAT_EXTRA_PHRASES >> 3) + (NUM_EASY_CHAT_EXTRA_PHRASES % 8 ? 1 : 0)) +struct MEventBuffer_3120_Sub +{ + u16 unk_00; + u8 unk_02; + u16 filler_04[220]; +}; + struct MEventBuffer_3120 { u32 crc; - u16 data[222]; + struct MEventBuffer_3120_Sub data; +}; + +struct MEventBuffer_32E0_Sub +{ + u16 unk_00; + u16 unk_02; + u8 filler_04[4]; + u8 unk_08_0:2; + u8 unk_08_2:4; + u8 unk_08_6:2; + u8 unk_09; + u8 filler_0A[322]; }; struct MEventBuffer_32E0 { u32 crc; - u16 data[166]; + struct MEventBuffer_32E0_Sub data; +}; + +struct MEventBuffer_3430_Sub +{ + u8 filler_00[6]; + u16 unk_06; + u8 filler_08[28]; }; struct MEventBuffer_3430 { u32 crc; - u16 data[18]; + struct MEventBuffer_3430_Sub data; }; struct MEventBuffers diff --git a/include/script.h b/include/script.h index 9e26b8a28..6ed2e8f49 100644 --- a/include/script.h +++ b/include/script.h @@ -62,5 +62,6 @@ u8 *GetRamScript(u8 objectId, u8 *script); bool32 sub_80991F8(void); u8 *sub_8099244(void); void sub_80992A0(u8 *script, u16 scriptSize); +bool32 sub_8069DFC(void); #endif // GUARD_SCRIPT_H diff --git a/src/mevent.c b/src/mevent.c index dd2891de0..74a3d1b5f 100644 --- a/src/mevent.c +++ b/src/mevent.c @@ -10,6 +10,9 @@ #include "link_rfu_4.h" #include "unk_815c27c.h" #include "util.h" +#include "script.h" +#include "event_data.h" +#include "battle_tower.h" #include "menews_jisan.h" struct MEvent_Str_1 @@ -41,13 +44,17 @@ struct MEventTaskData1 }; void sub_8143910(u8 taskId); -bool32 sub_8143E64(const u16 * src); -u8 sub_815D6B4(u8 *); +bool32 sub_8143E64(const struct MEventBuffer_3120_Sub * src); +void sub_8143E9C(void); +void sub_8143ED0(void); +bool32 sub_8144018(const struct MEventBuffer_32E0_Sub * src); bool32 sub_815D794(u8 *); void sub_81422FC(void); void sub_812B484(void); -void sub_8143E9C(void); -void sub_8143ED0(void); +void sub_814407C(void); +void sub_81440B4(void); +void sub_8144790(void); +u8 sub_815D6B4(u8 *); extern const u8 gUnknown_841DE52[]; extern const u8 gUnknown_841DE53[]; @@ -466,19 +473,19 @@ void sub_8143D24(void) sub_80BDE28(); } -u16 * sub_8143D58(void) +struct MEventBuffer_3120_Sub * sub_8143D58(void) { - return gSaveBlock1Ptr->unk_3120.buffer_000.data; + return &gSaveBlock1Ptr->unk_3120.buffer_000.data; } -u16 * sav1_get_mevent_buffer_1(void) +struct MEventBuffer_32E0_Sub * sav1_get_mevent_buffer_1(void) { - return gSaveBlock1Ptr->unk_3120.buffer_1c0.data; + return &gSaveBlock1Ptr->unk_3120.buffer_1c0.data; } -u16 * sav1_get_mevent_buffer_2(void) +struct MEventBuffer_3430_Sub * sav1_get_mevent_buffer_2(void) { - return gSaveBlock1Ptr->unk_3120.buffer_310.data; + return &gSaveBlock1Ptr->unk_3120.buffer_310.data; } struct MysteryEventStruct * sub_8143D94(void) @@ -496,36 +503,36 @@ void sub_8143DBC(void) sub_8143E9C(); } -bool32 sub_8143DC8(const u16 * src) +bool32 sub_8143DC8(const struct MEventBuffer_3120_Sub * src) { if (!sub_8143E64(src)) return FALSE; sub_8143E9C(); - memcpy(gSaveBlock1Ptr->unk_3120.buffer_000.data, src, sizeof(gSaveBlock1Ptr->unk_3120.buffer_000.data)); - gSaveBlock1Ptr->unk_3120.buffer_000.crc = CalcCRC16WithTable((void *)gSaveBlock1Ptr->unk_3120.buffer_000.data, sizeof(gSaveBlock1Ptr->unk_3120.buffer_000.data)); + gSaveBlock1Ptr->unk_3120.buffer_000.data = *src; + gSaveBlock1Ptr->unk_3120.buffer_000.crc = CalcCRC16WithTable((void *)&gSaveBlock1Ptr->unk_3120.buffer_000.data, sizeof(struct MEventBuffer_3120_Sub)); return TRUE; } bool32 sub_8143E1C(void) { - if (CalcCRC16WithTable((void *)gSaveBlock1Ptr->unk_3120.buffer_000.data, sizeof(gSaveBlock1Ptr->unk_3120.buffer_000.data)) != gSaveBlock1Ptr->unk_3120.buffer_000.crc) + if (CalcCRC16WithTable((void *)&gSaveBlock1Ptr->unk_3120.buffer_000.data, sizeof(struct MEventBuffer_3120_Sub)) != gSaveBlock1Ptr->unk_3120.buffer_000.crc) return FALSE; - if (!sub_8143E64(gSaveBlock1Ptr->unk_3120.buffer_000.data)) + if (!sub_8143E64(&gSaveBlock1Ptr->unk_3120.buffer_000.data)) return FALSE; return TRUE; } -bool32 sub_8143E64(const u16 * data) +bool32 sub_8143E64(const struct MEventBuffer_3120_Sub * data) { - if (data[0] == 0) + if (data->unk_00 == 0) return FALSE; return TRUE; } bool32 sub_8143E78(void) { - u16 * data = gSaveBlock1Ptr->unk_3120.buffer_000.data; - if (*(u8 *)&data[1] == 0) + const struct MEventBuffer_3120_Sub * data = &gSaveBlock1Ptr->unk_3120.buffer_000.data; + if (data->unk_02 == 0) return FALSE; return TRUE; } @@ -544,14 +551,66 @@ void sub_8143ED0(void) bool32 sub_8143EF4(const u8 * src) { - const u8 * r5 = (const u8 *)gSaveBlock1Ptr->unk_3120.buffer_000.data; + const u8 * r5 = (const u8 *)&gSaveBlock1Ptr->unk_3120.buffer_000.data; u32 i; if (!sub_8143E1C()) return FALSE; - for (i = 0; i < sizeof(gSaveBlock1Ptr->unk_3120.buffer_000.data); i++) + for (i = 0; i < sizeof(struct MEventBuffer_3120_Sub); i++) { if (r5[i] != src[i]) return FALSE; } return TRUE; } + +void sub_8143F38(void) +{ + sub_814407C(); + sub_81440B4(); + sub_8144790(); + ClearRamScript(); + sub_806E2D0(); + sub_806E370(); + sub_80E7524(gSaveBlock2Ptr->unk_4A0); +} + +bool32 sub_8143F68(const struct MEventBuffer_32E0_Sub * data) +{ + struct MEventBuffer_3430_Sub * r2; + struct MEventBuffer_32E0_Sub * r1; + if (!sub_8144018(data)) + return FALSE; + sub_8143F38(); + memcpy(&gSaveBlock1Ptr->unk_3120.buffer_1c0.data, data, sizeof(struct MEventBuffer_32E0_Sub)); + gSaveBlock1Ptr->unk_3120.buffer_1c0.crc = CalcCRC16WithTable((void *)&gSaveBlock1Ptr->unk_3120.buffer_1c0.data, sizeof(struct MEventBuffer_32E0_Sub)); + r2 = &gSaveBlock1Ptr->unk_3120.buffer_310.data; + r1 = &gSaveBlock1Ptr->unk_3120.buffer_1c0.data; + r2->unk_06 = r1->unk_02; + return TRUE; +} + +bool32 sub_8143FC8(void) +{ + if (gSaveBlock1Ptr->unk_3120.buffer_1c0.crc != CalcCRC16WithTable((void *)&gSaveBlock1Ptr->unk_3120.buffer_1c0.data, sizeof(struct MEventBuffer_32E0_Sub))) + return FALSE; + if (!sub_8144018(&gSaveBlock1Ptr->unk_3120.buffer_1c0.data)) + return FALSE; + if (!sub_8069DFC()) + return FALSE; + return TRUE; +} + +bool32 sub_8144018(const struct MEventBuffer_32E0_Sub * data) +{ + if (data->unk_00 == 0) + return FALSE; + if (data->unk_08_0 > 2) + return FALSE; + if (!(data->unk_08_6 == 0 || data->unk_08_6 == 1 || data->unk_08_6 == 2)) + return FALSE; + if (data->unk_08_2 > 7) + return FALSE; + if (data->unk_09 > 7) + return FALSE; + return TRUE; +} -- cgit v1.2.3 From 9460cbfe6cfbbd679ea6febf112ba6e46679ac02 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Thu, 29 Nov 2018 15:37:39 -0500 Subject: through sub_814407C --- asm/mevent.s | 52 ---------------------------------------------------- src/mevent.c | 14 ++++++++++++++ 2 files changed, 14 insertions(+), 52 deletions(-) diff --git a/asm/mevent.s b/asm/mevent.s index 42d4f322b..53b7226de 100644 --- a/asm/mevent.s +++ b/asm/mevent.s @@ -5,58 +5,6 @@ .text - thumb_func_start sub_8144054 -sub_8144054: @ 8144054 - push {lr} - ldr r0, _0814406C @ =gSaveBlock1Ptr - ldr r0, [r0] - ldr r1, _08144070 @ =0x000032e4 - adds r0, r1 - ldrb r1, [r0, 0x8] - movs r0, 0xC0 - ands r0, r1 - cmp r0, 0 - beq _08144074 - movs r0, 0x1 - b _08144076 - .align 2, 0 -_0814406C: .4byte gSaveBlock1Ptr -_08144070: .4byte 0x000032e4 -_08144074: - movs r0, 0 -_08144076: - pop {r1} - bx r1 - thumb_func_end sub_8144054 - - thumb_func_start sub_814407C -sub_814407C: @ 814407C - push {r4,r5,lr} - sub sp, 0x4 - movs r5, 0 - str r5, [sp] - ldr r4, _081440A4 @ =gSaveBlock1Ptr - ldr r1, [r4] - ldr r0, _081440A8 @ =0x000032e4 - adds r1, r0 - ldr r2, _081440AC @ =0x05000053 - mov r0, sp - bl CpuSet - ldr r0, [r4] - ldr r1, _081440B0 @ =0x000032e0 - adds r0, r1 - str r5, [r0] - add sp, 0x4 - pop {r4,r5} - pop {r0} - bx r0 - .align 2, 0 -_081440A4: .4byte gSaveBlock1Ptr -_081440A8: .4byte 0x000032e4 -_081440AC: .4byte 0x05000053 -_081440B0: .4byte 0x000032e0 - thumb_func_end sub_814407C - thumb_func_start sub_81440B4 sub_81440B4: @ 81440B4 push {r4,lr} diff --git a/src/mevent.c b/src/mevent.c index 74a3d1b5f..f61f7b7a2 100644 --- a/src/mevent.c +++ b/src/mevent.c @@ -614,3 +614,17 @@ bool32 sub_8144018(const struct MEventBuffer_32E0_Sub * data) return FALSE; return TRUE; } + +bool32 sub_8144054(void) +{ + const struct MEventBuffer_32E0_Sub * data = &gSaveBlock1Ptr->unk_3120.buffer_1c0.data; + if (data->unk_08_6 == 0) + return FALSE; + return TRUE; +} + +void sub_814407C(void) +{ + CpuFill32(0, &gSaveBlock1Ptr->unk_3120.buffer_1c0.data, sizeof(struct MEventBuffer_32E0_Sub)); + gSaveBlock1Ptr->unk_3120.buffer_1c0.crc = 0; +} -- cgit v1.2.3 From 51622adaec9fd47a8f1be2b61b1f4521cc9d47da Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Thu, 29 Nov 2018 18:15:22 -0500 Subject: through sub_8144218 --- asm/mevent.s | 245 +------------------------------------------------------ include/global.h | 2 +- src/mevent.c | 86 +++++++++++++++++++ 3 files changed, 88 insertions(+), 245 deletions(-) diff --git a/asm/mevent.s b/asm/mevent.s index 53b7226de..19c6248ae 100644 --- a/asm/mevent.s +++ b/asm/mevent.s @@ -5,251 +5,8 @@ .text - thumb_func_start sub_81440B4 -sub_81440B4: @ 81440B4 - push {r4,lr} - sub sp, 0x4 - movs r4, 0 - str r4, [sp] - bl sav1_get_mevent_buffer_2 - adds r1, r0, 0 - ldr r2, _081440DC @ =0x05000009 - mov r0, sp - bl CpuSet - ldr r0, _081440E0 @ =gSaveBlock1Ptr - ldr r0, [r0] - ldr r1, _081440E4 @ =0x00003430 - adds r0, r1 - str r4, [r0] - add sp, 0x4 - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_081440DC: .4byte 0x05000009 -_081440E0: .4byte gSaveBlock1Ptr -_081440E4: .4byte 0x00003430 - thumb_func_end sub_81440B4 - - thumb_func_start sub_81440E8 -sub_81440E8: @ 81440E8 - push {lr} - bl sub_8143FC8 - cmp r0, 0 - bne _081440F6 - movs r0, 0 - b _08144100 -_081440F6: - ldr r0, _08144104 @ =gSaveBlock1Ptr - ldr r0, [r0] - ldr r1, _08144108 @ =0x000032e4 - adds r0, r1 - ldrh r0, [r0] -_08144100: - pop {r1} - bx r1 - .align 2, 0 -_08144104: .4byte gSaveBlock1Ptr -_08144108: .4byte 0x000032e4 - thumb_func_end sub_81440E8 - - thumb_func_start sub_814410C -sub_814410C: @ 814410C - push {lr} - adds r2, r0, 0 - ldrb r1, [r2, 0x8] - movs r0, 0xC0 - ands r0, r1 - cmp r0, 0x40 - bne _08144120 - movs r0, 0x3F - ands r0, r1 - strb r0, [r2, 0x8] -_08144120: - pop {r0} - bx r0 - thumb_func_end sub_814410C - - thumb_func_start sub_8144124 -sub_8144124: @ 8144124 - push {lr} - lsls r0, 16 - ldr r1, _08144138 @ =0xfc180000 - adds r0, r1 - lsrs r0, 16 - cmp r0, 0x13 - bls _0814413C - movs r0, 0 - b _0814413E - .align 2, 0 -_08144138: .4byte 0xfc180000 -_0814413C: - movs r0, 0x1 -_0814413E: - pop {r1} - bx r1 - thumb_func_end sub_8144124 - - thumb_func_start sub_8144144 -sub_8144144: @ 8144144 - push {r4,lr} - bl sub_81440E8 - lsls r0, 16 - lsrs r4, r0, 16 - adds r0, r4, 0 - bl sub_8144124 - cmp r0, 0 - beq _0814417C - ldr r1, _08144174 @ =gUnknown_8466F00 - ldr r2, _08144178 @ =0xfffffc18 - adds r0, r4, r2 - lsls r0, 1 - adds r0, r1 - ldrh r0, [r0] - bl FlagGet - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x1 - beq _0814417C - movs r0, 0x1 - b _0814417E - .align 2, 0 -_08144174: .4byte gUnknown_8466F00 -_08144178: .4byte 0xfffffc18 -_0814417C: - movs r0, 0 -_0814417E: - pop {r4} - pop {r1} - bx r1 - thumb_func_end sub_8144144 - - thumb_func_start sub_8144184 -sub_8144184: @ 8144184 - push {lr} - movs r3, 0 - cmp r3, r1 - bge _081441A6 - adds r2, r0, 0 - adds r2, 0x8 -_08144190: - ldrh r0, [r2, 0xE] - cmp r0, 0 - beq _0814419E - ldrh r0, [r2] - cmp r0, 0 - beq _0814419E - adds r3, 0x1 -_0814419E: - adds r2, 0x2 - subs r1, 0x1 - cmp r1, 0 - bne _08144190 -_081441A6: - adds r0, r3, 0 - pop {r1} - bx r1 - thumb_func_end sub_8144184 - - thumb_func_start sub_81441AC -sub_81441AC: @ 81441AC - push {r4-r7,lr} - adds r5, r0, 0 - adds r4, r1, 0 - movs r1, 0 - cmp r1, r2 - bge _081441E6 - ldrh r6, [r4, 0x2] - movs r0, 0x16 - adds r0, r5 - mov r12, r0 -_081441C0: - lsls r3, r1, 1 - mov r7, r12 - ldrh r0, [r7] - cmp r0, r6 - beq _081441D8 - adds r0, r5, 0 - adds r0, 0x8 - adds r0, r3 - ldrh r0, [r0] - ldrh r3, [r4] - cmp r0, r3 - bne _081441DC -_081441D8: - movs r0, 0x1 - b _081441E8 -_081441DC: - movs r7, 0x2 - add r12, r7 - adds r1, 0x1 - cmp r1, r2 - blt _081441C0 -_081441E6: - movs r0, 0 -_081441E8: - pop {r4-r7} - pop {r1} - bx r1 - thumb_func_end sub_81441AC - - thumb_func_start sub_81441F0 -sub_81441F0: @ 81441F0 - push {lr} - adds r1, r0, 0 - ldrh r0, [r1, 0x2] - cmp r0, 0 - beq _08144210 - ldrh r1, [r1] - cmp r1, 0 - beq _08144210 - ldr r0, _0814420C @ =0x0000019b - cmp r1, r0 - bhi _08144210 - movs r0, 0x1 - b _08144212 - .align 2, 0 -_0814420C: .4byte 0x0000019b -_08144210: - movs r0, 0 -_08144212: - pop {r1} - bx r1 - thumb_func_end sub_81441F0 - - thumb_func_start sub_8144218 -sub_8144218: @ 8144218 - push {lr} - bl sub_8143FC8 - cmp r0, 0 - beq _0814424C - ldr r0, _08144240 @ =gSaveBlock1Ptr - ldr r3, [r0] - ldr r0, _08144244 @ =0x000032e4 - adds r2, r3, r0 - ldrb r1, [r2, 0x8] - movs r0, 0x3 - ands r0, r1 - cmp r0, 0x1 - bne _0814424C - ldr r1, _08144248 @ =0x00003434 - adds r0, r3, r1 - ldrb r1, [r2, 0x9] - bl sub_8144184 - b _0814424E - .align 2, 0 -_08144240: .4byte gSaveBlock1Ptr -_08144244: .4byte 0x000032e4 -_08144248: .4byte 0x00003434 -_0814424C: - movs r0, 0 -_0814424E: - pop {r1} - bx r1 - thumb_func_end sub_8144218 - thumb_func_start sub_8144254 -sub_8144254: @ 8144254 +sub_8144254: @ 8144254sub_81441F0 push {r4-r6,lr} adds r5, r0, 0 ldr r6, _08144280 @ =gSaveBlock1Ptr diff --git a/include/global.h b/include/global.h index df2926d0b..04f89802c 100644 --- a/include/global.h +++ b/include/global.h @@ -628,7 +628,7 @@ struct MEventBuffer_3430_Sub { u8 filler_00[6]; u16 unk_06; - u8 filler_08[28]; + u16 unk_08[2][7]; }; struct MEventBuffer_3430 diff --git a/src/mevent.c b/src/mevent.c index f61f7b7a2..5d45a0243 100644 --- a/src/mevent.c +++ b/src/mevent.c @@ -1,5 +1,6 @@ #include "global.h" #include "constants/songs.h" +#include "constants/species.h" #include "malloc.h" #include "sound.h" #include "easy_chat.h" @@ -72,6 +73,8 @@ extern const u8 gUnknown_841DE9C[]; extern const u8 gUnknownSerialData_Start[]; extern const u8 gUnknownSerialData_End[]; +extern const u16 gUnknown_8466F00[]; + struct MEvent_Str_1 gUnknown_3005ED0; void sub_81435DC(struct MEvent_Str_1 *a0, size_t a1, const void * a2) @@ -628,3 +631,86 @@ void sub_814407C(void) CpuFill32(0, &gSaveBlock1Ptr->unk_3120.buffer_1c0.data, sizeof(struct MEventBuffer_32E0_Sub)); gSaveBlock1Ptr->unk_3120.buffer_1c0.crc = 0; } + +void sub_81440B4(void) +{ + CpuFill32(0, sav1_get_mevent_buffer_2(), 18 * sizeof(u16)); + gSaveBlock1Ptr->unk_3120.buffer_310.crc = 0; +} + +u16 sub_81440E8(void) +{ + if (sub_8143FC8()) + return gSaveBlock1Ptr->unk_3120.buffer_1c0.data.unk_00; + return 0; +} + +void sub_814410C(struct MEventBuffer_32E0_Sub * buffer) +{ + if (buffer->unk_08_6 == 1) + buffer->unk_08_6 = 0; +} + +bool32 sub_8144124(u16 a0) +{ + if (a0 >= 1000 && a0 < 1020) + return TRUE; + return FALSE; +} + +bool32 sub_8144144(void) +{ + u16 value = sub_81440E8(); + if (!sub_8144124(value)) + return FALSE; + if (FlagGet(gUnknown_8466F00[value - 1000]) == TRUE) + return FALSE; + return TRUE; +} + +s32 sub_8144184(const struct MEventBuffer_3430_Sub * data, s32 size) +{ + s32 r3 = 0; + s32 i; + for (i = 0; i < size; i++) + { + if (data->unk_08[1][i] && data->unk_08[0][i]) + r3++; + } + return r3; +} + +bool32 sub_81441AC(const struct MEventBuffer_3430_Sub * data1, const u16 * data2, s32 size) +{ + s32 i; + for (i = 0; i < size; i++) + { + if (data1->unk_08[1][i] == data2[1]) + return TRUE; + if (data1->unk_08[0][i] == data2[0]) + return TRUE; + } + return FALSE; +} + +bool32 sub_81441F0(const u16 * data) +{ + if (data[1] == 0) + return FALSE; + if (data[0] == 0) + return FALSE; + if (data[0] >= NUM_SPECIES) + return FALSE; + return TRUE; +} + +bool32 sub_8144218(void) +{ + struct MEventBuffer_32E0_Sub * data; + if (!sub_8143FC8()) + return FALSE; + data = &gSaveBlock1Ptr->unk_3120.buffer_1c0.data; + if (data->unk_08_0 != 1) + return FALSE; + return sub_8144184(&gSaveBlock1Ptr->unk_3120.buffer_310.data, data->unk_09); +} -- cgit v1.2.3 From d68f434a527d185e2968d8da418fa74110090c79 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Thu, 29 Nov 2018 18:48:06 -0500 Subject: through sub_814449C --- asm/mevent.s | 328 ------------------------------------------------------- include/main.h | 3 + include/mevent.h | 18 +++ src/mevent.c | 109 +++++++++++++++++- 4 files changed, 127 insertions(+), 331 deletions(-) diff --git a/asm/mevent.s b/asm/mevent.s index 19c6248ae..0e02d5b2b 100644 --- a/asm/mevent.s +++ b/asm/mevent.s @@ -5,334 +5,6 @@ .text - thumb_func_start sub_8144254 -sub_8144254: @ 8144254sub_81441F0 - push {r4-r6,lr} - adds r5, r0, 0 - ldr r6, _08144280 @ =gSaveBlock1Ptr - ldr r0, [r6] - ldr r1, _08144284 @ =0x000032e4 - adds r0, r1 - ldrb r4, [r0, 0x9] - adds r0, r5, 0 - bl sub_81441F0 - cmp r0, 0 - beq _081442BE - ldr r0, [r6] - ldr r1, _08144288 @ =0x00003434 - adds r0, r1 - adds r1, r5, 0 - adds r2, r4, 0 - bl sub_81441AC - cmp r0, 0 - beq _08144298 - b _081442BE - .align 2, 0 -_08144280: .4byte gSaveBlock1Ptr -_08144284: .4byte 0x000032e4 -_08144288: .4byte 0x00003434 -_0814428C: - ldrh r0, [r5, 0x2] - strh r0, [r1] - ldrh r0, [r5] - strh r0, [r2] - movs r0, 0x1 - b _081442C0 -_08144298: - movs r3, 0 - cmp r3, r4 - bge _081442BE - ldr r0, [r6] - ldr r6, _081442C8 @ =0x0000343c - adds r2, r0, r6 - adds r6, 0xE - adds r1, r0, r6 -_081442A8: - ldrh r0, [r2, 0xE] - cmp r0, 0 - bne _081442B4 - ldrh r0, [r2] - cmp r0, 0 - beq _0814428C -_081442B4: - adds r2, 0x2 - adds r1, 0x2 - adds r3, 0x1 - cmp r3, r4 - blt _081442A8 -_081442BE: - movs r0, 0 -_081442C0: - pop {r4-r6} - pop {r1} - bx r1 - .align 2, 0 -_081442C8: .4byte 0x0000343c - thumb_func_end sub_8144254 - - thumb_func_start sub_81442CC -sub_81442CC: @ 81442CC - push {r4-r7,lr} - mov r7, r10 - mov r6, r9 - mov r5, r8 - push {r5-r7} - sub sp, 0x4 - adds r4, r0, 0 - movs r0, 0 - str r0, [sp] - ldr r2, _08144328 @ =0x05000019 - mov r0, sp - adds r1, r4, 0 - bl CpuSet - ldr r0, _0814432C @ =0x00000101 - str r0, [r4] - movs r0, 0x1 - strh r0, [r4, 0x4] - str r0, [r4, 0x8] - strh r0, [r4, 0xC] - str r0, [r4, 0x10] - bl sub_8143FC8 - cmp r0, 0 - beq _08144330 - bl sav1_get_mevent_buffer_1 - ldrh r0, [r0] - strh r0, [r4, 0x14] - bl sav1_get_mevent_buffer_2 - adds r1, r4, 0 - adds r1, 0x20 - ldm r0!, {r2,r3,r5} - stm r1!, {r2,r3,r5} - ldm r0!, {r2,r3,r5} - stm r1!, {r2,r3,r5} - ldm r0!, {r2,r3,r5} - stm r1!, {r2,r3,r5} - bl sav1_get_mevent_buffer_1 - ldrb r1, [r0, 0x9] - adds r0, r4, 0 - adds r0, 0x44 - strb r1, [r0] - b _08144332 - .align 2, 0 -_08144328: .4byte 0x05000019 -_0814432C: .4byte 0x00000101 -_08144330: - strh r0, [r4, 0x14] -_08144332: - adds r5, r4, 0 - adds r5, 0x4C - ldr r0, _081443BC @ =gSaveBlock2Ptr - mov r8, r0 - adds r6, r4, 0 - adds r6, 0x45 - adds r7, r4, 0 - adds r7, 0x50 - movs r1, 0x5C - adds r1, r4 - mov r9, r1 - movs r2, 0x60 - adds r2, r4 - mov r10, r2 - ldr r0, _081443C0 @ =gSaveBlock1Ptr - ldr r0, [r0] - ldr r3, _081443C4 @ =0x00003458 - adds r2, r0, r3 - adds r1, r4, 0 - adds r1, 0x16 - movs r3, 0x3 -_0814435C: - ldrh r0, [r2] - strh r0, [r1] - adds r2, 0x2 - adds r1, 0x2 - subs r3, 0x1 - cmp r3, 0 - bge _0814435C - mov r0, r8 - ldr r1, [r0] - adds r1, 0xA - adds r0, r5, 0 - bl CopyUnalignedWord - mov r2, r8 - ldr r1, [r2] - adds r0, r6, 0 - bl StringCopy - ldr r0, _081443C0 @ =gSaveBlock1Ptr - ldr r0, [r0] - ldr r3, _081443C8 @ =0x00002ca0 - adds r2, r0, r3 - adds r1, r7, 0 - movs r3, 0x5 -_0814438C: - ldrh r0, [r2] - strh r0, [r1] - adds r2, 0x2 - adds r1, 0x2 - subs r3, 0x1 - cmp r3, 0 - bge _0814438C - ldr r1, _081443CC @ =RomHeaderGameCode - mov r0, r9 - movs r2, 0x4 - bl memcpy - ldr r0, _081443D0 @ =RomHeaderSoftwareVersion - ldrb r0, [r0] - mov r5, r10 - strb r0, [r5] - add sp, 0x4 - pop {r3-r5} - mov r8, r3 - mov r9, r4 - mov r10, r5 - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_081443BC: .4byte gSaveBlock2Ptr -_081443C0: .4byte gSaveBlock1Ptr -_081443C4: .4byte 0x00003458 -_081443C8: .4byte 0x00002ca0 -_081443CC: .4byte RomHeaderGameCode -_081443D0: .4byte RomHeaderSoftwareVersion - thumb_func_end sub_81442CC - - thumb_func_start sub_81443D4 -sub_81443D4: @ 81443D4 - push {lr} - adds r2, r0, 0 - ldr r1, [r2] - ldr r0, _0814440C @ =0x00000101 - cmp r1, r0 - bne _08144410 - ldrh r1, [r2, 0x4] - movs r3, 0x1 - adds r0, r3, 0 - ands r0, r1 - cmp r0, 0 - beq _08144410 - ldr r0, [r2, 0x8] - ands r0, r3 - cmp r0, 0 - beq _08144410 - ldrh r1, [r2, 0xC] - adds r0, r3, 0 - ands r0, r1 - cmp r0, 0 - beq _08144410 - ldr r0, [r2, 0x10] - movs r1, 0xF - ands r0, r1 - cmp r0, 0 - beq _08144410 - movs r0, 0x1 - b _08144412 - .align 2, 0 -_0814440C: .4byte 0x00000101 -_08144410: - movs r0, 0 -_08144412: - pop {r1} - bx r1 - thumb_func_end sub_81443D4 - - thumb_func_start sub_8144418 -sub_8144418: @ 8144418 - push {lr} - ldrh r1, [r1, 0x14] - cmp r1, 0 - bne _08144424 - movs r0, 0 - b _08144430 -_08144424: - ldrh r0, [r0] - cmp r0, r1 - beq _0814442E - movs r0, 0x2 - b _08144430 -_0814442E: - movs r0, 0x1 -_08144430: - pop {r1} - bx r1 - thumb_func_end sub_8144418 - - thumb_func_start sub_8144434 -sub_8144434: @ 8144434 - push {r4-r6,lr} - adds r6, r0, 0 - adds r4, r1, 0 - adds r5, r4, 0 - adds r5, 0x20 - adds r4, 0x44 - ldrb r1, [r4] - adds r0, r5, 0 - bl sub_8144184 - ldrb r2, [r4] - subs r4, r2, r0 - cmp r4, 0 - bne _08144454 - movs r0, 0x1 - b _0814446E -_08144454: - adds r0, r5, 0 - adds r1, r6, 0 - bl sub_81441AC - cmp r0, 0 - beq _08144464 - movs r0, 0x3 - b _0814446E -_08144464: - cmp r4, 0x1 - beq _0814446C - movs r0, 0x2 - b _0814446E -_0814446C: - movs r0, 0x4 -_0814446E: - pop {r4-r6} - pop {r1} - bx r1 - thumb_func_end sub_8144434 - - thumb_func_start sub_8144474 -sub_8144474: @ 8144474 - push {r4,lr} - movs r3, 0 - adds r2, r0, 0 - adds r2, 0x16 -_0814447C: - ldrh r0, [r2] - ldrh r4, [r1] - cmp r0, r4 - beq _08144488 - movs r0, 0 - b _08144494 -_08144488: - adds r1, 0x2 - adds r2, 0x2 - adds r3, 0x1 - cmp r3, 0x3 - ble _0814447C - movs r0, 0x1 -_08144494: - pop {r4} - pop {r1} - bx r1 - thumb_func_end sub_8144474 - - thumb_func_start sub_814449C -sub_814449C: @ 814449C - push {lr} - adds r2, r0, 0 - adds r2, 0x20 - adds r0, 0x44 - ldrb r1, [r0] - adds r0, r2, 0 - bl sub_8144184 - pop {r1} - bx r1 - thumb_func_end sub_814449C - thumb_func_start sub_81444B0 sub_81444B0: @ 81444B0 push {lr} diff --git a/include/main.h b/include/main.h index 0fe138d1f..adbf1fb5d 100644 --- a/include/main.h +++ b/include/main.h @@ -66,4 +66,7 @@ void DoSoftReset(void); void ClearPokemonCrySongs(void); void RestoreSerialTimer3IntrHandlers(void); +extern const char RomHeaderGameCode[4]; +extern const char RomHeaderSoftwareVersion; + #endif // GUARD_MAIN_H diff --git a/include/mevent.h b/include/mevent.h index 7df669da3..ae301263f 100644 --- a/include/mevent.h +++ b/include/mevent.h @@ -3,6 +3,24 @@ #include "global.h" +struct MEventStruct_Unk1442CC +{ + u32 unk_00; + u16 unk_04; + u32 unk_08; + u16 unk_0C; + u32 unk_10; + u16 unk_14; + u16 unk_16[4]; + struct MEventBuffer_3430_Sub unk_20; + u8 unk_44; + u8 unk_45[7]; + u8 unk_4C[4]; + u16 unk_50[6]; + u8 unk_5C[4]; + u8 unk_60; +}; + struct MysteryEventStruct * sub_8143D94(void); bool32 sub_8143E1C(void); diff --git a/src/mevent.c b/src/mevent.c index 5d45a0243..d24219f49 100644 --- a/src/mevent.c +++ b/src/mevent.c @@ -14,7 +14,10 @@ #include "script.h" #include "event_data.h" #include "battle_tower.h" +#include "new_game.h" +#include "string_util.h" #include "menews_jisan.h" +#include "mevent.h" struct MEvent_Str_1 { @@ -704,13 +707,113 @@ bool32 sub_81441F0(const u16 * data) return TRUE; } -bool32 sub_8144218(void) +s32 sub_8144218(void) { struct MEventBuffer_32E0_Sub * data; if (!sub_8143FC8()) - return FALSE; + return 0; data = &gSaveBlock1Ptr->unk_3120.buffer_1c0.data; if (data->unk_08_0 != 1) - return FALSE; + return 0; return sub_8144184(&gSaveBlock1Ptr->unk_3120.buffer_310.data, data->unk_09); } + +bool32 sub_8144254(const u16 * data) +{ + struct MEventBuffer_32E0_Sub * buffer = &gSaveBlock1Ptr->unk_3120.buffer_1c0.data; + s32 size = buffer->unk_09; + s32 i; + if (!sub_81441F0(data)) + return FALSE; + if (sub_81441AC(&gSaveBlock1Ptr->unk_3120.buffer_310.data, data, size)) + return FALSE; + for (i = 0; i < size; i++) + { + if (gSaveBlock1Ptr->unk_3120.buffer_310.data.unk_08[1][i] == 0 && gSaveBlock1Ptr->unk_3120.buffer_310.data.unk_08[0][i] == 0) + { + gSaveBlock1Ptr->unk_3120.buffer_310.data.unk_08[1][i] = data[1]; + gSaveBlock1Ptr->unk_3120.buffer_310.data.unk_08[0][i] = data[0]; + return TRUE; + } + } + return FALSE; +} + +void sub_81442CC(struct MEventStruct_Unk1442CC * data) +{ + s32 i; + CpuFill32(0, data, sizeof(struct MEventStruct_Unk1442CC)); + data->unk_00 = 0x101; + data->unk_04 = 1; + data->unk_08 = 1; + data->unk_0C = 1; + data->unk_10 = 1; + if (sub_8143FC8()) + { + data->unk_14 = sav1_get_mevent_buffer_1()->unk_00; + data->unk_20 = *sav1_get_mevent_buffer_2(); + data->unk_44 = sav1_get_mevent_buffer_1()->unk_09; + } + else + data->unk_14 = 0; + for (i = 0; i < 4; i++) + data->unk_16[i] = gSaveBlock1Ptr->unk_3120.unk_338[i]; + CopyUnalignedWord(data->unk_4C, gSaveBlock2Ptr->playerTrainerId); + StringCopy(data->unk_45, gSaveBlock2Ptr->playerName); + for (i = 0; i < 6; i++) + data->unk_50[i] = gSaveBlock1Ptr->unk2CA0[i]; + memcpy(data->unk_5C, RomHeaderGameCode, 4); + data->unk_60 = RomHeaderSoftwareVersion; +} + +bool32 sub_81443D4(const struct MEventStruct_Unk1442CC * data) +{ + if (data->unk_00 != 0x101) + return FALSE; + if (!(data->unk_04 & 1)) + return FALSE; + if (!(data->unk_08 & 1)) + return FALSE; + if (!(data->unk_0C & 1)) + return FALSE; + if (!(data->unk_10 & 0x0F)) + return FALSE; + return TRUE; +} + +u32 sub_8144418(const u16 * a0, const struct MEventStruct_Unk1442CC * a1) +{ + if (a1->unk_14 == 0) + return 0; + if (*a0 == a1->unk_14) + return 1; + return 2; +} + +u32 sub_8144434(const u16 * a0, const struct MEventStruct_Unk1442CC * a1) +{ + s32 r4 = a1->unk_44 - sub_8144184(&a1->unk_20, a1->unk_44); + if (r4 == 0) + return 1; + if (sub_81441AC(&a1->unk_20, a0, a1->unk_44)) + return 3; + if (r4 == 1) + return 4; + return 2; +} + +bool32 sub_8144474(const struct MEventStruct_Unk1442CC * a0, const u16 * a1) +{ + s32 i; + for (i = 0; i < 4; i++) + { + if (a0->unk_16[i] != a1[i]) + return FALSE; + } + return TRUE; +} + +s32 sub_814449C(const struct MEventStruct_Unk1442CC * a0) +{ + return sub_8144184(&a0->unk_20, a0->unk_44); +} -- cgit v1.2.3 From 939ae833c3364d7ea7543c4db56df5c90b4e9d8d Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Thu, 29 Nov 2018 19:17:38 -0500 Subject: through sub_81445C0 --- asm/mevent.s | 259 ---------------------------------------------------- data/data_845FD54.s | 86 ----------------- data/data_8466FB8.s | 76 +++++++++++++++ include/global.h | 4 +- ld_script.txt | 2 + src/mevent.c | 135 ++++++++++++++++++++++++++- 6 files changed, 215 insertions(+), 347 deletions(-) create mode 100644 data/data_8466FB8.s diff --git a/asm/mevent.s b/asm/mevent.s index 0e02d5b2b..819179c2b 100644 --- a/asm/mevent.s +++ b/asm/mevent.s @@ -5,265 +5,6 @@ .text - thumb_func_start sub_81444B0 -sub_81444B0: @ 81444B0 - push {lr} - adds r2, r0, 0 - cmp r1, 0x4 - bhi _081444FC - lsls r0, r1, 2 - ldr r1, _081444C4 @ =_081444C8 - adds r0, r1 - ldr r0, [r0] - mov pc, r0 - .align 2, 0 -_081444C4: .4byte _081444C8 - .align 2, 0 -_081444C8: - .4byte _081444DC - .4byte _081444E0 - .4byte _081444E4 - .4byte _081444E8 - .4byte _081444F4 -_081444DC: - ldrh r0, [r2, 0x20] - b _0814450A -_081444E0: - ldrh r0, [r2, 0x22] - b _0814450A -_081444E4: - ldrh r0, [r2, 0x24] - b _0814450A -_081444E8: - adds r0, r2, 0 - bl sub_814449C - lsls r0, 16 - lsrs r0, 16 - b _0814450A -_081444F4: - adds r0, r2, 0 - adds r0, 0x44 - ldrb r0, [r0] - b _0814450A -_081444FC: - ldr r0, _08144510 @ =gUnknown_8466F28 "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/mevent.c" - ldr r1, _08144514 @ =0x00000339 - ldr r2, _08144518 @ =gUnknown_8466F5C "0" - movs r3, 0x1 - bl AGBAssert - movs r0, 0 -_0814450A: - pop {r1} - bx r1 - .align 2, 0 -_08144510: .4byte gUnknown_8466F28 -_08144514: .4byte 0x00000339 -_08144518: .4byte gUnknown_8466F5C - thumb_func_end sub_81444B0 - - thumb_func_start sub_814451C -sub_814451C: @ 814451C - push {r4,lr} - adds r4, r0, 0 - ldr r2, _08144544 @ =gSaveBlock1Ptr - ldr r0, [r2] - ldr r1, _08144548 @ =0x000032e4 - adds r0, r1 - ldrb r1, [r0, 0x8] - movs r0, 0x3 - ands r0, r1 - adds r3, r2, 0 - cmp r0, 0x2 - bne _081445B6 - movs r2, 0 - cmp r4, 0x4 - bhi _08144582 - lsls r0, r4, 2 - ldr r1, _0814454C @ =_08144550 - adds r0, r1 - ldr r0, [r0] - mov pc, r0 - .align 2, 0 -_08144544: .4byte gSaveBlock1Ptr -_08144548: .4byte 0x000032e4 -_0814454C: .4byte _08144550 - .align 2, 0 -_08144550: - .4byte _08144564 - .4byte _08144570 - .4byte _0814457C - .4byte _08144582 - .4byte _08144582 -_08144564: - ldr r0, [r3] - ldr r1, _0814456C @ =0x00003434 - b _08144580 - .align 2, 0 -_0814456C: .4byte 0x00003434 -_08144570: - ldr r0, [r3] - ldr r1, _08144578 @ =0x00003436 - b _08144580 - .align 2, 0 -_08144578: .4byte 0x00003436 -_0814457C: - ldr r0, [r3] - ldr r1, _08144598 @ =0x00003438 -_08144580: - adds r2, r0, r1 -_08144582: - cmp r2, 0 - bne _081445A4 - ldr r0, _0814459C @ =gUnknown_8466F28 "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/mevent.c" - movs r1, 0xD9 - lsls r1, 2 - ldr r2, _081445A0 @ =gUnknown_8466F5C "0" - movs r3, 0x1 - bl AGBAssert - b _081445B6 - .align 2, 0 -_08144598: .4byte 0x00003438 -_0814459C: .4byte gUnknown_8466F28 -_081445A0: .4byte gUnknown_8466F5C -_081445A4: - ldrh r0, [r2] - adds r0, 0x1 - strh r0, [r2] - lsls r0, 16 - lsrs r0, 16 - ldr r1, _081445BC @ =0x000003e7 - cmp r0, r1 - bls _081445B6 - strh r1, [r2] -_081445B6: - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_081445BC: .4byte 0x000003e7 - thumb_func_end sub_814451C - - thumb_func_start sub_81445C0 -sub_81445C0: @ 81445C0 - push {lr} - cmp r0, 0x4 - bhi _081446A4 - lsls r0, 2 - ldr r1, _081445D0 @ =_081445D4 - adds r0, r1 - ldr r0, [r0] - mov pc, r0 - .align 2, 0 -_081445D0: .4byte _081445D4 - .align 2, 0 -_081445D4: - .4byte _081445E8 - .4byte _08144610 - .4byte _08144638 - .4byte _08144660 - .4byte _08144684 -_081445E8: - ldr r0, _08144604 @ =gSaveBlock1Ptr - ldr r2, [r0] - ldr r1, _08144608 @ =0x000032e4 - adds r0, r2, r1 - ldrb r1, [r0, 0x8] - movs r0, 0x3 - ands r0, r1 - cmp r0, 0x2 - bne _081446A4 - ldr r1, _0814460C @ =0x00003434 - adds r0, r2, r1 - ldrh r0, [r0] - b _081446B2 - .align 2, 0 -_08144604: .4byte gSaveBlock1Ptr -_08144608: .4byte 0x000032e4 -_0814460C: .4byte 0x00003434 -_08144610: - ldr r0, _0814462C @ =gSaveBlock1Ptr - ldr r2, [r0] - ldr r1, _08144630 @ =0x000032e4 - adds r0, r2, r1 - ldrb r1, [r0, 0x8] - movs r0, 0x3 - ands r0, r1 - cmp r0, 0x2 - bne _081446A4 - ldr r1, _08144634 @ =0x00003434 - adds r0, r2, r1 - ldrh r0, [r0, 0x2] - b _081446B2 - .align 2, 0 -_0814462C: .4byte gSaveBlock1Ptr -_08144630: .4byte 0x000032e4 -_08144634: .4byte 0x00003434 -_08144638: - ldr r0, _08144654 @ =gSaveBlock1Ptr - ldr r2, [r0] - ldr r1, _08144658 @ =0x000032e4 - adds r0, r2, r1 - ldrb r1, [r0, 0x8] - movs r0, 0x3 - ands r0, r1 - cmp r0, 0x2 - bne _081446A4 - ldr r1, _0814465C @ =0x00003434 - adds r0, r2, r1 - ldrh r0, [r0, 0x4] - b _081446B2 - .align 2, 0 -_08144654: .4byte gSaveBlock1Ptr -_08144658: .4byte 0x000032e4 -_0814465C: .4byte 0x00003434 -_08144660: - ldr r0, _0814467C @ =gSaveBlock1Ptr - ldr r0, [r0] - ldr r1, _08144680 @ =0x000032e4 - adds r0, r1 - ldrb r1, [r0, 0x8] - movs r0, 0x3 - ands r0, r1 - cmp r0, 0x1 - bne _081446A4 - bl sub_8144218 - lsls r0, 16 - lsrs r0, 16 - b _081446B2 - .align 2, 0 -_0814467C: .4byte gSaveBlock1Ptr -_08144680: .4byte 0x000032e4 -_08144684: - ldr r0, _0814469C @ =gSaveBlock1Ptr - ldr r0, [r0] - ldr r1, _081446A0 @ =0x000032e4 - adds r2, r0, r1 - ldrb r1, [r2, 0x8] - movs r0, 0x3 - ands r0, r1 - cmp r0, 0x1 - bne _081446A4 - ldrb r0, [r2, 0x9] - b _081446B2 - .align 2, 0 -_0814469C: .4byte gSaveBlock1Ptr -_081446A0: .4byte 0x000032e4 -_081446A4: - ldr r0, _081446B8 @ =gUnknown_8466F28 "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/mevent.c" - ldr r1, _081446BC @ =0x00000391 - ldr r2, _081446C0 @ =gUnknown_8466F5C "0" - movs r3, 0x1 - bl AGBAssert - movs r0, 0 -_081446B2: - pop {r1} - bx r1 - .align 2, 0 -_081446B8: .4byte gUnknown_8466F28 -_081446BC: .4byte 0x00000391 -_081446C0: .4byte gUnknown_8466F5C - thumb_func_end sub_81445C0 - thumb_func_start sub_81446C4 sub_81446C4: @ 81446C4 ldr r1, _081446CC @ =gUnknown_203F3BC diff --git a/data/data_845FD54.s b/data/data_845FD54.s index d2b52192d..d05e14570 100644 --- a/data/data_845FD54.s +++ b/data/data_845FD54.s @@ -598,89 +598,3 @@ gUnknown_8466EE8:: @ 8466EE8 gUnknown_8466EF0:: @ 8466EF0 .incbin "baserom.gba", 0x466EF0, 0x10 - -gUnknown_8466F00:: @ 8466F00 - .incbin "baserom.gba", 0x466F00, 0x28 - - .align 2 -gUnknown_8466F28:: @ 8466F28 - .asciz "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/mevent.c" - - .align 2 -gUnknown_8466F5C:: @ 8466F5C - .asciz "0" - - .align 2 -gUnknown_8466F60:: @ 8466F60 - .incbin "baserom.gba", 0x466F60, 0x20 - - .align 2 -gUnknown_8466F80:: @ 8466F80 - .asciz "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/mevent_server.c" - - .align 2 -gUnknown_8466FB8:: @ 8466FB8 - .asciz "size <= ME_SEND_BUF_SIZE" - - .align 2 -gUnknown_8466FD4:: @ 8466FD4 - .asciz "cmd->parameter == NULL" - - .align 2 -gUnknown_8466FEC:: @ 8466FEC - .asciz "cmd->flag == FALSE" - - .align 2 -gUnknown_8467000:: @ 8467000 - .asciz "cmd->flag == FALSE && cmd->parameter == NULL" - - .align 2 -gUnknown_8467030:: @ 8467030 - .incbin "baserom.gba", 0x467030, 0x14 - - .align 2 -gUnknown_8467044:: @ 8467044 - .asciz "svr->mainseqno < NELEMS(func_tbl)" - - .align 2 -gUnknown_8467068:: @ 8467068 - .incbin "baserom.gba", 0x467068, 0x8 - -gUnknown_8467070:: @ 8467070 - .incbin "baserom.gba", 0x467070, 0x4 - -gUnknown_8467074:: @ 8467074 - .incbin "baserom.gba", 0x467074, 0xEE4 - -gUnknown_8467F58:: @ 8467F58 - .incbin "baserom.gba", 0x467F58, 0x8 - -gUnknown_8467F60:: @ 8467F60 - .incbin "baserom.gba", 0x467F60, 0x40 - -gUnknown_8467FA0:: @ 8467FA0 - .incbin "baserom.gba", 0x467FA0, 0x18 - -gUnknown_8467FB8:: @ 8467FB8 - .incbin "baserom.gba", 0x467FB8, 0x80 - -gUnknown_8468038:: @ 8468038 - .incbin "baserom.gba", 0x468038, 0x8 - -gUnknown_8468040:: @ 8468040 - .incbin "baserom.gba", 0x468040, 0x10 - -gUnknown_8468050:: @ 8468050 - .incbin "baserom.gba", 0x468050, 0x6D0 - -gUnknown_8468720:: @ 8468720 - .incbin "baserom.gba", 0x468720, 0xC0 - -gUnknown_84687E0:: @ 84687E0 - .incbin "baserom.gba", 0x4687E0, 0x38C - -gUnknown_8468B6C:: @ 8468B6C - .incbin "baserom.gba", 0x468B6C, 0x60 - -gUnknown_8468BCC:: @ 8468BCC - .incbin "baserom.gba", 0x468BCC, 0x90 diff --git a/data/data_8466FB8.s b/data/data_8466FB8.s new file mode 100644 index 000000000..3f4fd49cd --- /dev/null +++ b/data/data_8466FB8.s @@ -0,0 +1,76 @@ + .section .rodata + + .align 2 +gUnknown_8466F60:: @ 8466F60 + .incbin "baserom.gba", 0x466F60, 0x20 + + .align 2 +gUnknown_8466F80:: @ 8466F80 + .asciz "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/mevent_server.c" + + .align 2 +gUnknown_8466FB8:: @ 8466FB8 + .asciz "size <= ME_SEND_BUF_SIZE" + + .align 2 +gUnknown_8466FD4:: @ 8466FD4 + .asciz "cmd->parameter == NULL" + + .align 2 +gUnknown_8466FEC:: @ 8466FEC + .asciz "cmd->flag == FALSE" + + .align 2 +gUnknown_8467000:: @ 8467000 + .asciz "cmd->flag == FALSE && cmd->parameter == NULL" + + .align 2 +gUnknown_8467030:: @ 8467030 + .incbin "baserom.gba", 0x467030, 0x14 + + .align 2 +gUnknown_8467044:: @ 8467044 + .asciz "svr->mainseqno < NELEMS(func_tbl)" + + .align 2 +gUnknown_8467068:: @ 8467068 + .incbin "baserom.gba", 0x467068, 0x8 + +gUnknown_8467070:: @ 8467070 + .incbin "baserom.gba", 0x467070, 0x4 + +gUnknown_8467074:: @ 8467074 + .incbin "baserom.gba", 0x467074, 0xEE4 + +gUnknown_8467F58:: @ 8467F58 + .incbin "baserom.gba", 0x467F58, 0x8 + +gUnknown_8467F60:: @ 8467F60 + .incbin "baserom.gba", 0x467F60, 0x40 + +gUnknown_8467FA0:: @ 8467FA0 + .incbin "baserom.gba", 0x467FA0, 0x18 + +gUnknown_8467FB8:: @ 8467FB8 + .incbin "baserom.gba", 0x467FB8, 0x80 + +gUnknown_8468038:: @ 8468038 + .incbin "baserom.gba", 0x468038, 0x8 + +gUnknown_8468040:: @ 8468040 + .incbin "baserom.gba", 0x468040, 0x10 + +gUnknown_8468050:: @ 8468050 + .incbin "baserom.gba", 0x468050, 0x6D0 + +gUnknown_8468720:: @ 8468720 + .incbin "baserom.gba", 0x468720, 0xC0 + +gUnknown_84687E0:: @ 84687E0 + .incbin "baserom.gba", 0x4687E0, 0x38C + +gUnknown_8468B6C:: @ 8468B6C + .incbin "baserom.gba", 0x468B6C, 0x60 + +gUnknown_8468BCC:: @ 8468BCC + .incbin "baserom.gba", 0x468BCC, 0x90 diff --git a/include/global.h b/include/global.h index 04f89802c..92e6b7da1 100644 --- a/include/global.h +++ b/include/global.h @@ -626,7 +626,9 @@ struct MEventBuffer_32E0 struct MEventBuffer_3430_Sub { - u8 filler_00[6]; + u16 unk_00; + u16 unk_02; + u16 unk_04; u16 unk_06; u16 unk_08[2][7]; }; diff --git a/ld_script.txt b/ld_script.txt index bef37772a..91bd070af 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -379,6 +379,8 @@ SECTIONS { data/data_83FECCC.o(.rodata.8456C74); src/fame_checker.o(.rodata); data/data_845FD54.o(.rodata); + src/mevent.o(.rodata); + data/data_8466FB8.o(.rodata); src/menews_jisan.o(.rodata); src/menews_jisan.o(.rodata.str1.4); data/data_8468C98.o(.rodata); diff --git a/src/mevent.c b/src/mevent.c index d24219f49..bf2d2c1a5 100644 --- a/src/mevent.c +++ b/src/mevent.c @@ -76,7 +76,28 @@ extern const u8 gUnknown_841DE9C[]; extern const u8 gUnknownSerialData_Start[]; extern const u8 gUnknownSerialData_End[]; -extern const u16 gUnknown_8466F00[]; +const u16 gUnknown_8466F00[] = { + 0x02a7, + 0x02a8, + 0x02a9, + 0x02aa, + 0x02ab, + 0x02ac, + 0x02ad, + 0x02ae, + 0x02af, + 0x02b0, + 0x02b1, + 0x02b2, + 0x02b3, + 0x02b4, + 0x02b5, + 0x02b6, + 0x02b7, + 0x02b8, + 0x02b9, + 0x02ba +}; struct MEvent_Str_1 gUnknown_3005ED0; @@ -817,3 +838,115 @@ s32 sub_814449C(const struct MEventStruct_Unk1442CC * a0) { return sub_8144184(&a0->unk_20, a0->unk_44); } + +//TODO: Remove these later +const char ALIGNED(4) gUnknown_8466F28[] = "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/mevent.c"; +const char ALIGNED(4) gUnknown_8466F5C[] = "0"; + +u16 sub_81444B0(const struct MEventStruct_Unk1442CC * a0, u32 command) +{ + switch (command) + { + case 0: + return a0->unk_20.unk_00; + case 1: + return a0->unk_20.unk_02; + case 2: + return a0->unk_20.unk_04; + case 3: + return sub_814449C(a0); + case 4: + return a0->unk_44; + default: + AGBAssert(gUnknown_8466F28, 825, gUnknown_8466F5C, 1); + // AGB_ASSERT_EX(0, "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/mevent.c", 825); + return 0; + } +} + +void sub_814451C(u32 command) +{ + struct MEventBuffer_32E0_Sub * data = &gSaveBlock1Ptr->unk_3120.buffer_1c0.data; + if (data->unk_08_0 == 2) + { + u16 * dest = NULL; + switch (command) + { + case 0: + dest = &gSaveBlock1Ptr->unk_3120.buffer_310.data.unk_00; + break; + case 1: + dest = &gSaveBlock1Ptr->unk_3120.buffer_310.data.unk_02; + break; + case 2: + dest = &gSaveBlock1Ptr->unk_3120.buffer_310.data.unk_04; + break; + case 3: + break; + case 4: + break; + } + if (dest == NULL) + { + AGBAssert(gUnknown_8466F28, 868, gUnknown_8466F5C, 1); + // AGB_ASSERT_EX(0, "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/mevent.c", 868); + } + else if (++(*dest) > 999) + { + *dest = 999; + } + } +} + +u16 sub_81445C0(u32 command) +{ + switch (command) + { + case 0: + { + struct MEventBuffer_32E0_Sub * data = &gSaveBlock1Ptr->unk_3120.buffer_1c0.data; + if (data->unk_08_0 == 2) + { + struct MEventBuffer_3430_Sub * buffer = &gSaveBlock1Ptr->unk_3120.buffer_310.data; + return buffer->unk_00; + } + break; + } + case 1: + { + struct MEventBuffer_32E0_Sub * data = &gSaveBlock1Ptr->unk_3120.buffer_1c0.data; + if (data->unk_08_0 == 2) + { + struct MEventBuffer_3430_Sub * buffer = &gSaveBlock1Ptr->unk_3120.buffer_310.data; + return buffer->unk_02; + } + break; + } + case 2: + { + struct MEventBuffer_32E0_Sub * data = &gSaveBlock1Ptr->unk_3120.buffer_1c0.data; + if (data->unk_08_0 == 2) + { + struct MEventBuffer_3430_Sub * buffer = &gSaveBlock1Ptr->unk_3120.buffer_310.data; + return buffer->unk_04; + } + break; + } + case 3: + { + struct MEventBuffer_32E0_Sub * data = &gSaveBlock1Ptr->unk_3120.buffer_1c0.data; + if (data->unk_08_0 == 1) + return sub_8144218(); + break; + } + case 4: + { + struct MEventBuffer_32E0_Sub * data = &gSaveBlock1Ptr->unk_3120.buffer_1c0.data; + if (data->unk_08_0 == 1) + return data->unk_09; + break; + } + } + AGBAssert(gUnknown_8466F28, 913, gUnknown_8466F5C, 1); + return 0; +} -- cgit v1.2.3 From 9200df7516151a84d0fcdda84259179eafafcabb Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Thu, 29 Nov 2018 20:56:53 -0500 Subject: Finish decomp of mevent.s --- asm/mevent.s | 219 ------------------------------------------------------- include/global.h | 2 +- ld_script.txt | 1 - src/mevent.c | 95 +++++++++++++++++++++--- 4 files changed, 87 insertions(+), 230 deletions(-) delete mode 100644 asm/mevent.s diff --git a/asm/mevent.s b/asm/mevent.s deleted file mode 100644 index 819179c2b..000000000 --- a/asm/mevent.s +++ /dev/null @@ -1,219 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .syntax unified - - .text - - thumb_func_start sub_81446C4 -sub_81446C4: @ 81446C4 - ldr r1, _081446CC @ =gUnknown_203F3BC - movs r0, 0 - str r0, [r1] - bx lr - .align 2, 0 -_081446CC: .4byte gUnknown_203F3BC - thumb_func_end sub_81446C4 - - thumb_func_start sub_81446D0 -sub_81446D0: @ 81446D0 - push {r4,r5,lr} - lsls r0, 16 - lsrs r0, 16 - adds r4, r0, 0 - ldr r5, _08144700 @ =gUnknown_203F3BC - movs r0, 0 - str r0, [r5] - cmp r4, 0 - beq _0814470E - bl sub_8143FC8 - cmp r0, 0 - beq _0814470C - ldr r0, _08144704 @ =gSaveBlock1Ptr - ldr r0, [r0] - ldr r1, _08144708 @ =0x000032e4 - adds r0, r1 - ldrh r0, [r0] - cmp r0, r4 - bne _0814470C - movs r0, 0x1 - str r0, [r5] - b _0814470E - .align 2, 0 -_08144700: .4byte gUnknown_203F3BC -_08144704: .4byte gSaveBlock1Ptr -_08144708: .4byte 0x000032e4 -_0814470C: - movs r0, 0 -_0814470E: - pop {r4,r5} - pop {r1} - bx r1 - thumb_func_end sub_81446D0 - - thumb_func_start sub_8144714 -sub_8144714: @ 8144714 - push {lr} - adds r2, r0, 0 - ldr r0, _08144738 @ =gUnknown_203F3BC - ldr r0, [r0] - cmp r0, 0 - beq _08144782 - cmp r2, 0x1 - beq _08144758 - cmp r2, 0x1 - bcc _08144744 - cmp r2, 0x2 - bne _08144774 - ldr r0, _0814473C @ =gSaveBlock1Ptr - ldr r2, [r0] - ldr r0, _08144740 @ =0x00003478 - adds r2, r0 - movs r0, 0x2 - b _08144762 - .align 2, 0 -_08144738: .4byte gUnknown_203F3BC -_0814473C: .4byte gSaveBlock1Ptr -_08144740: .4byte 0x00003478 -_08144744: - ldr r0, _08144750 @ =gSaveBlock1Ptr - ldr r2, [r0] - ldr r0, _08144754 @ =0x00003464 - adds r2, r0 - movs r0, 0 - b _08144762 - .align 2, 0 -_08144750: .4byte gSaveBlock1Ptr -_08144754: .4byte 0x00003464 -_08144758: - ldr r0, _0814476C @ =gSaveBlock1Ptr - ldr r2, [r0] - ldr r0, _08144770 @ =0x00003464 - adds r2, r0 - movs r0, 0x1 -_08144762: - movs r3, 0x5 - bl sub_8144824 - b _08144782 - .align 2, 0 -_0814476C: .4byte gSaveBlock1Ptr -_08144770: .4byte 0x00003464 -_08144774: - ldr r0, _08144788 @ =gUnknown_8466F28 "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/mevent.c" - movs r1, 0xF7 - lsls r1, 2 - ldr r2, _0814478C @ =gUnknown_8466F5C "0" - movs r3, 0x1 - bl AGBAssert -_08144782: - pop {r0} - bx r0 - .align 2, 0 -_08144788: .4byte gUnknown_8466F28 -_0814478C: .4byte gUnknown_8466F5C - thumb_func_end sub_8144714 - - thumb_func_start sub_8144790 -sub_8144790: @ 8144790 - push {lr} - sub sp, 0x4 - movs r0, 0 - str r0, [sp] - ldr r0, _081447B0 @ =gSaveBlock1Ptr - ldr r1, [r0] - ldr r0, _081447B4 @ =0x00003464 - adds r1, r0 - ldr r2, _081447B8 @ =0x0500000a - mov r0, sp - bl CpuSet - add sp, 0x4 - pop {r0} - bx r0 - .align 2, 0 -_081447B0: .4byte gSaveBlock1Ptr -_081447B4: .4byte 0x00003464 -_081447B8: .4byte 0x0500000a - thumb_func_end sub_8144790 - - thumb_func_start sub_81447BC -sub_81447BC: @ 81447BC - push {r4,r5,lr} - adds r5, r0, 0 - adds r4, r1, 0 - movs r1, 0 - cmp r1, r2 - bge _081447DE - ldr r0, [r4] - cmp r0, r5 - beq _081447DE - adds r3, r4, 0 -_081447D0: - adds r3, 0x4 - adds r1, 0x1 - cmp r1, r2 - bge _081447DE - ldr r0, [r3] - cmp r0, r5 - bne _081447D0 -_081447DE: - cmp r1, r2 - bne _08144800 - subs r3, r1, 0x1 - cmp r3, 0 - ble _081447FA - lsls r0, r3, 2 - subs r0, 0x4 - adds r2, r0, r4 -_081447EE: - ldr r0, [r2] - str r0, [r2, 0x4] - subs r2, 0x4 - subs r3, 0x1 - cmp r3, 0 - bgt _081447EE -_081447FA: - str r5, [r4] - movs r0, 0x1 - b _0814481C -_08144800: - adds r3, r1, 0 - cmp r3, 0 - ble _08144818 - lsls r0, r3, 2 - subs r0, 0x4 - adds r2, r0, r4 -_0814480C: - ldr r0, [r2] - str r0, [r2, 0x4] - subs r2, 0x4 - subs r3, 0x1 - cmp r3, 0 - bgt _0814480C -_08144818: - str r5, [r4] - movs r0, 0 -_0814481C: - pop {r4,r5} - pop {r1} - bx r1 - thumb_func_end sub_81447BC - - thumb_func_start sub_8144824 -sub_8144824: @ 8144824 - push {r4,lr} - adds r4, r0, 0 - adds r0, r1, 0 - adds r1, r2, 0 - adds r2, r3, 0 - bl sub_81447BC - cmp r0, 0 - beq _0814483C - adds r0, r4, 0 - bl sub_814451C -_0814483C: - pop {r4} - pop {r0} - bx r0 - thumb_func_end sub_8144824 - - .align 2, 0 @ Don't pad with nop. diff --git a/include/global.h b/include/global.h index 92e6b7da1..b1c6adcf3 100644 --- a/include/global.h +++ b/include/global.h @@ -646,7 +646,7 @@ struct MEventBuffers /*0x310 0x3430*/ struct MEventBuffer_3430 buffer_310; /*0x338 0x3458*/ u16 unk_338[4]; /*0x340 0x3460*/ struct MysteryEventStruct unk_340; - /*0x344 0x3464*/ u8 filler_344[0x28]; + /*0x344 0x3464*/ u32 unk_344[2][5]; }; // 0x36C 0x348C struct SaveBlock1 diff --git a/ld_script.txt b/ld_script.txt index 91bd070af..237166975 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -244,7 +244,6 @@ SECTIONS { asm/mystery_gift_menu.o(.text); asm/link_rfu_4.o(.text); src/mevent.o(.text); - asm/mevent.o(.text); asm/mevent_server.o(.text); asm/mevent_8145654.o(.text); src/menews_jisan.o(.text); diff --git a/src/mevent.c b/src/mevent.c index bf2d2c1a5..a65433999 100644 --- a/src/mevent.c +++ b/src/mevent.c @@ -57,6 +57,7 @@ void sub_81422FC(void); void sub_812B484(void); void sub_814407C(void); void sub_81440B4(void); +void sub_8144824(u32, u32, u32 *, s32); void sub_8144790(void); u8 sub_815D6B4(u8 *); @@ -101,6 +102,8 @@ const u16 gUnknown_8466F00[] = { struct MEvent_Str_1 gUnknown_3005ED0; +bool32 gUnknown_203F3BC = FALSE; + void sub_81435DC(struct MEvent_Str_1 *a0, size_t a1, const void * a2) { vu16 imeBak = REG_IME; @@ -839,10 +842,6 @@ s32 sub_814449C(const struct MEventStruct_Unk1442CC * a0) return sub_8144184(&a0->unk_20, a0->unk_44); } -//TODO: Remove these later -const char ALIGNED(4) gUnknown_8466F28[] = "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/mevent.c"; -const char ALIGNED(4) gUnknown_8466F5C[] = "0"; - u16 sub_81444B0(const struct MEventStruct_Unk1442CC * a0, u32 command) { switch (command) @@ -858,8 +857,7 @@ u16 sub_81444B0(const struct MEventStruct_Unk1442CC * a0, u32 command) case 4: return a0->unk_44; default: - AGBAssert(gUnknown_8466F28, 825, gUnknown_8466F5C, 1); - // AGB_ASSERT_EX(0, "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/mevent.c", 825); + AGB_ASSERT_EX(0, "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/mevent.c", 825); return 0; } } @@ -888,8 +886,7 @@ void sub_814451C(u32 command) } if (dest == NULL) { - AGBAssert(gUnknown_8466F28, 868, gUnknown_8466F5C, 1); - // AGB_ASSERT_EX(0, "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/mevent.c", 868); + AGB_ASSERT_EX(0, "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/mevent.c", 868); } else if (++(*dest) > 999) { @@ -947,6 +944,86 @@ u16 sub_81445C0(u32 command) break; } } - AGBAssert(gUnknown_8466F28, 913, gUnknown_8466F5C, 1); + AGB_ASSERT_EX(0, "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/mevent.c", 913); return 0; } + +void sub_81446C4(void) +{ + gUnknown_203F3BC = FALSE; +} + +bool32 sub_81446D0(u16 a0) +{ + gUnknown_203F3BC = FALSE; + if (a0 == 0) + return FALSE; + if (!sub_8143FC8()) + return FALSE; + if (gSaveBlock1Ptr->unk_3120.buffer_1c0.data.unk_00 != a0) + return FALSE; + gUnknown_203F3BC = TRUE; + return TRUE; +} + +void sub_8144714(u32 a0, u32 a1) +{ + if (gUnknown_203F3BC) + { + switch (a0) + { + case 2: + sub_8144824(2, a1, gSaveBlock1Ptr->unk_3120.unk_344[1], 5); + break; + case 0: + sub_8144824(0, a1, gSaveBlock1Ptr->unk_3120.unk_344[0], 5); + break; + case 1: + sub_8144824(1, a1, gSaveBlock1Ptr->unk_3120.unk_344[0], 5); + break; + default: + AGB_ASSERT_EX(0, "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/mevent.c", 988); + } + } +} + +void sub_8144790(void) +{ + CpuFill32(0, gSaveBlock1Ptr->unk_3120.unk_344, sizeof(gSaveBlock1Ptr->unk_3120.unk_344)); +} + +bool32 sub_81447BC(u32 a0, u32 * a1, s32 size) +{ + s32 i; + s32 j; + + for (i = 0; i < size; i++) + { + if (a1[i] == a0) + break; + } + if (i == size) + { + for (j = size - 1; j > 0; j--) + { + a1[j] = a1[j - 1]; + } + a1[0] = a0; + return TRUE; + } + else + { + for (j = i; j > 0; j--) + { + a1[j] = a1[j - 1]; + } + a1[0] = a0; + return FALSE; + } +} + +void sub_8144824(u32 a0, u32 a1, u32 * a2, s32 a3) +{ + if (sub_81447BC(a1, a2, a3)) + sub_814451C(a0); +} -- cgit v1.2.3 From 5e98e6b8df930bb386acc5ce21940a122fd497ce Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Thu, 29 Nov 2018 21:02:08 -0500 Subject: Fix this field's name to be consistent with offset --- include/global.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/global.h b/include/global.h index b1c6adcf3..1dae2f75f 100644 --- a/include/global.h +++ b/include/global.h @@ -697,7 +697,7 @@ struct SaveBlock1 /*0x30D0*/ struct Roamer roamer; /*0x30EC*/ struct EnigmaBerry enigmaBerry; /*0x3120*/ struct MEventBuffers unk_3120; - /*0x348C*/ u8 filler_3464[0x190]; + /*0x348C*/ u8 filler_348C[0x190]; /*0x361C*/ struct RamScript ramScript; /*0x3A08*/ u8 filler3A08[12]; /*0x3A14*/ u8 seen2[DEX_FLAGS_NO]; -- cgit v1.2.3 From 294b150d70385a117e1324fd1e13bab25bfaabc9 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Fri, 30 Nov 2018 08:47:58 -0500 Subject: Set up to decomp mevent_server --- data/data_8466FB8.s | 15 +++++++++++++-- include/global.h | 2 ++ include/mevent.h | 12 ++++++++++++ ld_script.txt | 2 ++ src/mevent.c | 12 ------------ src/mevent_server.c | 2 ++ 6 files changed, 31 insertions(+), 14 deletions(-) create mode 100644 src/mevent_server.c diff --git a/data/data_8466FB8.s b/data/data_8466FB8.s index 3f4fd49cd..21ee2e1df 100644 --- a/data/data_8466FB8.s +++ b/data/data_8466FB8.s @@ -2,7 +2,14 @@ .align 2 gUnknown_8466F60:: @ 8466F60 - .incbin "baserom.gba", 0x466F60, 0x20 + .4byte sub_8144C34 + .4byte sub_8144C5C + .4byte sub_8144C60 + .4byte sub_8144C80 + .4byte sub_8144CA0 + .4byte sub_8144E6C + .4byte sub_8144E84 + .4byte sub_8144EBC .align 2 gUnknown_8466F80:: @ 8466F80 @@ -26,7 +33,11 @@ gUnknown_8467000:: @ 8467000 .align 2 gUnknown_8467030:: @ 8467030 - .incbin "baserom.gba", 0x467030, 0x14 + .4byte sub_8145080 + .4byte sub_8145088 + .4byte sub_814508C + .4byte sub_81450A8 + .4byte sub_81450C4 .align 2 gUnknown_8467044:: @ 8467044 diff --git a/include/global.h b/include/global.h index 1dae2f75f..5b07796cc 100644 --- a/include/global.h +++ b/include/global.h @@ -28,6 +28,8 @@ #endif // __APPLE__ #define ARRAY_COUNT(array) (sizeof(array) / sizeof((array)[0])) +// GF's lingo +#define NELEMS ARRAY_COUNT // useful math macros diff --git a/include/mevent.h b/include/mevent.h index ae301263f..31e1041fe 100644 --- a/include/mevent.h +++ b/include/mevent.h @@ -21,6 +21,18 @@ struct MEventStruct_Unk1442CC u8 unk_60; }; +struct MEvent_Str_1 +{ + u16 unk_000; + size_t unk_004; + const void * unk_008; +}; + +struct MEvent_Str_2 +{ + u8 fill_00[0x40]; +}; + struct MysteryEventStruct * sub_8143D94(void); bool32 sub_8143E1C(void); diff --git a/ld_script.txt b/ld_script.txt index 237166975..88ad583b6 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -244,6 +244,7 @@ SECTIONS { asm/mystery_gift_menu.o(.text); asm/link_rfu_4.o(.text); src/mevent.o(.text); + src/mevent_server.o(.text); asm/mevent_server.o(.text); asm/mevent_8145654.o(.text); src/menews_jisan.o(.text); @@ -379,6 +380,7 @@ SECTIONS { src/fame_checker.o(.rodata); data/data_845FD54.o(.rodata); src/mevent.o(.rodata); + src/mevent_server.o(.rodata); data/data_8466FB8.o(.rodata); src/menews_jisan.o(.rodata); src/menews_jisan.o(.rodata.str1.4); diff --git a/src/mevent.c b/src/mevent.c index a65433999..c81712de6 100644 --- a/src/mevent.c +++ b/src/mevent.c @@ -19,18 +19,6 @@ #include "menews_jisan.h" #include "mevent.h" -struct MEvent_Str_1 -{ - u16 unk_000; - size_t unk_004; - const void * unk_008; -}; - -struct MEvent_Str_2 -{ - u8 fill_00[0x40]; -}; - struct MEventTaskData1 { u16 t00; diff --git a/src/mevent_server.c b/src/mevent_server.c new file mode 100644 index 000000000..529b4ba77 --- /dev/null +++ b/src/mevent_server.c @@ -0,0 +1,2 @@ +#include "global.h" +#include "mevent.h" -- cgit v1.2.3 From 80dbdacaced2e4522f29e6974474103926461161 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Fri, 30 Nov 2018 10:27:25 -0500 Subject: through sub_814490C --- asm/battle_2.s | 48 +++++----- asm/battle_controllers.s | 8 +- asm/cable_club.s | 92 +++++++++--------- asm/link.s | 114 +++++++++++------------ asm/link_rfu_2.s | 42 ++++----- asm/link_rfu_3.s | 62 ++++++------- asm/mevent_server.s | 237 ----------------------------------------------- asm/trade.s | 66 ++++++------- asm/union_room_chat.s | 8 +- asm/unk_814BB4C.s | 16 ++-- asm/unk_81507FC.s | 16 ++-- include/link.h | 2 +- include/link_rfu.h | 8 ++ include/link_rfu_4.h | 7 -- include/mevent_server.h | 4 + src/mevent.c | 4 +- src/mevent_server.c | 178 +++++++++++++++++++++++++++++++++++ sym_ewram.txt | 41 ++++---- 18 files changed, 453 insertions(+), 500 deletions(-) create mode 100644 include/link_rfu.h delete mode 100644 include/link_rfu_4.h create mode 100644 include/mevent_server.h diff --git a/asm/battle_2.s b/asm/battle_2.s index eba29102c..011bb6d56 100644 --- a/asm/battle_2.s +++ b/asm/battle_2.s @@ -638,7 +638,7 @@ _080102C0: mov r8, r4 _080102D8: lsls r0, r5, 8 - ldr r1, _08010348 @ =gUnknown_202211C + ldr r1, _08010348 @ =gBlockRecvBuffer + 4 adds r7, r0, r1 lsls r0, r5, 3 subs r0, r5 @@ -694,14 +694,14 @@ _0801031C: .align 2, 0 _08010340: .4byte gEnigmaBerries _08010344: .4byte gLinkPlayers -_08010348: .4byte gUnknown_202211C +_08010348: .4byte gBlockRecvBuffer + 4 _0801034C: movs r5, 0 ldr r4, _0801040C @ =gEnigmaBerries mov r9, r4 _08010352: lsls r0, r5, 8 - ldr r1, _08010410 @ =gUnknown_202211C + ldr r1, _08010410 @ =gBlockRecvBuffer + 4 adds r7, r0, r1 movs r4, 0 adds r2, r5, 0x1 @@ -797,7 +797,7 @@ _080103FC: bx r0 .align 2, 0 _0801040C: .4byte gEnigmaBerries -_08010410: .4byte gUnknown_202211C +_08010410: .4byte gBlockRecvBuffer + 4 thumb_func_end sub_801017C thumb_func_start sub_8010414 @@ -810,7 +810,7 @@ sub_8010414: @ 8010414 lsls r1, 24 lsrs r3, r1, 24 movs r6, 0 - ldr r0, _08010440 @ =gUnknown_2022118 + ldr r0, _08010440 @ =gBlockRecvBuffer ldrh r2, [r0] movs r1, 0x80 lsls r1, 1 @@ -824,7 +824,7 @@ sub_8010414: @ 8010414 movs r2, 0xC b _0801044E .align 2, 0 -_08010440: .4byte gUnknown_2022118 +_08010440: .4byte gBlockRecvBuffer _08010444: .4byte gBattleTypeFlags _08010448: ldr r0, _0801048C @ =gBattleTypeFlags @@ -842,7 +842,7 @@ _08010458: movs r2, 0 cmp r2, r4 bge _0801047C - ldr r1, _08010490 @ =gUnknown_2022118 + ldr r1, _08010490 @ =gBlockRecvBuffer mov r8, r1 movs r5, 0x80 lsls r5, 1 @@ -867,7 +867,7 @@ _0801047C: b _0801049A .align 2, 0 _0801048C: .4byte gBattleTypeFlags -_08010490: .4byte gUnknown_2022118 +_08010490: .4byte gBlockRecvBuffer _08010494: ldr r0, _080104EC @ =gBattleTypeFlags ldr r1, [r0] @@ -1126,7 +1126,7 @@ _0801067E: lsls r0, 8 orrs r1, r0 strh r1, [r2, 0xE] - ldr r0, _080106EC @ =gUnknown_2022118 + ldr r0, _080106EC @ =gBlockRecvBuffer lsls r1, r5, 8 adds r0, 0x2 adds r1, r0 @@ -1139,7 +1139,7 @@ _0801067E: _080106E0: .4byte sub_800F6FC _080106E4: .4byte gTasks _080106E8: .4byte gBattleStruct -_080106EC: .4byte gUnknown_2022118 +_080106EC: .4byte gBlockRecvBuffer _080106F0: .4byte gUnknown_2023E82 _080106F4: bl sub_800A4BC @@ -1170,7 +1170,7 @@ _0801072A: bl ResetBlockReceivedFlags ldr r0, _08010740 @ =gEnemyParty lsls r1, r5, 8 - ldr r2, _08010744 @ =gUnknown_2022118 + ldr r2, _08010744 @ =gBlockRecvBuffer adds r1, r2 movs r2, 0xC8 bl memcpy @@ -1178,7 +1178,7 @@ _0801072A: b _080108B2 .align 2, 0 _08010740: .4byte gEnemyParty -_08010744: .4byte gUnknown_2022118 +_08010744: .4byte gBlockRecvBuffer _08010748: .4byte gUnknown_2023E82 _0801074C: bl sub_800A4BC @@ -1209,7 +1209,7 @@ _08010782: bl ResetBlockReceivedFlags ldr r0, _08010798 @ =gUnknown_20240F4 lsls r1, r5, 8 - ldr r2, _0801079C @ =gUnknown_2022118 + ldr r2, _0801079C @ =gBlockRecvBuffer adds r1, r2 movs r2, 0xC8 bl memcpy @@ -1217,7 +1217,7 @@ _08010782: b _080108B2 .align 2, 0 _08010798: .4byte gUnknown_20240F4 -_0801079C: .4byte gUnknown_2022118 +_0801079C: .4byte gBlockRecvBuffer _080107A0: .4byte gUnknown_2023E82 _080107A4: bl sub_800A4BC @@ -1246,7 +1246,7 @@ _080107CC: bl ResetBlockReceivedFlags ldr r4, _08010820 @ =gUnknown_20241BC lsls r1, r5, 8 - ldr r0, _08010824 @ =gUnknown_2022118 + ldr r0, _08010824 @ =gBlockRecvBuffer adds r1, r0 adds r0, r4, 0 movs r2, 0xC8 @@ -1272,7 +1272,7 @@ _080107CC: b _080108B2 .align 2, 0 _08010820: .4byte gUnknown_20241BC -_08010824: .4byte gUnknown_2022118 +_08010824: .4byte gBlockRecvBuffer _08010828: .4byte 0xfffffe70 _0801082C: .4byte 0xfffffed4 _08010830: .4byte gUnknown_2023E82 @@ -1586,7 +1586,7 @@ _08010AA0: beq _08010ABA _08010AAC: lsls r1, r4, 8 - ldr r0, _08010AE4 @ =gUnknown_2022118 + ldr r0, _08010AE4 @ =gBlockRecvBuffer adds r1, r0 ldr r0, _08010AE8 @ =gUnknown_2022B58 movs r2, 0x60 @@ -1613,7 +1613,7 @@ _08010ABA: bl sub_8128198 b _08010B82 .align 2, 0 -_08010AE4: .4byte gUnknown_2022118 +_08010AE4: .4byte gBlockRecvBuffer _08010AE8: .4byte gUnknown_2022B58 _08010AEC: .4byte gUnknown_2023E82 _08010AF0: .4byte gMain @@ -1860,7 +1860,7 @@ _08010CE2: strh r2, [r1, 0xE] strh r2, [r1, 0x10] adds r2, r1, 0 - ldr r0, _08010D5C @ =gUnknown_2022118 + ldr r0, _08010D5C @ =gBlockRecvBuffer adds r3, r0, 0x2 ldr r5, _08010D60 @ =gLinkPlayers movs r4, 0x3F @@ -1881,7 +1881,7 @@ _08010D4C: .4byte gDecompressionBuffer _08010D50: .4byte gPlayerParty _08010D54: .4byte sub_800F6FC _08010D58: .4byte gTasks -_08010D5C: .4byte gUnknown_2022118 +_08010D5C: .4byte gBlockRecvBuffer _08010D60: .4byte gLinkPlayers _08010D64: cmp r0, 0x2 @@ -1962,7 +1962,7 @@ _08010DEE: subs r0, r7 lsls r0, 2 mov r8, r0 - ldr r4, _08010E18 @ =gUnknown_2022118 + ldr r4, _08010E18 @ =gBlockRecvBuffer movs r5, 0 _08010E00: cmp r6, r7 @@ -1978,7 +1978,7 @@ _08010E00: beq _08010E24 b _08010EBE .align 2, 0 -_08010E18: .4byte gUnknown_2022118 +_08010E18: .4byte gBlockRecvBuffer _08010E1C: .4byte gLinkPlayers _08010E20: cmp r0, 0x3 @@ -2115,7 +2115,7 @@ _08010F0E: subs r0, r7 lsls r0, 2 mov r8, r0 - ldr r4, _08010F38 @ =gUnknown_2022118 + ldr r4, _08010F38 @ =gBlockRecvBuffer movs r5, 0 _08010F20: cmp r6, r7 @@ -2131,7 +2131,7 @@ _08010F20: beq _08010F44 b _08010FDE .align 2, 0 -_08010F38: .4byte gUnknown_2022118 +_08010F38: .4byte gBlockRecvBuffer _08010F3C: .4byte gLinkPlayers _08010F40: cmp r0, 0x3 diff --git a/asm/battle_controllers.s b/asm/battle_controllers.s index 71c39120f..8ef9408a0 100644 --- a/asm/battle_controllers.s +++ b/asm/battle_controllers.s @@ -1420,7 +1420,7 @@ sub_800DD28: @ 800DD28 bne _0800DE28 bl sub_80FBB4C movs r4, 0 - ldr r0, _0800DD6C @ =gUnknown_2022118 + ldr r0, _0800DD6C @ =gBlockRecvBuffer mov r10, r0 b _0800DE1C .align 2, 0 @@ -1428,7 +1428,7 @@ _0800DD5C: .4byte gUnknown_3003F64 _0800DD60: .4byte gBattleTypeFlags _0800DD64: .4byte gLinkPlayers _0800DD68: .4byte 0x00002211 -_0800DD6C: .4byte gUnknown_2022118 +_0800DD6C: .4byte gBlockRecvBuffer _0800DD70: bl GetBlockReceivedStatus lsls r0, 24 @@ -1447,7 +1447,7 @@ _0800DD70: lsls r0, r4, 8 mov r4, r10 adds r3, r0, r4 - ldr r1, _0800DE3C @ =gUnknown_202211C + ldr r1, _0800DE3C @ =gBlockRecvBuffer + 4 adds r0, r1 ldrh r6, [r0] ldr r7, _0800DE40 @ =gTasks @@ -1534,7 +1534,7 @@ _0800DE28: bx r0 .align 2, 0 _0800DE38: .4byte gBitTable -_0800DE3C: .4byte gUnknown_202211C +_0800DE3C: .4byte gBlockRecvBuffer + 4 _0800DE40: .4byte gTasks _0800DE44: .4byte gUnknown_202286D _0800DE48: .4byte gUnknown_2023FF0 diff --git a/asm/cable_club.s b/asm/cable_club.s index 1d49bfcaa..830cff288 100644 --- a/asm/cable_club.s +++ b/asm/cable_club.s @@ -243,7 +243,7 @@ sub_80808F0: @ 80808F0 lsrs r1, r0, 24 cmp r1, 0 bne _08080934 - ldr r0, _08080928 @ =gUnknown_202271A + ldr r0, _08080928 @ =gLinkType strh r1, [r0] ldr r1, _0808092C @ =gTasks lsls r0, r4, 2 @@ -256,7 +256,7 @@ sub_80808F0: @ 80808F0 b _08080936 .align 2, 0 _08080924: .4byte gMain -_08080928: .4byte gUnknown_202271A +_08080928: .4byte gLinkType _0808092C: .4byte gTasks _08080930: .4byte sub_8080FB4 _08080934: @@ -290,7 +290,7 @@ _08080952: .align 2, 0 _08080964: .4byte gMain _08080968: - ldr r1, _08080984 @ =gUnknown_202271A + ldr r1, _08080984 @ =gLinkType movs r0, 0 strh r0, [r1] ldr r1, _08080988 @ =gTasks @@ -306,7 +306,7 @@ _0808097E: pop {r1} bx r1 .align 2, 0 -_08080984: .4byte gUnknown_202271A +_08080984: .4byte gLinkType _08080988: .4byte gTasks _0808098C: .4byte sub_8080FB4 thumb_func_end sub_808093C @@ -780,7 +780,7 @@ _08080D54: strb r0, [r1] ldrb r0, [r4] bl sub_800A900 - ldr r0, _08080D84 @ =gUnknown_2022618 + ldr r0, _08080D84 @ =gBlockSendBuffer bl sub_80898E8 ldr r0, _08080D88 @ =sub_8080E6C _08080D72: @@ -792,7 +792,7 @@ _08080D74: .align 2, 0 _08080D7C: .4byte gUnknown_3005030 _08080D80: .4byte gUnknown_300502C -_08080D84: .4byte gUnknown_2022618 +_08080D84: .4byte gBlockSendBuffer _08080D88: .4byte sub_8080E6C thumb_func_end sub_8080CDC @@ -883,7 +883,7 @@ _08080E20: strb r0, [r1] ldrb r0, [r4] bl sub_800A900 - ldr r0, _08080E60 @ =gUnknown_2022618 + ldr r0, _08080E60 @ =gBlockSendBuffer bl sub_80898E8 ldr r1, _08080E64 @ =gTasks lsls r0, r5, 2 @@ -901,7 +901,7 @@ _08080E50: .align 2, 0 _08080E58: .4byte gUnknown_3005030 _08080E5C: .4byte gUnknown_300502C -_08080E60: .4byte gUnknown_2022618 +_08080E60: .4byte gBlockSendBuffer _08080E64: .4byte gTasks _08080E68: .4byte sub_8080E6C thumb_func_end sub_8080DC0 @@ -941,7 +941,7 @@ _08080E9A: cmp r0, 0x1 bls _08080EDC lsls r1, r5, 8 - ldr r0, _08080ED4 @ =gUnknown_2022118 + ldr r0, _08080ED4 @ =gBlockRecvBuffer adds r1, r0 ldr r0, _08080ED8 @ =gUnknown_2039624 lsls r4, r5, 1 @@ -957,11 +957,11 @@ _08080E9A: b _08080EF2 .align 2, 0 _08080ED0: .4byte gLinkPlayers -_08080ED4: .4byte gUnknown_2022118 +_08080ED4: .4byte gBlockRecvBuffer _08080ED8: .4byte gUnknown_2039624 _08080EDC: lsls r1, r5, 8 - ldr r0, _08080F3C @ =gUnknown_2022118 + ldr r0, _08080F3C @ =gBlockRecvBuffer adds r1, r0 ldr r2, _08080F40 @ =gUnknown_2039624 lsls r0, r5, 1 @@ -988,7 +988,7 @@ _08080EF8: ldrh r0, [r0] cmp r0, 0x1 bne _08080F54 - ldr r0, _08080F48 @ =gUnknown_202271A + ldr r0, _08080F48 @ =gLinkType ldrh r1, [r0] ldr r0, _08080F4C @ =0x00004411 ldr r0, _08080F50 @ =gTasks @@ -1003,10 +1003,10 @@ _08080EF8: bl DestroyTask b _08080F66 .align 2, 0 -_08080F3C: .4byte gUnknown_2022118 +_08080F3C: .4byte gBlockRecvBuffer _08080F40: .4byte gUnknown_2039624 _08080F44: .4byte gUnknown_20370D0 -_08080F48: .4byte gUnknown_202271A +_08080F48: .4byte gLinkType _08080F4C: .4byte 0x00004411 _08080F50: .4byte gTasks _08080F54: @@ -1170,24 +1170,24 @@ _08081080: b _080810B4 _08081086: movs r3, 0x2 - ldr r1, _08081090 @ =gUnknown_202271A + ldr r1, _08081090 @ =gLinkType ldr r4, _08081094 @ =0x00002233 b _080810B0 .align 2, 0 -_08081090: .4byte gUnknown_202271A +_08081090: .4byte gLinkType _08081094: .4byte 0x00002233 _08081098: movs r3, 0x2 - ldr r1, _080810A0 @ =gUnknown_202271A + ldr r1, _080810A0 @ =gLinkType ldr r4, _080810A4 @ =0x00002244 b _080810B0 .align 2, 0 -_080810A0: .4byte gUnknown_202271A +_080810A0: .4byte gLinkType _080810A4: .4byte 0x00002244 _080810A8: movs r3, 0x4 movs r2, 0x4 - ldr r1, _080810C4 @ =gUnknown_202271A + ldr r1, _080810C4 @ =gLinkType ldr r4, _080810C8 @ =0x00002255 _080810B0: adds r0, r4, 0 @@ -1200,14 +1200,14 @@ _080810B4: pop {r0} bx r0 .align 2, 0 -_080810C4: .4byte gUnknown_202271A +_080810C4: .4byte gLinkType _080810C8: .4byte 0x00002255 thumb_func_end sub_8081064 thumb_func_start sub_80810CC sub_80810CC: @ 80810CC push {lr} - ldr r1, _080810E8 @ =gUnknown_202271A + ldr r1, _080810E8 @ =gLinkType ldr r2, _080810EC @ =0x00001133 adds r0, r2, 0 strh r0, [r1] @@ -1220,7 +1220,7 @@ sub_80810CC: @ 80810CC pop {r0} bx r0 .align 2, 0 -_080810E8: .4byte gUnknown_202271A +_080810E8: .4byte gLinkType _080810EC: .4byte 0x00001133 _080810F0: .4byte gBattleTypeFlags thumb_func_end sub_80810CC @@ -1231,7 +1231,7 @@ sub_80810F4: @ 80810F4 ldr r1, _08081118 @ =gUnknown_20370D0 movs r0, 0 strh r0, [r1] - ldr r1, _0808111C @ =gUnknown_202271A + ldr r1, _0808111C @ =gLinkType ldr r2, _08081120 @ =0x00003311 adds r0, r2, 0 strh r0, [r1] @@ -1245,7 +1245,7 @@ sub_80810F4: @ 80810F4 bx r0 .align 2, 0 _08081118: .4byte gUnknown_20370D0 -_0808111C: .4byte gUnknown_202271A +_0808111C: .4byte gLinkType _08081120: .4byte 0x00003311 _08081124: .4byte gBattleTypeFlags thumb_func_end sub_80810F4 @@ -1253,7 +1253,7 @@ _08081124: .4byte gBattleTypeFlags thumb_func_start sub_8081128 sub_8081128: @ 8081128 push {lr} - ldr r1, _08081144 @ =gUnknown_202271A + ldr r1, _08081144 @ =gLinkType ldr r2, _08081148 @ =0x00006601 adds r0, r2, 0 strh r0, [r1] @@ -1266,7 +1266,7 @@ sub_8081128: @ 8081128 pop {r0} bx r0 .align 2, 0 -_08081144: .4byte gUnknown_202271A +_08081144: .4byte gLinkType _08081148: .4byte 0x00006601 _0808114C: .4byte gBattleTypeFlags thumb_func_end sub_8081128 @@ -1305,35 +1305,35 @@ _08081184: .4byte _080811D8 .4byte _080811B8 _08081198: - ldr r1, _080811A0 @ =gUnknown_202271A + ldr r1, _080811A0 @ =gLinkType ldr r2, _080811A4 @ =0x00002233 b _080811DC .align 2, 0 -_080811A0: .4byte gUnknown_202271A +_080811A0: .4byte gLinkType _080811A4: .4byte 0x00002233 _080811A8: - ldr r1, _080811B0 @ =gUnknown_202271A + ldr r1, _080811B0 @ =gLinkType ldr r2, _080811B4 @ =0x00002244 b _080811DC .align 2, 0 -_080811B0: .4byte gUnknown_202271A +_080811B0: .4byte gLinkType _080811B4: .4byte 0x00002244 _080811B8: - ldr r1, _080811C0 @ =gUnknown_202271A + ldr r1, _080811C0 @ =gLinkType ldr r2, _080811C4 @ =0x00002255 b _080811DC .align 2, 0 -_080811C0: .4byte gUnknown_202271A +_080811C0: .4byte gLinkType _080811C4: .4byte 0x00002255 _080811C8: - ldr r1, _080811D0 @ =gUnknown_202271A + ldr r1, _080811D0 @ =gLinkType ldr r2, _080811D4 @ =0x00001111 b _080811DC .align 2, 0 -_080811D0: .4byte gUnknown_202271A +_080811D0: .4byte gLinkType _080811D4: .4byte 0x00001111 _080811D8: - ldr r1, _080811F0 @ =gUnknown_202271A + ldr r1, _080811F0 @ =gLinkType ldr r2, _080811F4 @ =0x00003322 _080811DC: adds r0, r2, 0 @@ -1348,7 +1348,7 @@ _080811EC: pop {r1} bx r1 .align 2, 0 -_080811F0: .4byte gUnknown_202271A +_080811F0: .4byte gLinkType _080811F4: .4byte 0x00003322 _080811F8: .4byte sub_80811FC thumb_func_end sub_8081150 @@ -1537,14 +1537,14 @@ _0808135C: movs r0, 0x1 movs r1, 0 bl fade_screen - ldr r1, _08081374 @ =gUnknown_202271A + ldr r1, _08081374 @ =gLinkType ldr r2, _08081378 @ =0x00002211 adds r0, r2, 0 strh r0, [r1] bl sub_800A068 b _080813AA .align 2, 0 -_08081374: .4byte gUnknown_202271A +_08081374: .4byte gLinkType _08081378: .4byte 0x00002211 _0808137C: ldr r0, _08081388 @ =gPaletteFade @@ -1694,7 +1694,7 @@ _080814A0: movs r0, 0x1 movs r1, 0 bl fade_screen - ldr r0, _080814BC @ =gUnknown_202271A + ldr r0, _080814BC @ =gLinkType ldr r2, _080814C0 @ =0x00002211 adds r1, r2, 0 strh r1, [r0] @@ -1703,7 +1703,7 @@ _080814A0: strh r0, [r6] b _0808160A .align 2, 0 -_080814BC: .4byte gUnknown_202271A +_080814BC: .4byte gLinkType _080814C0: .4byte 0x00002211 _080814C4: ldr r0, _080814D8 @ =gPaletteFade @@ -1720,7 +1720,7 @@ _080814D2: .align 2, 0 _080814D8: .4byte gPaletteFade _080814DC: - ldr r1, _080814EC @ =gUnknown_2022720 + ldr r1, _080814EC @ =gLocalLinkPlayer movs r0, 0 movs r2, 0x1C bl SendBlock @@ -1728,7 +1728,7 @@ _080814DC: strh r0, [r6] b _0808160A .align 2, 0 -_080814EC: .4byte gUnknown_2022720 +_080814EC: .4byte gLocalLinkPlayer _080814F0: bl GetBlockReceivedStatus adds r4, r0, 0 @@ -1746,7 +1746,7 @@ _08081504: _0808150C: .4byte gLinkPlayers _08081510: lsls r1, r4, 8 - ldr r2, _08081548 @ =gUnknown_2022118 + ldr r2, _08081548 @ =gBlockRecvBuffer adds r0, r5, 0 adds r1, r2 ldm r1!, {r2,r3,r7} @@ -1772,7 +1772,7 @@ _08081536: strh r0, [r6] b _0808160A .align 2, 0 -_08081548: .4byte gUnknown_2022118 +_08081548: .4byte gBlockRecvBuffer _0808154C: ldrh r0, [r6, 0x2] adds r0, 0x1 @@ -2343,7 +2343,7 @@ sub_80819B8: @ 80819B8 thumb_func_start sub_80819C8 sub_80819C8: @ 80819C8 push {lr} - ldr r1, _080819E4 @ =gUnknown_202271A + ldr r1, _080819E4 @ =gLinkType ldr r2, _080819E8 @ =0x00002211 adds r0, r2, 0 strh r0, [r1] @@ -2355,7 +2355,7 @@ sub_80819C8: @ 80819C8 bl sub_8081828 b _080819FA .align 2, 0 -_080819E4: .4byte gUnknown_202271A +_080819E4: .4byte gLinkType _080819E8: .4byte 0x00002211 _080819EC: .4byte gUnknown_3003F3C _080819F0: .4byte sub_8081454 diff --git a/asm/link.s b/asm/link.s index 586ee46a8..63178e0dc 100644 --- a/asm/link.s +++ b/asm/link.s @@ -232,7 +232,7 @@ sub_8009640: @ 8009640 ldr r0, _080096D4 @ =sub_800978C bl SetVBlankCallback bl ResetBlockSend - ldr r1, _080096D8 @ =gUnknown_202271A + ldr r1, _080096D8 @ =gLinkType ldr r2, _080096DC @ =0x00001111 adds r0, r2, 0 strh r0, [r1] @@ -283,7 +283,7 @@ _08009670: bx r0 .align 2, 0 _080096D4: .4byte sub_800978C -_080096D8: .4byte gUnknown_202271A +_080096D8: .4byte gLinkType _080096DC: .4byte 0x00001111 _080096E0: .4byte gMain _080096E4: .4byte gSaveBlock2Ptr @@ -297,17 +297,17 @@ _080096F4: .4byte c2_08009A8C sub_80096F8: @ 80096F8 lsls r0, 24 lsrs r0, 24 - ldr r1, _08009704 @ =gUnknown_2022720 + ldr r1, _08009704 @ =gLocalLinkPlayer strh r0, [r1, 0x18] bx lr .align 2, 0 -_08009704: .4byte gUnknown_2022720 +_08009704: .4byte gLocalLinkPlayer thumb_func_end sub_80096F8 thumb_func_start sub_8009708 sub_8009708: @ 8009708 push {r4,r5,lr} - ldr r5, _08009774 @ =gUnknown_2022720 + ldr r5, _08009774 @ =gLocalLinkPlayer ldr r4, _08009778 @ =gSaveBlock2Ptr ldr r1, [r4] ldrb r2, [r1, 0xA] @@ -327,7 +327,7 @@ sub_8009708: @ 8009708 ldr r0, [r4] ldrb r0, [r0, 0x8] strb r0, [r5, 0x13] - ldr r0, _0800977C @ =gUnknown_202271A + ldr r0, _0800977C @ =gLinkType ldrh r0, [r0] str r0, [r5, 0x14] ldr r0, _08009780 @ =gGameLanguage @@ -359,9 +359,9 @@ _0800976E: pop {r0} bx r0 .align 2, 0 -_08009774: .4byte gUnknown_2022720 +_08009774: .4byte gLocalLinkPlayer _08009778: .4byte gSaveBlock2Ptr -_0800977C: .4byte gUnknown_202271A +_0800977C: .4byte gLinkType _08009780: .4byte gGameLanguage _08009784: .4byte gGameVersion _08009788: .4byte 0x00000844 @@ -380,7 +380,7 @@ sub_800978C: @ 800978C thumb_func_start sub_80097A0 sub_80097A0: @ 80097A0 push {lr} - ldr r3, _080097C0 @ =gUnknown_2022718 + ldr r3, _080097C0 @ =gLinkOpen ldr r1, _080097C4 @ =gUnknown_3003F50 ldr r2, _080097C8 @ =0x0000efff adds r0, r1, 0 @@ -396,7 +396,7 @@ _080097AC: pop {r0} bx r0 .align 2, 0 -_080097C0: .4byte gUnknown_2022718 +_080097C0: .4byte gLinkOpen _080097C4: .4byte gUnknown_3003F50 _080097C8: .4byte 0x0000efff thumb_func_end sub_80097A0 @@ -519,7 +519,7 @@ sub_80098B8: @ 80098B8 beq _080098CC bl sub_80F8DC0 _080098CC: - ldr r0, _080098E4 @ =gUnknown_2022718 + ldr r0, _080098E4 @ =gLinkOpen strb r4, [r0] bl sub_800B29C pop {r4} @@ -528,7 +528,7 @@ _080098CC: .align 2, 0 _080098DC: .4byte gUnknown_3003F64 _080098E0: .4byte gUnknown_3003F3C -_080098E4: .4byte gUnknown_2022718 +_080098E4: .4byte gLinkOpen thumb_func_end sub_80098B8 thumb_func_start TestBlockTransfer @@ -597,7 +597,7 @@ _08009958: cmp r0, 0 beq _08009994 lsls r0, r5, 8 - ldr r1, _080099C0 @ =gUnknown_2022118 + ldr r1, _080099C0 @ =gBlockRecvBuffer adds r0, r1 lsls r4, r5, 1 adds r1, r4, r5 @@ -614,7 +614,7 @@ _08009958: ldrh r0, [r4] cmp r0, r8 beq _08009994 - ldr r0, _080099C8 @ =gUnknown_2022110 + ldr r0, _080099C8 @ =gLinkTestDebugValuesEnabled strb r6, [r0] ldr r0, _080099CC @ =gUnknown_2022111 strb r6, [r0] @@ -637,9 +637,9 @@ _080099B0: .4byte gUnknown_3000E08 _080099B4: .4byte gUnknown_3000E18 _080099B8: .4byte gUnknown_3000E60 _080099BC: .4byte 0x00000342 -_080099C0: .4byte gUnknown_2022118 +_080099C0: .4byte gBlockRecvBuffer _080099C4: .4byte gUnknown_3003F88 -_080099C8: .4byte gUnknown_2022110 +_080099C8: .4byte gLinkTestDebugValuesEnabled _080099CC: .4byte gUnknown_2022111 thumb_func_end TestBlockTransfer @@ -705,7 +705,7 @@ _08009A38: beq _08009A46 bl sub_800AAC0 _08009A46: - ldr r0, _08009A80 @ =gUnknown_2022110 + ldr r0, _08009A80 @ =gLinkTestDebugValuesEnabled ldrb r0, [r0] cmp r0, 0 beq _08009A66 @@ -731,7 +731,7 @@ _08009A70: .4byte gMain _08009A74: .4byte gUnknown_3003F84 _08009A78: .4byte gHeap + 0x4000 _08009A7C: .4byte 0x00002004 -_08009A80: .4byte gUnknown_2022110 +_08009A80: .4byte gLinkTestDebugValuesEnabled _08009A84: .4byte gLinkVSyncDisabled _08009A88: .4byte gUnknown_3003F80 thumb_func_end LinkTestProcessKeyInput @@ -756,14 +756,14 @@ c2_08009A8C: @ 8009A8C LinkMain2: @ 8009AB0 push {r4,r5,lr} adds r4, r0, 0 - ldr r0, _08009AC0 @ =gUnknown_2022718 + ldr r0, _08009AC0 @ =gLinkOpen ldrb r0, [r0] cmp r0, 0 bne _08009AC4 movs r0, 0 b _08009B0C .align 2, 0 -_08009AC0: .4byte gUnknown_2022718 +_08009AC0: .4byte gLinkOpen _08009AC4: movs r1, 0 ldr r5, _08009B14 @ =gUnknown_3003EC4 @@ -960,7 +960,7 @@ _08009C38: ldr r0, _08009C7C @ =gUnknown_3003E70 adds r2, r0, 0 adds r2, 0x10 - ldr r1, _08009C80 @ =gUnknown_2022720 + ldr r1, _08009C80 @ =gLocalLinkPlayer ldm r1!, {r3-r5} stm r2!, {r3-r5} ldm r1!, {r3,r6,r7} @@ -989,7 +989,7 @@ _08009C38: b _08009E3E .align 2, 0 _08009C7C: .4byte gUnknown_3003E70 -_08009C80: .4byte gUnknown_2022720 +_08009C80: .4byte gLocalLinkPlayer _08009C84: .4byte gUnknown_82345C0 _08009C88: ldr r1, _08009C90 @ =gUnknown_3003F28 @@ -1062,7 +1062,7 @@ _08009D08: .4byte gDecompressionBuffer _08009D0C: .4byte gUnknown_3003ED0 _08009D10: movs r2, 0 - ldr r1, _08009DC4 @ =gUnknown_2022118 + ldr r1, _08009DC4 @ =gBlockRecvBuffer mov r9, r1 adds r7, r3, 0 ldr r3, _08009DC8 @ =gUnknown_3003ED0 @@ -1106,7 +1106,7 @@ _08009D40: cmp r0, 0x1 bne _08009DE6 lsls r1, r6, 8 - ldr r0, _08009DC4 @ =gUnknown_2022118 + ldr r0, _08009DC4 @ =gBlockRecvBuffer adds r1, r0 mov r8, r1 lsls r0, r6, 3 @@ -1152,7 +1152,7 @@ _08009DBC: bl SetMainCallback2 b _08009E3E .align 2, 0 -_08009DC4: .4byte gUnknown_2022118 +_08009DC4: .4byte gBlockRecvBuffer _08009DC8: .4byte gUnknown_3003ED0 _08009DCC: .4byte gUnknown_3003EB8 _08009DD0: .4byte gLinkPlayers @@ -1318,12 +1318,12 @@ _08009F04: .4byte 0x0000cccc _08009F08: ldr r0, _08009F14 @ =gUnknown_3003F50 strh r2, [r0] - ldr r1, _08009F18 @ =gUnknown_202271A + ldr r1, _08009F18 @ =gLinkType ldrh r1, [r1] b _08009FD4 .align 2, 0 _08009F14: .4byte gUnknown_3003F50 -_08009F18: .4byte gUnknown_202271A +_08009F18: .4byte gLinkType _08009F1C: ldr r0, _08009F28 @ =gUnknown_3003F50 strh r2, [r0] @@ -1554,14 +1554,14 @@ sub_800A0B4: @ 800A0B4 ldr r0, _0800A0C8 @ =gUnknown_3000E54 movs r1, 0 str r1, [r0] - ldr r0, _0800A0CC @ =gUnknown_202271C + ldr r0, _0800A0CC @ =gLinkTimeOutCounter strh r1, [r0] bl sub_8009804 pop {r0} bx r0 .align 2, 0 _0800A0C8: .4byte gUnknown_3000E54 -_0800A0CC: .4byte gUnknown_202271C +_0800A0CC: .4byte gLinkTimeOutCounter thumb_func_end sub_800A0B4 thumb_func_start sub_800A0D0 @@ -1687,7 +1687,7 @@ _0800A1BC: .align 2, 0 _0800A1C4: .4byte gUnknown_3000E54 _0800A1C8: - ldr r0, _0800A1E8 @ =gUnknown_202271C + ldr r0, _0800A1E8 @ =gLinkTimeOutCounter ldrh r1, [r0] adds r1, 0x1 strh r1, [r0] @@ -1706,7 +1706,7 @@ _0800A1E2: pop {r1} bx r1 .align 2, 0 -_0800A1E8: .4byte gUnknown_202271C +_0800A1E8: .4byte gLinkTimeOutCounter _0800A1EC: .4byte gUnknown_3000E54 thumb_func_end sub_800A0D0 @@ -1844,7 +1844,7 @@ _0800A2C0: str r7, [r4, 0x4] b _0800A2EA _0800A2D8: - ldr r5, _0800A304 @ =gUnknown_2022618 + ldr r5, _0800A304 @ =gBlockSendBuffer cmp r7, r5 beq _0800A2E8 adds r0, r5, 0 @@ -1868,7 +1868,7 @@ _0800A2FE: pop {r1} bx r1 .align 2, 0 -_0800A304: .4byte gUnknown_2022618 +_0800A304: .4byte gBlockSendBuffer _0800A308: .4byte 0x0000bbbb _0800A30C: .4byte gUnknown_3003F80 _0800A310: .4byte LinkCB_BlockSendBegin @@ -2707,7 +2707,7 @@ sub_800A900: @ 800A900 ldr r1, _0800A938 @ =gUnknown_3003F60 strb r0, [r1] ldr r4, _0800A93C @ =gLinkPlayers - ldr r3, _0800A940 @ =gUnknown_20227C8 + ldr r3, _0800A940 @ =gSavedLinkPlayers movs r2, 0x4 _0800A914: adds r0, r3, 0 @@ -2730,7 +2730,7 @@ _0800A914: _0800A934: .4byte gUnknown_3003F40 _0800A938: .4byte gUnknown_3003F60 _0800A93C: .4byte gLinkPlayers -_0800A940: .4byte gUnknown_20227C8 +_0800A940: .4byte gSavedLinkPlayers thumb_func_end sub_800A900 thumb_func_start sub_800A944 @@ -2761,7 +2761,7 @@ sub_800A95C: @ 800A95C cmp r5, r2 bge _0800A986 ldr r1, _0800A994 @ =gLinkPlayers - ldr r0, _0800A998 @ =gUnknown_20227C8 + ldr r0, _0800A998 @ =gSavedLinkPlayers adds r4, r0, 0x4 adds r3, r1, 0x4 _0800A972: @@ -2785,7 +2785,7 @@ _0800A986: .align 2, 0 _0800A990: .4byte gUnknown_3003F40 _0800A994: .4byte gLinkPlayers -_0800A998: .4byte gUnknown_20227C8 +_0800A998: .4byte gSavedLinkPlayers _0800A99C: movs r0, 0x1 _0800A99E: @@ -2804,7 +2804,7 @@ sub_800A9A4: @ 800A9A4 ldrb r0, [r0] cmp r4, r0 bcs _0800AA04 - ldr r6, _0800AA14 @ =gUnknown_20227C8 + ldr r6, _0800AA14 @ =gSavedLinkPlayers ldr r5, _0800AA18 @ =gLinkPlayers movs r0, 0x8 adds r0, r6 @@ -2852,7 +2852,7 @@ _0800AA04: bx r0 .align 2, 0 _0800AA10: .4byte gUnknown_3003F40 -_0800AA14: .4byte gUnknown_20227C8 +_0800AA14: .4byte gSavedLinkPlayers _0800AA18: .4byte gLinkPlayers _0800AA1C: .4byte gUnknown_3003EAC _0800AA20: .4byte c2_800ACD4 @@ -3169,7 +3169,7 @@ _0800AC54: .4byte gUnknown_3003F80 thumb_func_start sub_800AC58 sub_800AC58: @ 800AC58 push {lr} - ldr r0, _0800AC9C @ =gUnknown_2022718 + ldr r0, _0800AC9C @ =gLinkOpen ldrb r0, [r0] cmp r0, 0 beq _0800AC98 @@ -3184,7 +3184,7 @@ sub_800AC58: @ 800AC58 ldrb r0, [r0] cmp r0, 0 bne _0800AC8E - ldr r1, _0800ACA8 @ =gUnknown_2022854 + ldr r1, _0800ACA8 @ =sLinkErrorBuffer str r2, [r1] ldr r0, _0800ACAC @ =gUnknown_3004F70 ldrb r0, [r0] @@ -3203,10 +3203,10 @@ _0800AC98: pop {r0} bx r0 .align 2, 0 -_0800AC9C: .4byte gUnknown_2022718 +_0800AC9C: .4byte gLinkOpen _0800ACA0: .4byte gUnknown_3003F20 _0800ACA4: .4byte gUnknown_3003F38 -_0800ACA8: .4byte gUnknown_2022854 +_0800ACA8: .4byte sLinkErrorBuffer _0800ACAC: .4byte gUnknown_3004F70 _0800ACB0: .4byte gUnknown_3003FA0 _0800ACB4: .4byte c2_800ACD4 @@ -3216,7 +3216,7 @@ _0800ACB8: .4byte gUnknown_3003EAC thumb_func_start sub_800ACBC sub_800ACBC: @ 800ACBC push {r4,lr} - ldr r4, _0800ACD0 @ =gUnknown_2022854 + ldr r4, _0800ACD0 @ =sLinkErrorBuffer str r0, [r4] strb r1, [r4, 0x5] strb r2, [r4, 0x4] @@ -3225,7 +3225,7 @@ sub_800ACBC: @ 800ACBC pop {r0} bx r0 .align 2, 0 -_0800ACD0: .4byte gUnknown_2022854 +_0800ACD0: .4byte sLinkErrorBuffer thumb_func_end sub_800ACBC thumb_func_start c2_800ACD4 @@ -3257,7 +3257,7 @@ c2_800ACD4: @ 800ACD4 ldrb r0, [r1] cmp r0, 0 beq _0800AD30 - ldr r0, _0800ADF4 @ =gUnknown_2022854 + ldr r0, _0800ADF4 @ =sLinkErrorBuffer ldrb r0, [r0, 0x6] cmp r0, 0 bne _0800AD2C @@ -3338,7 +3338,7 @@ _0800ADE4: .4byte gMPlayInfo_SE2 _0800ADE8: .4byte gMPlayInfo_SE3 _0800ADEC: .4byte gHeap _0800ADF0: .4byte gUnknown_3003F3C -_0800ADF4: .4byte gUnknown_2022854 +_0800ADF4: .4byte sLinkErrorBuffer _0800ADF8: .4byte sub_800978C _0800ADFC: .4byte gUnknown_82345E8 _0800AE00: .4byte gUnknown_2022860 @@ -3492,14 +3492,14 @@ _0800AF50: beq _0800AF7A b _0800AFC4 _0800AF5A: - ldr r0, _0800AF68 @ =gUnknown_2022854 + ldr r0, _0800AF68 @ =sLinkErrorBuffer ldrb r0, [r0, 0x6] cmp r0, 0 beq _0800AF6C bl sub_800AE1C b _0800AFC4 .align 2, 0 -_0800AF68: .4byte gUnknown_2022854 +_0800AF68: .4byte sLinkErrorBuffer _0800AF6C: bl sub_800AED0 b _0800AFC4 @@ -3563,7 +3563,7 @@ _0800AFC4: bl PlaySE movs r0, 0 strb r0, [r4] - ldr r1, _0800B00C @ =gUnknown_2022854 + ldr r1, _0800B00C @ =sLinkErrorBuffer movs r0, 0 strb r0, [r1, 0x6] bl sub_8079B7C @@ -3573,7 +3573,7 @@ _0800AFFC: .4byte gUnknown_8234610 _0800B000: .4byte gUnknown_841DF4C _0800B004: .4byte gMain _0800B008: .4byte gUnknown_3003F3C -_0800B00C: .4byte gUnknown_2022854 +_0800B00C: .4byte sLinkErrorBuffer _0800B010: cmp r2, 0x2 bne _0800B02E @@ -3683,7 +3683,7 @@ sub_800B0B4: @ 800B0B4 ldr r1, _0800B100 @ =gUnknown_3003E70 adds r2, r1, 0 adds r2, 0x10 - ldr r0, _0800B104 @ =gUnknown_2022720 + ldr r0, _0800B104 @ =gLocalLinkPlayer ldm r0!, {r3-r5} stm r2!, {r3-r5} ldm r0!, {r3,r4,r6} @@ -3707,7 +3707,7 @@ sub_800B0B4: @ 800B0B4 strh r2, [r0] ldrb r2, [r3, 0x2] strb r2, [r0, 0x2] - ldr r0, _0800B10C @ =gUnknown_2022618 + ldr r0, _0800B10C @ =gBlockSendBuffer movs r2, 0x3C bl memcpy pop {r4-r6} @@ -3715,9 +3715,9 @@ sub_800B0B4: @ 800B0B4 bx r0 .align 2, 0 _0800B100: .4byte gUnknown_3003E70 -_0800B104: .4byte gUnknown_2022720 +_0800B104: .4byte gLocalLinkPlayer _0800B108: .4byte gUnknown_82345C0 -_0800B10C: .4byte gUnknown_2022618 +_0800B10C: .4byte gBlockSendBuffer thumb_func_end sub_800B0B4 thumb_func_start sub_800B110 @@ -3726,7 +3726,7 @@ sub_800B110: @ 800B110 lsls r0, 24 lsrs r0, 24 lsls r2, r0, 8 - ldr r1, _0800B168 @ =gUnknown_2022118 + ldr r1, _0800B168 @ =gBlockRecvBuffer adds r4, r2, r1 lsls r2, r0, 3 subs r2, r0 @@ -3764,7 +3764,7 @@ _0800B160: pop {r0} bx r0 .align 2, 0 -_0800B168: .4byte gUnknown_2022118 +_0800B168: .4byte gBlockRecvBuffer _0800B16C: .4byte gLinkPlayers _0800B170: .4byte gUnknown_82345C0 _0800B174: .4byte c2_800ACD4 diff --git a/asm/link_rfu_2.s b/asm/link_rfu_2.s index f59f1ea87..0bfd71538 100644 --- a/asm/link_rfu_2.s +++ b/asm/link_rfu_2.s @@ -142,7 +142,7 @@ sub_80F86F4: @ 80F86F4 lsrs r1, r0, 16 cmp r1, 0 bne _080F8722 - ldr r0, _080F8734 @ =gUnknown_202271A + ldr r0, _080F8734 @ =gLinkType strh r1, [r0] movs r0, 0 bl sub_80FB128 @@ -158,7 +158,7 @@ _080F8722: _080F8728: .4byte gUnknown_3001190 _080F872C: .4byte 0x00000e64 _080F8730: .4byte gIntrTable + 0x4 -_080F8734: .4byte gUnknown_202271A +_080F8734: .4byte gLinkType thumb_func_end sub_80F86F4 thumb_func_start sub_80F8738 @@ -2543,7 +2543,7 @@ _080F99DA: orrs r0, r3 str r0, [r1] movs r4, 0 - ldr r0, _080F9A8C @ =gUnknown_2022118 + ldr r0, _080F9A8C @ =gBlockRecvBuffer mov r9, r0 mov r12, r2 mov r1, r8 @@ -2617,12 +2617,12 @@ _080F9A78: beq _080F9A80 b _080F9BF8 _080F9A80: - ldr r0, _080F9A8C @ =gUnknown_2022118 + ldr r0, _080F9A8C @ =gBlockRecvBuffer bl sub_80FAA58 b _080F9BF8 .align 2, 0 _080F9A88: .4byte gUnknown_3005450 -_080F9A8C: .4byte gUnknown_2022118 +_080F9A8C: .4byte gBlockRecvBuffer _080F9A90: .4byte gUnknown_3003ED0 _080F9A94: .4byte gUnknown_843EBD4 _080F9A98: .4byte gUnknown_3003F64 @@ -3204,7 +3204,7 @@ _080F9EC0: str r7, [r5, 0x70] b _080F9F14 _080F9F02: - ldr r4, _080F9F38 @ =gUnknown_2022618 + ldr r4, _080F9F38 @ =gBlockSendBuffer cmp r7, r4 beq _080F9F12 adds r0, r4, 0 @@ -3232,7 +3232,7 @@ _080F9F2A: pop {r1} bx r1 .align 2, 0 -_080F9F38: .4byte gUnknown_2022618 +_080F9F38: .4byte gBlockSendBuffer _080F9F3C: .4byte gUnknown_3005450 _080F9F40: .4byte rfufunc_80F9F44 thumb_func_end sub_80F9E60 @@ -4872,7 +4872,7 @@ _080FAB70: adds r0, r4, 0 bl ResetBlockReceivedFlag lsls r2, r4, 8 - ldr r0, _080FAB9C @ =gUnknown_2022118 + ldr r0, _080FAB9C @ =gBlockRecvBuffer adds r2, r0 ldr r1, _080FABA0 @ =gLinkPlayers lsls r0, r4, 3 @@ -4890,10 +4890,10 @@ _080FAB70: bl sub_800B284 b _080FAC2E .align 2, 0 -_080FAB9C: .4byte gUnknown_2022118 +_080FAB9C: .4byte gBlockRecvBuffer _080FABA0: .4byte gLinkPlayers _080FABA4: - ldr r5, _080FAC40 @ =gUnknown_2022618 + ldr r5, _080FAC40 @ =gBlockSendBuffer adds r1, r5, 0 ldr r0, _080FAC44 @ =gUnknown_843EDE4 "PokemonSioInfo" ldm r0!, {r2-r4} @@ -4931,7 +4931,7 @@ _080FABC6: adds r0, 0x1 strh r0, [r1, 0x8] _080FABEE: - ldr r5, _080FAC40 @ =gUnknown_2022618 + ldr r5, _080FAC40 @ =gBlockSendBuffer ldr r1, _080FAC48 @ =gUnknown_3005450 ldrb r0, [r1, 0xD] strb r0, [r5, 0xF] @@ -4955,7 +4955,7 @@ _080FAC04: mov r1, r12 movs r2, 0x8C bl memcpy - ldr r1, _080FAC40 @ =gUnknown_2022618 + ldr r1, _080FAC40 @ =gBlockSendBuffer movs r0, 0 movs r2, 0xA0 bl SendBlock @@ -4973,7 +4973,7 @@ _080FAC36: strh r0, [r1, 0x8] b _080FACD6 .align 2, 0 -_080FAC40: .4byte gUnknown_2022618 +_080FAC40: .4byte gBlockSendBuffer _080FAC44: .4byte gUnknown_843EDE4 _080FAC48: .4byte gUnknown_3005450 _080FAC4C: .4byte 0x00000996 @@ -5008,7 +5008,7 @@ _080FAC78: mov r0, sp movs r4, 0 strh r4, [r0] - ldr r1, _080FACE0 @ =gUnknown_2022118 + ldr r1, _080FACE0 @ =gBlockRecvBuffer ldr r2, _080FACE4 @ =0x0100007e bl CpuSet movs r0, 0 @@ -5046,7 +5046,7 @@ _080FACD6: pop {r0} bx r0 .align 2, 0 -_080FACE0: .4byte gUnknown_2022118 +_080FACE0: .4byte gBlockRecvBuffer _080FACE4: .4byte 0x0100007e _080FACE8: .4byte gUnknown_3005450 _080FACEC: .4byte 0x0000099e @@ -5095,13 +5095,13 @@ _080FAD3A: cmp r0, 0 beq _080FAD8A bl sub_800B0B4 - ldr r1, _080FAD50 @ =gUnknown_2022618 + ldr r1, _080FAD50 @ =gBlockSendBuffer movs r0, 0 movs r2, 0x3C bl SendBlock b _080FAD5E .align 2, 0 -_080FAD50: .4byte gUnknown_2022618 +_080FAD50: .4byte gBlockSendBuffer _080FAD54: bl sub_800A4BC lsls r0, 24 @@ -5119,7 +5119,7 @@ _080FAD66: ands r1, r0 cmp r1, 0 beq _080FAD8A - ldr r0, _080FAD90 @ =gUnknown_2022118 + ldr r0, _080FAD90 @ =gBlockRecvBuffer bl sub_80FA9FC movs r0, 0 bl ResetBlockReceivedFlag @@ -5132,7 +5132,7 @@ _080FAD8A: pop {r0} bx r0 .align 2, 0 -_080FAD90: .4byte gUnknown_2022118 +_080FAD90: .4byte gBlockRecvBuffer _080FAD94: .4byte gUnknown_3003F64 thumb_func_end sub_80FACF0 @@ -6870,7 +6870,7 @@ sub_80FBA78: @ 80FBA78 lsls r0, 24 cmp r0, 0 beq _080FBAEC - ldr r1, _080FBAF8 @ =gUnknown_202271A + ldr r1, _080FBAF8 @ =gLinkType ldr r2, _080FBAFC @ =0x00001111 adds r0, r2, 0 strh r0, [r1] @@ -6907,7 +6907,7 @@ _080FBAEC: bx r0 .align 2, 0 _080FBAF4: .4byte sub_80FBA64 -_080FBAF8: .4byte gUnknown_202271A +_080FBAF8: .4byte gLinkType _080FBAFC: .4byte 0x00001111 _080FBB00: .4byte gMain _080FBB04: .4byte gSaveBlock2Ptr diff --git a/asm/link_rfu_3.s b/asm/link_rfu_3.s index d67176ed4..56bbd2c51 100644 --- a/asm/link_rfu_3.s +++ b/asm/link_rfu_3.s @@ -3028,7 +3028,7 @@ _0811719C: eors r1, r2 lsls r1, 24 lsrs r1, 16 - ldr r2, _081171D4 @ =gUnknown_2022118 + ldr r2, _081171D4 @ =gBlockRecvBuffer adds r1, r2 movs r2, 0x64 bl memcpy @@ -3038,9 +3038,9 @@ _0811719C: b _081171FA .align 2, 0 _081171D0: .4byte gEnemyParty -_081171D4: .4byte gUnknown_2022118 +_081171D4: .4byte gBlockRecvBuffer _081171D8: - ldr r4, _08117204 @ =gUnknown_2022618 + ldr r4, _08117204 @ =gBlockSendBuffer ldr r0, _08117208 @ =gSaveBlock1Ptr ldr r1, [r0] ldr r0, _0811720C @ =0x00002cd0 @@ -3061,7 +3061,7 @@ _081171FA: strh r0, [r5, 0x8] b _0811725C .align 2, 0 -_08117204: .4byte gUnknown_2022618 +_08117204: .4byte gBlockSendBuffer _08117208: .4byte gSaveBlock1Ptr _0811720C: .4byte 0x00002cd0 _08117210: @@ -3077,7 +3077,7 @@ _08117210: eors r1, r0 lsls r1, 24 lsrs r1, 16 - ldr r0, _0811726C @ =gUnknown_2022118 + ldr r0, _0811726C @ =gBlockRecvBuffer adds r1, r0 adds r0, r4, 0 movs r2, 0xD8 @@ -3104,7 +3104,7 @@ _0811725C: bx r0 .align 2, 0 _08117268: .4byte gUnknown_2031CCC -_0811726C: .4byte gUnknown_2022118 +_0811726C: .4byte gBlockRecvBuffer _08117270: .4byte gUnknown_2031DA4 _08117274: .4byte gMain _08117278: .4byte c2_exit_to_overworld_2_switch @@ -3165,7 +3165,7 @@ _081172E0: .4byte gUnknown_2039624 _081172E4: .4byte gLinkPlayers _081172E8: lsls r0, r4, 8 - ldr r1, _08117338 @ =gUnknown_2022118 + ldr r1, _08117338 @ =gBlockRecvBuffer adds r1, r0, r1 adds r0, r5, 0 movs r2, 0x60 @@ -3192,7 +3192,7 @@ _08117302: eors r0, r1 lsls r0, 24 lsrs r0, 16 - ldr r1, _08117338 @ =gUnknown_2022118 + ldr r1, _08117338 @ =gBlockRecvBuffer adds r1, r0, r1 adds r0, r1, 0 adds r0, 0x60 @@ -3200,7 +3200,7 @@ _08117302: bl sub_81446D0 b _08117340 .align 2, 0 -_08117338: .4byte gUnknown_2022118 +_08117338: .4byte gBlockRecvBuffer _0811733C: bl sub_81446C4 _08117340: @@ -3657,7 +3657,7 @@ _08117798: .4byte gMain _0811779C: .4byte sub_811C1C8 _081177A0: bl sub_80563F0 - ldr r0, _081177C4 @ =gUnknown_2022618 + ldr r0, _081177C4 @ =gBlockSendBuffer movs r1, 0x1 bl sub_8117594 bl sp000_heal_pokemon @@ -3670,13 +3670,13 @@ _081177A0: movs r2, 0x6 b _0811782E .align 2, 0 -_081177C4: .4byte gUnknown_2022618 +_081177C4: .4byte gBlockSendBuffer _081177C8: bl sub_80563F0 bl sp000_heal_pokemon bl SavePlayerParty bl LoadPlayerBag - ldr r0, _081177EC @ =gUnknown_2022618 + ldr r0, _081177EC @ =gBlockSendBuffer movs r1, 0x1 bl sub_8117594 movs r0, 0x2 @@ -3686,13 +3686,13 @@ _081177C8: movs r2, 0x6 b _0811782E .align 2, 0 -_081177EC: .4byte gUnknown_2022618 +_081177EC: .4byte gBlockSendBuffer _081177F0: bl sub_80563F0 bl sp000_heal_pokemon bl SavePlayerParty bl LoadPlayerBag - ldr r0, _08117814 @ =gUnknown_2022618 + ldr r0, _08117814 @ =gBlockSendBuffer movs r1, 0x1 bl sub_8117594 movs r0, 0x5 @@ -3701,9 +3701,9 @@ _081177F0: movs r1, 0x3 b _0811782C .align 2, 0 -_08117814: .4byte gUnknown_2022618 +_08117814: .4byte gBlockSendBuffer _08117818: - ldr r0, _0811783C @ =gUnknown_2022618 + ldr r0, _0811783C @ =gBlockSendBuffer movs r1, 0x1 bl sub_8117594 bl sub_80563F0 @@ -3720,7 +3720,7 @@ _0811782E: bl SetMainCallback2 b _081178E0 .align 2, 0 -_0811783C: .4byte gUnknown_2022618 +_0811783C: .4byte gBlockSendBuffer _08117840: .4byte sub_8117534 _08117844: ldr r0, _08117850 @ =sub_8117130 @@ -3746,14 +3746,14 @@ _08117872: bl sub_8128420 b _081178E0 _08117878: - ldr r0, _08117888 @ =gUnknown_2022618 + ldr r0, _08117888 @ =gBlockSendBuffer movs r1, 0 bl sub_8117594 ldr r0, _0811788C @ =sub_8117354 bl SetMainCallback2 b _081178E0 .align 2, 0 -_08117888: .4byte gUnknown_2022618 +_08117888: .4byte gBlockSendBuffer _0811788C: .4byte sub_8117354 _08117890: movs r0, 0x8 @@ -5947,7 +5947,7 @@ _08118BC2: bne _08118BCE bl _081198DC _08118BCE: - ldr r0, _08118BF0 @ =gUnknown_2022618 + ldr r0, _08118BF0 @ =gBlockSendBuffer movs r1, 0x1 bl sub_8117594 ldr r0, _08118BF4 @ =sub_8117280 @@ -5959,7 +5959,7 @@ _08118BCE: _08118BE4: .4byte gUnknown_8457F90 _08118BE8: .4byte gUnknown_203B058 _08118BEC: .4byte gUnknown_3003F64 -_08118BF0: .4byte gUnknown_2022618 +_08118BF0: .4byte gBlockSendBuffer _08118BF4: .4byte sub_8117280 _08118BF8: ldr r0, _08118C1C @ =sub_8117280 @@ -6518,7 +6518,7 @@ _081190DE: bne _081190EA bl _081198DC _081190EA: - ldr r0, _08119104 @ =gUnknown_2022618 + ldr r0, _08119104 @ =gBlockSendBuffer movs r1, 0x1 bl sub_8117594 ldr r0, _08119108 @ =sub_8117280 @@ -6528,7 +6528,7 @@ _081190EA: bl _081198DA .align 2, 0 _08119100: .4byte gUnknown_3003F64 -_08119104: .4byte gUnknown_2022618 +_08119104: .4byte gBlockSendBuffer _08119108: .4byte sub_8117280 _0811910C: adds r0, r6, 0 @@ -13024,7 +13024,7 @@ _0811C3B0: beq _0811C3BC b _0811C516 _0811C3BC: - ldr r4, _0811C3D8 @ =gUnknown_2022618 + ldr r4, _0811C3D8 @ =gBlockSendBuffer adds r0, r4, 0 movs r1, 0 movs r2, 0x20 @@ -13037,13 +13037,13 @@ _0811C3BC: movs r0, 0x52 b _0811C3E2 .align 2, 0 -_0811C3D8: .4byte gUnknown_2022618 +_0811C3D8: .4byte gBlockSendBuffer _0811C3DC: .4byte gUnknown_203B0D4 _0811C3E0: movs r0, 0x51 _0811C3E2: strb r0, [r4] - ldr r1, _0811C3F8 @ =gUnknown_2022618 + ldr r1, _0811C3F8 @ =gBlockSendBuffer movs r0, 0 movs r2, 0x20 bl SendBlock @@ -13053,7 +13053,7 @@ _0811C3E2: adds r1, r2 b _0811C4F2 .align 2, 0 -_0811C3F8: .4byte gUnknown_2022618 +_0811C3F8: .4byte gBlockSendBuffer _0811C3FC: .4byte gMain _0811C400: bl GetBlockReceivedStatus @@ -13063,7 +13063,7 @@ _0811C400: beq _0811C40E b _0811C516 _0811C40E: - ldr r1, _0811C440 @ =gUnknown_2022118 + ldr r1, _0811C440 @ =gBlockRecvBuffer ldrh r0, [r1] cmp r0, 0x51 bne _0811C448 @@ -13087,11 +13087,11 @@ _0811C40E: movs r1, 0x32 b _0811C47E .align 2, 0 -_0811C440: .4byte gUnknown_2022118 +_0811C440: .4byte gBlockRecvBuffer _0811C444: .4byte gMain _0811C448: bl sub_800AAC0 - ldr r4, _0811C46C @ =gUnknown_2022118 + ldr r4, _0811C46C @ =gBlockRecvBuffer bl GetMultiplayerId lsls r0, 24 lsrs r0, 16 @@ -13106,7 +13106,7 @@ _0811C448: movs r1, 0x6 b _0811C47E .align 2, 0 -_0811C46C: .4byte gUnknown_2022118 +_0811C46C: .4byte gBlockRecvBuffer _0811C470: .4byte gMain _0811C474: ldr r0, _0811C488 @ =gMain diff --git a/asm/mevent_server.s b/asm/mevent_server.s index 5772b19f4..833212ea4 100644 --- a/asm/mevent_server.s +++ b/asm/mevent_server.s @@ -5,243 +5,6 @@ .text - thumb_func_start sub_8144844 -sub_8144844: @ 8144844 - push {lr} - ldr r1, [r0, 0x20] - bl _call_via_r1 - pop {r1} - bx r1 - thumb_func_end sub_8144844 - - thumb_func_start sub_8144850 -sub_8144850: @ 8144850 - push {lr} - ldr r1, [r0, 0x24] - bl _call_via_r1 - pop {r1} - bx r1 - thumb_func_end sub_8144850 - - thumb_func_start sub_814485C -sub_814485C: @ 814485C - movs r3, 0 - strb r1, [r0, 0x4] - strb r2, [r0, 0x5] - str r3, [r0] - strh r3, [r0, 0x12] - strh r3, [r0, 0x14] - strh r3, [r0, 0x10] - strh r3, [r0, 0xA] - strh r3, [r0, 0xC] - strh r3, [r0, 0x8] - str r3, [r0, 0x1C] - str r3, [r0, 0x18] - ldr r1, _08144880 @ =sub_81449E0 - str r1, [r0, 0x24] - ldr r1, _08144884 @ =sub_814490C - str r1, [r0, 0x20] - bx lr - .align 2, 0 -_08144880: .4byte sub_81449E0 -_08144884: .4byte sub_814490C - thumb_func_end sub_814485C - - thumb_func_start sub_8144888 -sub_8144888: @ 8144888 - push {r4,lr} - adds r4, r0, 0 - movs r0, 0 - str r0, [r4] - strh r1, [r4, 0xE] - strh r0, [r4, 0x10] - strh r0, [r4, 0x12] - cmp r3, 0 - beq _0814489E - strh r3, [r4, 0x14] - b _081448A4 -_0814489E: - movs r0, 0x80 - lsls r0, 3 - strh r0, [r4, 0x14] -_081448A4: - str r2, [r4, 0x1C] - pop {r4} - pop {r0} - bx r0 - thumb_func_end sub_8144888 - - thumb_func_start sub_81448AC -sub_81448AC: @ 81448AC - movs r3, 0 - str r3, [r0] - strh r1, [r0, 0x6] - strh r3, [r0, 0x8] - strh r3, [r0, 0xA] - strh r3, [r0, 0xC] - str r2, [r0, 0x18] - bx lr - thumb_func_end sub_81448AC - - thumb_func_start sub_81448BC -sub_81448BC: @ 81448BC - push {lr} - adds r3, r0, 0 - adds r0, r1, 0 - lsls r3, 8 - ldr r1, _081448D4 @ =gUnknown_2022118 - adds r3, r1 - adds r1, r3, 0 - bl memcpy - pop {r0} - bx r0 - .align 2, 0 -_081448D4: .4byte gUnknown_2022118 - thumb_func_end sub_81448BC - - thumb_func_start sub_81448D8 -sub_81448D8: @ 81448D8 - push {r4,lr} - adds r4, r0, 0 - bl GetBlockReceivedStatus - lsls r0, 24 - lsrs r0, 24 - asrs r0, r4 - movs r1, 0x1 - ands r0, r1 - cmp r0, 0 - bne _081448F2 - movs r0, 0 - b _081448F4 -_081448F2: - movs r0, 0x1 -_081448F4: - pop {r4} - pop {r1} - bx r1 - thumb_func_end sub_81448D8 - - thumb_func_start sub_81448FC -sub_81448FC: @ 81448FC - push {lr} - lsls r0, 24 - lsrs r0, 24 - bl ResetBlockReceivedFlag - pop {r0} - bx r0 - thumb_func_end sub_81448FC - - thumb_func_start sub_814490C -sub_814490C: @ 814490C - push {r4-r6,lr} - sub sp, 0x8 - adds r5, r0, 0 - ldr r6, [r5] - cmp r6, 0x1 - beq _08144970 - cmp r6, 0x1 - bgt _08144922 - cmp r6, 0 - beq _08144928 - b _081449D6 -_08144922: - cmp r6, 0x2 - beq _081449BC - b _081449D6 -_08144928: - ldrb r0, [r5, 0x5] - bl sub_81448D8 - cmp r0, 0 - beq _081449D6 - ldrb r0, [r5, 0x5] - mov r4, sp - mov r1, sp - movs r2, 0x8 - bl sub_81448BC - ldrh r1, [r4, 0x4] - strh r1, [r5, 0xC] - ldrh r0, [r4, 0x2] - strh r0, [r5, 0xA] - lsls r1, 16 - movs r0, 0x80 - lsls r0, 19 - cmp r1, r0 - bls _08144956 -_08144950: - bl sub_80FA190 - b _081449D6 -_08144956: - mov r1, sp - ldrh r0, [r5, 0x6] - ldrh r1, [r1] - cmp r0, r1 - bne _08144950 - strh r6, [r5, 0x8] - ldrb r0, [r5, 0x5] - bl sub_81448FC - ldr r0, [r5] - adds r0, 0x1 - str r0, [r5] - b _081449D6 -_08144970: - ldrb r0, [r5, 0x5] - bl sub_81448D8 - cmp r0, 0 - beq _081449D6 - ldrh r0, [r5, 0x8] - lsls r1, r0, 6 - subs r1, r0 - lsls r3, r1, 2 - ldrh r0, [r5, 0xC] - subs r2, r0, r3 - cmp r2, 0xFC - bhi _081449A2 - ldrb r0, [r5, 0x5] - ldr r1, [r5, 0x18] - adds r1, r3 - bl sub_81448BC - ldrh r0, [r5, 0x8] - adds r0, 0x1 - strh r0, [r5, 0x8] - ldr r0, [r5] - adds r0, 0x1 - str r0, [r5] - b _081449B4 -_081449A2: - ldrb r0, [r5, 0x5] - ldr r1, [r5, 0x18] - adds r1, r3 - movs r2, 0xFC - bl sub_81448BC - ldrh r0, [r5, 0x8] - adds r0, 0x1 - strh r0, [r5, 0x8] -_081449B4: - ldrb r0, [r5, 0x5] - bl sub_81448FC - b _081449D6 -_081449BC: - ldr r0, [r5, 0x18] - ldrh r1, [r5, 0xC] - bl CalcCRC16WithTable - lsls r0, 16 - lsrs r0, 16 - ldrh r1, [r5, 0xA] - cmp r0, r1 - bne _08144950 - movs r0, 0 - str r0, [r5] - movs r0, 0x1 - b _081449D8 -_081449D6: - movs r0, 0 -_081449D8: - add sp, 0x8 - pop {r4-r6} - pop {r1} - bx r1 - thumb_func_end sub_814490C - thumb_func_start sub_81449E0 sub_81449E0: @ 81449E0 push {r4,r5,lr} diff --git a/asm/trade.s b/asm/trade.s index b5d1dcac6..5df1c0534 100644 --- a/asm/trade.s +++ b/asm/trade.s @@ -250,7 +250,7 @@ _0804C80A: ldrb r2, [r0] cmp r2, 0 bne _0804C8B4 - ldr r1, _0804C870 @ =gUnknown_202271A + ldr r1, _0804C870 @ =gLinkType ldr r5, _0804C874 @ =0x00001122 adds r0, r5, 0 strh r0, [r1] @@ -270,7 +270,7 @@ _0804C80A: _0804C864: .4byte gPaletteFade _0804C868: .4byte gEnemyParty _0804C86C: .4byte gUnknown_3003F64 -_0804C870: .4byte gUnknown_202271A +_0804C870: .4byte gLinkType _0804C874: .4byte 0x00001122 _0804C878: .4byte gUnknown_2031DA8 _0804C87C: .4byte gUnknown_3003F3C @@ -2181,7 +2181,7 @@ _0804D860: .4byte _0804DAE0 .4byte _0804DB14 _0804D8B8: - ldr r0, _0804D8D8 @ =gUnknown_2022618 + ldr r0, _0804D8D8 @ =gBlockSendBuffer ldr r1, _0804D8DC @ =gPlayerParty movs r2, 0xC8 bl sub_804D814 @@ -2197,7 +2197,7 @@ _0804D8B8: strb r2, [r0] b _0804DB9E .align 2, 0 -_0804D8D8: .4byte gUnknown_2022618 +_0804D8D8: .4byte gBlockSendBuffer _0804D8DC: .4byte gPlayerParty _0804D8E0: .4byte gUnknown_2031DA8 _0804D8E4: @@ -2247,7 +2247,7 @@ _0804D936: adds r1, r5, 0 eors r1, r2 lsls r1, 8 - ldr r2, _0804D958 @ =gUnknown_2022118 + ldr r2, _0804D958 @ =gBlockRecvBuffer adds r1, r2 movs r2, 0xC8 bl sub_804D814 @@ -2257,10 +2257,10 @@ _0804D936: b _0804DB96 .align 2, 0 _0804D954: .4byte gEnemyParty -_0804D958: .4byte gUnknown_2022118 +_0804D958: .4byte gBlockRecvBuffer _0804D95C: .4byte gUnknown_2031DA8 _0804D960: - ldr r0, _0804D970 @ =gUnknown_2022618 + ldr r0, _0804D970 @ =gBlockSendBuffer ldr r1, _0804D974 @ =gUnknown_202434C movs r2, 0xC8 bl sub_804D814 @@ -2268,7 +2268,7 @@ _0804D960: ldr r1, [r0] b _0804DB96 .align 2, 0 -_0804D970: .4byte gUnknown_2022618 +_0804D970: .4byte gBlockSendBuffer _0804D974: .4byte gUnknown_202434C _0804D978: .4byte gUnknown_2031DA8 _0804D97C: @@ -2295,7 +2295,7 @@ _0804D99E: adds r1, r5, 0 eors r1, r2 lsls r1, 8 - ldr r2, _0804D9C0 @ =gUnknown_2022118 + ldr r2, _0804D9C0 @ =gBlockRecvBuffer adds r1, r2 movs r2, 0xC8 bl sub_804D814 @@ -2305,10 +2305,10 @@ _0804D99E: b _0804DB96 .align 2, 0 _0804D9BC: .4byte gUnknown_20240F4 -_0804D9C0: .4byte gUnknown_2022118 +_0804D9C0: .4byte gBlockRecvBuffer _0804D9C4: .4byte gUnknown_2031DA8 _0804D9C8: - ldr r0, _0804D9D8 @ =gUnknown_2022618 + ldr r0, _0804D9D8 @ =gBlockSendBuffer ldr r1, _0804D9DC @ =gUnknown_2024414 movs r2, 0xC8 bl sub_804D814 @@ -2316,7 +2316,7 @@ _0804D9C8: ldr r1, [r0] b _0804DB96 .align 2, 0 -_0804D9D8: .4byte gUnknown_2022618 +_0804D9D8: .4byte gBlockSendBuffer _0804D9DC: .4byte gUnknown_2024414 _0804D9E0: .4byte gUnknown_2031DA8 _0804D9E4: @@ -2343,7 +2343,7 @@ _0804DA06: adds r1, r5, 0 eors r1, r2 lsls r1, 8 - ldr r2, _0804DA28 @ =gUnknown_2022118 + ldr r2, _0804DA28 @ =gBlockRecvBuffer adds r1, r2 movs r2, 0xC8 bl sub_804D814 @@ -2353,10 +2353,10 @@ _0804DA06: b _0804DB96 .align 2, 0 _0804DA24: .4byte gUnknown_20241BC -_0804DA28: .4byte gUnknown_2022118 +_0804DA28: .4byte gBlockRecvBuffer _0804DA2C: .4byte gUnknown_2031DA8 _0804DA30: - ldr r0, _0804DA48 @ =gUnknown_2022618 + ldr r0, _0804DA48 @ =gBlockSendBuffer ldr r1, _0804DA4C @ =gSaveBlock1Ptr ldr r1, [r1] ldr r2, _0804DA50 @ =0x00002cd0 @@ -2367,7 +2367,7 @@ _0804DA30: ldr r1, [r0] b _0804DB96 .align 2, 0 -_0804DA48: .4byte gUnknown_2022618 +_0804DA48: .4byte gBlockSendBuffer _0804DA4C: .4byte gSaveBlock1Ptr _0804DA50: .4byte 0x00002cd0 _0804DA54: .4byte gUnknown_2031DA8 @@ -2395,7 +2395,7 @@ _0804DA7A: adds r1, r5, 0 eors r1, r2 lsls r1, 8 - ldr r2, _0804DA9C @ =gUnknown_2022118 + ldr r2, _0804DA9C @ =gBlockRecvBuffer adds r1, r2 movs r2, 0xD8 bl sub_804D814 @@ -2405,10 +2405,10 @@ _0804DA7A: b _0804DB96 .align 2, 0 _0804DA98: .4byte gUnknown_2031CCC -_0804DA9C: .4byte gUnknown_2022118 +_0804DA9C: .4byte gBlockRecvBuffer _0804DAA0: .4byte gUnknown_2031DA8 _0804DAA4: - ldr r0, _0804DABC @ =gUnknown_2022618 + ldr r0, _0804DABC @ =gBlockSendBuffer ldr r1, _0804DAC0 @ =gSaveBlock1Ptr ldr r1, [r1] ldr r2, _0804DAC4 @ =0x0000309c @@ -2419,7 +2419,7 @@ _0804DAA4: ldr r1, [r0] b _0804DB96 .align 2, 0 -_0804DABC: .4byte gUnknown_2022618 +_0804DABC: .4byte gBlockSendBuffer _0804DAC0: .4byte gSaveBlock1Ptr _0804DAC4: .4byte 0x0000309c _0804DAC8: .4byte gUnknown_2031DA8 @@ -2447,7 +2447,7 @@ _0804DAE0: adds r1, r5, 0 eors r1, r2 lsls r1, 8 - ldr r2, _0804DB10 @ =gUnknown_2022118 + ldr r2, _0804DB10 @ =gBlockRecvBuffer adds r1, r2 movs r2, 0xB bl sub_804D814 @@ -2456,7 +2456,7 @@ _0804DAE0: b _0804DB96 .align 2, 0 _0804DB0C: .4byte gUnknown_2031DA8 -_0804DB10: .4byte gUnknown_2022118 +_0804DB10: .4byte gBlockRecvBuffer _0804DB14: ldr r4, _0804DB68 @ =gEnemyParty ldr r6, _0804DB6C @ =0x0000012f @@ -2564,7 +2564,7 @@ sub_804DBD4: @ 804DBD4 ands r0, r2 cmp r0, 0 beq _0804DC58 - ldr r0, _0804DBFC @ =gUnknown_2022118 + ldr r0, _0804DBFC @ =gBlockRecvBuffer ldrh r1, [r0] ldr r0, _0804DC00 @ =0x0000bbbb cmp r1, r0 @@ -2576,7 +2576,7 @@ sub_804DBD4: @ 804DBD4 beq _0804DC28 b _0804DC52 .align 2, 0 -_0804DBFC: .4byte gUnknown_2022118 +_0804DBFC: .4byte gBlockRecvBuffer _0804DC00: .4byte 0x0000bbbb _0804DC04: .4byte 0x0000aabb _0804DC08: @@ -2626,7 +2626,7 @@ _0804DC58: ands r0, r2 cmp r0, 0 beq _0804DCEA - ldr r3, _0804DC84 @ =gUnknown_2022118 + ldr r3, _0804DC84 @ =gBlockRecvBuffer movs r1, 0x80 lsls r1, 1 adds r0, r3, r1 @@ -2642,7 +2642,7 @@ _0804DC58: b _0804DCE4 .align 2, 0 _0804DC80: .4byte gUnknown_2031DA8 -_0804DC84: .4byte gUnknown_2022118 +_0804DC84: .4byte gBlockRecvBuffer _0804DC88: .4byte 0x0000bbbb _0804DC8C: .4byte 0x0000aabb _0804DC90: @@ -2712,7 +2712,7 @@ sub_804DCF4: @ 804DCF4 ands r0, r5 cmp r0, 0 beq _0804DDD6 - ldr r2, _0804DD20 @ =gUnknown_2022118 + ldr r2, _0804DD20 @ =gBlockRecvBuffer ldrh r1, [r2] ldr r0, _0804DD24 @ =0x0000ddee cmp r1, r0 @@ -2727,7 +2727,7 @@ sub_804DCF4: @ 804DCF4 beq _0804DD6C b _0804DDD0 .align 2, 0 -_0804DD20: .4byte gUnknown_2022118 +_0804DD20: .4byte gBlockRecvBuffer _0804DD24: .4byte 0x0000ddee _0804DD28: .4byte 0x0000ccdd _0804DD2C: .4byte 0x0000dddd @@ -7428,7 +7428,7 @@ _08050194: ldrb r0, [r0] cmp r0, 0 bne _080501A8 - ldr r1, _0805022C @ =gUnknown_202271A + ldr r1, _0805022C @ =gLinkType ldr r2, _08050230 @ =0x00001144 adds r0, r2, 0 strh r0, [r1] @@ -7491,7 +7491,7 @@ _080501A8: b _08050472 .align 2, 0 _08050228: .4byte gUnknown_3003F64 -_0805022C: .4byte gUnknown_202271A +_0805022C: .4byte gLinkType _08050230: .4byte 0x00001144 _08050234: .4byte gUnknown_2031DAC _08050238: .4byte sub_804FF0C @@ -13477,7 +13477,7 @@ sub_805383C: @ 805383C ands r0, r6 cmp r0, 0 beq _0805387A - ldr r4, _080538A8 @ =gUnknown_2022118 + ldr r4, _080538A8 @ =gBlockRecvBuffer ldrh r1, [r4] ldr r0, _080538AC @ =0x0000dcba cmp r1, r0 @@ -13501,7 +13501,7 @@ _0805387A: ands r0, r5 cmp r0, 0 beq _080538A2 - ldr r0, _080538A8 @ =gUnknown_2022118 + ldr r0, _080538A8 @ =gBlockRecvBuffer movs r1, 0x80 lsls r1, 1 adds r0, r1 @@ -13522,7 +13522,7 @@ _080538A2: pop {r0} bx r0 .align 2, 0 -_080538A8: .4byte gUnknown_2022118 +_080538A8: .4byte gBlockRecvBuffer _080538AC: .4byte 0x0000dcba _080538B0: .4byte sub_8053788 _080538B4: .4byte 0x0000abcd diff --git a/asm/union_room_chat.s b/asm/union_room_chat.s index e7454d31f..4c7d6769f 100644 --- a/asm/union_room_chat.s +++ b/asm/union_room_chat.s @@ -2831,7 +2831,7 @@ _081299E6: movs r1, 0x2 ldrsh r0, [r4, r1] lsls r0, 8 - ldr r1, _08129A0C @ =gUnknown_2022118 + ldr r1, _08129A0C @ =gBlockRecvBuffer adds r0, r1 ldrb r0, [r0] subs r0, 0x1 @@ -2843,7 +2843,7 @@ _081299E6: ldr r0, [r0] mov pc, r0 .align 2, 0 -_08129A0C: .4byte gUnknown_2022118 +_08129A0C: .4byte gBlockRecvBuffer _08129A10: .4byte _08129A14 .align 2, 0 _08129A14: @@ -2874,7 +2874,7 @@ _08129A3A: movs r2, 0x2 ldrsh r1, [r4, r2] lsls r1, 8 - ldr r2, _08129A6C @ =gUnknown_2022118 + ldr r2, _08129A6C @ =gBlockRecvBuffer adds r1, r2 bl sub_812963C cmp r0, 0 @@ -2889,7 +2889,7 @@ _08129A3A: b _08129A72 .align 2, 0 _08129A68: .4byte gUnknown_203B0E0 -_08129A6C: .4byte gUnknown_2022118 +_08129A6C: .4byte gBlockRecvBuffer _08129A70: ldrh r0, [r4, 0xA] _08129A72: diff --git a/asm/unk_814BB4C.s b/asm/unk_814BB4C.s index 1895133dc..c3f054fc7 100644 --- a/asm/unk_814BB4C.s +++ b/asm/unk_814BB4C.s @@ -540,7 +540,7 @@ _0814BF1A: movs r3, 0 cmp r3, r4 bcs _0814BF7E - ldr r7, _0814BF9C @ =gUnknown_2022118 + ldr r7, _0814BF9C @ =gBlockRecvBuffer movs r6, 0 ldr r4, _0814BFA0 @ =gUnknown_83DFC9C _0814BF3C: @@ -592,7 +592,7 @@ _0814BF7E: b _0814BFC0 .align 2, 0 _0814BF98: .4byte gUnknown_846E3C8 -_0814BF9C: .4byte gUnknown_2022118 +_0814BF9C: .4byte gBlockRecvBuffer _0814BFA0: .4byte gUnknown_83DFC9C _0814BFA4: movs r0, 0 @@ -2299,7 +2299,7 @@ _0814CCB0: adds r4, 0x42 cmp r8, r3 bcs _0814CCDE - ldr r2, _0814CCF8 @ =gUnknown_2022118 + ldr r2, _0814CCF8 @ =gBlockRecvBuffer _0814CCBE: mov r3, r8 lsls r1, r3, 5 @@ -2329,7 +2329,7 @@ _0814CCDE: b _0814CF92 .align 2, 0 _0814CCF4: .4byte gUnknown_846E3C8 -_0814CCF8: .4byte gUnknown_2022118 +_0814CCF8: .4byte gBlockRecvBuffer _0814CCFC: movs r0, 0x6 b _0814CF92 @@ -2635,7 +2635,7 @@ _0814CF3C: movs r1, 0 movs r2, 0x30 bl memset - ldr r1, _0814CF6C @ =gUnknown_2022118 + ldr r1, _0814CF6C @ =gBlockRecvBuffer adds r0, r4, 0 movs r2, 0x30 bl memcpy @@ -2645,7 +2645,7 @@ _0814CF64: strh r0, [r7, 0x10] b _0814CF8E .align 2, 0 -_0814CF6C: .4byte gUnknown_2022118 +_0814CF6C: .4byte gBlockRecvBuffer _0814CF70: bl sub_814B930 movs r0, 0x12 @@ -3071,7 +3071,7 @@ _0814D296: cmp r5, r3 bcs _0814D2D4 adds r1, r6, 0 - ldr r2, _0814D2EC @ =gUnknown_2022118 + ldr r2, _0814D2EC @ =gBlockRecvBuffer _0814D2BC: lsls r0, r5, 8 adds r0, r2 @@ -3096,7 +3096,7 @@ _0814D2D4: b _0814D2FA .align 2, 0 _0814D2E8: .4byte gUnknown_846E3C8 -_0814D2EC: .4byte gUnknown_2022118 +_0814D2EC: .4byte gBlockRecvBuffer _0814D2F0: movs r0, 0x16 movs r1, 0x1 diff --git a/asm/unk_81507FC.s b/asm/unk_81507FC.s index 40d5a13b0..97711bd33 100644 --- a/asm/unk_81507FC.s +++ b/asm/unk_81507FC.s @@ -1150,7 +1150,7 @@ _081510F4: beq _08151116 ldr r0, [r6] adds r0, 0x4A - ldr r1, _08151148 @ =gUnknown_2022118 + ldr r1, _08151148 @ =gBlockRecvBuffer movs r2, 0x3C bl memcpy adds r0, r4, 0 @@ -1188,7 +1188,7 @@ _08151140: strb r0, [r1, 0x10] b _0815118A .align 2, 0 -_08151148: .4byte gUnknown_2022118 +_08151148: .4byte gBlockRecvBuffer _0815114C: .4byte gUnknown_203F3E0 _08151150: movs r0, 0x1 @@ -1305,7 +1305,7 @@ _08151228: lsls r0, 1 adds r2, r0 lsls r0, r4, 8 - ldr r1, _08151294 @ =gUnknown_2022118 + ldr r1, _08151294 @ =gBlockRecvBuffer adds r0, r1 ldrb r0, [r0] strb r0, [r2] @@ -1350,7 +1350,7 @@ _0815128A: strb r0, [r1, 0x10] b _081512AA .align 2, 0 -_08151294: .4byte gUnknown_2022118 +_08151294: .4byte gBlockRecvBuffer _08151298: .4byte gUnknown_203F3E0 _0815129C: bl sub_8155E68 @@ -1501,7 +1501,7 @@ _081513C4: lsls r0, 1 adds r2, r0 lsls r0, r4, 8 - ldr r1, _08151438 @ =gUnknown_2022118 + ldr r1, _08151438 @ =gBlockRecvBuffer adds r0, r1 ldrb r0, [r0] strb r0, [r2] @@ -1548,7 +1548,7 @@ _0815142A: b _08151480 .align 2, 0 _08151434: .4byte gUnknown_203F3E0 -_08151438: .4byte gUnknown_2022118 +_08151438: .4byte gBlockRecvBuffer _0815143C: bl sub_81532B8 b _08151480 @@ -2016,7 +2016,7 @@ _081517D2: ldr r0, _08151844 @ =0x0000318c adds r2, r0 lsls r0, r4, 8 - ldr r1, _08151848 @ =gUnknown_2022118 + ldr r1, _08151848 @ =gBlockRecvBuffer adds r0, r1 ldrb r0, [r0] strb r0, [r2] @@ -2063,7 +2063,7 @@ _08151836: .align 2, 0 _08151840: .4byte gUnknown_203F3E0 _08151844: .4byte 0x0000318c -_08151848: .4byte gUnknown_2022118 +_08151848: .4byte gBlockRecvBuffer thumb_func_end sub_8151750 thumb_func_start sub_815184C diff --git a/include/link.h b/include/link.h index 321a28d11..1c13de37e 100644 --- a/include/link.h +++ b/include/link.h @@ -149,7 +149,7 @@ extern bool8 gLinkVSyncDisabled; extern u8 gUnknown_3003F64; extern u8 gUnknown_3003F84; extern u64 gUnknown_3003FB4; -extern u16 gUnknown_202271A; +extern u16 gLinkType; void Task_DestroySelf(u8); void OpenLink(void); diff --git a/include/link_rfu.h b/include/link_rfu.h new file mode 100644 index 000000000..065d23f9f --- /dev/null +++ b/include/link_rfu.h @@ -0,0 +1,8 @@ +#ifndef GUARD_LINK_RFU_H +#define GUARD_LINK_RFU_H + +void sub_8142504(const u8 *str); +bool32 mevent_0814257C(u8 * cmdPtr, const u8 * src); +void sub_80FA190(void); + +#endif //GUARD_LINK_RFU_H diff --git a/include/link_rfu_4.h b/include/link_rfu_4.h deleted file mode 100644 index 91ae86e4c..000000000 --- a/include/link_rfu_4.h +++ /dev/null @@ -1,7 +0,0 @@ -#ifndef GUARD_LINK_RFU_4_H -#define GUARD_LINK_RFU_4_H - -void sub_8142504(const u8 *str); -bool32 mevent_0814257C(u8 * cmdPtr, const u8 * src); - -#endif //GUARD_LINK_RFU_4_H diff --git a/include/mevent_server.h b/include/mevent_server.h new file mode 100644 index 000000000..0d46d8fc5 --- /dev/null +++ b/include/mevent_server.h @@ -0,0 +1,4 @@ +#ifndef GUARD_MEVENT_SERVER_H +#define GUARD_MEVENT_SERVER_H + +#endif //GUARD_MEVENT_SERVER_H diff --git a/src/mevent.c b/src/mevent.c index c81712de6..b04ac5462 100644 --- a/src/mevent.c +++ b/src/mevent.c @@ -8,7 +8,7 @@ #include "task.h" #include "decompress.h" #include "link.h" -#include "link_rfu_4.h" +#include "link_rfu.h" #include "unk_815c27c.h" #include "util.h" #include "script.h" @@ -134,7 +134,7 @@ u8 sub_8143674(struct MEvent_Str_1 *a0) void sub_81436BC(void) { memset(gDecompressionBuffer, 0, 0x2000); - gUnknown_202271A = 0x5502; + gLinkType = 0x5502; sub_8009804(); SetSuppressLinkErrorMessage(TRUE); } diff --git a/src/mevent_server.c b/src/mevent_server.c index 529b4ba77..0c94980ff 100644 --- a/src/mevent_server.c +++ b/src/mevent_server.c @@ -1,2 +1,180 @@ #include "global.h" +#include "malloc.h" +#include "util.h" +#include "link.h" +#include "link_rfu.h" #include "mevent.h" + +extern u16 gBlockRecvBuffer[][128]; + +struct mevent_srv_sub +{ + s32 unk_00; + u8 unk_04; + u8 unk_05; + u16 unk_06; + u16 unk_08; + u16 unk_0A; + u16 unk_0C; + u16 unk_0E; + u16 unk_10; + u16 unk_12; + u16 unk_14; + void * unk_18; + u32 unk_1C; + u32 (*unk_20)(struct mevent_srv_sub *); + u32 (*unk_24)(struct mevent_srv_sub *); +}; + +struct mevent_srv_ish +{ + u32 unk_00; + u32 unk_04; + u32 unk_08; + u32 unk_0C; + u32 unk_10; + void * unk_14; + void * unk_18; + void * unk_1C; + void * unk_20; + struct mevent_srv_sub unk_24; +}; + +EWRAM_DATA struct mevent_srv_ish * gUnknown_203F3C0 = NULL; + +u32 sub_814490C(struct mevent_srv_sub *); +u32 sub_81449E0(struct mevent_srv_sub *); + +u32 sub_8144844(struct mevent_srv_sub * srv) +{ + return srv->unk_20(srv); +} + +u32 sub_8144850(struct mevent_srv_sub * srv) +{ + return srv->unk_24(srv); +} + +void sub_814485C(struct mevent_srv_sub * srv, u8 a1, u8 a2) +{ + srv->unk_04 = a1; + srv->unk_05 = a2; + srv->unk_00 = 0; + srv->unk_12 = 0; + srv->unk_14 = 0; + srv->unk_10 = 0; + srv->unk_0A = 0; + srv->unk_0C = 0; + srv->unk_08 = 0; + srv->unk_1C = 0; + srv->unk_18 = NULL; + srv->unk_24 = sub_81449E0; + srv->unk_20 = sub_814490C; +} + +void sub_8144888(struct mevent_srv_sub * srv, u16 a1, u32 a2, u32 a3) +{ + srv->unk_00 = 0; + srv->unk_0E = a1; + srv->unk_10 = 0; + srv->unk_12 = 0; + if (a3 != 0) + srv->unk_14 = a3; + else + srv->unk_14 = 0x400; + srv->unk_1C = a2; +} + +void sub_81448AC(struct mevent_srv_sub * srv, u16 a1, void * a2) +{ + srv->unk_00 = 0; + srv->unk_06 = a1; + srv->unk_08 = 0; + srv->unk_0A = 0; + srv->unk_0C = 0; + srv->unk_18 = a2; +} + +void sub_81448BC(u32 recv_idx, u16 * dest, size_t size) +{ + memcpy(dest, gBlockRecvBuffer[recv_idx], size); +} + +bool32 sub_81448D8(u32 recv_idx) +{ + if ((GetBlockReceivedStatus() >> recv_idx) & 1) + return TRUE; + else + return FALSE; +} + +void sub_81448FC(u32 recv_idx) +{ + ResetBlockReceivedFlag(recv_idx); +} + +bool32 sub_814490C(struct mevent_srv_sub * srv) +{ + u16 buff[4]; + switch (srv->unk_00) + { + case 0: + if (sub_81448D8(srv->unk_05)) + { + u16 * r4; + sub_81448BC(srv->unk_05, (r4 = buff), sizeof(buff)); + srv->unk_0C = r4[2]; + srv->unk_0A = r4[1]; + if (srv->unk_0C > 0x400) + { + sub_80FA190(); + return FALSE; + } + else if (srv->unk_06 != buff[0]) + { + sub_80FA190(); + return FALSE; + } + else + { + srv->unk_08 = 0; + sub_81448FC(srv->unk_05); + ++srv->unk_00; + } + } + break; + case 1: + if (sub_81448D8(srv->unk_05)) + { + size_t r3 = srv->unk_08 * 252; + if (srv->unk_0C - r3 <= 252) + { + sub_81448BC(srv->unk_05, srv->unk_18 + r3, srv->unk_0C - r3); + ++srv->unk_08; + ++srv->unk_00; + } + else + { + sub_81448BC(srv->unk_05, srv->unk_18 + r3, 252); + ++srv->unk_08; + } + sub_81448FC(srv->unk_05); + } + break; + case 2: + if (CalcCRC16WithTable(srv->unk_18, srv->unk_0C) != srv->unk_0A) + { + sub_80FA190(); + return FALSE; + } + else + { + srv->unk_00 = 0; + return TRUE; + } + break; + + } + + return FALSE; +} diff --git a/sym_ewram.txt b/sym_ewram.txt index 83fdcf763..cb35591a1 100644 --- a/sym_ewram.txt +++ b/sym_ewram.txt @@ -49,51 +49,58 @@ gStringVar4: @ 2021D18 .include "src/string_util.o" -gUnknown_2022110: @ 2022110 + @ .include "src/link.o" +gLinkTestDebugValuesEnabled: @ 2022110 .space 0x1 gUnknown_2022111: @ 2022111 - .space 0x3 + .space 0x1 + .align 2 gUnknown_2022114: @ 2022114 .space 0x4 -gUnknown_2022118: @ 2022118 - .space 0x4 - -gUnknown_202211C: @ 202211C - .space 0x4FC +gBlockRecvBuffer: @ 2022118 + .space 0x500 -gUnknown_2022618: @ 2022618 +gBlockSendBuffer: @ 2022618 .space 0x100 -gUnknown_2022718: @ 2022718 - .space 0x2 +gLinkOpen: @ 2022718 + .space 0x1 -gUnknown_202271A: @ 202271A + .align 1 +gLinkType: @ 202271A .space 0x2 -gUnknown_202271C: @ 202271C - .space 0x4 +gLinkTimeOutCounter: @ 202271C + .space 0x2 -gUnknown_2022720: @ 2022720 + .align 2 +gLocalLinkPlayer: @ 2022720 .space 0x1C + .align 2 gLinkPlayers: @ 202273C .space 0x8C -gUnknown_20227C8: @ 20227C8 + .align 2 +gSavedLinkPlayers: @ 20227C8 .space 0x8C -gUnknown_2022854: @ 2022854 + .align 2 +sLinkErrorBuffer: @ 2022854 .space 0x8 + .align 1 gUnknown_202285C: @ 202285C - .space 0x4 + .space 0x2 + .align 2 gUnknown_2022860: @ 2022860 .space 0xC + @ .include "src/link_rfu.o" gUnknown_202286C: @ 202286C .space 0x1 -- cgit v1.2.3 From 5a80a339cd04864f36bae99eb4b35de2f8bbab16 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Fri, 30 Nov 2018 10:52:54 -0500 Subject: sub_81449E0 --- asm/mevent_server.s | 133 ---------------------------------------------------- include/link.h | 1 + src/mevent_server.c | 89 +++++++++++++++++++++++++++++++---- 3 files changed, 80 insertions(+), 143 deletions(-) diff --git a/asm/mevent_server.s b/asm/mevent_server.s index 833212ea4..d41ad7af4 100644 --- a/asm/mevent_server.s +++ b/asm/mevent_server.s @@ -5,139 +5,6 @@ .text - thumb_func_start sub_81449E0 -sub_81449E0: @ 81449E0 - push {r4,r5,lr} - sub sp, 0x8 - adds r4, r0, 0 - ldr r5, [r4] - cmp r5, 0x1 - beq _08144A4C - cmp r5, 0x1 - bgt _081449F6 - cmp r5, 0 - beq _08144A00 - b _08144AE2 -_081449F6: - cmp r5, 0x2 - beq _08144AA0 - cmp r5, 0x3 - beq _08144ACA - b _08144AE2 -_08144A00: - bl sub_800A4BC - lsls r0, 24 - cmp r0, 0 - beq _08144AE2 - ldrh r1, [r4, 0xE] - ldr r2, _08144A44 @ =0xffff0000 - ldr r0, [sp] - ands r0, r2 - orrs r0, r1 - str r0, [sp] - ldrh r1, [r4, 0x14] - ldr r0, [sp, 0x4] - ands r0, r2 - orrs r0, r1 - str r0, [sp, 0x4] - ldr r0, [r4, 0x1C] - bl CalcCRC16WithTable - lsls r0, 16 - ldr r2, _08144A48 @ =0x0000ffff - ldr r1, [sp] - ands r1, r2 - orrs r1, r0 - str r1, [sp] - lsrs r1, 16 - strh r1, [r4, 0x12] - strh r5, [r4, 0x10] - movs r0, 0 - mov r1, sp - movs r2, 0x8 - bl SendBlock - b _08144AC2 - .align 2, 0 -_08144A44: .4byte 0xffff0000 -_08144A48: .4byte 0x0000ffff -_08144A4C: - bl sub_800A4BC - lsls r0, 24 - cmp r0, 0 - beq _08144AE2 - ldrb r0, [r4, 0x4] - bl sub_81448D8 - cmp r0, 0 - beq _08144AE2 - ldrb r0, [r4, 0x4] - bl sub_81448FC - ldrh r1, [r4, 0x10] - lsls r0, r1, 6 - subs r0, r1 - lsls r3, r0, 2 - ldrh r0, [r4, 0x14] - subs r0, r3 - cmp r0, 0xFC - bhi _08144A8C - ldr r1, [r4, 0x1C] - adds r1, r3 - lsls r2, r0, 16 - lsrs r2, 16 - movs r0, 0 - bl SendBlock - ldrh r0, [r4, 0x10] - adds r0, 0x1 - strh r0, [r4, 0x10] - b _08144AC2 -_08144A8C: - ldr r1, [r4, 0x1C] - adds r1, r3 - movs r0, 0 - movs r2, 0xFC - bl SendBlock - ldrh r0, [r4, 0x10] - adds r0, 0x1 - strh r0, [r4, 0x10] - b _08144AE2 -_08144AA0: - bl sub_800A4BC - lsls r0, 24 - cmp r0, 0 - beq _08144AE2 - ldr r0, [r4, 0x1C] - ldrh r1, [r4, 0x14] - bl CalcCRC16WithTable - lsls r0, 16 - lsrs r0, 16 - ldrh r1, [r4, 0x12] - cmp r0, r1 - beq _08144AC2 - bl sub_80FA190 - b _08144AE2 -_08144AC2: - ldr r0, [r4] - adds r0, 0x1 - str r0, [r4] - b _08144AE2 -_08144ACA: - ldrb r0, [r4, 0x4] - bl sub_81448D8 - cmp r0, 0 - beq _08144AE2 - ldrb r0, [r4, 0x4] - bl sub_81448FC - movs r0, 0 - str r0, [r4] - movs r0, 0x1 - b _08144AE4 -_08144AE2: - movs r0, 0 -_08144AE4: - add sp, 0x8 - pop {r4,r5} - pop {r1} - bx r1 - thumb_func_end sub_81449E0 - thumb_func_start sub_8144AEC sub_8144AEC: @ 8144AEC push {r4,lr} diff --git a/include/link.h b/include/link.h index 1c13de37e..39873ec11 100644 --- a/include/link.h +++ b/include/link.h @@ -207,5 +207,6 @@ void sub_800A5BC(void); void sub_800AA80(u8); void sub_80098D8(void); void sub_80098B8(void); +bool8 sub_800A4BC(void); #endif // GUARD_LINK_H diff --git a/src/mevent_server.c b/src/mevent_server.c index 0c94980ff..8c68a9350 100644 --- a/src/mevent_server.c +++ b/src/mevent_server.c @@ -21,7 +21,7 @@ struct mevent_srv_sub u16 unk_12; u16 unk_14; void * unk_18; - u32 unk_1C; + void * unk_1C; u32 (*unk_20)(struct mevent_srv_sub *); u32 (*unk_24)(struct mevent_srv_sub *); }; @@ -40,6 +40,13 @@ struct mevent_srv_ish struct mevent_srv_sub unk_24; }; +struct send_recv_buff +{ + u16 unk0; + u16 unk2; + u16 unk4; +}; + EWRAM_DATA struct mevent_srv_ish * gUnknown_203F3C0 = NULL; u32 sub_814490C(struct mevent_srv_sub *); @@ -66,13 +73,13 @@ void sub_814485C(struct mevent_srv_sub * srv, u8 a1, u8 a2) srv->unk_0A = 0; srv->unk_0C = 0; srv->unk_08 = 0; - srv->unk_1C = 0; + srv->unk_1C = NULL; srv->unk_18 = NULL; srv->unk_24 = sub_81449E0; srv->unk_20 = sub_814490C; } -void sub_8144888(struct mevent_srv_sub * srv, u16 a1, u32 a2, u32 a3) +void sub_8144888(struct mevent_srv_sub * srv, u16 a1, void * a2, u32 a3) { srv->unk_00 = 0; srv->unk_0E = a1; @@ -95,7 +102,7 @@ void sub_81448AC(struct mevent_srv_sub * srv, u16 a1, void * a2) srv->unk_18 = a2; } -void sub_81448BC(u32 recv_idx, u16 * dest, size_t size) +void sub_81448BC(u32 recv_idx, void * dest, size_t size) { memcpy(dest, gBlockRecvBuffer[recv_idx], size); } @@ -115,22 +122,22 @@ void sub_81448FC(u32 recv_idx) bool32 sub_814490C(struct mevent_srv_sub * srv) { - u16 buff[4]; + struct send_recv_buff buff; + switch (srv->unk_00) { case 0: if (sub_81448D8(srv->unk_05)) { - u16 * r4; - sub_81448BC(srv->unk_05, (r4 = buff), sizeof(buff)); - srv->unk_0C = r4[2]; - srv->unk_0A = r4[1]; + sub_81448BC(srv->unk_05, &buff, sizeof(buff)); + srv->unk_0C = buff.unk4; + srv->unk_0A = buff.unk2; if (srv->unk_0C > 0x400) { sub_80FA190(); return FALSE; } - else if (srv->unk_06 != buff[0]) + else if (srv->unk_06 != buff.unk0) { sub_80FA190(); return FALSE; @@ -178,3 +185,65 @@ bool32 sub_814490C(struct mevent_srv_sub * srv) return FALSE; } + +bool32 sub_81449E0(struct mevent_srv_sub * srv) +{ + struct send_recv_buff buff; + + switch (srv->unk_00) + { + case 0: + if (sub_800A4BC()) + { + buff.unk0 = srv->unk_0E; + buff.unk4 = srv->unk_14; + buff.unk2 = CalcCRC16WithTable(srv->unk_1C, srv->unk_14); + srv->unk_12 = buff.unk2; + srv->unk_10 = 0; + SendBlock(0, &buff, sizeof(buff)); + ++srv->unk_00; + } + break; + case 1: + if (sub_800A4BC()) + { + if (sub_81448D8(srv->unk_04)) + { + size_t r3; + sub_81448FC(srv->unk_04); + r3 = 252 * srv->unk_10; + if (srv->unk_14 - r3 <= 252) + { + SendBlock(0, srv->unk_1C + r3, srv->unk_14 - r3); + ++srv->unk_10; + ++srv->unk_00; + } + else + { + SendBlock(0, srv->unk_1C + r3, 252); + ++srv->unk_10; + } + } + } + break; + case 2: + if (sub_800A4BC()) + { + if (CalcCRC16WithTable(srv->unk_1C, srv->unk_14) != srv->unk_12) + sub_80FA190(); + else + ++srv->unk_00; + } + break; + case 3: + if (sub_81448D8(srv->unk_04)) + { + sub_81448FC(srv->unk_04); + srv->unk_00 = 0; + return TRUE; + } + break; + } + + return FALSE; +} -- cgit v1.2.3 From de6cf9f0de562bfc3085ffc2e07825b4487b4b9e Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Fri, 30 Nov 2018 11:48:13 -0500 Subject: through sub_8144C80 --- asm/mevent_server.s | 247 ---------------------------------------------------- src/mevent_server.c | 115 +++++++++++++++++++++++- 2 files changed, 113 insertions(+), 249 deletions(-) diff --git a/asm/mevent_server.s b/asm/mevent_server.s index d41ad7af4..7c5042b15 100644 --- a/asm/mevent_server.s +++ b/asm/mevent_server.s @@ -5,253 +5,6 @@ .text - thumb_func_start sub_8144AEC -sub_8144AEC: @ 8144AEC - push {r4,lr} - ldr r4, _08144B08 @ =gUnknown_203F3C0 - movs r0, 0x4C - bl AllocZeroed - str r0, [r4] - movs r1, 0x1 - movs r2, 0 - bl mevent_srv_ish_init - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_08144B08: .4byte gUnknown_203F3C0 - thumb_func_end sub_8144AEC - - thumb_func_start sub_8144B0C -sub_8144B0C: @ 8144B0C - push {r4-r6,lr} - adds r6, r0, 0 - ldr r4, _08144B1C @ =gUnknown_203F3C0 - ldr r0, [r4] - cmp r0, 0 - bne _08144B20 - movs r0, 0x6 - b _08144B40 - .align 2, 0 -_08144B1C: .4byte gUnknown_203F3C0 -_08144B20: - bl mevent_srv_ish_exec - adds r5, r0, 0 - cmp r5, 0x6 - bne _08144B3E - ldr r0, [r4] - ldr r1, [r0, 0x4] - strh r1, [r6] - bl sub_8144BC0 - ldr r0, [r4] - bl Free - movs r0, 0 - str r0, [r4] -_08144B3E: - adds r0, r5, 0 -_08144B40: - pop {r4-r6} - pop {r1} - bx r1 - thumb_func_end sub_8144B0C - - thumb_func_start sub_8144B48 -sub_8144B48: @ 8144B48 - ldr r0, _08144B54 @ =gUnknown_203F3C0 - ldr r1, [r0] - ldr r0, [r1, 0xC] - adds r0, 0x1 - str r0, [r1, 0xC] - bx lr - .align 2, 0 -_08144B54: .4byte gUnknown_203F3C0 - thumb_func_end sub_8144B48 - - thumb_func_start sub_8144B58 -sub_8144B58: @ 8144B58 - ldr r0, _08144B60 @ =gUnknown_203F3C0 - ldr r0, [r0] - ldr r0, [r0, 0x20] - bx lr - .align 2, 0 -_08144B60: .4byte gUnknown_203F3C0 - thumb_func_end sub_8144B58 - - thumb_func_start sub_8144B64 -sub_8144B64: @ 8144B64 - ldr r1, _08144B6C @ =gUnknown_203F3C0 - ldr r1, [r1] - str r0, [r1, 0x4] - bx lr - .align 2, 0 -_08144B6C: .4byte gUnknown_203F3C0 - thumb_func_end sub_8144B64 - - thumb_func_start mevent_srv_ish_init -mevent_srv_ish_init: @ 8144B70 - push {r4-r6,lr} - mov r6, r8 - push {r6} - adds r4, r0, 0 - adds r6, r1, 0 - mov r8, r2 - movs r0, 0 - str r0, [r4] - str r0, [r4, 0x8] - str r0, [r4, 0xC] - movs r5, 0x80 - lsls r5, 3 - adds r0, r5, 0 - bl AllocZeroed - str r0, [r4, 0x14] - adds r0, r5, 0 - bl AllocZeroed - str r0, [r4, 0x18] - adds r0, r5, 0 - bl AllocZeroed - str r0, [r4, 0x1C] - movs r0, 0x40 - bl AllocZeroed - str r0, [r4, 0x20] - adds r4, 0x24 - adds r0, r4, 0 - adds r1, r6, 0 - mov r2, r8 - bl sub_814485C - pop {r3} - mov r8, r3 - pop {r4-r6} - pop {r0} - bx r0 - thumb_func_end mevent_srv_ish_init - - thumb_func_start sub_8144BC0 -sub_8144BC0: @ 8144BC0 - push {r4,lr} - adds r4, r0, 0 - ldr r0, [r4, 0x14] - bl Free - ldr r0, [r4, 0x18] - bl Free - ldr r0, [r4, 0x1C] - bl Free - ldr r0, [r4, 0x20] - bl Free - pop {r4} - pop {r0} - bx r0 - thumb_func_end sub_8144BC0 - - thumb_func_start sub_8144BE4 -sub_8144BE4: @ 8144BE4 - push {r4,lr} - adds r4, r0, 0 - ldr r0, [r4, 0x1C] - ldr r1, [r4, 0x18] - movs r2, 0x80 - lsls r2, 3 - bl memcpy - movs r0, 0 - str r0, [r4, 0x10] - pop {r4} - pop {r0} - bx r0 - thumb_func_end sub_8144BE4 - - thumb_func_start sub_8144C00 -sub_8144C00: @ 8144C00 - push {r4-r6,lr} - sub sp, 0x4 - adds r4, r0, 0 - adds r6, r1, 0 - adds r5, r2, 0 - movs r0, 0 - str r0, [sp] - ldr r1, [r4, 0x14] - ldr r2, _08144C30 @ =0x05000100 - mov r0, sp - bl CpuSet - ldr r2, [r4, 0x14] - str r5, [r2] - adds r4, 0x24 - adds r0, r4, 0 - adds r1, r6, 0 - movs r3, 0x4 - bl sub_8144888 - add sp, 0x4 - pop {r4-r6} - pop {r0} - bx r0 - .align 2, 0 -_08144C30: .4byte 0x05000100 - thumb_func_end sub_8144C00 - - thumb_func_start sub_8144C34 -sub_8144C34: @ 8144C34 - push {r4,lr} - adds r4, r0, 0 - ldr r0, [r4, 0x1C] - ldr r1, _08144C58 @ =gUnknown_84687E0 - movs r2, 0x80 - lsls r2, 3 - bl memcpy - movs r1, 0 - str r1, [r4, 0x10] - movs r0, 0x4 - str r0, [r4, 0x8] - str r1, [r4, 0xC] - movs r0, 0 - pop {r4} - pop {r1} - bx r1 - .align 2, 0 -_08144C58: .4byte gUnknown_84687E0 - thumb_func_end sub_8144C34 - - thumb_func_start sub_8144C5C -sub_8144C5C: @ 8144C5C - movs r0, 0x6 - bx lr - thumb_func_end sub_8144C5C - - thumb_func_start sub_8144C60 -sub_8144C60: @ 8144C60 - push {r4,lr} - adds r4, r0, 0 - adds r0, 0x24 - bl sub_8144844 - cmp r0, 0 - beq _08144C76 - movs r0, 0x4 - str r0, [r4, 0x8] - movs r0, 0 - str r0, [r4, 0xC] -_08144C76: - movs r0, 0x1 - pop {r4} - pop {r1} - bx r1 - thumb_func_end sub_8144C60 - - thumb_func_start sub_8144C80 -sub_8144C80: @ 8144C80 - push {r4,lr} - adds r4, r0, 0 - adds r0, 0x24 - bl sub_8144850 - cmp r0, 0 - beq _08144C96 - movs r0, 0x4 - str r0, [r4, 0x8] - movs r0, 0 - str r0, [r4, 0xC] -_08144C96: - movs r0, 0x1 - pop {r4} - pop {r1} - bx r1 - thumb_func_end sub_8144C80 - thumb_func_start sub_8144CA0 sub_8144CA0: @ 8144CA0 push {r4,lr} diff --git a/src/mevent_server.c b/src/mevent_server.c index 8c68a9350..a94d8a0a1 100644 --- a/src/mevent_server.c +++ b/src/mevent_server.c @@ -51,6 +51,11 @@ EWRAM_DATA struct mevent_srv_ish * gUnknown_203F3C0 = NULL; u32 sub_814490C(struct mevent_srv_sub *); u32 sub_81449E0(struct mevent_srv_sub *); +void mevent_srv_ish_init(struct mevent_srv_ish *, u32, u32); +u32 mevent_srv_ish_exec(struct mevent_srv_ish *); +void sub_8144BC0(struct mevent_srv_ish *); + +extern u8 gUnknown_84687E0[0x400]; u32 sub_8144844(struct mevent_srv_sub * srv) { @@ -62,7 +67,7 @@ u32 sub_8144850(struct mevent_srv_sub * srv) return srv->unk_24(srv); } -void sub_814485C(struct mevent_srv_sub * srv, u8 a1, u8 a2) +void sub_814485C(struct mevent_srv_sub * srv, u32 a1, u32 a2) { srv->unk_04 = a1; srv->unk_05 = a2; @@ -79,7 +84,7 @@ void sub_814485C(struct mevent_srv_sub * srv, u8 a1, u8 a2) srv->unk_20 = sub_814490C; } -void sub_8144888(struct mevent_srv_sub * srv, u16 a1, void * a2, u32 a3) +void sub_8144888(struct mevent_srv_sub * srv, u32 a1, void * a2, u32 a3) { srv->unk_00 = 0; srv->unk_0E = a1; @@ -247,3 +252,109 @@ bool32 sub_81449E0(struct mevent_srv_sub * srv) return FALSE; } + +void sub_8144AEC(void) +{ + gUnknown_203F3C0 = AllocZeroed(sizeof(struct mevent_srv_ish)); + mevent_srv_ish_init(gUnknown_203F3C0, 1, 0); +} + +u32 sub_8144B0C(u16 * a0) +{ + u32 result; + if (gUnknown_203F3C0 == NULL) + return 6; + result = mevent_srv_ish_exec(gUnknown_203F3C0); + if (result == 6) + { + *a0 = gUnknown_203F3C0->unk_04; + sub_8144BC0(gUnknown_203F3C0); + Free(gUnknown_203F3C0); + gUnknown_203F3C0 = NULL; + } + return result; +} + +void sub_8144B48(void) +{ + gUnknown_203F3C0->unk_0C++; +} + +void * sub_8144B58(void) +{ + return gUnknown_203F3C0->unk_20; +} + +void sub_8144B64(u32 a0) +{ + gUnknown_203F3C0->unk_04 = a0; +} + +void mevent_srv_ish_init(struct mevent_srv_ish * srv, u32 a1, u32 a2) +{ + srv->unk_00 = 0; + srv->unk_08 = 0; + srv->unk_0C = 0; + srv->unk_14 = AllocZeroed(0x400); + srv->unk_18 = AllocZeroed(0x400); + srv->unk_1C = AllocZeroed(0x400); + srv->unk_20 = AllocZeroed(0x40); + sub_814485C(&srv->unk_24, a1, a2); +} + +void sub_8144BC0(struct mevent_srv_ish * srv) +{ + Free(srv->unk_14); + Free(srv->unk_18); + Free(srv->unk_1C); + Free(srv->unk_20); +} + +void sub_8144BE4(struct mevent_srv_ish * srv) +{ + memcpy(srv->unk_1C, srv->unk_18, 0x400); + srv->unk_10 = 0; +} + +void sub_8144C00(struct mevent_srv_ish * srv, u32 a1, u32 a2) +{ + CpuFill32(0, srv->unk_14, 0x400); + *(u32 *)srv->unk_14 = a2; + sub_8144888(&srv->unk_24, a1, srv->unk_14, 4); +} + +// funcs in array gUnknown_8466F60 + +u32 sub_8144C34(struct mevent_srv_ish * srv) +{ + memcpy(srv->unk_1C, gUnknown_84687E0, sizeof(gUnknown_84687E0)); + srv->unk_10 = 0; + srv->unk_08 = 4; + srv->unk_0C = 0; + return 0; +} + +u32 sub_8144C5C(struct mevent_srv_ish * srv) +{ + return 6; +} + +u32 sub_8144C60(struct mevent_srv_ish * srv) +{ + if (sub_8144844(&srv->unk_24)) + { + srv->unk_08 = 4; + srv->unk_0C = 0; + } + return 1; +} + +u32 sub_8144C80(struct mevent_srv_ish * srv) +{ + if (sub_8144850(&srv->unk_24)) + { + srv->unk_08 = 4; + srv->unk_0C = 0; + } + return 1; +} -- cgit v1.2.3 From 7c2517611b83ac9d490a99ec32cf1a4412c05ce0 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Fri, 30 Nov 2018 12:16:42 -0500 Subject: sub_8144CA0 --- asm/mevent_server.s | 218 ------------------------------------------------- include/battle_tower.h | 1 + include/mevent.h | 5 ++ include/script.h | 1 + src/mevent_server.c | 111 ++++++++++++++++++++++++- 5 files changed, 117 insertions(+), 219 deletions(-) diff --git a/asm/mevent_server.s b/asm/mevent_server.s index 7c5042b15..5f9ce9862 100644 --- a/asm/mevent_server.s +++ b/asm/mevent_server.s @@ -5,224 +5,6 @@ .text - thumb_func_start sub_8144CA0 -sub_8144CA0: @ 8144CA0 - push {r4,lr} - adds r4, r0, 0 - ldr r0, [r4, 0x10] - lsls r2, r0, 3 - ldr r1, [r4, 0x1C] - adds r2, r1, r2 - adds r0, 0x1 - str r0, [r4, 0x10] - ldr r0, [r2] - cmp r0, 0x15 - bls _08144CB8 - b _08144E60 -_08144CB8: - lsls r0, 2 - ldr r1, _08144CC4 @ =_08144CC8 - adds r0, r1 - ldr r0, [r0] - mov pc, r0 - .align 2, 0 -_08144CC4: .4byte _08144CC8 - .align 2, 0 -_08144CC8: - .4byte _08144E60 - .4byte _08144D20 - .4byte _08144D28 - .4byte _08144D38 - .4byte _08144D70 - .4byte _08144D78 - .4byte _08144D62 - .4byte _08144D6A - .4byte _08144DC6 - .4byte _08144DF0 - .4byte _08144DE8 - .4byte _08144D8E - .4byte _08144DA4 - .4byte _08144DBA - .4byte _08144DDC - .4byte _08144E18 - .4byte _08144E1C - .4byte _08144E24 - .4byte _08144E30 - .4byte _08144D4E - .4byte _08144D3C - .4byte _08144E4C -_08144D20: - ldr r0, [r2, 0x4] - str r0, [r4, 0x4] - movs r0, 0x1 - b _08144E5A -_08144D28: - adds r0, r4, 0 - adds r0, 0x24 - ldr r1, [r2, 0x4] - ldr r2, [r4, 0x18] - bl sub_81448AC - movs r0, 0x2 - b _08144E5A -_08144D38: - movs r0, 0x3 - b _08144E5A -_08144D3C: - adds r0, r4, 0 - adds r0, 0x24 - ldr r2, [r4, 0x14] - movs r1, 0x14 - movs r3, 0 - bl sub_8144888 - movs r0, 0x3 - b _08144E5A -_08144D4E: - ldrb r0, [r2, 0x4] - bl GetGameStat - adds r2, r0, 0 - adds r0, r4, 0 - movs r1, 0x12 - bl sub_8144C00 - movs r0, 0x3 - b _08144E5A -_08144D62: - ldr r0, [r4, 0x4] - cmp r0, 0 - bne _08144E60 - b _08144D70 -_08144D6A: - ldr r0, [r4, 0x4] - cmp r0, 0x1 - bne _08144E60 -_08144D70: - adds r0, r4, 0 - bl sub_8144BE4 - b _08144E60 -_08144D78: - ldr r0, [r4, 0x20] - ldr r1, [r4, 0x18] - movs r2, 0x40 - bl memcpy - movs r0, 0x5 - str r0, [r4, 0x8] - movs r0, 0 - str r0, [r4, 0xC] - movs r0, 0x2 - b _08144E62 -_08144D8E: - ldr r0, [r4, 0x20] - ldr r1, [r4, 0x18] - movs r2, 0x40 - bl memcpy - movs r0, 0x5 - str r0, [r4, 0x8] - movs r0, 0 - str r0, [r4, 0xC] - movs r0, 0x3 - b _08144E62 -_08144DA4: - ldr r0, [r4, 0x20] - ldr r1, [r4, 0x18] - movs r2, 0x40 - bl memcpy - movs r0, 0x5 - str r0, [r4, 0x8] - movs r0, 0 - str r0, [r4, 0xC] - movs r0, 0x5 - b _08144E62 -_08144DBA: - movs r0, 0x5 - str r0, [r4, 0x8] - movs r0, 0 - str r0, [r4, 0xC] - movs r0, 0x4 - b _08144E62 -_08144DC6: - ldr r0, [r4, 0x14] - bl sub_81442CC - adds r0, r4, 0 - adds r0, 0x24 - ldr r2, [r4, 0x14] - movs r1, 0x11 - movs r3, 0x64 - bl sub_8144888 - b _08144E60 -_08144DDC: - ldr r2, [r4, 0x4] - adds r0, r4, 0 - movs r1, 0x13 - bl sub_8144C00 - b _08144E60 -_08144DE8: - ldr r0, [r4, 0x18] - bl sub_8143F68 - b _08144E60 -_08144DF0: - ldr r0, [r4, 0x18] - bl sub_8143EF4 - cmp r0, 0 - bne _08144E0C - ldr r0, [r4, 0x18] - bl sub_8143DC8 - adds r0, r4, 0 - movs r1, 0x13 - movs r2, 0 - bl sub_8144C00 - b _08144E60 -_08144E0C: - adds r0, r4, 0 - movs r1, 0x13 - movs r2, 0x1 - bl sub_8144C00 - b _08144E60 -_08144E18: - movs r0, 0x6 - b _08144E5A -_08144E1C: - ldr r0, [r4, 0x18] - bl sub_8144254 - b _08144E60 -_08144E24: - ldr r0, [r4, 0x18] - movs r1, 0xFA - lsls r1, 2 - bl sub_8069EA4 - b _08144E60 -_08144E30: - ldr r0, _08144E48 @ =gSaveBlock2Ptr - ldr r0, [r0] - movs r1, 0x94 - lsls r1, 3 - adds r0, r1 - ldr r1, [r4, 0x18] - movs r2, 0xBC - bl memcpy - bl sub_80E7490 - b _08144E60 - .align 2, 0 -_08144E48: .4byte gSaveBlock2Ptr -_08144E4C: - ldr r0, _08144E68 @ =gDecompressionBuffer - ldr r1, [r4, 0x18] - movs r2, 0x80 - lsls r2, 3 - bl memcpy - movs r0, 0x7 -_08144E5A: - str r0, [r4, 0x8] - movs r0, 0 - str r0, [r4, 0xC] -_08144E60: - movs r0, 0x1 -_08144E62: - pop {r4} - pop {r1} - bx r1 - .align 2, 0 -_08144E68: .4byte gDecompressionBuffer - thumb_func_end sub_8144CA0 - thumb_func_start sub_8144E6C sub_8144E6C: @ 8144E6C push {lr} diff --git a/include/battle_tower.h b/include/battle_tower.h index 36d5eb1f7..0782725b6 100644 --- a/include/battle_tower.h +++ b/include/battle_tower.h @@ -5,5 +5,6 @@ u16 sub_8164FCC(u8, u8); void sub_80E7524(u32 *); +void sub_80E7490(void); #endif //GUARD_BATTLE_TOWER_H diff --git a/include/mevent.h b/include/mevent.h index 31e1041fe..1744bb524 100644 --- a/include/mevent.h +++ b/include/mevent.h @@ -34,6 +34,11 @@ struct MEvent_Str_2 }; struct MysteryEventStruct * sub_8143D94(void); +bool32 sub_8143DC8(const struct MEventBuffer_3120_Sub * src); bool32 sub_8143E1C(void); +bool32 sub_8143EF4(const u8 * src); +bool32 sub_8143F68(const struct MEventBuffer_32E0_Sub * data); +bool32 sub_8144254(const u16 * data); +void sub_81442CC(struct MEventStruct_Unk1442CC * data); #endif //GUARD_MEVENT_H diff --git a/include/script.h b/include/script.h index 6ed2e8f49..b718af4c1 100644 --- a/include/script.h +++ b/include/script.h @@ -63,5 +63,6 @@ bool32 sub_80991F8(void); u8 *sub_8099244(void); void sub_80992A0(u8 *script, u16 scriptSize); bool32 sub_8069DFC(void); +void sub_8069EA4(u8 * script, u16 scriptSize); #endif // GUARD_SCRIPT_H diff --git a/src/mevent_server.c b/src/mevent_server.c index a94d8a0a1..3297e2658 100644 --- a/src/mevent_server.c +++ b/src/mevent_server.c @@ -1,8 +1,12 @@ #include "global.h" #include "malloc.h" +#include "decompress.h" #include "util.h" #include "link.h" #include "link_rfu.h" +#include "overworld.h" +#include "script.h" +#include "battle_tower.h" #include "mevent.h" extern u16 gBlockRecvBuffer[][128]; @@ -97,7 +101,7 @@ void sub_8144888(struct mevent_srv_sub * srv, u32 a1, void * a2, u32 a3) srv->unk_1C = a2; } -void sub_81448AC(struct mevent_srv_sub * srv, u16 a1, void * a2) +void sub_81448AC(struct mevent_srv_sub * srv, u32 a1, void * a2) { srv->unk_00 = 0; srv->unk_06 = a1; @@ -358,3 +362,108 @@ u32 sub_8144C80(struct mevent_srv_ish * srv) } return 1; } + +u32 sub_8144CA0(struct mevent_srv_ish * srv) +{ + u32 * r2 = (u32 *)srv->unk_1C + 2 * srv->unk_10; + ++srv->unk_10; + switch (r2[0]) + { + case 0: + break; + case 1: + srv->unk_04 = r2[1]; + srv->unk_08 = 1; + srv->unk_0C = 0; + break; + case 2: + sub_81448AC(&srv->unk_24, r2[1], srv->unk_18); + srv->unk_08 = 2; + srv->unk_0C = 0; + break; + case 3: + srv->unk_08 = 3; + srv->unk_0C = 0; + break; + case 20: + sub_8144888(&srv->unk_24, 0x14, srv->unk_14, 0); + srv->unk_08 = 3; + srv->unk_0C = 0; + break; + case 19: + sub_8144C00(srv, 0x12, GetGameStat(r2[1])); + srv->unk_08 = 3; + srv->unk_0C = 0; + break; + case 6: + if (srv->unk_04 == 0) + sub_8144BE4(srv); + break; + case 7: + if (srv->unk_04 == 1) + sub_8144BE4(srv); + break; + case 4: + sub_8144BE4(srv); + break; + case 5: + memcpy(srv->unk_20, srv->unk_18, 0x40); + srv->unk_08 = 5; + srv->unk_0C = 0; + return 2; + case 11: + memcpy(srv->unk_20, srv->unk_18, 0x40); + srv->unk_08 = 5; + srv->unk_0C = 0; + return 3; + case 12: + memcpy(srv->unk_20, srv->unk_18, 0x40); + srv->unk_08 = 5; + srv->unk_0C = 0; + return 5; + case 13: + srv->unk_08 = 5; + srv->unk_0C = 0; + return 4; + case 8: + sub_81442CC(srv->unk_14); + sub_8144888(&srv->unk_24, 0x11, srv->unk_14, 0x64); + break; + case 14: + sub_8144C00(srv, 0x13, srv->unk_04); + break; + case 10: + sub_8143F68(srv->unk_18); + break; + case 9: + if (!sub_8143EF4(srv->unk_18)) + { + sub_8143DC8(srv->unk_18); + sub_8144C00(srv, 0x13, 0); + } + else + sub_8144C00(srv, 0x13, 1); + break; + case 15: + srv->unk_08 = 6; + srv->unk_0C = 0; + break; + case 16: + sub_8144254(srv->unk_18); + break; + case 17: + sub_8069EA4(srv->unk_18, 1000); + break; + case 18: + memcpy(gSaveBlock2Ptr->unk_4A0, srv->unk_18, 0xbc); + sub_80E7490(); + break; + case 21: + memcpy(gDecompressionBuffer, srv->unk_18, 0x400); + srv->unk_08 = 7; + srv->unk_0C = 0; + break; + } + + return 1; +} -- cgit v1.2.3 From f178d06946a4debf6a0551094d3ef2f70b7b364c Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Fri, 30 Nov 2018 12:26:24 -0500 Subject: through mevent_srv_ish_exec --- asm/mevent_server.s | 103 ----------------------------------------- data/data_8466FB8.s | 11 ----- include/mystery_event_script.h | 3 ++ src/mevent_server.c | 56 ++++++++++++++++++++++ 4 files changed, 59 insertions(+), 114 deletions(-) diff --git a/asm/mevent_server.s b/asm/mevent_server.s index 5f9ce9862..41c3ad7da 100644 --- a/asm/mevent_server.s +++ b/asm/mevent_server.s @@ -5,109 +5,6 @@ .text - thumb_func_start sub_8144E6C -sub_8144E6C: @ 8144E6C - push {lr} - adds r1, r0, 0 - ldr r0, [r1, 0xC] - cmp r0, 0 - beq _08144E7E - movs r0, 0x4 - str r0, [r1, 0x8] - movs r0, 0 - str r0, [r1, 0xC] -_08144E7E: - movs r0, 0x1 - pop {r1} - bx r1 - thumb_func_end sub_8144E6C - - thumb_func_start sub_8144E84 -sub_8144E84: @ 8144E84 - push {r4,lr} - adds r4, r0, 0 - ldr r0, [r4, 0xC] - cmp r0, 0 - beq _08144E94 - cmp r0, 0x1 - beq _08144EA2 - b _08144EB4 -_08144E94: - ldr r0, [r4, 0x18] - bl sub_80DA89C - ldr r0, [r4, 0xC] - adds r0, 0x1 - str r0, [r4, 0xC] - b _08144EB4 -_08144EA2: - adds r0, r4, 0x4 - bl sub_80DA8B0 - adds r1, r0, 0 - cmp r1, 0 - bne _08144EB4 - movs r0, 0x4 - str r0, [r4, 0x8] - str r1, [r4, 0xC] -_08144EB4: - movs r0, 0x1 - pop {r4} - pop {r1} - bx r1 - thumb_func_end sub_8144E84 - - thumb_func_start sub_8144EBC -sub_8144EBC: @ 8144EBC - push {r4,lr} - adds r4, r0, 0 - ldr r3, _08144EE4 @ =gDecompressionBuffer - adds r0, r4, 0x4 - ldr r1, _08144EE8 @ =gSaveBlock2Ptr - ldr r1, [r1] - ldr r2, _08144EEC @ =gSaveBlock1Ptr - ldr r2, [r2] - bl _call_via_r3 - cmp r0, 0x1 - bne _08144EDC - movs r0, 0x4 - str r0, [r4, 0x8] - movs r0, 0 - str r0, [r4, 0xC] -_08144EDC: - movs r0, 0x1 - pop {r4} - pop {r1} - bx r1 - .align 2, 0 -_08144EE4: .4byte gDecompressionBuffer -_08144EE8: .4byte gSaveBlock2Ptr -_08144EEC: .4byte gSaveBlock1Ptr - thumb_func_end sub_8144EBC - - thumb_func_start mevent_srv_ish_exec -mevent_srv_ish_exec: @ 8144EF0 - push {r4,r5,lr} - sub sp, 0x20 - mov r2, sp - ldr r1, _08144F18 @ =gUnknown_8466F60 - ldm r1!, {r3-r5} - stm r2!, {r3-r5} - ldm r1!, {r3-r5} - stm r2!, {r3-r5} - ldm r1!, {r3,r4} - stm r2!, {r3,r4} - ldr r1, [r0, 0x8] - lsls r1, 2 - add r1, sp - ldr r1, [r1] - bl _call_via_r1 - add sp, 0x20 - pop {r4,r5} - pop {r1} - bx r1 - .align 2, 0 -_08144F18: .4byte gUnknown_8466F60 - thumb_func_end mevent_srv_ish_exec - thumb_func_start sub_8144F1C sub_8144F1C: @ 8144F1C push {r4,lr} diff --git a/data/data_8466FB8.s b/data/data_8466FB8.s index 21ee2e1df..bdfdaaa6b 100644 --- a/data/data_8466FB8.s +++ b/data/data_8466FB8.s @@ -1,16 +1,5 @@ .section .rodata - .align 2 -gUnknown_8466F60:: @ 8466F60 - .4byte sub_8144C34 - .4byte sub_8144C5C - .4byte sub_8144C60 - .4byte sub_8144C80 - .4byte sub_8144CA0 - .4byte sub_8144E6C - .4byte sub_8144E84 - .4byte sub_8144EBC - .align 2 gUnknown_8466F80:: @ 8466F80 .asciz "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/mevent_server.c" diff --git a/include/mystery_event_script.h b/include/mystery_event_script.h index 1ba1464fa..8f90ccf53 100644 --- a/include/mystery_event_script.h +++ b/include/mystery_event_script.h @@ -7,4 +7,7 @@ u32 RunMysteryEventScript(u8 *); void SetMysteryEventScriptStatus(u32 val); u16 GetRecordMixingGift(void); +void sub_80DA89C(void *); +bool32 sub_80DA8B0(u32 *); + #endif // GUARD_MYSTERY_EVENT_SCRIPT_H diff --git a/src/mevent_server.c b/src/mevent_server.c index 3297e2658..251764441 100644 --- a/src/mevent_server.c +++ b/src/mevent_server.c @@ -7,6 +7,7 @@ #include "overworld.h" #include "script.h" #include "battle_tower.h" +#include "mystery_event_script.h" #include "mevent.h" extern u16 gBlockRecvBuffer[][128]; @@ -467,3 +468,58 @@ u32 sub_8144CA0(struct mevent_srv_ish * srv) return 1; } + +u32 sub_8144E6C(struct mevent_srv_ish * srv) +{ + if (srv->unk_0C) + { + srv->unk_08 = 4; + srv->unk_0C = 0; + } + return 1; +} + +u32 sub_8144E84(struct mevent_srv_ish * srv) +{ + switch (srv->unk_0C) + { + case 0: + sub_80DA89C(srv->unk_18); + ++srv->unk_0C; + break; + case 1: + if (!sub_80DA8B0(&srv->unk_04)) + { + srv->unk_08 = 4; + srv->unk_0C = 0; + } + break; + } + return 1; +} + +u32 sub_8144EBC(struct mevent_srv_ish * srv) +{ + u32 (*func)(u32 *, struct SaveBlock2 *, struct SaveBlock1 *) = (void *)gDecompressionBuffer; + if (func(&srv->unk_04, gSaveBlock2Ptr, gSaveBlock1Ptr) == 1) + { + srv->unk_08 = 4; + srv->unk_0C = 0; + } + return 1; +} + +u32 mevent_srv_ish_exec(struct mevent_srv_ish * srv) +{ + u32 (*funcs[])(struct mevent_srv_ish *) = { + sub_8144C34, + sub_8144C5C, + sub_8144C60, + sub_8144C80, + sub_8144CA0, + sub_8144E6C, + sub_8144E84, + sub_8144EBC + }; + return funcs[srv->unk_08](srv); +} -- cgit v1.2.3 From 8a8e86fa4fe0a7932f475c7aa8424ea840327e4b Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Fri, 30 Nov 2018 15:26:16 -0500 Subject: split mevent_server --- asm/mevent_server.s | 167 +------------- common_syms/mevent.txt | 1 + data/data_8466FB8.s | 22 +- include/cereader_tool.h | 9 + include/help_system.h | 2 + include/mevent_server.h | 36 +++ include/mystery_gift_menu.h | 6 + ld_script.txt | 4 + src/mevent.c | 9 +- src/mevent_server.c | 527 +++++--------------------------------------- src/mevent_server_ish.c | 308 ++++++++++++++++++++++++++ src/mevent_server_sub.c | 211 ++++++++++++++++++ sym_common.txt | 4 +- sym_ewram.txt | 12 +- 14 files changed, 641 insertions(+), 677 deletions(-) create mode 100644 common_syms/mevent.txt create mode 100644 include/cereader_tool.h create mode 100644 include/mystery_gift_menu.h create mode 100644 src/mevent_server_ish.c create mode 100644 src/mevent_server_sub.c diff --git a/asm/mevent_server.s b/asm/mevent_server.s index 41c3ad7da..1bcc5deed 100644 --- a/asm/mevent_server.s +++ b/asm/mevent_server.s @@ -5,169 +5,6 @@ .text - thumb_func_start sub_8144F1C -sub_8144F1C: @ 8144F1C - push {r4,lr} - ldr r4, _08144F38 @ =gUnknown_203F3C4 - movs r0, 0x60 - bl AllocZeroed - str r0, [r4] - ldr r1, _08144F3C @ =gUnknown_8468B6C - movs r2, 0 - movs r3, 0x1 - bl mevent_srv_init_common - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_08144F38: .4byte gUnknown_203F3C4 -_08144F3C: .4byte gUnknown_8468B6C - thumb_func_end sub_8144F1C - - thumb_func_start sub_8144F40 -sub_8144F40: @ 8144F40 - push {r4,lr} - ldr r4, _08144F5C @ =gUnknown_203F3C4 - movs r0, 0x60 - bl AllocZeroed - str r0, [r4] - ldr r1, _08144F60 @ =gUnknown_8468BCC - movs r2, 0 - movs r3, 0x1 - bl mevent_srv_init_common - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_08144F5C: .4byte gUnknown_203F3C4 -_08144F60: .4byte gUnknown_8468BCC - thumb_func_end sub_8144F40 - - thumb_func_start sub_8144F64 -sub_8144F64: @ 8144F64 - push {r4-r6,lr} - adds r6, r0, 0 - ldr r4, _08144F74 @ =gUnknown_203F3C4 - ldr r0, [r4] - cmp r0, 0 - bne _08144F78 - movs r0, 0x3 - b _08144F98 - .align 2, 0 -_08144F74: .4byte gUnknown_203F3C4 -_08144F78: - bl sub_8145600 - adds r5, r0, 0 - cmp r5, 0x3 - bne _08144F96 - ldr r0, [r4] - ldr r1, [r0, 0x4] - strh r1, [r6] - bl mevent_srv_free_resources - ldr r0, [r4] - bl Free - movs r0, 0 - str r0, [r4] -_08144F96: - adds r0, r5, 0 -_08144F98: - pop {r4-r6} - pop {r1} - bx r1 - thumb_func_end sub_8144F64 - - thumb_func_start mevent_srv_init_common -mevent_srv_init_common: @ 8144FA0 - push {r4-r6,lr} - mov r6, r9 - mov r5, r8 - push {r5,r6} - adds r4, r0, 0 - adds r6, r1, 0 - mov r8, r2 - mov r9, r3 - movs r5, 0 - str r5, [r4] - str r5, [r4, 0x8] - movs r0, 0xA6 - lsls r0, 1 - bl AllocZeroed - str r0, [r4, 0x18] - movs r0, 0xDE - lsls r0, 1 - bl AllocZeroed - str r0, [r4, 0x1C] - movs r0, 0x80 - lsls r0, 3 - bl AllocZeroed - str r0, [r4, 0x14] - movs r0, 0x64 - bl AllocZeroed - str r0, [r4, 0x20] - str r6, [r4, 0x10] - str r5, [r4, 0xC] - adds r4, 0x38 - adds r0, r4, 0 - mov r1, r8 - mov r2, r9 - bl sub_814485C - pop {r3,r4} - mov r8, r3 - mov r9, r4 - pop {r4-r6} - pop {r0} - bx r0 - thumb_func_end mevent_srv_init_common - - thumb_func_start mevent_srv_free_resources -mevent_srv_free_resources: @ 8144FF8 - push {r4,lr} - adds r4, r0, 0 - ldr r0, [r4, 0x18] - bl Free - ldr r0, [r4, 0x1C] - bl Free - ldr r0, [r4, 0x14] - bl Free - ldr r0, [r4, 0x20] - bl Free - pop {r4} - pop {r0} - bx r0 - thumb_func_end mevent_srv_free_resources - - thumb_func_start sub_814501C -sub_814501C: @ 814501C - push {r4-r7,lr} - adds r5, r0, 0 - adds r6, r1, 0 - adds r7, r2, 0 - adds r4, r3, 0 - movs r0, 0x80 - lsls r0, 3 - cmp r4, r0 - bls _0814503A - ldr r0, _08145050 @ =gUnknown_8466F80 "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/mevent_server.c" - ldr r1, _08145054 @ =0x00000101 - ldr r2, _08145058 @ =gUnknown_8466FB8 "size <= ME_SEND_BUF_SIZE" - movs r3, 0x1 - bl AGBAssert -_0814503A: - adds r0, r5, 0 - adds r0, 0x38 - adds r1, r6, 0 - adds r2, r7, 0 - adds r3, r4, 0 - bl sub_8144888 - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_08145050: .4byte gUnknown_8466F80 -_08145054: .4byte 0x00000101 -_08145058: .4byte gUnknown_8466FB8 - thumb_func_end sub_814501C - thumb_func_start sub_814505C sub_814505C: @ 814505C push {lr} @@ -871,7 +708,7 @@ sub_8145600: @ 8145600 movs r3, 0x1 bl AGBAssert _08145616: - ldr r1, _08145650 @ =gUnknown_8467030 + ldr r1, _08145650 @ =func_tbl ldr r0, [r4, 0x8] lsls r0, 2 adds r0, r1 @@ -897,7 +734,7 @@ _0814563C: _08145644: .4byte gUnknown_8466F80 _08145648: .4byte 0x00000222 _0814564C: .4byte gUnknown_8467044 -_08145650: .4byte gUnknown_8467030 +_08145650: .4byte func_tbl thumb_func_end sub_8145600 .align 2, 0 @ Don't pad with nop. diff --git a/common_syms/mevent.txt b/common_syms/mevent.txt new file mode 100644 index 000000000..cfaf59d33 --- /dev/null +++ b/common_syms/mevent.txt @@ -0,0 +1 @@ +gUnknown_3005ED0 diff --git a/data/data_8466FB8.s b/data/data_8466FB8.s index bdfdaaa6b..c34887d86 100644 --- a/data/data_8466FB8.s +++ b/data/data_8466FB8.s @@ -1,27 +1,7 @@ .section .rodata .align 2 -gUnknown_8466F80:: @ 8466F80 - .asciz "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/mevent_server.c" - - .align 2 -gUnknown_8466FB8:: @ 8466FB8 - .asciz "size <= ME_SEND_BUF_SIZE" - - .align 2 -gUnknown_8466FD4:: @ 8466FD4 - .asciz "cmd->parameter == NULL" - - .align 2 -gUnknown_8466FEC:: @ 8466FEC - .asciz "cmd->flag == FALSE" - - .align 2 -gUnknown_8467000:: @ 8467000 - .asciz "cmd->flag == FALSE && cmd->parameter == NULL" - - .align 2 -gUnknown_8467030:: @ 8467030 +func_tbl:: @ 8467030 .4byte sub_8145080 .4byte sub_8145088 .4byte sub_814508C diff --git a/include/cereader_tool.h b/include/cereader_tool.h new file mode 100644 index 000000000..28ef526eb --- /dev/null +++ b/include/cereader_tool.h @@ -0,0 +1,9 @@ +#ifndef GUARD_CEREADER_TOOL_H +#define GUARD_CEREADER_TOOL_H + +#include "global.h" + +bool32 sub_815D794(u8 *); +u8 sub_815D6B4(u8 *); + +#endif //GUARD_CEREADER_TOOL_H diff --git a/include/help_system.h b/include/help_system.h index 3f6a741c6..632788148 100644 --- a/include/help_system.h +++ b/include/help_system.h @@ -5,4 +5,6 @@ extern bool8 gUnknown_3005ECC; +void sub_812B484(void); + #endif //GUARD_HELP_SYSTEM_H diff --git a/include/mevent_server.h b/include/mevent_server.h index 0d46d8fc5..d2d7b0687 100644 --- a/include/mevent_server.h +++ b/include/mevent_server.h @@ -1,4 +1,40 @@ #ifndef GUARD_MEVENT_SERVER_H #define GUARD_MEVENT_SERVER_H +#include "global.h" + +#define ME_SEND_BUF_SIZE 0x400 + +struct mevent_srv_sub +{ + s32 unk_00; + u8 unk_04; + u8 unk_05; + u16 unk_06; + u16 unk_08; + u16 unk_0A; + u16 unk_0C; + u16 unk_0E; + u16 unk_10; + u16 unk_12; + u16 unk_14; + void * unk_18; + void * unk_1C; + u32 (*unk_20)(struct mevent_srv_sub *); + u32 (*unk_24)(struct mevent_srv_sub *); +}; + +struct send_recv_buff +{ + u16 unk0; + u16 unk2; + u16 unk4; +}; + +u32 sub_8144844(struct mevent_srv_sub * svr); +u32 sub_8144850(struct mevent_srv_sub * svr); +void sub_814485C(struct mevent_srv_sub * svr, u32 a1, u32 a2); +void sub_8144888(struct mevent_srv_sub * svr, u32 a1, void * a2, u32 size); +void sub_81448AC(struct mevent_srv_sub * svr, u32 a1, void * a2); + #endif //GUARD_MEVENT_SERVER_H diff --git a/include/mystery_gift_menu.h b/include/mystery_gift_menu.h new file mode 100644 index 000000000..17af9ce57 --- /dev/null +++ b/include/mystery_gift_menu.h @@ -0,0 +1,6 @@ +#ifndef GUARD_MYSTERY_GIFT_MENU_H +#define GUARD_MYSTERY_GIFT_MENU_H + +void sub_81422FC(void); + +#endif //GUARD_MYSTERY_GIFT_MENU_H diff --git a/ld_script.txt b/ld_script.txt index 88ad583b6..19d8a5862 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -244,6 +244,8 @@ SECTIONS { asm/mystery_gift_menu.o(.text); asm/link_rfu_4.o(.text); src/mevent.o(.text); + src/mevent_server_sub.o(.text); + src/mevent_server_ish.o(.text); src/mevent_server.o(.text); asm/mevent_server.o(.text); asm/mevent_8145654.o(.text); @@ -380,6 +382,8 @@ SECTIONS { src/fame_checker.o(.rodata); data/data_845FD54.o(.rodata); src/mevent.o(.rodata); + src/mevent_server_sub.o(.rodata); + src/mevent_server_ish.o(.rodata); src/mevent_server.o(.rodata); data/data_8466FB8.o(.rodata); src/menews_jisan.o(.rodata); diff --git a/src/mevent.c b/src/mevent.c index b04ac5462..9638e0327 100644 --- a/src/mevent.c +++ b/src/mevent.c @@ -17,6 +17,9 @@ #include "new_game.h" #include "string_util.h" #include "menews_jisan.h" +#include "cereader_tool.h" +#include "mystery_gift_menu.h" +#include "help_system.h" #include "mevent.h" struct MEventTaskData1 @@ -40,14 +43,10 @@ bool32 sub_8143E64(const struct MEventBuffer_3120_Sub * src); void sub_8143E9C(void); void sub_8143ED0(void); bool32 sub_8144018(const struct MEventBuffer_32E0_Sub * src); -bool32 sub_815D794(u8 *); -void sub_81422FC(void); -void sub_812B484(void); void sub_814407C(void); void sub_81440B4(void); void sub_8144824(u32, u32, u32 *, s32); void sub_8144790(void); -u8 sub_815D6B4(u8 *); extern const u8 gUnknown_841DE52[]; extern const u8 gUnknown_841DE53[]; @@ -90,7 +89,7 @@ const u16 gUnknown_8466F00[] = { struct MEvent_Str_1 gUnknown_3005ED0; -bool32 gUnknown_203F3BC = FALSE; +static EWRAM_DATA bool32 gUnknown_203F3BC = FALSE; void sub_81435DC(struct MEvent_Str_1 *a0, size_t a1, const void * a2) { diff --git a/src/mevent_server.c b/src/mevent_server.c index 251764441..027a7e994 100644 --- a/src/mevent_server.c +++ b/src/mevent_server.c @@ -9,517 +9,92 @@ #include "battle_tower.h" #include "mystery_event_script.h" #include "mevent.h" +#include "mevent_server.h" extern u16 gBlockRecvBuffer[][128]; -struct mevent_srv_sub -{ - s32 unk_00; - u8 unk_04; - u8 unk_05; - u16 unk_06; - u16 unk_08; - u16 unk_0A; - u16 unk_0C; - u16 unk_0E; - u16 unk_10; - u16 unk_12; - u16 unk_14; - void * unk_18; - void * unk_1C; - u32 (*unk_20)(struct mevent_srv_sub *); - u32 (*unk_24)(struct mevent_srv_sub *); -}; - -struct mevent_srv_ish +struct mevent_srv_common { u32 unk_00; u32 unk_04; - u32 unk_08; + u32 mainseqno; u32 unk_0C; - u32 unk_10; + const void * unk_10; void * unk_14; void * unk_18; void * unk_1C; void * unk_20; - struct mevent_srv_sub unk_24; -}; - -struct send_recv_buff -{ - u16 unk0; - u16 unk2; - u16 unk4; + u8 filler_24[0x14]; + struct mevent_srv_sub unk_38; }; -EWRAM_DATA struct mevent_srv_ish * gUnknown_203F3C0 = NULL; - -u32 sub_814490C(struct mevent_srv_sub *); -u32 sub_81449E0(struct mevent_srv_sub *); -void mevent_srv_ish_init(struct mevent_srv_ish *, u32, u32); -u32 mevent_srv_ish_exec(struct mevent_srv_ish *); -void sub_8144BC0(struct mevent_srv_ish *); - -extern u8 gUnknown_84687E0[0x400]; - -u32 sub_8144844(struct mevent_srv_sub * srv) -{ - return srv->unk_20(srv); -} - -u32 sub_8144850(struct mevent_srv_sub * srv) -{ - return srv->unk_24(srv); -} - -void sub_814485C(struct mevent_srv_sub * srv, u32 a1, u32 a2) -{ - srv->unk_04 = a1; - srv->unk_05 = a2; - srv->unk_00 = 0; - srv->unk_12 = 0; - srv->unk_14 = 0; - srv->unk_10 = 0; - srv->unk_0A = 0; - srv->unk_0C = 0; - srv->unk_08 = 0; - srv->unk_1C = NULL; - srv->unk_18 = NULL; - srv->unk_24 = sub_81449E0; - srv->unk_20 = sub_814490C; -} - -void sub_8144888(struct mevent_srv_sub * srv, u32 a1, void * a2, u32 a3) -{ - srv->unk_00 = 0; - srv->unk_0E = a1; - srv->unk_10 = 0; - srv->unk_12 = 0; - if (a3 != 0) - srv->unk_14 = a3; - else - srv->unk_14 = 0x400; - srv->unk_1C = a2; -} - -void sub_81448AC(struct mevent_srv_sub * srv, u32 a1, void * a2) -{ - srv->unk_00 = 0; - srv->unk_06 = a1; - srv->unk_08 = 0; - srv->unk_0A = 0; - srv->unk_0C = 0; - srv->unk_18 = a2; -} - -void sub_81448BC(u32 recv_idx, void * dest, size_t size) -{ - memcpy(dest, gBlockRecvBuffer[recv_idx], size); -} - -bool32 sub_81448D8(u32 recv_idx) -{ - if ((GetBlockReceivedStatus() >> recv_idx) & 1) - return TRUE; - else - return FALSE; -} - -void sub_81448FC(u32 recv_idx) -{ - ResetBlockReceivedFlag(recv_idx); -} - -bool32 sub_814490C(struct mevent_srv_sub * srv) -{ - struct send_recv_buff buff; - - switch (srv->unk_00) - { - case 0: - if (sub_81448D8(srv->unk_05)) - { - sub_81448BC(srv->unk_05, &buff, sizeof(buff)); - srv->unk_0C = buff.unk4; - srv->unk_0A = buff.unk2; - if (srv->unk_0C > 0x400) - { - sub_80FA190(); - return FALSE; - } - else if (srv->unk_06 != buff.unk0) - { - sub_80FA190(); - return FALSE; - } - else - { - srv->unk_08 = 0; - sub_81448FC(srv->unk_05); - ++srv->unk_00; - } - } - break; - case 1: - if (sub_81448D8(srv->unk_05)) - { - size_t r3 = srv->unk_08 * 252; - if (srv->unk_0C - r3 <= 252) - { - sub_81448BC(srv->unk_05, srv->unk_18 + r3, srv->unk_0C - r3); - ++srv->unk_08; - ++srv->unk_00; - } - else - { - sub_81448BC(srv->unk_05, srv->unk_18 + r3, 252); - ++srv->unk_08; - } - sub_81448FC(srv->unk_05); - } - break; - case 2: - if (CalcCRC16WithTable(srv->unk_18, srv->unk_0C) != srv->unk_0A) - { - sub_80FA190(); - return FALSE; - } - else - { - srv->unk_00 = 0; - return TRUE; - } - break; +EWRAM_DATA struct mevent_srv_common * gUnknown_203F3C4 = NULL; - } +void mevent_srv_init_common(struct mevent_srv_common *, const void *, u32, u32); +void mevent_srv_free_resources(struct mevent_srv_common *); +u32 sub_8145600(struct mevent_srv_common *); - return FALSE; -} +extern const u8 gUnknown_8468B6C[]; +extern const u8 gUnknown_8468BCC[]; -bool32 sub_81449E0(struct mevent_srv_sub * srv) +void sub_8144F1C(void) { - struct send_recv_buff buff; - - switch (srv->unk_00) - { - case 0: - if (sub_800A4BC()) - { - buff.unk0 = srv->unk_0E; - buff.unk4 = srv->unk_14; - buff.unk2 = CalcCRC16WithTable(srv->unk_1C, srv->unk_14); - srv->unk_12 = buff.unk2; - srv->unk_10 = 0; - SendBlock(0, &buff, sizeof(buff)); - ++srv->unk_00; - } - break; - case 1: - if (sub_800A4BC()) - { - if (sub_81448D8(srv->unk_04)) - { - size_t r3; - sub_81448FC(srv->unk_04); - r3 = 252 * srv->unk_10; - if (srv->unk_14 - r3 <= 252) - { - SendBlock(0, srv->unk_1C + r3, srv->unk_14 - r3); - ++srv->unk_10; - ++srv->unk_00; - } - else - { - SendBlock(0, srv->unk_1C + r3, 252); - ++srv->unk_10; - } - } - } - break; - case 2: - if (sub_800A4BC()) - { - if (CalcCRC16WithTable(srv->unk_1C, srv->unk_14) != srv->unk_12) - sub_80FA190(); - else - ++srv->unk_00; - } - break; - case 3: - if (sub_81448D8(srv->unk_04)) - { - sub_81448FC(srv->unk_04); - srv->unk_00 = 0; - return TRUE; - } - break; - } - - return FALSE; + gUnknown_203F3C4 = AllocZeroed(sizeof(struct mevent_srv_common)); + mevent_srv_init_common(gUnknown_203F3C4, gUnknown_8468B6C, 0, 1); } -void sub_8144AEC(void) +void sub_8144F40(void) { - gUnknown_203F3C0 = AllocZeroed(sizeof(struct mevent_srv_ish)); - mevent_srv_ish_init(gUnknown_203F3C0, 1, 0); + gUnknown_203F3C4 = AllocZeroed(sizeof(struct mevent_srv_common)); + mevent_srv_init_common(gUnknown_203F3C4, gUnknown_8468BCC, 0, 1); } -u32 sub_8144B0C(u16 * a0) +u32 sub_8144F64(u16 * a0) { u32 result; - if (gUnknown_203F3C0 == NULL) - return 6; - result = mevent_srv_ish_exec(gUnknown_203F3C0); - if (result == 6) + if (gUnknown_203F3C4 == NULL) + return 3; + result = sub_8145600(gUnknown_203F3C4); + if (result == 3) { - *a0 = gUnknown_203F3C0->unk_04; - sub_8144BC0(gUnknown_203F3C0); - Free(gUnknown_203F3C0); - gUnknown_203F3C0 = NULL; + *a0 = gUnknown_203F3C4->unk_04; + mevent_srv_free_resources(gUnknown_203F3C4); + Free(gUnknown_203F3C4); + gUnknown_203F3C4 = NULL; } return result; } -void sub_8144B48(void) -{ - gUnknown_203F3C0->unk_0C++; -} - -void * sub_8144B58(void) -{ - return gUnknown_203F3C0->unk_20; -} - -void sub_8144B64(u32 a0) -{ - gUnknown_203F3C0->unk_04 = a0; -} - -void mevent_srv_ish_init(struct mevent_srv_ish * srv, u32 a1, u32 a2) -{ - srv->unk_00 = 0; - srv->unk_08 = 0; - srv->unk_0C = 0; - srv->unk_14 = AllocZeroed(0x400); - srv->unk_18 = AllocZeroed(0x400); - srv->unk_1C = AllocZeroed(0x400); - srv->unk_20 = AllocZeroed(0x40); - sub_814485C(&srv->unk_24, a1, a2); -} - -void sub_8144BC0(struct mevent_srv_ish * srv) -{ - Free(srv->unk_14); - Free(srv->unk_18); - Free(srv->unk_1C); - Free(srv->unk_20); -} - -void sub_8144BE4(struct mevent_srv_ish * srv) -{ - memcpy(srv->unk_1C, srv->unk_18, 0x400); - srv->unk_10 = 0; -} - -void sub_8144C00(struct mevent_srv_ish * srv, u32 a1, u32 a2) -{ - CpuFill32(0, srv->unk_14, 0x400); - *(u32 *)srv->unk_14 = a2; - sub_8144888(&srv->unk_24, a1, srv->unk_14, 4); -} - -// funcs in array gUnknown_8466F60 - -u32 sub_8144C34(struct mevent_srv_ish * srv) -{ - memcpy(srv->unk_1C, gUnknown_84687E0, sizeof(gUnknown_84687E0)); - srv->unk_10 = 0; - srv->unk_08 = 4; - srv->unk_0C = 0; - return 0; -} - -u32 sub_8144C5C(struct mevent_srv_ish * srv) -{ - return 6; -} - -u32 sub_8144C60(struct mevent_srv_ish * srv) +void mevent_srv_init_common(struct mevent_srv_common * svr, const void * a1, u32 a2, u32 a3) { - if (sub_8144844(&srv->unk_24)) - { - srv->unk_08 = 4; - srv->unk_0C = 0; - } - return 1; -} - -u32 sub_8144C80(struct mevent_srv_ish * srv) -{ - if (sub_8144850(&srv->unk_24)) - { - srv->unk_08 = 4; - srv->unk_0C = 0; - } - return 1; -} - -u32 sub_8144CA0(struct mevent_srv_ish * srv) -{ - u32 * r2 = (u32 *)srv->unk_1C + 2 * srv->unk_10; - ++srv->unk_10; - switch (r2[0]) - { - case 0: - break; - case 1: - srv->unk_04 = r2[1]; - srv->unk_08 = 1; - srv->unk_0C = 0; - break; - case 2: - sub_81448AC(&srv->unk_24, r2[1], srv->unk_18); - srv->unk_08 = 2; - srv->unk_0C = 0; - break; - case 3: - srv->unk_08 = 3; - srv->unk_0C = 0; - break; - case 20: - sub_8144888(&srv->unk_24, 0x14, srv->unk_14, 0); - srv->unk_08 = 3; - srv->unk_0C = 0; - break; - case 19: - sub_8144C00(srv, 0x12, GetGameStat(r2[1])); - srv->unk_08 = 3; - srv->unk_0C = 0; - break; - case 6: - if (srv->unk_04 == 0) - sub_8144BE4(srv); - break; - case 7: - if (srv->unk_04 == 1) - sub_8144BE4(srv); - break; - case 4: - sub_8144BE4(srv); - break; - case 5: - memcpy(srv->unk_20, srv->unk_18, 0x40); - srv->unk_08 = 5; - srv->unk_0C = 0; - return 2; - case 11: - memcpy(srv->unk_20, srv->unk_18, 0x40); - srv->unk_08 = 5; - srv->unk_0C = 0; - return 3; - case 12: - memcpy(srv->unk_20, srv->unk_18, 0x40); - srv->unk_08 = 5; - srv->unk_0C = 0; - return 5; - case 13: - srv->unk_08 = 5; - srv->unk_0C = 0; - return 4; - case 8: - sub_81442CC(srv->unk_14); - sub_8144888(&srv->unk_24, 0x11, srv->unk_14, 0x64); - break; - case 14: - sub_8144C00(srv, 0x13, srv->unk_04); - break; - case 10: - sub_8143F68(srv->unk_18); - break; - case 9: - if (!sub_8143EF4(srv->unk_18)) - { - sub_8143DC8(srv->unk_18); - sub_8144C00(srv, 0x13, 0); - } - else - sub_8144C00(srv, 0x13, 1); - break; - case 15: - srv->unk_08 = 6; - srv->unk_0C = 0; - break; - case 16: - sub_8144254(srv->unk_18); - break; - case 17: - sub_8069EA4(srv->unk_18, 1000); - break; - case 18: - memcpy(gSaveBlock2Ptr->unk_4A0, srv->unk_18, 0xbc); - sub_80E7490(); - break; - case 21: - memcpy(gDecompressionBuffer, srv->unk_18, 0x400); - srv->unk_08 = 7; - srv->unk_0C = 0; - break; - } - - return 1; -} - -u32 sub_8144E6C(struct mevent_srv_ish * srv) -{ - if (srv->unk_0C) - { - srv->unk_08 = 4; - srv->unk_0C = 0; - } - return 1; + svr->unk_00 = 0; + svr->mainseqno = 0; + svr->unk_18 = AllocZeroed(332); + svr->unk_1C = AllocZeroed(444); + svr->unk_14 = AllocZeroed(ME_SEND_BUF_SIZE); + svr->unk_20 = AllocZeroed(100); + svr->unk_10 = a1; + svr->unk_0C = 0; + sub_814485C(&svr->unk_38, a2, a3); } -u32 sub_8144E84(struct mevent_srv_ish * srv) +void mevent_srv_free_resources(struct mevent_srv_common * svr) { - switch (srv->unk_0C) - { - case 0: - sub_80DA89C(srv->unk_18); - ++srv->unk_0C; - break; - case 1: - if (!sub_80DA8B0(&srv->unk_04)) - { - srv->unk_08 = 4; - srv->unk_0C = 0; - } - break; - } - return 1; + Free(svr->unk_18); + Free(svr->unk_1C); + Free(svr->unk_14); + Free(svr->unk_20); } -u32 sub_8144EBC(struct mevent_srv_ish * srv) -{ - u32 (*func)(u32 *, struct SaveBlock2 *, struct SaveBlock1 *) = (void *)gDecompressionBuffer; - if (func(&srv->unk_04, gSaveBlock2Ptr, gSaveBlock1Ptr) == 1) - { - srv->unk_08 = 4; - srv->unk_0C = 0; - } - return 1; -} +const char gUnknown_8466F80[] = "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/mevent_server.c"; +const char gUnknown_8466FB8[] = "size <= ME_SEND_BUF_SIZE"; +const char gUnknown_8466FD4[] = "cmd->parameter == NULL"; +const char gUnknown_8466FEC[] = "cmd->flag == FALSE"; +const char gUnknown_8467000[] = "cmd->flag == FALSE && cmd->parameter == NULL"; -u32 mevent_srv_ish_exec(struct mevent_srv_ish * srv) +void sub_814501C(struct mevent_srv_common * svr, u32 a1, void * a2, u32 size) { - u32 (*funcs[])(struct mevent_srv_ish *) = { - sub_8144C34, - sub_8144C5C, - sub_8144C60, - sub_8144C80, - sub_8144CA0, - sub_8144E6C, - sub_8144E84, - sub_8144EBC - }; - return funcs[srv->unk_08](srv); + // AGB_ASSERT_EX(size <= ME_SEND_BUF_SIZE, "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/mevent_server.c", 257); + size <= ME_SEND_BUF_SIZE ? NULL : AGBAssert(gUnknown_8466F80, 257, gUnknown_8466FB8, 1); + sub_8144888(&svr->unk_38, a1, a2, size); } diff --git a/src/mevent_server_ish.c b/src/mevent_server_ish.c new file mode 100644 index 000000000..7e9639303 --- /dev/null +++ b/src/mevent_server_ish.c @@ -0,0 +1,308 @@ +#include "global.h" +#include "malloc.h" +#include "decompress.h" +#include "util.h" +#include "link.h" +#include "link_rfu.h" +#include "overworld.h" +#include "script.h" +#include "battle_tower.h" +#include "mystery_event_script.h" +#include "mevent.h" +#include "mevent_server.h" + +extern u16 gBlockRecvBuffer[][128]; + +struct mevent_srv_ish +{ + u32 unk_00; + u32 unk_04; + u32 mainseqno; + u32 unk_0C; + u32 unk_10; + void * unk_14; + void * unk_18; + void * unk_1C; + void * unk_20; + struct mevent_srv_sub unk_24; +}; + +struct mevent_cmd +{ + u32 instr; + bool32 flag; + u32 parameter; +}; + +EWRAM_DATA struct mevent_srv_ish * gUnknown_203F3C0 = NULL; + +void mevent_srv_ish_init(struct mevent_srv_ish *, u32, u32); +u32 mevent_srv_ish_exec(struct mevent_srv_ish *); +void sub_8144BC0(struct mevent_srv_ish *); +extern const u8 gUnknown_84687E0[]; + +void sub_8144AEC(void) +{ + gUnknown_203F3C0 = AllocZeroed(sizeof(struct mevent_srv_ish)); + mevent_srv_ish_init(gUnknown_203F3C0, 1, 0); +} + +u32 sub_8144B0C(u16 * a0) +{ + u32 result; + if (gUnknown_203F3C0 == NULL) + return 6; + result = mevent_srv_ish_exec(gUnknown_203F3C0); + if (result == 6) + { + *a0 = gUnknown_203F3C0->unk_04; + sub_8144BC0(gUnknown_203F3C0); + Free(gUnknown_203F3C0); + gUnknown_203F3C0 = NULL; + } + return result; +} + +void sub_8144B48(void) +{ + gUnknown_203F3C0->unk_0C++; +} + +void * sub_8144B58(void) +{ + return gUnknown_203F3C0->unk_20; +} + +void sub_8144B64(u32 a0) +{ + gUnknown_203F3C0->unk_04 = a0; +} + +void mevent_srv_ish_init(struct mevent_srv_ish * svr, u32 a1, u32 a2) +{ + svr->unk_00 = 0; + svr->mainseqno = 0; + svr->unk_0C = 0; + svr->unk_14 = AllocZeroed(ME_SEND_BUF_SIZE); + svr->unk_18 = AllocZeroed(ME_SEND_BUF_SIZE); + svr->unk_1C = AllocZeroed(ME_SEND_BUF_SIZE); + svr->unk_20 = AllocZeroed(0x40); + sub_814485C(&svr->unk_24, a1, a2); +} + +void sub_8144BC0(struct mevent_srv_ish * svr) +{ + Free(svr->unk_14); + Free(svr->unk_18); + Free(svr->unk_1C); + Free(svr->unk_20); +} + +void sub_8144BE4(struct mevent_srv_ish * svr) +{ + memcpy(svr->unk_1C, svr->unk_18, ME_SEND_BUF_SIZE); + svr->unk_10 = 0; +} + +void sub_8144C00(struct mevent_srv_ish * svr, u32 a1, u32 a2) +{ + CpuFill32(0, svr->unk_14, ME_SEND_BUF_SIZE); + *(u32 *)svr->unk_14 = a2; + sub_8144888(&svr->unk_24, a1, svr->unk_14, 4); +} + +// funcs in array gUnknown_8466F60 + +u32 sub_8144C34(struct mevent_srv_ish * svr) +{ + memcpy(svr->unk_1C, gUnknown_84687E0, ME_SEND_BUF_SIZE); + svr->unk_10 = 0; + svr->mainseqno = 4; + svr->unk_0C = 0; + return 0; +} + +u32 sub_8144C5C(struct mevent_srv_ish * svr) +{ + return 6; +} + +u32 sub_8144C60(struct mevent_srv_ish * svr) +{ + if (sub_8144844(&svr->unk_24)) + { + svr->mainseqno = 4; + svr->unk_0C = 0; + } + return 1; +} + +u32 sub_8144C80(struct mevent_srv_ish * svr) +{ + if (sub_8144850(&svr->unk_24)) + { + svr->mainseqno = 4; + svr->unk_0C = 0; + } + return 1; +} + +u32 sub_8144CA0(struct mevent_srv_ish * svr) +{ + u32 * r2 = (u32 *)svr->unk_1C + 2 * svr->unk_10; + ++svr->unk_10; + switch (r2[0]) + { + case 0: + break; + case 1: + svr->unk_04 = r2[1]; + svr->mainseqno = 1; + svr->unk_0C = 0; + break; + case 2: + sub_81448AC(&svr->unk_24, r2[1], svr->unk_18); + svr->mainseqno = 2; + svr->unk_0C = 0; + break; + case 3: + svr->mainseqno = 3; + svr->unk_0C = 0; + break; + case 20: + sub_8144888(&svr->unk_24, 0x14, svr->unk_14, 0); + svr->mainseqno = 3; + svr->unk_0C = 0; + break; + case 19: + sub_8144C00(svr, 0x12, GetGameStat(r2[1])); + svr->mainseqno = 3; + svr->unk_0C = 0; + break; + case 6: + if (svr->unk_04 == 0) + sub_8144BE4(svr); + break; + case 7: + if (svr->unk_04 == 1) + sub_8144BE4(svr); + break; + case 4: + sub_8144BE4(svr); + break; + case 5: + memcpy(svr->unk_20, svr->unk_18, 0x40); + svr->mainseqno = 5; + svr->unk_0C = 0; + return 2; + case 11: + memcpy(svr->unk_20, svr->unk_18, 0x40); + svr->mainseqno = 5; + svr->unk_0C = 0; + return 3; + case 12: + memcpy(svr->unk_20, svr->unk_18, 0x40); + svr->mainseqno = 5; + svr->unk_0C = 0; + return 5; + case 13: + svr->mainseqno = 5; + svr->unk_0C = 0; + return 4; + case 8: + sub_81442CC(svr->unk_14); + sub_8144888(&svr->unk_24, 0x11, svr->unk_14, 0x64); + break; + case 14: + sub_8144C00(svr, 0x13, svr->unk_04); + break; + case 10: + sub_8143F68(svr->unk_18); + break; + case 9: + if (!sub_8143EF4(svr->unk_18)) + { + sub_8143DC8(svr->unk_18); + sub_8144C00(svr, 0x13, 0); + } + else + sub_8144C00(svr, 0x13, 1); + break; + case 15: + svr->mainseqno = 6; + svr->unk_0C = 0; + break; + case 16: + sub_8144254(svr->unk_18); + break; + case 17: + sub_8069EA4(svr->unk_18, 1000); + break; + case 18: + memcpy(gSaveBlock2Ptr->unk_4A0, svr->unk_18, 0xbc); + sub_80E7490(); + break; + case 21: + memcpy(gDecompressionBuffer, svr->unk_18, ME_SEND_BUF_SIZE); + svr->mainseqno = 7; + svr->unk_0C = 0; + break; + } + + return 1; +} + +u32 sub_8144E6C(struct mevent_srv_ish * svr) +{ + if (svr->unk_0C) + { + svr->mainseqno = 4; + svr->unk_0C = 0; + } + return 1; +} + +u32 sub_8144E84(struct mevent_srv_ish * svr) +{ + switch (svr->unk_0C) + { + case 0: + sub_80DA89C(svr->unk_18); + ++svr->unk_0C; + break; + case 1: + if (!sub_80DA8B0(&svr->unk_04)) + { + svr->mainseqno = 4; + svr->unk_0C = 0; + } + break; + } + return 1; +} + +u32 sub_8144EBC(struct mevent_srv_ish * svr) +{ + u32 (*func)(u32 *, struct SaveBlock2 *, struct SaveBlock1 *) = (void *)gDecompressionBuffer; + if (func(&svr->unk_04, gSaveBlock2Ptr, gSaveBlock1Ptr) == 1) + { + svr->mainseqno = 4; + svr->unk_0C = 0; + } + return 1; +} + +u32 mevent_srv_ish_exec(struct mevent_srv_ish * svr) +{ + u32 (*funcs[])(struct mevent_srv_ish *) = { + sub_8144C34, + sub_8144C5C, + sub_8144C60, + sub_8144C80, + sub_8144CA0, + sub_8144E6C, + sub_8144E84, + sub_8144EBC + }; + return funcs[svr->mainseqno](svr); +} diff --git a/src/mevent_server_sub.c b/src/mevent_server_sub.c new file mode 100644 index 000000000..83b8f62ca --- /dev/null +++ b/src/mevent_server_sub.c @@ -0,0 +1,211 @@ +#include "global.h" +#include "malloc.h" +#include "decompress.h" +#include "util.h" +#include "link.h" +#include "link_rfu.h" +#include "overworld.h" +#include "script.h" +#include "battle_tower.h" +#include "mystery_event_script.h" +#include "mevent.h" +#include "mevent_server.h" + +u32 sub_814490C(struct mevent_srv_sub *); +u32 sub_81449E0(struct mevent_srv_sub *); + +u32 sub_8144844(struct mevent_srv_sub * svr) +{ + return svr->unk_20(svr); +} + +u32 sub_8144850(struct mevent_srv_sub * svr) +{ + return svr->unk_24(svr); +} + +void sub_814485C(struct mevent_srv_sub * svr, u32 a1, u32 a2) +{ + svr->unk_04 = a1; + svr->unk_05 = a2; + svr->unk_00 = 0; + svr->unk_12 = 0; + svr->unk_14 = 0; + svr->unk_10 = 0; + svr->unk_0A = 0; + svr->unk_0C = 0; + svr->unk_08 = 0; + svr->unk_1C = NULL; + svr->unk_18 = NULL; + svr->unk_24 = sub_81449E0; + svr->unk_20 = sub_814490C; +} + +void sub_8144888(struct mevent_srv_sub * svr, u32 a1, void * a2, u32 a3) +{ + svr->unk_00 = 0; + svr->unk_0E = a1; + svr->unk_10 = 0; + svr->unk_12 = 0; + if (a3 != 0) + svr->unk_14 = a3; + else + svr->unk_14 = ME_SEND_BUF_SIZE; + svr->unk_1C = a2; +} + +void sub_81448AC(struct mevent_srv_sub * svr, u32 a1, void * a2) +{ + svr->unk_00 = 0; + svr->unk_06 = a1; + svr->unk_08 = 0; + svr->unk_0A = 0; + svr->unk_0C = 0; + svr->unk_18 = a2; +} + +void sub_81448BC(u32 recv_idx, void * dest, size_t size) +{ + memcpy(dest, gBlockRecvBuffer[recv_idx], size); +} + +bool32 sub_81448D8(u32 recv_idx) +{ + if ((GetBlockReceivedStatus() >> recv_idx) & 1) + return TRUE; + else + return FALSE; +} + +void sub_81448FC(u32 recv_idx) +{ + ResetBlockReceivedFlag(recv_idx); +} + +bool32 sub_814490C(struct mevent_srv_sub * svr) +{ + struct send_recv_buff buff; + + switch (svr->unk_00) + { + case 0: + if (sub_81448D8(svr->unk_05)) + { + sub_81448BC(svr->unk_05, &buff, sizeof(buff)); + svr->unk_0C = buff.unk4; + svr->unk_0A = buff.unk2; + if (svr->unk_0C > ME_SEND_BUF_SIZE) + { + sub_80FA190(); + return FALSE; + } + else if (svr->unk_06 != buff.unk0) + { + sub_80FA190(); + return FALSE; + } + else + { + svr->unk_08 = 0; + sub_81448FC(svr->unk_05); + ++svr->unk_00; + } + } + break; + case 1: + if (sub_81448D8(svr->unk_05)) + { + size_t r3 = svr->unk_08 * 252; + if (svr->unk_0C - r3 <= 252) + { + sub_81448BC(svr->unk_05, svr->unk_18 + r3, svr->unk_0C - r3); + ++svr->unk_08; + ++svr->unk_00; + } + else + { + sub_81448BC(svr->unk_05, svr->unk_18 + r3, 252); + ++svr->unk_08; + } + sub_81448FC(svr->unk_05); + } + break; + case 2: + if (CalcCRC16WithTable(svr->unk_18, svr->unk_0C) != svr->unk_0A) + { + sub_80FA190(); + return FALSE; + } + else + { + svr->unk_00 = 0; + return TRUE; + } + break; + + } + + return FALSE; +} + +bool32 sub_81449E0(struct mevent_srv_sub * svr) +{ + struct send_recv_buff buff; + + switch (svr->unk_00) + { + case 0: + if (sub_800A4BC()) + { + buff.unk0 = svr->unk_0E; + buff.unk4 = svr->unk_14; + buff.unk2 = CalcCRC16WithTable(svr->unk_1C, svr->unk_14); + svr->unk_12 = buff.unk2; + svr->unk_10 = 0; + SendBlock(0, &buff, sizeof(buff)); + ++svr->unk_00; + } + break; + case 1: + if (sub_800A4BC()) + { + if (sub_81448D8(svr->unk_04)) + { + size_t r3; + sub_81448FC(svr->unk_04); + r3 = 252 * svr->unk_10; + if (svr->unk_14 - r3 <= 252) + { + SendBlock(0, svr->unk_1C + r3, svr->unk_14 - r3); + ++svr->unk_10; + ++svr->unk_00; + } + else + { + SendBlock(0, svr->unk_1C + r3, 252); + ++svr->unk_10; + } + } + } + break; + case 2: + if (sub_800A4BC()) + { + if (CalcCRC16WithTable(svr->unk_1C, svr->unk_14) != svr->unk_12) + sub_80FA190(); + else + ++svr->unk_00; + } + break; + case 3: + if (sub_81448D8(svr->unk_04)) + { + sub_81448FC(svr->unk_04); + svr->unk_00 = 0; + return TRUE; + } + break; + } + + return FALSE; +} diff --git a/sym_common.txt b/sym_common.txt index af6d7ba4f..d71702d05 100644 --- a/sym_common.txt +++ b/sym_common.txt @@ -329,9 +329,9 @@ gUnknown_3005EA0: @ 3005EA0 gUnknown_3005ECC: @ 3005ECC .space 0x4 -gUnknown_3005ED0: @ 3005ED0 - .space 0x10 + .include "mevent.o" + .align 4 gUnknown_3005EE0: @ 3005EE0 .space 0x10 diff --git a/sym_ewram.txt b/sym_ewram.txt index cb35591a1..4c8d1dc78 100644 --- a/sym_ewram.txt +++ b/sym_ewram.txt @@ -1706,14 +1706,10 @@ gUnknown_203F3B0: @ 203F3B0 gUnknown_203F3B8: @ 203F3B8 .space 0x4 -gUnknown_203F3BC: @ 203F3BC - .space 0x4 - -gUnknown_203F3C0: @ 203F3C0 - .space 0x4 - -gUnknown_203F3C4: @ 203F3C4 - .space 0x4 + .include "src/mevent.o" + .include "src/mevent_server_sub.o" + .include "src/mevent_server_ish.o" + .include "src/mevent_server.o" gUnknown_203F3C8: @ 203F3C8 .space 0x4 -- cgit v1.2.3 From 308e60da31388973ac8885127b12db300e21100a Mon Sep 17 00:00:00 2001 From: Paul Sander Date: Fri, 30 Nov 2018 22:01:50 +0100 Subject: change some names and remove some blank lines --- data/graphics.s | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/data/graphics.s b/data/graphics.s index ab8075c41..50e557dc3 100644 --- a/data/graphics.s +++ b/data/graphics.s @@ -18,11 +18,11 @@ gUnknown_8D0098C:: @ 8D0098C .incbin "baserom.gba", 0xD0098C, 0x244 .align 2 -gUnknown_8D00BD0:: @ 8D00BD0 +gFile_graphics_pokemon_palettes_circled_question_mark_palette:: @ 8D00BD0 .incbin "graphics/pokemon/palettes/circled_question_mark_palette.gbapal.lz" .align 2 -gUnknown_8D00BE8:: @ 8D00BE8 +gFile_graphics_pokemon_palettes_circled_question_mark_shiny_palette:: @ 8D00BE8 .incbin "graphics/pokemon/palettes/circled_question_mark_shiny_palette.gbapal.lz" .align 2 @@ -1836,7 +1836,6 @@ gFile_graphics_battle_anims_sprites_193_sheet:: @ 8D206B8 gFile_graphics_battle_anims_sprites_193_palette:: @ 8D20814 .incbin "graphics/battle_anims/sprites/193.gbapal.lz" - .align 2 gFile_graphics_battle_anims_masks_curse_sheet:: @ 8D2083C .incbin "graphics/battle_anims/masks/curse.4bpp.lz" @@ -13695,7 +13694,6 @@ gFile_graphics_battle_interface_enemy_mon_shadow_sheet:: @ 8E7BAD4 gFile_graphics_battle_interface_ball_status_bar_sheet:: @ 8E7BB04 .incbin "graphics/battle_interface/ball_status_bar.4bpp.lz" - .align 2 gUnknown_8E7BBB8:: @ 8E7BB88 .incbin "baserom.gba", 0xE7BB88, 0x400 @UNKNOWN @@ -13756,7 +13754,6 @@ gFile_graphics_battle_anims_sprites_277_palette:: @ 8E7EDD8 gFile_graphics_battle_anims_sprites_277_sheet:: @ 8E7EE00 .incbin "graphics/battle_anims/sprites/277.4bpp.lz" - .align 2 gFile_graphics_battle_anims_backgrounds_fog_tilemap:: @ 8E7F1F4 .incbin "graphics/battle_anims/backgrounds/fog.bin.lz" -- cgit v1.2.3 From b9a6cba30a3ee44ccb14548d198accd7f6bbfa8d Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Fri, 30 Nov 2018 16:51:22 -0500 Subject: Finish decomp of mevent_server --- asm/mevent_server.s | 740 ------------------------------------------------ data/data_8466FB8.s | 12 - include/mevent.h | 9 + include/script.h | 1 + ld_script.txt | 1 - src/mevent.c | 4 +- src/mevent_server.c | 241 ++++++++++++++-- src/mevent_server_ish.c | 43 ++- 8 files changed, 257 insertions(+), 794 deletions(-) delete mode 100644 asm/mevent_server.s diff --git a/asm/mevent_server.s b/asm/mevent_server.s deleted file mode 100644 index 1bcc5deed..000000000 --- a/asm/mevent_server.s +++ /dev/null @@ -1,740 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .syntax unified - - .text - - thumb_func_start sub_814505C -sub_814505C: @ 814505C - push {lr} - cmp r0, 0 - bne _08145064 - adds r0, r1, 0 -_08145064: - pop {r1} - bx r1 - thumb_func_end sub_814505C - - thumb_func_start sub_8145068 -sub_8145068: @ 8145068 - push {lr} - cmp r1, r0 - bcs _08145072 - movs r0, 0 - b _0814507C -_08145072: - cmp r1, r0 - beq _0814507A - movs r0, 0x2 - b _0814507C -_0814507A: - movs r0, 0x1 -_0814507C: - pop {r1} - bx r1 - thumb_func_end sub_8145068 - - thumb_func_start sub_8145080 -sub_8145080: @ 8145080 - movs r1, 0x4 - str r1, [r0, 0x8] - movs r0, 0 - bx lr - thumb_func_end sub_8145080 - - thumb_func_start sub_8145088 -sub_8145088: @ 8145088 - movs r0, 0x3 - bx lr - thumb_func_end sub_8145088 - - thumb_func_start sub_814508C -sub_814508C: @ 814508C - push {r4,lr} - adds r4, r0, 0 - adds r0, 0x38 - bl sub_8144844 - cmp r0, 0 - beq _0814509E - movs r0, 0x4 - str r0, [r4, 0x8] -_0814509E: - movs r0, 0x1 - pop {r4} - pop {r1} - bx r1 - thumb_func_end sub_814508C - - thumb_func_start sub_81450A8 -sub_81450A8: @ 81450A8 - push {r4,lr} - adds r4, r0, 0 - adds r0, 0x38 - bl sub_8144850 - cmp r0, 0 - beq _081450BA - movs r0, 0x4 - str r0, [r4, 0x8] -_081450BA: - movs r0, 0x1 - pop {r4} - pop {r1} - bx r1 - thumb_func_end sub_81450A8 - - thumb_func_start sub_81450C4 -sub_81450C4: @ 81450C4 - push {r4,r5,lr} - adds r5, r0, 0 - ldr r0, [r5, 0xC] - lsls r1, r0, 1 - adds r1, r0 - lsls r1, 2 - ldr r2, [r5, 0x10] - adds r4, r2, r1 - adds r0, 0x1 - str r0, [r5, 0xC] - ldr r0, [r4] - cmp r0, 0x1D - bls _081450E0 - b _081455F8 -_081450E0: - lsls r0, 2 - ldr r1, _081450EC @ =_081450F0 - adds r0, r1 - ldr r0, [r0] - mov pc, r0 - .align 2, 0 -_081450EC: .4byte _081450F0 - .align 2, 0 -_081450F0: - .4byte _08145168 - .4byte _08145190 - .4byte _08145196 - .4byte _081451C4 - .4byte _08145268 - .4byte _081451E4 - .4byte _08145228 - .4byte _0814527C - .4byte _081452AC - .4byte _081452EC - .4byte _08145320 - .4byte _08145350 - .4byte _08145378 - .4byte _081453D8 - .4byte _081453A4 - .4byte _08145440 - .4byte _0814540C - .4byte _081454AA - .4byte _08145458 - .4byte _08145470 - .4byte _0814549C - .4byte _08145510 - .4byte _081454B8 - .4byte _081454E4 - .4byte _08145538 - .4byte _08145542 - .4byte _0814554C - .4byte _08145588 - .4byte _081455C0 - .4byte _081455EC -_08145168: - ldr r0, [r4, 0x8] - cmp r0, 0 - beq _0814517C - ldr r0, _08145188 @ =gUnknown_8466F80 "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/mevent_server.c" - movs r1, 0xB1 - lsls r1, 1 - ldr r2, _0814518C @ =gUnknown_8466FD4 "cmd->parameter == NULL" - movs r3, 0x1 - bl AGBAssert -_0814517C: - movs r0, 0x1 - str r0, [r5, 0x8] - ldr r0, [r4, 0x4] - str r0, [r5, 0x4] - b _081455F8 - .align 2, 0 -_08145188: .4byte gUnknown_8466F80 -_0814518C: .4byte gUnknown_8466FD4 -_08145190: - movs r0, 0x3 - str r0, [r5, 0x8] - b _081455F8 -_08145196: - ldr r0, [r4, 0x8] - cmp r0, 0 - beq _081451AA - ldr r0, _081451BC @ =gUnknown_8466F80 "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/mevent_server.c" - movs r1, 0xB6 - lsls r1, 1 - ldr r2, _081451C0 @ =gUnknown_8466FD4 "cmd->parameter == NULL" - movs r3, 0x1 - bl AGBAssert -_081451AA: - adds r0, r5, 0 - adds r0, 0x38 - ldr r1, [r4, 0x4] - ldr r2, [r5, 0x14] - bl sub_81448AC - movs r0, 0x2 - str r0, [r5, 0x8] - b _081455F8 - .align 2, 0 -_081451BC: .4byte gUnknown_8466F80 -_081451C0: .4byte gUnknown_8466FD4 -_081451C4: - ldr r0, [r4, 0x4] - cmp r0, 0 - beq _08145272 - ldr r0, _081451DC @ =gUnknown_8466F80 "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/mevent_server.c" - movs r1, 0xB9 - lsls r1, 1 - ldr r2, _081451E0 @ =gUnknown_8466FEC "cmd->flag == FALSE" - movs r3, 0x1 - bl AGBAssert - b _08145272 - .align 2, 0 -_081451DC: .4byte gUnknown_8466F80 -_081451E0: .4byte gUnknown_8466FEC -_081451E4: - ldr r0, [r4, 0x4] - cmp r0, 0 - beq _081451F8 - ldr r0, _08145218 @ =gUnknown_8466F80 "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/mevent_server.c" - movs r1, 0xBC - lsls r1, 1 - ldr r2, _0814521C @ =gUnknown_8466FEC "cmd->flag == FALSE" - movs r3, 0x1 - bl AGBAssert -_081451F8: - ldr r0, [r4, 0x8] - cmp r0, 0 - beq _0814520A - ldr r0, _08145218 @ =gUnknown_8466F80 "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/mevent_server.c" - ldr r1, _08145220 @ =0x00000179 - ldr r2, _08145224 @ =gUnknown_8466FD4 "cmd->parameter == NULL" - movs r3, 0x1 - bl AGBAssert -_0814520A: - ldr r0, [r5, 0x20] - ldr r1, [r5, 0x14] - movs r2, 0x64 - bl memcpy - b _081455F8 - .align 2, 0 -_08145218: .4byte gUnknown_8466F80 -_0814521C: .4byte gUnknown_8466FEC -_08145220: .4byte 0x00000179 -_08145224: .4byte gUnknown_8466FD4 -_08145228: - ldr r0, [r4, 0x4] - cmp r0, 0 - beq _0814523C - ldr r0, _08145258 @ =gUnknown_8466F80 "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/mevent_server.c" - movs r1, 0xBF - lsls r1, 1 - ldr r2, _0814525C @ =gUnknown_8466FEC "cmd->flag == FALSE" - movs r3, 0x1 - bl AGBAssert -_0814523C: - ldr r0, [r4, 0x8] - cmp r0, 0 - beq _0814524E - ldr r0, _08145258 @ =gUnknown_8466F80 "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/mevent_server.c" - ldr r1, _08145260 @ =0x0000017f - ldr r2, _08145264 @ =gUnknown_8466FD4 "cmd->parameter == NULL" - movs r3, 0x1 - bl AGBAssert -_0814524E: - ldr r0, [r5, 0x20] - bl sub_81443D4 - str r0, [r5, 0x4] - b _081455F8 - .align 2, 0 -_08145258: .4byte gUnknown_8466F80 -_0814525C: .4byte gUnknown_8466FEC -_08145260: .4byte 0x0000017f -_08145264: .4byte gUnknown_8466FD4 -_08145268: - ldr r1, [r5, 0x4] - ldr r0, [r4, 0x4] - cmp r1, r0 - beq _08145272 - b _081455F8 -_08145272: - movs r0, 0 - str r0, [r5, 0xC] - ldr r0, [r4, 0x8] - str r0, [r5, 0x10] - b _081455F8 -_0814527C: - ldr r0, [r4, 0x4] - cmp r0, 0 - beq _08145290 - ldr r0, _081452A4 @ =gUnknown_8466F80 "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/mevent_server.c" - movs r1, 0xC6 - lsls r1, 1 - ldr r2, _081452A8 @ =gUnknown_8466FEC "cmd->flag == FALSE" - movs r3, 0x1 - bl AGBAssert -_08145290: - ldr r0, [r4, 0x8] - ldr r1, [r5, 0x18] - bl sub_814505C - adds r2, r0, 0 - ldr r1, [r5, 0x20] - bl sub_8144418 - str r0, [r5, 0x4] - b _081455F8 - .align 2, 0 -_081452A4: .4byte gUnknown_8466F80 -_081452A8: .4byte gUnknown_8466FEC -_081452AC: - ldr r0, [r4, 0x4] - cmp r0, 0 - beq _081452C0 - ldr r0, _081452DC @ =gUnknown_8466F80 "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/mevent_server.c" - movs r1, 0xC9 - lsls r1, 1 - ldr r2, _081452E0 @ =gUnknown_8466FEC "cmd->flag == FALSE" - movs r3, 0x1 - bl AGBAssert -_081452C0: - ldr r0, [r4, 0x8] - cmp r0, 0 - beq _081452D2 - ldr r0, _081452DC @ =gUnknown_8466F80 "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/mevent_server.c" - ldr r1, _081452E4 @ =0x00000193 - ldr r2, _081452E8 @ =gUnknown_8466FD4 "cmd->parameter == NULL" - movs r3, 0x1 - bl AGBAssert -_081452D2: - ldr r0, [r5, 0x14] - ldr r0, [r0] - str r0, [r5, 0x4] - b _081455F8 - .align 2, 0 -_081452DC: .4byte gUnknown_8466F80 -_081452E0: .4byte gUnknown_8466FEC -_081452E4: .4byte 0x00000193 -_081452E8: .4byte gUnknown_8466FD4 -_081452EC: - ldr r0, [r4, 0x4] - cmp r0, 0 - beq _08145300 - ldr r0, _08145318 @ =gUnknown_8466F80 "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/mevent_server.c" - movs r1, 0xCC - lsls r1, 1 - ldr r2, _0814531C @ =gUnknown_8466FEC "cmd->flag == FALSE" - movs r3, 0x1 - bl AGBAssert -_08145300: - ldr r0, [r4, 0x8] - adds r1, r5, 0 - adds r1, 0x34 - bl sub_814505C - adds r2, r0, 0 - ldr r1, [r5, 0x20] - bl sub_8144434 - str r0, [r5, 0x4] - b _081455F8 - .align 2, 0 -_08145318: .4byte gUnknown_8466F80 -_0814531C: .4byte gUnknown_8466FEC -_08145320: - ldr r0, [r4, 0x8] - cmp r0, 0 - beq _08145332 - ldr r0, _08145344 @ =gUnknown_8466F80 "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/mevent_server.c" - ldr r1, _08145348 @ =0x0000019f - ldr r2, _0814534C @ =gUnknown_8466FD4 "cmd->parameter == NULL" - movs r3, 0x1 - bl AGBAssert -_08145332: - ldr r0, [r5, 0x20] - ldr r1, [r4, 0x4] - bl sub_81444B0 - lsls r0, 16 - lsrs r0, 16 - str r0, [r5, 0x4] - b _081455F8 - .align 2, 0 -_08145344: .4byte gUnknown_8466F80 -_08145348: .4byte 0x0000019f -_0814534C: .4byte gUnknown_8466FD4 -_08145350: - ldr r0, [r4, 0x4] - cmp r0, 0 - beq _08145364 - ldr r0, _08145370 @ =gUnknown_8466F80 "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/mevent_server.c" - movs r1, 0xD2 - lsls r1, 1 - ldr r2, _08145374 @ =gUnknown_8466FEC "cmd->flag == FALSE" - movs r3, 0x1 - bl AGBAssert -_08145364: - ldr r0, [r5, 0x20] - ldr r1, [r4, 0x8] - bl sub_8144474 - str r0, [r5, 0x4] - b _081455F8 - .align 2, 0 -_08145370: .4byte gUnknown_8466F80 -_08145374: .4byte gUnknown_8466FEC -_08145378: - ldr r0, [r4, 0x4] - cmp r0, 0 - beq _0814538C - ldr r0, _0814539C @ =gUnknown_8466F80 "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/mevent_server.c" - movs r1, 0xD5 - lsls r1, 1 - ldr r2, _081453A0 @ =gUnknown_8466FEC "cmd->flag == FALSE" - movs r3, 0x1 - bl AGBAssert -_0814538C: - ldr r0, [r4, 0x8] - ldr r1, [r5, 0x14] - ldr r1, [r1] - bl sub_8145068 - str r0, [r5, 0x4] - b _081455F8 - .align 2, 0 -_0814539C: .4byte gUnknown_8466F80 -_081453A0: .4byte gUnknown_8466FEC -_081453A4: - ldr r0, [r4, 0x4] - cmp r0, 0 - beq _081453B8 - ldr r0, _081453D0 @ =gUnknown_8466F80 "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/mevent_server.c" - movs r1, 0xD8 - lsls r1, 1 - ldr r2, _081453D4 @ =gUnknown_8466FEC "cmd->flag == FALSE" - movs r3, 0x1 - bl AGBAssert -_081453B8: - ldr r0, [r4, 0x8] - ldr r1, [r5, 0x1C] - bl sub_814505C - adds r2, r0, 0 - movs r3, 0xDE - lsls r3, 1 - adds r0, r5, 0 - movs r1, 0x17 - bl sub_814501C - b _081455F8 - .align 2, 0 -_081453D0: .4byte gUnknown_8466F80 -_081453D4: .4byte gUnknown_8466FEC -_081453D8: - ldr r0, [r4, 0x4] - cmp r0, 0 - beq _081453EC - ldr r0, _08145404 @ =gUnknown_8466F80 "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/mevent_server.c" - movs r1, 0xDB - lsls r1, 1 - ldr r2, _08145408 @ =gUnknown_8466FEC "cmd->flag == FALSE" - movs r3, 0x1 - bl AGBAssert -_081453EC: - ldr r0, [r4, 0x8] - ldr r1, [r5, 0x18] - bl sub_814505C - adds r2, r0, 0 - movs r3, 0xA6 - lsls r3, 1 - adds r0, r5, 0 - movs r1, 0x16 - bl sub_814501C - b _081455F8 - .align 2, 0 -_08145404: .4byte gUnknown_8466F80 -_08145408: .4byte gUnknown_8466FEC -_0814540C: - ldr r0, [r4, 0x4] - cmp r0, 0 - beq _08145420 - ldr r0, _08145438 @ =gUnknown_8466F80 "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/mevent_server.c" - movs r1, 0xDE - lsls r1, 1 - ldr r2, _0814543C @ =gUnknown_8466FEC "cmd->flag == FALSE" - movs r3, 0x1 - bl AGBAssert -_08145420: - ldr r0, [r4, 0x8] - adds r1, r5, 0 - adds r1, 0x34 - bl sub_814505C - adds r2, r0, 0 - adds r0, r5, 0 - movs r1, 0x18 - movs r3, 0x4 - bl sub_814501C - b _081455F8 - .align 2, 0 -_08145438: .4byte gUnknown_8466F80 -_0814543C: .4byte gUnknown_8466FEC -_08145440: - ldr r2, [r4, 0x8] - cmp r2, 0 - bne _0814544C - ldr r2, [r5, 0x24] - ldr r3, [r5, 0x28] - b _0814544E -_0814544C: - ldr r3, [r4, 0x4] -_0814544E: - adds r0, r5, 0 - movs r1, 0x19 - bl sub_814501C - b _081455F8 -_08145458: - ldr r2, [r4, 0x8] - cmp r2, 0 - bne _08145464 - ldr r2, [r5, 0x2C] - ldr r3, [r5, 0x30] - b _08145466 -_08145464: - ldr r3, [r4, 0x4] -_08145466: - adds r0, r5, 0 - movs r1, 0x10 - bl sub_814501C - b _081455F8 -_08145470: - ldr r0, [r4, 0x4] - cmp r0, 0 - beq _08145484 - ldr r0, _08145494 @ =gUnknown_8466F80 "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/mevent_server.c" - movs r1, 0xE9 - lsls r1, 1 - ldr r2, _08145498 @ =gUnknown_8466FEC "cmd->flag == FALSE" - movs r3, 0x1 - bl AGBAssert -_08145484: - ldr r2, [r4, 0x8] - adds r0, r5, 0 - movs r1, 0x1A - movs r3, 0xBC - bl sub_814501C - b _081455F8 - .align 2, 0 -_08145494: .4byte gUnknown_8466F80 -_08145498: .4byte gUnknown_8466FEC -_0814549C: - ldr r2, [r4, 0x8] - ldr r3, [r4, 0x4] - adds r0, r5, 0 - movs r1, 0x15 - bl sub_814501C - b _081455F8 -_081454AA: - ldr r2, [r4, 0x8] - ldr r3, [r4, 0x4] - adds r0, r5, 0 - movs r1, 0x1C - bl sub_814501C - b _081455F8 -_081454B8: - ldr r0, [r4, 0x4] - cmp r0, 0 - beq _081454CA - ldr r0, _081454D8 @ =gUnknown_8466F80 "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/mevent_server.c" - ldr r1, _081454DC @ =0x000001e1 - ldr r2, _081454E0 @ =gUnknown_8466FEC "cmd->flag == FALSE" - movs r3, 0x1 - bl AGBAssert -_081454CA: - ldr r0, [r5, 0x18] - ldr r1, [r4, 0x8] - movs r2, 0xA6 - lsls r2, 1 - bl memcpy - b _081455F8 - .align 2, 0 -_081454D8: .4byte gUnknown_8466F80 -_081454DC: .4byte 0x000001e1 -_081454E0: .4byte gUnknown_8466FEC -_081454E4: - ldr r0, [r4, 0x4] - cmp r0, 0 - beq _081454F8 - ldr r0, _08145508 @ =gUnknown_8466F80 "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/mevent_server.c" - movs r1, 0xF3 - lsls r1, 1 - ldr r2, _0814550C @ =gUnknown_8466FEC "cmd->flag == FALSE" - movs r3, 0x1 - bl AGBAssert -_081454F8: - ldr r0, [r5, 0x1C] - ldr r1, [r4, 0x8] - movs r2, 0xDE - lsls r2, 1 - bl memcpy - b _081455F8 - .align 2, 0 -_08145508: .4byte gUnknown_8466F80 -_0814550C: .4byte gUnknown_8466FEC -_08145510: - ldr r0, [r4, 0x4] - cmp r0, 0 - beq _08145522 - ldr r0, _0814552C @ =gUnknown_8466F80 "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/mevent_server.c" - ldr r1, _08145530 @ =0x000001eb - ldr r2, _08145534 @ =gUnknown_8466FEC "cmd->flag == FALSE" - movs r3, 0x1 - bl AGBAssert -_08145522: - ldr r0, [r4, 0x8] - ldr r0, [r0] - str r0, [r5, 0x34] - b _081455F8 - .align 2, 0 -_0814552C: .4byte gUnknown_8466F80 -_08145530: .4byte 0x000001eb -_08145534: .4byte gUnknown_8466FEC -_08145538: - ldr r0, [r4, 0x8] - str r0, [r5, 0x24] - ldr r0, [r4, 0x4] - str r0, [r5, 0x28] - b _081455F8 -_08145542: - ldr r0, [r4, 0x8] - str r0, [r5, 0x2C] - ldr r0, [r4, 0x4] - str r0, [r5, 0x30] - b _081455F8 -_0814554C: - ldr r0, [r4, 0x4] - cmp r0, 0 - bne _08145558 - ldr r0, [r4, 0x8] - cmp r0, 0 - beq _08145566 -_08145558: - ldr r0, _08145580 @ =gUnknown_8466F80 "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/mevent_server.c" - movs r1, 0xFD - lsls r1, 1 - ldr r2, _08145584 @ =gUnknown_8467000 "cmd->flag == FALSE && cmd->parameter == NULL" - movs r3, 0x1 - bl AGBAssert -_08145566: - ldr r4, [r5, 0x18] - bl sav1_get_mevent_buffer_1 - adds r1, r0, 0 - movs r2, 0xA6 - lsls r2, 1 - adds r0, r4, 0 - bl memcpy - ldr r0, [r5, 0x18] - bl sub_814410C - b _081455F8 - .align 2, 0 -_08145580: .4byte gUnknown_8466F80 -_08145584: .4byte gUnknown_8467000 -_08145588: - ldr r0, [r4, 0x4] - cmp r0, 0 - bne _08145594 - ldr r0, [r4, 0x8] - cmp r0, 0 - beq _081455A2 -_08145594: - ldr r0, _081455B8 @ =gUnknown_8466F80 "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/mevent_server.c" - movs r1, 0x80 - lsls r1, 2 - ldr r2, _081455BC @ =gUnknown_8467000 "cmd->flag == FALSE && cmd->parameter == NULL" - movs r3, 0x1 - bl AGBAssert -_081455A2: - ldr r4, [r5, 0x1C] - bl sub_8143D58 - adds r1, r0, 0 - movs r2, 0xDE - lsls r2, 1 - adds r0, r4, 0 - bl memcpy - b _081455F8 - .align 2, 0 -_081455B8: .4byte gUnknown_8466F80 -_081455BC: .4byte gUnknown_8467000 -_081455C0: - ldr r0, [r4, 0x4] - cmp r0, 0 - bne _081455CC - ldr r0, [r4, 0x8] - cmp r0, 0 - beq _081455D8 -_081455CC: - ldr r0, _081455E0 @ =gUnknown_8466F80 "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/mevent_server.c" - ldr r1, _081455E4 @ =0x00000205 - ldr r2, _081455E8 @ =gUnknown_8467000 "cmd->flag == FALSE && cmd->parameter == NULL" - movs r3, 0x1 - bl AGBAssert -_081455D8: - bl sub_8069E48 - str r0, [r5, 0x24] - b _081455F8 - .align 2, 0 -_081455E0: .4byte gUnknown_8466F80 -_081455E4: .4byte 0x00000205 -_081455E8: .4byte gUnknown_8467000 -_081455EC: - ldr r2, [r4, 0x8] - ldr r3, [r4, 0x4] - adds r0, r5, 0 - movs r1, 0x1B - bl sub_814501C -_081455F8: - movs r0, 0x1 - pop {r4,r5} - pop {r1} - bx r1 - thumb_func_end sub_81450C4 - - thumb_func_start sub_8145600 -sub_8145600: @ 8145600 - push {r4,r5,lr} - adds r4, r0, 0 - ldr r0, [r4, 0x8] - cmp r0, 0x4 - bls _08145616 - ldr r0, _08145644 @ =gUnknown_8466F80 "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/mevent_server.c" - ldr r1, _08145648 @ =0x00000222 - ldr r2, _0814564C @ =gUnknown_8467044 "svr->mainseqno < NELEMS(func_tbl)" - movs r3, 0x1 - bl AGBAssert -_08145616: - ldr r1, _08145650 @ =func_tbl - ldr r0, [r4, 0x8] - lsls r0, 2 - adds r0, r1 - ldr r1, [r0] - adds r0, r4, 0 - bl _call_via_r1 - adds r5, r0, 0 - ldr r0, [r4, 0x8] - cmp r0, 0x4 - bls _0814563C - ldr r0, _08145644 @ =gUnknown_8466F80 "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/mevent_server.c" - movs r1, 0x89 - lsls r1, 2 - ldr r2, _0814564C @ =gUnknown_8467044 "svr->mainseqno < NELEMS(func_tbl)" - movs r3, 0x1 - bl AGBAssert -_0814563C: - adds r0, r5, 0 - pop {r4,r5} - pop {r1} - bx r1 - .align 2, 0 -_08145644: .4byte gUnknown_8466F80 -_08145648: .4byte 0x00000222 -_0814564C: .4byte gUnknown_8467044 -_08145650: .4byte func_tbl - thumb_func_end sub_8145600 - - .align 2, 0 @ Don't pad with nop. diff --git a/data/data_8466FB8.s b/data/data_8466FB8.s index c34887d86..0ca0bcbf3 100644 --- a/data/data_8466FB8.s +++ b/data/data_8466FB8.s @@ -1,17 +1,5 @@ .section .rodata - .align 2 -func_tbl:: @ 8467030 - .4byte sub_8145080 - .4byte sub_8145088 - .4byte sub_814508C - .4byte sub_81450A8 - .4byte sub_81450C4 - - .align 2 -gUnknown_8467044:: @ 8467044 - .asciz "svr->mainseqno < NELEMS(func_tbl)" - .align 2 gUnknown_8467068:: @ 8467068 .incbin "baserom.gba", 0x467068, 0x8 diff --git a/include/mevent.h b/include/mevent.h index 1744bb524..d940b212c 100644 --- a/include/mevent.h +++ b/include/mevent.h @@ -33,12 +33,21 @@ struct MEvent_Str_2 u8 fill_00[0x40]; }; +struct MEventBuffer_3120_Sub * sub_8143D58(void); +struct MEventBuffer_32E0_Sub * sav1_get_mevent_buffer_1(void); +struct MEventBuffer_3430_Sub * sav1_get_mevent_buffer_2(void); struct MysteryEventStruct * sub_8143D94(void); bool32 sub_8143DC8(const struct MEventBuffer_3120_Sub * src); bool32 sub_8143E1C(void); bool32 sub_8143EF4(const u8 * src); bool32 sub_8143F68(const struct MEventBuffer_32E0_Sub * data); +void sub_814410C(struct MEventBuffer_32E0_Sub * buffer); bool32 sub_8144254(const u16 * data); void sub_81442CC(struct MEventStruct_Unk1442CC * data); +bool32 sub_81443D4(const struct MEventStruct_Unk1442CC * data); +u32 sub_8144418(const u16 * a0, const struct MEventStruct_Unk1442CC * a1, void * unused); +u32 sub_8144434(const u16 * a0, const struct MEventStruct_Unk1442CC * a1, void * unused); +bool32 sub_8144474(const struct MEventStruct_Unk1442CC * a0, const u16 * a1); +u16 sub_81444B0(const struct MEventStruct_Unk1442CC * a0, u32 command); #endif //GUARD_MEVENT_H diff --git a/include/script.h b/include/script.h index b718af4c1..ebb4caa86 100644 --- a/include/script.h +++ b/include/script.h @@ -64,5 +64,6 @@ u8 *sub_8099244(void); void sub_80992A0(u8 *script, u16 scriptSize); bool32 sub_8069DFC(void); void sub_8069EA4(u8 * script, u16 scriptSize); +u8 * sub_8069E48(void); #endif // GUARD_SCRIPT_H diff --git a/ld_script.txt b/ld_script.txt index 19d8a5862..04be16a01 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -247,7 +247,6 @@ SECTIONS { src/mevent_server_sub.o(.text); src/mevent_server_ish.o(.text); src/mevent_server.o(.text); - asm/mevent_server.o(.text); asm/mevent_8145654.o(.text); src/menews_jisan.o(.text); asm/seagallop.o(.text); diff --git a/src/mevent.c b/src/mevent.c index 9638e0327..7a7fcc399 100644 --- a/src/mevent.c +++ b/src/mevent.c @@ -792,7 +792,7 @@ bool32 sub_81443D4(const struct MEventStruct_Unk1442CC * data) return TRUE; } -u32 sub_8144418(const u16 * a0, const struct MEventStruct_Unk1442CC * a1) +u32 sub_8144418(const u16 * a0, const struct MEventStruct_Unk1442CC * a1, void * unused) { if (a1->unk_14 == 0) return 0; @@ -801,7 +801,7 @@ u32 sub_8144418(const u16 * a0, const struct MEventStruct_Unk1442CC * a1) return 2; } -u32 sub_8144434(const u16 * a0, const struct MEventStruct_Unk1442CC * a1) +u32 sub_8144434(const u16 * a0, const struct MEventStruct_Unk1442CC * a1, void * unused) { s32 r4 = a1->unk_44 - sub_8144184(&a1->unk_20, a1->unk_44); if (r4 == 0) diff --git a/src/mevent_server.c b/src/mevent_server.c index 027a7e994..2242dabce 100644 --- a/src/mevent_server.c +++ b/src/mevent_server.c @@ -13,18 +13,29 @@ extern u16 gBlockRecvBuffer[][128]; +struct mevent_cmd +{ + u32 instr; + bool32 flag; + void * parameter; +}; + struct mevent_srv_common { u32 unk_00; u32 unk_04; u32 mainseqno; - u32 unk_0C; - const void * unk_10; + u32 cmdidx; + const struct mevent_cmd * cmdBuffer; void * unk_14; - void * unk_18; - void * unk_1C; - void * unk_20; - u8 filler_24[0x14]; + struct MEventBuffer_32E0_Sub * unk_18; + struct MEventBuffer_3120_Sub * unk_1C; + struct MEventStruct_Unk1442CC * unk_20; + void * unk_24; + u32 unk_28; + void * unk_2C; + u32 unk_30; + void * unk_34; struct mevent_srv_sub unk_38; }; @@ -73,8 +84,8 @@ void mevent_srv_init_common(struct mevent_srv_common * svr, const void * a1, u32 svr->unk_1C = AllocZeroed(444); svr->unk_14 = AllocZeroed(ME_SEND_BUF_SIZE); svr->unk_20 = AllocZeroed(100); - svr->unk_10 = a1; - svr->unk_0C = 0; + svr->cmdBuffer = a1; + svr->cmdidx = 0; sub_814485C(&svr->unk_38, a2, a3); } @@ -86,15 +97,213 @@ void mevent_srv_free_resources(struct mevent_srv_common * svr) Free(svr->unk_20); } -const char gUnknown_8466F80[] = "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/mevent_server.c"; -const char gUnknown_8466FB8[] = "size <= ME_SEND_BUF_SIZE"; -const char gUnknown_8466FD4[] = "cmd->parameter == NULL"; -const char gUnknown_8466FEC[] = "cmd->flag == FALSE"; -const char gUnknown_8467000[] = "cmd->flag == FALSE && cmd->parameter == NULL"; - void sub_814501C(struct mevent_srv_common * svr, u32 a1, void * a2, u32 size) { - // AGB_ASSERT_EX(size <= ME_SEND_BUF_SIZE, "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/mevent_server.c", 257); - size <= ME_SEND_BUF_SIZE ? NULL : AGBAssert(gUnknown_8466F80, 257, gUnknown_8466FB8, 1); + AGB_ASSERT_EX(size <= ME_SEND_BUF_SIZE, "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/mevent_server.c", 257); sub_8144888(&svr->unk_38, a1, a2, size); } + +void * sub_814505C(void * a0, void * a1) +{ + if (a0 != NULL) + return a0; + else + return a1; +} + +u32 sub_8145068(void * a0, void * a1) +{ + if (a1 < a0) + return 0; + else if (a1 == a0) + return 1; + else + return 2; +} + +u32 sub_8145080(struct mevent_srv_common * svr) +{ + svr->mainseqno = 4; + return 0; +} + +u32 sub_8145088(struct mevent_srv_common * svr) +{ + return 3; +} + +u32 sub_814508C(struct mevent_srv_common * svr) +{ + if (sub_8144844(&svr->unk_38)) + svr->mainseqno = 4; + return 1; +} + +u32 sub_81450A8(struct mevent_srv_common * svr) +{ + if (sub_8144850(&svr->unk_38)) + svr->mainseqno = 4; + return 1; +} + +u32 sub_81450C4(struct mevent_srv_common * svr) +{ + const struct mevent_cmd * cmd = &svr->cmdBuffer[svr->cmdidx]; + void * ptr; + svr->cmdidx++; + + switch (cmd->instr) + { + case 0: + AGB_ASSERT_EX(cmd->parameter == NULL, "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/mevent_server.c", 354); + svr->mainseqno = 1; + svr->unk_04 = cmd->flag; + break; + case 1: + svr->mainseqno = 3; + break; + case 2: + AGB_ASSERT_EX(cmd->parameter == NULL, "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/mevent_server.c", 364); + sub_81448AC(&svr->unk_38, cmd->flag, svr->unk_14); + svr->mainseqno = 2; + break; + case 3: + AGB_ASSERT_EX(cmd->flag == FALSE, "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/mevent_server.c", 370); + svr->cmdidx = 0; + svr->cmdBuffer = cmd->parameter; + break; + case 5: + AGB_ASSERT_EX(cmd->flag == FALSE, "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/mevent_server.c", 376); + AGB_ASSERT_EX(cmd->parameter == NULL, "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/mevent_server.c", 377); + memcpy(svr->unk_20, svr->unk_14, 100); + break; + case 6: + AGB_ASSERT_EX(cmd->flag == FALSE, "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/mevent_server.c", 382); + AGB_ASSERT_EX(cmd->parameter == NULL, "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/mevent_server.c", 383); + svr->unk_04 = sub_81443D4(svr->unk_20); + break; + case 4: + if (svr->unk_04 == cmd->flag) + { + svr->cmdidx = 0; + svr->cmdBuffer = cmd->parameter; + } + break; + case 7: + AGB_ASSERT_EX(cmd->flag == FALSE, "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/mevent_server.c", 396); + ptr = sub_814505C(cmd->parameter, svr->unk_18); + svr->unk_04 = sub_8144418(ptr, svr->unk_20, ptr); + break; + case 8: + AGB_ASSERT_EX(cmd->flag == FALSE, "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/mevent_server.c", 402); + AGB_ASSERT_EX(cmd->parameter == NULL, "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/mevent_server.c", 403); + svr->unk_04 = *(u32 *)svr->unk_14; + break; + case 9: + AGB_ASSERT_EX(cmd->flag == FALSE, "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/mevent_server.c", 408); + ptr = sub_814505C(cmd->parameter, &svr->unk_34); + svr->unk_04 = sub_8144434(ptr, svr->unk_20, ptr); + break; + case 10: + AGB_ASSERT_EX(cmd->parameter == NULL, "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/mevent_server.c", 415); + svr->unk_04 = sub_81444B0(svr->unk_20, cmd->flag); + break; + case 11: + AGB_ASSERT_EX(cmd->flag == FALSE, "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/mevent_server.c", 420); + svr->unk_04 = sub_8144474(svr->unk_20, cmd->parameter); + break; + case 12: + AGB_ASSERT_EX(cmd->flag == FALSE, "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/mevent_server.c", 426); + svr->unk_04 = sub_8145068(cmd->parameter, *(void **)svr->unk_14); + break; + case 14: + AGB_ASSERT_EX(cmd->flag == FALSE, "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/mevent_server.c", 432); + sub_814501C(svr, 0x17, sub_814505C(cmd->parameter, svr->unk_1C), 444); + break; + case 13: + AGB_ASSERT_EX(cmd->flag == FALSE, "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/mevent_server.c", 438); + sub_814501C(svr, 0x16, sub_814505C(cmd->parameter, svr->unk_18), 332); + break; + case 16: + AGB_ASSERT_EX(cmd->flag == FALSE, "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/mevent_server.c", 444); + sub_814501C(svr, 0x18, sub_814505C(cmd->parameter, &svr->unk_34), 4); + break; + case 15: + if (cmd->parameter == NULL) + sub_814501C(svr, 0x19, svr->unk_24, svr->unk_28); + else + sub_814501C(svr, 0x19, cmd->parameter, cmd->flag); + break; + case 18: + if (cmd->parameter == NULL) + sub_814501C(svr, 0x10, svr->unk_2C, svr->unk_30); + else + sub_814501C(svr, 0x10, cmd->parameter, cmd->flag); + break; + case 19: + AGB_ASSERT_EX(cmd->flag == FALSE, "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/mevent_server.c", 466); + sub_814501C(svr, 0x1a, cmd->parameter, 188); + break; + case 20: + sub_814501C(svr, 0x15, cmd->parameter, cmd->flag); + break; + case 17: + sub_814501C(svr, 0x1c, cmd->parameter, cmd->flag); + break; + case 22: + AGB_ASSERT_EX(cmd->flag == FALSE, "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/mevent_server.c", 481); + memcpy(svr->unk_18, cmd->parameter, 332); + break; + case 23: + AGB_ASSERT_EX(cmd->flag == FALSE, "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/mevent_server.c", 486); + memcpy(svr->unk_1C, cmd->parameter, 444); + break; + case 21: + AGB_ASSERT_EX(cmd->flag == FALSE, "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/mevent_server.c", 491); + svr->unk_34 = *(void **)cmd->parameter; + break; + case 24: + svr->unk_24 = cmd->parameter; + svr->unk_28 = cmd->flag; + break; + case 25: + svr->unk_2C = cmd->parameter; + svr->unk_30 = cmd->flag; + break; + case 26: + AGB_ASSERT_EX(cmd->flag == FALSE && cmd->parameter == NULL, "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/mevent_server.c", 506); + memcpy(svr->unk_18, sav1_get_mevent_buffer_1(), 332); + sub_814410C(svr->unk_18); + break; + case 27: + AGB_ASSERT_EX(cmd->flag == FALSE && cmd->parameter == NULL, "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/mevent_server.c", 512); + memcpy(svr->unk_1C, sub_8143D58(), 444); + break; + case 28: + AGB_ASSERT_EX(cmd->flag == FALSE && cmd->parameter == NULL, "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/mevent_server.c", 517); + svr->unk_24 = sub_8069E48(); + break; + case 29: + sub_814501C(svr, 0x1b, cmd->parameter, cmd->flag); + break; + } + + return 1; +} + +static u32 (*const func_tbl[])(struct mevent_srv_common *) = { + sub_8145080, + sub_8145088, + sub_814508C, + sub_81450A8, + sub_81450C4 +}; + +u32 sub_8145600(struct mevent_srv_common * svr) +{ + u32 response; + AGB_ASSERT_EX(svr->mainseqno < NELEMS(func_tbl), "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/mevent_server.c", 546); + response = func_tbl[svr->mainseqno](svr); + AGB_ASSERT_EX(svr->mainseqno < NELEMS(func_tbl), "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/mevent_server.c", 548); + return response; +} diff --git a/src/mevent_server_ish.c b/src/mevent_server_ish.c index 7e9639303..e544c0f42 100644 --- a/src/mevent_server_ish.c +++ b/src/mevent_server_ish.c @@ -13,27 +13,26 @@ extern u16 gBlockRecvBuffer[][128]; +struct mevent_cmd +{ + u32 instr; + u32 parameter; +}; + struct mevent_srv_ish { u32 unk_00; u32 unk_04; u32 mainseqno; u32 unk_0C; - u32 unk_10; + u32 cmdidx; void * unk_14; void * unk_18; - void * unk_1C; + struct mevent_cmd * cmdBuffer; void * unk_20; struct mevent_srv_sub unk_24; }; -struct mevent_cmd -{ - u32 instr; - bool32 flag; - u32 parameter; -}; - EWRAM_DATA struct mevent_srv_ish * gUnknown_203F3C0 = NULL; void mevent_srv_ish_init(struct mevent_srv_ish *, u32, u32); @@ -85,7 +84,7 @@ void mevent_srv_ish_init(struct mevent_srv_ish * svr, u32 a1, u32 a2) svr->unk_0C = 0; svr->unk_14 = AllocZeroed(ME_SEND_BUF_SIZE); svr->unk_18 = AllocZeroed(ME_SEND_BUF_SIZE); - svr->unk_1C = AllocZeroed(ME_SEND_BUF_SIZE); + svr->cmdBuffer = AllocZeroed(ME_SEND_BUF_SIZE); svr->unk_20 = AllocZeroed(0x40); sub_814485C(&svr->unk_24, a1, a2); } @@ -94,14 +93,14 @@ void sub_8144BC0(struct mevent_srv_ish * svr) { Free(svr->unk_14); Free(svr->unk_18); - Free(svr->unk_1C); + Free(svr->cmdBuffer); Free(svr->unk_20); } void sub_8144BE4(struct mevent_srv_ish * svr) { - memcpy(svr->unk_1C, svr->unk_18, ME_SEND_BUF_SIZE); - svr->unk_10 = 0; + memcpy(svr->cmdBuffer, svr->unk_18, ME_SEND_BUF_SIZE); + svr->cmdidx = 0; } void sub_8144C00(struct mevent_srv_ish * svr, u32 a1, u32 a2) @@ -111,12 +110,10 @@ void sub_8144C00(struct mevent_srv_ish * svr, u32 a1, u32 a2) sub_8144888(&svr->unk_24, a1, svr->unk_14, 4); } -// funcs in array gUnknown_8466F60 - u32 sub_8144C34(struct mevent_srv_ish * svr) { - memcpy(svr->unk_1C, gUnknown_84687E0, ME_SEND_BUF_SIZE); - svr->unk_10 = 0; + memcpy(svr->cmdBuffer, gUnknown_84687E0, ME_SEND_BUF_SIZE); + svr->cmdidx = 0; svr->mainseqno = 4; svr->unk_0C = 0; return 0; @@ -149,19 +146,19 @@ u32 sub_8144C80(struct mevent_srv_ish * svr) u32 sub_8144CA0(struct mevent_srv_ish * svr) { - u32 * r2 = (u32 *)svr->unk_1C + 2 * svr->unk_10; - ++svr->unk_10; - switch (r2[0]) + struct mevent_cmd * cmd = &svr->cmdBuffer[svr->cmdidx]; + ++svr->cmdidx; + switch (cmd->instr) { case 0: break; case 1: - svr->unk_04 = r2[1]; + svr->unk_04 = cmd->parameter; svr->mainseqno = 1; svr->unk_0C = 0; break; case 2: - sub_81448AC(&svr->unk_24, r2[1], svr->unk_18); + sub_81448AC(&svr->unk_24, cmd->parameter, svr->unk_18); svr->mainseqno = 2; svr->unk_0C = 0; break; @@ -175,7 +172,7 @@ u32 sub_8144CA0(struct mevent_srv_ish * svr) svr->unk_0C = 0; break; case 19: - sub_8144C00(svr, 0x12, GetGameStat(r2[1])); + sub_8144C00(svr, 0x12, GetGameStat(cmd->parameter)); svr->mainseqno = 3; svr->unk_0C = 0; break; -- cgit v1.2.3 From 01aada9e93b5e132635feb214baa5d302c4f2154 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sat, 1 Dec 2018 11:24:05 -0500 Subject: merge mevent server and document mevent_server_helpers --- include/link.h | 2 +- include/mevent_server.h | 105 +++++++++++--- include/util.h | 4 +- ld_script.txt | 6 +- src/mevent_server.c | 332 ++++++++++++++++++++++++++++++++++++++------ src/mevent_server_helpers.c | 211 ++++++++++++++++++++++++++++ src/mevent_server_ish.c | 305 ---------------------------------------- src/mevent_server_sub.c | 211 ---------------------------- sym_ewram.txt | 3 +- 9 files changed, 585 insertions(+), 594 deletions(-) create mode 100644 src/mevent_server_helpers.c delete mode 100644 src/mevent_server_ish.c delete mode 100644 src/mevent_server_sub.c diff --git a/include/link.h b/include/link.h index 39873ec11..ef8776c64 100644 --- a/include/link.h +++ b/include/link.h @@ -169,7 +169,7 @@ void sub_8007E24(void); void sub_8007E4C(void); u8 GetMultiplayerId(void); u8 bitmask_all_link_players_but_self(void); -bool8 SendBlock(u8, void *, u16); +bool8 SendBlock(u8, const void *, u16); u8 GetBlockReceivedStatus(void); void ResetBlockReceivedFlags(void); void ResetBlockReceivedFlag(u8); diff --git a/include/mevent_server.h b/include/mevent_server.h index d2d7b0687..90cb5f35d 100644 --- a/include/mevent_server.h +++ b/include/mevent_server.h @@ -7,34 +7,93 @@ struct mevent_srv_sub { - s32 unk_00; - u8 unk_04; - u8 unk_05; - u16 unk_06; - u16 unk_08; - u16 unk_0A; - u16 unk_0C; - u16 unk_0E; - u16 unk_10; - u16 unk_12; - u16 unk_14; + s32 seqno; + u8 sendPlayerNo; + u8 recvPlayerNo; + u16 recvIdent; + u16 recvCounter; + u16 recvCRC; + u16 recvSize; + u16 sendIdent; + u16 sendCounter; + u16 sendCRC; + u16 sendSize; + void * recvBfr; + const void * sendBfr; + u32 (*recvFunc)(struct mevent_srv_sub *); + u32 (*sendFunc)(struct mevent_srv_sub *); +}; + +struct send_recv_header +{ + u16 ident; + u16 crc; + u16 size; +}; + +struct mevent_cmd_ish +{ + u32 instr; + u32 parameter; +}; + +struct mevent_srv_ish +{ + u32 unk_00; + u32 unk_04; + u32 mainseqno; + u32 unk_0C; + u32 cmdidx; + void * unk_14; void * unk_18; - void * unk_1C; - u32 (*unk_20)(struct mevent_srv_sub *); - u32 (*unk_24)(struct mevent_srv_sub *); + struct mevent_cmd_ish * cmdBuffer; + void * unk_20; + struct mevent_srv_sub unk_24; }; -struct send_recv_buff +struct mevent_cmd { - u16 unk0; - u16 unk2; - u16 unk4; + u32 instr; + bool32 flag; + void * parameter; }; -u32 sub_8144844(struct mevent_srv_sub * svr); -u32 sub_8144850(struct mevent_srv_sub * svr); -void sub_814485C(struct mevent_srv_sub * svr, u32 a1, u32 a2); -void sub_8144888(struct mevent_srv_sub * svr, u32 a1, void * a2, u32 size); -void sub_81448AC(struct mevent_srv_sub * svr, u32 a1, void * a2); +struct mevent_srv_common +{ + u32 unk_00; + u32 unk_04; + u32 mainseqno; + u32 cmdidx; + const struct mevent_cmd * cmdBuffer; + void * unk_14; + struct MEventBuffer_32E0_Sub * unk_18; + struct MEventBuffer_3120_Sub * unk_1C; + struct MEventStruct_Unk1442CC * unk_20; + void * unk_24; + u32 unk_28; + void * unk_2C; + u32 unk_30; + void * unk_34; + struct mevent_srv_sub unk_38; +}; + +u32 mevent_srv_sub_recv(struct mevent_srv_sub * svr); +u32 mevent_srv_sub_send(struct mevent_srv_sub * svr); +void mevent_srv_sub_init(struct mevent_srv_sub * svr, u32 sendPlayerNo, u32 recvPlayerNo); +void mevent_srv_sub_init_send(struct mevent_srv_sub * svr, u32 ident, const void * src, u32 size); +void mevent_srv_sub_init_recv(struct mevent_srv_sub * svr, u32 ident, void * dest); + +void sub_8144AEC(void); +u32 sub_8144B0C(u16 * a0); +void sub_8144B48(void); +void * sub_8144B58(void); +void sub_8144B64(u32 a0); +void sub_8144F1C(void); +void sub_8144F40(void); +u32 sub_8144F64(u16 * a0); + +extern const u8 gUnknown_84687E0[]; +extern const u8 gUnknown_8468B6C[]; +extern const u8 gUnknown_8468BCC[]; #endif //GUARD_MEVENT_SERVER_H diff --git a/include/util.h b/include/util.h index a22cc77fa..e0034d816 100644 --- a/include/util.h +++ b/include/util.h @@ -12,8 +12,8 @@ u8 CreateInvisibleSpriteWithCallback(void (*)(struct Sprite *)); void StoreWordInTwoHalfwords(u16 *, u32); void LoadWordFromTwoHalfwords(u16 *, u32 *); int CountTrailingZeroBits(u32 value); -u16 CalcCRC16(u8 *data, s32 length); -u16 CalcCRC16WithTable(u8 *data, u32 length); +u16 CalcCRC16(const u8 *data, s32 length); +u16 CalcCRC16WithTable(const u8 *data, u32 length); u32 CalcByteArraySum(const u8* data, u32 length); #endif // GUARD_UTIL_H diff --git a/ld_script.txt b/ld_script.txt index 04be16a01..87d5fd323 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -244,8 +244,7 @@ SECTIONS { asm/mystery_gift_menu.o(.text); asm/link_rfu_4.o(.text); src/mevent.o(.text); - src/mevent_server_sub.o(.text); - src/mevent_server_ish.o(.text); + src/mevent_server_helpers.o(.text); src/mevent_server.o(.text); asm/mevent_8145654.o(.text); src/menews_jisan.o(.text); @@ -381,8 +380,7 @@ SECTIONS { src/fame_checker.o(.rodata); data/data_845FD54.o(.rodata); src/mevent.o(.rodata); - src/mevent_server_sub.o(.rodata); - src/mevent_server_ish.o(.rodata); + src/mevent_server_helpers.o(.rodata); src/mevent_server.o(.rodata); data/data_8466FB8.o(.rodata); src/menews_jisan.o(.rodata); diff --git a/src/mevent_server.c b/src/mevent_server.c index 2242dabce..2c0dcafad 100644 --- a/src/mevent_server.c +++ b/src/mevent_server.c @@ -11,42 +11,282 @@ #include "mevent.h" #include "mevent_server.h" -extern u16 gBlockRecvBuffer[][128]; +EWRAM_DATA struct mevent_srv_ish * gUnknown_203F3C0 = NULL; +EWRAM_DATA struct mevent_srv_common * gUnknown_203F3C4 = NULL; + +static void mevent_srv_ish_init(struct mevent_srv_ish *, u32, u32); +static u32 mevent_srv_ish_exec(struct mevent_srv_ish *); +static void sub_8144BC0(struct mevent_srv_ish *); +static void mevent_srv_init_common(struct mevent_srv_common *, const void *, u32, u32); +static void mevent_srv_free_resources(struct mevent_srv_common *); +static u32 sub_8145600(struct mevent_srv_common *); -struct mevent_cmd +void sub_8144AEC(void) { - u32 instr; - bool32 flag; - void * parameter; -}; + gUnknown_203F3C0 = AllocZeroed(sizeof(struct mevent_srv_ish)); + mevent_srv_ish_init(gUnknown_203F3C0, 1, 0); +} -struct mevent_srv_common -{ - u32 unk_00; - u32 unk_04; - u32 mainseqno; - u32 cmdidx; - const struct mevent_cmd * cmdBuffer; - void * unk_14; - struct MEventBuffer_32E0_Sub * unk_18; - struct MEventBuffer_3120_Sub * unk_1C; - struct MEventStruct_Unk1442CC * unk_20; - void * unk_24; - u32 unk_28; - void * unk_2C; - u32 unk_30; - void * unk_34; - struct mevent_srv_sub unk_38; -}; +u32 sub_8144B0C(u16 * a0) +{ + u32 result; + if (gUnknown_203F3C0 == NULL) + return 6; + result = mevent_srv_ish_exec(gUnknown_203F3C0); + if (result == 6) + { + *a0 = gUnknown_203F3C0->unk_04; + sub_8144BC0(gUnknown_203F3C0); + Free(gUnknown_203F3C0); + gUnknown_203F3C0 = NULL; + } + return result; +} -EWRAM_DATA struct mevent_srv_common * gUnknown_203F3C4 = NULL; +void sub_8144B48(void) +{ + gUnknown_203F3C0->unk_0C++; +} + +void * sub_8144B58(void) +{ + return gUnknown_203F3C0->unk_20; +} + +void sub_8144B64(u32 a0) +{ + gUnknown_203F3C0->unk_04 = a0; +} + +static void mevent_srv_ish_init(struct mevent_srv_ish * svr, u32 a1, u32 a2) +{ + svr->unk_00 = 0; + svr->mainseqno = 0; + svr->unk_0C = 0; + svr->unk_14 = AllocZeroed(ME_SEND_BUF_SIZE); + svr->unk_18 = AllocZeroed(ME_SEND_BUF_SIZE); + svr->cmdBuffer = AllocZeroed(ME_SEND_BUF_SIZE); + svr->unk_20 = AllocZeroed(0x40); + mevent_srv_sub_init(&svr->unk_24, a1, a2); +} + +static void sub_8144BC0(struct mevent_srv_ish * svr) +{ + Free(svr->unk_14); + Free(svr->unk_18); + Free(svr->cmdBuffer); + Free(svr->unk_20); +} + +static void sub_8144BE4(struct mevent_srv_ish * svr) +{ + memcpy(svr->cmdBuffer, svr->unk_18, ME_SEND_BUF_SIZE); + svr->cmdidx = 0; +} + +static void sub_8144C00(struct mevent_srv_ish * svr, u32 a1, u32 a2) +{ + CpuFill32(0, svr->unk_14, ME_SEND_BUF_SIZE); + *(u32 *)svr->unk_14 = a2; + mevent_srv_sub_init_send(&svr->unk_24, a1, svr->unk_14, 4); +} + +static u32 ish_mainseq_0(struct mevent_srv_ish * svr) +{ + // init + memcpy(svr->cmdBuffer, gUnknown_84687E0, ME_SEND_BUF_SIZE); + svr->cmdidx = 0; + svr->mainseqno = 4; + svr->unk_0C = 0; + return 0; +} + +static u32 ish_mainseq_1(struct mevent_srv_ish * svr) +{ + // done + return 6; +} + +static u32 ish_mainseq_2(struct mevent_srv_ish * svr) +{ + + if (mevent_srv_sub_recv(&svr->unk_24)) + { + svr->mainseqno = 4; + svr->unk_0C = 0; + } + return 1; +} + +static u32 ish_mainseq_3(struct mevent_srv_ish * svr) +{ + if (mevent_srv_sub_send(&svr->unk_24)) + { + svr->mainseqno = 4; + svr->unk_0C = 0; + } + return 1; +} + +static u32 ish_mainseq_4(struct mevent_srv_ish * svr) +{ + struct mevent_cmd_ish * cmd = &svr->cmdBuffer[svr->cmdidx]; + ++svr->cmdidx; + switch (cmd->instr) + { + case 0: + break; + case 1: + svr->unk_04 = cmd->parameter; + svr->mainseqno = 1; + svr->unk_0C = 0; + break; + case 2: + mevent_srv_sub_init_recv(&svr->unk_24, cmd->parameter, svr->unk_18); + svr->mainseqno = 2; + svr->unk_0C = 0; + break; + case 3: + svr->mainseqno = 3; + svr->unk_0C = 0; + break; + case 20: + mevent_srv_sub_init_send(&svr->unk_24, 0x14, svr->unk_14, 0); + svr->mainseqno = 3; + svr->unk_0C = 0; + break; + case 19: + sub_8144C00(svr, 0x12, GetGameStat(cmd->parameter)); + svr->mainseqno = 3; + svr->unk_0C = 0; + break; + case 6: + if (svr->unk_04 == 0) + sub_8144BE4(svr); + break; + case 7: + if (svr->unk_04 == 1) + sub_8144BE4(svr); + break; + case 4: + sub_8144BE4(svr); + break; + case 5: + memcpy(svr->unk_20, svr->unk_18, 0x40); + svr->mainseqno = 5; + svr->unk_0C = 0; + return 2; + case 11: + memcpy(svr->unk_20, svr->unk_18, 0x40); + svr->mainseqno = 5; + svr->unk_0C = 0; + return 3; + case 12: + memcpy(svr->unk_20, svr->unk_18, 0x40); + svr->mainseqno = 5; + svr->unk_0C = 0; + return 5; + case 13: + svr->mainseqno = 5; + svr->unk_0C = 0; + return 4; + case 8: + sub_81442CC(svr->unk_14); + mevent_srv_sub_init_send(&svr->unk_24, 0x11, svr->unk_14, 0x64); + break; + case 14: + sub_8144C00(svr, 0x13, svr->unk_04); + break; + case 10: + sub_8143F68(svr->unk_18); + break; + case 9: + if (!sub_8143EF4(svr->unk_18)) + { + sub_8143DC8(svr->unk_18); + sub_8144C00(svr, 0x13, 0); + } + else + sub_8144C00(svr, 0x13, 1); + break; + case 15: + svr->mainseqno = 6; + svr->unk_0C = 0; + break; + case 16: + sub_8144254(svr->unk_18); + break; + case 17: + sub_8069EA4(svr->unk_18, 1000); + break; + case 18: + memcpy(gSaveBlock2Ptr->unk_4A0, svr->unk_18, 0xbc); + sub_80E7490(); + break; + case 21: + memcpy(gDecompressionBuffer, svr->unk_18, ME_SEND_BUF_SIZE); + svr->mainseqno = 7; + svr->unk_0C = 0; + break; + } + + return 1; +} + +static u32 ish_mainseq_5(struct mevent_srv_ish * svr) +{ + if (svr->unk_0C) + { + svr->mainseqno = 4; + svr->unk_0C = 0; + } + return 1; +} + +static u32 ish_mainseq_6(struct mevent_srv_ish * svr) +{ + switch (svr->unk_0C) + { + case 0: + sub_80DA89C(svr->unk_18); + ++svr->unk_0C; + break; + case 1: + if (!sub_80DA8B0(&svr->unk_04)) + { + svr->mainseqno = 4; + svr->unk_0C = 0; + } + break; + } + return 1; +} -void mevent_srv_init_common(struct mevent_srv_common *, const void *, u32, u32); -void mevent_srv_free_resources(struct mevent_srv_common *); -u32 sub_8145600(struct mevent_srv_common *); +static u32 ish_mainseq_7(struct mevent_srv_ish * svr) +{ + u32 (*func)(u32 *, struct SaveBlock2 *, struct SaveBlock1 *) = (void *)gDecompressionBuffer; + if (func(&svr->unk_04, gSaveBlock2Ptr, gSaveBlock1Ptr) == 1) + { + svr->mainseqno = 4; + svr->unk_0C = 0; + } + return 1; +} -extern const u8 gUnknown_8468B6C[]; -extern const u8 gUnknown_8468BCC[]; +static u32 mevent_srv_ish_exec(struct mevent_srv_ish * svr) +{ + u32 (*funcs[])(struct mevent_srv_ish *) = { + ish_mainseq_0, + ish_mainseq_1, + ish_mainseq_2, + ish_mainseq_3, + ish_mainseq_4, + ish_mainseq_5, + ish_mainseq_6, + ish_mainseq_7 + }; + return funcs[svr->mainseqno](svr); +} void sub_8144F1C(void) { @@ -76,7 +316,7 @@ u32 sub_8144F64(u16 * a0) return result; } -void mevent_srv_init_common(struct mevent_srv_common * svr, const void * a1, u32 a2, u32 a3) +static void mevent_srv_init_common(struct mevent_srv_common * svr, const void * a1, u32 a2, u32 a3) { svr->unk_00 = 0; svr->mainseqno = 0; @@ -86,10 +326,10 @@ void mevent_srv_init_common(struct mevent_srv_common * svr, const void * a1, u32 svr->unk_20 = AllocZeroed(100); svr->cmdBuffer = a1; svr->cmdidx = 0; - sub_814485C(&svr->unk_38, a2, a3); + mevent_srv_sub_init(&svr->unk_38, a2, a3); } -void mevent_srv_free_resources(struct mevent_srv_common * svr) +static void mevent_srv_free_resources(struct mevent_srv_common * svr) { Free(svr->unk_18); Free(svr->unk_1C); @@ -97,13 +337,13 @@ void mevent_srv_free_resources(struct mevent_srv_common * svr) Free(svr->unk_20); } -void sub_814501C(struct mevent_srv_common * svr, u32 a1, void * a2, u32 size) +static void sub_814501C(struct mevent_srv_common * svr, u32 a1, void * a2, u32 size) { AGB_ASSERT_EX(size <= ME_SEND_BUF_SIZE, "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/mevent_server.c", 257); - sub_8144888(&svr->unk_38, a1, a2, size); + mevent_srv_sub_init_send(&svr->unk_38, a1, a2, size); } -void * sub_814505C(void * a0, void * a1) +static void * sub_814505C(void * a0, void * a1) { if (a0 != NULL) return a0; @@ -111,7 +351,7 @@ void * sub_814505C(void * a0, void * a1) return a1; } -u32 sub_8145068(void * a0, void * a1) +static u32 sub_8145068(void * a0, void * a1) { if (a1 < a0) return 0; @@ -121,32 +361,32 @@ u32 sub_8145068(void * a0, void * a1) return 2; } -u32 sub_8145080(struct mevent_srv_common * svr) +static u32 sub_8145080(struct mevent_srv_common * svr) { svr->mainseqno = 4; return 0; } -u32 sub_8145088(struct mevent_srv_common * svr) +static u32 sub_8145088(struct mevent_srv_common * svr) { return 3; } -u32 sub_814508C(struct mevent_srv_common * svr) +static u32 sub_814508C(struct mevent_srv_common * svr) { - if (sub_8144844(&svr->unk_38)) + if (mevent_srv_sub_recv(&svr->unk_38)) svr->mainseqno = 4; return 1; } -u32 sub_81450A8(struct mevent_srv_common * svr) +static u32 sub_81450A8(struct mevent_srv_common * svr) { - if (sub_8144850(&svr->unk_38)) + if (mevent_srv_sub_send(&svr->unk_38)) svr->mainseqno = 4; return 1; } -u32 sub_81450C4(struct mevent_srv_common * svr) +static u32 sub_81450C4(struct mevent_srv_common * svr) { const struct mevent_cmd * cmd = &svr->cmdBuffer[svr->cmdidx]; void * ptr; @@ -164,7 +404,7 @@ u32 sub_81450C4(struct mevent_srv_common * svr) break; case 2: AGB_ASSERT_EX(cmd->parameter == NULL, "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/mevent_server.c", 364); - sub_81448AC(&svr->unk_38, cmd->flag, svr->unk_14); + mevent_srv_sub_init_recv(&svr->unk_38, cmd->flag, svr->unk_14); svr->mainseqno = 2; break; case 3: @@ -299,7 +539,7 @@ static u32 (*const func_tbl[])(struct mevent_srv_common *) = { sub_81450C4 }; -u32 sub_8145600(struct mevent_srv_common * svr) +static u32 sub_8145600(struct mevent_srv_common * svr) { u32 response; AGB_ASSERT_EX(svr->mainseqno < NELEMS(func_tbl), "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/mevent_server.c", 546); diff --git a/src/mevent_server_helpers.c b/src/mevent_server_helpers.c new file mode 100644 index 000000000..a5ce595b0 --- /dev/null +++ b/src/mevent_server_helpers.c @@ -0,0 +1,211 @@ +#include "global.h" +#include "malloc.h" +#include "decompress.h" +#include "util.h" +#include "link.h" +#include "link_rfu.h" +#include "overworld.h" +#include "script.h" +#include "battle_tower.h" +#include "mystery_event_script.h" +#include "mevent.h" +#include "mevent_server.h" + +static u32 mevent_receive_func(struct mevent_srv_sub *); +static u32 mevent_send_func(struct mevent_srv_sub *); + +u32 mevent_srv_sub_recv(struct mevent_srv_sub * svr) +{ + return svr->recvFunc(svr); +} + +u32 mevent_srv_sub_send(struct mevent_srv_sub * svr) +{ + return svr->sendFunc(svr); +} + +void mevent_srv_sub_init(struct mevent_srv_sub * svr, u32 sendPlayerNo, u32 recvPlayerNo) +{ + svr->sendPlayerNo = sendPlayerNo; + svr->recvPlayerNo = recvPlayerNo; + svr->seqno = 0; + svr->sendCRC = 0; + svr->sendSize = 0; + svr->sendCounter = 0; + svr->recvCRC = 0; + svr->recvSize = 0; + svr->recvCounter = 0; + svr->sendBfr = NULL; + svr->recvBfr = NULL; + svr->sendFunc = mevent_send_func; + svr->recvFunc = mevent_receive_func; +} + +void mevent_srv_sub_init_send(struct mevent_srv_sub * svr, u32 a1, const void * src, u32 size) +{ + svr->seqno = 0; + svr->sendIdent = a1; + svr->sendCounter = 0; + svr->sendCRC = 0; + if (size != 0) + svr->sendSize = size; + else + svr->sendSize = ME_SEND_BUF_SIZE; + svr->sendBfr = src; +} + +void mevent_srv_sub_init_recv(struct mevent_srv_sub * svr, u32 ident, void * dest) +{ + svr->seqno = 0; + svr->recvIdent = ident; + svr->recvCounter = 0; + svr->recvCRC = 0; + svr->recvSize = 0; + svr->recvBfr = dest; +} + +static void mevent_recv_block(u32 recv_idx, void * dest, size_t size) +{ + memcpy(dest, gBlockRecvBuffer[recv_idx], size); +} + +static bool32 mevent_has_received(u32 recv_idx) +{ + if ((GetBlockReceivedStatus() >> recv_idx) & 1) + return TRUE; + else + return FALSE; +} + +static void mevent_reset_recv(u32 recv_idx) +{ + ResetBlockReceivedFlag(recv_idx); +} + +static bool32 mevent_receive_func(struct mevent_srv_sub * svr) +{ + struct send_recv_header header; + + switch (svr->seqno) + { + case 0: + if (mevent_has_received(svr->recvPlayerNo)) + { + mevent_recv_block(svr->recvPlayerNo, &header, sizeof(header)); + svr->recvSize = header.size; + svr->recvCRC = header.crc; + if (svr->recvSize > ME_SEND_BUF_SIZE) + { + sub_80FA190(); + return FALSE; + } + else if (svr->recvIdent != header.ident) + { + sub_80FA190(); + return FALSE; + } + else + { + svr->recvCounter = 0; + mevent_reset_recv(svr->recvPlayerNo); + ++svr->seqno; + } + } + break; + case 1: + if (mevent_has_received(svr->recvPlayerNo)) + { + size_t r3 = svr->recvCounter * 252; + if (svr->recvSize - r3 <= 252) + { + mevent_recv_block(svr->recvPlayerNo, svr->recvBfr + r3, svr->recvSize - r3); + ++svr->recvCounter; + ++svr->seqno; + } + else + { + mevent_recv_block(svr->recvPlayerNo, svr->recvBfr + r3, 252); + ++svr->recvCounter; + } + mevent_reset_recv(svr->recvPlayerNo); + } + break; + case 2: + if (CalcCRC16WithTable(svr->recvBfr, svr->recvSize) != svr->recvCRC) + { + sub_80FA190(); + return FALSE; + } + else + { + svr->seqno = 0; + return TRUE; + } + break; + + } + + return FALSE; +} + +static bool32 mevent_send_func(struct mevent_srv_sub * svr) +{ + struct send_recv_header header; + + switch (svr->seqno) + { + case 0: + if (sub_800A4BC()) + { + header.ident = svr->sendIdent; + header.size = svr->sendSize; + header.crc = CalcCRC16WithTable(svr->sendBfr, svr->sendSize); + svr->sendCRC = header.crc; + svr->sendCounter = 0; + SendBlock(0, &header, sizeof(header)); + ++svr->seqno; + } + break; + case 1: + if (sub_800A4BC()) + { + if (mevent_has_received(svr->sendPlayerNo)) + { + size_t r3; + mevent_reset_recv(svr->sendPlayerNo); + r3 = 252 * svr->sendCounter; + if (svr->sendSize - r3 <= 252) + { + SendBlock(0, svr->sendBfr + r3, svr->sendSize - r3); + ++svr->sendCounter; + ++svr->seqno; + } + else + { + SendBlock(0, svr->sendBfr + r3, 252); + ++svr->sendCounter; + } + } + } + break; + case 2: + if (sub_800A4BC()) + { + if (CalcCRC16WithTable(svr->sendBfr, svr->sendSize) != svr->sendCRC) + sub_80FA190(); + else + ++svr->seqno; + } + break; + case 3: + if (mevent_has_received(svr->sendPlayerNo)) + { + mevent_reset_recv(svr->sendPlayerNo); + svr->seqno = 0; + return TRUE; + } + break; + } + + return FALSE; +} diff --git a/src/mevent_server_ish.c b/src/mevent_server_ish.c deleted file mode 100644 index e544c0f42..000000000 --- a/src/mevent_server_ish.c +++ /dev/null @@ -1,305 +0,0 @@ -#include "global.h" -#include "malloc.h" -#include "decompress.h" -#include "util.h" -#include "link.h" -#include "link_rfu.h" -#include "overworld.h" -#include "script.h" -#include "battle_tower.h" -#include "mystery_event_script.h" -#include "mevent.h" -#include "mevent_server.h" - -extern u16 gBlockRecvBuffer[][128]; - -struct mevent_cmd -{ - u32 instr; - u32 parameter; -}; - -struct mevent_srv_ish -{ - u32 unk_00; - u32 unk_04; - u32 mainseqno; - u32 unk_0C; - u32 cmdidx; - void * unk_14; - void * unk_18; - struct mevent_cmd * cmdBuffer; - void * unk_20; - struct mevent_srv_sub unk_24; -}; - -EWRAM_DATA struct mevent_srv_ish * gUnknown_203F3C0 = NULL; - -void mevent_srv_ish_init(struct mevent_srv_ish *, u32, u32); -u32 mevent_srv_ish_exec(struct mevent_srv_ish *); -void sub_8144BC0(struct mevent_srv_ish *); -extern const u8 gUnknown_84687E0[]; - -void sub_8144AEC(void) -{ - gUnknown_203F3C0 = AllocZeroed(sizeof(struct mevent_srv_ish)); - mevent_srv_ish_init(gUnknown_203F3C0, 1, 0); -} - -u32 sub_8144B0C(u16 * a0) -{ - u32 result; - if (gUnknown_203F3C0 == NULL) - return 6; - result = mevent_srv_ish_exec(gUnknown_203F3C0); - if (result == 6) - { - *a0 = gUnknown_203F3C0->unk_04; - sub_8144BC0(gUnknown_203F3C0); - Free(gUnknown_203F3C0); - gUnknown_203F3C0 = NULL; - } - return result; -} - -void sub_8144B48(void) -{ - gUnknown_203F3C0->unk_0C++; -} - -void * sub_8144B58(void) -{ - return gUnknown_203F3C0->unk_20; -} - -void sub_8144B64(u32 a0) -{ - gUnknown_203F3C0->unk_04 = a0; -} - -void mevent_srv_ish_init(struct mevent_srv_ish * svr, u32 a1, u32 a2) -{ - svr->unk_00 = 0; - svr->mainseqno = 0; - svr->unk_0C = 0; - svr->unk_14 = AllocZeroed(ME_SEND_BUF_SIZE); - svr->unk_18 = AllocZeroed(ME_SEND_BUF_SIZE); - svr->cmdBuffer = AllocZeroed(ME_SEND_BUF_SIZE); - svr->unk_20 = AllocZeroed(0x40); - sub_814485C(&svr->unk_24, a1, a2); -} - -void sub_8144BC0(struct mevent_srv_ish * svr) -{ - Free(svr->unk_14); - Free(svr->unk_18); - Free(svr->cmdBuffer); - Free(svr->unk_20); -} - -void sub_8144BE4(struct mevent_srv_ish * svr) -{ - memcpy(svr->cmdBuffer, svr->unk_18, ME_SEND_BUF_SIZE); - svr->cmdidx = 0; -} - -void sub_8144C00(struct mevent_srv_ish * svr, u32 a1, u32 a2) -{ - CpuFill32(0, svr->unk_14, ME_SEND_BUF_SIZE); - *(u32 *)svr->unk_14 = a2; - sub_8144888(&svr->unk_24, a1, svr->unk_14, 4); -} - -u32 sub_8144C34(struct mevent_srv_ish * svr) -{ - memcpy(svr->cmdBuffer, gUnknown_84687E0, ME_SEND_BUF_SIZE); - svr->cmdidx = 0; - svr->mainseqno = 4; - svr->unk_0C = 0; - return 0; -} - -u32 sub_8144C5C(struct mevent_srv_ish * svr) -{ - return 6; -} - -u32 sub_8144C60(struct mevent_srv_ish * svr) -{ - if (sub_8144844(&svr->unk_24)) - { - svr->mainseqno = 4; - svr->unk_0C = 0; - } - return 1; -} - -u32 sub_8144C80(struct mevent_srv_ish * svr) -{ - if (sub_8144850(&svr->unk_24)) - { - svr->mainseqno = 4; - svr->unk_0C = 0; - } - return 1; -} - -u32 sub_8144CA0(struct mevent_srv_ish * svr) -{ - struct mevent_cmd * cmd = &svr->cmdBuffer[svr->cmdidx]; - ++svr->cmdidx; - switch (cmd->instr) - { - case 0: - break; - case 1: - svr->unk_04 = cmd->parameter; - svr->mainseqno = 1; - svr->unk_0C = 0; - break; - case 2: - sub_81448AC(&svr->unk_24, cmd->parameter, svr->unk_18); - svr->mainseqno = 2; - svr->unk_0C = 0; - break; - case 3: - svr->mainseqno = 3; - svr->unk_0C = 0; - break; - case 20: - sub_8144888(&svr->unk_24, 0x14, svr->unk_14, 0); - svr->mainseqno = 3; - svr->unk_0C = 0; - break; - case 19: - sub_8144C00(svr, 0x12, GetGameStat(cmd->parameter)); - svr->mainseqno = 3; - svr->unk_0C = 0; - break; - case 6: - if (svr->unk_04 == 0) - sub_8144BE4(svr); - break; - case 7: - if (svr->unk_04 == 1) - sub_8144BE4(svr); - break; - case 4: - sub_8144BE4(svr); - break; - case 5: - memcpy(svr->unk_20, svr->unk_18, 0x40); - svr->mainseqno = 5; - svr->unk_0C = 0; - return 2; - case 11: - memcpy(svr->unk_20, svr->unk_18, 0x40); - svr->mainseqno = 5; - svr->unk_0C = 0; - return 3; - case 12: - memcpy(svr->unk_20, svr->unk_18, 0x40); - svr->mainseqno = 5; - svr->unk_0C = 0; - return 5; - case 13: - svr->mainseqno = 5; - svr->unk_0C = 0; - return 4; - case 8: - sub_81442CC(svr->unk_14); - sub_8144888(&svr->unk_24, 0x11, svr->unk_14, 0x64); - break; - case 14: - sub_8144C00(svr, 0x13, svr->unk_04); - break; - case 10: - sub_8143F68(svr->unk_18); - break; - case 9: - if (!sub_8143EF4(svr->unk_18)) - { - sub_8143DC8(svr->unk_18); - sub_8144C00(svr, 0x13, 0); - } - else - sub_8144C00(svr, 0x13, 1); - break; - case 15: - svr->mainseqno = 6; - svr->unk_0C = 0; - break; - case 16: - sub_8144254(svr->unk_18); - break; - case 17: - sub_8069EA4(svr->unk_18, 1000); - break; - case 18: - memcpy(gSaveBlock2Ptr->unk_4A0, svr->unk_18, 0xbc); - sub_80E7490(); - break; - case 21: - memcpy(gDecompressionBuffer, svr->unk_18, ME_SEND_BUF_SIZE); - svr->mainseqno = 7; - svr->unk_0C = 0; - break; - } - - return 1; -} - -u32 sub_8144E6C(struct mevent_srv_ish * svr) -{ - if (svr->unk_0C) - { - svr->mainseqno = 4; - svr->unk_0C = 0; - } - return 1; -} - -u32 sub_8144E84(struct mevent_srv_ish * svr) -{ - switch (svr->unk_0C) - { - case 0: - sub_80DA89C(svr->unk_18); - ++svr->unk_0C; - break; - case 1: - if (!sub_80DA8B0(&svr->unk_04)) - { - svr->mainseqno = 4; - svr->unk_0C = 0; - } - break; - } - return 1; -} - -u32 sub_8144EBC(struct mevent_srv_ish * svr) -{ - u32 (*func)(u32 *, struct SaveBlock2 *, struct SaveBlock1 *) = (void *)gDecompressionBuffer; - if (func(&svr->unk_04, gSaveBlock2Ptr, gSaveBlock1Ptr) == 1) - { - svr->mainseqno = 4; - svr->unk_0C = 0; - } - return 1; -} - -u32 mevent_srv_ish_exec(struct mevent_srv_ish * svr) -{ - u32 (*funcs[])(struct mevent_srv_ish *) = { - sub_8144C34, - sub_8144C5C, - sub_8144C60, - sub_8144C80, - sub_8144CA0, - sub_8144E6C, - sub_8144E84, - sub_8144EBC - }; - return funcs[svr->mainseqno](svr); -} diff --git a/src/mevent_server_sub.c b/src/mevent_server_sub.c deleted file mode 100644 index 83b8f62ca..000000000 --- a/src/mevent_server_sub.c +++ /dev/null @@ -1,211 +0,0 @@ -#include "global.h" -#include "malloc.h" -#include "decompress.h" -#include "util.h" -#include "link.h" -#include "link_rfu.h" -#include "overworld.h" -#include "script.h" -#include "battle_tower.h" -#include "mystery_event_script.h" -#include "mevent.h" -#include "mevent_server.h" - -u32 sub_814490C(struct mevent_srv_sub *); -u32 sub_81449E0(struct mevent_srv_sub *); - -u32 sub_8144844(struct mevent_srv_sub * svr) -{ - return svr->unk_20(svr); -} - -u32 sub_8144850(struct mevent_srv_sub * svr) -{ - return svr->unk_24(svr); -} - -void sub_814485C(struct mevent_srv_sub * svr, u32 a1, u32 a2) -{ - svr->unk_04 = a1; - svr->unk_05 = a2; - svr->unk_00 = 0; - svr->unk_12 = 0; - svr->unk_14 = 0; - svr->unk_10 = 0; - svr->unk_0A = 0; - svr->unk_0C = 0; - svr->unk_08 = 0; - svr->unk_1C = NULL; - svr->unk_18 = NULL; - svr->unk_24 = sub_81449E0; - svr->unk_20 = sub_814490C; -} - -void sub_8144888(struct mevent_srv_sub * svr, u32 a1, void * a2, u32 a3) -{ - svr->unk_00 = 0; - svr->unk_0E = a1; - svr->unk_10 = 0; - svr->unk_12 = 0; - if (a3 != 0) - svr->unk_14 = a3; - else - svr->unk_14 = ME_SEND_BUF_SIZE; - svr->unk_1C = a2; -} - -void sub_81448AC(struct mevent_srv_sub * svr, u32 a1, void * a2) -{ - svr->unk_00 = 0; - svr->unk_06 = a1; - svr->unk_08 = 0; - svr->unk_0A = 0; - svr->unk_0C = 0; - svr->unk_18 = a2; -} - -void sub_81448BC(u32 recv_idx, void * dest, size_t size) -{ - memcpy(dest, gBlockRecvBuffer[recv_idx], size); -} - -bool32 sub_81448D8(u32 recv_idx) -{ - if ((GetBlockReceivedStatus() >> recv_idx) & 1) - return TRUE; - else - return FALSE; -} - -void sub_81448FC(u32 recv_idx) -{ - ResetBlockReceivedFlag(recv_idx); -} - -bool32 sub_814490C(struct mevent_srv_sub * svr) -{ - struct send_recv_buff buff; - - switch (svr->unk_00) - { - case 0: - if (sub_81448D8(svr->unk_05)) - { - sub_81448BC(svr->unk_05, &buff, sizeof(buff)); - svr->unk_0C = buff.unk4; - svr->unk_0A = buff.unk2; - if (svr->unk_0C > ME_SEND_BUF_SIZE) - { - sub_80FA190(); - return FALSE; - } - else if (svr->unk_06 != buff.unk0) - { - sub_80FA190(); - return FALSE; - } - else - { - svr->unk_08 = 0; - sub_81448FC(svr->unk_05); - ++svr->unk_00; - } - } - break; - case 1: - if (sub_81448D8(svr->unk_05)) - { - size_t r3 = svr->unk_08 * 252; - if (svr->unk_0C - r3 <= 252) - { - sub_81448BC(svr->unk_05, svr->unk_18 + r3, svr->unk_0C - r3); - ++svr->unk_08; - ++svr->unk_00; - } - else - { - sub_81448BC(svr->unk_05, svr->unk_18 + r3, 252); - ++svr->unk_08; - } - sub_81448FC(svr->unk_05); - } - break; - case 2: - if (CalcCRC16WithTable(svr->unk_18, svr->unk_0C) != svr->unk_0A) - { - sub_80FA190(); - return FALSE; - } - else - { - svr->unk_00 = 0; - return TRUE; - } - break; - - } - - return FALSE; -} - -bool32 sub_81449E0(struct mevent_srv_sub * svr) -{ - struct send_recv_buff buff; - - switch (svr->unk_00) - { - case 0: - if (sub_800A4BC()) - { - buff.unk0 = svr->unk_0E; - buff.unk4 = svr->unk_14; - buff.unk2 = CalcCRC16WithTable(svr->unk_1C, svr->unk_14); - svr->unk_12 = buff.unk2; - svr->unk_10 = 0; - SendBlock(0, &buff, sizeof(buff)); - ++svr->unk_00; - } - break; - case 1: - if (sub_800A4BC()) - { - if (sub_81448D8(svr->unk_04)) - { - size_t r3; - sub_81448FC(svr->unk_04); - r3 = 252 * svr->unk_10; - if (svr->unk_14 - r3 <= 252) - { - SendBlock(0, svr->unk_1C + r3, svr->unk_14 - r3); - ++svr->unk_10; - ++svr->unk_00; - } - else - { - SendBlock(0, svr->unk_1C + r3, 252); - ++svr->unk_10; - } - } - } - break; - case 2: - if (sub_800A4BC()) - { - if (CalcCRC16WithTable(svr->unk_1C, svr->unk_14) != svr->unk_12) - sub_80FA190(); - else - ++svr->unk_00; - } - break; - case 3: - if (sub_81448D8(svr->unk_04)) - { - sub_81448FC(svr->unk_04); - svr->unk_00 = 0; - return TRUE; - } - break; - } - - return FALSE; -} diff --git a/sym_ewram.txt b/sym_ewram.txt index 4c8d1dc78..b12c9d4a6 100644 --- a/sym_ewram.txt +++ b/sym_ewram.txt @@ -1707,8 +1707,7 @@ gUnknown_203F3B8: @ 203F3B8 .space 0x4 .include "src/mevent.o" - .include "src/mevent_server_sub.o" - .include "src/mevent_server_ish.o" + .include "src/mevent_server_helpers.o" .include "src/mevent_server.o" gUnknown_203F3C8: @ 203F3C8 -- cgit v1.2.3 From d4d209428107f0530b4018b6373c6f0bf697793e Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sat, 1 Dec 2018 11:24:48 -0500 Subject: also rename r3 in the mevent helper send and recv functions --- src/mevent_server_helpers.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/mevent_server_helpers.c b/src/mevent_server_helpers.c index a5ce595b0..7e2119088 100644 --- a/src/mevent_server_helpers.c +++ b/src/mevent_server_helpers.c @@ -115,16 +115,16 @@ static bool32 mevent_receive_func(struct mevent_srv_sub * svr) case 1: if (mevent_has_received(svr->recvPlayerNo)) { - size_t r3 = svr->recvCounter * 252; - if (svr->recvSize - r3 <= 252) + size_t blocksiz = svr->recvCounter * 252; + if (svr->recvSize - blocksiz <= 252) { - mevent_recv_block(svr->recvPlayerNo, svr->recvBfr + r3, svr->recvSize - r3); + mevent_recv_block(svr->recvPlayerNo, svr->recvBfr + blocksiz, svr->recvSize - blocksiz); ++svr->recvCounter; ++svr->seqno; } else { - mevent_recv_block(svr->recvPlayerNo, svr->recvBfr + r3, 252); + mevent_recv_block(svr->recvPlayerNo, svr->recvBfr + blocksiz, 252); ++svr->recvCounter; } mevent_reset_recv(svr->recvPlayerNo); @@ -171,18 +171,18 @@ static bool32 mevent_send_func(struct mevent_srv_sub * svr) { if (mevent_has_received(svr->sendPlayerNo)) { - size_t r3; + size_t blocksiz; mevent_reset_recv(svr->sendPlayerNo); - r3 = 252 * svr->sendCounter; - if (svr->sendSize - r3 <= 252) + blocksiz = 252 * svr->sendCounter; + if (svr->sendSize - blocksiz <= 252) { - SendBlock(0, svr->sendBfr + r3, svr->sendSize - r3); + SendBlock(0, svr->sendBfr + blocksiz, svr->sendSize - blocksiz); ++svr->sendCounter; ++svr->seqno; } else { - SendBlock(0, svr->sendBfr + r3, 252); + SendBlock(0, svr->sendBfr + blocksiz, 252); ++svr->sendCounter; } } -- cgit v1.2.3 From 8473bf1bcd8ef38bcb7db0125b4840ee23b6e8c6 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sat, 1 Dec 2018 11:31:54 -0500 Subject: More symbol names in mevent server --- src/mevent_server.c | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/src/mevent_server.c b/src/mevent_server.c index 2c0dcafad..fff22acdb 100644 --- a/src/mevent_server.c +++ b/src/mevent_server.c @@ -109,7 +109,7 @@ static u32 ish_mainseq_1(struct mevent_srv_ish * svr) static u32 ish_mainseq_2(struct mevent_srv_ish * svr) { - + // do recv if (mevent_srv_sub_recv(&svr->unk_24)) { svr->mainseqno = 4; @@ -120,6 +120,7 @@ static u32 ish_mainseq_2(struct mevent_srv_ish * svr) static u32 ish_mainseq_3(struct mevent_srv_ish * svr) { + // do send if (mevent_srv_sub_send(&svr->unk_24)) { svr->mainseqno = 4; @@ -130,6 +131,7 @@ static u32 ish_mainseq_3(struct mevent_srv_ish * svr) static u32 ish_mainseq_4(struct mevent_srv_ish * svr) { + // process command struct mevent_cmd_ish * cmd = &svr->cmdBuffer[svr->cmdidx]; ++svr->cmdidx; switch (cmd->instr) @@ -235,6 +237,7 @@ static u32 ish_mainseq_4(struct mevent_srv_ish * svr) static u32 ish_mainseq_5(struct mevent_srv_ish * svr) { + // wait unk_0C if (svr->unk_0C) { svr->mainseqno = 4; @@ -245,6 +248,7 @@ static u32 ish_mainseq_5(struct mevent_srv_ish * svr) static u32 ish_mainseq_6(struct mevent_srv_ish * svr) { + // ??? switch (svr->unk_0C) { case 0: @@ -264,6 +268,7 @@ static u32 ish_mainseq_6(struct mevent_srv_ish * svr) static u32 ish_mainseq_7(struct mevent_srv_ish * svr) { + // exec arbitrary code u32 (*func)(u32 *, struct SaveBlock2 *, struct SaveBlock1 *) = (void *)gDecompressionBuffer; if (func(&svr->unk_04, gSaveBlock2Ptr, gSaveBlock1Ptr) == 1) { @@ -361,33 +366,38 @@ static u32 sub_8145068(void * a0, void * a1) return 2; } -static u32 sub_8145080(struct mevent_srv_common * svr) +static u32 common_mainseq_0(struct mevent_srv_common * svr) { + // start svr->mainseqno = 4; return 0; } -static u32 sub_8145088(struct mevent_srv_common * svr) +static u32 common_mainseq_1(struct mevent_srv_common * svr) { + // done return 3; } -static u32 sub_814508C(struct mevent_srv_common * svr) +static u32 common_mainseq_2(struct mevent_srv_common * svr) { + // do recv if (mevent_srv_sub_recv(&svr->unk_38)) svr->mainseqno = 4; return 1; } -static u32 sub_81450A8(struct mevent_srv_common * svr) +static u32 common_mainseq_3(struct mevent_srv_common * svr) { + // do send if (mevent_srv_sub_send(&svr->unk_38)) svr->mainseqno = 4; return 1; } -static u32 sub_81450C4(struct mevent_srv_common * svr) +static u32 common_mainseq_4(struct mevent_srv_common * svr) { + // process command const struct mevent_cmd * cmd = &svr->cmdBuffer[svr->cmdidx]; void * ptr; svr->cmdidx++; @@ -532,11 +542,11 @@ static u32 sub_81450C4(struct mevent_srv_common * svr) } static u32 (*const func_tbl[])(struct mevent_srv_common *) = { - sub_8145080, - sub_8145088, - sub_814508C, - sub_81450A8, - sub_81450C4 + common_mainseq_0, + common_mainseq_1, + common_mainseq_2, + common_mainseq_3, + common_mainseq_4 }; static u32 sub_8145600(struct mevent_srv_common * svr) -- cgit v1.2.3 From 2fbe528d5e2db723db338cb2d1635f0fa76ac905 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sat, 1 Dec 2018 20:27:35 -0500 Subject: Attempt to give meaningful names to mevent srv fields --- asm/link_rfu_4.s | 22 +-- data/data_83FECCC.s | 5 +- data/data_8466FB8.s | 13 +- data/mevent/script_common.inc | 84 ++++++++++++ data/mevent/script_ish.inc | 65 +++++++++ include/mevent_server.h | 54 ++++---- src/mevent_server.c | 308 +++++++++++++++++++++--------------------- src/mevent_server_helpers.c | 4 +- 8 files changed, 352 insertions(+), 203 deletions(-) create mode 100644 data/mevent/script_common.inc create mode 100644 data/mevent/script_ish.inc diff --git a/asm/link_rfu_4.s b/asm/link_rfu_4.s index f8917e197..20381dca1 100644 --- a/asm/link_rfu_4.s +++ b/asm/link_rfu_4.s @@ -1657,7 +1657,7 @@ _081430B8: bl sub_81424B8 movs r0, 0x7 strb r0, [r5, 0x8] - bl sub_8144AEC + bl mevent_srv_ish_do_init b _081435C6 .align 2, 0 _081430D0: .4byte gUnknown_3003F64 @@ -1683,7 +1683,7 @@ _081430EC: _081430F8: .4byte gUnknown_841E794 _081430FC: adds r0, r5, 0 - bl sub_8144B0C + bl mevent_srv_ish_do_exec subs r0, 0x2 cmp r0, 0x4 bls _0814310A @@ -1712,12 +1712,12 @@ _0814312C: b _081435C6 _0814313A: ldr r4, [r5, 0x10] - bl sub_8144B58 + bl mevent_srv_ish_get_buffer adds r1, r0, 0 adds r0, r4, 0 movs r2, 0x40 bl memcpy - bl sub_8144B48 + bl mevent_srv_ish_inc_flag b _081435C6 _08143150: movs r0, 0xA @@ -1740,7 +1740,7 @@ _08143170: .4byte gLinkPlayers + 8 _08143174: adds r4, r5, 0 adds r4, 0x9 - bl sub_8144B58 + bl mevent_srv_ish_get_buffer adds r3, r0, 0 adds r0, r4, 0 adds r1, r5, 0 @@ -1757,7 +1757,7 @@ _08143174: _08143198: adds r4, r5, 0 adds r4, 0x9 - bl sub_8144B58 + bl mevent_srv_ish_get_buffer adds r1, r0, 0 adds r0, r4, 0 bl mevent_0814257C @@ -1817,9 +1817,9 @@ _08143208: _0814320C: movs r0, 0x1 _0814320E: - bl sub_8144B64 + bl mevent_srv_ish_set_param _08143212: - bl sub_8144B48 + bl mevent_srv_ish_inc_flag movs r0, 0x7 strb r0, [r5, 0x8] b _081435C6 @@ -2199,7 +2199,7 @@ _081434D0: bne _08143500 ldr r0, _081434FC @ =gUnknown_841EAE7 bl sub_8142504 - bl sub_8144F40 + bl mevent_srv_common_do_init_2 b _0814350A .align 2, 0 _081434F0: .4byte gStringVar1 @@ -2209,7 +2209,7 @@ _081434FC: .4byte gUnknown_841EAE7 _08143500: ldr r0, _08143510 @ =gUnknown_841EB01 bl sub_8142504 - bl sub_8144F1C + bl mevent_srv_common_do_init_1 _0814350A: movs r0, 0x20 strb r0, [r5, 0x8] @@ -2218,7 +2218,7 @@ _0814350A: _08143510: .4byte gUnknown_841EB01 _08143514: adds r0, r5, 0 - bl sub_8144F64 + bl mevent_srv_init_do_exec cmp r0, 0x3 bne _081435C6 ldrh r0, [r5] diff --git a/data/data_83FECCC.s b/data/data_83FECCC.s index 15416aed2..c89f5f308 100644 --- a/data/data_83FECCC.s +++ b/data/data_83FECCC.s @@ -3176,7 +3176,10 @@ gUnknown_8459580:: @ 8459580 .incbin "baserom.gba", 0x459580, 0x8 gUnknown_8459588:: @ 8459588 - .incbin "baserom.gba", 0x459588, 0xAC + .incbin "baserom.gba", 0x459588, 0x64 + +gUnknown_84595EC:: + .incbin "baserom.gba", 0x4595EC, 0x48 gUnknown_8459634:: @ 8459634 .incbin "baserom.gba", 0x459634, 0x8 diff --git a/data/data_8466FB8.s b/data/data_8466FB8.s index 0ca0bcbf3..ee830ca04 100644 --- a/data/data_8466FB8.s +++ b/data/data_8466FB8.s @@ -1,3 +1,6 @@ + .include "asm/macros.inc" + .include "constants/constants.inc" + .section .rodata .align 2 @@ -34,11 +37,5 @@ gUnknown_8468050:: @ 8468050 gUnknown_8468720:: @ 8468720 .incbin "baserom.gba", 0x468720, 0xC0 -gUnknown_84687E0:: @ 84687E0 - .incbin "baserom.gba", 0x4687E0, 0x38C - -gUnknown_8468B6C:: @ 8468B6C - .incbin "baserom.gba", 0x468B6C, 0x60 - -gUnknown_8468BCC:: @ 8468BCC - .incbin "baserom.gba", 0x468BCC, 0x90 + .include "data/mevent/script_ish.inc" + .include "data/mevent/script_common.inc" diff --git a/data/mevent/script_common.inc b/data/mevent/script_common.inc new file mode 100644 index 000000000..abf03ab95 --- /dev/null +++ b/data/mevent/script_common.inc @@ -0,0 +1,84 @@ +gUnknown_8468920:: + .4byte 0x12, 0x10, gUnknown_8468810 + .4byte 0x01, 0x00, NULL + .4byte 0x02, 0x14, NULL + .4byte 0x00, 0x0a, NULL + .4byte 0x12, 0x10, gUnknown_8468820 + .4byte 0x01, 0x00, NULL + .4byte 0x02, 0x14, NULL + .4byte 0x00, 0x0b, NULL + .4byte 0x12, 0x10, gUnknown_84688E0 + .4byte 0x01, 0x00, NULL + .4byte 0x02, 0x14, NULL + .4byte 0x00, 0x09, NULL + +gUnknown_84689B0:: + .4byte 0x12, 0x10, gUnknown_8468898 + .4byte 0x01, 0x00, NULL + .4byte 0x02, 0x14, NULL + .4byte 0x00, 0x07, NULL + +gUnknown_84689E0:: + .4byte 0x12, 0x28, gUnknown_8468870 + .4byte 0x01, 0x00, NULL + .4byte 0x0e, 0x00, NULL + .4byte 0x01, 0x00, NULL + .4byte 0x02, 0x13, NULL + .4byte 0x08, 0x00, NULL + .4byte 0x04, 0x01, gUnknown_84689B0 + .4byte 0x12, 0x10, gUnknown_84688A8 + .4byte 0x01, 0x00, NULL + .4byte 0x02, 0x14, NULL + .4byte 0x00, 0x03, NULL + +gUnknown_8468A64:: + .4byte 0x12, 0x30, gUnknown_8468840 + .4byte 0x01, 0x00, NULL + .4byte 0x0d, 0x00, NULL + .4byte 0x01, 0x00, NULL + .4byte 0x0f, 0x00, NULL + .4byte 0x01, 0x00, NULL + .4byte 0x02, 0x14, NULL + .4byte 0x00, 0x02, NULL + +gUnknown_8468AC4:: + .4byte 0x12, 0x28, gUnknown_84688B8 + .4byte 0x01, 0x00, NULL + .4byte 0x02, 0x13, NULL + .4byte 0x08, 0x00, NULL + .4byte 0x04, 0x00, gUnknown_8468A64 + .4byte 0x03, 0x00, gUnknown_84595EC + +gUnknown_8468B0C:: + .4byte 0x12, 0x10, gUnknown_84688F0 + .4byte 0x01, 0x00, NULL + .4byte 0x02, 0x14, NULL + .4byte 0x00, 0x05, NULL + .4byte 0x12, 0x10, gUnknown_8468830 + .4byte 0x01, 0x00, NULL + .4byte 0x02, 0x14, NULL + .4byte 0x00, 0x00, NULL + +gUnknown_8468B6C:: @ 8468B6C + .4byte 0x1b, 0x00, NULL + .4byte 0x12, 0x20, gUnknown_84687F0 + .4byte 0x01, 0x00, NULL + .4byte 0x02, 0x11, NULL + .4byte 0x05, 0x00, NULL + .4byte 0x06, 0x00, NULL + .4byte 0x04, 0x00, gUnknown_8468920 + .4byte 0x03, 0x00, gUnknown_84689E0 + +gUnknown_8468BCC:: @ 8468BCC + .4byte 0x1a, 0x00, NULL + .4byte 0x1c, 0x00, NULL + .4byte 0x12, 0x20, gUnknown_84687F0 + .4byte 0x01, 0x00, NULL + .4byte 0x02, 0x11, NULL + .4byte 0x05, 0x00, NULL + .4byte 0x06, 0x00, NULL + .4byte 0x04, 0x00, gUnknown_8468920 + .4byte 0x07, 0x00, NULL + .4byte 0x04, 0x02, gUnknown_8468AC4 + .4byte 0x04, 0x00, gUnknown_8468A64 + .4byte 0x03, 0x00, gUnknown_8468B0C diff --git a/data/mevent/script_ish.inc b/data/mevent/script_ish.inc new file mode 100644 index 000000000..3d79cf1ee --- /dev/null +++ b/data/mevent/script_ish.inc @@ -0,0 +1,65 @@ +gUnknown_84687E0:: @ 84687E0 + .4byte 0x02, 0x10 @ RECEIVE ID(0x10) + .4byte 0x04, 0x00 @ JUMP TO RECEIVE BUFFER + +gUnknown_84687F0:: + .4byte 0x08, 0x00 @ SEND HEADER MAYBE + .4byte 0x03, 0x00 @ WAIT SEND + .4byte 0x02, 0x10 @ RECEIVE ID(0x10) + .4byte 0x04, 0x00 @ JUMP TO RECEIVE BUFFER + +gUnknown_8468810:: + .4byte 0x14, 0x00 @ SEND ALL + .4byte 0x01, 0x0a @ RETURN 0x0a + +gUnknown_8468820:: + .4byte 0x14, 0x00 @ SEND ALL + .4byte 0x01, 0x0b @ RETURN 0x0b + +gUnknown_8468830:: + .4byte 0x14, 0x00 @ SEND ALL + .4byte 0x01, 0x00 @ RETURN 0x00 + +gUnknown_8468840:: + .4byte 0x02, 0x16 @ RECEIVE ID(0x16) + .4byte 0x0a, 0x00 @ RECEIVE_TO_SAVE_FILE + .4byte 0x02, 0x19 @ RECEIVE ID(0x19) + .4byte 0x11, 0x00 @ RECEIVE_TO_RAM_SCRIPT + .4byte 0x14, 0x00 @ SEND ALL + .4byte 0x01, 0x02 @ RETURN 0x02 + +gUnknown_8468870:: + .4byte 0x02, 0x17 @ RECEIVE ID(0x17) + .4byte 0x09, 0x00 @ VALIDATE BUFF3120 + .4byte 0x03, 0x00 @ WAIT SEND + .4byte 0x02, 0x10 @ RECEIVE ID(0x10) + .4byte 0x04, 0x00 @ JUMP TO RECEIVE BUFFER + +gUnknown_8468898:: + .4byte 0x14, 0x00 @ SEND ALL + .4byte 0x01, 0x07 @ RETURN 0x07 + +gUnknown_84688A8:: + .4byte 0x14, 0x00 @ SEND ALL + .4byte 0x01, 0x03 @ RETURN 0x03 + +gUnknown_84688B8:: + .4byte 0x0d, 0x00 @ REQUEST PARAMETER + .4byte 0x0e, 0x00 @ SEND PARAMETER + .4byte 0x03, 0x00 @ WAIT SEND + .4byte 0x02, 0x10 @ RECEIVE ID(0x10) + .4byte 0x04, 0x00 @ JUMP TO RECEIVE BUFFER + +gUnknown_84688E0:: + .4byte 0x14, 0x00 @ SEND ALL + .4byte 0x01, 0x09 @ RETURN 0x09 + +gUnknown_84688F0:: + .4byte 0x14, 0x00 @ SEND ALL + .4byte 0x01, 0x05 @ RETURN 0x05 + +gUnknown_8468900:: + .4byte 0x02, 0x15 @ RECEIVE ID(0x15) + .4byte 0x0c, 0x00 @ READ PACKET AND COMPUTE SOMETHING + .4byte 0x14, 0x00 @ SEND ALL + .4byte 0x01, 0x0d @ RETURN 0x0d diff --git a/include/mevent_server.h b/include/mevent_server.h index 90cb5f35d..e593b5dbd 100644 --- a/include/mevent_server.h +++ b/include/mevent_server.h @@ -40,15 +40,15 @@ struct mevent_cmd_ish struct mevent_srv_ish { u32 unk_00; - u32 unk_04; + u32 param; u32 mainseqno; - u32 unk_0C; + u32 flag; u32 cmdidx; - void * unk_14; - void * unk_18; + void * sendBuffer; + void * recvBuffer; struct mevent_cmd_ish * cmdBuffer; - void * unk_20; - struct mevent_srv_sub unk_24; + void * buffer; + struct mevent_srv_sub manager; }; struct mevent_cmd @@ -61,20 +61,20 @@ struct mevent_cmd struct mevent_srv_common { u32 unk_00; - u32 unk_04; + u32 param; u32 mainseqno; u32 cmdidx; const struct mevent_cmd * cmdBuffer; - void * unk_14; - struct MEventBuffer_32E0_Sub * unk_18; - struct MEventBuffer_3120_Sub * unk_1C; - struct MEventStruct_Unk1442CC * unk_20; - void * unk_24; - u32 unk_28; - void * unk_2C; - u32 unk_30; - void * unk_34; - struct mevent_srv_sub unk_38; + void * recvBuffer; + struct MEventBuffer_32E0_Sub * mevent_32e0; + struct MEventBuffer_3120_Sub * mevent_3120; + struct MEventStruct_Unk1442CC * mevent_unk1442cc; + void * sendBuffer1; + u32 sendBuffer1Size; + void * sendBuffer2; + u32 sendBuffer2Size; + u32 sendWord; + struct mevent_srv_sub manager; }; u32 mevent_srv_sub_recv(struct mevent_srv_sub * svr); @@ -83,17 +83,13 @@ void mevent_srv_sub_init(struct mevent_srv_sub * svr, u32 sendPlayerNo, u32 recv void mevent_srv_sub_init_send(struct mevent_srv_sub * svr, u32 ident, const void * src, u32 size); void mevent_srv_sub_init_recv(struct mevent_srv_sub * svr, u32 ident, void * dest); -void sub_8144AEC(void); -u32 sub_8144B0C(u16 * a0); -void sub_8144B48(void); -void * sub_8144B58(void); -void sub_8144B64(u32 a0); -void sub_8144F1C(void); -void sub_8144F40(void); -u32 sub_8144F64(u16 * a0); - -extern const u8 gUnknown_84687E0[]; -extern const u8 gUnknown_8468B6C[]; -extern const u8 gUnknown_8468BCC[]; +void mevent_srv_ish_do_init(void); +u32 mevent_srv_ish_do_exec(u16 * a0); +void mevent_srv_ish_inc_flag(void); +void * mevent_srv_ish_get_buffer(void); +void mevent_srv_ish_set_param(u32 a0); +void mevent_srv_common_do_init_1(void); +void mevent_srv_common_do_init_2(void); +u32 mevent_srv_init_do_exec(u16 * a0); #endif //GUARD_MEVENT_SERVER_H diff --git a/src/mevent_server.c b/src/mevent_server.c index fff22acdb..d5a9a0c0e 100644 --- a/src/mevent_server.c +++ b/src/mevent_server.c @@ -11,84 +11,88 @@ #include "mevent.h" #include "mevent_server.h" -EWRAM_DATA struct mevent_srv_ish * gUnknown_203F3C0 = NULL; -EWRAM_DATA struct mevent_srv_common * gUnknown_203F3C4 = NULL; +EWRAM_DATA struct mevent_srv_ish * s_mevent_srv_ish_ptr = NULL; +EWRAM_DATA struct mevent_srv_common * s_mevent_srv_common_ptr = NULL; static void mevent_srv_ish_init(struct mevent_srv_ish *, u32, u32); static u32 mevent_srv_ish_exec(struct mevent_srv_ish *); -static void sub_8144BC0(struct mevent_srv_ish *); +static void mevent_srv_ish_free_resources(struct mevent_srv_ish *); static void mevent_srv_init_common(struct mevent_srv_common *, const void *, u32, u32); static void mevent_srv_free_resources(struct mevent_srv_common *); -static u32 sub_8145600(struct mevent_srv_common *); +static u32 mevent_srv_exec_common(struct mevent_srv_common *); -void sub_8144AEC(void) +extern const u8 gUnknown_84687E0[]; +extern const struct mevent_cmd gUnknown_8468B6C[]; +extern const struct mevent_cmd gUnknown_8468BCC[]; + +void mevent_srv_ish_do_init(void) { - gUnknown_203F3C0 = AllocZeroed(sizeof(struct mevent_srv_ish)); - mevent_srv_ish_init(gUnknown_203F3C0, 1, 0); + s_mevent_srv_ish_ptr = AllocZeroed(sizeof(struct mevent_srv_ish)); + mevent_srv_ish_init(s_mevent_srv_ish_ptr, 1, 0); } -u32 sub_8144B0C(u16 * a0) +u32 mevent_srv_ish_do_exec(u16 * a0) { u32 result; - if (gUnknown_203F3C0 == NULL) + if (s_mevent_srv_ish_ptr == NULL) return 6; - result = mevent_srv_ish_exec(gUnknown_203F3C0); + result = mevent_srv_ish_exec(s_mevent_srv_ish_ptr); if (result == 6) { - *a0 = gUnknown_203F3C0->unk_04; - sub_8144BC0(gUnknown_203F3C0); - Free(gUnknown_203F3C0); - gUnknown_203F3C0 = NULL; + *a0 = s_mevent_srv_ish_ptr->param; + mevent_srv_ish_free_resources(s_mevent_srv_ish_ptr); + Free(s_mevent_srv_ish_ptr); + s_mevent_srv_ish_ptr = NULL; } return result; } -void sub_8144B48(void) +void mevent_srv_ish_inc_flag(void) { - gUnknown_203F3C0->unk_0C++; + s_mevent_srv_ish_ptr->flag++; } -void * sub_8144B58(void) +void * mevent_srv_ish_get_buffer(void) { - return gUnknown_203F3C0->unk_20; + return s_mevent_srv_ish_ptr->buffer; } -void sub_8144B64(u32 a0) +void mevent_srv_ish_set_param(u32 a0) { - gUnknown_203F3C0->unk_04 = a0; + s_mevent_srv_ish_ptr->param = a0; } -static void mevent_srv_ish_init(struct mevent_srv_ish * svr, u32 a1, u32 a2) +static void mevent_srv_ish_init(struct mevent_srv_ish * svr, u32 sendPlayerNo, u32 recvPlayerNo) { svr->unk_00 = 0; svr->mainseqno = 0; - svr->unk_0C = 0; - svr->unk_14 = AllocZeroed(ME_SEND_BUF_SIZE); - svr->unk_18 = AllocZeroed(ME_SEND_BUF_SIZE); + svr->flag = 0; + svr->sendBuffer = AllocZeroed(ME_SEND_BUF_SIZE); + svr->recvBuffer = AllocZeroed(ME_SEND_BUF_SIZE); svr->cmdBuffer = AllocZeroed(ME_SEND_BUF_SIZE); - svr->unk_20 = AllocZeroed(0x40); - mevent_srv_sub_init(&svr->unk_24, a1, a2); + svr->buffer = AllocZeroed(0x40); + mevent_srv_sub_init(&svr->manager, sendPlayerNo, recvPlayerNo); } -static void sub_8144BC0(struct mevent_srv_ish * svr) +static void mevent_srv_ish_free_resources(struct mevent_srv_ish * svr) { - Free(svr->unk_14); - Free(svr->unk_18); + Free(svr->sendBuffer); + Free(svr->recvBuffer); Free(svr->cmdBuffer); - Free(svr->unk_20); + Free(svr->buffer); } -static void sub_8144BE4(struct mevent_srv_ish * svr) +static void mevent_srv_ish_jmp_buffer(struct mevent_srv_ish * svr) { - memcpy(svr->cmdBuffer, svr->unk_18, ME_SEND_BUF_SIZE); + memcpy(svr->cmdBuffer, svr->recvBuffer, ME_SEND_BUF_SIZE); svr->cmdidx = 0; } -static void sub_8144C00(struct mevent_srv_ish * svr, u32 a1, u32 a2) +static void mevent_srv_ish_send_word(struct mevent_srv_ish * svr, u32 ident, u32 word) { - CpuFill32(0, svr->unk_14, ME_SEND_BUF_SIZE); - *(u32 *)svr->unk_14 = a2; - mevent_srv_sub_init_send(&svr->unk_24, a1, svr->unk_14, 4); + CpuFill32(0, svr->sendBuffer, ME_SEND_BUF_SIZE); + *(u32 *)svr->sendBuffer = word; + mevent_srv_sub_init_send(&svr->manager, ident, svr->sendBuffer, sizeof(u32)); } static u32 ish_mainseq_0(struct mevent_srv_ish * svr) @@ -97,7 +101,7 @@ static u32 ish_mainseq_0(struct mevent_srv_ish * svr) memcpy(svr->cmdBuffer, gUnknown_84687E0, ME_SEND_BUF_SIZE); svr->cmdidx = 0; svr->mainseqno = 4; - svr->unk_0C = 0; + svr->flag = 0; return 0; } @@ -110,10 +114,10 @@ static u32 ish_mainseq_1(struct mevent_srv_ish * svr) static u32 ish_mainseq_2(struct mevent_srv_ish * svr) { // do recv - if (mevent_srv_sub_recv(&svr->unk_24)) + if (mevent_srv_sub_recv(&svr->manager)) { svr->mainseqno = 4; - svr->unk_0C = 0; + svr->flag = 0; } return 1; } @@ -121,10 +125,10 @@ static u32 ish_mainseq_2(struct mevent_srv_ish * svr) static u32 ish_mainseq_3(struct mevent_srv_ish * svr) { // do send - if (mevent_srv_sub_send(&svr->unk_24)) + if (mevent_srv_sub_send(&svr->manager)) { svr->mainseqno = 4; - svr->unk_0C = 0; + svr->flag = 0; } return 1; } @@ -139,96 +143,96 @@ static u32 ish_mainseq_4(struct mevent_srv_ish * svr) case 0: break; case 1: - svr->unk_04 = cmd->parameter; + svr->param = cmd->parameter; svr->mainseqno = 1; - svr->unk_0C = 0; + svr->flag = 0; break; case 2: - mevent_srv_sub_init_recv(&svr->unk_24, cmd->parameter, svr->unk_18); + mevent_srv_sub_init_recv(&svr->manager, cmd->parameter, svr->recvBuffer); svr->mainseqno = 2; - svr->unk_0C = 0; + svr->flag = 0; break; case 3: svr->mainseqno = 3; - svr->unk_0C = 0; + svr->flag = 0; break; case 20: - mevent_srv_sub_init_send(&svr->unk_24, 0x14, svr->unk_14, 0); + mevent_srv_sub_init_send(&svr->manager, 0x14, svr->sendBuffer, 0); svr->mainseqno = 3; - svr->unk_0C = 0; + svr->flag = 0; break; case 19: - sub_8144C00(svr, 0x12, GetGameStat(cmd->parameter)); + mevent_srv_ish_send_word(svr, 0x12, GetGameStat(cmd->parameter)); svr->mainseqno = 3; - svr->unk_0C = 0; + svr->flag = 0; break; case 6: - if (svr->unk_04 == 0) - sub_8144BE4(svr); + if (svr->param == 0) + mevent_srv_ish_jmp_buffer(svr); break; case 7: - if (svr->unk_04 == 1) - sub_8144BE4(svr); + if (svr->param == 1) + mevent_srv_ish_jmp_buffer(svr); break; case 4: - sub_8144BE4(svr); + mevent_srv_ish_jmp_buffer(svr); break; case 5: - memcpy(svr->unk_20, svr->unk_18, 0x40); + memcpy(svr->buffer, svr->recvBuffer, 0x40); svr->mainseqno = 5; - svr->unk_0C = 0; + svr->flag = 0; return 2; case 11: - memcpy(svr->unk_20, svr->unk_18, 0x40); + memcpy(svr->buffer, svr->recvBuffer, 0x40); svr->mainseqno = 5; - svr->unk_0C = 0; + svr->flag = 0; return 3; case 12: - memcpy(svr->unk_20, svr->unk_18, 0x40); + memcpy(svr->buffer, svr->recvBuffer, 0x40); svr->mainseqno = 5; - svr->unk_0C = 0; + svr->flag = 0; return 5; case 13: svr->mainseqno = 5; - svr->unk_0C = 0; + svr->flag = 0; return 4; case 8: - sub_81442CC(svr->unk_14); - mevent_srv_sub_init_send(&svr->unk_24, 0x11, svr->unk_14, 0x64); + sub_81442CC(svr->sendBuffer); + mevent_srv_sub_init_send(&svr->manager, 0x11, svr->sendBuffer, sizeof(struct MEventStruct_Unk1442CC)); break; case 14: - sub_8144C00(svr, 0x13, svr->unk_04); + mevent_srv_ish_send_word(svr, 0x13, svr->param); break; case 10: - sub_8143F68(svr->unk_18); + sub_8143F68(svr->recvBuffer); break; case 9: - if (!sub_8143EF4(svr->unk_18)) + if (!sub_8143EF4(svr->recvBuffer)) { - sub_8143DC8(svr->unk_18); - sub_8144C00(svr, 0x13, 0); + sub_8143DC8(svr->recvBuffer); + mevent_srv_ish_send_word(svr, 0x13, 0); } else - sub_8144C00(svr, 0x13, 1); + mevent_srv_ish_send_word(svr, 0x13, 1); break; case 15: svr->mainseqno = 6; - svr->unk_0C = 0; + svr->flag = 0; break; case 16: - sub_8144254(svr->unk_18); + sub_8144254(svr->recvBuffer); break; case 17: - sub_8069EA4(svr->unk_18, 1000); + sub_8069EA4(svr->recvBuffer, 1000); break; case 18: - memcpy(gSaveBlock2Ptr->unk_4A0, svr->unk_18, 0xbc); + memcpy(gSaveBlock2Ptr->unk_4A0, svr->recvBuffer, 0xbc); sub_80E7490(); break; case 21: - memcpy(gDecompressionBuffer, svr->unk_18, ME_SEND_BUF_SIZE); + memcpy(gDecompressionBuffer, svr->recvBuffer, ME_SEND_BUF_SIZE); svr->mainseqno = 7; - svr->unk_0C = 0; + svr->flag = 0; break; } @@ -237,11 +241,11 @@ static u32 ish_mainseq_4(struct mevent_srv_ish * svr) static u32 ish_mainseq_5(struct mevent_srv_ish * svr) { - // wait unk_0C - if (svr->unk_0C) + // wait flag + if (svr->flag) { svr->mainseqno = 4; - svr->unk_0C = 0; + svr->flag = 0; } return 1; } @@ -249,17 +253,17 @@ static u32 ish_mainseq_5(struct mevent_srv_ish * svr) static u32 ish_mainseq_6(struct mevent_srv_ish * svr) { // ??? - switch (svr->unk_0C) + switch (svr->flag) { case 0: - sub_80DA89C(svr->unk_18); - ++svr->unk_0C; + sub_80DA89C(svr->recvBuffer); + ++svr->flag; break; case 1: - if (!sub_80DA8B0(&svr->unk_04)) + if (!sub_80DA8B0(&svr->param)) { svr->mainseqno = 4; - svr->unk_0C = 0; + svr->flag = 0; } break; } @@ -270,10 +274,10 @@ static u32 ish_mainseq_7(struct mevent_srv_ish * svr) { // exec arbitrary code u32 (*func)(u32 *, struct SaveBlock2 *, struct SaveBlock1 *) = (void *)gDecompressionBuffer; - if (func(&svr->unk_04, gSaveBlock2Ptr, gSaveBlock1Ptr) == 1) + if (func(&svr->param, gSaveBlock2Ptr, gSaveBlock1Ptr) == 1) { svr->mainseqno = 4; - svr->unk_0C = 0; + svr->flag = 0; } return 1; } @@ -293,62 +297,62 @@ static u32 mevent_srv_ish_exec(struct mevent_srv_ish * svr) return funcs[svr->mainseqno](svr); } -void sub_8144F1C(void) +void mevent_srv_common_do_init_1(void) { - gUnknown_203F3C4 = AllocZeroed(sizeof(struct mevent_srv_common)); - mevent_srv_init_common(gUnknown_203F3C4, gUnknown_8468B6C, 0, 1); + s_mevent_srv_common_ptr = AllocZeroed(sizeof(struct mevent_srv_common)); + mevent_srv_init_common(s_mevent_srv_common_ptr, gUnknown_8468B6C, 0, 1); } -void sub_8144F40(void) +void mevent_srv_common_do_init_2(void) { - gUnknown_203F3C4 = AllocZeroed(sizeof(struct mevent_srv_common)); - mevent_srv_init_common(gUnknown_203F3C4, gUnknown_8468BCC, 0, 1); + s_mevent_srv_common_ptr = AllocZeroed(sizeof(struct mevent_srv_common)); + mevent_srv_init_common(s_mevent_srv_common_ptr, gUnknown_8468BCC, 0, 1); } -u32 sub_8144F64(u16 * a0) +u32 mevent_srv_init_do_exec(u16 * a0) { u32 result; - if (gUnknown_203F3C4 == NULL) + if (s_mevent_srv_common_ptr == NULL) return 3; - result = sub_8145600(gUnknown_203F3C4); + result = mevent_srv_exec_common(s_mevent_srv_common_ptr); if (result == 3) { - *a0 = gUnknown_203F3C4->unk_04; - mevent_srv_free_resources(gUnknown_203F3C4); - Free(gUnknown_203F3C4); - gUnknown_203F3C4 = NULL; + *a0 = s_mevent_srv_common_ptr->param; + mevent_srv_free_resources(s_mevent_srv_common_ptr); + Free(s_mevent_srv_common_ptr); + s_mevent_srv_common_ptr = NULL; } return result; } -static void mevent_srv_init_common(struct mevent_srv_common * svr, const void * a1, u32 a2, u32 a3) +static void mevent_srv_init_common(struct mevent_srv_common * svr, const void * cmdBuffer, u32 sendPlayerNo, u32 recvPlayerNo) { svr->unk_00 = 0; svr->mainseqno = 0; - svr->unk_18 = AllocZeroed(332); - svr->unk_1C = AllocZeroed(444); - svr->unk_14 = AllocZeroed(ME_SEND_BUF_SIZE); - svr->unk_20 = AllocZeroed(100); - svr->cmdBuffer = a1; + svr->mevent_32e0 = AllocZeroed(sizeof(struct MEventBuffer_32E0_Sub)); + svr->mevent_3120 = AllocZeroed(sizeof(struct MEventBuffer_3120_Sub)); + svr->recvBuffer = AllocZeroed(ME_SEND_BUF_SIZE); + svr->mevent_unk1442cc = AllocZeroed(sizeof(struct MEventStruct_Unk1442CC)); + svr->cmdBuffer = cmdBuffer; svr->cmdidx = 0; - mevent_srv_sub_init(&svr->unk_38, a2, a3); + mevent_srv_sub_init(&svr->manager, sendPlayerNo, recvPlayerNo); } static void mevent_srv_free_resources(struct mevent_srv_common * svr) { - Free(svr->unk_18); - Free(svr->unk_1C); - Free(svr->unk_14); - Free(svr->unk_20); + Free(svr->mevent_32e0); + Free(svr->mevent_3120); + Free(svr->recvBuffer); + Free(svr->mevent_unk1442cc); } -static void sub_814501C(struct mevent_srv_common * svr, u32 a1, void * a2, u32 size) +static void mevent_srv_common_init_send(struct mevent_srv_common * svr, u32 ident, const void * src, u32 size) { AGB_ASSERT_EX(size <= ME_SEND_BUF_SIZE, "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/mevent_server.c", 257); - mevent_srv_sub_init_send(&svr->unk_38, a1, a2, size); + mevent_srv_sub_init_send(&svr->manager, ident, src, size); } -static void * sub_814505C(void * a0, void * a1) +static void * mevent_first_if_not_null_else_second(void * a0, void * a1) { if (a0 != NULL) return a0; @@ -356,7 +360,7 @@ static void * sub_814505C(void * a0, void * a1) return a1; } -static u32 sub_8145068(void * a0, void * a1) +static u32 mevent_compare_pointers(void * a0, void * a1) { if (a1 < a0) return 0; @@ -382,7 +386,7 @@ static u32 common_mainseq_1(struct mevent_srv_common * svr) static u32 common_mainseq_2(struct mevent_srv_common * svr) { // do recv - if (mevent_srv_sub_recv(&svr->unk_38)) + if (mevent_srv_sub_recv(&svr->manager)) svr->mainseqno = 4; return 1; } @@ -390,7 +394,7 @@ static u32 common_mainseq_2(struct mevent_srv_common * svr) static u32 common_mainseq_3(struct mevent_srv_common * svr) { // do send - if (mevent_srv_sub_send(&svr->unk_38)) + if (mevent_srv_sub_send(&svr->manager)) svr->mainseqno = 4; return 1; } @@ -407,14 +411,14 @@ static u32 common_mainseq_4(struct mevent_srv_common * svr) case 0: AGB_ASSERT_EX(cmd->parameter == NULL, "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/mevent_server.c", 354); svr->mainseqno = 1; - svr->unk_04 = cmd->flag; + svr->param = cmd->flag; break; case 1: svr->mainseqno = 3; break; case 2: AGB_ASSERT_EX(cmd->parameter == NULL, "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/mevent_server.c", 364); - mevent_srv_sub_init_recv(&svr->unk_38, cmd->flag, svr->unk_14); + mevent_srv_sub_init_recv(&svr->manager, cmd->flag, svr->recvBuffer); svr->mainseqno = 2; break; case 3: @@ -425,15 +429,15 @@ static u32 common_mainseq_4(struct mevent_srv_common * svr) case 5: AGB_ASSERT_EX(cmd->flag == FALSE, "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/mevent_server.c", 376); AGB_ASSERT_EX(cmd->parameter == NULL, "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/mevent_server.c", 377); - memcpy(svr->unk_20, svr->unk_14, 100); + memcpy(svr->mevent_unk1442cc, svr->recvBuffer, sizeof(struct MEventStruct_Unk1442CC)); break; case 6: AGB_ASSERT_EX(cmd->flag == FALSE, "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/mevent_server.c", 382); AGB_ASSERT_EX(cmd->parameter == NULL, "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/mevent_server.c", 383); - svr->unk_04 = sub_81443D4(svr->unk_20); + svr->param = sub_81443D4(svr->mevent_unk1442cc); break; case 4: - if (svr->unk_04 == cmd->flag) + if (svr->param == cmd->flag) { svr->cmdidx = 0; svr->cmdBuffer = cmd->parameter; @@ -441,100 +445,100 @@ static u32 common_mainseq_4(struct mevent_srv_common * svr) break; case 7: AGB_ASSERT_EX(cmd->flag == FALSE, "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/mevent_server.c", 396); - ptr = sub_814505C(cmd->parameter, svr->unk_18); - svr->unk_04 = sub_8144418(ptr, svr->unk_20, ptr); + ptr = mevent_first_if_not_null_else_second(cmd->parameter, svr->mevent_32e0); + svr->param = sub_8144418(ptr, svr->mevent_unk1442cc, ptr); break; case 8: AGB_ASSERT_EX(cmd->flag == FALSE, "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/mevent_server.c", 402); AGB_ASSERT_EX(cmd->parameter == NULL, "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/mevent_server.c", 403); - svr->unk_04 = *(u32 *)svr->unk_14; + svr->param = *(u32 *)svr->recvBuffer; break; case 9: AGB_ASSERT_EX(cmd->flag == FALSE, "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/mevent_server.c", 408); - ptr = sub_814505C(cmd->parameter, &svr->unk_34); - svr->unk_04 = sub_8144434(ptr, svr->unk_20, ptr); + ptr = mevent_first_if_not_null_else_second(cmd->parameter, &svr->sendWord); + svr->param = sub_8144434(ptr, svr->mevent_unk1442cc, ptr); break; case 10: AGB_ASSERT_EX(cmd->parameter == NULL, "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/mevent_server.c", 415); - svr->unk_04 = sub_81444B0(svr->unk_20, cmd->flag); + svr->param = sub_81444B0(svr->mevent_unk1442cc, cmd->flag); break; case 11: AGB_ASSERT_EX(cmd->flag == FALSE, "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/mevent_server.c", 420); - svr->unk_04 = sub_8144474(svr->unk_20, cmd->parameter); + svr->param = sub_8144474(svr->mevent_unk1442cc, cmd->parameter); break; case 12: AGB_ASSERT_EX(cmd->flag == FALSE, "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/mevent_server.c", 426); - svr->unk_04 = sub_8145068(cmd->parameter, *(void **)svr->unk_14); + svr->param = mevent_compare_pointers(cmd->parameter, *(void **)svr->recvBuffer); break; case 14: AGB_ASSERT_EX(cmd->flag == FALSE, "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/mevent_server.c", 432); - sub_814501C(svr, 0x17, sub_814505C(cmd->parameter, svr->unk_1C), 444); + mevent_srv_common_init_send(svr, 0x17, mevent_first_if_not_null_else_second(cmd->parameter, svr->mevent_3120), sizeof(struct MEventBuffer_3120_Sub)); break; case 13: AGB_ASSERT_EX(cmd->flag == FALSE, "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/mevent_server.c", 438); - sub_814501C(svr, 0x16, sub_814505C(cmd->parameter, svr->unk_18), 332); + mevent_srv_common_init_send(svr, 0x16, mevent_first_if_not_null_else_second(cmd->parameter, svr->mevent_32e0), sizeof(struct MEventBuffer_32E0_Sub)); break; case 16: AGB_ASSERT_EX(cmd->flag == FALSE, "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/mevent_server.c", 444); - sub_814501C(svr, 0x18, sub_814505C(cmd->parameter, &svr->unk_34), 4); + mevent_srv_common_init_send(svr, 0x18, mevent_first_if_not_null_else_second(cmd->parameter, &svr->sendWord), 4); break; case 15: if (cmd->parameter == NULL) - sub_814501C(svr, 0x19, svr->unk_24, svr->unk_28); + mevent_srv_common_init_send(svr, 0x19, svr->sendBuffer1, svr->sendBuffer1Size); else - sub_814501C(svr, 0x19, cmd->parameter, cmd->flag); + mevent_srv_common_init_send(svr, 0x19, cmd->parameter, cmd->flag); break; case 18: if (cmd->parameter == NULL) - sub_814501C(svr, 0x10, svr->unk_2C, svr->unk_30); + mevent_srv_common_init_send(svr, 0x10, svr->sendBuffer2, svr->sendBuffer2Size); else - sub_814501C(svr, 0x10, cmd->parameter, cmd->flag); + mevent_srv_common_init_send(svr, 0x10, cmd->parameter, cmd->flag); break; case 19: AGB_ASSERT_EX(cmd->flag == FALSE, "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/mevent_server.c", 466); - sub_814501C(svr, 0x1a, cmd->parameter, 188); + mevent_srv_common_init_send(svr, 0x1a, cmd->parameter, 188); break; case 20: - sub_814501C(svr, 0x15, cmd->parameter, cmd->flag); + mevent_srv_common_init_send(svr, 0x15, cmd->parameter, cmd->flag); break; case 17: - sub_814501C(svr, 0x1c, cmd->parameter, cmd->flag); + mevent_srv_common_init_send(svr, 0x1c, cmd->parameter, cmd->flag); break; case 22: AGB_ASSERT_EX(cmd->flag == FALSE, "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/mevent_server.c", 481); - memcpy(svr->unk_18, cmd->parameter, 332); + memcpy(svr->mevent_32e0, cmd->parameter, 332); break; case 23: AGB_ASSERT_EX(cmd->flag == FALSE, "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/mevent_server.c", 486); - memcpy(svr->unk_1C, cmd->parameter, 444); + memcpy(svr->mevent_3120, cmd->parameter, 444); break; case 21: AGB_ASSERT_EX(cmd->flag == FALSE, "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/mevent_server.c", 491); - svr->unk_34 = *(void **)cmd->parameter; + svr->sendWord = *(u32 *)cmd->parameter; break; case 24: - svr->unk_24 = cmd->parameter; - svr->unk_28 = cmd->flag; + svr->sendBuffer1 = cmd->parameter; + svr->sendBuffer1Size = cmd->flag; break; case 25: - svr->unk_2C = cmd->parameter; - svr->unk_30 = cmd->flag; + svr->sendBuffer2 = cmd->parameter; + svr->sendBuffer2Size = cmd->flag; break; case 26: AGB_ASSERT_EX(cmd->flag == FALSE && cmd->parameter == NULL, "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/mevent_server.c", 506); - memcpy(svr->unk_18, sav1_get_mevent_buffer_1(), 332); - sub_814410C(svr->unk_18); + memcpy(svr->mevent_32e0, sav1_get_mevent_buffer_1(), 332); + sub_814410C(svr->mevent_32e0); break; case 27: AGB_ASSERT_EX(cmd->flag == FALSE && cmd->parameter == NULL, "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/mevent_server.c", 512); - memcpy(svr->unk_1C, sub_8143D58(), 444); + memcpy(svr->mevent_3120, sub_8143D58(), 444); break; case 28: AGB_ASSERT_EX(cmd->flag == FALSE && cmd->parameter == NULL, "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/mevent_server.c", 517); - svr->unk_24 = sub_8069E48(); + svr->sendBuffer1 = sub_8069E48(); break; case 29: - sub_814501C(svr, 0x1b, cmd->parameter, cmd->flag); + mevent_srv_common_init_send(svr, 0x1b, cmd->parameter, cmd->flag); break; } @@ -549,7 +553,7 @@ static u32 (*const func_tbl[])(struct mevent_srv_common *) = { common_mainseq_4 }; -static u32 sub_8145600(struct mevent_srv_common * svr) +static u32 mevent_srv_exec_common(struct mevent_srv_common * svr) { u32 response; AGB_ASSERT_EX(svr->mainseqno < NELEMS(func_tbl), "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/mevent_server.c", 546); diff --git a/src/mevent_server_helpers.c b/src/mevent_server_helpers.c index 7e2119088..35efa68c8 100644 --- a/src/mevent_server_helpers.c +++ b/src/mevent_server_helpers.c @@ -41,10 +41,10 @@ void mevent_srv_sub_init(struct mevent_srv_sub * svr, u32 sendPlayerNo, u32 recv svr->recvFunc = mevent_receive_func; } -void mevent_srv_sub_init_send(struct mevent_srv_sub * svr, u32 a1, const void * src, u32 size) +void mevent_srv_sub_init_send(struct mevent_srv_sub * svr, u32 ident, const void * src, u32 size) { svr->seqno = 0; - svr->sendIdent = a1; + svr->sendIdent = ident; svr->sendCounter = 0; svr->sendCRC = 0; if (size != 0) -- cgit v1.2.3 From 884f1934e8bf34813701f745140f1d8429e8beaf Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sun, 2 Dec 2018 10:02:39 -0500 Subject: start decompiling mevent_8145654 --- asm/mevent_8145654.s | 108 ----------------------------------------- data/data_8466FB8.s | 133 ++++++++++++++++++++++++++++++++++++++++++++++++--- include/global.h | 2 +- ld_script.txt | 2 + src/mevent_8145654.c | 52 ++++++++++++++++++++ 5 files changed, 182 insertions(+), 115 deletions(-) create mode 100644 src/mevent_8145654.c diff --git a/asm/mevent_8145654.s b/asm/mevent_8145654.s index ccb86ba64..51e90677a 100644 --- a/asm/mevent_8145654.s +++ b/asm/mevent_8145654.s @@ -5,114 +5,6 @@ .text - thumb_func_start sub_8145654 -sub_8145654: @ 8145654 - push {r4-r7,lr} - adds r5, r0, 0 - adds r6, r1, 0 - cmp r5, 0 - beq _08145670 - cmp r6, 0 - beq _08145670 - ldr r7, _08145674 @ =gUnknown_203F3C8 - ldr r0, _08145678 @ =0x0000145c - bl AllocZeroed - str r0, [r7] - cmp r0, 0 - bne _0814567C -_08145670: - movs r0, 0 - b _081456E6 - .align 2, 0 -_08145674: .4byte gUnknown_203F3C8 -_08145678: .4byte 0x0000145c -_0814567C: - movs r4, 0xA6 - lsls r4, 1 - adds r1, r5, 0 - adds r2, r4, 0 - bl memcpy - ldr r1, [r7] - adds r1, r4 - adds r0, r6, 0 - ldm r0!, {r2-r4} - stm r1!, {r2-r4} - ldm r0!, {r2-r4} - stm r1!, {r2-r4} - ldm r0!, {r2-r4} - stm r1!, {r2-r4} - ldr r2, [r7] - ldrb r1, [r2, 0x8] - lsls r0, r1, 26 - lsrs r0, 28 - cmp r0, 0x7 - bls _081456AE - movs r0, 0x3D - negs r0, r0 - ands r0, r1 - strb r0, [r2, 0x8] -_081456AE: - ldr r2, [r7] - ldrb r1, [r2, 0x8] - lsls r0, r1, 30 - lsrs r0, 30 - cmp r0, 0x2 - bls _081456C2 - movs r0, 0x4 - negs r0, r0 - ands r0, r1 - strb r0, [r2, 0x8] -_081456C2: - ldr r1, [r7] - ldrb r0, [r1, 0x9] - cmp r0, 0x7 - bls _081456CE - movs r0, 0 - strb r0, [r1, 0x9] -_081456CE: - ldr r0, [r7] - movs r1, 0xB8 - lsls r1, 1 - adds r2, r0, r1 - ldrb r0, [r0, 0x8] - lsls r0, 26 - lsrs r0, 28 - lsls r0, 4 - ldr r1, _081456EC @ =gUnknown_8467FB8 - adds r0, r1 - str r0, [r2] - movs r0, 0x1 -_081456E6: - pop {r4-r7} - pop {r1} - bx r1 - .align 2, 0 -_081456EC: .4byte gUnknown_8467FB8 - thumb_func_end sub_8145654 - - thumb_func_start sub_81456F0 -sub_81456F0: @ 81456F0 - push {r4,lr} - ldr r4, _08145714 @ =gUnknown_203F3C8 - ldr r0, [r4] - cmp r0, 0 - beq _0814570C - ldr r2, _08145718 @ =0x0000145c - movs r1, 0 - bl memset - ldr r0, [r4] - bl Free - movs r0, 0 - str r0, [r4] -_0814570C: - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_08145714: .4byte gUnknown_203F3C8 -_08145718: .4byte 0x0000145c - thumb_func_end sub_81456F0 - thumb_func_start sub_814571C sub_814571C: @ 814571C push {r4-r6,lr} diff --git a/data/data_8466FB8.s b/data/data_8466FB8.s index ee830ca04..6883ab138 100644 --- a/data/data_8466FB8.s +++ b/data/data_8466FB8.s @@ -5,13 +5,78 @@ .align 2 gUnknown_8467068:: @ 8467068 - .incbin "baserom.gba", 0x467068, 0x8 + .byte 0x00, 0x02, 0x03 + .byte 0x00, 0x01, 0x02 + .align 2 gUnknown_8467070:: @ 8467070 - .incbin "baserom.gba", 0x467070, 0x4 + .byte 0x07, 0x04, 0x07 + .align 2 gUnknown_8467074:: @ 8467074 - .incbin "baserom.gba", 0x467074, 0xEE4 + @ {0x01, 0x01, 0x01, 0x19, 0x04, 0x0f, 0x029c}, + @ {0x01, 0x01, 0x06, 0x1c, 0x08, 0x0f, 0x01bc}, + @ {0x01, 0x01, 0x0e, 0x1c, 0x05, 0x0f, 0x0130} + .byte 0x01, 0x01, 0x01, 0x19, 0x04, 0x0f + .2byte 0x029c + .byte 0x01, 0x01, 0x06, 0x1c, 0x08, 0x0f + .2byte 0x01bc + .byte 0x01, 0x01, 0x0e, 0x1c, 0x05, 0x0f + .2byte 0x0130 + +gUnknown_846708C:: + .incbin "baserom.gba", 0x46708c, 0x20 + +gUnknown_84670AC:: + .incbin "baserom.gba", 0x4670ac, 0x20 + +gUnknown_84670CC:: + .incbin "baserom.gba", 0x4670cc, 0x20 + +gUnknown_84670EC:: + .incbin "baserom.gba", 0x4670ec, 0x20 + +gUnknown_846710C:: + .incbin "baserom.gba", 0x46710c, 0x20 + +gUnknown_846712C:: + .incbin "baserom.gba", 0x46712c, 0x20 + +gUnknown_846714C:: + .incbin "baserom.gba", 0x46714c, 0x20 + +gUnknown_846716C:: + .incbin "baserom.gba", 0x46716c, 0x20 + +gUnknown_846718C:: + .incbin "baserom.gba", 0x46718c, 0xFC + +gUnknown_8467288:: + .incbin "baserom.gba", 0x467288, 0xF4 + +gUnknown_846737C:: + .incbin "baserom.gba", 0x46737c, 0xF4 + +gUnknown_8467470:: + .incbin "baserom.gba", 0x467470, 0xE8 + +gUnknown_8467558:: + .incbin "baserom.gba", 0x467558, 0xD4 + +gUnknown_846762C:: + .incbin "baserom.gba", 0x46762c, 0xD4 + +gUnknown_8467700:: + .incbin "baserom.gba", 0x467700, 0x234 + +gUnknown_8467934:: + .incbin "baserom.gba", 0x467934, 0x148 + +gUnknown_8467A7C:: + .incbin "baserom.gba", 0x467a7c, 0x230 + +gUnknown_8467CAC:: + .incbin "baserom.gba", 0x467cac, 0x2AC gUnknown_8467F58:: @ 8467F58 .incbin "baserom.gba", 0x467F58, 0x8 @@ -23,7 +88,14 @@ gUnknown_8467FA0:: @ 8467FA0 .incbin "baserom.gba", 0x467FA0, 0x18 gUnknown_8467FB8:: @ 8467FB8 - .incbin "baserom.gba", 0x467FB8, 0x80 + .4byte 0x0001, gUnknown_846718C, gUnknown_8467288, gUnknown_846708C + .4byte 0x1001, gUnknown_846737C, gUnknown_8467470, gUnknown_84670AC + .4byte 0x2001, gUnknown_8467558, gUnknown_846762C, gUnknown_84670CC + .4byte 0x3001, gUnknown_8467558, gUnknown_846762C, gUnknown_84670EC + .4byte 0x4001, gUnknown_8467558, gUnknown_846762C, gUnknown_846710C + .4byte 0x5001, gUnknown_8467558, gUnknown_846762C, gUnknown_846712C + .4byte 0x6001, gUnknown_8467700, gUnknown_8467934, gUnknown_846714C + .4byte 0x7001, gUnknown_8467A7C, gUnknown_8467CAC, gUnknown_846716C gUnknown_8468038:: @ 8468038 .incbin "baserom.gba", 0x468038, 0x8 @@ -32,10 +104,59 @@ gUnknown_8468040:: @ 8468040 .incbin "baserom.gba", 0x468040, 0x10 gUnknown_8468050:: @ 8468050 - .incbin "baserom.gba", 0x468050, 0x6D0 + .incbin "baserom.gba", 0x468050, 0x10 + +gUnknown_8468060:: + .incbin "baserom.gba", 0x468060, 0x20 + +gUnknown_8468080:: + .incbin "baserom.gba", 0x468080, 0x20 + +gUnknown_84680A0:: + .incbin "baserom.gba", 0x4680A0, 0x20 + +gUnknown_84680C0:: + .incbin "baserom.gba", 0x4680C0, 0x80 + +gUnknown_8468140:: + .incbin "baserom.gba", 0x468140, 0xdc + +gUnknown_846821C:: + .incbin "baserom.gba", 0x46821C, 0x30 + +gUnknown_846824C:: + .incbin "baserom.gba", 0x46824C, 0xc0 + +gUnknown_846830C:: + .incbin "baserom.gba", 0x46830C, 0x70 + +gUnknown_846837C:: + .incbin "baserom.gba", 0x46837C, 0xcc + +gUnknown_8468448:: + .incbin "baserom.gba", 0x468448, 0x90 + +gUnknown_84684D8:: + .incbin "baserom.gba", 0x4684D8, 0xdc + +gUnknown_84685B4:: + .incbin "baserom.gba", 0x4685B4, 0x90 + +gUnknown_8468644:: + .incbin "baserom.gba", 0x468644, 0xdc gUnknown_8468720:: @ 8468720 - .incbin "baserom.gba", 0x468720, 0xC0 + .4byte 1, gUnknown_84680C0, gUnknown_8468140, gUnknown_8468060 + .4byte 1, gUnknown_846821C, gUnknown_846824C, gUnknown_84670AC + .4byte 1, gUnknown_846830C, gUnknown_846837C, gUnknown_84670CC + .4byte 1, gUnknown_846830C, gUnknown_846837C, gUnknown_84670EC + .4byte 1, gUnknown_846830C, gUnknown_846837C, gUnknown_846710C + .4byte 1, gUnknown_846830C, gUnknown_846837C, gUnknown_846712C + .4byte 1, gUnknown_8468448, gUnknown_84684D8, gUnknown_8468080 + .4byte 1, gUnknown_84685B4, gUnknown_8468644, gUnknown_84680A0 + +gUnknown_84687A0:: + .incbin "baserom.gba", 0x4687a0, 0x40 .include "data/mevent/script_ish.inc" .include "data/mevent/script_common.inc" diff --git a/include/global.h b/include/global.h index 5b07796cc..7c663a813 100644 --- a/include/global.h +++ b/include/global.h @@ -599,7 +599,7 @@ struct MEventBuffer_3120_Sub { u16 unk_00; u8 unk_02; - u16 filler_04[220]; + u8 filler_04[440]; }; struct MEventBuffer_3120 diff --git a/ld_script.txt b/ld_script.txt index 87d5fd323..8d88929cf 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -246,6 +246,7 @@ SECTIONS { src/mevent.o(.text); src/mevent_server_helpers.o(.text); src/mevent_server.o(.text); + src/mevent_8145654.o(.text); asm/mevent_8145654.o(.text); src/menews_jisan.o(.text); asm/seagallop.o(.text); @@ -382,6 +383,7 @@ SECTIONS { src/mevent.o(.rodata); src/mevent_server_helpers.o(.rodata); src/mevent_server.o(.rodata); + src/mevent_8145654.o(.rodata); data/data_8466FB8.o(.rodata); src/menews_jisan.o(.rodata); src/menews_jisan.o(.rodata.str1.4); diff --git a/src/mevent_8145654.c b/src/mevent_8145654.c new file mode 100644 index 000000000..9c26a21a1 --- /dev/null +++ b/src/mevent_8145654.c @@ -0,0 +1,52 @@ +#include "global.h" +#include "malloc.h" +#include "mevent.h" + +struct UnkStruct_8467FB8 +{ + u16 ident; + const void * unk_04; + const void * unk_08; + const void * unk_0C; +}; + +struct UnkStruct_203F3C8 +{ + /*0000*/ struct MEventBuffer_32E0_Sub unk_0000; + /*014c*/ struct MEventBuffer_3430_Sub unk_014c; + /*0170*/ const struct UnkStruct_8467FB8 * unk_0170; + /*0174*/ u8 filler_0174[0x12E8]; +}; + +EWRAM_DATA struct UnkStruct_203F3C8 * gUnknown_203F3C8 = NULL; + +extern const struct UnkStruct_8467FB8 gUnknown_8467FB8[8]; + +bool32 sub_8145654(struct MEventBuffer_32E0_Sub * r5, struct MEventBuffer_3430_Sub * r6) +{ + if (r5 == NULL || r6 == NULL) + return FALSE; + gUnknown_203F3C8 = AllocZeroed(sizeof(struct UnkStruct_203F3C8)); + if (gUnknown_203F3C8 == NULL) + return FALSE; + gUnknown_203F3C8->unk_0000 = *r5; + gUnknown_203F3C8->unk_014c = *r6; + if (gUnknown_203F3C8->unk_0000.unk_08_2 > 7) + gUnknown_203F3C8->unk_0000.unk_08_2 = 0; + if (gUnknown_203F3C8->unk_0000.unk_08_0 > 2) + gUnknown_203F3C8->unk_0000.unk_08_0 = 0; + if (gUnknown_203F3C8->unk_0000.unk_09 > 7) + gUnknown_203F3C8->unk_0000.unk_09 = 0; + gUnknown_203F3C8->unk_0170 = &gUnknown_8467FB8[gUnknown_203F3C8->unk_0000.unk_08_2]; + return TRUE; +} + +void sub_81456F0(void) +{ + if (gUnknown_203F3C8 != NULL) + { + *gUnknown_203F3C8 = (struct UnkStruct_203F3C8){}; + Free(gUnknown_203F3C8); + gUnknown_203F3C8 = NULL; + } +} -- cgit v1.2.3 From 993df493cd566fb086960ffd763965e130e0a8b9 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sun, 2 Dec 2018 10:09:01 -0500 Subject: use the .pool directive for mevent_8145654.s --- asm/mevent_8145654.s | 400 ++++++++++++++++++++------------------------------- 1 file changed, 154 insertions(+), 246 deletions(-) diff --git a/asm/mevent_8145654.s b/asm/mevent_8145654.s index 51e90677a..00676462f 100644 --- a/asm/mevent_8145654.s +++ b/asm/mevent_8145654.s @@ -9,15 +9,14 @@ sub_814571C: @ 814571C push {r4-r6,lr} sub sp, 0x24 - ldr r5, _08145730 @ =gUnknown_203F3C8 + ldr r5, =gUnknown_203F3C8 ldr r0, [r5] cmp r0, 0 bne _08145734 movs r0, 0x1 negs r0, r0 b _08145930 - .align 2, 0 -_08145730: .4byte gUnknown_203F3C8 + .pool _08145734: movs r4, 0xBA lsls r4, 1 @@ -28,12 +27,11 @@ _08145734: b _08145908 _08145742: lsls r0, 2 - ldr r1, _0814574C @ =_08145750 + ldr r1, =_08145750 adds r0, r1 ldr r0, [r0] mov pc, r0 - .align 2, 0 -_0814574C: .4byte _08145750 + .pool .align 2, 0 _08145750: .4byte _08145770 @@ -91,7 +89,7 @@ _08145790: bl CopyBgTilemapBufferToVram movs r0, 0x2 bl CopyBgTilemapBufferToVram - ldr r5, _0814582C @ =gUnknown_203F3C8 + ldr r5, =gUnknown_203F3C8 ldr r0, [r5] movs r1, 0xB8 lsls r1, 1 @@ -104,7 +102,7 @@ _08145790: movs r2, 0 movs r3, 0x8 bl decompress_and_copy_tile_data_to_vram - ldr r4, _08145830 @ =gUnknown_8467074 + ldr r4, =gUnknown_8467074 adds r0, r4, 0 bl AddWindow ldr r1, [r5] @@ -129,21 +127,19 @@ _08145790: adds r1, r2 strh r0, [r1] b _0814591E - .align 2, 0 -_0814582C: .4byte gUnknown_203F3C8 -_08145830: .4byte gUnknown_8467074 + .pool _08145834: bl free_temp_tile_data_buffers_if_possible lsls r0, 24 lsrs r6, r0, 24 cmp r6, 0 bne _0814592E - ldr r2, _081458A0 @ =gPaletteFade + ldr r2, =gPaletteFade ldrb r0, [r2, 0x8] movs r1, 0x80 orrs r0, r1 strb r0, [r2, 0x8] - ldr r5, _081458A4 @ =gUnknown_203F3C8 + ldr r5, =gUnknown_203F3C8 ldr r0, [r5] movs r4, 0xB8 lsls r4, 1 @@ -157,7 +153,7 @@ _08145834: adds r4, r1, r4 ldr r0, [r4] ldr r0, [r0, 0x8] - ldr r4, _081458A8 @ =0x0000045c + ldr r4, =0x0000045c adds r1, r4 bl LZ77UnCompWram ldr r1, [r5] @@ -182,10 +178,7 @@ _08145834: movs r0, 0x2 bl CopyBgTilemapBufferToVram b _0814591E - .align 2, 0 -_081458A0: .4byte gPaletteFade -_081458A4: .4byte gUnknown_203F3C8 -_081458A8: .4byte 0x0000045c + .pool _081458AC: bl sub_8145A98 b _0814591E @@ -207,7 +200,7 @@ _081458D2: bl ShowBg movs r0, 0x2 bl ShowBg - ldr r2, _08145904 @ =gPaletteFade + ldr r2, =gPaletteFade ldrb r1, [r2, 0x8] movs r0, 0x7F ands r0, r1 @@ -222,8 +215,7 @@ _081458D2: bl BeginNormalPaletteFade bl UpdatePaletteFade b _0814591E - .align 2, 0 -_08145904: .4byte gPaletteFade + .pool _08145908: bl UpdatePaletteFade lsls r0, 24 @@ -236,7 +228,7 @@ _08145908: movs r0, 0x1 b _08145930 _0814591E: - ldr r0, _08145938 @ =gUnknown_203F3C8 + ldr r0, =gUnknown_203F3C8 ldr r1, [r0] movs r0, 0xBA lsls r0, 1 @@ -251,8 +243,7 @@ _08145930: pop {r4-r6} pop {r1} bx r1 - .align 2, 0 -_08145938: .4byte gUnknown_203F3C8 + .pool thumb_func_end sub_814571C thumb_func_start sub_814593C @@ -260,15 +251,14 @@ sub_814593C: @ 814593C push {r4,r5,lr} sub sp, 0x8 adds r2, r0, 0 - ldr r5, _08145950 @ =gUnknown_203F3C8 + ldr r5, =gUnknown_203F3C8 ldr r0, [r5] cmp r0, 0 bne _08145954 movs r0, 0x1 negs r0, r0 b _08145A8C - .align 2, 0 -_08145950: .4byte gUnknown_203F3C8 + .pool _08145954: movs r4, 0xBA lsls r4, 1 @@ -279,12 +269,11 @@ _08145954: b _08145A64 _08145962: lsls r0, 2 - ldr r1, _0814596C @ =_08145970 + ldr r1, =_08145970 adds r0, r1 ldr r0, [r0] mov pc, r0 - .align 2, 0 -_0814596C: .4byte _08145970 + .pool .align 2, 0 _08145970: .4byte _0814598C @@ -345,7 +334,7 @@ _081459F2: bl HideBg movs r0, 0x2 bl HideBg - ldr r4, _08145A2C @ =gUnknown_203F3C8 + ldr r4, =gUnknown_203F3C8 ldr r0, [r4] movs r1, 0xBD lsls r1, 1 @@ -365,20 +354,18 @@ _081459F2: ldrb r0, [r0] bl RemoveWindow b _08145A7A - .align 2, 0 -_08145A2C: .4byte gUnknown_203F3C8 + .pool _08145A30: bl sub_81461D8 bl FreeMonIconPalettes b _08145A7A _08145A3A: - ldr r0, _08145A48 @ =gUnknown_203F3B8 + ldr r0, =gUnknown_203F3B8 ldrb r0, [r0] adds r1, r2, 0 bl sub_8142344 b _08145A7A - .align 2, 0 -_08145A48: .4byte gUnknown_203F3B8 + .pool _08145A4C: movs r0, 0 bl CopyBgTilemapBufferToVram @@ -402,7 +389,7 @@ _08145A64: movs r0, 0x1 b _08145A8C _08145A7A: - ldr r0, _08145A94 @ =gUnknown_203F3C8 + ldr r0, =gUnknown_203F3C8 ldr r1, [r0] movs r0, 0xBA lsls r0, 1 @@ -417,8 +404,7 @@ _08145A8C: pop {r4,r5} pop {r1} bx r1 - .align 2, 0 -_08145A94: .4byte gUnknown_203F3C8 + .pool thumb_func_end sub_814593C thumb_func_start sub_8145A98 @@ -434,15 +420,15 @@ sub_8145A98: @ 8145A98 movs r1, 0 movs r2, 0x6 bl memset - ldr r4, _08145B7C @ =gUnknown_203F3C8 + ldr r4, =gUnknown_203F3C8 ldr r1, [r4] - ldr r2, _08145B80 @ =0x0000018b + ldr r2, =0x0000018b adds r0, r1, r2 adds r1, 0xA movs r2, 0x28 bl memcpy ldr r0, [r4] - ldr r3, _08145B84 @ =0x000001b3 + ldr r3, =0x000001b3 adds r1, r0, r3 movs r0, 0xFF strb r0, [r1] @@ -462,13 +448,13 @@ sub_8145A98: @ 8145A98 strb r1, [r0] ldr r1, [r4] ldr r0, [r1, 0x4] - ldr r2, _08145B88 @ =0x000f423f + ldr r2, =0x000f423f cmp r0, r2 bls _08145AF4 str r2, [r1, 0x4] _08145AF4: ldr r1, [r4] - ldr r2, _08145B8C @ =0x000001dd + ldr r2, =0x000001dd adds r0, r1, r2 ldr r1, [r1, 0x4] movs r2, 0 @@ -504,7 +490,7 @@ _08145B06: lsrs r5, r0, 16 cmp r5, 0x3 bls _08145B06 - ldr r6, _08145B7C @ =gUnknown_203F3C8 + ldr r6, =gUnknown_203F3C8 ldr r1, [r6] movs r3, 0xA2 lsls r3, 2 @@ -532,18 +518,13 @@ _08145B06: cmp r0, 0 beq _08145B96 b _08145D08 - .align 2, 0 -_08145B7C: .4byte gUnknown_203F3C8 -_08145B80: .4byte 0x0000018b -_08145B84: .4byte 0x000001b3 -_08145B88: .4byte 0x000f423f -_08145B8C: .4byte 0x000001dd + .pool _08145B90: cmp r0, 0x2 beq _08145BC8 b _08145D08 _08145B96: - ldr r2, _08145BB0 @ =0x000002b1 + ldr r2, =0x000002b1 adds r0, r1, r2 movs r3, 0x91 lsls r3, 1 @@ -551,24 +532,21 @@ _08145B96: movs r2, 0x28 bl memcpy ldr r1, [r6] - ldr r0, _08145BB4 @ =0x000002d9 + ldr r0, =0x000002d9 adds r1, r0 b _08145BBC - .align 2, 0 -_08145BB0: .4byte 0x000002b1 -_08145BB4: .4byte 0x000002d9 + .pool _08145BB8: - ldr r2, _08145BC4 @ =0x000002b1 + ldr r2, =0x000002b1 adds r1, r2 _08145BBC: ldrb r0, [r1] orrs r0, r4 strb r0, [r1] b _08145D08 - .align 2, 0 -_08145BC4: .4byte 0x000002b1 + .pool _08145BC8: - ldr r3, _08145C84 @ =0x000002b1 + ldr r3, =0x000002b1 adds r0, r1, r3 ldrb r1, [r0] orrs r1, r7 @@ -579,7 +557,7 @@ _08145BC8: lsls r4, 1 adds r0, r1, r4 ldrh r0, [r0] - ldr r2, _08145C88 @ =0x000003e7 + ldr r2, =0x000003e7 cmp r0, r2 bls _08145BE6 adds r0, r2, 0 @@ -632,12 +610,12 @@ _08145C0E: bls _08145C0E movs r5, 0 movs r6, 0 - ldr r1, _08145C8C @ =gUnknown_203F3C8 + ldr r1, =gUnknown_203F3C8 mov r8, r1 movs r2, 0x91 lsls r2, 1 mov r10, r2 - ldr r7, _08145C90 @ =0x00000175 + ldr r7, =0x00000175 movs r3, 0xB7 lsls r3, 2 mov r9, r3 @@ -650,14 +628,14 @@ _08145C56: ldrb r3, [r0] cmp r3, 0xF7 beq _08145C98 - ldr r1, _08145C90 @ =0x00000175 + ldr r1, =0x00000175 adds r0, r2, r1 ldrb r1, [r0] lsls r0, r1, 1 adds r0, r1 lsls r0, 4 adds r0, r6, r0 - ldr r4, _08145C94 @ =0x000002dd + ldr r4, =0x000002dd adds r1, r2, r4 adds r1, r0 strb r3, [r1] @@ -665,12 +643,7 @@ _08145C56: lsls r0, 16 lsrs r6, r0, 16 b _08145CFE - .align 2, 0 -_08145C84: .4byte 0x000002b1 -_08145C88: .4byte 0x000003e7 -_08145C8C: .4byte gUnknown_203F3C8 -_08145C90: .4byte 0x00000175 -_08145C94: .4byte 0x000002dd + .pool _08145C98: adds r0, r5, 0x1 adds r0, r1, r0 @@ -754,7 +727,7 @@ sub_8145D18: @ 8145D18 mov r8, r4 movs r0, 0 str r0, [sp, 0xC] - ldr r7, _08145D60 @ =gUnknown_203F3C8 + ldr r7, =gUnknown_203F3C8 ldr r0, [r7] lsls r1, r4, 1 movs r2, 0xBB @@ -777,8 +750,7 @@ sub_8145D18: @ 8145D18 beq _08145D70 mov r9, r6 b _08146038 - .align 2, 0 -_08145D60: .4byte gUnknown_203F3C8 + .pool _08145D64: mov r0, r8 cmp r0, 0x2 @@ -799,13 +771,13 @@ _08145D70: lsrs r0, 28 lsls r1, r0, 1 adds r1, r0 - ldr r0, _08145E34 @ =gUnknown_8467068 + ldr r0, =gUnknown_8467068 mov r8, r0 add r1, r8 str r1, [sp] ldr r1, [sp, 0xC] str r1, [sp, 0x4] - ldr r0, _08145E38 @ =0x0000018b + ldr r0, =0x0000018b adds r2, r0 str r2, [sp, 0x8] adds r0, r5, 0 @@ -873,7 +845,7 @@ _08145E06: str r0, [sp] ldr r0, [sp, 0xC] str r0, [sp, 0x4] - ldr r1, _08145E3C @ =0x000001dd + ldr r1, =0x000001dd adds r0, r2, r1 str r0, [sp, 0x8] adds r0, r5, 0 @@ -882,10 +854,7 @@ _08145E06: movs r3, 0x11 bl box_print b _08146038 - .align 2, 0 -_08145E34: .4byte gUnknown_8467068 -_08145E38: .4byte 0x0000018b -_08145E3C: .4byte 0x000001dd + .pool _08145E40: mov r9, r6 _08145E42: @@ -896,7 +865,7 @@ _08145E42: adds r3, 0x2 lsls r3, 24 lsrs r3, 24 - ldr r0, _08145E9C @ =gUnknown_203F3C8 + ldr r0, =gUnknown_203F3C8 ldr r2, [r0] movs r1, 0xB8 lsls r1, 1 @@ -906,7 +875,7 @@ _08145E42: lsrs r0, 4 lsls r1, r0, 1 adds r1, r0 - ldr r0, _08145EA0 @ =gUnknown_8467068 + ldr r0, =gUnknown_8467068 adds r1, r0 str r1, [sp] movs r0, 0 @@ -933,11 +902,9 @@ _08145E42: cmp r4, 0x3 ble _08145E42 b _08146038 - .align 2, 0 -_08145E9C: .4byte gUnknown_203F3C8 -_08145EA0: .4byte gUnknown_8467068 + .pool _08145EA4: - ldr r4, _08145F2C @ =gUnknown_8467070 + ldr r4, =gUnknown_8467070 ldr r2, [r7] ldrb r0, [r2, 0x8] lsls r0, 30 @@ -953,7 +920,7 @@ _08145EA4: lsrs r0, 28 lsls r1, r0, 1 adds r1, r0 - ldr r0, _08145F30 @ =gUnknown_8467068 + ldr r0, =gUnknown_8467068 mov r10, r0 add r1, r10 str r1, [sp] @@ -993,7 +960,7 @@ _08145EA4: str r0, [sp] ldr r0, [sp, 0xC] str r0, [sp, 0x4] - ldr r1, _08145F34 @ =0x000002b1 + ldr r1, =0x000002b1 adds r0, r2, r1 str r0, [sp, 0x8] adds r0, r5, 0 @@ -1002,10 +969,7 @@ _08145EA4: bl box_print mov r9, r6 b _08146038 - .align 2, 0 -_08145F2C: .4byte gUnknown_8467070 -_08145F30: .4byte gUnknown_8467068 -_08145F34: .4byte 0x000002b1 + .pool _08145F38: movs r2, 0 mov r8, r2 @@ -1021,7 +985,7 @@ _08145F38: lsls r0, 24 lsrs r2, r0, 24 ldr r0, [r7] - ldr r1, _08146054 @ =0x00000175 + ldr r1, =0x00000175 adds r0, r1 mov r9, r6 ldr r1, [sp, 0xC] @@ -1047,7 +1011,7 @@ _08145F6E: lsrs r1, 28 lsls r0, r1, 1 adds r0, r1 - ldr r1, _08146058 @ =gUnknown_8467068 + ldr r1, =gUnknown_8467068 adds r0, r1 str r0, [sp] movs r0, 0 @@ -1070,7 +1034,7 @@ _08145F6E: bl box_print ldr r1, [r7] adds r0, r1, r5 - ldr r2, _0814605C @ =0x00000306 + ldr r2, =0x00000306 adds r0, r2 ldrb r0, [r0] cmp r0, 0xFF @@ -1094,7 +1058,7 @@ _08145F6E: lsrs r1, 28 lsls r0, r1, 1 adds r0, r1 - ldr r1, _08146058 @ =gUnknown_8467068 + ldr r1, =gUnknown_8467068 adds r0, r1 str r0, [sp] movs r0, 0 @@ -1127,7 +1091,7 @@ _08146022: str r0, [sp, 0xC] asrs r1, 24 ldr r0, [r7] - ldr r2, _08146054 @ =0x00000175 + ldr r2, =0x00000175 adds r0, r2 ldrb r0, [r0] cmp r1, r0 @@ -1145,10 +1109,7 @@ _08146038: pop {r4-r7} pop {r0} bx r0 - .align 2, 0 -_08146054: .4byte 0x00000175 -_08146058: .4byte gUnknown_8467068 -_0814605C: .4byte 0x00000306 + .pool thumb_func_end sub_8145D18 thumb_func_start sub_8146060 @@ -1160,7 +1121,7 @@ sub_8146060: @ 8146060 push {r5-r7} sub sp, 0x8 movs r7, 0 - ldr r4, _081461BC @ =gUnknown_203F3C8 + ldr r4, =gUnknown_203F3C8 ldr r0, [r4] movs r1, 0xBE lsls r1, 1 @@ -1177,7 +1138,7 @@ sub_8146060: @ 8146060 bl sub_8096FD4 lsls r0, 16 lsrs r0, 16 - ldr r1, _081461C0 @ =SpriteCallbackDummy + ldr r1, =SpriteCallbackDummy str r7, [sp] str r7, [sp, 0x4] movs r2, 0xDC @@ -1188,7 +1149,7 @@ sub_8146060: @ 8146060 lsls r3, 1 adds r1, r3 strb r0, [r1] - ldr r2, _081461C4 @ =gSprites + ldr r2, =gSprites ldr r0, [r4] adds r0, r3 ldrb r1, [r0] @@ -1213,7 +1174,7 @@ _081460C8: ands r0, r1 cmp r0, 0x1 bne _081461AC - ldr r0, _081461C8 @ =gUnknown_8467F58 + ldr r0, =gUnknown_8467F58 bl sub_800F034 ldr r0, [r4] movs r1, 0xB8 @@ -1223,7 +1184,7 @@ _081460C8: ldrb r0, [r0, 0x1] lsrs r0, 4 lsls r0, 3 - ldr r1, _081461CC @ =gUnknown_8467F60 + ldr r1, =gUnknown_8467F60 adds r0, r1 bl LoadSpritePalette ldr r0, [r4] @@ -1231,7 +1192,7 @@ _081460C8: cmp r7, r0 bcs _081461AC adds r6, r4, 0 - ldr r2, _081461D0 @ =0x0000017d + ldr r2, =0x0000017d mov r10, r2 movs r3, 0 mov r9, r3 @@ -1257,7 +1218,7 @@ _0814610E: lsls r1, r7, 5 movs r0, 0xD8 subs r5, r0, r1 - ldr r0, _081461D4 @ =gUnknown_8467FA0 + ldr r0, =gUnknown_8467FA0 adds r1, r5, 0 movs r2, 0x90 movs r3, 0x8 @@ -1280,7 +1241,7 @@ _0814610E: mov r2, r9 str r2, [sp] str r2, [sp, 0x4] - ldr r1, _081461C0 @ =SpriteCallbackDummy + ldr r1, =SpriteCallbackDummy adds r2, r5, 0 movs r3, 0x88 bl sub_8096ECC @@ -1297,7 +1258,7 @@ _0814610E: lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, _081461C4 @ =gSprites + ldr r1, =gSprites adds r0, r1 ldrb r2, [r0, 0x5] movs r3, 0xD @@ -1324,21 +1285,14 @@ _081461AC: pop {r4-r7} pop {r0} bx r0 - .align 2, 0 -_081461BC: .4byte gUnknown_203F3C8 -_081461C0: .4byte SpriteCallbackDummy -_081461C4: .4byte gSprites -_081461C8: .4byte gUnknown_8467F58 -_081461CC: .4byte gUnknown_8467F60 -_081461D0: .4byte 0x0000017d -_081461D4: .4byte gUnknown_8467FA0 + .pool thumb_func_end sub_8146060 thumb_func_start sub_81461D8 sub_81461D8: @ 81461D8 push {r4-r7,lr} movs r6, 0 - ldr r4, _0814627C @ =gUnknown_203F3C8 + ldr r4, =gUnknown_203F3C8 ldr r0, [r4] movs r2, 0xBE lsls r2, 1 @@ -1350,7 +1304,7 @@ sub_81461D8: @ 81461D8 lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, _08146280 @ =gSprites + ldr r1, =gSprites adds r0, r1 bl sub_8097070 _081461FC: @@ -1369,7 +1323,7 @@ _081461FC: _08146214: ldr r0, [r7] lsls r4, r6, 1 - ldr r1, _08146284 @ =0x0000017d + ldr r1, =0x0000017d adds r0, r1 adds r1, r0, r4 ldrb r0, [r1] @@ -1379,11 +1333,11 @@ _08146214: lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r5, _08146280 @ =gSprites + ldr r5, =gSprites adds r0, r5 bl DestroySprite ldr r1, [r7] - ldr r2, _08146284 @ =0x0000017d + ldr r2, =0x0000017d adds r0, r1, r2 adds r0, r4 ldrb r0, [r0] @@ -1417,10 +1371,7 @@ _08146274: pop {r4-r7} pop {r0} bx r0 - .align 2, 0 -_0814627C: .4byte gUnknown_203F3C8 -_08146280: .4byte gSprites -_08146284: .4byte 0x0000017d + .pool thumb_func_end sub_81461D8 thumb_func_start sub_8146288 @@ -1429,8 +1380,8 @@ sub_8146288: @ 8146288 adds r4, r0, 0 cmp r4, 0 beq _0814629E - ldr r5, _081462A4 @ =gUnknown_203F3CC - ldr r0, _081462A8 @ =0x000013a4 + ldr r5, =gUnknown_203F3CC + ldr r0, =0x000013a4 bl AllocZeroed str r0, [r5] cmp r0, 0 @@ -1438,9 +1389,7 @@ sub_8146288: @ 8146288 _0814629E: movs r0, 0 b _081462DC - .align 2, 0 -_081462A4: .4byte gUnknown_203F3CC -_081462A8: .4byte 0x000013a4 + .pool _081462AC: movs r6, 0xDE lsls r6, 1 @@ -1458,10 +1407,10 @@ _081462C4: adds r3, r2, r6 ldrb r0, [r2, 0x3] lsls r0, 4 - ldr r1, _081462E4 @ =gUnknown_8468720 + ldr r1, =gUnknown_8468720 adds r0, r1 str r0, [r3] - ldr r0, _081462E8 @ =0x000001c1 + ldr r0, =0x000001c1 adds r1, r2, r0 movs r0, 0xFF strb r0, [r1] @@ -1470,19 +1419,17 @@ _081462DC: pop {r4-r6} pop {r1} bx r1 - .align 2, 0 -_081462E4: .4byte gUnknown_8468720 -_081462E8: .4byte 0x000001c1 + .pool thumb_func_end sub_8146288 thumb_func_start sub_81462EC sub_81462EC: @ 81462EC push {r4,lr} - ldr r4, _08146310 @ =gUnknown_203F3CC + ldr r4, =gUnknown_203F3CC ldr r0, [r4] cmp r0, 0 beq _08146308 - ldr r2, _08146314 @ =0x000013a4 + ldr r2, =0x000013a4 movs r1, 0 bl memset ldr r0, [r4] @@ -1493,9 +1440,7 @@ _08146308: pop {r4} pop {r0} bx r0 - .align 2, 0 -_08146310: .4byte gUnknown_203F3CC -_08146314: .4byte 0x000013a4 + .pool thumb_func_end sub_81462EC thumb_func_start sub_8146318 @@ -1506,15 +1451,14 @@ sub_8146318: @ 8146318 mov r5, r8 push {r5-r7} sub sp, 0x24 - ldr r5, _08146334 @ =gUnknown_203F3CC + ldr r5, =gUnknown_203F3CC ldr r0, [r5] cmp r0, 0 bne _08146338 movs r0, 0x1 negs r0, r0 b _081465EE - .align 2, 0 -_08146334: .4byte gUnknown_203F3CC + .pool _08146338: movs r4, 0xE0 lsls r4, 1 @@ -1526,12 +1470,11 @@ _08146338: b _081465B8 _08146348: lsls r0, 2 - ldr r1, _08146354 @ =_08146358 + ldr r1, =_08146358 adds r0, r1 ldr r0, [r0] mov pc, r0 - .align 2, 0 -_08146354: .4byte _08146358 + .pool .align 2, 0 _08146358: .4byte _08146374 @@ -1576,7 +1519,7 @@ _08146392: movs r0, 0x40 movs r1, 0xF0 bl SetGpuReg - ldr r1, _081463E8 @ =0x00001a98 + ldr r1, =0x00001a98 movs r0, 0x44 bl SetGpuReg movs r0, 0x48 @@ -1590,8 +1533,7 @@ _08146392: movs r0, 0 bl SetGpuRegBits b _081465D2 - .align 2, 0 -_081463E8: .4byte 0x00001a98 + .pool _081463EC: movs r5, 0x1E str r5, [sp] @@ -1631,7 +1573,7 @@ _081463EC: bl CopyBgTilemapBufferToVram movs r0, 0x3 bl CopyBgTilemapBufferToVram - ldr r5, _0814648C @ =gUnknown_203F3CC + ldr r5, =gUnknown_203F3CC ldr r0, [r5] movs r1, 0xDE lsls r1, 1 @@ -1644,7 +1586,7 @@ _081463EC: movs r2, 0 movs r3, 0x8 bl decompress_and_copy_tile_data_to_vram - ldr r4, _08146490 @ =gUnknown_8468040 + ldr r4, =gUnknown_8468040 adds r0, r4, 0 bl AddWindow ldr r1, [r5] @@ -1661,9 +1603,7 @@ _081463EC: adds r1, r3 strh r0, [r1] b _081465D2 - .align 2, 0 -_0814648C: .4byte gUnknown_203F3CC -_08146490: .4byte gUnknown_8468040 + .pool _08146494: bl free_temp_tile_data_buffers_if_possible lsls r0, 24 @@ -1672,12 +1612,12 @@ _08146494: beq _081464A2 b _081465EC _081464A2: - ldr r2, _0814653C @ =gPaletteFade + ldr r2, =gPaletteFade ldrb r0, [r2, 0x8] movs r1, 0x80 orrs r0, r1 strb r0, [r2, 0x8] - ldr r0, _08146540 @ =gUnknown_203F3CC + ldr r0, =gUnknown_203F3CC mov r8, r0 ldr r0, [r0] movs r4, 0xDE @@ -1742,9 +1682,7 @@ _081464A2: movs r0, 0x3 bl CopyBgTilemapBufferToVram b _081465D2 - .align 2, 0 -_0814653C: .4byte gPaletteFade -_08146540: .4byte gUnknown_203F3CC + .pool _08146544: bl sub_8146980 b _081465D2 @@ -1762,12 +1700,12 @@ _0814655C: bl ShowBg movs r0, 0x3 bl ShowBg - ldr r2, _081465AC @ =gPaletteFade + ldr r2, =gPaletteFade ldrb r1, [r2, 0x8] movs r0, 0x7F ands r0, r1 strb r0, [r2, 0x8] - ldr r4, _081465B0 @ =gUnknown_203F3CC + ldr r4, =gUnknown_203F3CC ldr r1, [r4] movs r3, 0xE5 lsls r3, 2 @@ -1777,7 +1715,7 @@ _0814655C: adds r1, r2 bl AddScrollIndicatorArrowPair ldr r1, [r4] - ldr r3, _081465B4 @ =0x000001c1 + ldr r3, =0x000001c1 adds r2, r1, r3 movs r1, 0 strb r0, [r2] @@ -1789,10 +1727,7 @@ _0814655C: bl BeginNormalPaletteFade bl UpdatePaletteFade b _081465D2 - .align 2, 0 -_081465AC: .4byte gPaletteFade -_081465B0: .4byte gUnknown_203F3CC -_081465B4: .4byte 0x000001c1 + .pool _081465B8: bl UpdatePaletteFade lsls r0, 24 @@ -1807,7 +1742,7 @@ _081465B8: movs r0, 0x1 b _081465EE _081465D2: - ldr r0, _08146600 @ =gUnknown_203F3CC + ldr r0, =gUnknown_203F3CC ldr r2, [r0] movs r0, 0xE0 lsls r0, 1 @@ -1831,8 +1766,7 @@ _081465EE: pop {r4-r7} pop {r1} bx r1 - .align 2, 0 -_08146600: .4byte gUnknown_203F3CC + .pool thumb_func_end sub_8146318 thumb_func_start sub_8146604 @@ -1840,15 +1774,14 @@ sub_8146604: @ 8146604 push {r4,r5,lr} sub sp, 0x8 adds r2, r0, 0 - ldr r5, _08146618 @ =gUnknown_203F3CC + ldr r5, =gUnknown_203F3CC ldr r0, [r5] cmp r0, 0 bne _0814661C movs r0, 0x1 negs r0, r0 b _081467E0 - .align 2, 0 -_08146618: .4byte gUnknown_203F3CC + .pool _0814661C: movs r4, 0xE0 lsls r4, 1 @@ -1860,12 +1793,11 @@ _0814661C: b _081467AA _0814662C: lsls r0, 2 - ldr r1, _08146638 @ =_0814663C + ldr r1, =_0814663C adds r0, r1 ldr r0, [r0] mov pc, r0 - .align 2, 0 -_08146638: .4byte _0814663C + .pool .align 2, 0 _0814663C: .4byte _08146658 @@ -1958,7 +1890,7 @@ _0814670C: bl HideBg movs r0, 0x2 bl HideBg - ldr r4, _08146738 @ =gUnknown_203F3CC + ldr r4, =gUnknown_203F3CC ldr r0, [r4] movs r1, 0xE5 lsls r1, 1 @@ -1972,8 +1904,7 @@ _0814670C: ldrb r0, [r0] bl RemoveWindow b _081467C4 - .align 2, 0 -_08146738: .4byte gUnknown_203F3CC + .pool _0814673C: movs r0, 0x2 movs r1, 0 @@ -1983,31 +1914,28 @@ _0814673C: movs r1, 0 movs r2, 0 bl ChangeBgY - ldr r4, _08146770 @ =gUnknown_203F3CC + ldr r4, =gUnknown_203F3CC ldr r0, [r4] - ldr r2, _08146774 @ =0x000001c1 + ldr r2, =0x000001c1 adds r1, r0, r2 ldrb r0, [r1] cmp r0, 0xFF beq _081467C4 bl RemoveScrollIndicatorArrowPair ldr r0, [r4] - ldr r2, _08146774 @ =0x000001c1 + ldr r2, =0x000001c1 adds r1, r0, r2 movs r0, 0xFF strb r0, [r1] b _081467C4 - .align 2, 0 -_08146770: .4byte gUnknown_203F3CC -_08146774: .4byte 0x000001c1 + .pool _08146778: - ldr r0, _08146784 @ =gUnknown_203F3B8 + ldr r0, =gUnknown_203F3B8 ldrb r0, [r0] adds r1, r2, 0 bl sub_8142344 b _081467C4 - .align 2, 0 -_08146784: .4byte gUnknown_203F3B8 + .pool _08146788: bl sub_8142420 movs r0, 0 @@ -2036,7 +1964,7 @@ _081467AA: movs r0, 0x1 b _081467E0 _081467C4: - ldr r0, _081467E8 @ =gUnknown_203F3CC + ldr r0, =gUnknown_203F3CC ldr r2, [r0] movs r0, 0xE0 lsls r0, 1 @@ -2056,14 +1984,13 @@ _081467E0: pop {r4,r5} pop {r1} bx r1 - .align 2, 0 -_081467E8: .4byte gUnknown_203F3CC + .pool thumb_func_end sub_8146604 thumb_func_start sub_81467EC sub_81467EC: @ 81467EC push {r4,r5,lr} - ldr r4, _0814682C @ =gUnknown_203F3CC + ldr r4, =gUnknown_203F3CC ldr r2, [r4] movs r5, 0xE0 lsls r5, 1 @@ -2073,14 +2000,14 @@ sub_81467EC: @ 81467EC ands r0, r1 cmp r0, 0 bne _08146826 - ldr r0, _08146830 @ =0x000001c1 + ldr r0, =0x000001c1 adds r1, r2, r0 ldrb r0, [r1] cmp r0, 0xFF beq _08146826 bl RemoveScrollIndicatorArrowPair ldr r0, [r4] - ldr r2, _08146830 @ =0x000001c1 + ldr r2, =0x000001c1 adds r1, r0, r2 movs r0, 0xFF strb r0, [r1] @@ -2094,15 +2021,13 @@ _08146826: pop {r4,r5} pop {r0} bx r0 - .align 2, 0 -_0814682C: .4byte gUnknown_203F3CC -_08146830: .4byte 0x000001c1 + .pool thumb_func_end sub_81467EC thumb_func_start sub_8146834 sub_8146834: @ 8146834 push {r4,lr} - ldr r4, _0814687C @ =gUnknown_203F3CC + ldr r4, =gUnknown_203F3CC ldr r2, [r4] movs r1, 0xE0 lsls r1, 1 @@ -2120,7 +2045,7 @@ sub_8146834: @ 8146834 adds r1, r2, r3 bl AddScrollIndicatorArrowPair ldr r1, [r4] - ldr r2, _08146880 @ =0x000001c1 + ldr r2, =0x000001c1 adds r1, r2 strb r0, [r1] ldr r1, [r4] @@ -2136,9 +2061,7 @@ _08146874: pop {r4} pop {r0} bx r0 - .align 2, 0 -_0814687C: .4byte gUnknown_203F3CC -_08146880: .4byte 0x000001c1 + .pool thumb_func_end sub_8146834 thumb_func_start sub_8146884 @@ -2147,7 +2070,7 @@ sub_8146884: @ 8146884 lsls r0, 16 lsrs r4, r0, 16 adds r3, r4, 0 - ldr r2, _081468B0 @ =gUnknown_203F3CC + ldr r2, =gUnknown_203F3CC ldr r0, [r2] mov r12, r0 movs r0, 0xE1 @@ -2164,8 +2087,7 @@ sub_8146884: @ 8146884 _081468AA: movs r0, 0xFF b _0814697A - .align 2, 0 -_081468B0: .4byte gUnknown_203F3CC + .pool _081468B4: cmp r4, 0x2 beq _081468D0 @@ -2201,15 +2123,14 @@ _081468D4: ands r0, r1 cmp r0, 0 bne _081468AA - ldr r2, _08146900 @ =0x000001c3 + ldr r2, =0x000001c3 add r2, r12 ldrb r1, [r2] movs r0, 0x2 negs r0, r0 ands r0, r1 b _08146932 - .align 2, 0 -_08146900: .4byte 0x000001c3 + .pool _08146904: movs r0, 0xE3 lsls r0, 1 @@ -2229,7 +2150,7 @@ _08146904: ands r0, r1 cmp r0, 0 bne _081468AA - ldr r2, _08146974 @ =0x000001c3 + ldr r2, =0x000001c3 add r2, r12 ldrb r0, [r2] movs r1, 0x1 @@ -2268,8 +2189,7 @@ _08146932: beq _08146978 movs r0, 0x3 b _0814697A - .align 2, 0 -_08146974: .4byte 0x000001c3 + .pool _08146978: movs r0, 0x2 _0814697A: @@ -2282,7 +2202,7 @@ _0814697A: sub_8146980: @ 8146980 push {r4-r6,lr} movs r5, 0 - ldr r4, _08146A20 @ =gUnknown_203F3CC + ldr r4, =gUnknown_203F3CC ldr r1, [r4] movs r2, 0xE7 lsls r2, 1 @@ -2304,14 +2224,14 @@ _081469A4: lsls r1, 3 adds r4, r1, r5 adds r0, r4, r2 - ldr r3, _08146A24 @ =0x000001f7 + ldr r3, =0x000001f7 adds r0, r3 adds r1, r2 adds r1, 0x2C movs r2, 0x28 bl memcpy ldr r0, [r6] - ldr r1, _08146A28 @ =0x0000021f + ldr r1, =0x0000021f adds r0, r1 adds r0, r4 movs r1, 0xFF @@ -2319,7 +2239,7 @@ _081469A4: cmp r5, 0x7 bls _081469E8 ldr r1, [r6] - ldr r2, _08146A24 @ =0x000001f7 + ldr r2, =0x000001f7 adds r0, r1, r2 adds r0, r4 ldrb r0, [r0] @@ -2337,12 +2257,12 @@ _081469E8: lsrs r5, r0, 24 cmp r5, 0x9 bls _081469A4 - ldr r2, _08146A20 @ =gUnknown_203F3CC + ldr r2, =gUnknown_203F3CC ldr r1, [r2] movs r4, 0xE5 lsls r4, 2 adds r1, r4 - ldr r0, _08146A2C @ =gUnknown_8468050 + ldr r0, =gUnknown_8468050 ldm r0!, {r3-r5} stm r1!, {r3-r5} ldr r0, [r0] @@ -2359,11 +2279,7 @@ _081469E8: pop {r4-r6} pop {r0} bx r0 - .align 2, 0 -_08146A20: .4byte gUnknown_203F3CC -_08146A24: .4byte 0x000001f7 -_08146A28: .4byte 0x0000021f -_08146A2C: .4byte gUnknown_8468050 + .pool thumb_func_end sub_8146980 thumb_func_start sub_8146A30 @@ -2373,7 +2289,7 @@ sub_8146A30: @ 8146A30 push {r7} sub sp, 0xC movs r5, 0 - ldr r6, _08146B4C @ =gUnknown_203F3CC + ldr r6, =gUnknown_203F3CC ldr r0, [r6] movs r7, 0xE4 lsls r7, 1 @@ -2433,7 +2349,7 @@ _08146AA0: lsrs r1, 28 lsls r3, r1, 1 adds r3, r1 - ldr r1, _08146B50 @ =gUnknown_8468038 + ldr r1, =gUnknown_8468038 adds r3, r1 str r3, [sp] str r5, [sp, 0x4] @@ -2443,7 +2359,7 @@ _08146AA0: movs r3, 0x6 bl box_print _08146AD0: - ldr r6, _08146B4C @ =gUnknown_203F3CC + ldr r6, =gUnknown_203F3CC ldr r4, [r6] movs r1, 0xE5 lsls r1, 1 @@ -2461,7 +2377,7 @@ _08146AD0: lsrs r1, 4 lsls r2, r1, 1 adds r2, r1 - ldr r1, _08146B50 @ =gUnknown_8468038 + ldr r1, =gUnknown_8468038 adds r2, r1 str r2, [sp] movs r1, 0 @@ -2470,7 +2386,7 @@ _08146AD0: adds r1, r5 lsls r1, 3 adds r1, r5 - ldr r2, _08146B54 @ =0x000001f7 + ldr r2, =0x000001f7 adds r1, r2 adds r4, r1 str r4, [sp, 0x8] @@ -2502,16 +2418,13 @@ _08146AD0: pop {r4-r7} pop {r0} bx r0 - .align 2, 0 -_08146B4C: .4byte gUnknown_203F3CC -_08146B50: .4byte gUnknown_8468038 -_08146B54: .4byte 0x000001f7 + .pool thumb_func_end sub_8146A30 thumb_func_start sub_8146B58 sub_8146B58: @ 8146B58 push {r4-r6,lr} - ldr r0, _08146B90 @ =gUnknown_203F3CC + ldr r0, =gUnknown_203F3CC ldr r1, [r0] movs r2, 0xE1 lsls r2, 1 @@ -2519,7 +2432,7 @@ sub_8146B58: @ 8146B58 ldrb r0, [r0] lsrs r4, r0, 1 lsls r4, 8 - ldr r6, _08146B94 @ =0x000001c3 + ldr r6, =0x000001c3 adds r0, r1, r6 ldrb r1, [r0] movs r0, 0x1 @@ -2535,9 +2448,7 @@ sub_8146B58: @ 8146B58 movs r2, 0x1 bl ChangeBgY b _08146BAC - .align 2, 0 -_08146B90: .4byte gUnknown_203F3CC -_08146B94: .4byte 0x000001c3 + .pool _08146B98: movs r0, 0x2 adds r1, r4, 0 @@ -2548,9 +2459,9 @@ _08146B98: movs r2, 0x2 bl ChangeBgY _08146BAC: - ldr r3, _08146BF0 @ =gUnknown_203F3CC + ldr r3, =gUnknown_203F3CC ldr r0, [r3] - ldr r2, _08146BF4 @ =0x000001c3 + ldr r2, =0x000001c3 adds r5, r0, r2 ldrb r4, [r5] lsrs r1, r4, 1 @@ -2582,9 +2493,7 @@ _08146BAC: ldrh r0, [r1] adds r0, 0x1 b _08146C02 - .align 2, 0 -_08146BF0: .4byte gUnknown_203F3CC -_08146BF4: .4byte 0x000001c3 + .pool _08146BF8: movs r2, 0xE3 lsls r2, 1 @@ -2603,7 +2512,7 @@ _08146C02: ands r0, r1 strb r0, [r2] ldr r0, [r3] - ldr r1, _08146C2C @ =0x000001c3 + ldr r1, =0x000001c3 adds r2, r0, r1 ldrb r1, [r2] movs r0, 0x1 @@ -2613,8 +2522,7 @@ _08146C24: pop {r4-r6} pop {r0} bx r0 - .align 2, 0 -_08146C2C: .4byte 0x000001c3 + .pool thumb_func_end sub_8146B58 .align 2, 0 @ Don't pad with nop. -- cgit v1.2.3 From 8f0f725039e9b0ae9de440df28e1eb4bd7d00dc3 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sun, 2 Dec 2018 11:42:45 -0500 Subject: sub_814571C and associated graphics dump --- asm/mevent_8145654.s | 241 -------------------------------- data/data_8466FB8.s | 49 ++++--- data/graphics/mevent/gfx_46718C.png | Bin 0 -> 330 bytes data/graphics/mevent/gfx_46737C.png | Bin 0 -> 314 bytes data/graphics/mevent/gfx_467558.png | Bin 0 -> 288 bytes data/graphics/mevent/gfx_467700.png | Bin 0 -> 558 bytes data/graphics/mevent/gfx_467A7C.png | Bin 0 -> 551 bytes data/graphics/mevent/pal_46708C.pal | 19 +++ data/graphics/mevent/pal_4670AC.pal | 19 +++ data/graphics/mevent/pal_4670CC.pal | 19 +++ data/graphics/mevent/pal_4670EC.pal | 19 +++ data/graphics/mevent/pal_46710C.pal | 19 +++ data/graphics/mevent/pal_46712C.pal | 19 +++ data/graphics/mevent/pal_46714C.pal | 19 +++ data/graphics/mevent/pal_46716C.pal | 19 +++ data/graphics/mevent/tilemap_467288.bin | Bin 0 -> 1200 bytes data/graphics/mevent/tilemap_467470.bin | Bin 0 -> 1200 bytes data/graphics/mevent/tilemap_46762C.bin | Bin 0 -> 1200 bytes data/graphics/mevent/tilemap_467934.bin | Bin 0 -> 1200 bytes data/graphics/mevent/tilemap_467CAC.bin | Bin 0 -> 1200 bytes include/pokemon_icon.h | 1 + src/mevent_8145654.c | 88 +++++++++++- 22 files changed, 268 insertions(+), 263 deletions(-) create mode 100644 data/graphics/mevent/gfx_46718C.png create mode 100644 data/graphics/mevent/gfx_46737C.png create mode 100644 data/graphics/mevent/gfx_467558.png create mode 100644 data/graphics/mevent/gfx_467700.png create mode 100644 data/graphics/mevent/gfx_467A7C.png create mode 100644 data/graphics/mevent/pal_46708C.pal create mode 100644 data/graphics/mevent/pal_4670AC.pal create mode 100644 data/graphics/mevent/pal_4670CC.pal create mode 100644 data/graphics/mevent/pal_4670EC.pal create mode 100644 data/graphics/mevent/pal_46710C.pal create mode 100644 data/graphics/mevent/pal_46712C.pal create mode 100644 data/graphics/mevent/pal_46714C.pal create mode 100644 data/graphics/mevent/pal_46716C.pal create mode 100644 data/graphics/mevent/tilemap_467288.bin create mode 100644 data/graphics/mevent/tilemap_467470.bin create mode 100644 data/graphics/mevent/tilemap_46762C.bin create mode 100644 data/graphics/mevent/tilemap_467934.bin create mode 100644 data/graphics/mevent/tilemap_467CAC.bin diff --git a/asm/mevent_8145654.s b/asm/mevent_8145654.s index 00676462f..80f9f6d3d 100644 --- a/asm/mevent_8145654.s +++ b/asm/mevent_8145654.s @@ -5,247 +5,6 @@ .text - thumb_func_start sub_814571C -sub_814571C: @ 814571C - push {r4-r6,lr} - sub sp, 0x24 - ldr r5, =gUnknown_203F3C8 - ldr r0, [r5] - cmp r0, 0 - bne _08145734 - movs r0, 0x1 - negs r0, r0 - b _08145930 - .pool -_08145734: - movs r4, 0xBA - lsls r4, 1 - adds r0, r4 - ldrb r0, [r0] - cmp r0, 0x7 - bls _08145742 - b _08145908 -_08145742: - lsls r0, 2 - ldr r1, =_08145750 - adds r0, r1 - ldr r0, [r0] - mov pc, r0 - .pool - .align 2, 0 -_08145750: - .4byte _08145770 - .4byte _08145782 - .4byte _08145790 - .4byte _08145834 - .4byte _081458AC - .4byte _081458B2 - .4byte _081458CC - .4byte _081458D2 -_08145770: - movs r0, 0x1 - negs r0, r0 - movs r1, 0 - str r1, [sp] - movs r2, 0 - movs r3, 0x10 - bl BeginNormalPaletteFade - b _0814591E -_08145782: - bl UpdatePaletteFade - lsls r0, 24 - cmp r0, 0 - bne _0814578E - b _0814591E -_0814578E: - b _0814592E -_08145790: - movs r5, 0x1E - str r5, [sp] - movs r4, 0x14 - str r4, [sp, 0x4] - movs r0, 0 - movs r1, 0 - movs r2, 0 - movs r3, 0 - bl FillBgTilemapBufferRect_Palette0 - str r5, [sp] - str r4, [sp, 0x4] - movs r0, 0x1 - movs r1, 0 - movs r2, 0 - movs r3, 0 - bl FillBgTilemapBufferRect_Palette0 - str r5, [sp] - str r4, [sp, 0x4] - movs r0, 0x2 - movs r1, 0 - movs r2, 0 - movs r3, 0 - bl FillBgTilemapBufferRect_Palette0 - movs r0, 0 - bl CopyBgTilemapBufferToVram - movs r0, 0x1 - bl CopyBgTilemapBufferToVram - movs r0, 0x2 - bl CopyBgTilemapBufferToVram - ldr r5, =gUnknown_203F3C8 - ldr r0, [r5] - movs r1, 0xB8 - lsls r1, 1 - adds r0, r1 - ldr r0, [r0] - ldr r1, [r0, 0x4] - movs r0, 0 - str r0, [sp] - movs r0, 0x2 - movs r2, 0 - movs r3, 0x8 - bl decompress_and_copy_tile_data_to_vram - ldr r4, =gUnknown_8467074 - adds r0, r4, 0 - bl AddWindow - ldr r1, [r5] - movs r2, 0xBB - lsls r2, 1 - adds r1, r2 - strh r0, [r1] - adds r0, r4, 0 - adds r0, 0x8 - bl AddWindow - ldr r1, [r5] - movs r2, 0xBC - lsls r2, 1 - adds r1, r2 - strh r0, [r1] - adds r4, 0x10 - adds r0, r4, 0 - bl AddWindow - ldr r1, [r5] - movs r2, 0xBD - lsls r2, 1 - adds r1, r2 - strh r0, [r1] - b _0814591E - .pool -_08145834: - bl free_temp_tile_data_buffers_if_possible - lsls r0, 24 - lsrs r6, r0, 24 - cmp r6, 0 - bne _0814592E - ldr r2, =gPaletteFade - ldrb r0, [r2, 0x8] - movs r1, 0x80 - orrs r0, r1 - strb r0, [r2, 0x8] - ldr r5, =gUnknown_203F3C8 - ldr r0, [r5] - movs r4, 0xB8 - lsls r4, 1 - adds r0, r4 - ldr r0, [r0] - ldr r0, [r0, 0xC] - movs r1, 0x10 - movs r2, 0x20 - bl LoadPalette - ldr r1, [r5] - adds r4, r1, r4 - ldr r0, [r4] - ldr r0, [r0, 0x8] - ldr r4, =0x0000045c - adds r1, r4 - bl LZ77UnCompWram - ldr r1, [r5] - adds r1, r4 - movs r2, 0x1E - str r2, [sp] - movs r0, 0x14 - str r0, [sp, 0x4] - str r6, [sp, 0x8] - str r6, [sp, 0xC] - str r2, [sp, 0x10] - str r0, [sp, 0x14] - movs r0, 0x1 - str r0, [sp, 0x18] - movs r0, 0x8 - str r0, [sp, 0x1C] - str r6, [sp, 0x20] - movs r0, 0x2 - movs r2, 0 - movs r3, 0 - bl CopyRectToBgTilemapBufferRect - movs r0, 0x2 - bl CopyBgTilemapBufferToVram - b _0814591E - .pool -_081458AC: - bl sub_8145A98 - b _0814591E -_081458B2: - movs r0, 0 - bl sub_8145D18 - movs r0, 0x1 - bl sub_8145D18 - movs r0, 0x2 - bl sub_8145D18 - movs r0, 0x1 - bl CopyBgTilemapBufferToVram - b _0814591E -_081458CC: - bl sub_809707C - b _0814591E -_081458D2: - movs r0, 0x1 - bl ShowBg - movs r0, 0x2 - bl ShowBg - ldr r2, =gPaletteFade - ldrb r1, [r2, 0x8] - movs r0, 0x7F - ands r0, r1 - strb r0, [r2, 0x8] - bl sub_8146060 - movs r0, 0x1 - negs r0, r0 - movs r1, 0 - str r1, [sp] - movs r2, 0x10 - movs r3, 0 - bl BeginNormalPaletteFade - bl UpdatePaletteFade - b _0814591E - .pool -_08145908: - bl UpdatePaletteFade - lsls r0, 24 - lsrs r1, r0, 24 - cmp r1, 0 - bne _0814592E - ldr r0, [r5] - adds r0, r4 - strb r1, [r0] - movs r0, 0x1 - b _08145930 -_0814591E: - ldr r0, =gUnknown_203F3C8 - ldr r1, [r0] - movs r0, 0xBA - lsls r0, 1 - adds r1, r0 - ldrb r0, [r1] - adds r0, 0x1 - strb r0, [r1] -_0814592E: - movs r0, 0 -_08145930: - add sp, 0x24 - pop {r4-r6} - pop {r1} - bx r1 - .pool - thumb_func_end sub_814571C - thumb_func_start sub_814593C sub_814593C: @ 814593C push {r4,r5,lr} diff --git a/data/data_8466FB8.s b/data/data_8466FB8.s index 6883ab138..f6d8ebaff 100644 --- a/data/data_8466FB8.s +++ b/data/data_8466FB8.s @@ -25,58 +25,71 @@ gUnknown_8467074:: @ 8467074 .2byte 0x0130 gUnknown_846708C:: - .incbin "baserom.gba", 0x46708c, 0x20 + .incbin "data/graphics/mevent/pal_46708C.gbapal" gUnknown_84670AC:: - .incbin "baserom.gba", 0x4670ac, 0x20 + .incbin "data/graphics/mevent/pal_4670AC.gbapal" gUnknown_84670CC:: - .incbin "baserom.gba", 0x4670cc, 0x20 + .incbin "data/graphics/mevent/pal_4670CC.gbapal" gUnknown_84670EC:: - .incbin "baserom.gba", 0x4670ec, 0x20 + .incbin "data/graphics/mevent/pal_4670EC.gbapal" gUnknown_846710C:: - .incbin "baserom.gba", 0x46710c, 0x20 + .incbin "data/graphics/mevent/pal_46710C.gbapal" gUnknown_846712C:: - .incbin "baserom.gba", 0x46712c, 0x20 + .incbin "data/graphics/mevent/pal_46712C.gbapal" gUnknown_846714C:: - .incbin "baserom.gba", 0x46714c, 0x20 + .incbin "data/graphics/mevent/pal_46714C.gbapal" gUnknown_846716C:: - .incbin "baserom.gba", 0x46716c, 0x20 + .incbin "data/graphics/mevent/pal_46716C.gbapal" + .align 2 gUnknown_846718C:: - .incbin "baserom.gba", 0x46718c, 0xFC + .incbin "data/graphics/mevent/gfx_46718C.4bpp.lz" + .align 2 gUnknown_8467288:: - .incbin "baserom.gba", 0x467288, 0xF4 + .incbin "data/graphics/mevent/tilemap_467288.bin.lz" + .align 2 gUnknown_846737C:: - .incbin "baserom.gba", 0x46737c, 0xF4 + .incbin "data/graphics/mevent/gfx_46737C.4bpp.lz" + .align 2 gUnknown_8467470:: - .incbin "baserom.gba", 0x467470, 0xE8 + .incbin "data/graphics/mevent/tilemap_467470.bin.lz" + .align 2 gUnknown_8467558:: - .incbin "baserom.gba", 0x467558, 0xD4 + .incbin "data/graphics/mevent/gfx_467558.4bpp.lz" + .align 2 gUnknown_846762C:: - .incbin "baserom.gba", 0x46762c, 0xD4 + .incbin "data/graphics/mevent/tilemap_46762C.bin.lz" + .align 2 gUnknown_8467700:: - .incbin "baserom.gba", 0x467700, 0x234 + .incbin "data/graphics/mevent/gfx_467700.4bpp.lz" + .align 2 gUnknown_8467934:: - .incbin "baserom.gba", 0x467934, 0x148 + .incbin "data/graphics/mevent/tilemap_467934.bin.lz" + .align 2 gUnknown_8467A7C:: - .incbin "baserom.gba", 0x467a7c, 0x230 + .incbin "data/graphics/mevent/gfx_467A7C.4bpp.lz" + .align 2 gUnknown_8467CAC:: - .incbin "baserom.gba", 0x467cac, 0x2AC + .incbin "data/graphics/mevent/tilemap_467CAC.bin.lz" + +gUnknown_8467DF4:: + .incbin "baserom.gba", 0x467DF4, 0x164 gUnknown_8467F58:: @ 8467F58 .incbin "baserom.gba", 0x467F58, 0x8 diff --git a/data/graphics/mevent/gfx_46718C.png b/data/graphics/mevent/gfx_46718C.png new file mode 100644 index 000000000..bf52445e6 Binary files /dev/null and b/data/graphics/mevent/gfx_46718C.png differ diff --git a/data/graphics/mevent/gfx_46737C.png b/data/graphics/mevent/gfx_46737C.png new file mode 100644 index 000000000..1a23f8b94 Binary files /dev/null and b/data/graphics/mevent/gfx_46737C.png differ diff --git a/data/graphics/mevent/gfx_467558.png b/data/graphics/mevent/gfx_467558.png new file mode 100644 index 000000000..c28edd891 Binary files /dev/null and b/data/graphics/mevent/gfx_467558.png differ diff --git a/data/graphics/mevent/gfx_467700.png b/data/graphics/mevent/gfx_467700.png new file mode 100644 index 000000000..f31385746 Binary files /dev/null and b/data/graphics/mevent/gfx_467700.png differ diff --git a/data/graphics/mevent/gfx_467A7C.png b/data/graphics/mevent/gfx_467A7C.png new file mode 100644 index 000000000..f94b6c50f Binary files /dev/null and b/data/graphics/mevent/gfx_467A7C.png differ diff --git a/data/graphics/mevent/pal_46708C.pal b/data/graphics/mevent/pal_46708C.pal new file mode 100644 index 000000000..9c5ef9b26 --- /dev/null +++ b/data/graphics/mevent/pal_46708C.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +90 197 148 +213 213 213 +74 74 74 +98 106 106 +213 189 74 +238 213 82 +246 246 213 +255 255 255 +230 230 213 +238 238 213 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 diff --git a/data/graphics/mevent/pal_4670AC.pal b/data/graphics/mevent/pal_4670AC.pal new file mode 100644 index 000000000..18c2be3fd --- /dev/null +++ b/data/graphics/mevent/pal_4670AC.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +90 197 148 +82 82 106 +131 131 139 +197 189 213 +205 230 255 +115 139 197 +49 74 82 +0 0 0 +0 0 0 +222 255 246 +197 255 222 +222 238 255 +156 180 222 +156 106 115 +172 139 164 +255 255 255 diff --git a/data/graphics/mevent/pal_4670CC.pal b/data/graphics/mevent/pal_4670CC.pal new file mode 100644 index 000000000..db02d5d4b --- /dev/null +++ b/data/graphics/mevent/pal_4670CC.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +90 197 148 +82 82 106 +131 131 139 +164 156 172 +197 189 213 +246 238 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 230 230 +255 197 197 +255 164 164 +246 139 139 +238 90 90 +255 255 255 diff --git a/data/graphics/mevent/pal_4670EC.pal b/data/graphics/mevent/pal_4670EC.pal new file mode 100644 index 000000000..bfbf036a5 --- /dev/null +++ b/data/graphics/mevent/pal_4670EC.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +90 197 148 +82 82 106 +131 131 139 +164 156 172 +197 189 213 +246 238 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +238 255 230 +213 255 189 +189 230 156 +164 213 131 +148 197 106 +255 255 255 diff --git a/data/graphics/mevent/pal_46710C.pal b/data/graphics/mevent/pal_46710C.pal new file mode 100644 index 000000000..fa41ee3b0 --- /dev/null +++ b/data/graphics/mevent/pal_46710C.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +90 197 148 +82 82 106 +131 131 139 +164 156 172 +197 189 213 +246 238 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +238 246 255 +205 238 246 +180 222 246 +156 197 238 +115 156 197 +255 255 255 diff --git a/data/graphics/mevent/pal_46712C.pal b/data/graphics/mevent/pal_46712C.pal new file mode 100644 index 000000000..8a71f5846 --- /dev/null +++ b/data/graphics/mevent/pal_46712C.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +90 197 148 +82 82 106 +131 131 139 +164 156 172 +197 189 213 +246 238 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +238 238 197 +230 230 139 +222 222 115 +213 213 90 +189 189 57 +255 255 255 diff --git a/data/graphics/mevent/pal_46714C.pal b/data/graphics/mevent/pal_46714C.pal new file mode 100644 index 000000000..01832b5e2 --- /dev/null +++ b/data/graphics/mevent/pal_46714C.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +189 123 148 +213 213 213 +74 74 74 +115 123 123 +164 156 90 +164 148 90 +197 197 90 +213 205 90 +222 213 90 +213 213 106 +238 246 98 +230 222 98 +213 205 98 +197 180 98 +238 230 98 +246 238 106 diff --git a/data/graphics/mevent/pal_46716C.pal b/data/graphics/mevent/pal_46716C.pal new file mode 100644 index 000000000..28a498b57 --- /dev/null +++ b/data/graphics/mevent/pal_46716C.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +189 123 148 +213 213 213 +74 74 74 +115 123 123 +156 156 156 +139 139 148 +180 180 197 +197 189 205 +205 205 222 +189 189 189 +197 230 222 +189 213 213 +180 197 197 +156 164 172 +222 222 230 +230 230 238 diff --git a/data/graphics/mevent/tilemap_467288.bin b/data/graphics/mevent/tilemap_467288.bin new file mode 100644 index 000000000..8e4a4717b Binary files /dev/null and b/data/graphics/mevent/tilemap_467288.bin differ diff --git a/data/graphics/mevent/tilemap_467470.bin b/data/graphics/mevent/tilemap_467470.bin new file mode 100644 index 000000000..b59dbabb5 Binary files /dev/null and b/data/graphics/mevent/tilemap_467470.bin differ diff --git a/data/graphics/mevent/tilemap_46762C.bin b/data/graphics/mevent/tilemap_46762C.bin new file mode 100644 index 000000000..aba2b9e92 Binary files /dev/null and b/data/graphics/mevent/tilemap_46762C.bin differ diff --git a/data/graphics/mevent/tilemap_467934.bin b/data/graphics/mevent/tilemap_467934.bin new file mode 100644 index 000000000..1800bff4d Binary files /dev/null and b/data/graphics/mevent/tilemap_467934.bin differ diff --git a/data/graphics/mevent/tilemap_467CAC.bin b/data/graphics/mevent/tilemap_467CAC.bin new file mode 100644 index 000000000..1800bff4d Binary files /dev/null and b/data/graphics/mevent/tilemap_467CAC.bin differ diff --git a/include/pokemon_icon.h b/include/pokemon_icon.h index da58a2d83..cc6c578fe 100644 --- a/include/pokemon_icon.h +++ b/include/pokemon_icon.h @@ -10,5 +10,6 @@ void sub_80D2F68(u16 iconId); u8 sub_80D2D78(u16 iconId, void callback(struct Sprite *), u16 x, u16 y, u16 a4, u8 a5); void sub_80D2FF0(u16 iconId); void sub_80D2EF8(struct Sprite *sprite); +void sub_809707C(void); #endif // GUARD_POKEMON_ICON_H diff --git a/src/mevent_8145654.c b/src/mevent_8145654.c index 9c26a21a1..3477543a8 100644 --- a/src/mevent_8145654.c +++ b/src/mevent_8145654.c @@ -1,13 +1,18 @@ #include "global.h" +#include "bg.h" +#include "palette.h" +#include "decompress.h" #include "malloc.h" +#include "menu.h" +#include "pokemon_icon.h" #include "mevent.h" struct UnkStruct_8467FB8 { u16 ident; - const void * unk_04; - const void * unk_08; - const void * unk_0C; + const u8 * tiles; + const u8 * map; + const u16 * pal; }; struct UnkStruct_203F3C8 @@ -15,11 +20,22 @@ struct UnkStruct_203F3C8 /*0000*/ struct MEventBuffer_32E0_Sub unk_0000; /*014c*/ struct MEventBuffer_3430_Sub unk_014c; /*0170*/ const struct UnkStruct_8467FB8 * unk_0170; - /*0174*/ u8 filler_0174[0x12E8]; + /*0174*/ u8 unk_0174; + /*0176*/ u16 unk_0176; + /*0178*/ u16 unk_0178; + /*017A*/ u16 unk_017A; + /*017C*/ u8 filler_0178[0x2E0]; + /*045C*/ u8 buffer_045C[0x1000]; }; EWRAM_DATA struct UnkStruct_203F3C8 * gUnknown_203F3C8 = NULL; +void sub_8145A98(void); +void sub_8145D18(u8 bgId); +void sub_8146060(void); + +extern const struct WindowTemplate gUnknown_8467074[3]; + extern const struct UnkStruct_8467FB8 gUnknown_8467FB8[8]; bool32 sub_8145654(struct MEventBuffer_32E0_Sub * r5, struct MEventBuffer_3430_Sub * r6) @@ -50,3 +66,67 @@ void sub_81456F0(void) gUnknown_203F3C8 = NULL; } } + +s32 sub_814571C(void) +{ + if (gUnknown_203F3C8 == NULL) + return -1; + switch(gUnknown_203F3C8->unk_0174) + { + case 0: + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, 0); + break; + case 1: + if (UpdatePaletteFade()) + return 0; + break; + case 2: + FillBgTilemapBufferRect_Palette0(0, 0x000, 0, 0, 30, 20); + FillBgTilemapBufferRect_Palette0(1, 0x000, 0, 0, 30, 20); + FillBgTilemapBufferRect_Palette0(2, 0x000, 0, 0, 30, 20); + CopyBgTilemapBufferToVram(0); + CopyBgTilemapBufferToVram(1); + CopyBgTilemapBufferToVram(2); + decompress_and_copy_tile_data_to_vram(2, gUnknown_203F3C8->unk_0170->tiles, 0, 0x008, 0); + gUnknown_203F3C8->unk_0176 = AddWindow(&gUnknown_8467074[0]); + gUnknown_203F3C8->unk_0178 = AddWindow(&gUnknown_8467074[1]); + gUnknown_203F3C8->unk_017A = AddWindow(&gUnknown_8467074[2]); + break; + case 3: + if (free_temp_tile_data_buffers_if_possible()) + return 0; + gPaletteFade.bufferTransferDisabled = TRUE; + LoadPalette(gUnknown_203F3C8->unk_0170->pal, 0x10, 0x20); + LZ77UnCompWram(gUnknown_203F3C8->unk_0170->map, gUnknown_203F3C8->buffer_045C); + CopyRectToBgTilemapBufferRect(2, gUnknown_203F3C8->buffer_045C, 0, 0, 30, 20, 0, 0, 30, 20, 1, 0x008, 0); + CopyBgTilemapBufferToVram(2); + break; + case 4: + sub_8145A98(); + break; + case 5: + sub_8145D18(0); + sub_8145D18(1); + sub_8145D18(2); + CopyBgTilemapBufferToVram(1); + break; + case 6: + sub_809707C(); + break; + case 7: + ShowBg(1); + ShowBg(2); + gPaletteFade.bufferTransferDisabled = FALSE; + sub_8146060(); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, 0); + UpdatePaletteFade(); + break; + default: + if (UpdatePaletteFade()) + return 0; + gUnknown_203F3C8->unk_0174 = 0; + return 1; + } + ++gUnknown_203F3C8->unk_0174; + return 0; +} -- cgit v1.2.3 From 2fb1404613d12e5384c7650ef9d46d2678865544 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sun, 2 Dec 2018 12:09:16 -0500 Subject: sub_814593C and associated ewram --- asm/mevent_8145654.s | 161 -------------------------------------------- include/mystery_gift_menu.h | 3 + include/pokemon_icon.h | 1 + src/mevent_8145654.c | 57 ++++++++++++++++ sym_ewram.txt | 7 +- 5 files changed, 62 insertions(+), 167 deletions(-) diff --git a/asm/mevent_8145654.s b/asm/mevent_8145654.s index 80f9f6d3d..b831c9e87 100644 --- a/asm/mevent_8145654.s +++ b/asm/mevent_8145654.s @@ -5,167 +5,6 @@ .text - thumb_func_start sub_814593C -sub_814593C: @ 814593C - push {r4,r5,lr} - sub sp, 0x8 - adds r2, r0, 0 - ldr r5, =gUnknown_203F3C8 - ldr r0, [r5] - cmp r0, 0 - bne _08145954 - movs r0, 0x1 - negs r0, r0 - b _08145A8C - .pool -_08145954: - movs r4, 0xBA - lsls r4, 1 - adds r0, r4 - ldrb r0, [r0] - cmp r0, 0x6 - bls _08145962 - b _08145A64 -_08145962: - lsls r0, 2 - ldr r1, =_08145970 - adds r0, r1 - ldr r0, [r0] - mov pc, r0 - .pool - .align 2, 0 -_08145970: - .4byte _0814598C - .4byte _0814599E - .4byte _081459AA - .4byte _081459F2 - .4byte _08145A30 - .4byte _08145A3A - .4byte _08145A4C -_0814598C: - movs r0, 0x1 - negs r0, r0 - movs r1, 0 - str r1, [sp] - movs r2, 0 - movs r3, 0x10 - bl BeginNormalPaletteFade - b _08145A7A -_0814599E: - bl UpdatePaletteFade - lsls r0, 24 - cmp r0, 0 - beq _08145A7A - b _08145A8A -_081459AA: - movs r5, 0x1E - str r5, [sp] - movs r4, 0x14 - str r4, [sp, 0x4] - movs r0, 0 - movs r1, 0 - movs r2, 0 - movs r3, 0 - bl FillBgTilemapBufferRect_Palette0 - str r5, [sp] - str r4, [sp, 0x4] - movs r0, 0x1 - movs r1, 0 - movs r2, 0 - movs r3, 0 - bl FillBgTilemapBufferRect_Palette0 - str r5, [sp] - str r4, [sp, 0x4] - movs r0, 0x2 - movs r1, 0 - movs r2, 0 - movs r3, 0 - bl FillBgTilemapBufferRect_Palette0 - movs r0, 0 - bl CopyBgTilemapBufferToVram - movs r0, 0x1 - bl CopyBgTilemapBufferToVram - movs r0, 0x2 - bl CopyBgTilemapBufferToVram - b _08145A7A -_081459F2: - movs r0, 0x1 - bl HideBg - movs r0, 0x2 - bl HideBg - ldr r4, =gUnknown_203F3C8 - ldr r0, [r4] - movs r1, 0xBD - lsls r1, 1 - adds r0, r1 - ldrb r0, [r0] - bl RemoveWindow - ldr r0, [r4] - movs r1, 0xBC - lsls r1, 1 - adds r0, r1 - ldrb r0, [r0] - bl RemoveWindow - ldr r0, [r4] - movs r1, 0xBB - lsls r1, 1 - adds r0, r1 - ldrb r0, [r0] - bl RemoveWindow - b _08145A7A - .pool -_08145A30: - bl sub_81461D8 - bl FreeMonIconPalettes - b _08145A7A -_08145A3A: - ldr r0, =gUnknown_203F3B8 - ldrb r0, [r0] - adds r1, r2, 0 - bl sub_8142344 - b _08145A7A - .pool -_08145A4C: - movs r0, 0 - bl CopyBgTilemapBufferToVram - movs r0, 0x1 - negs r0, r0 - movs r1, 0 - str r1, [sp] - movs r2, 0x10 - movs r3, 0 - bl BeginNormalPaletteFade - b _08145A7A -_08145A64: - bl UpdatePaletteFade - lsls r0, 24 - lsrs r1, r0, 24 - cmp r1, 0 - bne _08145A8A - ldr r0, [r5] - adds r0, r4 - strb r1, [r0] - movs r0, 0x1 - b _08145A8C -_08145A7A: - ldr r0, =gUnknown_203F3C8 - ldr r1, [r0] - movs r0, 0xBA - lsls r0, 1 - adds r1, r0 - ldrb r0, [r1] - adds r0, 0x1 - strb r0, [r1] -_08145A8A: - movs r0, 0 -_08145A8C: - add sp, 0x8 - pop {r4,r5} - pop {r1} - bx r1 - .pool - thumb_func_end sub_814593C - thumb_func_start sub_8145A98 sub_8145A98: @ 8145A98 push {r4-r7,lr} diff --git a/include/mystery_gift_menu.h b/include/mystery_gift_menu.h index 17af9ce57..24bf85a13 100644 --- a/include/mystery_gift_menu.h +++ b/include/mystery_gift_menu.h @@ -1,6 +1,9 @@ #ifndef GUARD_MYSTERY_GIFT_MENU_H #define GUARD_MYSTERY_GIFT_MENU_H +extern bool8 gUnknown_203F3B8; + void sub_81422FC(void); +void sub_8142344(bool8, bool32); #endif //GUARD_MYSTERY_GIFT_MENU_H diff --git a/include/pokemon_icon.h b/include/pokemon_icon.h index cc6c578fe..2c2edcc7c 100644 --- a/include/pokemon_icon.h +++ b/include/pokemon_icon.h @@ -11,5 +11,6 @@ u8 sub_80D2D78(u16 iconId, void callback(struct Sprite *), u16 x, u16 y, u16 a4, void sub_80D2FF0(u16 iconId); void sub_80D2EF8(struct Sprite *sprite); void sub_809707C(void); +void FreeMonIconPalettes(void); #endif // GUARD_POKEMON_ICON_H diff --git a/src/mevent_8145654.c b/src/mevent_8145654.c index 3477543a8..6c51f9091 100644 --- a/src/mevent_8145654.c +++ b/src/mevent_8145654.c @@ -5,6 +5,7 @@ #include "malloc.h" #include "menu.h" #include "pokemon_icon.h" +#include "mystery_gift_menu.h" #include "mevent.h" struct UnkStruct_8467FB8 @@ -28,11 +29,18 @@ struct UnkStruct_203F3C8 /*045C*/ u8 buffer_045C[0x1000]; }; +struct UnkStruct_203F3CC +{ + /*0000*/ u8 filler_0000[0x13a4]; +}; + EWRAM_DATA struct UnkStruct_203F3C8 * gUnknown_203F3C8 = NULL; +EWRAM_DATA struct UnkStruct_203F3CC * gUnknown_203F3CC = NULL; void sub_8145A98(void); void sub_8145D18(u8 bgId); void sub_8146060(void); +void sub_81461D8(void); extern const struct WindowTemplate gUnknown_8467074[3]; @@ -130,3 +138,52 @@ s32 sub_814571C(void) ++gUnknown_203F3C8->unk_0174; return 0; } + +s32 sub_814593C(bool32 flag) +{ + if (gUnknown_203F3C8 == NULL) + return -1; + switch (gUnknown_203F3C8->unk_0174) + { + case 0: + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, 0); + break; + case 1: + if (UpdatePaletteFade()) + return 0; + break; + case 2: + FillBgTilemapBufferRect_Palette0(0, 0x000, 0, 0, 30, 20); + FillBgTilemapBufferRect_Palette0(1, 0x000, 0, 0, 30, 20); + FillBgTilemapBufferRect_Palette0(2, 0x000, 0, 0, 30, 20); + CopyBgTilemapBufferToVram(0); + CopyBgTilemapBufferToVram(1); + CopyBgTilemapBufferToVram(2); + break; + case 3: + HideBg(1); + HideBg(2); + RemoveWindow(gUnknown_203F3C8->unk_017A); + RemoveWindow(gUnknown_203F3C8->unk_0178); + RemoveWindow(gUnknown_203F3C8->unk_0176); + break; + case 4: + sub_81461D8(); + FreeMonIconPalettes(); + break; + case 5: + sub_8142344(gUnknown_203F3B8, flag); + break; + case 6: + CopyBgTilemapBufferToVram(0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, 0); + break; + default: + if (UpdatePaletteFade()) + return 0; + gUnknown_203F3C8->unk_0174 = 0; + return 1; + } + ++gUnknown_203F3C8->unk_0174; + return 0; +} diff --git a/sym_ewram.txt b/sym_ewram.txt index b12c9d4a6..9e638c025 100644 --- a/sym_ewram.txt +++ b/sym_ewram.txt @@ -1709,12 +1709,7 @@ gUnknown_203F3B8: @ 203F3B8 .include "src/mevent.o" .include "src/mevent_server_helpers.o" .include "src/mevent_server.o" - -gUnknown_203F3C8: @ 203F3C8 - .space 0x4 - -gUnknown_203F3CC: @ 203F3CC - .space 0x4 + .include "src/mevent_8145654.o" gUnknown_203F3D0: @ 203F3D0 .space 0x4 -- cgit v1.2.3 From cd42b22d6b450b1fc1d79b046fe7cd1a0fdcf543 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sun, 2 Dec 2018 13:33:03 -0500 Subject: sub_8145A98 --- asm/mevent_8145654.s | 309 +-------------------------------------------------- include/global.h | 8 +- src/mevent_8145654.c | 86 +++++++++++++- 3 files changed, 93 insertions(+), 310 deletions(-) diff --git a/asm/mevent_8145654.s b/asm/mevent_8145654.s index b831c9e87..45465afb9 100644 --- a/asm/mevent_8145654.s +++ b/asm/mevent_8145654.s @@ -5,313 +5,6 @@ .text - thumb_func_start sub_8145A98 -sub_8145A98: @ 8145A98 - push {r4-r7,lr} - mov r7, r10 - mov r6, r9 - mov r5, r8 - push {r5-r7} - sub sp, 0x8 - movs r5, 0 - mov r0, sp - movs r1, 0 - movs r2, 0x6 - bl memset - ldr r4, =gUnknown_203F3C8 - ldr r1, [r4] - ldr r2, =0x0000018b - adds r0, r1, r2 - adds r1, 0xA - movs r2, 0x28 - bl memcpy - ldr r0, [r4] - ldr r3, =0x000001b3 - adds r1, r0, r3 - movs r0, 0xFF - strb r0, [r1] - ldr r1, [r4] - movs r2, 0xDA - lsls r2, 1 - adds r0, r1, r2 - adds r1, 0x32 - movs r2, 0x28 - bl memcpy - ldr r0, [r4] - movs r3, 0xEE - lsls r3, 1 - adds r0, r3 - movs r1, 0x1 - negs r1, r1 - strb r1, [r0] - ldr r1, [r4] - ldr r0, [r1, 0x4] - ldr r2, =0x000f423f - cmp r0, r2 - bls _08145AF4 - str r2, [r1, 0x4] -_08145AF4: - ldr r1, [r4] - ldr r2, =0x000001dd - adds r0, r1, r2 - ldr r1, [r1, 0x4] - movs r2, 0 - movs r3, 0x6 - bl ConvertIntToDecimalStringN - adds r6, r4, 0 -_08145B06: - ldr r2, [r6] - lsls r1, r5, 2 - adds r1, r5 - lsls r1, 3 - adds r4, r1, r5 - adds r0, r4, r2 - movs r3, 0xF2 - lsls r3, 1 - adds r0, r3 - adds r1, r2 - adds r1, 0x5A - movs r2, 0x28 - bl memcpy - ldr r1, [r6] - movs r0, 0x83 - lsls r0, 2 - adds r1, r0 - adds r1, r4 - movs r2, 0x1 - negs r2, r2 - adds r7, r2, 0 - movs r0, 0xFF - strb r0, [r1] - adds r0, r5, 0x1 - lsls r0, 16 - lsrs r5, r0, 16 - cmp r5, 0x3 - bls _08145B06 - ldr r6, =gUnknown_203F3C8 - ldr r1, [r6] - movs r3, 0xA2 - lsls r3, 2 - adds r0, r1, r3 - adds r1, 0xFA - movs r2, 0x28 - bl memcpy - ldr r0, [r6] - movs r4, 0xAC - lsls r4, 2 - adds r0, r4 - movs r1, 0x1 - negs r1, r1 - adds r4, r1, 0 - movs r1, 0xFF - strb r1, [r0] - ldr r1, [r6] - ldrb r0, [r1, 0x8] - lsls r0, 30 - lsrs r0, 30 - cmp r0, 0x1 - beq _08145BB8 - cmp r0, 0x1 - bgt _08145B90 - cmp r0, 0 - beq _08145B96 - b _08145D08 - .pool -_08145B90: - cmp r0, 0x2 - beq _08145BC8 - b _08145D08 -_08145B96: - ldr r2, =0x000002b1 - adds r0, r1, r2 - movs r3, 0x91 - lsls r3, 1 - adds r1, r3 - movs r2, 0x28 - bl memcpy - ldr r1, [r6] - ldr r0, =0x000002d9 - adds r1, r0 - b _08145BBC - .pool -_08145BB8: - ldr r2, =0x000002b1 - adds r1, r2 -_08145BBC: - ldrb r0, [r1] - orrs r0, r4 - strb r0, [r1] - b _08145D08 - .pool -_08145BC8: - ldr r3, =0x000002b1 - adds r0, r1, r3 - ldrb r1, [r0] - orrs r1, r7 - strb r1, [r0] - mov r3, sp - ldr r1, [r6] - movs r4, 0xA6 - lsls r4, 1 - adds r0, r1, r4 - ldrh r0, [r0] - ldr r2, =0x000003e7 - cmp r0, r2 - bls _08145BE6 - adds r0, r2, 0 -_08145BE6: - strh r0, [r3] - mov r3, sp - movs r4, 0xA7 - lsls r4, 1 - adds r0, r1, r4 - ldrh r0, [r0] - cmp r0, r2 - bls _08145BF8 - adds r0, r2, 0 -_08145BF8: - strh r0, [r3, 0x2] - mov r3, sp - movs r4, 0xA8 - lsls r4, 1 - adds r0, r1, r4 - ldrh r0, [r0] - cmp r0, r2 - bls _08145C0A - adds r0, r2, 0 -_08145C0A: - strh r0, [r3, 0x4] - movs r5, 0 -_08145C0E: - lsls r4, r5, 1 - adds r4, r5 - lsls r4, 4 - movs r0, 0xB7 - lsls r0, 2 - adds r4, r0 - ldr r0, [r6] - adds r0, r4 - adds r0, 0x2A - movs r1, 0xFF - movs r2, 0x4 - bl memset - ldr r0, [r6] - adds r0, r4 - adds r0, 0x1 - movs r1, 0xFF - movs r2, 0x29 - bl memset - adds r0, r5, 0x1 - lsls r0, 16 - lsrs r5, r0, 16 - cmp r5, 0x7 - bls _08145C0E - movs r5, 0 - movs r6, 0 - ldr r1, =gUnknown_203F3C8 - mov r8, r1 - movs r2, 0x91 - lsls r2, 1 - mov r10, r2 - ldr r7, =0x00000175 - movs r3, 0xB7 - lsls r3, 2 - mov r9, r3 -_08145C56: - mov r4, r8 - ldr r2, [r4] - mov r0, r10 - adds r1, r2, r0 - adds r0, r1, r5 - ldrb r3, [r0] - cmp r3, 0xF7 - beq _08145C98 - ldr r1, =0x00000175 - adds r0, r2, r1 - ldrb r1, [r0] - lsls r0, r1, 1 - adds r0, r1 - lsls r0, 4 - adds r0, r6, r0 - ldr r4, =0x000002dd - adds r1, r2, r4 - adds r1, r0 - strb r3, [r1] - adds r0, r6, 0x1 - lsls r0, 16 - lsrs r6, r0, 16 - b _08145CFE - .pool -_08145C98: - adds r0, r5, 0x1 - adds r0, r1, r0 - ldrb r3, [r0] - cmp r3, 0x2 - bls _08145CA8 - adds r0, r5, 0x2 - lsls r0, 16 - b _08145CFC -_08145CA8: - adds r0, r2, r7 - ldrb r1, [r0] - lsls r0, r1, 1 - adds r0, r1 - lsls r0, 4 - add r0, r9 - adds r0, r2, r0 - adds r0, 0x2A - lsls r1, r3, 1 - add r1, sp - ldrh r1, [r1] - movs r2, 0x2 - movs r3, 0x3 - bl ConvertIntToDecimalStringN - mov r0, r8 - ldr r1, [r0] - adds r0, r1, r7 - ldrb r2, [r0] - lsls r0, r2, 1 - adds r0, r2 - lsls r0, 4 - adds r0, r1, r0 - adds r4, r5, 0x2 - add r1, r10 - adds r1, r4 - ldrb r1, [r1] - add r0, r9 - strb r1, [r0] - mov r2, r8 - ldr r1, [r2] - adds r1, r7 - ldrb r0, [r1] - adds r0, 0x1 - strb r0, [r1] - ldr r0, [r2] - adds r0, r7 - ldrb r0, [r0] - cmp r0, 0x7 - bhi _08145D08 - movs r6, 0 - lsls r0, r4, 16 -_08145CFC: - lsrs r5, r0, 16 -_08145CFE: - adds r0, r5, 0x1 - lsls r0, 16 - lsrs r5, r0, 16 - cmp r5, 0x27 - bls _08145C56 -_08145D08: - add sp, 0x8 - pop {r3-r5} - mov r8, r3 - mov r9, r4 - mov r10, r5 - pop {r4-r7} - pop {r0} - bx r0 - thumb_func_end sub_8145A98 - thumb_func_start sub_8145D18 sub_8145D18: @ 8145D18 push {r4-r7,lr} @@ -972,6 +665,8 @@ _08146274: .pool thumb_func_end sub_81461D8 + @ file boundary maybe + thumb_func_start sub_8146288 sub_8146288: @ 8146288 push {r4-r6,lr} diff --git a/include/global.h b/include/global.h index 7c663a813..783a2c375 100644 --- a/include/global.h +++ b/include/global.h @@ -612,12 +612,16 @@ struct MEventBuffer_32E0_Sub { u16 unk_00; u16 unk_02; - u8 filler_04[4]; + u32 unk_04; u8 unk_08_0:2; u8 unk_08_2:4; u8 unk_08_6:2; u8 unk_09; - u8 filler_0A[322]; + u8 unk_0A[40]; + u8 unk_32[40]; + u8 unk_5A[4][40]; + u8 unk_FA[40]; + u8 unk_122[40]; }; struct MEventBuffer_32E0 diff --git a/src/mevent_8145654.c b/src/mevent_8145654.c index 6c51f9091..d3ec2e0ce 100644 --- a/src/mevent_8145654.c +++ b/src/mevent_8145654.c @@ -6,6 +6,7 @@ #include "menu.h" #include "pokemon_icon.h" #include "mystery_gift_menu.h" +#include "string_util.h" #include "mevent.h" struct UnkStruct_8467FB8 @@ -16,16 +17,31 @@ struct UnkStruct_8467FB8 const u16 * pal; }; +struct UnkStruct_203F3C8_02DC +{ + u8 unk_00; + u8 unk_01[41]; + u8 unk_42[4]; +}; + struct UnkStruct_203F3C8 { /*0000*/ struct MEventBuffer_32E0_Sub unk_0000; /*014c*/ struct MEventBuffer_3430_Sub unk_014c; /*0170*/ const struct UnkStruct_8467FB8 * unk_0170; /*0174*/ u8 unk_0174; + /*0175*/ u8 unk_0175; /*0176*/ u16 unk_0176; /*0178*/ u16 unk_0178; /*017A*/ u16 unk_017A; - /*017C*/ u8 filler_0178[0x2E0]; + /*017C*/ u8 filler_017C[15]; + /*018B*/ u8 unk_018B[41]; + /*01B4*/ u8 unk_01B4[41]; + /*01DD*/ u8 unk_01DD[7]; + /*01E4*/ u8 unk_01E4[4][41]; + /*0288*/ u8 unk_0288[41]; + /*02B1*/ u8 unk_02B1[41]; + /*02DC*/ struct UnkStruct_203F3C8_02DC unk_02DC[8]; /*045C*/ u8 buffer_045C[0x1000]; }; @@ -187,3 +203,71 @@ s32 sub_814593C(bool32 flag) ++gUnknown_203F3C8->unk_0174; return 0; } + +void sub_8145A98(void) +{ + u16 i = 0; + u16 r6; + u16 sp0[3] = {0, 0, 0}; + + memcpy(gUnknown_203F3C8->unk_018B, gUnknown_203F3C8->unk_0000.unk_0A, 40); + gUnknown_203F3C8->unk_018B[40] = EOS; + memcpy(gUnknown_203F3C8->unk_01B4, gUnknown_203F3C8->unk_0000.unk_32, 40); + gUnknown_203F3C8->unk_01B4[40] = EOS; + if (gUnknown_203F3C8->unk_0000.unk_04 > 999999) + gUnknown_203F3C8->unk_0000.unk_04 = 999999; + ConvertIntToDecimalStringN(gUnknown_203F3C8->unk_01DD, gUnknown_203F3C8->unk_0000.unk_04, STR_CONV_MODE_LEFT_ALIGN, 6); + for (i = 0; i < 4; i++) + { + memcpy(gUnknown_203F3C8->unk_01E4[i], gUnknown_203F3C8->unk_0000.unk_5A[i], 40); + gUnknown_203F3C8->unk_01E4[i][40] = EOS; + } + memcpy(gUnknown_203F3C8->unk_0288, gUnknown_203F3C8->unk_0000.unk_FA, 40); + gUnknown_203F3C8->unk_0288[40] = EOS; + switch (gUnknown_203F3C8->unk_0000.unk_08_0) + { + case 0: + memcpy(gUnknown_203F3C8->unk_02B1, gUnknown_203F3C8->unk_0000.unk_122, 40); + gUnknown_203F3C8->unk_02B1[40] = EOS; + break; + case 1: + gUnknown_203F3C8->unk_02B1[00] = EOS; + break; + case 2: + gUnknown_203F3C8->unk_02B1[00] = EOS; + sp0[0] = gUnknown_203F3C8->unk_014c.unk_00 < 999 ? gUnknown_203F3C8->unk_014c.unk_00 : 999; + sp0[1] = gUnknown_203F3C8->unk_014c.unk_02 < 999 ? gUnknown_203F3C8->unk_014c.unk_02 : 999; + sp0[2] = gUnknown_203F3C8->unk_014c.unk_04 < 999 ? gUnknown_203F3C8->unk_014c.unk_04 : 999; + for (i = 0; i < 8; i++) + { + memset(gUnknown_203F3C8->unk_02DC[i].unk_42, EOS, 4); + memset(gUnknown_203F3C8->unk_02DC[i].unk_01, EOS, 41); + } + for (i = 0, r6 = 0; i < 40; i++) + { + if (gUnknown_203F3C8->unk_0000.unk_122[i] != 0xF7) + { + gUnknown_203F3C8->unk_02DC[gUnknown_203F3C8->unk_0175].unk_01[r6] = gUnknown_203F3C8->unk_0000.unk_122[i]; + r6++; + } + else + { + u8 r3 = gUnknown_203F3C8->unk_0000.unk_122[i + 1]; + if (r3 > 2) + { + i += 2; + } + else + { + ConvertIntToDecimalStringN(gUnknown_203F3C8->unk_02DC[gUnknown_203F3C8->unk_0175].unk_42, sp0[r3], STR_CONV_MODE_LEADING_ZEROS, 3); + gUnknown_203F3C8->unk_02DC[gUnknown_203F3C8->unk_0175].unk_00 = gUnknown_203F3C8->unk_0000.unk_122[i + 2]; + gUnknown_203F3C8->unk_0175++; + if (gUnknown_203F3C8->unk_0175 > 7) + break; + r6 = 0; + i += 2; + } + } + } + } +} -- cgit v1.2.3 From 30d4803a44a8f11ee88c4d4e37cef9f2373b3542 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sun, 2 Dec 2018 16:06:01 -0500 Subject: sub_8145D18 --- asm/mevent_8145654.s | 398 ------------------------------------------------- data/data_8466FB8.s | 5 +- include/pokemon_icon.h | 2 + src/mevent_8145654.c | 111 +++++++++++--- 4 files changed, 100 insertions(+), 416 deletions(-) diff --git a/asm/mevent_8145654.s b/asm/mevent_8145654.s index 45465afb9..d561f2766 100644 --- a/asm/mevent_8145654.s +++ b/asm/mevent_8145654.s @@ -5,404 +5,6 @@ .text - thumb_func_start sub_8145D18 -sub_8145D18: @ 8145D18 - push {r4-r7,lr} - mov r7, r10 - mov r6, r9 - mov r5, r8 - push {r5-r7} - sub sp, 0x18 - lsls r0, 24 - lsrs r4, r0, 24 - mov r8, r4 - movs r0, 0 - str r0, [sp, 0xC] - ldr r7, =gUnknown_203F3C8 - ldr r0, [r7] - lsls r1, r4, 1 - movs r2, 0xBB - lsls r2, 1 - adds r0, r2 - adds r0, r1 - ldrh r0, [r0] - lsls r6, r0, 24 - lsrs r5, r6, 24 - adds r0, r5, 0 - bl PutWindowTilemap - adds r0, r5, 0 - movs r1, 0 - bl FillWindowPixelBuffer - cmp r4, 0x1 - beq _08145E40 - cmp r4, 0x1 - bgt _08145D64 - cmp r4, 0 - beq _08145D70 - mov r9, r6 - b _08146038 - .pool -_08145D64: - mov r0, r8 - cmp r0, 0x2 - bne _08145D6C - b _08145EA4 -_08145D6C: - mov r9, r6 - b _08146038 -_08145D70: - ldr r2, [r7] - movs r1, 0xB8 - lsls r1, 1 - mov r10, r1 - adds r0, r2, r1 - ldr r0, [r0] - ldrb r0, [r0] - lsls r0, 28 - lsrs r0, 28 - lsls r1, r0, 1 - adds r1, r0 - ldr r0, =gUnknown_8467068 - mov r8, r0 - add r1, r8 - str r1, [sp] - ldr r1, [sp, 0xC] - str r1, [sp, 0x4] - ldr r0, =0x0000018b - adds r2, r0 - str r2, [sp, 0x8] - adds r0, r5, 0 - movs r1, 0x3 - movs r2, 0 - movs r3, 0x1 - bl box_print - ldr r4, [r7] - movs r1, 0xDA - lsls r1, 1 - mov r9, r1 - add r4, r9 - movs r0, 0x3 - movs r1, 0x2 - bl GetFontAttribute - adds r2, r0, 0 - lsls r2, 24 - lsrs r2, 24 - movs r0, 0x3 - adds r1, r4, 0 - bl GetStringWidth - movs r1, 0xA0 - subs r1, r0 - cmp r1, 0 - bge _08145DCE - movs r1, 0 -_08145DCE: - lsls r2, r1, 24 - lsrs r2, 24 - ldr r3, [r7] - mov r1, r10 - adds r0, r3, r1 - ldr r0, [r0] - ldrb r1, [r0] - lsls r1, 28 - lsrs r1, 28 - lsls r0, r1, 1 - adds r0, r1 - add r0, r8 - str r0, [sp] - ldr r0, [sp, 0xC] - str r0, [sp, 0x4] - add r3, r9 - str r3, [sp, 0x8] - adds r0, r5, 0 - movs r1, 0x3 - movs r3, 0x11 - bl box_print - ldr r2, [r7] - ldr r0, [r2, 0x4] - mov r9, r6 - cmp r0, 0 - bne _08145E06 - b _08146038 -_08145E06: - mov r1, r10 - adds r0, r2, r1 - ldr r0, [r0] - ldrb r1, [r0] - lsls r1, 28 - lsrs r1, 28 - lsls r0, r1, 1 - adds r0, r1 - add r0, r8 - str r0, [sp] - ldr r0, [sp, 0xC] - str r0, [sp, 0x4] - ldr r1, =0x000001dd - adds r0, r2, r1 - str r0, [sp, 0x8] - adds r0, r5, 0 - movs r1, 0x2 - movs r2, 0xA6 - movs r3, 0x11 - bl box_print - b _08146038 - .pool -_08145E40: - mov r9, r6 -_08145E42: - ldr r2, [sp, 0xC] - lsls r4, r2, 24 - asrs r4, 24 - lsls r3, r4, 4 - adds r3, 0x2 - lsls r3, 24 - lsrs r3, 24 - ldr r0, =gUnknown_203F3C8 - ldr r2, [r0] - movs r1, 0xB8 - lsls r1, 1 - adds r0, r2, r1 - ldr r0, [r0] - ldrb r0, [r0] - lsrs r0, 4 - lsls r1, r0, 1 - adds r1, r0 - ldr r0, =gUnknown_8467068 - adds r1, r0 - str r1, [sp] - movs r0, 0 - str r0, [sp, 0x4] - lsls r0, r4, 2 - adds r0, r4 - lsls r0, 3 - adds r0, r4 - movs r1, 0xF2 - lsls r1, 1 - adds r0, r1 - adds r2, r0 - str r2, [sp, 0x8] - mov r2, r9 - lsrs r0, r2, 24 - movs r1, 0x3 - movs r2, 0 - bl box_print - adds r4, 0x1 - lsls r4, 24 - lsrs r0, r4, 24 - str r0, [sp, 0xC] - asrs r4, 24 - cmp r4, 0x3 - ble _08145E42 - b _08146038 - .pool -_08145EA4: - ldr r4, =gUnknown_8467070 - ldr r2, [r7] - ldrb r0, [r2, 0x8] - lsls r0, 30 - lsrs r0, 30 - adds r0, r4 - ldrb r3, [r0] - movs r1, 0xB8 - lsls r1, 1 - adds r0, r2, r1 - ldr r0, [r0] - ldrb r0, [r0, 0x1] - lsls r0, 28 - lsrs r0, 28 - lsls r1, r0, 1 - adds r1, r0 - ldr r0, =gUnknown_8467068 - mov r10, r0 - add r1, r10 - str r1, [sp] - ldr r1, [sp, 0xC] - str r1, [sp, 0x4] - movs r1, 0xA2 - lsls r1, 2 - adds r0, r2, r1 - str r0, [sp, 0x8] - adds r0, r5, 0 - movs r1, 0x3 - movs r2, 0 - bl box_print - ldr r2, [r7] - ldrb r1, [r2, 0x8] - movs r0, 0x3 - ands r0, r1 - cmp r0, 0x2 - beq _08145F38 - lsls r0, r1, 30 - lsrs r0, 30 - adds r0, r4 - ldrb r3, [r0] - adds r3, 0x10 - lsls r3, 24 - lsrs r3, 24 - movs r1, 0xB8 - lsls r1, 1 - adds r0, r2, r1 - ldr r0, [r0] - ldrb r1, [r0, 0x1] - lsls r1, 28 - lsrs r1, 28 - lsls r0, r1, 1 - adds r0, r1 - add r0, r10 - str r0, [sp] - ldr r0, [sp, 0xC] - str r0, [sp, 0x4] - ldr r1, =0x000002b1 - adds r0, r2, r1 - str r0, [sp, 0x8] - adds r0, r5, 0 - movs r1, 0x3 - movs r2, 0 - bl box_print - mov r9, r6 - b _08146038 - .pool -_08145F38: - movs r2, 0 - mov r8, r2 - lsls r0, r1, 30 - lsrs r0, 30 - adds r0, r4 - ldrb r0, [r0] - adds r4, r0, 0 - adds r4, 0x10 - movs r0, 0x3 - movs r1, 0x2 - bl GetFontAttribute - lsls r0, 24 - lsrs r2, r0, 24 - ldr r0, [r7] - ldr r1, =0x00000175 - adds r0, r1 - mov r9, r6 - ldr r1, [sp, 0xC] - ldrb r0, [r0] - cmp r1, r0 - bge _08146038 - str r5, [sp, 0x10] - lsls r0, r4, 24 - lsrs r0, 24 - str r0, [sp, 0x14] - mov r10, r2 -_08145F6E: - mov r0, r8 - lsls r2, r0, 24 - lsrs r2, 24 - ldr r3, [r7] - movs r1, 0xB8 - lsls r1, 1 - adds r0, r3, r1 - ldr r0, [r0] - ldrb r1, [r0, 0x1] - lsls r1, 28 - lsrs r1, 28 - lsls r0, r1, 1 - adds r0, r1 - ldr r1, =gUnknown_8467068 - adds r0, r1 - str r0, [sp] - movs r0, 0 - str r0, [sp, 0x4] - ldr r1, [sp, 0xC] - lsls r0, r1, 24 - asrs r6, r0, 24 - lsls r0, r6, 1 - adds r0, r6 - lsls r5, r0, 4 - movs r0, 0xB7 - lsls r0, 2 - adds r4, r5, r0 - adds r3, r4 - adds r3, 0x1 - str r3, [sp, 0x8] - ldr r0, [sp, 0x10] - movs r1, 0x3 - ldr r3, [sp, 0x14] - bl box_print - ldr r1, [r7] - adds r0, r1, r5 - ldr r2, =0x00000306 - adds r0, r2 - ldrb r0, [r0] - cmp r0, 0xFF - beq _08146022 - adds r1, r4 - adds r1, 0x1 - movs r0, 0x3 - mov r2, r10 - bl GetStringWidth - add r8, r0 - mov r0, r8 - lsls r2, r0, 24 - lsrs r2, 24 - ldr r3, [r7] - movs r1, 0xB8 - lsls r1, 1 - adds r0, r3, r1 - ldr r0, [r0] - ldrb r1, [r0, 0x1] - lsls r1, 28 - lsrs r1, 28 - lsls r0, r1, 1 - adds r0, r1 - ldr r1, =gUnknown_8467068 - adds r0, r1 - str r0, [sp] - movs r0, 0 - str r0, [sp, 0x4] - adds r3, r4 - adds r3, 0x2A - str r3, [sp, 0x8] - ldr r0, [sp, 0x10] - movs r1, 0x2 - ldr r3, [sp, 0x14] - bl box_print - ldr r1, [r7] - adds r1, r4 - adds r1, 0x2A - movs r0, 0x3 - mov r2, r10 - bl GetStringWidth - ldr r1, [r7] - adds r1, r5 - movs r2, 0xB7 - lsls r2, 2 - adds r1, r2 - ldrb r1, [r1] - adds r0, r1 - add r8, r0 -_08146022: - adds r1, r6, 0x1 - lsls r1, 24 - lsrs r0, r1, 24 - str r0, [sp, 0xC] - asrs r1, 24 - ldr r0, [r7] - ldr r2, =0x00000175 - adds r0, r2 - ldrb r0, [r0] - cmp r1, r0 - blt _08145F6E -_08146038: - mov r1, r9 - lsrs r0, r1, 24 - movs r1, 0x3 - bl CopyWindowToVram - add sp, 0x18 - pop {r3-r5} - mov r8, r3 - mov r9, r4 - mov r10, r5 - pop {r4-r7} - pop {r0} - bx r0 - .pool - thumb_func_end sub_8145D18 - thumb_func_start sub_8146060 sub_8146060: @ 8146060 push {r4-r7,lr} diff --git a/data/data_8466FB8.s b/data/data_8466FB8.s index f6d8ebaff..e7b8c4fbb 100644 --- a/data/data_8466FB8.s +++ b/data/data_8466FB8.s @@ -89,7 +89,10 @@ gUnknown_8467CAC:: .incbin "data/graphics/mevent/tilemap_467CAC.bin.lz" gUnknown_8467DF4:: - .incbin "baserom.gba", 0x467DF4, 0x164 + .incbin "baserom.gba", 0x467DF4, 0x100 + +gUnknown_8467EF4:: + .incbin "baserom.gba", 0x467EF4, 0x64 gUnknown_8467F58:: @ 8467F58 .incbin "baserom.gba", 0x467F58, 0x8 diff --git a/include/pokemon_icon.h b/include/pokemon_icon.h index 2c2edcc7c..cef408046 100644 --- a/include/pokemon_icon.h +++ b/include/pokemon_icon.h @@ -12,5 +12,7 @@ void sub_80D2FF0(u16 iconId); void sub_80D2EF8(struct Sprite *sprite); void sub_809707C(void); void FreeMonIconPalettes(void); +u16 sub_8096FD4(u16); +u8 sub_8096ECC(u16, void (*)(struct Sprite *), s16, s16, u8, bool32); #endif // GUARD_POKEMON_ICON_H diff --git a/src/mevent_8145654.c b/src/mevent_8145654.c index d3ec2e0ce..ec1664643 100644 --- a/src/mevent_8145654.c +++ b/src/mevent_8145654.c @@ -1,4 +1,5 @@ #include "global.h" +#include "constants/species.h" #include "bg.h" #include "palette.h" #include "decompress.h" @@ -11,7 +12,10 @@ struct UnkStruct_8467FB8 { - u16 ident; + u8 textPal1:4; + u8 textPal2:4; + u8 textPal3:4; + u8 textPal4:4; const u8 * tiles; const u8 * map; const u16 * pal; @@ -27,14 +31,13 @@ struct UnkStruct_203F3C8_02DC struct UnkStruct_203F3C8 { /*0000*/ struct MEventBuffer_32E0_Sub unk_0000; - /*014c*/ struct MEventBuffer_3430_Sub unk_014c; + /*014c*/ struct MEventBuffer_3430_Sub unk_014C; /*0170*/ const struct UnkStruct_8467FB8 * unk_0170; /*0174*/ u8 unk_0174; /*0175*/ u8 unk_0175; - /*0176*/ u16 unk_0176; - /*0178*/ u16 unk_0178; - /*017A*/ u16 unk_017A; - /*017C*/ u8 filler_017C[15]; + /*0176*/ u16 unk_0176[3]; + /*017C*/ u8 unk_017C; + /*017D*/ u8 filler_017D[14]; /*018B*/ u8 unk_018B[41]; /*01B4*/ u8 unk_01B4[41]; /*01DD*/ u8 unk_01DD[7]; @@ -54,12 +57,15 @@ EWRAM_DATA struct UnkStruct_203F3C8 * gUnknown_203F3C8 = NULL; EWRAM_DATA struct UnkStruct_203F3CC * gUnknown_203F3CC = NULL; void sub_8145A98(void); -void sub_8145D18(u8 bgId); +void sub_8145D18(u8 whichWindow); void sub_8146060(void); void sub_81461D8(void); +extern const struct TextColor gUnknown_8467068[2]; +extern const u8 gUnknown_8467070[3]; extern const struct WindowTemplate gUnknown_8467074[3]; +extern const struct CompressedSpriteSheet gUnknown_8467F58; extern const struct UnkStruct_8467FB8 gUnknown_8467FB8[8]; bool32 sub_8145654(struct MEventBuffer_32E0_Sub * r5, struct MEventBuffer_3430_Sub * r6) @@ -70,7 +76,7 @@ bool32 sub_8145654(struct MEventBuffer_32E0_Sub * r5, struct MEventBuffer_3430_S if (gUnknown_203F3C8 == NULL) return FALSE; gUnknown_203F3C8->unk_0000 = *r5; - gUnknown_203F3C8->unk_014c = *r6; + gUnknown_203F3C8->unk_014C = *r6; if (gUnknown_203F3C8->unk_0000.unk_08_2 > 7) gUnknown_203F3C8->unk_0000.unk_08_2 = 0; if (gUnknown_203F3C8->unk_0000.unk_08_0 > 2) @@ -112,9 +118,9 @@ s32 sub_814571C(void) CopyBgTilemapBufferToVram(1); CopyBgTilemapBufferToVram(2); decompress_and_copy_tile_data_to_vram(2, gUnknown_203F3C8->unk_0170->tiles, 0, 0x008, 0); - gUnknown_203F3C8->unk_0176 = AddWindow(&gUnknown_8467074[0]); - gUnknown_203F3C8->unk_0178 = AddWindow(&gUnknown_8467074[1]); - gUnknown_203F3C8->unk_017A = AddWindow(&gUnknown_8467074[2]); + gUnknown_203F3C8->unk_0176[0] = AddWindow(&gUnknown_8467074[0]); + gUnknown_203F3C8->unk_0176[1] = AddWindow(&gUnknown_8467074[1]); + gUnknown_203F3C8->unk_0176[2] = AddWindow(&gUnknown_8467074[2]); break; case 3: if (free_temp_tile_data_buffers_if_possible()) @@ -179,9 +185,9 @@ s32 sub_814593C(bool32 flag) case 3: HideBg(1); HideBg(2); - RemoveWindow(gUnknown_203F3C8->unk_017A); - RemoveWindow(gUnknown_203F3C8->unk_0178); - RemoveWindow(gUnknown_203F3C8->unk_0176); + RemoveWindow(gUnknown_203F3C8->unk_0176[2]); + RemoveWindow(gUnknown_203F3C8->unk_0176[1]); + RemoveWindow(gUnknown_203F3C8->unk_0176[0]); break; case 4: sub_81461D8(); @@ -235,9 +241,9 @@ void sub_8145A98(void) break; case 2: gUnknown_203F3C8->unk_02B1[00] = EOS; - sp0[0] = gUnknown_203F3C8->unk_014c.unk_00 < 999 ? gUnknown_203F3C8->unk_014c.unk_00 : 999; - sp0[1] = gUnknown_203F3C8->unk_014c.unk_02 < 999 ? gUnknown_203F3C8->unk_014c.unk_02 : 999; - sp0[2] = gUnknown_203F3C8->unk_014c.unk_04 < 999 ? gUnknown_203F3C8->unk_014c.unk_04 : 999; + sp0[0] = gUnknown_203F3C8->unk_014C.unk_00 < 999 ? gUnknown_203F3C8->unk_014C.unk_00 : 999; + sp0[1] = gUnknown_203F3C8->unk_014C.unk_02 < 999 ? gUnknown_203F3C8->unk_014C.unk_02 : 999; + sp0[2] = gUnknown_203F3C8->unk_014C.unk_04 < 999 ? gUnknown_203F3C8->unk_014C.unk_04 : 999; for (i = 0; i < 8; i++) { memset(gUnknown_203F3C8->unk_02DC[i].unk_42, EOS, 4); @@ -271,3 +277,74 @@ void sub_8145A98(void) } } } + +void sub_8145D18(u8 whichWindow) +{ + s8 sp0C = 0; + s32 windowId = gUnknown_203F3C8->unk_0176[whichWindow]; + PutWindowTilemap(windowId); + FillWindowPixelBuffer(windowId, 0); + switch (whichWindow) + { + case 0: + { + s32 x; + box_print(windowId, 3, 0, 1, &gUnknown_8467068[gUnknown_203F3C8->unk_0170->textPal1], 0, gUnknown_203F3C8->unk_018B); + x = 160 - GetStringWidth(3, gUnknown_203F3C8->unk_01B4, GetFontAttribute(3, 2)); + if (x < 0) + x = 0; + box_print(windowId, 3, x, 17, &gUnknown_8467068[gUnknown_203F3C8->unk_0170->textPal1], 0, gUnknown_203F3C8->unk_01B4); + if (gUnknown_203F3C8->unk_0000.unk_04 != 0) + { + box_print(windowId, 2, 166, 17, &gUnknown_8467068[gUnknown_203F3C8->unk_0170->textPal1], 0, gUnknown_203F3C8->unk_01DD); + } + break; + } + case 1: + for (; sp0C < 4; sp0C++) + { + box_print(windowId, 3, 0, 16 * sp0C + 2, &gUnknown_8467068[gUnknown_203F3C8->unk_0170->textPal2], 0, gUnknown_203F3C8->unk_01E4[sp0C]); + } + break; + case 2: + box_print(windowId, 3, 0, gUnknown_8467070[gUnknown_203F3C8->unk_0000.unk_08_0], &gUnknown_8467068[gUnknown_203F3C8->unk_0170->textPal3], 0, gUnknown_203F3C8->unk_0288); + if (gUnknown_203F3C8->unk_0000.unk_08_0 != 2) + { + box_print(windowId, 3, 0, 16 + gUnknown_8467070[gUnknown_203F3C8->unk_0000.unk_08_0], &gUnknown_8467068[gUnknown_203F3C8->unk_0170->textPal3], 0, gUnknown_203F3C8->unk_02B1); + } + else + { + s32 x = 0; + s32 y = gUnknown_8467070[gUnknown_203F3C8->unk_0000.unk_08_0] + 16; + s32 spacing = GetFontAttribute(3, 2); + for (; sp0C < gUnknown_203F3C8->unk_0175; sp0C++) + { + box_print(windowId, 3, x, y, &gUnknown_8467068[gUnknown_203F3C8->unk_0170->textPal3], 0, gUnknown_203F3C8->unk_02DC[sp0C].unk_01); + if (gUnknown_203F3C8->unk_02DC[sp0C].unk_42[0] != EOS) + { + x += GetStringWidth(3, gUnknown_203F3C8->unk_02DC[sp0C].unk_01, spacing); + box_print(windowId, 2, x, y, &gUnknown_8467068[gUnknown_203F3C8->unk_0170->textPal3], 0, gUnknown_203F3C8->unk_02DC[sp0C].unk_42); + x += GetStringWidth(3, gUnknown_203F3C8->unk_02DC[sp0C].unk_42, spacing) + gUnknown_203F3C8->unk_02DC[sp0C].unk_00; + } + } + } + break; + } + CopyWindowToVram(windowId, 3); +} + +/* +void sub_8146060(void) +{ + gUnknown_203F3C8->unk_017C = 0xFF; + if (gUnknown_203F3C8->unk_014C.unk_06 != SPECIES_NONE) + { + gUnknown_203F3C8->unk_017C = sub_8096ECC(sub_8096FD4(gUnknown_203F3C8->unk_014C.unk_06), SpriteCallbackDummy, 0xDC, 0x14, 0, FALSE); + gSprites[gUnknown_203F3C8->unk_017C].oam.priority = 2; + } + if (gUnknown_203F3C8->unk_0000.unk_09 != 0 && gUnknown_203F3C8->unk_0000.unk_08_0 == 1) + { + sub_800F034(gUnknown_8467F58); + } +} + */ -- cgit v1.2.3 From 9e34e6b53d8c21c79e67c7b46ac658506abb4ed3 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sun, 2 Dec 2018 16:38:07 -0500 Subject: sub_8146060 --- asm/mevent_8145654.s | 176 --------------------------------------------------- data/data_8466FB8.s | 37 +++++++++-- include/decompress.h | 2 + src/mevent_8145654.c | 21 ++++-- 4 files changed, 52 insertions(+), 184 deletions(-) diff --git a/asm/mevent_8145654.s b/asm/mevent_8145654.s index d561f2766..e8af5eeae 100644 --- a/asm/mevent_8145654.s +++ b/asm/mevent_8145654.s @@ -5,182 +5,6 @@ .text - thumb_func_start sub_8146060 -sub_8146060: @ 8146060 - push {r4-r7,lr} - mov r7, r10 - mov r6, r9 - mov r5, r8 - push {r5-r7} - sub sp, 0x8 - movs r7, 0 - ldr r4, =gUnknown_203F3C8 - ldr r0, [r4] - movs r1, 0xBE - lsls r1, 1 - adds r0, r1 - movs r1, 0xFF - strb r1, [r0] - ldr r0, [r4] - movs r2, 0xA9 - lsls r2, 1 - adds r1, r0, r2 - ldrh r0, [r1] - cmp r0, 0 - beq _081460C8 - bl sub_8096FD4 - lsls r0, 16 - lsrs r0, 16 - ldr r1, =SpriteCallbackDummy - str r7, [sp] - str r7, [sp, 0x4] - movs r2, 0xDC - movs r3, 0x14 - bl sub_8096ECC - ldr r1, [r4] - movs r3, 0xBE - lsls r3, 1 - adds r1, r3 - strb r0, [r1] - ldr r2, =gSprites - ldr r0, [r4] - adds r0, r3 - ldrb r1, [r0] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - adds r0, r2 - ldrb r2, [r0, 0x5] - movs r1, 0xD - negs r1, r1 - ands r1, r2 - movs r2, 0x8 - orrs r1, r2 - strb r1, [r0, 0x5] -_081460C8: - ldr r1, [r4] - ldrb r0, [r1, 0x9] - cmp r0, 0 - beq _081461AC - ldrb r1, [r1, 0x8] - movs r0, 0x3 - ands r0, r1 - cmp r0, 0x1 - bne _081461AC - ldr r0, =gUnknown_8467F58 - bl sub_800F034 - ldr r0, [r4] - movs r1, 0xB8 - lsls r1, 1 - adds r0, r1 - ldr r0, [r0] - ldrb r0, [r0, 0x1] - lsrs r0, 4 - lsls r0, 3 - ldr r1, =gUnknown_8467F60 - adds r0, r1 - bl LoadSpritePalette - ldr r0, [r4] - ldrb r0, [r0, 0x9] - cmp r7, r0 - bcs _081461AC - adds r6, r4, 0 - ldr r2, =0x0000017d - mov r10, r2 - movs r3, 0 - mov r9, r3 - movs r0, 0xFF - mov r8, r0 -_0814610E: - ldr r1, [r6] - lsls r4, r7, 1 - add r1, r10 - adds r1, r4 - ldrb r0, [r1] - mov r2, r8 - orrs r0, r2 - strb r0, [r1] - ldr r1, [r6] - movs r3, 0xBF - lsls r3, 1 - adds r1, r3 - adds r1, r4 - ldrb r0, [r1] - orrs r0, r2 - strb r0, [r1] - lsls r1, r7, 5 - movs r0, 0xD8 - subs r5, r0, r1 - ldr r0, =gUnknown_8467FA0 - adds r1, r5, 0 - movs r2, 0x90 - movs r3, 0x8 - bl CreateSprite - ldr r1, [r6] - add r1, r10 - adds r1, r4 - strb r0, [r1] - ldr r0, [r6] - movs r1, 0xAA - lsls r1, 1 - adds r0, r1 - adds r1, r0, r4 - ldrh r0, [r1] - cmp r0, 0 - beq _0814619E - bl sub_8096FD4 - lsls r0, 16 - lsrs r0, 16 - mov r2, r9 - str r2, [sp] - str r2, [sp, 0x4] - ldr r1, =SpriteCallbackDummy - adds r2, r5, 0 - movs r3, 0x88 - bl sub_8096ECC - ldr r1, [r6] - movs r3, 0xBF - lsls r3, 1 - adds r1, r3 - adds r1, r4 - strb r0, [r1] - ldr r0, [r6] - adds r0, r3 - adds r0, r4 - ldrb r1, [r0] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - ldr r1, =gSprites - adds r0, r1 - ldrb r2, [r0, 0x5] - movs r3, 0xD - negs r3, r3 - adds r1, r3, 0 - ands r2, r1 - movs r1, 0x8 - orrs r2, r1 - strb r2, [r0, 0x5] -_0814619E: - adds r0, r7, 0x1 - lsls r0, 24 - lsrs r7, r0, 24 - ldr r0, [r6] - ldrb r0, [r0, 0x9] - cmp r7, r0 - bcc _0814610E -_081461AC: - add sp, 0x8 - pop {r3-r5} - mov r8, r3 - mov r9, r4 - mov r10, r5 - pop {r4-r7} - pop {r0} - bx r0 - .pool - thumb_func_end sub_8146060 - thumb_func_start sub_81461D8 sub_81461D8: @ 81461D8 push {r4-r7,lr} diff --git a/data/data_8466FB8.s b/data/data_8466FB8.s index e7b8c4fbb..38cd46b8c 100644 --- a/data/data_8466FB8.s +++ b/data/data_8466FB8.s @@ -89,16 +89,45 @@ gUnknown_8467CAC:: .incbin "data/graphics/mevent/tilemap_467CAC.bin.lz" gUnknown_8467DF4:: - .incbin "baserom.gba", 0x467DF4, 0x100 + .incbin "data/graphics/mevent/pal_467DF4.gbapal" + +gUnknown_8467E14:: + .incbin "data/graphics/mevent/pal_467E14.gbapal" + +gUnknown_8467E34:: + .incbin "data/graphics/mevent/pal_467E34.gbapal" + +gUnknown_8467E54:: + .incbin "data/graphics/mevent/pal_467E54.gbapal" + +gUnknown_8467E74:: + .incbin "data/graphics/mevent/pal_467E74.gbapal" + +gUnknown_8467E94:: + .incbin "data/graphics/mevent/pal_467E94.gbapal" + +gUnknown_8467EB4:: + .incbin "data/graphics/mevent/pal_467EB4.gbapal" + +gUnknown_8467ED4:: + .incbin "data/graphics/mevent/pal_467ED4.gbapal" gUnknown_8467EF4:: - .incbin "baserom.gba", 0x467EF4, 0x64 + .incbin "data/graphics/mevent/gfx_467F58.4bpp.lz" gUnknown_8467F58:: @ 8467F58 - .incbin "baserom.gba", 0x467F58, 0x8 + .4byte gUnknown_8467EF4 + .2byte 0x0100, 0x8000 gUnknown_8467F60:: @ 8467F60 - .incbin "baserom.gba", 0x467F60, 0x40 + obj_pal gUnknown_8467DF4, 0x8000 + obj_pal gUnknown_8467E14, 0x8000 + obj_pal gUnknown_8467E34, 0x8000 + obj_pal gUnknown_8467E54, 0x8000 + obj_pal gUnknown_8467E74, 0x8000 + obj_pal gUnknown_8467E94, 0x8000 + obj_pal gUnknown_8467EB4, 0x8000 + obj_pal gUnknown_8467ED4, 0x8000 gUnknown_8467FA0:: @ 8467FA0 .incbin "baserom.gba", 0x467FA0, 0x18 diff --git a/include/decompress.h b/include/decompress.h index 5f3863dc7..36672dcfd 100644 --- a/include/decompress.h +++ b/include/decompress.h @@ -32,4 +32,6 @@ void LoadSpecialPokePic_DontHandleDeoxys(const struct CompressedSpriteSheet *src u32 sub_8034974(const u8 *ptr); +void sub_800F034(const struct CompressedSpriteSheet *src); + #endif // GUARD_DECOMPRESS_H diff --git a/src/mevent_8145654.c b/src/mevent_8145654.c index ec1664643..db714ce80 100644 --- a/src/mevent_8145654.c +++ b/src/mevent_8145654.c @@ -37,7 +37,7 @@ struct UnkStruct_203F3C8 /*0175*/ u8 unk_0175; /*0176*/ u16 unk_0176[3]; /*017C*/ u8 unk_017C; - /*017D*/ u8 filler_017D[14]; + /*017D*/ u8 unk_017D[7][2]; /*018B*/ u8 unk_018B[41]; /*01B4*/ u8 unk_01B4[41]; /*01DD*/ u8 unk_01DD[7]; @@ -66,7 +66,9 @@ extern const u8 gUnknown_8467070[3]; extern const struct WindowTemplate gUnknown_8467074[3]; extern const struct CompressedSpriteSheet gUnknown_8467F58; +extern const struct SpritePalette gUnknown_8467F60[]; extern const struct UnkStruct_8467FB8 gUnknown_8467FB8[8]; +extern const struct SpriteTemplate gUnknown_8467FA0; bool32 sub_8145654(struct MEventBuffer_32E0_Sub * r5, struct MEventBuffer_3430_Sub * r6) { @@ -333,9 +335,9 @@ void sub_8145D18(u8 whichWindow) CopyWindowToVram(windowId, 3); } -/* void sub_8146060(void) { + u8 r7 = 0; gUnknown_203F3C8->unk_017C = 0xFF; if (gUnknown_203F3C8->unk_014C.unk_06 != SPECIES_NONE) { @@ -344,7 +346,18 @@ void sub_8146060(void) } if (gUnknown_203F3C8->unk_0000.unk_09 != 0 && gUnknown_203F3C8->unk_0000.unk_08_0 == 1) { - sub_800F034(gUnknown_8467F58); + sub_800F034(&gUnknown_8467F58); + LoadSpritePalette(&gUnknown_8467F60[gUnknown_203F3C8->unk_0170->textPal4]); + for (; r7 < gUnknown_203F3C8->unk_0000.unk_09; r7++) + { + gUnknown_203F3C8->unk_017D[r7][0] = 0xFF; + gUnknown_203F3C8->unk_017D[r7][1] = 0xFF; + gUnknown_203F3C8->unk_017D[r7][0] = CreateSprite(&gUnknown_8467FA0, 0xd8 - 32 * r7, 0x90, 8); + if (gUnknown_203F3C8->unk_014C.unk_08[0][r7] != 0) + { + gUnknown_203F3C8->unk_017D[r7][1] = sub_8096ECC(sub_8096FD4(gUnknown_203F3C8->unk_014C.unk_08[0][r7]), SpriteCallbackDummy, 0xd8 - 32 * r7, 0x88, 0, 0); + gSprites[gUnknown_203F3C8->unk_017D[r7][1]].oam.priority = 2; + } + } } } - */ -- cgit v1.2.3 From 60b8858b19f50751d1222abd0c662d1ee938b3ce Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sun, 2 Dec 2018 16:48:04 -0500 Subject: sub_81461D8 --- asm/mevent_8145654.s | 86 -------------------------------------------------- include/pokemon_icon.h | 1 + src/mevent_8145654.c | 25 +++++++++++++++ 3 files changed, 26 insertions(+), 86 deletions(-) diff --git a/asm/mevent_8145654.s b/asm/mevent_8145654.s index e8af5eeae..152a8759a 100644 --- a/asm/mevent_8145654.s +++ b/asm/mevent_8145654.s @@ -5,92 +5,6 @@ .text - thumb_func_start sub_81461D8 -sub_81461D8: @ 81461D8 - push {r4-r7,lr} - movs r6, 0 - ldr r4, =gUnknown_203F3C8 - ldr r0, [r4] - movs r2, 0xBE - lsls r2, 1 - adds r1, r0, r2 - ldrb r0, [r1] - cmp r0, 0xFF - beq _081461FC - adds r1, r0, 0 - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - ldr r1, =gSprites - adds r0, r1 - bl sub_8097070 -_081461FC: - ldr r0, [r4] - ldrb r2, [r0, 0x9] - cmp r2, 0 - beq _08146274 - ldrb r1, [r0, 0x8] - movs r0, 0x3 - ands r0, r1 - cmp r0, 0x1 - bne _08146274 - cmp r6, r2 - bcs _08146264 - adds r7, r4, 0 -_08146214: - ldr r0, [r7] - lsls r4, r6, 1 - ldr r1, =0x0000017d - adds r0, r1 - adds r1, r0, r4 - ldrb r0, [r1] - cmp r0, 0xFF - beq _08146256 - adds r1, r0, 0 - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - ldr r5, =gSprites - adds r0, r5 - bl DestroySprite - ldr r1, [r7] - ldr r2, =0x0000017d - adds r0, r1, r2 - adds r0, r4 - ldrb r0, [r0] - cmp r0, 0xFF - beq _08146256 - adds r2, 0x1 - adds r0, r1, r2 - adds r0, r4 - ldrb r1, [r0] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - adds r0, r5 - bl sub_8097070 -_08146256: - adds r0, r6, 0x1 - lsls r0, 24 - lsrs r6, r0, 24 - ldr r0, [r7] - ldrb r0, [r0, 0x9] - cmp r6, r0 - bcc _08146214 -_08146264: - movs r4, 0x80 - lsls r4, 8 - adds r0, r4, 0 - bl FreeSpriteTilesByTag - adds r0, r4, 0 - bl FreeSpritePaletteByTag -_08146274: - pop {r4-r7} - pop {r0} - bx r0 - .pool - thumb_func_end sub_81461D8 - @ file boundary maybe thumb_func_start sub_8146288 diff --git a/include/pokemon_icon.h b/include/pokemon_icon.h index cef408046..593715b7d 100644 --- a/include/pokemon_icon.h +++ b/include/pokemon_icon.h @@ -14,5 +14,6 @@ void sub_809707C(void); void FreeMonIconPalettes(void); u16 sub_8096FD4(u16); u8 sub_8096ECC(u16, void (*)(struct Sprite *), s16, s16, u8, bool32); +void sub_8097070(struct Sprite *); #endif // GUARD_POKEMON_ICON_H diff --git a/src/mevent_8145654.c b/src/mevent_8145654.c index db714ce80..116db2e0e 100644 --- a/src/mevent_8145654.c +++ b/src/mevent_8145654.c @@ -361,3 +361,28 @@ void sub_8146060(void) } } } + +void sub_81461D8(void) +{ + u8 r6 = 0; + if (gUnknown_203F3C8->unk_017C != 0xFF) + sub_8097070(&gSprites[gUnknown_203F3C8->unk_017C]); + if (gUnknown_203F3C8->unk_0000.unk_09 != 0 && gUnknown_203F3C8->unk_0000.unk_08_0 == 1) + { + for (; r6 < gUnknown_203F3C8->unk_0000.unk_09; r6++) + { + if (gUnknown_203F3C8->unk_017D[r6][0] != 0xFF) + { + DestroySprite(&gSprites[gUnknown_203F3C8->unk_017D[r6][0]]); + // This might be a typo. Uncomment the next line, and comment the one that follows, to get the presumed intended behavior. + // if (gUnknown_203F3C8->unk_017D[r6][1] != 0xFF) + if (gUnknown_203F3C8->unk_017D[r6][0] != 0xFF) + { + sub_8097070(&gSprites[gUnknown_203F3C8->unk_017D[r6][1]]); + } + } + } + FreeSpriteTilesByTag(0x8000); + FreeSpritePaletteByTag(0x8000); + } +} -- cgit v1.2.3 From 39a9e186e05fd87d7b4787822b7207e8ab9fd9fd Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sun, 2 Dec 2018 17:01:48 -0500 Subject: Decompile mevent_8145654 data so far --- data/data_835B488.s | 8 ++- data/data_8466FB8.s | 139 --------------------------------------------------- src/mevent_8145654.c | 73 ++++++++++++++++++++++++--- 3 files changed, 73 insertions(+), 147 deletions(-) diff --git a/data/data_835B488.s b/data/data_835B488.s index de6460b81..44e4fe725 100644 --- a/data/data_835B488.s +++ b/data/data_835B488.s @@ -751,7 +751,13 @@ sFanfares:: @ 83AC990 .incbin "baserom.gba", 0x3AC990, 0x40 gUnknown_83AC9D0:: @ 83AC9D0 - .incbin "baserom.gba", 0x3AC9D0, 0x238 + .incbin "baserom.gba", 0x3AC9D0, 0x28 + +gUnknown_83AC9F8:: + .incbin "baserom.gba", 0x3AC9F8, 0x8 + +gUnknown_83ACA00:: + .incbin "baserom.gba", 0x3ACA00, 0x208 gUnknown_83ACC08:: @ 83ACC08 .incbin "baserom.gba", 0x3ACC08, 0x440 diff --git a/data/data_8466FB8.s b/data/data_8466FB8.s index 38cd46b8c..7acd28401 100644 --- a/data/data_8466FB8.s +++ b/data/data_8466FB8.s @@ -3,145 +3,6 @@ .section .rodata - .align 2 -gUnknown_8467068:: @ 8467068 - .byte 0x00, 0x02, 0x03 - .byte 0x00, 0x01, 0x02 - - .align 2 -gUnknown_8467070:: @ 8467070 - .byte 0x07, 0x04, 0x07 - - .align 2 -gUnknown_8467074:: @ 8467074 - @ {0x01, 0x01, 0x01, 0x19, 0x04, 0x0f, 0x029c}, - @ {0x01, 0x01, 0x06, 0x1c, 0x08, 0x0f, 0x01bc}, - @ {0x01, 0x01, 0x0e, 0x1c, 0x05, 0x0f, 0x0130} - .byte 0x01, 0x01, 0x01, 0x19, 0x04, 0x0f - .2byte 0x029c - .byte 0x01, 0x01, 0x06, 0x1c, 0x08, 0x0f - .2byte 0x01bc - .byte 0x01, 0x01, 0x0e, 0x1c, 0x05, 0x0f - .2byte 0x0130 - -gUnknown_846708C:: - .incbin "data/graphics/mevent/pal_46708C.gbapal" - -gUnknown_84670AC:: - .incbin "data/graphics/mevent/pal_4670AC.gbapal" - -gUnknown_84670CC:: - .incbin "data/graphics/mevent/pal_4670CC.gbapal" - -gUnknown_84670EC:: - .incbin "data/graphics/mevent/pal_4670EC.gbapal" - -gUnknown_846710C:: - .incbin "data/graphics/mevent/pal_46710C.gbapal" - -gUnknown_846712C:: - .incbin "data/graphics/mevent/pal_46712C.gbapal" - -gUnknown_846714C:: - .incbin "data/graphics/mevent/pal_46714C.gbapal" - -gUnknown_846716C:: - .incbin "data/graphics/mevent/pal_46716C.gbapal" - - .align 2 -gUnknown_846718C:: - .incbin "data/graphics/mevent/gfx_46718C.4bpp.lz" - - .align 2 -gUnknown_8467288:: - .incbin "data/graphics/mevent/tilemap_467288.bin.lz" - - .align 2 -gUnknown_846737C:: - .incbin "data/graphics/mevent/gfx_46737C.4bpp.lz" - - .align 2 -gUnknown_8467470:: - .incbin "data/graphics/mevent/tilemap_467470.bin.lz" - - .align 2 -gUnknown_8467558:: - .incbin "data/graphics/mevent/gfx_467558.4bpp.lz" - - .align 2 -gUnknown_846762C:: - .incbin "data/graphics/mevent/tilemap_46762C.bin.lz" - - .align 2 -gUnknown_8467700:: - .incbin "data/graphics/mevent/gfx_467700.4bpp.lz" - - .align 2 -gUnknown_8467934:: - .incbin "data/graphics/mevent/tilemap_467934.bin.lz" - - .align 2 -gUnknown_8467A7C:: - .incbin "data/graphics/mevent/gfx_467A7C.4bpp.lz" - - .align 2 -gUnknown_8467CAC:: - .incbin "data/graphics/mevent/tilemap_467CAC.bin.lz" - -gUnknown_8467DF4:: - .incbin "data/graphics/mevent/pal_467DF4.gbapal" - -gUnknown_8467E14:: - .incbin "data/graphics/mevent/pal_467E14.gbapal" - -gUnknown_8467E34:: - .incbin "data/graphics/mevent/pal_467E34.gbapal" - -gUnknown_8467E54:: - .incbin "data/graphics/mevent/pal_467E54.gbapal" - -gUnknown_8467E74:: - .incbin "data/graphics/mevent/pal_467E74.gbapal" - -gUnknown_8467E94:: - .incbin "data/graphics/mevent/pal_467E94.gbapal" - -gUnknown_8467EB4:: - .incbin "data/graphics/mevent/pal_467EB4.gbapal" - -gUnknown_8467ED4:: - .incbin "data/graphics/mevent/pal_467ED4.gbapal" - -gUnknown_8467EF4:: - .incbin "data/graphics/mevent/gfx_467F58.4bpp.lz" - -gUnknown_8467F58:: @ 8467F58 - .4byte gUnknown_8467EF4 - .2byte 0x0100, 0x8000 - -gUnknown_8467F60:: @ 8467F60 - obj_pal gUnknown_8467DF4, 0x8000 - obj_pal gUnknown_8467E14, 0x8000 - obj_pal gUnknown_8467E34, 0x8000 - obj_pal gUnknown_8467E54, 0x8000 - obj_pal gUnknown_8467E74, 0x8000 - obj_pal gUnknown_8467E94, 0x8000 - obj_pal gUnknown_8467EB4, 0x8000 - obj_pal gUnknown_8467ED4, 0x8000 - -gUnknown_8467FA0:: @ 8467FA0 - .incbin "baserom.gba", 0x467FA0, 0x18 - -gUnknown_8467FB8:: @ 8467FB8 - .4byte 0x0001, gUnknown_846718C, gUnknown_8467288, gUnknown_846708C - .4byte 0x1001, gUnknown_846737C, gUnknown_8467470, gUnknown_84670AC - .4byte 0x2001, gUnknown_8467558, gUnknown_846762C, gUnknown_84670CC - .4byte 0x3001, gUnknown_8467558, gUnknown_846762C, gUnknown_84670EC - .4byte 0x4001, gUnknown_8467558, gUnknown_846762C, gUnknown_846710C - .4byte 0x5001, gUnknown_8467558, gUnknown_846762C, gUnknown_846712C - .4byte 0x6001, gUnknown_8467700, gUnknown_8467934, gUnknown_846714C - .4byte 0x7001, gUnknown_8467A7C, gUnknown_8467CAC, gUnknown_846716C - gUnknown_8468038:: @ 8468038 .incbin "baserom.gba", 0x468038, 0x8 diff --git a/src/mevent_8145654.c b/src/mevent_8145654.c index 116db2e0e..578b90b54 100644 --- a/src/mevent_8145654.c +++ b/src/mevent_8145654.c @@ -61,14 +61,73 @@ void sub_8145D18(u8 whichWindow); void sub_8146060(void); void sub_81461D8(void); -extern const struct TextColor gUnknown_8467068[2]; -extern const u8 gUnknown_8467070[3]; -extern const struct WindowTemplate gUnknown_8467074[3]; +extern const struct OamData gUnknown_83AC9F8; -extern const struct CompressedSpriteSheet gUnknown_8467F58; -extern const struct SpritePalette gUnknown_8467F60[]; -extern const struct UnkStruct_8467FB8 gUnknown_8467FB8[8]; -extern const struct SpriteTemplate gUnknown_8467FA0; +const struct TextColor gUnknown_8467068[] = { + {0, 2, 3}, + {0, 1, 2} +}; +const u8 ALIGNED(4) gUnknown_8467070[3] = {7, 4, 7}; +const struct WindowTemplate gUnknown_8467074[] = { + {0x01, 0x01, 0x01, 0x19, 0x04, 0x0f, 0x029c}, + {0x01, 0x01, 0x06, 0x1c, 0x08, 0x0f, 0x01bc}, + {0x01, 0x01, 0x0e, 0x1c, 0x05, 0x0f, 0x0130} +}; + +const u16 gUnknown_846708C[] = INCBIN_U16("data/graphics/mevent/pal_46708C.gbapal"); +const u16 gUnknown_84670AC[] = INCBIN_U16("data/graphics/mevent/pal_4670AC.gbapal"); +const u16 gUnknown_84670CC[] = INCBIN_U16("data/graphics/mevent/pal_4670CC.gbapal"); +const u16 gUnknown_84670EC[] = INCBIN_U16("data/graphics/mevent/pal_4670EC.gbapal"); +const u16 gUnknown_846710C[] = INCBIN_U16("data/graphics/mevent/pal_46710C.gbapal"); +const u16 gUnknown_846712C[] = INCBIN_U16("data/graphics/mevent/pal_46712C.gbapal"); +const u16 gUnknown_846714C[] = INCBIN_U16("data/graphics/mevent/pal_46714C.gbapal"); +const u16 gUnknown_846716C[] = INCBIN_U16("data/graphics/mevent/pal_46716C.gbapal"); +const u8 gUnknown_846718C[] = INCBIN_U8("data/graphics/mevent/gfx_46718C.4bpp.lz"); +const u8 gUnknown_8467288[] = INCBIN_U8("data/graphics/mevent/tilemap_467288.bin.lz"); +const u8 gUnknown_846737C[] = INCBIN_U8("data/graphics/mevent/gfx_46737C.4bpp.lz"); +const u8 gUnknown_8467470[] = INCBIN_U8("data/graphics/mevent/tilemap_467470.bin.lz"); +const u8 gUnknown_8467558[] = INCBIN_U8("data/graphics/mevent/gfx_467558.4bpp.lz"); +const u8 gUnknown_846762C[] = INCBIN_U8("data/graphics/mevent/tilemap_46762C.bin.lz"); +const u8 gUnknown_8467700[] = INCBIN_U8("data/graphics/mevent/gfx_467700.4bpp.lz"); +const u8 gUnknown_8467934[] = INCBIN_U8("data/graphics/mevent/tilemap_467934.bin.lz"); +const u8 gUnknown_8467A7C[] = INCBIN_U8("data/graphics/mevent/gfx_467A7C.4bpp.lz"); +const u8 gUnknown_8467CAC[] = INCBIN_U8("data/graphics/mevent/tilemap_467CAC.bin.lz"); +const u16 gUnknown_8467DF4[] = INCBIN_U16("data/graphics/mevent/pal_467DF4.gbapal"); +const u16 gUnknown_8467E14[] = INCBIN_U16("data/graphics/mevent/pal_467E14.gbapal"); +const u16 gUnknown_8467E34[] = INCBIN_U16("data/graphics/mevent/pal_467E34.gbapal"); +const u16 gUnknown_8467E54[] = INCBIN_U16("data/graphics/mevent/pal_467E54.gbapal"); +const u16 gUnknown_8467E74[] = INCBIN_U16("data/graphics/mevent/pal_467E74.gbapal"); +const u16 gUnknown_8467E94[] = INCBIN_U16("data/graphics/mevent/pal_467E94.gbapal"); +const u16 gUnknown_8467EB4[] = INCBIN_U16("data/graphics/mevent/pal_467EB4.gbapal"); +const u16 gUnknown_8467ED4[] = INCBIN_U16("data/graphics/mevent/pal_467ED4.gbapal"); +const u8 gUnknown_8467EF4[] = INCBIN_U8("data/graphics/mevent/gfx_467F58.4bpp.lz"); + +const struct CompressedSpriteSheet gUnknown_8467F58 = { + gUnknown_8467EF4, 0x100, 0x8000 +}; +const struct SpritePalette gUnknown_8467F60[] = { + {gUnknown_8467DF4, 0x8000}, + {gUnknown_8467E14, 0x8000}, + {gUnknown_8467E34, 0x8000}, + {gUnknown_8467E54, 0x8000}, + {gUnknown_8467E74, 0x8000}, + {gUnknown_8467E94, 0x8000}, + {gUnknown_8467EB4, 0x8000}, + {gUnknown_8467ED4, 0x8000} +}; +const struct SpriteTemplate gUnknown_8467FA0 = { + 0x8000, 0x8000, &gUnknown_83AC9F8, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy +}; +const struct UnkStruct_8467FB8 gUnknown_8467FB8[8] = { + {1, 0, 0, 0, gUnknown_846718C, gUnknown_8467288, gUnknown_846708C}, + {1, 0, 0, 1, gUnknown_846737C, gUnknown_8467470, gUnknown_84670AC}, + {1, 0, 0, 2, gUnknown_8467558, gUnknown_846762C, gUnknown_84670CC}, + {1, 0, 0, 3, gUnknown_8467558, gUnknown_846762C, gUnknown_84670EC}, + {1, 0, 0, 4, gUnknown_8467558, gUnknown_846762C, gUnknown_846710C}, + {1, 0, 0, 5, gUnknown_8467558, gUnknown_846762C, gUnknown_846712C}, + {1, 0, 0, 6, gUnknown_8467700, gUnknown_8467934, gUnknown_846714C}, + {1, 0, 0, 7, gUnknown_8467A7C, gUnknown_8467CAC, gUnknown_846716C} +}; bool32 sub_8145654(struct MEventBuffer_32E0_Sub * r5, struct MEventBuffer_3430_Sub * r6) { -- cgit v1.2.3 From 5151db6054d0704584fdf53e55840e262cde32a4 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sun, 2 Dec 2018 17:25:59 -0500 Subject: sub_8146288 --- asm/mevent_8145654.s | 50 -------------------------------------------------- data/data_8466FB8.s | 16 +++++++++++++--- include/global.h | 1 + src/mevent_8145654.c | 50 +++++++++++++++++++++++++++++++++++++++++--------- 4 files changed, 55 insertions(+), 62 deletions(-) diff --git a/asm/mevent_8145654.s b/asm/mevent_8145654.s index 152a8759a..22b042b50 100644 --- a/asm/mevent_8145654.s +++ b/asm/mevent_8145654.s @@ -5,56 +5,6 @@ .text - @ file boundary maybe - - thumb_func_start sub_8146288 -sub_8146288: @ 8146288 - push {r4-r6,lr} - adds r4, r0, 0 - cmp r4, 0 - beq _0814629E - ldr r5, =gUnknown_203F3CC - ldr r0, =0x000013a4 - bl AllocZeroed - str r0, [r5] - cmp r0, 0 - bne _081462AC -_0814629E: - movs r0, 0 - b _081462DC - .pool -_081462AC: - movs r6, 0xDE - lsls r6, 1 - adds r1, r4, 0 - adds r2, r6, 0 - bl memcpy - ldr r1, [r5] - ldrb r0, [r1, 0x3] - cmp r0, 0x7 - bls _081462C4 - movs r0, 0 - strb r0, [r1, 0x3] -_081462C4: - ldr r2, [r5] - adds r3, r2, r6 - ldrb r0, [r2, 0x3] - lsls r0, 4 - ldr r1, =gUnknown_8468720 - adds r0, r1 - str r0, [r3] - ldr r0, =0x000001c1 - adds r1, r2, r0 - movs r0, 0xFF - strb r0, [r1] - movs r0, 0x1 -_081462DC: - pop {r4-r6} - pop {r1} - bx r1 - .pool - thumb_func_end sub_8146288 - thumb_func_start sub_81462EC sub_81462EC: @ 81462EC push {r4,lr} diff --git a/data/data_8466FB8.s b/data/data_8466FB8.s index 7acd28401..389b0d584 100644 --- a/data/data_8466FB8.s +++ b/data/data_8466FB8.s @@ -3,14 +3,24 @@ .section .rodata + .macro window_template bg, left, top, width, height, pal, baseTile + .byte \bg, \left, \top, \width, \height, \pal + .2byte \baseTile + .endm + gUnknown_8468038:: @ 8468038 - .incbin "baserom.gba", 0x468038, 0x8 + .byte 0x00, 0x02, 0x03 + .byte 0x00, 0x01, 0x02 + .align 2 gUnknown_8468040:: @ 8468040 - .incbin "baserom.gba", 0x468040, 0x10 + window_template 0x00, 0x01, 0x00, 0x1c, 0x03, 0x0f, 0x0000 + window_template 0x02, 0x01, 0x03, 0x1c, 0x14, 0x0f, 0x0000 + .align 2 gUnknown_8468050:: @ 8468050 - .incbin "baserom.gba", 0x468050, 0x10 + .byte 0x02, 0xe8, 0x18, 0x03, 0xe8, 0x98 + .2byte 0x0000, 0x0002, 0x1000, 0x1000, 0x0000 gUnknown_8468060:: .incbin "baserom.gba", 0x468060, 0x20 diff --git a/include/global.h b/include/global.h index 783a2c375..840c90725 100644 --- a/include/global.h +++ b/include/global.h @@ -599,6 +599,7 @@ struct MEventBuffer_3120_Sub { u16 unk_00; u8 unk_02; + u8 unk_03; u8 filler_04[440]; }; diff --git a/src/mevent_8145654.c b/src/mevent_8145654.c index 578b90b54..4c81cb620 100644 --- a/src/mevent_8145654.c +++ b/src/mevent_8145654.c @@ -48,13 +48,7 @@ struct UnkStruct_203F3C8 /*045C*/ u8 buffer_045C[0x1000]; }; -struct UnkStruct_203F3CC -{ - /*0000*/ u8 filler_0000[0x13a4]; -}; - EWRAM_DATA struct UnkStruct_203F3C8 * gUnknown_203F3C8 = NULL; -EWRAM_DATA struct UnkStruct_203F3CC * gUnknown_203F3CC = NULL; void sub_8145A98(void); void sub_8145D18(u8 whichWindow); @@ -138,11 +132,11 @@ bool32 sub_8145654(struct MEventBuffer_32E0_Sub * r5, struct MEventBuffer_3430_S return FALSE; gUnknown_203F3C8->unk_0000 = *r5; gUnknown_203F3C8->unk_014C = *r6; - if (gUnknown_203F3C8->unk_0000.unk_08_2 > 7) + if (gUnknown_203F3C8->unk_0000.unk_08_2 >= NELEMS(gUnknown_8467FB8)) gUnknown_203F3C8->unk_0000.unk_08_2 = 0; - if (gUnknown_203F3C8->unk_0000.unk_08_0 > 2) + if (gUnknown_203F3C8->unk_0000.unk_08_0 >= NELEMS(gUnknown_8467070)) gUnknown_203F3C8->unk_0000.unk_08_0 = 0; - if (gUnknown_203F3C8->unk_0000.unk_09 > 7) + if (gUnknown_203F3C8->unk_0000.unk_09 > NELEMS(gUnknown_203F3C8->unk_017D)) gUnknown_203F3C8->unk_0000.unk_09 = 0; gUnknown_203F3C8->unk_0170 = &gUnknown_8467FB8[gUnknown_203F3C8->unk_0000.unk_08_2]; return TRUE; @@ -445,3 +439,41 @@ void sub_81461D8(void) FreeSpritePaletteByTag(0x8000); } } + +struct UnkStruct_8468720 +{ + u8 unk0; + const void * unk4; + const void * unk8; + const void * unkC; +}; + +struct UnkStruct_203F3CC +{ + /*0000*/ struct MEventBuffer_3120_Sub unk_0000; + /*01bc*/ const struct UnkStruct_8468720 * unk_01BC; + /*01c0*/ u8 unk_01C0; + /*01c1*/ u8 unk_01C1; + /*01c2*/ u8 filler_01C2[0x11e2]; +}; + +EWRAM_DATA struct UnkStruct_203F3CC * gUnknown_203F3CC = NULL; + +extern const struct TextColor gUnknown_8468038[2]; +extern const struct UnkStruct_8468720 gUnknown_8468720[8]; +extern const struct ScrollIndicatorArrowPairTemplate gUnknown_8468050; + +bool32 sub_8146288(const struct MEventBuffer_3120_Sub * a0) +{ + if (a0 == NULL) + return FALSE; + gUnknown_203F3CC = AllocZeroed(sizeof(struct UnkStruct_203F3CC)); + if (gUnknown_203F3CC == NULL) + return FALSE; + gUnknown_203F3CC->unk_0000 = *a0; + if (gUnknown_203F3CC->unk_0000.unk_03 >= NELEMS(gUnknown_8468720)) + gUnknown_203F3CC->unk_0000.unk_03 = 0; + gUnknown_203F3CC->unk_01BC = &gUnknown_8468720[gUnknown_203F3CC->unk_0000.unk_03]; + gUnknown_203F3CC->unk_01C1 = 0xFF; + return TRUE; +} -- cgit v1.2.3 From c7f9c8f1a52ca6284892442a76b462d67d23145e Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sun, 2 Dec 2018 17:31:54 -0500 Subject: sub_81462EC --- asm/mevent_8145654.s | 21 --------------------- src/mevent_8145654.c | 10 ++++++++++ 2 files changed, 10 insertions(+), 21 deletions(-) diff --git a/asm/mevent_8145654.s b/asm/mevent_8145654.s index 22b042b50..9641e4e87 100644 --- a/asm/mevent_8145654.s +++ b/asm/mevent_8145654.s @@ -5,27 +5,6 @@ .text - thumb_func_start sub_81462EC -sub_81462EC: @ 81462EC - push {r4,lr} - ldr r4, =gUnknown_203F3CC - ldr r0, [r4] - cmp r0, 0 - beq _08146308 - ldr r2, =0x000013a4 - movs r1, 0 - bl memset - ldr r0, [r4] - bl Free - movs r0, 0 - str r0, [r4] -_08146308: - pop {r4} - pop {r0} - bx r0 - .pool - thumb_func_end sub_81462EC - thumb_func_start sub_8146318 sub_8146318: @ 8146318 push {r4-r7,lr} diff --git a/src/mevent_8145654.c b/src/mevent_8145654.c index 4c81cb620..300a1bf3e 100644 --- a/src/mevent_8145654.c +++ b/src/mevent_8145654.c @@ -477,3 +477,13 @@ bool32 sub_8146288(const struct MEventBuffer_3120_Sub * a0) gUnknown_203F3CC->unk_01C1 = 0xFF; return TRUE; } + +void sub_81462EC(void) +{ + if (gUnknown_203F3CC != NULL) + { + *gUnknown_203F3CC = (struct UnkStruct_203F3CC){}; + Free(gUnknown_203F3CC); + gUnknown_203F3CC = NULL; + } +} -- cgit v1.2.3 From ecc4af703a163336219a87d7b4755da1406c5f2e Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sun, 2 Dec 2018 19:01:51 -0500 Subject: Add missing graphics files --- data/graphics/mevent/gfx_467EF4.png | Bin 0 -> 147 bytes data/graphics/mevent/pal_467DF4.pal | 19 +++++++++++++++++++ data/graphics/mevent/pal_467E14.pal | 19 +++++++++++++++++++ data/graphics/mevent/pal_467E34.pal | 19 +++++++++++++++++++ data/graphics/mevent/pal_467E54.pal | 19 +++++++++++++++++++ data/graphics/mevent/pal_467E74.pal | 19 +++++++++++++++++++ data/graphics/mevent/pal_467E94.pal | 19 +++++++++++++++++++ data/graphics/mevent/pal_467EB4.pal | 19 +++++++++++++++++++ data/graphics/mevent/pal_467ED4.pal | 19 +++++++++++++++++++ src/mevent_8145654.c | 2 +- 10 files changed, 153 insertions(+), 1 deletion(-) create mode 100644 data/graphics/mevent/gfx_467EF4.png create mode 100644 data/graphics/mevent/pal_467DF4.pal create mode 100644 data/graphics/mevent/pal_467E14.pal create mode 100644 data/graphics/mevent/pal_467E34.pal create mode 100644 data/graphics/mevent/pal_467E54.pal create mode 100644 data/graphics/mevent/pal_467E74.pal create mode 100644 data/graphics/mevent/pal_467E94.pal create mode 100644 data/graphics/mevent/pal_467EB4.pal create mode 100644 data/graphics/mevent/pal_467ED4.pal diff --git a/data/graphics/mevent/gfx_467EF4.png b/data/graphics/mevent/gfx_467EF4.png new file mode 100644 index 000000000..aa0475ec0 Binary files /dev/null and b/data/graphics/mevent/gfx_467EF4.png differ diff --git a/data/graphics/mevent/pal_467DF4.pal b/data/graphics/mevent/pal_467DF4.pal new file mode 100644 index 000000000..7314ddbc8 --- /dev/null +++ b/data/graphics/mevent/pal_467DF4.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +90 197 148 +189 189 164 +205 205 172 +213 213 189 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 diff --git a/data/graphics/mevent/pal_467E14.pal b/data/graphics/mevent/pal_467E14.pal new file mode 100644 index 000000000..333dd9280 --- /dev/null +++ b/data/graphics/mevent/pal_467E14.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +90 197 148 +82 82 106 +164 156 180 +246 238 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 diff --git a/data/graphics/mevent/pal_467E34.pal b/data/graphics/mevent/pal_467E34.pal new file mode 100644 index 000000000..3fca3cdf3 --- /dev/null +++ b/data/graphics/mevent/pal_467E34.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +90 197 148 +246 139 139 +246 180 180 +255 230 230 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 diff --git a/data/graphics/mevent/pal_467E54.pal b/data/graphics/mevent/pal_467E54.pal new file mode 100644 index 000000000..f5125b4c9 --- /dev/null +++ b/data/graphics/mevent/pal_467E54.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +90 197 148 +164 213 131 +197 230 180 +238 255 230 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 diff --git a/data/graphics/mevent/pal_467E74.pal b/data/graphics/mevent/pal_467E74.pal new file mode 100644 index 000000000..e8ec07ab5 --- /dev/null +++ b/data/graphics/mevent/pal_467E74.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +90 197 148 +156 197 238 +197 222 246 +238 246 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 diff --git a/data/graphics/mevent/pal_467E94.pal b/data/graphics/mevent/pal_467E94.pal new file mode 100644 index 000000000..783979089 --- /dev/null +++ b/data/graphics/mevent/pal_467E94.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +90 197 148 +213 213 90 +222 222 139 +238 238 197 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 diff --git a/data/graphics/mevent/pal_467EB4.pal b/data/graphics/mevent/pal_467EB4.pal new file mode 100644 index 000000000..1c74daace --- /dev/null +++ b/data/graphics/mevent/pal_467EB4.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +90 197 148 +205 189 98 +222 205 115 +230 222 98 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 diff --git a/data/graphics/mevent/pal_467ED4.pal b/data/graphics/mevent/pal_467ED4.pal new file mode 100644 index 000000000..d1d92ba57 --- /dev/null +++ b/data/graphics/mevent/pal_467ED4.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +90 197 148 +197 197 197 +205 205 205 +213 213 213 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 diff --git a/src/mevent_8145654.c b/src/mevent_8145654.c index 300a1bf3e..dc0969630 100644 --- a/src/mevent_8145654.c +++ b/src/mevent_8145654.c @@ -94,7 +94,7 @@ const u16 gUnknown_8467E74[] = INCBIN_U16("data/graphics/mevent/pal_467E74.gbapa const u16 gUnknown_8467E94[] = INCBIN_U16("data/graphics/mevent/pal_467E94.gbapal"); const u16 gUnknown_8467EB4[] = INCBIN_U16("data/graphics/mevent/pal_467EB4.gbapal"); const u16 gUnknown_8467ED4[] = INCBIN_U16("data/graphics/mevent/pal_467ED4.gbapal"); -const u8 gUnknown_8467EF4[] = INCBIN_U8("data/graphics/mevent/gfx_467F58.4bpp.lz"); +const u8 gUnknown_8467EF4[] = INCBIN_U8("data/graphics/mevent/gfx_467EF4.4bpp.lz"); const struct CompressedSpriteSheet gUnknown_8467F58 = { gUnknown_8467EF4, 0x100, 0x8000 -- cgit v1.2.3 From f92002b6da5ca426143864df5b679888cef8a9d8 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sun, 2 Dec 2018 19:02:49 -0500 Subject: Correct dims for shadow gfx --- data/graphics/mevent/gfx_467EF4.png | Bin 147 -> 116 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/data/graphics/mevent/gfx_467EF4.png b/data/graphics/mevent/gfx_467EF4.png index aa0475ec0..51a1aeb0c 100644 Binary files a/data/graphics/mevent/gfx_467EF4.png and b/data/graphics/mevent/gfx_467EF4.png differ -- cgit v1.2.3 From 9ff5f62747589e403bc8bf215f8ebe3f5ba82353 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Mon, 3 Dec 2018 08:28:05 -0500 Subject: sub_8146318 --- asm/mevent_8145654.s | 326 --------------------------------------------------- src/mevent_8145654.c | 91 +++++++++++++- 2 files changed, 89 insertions(+), 328 deletions(-) diff --git a/asm/mevent_8145654.s b/asm/mevent_8145654.s index 9641e4e87..31a8de0c3 100644 --- a/asm/mevent_8145654.s +++ b/asm/mevent_8145654.s @@ -5,332 +5,6 @@ .text - thumb_func_start sub_8146318 -sub_8146318: @ 8146318 - push {r4-r7,lr} - mov r7, r10 - mov r6, r9 - mov r5, r8 - push {r5-r7} - sub sp, 0x24 - ldr r5, =gUnknown_203F3CC - ldr r0, [r5] - cmp r0, 0 - bne _08146338 - movs r0, 0x1 - negs r0, r0 - b _081465EE - .pool -_08146338: - movs r4, 0xE0 - lsls r4, 1 - adds r0, r4 - ldrb r0, [r0] - lsrs r0, 1 - cmp r0, 0x6 - bls _08146348 - b _081465B8 -_08146348: - lsls r0, 2 - ldr r1, =_08146358 - adds r0, r1 - ldr r0, [r0] - mov pc, r0 - .pool - .align 2, 0 -_08146358: - .4byte _08146374 - .4byte _08146386 - .4byte _081463EC - .4byte _08146494 - .4byte _08146544 - .4byte _0814654A - .4byte _0814655C -_08146374: - movs r0, 0x1 - negs r0, r0 - movs r1, 0 - str r1, [sp] - movs r2, 0 - movs r3, 0x10 - bl BeginNormalPaletteFade - b _081465D2 -_08146386: - bl UpdatePaletteFade - lsls r0, 24 - cmp r0, 0 - beq _08146392 - b _081465EC -_08146392: - movs r0, 0 - movs r1, 0 - movs r2, 0 - bl ChangeBgY - movs r0, 0x1 - movs r1, 0 - movs r2, 0 - bl ChangeBgY - movs r0, 0x2 - movs r1, 0 - movs r2, 0 - bl ChangeBgY - movs r0, 0x3 - movs r1, 0 - movs r2, 0 - bl ChangeBgY - movs r0, 0x40 - movs r1, 0xF0 - bl SetGpuReg - ldr r1, =0x00001a98 - movs r0, 0x44 - bl SetGpuReg - movs r0, 0x48 - movs r1, 0x1F - bl SetGpuReg - movs r0, 0x4A - movs r1, 0x1B - bl SetGpuReg - movs r1, 0x80 - lsls r1, 6 - movs r0, 0 - bl SetGpuRegBits - b _081465D2 - .pool -_081463EC: - movs r5, 0x1E - str r5, [sp] - movs r4, 0x14 - str r4, [sp, 0x4] - movs r0, 0 - movs r1, 0 - movs r2, 0 - movs r3, 0 - bl FillBgTilemapBufferRect_Palette0 - str r5, [sp] - str r4, [sp, 0x4] - movs r0, 0x1 - movs r1, 0 - movs r2, 0 - movs r3, 0 - bl FillBgTilemapBufferRect_Palette0 - str r5, [sp] - str r4, [sp, 0x4] - movs r0, 0x2 - movs r1, 0 - movs r2, 0 - movs r3, 0 - bl FillBgTilemapBufferRect_Palette0 - str r5, [sp] - str r4, [sp, 0x4] - movs r0, 0x3 - movs r1, 0 - movs r2, 0 - movs r3, 0 - bl FillBgTilemapBufferRect_Palette0 - movs r0, 0 - bl CopyBgTilemapBufferToVram - movs r0, 0x1 - bl CopyBgTilemapBufferToVram - movs r0, 0x2 - bl CopyBgTilemapBufferToVram - movs r0, 0x3 - bl CopyBgTilemapBufferToVram - ldr r5, =gUnknown_203F3CC - ldr r0, [r5] - movs r1, 0xDE - lsls r1, 1 - adds r0, r1 - ldr r0, [r0] - ldr r1, [r0, 0x4] - movs r0, 0 - str r0, [sp] - movs r0, 0x3 - movs r2, 0 - movs r3, 0x8 - bl decompress_and_copy_tile_data_to_vram - ldr r4, =gUnknown_8468040 - adds r0, r4, 0 - bl AddWindow - ldr r1, [r5] - movs r2, 0xE4 - lsls r2, 1 - adds r1, r2 - strh r0, [r1] - adds r4, 0x8 - adds r0, r4, 0 - bl AddWindow - ldr r1, [r5] - movs r3, 0xE5 - lsls r3, 1 - adds r1, r3 - strh r0, [r1] - b _081465D2 - .pool -_08146494: - bl free_temp_tile_data_buffers_if_possible - lsls r0, 24 - lsrs r7, r0, 24 - cmp r7, 0 - beq _081464A2 - b _081465EC -_081464A2: - ldr r2, =gPaletteFade - ldrb r0, [r2, 0x8] - movs r1, 0x80 - orrs r0, r1 - strb r0, [r2, 0x8] - ldr r0, =gUnknown_203F3CC - mov r8, r0 - ldr r0, [r0] - movs r4, 0xDE - lsls r4, 1 - adds r0, r4 - ldr r0, [r0] - ldr r0, [r0, 0xC] - movs r1, 0x10 - movs r2, 0x20 - bl LoadPalette - mov r2, r8 - ldr r1, [r2] - adds r4, r1, r4 - ldr r0, [r4] - ldr r0, [r0, 0x8] - movs r6, 0xE9 - lsls r6, 2 - adds r1, r6 - bl LZ77UnCompWram - mov r3, r8 - ldr r1, [r3] - adds r1, r6 - movs r4, 0x1E - str r4, [sp] - movs r5, 0x3 - str r5, [sp, 0x4] - str r7, [sp, 0x8] - str r7, [sp, 0xC] - str r4, [sp, 0x10] - str r5, [sp, 0x14] - movs r0, 0x1 - mov r10, r0 - str r0, [sp, 0x18] - movs r2, 0x8 - mov r9, r2 - str r2, [sp, 0x1C] - str r7, [sp, 0x20] - movs r2, 0 - movs r3, 0 - bl CopyRectToBgTilemapBufferRect - mov r3, r8 - ldr r1, [r3] - adds r1, r6 - str r4, [sp] - movs r0, 0x17 - str r0, [sp, 0x4] - str r7, [sp, 0x8] - str r5, [sp, 0xC] - str r4, [sp, 0x10] - str r0, [sp, 0x14] - mov r0, r10 - str r0, [sp, 0x18] - mov r2, r9 - str r2, [sp, 0x1C] - str r7, [sp, 0x20] - movs r0, 0x3 - movs r2, 0 - movs r3, 0x3 - bl CopyRectToBgTilemapBufferRect - movs r0, 0x1 - bl CopyBgTilemapBufferToVram - movs r0, 0x3 - bl CopyBgTilemapBufferToVram - b _081465D2 - .pool -_08146544: - bl sub_8146980 - b _081465D2 -_0814654A: - bl sub_8146A30 - movs r0, 0 - bl CopyBgTilemapBufferToVram - movs r0, 0x2 - bl CopyBgTilemapBufferToVram - b _081465D2 -_0814655C: - movs r0, 0x1 - bl ShowBg - movs r0, 0x2 - bl ShowBg - movs r0, 0x3 - bl ShowBg - ldr r2, =gPaletteFade - ldrb r1, [r2, 0x8] - movs r0, 0x7F - ands r0, r1 - strb r0, [r2, 0x8] - ldr r4, =gUnknown_203F3CC - ldr r1, [r4] - movs r3, 0xE5 - lsls r3, 2 - adds r0, r1, r3 - movs r2, 0xE3 - lsls r2, 1 - adds r1, r2 - bl AddScrollIndicatorArrowPair - ldr r1, [r4] - ldr r3, =0x000001c1 - adds r2, r1, r3 - movs r1, 0 - strb r0, [r2] - movs r0, 0x1 - negs r0, r0 - str r1, [sp] - movs r2, 0x10 - movs r3, 0 - bl BeginNormalPaletteFade - bl UpdatePaletteFade - b _081465D2 - .pool -_081465B8: - bl UpdatePaletteFade - lsls r0, 24 - cmp r0, 0 - bne _081465EC - ldr r0, [r5] - adds r0, r4 - ldrb r2, [r0] - movs r1, 0x1 - ands r1, r2 - strb r1, [r0] - movs r0, 0x1 - b _081465EE -_081465D2: - ldr r0, =gUnknown_203F3CC - ldr r2, [r0] - movs r0, 0xE0 - lsls r0, 1 - adds r2, r0 - ldrb r3, [r2] - lsrs r1, r3, 1 - adds r1, 0x1 - lsls r1, 1 - movs r0, 0x1 - ands r0, r3 - orrs r0, r1 - strb r0, [r2] -_081465EC: - movs r0, 0 -_081465EE: - add sp, 0x24 - pop {r3-r5} - mov r8, r3 - mov r9, r4 - mov r10, r5 - pop {r4-r7} - pop {r1} - bx r1 - .pool - thumb_func_end sub_8146318 - thumb_func_start sub_8146604 sub_8146604: @ 8146604 push {r4,r5,lr} diff --git a/src/mevent_8145654.c b/src/mevent_8145654.c index dc0969630..3d7f6d3ca 100644 --- a/src/mevent_8145654.c +++ b/src/mevent_8145654.c @@ -1,12 +1,14 @@ #include "global.h" #include "constants/species.h" #include "bg.h" +#include "gpu_regs.h" #include "palette.h" #include "decompress.h" #include "malloc.h" #include "menu.h" #include "pokemon_icon.h" #include "mystery_gift_menu.h" +#include "menu_indicators.h" #include "string_util.h" #include "mevent.h" @@ -452,14 +454,24 @@ struct UnkStruct_203F3CC { /*0000*/ struct MEventBuffer_3120_Sub unk_0000; /*01bc*/ const struct UnkStruct_8468720 * unk_01BC; - /*01c0*/ u8 unk_01C0; + /*01c0*/ u8 unk_01C0_0:1; + /*01c0*/ u8 unk_01C0_1:7; /*01c1*/ u8 unk_01C1; - /*01c2*/ u8 filler_01C2[0x11e2]; + /*01c2*/ u8 filler_01C2[4]; + /*01c6*/ u16 unk_01C6; + /*01c8*/ u16 unk_01C8[2]; + /*01cc*/ u8 filler_01CC[0x1C8]; + /*0394*/ struct ScrollIndicatorArrowPairTemplate unk_0394; + /*03a4*/ u8 buffer_03A4[0x1000]; }; EWRAM_DATA struct UnkStruct_203F3CC * gUnknown_203F3CC = NULL; +void sub_8146980(void); +void sub_8146A30(void); + extern const struct TextColor gUnknown_8468038[2]; +extern const struct WindowTemplate gUnknown_8468040[2]; extern const struct UnkStruct_8468720 gUnknown_8468720[8]; extern const struct ScrollIndicatorArrowPairTemplate gUnknown_8468050; @@ -487,3 +499,78 @@ void sub_81462EC(void) gUnknown_203F3CC = NULL; } } + +s32 sub_8146318(void) +{ + if (gUnknown_203F3CC == NULL) + return -1; + + switch (gUnknown_203F3CC->unk_01C0_1) + { + case 0: + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, 0); + break; + case 1: + if (UpdatePaletteFade()) + return 0; + ChangeBgY(0, 0, 0); + ChangeBgY(1, 0, 0); + ChangeBgY(2, 0, 0); + ChangeBgY(3, 0, 0); + SetGpuReg(REG_OFFSET_WIN0H, 0xF0); + SetGpuReg(REG_OFFSET_WIN0V, 0x1A98); + SetGpuReg(REG_OFFSET_WININ, 0x1F); + SetGpuReg(REG_OFFSET_WINOUT, 0x1B); + SetGpuRegBits(REG_OFFSET_DISPCNT, DISPCNT_WIN0_ON); + break; + case 2: + FillBgTilemapBufferRect_Palette0(0, 0x000, 0, 0, 30, 20); + FillBgTilemapBufferRect_Palette0(1, 0x000, 0, 0, 30, 20); + FillBgTilemapBufferRect_Palette0(2, 0x000, 0, 0, 30, 20); + FillBgTilemapBufferRect_Palette0(3, 0x000, 0, 0, 30, 20); + CopyBgTilemapBufferToVram(0); + CopyBgTilemapBufferToVram(1); + CopyBgTilemapBufferToVram(2); + CopyBgTilemapBufferToVram(3); + decompress_and_copy_tile_data_to_vram(3, gUnknown_203F3CC->unk_01BC->unk4, 0, 8, 0); + gUnknown_203F3CC->unk_01C8[0] = AddWindow(&gUnknown_8468040[0]); + gUnknown_203F3CC->unk_01C8[1] = AddWindow(&gUnknown_8468040[1]); + break; + case 3: + if (free_temp_tile_data_buffers_if_possible()) + return 0; + gPaletteFade.bufferTransferDisabled = TRUE; + LoadPalette(gUnknown_203F3CC->unk_01BC->unkC, 0x10, 0x20); + LZ77UnCompWram(gUnknown_203F3CC->unk_01BC->unk8, gUnknown_203F3CC->buffer_03A4); + CopyRectToBgTilemapBufferRect(1, gUnknown_203F3CC->buffer_03A4, 0, 0, 30, 3, 0, 0, 30, 3, 1, 8, 0); + CopyRectToBgTilemapBufferRect(3, gUnknown_203F3CC->buffer_03A4, 0, 3, 30, 23, 0, 3, 30, 23, 1, 8, 0); + CopyBgTilemapBufferToVram(1); + CopyBgTilemapBufferToVram(3); + break; + case 4: + sub_8146980(); + break; + case 5: + sub_8146A30(); + CopyBgTilemapBufferToVram(0); + CopyBgTilemapBufferToVram(2); + break; + case 6: + ShowBg(1); + ShowBg(2); + ShowBg(3); + gPaletteFade.bufferTransferDisabled = FALSE; + gUnknown_203F3CC->unk_01C1 = AddScrollIndicatorArrowPair(&gUnknown_203F3CC->unk_0394, &gUnknown_203F3CC->unk_01C6); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, 0); + UpdatePaletteFade(); + break; + default: + if (UpdatePaletteFade()) + return 0; + gUnknown_203F3CC->unk_01C0_1 = 0; + return 1; + } + + ++gUnknown_203F3CC->unk_01C0_1; + return 0; +} -- cgit v1.2.3 From 208c6054475030ce48482c34647bd5728172b074 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Mon, 3 Dec 2018 08:41:06 -0500 Subject: sub_8146604 --- asm/mevent_8145654.s | 218 --------------------------------------------------- include/link_rfu.h | 1 + src/mevent_8145654.c | 64 +++++++++++++++ 3 files changed, 65 insertions(+), 218 deletions(-) diff --git a/asm/mevent_8145654.s b/asm/mevent_8145654.s index 31a8de0c3..b5e5dc019 100644 --- a/asm/mevent_8145654.s +++ b/asm/mevent_8145654.s @@ -5,224 +5,6 @@ .text - thumb_func_start sub_8146604 -sub_8146604: @ 8146604 - push {r4,r5,lr} - sub sp, 0x8 - adds r2, r0, 0 - ldr r5, =gUnknown_203F3CC - ldr r0, [r5] - cmp r0, 0 - bne _0814661C - movs r0, 0x1 - negs r0, r0 - b _081467E0 - .pool -_0814661C: - movs r4, 0xE0 - lsls r4, 1 - adds r0, r4 - ldrb r0, [r0] - lsrs r0, 1 - cmp r0, 0x6 - bls _0814662C - b _081467AA -_0814662C: - lsls r0, 2 - ldr r1, =_0814663C - adds r0, r1 - ldr r0, [r0] - mov pc, r0 - .pool - .align 2, 0 -_0814663C: - .4byte _08146658 - .4byte _0814666A - .4byte _081466AC - .4byte _0814670C - .4byte _0814673C - .4byte _08146778 - .4byte _08146788 -_08146658: - movs r0, 0x1 - negs r0, r0 - movs r1, 0 - str r1, [sp] - movs r2, 0 - movs r3, 0x10 - bl BeginNormalPaletteFade - b _081467C4 -_0814666A: - bl UpdatePaletteFade - lsls r0, 24 - cmp r0, 0 - beq _08146676 - b _081467DE -_08146676: - movs r0, 0x2 - movs r1, 0 - movs r2, 0 - bl ChangeBgY - movs r0, 0x40 - movs r1, 0 - bl SetGpuReg - movs r0, 0x44 - movs r1, 0 - bl SetGpuReg - movs r0, 0x48 - movs r1, 0 - bl SetGpuReg - movs r0, 0x4A - movs r1, 0 - bl SetGpuReg - movs r1, 0x80 - lsls r1, 6 - movs r0, 0 - bl ClearGpuRegBits - b _081467C4 -_081466AC: - movs r4, 0x1E - str r4, [sp] - movs r5, 0x14 - str r5, [sp, 0x4] - movs r0, 0 - movs r1, 0 - movs r2, 0 - movs r3, 0 - bl FillBgTilemapBufferRect_Palette0 - str r4, [sp] - str r5, [sp, 0x4] - movs r0, 0x1 - movs r1, 0 - movs r2, 0 - movs r3, 0 - bl FillBgTilemapBufferRect_Palette0 - str r4, [sp] - movs r5, 0x18 - str r5, [sp, 0x4] - movs r0, 0x2 - movs r1, 0 - movs r2, 0 - movs r3, 0 - bl FillBgTilemapBufferRect_Palette0 - str r4, [sp] - str r5, [sp, 0x4] - movs r0, 0x3 - movs r1, 0 - movs r2, 0 - movs r3, 0 - bl FillBgTilemapBufferRect_Palette0 - movs r0, 0 - bl CopyBgTilemapBufferToVram - movs r0, 0x1 - bl CopyBgTilemapBufferToVram - movs r0, 0x2 - bl CopyBgTilemapBufferToVram - movs r0, 0x3 - bl CopyBgTilemapBufferToVram - b _081467C4 -_0814670C: - movs r0, 0x1 - bl HideBg - movs r0, 0x2 - bl HideBg - ldr r4, =gUnknown_203F3CC - ldr r0, [r4] - movs r1, 0xE5 - lsls r1, 1 - adds r0, r1 - ldrb r0, [r0] - bl RemoveWindow - ldr r0, [r4] - movs r2, 0xE4 - lsls r2, 1 - adds r0, r2 - ldrb r0, [r0] - bl RemoveWindow - b _081467C4 - .pool -_0814673C: - movs r0, 0x2 - movs r1, 0 - movs r2, 0 - bl ChangeBgY - movs r0, 0x3 - movs r1, 0 - movs r2, 0 - bl ChangeBgY - ldr r4, =gUnknown_203F3CC - ldr r0, [r4] - ldr r2, =0x000001c1 - adds r1, r0, r2 - ldrb r0, [r1] - cmp r0, 0xFF - beq _081467C4 - bl RemoveScrollIndicatorArrowPair - ldr r0, [r4] - ldr r2, =0x000001c1 - adds r1, r0, r2 - movs r0, 0xFF - strb r0, [r1] - b _081467C4 - .pool -_08146778: - ldr r0, =gUnknown_203F3B8 - ldrb r0, [r0] - adds r1, r2, 0 - bl sub_8142344 - b _081467C4 - .pool -_08146788: - bl sub_8142420 - movs r0, 0 - bl CopyBgTilemapBufferToVram - movs r0, 0x3 - bl CopyBgTilemapBufferToVram - movs r0, 0x1 - negs r0, r0 - movs r1, 0 - str r1, [sp] - movs r2, 0x10 - movs r3, 0 - bl BeginNormalPaletteFade - b _081467C4 -_081467AA: - bl UpdatePaletteFade - lsls r0, 24 - cmp r0, 0 - bne _081467DE - ldr r0, [r5] - adds r0, r4 - ldrb r2, [r0] - movs r1, 0x1 - ands r1, r2 - strb r1, [r0] - movs r0, 0x1 - b _081467E0 -_081467C4: - ldr r0, =gUnknown_203F3CC - ldr r2, [r0] - movs r0, 0xE0 - lsls r0, 1 - adds r2, r0 - ldrb r3, [r2] - lsrs r1, r3, 1 - adds r1, 0x1 - lsls r1, 1 - movs r0, 0x1 - ands r0, r3 - orrs r0, r1 - strb r0, [r2] -_081467DE: - movs r0, 0 -_081467E0: - add sp, 0x8 - pop {r4,r5} - pop {r1} - bx r1 - .pool - thumb_func_end sub_8146604 - thumb_func_start sub_81467EC sub_81467EC: @ 81467EC push {r4,r5,lr} diff --git a/include/link_rfu.h b/include/link_rfu.h index 065d23f9f..6e54fcc6c 100644 --- a/include/link_rfu.h +++ b/include/link_rfu.h @@ -4,5 +4,6 @@ void sub_8142504(const u8 *str); bool32 mevent_0814257C(u8 * cmdPtr, const u8 * src); void sub_80FA190(void); +void sub_8142420(void); #endif //GUARD_LINK_RFU_H diff --git a/src/mevent_8145654.c b/src/mevent_8145654.c index 3d7f6d3ca..5161d5380 100644 --- a/src/mevent_8145654.c +++ b/src/mevent_8145654.c @@ -10,6 +10,7 @@ #include "mystery_gift_menu.h" #include "menu_indicators.h" #include "string_util.h" +#include "link_rfu.h" #include "mevent.h" struct UnkStruct_8467FB8 @@ -574,3 +575,66 @@ s32 sub_8146318(void) ++gUnknown_203F3CC->unk_01C0_1; return 0; } + +s32 sub_8146604(bool32 flag) +{ + if (gUnknown_203F3CC == NULL) + return -1; + switch (gUnknown_203F3CC->unk_01C0_1) + { + case 0: + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, 0); + break; + case 1: + if (UpdatePaletteFade()) + return 0; + ChangeBgY(2, 0, 0); + SetGpuReg(REG_OFFSET_WIN0H, 0); + SetGpuReg(REG_OFFSET_WIN0V, 0); + SetGpuReg(REG_OFFSET_WININ, 0); + SetGpuReg(REG_OFFSET_WINOUT, 0); + ClearGpuRegBits(REG_OFFSET_DISPCNT, DISPCNT_WIN0_ON); + break; + case 2: + FillBgTilemapBufferRect_Palette0(0, 0x000, 0, 0, 30, 20); + FillBgTilemapBufferRect_Palette0(1, 0x000, 0, 0, 30, 20); + FillBgTilemapBufferRect_Palette0(2, 0x000, 0, 0, 30, 24); + FillBgTilemapBufferRect_Palette0(3, 0x000, 0, 0, 30, 24); + CopyBgTilemapBufferToVram(0); + CopyBgTilemapBufferToVram(1); + CopyBgTilemapBufferToVram(2); + CopyBgTilemapBufferToVram(3); + break; + case 3: + HideBg(1); + HideBg(2); + RemoveWindow(gUnknown_203F3CC->unk_01C8[1]); + RemoveWindow(gUnknown_203F3CC->unk_01C8[0]); + break; + case 4: + ChangeBgY(2, 0, 0); + ChangeBgY(3, 0, 0); + if (gUnknown_203F3CC->unk_01C1 != 0xFF) + { + RemoveScrollIndicatorArrowPair(gUnknown_203F3CC->unk_01C1); + gUnknown_203F3CC->unk_01C1 = 0xFF; + } + break; + case 5: + sub_8142344(gUnknown_203F3B8, flag); + break; + case 6: + sub_8142420(); + CopyBgTilemapBufferToVram(0); + CopyBgTilemapBufferToVram(3); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, 0); + break; + default: + if (UpdatePaletteFade()) + return 0; + gUnknown_203F3CC->unk_01C0_1 = 0; + return 1; + } + ++gUnknown_203F3CC->unk_01C0_1; + return 0; +} -- cgit v1.2.3 From 3700b24a316d4c053e719c97642e32e3b1b297ca Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Mon, 3 Dec 2018 08:44:24 -0500 Subject: through sub_8146834 --- asm/mevent_8145654.s | 77 ---------------------------------------------------- src/mevent_8145654.c | 20 ++++++++++++++ 2 files changed, 20 insertions(+), 77 deletions(-) diff --git a/asm/mevent_8145654.s b/asm/mevent_8145654.s index b5e5dc019..8e3357763 100644 --- a/asm/mevent_8145654.s +++ b/asm/mevent_8145654.s @@ -5,83 +5,6 @@ .text - thumb_func_start sub_81467EC -sub_81467EC: @ 81467EC - push {r4,r5,lr} - ldr r4, =gUnknown_203F3CC - ldr r2, [r4] - movs r5, 0xE0 - lsls r5, 1 - adds r0, r2, r5 - ldrb r1, [r0] - movs r0, 0x1 - ands r0, r1 - cmp r0, 0 - bne _08146826 - ldr r0, =0x000001c1 - adds r1, r2, r0 - ldrb r0, [r1] - cmp r0, 0xFF - beq _08146826 - bl RemoveScrollIndicatorArrowPair - ldr r0, [r4] - ldr r2, =0x000001c1 - adds r1, r0, r2 - movs r0, 0xFF - strb r0, [r1] - ldr r1, [r4] - adds r1, r5 - ldrb r0, [r1] - movs r2, 0x1 - orrs r0, r2 - strb r0, [r1] -_08146826: - pop {r4,r5} - pop {r0} - bx r0 - .pool - thumb_func_end sub_81467EC - - thumb_func_start sub_8146834 -sub_8146834: @ 8146834 - push {r4,lr} - ldr r4, =gUnknown_203F3CC - ldr r2, [r4] - movs r1, 0xE0 - lsls r1, 1 - adds r0, r2, r1 - ldrb r1, [r0] - movs r0, 0x1 - ands r0, r1 - cmp r0, 0 - beq _08146874 - movs r3, 0xE5 - lsls r3, 2 - adds r0, r2, r3 - movs r3, 0xE3 - lsls r3, 1 - adds r1, r2, r3 - bl AddScrollIndicatorArrowPair - ldr r1, [r4] - ldr r2, =0x000001c1 - adds r1, r2 - strb r0, [r1] - ldr r1, [r4] - movs r3, 0xE0 - lsls r3, 1 - adds r1, r3 - ldrb r2, [r1] - movs r0, 0x2 - negs r0, r0 - ands r0, r2 - strb r0, [r1] -_08146874: - pop {r4} - pop {r0} - bx r0 - .pool - thumb_func_end sub_8146834 - thumb_func_start sub_8146884 sub_8146884: @ 8146884 push {r4-r6,lr} diff --git a/src/mevent_8145654.c b/src/mevent_8145654.c index 5161d5380..04fac680e 100644 --- a/src/mevent_8145654.c +++ b/src/mevent_8145654.c @@ -638,3 +638,23 @@ s32 sub_8146604(bool32 flag) ++gUnknown_203F3CC->unk_01C0_1; return 0; } + +void sub_81467EC(void) +{ + if (!gUnknown_203F3CC->unk_01C0_0 && gUnknown_203F3CC->unk_01C1 != 0xFF) + { + RemoveScrollIndicatorArrowPair(gUnknown_203F3CC->unk_01C1); + gUnknown_203F3CC->unk_01C1 = 0xFF; + gUnknown_203F3CC->unk_01C0_0 = TRUE; + } +} + + +void sub_8146834(void) +{ + if (gUnknown_203F3CC->unk_01C0_0) + { + gUnknown_203F3CC->unk_01C1 = AddScrollIndicatorArrowPair(&gUnknown_203F3CC->unk_0394, &gUnknown_203F3CC->unk_01C6); + gUnknown_203F3CC->unk_01C0_0 = FALSE; + } +} \ No newline at end of file -- cgit v1.2.3 From 0f486fec545ed2583b478033410b648329fc98f1 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Mon, 3 Dec 2018 09:43:03 -0500 Subject: sub_8146884 --- asm/mevent_8145654.s | 134 --------------------------------------------------- src/mevent_8145654.c | 50 +++++++++++++++++-- 2 files changed, 47 insertions(+), 137 deletions(-) diff --git a/asm/mevent_8145654.s b/asm/mevent_8145654.s index 8e3357763..c76fd8260 100644 --- a/asm/mevent_8145654.s +++ b/asm/mevent_8145654.s @@ -5,140 +5,6 @@ .text - thumb_func_start sub_8146884 -sub_8146884: @ 8146884 - push {r4-r6,lr} - lsls r0, 16 - lsrs r4, r0, 16 - adds r3, r4, 0 - ldr r2, =gUnknown_203F3CC - ldr r0, [r2] - mov r12, r0 - movs r0, 0xE1 - lsls r0, 1 - add r0, r12 - ldrb r1, [r0] - movs r5, 0x1 - adds r0, r5, 0 - ands r0, r1 - adds r6, r2, 0 - cmp r0, 0 - beq _081468B4 - bl sub_8146B58 -_081468AA: - movs r0, 0xFF - b _0814697A - .pool -_081468B4: - cmp r4, 0x2 - beq _081468D0 - cmp r4, 0x2 - bgt _081468C2 - cmp r4, 0x1 - beq _081468CC - b _081468AA -_081468C2: - cmp r3, 0x40 - beq _081468D4 - cmp r3, 0x80 - beq _08146904 - b _081468AA -_081468CC: - movs r0, 0 - b _0814697A -_081468D0: - movs r0, 0x1 - b _0814697A -_081468D4: - movs r0, 0xE3 - lsls r0, 1 - add r0, r12 - ldrh r0, [r0] - cmp r0, 0 - beq _081468AA - movs r0, 0xE0 - lsls r0, 1 - add r0, r12 - ldrb r1, [r0] - adds r0, r5, 0 - ands r0, r1 - cmp r0, 0 - bne _081468AA - ldr r2, =0x000001c3 - add r2, r12 - ldrb r1, [r2] - movs r0, 0x2 - negs r0, r0 - ands r0, r1 - b _08146932 - .pool -_08146904: - movs r0, 0xE3 - lsls r0, 1 - add r0, r12 - movs r1, 0xE2 - lsls r1, 1 - add r1, r12 - ldrh r0, [r0] - ldrh r1, [r1] - cmp r0, r1 - beq _081468AA - movs r0, 0xE0 - lsls r0, 1 - add r0, r12 - ldrb r1, [r0] - adds r0, r5, 0 - ands r0, r1 - cmp r0, 0 - bne _081468AA - ldr r2, =0x000001c3 - add r2, r12 - ldrb r0, [r2] - movs r1, 0x1 - orrs r0, r1 -_08146932: - strb r0, [r2] - ldr r2, [r6] - movs r4, 0xE1 - lsls r4, 1 - adds r2, r4 - ldrb r0, [r2] - movs r1, 0x1 - orrs r0, r1 - strb r0, [r2] - ldr r3, [r6] - adds r3, r4 - ldrb r1, [r3] - movs r2, 0x1 - adds r0, r2, 0 - ands r0, r1 - movs r1, 0x4 - orrs r0, r1 - strb r0, [r3] - ldr r1, [r6] - adds r4, 0x1 - adds r1, r4 - ldrb r3, [r1] - adds r0, r2, 0 - ands r0, r3 - strb r0, [r1] - ldr r0, [r6] - adds r0, r4 - ldrb r0, [r0] - ands r2, r0 - cmp r2, 0 - beq _08146978 - movs r0, 0x3 - b _0814697A - .pool -_08146978: - movs r0, 0x2 -_0814697A: - pop {r4-r6} - pop {r1} - bx r1 - thumb_func_end sub_8146884 - thumb_func_start sub_8146980 sub_8146980: @ 8146980 push {r4-r6,lr} diff --git a/src/mevent_8145654.c b/src/mevent_8145654.c index 04fac680e..443aa0b76 100644 --- a/src/mevent_8145654.c +++ b/src/mevent_8145654.c @@ -456,9 +456,13 @@ struct UnkStruct_203F3CC /*0000*/ struct MEventBuffer_3120_Sub unk_0000; /*01bc*/ const struct UnkStruct_8468720 * unk_01BC; /*01c0*/ u8 unk_01C0_0:1; - /*01c0*/ u8 unk_01C0_1:7; + u8 unk_01C0_1:7; /*01c1*/ u8 unk_01C1; - /*01c2*/ u8 filler_01C2[4]; + /*01c2*/ u8 unk_01C2_0:1; + u8 unk_01C2_1:7; + /*01c3*/ u8 unk_01C3_0:1; + u8 unk_01C3_1:7; + /*01c4*/ u16 unk_01C4; /*01c6*/ u16 unk_01C6; /*01c8*/ u16 unk_01C8[2]; /*01cc*/ u8 filler_01CC[0x1C8]; @@ -470,6 +474,7 @@ EWRAM_DATA struct UnkStruct_203F3CC * gUnknown_203F3CC = NULL; void sub_8146980(void); void sub_8146A30(void); +void sub_8146B58(void); extern const struct TextColor gUnknown_8468038[2]; extern const struct WindowTemplate gUnknown_8468040[2]; @@ -657,4 +662,43 @@ void sub_8146834(void) gUnknown_203F3CC->unk_01C1 = AddScrollIndicatorArrowPair(&gUnknown_203F3CC->unk_0394, &gUnknown_203F3CC->unk_01C6); gUnknown_203F3CC->unk_01C0_0 = FALSE; } -} \ No newline at end of file +} + +u8 sub_8146884(u16 input) +{ + if (gUnknown_203F3CC->unk_01C2_0) + { + sub_8146B58(); + return 0xFF; + } + switch (input) + { + case A_BUTTON: + return 0; + case B_BUTTON: + return 1; + case DPAD_UP: + if (gUnknown_203F3CC->unk_01C6 == 0) + return 0xFF; + if (gUnknown_203F3CC->unk_01C0_0) + return 0xFF; + gUnknown_203F3CC->unk_01C3_0 = FALSE; + break; + case DPAD_DOWN: + if (gUnknown_203F3CC->unk_01C6 == gUnknown_203F3CC->unk_01C4) + return 0xFF; + if (gUnknown_203F3CC->unk_01C0_0) + return 0xFF; + gUnknown_203F3CC->unk_01C3_0 = TRUE; + break; + default: + return 0xFF; + } + gUnknown_203F3CC->unk_01C2_0 = TRUE; + gUnknown_203F3CC->unk_01C2_1 = 2; + gUnknown_203F3CC->unk_01C3_1 = 0; + if (gUnknown_203F3CC->unk_01C3_0 == FALSE) + return 2; + else + return 3; +} -- cgit v1.2.3 From 59b87e9d2af887401736d8fd06d3a9266e3983e5 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Mon, 3 Dec 2018 10:09:28 -0500 Subject: sub_8146980 --- asm/mevent_8145654.s | 84 ---------------------------------------------------- data/data_8466FB8.s | 18 ----------- include/global.h | 3 +- src/mevent_8145654.c | 35 +++++++++++++++++++--- 4 files changed, 33 insertions(+), 107 deletions(-) diff --git a/asm/mevent_8145654.s b/asm/mevent_8145654.s index c76fd8260..0d232dcc2 100644 --- a/asm/mevent_8145654.s +++ b/asm/mevent_8145654.s @@ -5,90 +5,6 @@ .text - thumb_func_start sub_8146980 -sub_8146980: @ 8146980 - push {r4-r6,lr} - movs r5, 0 - ldr r4, =gUnknown_203F3CC - ldr r1, [r4] - movs r2, 0xE7 - lsls r2, 1 - adds r0, r1, r2 - adds r1, 0x4 - movs r2, 0x28 - bl memcpy - ldr r0, [r4] - movs r3, 0xFB - lsls r3, 1 - adds r1, r0, r3 - movs r0, 0xFF - strb r0, [r1] - adds r6, r4, 0 -_081469A4: - ldr r2, [r6] - lsls r1, r5, 2 - adds r1, r5 - lsls r1, 3 - adds r4, r1, r5 - adds r0, r4, r2 - ldr r3, =0x000001f7 - adds r0, r3 - adds r1, r2 - adds r1, 0x2C - movs r2, 0x28 - bl memcpy - ldr r0, [r6] - ldr r1, =0x0000021f - adds r0, r1 - adds r0, r4 - movs r1, 0xFF - strb r1, [r0] - cmp r5, 0x7 - bls _081469E8 - ldr r1, [r6] - ldr r2, =0x000001f7 - adds r0, r1, r2 - adds r0, r4 - ldrb r0, [r0] - cmp r0, 0xFF - beq _081469E8 - movs r3, 0xE2 - lsls r3, 1 - adds r1, r3 - ldrh r0, [r1] - adds r0, 0x1 - strh r0, [r1] -_081469E8: - adds r0, r5, 0x1 - lsls r0, 24 - lsrs r5, r0, 24 - cmp r5, 0x9 - bls _081469A4 - ldr r2, =gUnknown_203F3CC - ldr r1, [r2] - movs r4, 0xE5 - lsls r4, 2 - adds r1, r4 - ldr r0, =gUnknown_8468050 - ldm r0!, {r3-r5} - stm r1!, {r3-r5} - ldr r0, [r0] - str r0, [r1] - ldr r2, [r2] - movs r5, 0xE2 - lsls r5, 1 - adds r0, r2, r5 - ldrh r1, [r0] - movs r3, 0xE7 - lsls r3, 2 - adds r0, r2, r3 - strh r1, [r0] - pop {r4-r6} - pop {r0} - bx r0 - .pool - thumb_func_end sub_8146980 - thumb_func_start sub_8146A30 sub_8146A30: @ 8146A30 push {r4-r7,lr} diff --git a/data/data_8466FB8.s b/data/data_8466FB8.s index 389b0d584..276658b7a 100644 --- a/data/data_8466FB8.s +++ b/data/data_8466FB8.s @@ -3,25 +3,7 @@ .section .rodata - .macro window_template bg, left, top, width, height, pal, baseTile - .byte \bg, \left, \top, \width, \height, \pal - .2byte \baseTile - .endm - -gUnknown_8468038:: @ 8468038 - .byte 0x00, 0x02, 0x03 - .byte 0x00, 0x01, 0x02 - .align 2 -gUnknown_8468040:: @ 8468040 - window_template 0x00, 0x01, 0x00, 0x1c, 0x03, 0x0f, 0x0000 - window_template 0x02, 0x01, 0x03, 0x1c, 0x14, 0x0f, 0x0000 - - .align 2 -gUnknown_8468050:: @ 8468050 - .byte 0x02, 0xe8, 0x18, 0x03, 0xe8, 0x98 - .2byte 0x0000, 0x0002, 0x1000, 0x1000, 0x0000 - gUnknown_8468060:: .incbin "baserom.gba", 0x468060, 0x20 diff --git a/include/global.h b/include/global.h index 840c90725..775b3115e 100644 --- a/include/global.h +++ b/include/global.h @@ -600,7 +600,8 @@ struct MEventBuffer_3120_Sub u16 unk_00; u8 unk_02; u8 unk_03; - u8 filler_04[440]; + u8 unk_04[40]; + u8 unk_2C[10][40]; }; struct MEventBuffer_3120 diff --git a/src/mevent_8145654.c b/src/mevent_8145654.c index 443aa0b76..0be18ad8f 100644 --- a/src/mevent_8145654.c +++ b/src/mevent_8145654.c @@ -465,7 +465,9 @@ struct UnkStruct_203F3CC /*01c4*/ u16 unk_01C4; /*01c6*/ u16 unk_01C6; /*01c8*/ u16 unk_01C8[2]; - /*01cc*/ u8 filler_01CC[0x1C8]; + /*01cc*/ u8 filler_01CC[2]; + /*01ce*/ u8 unk_01CE[41]; + /*01f7*/ u8 unk_01F7[10][41]; /*0394*/ struct ScrollIndicatorArrowPairTemplate unk_0394; /*03a4*/ u8 buffer_03A4[0x1000]; }; @@ -476,10 +478,19 @@ void sub_8146980(void); void sub_8146A30(void); void sub_8146B58(void); -extern const struct TextColor gUnknown_8468038[2]; -extern const struct WindowTemplate gUnknown_8468040[2]; +const struct TextColor gUnknown_8468038[] = { + {0, 2, 3}, + {0, 1, 2} +}; +const struct WindowTemplate gUnknown_8468040[] = { + {0, 1, 0, 28, 3, 15, 0x000}, + {2, 1, 3, 28, 20, 15, 0x000} +}; +const struct ScrollIndicatorArrowPairTemplate gUnknown_8468050 = { + 0x02, 0xe8, 0x18, 0x03, 0xe8, 0x98, + 0x0000, 0x0002, 0x1000, 0x1000, 0x0, 0x000 +}; extern const struct UnkStruct_8468720 gUnknown_8468720[8]; -extern const struct ScrollIndicatorArrowPairTemplate gUnknown_8468050; bool32 sub_8146288(const struct MEventBuffer_3120_Sub * a0) { @@ -702,3 +713,19 @@ u8 sub_8146884(u16 input) else return 3; } + +void sub_8146980(void) +{ + u8 i = 0; + memcpy(gUnknown_203F3CC->unk_01CE, gUnknown_203F3CC->unk_0000.unk_04, 40); + gUnknown_203F3CC->unk_01CE[40] = EOS; + for (i = 0; i < 10; ++i) + { + memcpy(gUnknown_203F3CC->unk_01F7[i], gUnknown_203F3CC->unk_0000.unk_2C[i], 40); + gUnknown_203F3CC->unk_01F7[i][40] = EOS; + if (i > 7 && gUnknown_203F3CC->unk_01F7[i][0] != EOS) + ++gUnknown_203F3CC->unk_01C4; + } + gUnknown_203F3CC->unk_0394 = gUnknown_8468050; + gUnknown_203F3CC->unk_0394.unk_08 = gUnknown_203F3CC->unk_01C4; +} -- cgit v1.2.3 From c500754d6bfbfc1ae0d67b89e725bcb0014de892 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Mon, 3 Dec 2018 10:40:38 -0500 Subject: Finish decomp and dism of mevent_8145654 --- asm/mevent_8145654.s | 251 -------------------------------- data/data_8466FB8.s | 52 +------ data/graphics/mevent/gfx_4680C0.png | Bin 0 -> 169 bytes data/graphics/mevent/gfx_46821C.png | Bin 0 -> 103 bytes data/graphics/mevent/gfx_46830C.png | Bin 0 -> 146 bytes data/graphics/mevent/gfx_468448.png | Bin 0 -> 173 bytes data/graphics/mevent/gfx_4685B4.png | Bin 0 -> 173 bytes data/graphics/mevent/pal_468060.pal | 19 +++ data/graphics/mevent/pal_468080.pal | 19 +++ data/graphics/mevent/pal_4680A0.pal | 19 +++ data/graphics/mevent/tilemap_468140.bin | Bin 0 -> 1440 bytes data/graphics/mevent/tilemap_46824C.bin | Bin 0 -> 1440 bytes data/graphics/mevent/tilemap_46837C.bin | Bin 0 -> 1440 bytes data/graphics/mevent/tilemap_4684D8.bin | Bin 0 -> 1440 bytes data/graphics/mevent/tilemap_468644.bin | Bin 0 -> 1440 bytes ld_script.txt | 1 - src/mevent_8145654.c | 90 ++++++++++-- 17 files changed, 135 insertions(+), 316 deletions(-) delete mode 100644 asm/mevent_8145654.s create mode 100644 data/graphics/mevent/gfx_4680C0.png create mode 100644 data/graphics/mevent/gfx_46821C.png create mode 100644 data/graphics/mevent/gfx_46830C.png create mode 100644 data/graphics/mevent/gfx_468448.png create mode 100644 data/graphics/mevent/gfx_4685B4.png create mode 100644 data/graphics/mevent/pal_468060.pal create mode 100644 data/graphics/mevent/pal_468080.pal create mode 100644 data/graphics/mevent/pal_4680A0.pal create mode 100644 data/graphics/mevent/tilemap_468140.bin create mode 100644 data/graphics/mevent/tilemap_46824C.bin create mode 100644 data/graphics/mevent/tilemap_46837C.bin create mode 100644 data/graphics/mevent/tilemap_4684D8.bin create mode 100644 data/graphics/mevent/tilemap_468644.bin diff --git a/asm/mevent_8145654.s b/asm/mevent_8145654.s deleted file mode 100644 index 0d232dcc2..000000000 --- a/asm/mevent_8145654.s +++ /dev/null @@ -1,251 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .syntax unified - - .text - - thumb_func_start sub_8146A30 -sub_8146A30: @ 8146A30 - push {r4-r7,lr} - mov r7, r8 - push {r7} - sub sp, 0xC - movs r5, 0 - ldr r6, =gUnknown_203F3CC - ldr r0, [r6] - movs r7, 0xE4 - lsls r7, 1 - adds r0, r7 - ldrb r0, [r0] - bl PutWindowTilemap - ldr r0, [r6] - movs r4, 0xE5 - lsls r4, 1 - adds r0, r4 - ldrb r0, [r0] - bl PutWindowTilemap - ldr r0, [r6] - adds r0, r7 - ldrb r0, [r0] - movs r1, 0 - bl FillWindowPixelBuffer - ldr r0, [r6] - adds r0, r4 - ldrb r0, [r0] - movs r1, 0 - bl FillWindowPixelBuffer - ldr r4, [r6] - movs r0, 0xE7 - lsls r0, 1 - mov r8, r0 - add r4, r8 - movs r0, 0x3 - movs r1, 0x2 - bl GetFontAttribute - adds r2, r0, 0 - lsls r2, 24 - lsrs r2, 24 - movs r0, 0x3 - adds r1, r4, 0 - bl GetStringWidth - movs r1, 0xE0 - subs r1, r0 - lsrs r0, r1, 31 - adds r1, r0 - asrs r1, 1 - cmp r1, 0 - bge _08146AA0 - movs r1, 0 -_08146AA0: - ldr r4, [r6] - adds r0, r4, r7 - ldrb r0, [r0] - lsls r2, r1, 24 - lsrs r2, 24 - movs r3, 0xDE - lsls r3, 1 - adds r1, r4, r3 - ldr r1, [r1] - ldrb r1, [r1] - lsls r1, 28 - lsrs r1, 28 - lsls r3, r1, 1 - adds r3, r1 - ldr r1, =gUnknown_8468038 - adds r3, r1 - str r3, [sp] - str r5, [sp, 0x4] - add r4, r8 - str r4, [sp, 0x8] - movs r1, 0x3 - movs r3, 0x6 - bl box_print -_08146AD0: - ldr r6, =gUnknown_203F3CC - ldr r4, [r6] - movs r1, 0xE5 - lsls r1, 1 - adds r0, r4, r1 - ldrb r0, [r0] - lsls r3, r5, 4 - adds r3, 0x2 - lsls r3, 24 - lsrs r3, 24 - movs r2, 0xDE - lsls r2, 1 - adds r1, r4, r2 - ldr r1, [r1] - ldrb r1, [r1] - lsrs r1, 4 - lsls r2, r1, 1 - adds r2, r1 - ldr r1, =gUnknown_8468038 - adds r2, r1 - str r2, [sp] - movs r1, 0 - str r1, [sp, 0x4] - lsls r1, r5, 2 - adds r1, r5 - lsls r1, 3 - adds r1, r5 - ldr r2, =0x000001f7 - adds r1, r2 - adds r4, r1 - str r4, [sp, 0x8] - movs r1, 0x3 - movs r2, 0 - bl box_print - adds r0, r5, 0x1 - lsls r0, 24 - lsrs r5, r0, 24 - cmp r5, 0x9 - bls _08146AD0 - ldr r0, [r6] - movs r3, 0xE4 - lsls r3, 1 - adds r0, r3 - ldrb r0, [r0] - movs r1, 0x3 - bl CopyWindowToVram - ldr r0, [r6] - movs r1, 0xE5 - lsls r1, 1 - adds r0, r1 - ldrb r0, [r0] - movs r1, 0x3 - bl CopyWindowToVram - add sp, 0xC - pop {r3} - mov r8, r3 - pop {r4-r7} - pop {r0} - bx r0 - .pool - thumb_func_end sub_8146A30 - - thumb_func_start sub_8146B58 -sub_8146B58: @ 8146B58 - push {r4-r6,lr} - ldr r0, =gUnknown_203F3CC - ldr r1, [r0] - movs r2, 0xE1 - lsls r2, 1 - adds r0, r1, r2 - ldrb r0, [r0] - lsrs r4, r0, 1 - lsls r4, 8 - ldr r6, =0x000001c3 - adds r0, r1, r6 - ldrb r1, [r0] - movs r0, 0x1 - ands r0, r1 - cmp r0, 0 - beq _08146B98 - movs r0, 0x2 - adds r1, r4, 0 - movs r2, 0x1 - bl ChangeBgY - movs r0, 0x3 - adds r1, r4, 0 - movs r2, 0x1 - bl ChangeBgY - b _08146BAC - .pool -_08146B98: - movs r0, 0x2 - adds r1, r4, 0 - movs r2, 0x2 - bl ChangeBgY - movs r0, 0x3 - adds r1, r4, 0 - movs r2, 0x2 - bl ChangeBgY -_08146BAC: - ldr r3, =gUnknown_203F3CC - ldr r0, [r3] - ldr r2, =0x000001c3 - adds r5, r0, r2 - ldrb r4, [r5] - lsrs r1, r4, 1 - movs r6, 0xE1 - lsls r6, 1 - adds r0, r6 - ldrb r0, [r0] - lsrs r0, 1 - adds r1, r0 - lsls r1, 1 - movs r6, 0x1 - adds r0, r6, 0 - ands r0, r4 - orrs r0, r1 - strb r0, [r5] - ldr r1, [r3] - adds r2, r1, r2 - ldrb r2, [r2] - lsrs r0, r2, 1 - cmp r0, 0xF - bls _08146C24 - adds r0, r6, 0 - ands r0, r2 - cmp r0, 0 - beq _08146BF8 - movs r0, 0xE3 - lsls r0, 1 - adds r1, r0 - ldrh r0, [r1] - adds r0, 0x1 - b _08146C02 - .pool -_08146BF8: - movs r2, 0xE3 - lsls r2, 1 - adds r1, r2 - ldrh r0, [r1] - subs r0, 0x1 -_08146C02: - strh r0, [r1] - ldr r0, [r3] - movs r6, 0xE1 - lsls r6, 1 - adds r2, r0, r6 - ldrb r1, [r2] - movs r0, 0x2 - negs r0, r0 - ands r0, r1 - strb r0, [r2] - ldr r0, [r3] - ldr r1, =0x000001c3 - adds r2, r0, r1 - ldrb r1, [r2] - movs r0, 0x1 - ands r0, r1 - strb r0, [r2] -_08146C24: - pop {r4-r6} - pop {r0} - bx r0 - .pool - thumb_func_end sub_8146B58 - - .align 2, 0 @ Don't pad with nop. diff --git a/data/data_8466FB8.s b/data/data_8466FB8.s index 276658b7a..9436bc4fd 100644 --- a/data/data_8466FB8.s +++ b/data/data_8466FB8.s @@ -4,57 +4,9 @@ .section .rodata .align 2 -gUnknown_8468060:: - .incbin "baserom.gba", 0x468060, 0x20 - -gUnknown_8468080:: - .incbin "baserom.gba", 0x468080, 0x20 - -gUnknown_84680A0:: - .incbin "baserom.gba", 0x4680A0, 0x20 - -gUnknown_84680C0:: - .incbin "baserom.gba", 0x4680C0, 0x80 - -gUnknown_8468140:: - .incbin "baserom.gba", 0x468140, 0xdc - -gUnknown_846821C:: - .incbin "baserom.gba", 0x46821C, 0x30 - -gUnknown_846824C:: - .incbin "baserom.gba", 0x46824C, 0xc0 - -gUnknown_846830C:: - .incbin "baserom.gba", 0x46830C, 0x70 - -gUnknown_846837C:: - .incbin "baserom.gba", 0x46837C, 0xcc - -gUnknown_8468448:: - .incbin "baserom.gba", 0x468448, 0x90 - -gUnknown_84684D8:: - .incbin "baserom.gba", 0x4684D8, 0xdc - -gUnknown_84685B4:: - .incbin "baserom.gba", 0x4685B4, 0x90 - -gUnknown_8468644:: - .incbin "baserom.gba", 0x468644, 0xdc - -gUnknown_8468720:: @ 8468720 - .4byte 1, gUnknown_84680C0, gUnknown_8468140, gUnknown_8468060 - .4byte 1, gUnknown_846821C, gUnknown_846824C, gUnknown_84670AC - .4byte 1, gUnknown_846830C, gUnknown_846837C, gUnknown_84670CC - .4byte 1, gUnknown_846830C, gUnknown_846837C, gUnknown_84670EC - .4byte 1, gUnknown_846830C, gUnknown_846837C, gUnknown_846710C - .4byte 1, gUnknown_846830C, gUnknown_846837C, gUnknown_846712C - .4byte 1, gUnknown_8468448, gUnknown_84684D8, gUnknown_8468080 - .4byte 1, gUnknown_84685B4, gUnknown_8468644, gUnknown_84680A0 - gUnknown_84687A0:: - .incbin "baserom.gba", 0x4687a0, 0x40 + .string "You have collected all STAMPs!\n" + .string "Want to input a CARD as a prize?$" .include "data/mevent/script_ish.inc" .include "data/mevent/script_common.inc" diff --git a/data/graphics/mevent/gfx_4680C0.png b/data/graphics/mevent/gfx_4680C0.png new file mode 100644 index 000000000..1a27f3213 Binary files /dev/null and b/data/graphics/mevent/gfx_4680C0.png differ diff --git a/data/graphics/mevent/gfx_46821C.png b/data/graphics/mevent/gfx_46821C.png new file mode 100644 index 000000000..aab27d16c Binary files /dev/null and b/data/graphics/mevent/gfx_46821C.png differ diff --git a/data/graphics/mevent/gfx_46830C.png b/data/graphics/mevent/gfx_46830C.png new file mode 100644 index 000000000..3c2b8e6d1 Binary files /dev/null and b/data/graphics/mevent/gfx_46830C.png differ diff --git a/data/graphics/mevent/gfx_468448.png b/data/graphics/mevent/gfx_468448.png new file mode 100644 index 000000000..137dbe9f3 Binary files /dev/null and b/data/graphics/mevent/gfx_468448.png differ diff --git a/data/graphics/mevent/gfx_4685B4.png b/data/graphics/mevent/gfx_4685B4.png new file mode 100644 index 000000000..137dbe9f3 Binary files /dev/null and b/data/graphics/mevent/gfx_4685B4.png differ diff --git a/data/graphics/mevent/pal_468060.pal b/data/graphics/mevent/pal_468060.pal new file mode 100644 index 000000000..970736bbb --- /dev/null +++ b/data/graphics/mevent/pal_468060.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +90 197 148 +213 213 213 +74 74 74 +98 106 106 +213 189 74 +238 213 82 +246 246 213 +255 255 255 +230 230 213 +238 238 213 +246 246 238 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 diff --git a/data/graphics/mevent/pal_468080.pal b/data/graphics/mevent/pal_468080.pal new file mode 100644 index 000000000..01832b5e2 --- /dev/null +++ b/data/graphics/mevent/pal_468080.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +189 123 148 +213 213 213 +74 74 74 +115 123 123 +164 156 90 +164 148 90 +197 197 90 +213 205 90 +222 213 90 +213 213 106 +238 246 98 +230 222 98 +213 205 98 +197 180 98 +238 230 98 +246 238 106 diff --git a/data/graphics/mevent/pal_4680A0.pal b/data/graphics/mevent/pal_4680A0.pal new file mode 100644 index 000000000..28a498b57 --- /dev/null +++ b/data/graphics/mevent/pal_4680A0.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +189 123 148 +213 213 213 +74 74 74 +115 123 123 +156 156 156 +139 139 148 +180 180 197 +197 189 205 +205 205 222 +189 189 189 +197 230 222 +189 213 213 +180 197 197 +156 164 172 +222 222 230 +230 230 238 diff --git a/data/graphics/mevent/tilemap_468140.bin b/data/graphics/mevent/tilemap_468140.bin new file mode 100644 index 000000000..f8185b28e Binary files /dev/null and b/data/graphics/mevent/tilemap_468140.bin differ diff --git a/data/graphics/mevent/tilemap_46824C.bin b/data/graphics/mevent/tilemap_46824C.bin new file mode 100644 index 000000000..72c7ea278 Binary files /dev/null and b/data/graphics/mevent/tilemap_46824C.bin differ diff --git a/data/graphics/mevent/tilemap_46837C.bin b/data/graphics/mevent/tilemap_46837C.bin new file mode 100644 index 000000000..c7b2e3e21 Binary files /dev/null and b/data/graphics/mevent/tilemap_46837C.bin differ diff --git a/data/graphics/mevent/tilemap_4684D8.bin b/data/graphics/mevent/tilemap_4684D8.bin new file mode 100644 index 000000000..f8185b28e Binary files /dev/null and b/data/graphics/mevent/tilemap_4684D8.bin differ diff --git a/data/graphics/mevent/tilemap_468644.bin b/data/graphics/mevent/tilemap_468644.bin new file mode 100644 index 000000000..f8185b28e Binary files /dev/null and b/data/graphics/mevent/tilemap_468644.bin differ diff --git a/ld_script.txt b/ld_script.txt index 8d88929cf..9238e0e71 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -247,7 +247,6 @@ SECTIONS { src/mevent_server_helpers.o(.text); src/mevent_server.o(.text); src/mevent_8145654.o(.text); - asm/mevent_8145654.o(.text); src/menews_jisan.o(.text); asm/seagallop.o(.text); asm/unk_8147500.o(.text); diff --git a/src/mevent_8145654.c b/src/mevent_8145654.c index 0be18ad8f..c39d76f25 100644 --- a/src/mevent_8145654.c +++ b/src/mevent_8145654.c @@ -443,18 +443,10 @@ void sub_81461D8(void) } } -struct UnkStruct_8468720 -{ - u8 unk0; - const void * unk4; - const void * unk8; - const void * unkC; -}; - struct UnkStruct_203F3CC { /*0000*/ struct MEventBuffer_3120_Sub unk_0000; - /*01bc*/ const struct UnkStruct_8468720 * unk_01BC; + /*01bc*/ const struct UnkStruct_8467FB8 * unk_01BC; /*01c0*/ u8 unk_01C0_0:1; u8 unk_01C0_1:7; /*01c1*/ u8 unk_01C1; @@ -490,7 +482,31 @@ const struct ScrollIndicatorArrowPairTemplate gUnknown_8468050 = { 0x02, 0xe8, 0x18, 0x03, 0xe8, 0x98, 0x0000, 0x0002, 0x1000, 0x1000, 0x0, 0x000 }; -extern const struct UnkStruct_8468720 gUnknown_8468720[8]; + +const u16 gUnknown_8468060[] = INCBIN_U16("data/graphics/mevent/pal_468060.gbapal"); +const u16 gUnknown_8468080[] = INCBIN_U16("data/graphics/mevent/pal_468080.gbapal"); +const u16 gUnknown_84680A0[] = INCBIN_U16("data/graphics/mevent/pal_4680A0.gbapal"); +const u8 gUnknown_84680C0[] = INCBIN_U8("data/graphics/mevent/gfx_4680C0.4bpp.lz"); +const u8 gUnknown_8468140[] = INCBIN_U8("data/graphics/mevent/tilemap_468140.bin.lz"); +const u8 gUnknown_846821C[] = INCBIN_U8("data/graphics/mevent/gfx_46821C.4bpp.lz"); +const u8 gUnknown_846824C[] = INCBIN_U8("data/graphics/mevent/tilemap_46824C.bin.lz"); +const u8 gUnknown_846830C[] = INCBIN_U8("data/graphics/mevent/gfx_46830C.4bpp.lz"); +const u8 gUnknown_846837C[] = INCBIN_U8("data/graphics/mevent/tilemap_46837C.bin.lz"); +const u8 gUnknown_8468448[] = INCBIN_U8("data/graphics/mevent/gfx_468448.4bpp.lz"); +const u8 gUnknown_84684D8[] = INCBIN_U8("data/graphics/mevent/tilemap_4684D8.bin.lz"); +const u8 gUnknown_84685B4[] = INCBIN_U8("data/graphics/mevent/gfx_4685B4.4bpp.lz"); +const u8 gUnknown_8468644[] = INCBIN_U8("data/graphics/mevent/tilemap_468644.bin.lz"); + +const struct UnkStruct_8467FB8 gUnknown_8468720[] = { + {1, 0, 0, 0, gUnknown_84680C0, gUnknown_8468140, gUnknown_8468060}, + {1, 0, 0, 0, gUnknown_846821C, gUnknown_846824C, gUnknown_84670AC}, + {1, 0, 0, 0, gUnknown_846830C, gUnknown_846837C, gUnknown_84670CC}, + {1, 0, 0, 0, gUnknown_846830C, gUnknown_846837C, gUnknown_84670EC}, + {1, 0, 0, 0, gUnknown_846830C, gUnknown_846837C, gUnknown_846710C}, + {1, 0, 0, 0, gUnknown_846830C, gUnknown_846837C, gUnknown_846712C}, + {1, 0, 0, 0, gUnknown_8468448, gUnknown_84684D8, gUnknown_8468080}, + {1, 0, 0, 0, gUnknown_84685B4, gUnknown_8468644, gUnknown_84680A0} +}; bool32 sub_8146288(const struct MEventBuffer_3120_Sub * a0) { @@ -549,7 +565,7 @@ s32 sub_8146318(void) CopyBgTilemapBufferToVram(1); CopyBgTilemapBufferToVram(2); CopyBgTilemapBufferToVram(3); - decompress_and_copy_tile_data_to_vram(3, gUnknown_203F3CC->unk_01BC->unk4, 0, 8, 0); + decompress_and_copy_tile_data_to_vram(3, gUnknown_203F3CC->unk_01BC->tiles, 0, 8, 0); gUnknown_203F3CC->unk_01C8[0] = AddWindow(&gUnknown_8468040[0]); gUnknown_203F3CC->unk_01C8[1] = AddWindow(&gUnknown_8468040[1]); break; @@ -557,8 +573,8 @@ s32 sub_8146318(void) if (free_temp_tile_data_buffers_if_possible()) return 0; gPaletteFade.bufferTransferDisabled = TRUE; - LoadPalette(gUnknown_203F3CC->unk_01BC->unkC, 0x10, 0x20); - LZ77UnCompWram(gUnknown_203F3CC->unk_01BC->unk8, gUnknown_203F3CC->buffer_03A4); + LoadPalette(gUnknown_203F3CC->unk_01BC->pal, 0x10, 0x20); + LZ77UnCompWram(gUnknown_203F3CC->unk_01BC->map, gUnknown_203F3CC->buffer_03A4); CopyRectToBgTilemapBufferRect(1, gUnknown_203F3CC->buffer_03A4, 0, 0, 30, 3, 0, 0, 30, 3, 1, 8, 0); CopyRectToBgTilemapBufferRect(3, gUnknown_203F3CC->buffer_03A4, 0, 3, 30, 23, 0, 3, 30, 23, 1, 8, 0); CopyBgTilemapBufferToVram(1); @@ -719,7 +735,7 @@ void sub_8146980(void) u8 i = 0; memcpy(gUnknown_203F3CC->unk_01CE, gUnknown_203F3CC->unk_0000.unk_04, 40); gUnknown_203F3CC->unk_01CE[40] = EOS; - for (i = 0; i < 10; ++i) + for (; i < 10; ++i) { memcpy(gUnknown_203F3CC->unk_01F7[i], gUnknown_203F3CC->unk_0000.unk_2C[i], 40); gUnknown_203F3CC->unk_01F7[i][40] = EOS; @@ -729,3 +745,49 @@ void sub_8146980(void) gUnknown_203F3CC->unk_0394 = gUnknown_8468050; gUnknown_203F3CC->unk_0394.unk_08 = gUnknown_203F3CC->unk_01C4; } + +void sub_8146A30(void) +{ + u8 i = 0; + s32 x; + PutWindowTilemap(gUnknown_203F3CC->unk_01C8[0]); + PutWindowTilemap(gUnknown_203F3CC->unk_01C8[1]); + FillWindowPixelBuffer(gUnknown_203F3CC->unk_01C8[0], 0); + FillWindowPixelBuffer(gUnknown_203F3CC->unk_01C8[1], 0); + x = (0xe0 - GetStringWidth(3, gUnknown_203F3CC->unk_01CE, GetFontAttribute(3, 2))) / 2; + if (x < 0) + x = 0; + box_print(gUnknown_203F3CC->unk_01C8[0], 3, x, 6, &gUnknown_8468038[gUnknown_203F3CC->unk_01BC->textPal1], 0, gUnknown_203F3CC->unk_01CE); + for (; i < 10; ++i) + { + box_print(gUnknown_203F3CC->unk_01C8[1], 3, 0, 16 * i + 2, &gUnknown_8468038[gUnknown_203F3CC->unk_01BC->textPal2], 0, gUnknown_203F3CC->unk_01F7[i]); + } + CopyWindowToVram(gUnknown_203F3CC->unk_01C8[0], 3); + CopyWindowToVram(gUnknown_203F3CC->unk_01C8[1], 3); +} + +void sub_8146B58(void) +{ + u16 r4 = gUnknown_203F3CC->unk_01C2_1; + r4 <<= 8; + if (gUnknown_203F3CC->unk_01C3_0) + { + ChangeBgY(2, r4, 1); + ChangeBgY(3, r4, 1); + } + else + { + ChangeBgY(2, r4, 2); + ChangeBgY(3, r4, 2); + } + gUnknown_203F3CC->unk_01C3_1 += gUnknown_203F3CC->unk_01C2_1; + if (gUnknown_203F3CC->unk_01C3_1 > 15) + { + if (gUnknown_203F3CC->unk_01C3_0) + ++gUnknown_203F3CC->unk_01C6; + else + --gUnknown_203F3CC->unk_01C6; + gUnknown_203F3CC->unk_01C2_0 = FALSE; + gUnknown_203F3CC->unk_01C3_1 = 0; + } +} -- cgit v1.2.3 From 931f19d2ead516a5fb5a2a15784391ea02bdbbc3 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Mon, 3 Dec 2018 20:21:35 -0500 Subject: Port mystery_event_script --- asm/battle_interface.s | 2 +- asm/battle_script_commands.s | 4 +- asm/battle_tower.s | 10 +- asm/berry.s | 6 +- asm/easy_chat.s | 14 +- asm/egg_hatch.s | 4 +- asm/event_data.s | 6 +- asm/evolution_scene.s | 12 +- asm/field_specials.s | 6 +- asm/mystery_event_script.s | 722 ---------------------------------- asm/pokedex.s | 20 +- asm/pokemon_3.s | 4 +- asm/prof_pc.s | 2 +- asm/scrcmd.s | 2 +- asm/script_pokemon_util_80A0058.s | 4 +- asm/trade.s | 2 +- data/data_83FECCC.s | 2 +- data/data_8471F00.s | 46 ++- data/mystery_event_script_cmd_table.s | 3 +- include/battle_tower.h | 2 +- include/constants/vars.h | 10 +- include/easy_chat.h | 1 + include/global.berry.h | 1 + include/mail_data.h | 1 + include/mystery_event_msg.h | 18 + include/mystery_event_script.h | 2 +- include/strings.h | 2 + ld_script.txt | 2 +- src/mevent_server.c | 2 +- src/mystery_event_script.c | 322 +++++++++++++++ sym_ewram.txt | 5 +- 31 files changed, 433 insertions(+), 806 deletions(-) delete mode 100644 asm/mystery_event_script.s create mode 100644 include/mystery_event_msg.h create mode 100644 src/mystery_event_script.c diff --git a/asm/battle_interface.s b/asm/battle_interface.s index 3a27c29ea..8e109b6d6 100644 --- a/asm/battle_interface.s +++ b/asm/battle_interface.s @@ -3770,7 +3770,7 @@ sub_804981C: @ 804981C lsls r0, 16 lsrs r0, 16 movs r1, 0x1 - bl sub_8088E74 + bl GetSetPokedexFlag lsls r0, 24 cmp r0, 0 beq _0804991C diff --git a/asm/battle_script_commands.s b/asm/battle_script_commands.s index 1e99186bc..ed0e6cb50 100644 --- a/asm/battle_script_commands.s +++ b/asm/battle_script_commands.s @@ -31945,7 +31945,7 @@ _0802D5D8: lsls r0, 16 lsrs r0, 16 movs r1, 0x1 - bl sub_8088E74 + bl GetSetPokedexFlag lsls r0, 24 movs r4, 0xA cmp r0, 0 @@ -32356,7 +32356,7 @@ sub_802D95C: @ 802D95C lsls r0, 16 lsrs r0, 16 movs r1, 0x1 - bl sub_8088E74 + bl GetSetPokedexFlag lsls r0, 24 cmp r0, 0 beq _0802D9B4 diff --git a/asm/battle_tower.s b/asm/battle_tower.s index 10b07d2e0..f1cf4d3fa 100644 --- a/asm/battle_tower.s +++ b/asm/battle_tower.s @@ -143,7 +143,7 @@ sub_80E5A70: @ 80E5A70 add r4, sp, 0x28 movs r0, 0 strb r0, [r4] - bl sub_80E7490 + bl ValidateEReaderTrainer ldr r0, _080E5AA4 @ =gUnknown_20370D0 ldrh r0, [r0] adds r7, r4, 0 @@ -1506,7 +1506,7 @@ sub_80E64C0: @ 80E64C0 lsls r0, 16 lsrs r0, 16 movs r1, 0x1 - bl sub_8088E74 + bl GetSetPokedexFlag lsls r0, 24 cmp r0, 0 beq _080E6554 @@ -3497,8 +3497,8 @@ _080E7488: .4byte gSaveBlock2Ptr _080E748C: .4byte 0x000004a4 thumb_func_end sub_80E7460 - thumb_func_start sub_80E7490 -sub_80E7490: @ 80E7490 + thumb_func_start ValidateEReaderTrainer +ValidateEReaderTrainer: @ 80E7490 push {r4-r6,lr} ldr r2, _080E74C0 @ =gUnknown_20370D0 movs r0, 0 @@ -3556,7 +3556,7 @@ _080E74F6: bx r0 .align 2, 0 _080E74FC: .4byte gUnknown_20370D0 - thumb_func_end sub_80E7490 + thumb_func_end ValidateEReaderTrainer thumb_func_start sub_80E7500 sub_80E7500: @ 80E7500 diff --git a/asm/berry.s b/asm/berry.s index 8b9593a2a..5537e3590 100644 --- a/asm/berry.s +++ b/asm/berry.s @@ -89,8 +89,8 @@ _0809C7BC: .4byte 0x000030ec _0809C7C0: .4byte 0x0100001a thumb_func_end sub_809C794 - thumb_func_start sub_809C7C4 -sub_809C7C4: @ 809C7C4 + thumb_func_start SetEnigmaBerry +SetEnigmaBerry: @ 809C7C4 push {r4-r7,lr} adds r4, r0, 0 bl sub_809C794 @@ -144,7 +144,7 @@ _0809C828: .4byte 0x000030ec _0809C82C: .4byte 0x00003108 _0809C830: .4byte 0x00000516 _0809C834: .4byte 0x00000529 - thumb_func_end sub_809C7C4 + thumb_func_end SetEnigmaBerry thumb_func_start GetEnigmaBerryChecksum GetEnigmaBerryChecksum: @ 809C838 diff --git a/asm/easy_chat.s b/asm/easy_chat.s index 1b4879bf3..b8e9f7162 100644 --- a/asm/easy_chat.s +++ b/asm/easy_chat.s @@ -622,8 +622,8 @@ _080BDB68: .4byte gSaveBlock1Ptr _080BDB6C: .4byte 0x00002f10 thumb_func_end sub_80BDB48 - thumb_func_start sub_80BDB70 -sub_80BDB70: @ 80BDB70 + thumb_func_start EnableRareWord +EnableRareWord: @ 80BDB70 push {lr} lsls r0, 24 lsrs r1, r0, 24 @@ -648,7 +648,7 @@ _080BDB94: .align 2, 0 _080BDB98: .4byte gSaveBlock1Ptr _080BDB9C: .4byte 0x00002f10 - thumb_func_end sub_80BDB70 + thumb_func_end EnableRareWord thumb_func_start sub_80BDBA0 sub_80BDBA0: @ 80BDBA0 @@ -687,7 +687,7 @@ sub_80BDBCC: @ 80BDBCC b _080BDC32 _080BDBDC: adds r0, r5, 0 - bl sub_80BDB70 + bl EnableRareWord ldr r0, _080BDBF4 @ =0x000001ff ands r4, r0 movs r1, 0xA0 @@ -841,7 +841,7 @@ _080BDCF6: lsls r0, 16 lsrs r0, 16 movs r1, 0 - bl sub_8088E74 + bl GetSetPokedexFlag lsls r0, 24 cmp r0, 0 beq _080BDD16 @@ -1769,7 +1769,7 @@ _080BE3BC: lsls r0, 16 lsrs r0, 16 movs r1, 0 - bl sub_8088E74 + bl GetSetPokedexFlag lsls r0, 24 lsrs r0, 24 b _080BE40C @@ -1783,7 +1783,7 @@ _080BE3D6: lsls r0, 16 lsrs r0, 16 movs r1, 0 - bl sub_8088E74 + bl GetSetPokedexFlag lsls r0, 24 lsrs r0, 24 b _080BE40C diff --git a/asm/egg_hatch.s b/asm/egg_hatch.s index 078dadb29..278cc855e 100644 --- a/asm/egg_hatch.s +++ b/asm/egg_hatch.s @@ -214,10 +214,10 @@ AddHatchedMonToParty: @ 8046D60 lsrs r4, 16 adds r0, r4, 0 movs r1, 0x2 - bl sub_8088E74 + bl GetSetPokedexFlag adds r0, r4, 0 movs r1, 0x3 - bl sub_8088E74 + bl GetSetPokedexFlag ldr r1, _08046E1C @ =gStringVar1 adds r0, r5, 0 bl GetMonNick diff --git a/asm/event_data.s b/asm/event_data.s index d620e3142..416c777eb 100644 --- a/asm/event_data.s +++ b/asm/event_data.s @@ -170,8 +170,8 @@ _0806E224: .4byte 0x0000404e _0806E228: .4byte gSaveBlock2Ptr thumb_func_end sub_806E204 - thumb_func_start sub_806E22C -sub_806E22C: @ 806E22C + thumb_func_start EnableNationalPokedex +EnableNationalPokedex: @ 806E22C push {lr} ldr r0, _0806E250 @ =0x0000404e bl GetVarPointer @@ -191,7 +191,7 @@ sub_806E22C: @ 806E22C _0806E250: .4byte 0x0000404e _0806E254: .4byte gSaveBlock2Ptr _0806E258: .4byte 0x00006258 - thumb_func_end sub_806E22C + thumb_func_end EnableNationalPokedex thumb_func_start sub_806E25C sub_806E25C: @ 806E25C diff --git a/asm/evolution_scene.s b/asm/evolution_scene.s index 4aa868a77..f6f5a83e2 100644 --- a/asm/evolution_scene.s +++ b/asm/evolution_scene.s @@ -1252,13 +1252,13 @@ _080CE80C: lsls r0, 16 lsrs r0, 16 movs r1, 0x2 - bl sub_8088E74 + bl GetSetPokedexFlag ldrh r0, [r4, 0xC] bl SpeciesToNationalPokedexNum lsls r0, 16 lsrs r0, 16 movs r1, 0x3 - bl sub_8088E74 + bl GetSetPokedexFlag mov r0, r9 movs r1, 0xB bl GetMonData @@ -1829,13 +1829,13 @@ _080CED3A: lsls r0, 16 lsrs r0, 16 movs r1, 0x2 - bl sub_8088E74 + bl GetSetPokedexFlag ldrh r0, [r4, 0xC] bl SpeciesToNationalPokedexNum lsls r0, 16 lsrs r0, 16 movs r1, 0x3 - bl sub_8088E74 + bl GetSetPokedexFlag movs r0, 0xE bl IncrementGameStat b _080CF528 @@ -3136,13 +3136,13 @@ _080CF8A8: lsls r0, 16 lsrs r0, 16 movs r1, 0x2 - bl sub_8088E74 + bl GetSetPokedexFlag ldrh r0, [r4, 0xC] bl SpeciesToNationalPokedexNum lsls r0, 16 lsrs r0, 16 movs r1, 0x3 - bl sub_8088E74 + bl GetSetPokedexFlag movs r0, 0xE bl IncrementGameStat b _080D003A diff --git a/asm/field_specials.s b/asm/field_specials.s index c6df3442d..18b0401a4 100644 --- a/asm/field_specials.s +++ b/asm/field_specials.s @@ -1491,7 +1491,7 @@ _080CB128: lsls r0, 16 lsrs r0, 16 movs r1, 0 - bl sub_8088E74 + bl GetSetPokedexFlag lsls r0, 24 asrs r0, 24 cmp r0, 0x1 @@ -1521,7 +1521,7 @@ _080CB176: lsls r0, 16 lsrs r0, 16 movs r1, 0 - bl sub_8088E74 + bl GetSetPokedexFlag lsls r0, 24 asrs r0, 24 cmp r0, 0x1 @@ -3129,7 +3129,7 @@ sub_80CBDCC: @ 80CBDCC lsls r0, 16 lsrs r0, 16 movs r1, 0x2 - bl sub_8088E74 + bl GetSetPokedexFlag pop {r0} bx r0 .align 2, 0 diff --git a/asm/mystery_event_script.s b/asm/mystery_event_script.s deleted file mode 100644 index b150bb586..000000000 --- a/asm/mystery_event_script.s +++ /dev/null @@ -1,722 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .syntax unified - - .text - - thumb_func_start sub_80DA800 -sub_80DA800: @ 80DA800 - push {r4,lr} - lsls r0, 16 - lsrs r0, 16 - lsls r2, 16 - lsrs r2, 16 - movs r4, 0x1 - ands r0, r4 - cmp r0, 0 - beq _080DA828 - ands r1, r4 - cmp r1, 0 - beq _080DA828 - ands r2, r4 - cmp r2, 0 - beq _080DA828 - ands r3, r4 - cmp r3, 0 - beq _080DA828 - movs r0, 0x1 - b _080DA82A -_080DA828: - movs r0, 0 -_080DA82A: - pop {r4} - pop {r1} - bx r1 - thumb_func_end sub_80DA800 - - thumb_func_start SetIncompatible -SetIncompatible: @ 80DA830 - push {lr} - ldr r0, _080DA844 @ =gStringVar4 - ldr r1, _080DA848 @ =gUnknown_8488DFD - bl StringExpandPlaceholders - movs r0, 0x3 - bl sub_80DA8E8 - pop {r0} - bx r0 - .align 2, 0 -_080DA844: .4byte gStringVar4 -_080DA848: .4byte gUnknown_8488DFD - thumb_func_end SetIncompatible - - thumb_func_start InitMysteryEventScript -InitMysteryEventScript: @ 80DA84C - push {r4,r5,lr} - adds r4, r0, 0 - adds r5, r1, 0 - ldr r1, _080DA874 @ =gUnknown_81DBCF0 - ldr r2, _080DA878 @ =0x081dbd34 - bl InitScriptContext - adds r0, r4, 0 - adds r1, r5, 0 - bl SetupBytecodeScript - str r5, [r4, 0x64] - movs r0, 0 - str r0, [r4, 0x68] - str r0, [r4, 0x6C] - str r0, [r4, 0x70] - pop {r4,r5} - pop {r0} - bx r0 - .align 2, 0 -_080DA874: .4byte gUnknown_81DBCF0 -_080DA878: .4byte 0x081dbd34 - thumb_func_end InitMysteryEventScript - - thumb_func_start RunMysteryEventScriptCommand -RunMysteryEventScriptCommand: @ 80DA87C - push {r4,lr} - adds r4, r0, 0 - bl RunScriptCommand - lsls r0, 24 - cmp r0, 0 - beq _080DA894 - ldr r0, [r4, 0x70] - cmp r0, 0 - beq _080DA894 - movs r0, 0x1 - b _080DA896 -_080DA894: - movs r0, 0 -_080DA896: - pop {r4} - pop {r1} - bx r1 - thumb_func_end RunMysteryEventScriptCommand - - thumb_func_start sub_80DA89C -sub_80DA89C: @ 80DA89C - push {lr} - adds r1, r0, 0 - ldr r0, _080DA8AC @ =gUnknown_203AA3C - bl InitMysteryEventScript - pop {r0} - bx r0 - .align 2, 0 -_080DA8AC: .4byte gUnknown_203AA3C - thumb_func_end sub_80DA89C - - thumb_func_start sub_80DA8B0 -sub_80DA8B0: @ 80DA8B0 - push {r4,r5,lr} - adds r5, r0, 0 - ldr r4, _080DA8C8 @ =gUnknown_203AA3C - adds r0, r4, 0 - bl RunMysteryEventScriptCommand - ldr r1, [r4, 0x6C] - str r1, [r5] - pop {r4,r5} - pop {r1} - bx r1 - .align 2, 0 -_080DA8C8: .4byte gUnknown_203AA3C - thumb_func_end sub_80DA8B0 - - thumb_func_start sub_80DA8CC -sub_80DA8CC: @ 80DA8CC - push {lr} - sub sp, 0x4 - bl sub_80DA89C -_080DA8D4: - mov r0, sp - bl sub_80DA8B0 - cmp r0, 0 - bne _080DA8D4 - ldr r0, [sp] - add sp, 0x4 - pop {r1} - bx r1 - thumb_func_end sub_80DA8CC - - thumb_func_start sub_80DA8E8 -sub_80DA8E8: @ 80DA8E8 - ldr r1, _080DA8F0 @ =gUnknown_203AA3C - str r0, [r1, 0x6C] - bx lr - .align 2, 0 -_080DA8F0: .4byte gUnknown_203AA3C - thumb_func_end sub_80DA8E8 - - thumb_func_start script_status_stop_and_ret_1 -script_status_stop_and_ret_1: @ 80DA8F4 - push {lr} - bl StopScript - movs r0, 0x1 - pop {r1} - bx r1 - thumb_func_end script_status_stop_and_ret_1 - - thumb_func_start MEScrCmd_checkcompat -MEScrCmd_checkcompat: @ 80DA900 - push {r4-r7,lr} - adds r7, r0, 0 - bl ScriptReadWord - str r0, [r7, 0x68] - adds r0, r7, 0 - bl ScriptReadHalfword - adds r5, r0, 0 - lsls r5, 16 - lsrs r5, 16 - adds r0, r7, 0 - bl ScriptReadWord - adds r6, r0, 0 - adds r0, r7, 0 - bl ScriptReadHalfword - adds r4, r0, 0 - lsls r4, 16 - lsrs r4, 16 - adds r0, r7, 0 - bl ScriptReadWord - adds r3, r0, 0 - adds r0, r5, 0 - adds r1, r6, 0 - adds r2, r4, 0 - bl sub_80DA800 - cmp r0, 0x1 - bne _080DA944 - str r0, [r7, 0x70] - b _080DA948 -_080DA944: - bl SetIncompatible -_080DA948: - movs r0, 0x1 - pop {r4-r7} - pop {r1} - bx r1 - thumb_func_end MEScrCmd_checkcompat - - thumb_func_start sub_80DA950 -sub_80DA950: @ 80DA950 - movs r0, 0 - bx lr - thumb_func_end sub_80DA950 - - thumb_func_start MEScrCmd_setstatus -MEScrCmd_setstatus: @ 80DA954 - ldr r1, [r0, 0x8] - ldrb r2, [r1] - adds r1, 0x1 - str r1, [r0, 0x8] - str r2, [r0, 0x6C] - movs r0, 0 - bx lr - thumb_func_end MEScrCmd_setstatus - - thumb_func_start MEScrCmd_setmsg -MEScrCmd_setmsg: @ 80DA964 - push {r4,r5,lr} - adds r4, r0, 0 - ldr r0, [r4, 0x8] - ldrb r5, [r0] - adds r0, 0x1 - str r0, [r4, 0x8] - adds r0, r4, 0 - bl ScriptReadWord - ldr r1, [r4, 0x68] - subs r0, r1 - ldr r1, [r4, 0x64] - adds r1, r0, r1 - cmp r5, 0xFF - beq _080DA988 - ldr r0, [r4, 0x6C] - cmp r5, r0 - bne _080DA98E -_080DA988: - ldr r0, _080DA998 @ =gStringVar4 - bl StringExpandPlaceholders -_080DA98E: - movs r0, 0 - pop {r4,r5} - pop {r1} - bx r1 - .align 2, 0 -_080DA998: .4byte gStringVar4 - thumb_func_end MEScrCmd_setmsg - - thumb_func_start MEScrCmd_runscript -MEScrCmd_runscript: @ 80DA99C - push {r4,lr} - adds r4, r0, 0 - bl ScriptReadWord - ldr r1, [r4, 0x68] - subs r0, r1 - ldr r1, [r4, 0x64] - adds r0, r1 - bl ScriptContext2_RunNewScript - movs r0, 0 - pop {r4} - pop {r1} - bx r1 - thumb_func_end MEScrCmd_runscript - - thumb_func_start MEScrCmd_setenigmaberry -MEScrCmd_setenigmaberry: @ 80DA9B8 - push {r4-r7,lr} - mov r7, r9 - mov r6, r8 - push {r6,r7} - adds r7, r0, 0 - bl IsEnigmaBerryValid - mov r8, r0 - adds r0, r7, 0 - bl ScriptReadWord - adds r4, r0, 0 - ldr r0, [r7, 0x68] - subs r4, r0 - ldr r0, [r7, 0x64] - adds r4, r0 - ldr r0, _080DAA0C @ =gStringVar1 - mov r9, r0 - ldr r6, _080DAA10 @ =gSaveBlock1Ptr - ldr r1, [r6] - ldr r5, _080DAA14 @ =0x000030ec - adds r1, r5 - movs r2, 0x7 - bl StringCopyN - adds r0, r4, 0 - bl sub_809C7C4 - ldr r4, _080DAA18 @ =gStringVar2 - ldr r1, [r6] - adds r1, r5 - adds r0, r4, 0 - movs r2, 0x7 - bl StringCopyN - mov r0, r8 - cmp r0, 0 - bne _080DAA24 - ldr r0, _080DAA1C @ =gStringVar4 - ldr r1, _080DAA20 @ =gUnknown_8488C70 - b _080DAA44 - .align 2, 0 -_080DAA0C: .4byte gStringVar1 -_080DAA10: .4byte gSaveBlock1Ptr -_080DAA14: .4byte 0x000030ec -_080DAA18: .4byte gStringVar2 -_080DAA1C: .4byte gStringVar4 -_080DAA20: .4byte gUnknown_8488C70 -_080DAA24: - mov r0, r9 - adds r1, r4, 0 - bl StringCompare - cmp r0, 0 - beq _080DAA40 - ldr r0, _080DAA38 @ =gStringVar4 - ldr r1, _080DAA3C @ =gUnknown_8488CA2 - b _080DAA44 - .align 2, 0 -_080DAA38: .4byte gStringVar4 -_080DAA3C: .4byte gUnknown_8488CA2 -_080DAA40: - ldr r0, _080DAA60 @ =gStringVar4 - ldr r1, _080DAA64 @ =gUnknown_8488CCE -_080DAA44: - bl StringExpandPlaceholders - movs r0, 0x2 - str r0, [r7, 0x6C] - bl IsEnigmaBerryValid - cmp r0, 0x1 - bne _080DAA6C - ldr r0, _080DAA68 @ =0x00004033 - movs r1, 0x1 - bl VarSet - b _080DAA70 - .align 2, 0 -_080DAA60: .4byte gStringVar4 -_080DAA64: .4byte gUnknown_8488CCE -_080DAA68: .4byte 0x00004033 -_080DAA6C: - movs r0, 0x1 - str r0, [r7, 0x6C] -_080DAA70: - movs r0, 0 - pop {r3,r4} - mov r8, r3 - mov r9, r4 - pop {r4-r7} - pop {r1} - bx r1 - thumb_func_end MEScrCmd_setenigmaberry - - thumb_func_start MEScrCmd_giveribbon -MEScrCmd_giveribbon: @ 80DAA80 - push {r4,lr} - adds r4, r0, 0 - ldr r2, [r4, 0x8] - ldrb r0, [r2] - adds r2, 0x1 - str r2, [r4, 0x8] - ldrb r1, [r2] - adds r2, 0x1 - str r2, [r4, 0x8] - bl GiveGiftRibbonToParty - ldr r0, _080DAAAC @ =gStringVar4 - ldr r1, _080DAAB0 @ =gUnknown_8488CF6 - bl StringExpandPlaceholders - movs r0, 0x2 - str r0, [r4, 0x6C] - movs r0, 0 - pop {r4} - pop {r1} - bx r1 - .align 2, 0 -_080DAAAC: .4byte gStringVar4 -_080DAAB0: .4byte gUnknown_8488CF6 - thumb_func_end MEScrCmd_giveribbon - - thumb_func_start MEScrCmd_initramscript -MEScrCmd_initramscript: @ 80DAAB4 - push {r4-r6,lr} - mov r6, r9 - mov r5, r8 - push {r5,r6} - sub sp, 0x4 - adds r4, r0, 0 - ldr r0, [r4, 0x8] - ldrb r1, [r0] - mov r9, r1 - adds r0, 0x1 - str r0, [r4, 0x8] - ldrb r1, [r0] - mov r8, r1 - adds r1, r0, 0x1 - str r1, [r4, 0x8] - ldrb r6, [r0, 0x1] - adds r1, 0x1 - str r1, [r4, 0x8] - adds r0, r4, 0 - bl ScriptReadWord - adds r5, r0, 0 - ldr r0, [r4, 0x68] - subs r5, r0 - ldr r0, [r4, 0x64] - adds r5, r0 - adds r0, r4, 0 - bl ScriptReadWord - adds r1, r0, 0 - ldr r0, [r4, 0x68] - subs r1, r0 - ldr r0, [r4, 0x64] - adds r1, r0 - subs r1, r5 - lsls r1, 16 - lsrs r1, 16 - str r6, [sp] - adds r0, r5, 0 - mov r2, r9 - mov r3, r8 - bl InitRamScript - movs r0, 0 - add sp, 0x4 - pop {r3,r4} - mov r8, r3 - mov r9, r4 - pop {r4-r6} - pop {r1} - bx r1 - thumb_func_end MEScrCmd_initramscript - - thumb_func_start sub_80DAB1C -sub_80DAB1C: @ 80DAB1C - push {r4,lr} - adds r4, r0, 0 - bl sub_806E22C - ldr r0, _080DAB38 @ =gStringVar4 - ldr r1, _080DAB3C @ =gUnknown_8488D2A - bl StringExpandPlaceholders - movs r0, 0x2 - str r0, [r4, 0x6C] - movs r0, 0 - pop {r4} - pop {r1} - bx r1 - .align 2, 0 -_080DAB38: .4byte gStringVar4 -_080DAB3C: .4byte gUnknown_8488D2A - thumb_func_end sub_80DAB1C - - thumb_func_start MEScrCmd_addrareword -MEScrCmd_addrareword: @ 80DAB40 - push {r4,lr} - adds r4, r0, 0 - ldr r1, [r4, 0x8] - ldrb r0, [r1] - adds r1, 0x1 - str r1, [r4, 0x8] - bl sub_80BDB70 - ldr r0, _080DAB64 @ =gStringVar4 - ldr r1, _080DAB68 @ =gUnknown_8488D60 - bl StringExpandPlaceholders - movs r0, 0x2 - str r0, [r4, 0x6C] - movs r0, 0 - pop {r4} - pop {r1} - bx r1 - .align 2, 0 -_080DAB64: .4byte gStringVar4 -_080DAB68: .4byte gUnknown_8488D60 - thumb_func_end MEScrCmd_addrareword - - thumb_func_start sub_80DAB6C -sub_80DAB6C: @ 80DAB6C - push {r4,lr} - adds r4, r0, 0 - bl SetIncompatible - movs r0, 0 - str r0, [r4, 0x70] - movs r0, 0x1 - pop {r4} - pop {r1} - bx r1 - thumb_func_end sub_80DAB6C - - thumb_func_start sub_80DAB80 -sub_80DAB80: @ 80DAB80 - push {r4-r7,lr} - mov r7, r8 - push {r7} - sub sp, 0x88 - adds r6, r0, 0 - bl ScriptReadWord - ldr r1, [r6, 0x68] - subs r0, r1 - ldr r1, [r6, 0x64] - adds r5, r0, r1 - movs r0, 0x64 - adds r0, r5 - mov r8, r0 - add r4, sp, 0x24 - adds r0, r4, 0 - adds r1, r5, 0 - movs r2, 0x64 - bl memcpy - adds r0, r4, 0 - movs r1, 0x41 - bl GetMonData - lsls r0, 16 - lsrs r4, r0, 16 - movs r0, 0xCE - lsls r0, 1 - cmp r4, r0 - bne _080DABD0 - ldr r0, _080DABC8 @ =gStringVar1 - ldr r1, _080DABCC @ =gText_EggNickname - movs r2, 0xB - bl StringCopyN - b _080DABDA - .align 2, 0 -_080DABC8: .4byte gStringVar1 -_080DABCC: .4byte gText_EggNickname -_080DABD0: - ldr r0, _080DABF0 @ =gStringVar1 - ldr r1, _080DABF4 @ =gUnknown_8415A66 - movs r2, 0xB - bl StringCopyN -_080DABDA: - ldr r0, _080DABF8 @ =gPlayerPartyCount - ldrb r0, [r0] - cmp r0, 0x6 - bne _080DAC04 - ldr r0, _080DABFC @ =gStringVar4 - ldr r1, _080DAC00 @ =gUnknown_8488D8E - bl StringExpandPlaceholders - movs r0, 0x3 - b _080DAC6E - .align 2, 0 -_080DABF0: .4byte gStringVar1 -_080DABF4: .4byte gUnknown_8415A66 -_080DABF8: .4byte gPlayerPartyCount -_080DABFC: .4byte gStringVar4 -_080DAC00: .4byte gUnknown_8488D8E -_080DAC04: - ldr r7, _080DAC80 @ =gUnknown_2024478 - adds r0, r7, 0 - adds r1, r5, 0 - movs r2, 0x64 - bl memcpy - mov r0, sp - mov r1, r8 - movs r2, 0x24 - bl memcpy - movs r0, 0xCE - lsls r0, 1 - cmp r4, r0 - beq _080DAC3E - adds r0, r4, 0 - bl SpeciesToNationalPokedexNum - adds r4, r0, 0 - lsls r4, 16 - lsrs r4, 16 - adds r0, r4, 0 - movs r1, 0x2 - bl sub_8088E74 - adds r0, r4, 0 - movs r1, 0x3 - bl sub_8088E74 -_080DAC3E: - adds r0, r7, 0 - movs r1, 0xC - bl GetMonData - lsls r0, 16 - lsrs r0, 16 - bl itemid_is_mail - lsls r0, 24 - cmp r0, 0 - beq _080DAC5C - adds r0, r7, 0 - mov r1, sp - bl GiveMailToMon2 -_080DAC5C: - bl CompactPartySlots - bl CalculatePlayerPartyCount - ldr r0, _080DAC84 @ =gStringVar4 - ldr r1, _080DAC88 @ =gUnknown_8488D7C - bl StringExpandPlaceholders - movs r0, 0x2 -_080DAC6E: - str r0, [r6, 0x6C] - movs r0, 0 - add sp, 0x88 - pop {r3} - mov r8, r3 - pop {r4-r7} - pop {r1} - bx r1 - .align 2, 0 -_080DAC80: .4byte gUnknown_2024478 -_080DAC84: .4byte gStringVar4 -_080DAC88: .4byte gUnknown_8488D7C - thumb_func_end sub_80DAB80 - - thumb_func_start sub_80DAC8C -sub_80DAC8C: @ 80DAC8C - push {r4,lr} - adds r4, r0, 0 - bl ScriptReadWord - adds r1, r0, 0 - ldr r0, [r4, 0x68] - subs r1, r0 - ldr r0, [r4, 0x64] - adds r1, r0 - ldr r0, _080DACC8 @ =gSaveBlock2Ptr - ldr r0, [r0] - movs r2, 0x94 - lsls r2, 3 - adds r0, r2 - movs r2, 0xBC - bl memcpy - bl sub_80E7490 - ldr r0, _080DACCC @ =gStringVar4 - ldr r1, _080DACD0 @ =gUnknown_8488DBD - bl StringExpandPlaceholders - movs r0, 0x2 - str r0, [r4, 0x6C] - movs r0, 0 - pop {r4} - pop {r1} - bx r1 - .align 2, 0 -_080DACC8: .4byte gSaveBlock2Ptr -_080DACCC: .4byte gStringVar4 -_080DACD0: .4byte gUnknown_8488DBD - thumb_func_end sub_80DAC8C - - thumb_func_start sub_80DACD4 -sub_80DACD4: @ 80DACD4 - push {r4,lr} - adds r4, r0, 0 - bl SetIncompatible - movs r0, 0 - str r0, [r4, 0x70] - movs r0, 0x1 - pop {r4} - pop {r1} - bx r1 - thumb_func_end sub_80DACD4 - - thumb_func_start MEScrCmd_checksum -MEScrCmd_checksum: @ 80DACE8 - push {r4-r6,lr} - adds r6, r0, 0 - bl ScriptReadWord - adds r5, r0, 0 - adds r0, r6, 0 - bl ScriptReadWord - adds r4, r0, 0 - ldr r0, [r6, 0x68] - subs r4, r0 - ldr r0, [r6, 0x64] - adds r4, r0 - adds r0, r6, 0 - bl ScriptReadWord - adds r1, r0, 0 - ldr r0, [r6, 0x68] - subs r1, r0 - ldr r0, [r6, 0x64] - adds r1, r0 - subs r1, r4 - adds r0, r4, 0 - bl CalcByteArraySum - cmp r5, r0 - beq _080DAD26 - movs r0, 0 - str r0, [r6, 0x70] - movs r0, 0x1 - str r0, [r6, 0x6C] -_080DAD26: - movs r0, 0x1 - pop {r4-r6} - pop {r1} - bx r1 - thumb_func_end MEScrCmd_checksum - - thumb_func_start MEScrCmd_crc -MEScrCmd_crc: @ 80DAD30 - push {r4-r6,lr} - adds r6, r0, 0 - bl ScriptReadWord - adds r5, r0, 0 - adds r0, r6, 0 - bl ScriptReadWord - adds r4, r0, 0 - ldr r0, [r6, 0x68] - subs r4, r0 - ldr r0, [r6, 0x64] - adds r4, r0 - adds r0, r6, 0 - bl ScriptReadWord - adds r1, r0, 0 - ldr r0, [r6, 0x68] - subs r1, r0 - ldr r0, [r6, 0x64] - adds r1, r0 - subs r1, r4 - adds r0, r4, 0 - bl CalcCRC16 - lsls r0, 16 - lsrs r0, 16 - cmp r5, r0 - beq _080DAD72 - movs r0, 0 - str r0, [r6, 0x70] - movs r0, 0x1 - str r0, [r6, 0x6C] -_080DAD72: - movs r0, 0x1 - pop {r4-r6} - pop {r1} - bx r1 - thumb_func_end MEScrCmd_crc - - .align 2, 0 @ Don't pad with nop. diff --git a/asm/pokedex.s b/asm/pokedex.s index 6ec2ca7be..279270fbb 100644 --- a/asm/pokedex.s +++ b/asm/pokedex.s @@ -57,8 +57,8 @@ _08088E6C: _08088E70: .4byte gUnknown_844E850 thumb_func_end sub_8088E38 - thumb_func_start sub_8088E74 -sub_8088E74: @ 8088E74 + thumb_func_start GetSetPokedexFlag +GetSetPokedexFlag: @ 8088E74 push {lr} lsls r0, 16 lsrs r0, 16 @@ -70,7 +70,7 @@ sub_8088E74: @ 8088E74 asrs r0, 24 pop {r1} bx r1 - thumb_func_end sub_8088E74 + thumb_func_end GetSetPokedexFlag thumb_func_start pokedex_count pokedex_count: @ 8088E8C @@ -101,7 +101,7 @@ _08088EB2: lsrs r0, 16 movs r1, 0x1 _08088EBA: - bl sub_8088E74 + bl GetSetPokedexFlag lsls r0, 24 cmp r0, 0 beq _08088ECA @@ -145,7 +145,7 @@ _08088EFC: lsrs r0, 16 movs r1, 0x1 _08088F04: - bl sub_8088E74 + bl GetSetPokedexFlag lsls r0, 24 cmp r0, 0 beq _08088F14 @@ -176,7 +176,7 @@ _08088F28: lsls r0, 16 lsrs r0, 16 movs r1, 0x1 - bl sub_8088E74 + bl GetSetPokedexFlag lsls r0, 24 cmp r0, 0 bne _08088F48 @@ -203,7 +203,7 @@ _08088F5C: lsrs r4, r0, 16 adds r0, r4, 0 movs r1, 0x1 - bl sub_8088E74 + bl GetSetPokedexFlag lsls r0, 24 cmp r0, 0 bne _08088F74 @@ -230,7 +230,7 @@ _08088F88: lsrs r4, r0, 16 adds r0, r4, 0 movs r1, 0x1 - bl sub_8088E74 + bl GetSetPokedexFlag lsls r0, 24 cmp r0, 0 beq _08088FD6 @@ -244,7 +244,7 @@ _08088FA4: lsrs r4, r0, 16 adds r0, r4, 0 movs r1, 0x1 - bl sub_8088E74 + bl GetSetPokedexFlag lsls r0, 24 cmp r0, 0 beq _08088FD6 @@ -259,7 +259,7 @@ _08088FC2: lsrs r4, r0, 16 adds r0, r4, 0 movs r1, 0x1 - bl sub_8088E74 + bl GetSetPokedexFlag lsls r0, 24 cmp r0, 0 bne _08088FE0 diff --git a/asm/pokemon_3.s b/asm/pokemon_3.s index fab76b56f..c717ac119 100644 --- a/asm/pokemon_3.s +++ b/asm/pokemon_3.s @@ -482,13 +482,13 @@ sub_8044898: @ 8044898 orrs r1, r0 lsrs r1, 31 adds r0, r4, 0 - bl sub_8088E74 + bl GetSetPokedexFlag lsls r0, 24 cmp r0, 0 bne _080448EE adds r0, r4, 0 adds r1, r5, 0 - bl sub_8088E74 + bl GetSetPokedexFlag adds r0, r4, 0 bl NationalPokedexNumToSpecies lsls r0, 16 diff --git a/asm/prof_pc.s b/asm/prof_pc.s index ae8c68ded..2a449ff76 100644 --- a/asm/prof_pc.s +++ b/asm/prof_pc.s @@ -155,7 +155,7 @@ _080CA4D8: lsls r0, 16 lsrs r0, 16 movs r1, 0x1 - bl sub_8088E74 + bl GetSetPokedexFlag lsls r0, 24 cmp r0, 0 beq _080CA500 diff --git a/asm/scrcmd.s b/asm/scrcmd.s index b4f3678de..9bb17887a 100644 --- a/asm/scrcmd.s +++ b/asm/scrcmd.s @@ -525,7 +525,7 @@ ScrCmd_setmysteryeventstatus: @ 806A274 adds r1, 0x1 str r1, [r0, 0x8] adds r0, r2, 0 - bl sub_80DA8E8 + bl SetMysteryEventScriptStatus movs r0, 0 pop {r1} bx r1 diff --git a/asm/script_pokemon_util_80A0058.s b/asm/script_pokemon_util_80A0058.s index 18c2d7ecb..4dd5da652 100644 --- a/asm/script_pokemon_util_80A0058.s +++ b/asm/script_pokemon_util_80A0058.s @@ -154,10 +154,10 @@ ScriptGiveMon: @ 80A011C blt _080A0196 adds r0, r5, 0 movs r1, 0x2 - bl sub_8088E74 + bl GetSetPokedexFlag adds r0, r5, 0 movs r1, 0x3 - bl sub_8088E74 + bl GetSetPokedexFlag _080A0196: adds r0, r7, 0 bl Free diff --git a/asm/trade.s b/asm/trade.s index 5df1c0534..8ae34f179 100644 --- a/asm/trade.s +++ b/asm/trade.s @@ -8131,7 +8131,7 @@ sub_80507A0: @ 80507A0 lsrs r4, 16 adds r0, r4, 0 movs r1, 0x2 - bl sub_8088E74 + bl GetSetPokedexFlag adds r0, r4, 0 movs r1, 0x3 adds r2, r5, 0 diff --git a/data/data_83FECCC.s b/data/data_83FECCC.s index c89f5f308..9c39a96d2 100644 --- a/data/data_83FECCC.s +++ b/data/data_83FECCC.s @@ -556,7 +556,7 @@ gExpandedPlaceholder_Green:: @ 8415A5C gText_EggNickname:: @ 8415A62 .incbin "baserom.gba", 0x415A62, 0x4 -gUnknown_8415A66:: @ 8415A66 +gText_Pokemon:: @ 8415A66 .incbin "baserom.gba", 0x415A66, 0x8 gUnknown_8415A6E:: @ 8415A6E diff --git a/data/data_8471F00.s b/data/data_8471F00.s index b9767d933..93d5ea372 100644 --- a/data/data_8471F00.s +++ b/data/data_8471F00.s @@ -337,32 +337,38 @@ gUnknown_84827B4:: @ 84827B4 gUnknown_84886E8:: @ 84886E8 .incbin "baserom.gba", 0x4886E8, 0x588 -gUnknown_8488C70:: @ 8488C70 - .incbin "baserom.gba", 0x488C70, 0x32 +gText_MysteryGiftBerry:: @ 8488C70 + .string "Obtained a {STR_VAR_2} BERRY!\nDad has it at PETALBURG GYM.$" -gUnknown_8488CA2:: @ 8488CA2 - .incbin "baserom.gba", 0x488CA2, 0x2C +gText_MysteryGiftBerryTransform:: @ 8488CA2 + .string "The {STR_VAR_1} BERRY transformed into\none {STR_VAR_2} BERRY.$" -gUnknown_8488CCE:: @ 8488CCE - .incbin "baserom.gba", 0x488CCE, 0x28 +gText_MysteryGiftBerryObtained:: @ 8488CCE + .string "The {STR_VAR_1} BERRY has already been\nobtained.$" -gUnknown_8488CF6:: @ 8488CF6 - .incbin "baserom.gba", 0x488CF6, 0x34 +gText_MysteryGiftSpecialRibbon:: @ 8488CF6 + .string "A special RIBBON was awarded to\nyour party POKéMON.$" -gUnknown_8488D2A:: @ 8488D2A - .incbin "baserom.gba", 0x488D2A, 0x36 +gText_MysteryGiftNationalDex:: @ 8488D2A + .string "The POKéDEX has been upgraded\nwith the NATIONAL MODE.$" -gUnknown_8488D60:: @ 8488D60 - .incbin "baserom.gba", 0x488D60, 0x1C +gText_MysteryGiftRareWord:: @ 8488D60 + .string "A rare word has been added.$" -gUnknown_8488D7C:: @ 8488D7C - .incbin "baserom.gba", 0x488D7C, 0x12 +gText_MysteryGiftSentOver:: @ 8488D7C + .string "{STR_VAR_1} was sent over!$" -gUnknown_8488D8E:: @ 8488D8E - .incbin "baserom.gba", 0x488D8E, 0x2F +gText_MysteryGiftFullParty:: @ 8488D8E + .string "Your party is full.\n{STR_VAR_1} could not be sent over.$" -gUnknown_8488DBD:: @ 8488DBD - .incbin "baserom.gba", 0x488DBD, 0x40 +gText_MysteryGiftNewTrainer:: @ 8488DBD + .string "A new TRAINER has arrived in\nHOENN.$" -gUnknown_8488DFD:: @ 8488DFD - .incbin "baserom.gba", 0x488DFD, 0xB6B +gUnknown_8488DE1:: + .incbin "baserom.gba", 0x488DE1, 0x1C + +gText_MysteryGiftCantBeUsed:: @ 8488DFD + .string "This data can’t be used in\nthis version.$" + +gUnknown_8488E26:: + .incbin "baserom.gba", 0x488E26, 0xB42 diff --git a/data/mystery_event_script_cmd_table.s b/data/mystery_event_script_cmd_table.s index 76b7ab5a5..4b85804a1 100644 --- a/data/mystery_event_script_cmd_table.s +++ b/data/mystery_event_script_cmd_table.s @@ -1,4 +1,5 @@ .section script_data, "aw", %progbits -gUnknown_81DBCF0:: @ 81DBCF0 +gMysteryEventScriptCmdTable:: @ 81DBCF0 .incbin "baserom.gba", 0x1DBCF0, 0x44 +gMysteryEventScriptCmdTableEnd:: @ 81DBD34 diff --git a/include/battle_tower.h b/include/battle_tower.h index 0782725b6..ec00d1f96 100644 --- a/include/battle_tower.h +++ b/include/battle_tower.h @@ -5,6 +5,6 @@ u16 sub_8164FCC(u8, u8); void sub_80E7524(u32 *); -void sub_80E7490(void); +void ValidateEReaderTrainer(void); #endif //GUARD_BATTLE_TOWER_H diff --git a/include/constants/vars.h b/include/constants/vars.h index 6dc8d0ccd..c9340a3b4 100644 --- a/include/constants/vars.h +++ b/include/constants/vars.h @@ -51,12 +51,12 @@ #define VAR_0x402D 0x402D #define VAR_0x402E 0x402E -#define VAR_FRONTIER_MANIAC_FACILITY 0x402F +#define VAR_0x402F 0x402F -#define VAR_FRONTIER_GAMBLER_FACILITY 0x4030 -#define VAR_FRONTIER_GAMBLER_SET_FACILITY_F 0x4031 -#define VAR_FRONTIER_GAMBLER_AMOUNT_BET 0x4032 -#define VAR_FRONTIER_GAMBLER_PLACED_BET_F 0x4033 +#define VAR_0x4030 0x4030 +#define VAR_0x4031 0x4031 +#define VAR_0x4032 0x4032 +#define VAR_ENIGMA_BERRY_AVAILABLE 0x4033 #define VAR_0x4034 0x4034 #define VAR_0x4035 0x4035 diff --git a/include/easy_chat.h b/include/easy_chat.h index 78e371cbb..bd5c9a026 100644 --- a/include/easy_chat.h +++ b/include/easy_chat.h @@ -38,5 +38,6 @@ void InitializeEasyChatWordArray(u16 *words, u16 length); void ConvertEasyChatWordsToString(u8 *dest, const u16 *src, u16 length1, u16 length2); bool8 ECWord_CheckIfOutsideOfValidRange(u16 word); void sub_80BDE28(void); +void EnableRareWord(u8); #endif // GUARD_EASYCHAT_H diff --git a/include/global.berry.h b/include/global.berry.h index 5c8a43a02..148bbc957 100644 --- a/include/global.berry.h +++ b/include/global.berry.h @@ -1,6 +1,7 @@ #ifndef GUARD_GLOBAL_BERRY_H #define GUARD_GLOBAL_BERRY_H +#define BERRY_NAME_LENGTH 6 #define BERRY_NAME_COUNT 7 #define BERRY_ITEM_EFFECT_COUNT 18 diff --git a/include/mail_data.h b/include/mail_data.h index bbe695203..0275d8dc6 100644 --- a/include/mail_data.h +++ b/include/mail_data.h @@ -10,5 +10,6 @@ // Exported ROM declarations u16 sub_80D45E8(u16, u16 *); +bool8 itemid_is_mail(u16 itemId); #endif //GUARD_MAIL_DATA_H diff --git a/include/mystery_event_msg.h b/include/mystery_event_msg.h new file mode 100644 index 000000000..e96c3069b --- /dev/null +++ b/include/mystery_event_msg.h @@ -0,0 +1,18 @@ +#ifndef GUARD_MYSTERY_EVENT_MSG_H +#define GUARD_MYSTERY_EVENT_MSG_H + +#include + +extern const u8 gText_MysteryGiftBerry[]; +extern const u8 gText_MysteryGiftBerryTransform[]; +extern const u8 gText_MysteryGiftBerryObtained[]; +extern const u8 gText_MysteryGiftSpecialRibbon[]; +extern const u8 gText_MysteryGiftNationalDex[]; +extern const u8 gText_MysteryGiftRareWord[]; +extern const u8 gText_MysteryGiftSentOver[]; +extern const u8 gText_MysteryGiftFullParty[]; +extern const u8 gText_MysteryGiftNewTrainer[]; +extern const u8 gText_MysteryGiftNewAdversaryInBattleTower[]; +extern const u8 gText_MysteryGiftCantBeUsed[]; + +#endif // GUARD_MYSTERY_EVENT_MSG_H diff --git a/include/mystery_event_script.h b/include/mystery_event_script.h index 8f90ccf53..be64663ed 100644 --- a/include/mystery_event_script.h +++ b/include/mystery_event_script.h @@ -7,7 +7,7 @@ u32 RunMysteryEventScript(u8 *); void SetMysteryEventScriptStatus(u32 val); u16 GetRecordMixingGift(void); -void sub_80DA89C(void *); +void sub_80DA89C(u8 *); bool32 sub_80DA8B0(u32 *); #endif // GUARD_MYSTERY_EVENT_SCRIPT_H diff --git a/include/strings.h b/include/strings.h index 90c84c9b9..40021a01d 100644 --- a/include/strings.h +++ b/include/strings.h @@ -89,5 +89,7 @@ extern const u8 gText_Cancel4[]; extern const u8 gText_IsThisTheCorrectTime[]; extern const u8 gText_PkmnFainted3[]; extern const u8 gText_Coins[]; +extern const u8 gText_EggNickname[]; +extern const u8 gText_Pokemon[]; #endif //GUARD_STRINGS_H diff --git a/ld_script.txt b/ld_script.txt index 9238e0e71..a34e55e05 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -182,7 +182,7 @@ SECTIONS { asm/roulette_util.o(.text); asm/cable_car_util.o(.text); src/save.o(.text); - asm/mystery_event_script.o(.text); + src/mystery_event_script.o(.text); asm/field_effect_helpers.o(.text); asm/battle_anim_sound_tasks.o(.text); asm/battle_controller_safari.o(.text); diff --git a/src/mevent_server.c b/src/mevent_server.c index d5a9a0c0e..5e384ae0b 100644 --- a/src/mevent_server.c +++ b/src/mevent_server.c @@ -227,7 +227,7 @@ static u32 ish_mainseq_4(struct mevent_srv_ish * svr) break; case 18: memcpy(gSaveBlock2Ptr->unk_4A0, svr->recvBuffer, 0xbc); - sub_80E7490(); + ValidateEReaderTrainer(); break; case 21: memcpy(gDecompressionBuffer, svr->recvBuffer, ME_SEND_BUF_SIZE); diff --git a/src/mystery_event_script.c b/src/mystery_event_script.c new file mode 100644 index 000000000..c9dc6ae81 --- /dev/null +++ b/src/mystery_event_script.c @@ -0,0 +1,322 @@ +#include "global.h" +#include "berry.h" +#include "battle_tower.h" +#include "easy_chat.h" +#include "event_data.h" +#include "mail.h" +#include "mail_data.h" +#include "mystery_event_script.h" +#include "pokedex.h" +#include "pokemon.h" +#include "pokemon_size_record.h" +#include "script.h" +#include "constants/species.h" +#include "strings.h" +#include "string_util.h" +#include "text.h" +#include "util.h" +#include "mystery_event_msg.h" +#include "pokemon_storage_system.h" + +extern ScrCmdFunc gMysteryEventScriptCmdTable[]; +extern ScrCmdFunc gMysteryEventScriptCmdTableEnd[]; + +#define LANGUAGE_MASK 0x1 +#define VERSION_MASK 0x1 + +EWRAM_DATA static struct ScriptContext sMysteryEventScriptContext = {0}; + +static bool32 CheckCompatibility(u16 a1, u32 a2, u16 a3, u32 a4) +{ + if (!(a1 & LANGUAGE_MASK)) + return FALSE; + + if (!(a2 & LANGUAGE_MASK)) + return FALSE; + + if (!(a3 & 0x1)) + return FALSE; + + if (!(a4 & VERSION_MASK)) + return FALSE; + + return TRUE; +} + +static void SetIncompatible(void) +{ + StringExpandPlaceholders(gStringVar4, gText_MysteryGiftCantBeUsed); + SetMysteryEventScriptStatus(3); +} + +static void InitMysteryEventScript(struct ScriptContext *ctx, u8 *script) +{ + InitScriptContext(ctx, gMysteryEventScriptCmdTable, gMysteryEventScriptCmdTableEnd); + SetupBytecodeScript(ctx, script); + ctx->data[0] = (u32)script; + ctx->data[1] = 0; + ctx->data[2] = 0; + ctx->data[3] = 0; +} + +static bool32 RunMysteryEventScriptCommand(struct ScriptContext *ctx) +{ + if (RunScriptCommand(ctx) && ctx->data[3]) + return TRUE; + else + return FALSE; +} + +void sub_80DA89C(u8 *script) +{ + InitMysteryEventScript(&sMysteryEventScriptContext, script); +} + +bool32 sub_80DA8B0(u32 *a0) +{ + bool32 ret = RunMysteryEventScriptCommand(&sMysteryEventScriptContext); + *a0 = sMysteryEventScriptContext.data[2]; + + return ret; +} + +u32 RunMysteryEventScript(u8 *script) +{ + u32 ret; + sub_80DA89C(script); + while (sub_80DA8B0(&ret)); + + return ret; +} + +void SetMysteryEventScriptStatus(u32 val) +{ + sMysteryEventScriptContext.data[2] = val; +} + +bool8 MEScrCmd_end(struct ScriptContext *ctx) +{ + StopScript(ctx); + return TRUE; +} + +bool8 MEScrCmd_checkcompat(struct ScriptContext *ctx) +{ + u16 v1; + u32 v2; + u16 v3; + u32 v4; + + ctx->data[1] = ScriptReadWord(ctx); + v1 = ScriptReadHalfword(ctx); + v2 = ScriptReadWord(ctx); + v3 = ScriptReadHalfword(ctx); + v4 = ScriptReadWord(ctx); + + if (CheckCompatibility(v1, v2, v3, v4) == TRUE) + ctx->data[3] = 1; + else + SetIncompatible(); + + return TRUE; +} + +bool8 MEScrCmd_nop(struct ScriptContext *ctx) +{ + return FALSE; +} + +bool8 MEScrCmd_setstatus(struct ScriptContext *ctx) +{ + u8 value = ScriptReadByte(ctx); + ctx->data[2] = value; + return FALSE; +} + +bool8 MEScrCmd_setmsg(struct ScriptContext *ctx) +{ + u8 value = ScriptReadByte(ctx); + u8 *str = (u8 *)(ScriptReadWord(ctx) - ctx->data[1] + ctx->data[0]); + if (value == 0xFF || value == ctx->data[2]) + StringExpandPlaceholders(gStringVar4, str); + return FALSE; +} + +bool8 MEScrCmd_runscript(struct ScriptContext *ctx) +{ + u8 *script = (u8 *)(ScriptReadWord(ctx) - ctx->data[1] + ctx->data[0]); + ScriptContext2_RunNewScript(script); + return FALSE; +} + +bool8 MEScrCmd_setenigmaberry(struct ScriptContext *ctx) +{ + u8 *str; + const u8 *message; + bool32 haveBerry = IsEnigmaBerryValid(); + u8 *berry = (u8 *)(ScriptReadWord(ctx) - ctx->data[1] + ctx->data[0]); + StringCopyN(gStringVar1, gSaveBlock1Ptr->enigmaBerry.berry.name, BERRY_NAME_LENGTH + 1); + SetEnigmaBerry(berry); + StringCopyN(gStringVar2, gSaveBlock1Ptr->enigmaBerry.berry.name, BERRY_NAME_LENGTH + 1); + + if (!haveBerry) + { + str = gStringVar4; + message = gText_MysteryGiftBerry; + } + else if (StringCompare(gStringVar1, gStringVar2)) + { + str = gStringVar4; + message = gText_MysteryGiftBerryTransform; + } + else + { + str = gStringVar4; + message = gText_MysteryGiftBerryObtained; + } + + StringExpandPlaceholders(str, message); + + ctx->data[2] = 2; + + if (IsEnigmaBerryValid() == TRUE) + VarSet(VAR_ENIGMA_BERRY_AVAILABLE, 1); + else + ctx->data[2] = 1; + + return FALSE; +} + +bool8 MEScrCmd_giveribbon(struct ScriptContext *ctx) +{ + u8 index = ScriptReadByte(ctx); + u8 ribbonId = ScriptReadByte(ctx); + GiveGiftRibbonToParty(index, ribbonId); + StringExpandPlaceholders(gStringVar4, gText_MysteryGiftSpecialRibbon); + ctx->data[2] = 2; + return FALSE; +} + +bool8 MEScrCmd_initramscript(struct ScriptContext *ctx) +{ + u8 mapGroup = ScriptReadByte(ctx); + u8 mapNum = ScriptReadByte(ctx); + u8 objectId = ScriptReadByte(ctx); + u8 *script = (u8 *)(ScriptReadWord(ctx) - ctx->data[1] + ctx->data[0]); + u8 *scriptEnd = (u8 *)(ScriptReadWord(ctx) - ctx->data[1] + ctx->data[0]); + InitRamScript(script, scriptEnd - script, mapGroup, mapNum, objectId); + return FALSE; +} + +bool8 MEScrCmd_givenationaldex(struct ScriptContext *ctx) +{ + EnableNationalPokedex(); + StringExpandPlaceholders(gStringVar4, gText_MysteryGiftNationalDex); + ctx->data[2] = 2; + return FALSE; +} + +bool8 MEScrCmd_addrareword(struct ScriptContext *ctx) +{ + EnableRareWord(ScriptReadByte(ctx)); + StringExpandPlaceholders(gStringVar4, gText_MysteryGiftRareWord); + ctx->data[2] = 2; + return FALSE; +} + +bool8 MEScrCmd_setrecordmixinggift(struct ScriptContext *ctx) +{ + SetIncompatible(); + ctx->data[3] = 0; + return TRUE; +} + +bool8 MEScrCmd_givepokemon(struct ScriptContext *ctx) +{ + struct MailStruct mail; + struct Pokemon pokemon; + u16 species; + u16 heldItem; + u32 data = ScriptReadWord(ctx) - ctx->data[1] + ctx->data[0]; + void *pokemonPtr = (void *)data; + void *mailPtr = (void *)(data + sizeof(struct Pokemon)); + + pokemon = *(struct Pokemon *)pokemonPtr; + species = GetMonData(&pokemon, MON_DATA_SPECIES2); + + if (species == SPECIES_EGG) + StringCopyN(gStringVar1, gText_EggNickname, POKEMON_NAME_LENGTH + 1); + else + StringCopyN(gStringVar1, gText_Pokemon, POKEMON_NAME_LENGTH + 1); + + if (gPlayerPartyCount == PARTY_SIZE) + { + StringExpandPlaceholders(gStringVar4, gText_MysteryGiftFullParty); + ctx->data[2] = 3; + } + else + { + memcpy(&gPlayerParty[5], pokemonPtr, sizeof(struct Pokemon)); + memcpy(&mail, mailPtr, sizeof(struct MailStruct)); + + if (species != SPECIES_EGG) + { + u16 pokedexNum = SpeciesToNationalPokedexNum(species); + GetSetPokedexFlag(pokedexNum, FLAG_SET_SEEN); + GetSetPokedexFlag(pokedexNum, FLAG_SET_CAUGHT); + } + + heldItem = GetMonData(&gPlayerParty[5], MON_DATA_HELD_ITEM); + if (itemid_is_mail(heldItem)) + GiveMailToMon2(&gPlayerParty[5], &mail); + CompactPartySlots(); + CalculatePlayerPartyCount(); + StringExpandPlaceholders(gStringVar4, gText_MysteryGiftSentOver); + ctx->data[2] = 2; + } + + return FALSE; +} + +bool8 MEScrCmd_addtrainer(struct ScriptContext *ctx) +{ + u32 data = ScriptReadWord(ctx) - ctx->data[1] + ctx->data[0]; + memcpy(gSaveBlock2Ptr->unk_4A0, (void *)data, 0xBC); + ValidateEReaderTrainer(); + StringExpandPlaceholders(gStringVar4, gText_MysteryGiftNewTrainer); + ctx->data[2] = 2; + return FALSE; +} + +bool8 MEScrCmd_enableresetrtc(struct ScriptContext *ctx) +{ + SetIncompatible(); + ctx->data[3] = 0; + return TRUE; +} + +bool8 MEScrCmd_checksum(struct ScriptContext *ctx) +{ + int checksum = ScriptReadWord(ctx); + u8 *data = (u8 *)(ScriptReadWord(ctx) - ctx->data[1] + ctx->data[0]); + u8 *dataEnd = (u8 *)(ScriptReadWord(ctx) - ctx->data[1] + ctx->data[0]); + if (checksum != CalcByteArraySum(data, dataEnd - data)) + { + ctx->data[3] = 0; + ctx->data[2] = 1; + } + return TRUE; +} + +bool8 MEScrCmd_crc(struct ScriptContext *ctx) +{ + int crc = ScriptReadWord(ctx); + u8 *data = (u8 *)(ScriptReadWord(ctx) - ctx->data[1] + ctx->data[0]); + u8 *dataEnd = (u8 *)(ScriptReadWord(ctx) - ctx->data[1] + ctx->data[0]); + if (crc != CalcCRC16(data, dataEnd - data)) + { + ctx->data[3] = 0; + ctx->data[2] = 1; + } + return TRUE; +} diff --git a/sym_ewram.txt b/sym_ewram.txt index 9e638c025..9c5d6022b 100644 --- a/sym_ewram.txt +++ b/sym_ewram.txt @@ -1197,10 +1197,7 @@ gUnknown_2039A34: @ 2039A34 .space 0x4 .include "src/save.o" - - .align 2 -gUnknown_203AA3C: @ 203AA3C - .space 0x74 + .include "src/mystery_event_script.o" gUnknown_203AAB0: @ 203AAB0 .space 0x4 -- cgit v1.2.3 From 089703dc086d03081f80aa90c2978a0f091d7d77 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Mon, 3 Dec 2018 21:15:42 -0500 Subject: Decompile (partially) mystery_event_msg --- data/data_8471F00.s | 36 ---- data/mystery_event_msg.s | 343 ++++++++++++++++++++++++++++++++++ data/mystery_event_script_cmd_table.s | 18 +- ld_script.txt | 2 + src/mystery_event_msg.c | 13 ++ 5 files changed, 375 insertions(+), 37 deletions(-) create mode 100644 data/mystery_event_msg.s create mode 100644 src/mystery_event_msg.c diff --git a/data/data_8471F00.s b/data/data_8471F00.s index 93d5ea372..28454ac2d 100644 --- a/data/data_8471F00.s +++ b/data/data_8471F00.s @@ -336,39 +336,3 @@ gUnknown_84827B4:: @ 84827B4 gUnknown_84886E8:: @ 84886E8 .incbin "baserom.gba", 0x4886E8, 0x588 - -gText_MysteryGiftBerry:: @ 8488C70 - .string "Obtained a {STR_VAR_2} BERRY!\nDad has it at PETALBURG GYM.$" - -gText_MysteryGiftBerryTransform:: @ 8488CA2 - .string "The {STR_VAR_1} BERRY transformed into\none {STR_VAR_2} BERRY.$" - -gText_MysteryGiftBerryObtained:: @ 8488CCE - .string "The {STR_VAR_1} BERRY has already been\nobtained.$" - -gText_MysteryGiftSpecialRibbon:: @ 8488CF6 - .string "A special RIBBON was awarded to\nyour party POKéMON.$" - -gText_MysteryGiftNationalDex:: @ 8488D2A - .string "The POKéDEX has been upgraded\nwith the NATIONAL MODE.$" - -gText_MysteryGiftRareWord:: @ 8488D60 - .string "A rare word has been added.$" - -gText_MysteryGiftSentOver:: @ 8488D7C - .string "{STR_VAR_1} was sent over!$" - -gText_MysteryGiftFullParty:: @ 8488D8E - .string "Your party is full.\n{STR_VAR_1} could not be sent over.$" - -gText_MysteryGiftNewTrainer:: @ 8488DBD - .string "A new TRAINER has arrived in\nHOENN.$" - -gUnknown_8488DE1:: - .incbin "baserom.gba", 0x488DE1, 0x1C - -gText_MysteryGiftCantBeUsed:: @ 8488DFD - .string "This data can’t be used in\nthis version.$" - -gUnknown_8488E26:: - .incbin "baserom.gba", 0x488E26, 0xB42 diff --git a/data/mystery_event_msg.s b/data/mystery_event_msg.s new file mode 100644 index 000000000..c8e10ea4c --- /dev/null +++ b/data/mystery_event_msg.s @@ -0,0 +1,343 @@ +#include "constants/flags.h" +#include "constants/moves.h" +#include "constants/songs.h" +#include "constants/species.h" +#include "constants/vars.h" + .include "asm/macros.inc" + .include "asm/macros/event.inc" + .include "constants/constants.inc" + + .section .rodata + + .align 1 + +MysteryEventScript_StampCard:: @ 8488E26 + .incbin "baserom.gba", 0x488E26, 0xB42 + +@ setvaddress MysteryEventScript_StampCard +@ setorcopyvar VAR_RESULT, 1 +@ specialvar VAR_0x8008, sub_813986C +@ setorcopyvar VAR_RESULT, 0 +@ specialvar VAR_0x8009, sub_813986C +@ subvar VAR_0x8008, 32777 +@ getnumberstring 0, VAR_0x8008 +@ lock +@ faceplayer +@ vmessage sText_MysteryGiftStampCard +@ waitmessage +@ waitbutton +@ release +@ end +@ +@ sText_MysteryGiftStampCard: +@ .string "Thank you for using the STAMP CARD\nSystem.\pYou have {STR_VAR_1} more to collect to\nfill your STAMP CARD.$" +@ +@ MysteryEventScript_SurfPichu:: @ 8674D3D +@ setvaddress MysteryEventScript_SurfPichu +@ checkflag FLAG_MYSTERY_EVENT_DONE +@ vgoto_if 0, SurfPichu_GiveIfPossible +@ gotoram +@ +@ SurfPichu_GiveIfPossible: @ 8674D4C +@ specialvar VAR_EVENT_PICHU_SLOT, CalculatePlayerPartyCount +@ compare_var_to_value VAR_EVENT_PICHU_SLOT, 6 +@ vgoto_if 1, SurfPichu_FullParty +@ setflag FLAG_MYSTERY_EVENT_DONE +@ vcall SurfPichu_GiveEgg +@ lock +@ faceplayer +@ vmessage sText_MysteryGiftEgg +@ waitmessage +@ waitbutton +@ playfanfare MUS_FANFA4 +@ waitfanfare +@ release +@ end +@ +@ SurfPichu_FullParty: @ 8674D73 +@ lock +@ faceplayer +@ vmessage sText_FullParty +@ waitmessage +@ waitbutton +@ release +@ end +@ +@ SurfPichu_GiveEgg: @ 8674D7E +@ giveegg SPECIES_PICHU +@ setobedience VAR_EVENT_PICHU_SLOT +@ setcatchlocale VAR_EVENT_PICHU_SLOT, 255 +@ compare_var_to_value VAR_EVENT_PICHU_SLOT, 1 +@ vgoto_if 1, SurfPichu_Slot1 +@ compare_var_to_value VAR_EVENT_PICHU_SLOT, 2 +@ vgoto_if 1, SurfPichu_Slot2 +@ compare_var_to_value VAR_EVENT_PICHU_SLOT, 3 +@ vgoto_if 1, SurfPichu_Slot3 +@ compare_var_to_value VAR_EVENT_PICHU_SLOT, 4 +@ vgoto_if 1, SurfPichu_Slot4 +@ compare_var_to_value VAR_EVENT_PICHU_SLOT, 5 +@ vgoto_if 1, SurfPichu_Slot5 +@ return +@ +@ SurfPichu_Slot1: @ 8674DC0 +@ setpokemove 1, 2, MOVE_SURF +@ return +@ +@ SurfPichu_Slot2:: @ 8674DC6 +@ setpokemove 2, 2, MOVE_SURF +@ return +@ +@ SurfPichu_Slot3: @ 8674DCC +@ setpokemove 3, 2, MOVE_SURF +@ return +@ +@ SurfPichu_Slot4: @ 8674DD2 +@ setpokemove 4, 2, MOVE_SURF +@ return +@ +@ SurfPichu_Slot5: @ 8674DD8 +@ setpokemove 5, 2, MOVE_SURF +@ return +@ +@ sText_MysteryGiftEgg: +@ .string "Thank you for using the MYSTERY\nGIFT System.\pFrom the POKéMON CENTER we\nhave a gift--a POKéMON EGG!\pPlease raise it with love and\nkindness.$" +@ +@ sText_FullParty: +@ .string "Oh, your party appears to be full.\pPlease come see me after storing\na POKéMON on a PC.$" +@ +@ MysteryEventScript_VisitingTrainer:: @ 8674EC1 +@ setvaddress MysteryEventScript_VisitingTrainer +@ special ValidateEReaderTrainer +@ compare_var_to_value VAR_RESULT, 0 +@ vgoto_if 1, MysteryEventScript_VisitingTrainerArrived +@ lock +@ faceplayer +@ vmessage sText_MysteryGiftVisitingTrainer +@ waitmessage +@ waitbutton +@ release +@ end +@ +@ MysteryEventScript_VisitingTrainerArrived: @ 8674EDF +@ lock +@ faceplayer +@ vmessage sText_MysteryGiftVisitingTrainer_2 +@ waitmessage +@ waitbutton +@ release +@ end +@ +@ sText_MysteryGiftVisitingTrainer: +@ .string "Thank you for using the MYSTERY\nGIFT System.\pBy holding this WONDER CARD, you\nmay take part in a survey at a\lPOKéMON MART.\pUse these surveys to invite\nTRAINERS to SOOTOPOLIS CITY.\p…Let me give you a secret\npassword for a survey:\p“GIVE ME\nAWESOME TRAINERâ€\pWrite that in on a survey and send\nit to the WIRELESS\lCOMMUNICATION SYSTEM.$" +@ +@ sText_MysteryGiftVisitingTrainer_2: +@ .string "Thank you for using the MYSTERY\nGIFT System.\pA TRAINER has arrived in\nSOOTOPOLIS CITY looking for you.\pWe hope you will enjoy\nbattling the visiting TRAINER.\pYou may invite other TRAINERS by\nentering other passwords.\pTry looking for other passwords\nthat may work.$" +@ +@ MysteryEventScript_BattleCard:: @ 867513C +@ setvaddress MysteryEventScript_BattleCard +@ checkflag FLAG_MYSTERY_EVENT_DONE +@ vgoto_if 1, MysteryEventScript_BattleCardInfo +@ setorcopyvar VAR_RESULT, 2 +@ specialvar VAR_0x8008, sub_813986C +@ compare_var_to_value VAR_0x8008, 3 +@ vgoto_if 0, MysteryEventScript_BattleCardInfo +@ lock +@ faceplayer +@ vmessage sText_MysteryGiftBattleCountCard_2 +@ waitmessage +@ waitbutton +@ giveitem ITEM_POTION +@ release +@ setflag FLAG_MYSTERY_EVENT_DONE +@ end +@ +@ MysteryEventScript_BattleCardInfo: @ 8675179 +@ lock +@ faceplayer +@ vmessage sText_MysteryGiftBattleCountCard +@ waitmessage +@ waitbutton +@ release +@ end +@ +@ sText_MysteryGiftBattleCountCard: +@ .string "Thank you for using the MYSTERY\nGIFT System.\pYour BATTLE COUNT CARD keeps\ntrack of your battle record against\lTRAINERS with the same CARD.\pLook for and battle TRAINERS who\nhave the same CARD as you.\pYou may check the overall rankings\nby reading the NEWS.\pPlease do give it a try!$" +@ +@ sText_MysteryGiftBattleCountCard_2: +@ .string "Thank you for using the MYSTERY\nGIFT System.\pCongratulations!\pYou have won a prize for winning\nthree battles!\pWe hope you will be inspired to\nbattle some more.$" +@ +@ MysteryEventScript_AuroraTicket:: @ 867533C +@ setvaddress MysteryEventScript_AuroraTicket +@ lock +@ faceplayer +@ checkflag FLAG_0x13A +@ vgoto_if 1, AuroraTicket_Obtained +@ checkflag FLAG_0x1AD +@ vgoto_if 1, AuroraTicket_Obtained +@ checkitem ITEM_AURORA_TICKET, 1 +@ compare_var_to_value VAR_RESULT, 1 +@ vgoto_if 1, AuroraTicket_Obtained +@ vmessage sText_AuroraTicket1 +@ waitmessage +@ waitbutton +@ checkitemspace ITEM_AURORA_TICKET, 1 +@ compare_var_to_value VAR_RESULT, 0 +@ vgoto_if 1, AuroraTicket_NoBagSpace +@ giveitem ITEM_AURORA_TICKET +@ setflag FLAG_0x8D5 +@ setflag FLAG_0x13A +@ vmessage sText_AuroraTicket2 +@ waitmessage +@ waitbutton +@ release +@ end +@ +@ AuroraTicket_NoBagSpace: @ 8675397 +@ vmessage sText_AuroraTicketNoPlace +@ waitmessage +@ waitbutton +@ release +@ end +@ +@ AuroraTicket_Obtained: @ 86753A0 +@ vmessage sText_AuroraTicketGot +@ waitmessage +@ waitbutton +@ release +@ end +@ +@ sText_AuroraTicket1: +@ .string "Thank you for using the MYSTERY\nGIFT System.\pYou must be {PLAYER}.\nThere is a ticket here for you.$" +@ +@ sText_AuroraTicket2: +@ .string "It appears to be for use at the\nLILYCOVE CITY port.\pWhy not give it a try and see what\nit is about?$" +@ +@ sText_AuroraTicketGot: +@ .string "Thank you for using the MYSTERY\nGIFT System.$" +@ +@ sText_AuroraTicketNoPlace: +@ .string "Oh, I’m sorry, {PLAYER}.\nYour BAG’s KEY ITEMS POCKET is full.\pPlease store something on your PC,\nthen come back for this.$" +@ +@ MysteryEventScript_MysticTicket:: @ 867550B +@ setvaddress MysteryEventScript_MysticTicket +@ lock +@ faceplayer +@ checkflag FLAG_0x13B +@ vgoto_if 1, MysticTicket_Obtained +@ checkflag FLAG_0x091 +@ vgoto_if 1, MysticTicket_Obtained +@ checkflag FLAG_0x092 +@ vgoto_if 1, MysticTicket_Obtained +@ checkitem ITEM_MYSTIC_TICKET, 1 +@ compare_var_to_value VAR_RESULT, 1 +@ vgoto_if 1, MysticTicket_Obtained +@ vmessage sText_MysticTicket2 +@ waitmessage +@ waitbutton +@ checkitemspace ITEM_MYSTIC_TICKET, 1 +@ compare_var_to_value VAR_RESULT, 0 +@ vgoto_if 1, MysticTicket_NoBagSpace +@ giveitem ITEM_MYSTIC_TICKET +@ setflag FLAG_0x8E0 +@ setflag FLAG_0x13B +@ vmessage sText_MysticTicket1 +@ waitmessage +@ waitbutton +@ release +@ end +@ +@ MysticTicket_NoBagSpace: @ 867556F +@ vmessage sText_MysticTicketNoPlace +@ waitmessage +@ waitbutton +@ release +@ end +@ +@ MysticTicket_Obtained: @ 8675578 +@ vmessage sText_MysticTicketGot +@ waitmessage +@ waitbutton +@ release +@ end +@ +@ sText_MysticTicket2: +@ .string "Thank you for using the MYSTERY\nGIFT System.\pYou must be {PLAYER}.\nThere is a ticket here for you.$" +@ +@ sText_MysticTicket1: +@ .string "It appears to be for use at the\nLILYCOVE CITY port.\pWhy not give it a try and see what\nit is about?$" +@ +@ sText_MysticTicketGot: +@ .string "Thank you for using the MYSTERY\nGIFT System.$" +@ +@ sText_MysticTicketNoPlace: +@ .string "Oh, I’m sorry, {PLAYER}.\nYour BAG’s KEY ITEMS POCKET is full.\pPlease store something on your PC,\nthen come back for this.$" +@ +@ MysteryEventScript_AlteringCave:: @ 86756E3 +@ setvaddress MysteryEventScript_AlteringCave +@ addvar VAR_ALTERING_CAVE_WILD_SET, 1 +@ compare_var_to_value VAR_ALTERING_CAVE_WILD_SET, 10 +@ vgoto_if 0, MysteryEventScript_AlteringCave_ +@ setvar VAR_ALTERING_CAVE_WILD_SET, 0 +@ MysteryEventScript_AlteringCave_: @ 86756FD +@ lock +@ faceplayer +@ vmessage sText_MysteryGiftAlteringCave +@ waitmessage +@ waitbutton +@ release +@ end +@ +@ sText_MysteryGiftAlteringCave:: +@ .string "Thank you for using the MYSTERY\nGIFT System.\pThere appears to be a rumor about\nrare POKéMON sightings.\pThe sightings reportedly came from\nthe ALTERING CAVE on ROUTE 103.\pPerhaps it would be worthwhile for\nyou to investigate this rumor.$" +@ +@ MysteryEventScript_OldSeaMap:: @ 86757F4 +@ setvaddress MysteryEventScript_OldSeaMap +@ lock +@ faceplayer +@ checkflag FLAG_0x13C +@ vgoto_if 1, OldSeaMap_Obtained +@ checkflag FLAG_0x1CA +@ vgoto_if 1, OldSeaMap_Obtained +@ checkitem ITEM_OLD_SEA_MAP, 1 +@ compare_var_to_value VAR_RESULT, 1 +@ vgoto_if 1, OldSeaMap_Obtained +@ vmessage sText_MysteryGiftOldSeaMap +@ waitmessage +@ waitbutton +@ checkitemspace ITEM_OLD_SEA_MAP, 1 +@ compare_var_to_value VAR_RESULT, 0 +@ vgoto_if 1, OldSeaMap_NoBagSpace +@ giveitem ITEM_OLD_SEA_MAP +@ setflag FLAG_0x8D6 +@ setflag FLAG_0x13C +@ vmessage sText_MysteryGiftOldSeaMap_1 +@ waitmessage +@ waitbutton +@ release +@ end +@ +@ OldSeaMap_NoBagSpace: @ 867584F +@ vmessage sText_MysteryGiftOldSeaMap_3 +@ waitmessage +@ waitbutton +@ release +@ end +@ +@ OldSeaMap_Obtained: @ 8675858 +@ vmessage sText_MysteryGiftOldSeaMap_2 +@ waitmessage +@ waitbutton +@ release +@ end +@ +@ sText_MysteryGiftOldSeaMap: +@ .string "Thank you for using the MYSTERY\nGIFT System.\pLet me confirm--you are {PLAYER}?\pWe received this OLD SEA MAP\naddressed to you.$" +@ +@ sText_MysteryGiftOldSeaMap_1: +@ .string "It appears to be for use at the\nLILYCOVE CITY port.\pWhy not give it a try and see what\nit is about?$" +@ +@ sText_MysteryGiftOldSeaMap_2: +@ .string "Thank you for using the MYSTERY\nGIFT System.$" +@ +@ sText_MysteryGiftOldSeaMap_3: +@ .string "Oh, I’m sorry, {PLAYER}.\nYour BAG’s KEY ITEMS POCKET is full.\pPlease store something on your PC,\nthen come back for this.$" diff --git a/data/mystery_event_script_cmd_table.s b/data/mystery_event_script_cmd_table.s index 4b85804a1..5dbcf50ee 100644 --- a/data/mystery_event_script_cmd_table.s +++ b/data/mystery_event_script_cmd_table.s @@ -1,5 +1,21 @@ .section script_data, "aw", %progbits gMysteryEventScriptCmdTable:: @ 81DBCF0 - .incbin "baserom.gba", 0x1DBCF0, 0x44 + .4byte MEScrCmd_nop + .4byte MEScrCmd_checkcompat + .4byte MEScrCmd_end + .4byte MEScrCmd_setmsg + .4byte MEScrCmd_setstatus + .4byte MEScrCmd_runscript + .4byte MEScrCmd_initramscript + .4byte MEScrCmd_setenigmaberry + .4byte MEScrCmd_giveribbon + .4byte MEScrCmd_givenationaldex + .4byte MEScrCmd_addrareword + .4byte MEScrCmd_setrecordmixinggift + .4byte MEScrCmd_givepokemon + .4byte MEScrCmd_addtrainer + .4byte MEScrCmd_enableresetrtc + .4byte MEScrCmd_checksum + .4byte MEScrCmd_crc gMysteryEventScriptCmdTableEnd:: @ 81DBD34 diff --git a/ld_script.txt b/ld_script.txt index a34e55e05..d37858b3f 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -389,6 +389,8 @@ SECTIONS { data/data_8468C98.o(.rodata); src/quest_log_8150454.o(.rodata); data/data_8471F00.o(.rodata); + src/mystery_event_msg.o(.rodata); + data/mystery_event_msg.o(.rodata); src/m4a_tables.o(.rodata); data/sound_data.o(.rodata); } =0 diff --git a/src/mystery_event_msg.c b/src/mystery_event_msg.c new file mode 100644 index 000000000..a21750b7a --- /dev/null +++ b/src/mystery_event_msg.c @@ -0,0 +1,13 @@ +#include "global.h" + +const u8 gText_MysteryGiftBerry[] = _("Obtained a {STR_VAR_2} BERRY!\nDad has it at PETALBURG GYM."); +const u8 gText_MysteryGiftBerryTransform[] = _("The {STR_VAR_1} BERRY transformed into\none {STR_VAR_2} BERRY."); +const u8 gText_MysteryGiftBerryObtained[] = _("The {STR_VAR_1} BERRY has already been\nobtained."); +const u8 gText_MysteryGiftSpecialRibbon[] = _("A special RIBBON was awarded to\nyour party POKéMON."); +const u8 gText_MysteryGiftNationalDex[] = _("The POKéDEX has been upgraded\nwith the NATIONAL MODE."); +const u8 gText_MysteryGiftRareWord[] = _("A rare word has been added."); +const u8 gText_MysteryGiftSentOver[] = _("{STR_VAR_1} was sent over!"); +const u8 gText_MysteryGiftFullParty[] = _("Your party is full.\n{STR_VAR_1} could not be sent over."); +const u8 gText_MysteryGiftNewTrainer[] = _("A new TRAINER has arrived in\nHOENN."); +const u8 gText_MysteryGiftNewAdversaryInBattleTower[] = _("ãƒãƒˆãƒ«ã‚¿ãƒ¯ãƒ¼ã«ã€€ã‚らãŸãª\nãŸã„ã›ã‚“ã—ゃãŒã€€ã‚らã‚ã‚ŒãŸï¼"); +const u8 gText_MysteryGiftCantBeUsed[] = _("This data can’t be used in\nthis version."); -- cgit v1.2.3 From 2ce8cad8d2666ecaa9996dc99c7ff3d68d87f4e8 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Tue, 4 Dec 2018 08:09:54 -0500 Subject: Fix alignment --- data/mystery_event_msg.s | 93 ++++++++++++++++++++++++------------------------ 1 file changed, 46 insertions(+), 47 deletions(-) diff --git a/data/mystery_event_msg.s b/data/mystery_event_msg.s index c8e10ea4c..48be143d7 100644 --- a/data/mystery_event_msg.s +++ b/data/mystery_event_msg.s @@ -9,10 +9,9 @@ .section .rodata - .align 1 - -MysteryEventScript_StampCard:: @ 8488E26 - .incbin "baserom.gba", 0x488E26, 0xB42 + .align 2 +MysteryEventScript_StampCard:: @ 8488E2 + .incbin "baserom.gba", 0x488E28, 0xB40 @ setvaddress MysteryEventScript_StampCard @ setorcopyvar VAR_RESULT, 1 @@ -28,16 +27,16 @@ MysteryEventScript_StampCard:: @ 8488E26 @ waitbutton @ release @ end -@ +@ @ sText_MysteryGiftStampCard: @ .string "Thank you for using the STAMP CARD\nSystem.\pYou have {STR_VAR_1} more to collect to\nfill your STAMP CARD.$" -@ +@ @ MysteryEventScript_SurfPichu:: @ 8674D3D @ setvaddress MysteryEventScript_SurfPichu @ checkflag FLAG_MYSTERY_EVENT_DONE @ vgoto_if 0, SurfPichu_GiveIfPossible @ gotoram -@ +@ @ SurfPichu_GiveIfPossible: @ 8674D4C @ specialvar VAR_EVENT_PICHU_SLOT, CalculatePlayerPartyCount @ compare_var_to_value VAR_EVENT_PICHU_SLOT, 6 @@ -53,7 +52,7 @@ MysteryEventScript_StampCard:: @ 8488E26 @ waitfanfare @ release @ end -@ +@ @ SurfPichu_FullParty: @ 8674D73 @ lock @ faceplayer @@ -62,7 +61,7 @@ MysteryEventScript_StampCard:: @ 8488E26 @ waitbutton @ release @ end -@ +@ @ SurfPichu_GiveEgg: @ 8674D7E @ giveegg SPECIES_PICHU @ setobedience VAR_EVENT_PICHU_SLOT @@ -78,33 +77,33 @@ MysteryEventScript_StampCard:: @ 8488E26 @ compare_var_to_value VAR_EVENT_PICHU_SLOT, 5 @ vgoto_if 1, SurfPichu_Slot5 @ return -@ +@ @ SurfPichu_Slot1: @ 8674DC0 @ setpokemove 1, 2, MOVE_SURF @ return -@ +@ @ SurfPichu_Slot2:: @ 8674DC6 @ setpokemove 2, 2, MOVE_SURF @ return -@ +@ @ SurfPichu_Slot3: @ 8674DCC @ setpokemove 3, 2, MOVE_SURF @ return -@ +@ @ SurfPichu_Slot4: @ 8674DD2 @ setpokemove 4, 2, MOVE_SURF @ return -@ +@ @ SurfPichu_Slot5: @ 8674DD8 @ setpokemove 5, 2, MOVE_SURF @ return -@ +@ @ sText_MysteryGiftEgg: @ .string "Thank you for using the MYSTERY\nGIFT System.\pFrom the POKéMON CENTER we\nhave a gift--a POKéMON EGG!\pPlease raise it with love and\nkindness.$" -@ +@ @ sText_FullParty: @ .string "Oh, your party appears to be full.\pPlease come see me after storing\na POKéMON on a PC.$" -@ +@ @ MysteryEventScript_VisitingTrainer:: @ 8674EC1 @ setvaddress MysteryEventScript_VisitingTrainer @ special ValidateEReaderTrainer @@ -117,7 +116,7 @@ MysteryEventScript_StampCard:: @ 8488E26 @ waitbutton @ release @ end -@ +@ @ MysteryEventScript_VisitingTrainerArrived: @ 8674EDF @ lock @ faceplayer @@ -126,13 +125,13 @@ MysteryEventScript_StampCard:: @ 8488E26 @ waitbutton @ release @ end -@ +@ @ sText_MysteryGiftVisitingTrainer: @ .string "Thank you for using the MYSTERY\nGIFT System.\pBy holding this WONDER CARD, you\nmay take part in a survey at a\lPOKéMON MART.\pUse these surveys to invite\nTRAINERS to SOOTOPOLIS CITY.\p…Let me give you a secret\npassword for a survey:\p“GIVE ME\nAWESOME TRAINERâ€\pWrite that in on a survey and send\nit to the WIRELESS\lCOMMUNICATION SYSTEM.$" -@ +@ @ sText_MysteryGiftVisitingTrainer_2: @ .string "Thank you for using the MYSTERY\nGIFT System.\pA TRAINER has arrived in\nSOOTOPOLIS CITY looking for you.\pWe hope you will enjoy\nbattling the visiting TRAINER.\pYou may invite other TRAINERS by\nentering other passwords.\pTry looking for other passwords\nthat may work.$" -@ +@ @ MysteryEventScript_BattleCard:: @ 867513C @ setvaddress MysteryEventScript_BattleCard @ checkflag FLAG_MYSTERY_EVENT_DONE @@ -150,7 +149,7 @@ MysteryEventScript_StampCard:: @ 8488E26 @ release @ setflag FLAG_MYSTERY_EVENT_DONE @ end -@ +@ @ MysteryEventScript_BattleCardInfo: @ 8675179 @ lock @ faceplayer @@ -159,13 +158,13 @@ MysteryEventScript_StampCard:: @ 8488E26 @ waitbutton @ release @ end -@ +@ @ sText_MysteryGiftBattleCountCard: @ .string "Thank you for using the MYSTERY\nGIFT System.\pYour BATTLE COUNT CARD keeps\ntrack of your battle record against\lTRAINERS with the same CARD.\pLook for and battle TRAINERS who\nhave the same CARD as you.\pYou may check the overall rankings\nby reading the NEWS.\pPlease do give it a try!$" -@ +@ @ sText_MysteryGiftBattleCountCard_2: @ .string "Thank you for using the MYSTERY\nGIFT System.\pCongratulations!\pYou have won a prize for winning\nthree battles!\pWe hope you will be inspired to\nbattle some more.$" -@ +@ @ MysteryEventScript_AuroraTicket:: @ 867533C @ setvaddress MysteryEventScript_AuroraTicket @ lock @@ -191,33 +190,33 @@ MysteryEventScript_StampCard:: @ 8488E26 @ waitbutton @ release @ end -@ +@ @ AuroraTicket_NoBagSpace: @ 8675397 @ vmessage sText_AuroraTicketNoPlace @ waitmessage @ waitbutton @ release @ end -@ +@ @ AuroraTicket_Obtained: @ 86753A0 @ vmessage sText_AuroraTicketGot @ waitmessage @ waitbutton @ release @ end -@ +@ @ sText_AuroraTicket1: @ .string "Thank you for using the MYSTERY\nGIFT System.\pYou must be {PLAYER}.\nThere is a ticket here for you.$" -@ +@ @ sText_AuroraTicket2: @ .string "It appears to be for use at the\nLILYCOVE CITY port.\pWhy not give it a try and see what\nit is about?$" -@ +@ @ sText_AuroraTicketGot: @ .string "Thank you for using the MYSTERY\nGIFT System.$" -@ +@ @ sText_AuroraTicketNoPlace: @ .string "Oh, I’m sorry, {PLAYER}.\nYour BAG’s KEY ITEMS POCKET is full.\pPlease store something on your PC,\nthen come back for this.$" -@ +@ @ MysteryEventScript_MysticTicket:: @ 867550B @ setvaddress MysteryEventScript_MysticTicket @ lock @@ -245,33 +244,33 @@ MysteryEventScript_StampCard:: @ 8488E26 @ waitbutton @ release @ end -@ +@ @ MysticTicket_NoBagSpace: @ 867556F @ vmessage sText_MysticTicketNoPlace @ waitmessage @ waitbutton @ release @ end -@ +@ @ MysticTicket_Obtained: @ 8675578 @ vmessage sText_MysticTicketGot @ waitmessage @ waitbutton @ release @ end -@ +@ @ sText_MysticTicket2: @ .string "Thank you for using the MYSTERY\nGIFT System.\pYou must be {PLAYER}.\nThere is a ticket here for you.$" -@ +@ @ sText_MysticTicket1: @ .string "It appears to be for use at the\nLILYCOVE CITY port.\pWhy not give it a try and see what\nit is about?$" -@ +@ @ sText_MysticTicketGot: @ .string "Thank you for using the MYSTERY\nGIFT System.$" -@ +@ @ sText_MysticTicketNoPlace: @ .string "Oh, I’m sorry, {PLAYER}.\nYour BAG’s KEY ITEMS POCKET is full.\pPlease store something on your PC,\nthen come back for this.$" -@ +@ @ MysteryEventScript_AlteringCave:: @ 86756E3 @ setvaddress MysteryEventScript_AlteringCave @ addvar VAR_ALTERING_CAVE_WILD_SET, 1 @@ -286,10 +285,10 @@ MysteryEventScript_StampCard:: @ 8488E26 @ waitbutton @ release @ end -@ +@ @ sText_MysteryGiftAlteringCave:: @ .string "Thank you for using the MYSTERY\nGIFT System.\pThere appears to be a rumor about\nrare POKéMON sightings.\pThe sightings reportedly came from\nthe ALTERING CAVE on ROUTE 103.\pPerhaps it would be worthwhile for\nyou to investigate this rumor.$" -@ +@ @ MysteryEventScript_OldSeaMap:: @ 86757F4 @ setvaddress MysteryEventScript_OldSeaMap @ lock @@ -315,29 +314,29 @@ MysteryEventScript_StampCard:: @ 8488E26 @ waitbutton @ release @ end -@ +@ @ OldSeaMap_NoBagSpace: @ 867584F @ vmessage sText_MysteryGiftOldSeaMap_3 @ waitmessage @ waitbutton @ release @ end -@ +@ @ OldSeaMap_Obtained: @ 8675858 @ vmessage sText_MysteryGiftOldSeaMap_2 @ waitmessage @ waitbutton @ release @ end -@ +@ @ sText_MysteryGiftOldSeaMap: @ .string "Thank you for using the MYSTERY\nGIFT System.\pLet me confirm--you are {PLAYER}?\pWe received this OLD SEA MAP\naddressed to you.$" -@ +@ @ sText_MysteryGiftOldSeaMap_1: @ .string "It appears to be for use at the\nLILYCOVE CITY port.\pWhy not give it a try and see what\nit is about?$" -@ +@ @ sText_MysteryGiftOldSeaMap_2: @ .string "Thank you for using the MYSTERY\nGIFT System.$" -@ +@ @ sText_MysteryGiftOldSeaMap_3: @ .string "Oh, I’m sorry, {PLAYER}.\nYour BAG’s KEY ITEMS POCKET is full.\pPlease store something on your PC,\nthen come back for this.$" -- cgit v1.2.3 From ff24ec3ece411cf189f7f4d54110a77e79cea73e Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Tue, 4 Dec 2018 08:30:20 -0500 Subject: Dump special pointers --- asm/scrcmd.s | 8 +- data/event_scripts.s | 3 +- data/specials.inc | 456 +++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 461 insertions(+), 6 deletions(-) create mode 100644 data/specials.inc diff --git a/asm/scrcmd.s b/asm/scrcmd.s index 9bb17887a..24793be37 100644 --- a/asm/scrcmd.s +++ b/asm/scrcmd.s @@ -46,7 +46,7 @@ sub_8069EFC: @ 8069EFC bl ScriptReadHalfword lsls r0, 16 lsrs r0, 14 - ldr r1, _08069F18 @ =gUnknown_815FD60 + ldr r1, _08069F18 @ =gSpecials adds r1, r0, r1 ldr r0, _08069F1C @ =gUnknown_8160450 cmp r1, r0 @@ -55,7 +55,7 @@ sub_8069EFC: @ 8069EFC bl _call_via_r0 b _08069F2C .align 2, 0 -_08069F18: .4byte gUnknown_815FD60 +_08069F18: .4byte gSpecials _08069F1C: .4byte gUnknown_8160450 _08069F20: ldr r0, _08069F34 @ =gUnknown_83A725C "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/scrcmd.c" @@ -85,7 +85,7 @@ sub_8069F3C: @ 8069F3C bl ScriptReadHalfword lsls r0, 16 lsrs r0, 14 - ldr r1, _08069F6C @ =gUnknown_815FD60 + ldr r1, _08069F6C @ =gSpecials adds r1, r0, r1 ldr r0, _08069F70 @ =gUnknown_8160450 cmp r1, r0 @@ -95,7 +95,7 @@ sub_8069F3C: @ 8069F3C strh r0, [r5] b _08069F80 .align 2, 0 -_08069F6C: .4byte gUnknown_815FD60 +_08069F6C: .4byte gSpecials _08069F70: .4byte gUnknown_8160450 _08069F74: ldr r0, _08069F88 @ =gUnknown_83A725C "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/scrcmd.c" diff --git a/data/event_scripts.s b/data/event_scripts.s index c27df1946..5aef19caa 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -9,8 +9,7 @@ gScriptCmdTableEnd:: @ 815FD08 gUnknown_815FD0C:: @ 815FD0C .incbin "baserom.gba", 0x15FD0C, 0x54 -gUnknown_815FD60:: @ 815FD60 - .incbin "baserom.gba", 0x15FD60, 0x6F0 + .include "data/specials.inc" gUnknown_8160450:: @ 8160450 .incbin "baserom.gba", 0x160450, 0x28 diff --git a/data/specials.inc b/data/specials.inc new file mode 100644 index 000000000..171a6fd8e --- /dev/null +++ b/data/specials.inc @@ -0,0 +1,456 @@ +.macro def_special ptr +.global SPECIAL_\ptr +.set SPECIAL_\ptr, __special__ +.set __special__, __special__ + 1 + .4byte \ptr + .endm + +.set __special__, 0 + .align 2 + +gSpecials:: @ 815FD60 + def_special sp000_heal_pokemon + def_special SetCableClubWarp + def_special sub_807E654 + def_special sub_807E704 + def_special sub_8081744 + def_special sub_8081770 + def_special nullsub_75 + def_special nullsub_75 + def_special nullsub_75 + def_special nullsub_75 + def_special nullsub_75 + def_special nullsub_75 + def_special nullsub_75 + def_special nullsub_75 + def_special nullsub_75 + def_special nullsub_75 + def_special nullsub_75 + def_special nullsub_75 + def_special nullsub_75 + def_special nullsub_75 + def_special nullsub_75 + def_special nullsub_75 + def_special nullsub_75 + def_special nullsub_75 + def_special nullsub_75 + def_special nullsub_75 + def_special nullsub_75 + def_special nullsub_75 + def_special sub_8081064 + def_special sub_80810CC + def_special sub_80810F4 + def_special sub_80098B8 + def_special sub_80819C8 + def_special sub_8081978 + def_special sub_80819B8 + def_special sub_808130C + def_special nullsub_75 + def_special nullsub_75 + def_special nullsub_75 + def_special SavePlayerParty + def_special LoadPlayerParty + def_special sub_80A0334 + def_special sp02A_crash_sound + def_special nullsub_75 + def_special nullsub_75 + def_special nullsub_75 + def_special nullsub_75 + def_special nullsub_75 + def_special nullsub_75 + def_special nullsub_75 + def_special IsEnigmaBerryValid + def_special sub_80803CC + def_special sub_80805D8 + def_special sub_8080618 + def_special ScrSpecial_HasTrainerBeenFought + def_special ScrSpecial_EndTrainerApproach + def_special sub_8080628 + def_special sub_810CD4C + def_special sub_810CEB4 + def_special sub_80805B0 + def_special sub_808C6A8 + def_special CheckForAlivePartyMons + def_special nullsub_75 + def_special nullsub_75 + def_special nullsub_75 + def_special nullsub_75 + def_special nullsub_75 + def_special nullsub_75 + def_special nullsub_75 + def_special sub_80CBEBC + def_special nullsub_75 + def_special nullsub_75 + def_special nullsub_75 + def_special nullsub_75 + def_special nullsub_75 + def_special nullsub_75 + def_special nullsub_75 + def_special nullsub_75 + def_special nullsub_75 + def_special nullsub_75 + def_special nullsub_75 + def_special nullsub_75 + def_special nullsub_75 + def_special nullsub_75 + def_special nullsub_75 + def_special nullsub_75 + def_special nullsub_75 + def_special nullsub_75 + def_special nullsub_75 + def_special nullsub_75 + def_special nullsub_75 + def_special nullsub_75 + def_special sub_8081128 + def_special sub_806F67C + def_special nullsub_56 + def_special sub_80FEE44 + def_special sub_80BDA7C + def_special nullsub_75 + def_special nullsub_75 + def_special nullsub_75 + def_special nullsub_75 + def_special nullsub_75 + def_special nullsub_75 + def_special nullsub_75 + def_special nullsub_75 + def_special nullsub_75 + def_special nullsub_75 + def_special nullsub_75 + def_special nullsub_75 + def_special nullsub_75 + def_special nullsub_75 + def_special nullsub_75 + def_special nullsub_75 + def_special nullsub_75 + def_special nullsub_75 + def_special nullsub_75 + def_special nullsub_75 + def_special nullsub_75 + def_special nullsub_75 + def_special sub_80A0918 + def_special sub_80A0930 + def_special sub_80A096C + def_special sub_80A0984 + def_special sub_80CBFA0 + def_special TV_CopyNicknameToStringVar1AndEnsureTerminated + def_special TV_CheckMonOTIDEqualsPlayerID + def_special nullsub_75 + def_special nullsub_75 + def_special sub_80BDB1C + def_special nullsub_75 + def_special sub_809A540 + def_special CalculatePlayerPartyCount + def_special CountPartyNonEggMons + def_special CountPartyAliveNonEggMons_IgnoreVar0x8004Slot + def_special nullsub_75 + def_special nullsub_75 + def_special nullsub_75 + def_special nullsub_75 + def_special nullsub_75 + def_special nullsub_75 + def_special nullsub_75 + def_special sub_80CA68C + def_special DrawWholeMapView + def_special sub_80CA69C + def_special nullsub_75 + def_special nullsub_75 + def_special nullsub_75 + def_special sub_80CA6BC + def_special sub_80CA6DC + def_special sub_80CA714 + def_special sub_80CA758 + def_special nullsub_75 + def_special nullsub_75 + def_special sub_8055DC4 + def_special nullsub_75 + def_special nullsub_75 + def_special nullsub_75 + def_special sub_807F888 + def_special ChangePokemonNickname + def_special sub_80BF8FC + def_special nullsub_75 + def_special nullsub_75 + def_special nullsub_75 + def_special sub_8113364 + def_special sub_8113288 + def_special sub_81133A4 + def_special sub_8113064 + def_special sub_81132CC + def_special sub_8113510 + def_special sub_81130A8 + def_special sub_8113530 + def_special sub_8082E54 + def_special nullsub_75 + def_special nullsub_75 + def_special nullsub_75 + def_special nullsub_75 + def_special nullsub_75 + def_special nullsub_75 + def_special nullsub_75 + def_special nullsub_75 + def_special sub_80CA74C + def_special GetDaycareMonNicknames + def_special sub_80464B4 + def_special RejectEggFromDayCare + def_special GiveEggFromDaycare + def_special SetDaycareCompatibilityString + def_special GetSelectedMonNickAndSpecies + def_special StoreSelectedPokemonInDaycare + def_special ChooseSendDaycareMon + def_special ShowDaycareLevelMenu + def_special GetNumLevelsGainedFromDaycare + def_special GetDaycareCost + def_special TakePokemonFromDaycare + def_special ScriptHatchMon + def_special sub_8046FD4 + def_special sub_8046EAC + def_special sub_80CD228 + def_special IsEnoughForCostInVar0x8005 + def_special SubtractMoneyFromVar0x8005 + def_special ExecuteWhiteOut + def_special sub_80CA3C4 + def_special nullsub_75 + def_special nullsub_75 + def_special nullsub_75 + def_special nullsub_75 + def_special sub_80A0EC4 + def_special sub_80A0EEC + def_special nullsub_75 + def_special nullsub_75 + def_special nullsub_75 + def_special nullsub_75 + def_special nullsub_75 + def_special sub_80CA3D8 + def_special sub_80CA524 + def_special sub_80CA86C + def_special sub_80CA9A8 + def_special sub_80CB204 + def_special nullsub_75 + def_special nullsub_75 + def_special sub_80BF93C + def_special sub_80BF9BC + def_special sub_80BFBA8 + def_special ScrSpecial_GetPokemonNicknameAndMoveName + def_special ScrSpecial_CountPokemonMoves + def_special sub_80E4634 + def_special nullsub_75 + def_special nullsub_75 + def_special sub_80CA664 + def_special nullsub_75 + def_special nullsub_75 + def_special sub_80CA76C + def_special sub_80E5970 + def_special sub_80E5C28 + def_special sub_80E6648 + def_special sub_80E67FC + def_special sub_80E7538 + def_special sub_80E6900 + def_special sub_80E6A0C + def_special sub_80E6C8C + def_special sub_80E6E14 + def_special sub_80E6FB8 + def_special sub_80E7058 + def_special sub_80E71D0 + def_special sub_80E724C + def_special sub_80E72B8 + def_special sub_80A0380 + def_special ValidateEReaderTrainer + def_special nullsub_75 + def_special sub_80A03D8 + def_special sub_80EB6AC + def_special sub_80EB6FC + def_special sub_80CA7EC + def_special sub_8053A9C + def_special sub_8053D68 + def_special sub_8054440 + def_special sub_8053D2C + def_special nullsub_75 + def_special nullsub_75 + def_special nullsub_75 + def_special nullsub_75 + def_special nullsub_75 + def_special nullsub_75 + def_special sp109_CreatePCMenu + def_special sub_80CA574 + def_special sub_80CA618 + def_special nullsub_75 + def_special nullsub_75 + def_special nullsub_75 + def_special nullsub_75 + def_special nullsub_75 + def_special nullsub_61 + def_special DoSoftReset + def_special sub_80CA2E4 + def_special sub_80CB498 + def_special nullsub_75 + def_special SpawnScriptFieldObject + def_special RemoveScriptFieldObject + def_special nullsub_75 + def_special nullsub_75 + def_special nullsub_75 + def_special nullsub_75 + def_special nullsub_75 + def_special nullsub_75 + def_special nullsub_75 + def_special nullsub_75 + def_special sub_80CAAAC + def_special sub_80CAABC + def_special player_get_direction_lower_nybble + def_special nullsub_75 + def_special nullsub_75 + def_special nullsub_75 + def_special nullsub_75 + def_special LeadMonHasEffortRibbon + def_special GivLeadMonEffortRibbon + def_special ScrSpecial_AreLeadMonEVsMaxedOut + def_special sub_8069740 + def_special sub_8069768 + def_special sub_8141D9C + def_special nullsub_75 + def_special sub_80CA804 + def_special nullsub_75 + def_special nullsub_75 + def_special sub_80CAB78 + def_special nullsub_75 + def_special sub_80CABD0 + def_special nullsub_75 + def_special sub_80CB580 + def_special nullsub_75 + def_special sub_80CAC08 + def_special sub_806E99C + def_special sub_80CAC28 + def_special sub_807FA68 + def_special sub_807F9D8 + def_special sub_807FABC + def_special sub_8080398 + def_special nullsub_75 + def_special nullsub_75 + def_special sub_807B6C0 + def_special sp13E_warp_to_last_warp + def_special sp13F_fall_to_last_warp + def_special nullsub_75 + def_special nullsub_75 + def_special sub_80E5E70 + def_special sub_807F998 + def_special nullsub_75 + def_special nullsub_75 + def_special nullsub_75 + def_special sub_80CAD54 + def_special sub_80BFC14 + def_special nullsub_75 + def_special nullsub_75 + def_special LoadPlayerBag + def_special sub_807F0B0 + def_special nullsub_75 + def_special nullsub_75 + def_special sub_8088F58 + def_special sub_80CAD7C + def_special nullsub_75 + def_special sub_80E759C + def_special GetNameOfEnigmaBerryInPlayerParty + def_special nullsub_75 + def_special sub_810B82C + def_special sub_807F904 + def_special sub_80CA630 + def_special sub_80CB7C4 + def_special sub_80CBC5C + def_special sub_80CADC4 + def_special sub_80CADEC + def_special sub_805D1A8 + def_special sub_80CB0A8 + def_special sub_80CB1D8 + def_special GetDaycarePokemonCount + def_special sub_80CB63C + def_special sub_80CBD80 + def_special sub_80CBDB0 + def_special sub_80CBDCC + def_special sub_810C444 + def_special sub_80CC7B4 + def_special ChangeBoxPokemonNickname + def_special sub_80CC2BC + def_special sub_80CC3CC + def_special sub_80CC524 + def_special sub_8009480 + def_special sub_8115A24 + def_special BerryBlenderLinkJoinGroup + def_special UnionRoomSpecial + def_special sub_814F1D4 + def_special EnableNationalPokedex + def_special sub_80699E0 + def_special sub_80699BC + def_special sub_810C3A4 + def_special SetFlavorTextFlagFromSpecialVars + def_special UpdatePickStateFromSpecialVar8005 + def_special sub_8054C48 + def_special sub_8046B40 + def_special sub_8046B70 + def_special sub_8046B94 + def_special sub_8046BBC + def_special sub_8046BDC + def_special sub_8146E78 + def_special sub_80CC48C + def_special sub_812B220 + def_special sub_812B234 + def_special sub_812B248 + def_special sub_8143FC8 + def_special sub_810B810 + def_special sub_811999C + def_special sp182_move_string + def_special sub_811390C + def_special sub_80CC4D4 + def_special sub_80CC730 + def_special sub_8110AB4 + def_special sub_8112364 + def_special sub_8146CE8 + def_special get_unknown_box_id + def_special sub_809D504 + def_special sub_809D620 + def_special sub_812781C + def_special sub_8127888 + def_special sub_80803FC + def_special sub_812B35C + def_special sub_815D334 + def_special sub_8149A18 + def_special sub_806E25C + def_special sub_815D9E8 + def_special sub_814B504 + def_special sub_80CC8CC + def_special sub_80CC948 + def_special sub_812B478 + def_special sub_812B484 + def_special sub_810B82C + def_special sub_8099FAC + def_special sub_815F094 + def_special sub_815F114 + def_special sub_815EEB0 + def_special sub_815EF5C + def_special sub_815F070 + def_special sub_80CC974 + def_special sub_814EA7C + def_special sub_80CCB94 + def_special sub_80CCCF8 + def_special sub_80F39B4 + def_special sub_8153810 + def_special sub_809D764 + def_special sub_809D8C0 + def_special sub_8147500 + def_special player_get_direction_lower_nybble + def_special sub_80CCDFC + def_special sub_80CD008 + def_special sub_8147594 + def_special sub_80CD034 + def_special sub_815D834 + def_special sub_8088F84 + def_special sub_80CD074 + def_special sub_80CD098 + def_special sub_811B15C + def_special sub_80CD0F4 + def_special sub_809C4A8 + def_special sub_81537C0 + def_special sub_809C5FC + def_special sub_80CB328 + def_special sub_80CD154 + def_special sub_80CD1B4 + def_special sub_8044838 +gSpecialsEnd:: -- cgit v1.2.3 From d08f95be8afc1b400d791f93b05fe9e8daf0ee7a Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Tue, 4 Dec 2018 08:52:53 -0500 Subject: dump script command, special var, and std script pointers --- asm/event_data.s | 4 +- asm/scrcmd.s | 24 ++--- data/event_scripts.s | 86 +++++++++++++++--- data/script_cmd_table.inc | 219 ++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 305 insertions(+), 28 deletions(-) create mode 100644 data/script_cmd_table.inc diff --git a/asm/event_data.s b/asm/event_data.s index 416c777eb..b49620ace 100644 --- a/asm/event_data.s +++ b/asm/event_data.s @@ -509,7 +509,7 @@ _0806E500: .4byte gUnknown_300507C _0806E504: .4byte gSaveBlock1Ptr _0806E508: .4byte 0xffff9000 _0806E50C: - ldr r0, _0806E520 @ =gUnknown_815FD0C + ldr r0, _0806E520 @ =gSpecialVars ldr r3, _0806E524 @ =0xffff8000 adds r1, r6, r3 lsls r1, 2 @@ -520,7 +520,7 @@ _0806E518: pop {r1} bx r1 .align 2, 0 -_0806E520: .4byte gUnknown_815FD0C +_0806E520: .4byte gSpecialVars _0806E524: .4byte 0xffff8000 thumb_func_end GetVarPointer diff --git a/asm/scrcmd.s b/asm/scrcmd.s index 24793be37..8053a5abc 100644 --- a/asm/scrcmd.s +++ b/asm/scrcmd.s @@ -48,7 +48,7 @@ sub_8069EFC: @ 8069EFC lsrs r0, 14 ldr r1, _08069F18 @ =gSpecials adds r1, r0, r1 - ldr r0, _08069F1C @ =gUnknown_8160450 + ldr r0, _08069F1C @ =gStdScripts cmp r1, r0 bcs _08069F20 ldr r0, [r1] @@ -56,7 +56,7 @@ sub_8069EFC: @ 8069EFC b _08069F2C .align 2, 0 _08069F18: .4byte gSpecials -_08069F1C: .4byte gUnknown_8160450 +_08069F1C: .4byte gStdScripts _08069F20: ldr r0, _08069F34 @ =gUnknown_83A725C "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/scrcmd.c" ldr r2, _08069F38 @ =gUnknown_83A7290 "0" @@ -87,7 +87,7 @@ sub_8069F3C: @ 8069F3C lsrs r0, 14 ldr r1, _08069F6C @ =gSpecials adds r1, r0, r1 - ldr r0, _08069F70 @ =gUnknown_8160450 + ldr r0, _08069F70 @ =gStdScripts cmp r1, r0 bcs _08069F74 ldr r0, [r1] @@ -96,7 +96,7 @@ sub_8069F3C: @ 8069F3C b _08069F80 .align 2, 0 _08069F6C: .4byte gSpecials -_08069F70: .4byte gUnknown_8160450 +_08069F70: .4byte gStdScripts _08069F74: ldr r0, _08069F88 @ =gUnknown_83A725C "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/scrcmd.c" ldr r1, _08069F8C @ =0x00000107 @@ -368,7 +368,7 @@ ScrCmd_gotostd: @ 806A150 adds r0, 0x1 str r0, [r2, 0x8] lsls r1, 2 - ldr r0, _0806A178 @ =gUnknown_8160450 + ldr r0, _0806A178 @ =gStdScripts adds r1, r0 ldr r0, _0806A17C @ =gUnknown_8160478 cmp r1, r0 @@ -381,7 +381,7 @@ _0806A170: pop {r1} bx r1 .align 2, 0 -_0806A178: .4byte gUnknown_8160450 +_0806A178: .4byte gStdScripts _0806A17C: .4byte gUnknown_8160478 thumb_func_end ScrCmd_gotostd @@ -394,7 +394,7 @@ ScrCmd_callstd: @ 806A180 adds r0, 0x1 str r0, [r2, 0x8] lsls r1, 2 - ldr r0, _0806A1A8 @ =gUnknown_8160450 + ldr r0, _0806A1A8 @ =gStdScripts adds r1, r0 ldr r0, _0806A1AC @ =gUnknown_8160478 cmp r1, r0 @@ -407,7 +407,7 @@ _0806A1A0: pop {r1} bx r1 .align 2, 0 -_0806A1A8: .4byte gUnknown_8160450 +_0806A1A8: .4byte gStdScripts _0806A1AC: .4byte gUnknown_8160478 thumb_func_end ScrCmd_callstd @@ -432,7 +432,7 @@ ScrCmd_gotostd_if: @ 806A1B0 cmp r0, 0x1 bne _0806A1E8 lsls r0, r4, 2 - ldr r1, _0806A1F4 @ =gUnknown_8160450 + ldr r1, _0806A1F4 @ =gStdScripts adds r1, r0, r1 ldr r0, _0806A1F8 @ =gUnknown_8160478 cmp r1, r0 @@ -447,7 +447,7 @@ _0806A1E8: bx r1 .align 2, 0 _0806A1F0: .4byte gUnknown_83A7248 -_0806A1F4: .4byte gUnknown_8160450 +_0806A1F4: .4byte gStdScripts _0806A1F8: .4byte gUnknown_8160478 thumb_func_end ScrCmd_gotostd_if @@ -472,7 +472,7 @@ ScrCmd_callstd_if: @ 806A1FC cmp r0, 0x1 bne _0806A234 lsls r0, r4, 2 - ldr r1, _0806A240 @ =gUnknown_8160450 + ldr r1, _0806A240 @ =gStdScripts adds r1, r0, r1 ldr r0, _0806A244 @ =gUnknown_8160478 cmp r1, r0 @@ -487,7 +487,7 @@ _0806A234: bx r1 .align 2, 0 _0806A23C: .4byte gUnknown_83A7248 -_0806A240: .4byte gUnknown_8160450 +_0806A240: .4byte gStdScripts _0806A244: .4byte gUnknown_8160478 thumb_func_end ScrCmd_callstd_if diff --git a/data/event_scripts.s b/data/event_scripts.s index 5aef19caa..bc5e09b79 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -1,18 +1,46 @@ .section script_data, "aw", %progbits -gScriptCmdTable:: @ 815F9B4 - .incbin "baserom.gba", 0x15F9B4, 0x354 - -gScriptCmdTableEnd:: @ 815FD08 - .incbin "baserom.gba", 0x15FD08, 0x4 - -gUnknown_815FD0C:: @ 815FD0C - .incbin "baserom.gba", 0x15FD0C, 0x54 + .include "data/script_cmd_table.inc" + + .align 2 +gSpecialVars:: @ 815FD0C + .4byte gUnknown_20370B8 + .4byte gUnknown_20370BA + .4byte gUnknown_20370BC + .4byte gUnknown_20370BE + .4byte gUnknown_20370C0 + .4byte gSpecialVar_0x8005 + .4byte gUnknown_20370C4 + .4byte gUnknown_20370C6 + .4byte gUnknown_20370C8 + .4byte gUnknown_20370CA + .4byte gUnknown_20370CC + .4byte gUnknown_20370CE + .4byte gUnknown_20370D4 + .4byte gUnknown_20370D0 + .4byte gUnknown_203AD30 + .4byte gUnknown_20370D2 + .4byte gSpecialVar_MonBoxId + .4byte gSpecialVar_MonBoxPos + .4byte gUnknown_20370DA + .4byte gUnknown_20370DC + .4byte gUnknown_20370DE .include "data/specials.inc" -gUnknown_8160450:: @ 8160450 - .incbin "baserom.gba", 0x160450, 0x28 + .align 2 +gStdScripts:: @ 8160450 + .4byte gStdScript_81A667B + .4byte gStdScript_81A67B3 + .4byte gStdScript_81A4E3F + .4byte gStdScript_81A4E4A + .4byte gStdScript_81A4E54 + .4byte gStdScript_81A4E5C + .4byte gStdScript_81A501F + .4byte gStdScript_81A676C + .4byte gStdScript_81A8E58 + .4byte gStdScript_81A4E66 +gStdScripts_End:: gUnknown_8160478:: @ 8160478 .incbin "baserom.gba", 0x160478, 0x886C @@ -21,7 +49,22 @@ gUnknown_8168CE4:: @ 8168CE4 .incbin "baserom.gba", 0x168CE4, 0x33 gUnknown_8168D17:: @ 8168D17 - .incbin "baserom.gba", 0x168D17, 0x3C19D + .incbin "baserom.gba", 0x168D17, 0x3C128 + +gStdScript_81A4E3F:: + .incbin "baserom.gba", 0x1A4E3F, 0xB + +gStdScript_81A4E4A:: + .incbin "baserom.gba", 0x1A4E4A, 0xA + +gStdScript_81A4E54:: + .incbin "baserom.gba", 0x1A4E54, 0x8 + +gStdScript_81A4E5C:: + .incbin "baserom.gba", 0x1A4E5C, 0xA + +gStdScript_81A4E66:: + .incbin "baserom.gba", 0x1A4E66, 0x4E gUnknown_81A4EB4:: @ 81A4EB4 .incbin "baserom.gba", 0x1A4EB4, 0xD @@ -39,7 +82,10 @@ gUnknown_81A4F3E:: @ 81A4F3E .incbin "baserom.gba", 0x1A4F3E, 0x35 gUnknown_81A4F73:: @ 81A4F73 - .incbin "baserom.gba", 0x1A4F73, 0x117 + .incbin "baserom.gba", 0x1A4F73, 0xAC + +gStdScript_81A501F:: + .incbin "baserom.gba", 0x1A501F, 0x6B gUnknown_81A508A:: @ 81A508A .incbin "baserom.gba", 0x1A508A, 0x3EC @@ -51,7 +97,16 @@ gUnknown_81A6481:: @ 81A6481 .incbin "baserom.gba", 0x1A6481, 0xCA gUnknown_81A654B:: @ 81A654B - .incbin "baserom.gba", 0x1A654B, 0x2F8 + .incbin "baserom.gba", 0x1A654B, 0x130 + +gStdScript_81A667B:: + .incbin "baserom.gba", 0x1A667B, 0xF1 + +gStdScript_81A676C:: + .incbin "baserom.gba", 0x1A676C, 0x47 + +gStdScript_81A67B3:: + .incbin "baserom.gba", 0x1A67B3, 0x90 gUnknown_81A6843:: @ 81A6843 .incbin "baserom.gba", 0x1A6843, 0x112 @@ -225,7 +280,10 @@ gUnknown_81A8DD8:: @ 81A8DD8 .incbin "baserom.gba", 0x1A8DD8, 0x25 gUnknown_81A8DFD:: @ 81A8DFD - .incbin "baserom.gba", 0x1A8DFD, 0x4309 + .incbin "baserom.gba", 0x1A8DFD, 0x5B + +gStdScript_81A8E58:: + .incbin "baserom.gba", 0x1A8E58, 0x42AE .include "data/text/fame_checker.inc" diff --git a/data/script_cmd_table.inc b/data/script_cmd_table.inc new file mode 100644 index 000000000..29850d685 --- /dev/null +++ b/data/script_cmd_table.inc @@ -0,0 +1,219 @@ + .align 2 + +gScriptCmdTable:: @ 815F9B4 + .4byte sub_8069ED0 + .4byte sub_8069ED4 + .4byte ScrCmd_end + .4byte ScrCmd_return + .4byte ScrCmd_call + .4byte ScrCmd_goto + .4byte ScrCmd_goto_if + .4byte ScrCmd_call_if + .4byte ScrCmd_gotostd + .4byte ScrCmd_callstd + .4byte ScrCmd_gotostd_if + .4byte ScrCmd_callstd_if + .4byte ScrCmd_gotoram + .4byte ScrCmd_killscript + .4byte ScrCmd_setmysteryeventstatus + .4byte ScrCmd_loadword + .4byte ScrCmd_loadbyte + .4byte ScrCmd_writebytetoaddr + .4byte ScrCmd_loadbytefromaddr + .4byte ScrCmd_setptrbyte + .4byte ScrCmd_copylocal + .4byte ScrCmd_copybyte + .4byte ScrCmd_setvar + .4byte ScrCmd_addvar + .4byte ScrCmd_subvar + .4byte ScrCmd_copyvar + .4byte ScrCmd_setorcopyvar + .4byte ScrCmd_compare_local_to_local + .4byte ScrCmd_compare_local_to_value + .4byte ScrCmd_compare_local_to_addr + .4byte ScrCmd_compare_addr_to_local + .4byte ScrCmd_compare_addr_to_value + .4byte ScrCmd_compare_addr_to_addr + .4byte ScrCmd_compare_var_to_value + .4byte ScrCmd_compare_var_to_var + .4byte ScrCmd_callnative + .4byte ScrCmd_gotonative + .4byte sub_8069EFC + .4byte sub_8069F3C + .4byte sub_8069FA4 + .4byte ScrCmd_delay + .4byte ScrCmd_setflag + .4byte ScrCmd_clearflag + .4byte ScrCmd_checkflag + .4byte sub_806A9D4 + .4byte sub_806A9D8 + .4byte sub_806A9DC + .4byte ScrCmd_playse + .4byte sub_806B094 + .4byte ScrCmd_playfanfare + .4byte sub_806B0CC + .4byte sub_806B0E0 + .4byte sub_806B120 + .4byte sub_806B134 + .4byte sub_806B154 + .4byte sub_806B17C + .4byte sub_806B1C8 + .4byte ScrCmd_warp + .4byte ScrCmd_warpsilent + .4byte ScrCmd_warpdoor + .4byte ScrCmd_warphole + .4byte sub_806AC70 + .4byte ScrCmd_setwarp + .4byte ScrCmd_setdynamicwarp + .4byte sub_806AE90 + .4byte sub_806AF10 + .4byte ScrCmd_getplayerxy + .4byte ScrCmd_getpartysize + .4byte sub_806A610 + .4byte ScrCmd_takeitem + .4byte sub_806A6A0 + .4byte sub_806A6E4 + .4byte ScrCmd_checkitemtype + .4byte ScrCmd_givepcitem + .4byte ScrCmd_checkpcitem + .4byte sub_806A7DC + .4byte sub_806A7F0 + .4byte sub_806A818 + .4byte sub_806A804 + .4byte ScrCmd_applymovement + .4byte ScrCmd_applymovement_at + .4byte ScrCmd_waitmovement + .4byte ScrCmd_waitmovement_at + .4byte ScrCmd_removeobject + .4byte ScrCmd_removeobject_at + .4byte ScrCmd_addobject + .4byte ScrCmd_addobject_at + .4byte ScrCmd_setobjectxy + .4byte ScrCmd_showobject_at + .4byte ScrCmd_hideobject_at + .4byte ScrCmd_faceplayer + .4byte ScrCmd_turnobject + .4byte ScrCmd_trainerbattle + .4byte sub_806C2D8 + .4byte ScrCmd_ontrainerbattleend + .4byte ScrCmd_ontrainerbattleendgoto + .4byte ScrCmd_checktrainerflag + .4byte ScrCmd_settrainerflag + .4byte ScrCmd_cleartrainerflag + .4byte ScrCmd_setobjectxyperm + .4byte ScrCmd_moveobjectoffscreen + .4byte ScrCmd_setobjectmovementtype + .4byte sub_806B878 + .4byte sub_806B80C + .4byte sub_806B88C + .4byte ScrCmd_lockall + .4byte ScrCmd_lock + .4byte ScrCmd_releaseall + .4byte ScrCmd_release + .4byte sub_806BA3C + .4byte ScrCmd_yesnobox + .4byte ScrCmd_multichoice + .4byte ScrCmd_multichoicedefault + .4byte ScrCmd_multichoicegrid + .4byte sub_806BB38 + .4byte sub_806BB8C + .4byte sub_806BB98 + .4byte sub_806BB9C + .4byte sub_806BBD8 + .4byte sub_806BBF8 + .4byte sub_806BC04 + .4byte ScrCmd_givemon + .4byte ScrCmd_giveegg + .4byte ScrCmd_setmonmove + .4byte ScrCmd_checkpartymove + .4byte ScrCmd_bufferspeciesname + .4byte ScrCmd_bufferleadmonspeciesname + .4byte ScrCmd_bufferpartymonnick + .4byte ScrCmd_bufferitemname + .4byte sub_806BE34 + .4byte ScrCmd_buffermovename + .4byte ScrCmd_buffernumberstring + .4byte ScrCmd_bufferstdstring + .4byte ScrCmd_bufferstring + .4byte sub_806C3AC + .4byte sub_806C3C0 + .4byte sub_806C3D4 + .4byte ScrCmd_playslotmachine + .4byte sub_806C410 + .4byte sub_806C418 + .4byte sub_806C424 + .4byte sub_806C428 + .4byte sub_806C42C + .4byte ScrCmd_random + .4byte ScrCmd_givemoney + .4byte ScrCmd_takemoney + .4byte ScrCmd_checkmoney + .4byte sub_806C1CC + .4byte sub_806C21C + .4byte sub_806C228 + .4byte sub_806C414 + .4byte ScrCmd_fadescreen + .4byte ScrCmd_fadescreenspeed + .4byte ScrCmd_setflashradius + .4byte ScrCmd_animateflash + .4byte sub_806B85C + .4byte ScrCmd_dofieldeffect + .4byte ScrCmd_setfieldeffectarg + .4byte ScrCmd_waitfieldeffect + .4byte ScrCmd_setrespawn + .4byte ScrCmd_checkplayergender + .4byte ScrCmd_playmoncry + .4byte ScrCmd_setmetatile + .4byte ScrCmd_resetweather + .4byte ScrCmd_setweather + .4byte ScrCmd_doweather + .4byte ScrCmd_setstepcallback + .4byte ScrCmd_setmaplayoutindex + .4byte ScrCmd_setobjectpriority + .4byte ScrCmd_resetobjectpriority + .4byte ScrCmd_createvobject + .4byte ScrCmd_turnvobject + .4byte ScrCmd_opendoor + .4byte ScrCmd_closedoor + .4byte sub_806C688 + .4byte ScrCmd_setdooropen + .4byte ScrCmd_setdoorclosed + .4byte sub_806C724 + .4byte sub_806C728 + .4byte ScrCmd_checkcoins + .4byte ScrCmd_givecoins + .4byte ScrCmd_takecoins + .4byte ScrCmd_setwildbattle + .4byte sub_806C39C + .4byte ScrCmd_setvaddress + .4byte ScrCmd_vgoto + .4byte ScrCmd_vcall + .4byte ScrCmd_vgoto_if + .4byte ScrCmd_vcall_if + .4byte ScrCmd_vmessage + .4byte ScrCmd_vloadword + .4byte ScrCmd_vbufferstring + .4byte sub_806C258 + .4byte ScrCmd_hidecoinsbox + .4byte ScrCmd_updatecoinsbox + .4byte ScrCmd_incrementgamestat + .4byte ScrCmd_setescapewarp + .4byte sub_806C540 + .4byte ScrCmd_bufferboxname + .4byte sub_806B7EC + .4byte sub_806B828 + .4byte sub_806B850 + .4byte sub_806C7BC + .4byte sub_806C7C8 + .4byte sub_806A888 + .4byte ScrCmd_setmonobedient + .4byte ScrCmd_checkmonobedience + .4byte sub_806A28C + .4byte sub_806A8C0 + .4byte sub_806ACF8 + .4byte sub_806C844 + .4byte sub_806BC40 + .4byte sub_806BD90 + +gScriptCmdTableEnd:: @ 815FD08 + .4byte sub_8069ED0 -- cgit v1.2.3 From 7a166940d0621fdeac0b16ddaa4de6f235837c9c Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Tue, 4 Dec 2018 09:21:18 -0500 Subject: Dump multiboot programs and librfu_rodata --- asm/librfu.s | 24 ++++++++++++------------ data/berry_fix.mb | Bin 0 -> 15348 bytes data/librfu_rodata.s | 30 ++++++++++++++++++++++++------ data/multiboot_berry_glitch_fix.s | 2 +- data/multiboot_pokemon_colosseum.s | 2 +- data/pokemon_colosseum.mb | Bin 0 -> 163840 bytes 6 files changed, 38 insertions(+), 20 deletions(-) create mode 100644 data/berry_fix.mb create mode 100644 data/pokemon_colosseum.mb diff --git a/asm/librfu.s b/asm/librfu.s index 6995a9ac1..bdf816bd8 100644 --- a/asm/librfu.s +++ b/asm/librfu.s @@ -2769,11 +2769,11 @@ _081E0956: thumb_func_start sub_81E095C sub_81E095C: @ 81E095C push {lr} - ldr r2, _081E0964 @ =gUnknown_86FC068 + ldr r2, _081E0964 @ =_Str_RFU_MBOOT ldr r3, _081E0968 @ =0x30000F0 b _081E0976 .align 2, 0 -_081E0964: .4byte gUnknown_86FC068 +_081E0964: .4byte _Str_RFU_MBOOT _081E0968: .4byte 0x30000F0 _081E096C: ldrb r0, [r3] @@ -5794,7 +5794,7 @@ _081E1FF0: movs r2, 0 movs r0, 0x1 ands r0, r3 - ldr r4, _081E2020 @ =gUnknown_86FC03C + ldr r4, _081E2020 @ =_Str_RfuHeader cmp r0, 0 bne _081E2012 movs r1, 0x1 @@ -5818,7 +5818,7 @@ _081E2012: adds r1, 0xF b _081E202E .align 2, 0 -_081E2020: .4byte gUnknown_86FC03C +_081E2020: .4byte _Str_RfuHeader _081E2024: cmp r0, 0 bne _081E2030 @@ -6832,7 +6832,7 @@ rfu_STC_NI_constructLLSF: @ 81E2790 ldr r0, [r2] ldrb r0, [r0] lsls r0, 4 - ldr r1, _081E2810 @ =gUnknown_86FC03C + ldr r1, _081E2810 @ =_Str_RfuHeader adds r0, r1 mov r8, r0 ldrh r1, [r4] @@ -6883,7 +6883,7 @@ _081E27FA: b _081E285C .align 2, 0 _081E280C: .4byte gUnknown_3007460 -_081E2810: .4byte gUnknown_86FC03C +_081E2810: .4byte _Str_RfuHeader _081E2814: .4byte 0x00008022 _081E2818: ldr r0, _081E2844 @ =0x00008022 @@ -7083,7 +7083,7 @@ _081E297C: ldr r2, [r0] ldrb r0, [r2] lsls r0, 4 - ldr r1, _081E29F8 @ =gUnknown_86FC03C + ldr r1, _081E29F8 @ =_Str_RfuHeader adds r5, r0, r1 ldrh r0, [r4] movs r1, 0xF @@ -7142,7 +7142,7 @@ _081E29CE: b _081E2A0C .align 2, 0 _081E29F4: .4byte gUnknown_3007460 -_081E29F8: .4byte gUnknown_86FC03C +_081E29F8: .4byte _Str_RfuHeader _081E29FC: .4byte gUnknown_3007468 _081E2A00: movs r0, 0x10 @@ -7469,7 +7469,7 @@ rfu_STC_analyzeLLSF: @ 81E2C40 movs r1, 0x1 ands r0, r1 lsls r0, 4 - ldr r1, _081E2C78 @ =gUnknown_86FC03C + ldr r1, _081E2C78 @ =_Str_RfuHeader adds r6, r0, r1 ldrb r0, [r6] cmp r3, r0 @@ -7478,7 +7478,7 @@ rfu_STC_analyzeLLSF: @ 81E2C40 b _081E2E6E .align 2, 0 _081E2C74: .4byte gUnknown_3007460 -_081E2C78: .4byte gUnknown_86FC03C +_081E2C78: .4byte _Str_RfuHeader _081E2C7C: movs r5, 0 movs r4, 0 @@ -8877,12 +8877,12 @@ _081E3726: cmp r0, 0x3 bhi _081E373C lsls r0, 1 - ldr r1, _081E3738 @ =gUnknown_86FC074 + ldr r1, _081E3738 @ =_Str_Sio32ID adds r0, r1 ldrh r0, [r0] b _081E373E .align 2, 0 -_081E3738: .4byte gUnknown_86FC074 +_081E3738: .4byte _Str_Sio32ID _081E373C: ldr r0, _081E3794 @ =0x00008001 _081E373E: diff --git a/data/berry_fix.mb b/data/berry_fix.mb new file mode 100644 index 000000000..0afff07f5 Binary files /dev/null and b/data/berry_fix.mb differ diff --git a/data/librfu_rodata.s b/data/librfu_rodata.s index 867a1a17c..c6ca84f4b 100644 --- a/data/librfu_rodata.s +++ b/data/librfu_rodata.s @@ -1,10 +1,28 @@ .section .rodata -gUnknown_86FC03C:: @ 86FC03C - .incbin "baserom.gba", 0x6FC03C, 0x2C + .set VERSION_MAJOR, 1 + .set VERSION_MINOR, 0 + .set VERSION_REVISION, 24 -gUnknown_86FC068:: @ 86FC068 - .incbin "baserom.gba", 0x6FC068, 0xC + .align 2 +_Str_RfuHeader:: + .byte 2, 14, 0, 10, 9, 5, 7, 2 + .byte 0, 15, 1, 3, 3, 0, 31, 0 + .byte 3, 22, 18, 14, 13, 9, 11, 3 + .byte 15, 15, 1, 3, 3, 0, 0x7f, 0 + + .ascii "RFU_V" + .byte VERSION_MAJOR + 0x30 + .byte VERSION_MINOR + 0x30 + .byte (VERSION_REVISION / 10) + 0x30 + .byte (VERSION_REVISION % 10) + 0x30 + .byte 0 + + .align 2 +_Str_RFU_MBOOT:: + .asciz "RFU-MBOOT" + + .align 2 +_Str_Sio32ID:: + .asciz "NINTENDOSio32ID_030820" -gUnknown_86FC074:: @ 86FC074 - .incbin "baserom.gba", 0x6FC074, 0x18 diff --git a/data/multiboot_berry_glitch_fix.s b/data/multiboot_berry_glitch_fix.s index 0e4bcf384..bc417a8ba 100644 --- a/data/multiboot_berry_glitch_fix.s +++ b/data/multiboot_berry_glitch_fix.s @@ -1,5 +1,5 @@ .section .rodata gMultiBootProgram_BerryGlitchFix_Start:: @ 86FFC6C - .incbin "baserom.gba", 0x6FFC6C, 0x3BF4 + .incbin "data/berry_fix.mb" gMultiBootProgram_BerryGlitchFix_End:: diff --git a/data/multiboot_pokemon_colosseum.s b/data/multiboot_pokemon_colosseum.s index 64df89692..bbc47a9e8 100644 --- a/data/multiboot_pokemon_colosseum.s +++ b/data/multiboot_pokemon_colosseum.s @@ -1,5 +1,5 @@ .section .rodata gMultiBootProgram_PokemonColosseum_Start:: @ 8703860 - .incbin "baserom.gba", 0x703860, 0x28000 + .incbin "data/pokemon_colosseum.mb" gMultiBootProgram_PokemonColosseum_End:: diff --git a/data/pokemon_colosseum.mb b/data/pokemon_colosseum.mb new file mode 100644 index 000000000..2ff3f88bc Binary files /dev/null and b/data/pokemon_colosseum.mb differ -- cgit v1.2.3 From c14c6d36f8a60fd561f7c24339b575807bc6066f Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Wed, 5 Dec 2018 08:43:55 -0500 Subject: Rename most special vars --- asm/battle_2.s | 8 +- asm/battle_controller_oak.s | 12 +-- asm/battle_controller_player.s | 4 +- asm/battle_controller_pokedude.s | 12 +-- asm/battle_controller_safari.s | 4 +- asm/battle_records.s | 4 +- asm/battle_setup.s | 24 ++--- asm/battle_tower.s | 92 +++++++++--------- asm/berry_pouch.s | 52 +++++------ asm/cable_club.s | 60 ++++++------ asm/daycare.s | 28 +++--- asm/easy_chat.s | 4 +- asm/egg_hatch.s | 16 ++-- asm/event_data.s | 60 ++++++------ asm/field_control_avatar.s | 40 ++++---- asm/field_poison.s | 8 +- asm/field_specials.s | 192 +++++++++++++++++++------------------- asm/fldeff_strength.s | 4 +- asm/heal_location.s | 8 +- asm/help_system_812B1E0.s | 4 +- asm/item.s | 8 +- asm/item_menu.s | 100 ++++++++++---------- asm/item_use.s | 84 ++++++++--------- asm/itemfinder.s | 8 +- asm/learn_move.s | 16 ++-- asm/link.s | 4 +- asm/link_rfu.s | 24 ++--- asm/link_rfu_3.s | 100 ++++++++++---------- asm/link_rfu_4.s | 8 +- asm/map_obj_lock.s | 4 +- asm/party_menu.s | 168 ++++++++++++++++----------------- asm/pokemon_3.s | 8 +- asm/pokemon_size_record.s | 12 +-- asm/pokemon_storage_system.s | 8 +- asm/prof_pc.s | 20 ++-- asm/rom6.s | 4 +- asm/scrcmd.s | 116 +++++++++++------------ asm/script_menu.s | 88 ++++++++--------- asm/script_pokemon_util_80A0058.s | 20 ++-- asm/script_pokemon_util_80BF8FC.s | 34 +++---- asm/seagallop.s | 12 +-- asm/shop.s | 4 +- asm/start_menu.s | 8 +- asm/teachy_tv.s | 4 +- asm/tm_case.s | 32 +++---- asm/trade.s | 16 ++-- asm/trainer_tower.s | 92 +++++++++--------- asm/unk_8147500.s | 8 +- asm/unk_8147AA8.s | 8 +- asm/unk_814B6F0.s | 8 +- asm/unk_81507FC.s | 8 +- asm/unk_8159F40.s | 4 +- asm/unk_815EDDC.s | 8 +- asm/wild_encounter.s | 8 +- data/event_scripts.s | 30 +++--- include/event_data.h | 4 +- include/item_menu.h | 2 +- src/fame_checker.c | 10 +- src/menews_jisan.c | 2 +- src/quest_log.c | 8 +- src/vs_seeker.c | 10 +- sym_ewram.txt | 30 +++--- 62 files changed, 893 insertions(+), 893 deletions(-) diff --git a/asm/battle_2.s b/asm/battle_2.s index 011bb6d56..b11014d6b 100644 --- a/asm/battle_2.s +++ b/asm/battle_2.s @@ -2375,7 +2375,7 @@ sub_8011100: @ 8011100 ands r0, r1 cmp r0, 0 beq _08011158 - ldr r2, _08011168 @ =gUnknown_20370D0 + ldr r2, _08011168 @ =gSpecialVar_Result ldr r1, _0801116C @ =gUnknown_2023E8A movs r0, 0x3 strb r0, [r1] @@ -2398,7 +2398,7 @@ _08011158: .align 2, 0 _08011160: .4byte gMain _08011164: .4byte gBattleTypeFlags -_08011168: .4byte gUnknown_20370D0 +_08011168: .4byte gSpecialVar_Result _0801116C: .4byte gUnknown_2023E8A _08011170: .4byte CB2_QuitRecordedBattle thumb_func_end sub_8011100 @@ -11652,7 +11652,7 @@ _08015B74: cmp r0, 0 bne _08015BD4 _08015B86: - ldr r1, _08015BE8 @ =gUnknown_20370D0 + ldr r1, _08015BE8 @ =gSpecialVar_Result ldr r5, _08015BEC @ =gUnknown_2023E8A ldrb r0, [r5] strh r0, [r1] @@ -11697,7 +11697,7 @@ _08015BD4: _08015BDC: .4byte gBattleTypeFlags _08015BE0: .4byte gPlayerParty _08015BE4: .4byte gUnknown_3003F64 -_08015BE8: .4byte gUnknown_20370D0 +_08015BE8: .4byte gSpecialVar_Result _08015BEC: .4byte gUnknown_2023E8A _08015BF0: .4byte gMain _08015BF4: .4byte 0x00000439 diff --git a/asm/battle_controller_oak.s b/asm/battle_controller_oak.s index 94a49dd4e..29ae446f6 100644 --- a/asm/battle_controller_oak.s +++ b/asm/battle_controller_oak.s @@ -677,7 +677,7 @@ sub_80E7AC4: @ 80E7AC4 lsls r0, 24 cmp r0, 0 bne _080E7B34 - ldr r0, _080E7B20 @ =gUnknown_203AD30 + ldr r0, _080E7B20 @ =gSpecialVar_ItemId ldrh r0, [r0] cmp r0, 0xD bne _080E7B34 @@ -701,13 +701,13 @@ sub_80E7AC4: @ 80E7AC4 _080E7B14: .4byte gMain _080E7B18: .4byte sub_8011100 _080E7B1C: .4byte gPaletteFade -_080E7B20: .4byte gUnknown_203AD30 +_080E7B20: .4byte gSpecialVar_ItemId _080E7B24: .4byte gBattleTypeFlags _080E7B28: .4byte gUnknown_3004FE0 _080E7B2C: .4byte gActiveBattler _080E7B30: .4byte sub_80E8704 _080E7B34: - ldr r0, _080E7B48 @ =gUnknown_203AD30 + ldr r0, _080E7B48 @ =gSpecialVar_ItemId ldrh r1, [r0] movs r0, 0x1 bl EmitOneReturnValue @@ -716,7 +716,7 @@ _080E7B42: pop {r0} bx r0 .align 2, 0 -_080E7B48: .4byte gUnknown_203AD30 +_080E7B48: .4byte gSpecialVar_ItemId thumb_func_end sub_80E7AC4 thumb_func_start sub_80E7B4C @@ -2341,7 +2341,7 @@ _080E8880: cmp r4, 0 bne _080E88AA bl sub_80EB524 - ldr r0, _080E88B8 @ =gUnknown_203AD30 + ldr r0, _080E88B8 @ =gSpecialVar_ItemId ldrh r1, [r0] movs r0, 0x1 bl EmitOneReturnValue @@ -2357,7 +2357,7 @@ _080E88AA: bx r0 .align 2, 0 _080E88B4: .4byte gPaletteFade -_080E88B8: .4byte gUnknown_203AD30 +_080E88B8: .4byte gSpecialVar_ItemId _080E88BC: .4byte gBattleStruct thumb_func_end sub_80E8704 diff --git a/asm/battle_controller_player.s b/asm/battle_controller_player.s index c009baf03..477f73144 100644 --- a/asm/battle_controller_player.s +++ b/asm/battle_controller_player.s @@ -4435,7 +4435,7 @@ CompleteWhenChoseItem: @ 803073C ands r0, r1 cmp r0, 0 bne _08030762 - ldr r0, _08030774 @ =gUnknown_203AD30 + ldr r0, _08030774 @ =gSpecialVar_ItemId ldrh r1, [r0] movs r0, 0x1 bl EmitOneReturnValue @@ -4447,7 +4447,7 @@ _08030762: _08030768: .4byte gMain _0803076C: .4byte sub_8011100 _08030770: .4byte gPaletteFade -_08030774: .4byte gUnknown_203AD30 +_08030774: .4byte gSpecialVar_ItemId thumb_func_end CompleteWhenChoseItem thumb_func_start CompleteOnSpecialAnimDone diff --git a/asm/battle_controller_pokedude.s b/asm/battle_controller_pokedude.s index 36b4f62d9..58fad294a 100644 --- a/asm/battle_controller_pokedude.s +++ b/asm/battle_controller_pokedude.s @@ -22,7 +22,7 @@ sub_81560A4: @ 81560A4 ldr r2, _081560D4 @ =gBattleStruct ldr r0, [r2] adds r0, 0x96 - ldr r1, _081560D8 @ =gUnknown_20370C0 + ldr r1, _081560D8 @ =gSpecialVar_0x8004 ldrh r1, [r1] strb r1, [r0] ldr r0, [r2] @@ -35,7 +35,7 @@ _081560C8: .4byte gUnknown_3004FE0 _081560CC: .4byte gActiveBattler _081560D0: .4byte sub_81560DC _081560D4: .4byte gBattleStruct -_081560D8: .4byte gUnknown_20370C0 +_081560D8: .4byte gSpecialVar_0x8004 thumb_func_end sub_81560A4 thumb_func_start sub_81560DC @@ -642,7 +642,7 @@ sub_8156594: @ 8156594 str r1, [r0] bl nullsub_44 bl FreeAllWindowBuffers - ldr r0, _081565D8 @ =gUnknown_20370C0 + ldr r0, _081565D8 @ =gSpecialVar_0x8004 ldrh r0, [r0] cmp r0, 0x1 beq _081565C4 @@ -656,7 +656,7 @@ _081565C8: .4byte gPaletteFade _081565CC: .4byte gUnknown_3004FE0 _081565D0: .4byte gActiveBattler _081565D4: .4byte sub_81565E8 -_081565D8: .4byte gUnknown_20370C0 +_081565D8: .4byte gSpecialVar_0x8004 _081565DC: movs r0, 0x8 _081565DE: @@ -680,7 +680,7 @@ sub_81565E8: @ 81565E8 ands r0, r1 cmp r0, 0 bne _0815660E - ldr r0, _08156620 @ =gUnknown_203AD30 + ldr r0, _08156620 @ =gSpecialVar_ItemId ldrh r1, [r0] movs r0, 0x1 bl EmitOneReturnValue @@ -692,7 +692,7 @@ _0815660E: _08156614: .4byte gMain _08156618: .4byte sub_8011100 _0815661C: .4byte gPaletteFade -_08156620: .4byte gUnknown_203AD30 +_08156620: .4byte gSpecialVar_ItemId thumb_func_end sub_81565E8 thumb_func_start sub_8156624 diff --git a/asm/battle_controller_safari.s b/asm/battle_controller_safari.s index 10e702da5..405d4c45b 100644 --- a/asm/battle_controller_safari.s +++ b/asm/battle_controller_safari.s @@ -431,7 +431,7 @@ CompleteWhenChosePokeblock: @ 80DD85C ands r0, r1 cmp r0, 0 bne _080DD882 - ldr r0, _080DD894 @ =gUnknown_203AD30 + ldr r0, _080DD894 @ =gSpecialVar_ItemId ldrh r1, [r0] movs r0, 0x1 bl EmitOneReturnValue @@ -443,7 +443,7 @@ _080DD882: _080DD888: .4byte gMain _080DD88C: .4byte sub_8011100 _080DD890: .4byte gPaletteFade -_080DD894: .4byte gUnknown_203AD30 +_080DD894: .4byte gSpecialVar_ItemId thumb_func_end CompleteWhenChosePokeblock thumb_func_start CompleteOnFinishedBattleAnimation_3 diff --git a/asm/battle_records.s b/asm/battle_records.s index bd847561c..392161676 100644 --- a/asm/battle_records.s +++ b/asm/battle_records.s @@ -129,7 +129,7 @@ _080CD338: bl sub_80CD628 ldr r0, _080CD350 @ =sub_80CD38C bl SetVBlankCallback - ldr r0, _080CD354 @ =gUnknown_20370C0 + ldr r0, _080CD354 @ =gSpecialVar_0x8004 ldrh r0, [r0] cmp r0, 0 beq _080CD358 @@ -137,7 +137,7 @@ _080CD338: b _080CD35C .align 2, 0 _080CD350: .4byte sub_80CD38C -_080CD354: .4byte gUnknown_20370C0 +_080CD354: .4byte gSpecialVar_0x8004 _080CD358: bl sub_80CDBE4 _080CD35C: diff --git a/asm/battle_setup.s b/asm/battle_setup.s index faa32be0e..499d565f0 100644 --- a/asm/battle_setup.s +++ b/asm/battle_setup.s @@ -721,13 +721,13 @@ _0807FC30: ldrb r0, [r4] cmp r0, 0x1 bne _0807FC40 - ldr r0, _0807FC3C @ =gUnknown_20370D0 + ldr r0, _0807FC3C @ =gSpecialVar_Result strh r1, [r0] b _0807FC46 .align 2, 0 -_0807FC3C: .4byte gUnknown_20370D0 +_0807FC3C: .4byte gSpecialVar_Result _0807FC40: - ldr r1, _0807FC54 @ =gUnknown_20370D0 + ldr r1, _0807FC54 @ =gSpecialVar_Result movs r0, 0x1 strh r0, [r1] _0807FC46: @@ -739,7 +739,7 @@ _0807FC4C: pop {r0} bx r0 .align 2, 0 -_0807FC54: .4byte gUnknown_20370D0 +_0807FC54: .4byte gSpecialVar_Result _0807FC58: .4byte c2_exit_to_overworld_1_continue_scripts_restart_music thumb_func_end sub_807FBF0 @@ -1503,7 +1503,7 @@ battle_80801F0: @ 80801F0 ldrh r1, [r0] cmp r1, 0 beq _08080212 - ldr r0, _0808021C @ =gUnknown_20370D2 + ldr r0, _0808021C @ =gSpecialVar_LastTalked strh r1, [r0] lsls r0, r1, 24 lsrs r0, 24 @@ -1519,7 +1519,7 @@ _08080212: bx r0 .align 2, 0 _08080218: .4byte gUnknown_20386B0 -_0808021C: .4byte gUnknown_20370D2 +_0808021C: .4byte gSpecialVar_LastTalked _08080220: .4byte gSaveBlock1Ptr _08080224: .4byte gUnknown_3005074 thumb_func_end battle_80801F0 @@ -1649,7 +1649,7 @@ TrainerWantsBattle: @ 8080334 lsrs r0, 24 ldr r2, _08080368 @ =gUnknown_3005074 strb r0, [r2] - ldr r4, _0808036C @ =gUnknown_20370D2 + ldr r4, _0808036C @ =gSpecialVar_LastTalked ldr r3, _08080370 @ =gMapObjects lsls r2, r0, 3 adds r2, r0 @@ -1668,7 +1668,7 @@ TrainerWantsBattle: @ 8080334 bx r0 .align 2, 0 _08080368: .4byte gUnknown_3005074 -_0808036C: .4byte gUnknown_20370D2 +_0808036C: .4byte gSpecialVar_LastTalked _08080370: .4byte gMapObjects _08080374: .4byte gUnknown_81A4EB4 thumb_func_end TrainerWantsBattle @@ -1859,7 +1859,7 @@ sub_80804AC: @ 80804AC adds r1, r0, 0 cmp r1, 0x1 bne _080804E8 - ldr r0, _080804E0 @ =gUnknown_20370D0 + ldr r0, _080804E0 @ =gSpecialVar_Result strh r1, [r0] ldr r0, _080804E4 @ =gUnknown_20386CC ldrh r0, [r0] @@ -1871,10 +1871,10 @@ sub_80804AC: @ 80804AC .align 2, 0 _080804D8: .4byte gUnknown_20386AC _080804DC: .4byte gUnknown_2023E8A -_080804E0: .4byte gUnknown_20370D0 +_080804E0: .4byte gSpecialVar_Result _080804E4: .4byte gUnknown_20386CC _080804E8: - ldr r0, _08080500 @ =gUnknown_20370D0 + ldr r0, _08080500 @ =gSpecialVar_Result movs r1, 0 strh r1, [r0] _080804EE: @@ -1884,7 +1884,7 @@ _080804EE: bl sub_81139BC b _0808054E .align 2, 0 -_08080500: .4byte gUnknown_20370D0 +_08080500: .4byte gSpecialVar_Result _08080504: .4byte c2_exit_to_overworld_1_continue_scripts_restart_music _08080508: ldr r0, _0808051C @ =gTrainerBattleOpponent_A diff --git a/asm/battle_tower.s b/asm/battle_tower.s index f1cf4d3fa..82922b88f 100644 --- a/asm/battle_tower.s +++ b/asm/battle_tower.s @@ -144,7 +144,7 @@ sub_80E5A70: @ 80E5A70 movs r0, 0 strb r0, [r4] bl ValidateEReaderTrainer - ldr r0, _080E5AA4 @ =gUnknown_20370D0 + ldr r0, _080E5AA4 @ =gSpecialVar_Result ldrh r0, [r0] adds r7, r4, 0 cmp r0, 0 @@ -160,7 +160,7 @@ _080E5A9E: movs r0, 0 b _080E5B02 .align 2, 0 -_080E5AA4: .4byte gUnknown_20370D0 +_080E5AA4: .4byte gSpecialVar_Result _080E5AA8: .4byte gSaveBlock2Ptr _080E5AAC: .4byte 0x000004a2 _080E5AB0: @@ -1747,7 +1747,7 @@ _080E6662: adds r2, r0, 0 lsls r2, 16 lsrs r2, 16 - ldr r5, _080E6728 @ =gUnknown_20370D0 + ldr r5, _080E6728 @ =gSpecialVar_Result ldrb r3, [r5] str r4, [sp] add r0, sp, 0x10 @@ -1769,7 +1769,7 @@ _080E6662: ldr r1, _080E672C @ =gStringVar1 movs r0, 0xFF strb r0, [r1] - ldr r1, _080E6730 @ =gUnknown_20370C0 + ldr r1, _080E6730 @ =gSpecialVar_0x8004 movs r0, 0x1 strh r0, [r1] movs r0, 0 @@ -1810,9 +1810,9 @@ _080E6704: b _080E6742 .align 2, 0 _080E6724: .4byte gPlayerParty -_080E6728: .4byte gUnknown_20370D0 +_080E6728: .4byte gSpecialVar_Result _080E672C: .4byte gStringVar1 -_080E6730: .4byte gUnknown_20370C0 +_080E6730: .4byte gSpecialVar_0x8004 _080E6734: .4byte gUnknown_84020C4 _080E6738: .4byte 0x0000ffff _080E673C: .4byte gUnknown_83FE860 @@ -1825,7 +1825,7 @@ _080E6742: .align 2, 0 _080E674C: .4byte gUnknown_83FE864 _080E6750: - ldr r1, _080E6780 @ =gUnknown_20370C0 + ldr r1, _080E6780 @ =gSpecialVar_0x8004 movs r0, 0 strh r0, [r1] ldr r0, _080E6784 @ =gSaveBlock2Ptr @@ -1851,7 +1851,7 @@ _080E6770: pop {r0} bx r0 .align 2, 0 -_080E6780: .4byte gUnknown_20370C0 +_080E6780: .4byte gSpecialVar_0x8004 _080E6784: .4byte gSaveBlock2Ptr _080E6788: .4byte 0x0000055c thumb_func_end sub_80E6648 @@ -2053,7 +2053,7 @@ sub_80E6900: @ 80E6900 push {r4-r6,lr} sub sp, 0x4 ldr r0, _080E691C @ =gUnknown_203AAB8 - ldr r1, _080E6920 @ =gUnknown_20370C0 + ldr r1, _080E6920 @ =gSpecialVar_0x8004 ldrh r1, [r1] strh r1, [r0] ldrh r2, [r0] @@ -2066,7 +2066,7 @@ sub_80E6900: @ 80E6900 b _080E69E6 .align 2, 0 _080E691C: .4byte gUnknown_203AAB8 -_080E6920: .4byte gUnknown_20370C0 +_080E6920: .4byte gSpecialVar_0x8004 _080E6924: cmp r2, 0x2 beq _080E6998 @@ -2180,7 +2180,7 @@ sub_80E6A0C: @ 80E6A0C ldrb r0, [r0] lsls r0, 31 lsrs r5, r0, 31 - ldr r0, _080E6A3C @ =gUnknown_20370C0 + ldr r0, _080E6A3C @ =gSpecialVar_0x8004 ldrh r0, [r0] adds r6, r1, 0 cmp r0, 0xE @@ -2195,7 +2195,7 @@ _080E6A28: .align 2, 0 _080E6A34: .4byte gSaveBlock2Ptr _080E6A38: .4byte 0x0000055c -_080E6A3C: .4byte gUnknown_20370C0 +_080E6A3C: .4byte gSpecialVar_0x8004 _080E6A40: .4byte _080E6A44 .align 2, 0 _080E6A44: @@ -2339,7 +2339,7 @@ _080E6B66: adds r0, 0x1 strh r0, [r1] bl sub_80E6E48 - ldr r1, _080E6B9C @ =gUnknown_20370D0 + ldr r1, _080E6B9C @ =gSpecialVar_Result ldr r0, [r6] adds r0, r4 adds r0, r5 @@ -2354,7 +2354,7 @@ _080E6B66: .align 2, 0 _080E6B94: .4byte 0x0000056c _080E6B98: .4byte 0x0000270e -_080E6B9C: .4byte gUnknown_20370D0 +_080E6B9C: .4byte gSpecialVar_Result _080E6BA0: .4byte gStringVar1 _080E6BA4: ldr r0, [r6] @@ -2370,7 +2370,7 @@ _080E6BA4: strh r0, [r2] _080E6BBA: bl sub_80E6E48 - ldr r0, _080E6BD4 @ =gUnknown_20370D0 + ldr r0, _080E6BD4 @ =gSpecialVar_Result ldr r1, [r6] adds r1, r4 adds r1, r5 @@ -2381,7 +2381,7 @@ _080E6BC6: .align 2, 0 _080E6BCC: .4byte 0x00000564 _080E6BD0: .4byte 0x00000595 -_080E6BD4: .4byte gUnknown_20370D0 +_080E6BD4: .4byte gSpecialVar_Result _080E6BD8: ldr r3, [r6] ldr r0, _080E6BF8 @ =gSpecialVar_0x8005 @@ -2481,7 +2481,7 @@ sub_80E6C8C: @ 80E6C8C ldrb r0, [r0] lsls r0, 31 lsrs r4, r0, 31 - ldr r0, _080E6CBC @ =gUnknown_20370C0 + ldr r0, _080E6CBC @ =gSpecialVar_0x8004 ldrh r0, [r0] adds r3, r1, 0 cmp r0, 0xE @@ -2496,7 +2496,7 @@ _080E6CA8: .align 2, 0 _080E6CB4: .4byte gSaveBlock2Ptr _080E6CB8: .4byte 0x0000055c -_080E6CBC: .4byte gUnknown_20370C0 +_080E6CBC: .4byte gSpecialVar_0x8004 _080E6CC0: .4byte _080E6CC4 .align 2, 0 _080E6CC4: @@ -2516,17 +2516,17 @@ _080E6CC4: .4byte _080E6DD4 .4byte _080E6DF4 _080E6D00: - ldr r0, _080E6D0C @ =gUnknown_20370D0 + ldr r0, _080E6D0C @ =gSpecialVar_Result ldr r1, [r3] ldr r3, _080E6D10 @ =0x0000055e adds r1, r3 adds r1, r4 b _080E6D60 .align 2, 0 -_080E6D0C: .4byte gUnknown_20370D0 +_080E6D0C: .4byte gSpecialVar_Result _080E6D10: .4byte 0x0000055e _080E6D14: - ldr r0, _080E6D24 @ =gUnknown_20370D0 + ldr r0, _080E6D24 @ =gSpecialVar_Result ldr r1, [r3] ldr r2, _080E6D28 @ =0x0000055c adds r1, r2 @@ -2534,19 +2534,19 @@ _080E6D14: lsls r1, 31 b _080E6D7C .align 2, 0 -_080E6D24: .4byte gUnknown_20370D0 +_080E6D24: .4byte gSpecialVar_Result _080E6D28: .4byte 0x0000055c _080E6D2C: - ldr r2, _080E6D38 @ =gUnknown_20370D0 + ldr r2, _080E6D38 @ =gSpecialVar_Result ldr r0, [r3] lsls r1, r4, 1 movs r3, 0xAC lsls r3, 3 b _080E6D44 .align 2, 0 -_080E6D38: .4byte gUnknown_20370D0 +_080E6D38: .4byte gSpecialVar_Result _080E6D3C: - ldr r2, _080E6D50 @ =gUnknown_20370D0 + ldr r2, _080E6D50 @ =gSpecialVar_Result ldr r0, [r3] lsls r1, r4, 1 ldr r3, _080E6D54 @ =0x00000564 @@ -2557,10 +2557,10 @@ _080E6D44: strh r0, [r2] b _080E6E08 .align 2, 0 -_080E6D50: .4byte gUnknown_20370D0 +_080E6D50: .4byte gSpecialVar_Result _080E6D54: .4byte 0x00000564 _080E6D58: - ldr r0, _080E6D68 @ =gUnknown_20370D0 + ldr r0, _080E6D68 @ =gSpecialVar_Result ldr r1, [r3] ldr r2, _080E6D6C @ =0x0000056c adds r1, r2 @@ -2569,10 +2569,10 @@ _080E6D60: strh r1, [r0] b _080E6E08 .align 2, 0 -_080E6D68: .4byte gUnknown_20370D0 +_080E6D68: .4byte gSpecialVar_Result _080E6D6C: .4byte 0x0000056c _080E6D70: - ldr r0, _080E6D84 @ =gUnknown_20370D0 + ldr r0, _080E6D84 @ =gSpecialVar_Result ldr r1, [r3] ldr r3, _080E6D88 @ =0x0000055c adds r1, r3 @@ -2583,16 +2583,16 @@ _080E6D7C: strh r1, [r0] b _080E6E08 .align 2, 0 -_080E6D84: .4byte gUnknown_20370D0 +_080E6D84: .4byte gSpecialVar_Result _080E6D88: .4byte 0x0000055c _080E6D8C: adds r0, r4, 0 bl sub_80E7188 - ldr r1, _080E6D98 @ =gUnknown_20370D0 + ldr r1, _080E6D98 @ =gSpecialVar_Result strh r0, [r1] b _080E6E08 .align 2, 0 -_080E6D98: .4byte gUnknown_20370D0 +_080E6D98: .4byte gSpecialVar_Result _080E6D9C: ldr r0, [r3] ldr r1, _080E6DAC @ =0x0000057a @@ -2868,7 +2868,7 @@ sub_80E6FB8: @ 80E6FB8 ldrb r0, [r0] lsls r0, 31 lsrs r5, r0, 31 - ldr r0, _080E7044 @ =gUnknown_20370C0 + ldr r0, _080E7044 @ =gSpecialVar_0x8004 ldrh r0, [r0] cmp r0, 0x3 beq _080E6FD4 @@ -2899,7 +2899,7 @@ _080E6FF2: ldr r2, _080E7050 @ =0x0000055d adds r0, r2 strb r1, [r0] - ldr r0, _080E7044 @ =gUnknown_20370C0 + ldr r0, _080E7044 @ =gSpecialVar_0x8004 ldrh r1, [r0] cmp r1, 0x3 beq _080E7016 @@ -2928,7 +2928,7 @@ _080E7016: .align 2, 0 _080E703C: .4byte gSaveBlock2Ptr _080E7040: .4byte 0x0000055c -_080E7044: .4byte gUnknown_20370C0 +_080E7044: .4byte gSpecialVar_0x8004 _080E7048: .4byte 0x00000564 _080E704C: .4byte gUnknown_2023E8A _080E7050: .4byte 0x0000055d @@ -3230,16 +3230,16 @@ sub_80E724C: @ 80E724C ldrh r0, [r0] ldr r1, _080E7290 @ =gStringVar1 bl sub_8099E90 - ldr r0, _080E7294 @ =gUnknown_20370D0 + ldr r0, _080E7294 @ =gSpecialVar_Result strh r4, [r0] b _080E72AA .align 2, 0 _080E7288: .4byte gSaveBlock2Ptr _080E728C: .4byte 0x0000055c _080E7290: .4byte gStringVar1 -_080E7294: .4byte gUnknown_20370D0 +_080E7294: .4byte gSpecialVar_Result _080E7298: - ldr r1, _080E72B0 @ =gUnknown_20370D0 + ldr r1, _080E72B0 @ =gSpecialVar_Result movs r0, 0 strh r0, [r1] ldr r0, [r5] @@ -3253,7 +3253,7 @@ _080E72AA: pop {r0} bx r0 .align 2, 0 -_080E72B0: .4byte gUnknown_20370D0 +_080E72B0: .4byte gSpecialVar_Result _080E72B4: .4byte 0x0000055e thumb_func_end sub_80E724C @@ -3273,7 +3273,7 @@ sub_80E72B8: @ 80E72B8 beq _080E72D2 movs r7, 0x45 _080E72D2: - ldr r4, _080E733C @ =gUnknown_20370D0 + ldr r4, _080E733C @ =gSpecialVar_Result movs r0, 0 strh r0, [r4] adds r0, r1, 0 @@ -3312,7 +3312,7 @@ _080E731A: cmp r5, 0x2 ble _080E72EA _080E7320: - ldr r0, _080E733C @ =gUnknown_20370D0 + ldr r0, _080E733C @ =gSpecialVar_Result ldrh r0, [r0] cmp r0, 0 beq _080E732E @@ -3325,7 +3325,7 @@ _080E732E: .align 2, 0 _080E7334: .4byte gSaveBlock2Ptr _080E7338: .4byte 0x0000055c -_080E733C: .4byte gUnknown_20370D0 +_080E733C: .4byte gSpecialVar_Result _080E7340: .4byte 0x0000056d _080E7344: .4byte gPlayerParty thumb_func_end sub_80E72B8 @@ -3500,7 +3500,7 @@ _080E748C: .4byte 0x000004a4 thumb_func_start ValidateEReaderTrainer ValidateEReaderTrainer: @ 80E7490 push {r4-r6,lr} - ldr r2, _080E74C0 @ =gUnknown_20370D0 + ldr r2, _080E74C0 @ =gSpecialVar_Result movs r0, 0 strh r0, [r2] ldr r1, _080E74C4 @ =gSaveBlock2Ptr @@ -3524,7 +3524,7 @@ _080E74AA: strh r0, [r2] b _080E74F6 .align 2, 0 -_080E74C0: .4byte gUnknown_20370D0 +_080E74C0: .4byte gSpecialVar_Result _080E74C4: .4byte gSaveBlock2Ptr _080E74C8: movs r4, 0 @@ -3547,7 +3547,7 @@ _080E74CE: lsls r3, 3 adds r0, r1, r3 bl sub_80E7524 - ldr r1, _080E74FC @ =gUnknown_20370D0 + ldr r1, _080E74FC @ =gSpecialVar_Result movs r0, 0x1 strh r0, [r1] _080E74F6: @@ -3555,7 +3555,7 @@ _080E74F6: pop {r0} bx r0 .align 2, 0 -_080E74FC: .4byte gUnknown_20370D0 +_080E74FC: .4byte gSpecialVar_Result thumb_func_end ValidateEReaderTrainer thumb_func_start sub_80E7500 diff --git a/asm/berry_pouch.s b/asm/berry_pouch.s index 304efdd74..b58832931 100644 --- a/asm/berry_pouch.s +++ b/asm/berry_pouch.s @@ -52,7 +52,7 @@ _0813CD98: strb r0, [r1, 0x6] movs r2, 0 ldr r6, _0813CDF0 @ =gTextFlags - ldr r0, _0813CDF4 @ =gUnknown_203AD30 + ldr r0, _0813CDF4 @ =gSpecialVar_ItemId mov r12, r0 ldr r1, _0813CDF8 @ =sub_813CE30 mov r8, r1 @@ -89,7 +89,7 @@ _0813CDE2: .align 2, 0 _0813CDEC: .4byte gUnknown_203F370 _0813CDF0: .4byte gTextFlags -_0813CDF4: .4byte gUnknown_203AD30 +_0813CDF4: .4byte gSpecialVar_ItemId _0813CDF8: .4byte sub_813CE30 _0813CDFC: .4byte 0x0000080c thumb_func_end sub_813CD50 @@ -1708,7 +1708,7 @@ _0813DA9E: bne _0813DAEC movs r0, 0x5 bl PlaySE - ldr r0, _0813DAE8 @ =gUnknown_203AD30 + ldr r0, _0813DAE8 @ =gSpecialVar_ItemId mov r1, r8 strh r1, [r0] b _0813DB48 @@ -1717,7 +1717,7 @@ _0813DAD8: .4byte gTasks+0x8 _0813DADC: .4byte gPaletteFade _0813DAE0: .4byte gUnknown_203F37A _0813DAE4: .4byte gMain -_0813DAE8: .4byte gUnknown_203AD30 +_0813DAE8: .4byte gSpecialVar_ItemId _0813DAEC: movs r0, 0x2 negs r0, r0 @@ -1749,11 +1749,11 @@ _0813DB10: lsrs r1, 16 movs r0, 0x5 bl sub_809A798 - ldr r1, _0813DB34 @ =gUnknown_203AD30 + ldr r1, _0813DB34 @ =gSpecialVar_ItemId b _0813DB46 .align 2, 0 _0813DB30: .4byte gUnknown_203F370 -_0813DB34: .4byte gUnknown_203AD30 +_0813DB34: .4byte gSpecialVar_ItemId _0813DB38: ldr r0, _0813DB50 @ =gUnknown_203F36C ldr r0, [r0] @@ -1761,7 +1761,7 @@ _0813DB38: cmp r5, r0 bne _0813DB58 _0813DB42: - ldr r1, _0813DB54 @ =gUnknown_203AD30 + ldr r1, _0813DB54 @ =gSpecialVar_ItemId movs r0, 0 _0813DB46: strh r0, [r1] @@ -1771,7 +1771,7 @@ _0813DB48: b _0813DB9E .align 2, 0 _0813DB50: .4byte gUnknown_203F36C -_0813DB54: .4byte gUnknown_203AD30 +_0813DB54: .4byte gSpecialVar_ItemId _0813DB58: bl sub_813D684 movs r0, 0x1 @@ -1789,7 +1789,7 @@ _0813DB58: movs r0, 0x5 adds r1, r4, 0 bl sub_809A798 - ldr r1, _0813DBA8 @ =gUnknown_203AD30 + ldr r1, _0813DBA8 @ =gSpecialVar_ItemId strh r0, [r1] ldr r0, _0813DBAC @ =gTasks lsls r1, r6, 2 @@ -1810,7 +1810,7 @@ _0813DB9E: pop {r0} bx r0 .align 2, 0 -_0813DBA8: .4byte gUnknown_203AD30 +_0813DBA8: .4byte gSpecialVar_ItemId _0813DBAC: .4byte gTasks _0813DBB0: .4byte gUnknown_8464358 thumb_func_end sub_813DA68 @@ -1878,7 +1878,7 @@ _0813DC24: cmp r0, 0x1 bne _0813DC7C _0813DC38: - ldr r0, _0813DC54 @ =gUnknown_203AD30 + ldr r0, _0813DC54 @ =gSpecialVar_ItemId ldrh r0, [r0] bl sub_80BF6A8 lsls r0, 24 @@ -1891,7 +1891,7 @@ _0813DC38: movs r0, 0x1 b _0813DC86 .align 2, 0 -_0813DC54: .4byte gUnknown_203AD30 +_0813DC54: .4byte gSpecialVar_ItemId _0813DC58: .4byte gUnknown_203F384 _0813DC5C: .4byte gUnknown_84643AC _0813DC60: .4byte gUnknown_203F388 @@ -2118,7 +2118,7 @@ sub_813DE0C: @ 813DE0C ldrb r0, [r0, 0x4] cmp r0, 0x4 bne _0813DE78 - ldr r4, _0813DE64 @ =gUnknown_203AD30 + ldr r4, _0813DE64 @ =gSpecialVar_ItemId ldrh r0, [r4] bl ItemId_GetBattleFunc cmp r0, 0 @@ -2129,7 +2129,7 @@ sub_813DE0C: @ 813DE0C .align 2, 0 _0813DE5C: .4byte gUnknown_203F388 _0813DE60: .4byte gUnknown_203F370 -_0813DE64: .4byte gUnknown_203AD30 +_0813DE64: .4byte gSpecialVar_ItemId _0813DE68: ldrh r0, [r4] bl ItemId_GetBattleFunc @@ -2142,7 +2142,7 @@ _0813DE78: lsls r0, 24 cmp r0, 0 bne _0813DEA0 - ldr r0, _0813DE9C @ =gUnknown_203AD30 + ldr r0, _0813DE9C @ =gSpecialVar_ItemId ldrh r0, [r0] bl ItemId_GetType lsls r0, 24 @@ -2153,9 +2153,9 @@ _0813DE78: bl sub_813E274 b _0813DEB0 .align 2, 0 -_0813DE9C: .4byte gUnknown_203AD30 +_0813DE9C: .4byte gSpecialVar_ItemId _0813DEA0: - ldr r0, _0813DEB8 @ =gUnknown_203AD30 + ldr r0, _0813DEB8 @ =gSpecialVar_ItemId ldrh r0, [r0] bl ItemId_GetFieldFunc adds r1, r0, 0 @@ -2166,7 +2166,7 @@ _0813DEB0: pop {r0} bx r0 .align 2, 0 -_0813DEB8: .4byte gUnknown_203AD30 +_0813DEB8: .4byte gSpecialVar_ItemId thumb_func_end sub_813DE0C thumb_func_start sub_813DEBC @@ -2494,7 +2494,7 @@ sub_813E164: @ 813E164 _0813E18A: movs r0, 0x5 bl PlaySE - ldr r0, _0813E1F4 @ =gUnknown_203AD30 + ldr r0, _0813E1F4 @ =gSpecialVar_ItemId ldrh r0, [r0] ldrh r1, [r5, 0x10] bl sub_809A1D8 @@ -2532,7 +2532,7 @@ _0813E1E4: .align 2, 0 _0813E1EC: .4byte gTasks+0x8 _0813E1F0: .4byte gMain -_0813E1F4: .4byte gUnknown_203AD30 +_0813E1F4: .4byte gSpecialVar_ItemId _0813E1F8: .4byte gUnknown_203F37A _0813E1FC: .4byte gUnknown_3005E70 thumb_func_end sub_813E164 @@ -2807,7 +2807,7 @@ sub_813E428: @ 813E428 lsls r0, 3 ldr r1, _0813E470 @ =gTasks+0x8 adds r4, r0, r1 - ldr r6, _0813E474 @ =gUnknown_203AD30 + ldr r6, _0813E474 @ =gSpecialVar_ItemId ldrh r0, [r6] bl itemid_get_market_price lsls r0, 16 @@ -2831,7 +2831,7 @@ sub_813E428: @ 813E428 b _0813E4CE .align 2, 0 _0813E470: .4byte gTasks+0x8 -_0813E474: .4byte gUnknown_203AD30 +_0813E474: .4byte gSpecialVar_ItemId _0813E478: .4byte gStringVar1 _0813E47C: .4byte gStringVar4 _0813E480: .4byte gUnknown_84168F1 @@ -3185,7 +3185,7 @@ sub_813E768: @ 813E768 bl PutWindowTilemap movs r0, 0 bl schedule_bg_copy_tilemap_to_vram - ldr r0, _0813E7D8 @ =gUnknown_203AD30 + ldr r0, _0813E7D8 @ =gSpecialVar_ItemId ldrh r0, [r0] ldr r1, _0813E7DC @ =gStringVar1 bl sub_8099E90 @@ -3219,7 +3219,7 @@ sub_813E768: @ 813E768 bx r0 .align 2, 0 _0813E7D4: .4byte gTasks+0x8 -_0813E7D8: .4byte gUnknown_203AD30 +_0813E7D8: .4byte gSpecialVar_ItemId _0813E7DC: .4byte gStringVar1 _0813E7E0: .4byte gStringVar3 _0813E7E4: .4byte gStringVar4 @@ -3246,7 +3246,7 @@ sub_813E7F0: @ 813E7F0 mov r8, r1 movs r0, 0xF8 bl PlaySE - ldr r5, _0813E8C0 @ =gUnknown_203AD30 + ldr r5, _0813E8C0 @ =gSpecialVar_ItemId ldrh r0, [r5] mov r2, r8 ldrh r1, [r2, 0x10] @@ -3319,7 +3319,7 @@ sub_813E7F0: @ 813E7F0 bx r0 .align 2, 0 _0813E8BC: .4byte gTasks+0x8 -_0813E8C0: .4byte gUnknown_203AD30 +_0813E8C0: .4byte gSpecialVar_ItemId _0813E8C4: .4byte gSaveBlock1Ptr _0813E8C8: .4byte gUnknown_203F37A _0813E8CC: .4byte gUnknown_3005E70 diff --git a/asm/cable_club.s b/asm/cable_club.s index 830cff288..03b1e3497 100644 --- a/asm/cable_club.s +++ b/asm/cable_club.s @@ -696,7 +696,7 @@ sub_8080C6C: @ 8080C6C _08080CB0: .4byte gTasks _08080CB4: .4byte sub_8080FF0 _08080CB8: - ldr r4, _08080CD4 @ =gUnknown_20370D0 + ldr r4, _08080CD4 @ =gSpecialVar_Result adds r0, r7, 0 adds r1, r6, 0 bl sub_8080844 @@ -712,7 +712,7 @@ _08080CCE: pop {r0} bx r0 .align 2, 0 -_08080CD4: .4byte gUnknown_20370D0 +_08080CD4: .4byte gSpecialVar_Result _08080CD8: .4byte sub_8080DC0 thumb_func_end sub_8080C6C @@ -736,7 +736,7 @@ sub_8080CDC: @ 8080CDC bl sub_80808BC cmp r0, 0x1 beq _08080D74 - ldr r4, _08080D34 @ =gUnknown_20370D0 + ldr r4, _08080D34 @ =gSpecialVar_Result adds r0, r7, 0 adds r1, r6, 0 bl sub_8080844 @@ -757,7 +757,7 @@ sub_8080CDC: @ 8080CDC b _08080D72 .align 2, 0 _08080D30: .4byte gTasks -_08080D34: .4byte gUnknown_20370D0 +_08080D34: .4byte gSpecialVar_Result _08080D38: .4byte sub_8080F78 _08080D3C: cmp r2, 0x7 @@ -838,7 +838,7 @@ sub_8080DC0: @ 8080DC0 bl sub_80808BC cmp r0, 0x1 beq _08080E50 - ldr r0, _08080DE8 @ =gUnknown_20370D0 + ldr r0, _08080DE8 @ =gSpecialVar_Result ldrh r0, [r0] cmp r0, 0x4 bne _08080DEC @@ -848,7 +848,7 @@ sub_8080DC0: @ 8080DC0 bl sub_800AAC0 b _08080E02 .align 2, 0 -_08080DE8: .4byte gUnknown_20370D0 +_08080DE8: .4byte gSpecialVar_Result _08080DEC: cmp r0, 0x3 bne _08080DF6 @@ -984,7 +984,7 @@ _08080EF8: bl SetSuppressLinkErrorMessage bl ResetBlockReceivedFlags bl HideFieldMessageBox - ldr r0, _08080F44 @ =gUnknown_20370D0 + ldr r0, _08080F44 @ =gSpecialVar_Result ldrh r0, [r0] cmp r0, 0x1 bne _08080F54 @@ -1005,7 +1005,7 @@ _08080EF8: .align 2, 0 _08080F3C: .4byte gBlockRecvBuffer _08080F40: .4byte gUnknown_2039624 -_08080F44: .4byte gUnknown_20370D0 +_08080F44: .4byte gSpecialVar_Result _08080F48: .4byte gLinkType _08080F4C: .4byte 0x00004411 _08080F50: .4byte gTasks @@ -1065,7 +1065,7 @@ sub_8080FB4: @ 8080FB4 adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 - ldr r1, _08080FE8 @ =gUnknown_20370D0 + ldr r1, _08080FE8 @ =gSpecialVar_Result movs r0, 0x5 strh r0, [r1] ldr r1, _08080FEC @ =gTasks @@ -1083,7 +1083,7 @@ sub_8080FB4: @ 8080FB4 pop {r0} bx r0 .align 2, 0 -_08080FE8: .4byte gUnknown_20370D0 +_08080FE8: .4byte gSpecialVar_Result _08080FEC: .4byte gTasks thumb_func_end sub_8080FB4 @@ -1093,7 +1093,7 @@ sub_8080FF0: @ 8080FF0 adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 - ldr r1, _08081024 @ =gUnknown_20370D0 + ldr r1, _08081024 @ =gSpecialVar_Result movs r0, 0x6 strh r0, [r1] ldr r1, _08081028 @ =gTasks @@ -1111,7 +1111,7 @@ sub_8080FF0: @ 8080FF0 pop {r0} bx r0 .align 2, 0 -_08081024: .4byte gUnknown_20370D0 +_08081024: .4byte gSpecialVar_Result _08081028: .4byte gTasks thumb_func_end sub_8080FF0 @@ -1153,7 +1153,7 @@ sub_8081064: @ 8081064 push {r4,lr} movs r3, 0x2 movs r2, 0x2 - ldr r0, _0808107C @ =gUnknown_20370C0 + ldr r0, _0808107C @ =gSpecialVar_0x8004 ldrh r0, [r0] cmp r0, 0x2 beq _08081098 @@ -1163,7 +1163,7 @@ sub_8081064: @ 8081064 beq _08081086 b _080810B4 .align 2, 0 -_0808107C: .4byte gUnknown_20370C0 +_0808107C: .4byte gSpecialVar_0x8004 _08081080: cmp r0, 0x5 beq _080810A8 @@ -1228,7 +1228,7 @@ _080810F0: .4byte gBattleTypeFlags thumb_func_start sub_80810F4 sub_80810F4: @ 80810F4 push {lr} - ldr r1, _08081118 @ =gUnknown_20370D0 + ldr r1, _08081118 @ =gSpecialVar_Result movs r0, 0 strh r0, [r1] ldr r1, _0808111C @ =gLinkType @@ -1244,7 +1244,7 @@ sub_80810F4: @ 80810F4 pop {r0} bx r0 .align 2, 0 -_08081118: .4byte gUnknown_20370D0 +_08081118: .4byte gSpecialVar_Result _0808111C: .4byte gLinkType _08081120: .4byte 0x00003311 _08081124: .4byte gBattleTypeFlags @@ -1284,7 +1284,7 @@ sub_8081150: @ 8081150 .align 2, 0 _08081164: .4byte sub_80811FC _08081168: - ldr r0, _0808117C @ =gUnknown_20370C0 + ldr r0, _0808117C @ =gSpecialVar_0x8004 ldrh r0, [r0] subs r0, 0x1 cmp r0, 0x4 @@ -1295,7 +1295,7 @@ _08081168: ldr r0, [r0] mov pc, r0 .align 2, 0 -_0808117C: .4byte gUnknown_20370C0 +_0808117C: .4byte gSpecialVar_0x8004 _08081180: .4byte _08081184 .align 2, 0 _08081184: @@ -1597,7 +1597,7 @@ _080813D4: lsls r0, 1 bl PlayMapChosenOrBattleBGM _080813DC: - ldr r0, _080813F0 @ =gUnknown_20370C0 + ldr r0, _080813F0 @ =gSpecialVar_0x8004 ldrh r0, [r0] cmp r0, 0x2 beq _08081404 @@ -1607,7 +1607,7 @@ _080813DC: beq _080813FA b _0808141A .align 2, 0 -_080813F0: .4byte gUnknown_20370C0 +_080813F0: .4byte gSpecialVar_0x8004 _080813F4: cmp r0, 0x5 beq _08081410 @@ -1818,7 +1818,7 @@ _080815A0: ldr r0, _080815B8 @ =gLinkPlayers ldr r1, _080815BC @ =0x00002211 str r1, [r0, 0x14] - ldr r0, _080815C0 @ =gUnknown_20370C0 + ldr r0, _080815C0 @ =gSpecialVar_0x8004 ldrh r0, [r0] cmp r0, 0x2 beq _080815D4 @@ -1830,7 +1830,7 @@ _080815A0: .align 2, 0 _080815B8: .4byte gLinkPlayers _080815BC: .4byte 0x00002211 -_080815C0: .4byte gUnknown_20370C0 +_080815C0: .4byte gSpecialVar_0x8004 _080815C4: cmp r0, 0x5 beq _080815E0 @@ -1927,7 +1927,7 @@ sub_8081668: @ 8081668 bl LoadPlayerParty bl SavePlayerBag bl sub_81134B8 - ldr r0, _080816B8 @ =gUnknown_20370C0 + ldr r0, _080816B8 @ =gSpecialVar_0x8004 ldrh r0, [r0] cmp r0, 0x5 beq _0808170A @@ -1950,7 +1950,7 @@ sub_8081668: @ 8081668 .align 2, 0 _080816B0: .4byte gBattleTypeFlags _080816B4: .4byte 0x0000ffdf -_080816B8: .4byte gUnknown_20370C0 +_080816B8: .4byte gSpecialVar_0x8004 _080816BC: .4byte gUnknown_300502C _080816C0: .4byte gUnknown_3003F3C _080816C4: .4byte gUnknown_2023E8A @@ -2015,7 +2015,7 @@ _08081740: .4byte sub_806FB7C thumb_func_start sub_8081744 sub_8081744: @ 8081744 push {lr} - ldr r0, _0808176C @ =gUnknown_20370C0 + ldr r0, _0808176C @ =gSpecialVar_0x8004 ldrh r1, [r0] subs r0, r1, 0x1 lsls r0, 16 @@ -2033,7 +2033,7 @@ _08081760: pop {r0} bx r0 .align 2, 0 -_0808176C: .4byte gUnknown_20370C0 +_0808176C: .4byte gSpecialVar_0x8004 thumb_func_end sub_8081744 thumb_func_start sub_8081770 @@ -2385,14 +2385,14 @@ _08081A18: .4byte sub_808177C thumb_func_start sp02A_crash_sound sp02A_crash_sound: @ 8081A1C push {lr} - ldr r0, _08081A2C @ =gUnknown_20370C4 + ldr r0, _08081A2C @ =gSpecialVar_0x8006 ldrb r0, [r0] ldr r1, _08081A30 @ =c2_exit_to_overworld_1_continue_scripts_restart_music bl sub_808B700 pop {r0} bx r0 .align 2, 0 -_08081A2C: .4byte gUnknown_20370C4 +_08081A2C: .4byte gSpecialVar_0x8006 _08081A30: .4byte c2_exit_to_overworld_1_continue_scripts_restart_music thumb_func_end sp02A_crash_sound @@ -2402,7 +2402,7 @@ sub_8081A34: @ 8081A34 adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 - ldr r0, _08081A74 @ =gUnknown_20370C4 + ldr r0, _08081A74 @ =gSpecialVar_0x8006 strh r4, [r0] ldr r0, _08081A78 @ =gStringVar1 lsls r1, r4, 3 @@ -2427,7 +2427,7 @@ sub_8081A34: @ 8081A34 movs r0, 0x1 b _08081A8A .align 2, 0 -_08081A74: .4byte gUnknown_20370C4 +_08081A74: .4byte gSpecialVar_0x8006 _08081A78: .4byte gStringVar1 _08081A7C: .4byte gLinkPlayers + 8 _08081A80: .4byte gStringVar2 diff --git a/asm/daycare.s b/asm/daycare.s index f6bc7b0e1..3b7d7ffe0 100644 --- a/asm/daycare.s +++ b/asm/daycare.s @@ -458,7 +458,7 @@ TakePokemonFromDaycare: @ 8045728 movs r1, 0xBE lsls r1, 6 adds r0, r1 - ldr r1, _08045748 @ =gUnknown_20370C0 + ldr r1, _08045748 @ =gSpecialVar_0x8004 ldrb r1, [r1] bl TakeSelectedPokemonMonFromDaycareShiftSlots lsls r0, 16 @@ -467,7 +467,7 @@ TakePokemonFromDaycare: @ 8045728 bx r1 .align 2, 0 _08045744: .4byte gSaveBlock1Ptr -_08045748: .4byte gUnknown_20370C0 +_08045748: .4byte gSpecialVar_0x8004 thumb_func_end TakePokemonFromDaycare thumb_func_start GetLevelAfterDaycareSteps @@ -598,7 +598,7 @@ GetDaycareCost: @ 8045838 movs r1, 0xBE lsls r1, 6 adds r0, r1 - ldr r1, _08045858 @ =gUnknown_20370C0 + ldr r1, _08045858 @ =gSpecialVar_0x8004 ldrb r1, [r1] bl GetDaycareCostForMon ldr r1, _0804585C @ =gSpecialVar_0x8005 @@ -607,7 +607,7 @@ GetDaycareCost: @ 8045838 bx r0 .align 2, 0 _08045854: .4byte gSaveBlock1Ptr -_08045858: .4byte gUnknown_20370C0 +_08045858: .4byte gSpecialVar_0x8004 _0804585C: .4byte gSpecialVar_0x8005 thumb_func_end GetDaycareCost @@ -644,7 +644,7 @@ _08045894: .4byte 0x00003d20 GetNumLevelsGainedFromDaycare: @ 8045898 push {r4-r6,lr} ldr r6, _080458C0 @ =gSaveBlock1Ptr - ldr r5, _080458C4 @ =gUnknown_20370C0 + ldr r5, _080458C4 @ =gSpecialVar_0x8004 ldrh r0, [r5] movs r4, 0x8C adds r1, r0, 0 @@ -662,7 +662,7 @@ GetNumLevelsGainedFromDaycare: @ 8045898 b _080458E0 .align 2, 0 _080458C0: .4byte gSaveBlock1Ptr -_080458C4: .4byte gUnknown_20370C0 +_080458C4: .4byte gSpecialVar_0x8004 _080458C8: ldrh r0, [r5] adds r1, r0, 0 @@ -2076,13 +2076,13 @@ _08046350: str r0, [sp] cmp r0, 0 bne _08046390 - ldr r0, _0804638C @ =gUnknown_20370C0 + ldr r0, _0804638C @ =gSpecialVar_0x8004 strh r5, [r0] movs r0, 0x1 b _080463AA .align 2, 0 _08046388: .4byte gPlayerParty -_0804638C: .4byte gUnknown_20370C0 +_0804638C: .4byte gSpecialVar_0x8004 _08046390: subs r0, 0x1 str r0, [sp] @@ -2990,13 +2990,13 @@ Task_HandleDaycareLevelMenuInput: @ 80469FC _08046A2C: .4byte gTasks _08046A30: .4byte gMain _08046A34: - ldr r0, _08046A3C @ =gUnknown_20370D0 + ldr r0, _08046A3C @ =gSpecialVar_Result strh r1, [r0] b _08046A46 .align 2, 0 -_08046A3C: .4byte gUnknown_20370D0 +_08046A3C: .4byte gSpecialVar_Result _08046A40: - ldr r1, _08046A74 @ =gUnknown_20370D0 + ldr r1, _08046A74 @ =gSpecialVar_Result movs r0, 0x2 strh r0, [r1] _08046A46: @@ -3019,7 +3019,7 @@ _08046A46: bl EnableBothScriptContexts b _08046AAC .align 2, 0 -_08046A74: .4byte gUnknown_20370D0 +_08046A74: .4byte gSpecialVar_Result _08046A78: .4byte gTasks _08046A7C: movs r1, 0x2 @@ -3027,7 +3027,7 @@ _08046A7C: ands r0, r2 cmp r0, 0 beq _08046AAC - ldr r0, _08046AB4 @ =gUnknown_20370D0 + ldr r0, _08046AB4 @ =gSpecialVar_Result strh r1, [r0] ldrb r0, [r4, 0x8] movs r1, 0 @@ -3046,7 +3046,7 @@ _08046AAC: pop {r0} bx r0 .align 2, 0 -_08046AB4: .4byte gUnknown_20370D0 +_08046AB4: .4byte gSpecialVar_Result thumb_func_end Task_HandleDaycareLevelMenuInput thumb_func_start ShowDaycareLevelMenu diff --git a/asm/easy_chat.s b/asm/easy_chat.s index b8e9f7162..0ec71e087 100644 --- a/asm/easy_chat.s +++ b/asm/easy_chat.s @@ -495,7 +495,7 @@ _080BDA74: thumb_func_start sub_80BDA7C sub_80BDA7C: @ 80BDA7C push {r4,r5,lr} - ldr r0, _080BDA90 @ =gUnknown_20370C0 + ldr r0, _080BDA90 @ =gSpecialVar_0x8004 ldrh r0, [r0] cmp r0, 0x1 beq _080BDAB4 @@ -505,7 +505,7 @@ sub_80BDA7C: @ 80BDA7C beq _080BDA9E b _080BDB08 .align 2, 0 -_080BDA90: .4byte gUnknown_20370C0 +_080BDA90: .4byte gSpecialVar_0x8004 _080BDA94: cmp r0, 0x2 beq _080BDADC diff --git a/asm/egg_hatch.s b/asm/egg_hatch.s index 278cc855e..38b91b700 100644 --- a/asm/egg_hatch.s +++ b/asm/egg_hatch.s @@ -258,13 +258,13 @@ _08046E1C: .4byte gStringVar1 thumb_func_start ScriptHatchMon ScriptHatchMon: @ 8046E20 push {lr} - ldr r0, _08046E30 @ =gUnknown_20370C0 + ldr r0, _08046E30 @ =gSpecialVar_0x8004 ldrb r0, [r0] bl AddHatchedMonToParty pop {r0} bx r0 .align 2, 0 -_08046E30: .4byte gUnknown_20370C0 +_08046E30: .4byte gSpecialVar_0x8004 thumb_func_end ScriptHatchMon thumb_func_start sub_8046E34 @@ -332,7 +332,7 @@ sub_8046EAC: @ 8046EAC movs r1, 0xBE lsls r1, 6 adds r0, r1 - ldr r1, _08046ECC @ =gUnknown_20370C0 + ldr r1, _08046ECC @ =gSpecialVar_0x8004 ldrb r1, [r1] bl sub_8046E34 lsls r0, 24 @@ -341,7 +341,7 @@ sub_8046EAC: @ 8046EAC bx r1 .align 2, 0 _08046EC8: .4byte gSaveBlock1Ptr -_08046ECC: .4byte gUnknown_20370C0 +_08046ECC: .4byte gSpecialVar_0x8004 thumb_func_end sub_8046EAC thumb_func_start sub_8046ED0 @@ -566,7 +566,7 @@ _08047090: str r0, [r4] bl AllocateMonSpritesGfx ldr r2, [r4] - ldr r0, _0804714C @ =gUnknown_20370C0 + ldr r0, _0804714C @ =gSpecialVar_0x8004 ldrh r0, [r0] movs r1, 0 strb r0, [r2, 0x4] @@ -626,7 +626,7 @@ _08047090: b _0804724A .align 2, 0 _08047148: .4byte gUnknown_3000E74 -_0804714C: .4byte gUnknown_20370C0 +_0804714C: .4byte gSpecialVar_0x8004 _08047150: .4byte sub_8046FC0 _08047154: .4byte gSpecialVar_0x8005 _08047158: .4byte gUnknown_826019C @@ -770,7 +770,7 @@ _0804729C: .4byte gUnknown_3000E74 thumb_func_start EggHatchSetMonNickname EggHatchSetMonNickname: @ 80472A0 push {lr} - ldr r0, _080472D0 @ =gUnknown_20370C0 + ldr r0, _080472D0 @ =gSpecialVar_0x8004 ldrh r1, [r0] movs r0, 0x64 muls r0, r1 @@ -789,7 +789,7 @@ EggHatchSetMonNickname: @ 80472A0 pop {r0} bx r0 .align 2, 0 -_080472D0: .4byte gUnknown_20370C0 +_080472D0: .4byte gSpecialVar_0x8004 _080472D4: .4byte gPlayerParty _080472D8: .4byte gStringVar3 _080472DC: .4byte gUnknown_3000E74 diff --git a/asm/event_data.s b/asm/event_data.s index b49620ace..690134c27 100644 --- a/asm/event_data.s +++ b/asm/event_data.s @@ -796,38 +796,38 @@ _0806E6F6: thumb_func_start sub_806E6FC sub_806E6FC: @ 806E6FC - ldr r1, _0806E754 @ =gUnknown_20370B8 + ldr r1, _0806E754 @ =gSpecialVar_0x8000 movs r0, 0 strh r0, [r1] - ldr r1, _0806E758 @ =gUnknown_20370BA + ldr r1, _0806E758 @ =gSpecialVar_0x8001 strh r0, [r1] - ldr r1, _0806E75C @ =gUnknown_20370BC + ldr r1, _0806E75C @ =gSpecialVar_0x8002 strh r0, [r1] - ldr r1, _0806E760 @ =gUnknown_20370BE + ldr r1, _0806E760 @ =gSpecialVar_0x8003 strh r0, [r1] - ldr r1, _0806E764 @ =gUnknown_20370C0 + ldr r1, _0806E764 @ =gSpecialVar_0x8004 strh r0, [r1] ldr r1, _0806E768 @ =gSpecialVar_0x8005 strh r0, [r1] - ldr r1, _0806E76C @ =gUnknown_20370C4 + ldr r1, _0806E76C @ =gSpecialVar_0x8006 strh r0, [r1] - ldr r1, _0806E770 @ =gUnknown_20370C6 + ldr r1, _0806E770 @ =gSpecialVar_0x8007 strh r0, [r1] - ldr r1, _0806E774 @ =gUnknown_20370C8 + ldr r1, _0806E774 @ =gSpecialVar_0x8008 strh r0, [r1] - ldr r1, _0806E778 @ =gUnknown_20370CA + ldr r1, _0806E778 @ =gSpecialVar_0x8009 strh r0, [r1] - ldr r1, _0806E77C @ =gUnknown_20370CC + ldr r1, _0806E77C @ =gSpecialVar_0x800A strh r0, [r1] - ldr r1, _0806E780 @ =gUnknown_20370CE + ldr r1, _0806E780 @ =gSpecialVar_0x800B strh r0, [r1] - ldr r1, _0806E784 @ =gUnknown_20370D4 + ldr r1, _0806E784 @ =gSpecialVar_Facing strh r0, [r1] - ldr r1, _0806E788 @ =gUnknown_20370D0 + ldr r1, _0806E788 @ =gSpecialVar_Result strh r0, [r1] - ldr r1, _0806E78C @ =gUnknown_203AD30 + ldr r1, _0806E78C @ =gSpecialVar_ItemId strh r0, [r1] - ldr r1, _0806E790 @ =gUnknown_20370D2 + ldr r1, _0806E790 @ =gSpecialVar_LastTalked strh r0, [r1] ldr r1, _0806E794 @ =gSpecialVar_MonBoxId strh r0, [r1] @@ -841,22 +841,22 @@ sub_806E6FC: @ 806E6FC strh r0, [r1] bx lr .align 2, 0 -_0806E754: .4byte gUnknown_20370B8 -_0806E758: .4byte gUnknown_20370BA -_0806E75C: .4byte gUnknown_20370BC -_0806E760: .4byte gUnknown_20370BE -_0806E764: .4byte gUnknown_20370C0 +_0806E754: .4byte gSpecialVar_0x8000 +_0806E758: .4byte gSpecialVar_0x8001 +_0806E75C: .4byte gSpecialVar_0x8002 +_0806E760: .4byte gSpecialVar_0x8003 +_0806E764: .4byte gSpecialVar_0x8004 _0806E768: .4byte gSpecialVar_0x8005 -_0806E76C: .4byte gUnknown_20370C4 -_0806E770: .4byte gUnknown_20370C6 -_0806E774: .4byte gUnknown_20370C8 -_0806E778: .4byte gUnknown_20370CA -_0806E77C: .4byte gUnknown_20370CC -_0806E780: .4byte gUnknown_20370CE -_0806E784: .4byte gUnknown_20370D4 -_0806E788: .4byte gUnknown_20370D0 -_0806E78C: .4byte gUnknown_203AD30 -_0806E790: .4byte gUnknown_20370D2 +_0806E76C: .4byte gSpecialVar_0x8006 +_0806E770: .4byte gSpecialVar_0x8007 +_0806E774: .4byte gSpecialVar_0x8008 +_0806E778: .4byte gSpecialVar_0x8009 +_0806E77C: .4byte gSpecialVar_0x800A +_0806E780: .4byte gSpecialVar_0x800B +_0806E784: .4byte gSpecialVar_Facing +_0806E788: .4byte gSpecialVar_Result +_0806E78C: .4byte gSpecialVar_ItemId +_0806E790: .4byte gSpecialVar_LastTalked _0806E794: .4byte gSpecialVar_MonBoxId _0806E798: .4byte gSpecialVar_MonBoxPos _0806E79C: .4byte gUnknown_20370DA diff --git a/asm/field_control_avatar.s b/asm/field_control_avatar.s index 4ae8ad562..9748301f7 100644 --- a/asm/field_control_avatar.s +++ b/asm/field_control_avatar.s @@ -938,13 +938,13 @@ _0806CFBC: ble _0806CFB0 ldr r0, _0806CFE8 @ =gUnknown_3005074 strb r3, [r0] - ldr r1, _0806CFEC @ =gUnknown_20370D2 + ldr r1, _0806CFEC @ =gSpecialVar_LastTalked adds r0, r2, r3 lsls r0, 2 adds r0, r5 ldrb r0, [r0, 0x8] strh r0, [r1] - ldr r0, _0806CFF0 @ =gUnknown_20370D4 + ldr r0, _0806CFF0 @ =gSpecialVar_Facing strh r6, [r0] adds r0, r3, 0 bl GetFieldObjectScriptPointerByFieldObjectId @@ -955,8 +955,8 @@ _0806CFDE: .align 2, 0 _0806CFE4: .4byte gUnknown_2031DEC _0806CFE8: .4byte gUnknown_3005074 -_0806CFEC: .4byte gUnknown_20370D2 -_0806CFF0: .4byte gUnknown_20370D4 +_0806CFEC: .4byte gSpecialVar_LastTalked +_0806CFF0: .4byte gSpecialVar_Facing thumb_func_end sub_806CF38 thumb_func_start sub_806CFF4 @@ -1046,14 +1046,14 @@ _0806D09C: .4byte gUnknown_826D2D8 _0806D0A0: ldr r0, _0806D0D4 @ =gUnknown_3005074 strb r5, [r0] - ldr r4, _0806D0D8 @ =gUnknown_20370D2 + ldr r4, _0806D0D8 @ =gSpecialVar_LastTalked ldr r1, _0806D0DC @ =gMapObjects adds r0, r6, r5 lsls r0, 2 adds r0, r1 ldrb r0, [r0, 0x8] strh r0, [r4] - ldr r0, _0806D0E0 @ =gUnknown_20370D4 + ldr r0, _0806D0E0 @ =gSpecialVar_Facing mov r1, r8 strh r1, [r0] adds r0, r5, 0 @@ -1070,9 +1070,9 @@ _0806D0C8: bx r1 .align 2, 0 _0806D0D4: .4byte gUnknown_3005074 -_0806D0D8: .4byte gUnknown_20370D2 +_0806D0D8: .4byte gSpecialVar_LastTalked _0806D0DC: .4byte gMapObjects -_0806D0E0: .4byte gUnknown_20370D4 +_0806D0E0: .4byte gSpecialVar_Facing thumb_func_end sub_806CFF4 thumb_func_start sub_806D0E4 @@ -1165,12 +1165,12 @@ _0806D17A: ldr r0, [r5, 0x8] movs r1, 0x1 bl sub_80CC44C - ldr r4, _0806D1C8 @ =gUnknown_20370C0 + ldr r4, _0806D1C8 @ =gSpecialVar_0x8004 strh r0, [r4] ldr r0, [r5, 0x8] movs r1, 0x2 bl sub_80CC44C - ldr r1, _0806D1CC @ =gUnknown_20370C4 + ldr r1, _0806D1CC @ =gSpecialVar_0x8006 strh r0, [r1] ldrh r0, [r4] bl FlagGet @@ -1178,22 +1178,22 @@ _0806D17A: lsrs r0, 24 cmp r0, 0x1 beq _0806D164 - ldr r0, _0806D1D0 @ =gUnknown_20370D4 + ldr r0, _0806D1D0 @ =gSpecialVar_Facing strh r6, [r0] ldr r0, _0806D1D4 @ =gUnknown_81A6843 b _0806D1E6 .align 2, 0 _0806D1C4: .4byte gSpecialVar_0x8005 -_0806D1C8: .4byte gUnknown_20370C0 -_0806D1CC: .4byte gUnknown_20370C4 -_0806D1D0: .4byte gUnknown_20370D4 +_0806D1C8: .4byte gSpecialVar_0x8004 +_0806D1CC: .4byte gSpecialVar_0x8006 +_0806D1D0: .4byte gSpecialVar_Facing _0806D1D4: .4byte gUnknown_81A6843 _0806D1D8: cmp r2, 0xFF beq _0806D1E0 bl sub_8069A20 _0806D1E0: - ldr r0, _0806D1EC @ =gUnknown_20370D4 + ldr r0, _0806D1EC @ =gSpecialVar_Facing strh r6, [r0] ldr r0, [r5, 0x8] _0806D1E6: @@ -1201,7 +1201,7 @@ _0806D1E6: pop {r1} bx r1 .align 2, 0 -_0806D1EC: .4byte gUnknown_20370D4 +_0806D1EC: .4byte gSpecialVar_Facing thumb_func_end sub_806D0E4 thumb_func_start sub_806D1F0 @@ -1211,7 +1211,7 @@ sub_806D1F0: @ 806D1F0 lsrs r4, r1, 24 lsls r2, 24 lsrs r5, r2, 24 - ldr r0, _0806D210 @ =gUnknown_20370D4 + ldr r0, _0806D210 @ =gSpecialVar_Facing strh r5, [r0] adds r0, r4, 0 bl MetatileBehavior_IsPC @@ -1222,7 +1222,7 @@ sub_806D1F0: @ 806D1F0 ldr r0, _0806D214 @ =gUnknown_81A6955 b _0806D53E .align 2, 0 -_0806D210: .4byte gUnknown_20370D4 +_0806D210: .4byte gSpecialVar_Facing _0806D214: .4byte gUnknown_81A6955 _0806D218: adds r0, r4, 0 @@ -2114,7 +2114,7 @@ sub_806D908: @ 806D908 push {lr} lsls r1, 24 lsrs r1, 24 - ldr r2, _0806D924 @ =gUnknown_20370D4 + ldr r2, _0806D924 @ =gSpecialVar_Facing strh r1, [r2] bl ScriptContext1_SetupScript bl sub_80699E0 @@ -2122,7 +2122,7 @@ sub_806D908: @ 806D908 pop {r0} bx r0 .align 2, 0 -_0806D924: .4byte gUnknown_20370D4 +_0806D924: .4byte gSpecialVar_Facing thumb_func_end sub_806D908 thumb_func_start sub_806D928 diff --git a/asm/field_poison.s b/asm/field_poison.s index 930f5b403..f76e7db4f 100644 --- a/asm/field_poison.s +++ b/asm/field_poison.s @@ -196,12 +196,12 @@ _080A05B8: adds r1, r0, 0 cmp r1, 0 beq _080A05E8 - ldr r1, _080A05CC @ =gUnknown_20370D0 + ldr r1, _080A05CC @ =gSpecialVar_Result movs r0, 0x1 strh r0, [r1] b _080A05EC .align 2, 0 -_080A05CC: .4byte gUnknown_20370D0 +_080A05CC: .4byte gSpecialVar_Result _080A05D0: ldrb r0, [r4, 0x2] bl MonFaintFromPoisonOnField @@ -214,7 +214,7 @@ _080A05D0: .align 2, 0 _080A05E4: .4byte gUnknown_81A5476 _080A05E8: - ldr r0, _080A05FC @ =gUnknown_20370D0 + ldr r0, _080A05FC @ =gSpecialVar_Result strh r1, [r0] _080A05EC: bl EnableBothScriptContexts @@ -225,7 +225,7 @@ _080A05F6: pop {r0} bx r0 .align 2, 0 -_080A05FC: .4byte gUnknown_20370D0 +_080A05FC: .4byte gSpecialVar_Result thumb_func_end Task_WhiteOut thumb_func_start ExecuteWhiteOut diff --git a/asm/field_specials.s b/asm/field_specials.s index 18b0401a4..a4f3e6dc7 100644 --- a/asm/field_specials.s +++ b/asm/field_specials.s @@ -86,7 +86,7 @@ _080CA698: .4byte gStringVar4 thumb_func_start sub_80CA69C sub_80CA69C: @ 80CA69C - ldr r1, _080CA6B0 @ =gUnknown_20370C0 + ldr r1, _080CA6B0 @ =gSpecialVar_0x8004 ldr r0, _080CA6B4 @ =gSaveBlock1Ptr ldr r2, [r0] ldrh r0, [r2] @@ -96,7 +96,7 @@ sub_80CA69C: @ 80CA69C strh r0, [r1] bx lr .align 2, 0 -_080CA6B0: .4byte gUnknown_20370C0 +_080CA6B0: .4byte gSpecialVar_0x8004 _080CA6B4: .4byte gSaveBlock1Ptr _080CA6B8: .4byte gSpecialVar_0x8005 thumb_func_end sub_80CA69C @@ -188,13 +188,13 @@ _080CA754: .4byte gUnknown_2023E8A thumb_func_start sub_80CA758 sub_80CA758: @ 80CA758 push {lr} - ldr r0, _080CA768 @ =gUnknown_20370C0 + ldr r0, _080CA768 @ =gSpecialVar_0x8004 ldrh r0, [r0] bl FlagSet pop {r0} bx r0 .align 2, 0 -_080CA768: .4byte gUnknown_20370C0 +_080CA768: .4byte gSpecialVar_0x8004 thumb_func_end sub_80CA758 thumb_func_start sub_80CA76C @@ -441,14 +441,14 @@ _080CA92C: _080CA92E: cmp r6, 0 beq _080CA954 - ldr r0, _080CA940 @ =gUnknown_20370C0 + ldr r0, _080CA940 @ =gSpecialVar_0x8004 ldrh r0, [r0] cmp r0, 0 bne _080CA944 movs r4, 0x62 b _080CA96E .align 2, 0 -_080CA940: .4byte gUnknown_20370C0 +_080CA940: .4byte gSpecialVar_0x8004 _080CA944: cmp r0, 0x1 beq _080CA94C @@ -460,14 +460,14 @@ _080CA94C: .align 2, 0 _080CA950: .4byte 0x0000028f _080CA954: - ldr r0, _080CA960 @ =gUnknown_20370C0 + ldr r0, _080CA960 @ =gSpecialVar_0x8004 ldrh r0, [r0] cmp r0, 0 bne _080CA964 movs r4, 0x63 b _080CA96E .align 2, 0 -_080CA960: .4byte gUnknown_20370C0 +_080CA960: .4byte gSpecialVar_0x8004 _080CA964: cmp r0, 0x1 beq _080CA96C @@ -536,14 +536,14 @@ _080CA9D6: _080CA9D8: movs r5, 0xFF _080CA9DA: - ldr r0, _080CA9E8 @ =gUnknown_20370C0 + ldr r0, _080CA9E8 @ =gSpecialVar_0x8004 ldrh r0, [r0] cmp r0, 0 bne _080CA9EC movs r4, 0x62 b _080CA9F6 .align 2, 0 -_080CA9E8: .4byte gUnknown_20370C0 +_080CA9E8: .4byte gSpecialVar_0x8004 _080CA9EC: cmp r0, 0x1 beq _080CA9F4 @@ -867,13 +867,13 @@ sub_80CAC28: @ 80CAC28 movs r2, 0 strh r0, [r1, 0x8] strh r2, [r1, 0xA] - ldr r0, _080CAC78 @ =gUnknown_20370C4 + ldr r0, _080CAC78 @ =gSpecialVar_0x8006 ldrh r0, [r0] strh r0, [r1, 0xC] - ldr r0, _080CAC7C @ =gUnknown_20370C6 + ldr r0, _080CAC7C @ =gSpecialVar_0x8007 ldrh r0, [r0] strh r0, [r1, 0xE] - ldr r0, _080CAC80 @ =gUnknown_20370C0 + ldr r0, _080CAC80 @ =gSpecialVar_0x8004 ldrh r0, [r0] strh r0, [r1, 0x10] movs r0, 0 @@ -886,9 +886,9 @@ sub_80CAC28: @ 80CAC28 _080CAC6C: .4byte sub_80CAC84 _080CAC70: .4byte gTasks _080CAC74: .4byte gSpecialVar_0x8005 -_080CAC78: .4byte gUnknown_20370C4 -_080CAC7C: .4byte gUnknown_20370C6 -_080CAC80: .4byte gUnknown_20370C0 +_080CAC78: .4byte gSpecialVar_0x8006 +_080CAC7C: .4byte gSpecialVar_0x8007 +_080CAC80: .4byte gSpecialVar_0x8004 thumb_func_end sub_80CAC28 thumb_func_start sub_80CAC84 @@ -1002,7 +1002,7 @@ _080CAD4C: thumb_func_start sub_80CAD54 sub_80CAD54: @ 80CAD54 push {lr} - ldr r0, _080CAD74 @ =gUnknown_20370C0 + ldr r0, _080CAD74 @ =gSpecialVar_0x8004 ldrh r1, [r0] movs r0, 0x64 muls r0, r1 @@ -1016,14 +1016,14 @@ sub_80CAD54: @ 80CAD54 pop {r1} bx r1 .align 2, 0 -_080CAD74: .4byte gUnknown_20370C0 +_080CAD74: .4byte gSpecialVar_0x8004 _080CAD78: .4byte gPlayerParty thumb_func_end sub_80CAD54 thumb_func_start sub_80CAD7C sub_80CAD7C: @ 80CAD7C push {r4,lr} - ldr r0, _080CADA8 @ =gUnknown_20370C0 + ldr r0, _080CADA8 @ =gSpecialVar_0x8004 ldrh r1, [r0] movs r0, 0x64 muls r0, r1 @@ -1042,7 +1042,7 @@ sub_80CAD7C: @ 80CAD7C movs r0, 0x1 b _080CADBA .align 2, 0 -_080CADA8: .4byte gUnknown_20370C0 +_080CADA8: .4byte gSpecialVar_0x8004 _080CADAC: .4byte gPlayerParty _080CADB0: .4byte gStringVar1 _080CADB4: .4byte gSaveBlock2Ptr @@ -1092,7 +1092,7 @@ sub_80CADEC: @ 80CADEC adds r0, 0x1 lsls r0, 16 lsrs r2, r0, 16 - ldr r1, _080CAE20 @ =gUnknown_20370C0 + ldr r1, _080CAE20 @ =gSpecialVar_0x8004 strh r2, [r1] ldr r0, _080CAE24 @ =gSpecialVar_0x8005 strh r2, [r0] @@ -1108,7 +1108,7 @@ _080CAE14: ldr r0, [r0] mov pc, r0 .align 2, 0 -_080CAE20: .4byte gUnknown_20370C0 +_080CAE20: .4byte gSpecialVar_0x8004 _080CAE24: .4byte gSpecialVar_0x8005 _080CAE28: .4byte _080CAE2C .align 2, 0 @@ -1353,7 +1353,7 @@ _080CB01C: ldrh r0, [r5] cmp r0, 0xF bls _080CB04C - ldr r0, _080CB044 @ =gUnknown_20370C0 + ldr r0, _080CB044 @ =gSpecialVar_0x8004 ldrh r4, [r0] adds r0, r4, 0 movs r1, 0x5 @@ -1368,7 +1368,7 @@ _080CB01C: b _080CB04A .align 2, 0 _080CB040: .4byte gSpecialVar_0x8005 -_080CB044: .4byte gUnknown_20370C0 +_080CB044: .4byte gSpecialVar_0x8004 _080CB048: adds r0, r4, 0x1 _080CB04A: @@ -1569,9 +1569,9 @@ _080CB1D2: thumb_func_start sub_80CB1D8 sub_80CB1D8: @ 80CB1D8 push {lr} - ldr r0, _080CB1F0 @ =gUnknown_20370D0 + ldr r0, _080CB1F0 @ =gSpecialVar_Result ldrh r1, [r0] - ldr r0, _080CB1F4 @ =gUnknown_20370C4 + ldr r0, _080CB1F4 @ =gSpecialVar_0x8006 ldrh r0, [r0] adds r1, r0 ldr r0, _080CB1F8 @ =0x0000270f @@ -1580,8 +1580,8 @@ sub_80CB1D8: @ 80CB1D8 movs r0, 0x1 b _080CB1FE .align 2, 0 -_080CB1F0: .4byte gUnknown_20370D0 -_080CB1F4: .4byte gUnknown_20370C4 +_080CB1F0: .4byte gSpecialVar_Result +_080CB1F4: .4byte gSpecialVar_0x8006 _080CB1F8: .4byte 0x0000270f _080CB1FC: movs r0, 0 @@ -1956,7 +1956,7 @@ sub_80CB498: @ 80CB498 movs r6, 0x1 strh r6, [r4, 0x8] ldr r0, _080CB4D8 @ =gSpecialVar_0x8005 - ldr r1, _080CB4DC @ =gUnknown_20370C4 + ldr r1, _080CB4DC @ =gSpecialVar_0x8006 ldrh r2, [r0] ldrh r0, [r1] cmp r2, r0 @@ -1970,7 +1970,7 @@ sub_80CB498: @ 80CB498 _080CB4D0: .4byte sub_80CB514 _080CB4D4: .4byte gTasks+0x8 _080CB4D8: .4byte gSpecialVar_0x8005 -_080CB4DC: .4byte gUnknown_20370C4 +_080CB4DC: .4byte gSpecialVar_0x8006 _080CB4E0: subs r0, r2 lsls r0, 16 @@ -2357,7 +2357,7 @@ _080CB7D6: lsls r0, 3 ldr r1, _080CB810 @ =gTasks adds r3, r0, r1 - ldr r0, _080CB814 @ =gUnknown_20370C0 + ldr r0, _080CB814 @ =gSpecialVar_0x8004 ldrh r4, [r0] cmp r4, 0x3 beq _080CB886 @@ -2374,7 +2374,7 @@ _080CB7D6: _080CB808: .4byte sub_809D6D4 _080CB80C: .4byte sub_80CB904 _080CB810: .4byte gTasks -_080CB814: .4byte gUnknown_20370C0 +_080CB814: .4byte gSpecialVar_0x8004 _080CB818: cmp r4, 0x5 beq _080CB8B4 @@ -2490,7 +2490,7 @@ _080CB8E6: strh r5, [r3, 0x26] b _080CB8F8 _080CB8EC: - ldr r1, _080CB900 @ =gUnknown_20370D0 + ldr r1, _080CB900 @ =gSpecialVar_Result movs r0, 0x7F strh r0, [r1] adds r0, r5, 0 @@ -2500,7 +2500,7 @@ _080CB8F8: pop {r0} bx r0 .align 2, 0 -_080CB900: .4byte gUnknown_20370D0 +_080CB900: .4byte gSpecialVar_Result thumb_func_end sub_80CB7C4 thumb_func_start sub_80CB904 @@ -2519,7 +2519,7 @@ sub_80CB904: @ 80CB904 ldr r1, _080CB934 @ =gTasks adds r5, r0, r1 bl ScriptContext2_Enable - ldr r0, _080CB938 @ =gUnknown_20370C0 + ldr r0, _080CB938 @ =gSpecialVar_0x8004 ldrh r0, [r0] cmp r0, 0x1 bne _080CB944 @@ -2530,7 +2530,7 @@ sub_80CB904: @ 80CB904 b _080CB94A .align 2, 0 _080CB934: .4byte gTasks -_080CB938: .4byte gUnknown_20370C0 +_080CB938: .4byte gSpecialVar_0x8004 _080CB93C: .4byte gUnknown_2039A18 _080CB940: .4byte gUnknown_2039A0E _080CB944: @@ -2563,7 +2563,7 @@ _080CB974: lsls r3, r4, 3 adds r3, r0 lsls r2, r4, 2 - ldr r0, _080CBA6C @ =gUnknown_20370C0 + ldr r0, _080CBA6C @ =gSpecialVar_0x8004 ldrh r1, [r0] lsls r0, r1, 1 adds r0, r1 @@ -2676,7 +2676,7 @@ _080CB9D2: _080CBA60: .4byte gUnknown_2039A18 _080CBA64: .4byte gUnknown_2039A14 _080CBA68: .4byte gUnknown_83F5BCC -_080CBA6C: .4byte gUnknown_20370C0 +_080CBA6C: .4byte gSpecialVar_0x8004 _080CBA70: .4byte gUnknown_3005360 _080CBA74: .4byte gTasks _080CBA78: .4byte sub_80CBB28 @@ -2794,16 +2794,16 @@ sub_80CBB28: @ 80CBB28 .align 2, 0 _080CBB54: .4byte gTasks _080CBB58: - ldr r1, _080CBB68 @ =gUnknown_20370D0 + ldr r1, _080CBB68 @ =gSpecialVar_Result movs r0, 0x7F strh r0, [r1] movs r0, 0x5 bl PlaySE b _080CBB88 .align 2, 0 -_080CBB68: .4byte gUnknown_20370D0 +_080CBB68: .4byte gSpecialVar_Result _080CBB6C: - ldr r0, _080CBB90 @ =gUnknown_20370D0 + ldr r0, _080CBB90 @ =gSpecialVar_Result strh r4, [r0] movs r0, 0x5 bl PlaySE @@ -2821,7 +2821,7 @@ _080CBB88: bl sub_80CBBAC b _080CBBA2 .align 2, 0 -_080CBB90: .4byte gUnknown_20370D0 +_080CBB90: .4byte gSpecialVar_Result _080CBB94: adds r0, r5, 0 bl sub_80CBD50 @@ -3123,7 +3123,7 @@ _080CBDC8: .4byte 0x00004031 thumb_func_start sub_80CBDCC sub_80CBDCC: @ 80CBDCC push {lr} - ldr r0, _080CBDE4 @ =gUnknown_20370C0 + ldr r0, _080CBDE4 @ =gSpecialVar_0x8004 ldrh r0, [r0] bl SpeciesToNationalPokedexNum lsls r0, 16 @@ -3133,7 +3133,7 @@ sub_80CBDCC: @ 80CBDCC pop {r0} bx r0 .align 2, 0 -_080CBDE4: .4byte gUnknown_20370C0 +_080CBDE4: .4byte gSpecialVar_0x8004 thumb_func_end sub_80CBDCC thumb_func_start sub_80CBDE8 @@ -3371,7 +3371,7 @@ _080CBF9A: thumb_func_start sub_80CBFA0 sub_80CBFA0: @ 80CBFA0 push {r4,lr} - ldr r0, _080CBFC8 @ =gUnknown_20370C0 + ldr r0, _080CBFC8 @ =gSpecialVar_0x8004 ldrh r1, [r0] movs r0, 0x64 muls r0, r1 @@ -3389,7 +3389,7 @@ sub_80CBFA0: @ 80CBFA0 movs r0, 0x1 b _080CBFDA .align 2, 0 -_080CBFC8: .4byte gUnknown_20370C0 +_080CBFC8: .4byte gSpecialVar_0x8004 _080CBFCC: .4byte gPlayerParty _080CBFD0: .4byte gStringVar1 _080CBFD4: .4byte gStringVar3 @@ -3486,7 +3486,7 @@ ChangePokemonNickname: @ 80CC088 mov r4, r8 push {r4-r6} sub sp, 0x8 - ldr r0, _080CC130 @ =gUnknown_20370C0 + ldr r0, _080CC130 @ =gSpecialVar_0x8004 mov r9, r0 ldrh r0, [r0] movs r1, 0x64 @@ -3558,7 +3558,7 @@ ChangePokemonNickname: @ 80CC088 pop {r0} bx r0 .align 2, 0 -_080CC130: .4byte gUnknown_20370C0 +_080CC130: .4byte gSpecialVar_0x8004 _080CC134: .4byte gPlayerParty _080CC138: .4byte gStringVar3 _080CC13C: .4byte gStringVar2 @@ -3568,7 +3568,7 @@ _080CC140: .4byte ChangePokemonNickname_CB thumb_func_start ChangePokemonNickname_CB ChangePokemonNickname_CB: @ 80CC144 push {lr} - ldr r0, _080CC164 @ =gUnknown_20370C0 + ldr r0, _080CC164 @ =gSpecialVar_0x8004 ldrh r1, [r0] movs r0, 0x64 muls r0, r1 @@ -3581,7 +3581,7 @@ ChangePokemonNickname_CB: @ 80CC144 pop {r0} bx r0 .align 2, 0 -_080CC164: .4byte gUnknown_20370C0 +_080CC164: .4byte gSpecialVar_0x8004 _080CC168: .4byte gPlayerParty _080CC16C: .4byte gStringVar2 thumb_func_end ChangePokemonNickname_CB @@ -3589,7 +3589,7 @@ _080CC16C: .4byte gStringVar2 thumb_func_start TV_CopyNicknameToStringVar1AndEnsureTerminated TV_CopyNicknameToStringVar1AndEnsureTerminated: @ 80CC170 push {r4,lr} - ldr r0, _080CC194 @ =gUnknown_20370C0 + ldr r0, _080CC194 @ =gSpecialVar_0x8004 ldrh r1, [r0] movs r0, 0x64 muls r0, r1 @@ -3605,7 +3605,7 @@ TV_CopyNicknameToStringVar1AndEnsureTerminated: @ 80CC170 pop {r0} bx r0 .align 2, 0 -_080CC194: .4byte gUnknown_20370C0 +_080CC194: .4byte gSpecialVar_0x8004 _080CC198: .4byte gPlayerParty _080CC19C: .4byte gStringVar1 thumb_func_end TV_CopyNicknameToStringVar1AndEnsureTerminated @@ -3615,7 +3615,7 @@ TV_CheckMonOTIDEqualsPlayerID: @ 80CC1A0 push {r4,lr} bl sub_80CC1E4 adds r4, r0, 0 - ldr r0, _080CC1C8 @ =gUnknown_20370C0 + ldr r0, _080CC1C8 @ =gSpecialVar_0x8004 ldrh r1, [r0] movs r0, 0x64 muls r0, r1 @@ -3626,15 +3626,15 @@ TV_CheckMonOTIDEqualsPlayerID: @ 80CC1A0 bl GetMonData cmp r4, r0 bne _080CC1D4 - ldr r1, _080CC1D0 @ =gUnknown_20370D0 + ldr r1, _080CC1D0 @ =gSpecialVar_Result movs r0, 0 b _080CC1D8 .align 2, 0 -_080CC1C8: .4byte gUnknown_20370C0 +_080CC1C8: .4byte gSpecialVar_0x8004 _080CC1CC: .4byte gPlayerParty -_080CC1D0: .4byte gUnknown_20370D0 +_080CC1D0: .4byte gSpecialVar_Result _080CC1D4: - ldr r1, _080CC1E0 @ =gUnknown_20370D0 + ldr r1, _080CC1E0 @ =gSpecialVar_Result movs r0, 0x1 _080CC1D8: strh r0, [r1] @@ -3642,7 +3642,7 @@ _080CC1D8: pop {r0} bx r0 .align 2, 0 -_080CC1E0: .4byte gUnknown_20370D0 +_080CC1E0: .4byte gSpecialVar_Result thumb_func_end TV_CheckMonOTIDEqualsPlayerID thumb_func_start sub_80CC1E4 @@ -3863,7 +3863,7 @@ _080CC318: adds r0, r4, 0 bl VarSet ldr r0, _080CC3C4 @ =0x00004042 - ldr r1, _080CC3C8 @ =gUnknown_20370C0 + ldr r1, _080CC3C8 @ =gSpecialVar_0x8004 ldrh r1, [r1] bl VarSet add sp, 0x24 @@ -3874,21 +3874,21 @@ _080CC318: _080CC3BC: .4byte gPlayerParty _080CC3C0: .4byte 0x00004043 _080CC3C4: .4byte 0x00004042 -_080CC3C8: .4byte gUnknown_20370C0 +_080CC3C8: .4byte gSpecialVar_0x8004 thumb_func_end sub_80CC2BC thumb_func_start sub_80CC3CC sub_80CC3CC: @ 80CC3CC push {r4-r6,lr} movs r5, 0 - ldr r4, _080CC3F8 @ =gUnknown_20370C0 + ldr r4, _080CC3F8 @ =gSpecialVar_0x8004 movs r0, 0xA bl GetGameStat strh r0, [r4] movs r0, 0xD bl GetGameStat adds r6, r0, 0 - ldr r4, _080CC3FC @ =gUnknown_20370C4 + ldr r4, _080CC3FC @ =gSpecialVar_0x8006 movs r0, 0x17 bl GetGameStat strh r0, [r4] @@ -3899,8 +3899,8 @@ sub_80CC3CC: @ 80CC3CC strh r1, [r0] b _080CC40C .align 2, 0 -_080CC3F8: .4byte gUnknown_20370C0 -_080CC3FC: .4byte gUnknown_20370C4 +_080CC3F8: .4byte gSpecialVar_0x8004 +_080CC3FC: .4byte gSpecialVar_0x8006 _080CC400: .4byte 0x0000ffff _080CC404: .4byte gSpecialVar_0x8005 _080CC408: @@ -3908,7 +3908,7 @@ _080CC408: strh r6, [r0] _080CC40C: adds r1, r0, 0 - ldr r0, _080CC444 @ =gUnknown_20370C0 + ldr r0, _080CC444 @ =gSpecialVar_0x8004 ldrh r0, [r0] cmp r0, 0 beq _080CC41A @@ -3923,7 +3923,7 @@ _080CC41A: lsls r0, r5, 16 lsrs r5, r0, 16 _080CC428: - ldr r0, _080CC448 @ =gUnknown_20370C4 + ldr r0, _080CC448 @ =gSpecialVar_0x8006 ldrh r0, [r0] cmp r0, 0 beq _080CC438 @@ -3938,8 +3938,8 @@ _080CC438: bx r1 .align 2, 0 _080CC440: .4byte gSpecialVar_0x8005 -_080CC444: .4byte gUnknown_20370C0 -_080CC448: .4byte gUnknown_20370C4 +_080CC444: .4byte gSpecialVar_0x8004 +_080CC448: .4byte gSpecialVar_0x8006 thumb_func_end sub_80CC3CC thumb_func_start sub_80CC44C @@ -3999,7 +3999,7 @@ _080CC49C: movs r1, 0x41 movs r2, 0 bl GetMonData - ldr r1, _080CC4BC @ =gUnknown_20370C0 + ldr r1, _080CC4BC @ =gSpecialVar_0x8004 ldrh r1, [r1] cmp r0, r1 bne _080CC4C0 @@ -4007,7 +4007,7 @@ _080CC49C: b _080CC4CC .align 2, 0 _080CC4B8: .4byte gPlayerParty -_080CC4BC: .4byte gUnknown_20370C0 +_080CC4BC: .4byte gSpecialVar_0x8004 _080CC4C0: adds r0, r4, 0x1 lsls r0, 24 @@ -4331,7 +4331,7 @@ _080CC72C: .4byte 0x0000404d thumb_func_start sub_80CC730 sub_80CC730: @ 80CC730 push {lr} - ldr r0, _080CC744 @ =gUnknown_20370D0 + ldr r0, _080CC744 @ =gSpecialVar_Result ldrh r0, [r0] cmp r0, 0x4 bhi _080CC77C @@ -4341,7 +4341,7 @@ sub_80CC730: @ 80CC730 ldr r0, [r0] mov pc, r0 .align 2, 0 -_080CC744: .4byte gUnknown_20370D0 +_080CC744: .4byte gSpecialVar_Result _080CC748: .4byte _080CC74C .align 2, 0 _080CC74C: @@ -4548,7 +4548,7 @@ _080CC8C4: thumb_func_start sub_80CC8CC sub_80CC8CC: @ 80CC8CC push {r4,lr} - ldr r1, _080CC8E4 @ =gUnknown_20370C0 + ldr r1, _080CC8E4 @ =gSpecialVar_0x8004 ldr r2, _080CC8E8 @ =0xfffffedf adds r0, r2, 0 ldrh r2, [r1] @@ -4560,7 +4560,7 @@ sub_80CC8CC: @ 80CC8CC movs r0, 0 b _080CC908 .align 2, 0 -_080CC8E4: .4byte gUnknown_20370C0 +_080CC8E4: .4byte gSpecialVar_0x8004 _080CC8E8: .4byte 0xfffffedf _080CC8EC: ldr r4, _080CC910 @ =gStringVar1 @@ -4612,7 +4612,7 @@ _080CC944: .4byte 0x000001f3 thumb_func_start sub_80CC948 sub_80CC948: @ 80CC948 push {lr} - ldr r0, _080CC968 @ =gUnknown_20370C0 + ldr r0, _080CC968 @ =gSpecialVar_0x8004 ldrh r1, [r0] movs r0, 0x64 muls r0, r1 @@ -4626,7 +4626,7 @@ sub_80CC948: @ 80CC948 pop {r0} bx r0 .align 2, 0 -_080CC968: .4byte gUnknown_20370C0 +_080CC968: .4byte gSpecialVar_0x8004 _080CC96C: .4byte gPlayerParty _080CC970: .4byte 0x00004025 thumb_func_end sub_80CC948 @@ -4904,7 +4904,7 @@ sub_80CCB94: @ 80CCB94 lsls r0, 24 lsrs r0, 24 mov r8, r0 - ldr r0, _080CCBC0 @ =gUnknown_20370C6 + ldr r0, _080CCBC0 @ =gSpecialVar_0x8007 mov r1, r8 strh r1, [r0] movs r4, 0 @@ -4915,7 +4915,7 @@ sub_80CCB94: @ 80CCB94 mov r9, r0 b _080CCBCE .align 2, 0 -_080CCBC0: .4byte gUnknown_20370C6 +_080CCBC0: .4byte gSpecialVar_0x8007 _080CCBC4: .4byte gPlayerParty _080CCBC8: adds r0, r4, 0x1 @@ -5045,7 +5045,7 @@ _080CCCCC: lsls r0, 24 lsrs r6, r0, 24 _080CCCDE: - ldr r0, _080CCCF4 @ =gUnknown_20370C4 + ldr r0, _080CCCF4 @ =gSpecialVar_0x8006 strh r6, [r0] movs r0, 0x1 _080CCCE4: @@ -5057,7 +5057,7 @@ _080CCCE4: bx r1 .align 2, 0 _080CCCF0: .4byte gPlayerParty -_080CCCF4: .4byte gUnknown_20370C4 +_080CCCF4: .4byte gSpecialVar_0x8006 thumb_func_end sub_80CCB94 thumb_func_start sub_80CCCF8 @@ -5216,12 +5216,12 @@ task_deoxys_sound: @ 80CCE10 lsrs r0, 24 cmp r0, 0x1 bne _080CCE38 - ldr r1, _080CCE34 @ =gUnknown_20370D0 + ldr r1, _080CCE34 @ =gSpecialVar_Result movs r0, 0x3 b _080CCE9E .align 2, 0 _080CCE30: .4byte 0x00000848 -_080CCE34: .4byte gUnknown_20370D0 +_080CCE34: .4byte gSpecialVar_Result _080CCE38: ldr r0, _080CCE80 @ =0x0000403e mov r8, r0 @@ -5249,7 +5249,7 @@ _080CCE38: mov r0, r8 movs r1, 0 bl VarSet - ldr r1, _080CCE8C @ =gUnknown_20370D0 + ldr r1, _080CCE8C @ =gSpecialVar_Result movs r0, 0 strh r0, [r1] b _080CCEA4 @@ -5257,13 +5257,13 @@ _080CCE38: _080CCE80: .4byte 0x0000403e _080CCE84: .4byte 0x00004026 _080CCE88: .4byte gUnknown_83F637C -_080CCE8C: .4byte gUnknown_20370D0 +_080CCE8C: .4byte gSpecialVar_Result _080CCE90: cmp r5, 0xA bne _080CCEB4 ldr r0, _080CCEAC @ =0x00000848 bl FlagSet - ldr r1, _080CCEB0 @ =gUnknown_20370D0 + ldr r1, _080CCEB0 @ =gSpecialVar_Result movs r0, 0x2 _080CCE9E: strh r0, [r1] @@ -5274,7 +5274,7 @@ _080CCEA4: b _080CCED6 .align 2, 0 _080CCEAC: .4byte 0x00000848 -_080CCEB0: .4byte gUnknown_20370D0 +_080CCEB0: .4byte gSpecialVar_Result _080CCEB4: adds r0, r5, 0x1 lsls r0, 16 @@ -5285,7 +5285,7 @@ _080CCEB4: ldr r0, _080CCEE0 @ =0x0000403e adds r1, r5, 0 bl VarSet - ldr r1, _080CCEE4 @ =gUnknown_20370D0 + ldr r1, _080CCEE4 @ =gSpecialVar_Result movs r0, 0x1 strh r0, [r1] adds r0, r7, 0 @@ -5298,7 +5298,7 @@ _080CCED6: bx r0 .align 2, 0 _080CCEE0: .4byte 0x0000403e -_080CCEE4: .4byte gUnknown_20370D0 +_080CCEE4: .4byte gSpecialVar_Result thumb_func_end task_deoxys_sound thumb_func_start sub_80CCEE8 @@ -5528,12 +5528,12 @@ sub_80CD098: @ 80CD098 ldrb r0, [r0] cmp r0, 0x2 beq _080CD0E8 - ldr r0, _080CD0D0 @ =gUnknown_20370C0 + ldr r0, _080CD0D0 @ =gSpecialVar_0x8004 ldrh r0, [r0] adds r0, 0x1B lsls r0, 16 lsrs r1, r0, 16 - ldr r0, _080CD0D4 @ =gUnknown_20370C4 + ldr r0, _080CD0D4 @ =gSpecialVar_0x8006 ldrh r3, [r0] cmp r3, 0 bne _080CD0E0 @@ -5548,8 +5548,8 @@ sub_80CD098: @ 80CD098 b _080CD0E8 .align 2, 0 _080CD0CC: .4byte gUnknown_203ADFA -_080CD0D0: .4byte gUnknown_20370C0 -_080CD0D4: .4byte gUnknown_20370C4 +_080CD0D0: .4byte gSpecialVar_0x8004 +_080CD0D4: .4byte gSpecialVar_0x8006 _080CD0D8: .4byte gSpecialVar_0x8005 _080CD0DC: .4byte gUnknown_2039A1B _080CD0E0: @@ -5583,7 +5583,7 @@ _080CD104: movs r1, 0x41 movs r2, 0 bl GetMonData - ldr r1, _080CD13C @ =gUnknown_20370C0 + ldr r1, _080CD13C @ =gSpecialVar_0x8004 ldrh r1, [r1] cmp r0, r1 bne _080CD140 @@ -5599,7 +5599,7 @@ _080CD104: b _080CD14C .align 2, 0 _080CD138: .4byte gPlayerParty -_080CD13C: .4byte gUnknown_20370C0 +_080CD13C: .4byte gSpecialVar_0x8004 _080CD140: adds r0, r6, 0x1 lsls r0, 24 @@ -5708,7 +5708,7 @@ sub_80CD1CC: @ 80CD1CC _080CD200: movs r0, 0 ldrsh r1, [r4, r0] - ldr r0, _080CD224 @ =gUnknown_20370C0 + ldr r0, _080CD224 @ =gSpecialVar_0x8004 ldrh r0, [r0] subs r0, 0x1 cmp r1, r0 @@ -5722,7 +5722,7 @@ _080CD214: .align 2, 0 _080CD21C: .4byte gTasks+0x8 _080CD220: .4byte gSpecialVar_0x8005 -_080CD224: .4byte gUnknown_20370C0 +_080CD224: .4byte gSpecialVar_0x8004 thumb_func_end sub_80CD1CC .align 2, 0 @ Don't pad with nop. diff --git a/asm/fldeff_strength.s b/asm/fldeff_strength.s index 0c70bdf36..778f2c916 100644 --- a/asm/fldeff_strength.s +++ b/asm/fldeff_strength.s @@ -23,7 +23,7 @@ _080D0808: movs r0, 0 b _080D0826 _080D080C: - ldr r4, _080D082C @ =gUnknown_20370D0 + ldr r4, _080D082C @ =gSpecialVar_Result bl GetCursorSelectionMonId lsls r0, 24 lsrs r0, 24 @@ -40,7 +40,7 @@ _080D0826: pop {r1} bx r1 .align 2, 0 -_080D082C: .4byte gUnknown_20370D0 +_080D082C: .4byte gSpecialVar_Result _080D0830: .4byte gUnknown_3005024 _080D0834: .4byte hm_add_c3_launch_phase_2 _080D0838: .4byte gUnknown_203B0C4 diff --git a/asm/heal_location.s b/asm/heal_location.s index 33732a934..34eb1461b 100644 --- a/asm/heal_location.s +++ b/asm/heal_location.s @@ -112,7 +112,7 @@ sub_80BFCD0: @ 80BFCD0 movs r1, 0 bl VarSet _080BFD0A: - ldr r0, _080BFD34 @ =gUnknown_20370D2 + ldr r0, _080BFD34 @ =gSpecialVar_LastTalked strh r5, [r0] movs r0, 0x4 strh r0, [r4, 0x4] @@ -130,7 +130,7 @@ _080BFD24: .4byte 0x00004082 _080BFD28: .4byte gSaveBlock1Ptr _080BFD2C: .4byte 0x00003d34 _080BFD30: .4byte 0x00003d42 -_080BFD34: .4byte gUnknown_20370D2 +_080BFD34: .4byte gSpecialVar_LastTalked _080BFD38: ldr r0, _080BFD7C @ =gSaveBlock1Ptr ldr r1, [r0] @@ -239,7 +239,7 @@ _080BFDFA: thumb_func_start sub_80BFE00 sub_80BFE00: @ 80BFE00 - ldr r2, _080BFE10 @ =gUnknown_20370D2 + ldr r2, _080BFE10 @ =gSpecialVar_LastTalked ldr r1, _080BFE14 @ =gUnknown_83EECE8 subs r0, 0x1 adds r0, r1 @@ -247,7 +247,7 @@ sub_80BFE00: @ 80BFE00 strh r0, [r2] bx lr .align 2, 0 -_080BFE10: .4byte gUnknown_20370D2 +_080BFE10: .4byte gSpecialVar_LastTalked _080BFE14: .4byte gUnknown_83EECE8 thumb_func_end sub_80BFE00 diff --git a/asm/help_system_812B1E0.s b/asm/help_system_812B1E0.s index b95ad8666..d254207a4 100644 --- a/asm/help_system_812B1E0.s +++ b/asm/help_system_812B1E0.s @@ -49,13 +49,13 @@ _0812B21C: .4byte gUnknown_203B0EC thumb_func_start sub_812B220 sub_812B220: @ 812B220 ldr r0, _0812B22C @ =gUnknown_203B0EC - ldr r1, _0812B230 @ =gUnknown_20370C0 + ldr r1, _0812B230 @ =gSpecialVar_0x8004 ldrh r1, [r1] strh r1, [r0] bx lr .align 2, 0 _0812B22C: .4byte gUnknown_203B0EC -_0812B230: .4byte gUnknown_20370C0 +_0812B230: .4byte gSpecialVar_0x8004 thumb_func_end sub_812B220 thumb_func_start sub_812B234 diff --git a/asm/item.s b/asm/item.s index 08df51656..aa64e54fa 100644 --- a/asm/item.s +++ b/asm/item.s @@ -326,13 +326,13 @@ sub_8099FAC: @ 8099FAC .align 2, 0 _08099FC0: .4byte 0x0000016d _08099FC4: - ldr r1, _08099FD0 @ =gUnknown_20370D0 + ldr r1, _08099FD0 @ =gSpecialVar_Result movs r0, 0x1 strh r0, [r1] movs r0, 0x1 b _08099FF6 .align 2, 0 -_08099FD0: .4byte gUnknown_20370D0 +_08099FD0: .4byte gSpecialVar_Result _08099FD4: movs r4, 0x85 _08099FD6: @@ -349,7 +349,7 @@ _08099FD6: cmp r4, 0xAF bls _08099FD6 _08099FF0: - ldr r0, _08099FFC @ =gUnknown_20370D0 + ldr r0, _08099FFC @ =gSpecialVar_Result strh r1, [r0] movs r0, 0 _08099FF6: @@ -357,7 +357,7 @@ _08099FF6: pop {r1} bx r1 .align 2, 0 -_08099FFC: .4byte gUnknown_20370D0 +_08099FFC: .4byte gSpecialVar_Result thumb_func_end sub_8099FAC thumb_func_start sub_809A000 diff --git a/asm/item_menu.s b/asm/item_menu.s index 8650e912d..58b74acf3 100644 --- a/asm/item_menu.s +++ b/asm/item_menu.s @@ -94,7 +94,7 @@ _08107E5A: strb r0, [r2, 0x5] movs r1, 0 ldr r4, _08107EA4 @ =gTextFlags - ldr r5, _08107EA8 @ =gUnknown_203AD30 + ldr r5, _08107EA8 @ =gSpecialVar_ItemId ldr r6, _08107EAC @ =sub_8107F10 ldr r3, _08107EB0 @ =gUnknown_203AD10 movs r2, 0 @@ -132,7 +132,7 @@ _08107E9A: bx r0 .align 2, 0 _08107EA4: .4byte gTextFlags -_08107EA8: .4byte gUnknown_203AD30 +_08107EA8: .4byte gSpecialVar_ItemId _08107EAC: .4byte sub_8107F10 _08107EB0: .4byte gUnknown_203AD10 _08107EB4: .4byte gUnknown_203ACFC @@ -2367,7 +2367,7 @@ _08109014: .4byte gUnknown_203ACFC _08109018: movs r0, 0x5 bl PlaySE - ldr r1, _08109038 @ =gUnknown_203AD30 + ldr r1, _08109038 @ =gSpecialVar_ItemId movs r0, 0 strh r0, [r1] bl sub_8108CB4 @@ -2379,7 +2379,7 @@ _08109018: ldr r1, _08109040 @ =sub_8108B50 b _081090C4 .align 2, 0 -_08109038: .4byte gUnknown_203AD30 +_08109038: .4byte gSpecialVar_ItemId _0810903C: .4byte gTasks _08109040: .4byte sub_8108B50 _08109044: @@ -2393,7 +2393,7 @@ _08109044: ldrb r0, [r0] cmp r4, r0 bne _08109084 - ldr r1, _08109078 @ =gUnknown_203AD30 + ldr r1, _08109078 @ =gSpecialVar_ItemId movs r0, 0 strh r0, [r1] bl sub_8108CB4 @@ -2406,7 +2406,7 @@ _08109044: b _081090C4 .align 2, 0 _08109074: .4byte gUnknown_203AD10 -_08109078: .4byte gUnknown_203AD30 +_08109078: .4byte gSpecialVar_ItemId _0810907C: .4byte gTasks _08109080: .4byte sub_8108B50 _08109084: @@ -2430,7 +2430,7 @@ _08109084: lsrs r0, 24 adds r1, r4, 0 bl sub_809A798 - ldr r1, _081090D0 @ =gUnknown_203AD30 + ldr r1, _081090D0 @ =gSpecialVar_ItemId strh r0, [r1] ldr r1, _081090D4 @ =gTasks lsls r0, r6, 2 @@ -2446,7 +2446,7 @@ _081090C6: pop {r0} bx r0 .align 2, 0 -_081090D0: .4byte gUnknown_203AD30 +_081090D0: .4byte gSpecialVar_ItemId _081090D4: .4byte gTasks _081090D8: .4byte sub_81090DC thumb_func_end sub_8108F0C @@ -3404,7 +3404,7 @@ _081098AC: beq _08109924 b _0810993C _081098B6: - ldr r2, _081098D4 @ =gUnknown_203AD30 + ldr r2, _081098D4 @ =gSpecialVar_ItemId ldrh r1, [r2] ldr r0, _081098D8 @ =0x0000016d cmp r1, r0 @@ -3420,7 +3420,7 @@ _081098B6: movs r0, 0x2 b _08109AD0 .align 2, 0 -_081098D4: .4byte gUnknown_203AD30 +_081098D4: .4byte gSpecialVar_ItemId _081098D8: .4byte 0x0000016d _081098DC: .4byte gUnknown_203AD20 _081098E0: .4byte gUnknown_203AD24 @@ -3473,7 +3473,7 @@ _0810993C: cmp r0, 0x1 bne _081099C4 _08109950: - ldr r1, _08109970 @ =gUnknown_203AD30 + ldr r1, _08109970 @ =gSpecialVar_ItemId ldr r2, _08109974 @ =0xfffffe94 adds r0, r2, 0 ldrh r1, [r1] @@ -3489,7 +3489,7 @@ _08109950: movs r0, 0x2 b _08109AD0 .align 2, 0 -_08109970: .4byte gUnknown_203AD30 +_08109970: .4byte gSpecialVar_ItemId _08109974: .4byte 0xfffffe94 _08109978: .4byte gUnknown_203AD24 _0810997C: .4byte gUnknown_8452F2E @@ -3549,7 +3549,7 @@ _081099EC: ldr r4, _08109A0C @ =gUnknown_203AD28 movs r0, 0x4 strb r0, [r4] - ldr r0, _08109A10 @ =gUnknown_203AD30 + ldr r0, _08109A10 @ =gSpecialVar_ItemId ldrh r0, [r0] bl itemid_is_mail lsls r0, 24 @@ -3563,7 +3563,7 @@ _081099EC: b _08109AD4 .align 2, 0 _08109A0C: .4byte gUnknown_203AD28 -_08109A10: .4byte gUnknown_203AD30 +_08109A10: .4byte gSpecialVar_ItemId _08109A14: .4byte gUnknown_203AD24 _08109A18: .4byte gUnknown_8452F24 _08109A1C: @@ -3591,7 +3591,7 @@ _08109A34: ldr r0, [r0] ldr r1, _08109A6C @ =0x00000296 adds r0, r1 - ldr r1, _08109A70 @ =gUnknown_203AD30 + ldr r1, _08109A70 @ =gSpecialVar_ItemId ldrh r0, [r0] adds r7, r3, 0 ldrh r3, [r1] @@ -3605,7 +3605,7 @@ _08109A60: .4byte gUnknown_203AD20 _08109A64: .4byte gUnknown_203AD28 _08109A68: .4byte gSaveBlock1Ptr _08109A6C: .4byte 0x00000296 -_08109A70: .4byte gUnknown_203AD30 +_08109A70: .4byte gSpecialVar_ItemId _08109A74: movs r0, 0x2 _08109A76: @@ -3722,7 +3722,7 @@ _08109AD4: adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 - ldr r0, _08109BA8 @ =gUnknown_203AD30 + ldr r0, _08109BA8 @ =gSpecialVar_ItemId ldrh r0, [r0] ldr r1, _08109BAC @ =gStringVar1 bl sub_8099E90 @@ -3751,7 +3751,7 @@ _08109B98: .4byte gUnknown_203AD24 _08109B9C: .4byte gUnknown_8452F18 _08109BA0: .4byte gUnknown_203AD28 _08109BA4: .4byte gUnknown_8452EB8 -_08109BA8: .4byte gUnknown_203AD30 +_08109BA8: .4byte gSpecialVar_ItemId _08109BAC: .4byte gStringVar1 _08109BB0: .4byte gStringVar4 _08109BB4: .4byte gUnknown_84162FF @@ -3838,7 +3838,7 @@ sub_8109C50: @ 8109C50 push {r4,r5,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r5, _08109CA0 @ =gUnknown_203AD30 + ldr r5, _08109CA0 @ =gSpecialVar_ItemId ldrh r0, [r5] bl ItemId_GetFieldFunc cmp r0, 0 @@ -3867,9 +3867,9 @@ sub_8109C50: @ 8109C50 bl sub_810A170 b _08109CB4 .align 2, 0 -_08109CA0: .4byte gUnknown_203AD30 +_08109CA0: .4byte gSpecialVar_ItemId _08109CA4: - ldr r0, _08109CBC @ =gUnknown_203AD30 + ldr r0, _08109CBC @ =gSpecialVar_ItemId ldrh r0, [r0] bl ItemId_GetFieldFunc adds r1, r0, 0 @@ -3880,7 +3880,7 @@ _08109CB4: pop {r0} bx r0 .align 2, 0 -_08109CBC: .4byte gUnknown_203AD30 +_08109CBC: .4byte gSpecialVar_ItemId thumb_func_end sub_8109C50 thumb_func_start sub_8109CC0 @@ -4197,7 +4197,7 @@ sub_8109F44: @ 8109F44 _08109F6E: movs r0, 0x5 bl PlaySE - ldr r0, _08109FF4 @ =gUnknown_203AD30 + ldr r0, _08109FF4 @ =gSpecialVar_ItemId ldrh r0, [r0] ldrh r1, [r7, 0x10] bl sub_809A1D8 @@ -4249,7 +4249,7 @@ _08109FE0: .align 2, 0 _08109FEC: .4byte gTasks+0x8 _08109FF0: .4byte gMain -_08109FF4: .4byte gUnknown_203AD30 +_08109FF4: .4byte gSpecialVar_ItemId _08109FF8: .4byte gUnknown_203ACFC _08109FFC: .4byte gUnknown_3005E70 thumb_func_end sub_8109F44 @@ -4444,7 +4444,7 @@ sub_810A18C: @ 810A18C adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 - ldr r0, _0810A1BC @ =gUnknown_203AD30 + ldr r0, _0810A1BC @ =gSpecialVar_ItemId ldrh r0, [r0] ldr r1, _0810A1C0 @ =gStringVar1 bl sub_8099E90 @@ -4461,7 +4461,7 @@ sub_810A18C: @ 810A18C pop {r0} bx r0 .align 2, 0 -_0810A1BC: .4byte gUnknown_203AD30 +_0810A1BC: .4byte gSpecialVar_ItemId _0810A1C0: .4byte gStringVar1 _0810A1C4: .4byte gStringVar4 _0810A1C8: .4byte gUnknown_841635E @@ -4634,7 +4634,7 @@ sub_810A324: @ 810A324 push {r4,r5,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r5, _0810A36C @ =gUnknown_203AD30 + ldr r5, _0810A36C @ =gSpecialVar_ItemId ldrh r0, [r5] bl ItemId_GetBattleFunc cmp r0, 0 @@ -4660,7 +4660,7 @@ _0810A364: pop {r0} bx r0 .align 2, 0 -_0810A36C: .4byte gUnknown_203AD30 +_0810A36C: .4byte gSpecialVar_ItemId thumb_func_end sub_810A324 thumb_func_start sub_810A370 @@ -4936,7 +4936,7 @@ sub_810A568: @ 810A568 lsls r0, 3 ldr r1, _0810A58C @ =gTasks+0x8 adds r4, r0, r1 - ldr r6, _0810A590 @ =gUnknown_203AD30 + ldr r6, _0810A590 @ =gSpecialVar_ItemId ldrh r1, [r6] movs r0, 0xB6 lsls r0, 1 @@ -4946,7 +4946,7 @@ sub_810A568: @ 810A568 b _0810A5A0 .align 2, 0 _0810A58C: .4byte gTasks+0x8 -_0810A590: .4byte gUnknown_203AD30 +_0810A590: .4byte gSpecialVar_ItemId _0810A594: .4byte sub_810A654 _0810A598: ldr r0, _0810A5AC @ =0x0000016d @@ -5394,7 +5394,7 @@ sub_810A940: @ 810A940 bl PutWindowTilemap movs r0, 0 bl schedule_bg_copy_tilemap_to_vram - ldr r0, _0810A9B8 @ =gUnknown_203AD30 + ldr r0, _0810A9B8 @ =gSpecialVar_ItemId ldrh r0, [r0] ldr r1, _0810A9BC @ =gStringVar1 bl sub_8099E90 @@ -5432,7 +5432,7 @@ sub_810A940: @ 810A940 bx r0 .align 2, 0 _0810A9B4: .4byte gTasks+0x8 -_0810A9B8: .4byte gUnknown_203AD30 +_0810A9B8: .4byte gSpecialVar_ItemId _0810A9BC: .4byte gStringVar1 _0810A9C0: .4byte gStringVar3 _0810A9C4: .4byte gUnknown_203ACFC @@ -5460,7 +5460,7 @@ sub_810A9D4: @ 810A9D4 mov r8, r1 movs r0, 0xF8 bl PlaySE - ldr r5, _0810AADC @ =gUnknown_203AD30 + ldr r5, _0810AADC @ =gSpecialVar_ItemId ldrh r0, [r5] mov r2, r8 ldrh r1, [r2, 0x10] @@ -5559,7 +5559,7 @@ sub_810A9D4: @ 810A9D4 bx r0 .align 2, 0 _0810AAD8: .4byte gTasks+0x8 -_0810AADC: .4byte gUnknown_203AD30 +_0810AADC: .4byte gSpecialVar_ItemId _0810AAE0: .4byte gSaveBlock1Ptr _0810AAE4: .4byte gUnknown_203ACFC _0810AAE8: .4byte gUnknown_203AD10 @@ -5741,7 +5741,7 @@ sub_810AC40: @ 810AC40 mov r9, r0 mov r7, r8 add r7, r9 - ldr r5, _0810ACD0 @ =gUnknown_203AD30 + ldr r5, _0810ACD0 @ =gSpecialVar_ItemId ldrh r0, [r5] ldrh r1, [r7, 0x10] bl sub_809A3C8 @@ -5791,7 +5791,7 @@ sub_810AC40: @ 810AC40 b _0810ACF8 .align 2, 0 _0810ACCC: .4byte gTasks+0x8 -_0810ACD0: .4byte gUnknown_203AD30 +_0810ACD0: .4byte gSpecialVar_ItemId _0810ACD4: .4byte 0x0000ffff _0810ACD8: .4byte gStringVar1 _0810ACDC: .4byte gStringVar2 @@ -5848,7 +5848,7 @@ _0810AD1E: bl player_bitmagic bl sub_805C270 bl sub_805C780 - ldr r2, _0810AD88 @ =gUnknown_203AD30 + ldr r2, _0810AD88 @ =gSpecialVar_ItemId ldr r0, [r4] adds r0, r5 ldrh r1, [r0] @@ -5869,7 +5869,7 @@ _0810AD1E: .align 2, 0 _0810AD80: .4byte gSaveBlock1Ptr _0810AD84: .4byte 0x00000296 -_0810AD88: .4byte gUnknown_203AD30 +_0810AD88: .4byte gSpecialVar_ItemId _0810AD8C: .4byte gTasks _0810AD90: ldr r0, [r4] @@ -6187,14 +6187,14 @@ _0810AFF6: bl bag_menu_print_cursor_ movs r0, 0x1 bl sub_8109140 - ldr r1, _0810B018 @ =gUnknown_203AD30 + ldr r1, _0810B018 @ =gSpecialVar_ItemId movs r0, 0x4 strh r0, [r1] adds r0, r4, 0 bl sub_8109890 b _0810B064 .align 2, 0 -_0810B018: .4byte gUnknown_203AD30 +_0810B018: .4byte gSpecialVar_ItemId _0810B01C: movs r0, 0x5 bl PlaySE @@ -6493,7 +6493,7 @@ _0810B266: bl bag_menu_print_cursor_ movs r0, 0x1 bl sub_8109140 - ldr r1, _0810B28C @ =gUnknown_203AD30 + ldr r1, _0810B28C @ =gSpecialVar_ItemId movs r2, 0xB7 lsls r2, 1 adds r0, r2, 0 @@ -6502,7 +6502,7 @@ _0810B266: bl sub_8109890 b _0810B36C .align 2, 0 -_0810B28C: .4byte gUnknown_203AD30 +_0810B28C: .4byte gSpecialVar_ItemId _0810B290: movs r0, 0x5 bl PlaySE @@ -6514,7 +6514,7 @@ _0810B29E: bl PlaySE ldr r0, _0810B318 @ =gSaveBlock1Ptr ldr r0, [r0] - ldr r1, _0810B31C @ =gUnknown_203AD30 + ldr r1, _0810B31C @ =gSpecialVar_ItemId ldrh r1, [r1] ldr r2, _0810B320 @ =0x00000296 adds r0, r2 @@ -6562,7 +6562,7 @@ _0810B29E: b _0810B36C .align 2, 0 _0810B318: .4byte gSaveBlock1Ptr -_0810B31C: .4byte gUnknown_203AD30 +_0810B31C: .4byte gSpecialVar_ItemId _0810B320: .4byte 0x00000296 _0810B324: .4byte gUnknown_203ACFC _0810B328: .4byte gUnknown_3005E70 @@ -6713,14 +6713,14 @@ _0810B440: bl bag_menu_print_cursor_ movs r0, 0x1 bl sub_8109140 - ldr r1, _0810B464 @ =gUnknown_203AD30 + ldr r1, _0810B464 @ =gSpecialVar_ItemId movs r0, 0x4 strh r0, [r1] adds r0, r5, 0 bl sub_8109890 b _0810B4B0 .align 2, 0 -_0810B464: .4byte gUnknown_203AD30 +_0810B464: .4byte gSpecialVar_ItemId _0810B468: movs r0, 0x5 bl PlaySE @@ -6829,14 +6829,14 @@ _0810B53C: bl bag_menu_print_cursor_ movs r0, 0x1 bl sub_8109140 - ldr r1, _0810B560 @ =gUnknown_203AD30 + ldr r1, _0810B560 @ =gSpecialVar_ItemId movs r0, 0xE strh r0, [r1] adds r0, r4, 0 bl sub_8109890 b _0810B5C0 .align 2, 0 -_0810B560: .4byte gUnknown_203AD30 +_0810B560: .4byte gSpecialVar_ItemId _0810B564: movs r0, 0x5 bl PlaySE @@ -6962,7 +6962,7 @@ _0810B660: bl bag_menu_print_cursor_ movs r0, 0x1 bl sub_8109140 - ldr r1, _0810B688 @ =gUnknown_203AD30 + ldr r1, _0810B688 @ =gSpecialVar_ItemId movs r2, 0xB6 lsls r2, 1 adds r0, r2, 0 @@ -6971,7 +6971,7 @@ _0810B660: bl sub_8109890 b _0810B6E0 .align 2, 0 -_0810B688: .4byte gUnknown_203AD30 +_0810B688: .4byte gSpecialVar_ItemId _0810B68C: movs r0, 0x5 bl PlaySE diff --git a/asm/item_use.s b/asm/item_use.s index f653247d9..558e175f2 100644 --- a/asm/item_use.s +++ b/asm/item_use.s @@ -10,7 +10,7 @@ sub_80A0FBC: @ 80A0FBC push {r4,r5,lr} lsls r0, 24 lsrs r5, r0, 24 - ldr r1, _080A0FD8 @ =gUnknown_203AD30 + ldr r1, _080A0FD8 @ =gSpecialVar_ItemId ldrh r0, [r1] cmp r0, 0xAF bne _080A0FE0 @@ -22,7 +22,7 @@ sub_80A0FBC: @ 80A0FBC ldrb r0, [r1, 0x10] b _080A0FE6 .align 2, 0 -_080A0FD8: .4byte gUnknown_203AD30 +_080A0FD8: .4byte gSpecialVar_ItemId _080A0FDC: .4byte gTasks _080A0FE0: ldrh r0, [r1] @@ -31,7 +31,7 @@ _080A0FE6: subs r0, 0x1 lsls r0, 24 lsrs r4, r0, 24 - ldr r0, _080A1010 @ =gUnknown_203AD30 + ldr r0, _080A1010 @ =gSpecialVar_ItemId ldrh r0, [r0] bl GetPocketByItemId lsls r0, 24 @@ -47,7 +47,7 @@ _080A0FE6: bl sub_813D808 b _080A1032 .align 2, 0 -_080A1010: .4byte gUnknown_203AD30 +_080A1010: .4byte gSpecialVar_ItemId _080A1014: .4byte gUnknown_83E2954 _080A1018: ldr r0, _080A1038 @ =gUnknown_83E2954 @@ -317,7 +317,7 @@ sub_80A1208: @ 80A1208 push {lr} sub sp, 0x24 mov r1, sp - ldr r0, _080A1224 @ =gUnknown_203AD30 + ldr r0, _080A1224 @ =gSpecialVar_ItemId ldrh r0, [r0] strh r0, [r1, 0x20] ldr r1, _080A1228 @ =UseFameCheckerFromMenu @@ -328,7 +328,7 @@ sub_80A1208: @ 80A1208 pop {r0} bx r0 .align 2, 0 -_080A1224: .4byte gUnknown_203AD30 +_080A1224: .4byte gSpecialVar_ItemId _080A1228: .4byte UseFameCheckerFromMenu thumb_func_end sub_80A1208 @@ -571,7 +571,7 @@ ItemUseOnFieldCB_Rod: @ 80A1410 adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 - ldr r0, _080A1434 @ =gUnknown_203AD30 + ldr r0, _080A1434 @ =gSpecialVar_ItemId ldrh r0, [r0] bl ItemId_GetSecondaryId lsls r0, 24 @@ -583,7 +583,7 @@ ItemUseOnFieldCB_Rod: @ 80A1410 pop {r0} bx r0 .align 2, 0 -_080A1434: .4byte gUnknown_203AD30 +_080A1434: .4byte gSpecialVar_ItemId thumb_func_end ItemUseOnFieldCB_Rod thumb_func_start ItemUseOutOfBattle_Itemfinder @@ -625,7 +625,7 @@ sub_80A1460: @ 80A1460 ldr r1, _080A14BC @ =gUnknown_8416537 adds r0, r4, 0 bl StringExpandPlaceholders - ldr r0, _080A14C0 @ =gUnknown_203AD30 + ldr r0, _080A14C0 @ =gSpecialVar_ItemId ldrh r2, [r0] ldr r3, _080A14C4 @ =0x0000ffff movs r0, 0x4 @@ -650,7 +650,7 @@ sub_80A1460: @ 80A1460 _080A14B4: .4byte gStringVar1 _080A14B8: .4byte gStringVar4 _080A14BC: .4byte gUnknown_8416537 -_080A14C0: .4byte gUnknown_203AD30 +_080A14C0: .4byte gSpecialVar_ItemId _080A14C4: .4byte 0x0000ffff _080A14C8: .4byte gTasks _080A14CC: .4byte sub_810A1F8 @@ -684,7 +684,7 @@ sub_80A14E8: @ 80A14E8 ldr r1, _080A1540 @ =gUnknown_8416644 adds r0, r4, 0 bl StringExpandPlaceholders - ldr r0, _080A1544 @ =gUnknown_203AD30 + ldr r0, _080A1544 @ =gSpecialVar_ItemId ldrh r2, [r0] ldr r3, _080A1548 @ =0x0000ffff movs r0, 0x4 @@ -709,7 +709,7 @@ sub_80A14E8: @ 80A14E8 _080A1538: .4byte gStringVar1 _080A153C: .4byte gStringVar4 _080A1540: .4byte gUnknown_8416644 -_080A1544: .4byte gUnknown_203AD30 +_080A1544: .4byte gSpecialVar_ItemId _080A1548: .4byte 0x0000ffff _080A154C: .4byte gTasks _080A1550: .4byte sub_810A1F8 @@ -760,7 +760,7 @@ _080A1598: bcc _080A1578 cmp r6, 0 beq _080A1600 - ldr r0, _080A15D4 @ =gUnknown_203AD30 + ldr r0, _080A15D4 @ =gSpecialVar_ItemId ldrh r2, [r0] ldr r3, _080A15D8 @ =0x0000ffff movs r0, 0x4 @@ -780,7 +780,7 @@ _080A1598: b _080A1616 .align 2, 0 _080A15D0: .4byte gPlayerParty -_080A15D4: .4byte gUnknown_203AD30 +_080A15D4: .4byte gSpecialVar_ItemId _080A15D8: .4byte 0x0000ffff _080A15DC: .4byte gTasks _080A15E0: .4byte gUnknown_8416690 @@ -1196,7 +1196,7 @@ sub_80A18EC: @ 80A18EC push {r4,r5,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r0, _080A1920 @ =gUnknown_203AD30 + ldr r0, _080A1920 @ =gSpecialVar_ItemId ldrh r2, [r0] ldr r3, _080A1924 @ =0x0000ffff movs r0, 0x4 @@ -1217,7 +1217,7 @@ sub_80A18EC: @ 80A18EC bl sub_8108B50 b _080A1940 .align 2, 0 -_080A1920: .4byte gUnknown_203AD30 +_080A1920: .4byte gSpecialVar_ItemId _080A1924: .4byte 0x0000ffff _080A1928: .4byte gTasks _080A192C: .4byte sub_80A194C @@ -1323,7 +1323,7 @@ sub_80A19E8: @ 80A19E8 lsls r0, 24 cmp r0, 0 bne _080A1A2A - ldr r4, _080A1A30 @ =gUnknown_203AD30 + ldr r4, _080A1A30 @ =gSpecialVar_ItemId ldrh r2, [r4] ldr r3, _080A1A34 @ =0x0000ffff movs r0, 0x4 @@ -1348,7 +1348,7 @@ _080A1A2A: pop {r0} bx r0 .align 2, 0 -_080A1A30: .4byte gUnknown_203AD30 +_080A1A30: .4byte gSpecialVar_ItemId _080A1A34: .4byte 0x0000ffff _080A1A38: .4byte 0x00004020 _080A1A3C: .4byte gStringVar4 @@ -1358,7 +1358,7 @@ _080A1A40: .4byte sub_810A1F8 thumb_func_start sub_80A1A44 sub_80A1A44: @ 80A1A44 push {r4,lr} - ldr r4, _080A1A84 @ =gUnknown_203AD30 + ldr r4, _080A1A84 @ =gSpecialVar_ItemId ldrh r0, [r4] movs r1, 0x1 bl sub_809A1D8 @@ -1382,7 +1382,7 @@ sub_80A1A44: @ 80A1A44 pop {r0} bx r0 .align 2, 0 -_080A1A84: .4byte gUnknown_203AD30 +_080A1A84: .4byte gSpecialVar_ItemId _080A1A88: .4byte gStringVar2 _080A1A8C: .4byte gStringVar4 _080A1A90: .4byte gUnknown_841658C @@ -1394,7 +1394,7 @@ sub_80A1A94: @ 80A1A94 lsls r0, 24 lsrs r4, r0, 24 adds r6, r4, 0 - ldr r5, _080A1AD4 @ =gUnknown_203AD30 + ldr r5, _080A1AD4 @ =gSpecialVar_ItemId ldrh r2, [r5] ldr r3, _080A1AD8 @ =0x0000ffff movs r0, 0x4 @@ -1418,7 +1418,7 @@ sub_80A1A94: @ 80A1A94 adds r0, r4 b _080A1B1A .align 2, 0 -_080A1AD4: .4byte gUnknown_203AD30 +_080A1AD4: .4byte gSpecialVar_ItemId _080A1AD8: .4byte 0x0000ffff _080A1ADC: .4byte 0x00000803 _080A1AE0: .4byte 0x00000804 @@ -1527,7 +1527,7 @@ ItemUseOutOfBattle_EscapeRope: @ 80A1BAC lsrs r0, 24 cmp r0, 0x1 bne _080A1BEC - ldr r0, _080A1BDC @ =gUnknown_203AD30 + ldr r0, _080A1BDC @ =gSpecialVar_ItemId ldrh r2, [r0] ldr r0, _080A1BE0 @ =gMapHeader ldrb r3, [r0, 0x14] @@ -1541,7 +1541,7 @@ ItemUseOutOfBattle_EscapeRope: @ 80A1BAC bl sub_80A103C b _080A1BFE .align 2, 0 -_080A1BDC: .4byte gUnknown_203AD30 +_080A1BDC: .4byte gSpecialVar_ItemId _080A1BE0: .4byte gMapHeader _080A1BE4: .4byte gUnknown_2039998 _080A1BE8: .4byte sub_80A1C08 @@ -1687,7 +1687,7 @@ sub_80A1CF8: @ 80A1CF8 push {r4,r5,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r0, _080A1D2C @ =gUnknown_203AD30 + ldr r0, _080A1D2C @ =gSpecialVar_ItemId ldrh r2, [r0] ldr r3, _080A1D30 @ =0x0000ffff movs r0, 0x4 @@ -1708,7 +1708,7 @@ sub_80A1CF8: @ 80A1CF8 bl sub_8108B50 b _080A1D4C .align 2, 0 -_080A1D2C: .4byte gUnknown_203AD30 +_080A1D2C: .4byte gSpecialVar_ItemId _080A1D30: .4byte 0x0000ffff _080A1D34: .4byte gTasks _080A1D38: .4byte sub_80A1D58 @@ -1841,7 +1841,7 @@ sub_80A1E1C: @ 80A1E1C lsls r0, 24 cmp r0, 0 bne _080A1E48 - ldr r0, _080A1E44 @ =gUnknown_203AD30 + ldr r0, _080A1E44 @ =gSpecialVar_ItemId ldrh r0, [r0] movs r1, 0x1 bl sub_809A1D8 @@ -1850,7 +1850,7 @@ sub_80A1E1C: @ 80A1E1C bl sub_8108B50 b _080A1E54 .align 2, 0 -_080A1E44: .4byte gUnknown_203AD30 +_080A1E44: .4byte gSpecialVar_ItemId _080A1E48: ldr r2, _080A1E5C @ =gUnknown_8416631 ldr r3, _080A1E60 @ =sub_810A1F8 @@ -1895,7 +1895,7 @@ sub_80A1E7C: @ 80A1E7C muls r0, r2 ldr r1, _080A1EC4 @ =gPlayerParty adds r0, r1 - ldr r1, _080A1EC8 @ =gUnknown_203AD30 + ldr r1, _080A1EC8 @ =gSpecialVar_ItemId ldrh r1, [r1] lsls r2, 24 lsrs r2, 24 @@ -1915,7 +1915,7 @@ sub_80A1E7C: @ 80A1E7C _080A1EBC: .4byte gBattlerPartyIndexes _080A1EC0: .4byte gBattlerInMenuId _080A1EC4: .4byte gPlayerParty -_080A1EC8: .4byte gUnknown_203AD30 +_080A1EC8: .4byte gSpecialVar_ItemId _080A1ECC: .4byte gUnknown_84169DC _080A1ED0: .4byte sub_810A1F8 _080A1ED4: @@ -1953,7 +1953,7 @@ sub_80A1EF4: @ 80A1EF4 asrs r0, 16 cmp r0, 0x7 ble _080A1F36 - ldr r0, _080A1F40 @ =gUnknown_203AD30 + ldr r0, _080A1F40 @ =gSpecialVar_ItemId ldrh r4, [r0] movs r0, 0x1 bl PlaySE @@ -1973,7 +1973,7 @@ _080A1F36: bx r0 .align 2, 0 _080A1F3C: .4byte gTasks+0x8 -_080A1F40: .4byte gUnknown_203AD30 +_080A1F40: .4byte gSpecialVar_ItemId _080A1F44: .4byte sub_80A1F48 thumb_func_end sub_80A1EF4 @@ -2009,7 +2009,7 @@ sub_80A1F78: @ 80A1F78 push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r0, _080A1F9C @ =gUnknown_203AD30 + ldr r0, _080A1F9C @ =gSpecialVar_ItemId ldrh r0, [r0] bl GetPocketByItemId lsls r0, 24 @@ -2022,7 +2022,7 @@ sub_80A1F78: @ 80A1F78 bl sub_813D808 b _080A1FB0 .align 2, 0 -_080A1F9C: .4byte gUnknown_203AD30 +_080A1F9C: .4byte gSpecialVar_ItemId _080A1FA0: .4byte sub_81279E0 _080A1FA4: ldr r0, _080A1FB8 @ =sub_81279E0 @@ -2097,7 +2097,7 @@ sub_80A2010: @ 80A2010 cmp r0, 0 bne _080A2058 bl sub_80A1A44 - ldr r0, _080A2048 @ =gUnknown_203AD30 + ldr r0, _080A2048 @ =gSpecialVar_ItemId ldrh r2, [r0] ldr r3, _080A204C @ =0x0000ffff movs r0, 0x4 @@ -2111,7 +2111,7 @@ sub_80A2010: @ 80A2010 b _080A2060 .align 2, 0 _080A2044: .4byte gBattleTypeFlags -_080A2048: .4byte gUnknown_203AD30 +_080A2048: .4byte gSpecialVar_ItemId _080A204C: .4byte 0x0000ffff _080A2050: .4byte gStringVar4 _080A2054: .4byte sub_8108B50 @@ -2130,7 +2130,7 @@ ItemUseOutOfBattle_EnigmaBerry: @ 80A2068 push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r0, _080A208C @ =gUnknown_203AD30 + ldr r0, _080A208C @ =gSpecialVar_ItemId ldrh r0, [r0] bl GetItemEffectType lsls r0, 24 @@ -2146,7 +2146,7 @@ _080A2082: ldr r0, [r0] mov pc, r0 .align 2, 0 -_080A208C: .4byte gUnknown_203AD30 +_080A208C: .4byte gSpecialVar_ItemId _080A2090: .4byte _080A2094 .align 2, 0 _080A2094: @@ -2259,7 +2259,7 @@ ItemUseInBattle_EnigmaBerry: @ 80A2194 push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r0, _080A21B4 @ =gUnknown_203AD30 + ldr r0, _080A21B4 @ =gSpecialVar_ItemId ldrh r0, [r0] bl GetItemEffectType lsls r0, 24 @@ -2272,7 +2272,7 @@ ItemUseInBattle_EnigmaBerry: @ 80A2194 ldr r0, [r0] mov pc, r0 .align 2, 0 -_080A21B4: .4byte gUnknown_203AD30 +_080A21B4: .4byte gSpecialVar_ItemId _080A21B8: .4byte _080A21BC .align 2, 0 _080A21BC: @@ -2324,7 +2324,7 @@ sub_80A2238: @ 80A2238 push {r4,r5,lr} lsls r0, 24 lsrs r5, r0, 24 - ldr r0, _080A2268 @ =gUnknown_203AD30 + ldr r0, _080A2268 @ =gSpecialVar_ItemId ldrh r0, [r0] bl GetPocketByItemId lsls r0, 24 @@ -2342,7 +2342,7 @@ sub_80A2238: @ 80A2238 bl sub_813EB20 b _080A228A .align 2, 0 -_080A2268: .4byte gUnknown_203AD30 +_080A2268: .4byte gSpecialVar_ItemId _080A226C: .4byte gStringVar4 _080A2270: .4byte gUnknown_8416425 _080A2274: .4byte sub_813E2B8 diff --git a/asm/itemfinder.s b/asm/itemfinder.s index d25a0c486..bf3e78ebc 100644 --- a/asm/itemfinder.s +++ b/asm/itemfinder.s @@ -369,14 +369,14 @@ sub_813EF40: @ 813EF40 adds r0, r5, 0 movs r1, 0x1 bl sub_80CC44C - ldr r1, _0813EF90 @ =gUnknown_20370C0 + ldr r1, _0813EF90 @ =gSpecialVar_0x8004 strh r0, [r1] adds r0, r5, 0 movs r1, 0 bl sub_80CC44C ldr r1, _0813EF94 @ =gSpecialVar_0x8005 strh r0, [r1] - ldr r0, _0813EF98 @ =gUnknown_20370C4 + ldr r0, _0813EF98 @ =gSpecialVar_0x8006 movs r5, 0x1 strh r5, [r0] ldrh r1, [r1] @@ -394,9 +394,9 @@ sub_813EF40: @ 813EF40 bx r0 .align 2, 0 _0813EF8C: .4byte gTasks+0x8 -_0813EF90: .4byte gUnknown_20370C0 +_0813EF90: .4byte gSpecialVar_0x8004 _0813EF94: .4byte gSpecialVar_0x8005 -_0813EF98: .4byte gUnknown_20370C4 +_0813EF98: .4byte gSpecialVar_0x8006 thumb_func_end sub_813EF40 thumb_func_start sub_813EF9C diff --git a/asm/learn_move.s b/asm/learn_move.s index fec6928d3..5068e6d16 100644 --- a/asm/learn_move.s +++ b/asm/learn_move.s @@ -182,7 +182,7 @@ sub_80E478C: @ 80E478C str r0, [r4] bl sub_80E4F54 ldr r0, [r4] - ldr r1, _080E47F4 @ =gUnknown_20370C0 + ldr r1, _080E47F4 @ =gSpecialVar_0x8004 ldrh r1, [r1] movs r2, 0x98 lsls r2, 2 @@ -205,7 +205,7 @@ sub_80E478C: @ 80E478C .align 2, 0 _080E47EC: .4byte gUnknown_203AAB4 _080E47F0: .4byte 0x00000a6c -_080E47F4: .4byte gUnknown_20370C0 +_080E47F4: .4byte gSpecialVar_0x8004 _080E47F8: .4byte sub_80E4620 _080E47FC: .4byte sub_80E4870 thumb_func_end sub_80E478C @@ -505,7 +505,7 @@ _080E4A88: beq _080E4AE0 ldr r0, _080E4AD8 @ =gUnknown_841E405 bl sub_80E48C0 - ldr r1, _080E4ADC @ =gUnknown_20370C0 + ldr r1, _080E4ADC @ =gSpecialVar_0x8004 movs r0, 0x1 strh r0, [r1] ldr r1, [r4] @@ -517,7 +517,7 @@ _080E4ACC: .4byte gPlayerParty _080E4AD0: .4byte 0x00000a67 _080E4AD4: .4byte 0xffff0000 _080E4AD8: .4byte gUnknown_841E405 -_080E4ADC: .4byte gUnknown_20370C0 +_080E4ADC: .4byte gSpecialVar_0x8004 _080E4AE0: ldr r1, [r4] movs r0, 0x10 @@ -567,11 +567,11 @@ _080E4B3A: beq _080E4B4C b _080E4EDA _080E4B40: - ldr r0, _080E4B48 @ =gUnknown_20370C0 + ldr r0, _080E4B48 @ =gSpecialVar_0x8004 strh r1, [r0] b _080E4ED2 .align 2, 0 -_080E4B48: .4byte gUnknown_20370C0 +_080E4B48: .4byte gSpecialVar_0x8004 _080E4B4C: ldr r0, _080E4B54 @ =gUnknown_203AAB4 ldr r1, [r0] @@ -931,7 +931,7 @@ _080E4DB4: ldr r1, [r7] movs r0, 0x1E strb r0, [r1] - ldr r1, _080E4E6C @ =gUnknown_20370C0 + ldr r1, _080E4E6C @ =gSpecialVar_0x8004 movs r0, 0x1 strh r0, [r1] b _080E4EDA @@ -943,7 +943,7 @@ _080E4E5C: .4byte 0x00000261 _080E4E60: .4byte 0x00000a67 _080E4E64: .4byte gStringVar2 _080E4E68: .4byte gUnknown_841E493 -_080E4E6C: .4byte gUnknown_20370C0 +_080E4E6C: .4byte gSpecialVar_0x8004 _080E4E70: ldr r0, _080E4E88 @ =gUnknown_841E4C0 bl sub_80E48C0 diff --git a/asm/link.s b/asm/link.s index 63178e0dc..4b23d6b81 100644 --- a/asm/link.s +++ b/asm/link.s @@ -1373,12 +1373,12 @@ _08009F74: .4byte gUnknown_3000E08 _08009F78: ldr r0, _08009F84 @ =gUnknown_3003F50 strh r2, [r0] - ldr r1, _08009F88 @ =gUnknown_203AD30 + ldr r1, _08009F88 @ =gSpecialVar_ItemId ldrh r1, [r1] b _08009FD4 .align 2, 0 _08009F84: .4byte gUnknown_3003F50 -_08009F88: .4byte gUnknown_203AD30 +_08009F88: .4byte gSpecialVar_ItemId _08009F8C: ldr r0, _08009F98 @ =gUnknown_3003F50 strh r2, [r0] diff --git a/asm/link_rfu.s b/asm/link_rfu.s index c339bfdff..08f81f729 100644 --- a/asm/link_rfu.s +++ b/asm/link_rfu.s @@ -3504,7 +3504,7 @@ sub_80FEE24: @ 80FEE24 thumb_func_start sub_80FEE44 sub_80FEE44: @ 80FEE44 push {lr} - ldr r0, _080FEE58 @ =gUnknown_20370C0 + ldr r0, _080FEE58 @ =gSpecialVar_0x8004 ldrh r0, [r0] cmp r0, 0xE bhi _080FEF12 @@ -3514,7 +3514,7 @@ sub_80FEE44: @ 80FEE44 ldr r0, [r0] mov pc, r0 .align 2, 0 -_080FEE58: .4byte gUnknown_20370C0 +_080FEE58: .4byte gSpecialVar_0x8004 _080FEE5C: .4byte _080FEE60 .align 2, 0 _080FEE60: @@ -3585,7 +3585,7 @@ _080FEEF4: ldr r1, [r2] adds r1, r0 _080FEF08: - ldr r0, _080FEF24 @ =gUnknown_20370C0 + ldr r0, _080FEF24 @ =gSpecialVar_0x8004 ldrb r0, [r0] ldr r2, _080FEF28 @ =sub_80568C4 bl sub_80FEBAC @@ -3596,14 +3596,14 @@ _080FEF12: _080FEF18: .4byte gSaveBlock1Ptr _080FEF1C: .4byte gSpecialVar_0x8005 _080FEF20: .4byte 0x00002cd0 -_080FEF24: .4byte gUnknown_20370C0 +_080FEF24: .4byte gSpecialVar_0x8004 _080FEF28: .4byte sub_80568C4 thumb_func_end sub_80FEE44 thumb_func_start sub_80FEF2C sub_80FEF2C: @ 80FEF2C push {r4,lr} - ldr r4, _080FEF44 @ =gUnknown_20370C0 + ldr r4, _080FEF44 @ =gSpecialVar_0x8004 ldr r0, _080FEF48 @ =gUnknown_843F29C movs r1, 0x4 bl sub_80FFEDC @@ -3614,14 +3614,14 @@ sub_80FEF2C: @ 80FEF2C pop {r0} bx r0 .align 2, 0 -_080FEF44: .4byte gUnknown_20370C0 +_080FEF44: .4byte gSpecialVar_0x8004 _080FEF48: .4byte gUnknown_843F29C thumb_func_end sub_80FEF2C thumb_func_start sub_80FEF4C sub_80FEF4C: @ 80FEF4C push {r4,lr} - ldr r4, _080FEF64 @ =gUnknown_20370C0 + ldr r4, _080FEF64 @ =gSpecialVar_0x8004 ldr r0, _080FEF68 @ =gUnknown_843F2A4 movs r1, 0x4 bl sub_80FFEDC @@ -3632,7 +3632,7 @@ sub_80FEF4C: @ 80FEF4C pop {r0} bx r0 .align 2, 0 -_080FEF64: .4byte gUnknown_20370C0 +_080FEF64: .4byte gSpecialVar_0x8004 _080FEF68: .4byte gUnknown_843F2A4 thumb_func_end sub_80FEF4C @@ -4384,12 +4384,12 @@ _080FF4C8: .align 2, 0 _080FF4D8: .4byte gUnknown_203ACE8 _080FF4DC: - ldr r0, _080FF4E4 @ =gUnknown_20370D0 + ldr r0, _080FF4E4 @ =gSpecialVar_Result strh r1, [r0] movs r0, 0x17 b _080FF4EA .align 2, 0 -_080FF4E4: .4byte gUnknown_20370D0 +_080FF4E4: .4byte gSpecialVar_Result _080FF4E8: movs r0, 0 _080FF4EA: @@ -4425,7 +4425,7 @@ _080FF510: .align 2, 0 _080FF520: .4byte gUnknown_203ACE8 _080FF524: - ldr r4, _080FF538 @ =gUnknown_20370D0 + ldr r4, _080FF538 @ =gSpecialVar_Result bl sub_80FF78C lsls r0, 24 lsrs r0, 24 @@ -4434,7 +4434,7 @@ _080FF524: movs r0, 0x17 b _080FF53E .align 2, 0 -_080FF538: .4byte gUnknown_20370D0 +_080FF538: .4byte gSpecialVar_Result _080FF53C: movs r0, 0 _080FF53E: diff --git a/asm/link_rfu_3.s b/asm/link_rfu_3.s index 56bbd2c51..d9f172a81 100644 --- a/asm/link_rfu_3.s +++ b/asm/link_rfu_3.s @@ -230,7 +230,7 @@ sub_8115A24: @ 8115A24 movs r0, 0 strb r0, [r1, 0xC] strb r0, [r1, 0xD] - ldr r1, _08115A64 @ =gUnknown_20370D0 + ldr r1, _08115A64 @ =gSpecialVar_Result strh r0, [r1] pop {r0} bx r0 @@ -239,7 +239,7 @@ _08115A54: .4byte sub_8115A68 _08115A58: .4byte gUnknown_203B05C _08115A5C: .4byte gTasks+0x8 _08115A60: .4byte gUnknown_3002024 -_08115A64: .4byte gUnknown_20370D0 +_08115A64: .4byte gSpecialVar_Result thumb_func_end sub_8115A24 thumb_func_start sub_8115A68 @@ -299,7 +299,7 @@ _08115A90: _08115B0C: ldr r3, _08115B4C @ =gUnknown_203B058 ldr r2, _08115B50 @ =gUnknown_8456CD8 - ldr r1, _08115B54 @ =gUnknown_20370C0 + ldr r1, _08115B54 @ =gSpecialVar_0x8004 ldrh r0, [r1] lsls r0, 2 adds r0, r2 @@ -328,7 +328,7 @@ _08115B0C: .align 2, 0 _08115B4C: .4byte gUnknown_203B058 _08115B50: .4byte gUnknown_8456CD8 -_08115B54: .4byte gUnknown_20370C0 +_08115B54: .4byte gSpecialVar_0x8004 _08115B58: .4byte gUnknown_203B059 _08115B5C: movs r0, 0x70 @@ -1083,22 +1083,22 @@ _0811617E: bl EnableBothScriptContexts adds r0, r4, 0 bl DestroyTask - ldr r1, _08116190 @ =gUnknown_20370D0 + ldr r1, _08116190 @ =gSpecialVar_Result movs r0, 0x5 strh r0, [r1] b _081161D8 .align 2, 0 -_08116190: .4byte gUnknown_20370D0 +_08116190: .4byte gSpecialVar_Result _08116194: bl EnableBothScriptContexts adds r0, r4, 0 bl DestroyTask - ldr r1, _081161A8 @ =gUnknown_20370D0 + ldr r1, _081161A8 @ =gSpecialVar_Result movs r0, 0x8 strh r0, [r1] b _081161D8 .align 2, 0 -_081161A8: .4byte gUnknown_20370D0 +_081161A8: .4byte gSpecialVar_Result _081161AC: bl sub_80FBA00 cmp r0, 0 @@ -1767,7 +1767,7 @@ BerryBlenderLinkJoinGroup: @ 81166F4 movs r0, 0 strb r0, [r1, 0x8] strb r0, [r1, 0x9] - ldr r1, _08116734 @ =gUnknown_20370D0 + ldr r1, _08116734 @ =gSpecialVar_Result strh r0, [r1] pop {r0} bx r0 @@ -1776,7 +1776,7 @@ _08116724: .4byte sub_8116738 _08116728: .4byte gUnknown_203B05C _0811672C: .4byte gTasks+0x8 _08116730: .4byte gUnknown_3002028 -_08116734: .4byte gUnknown_20370D0 +_08116734: .4byte gSpecialVar_Result thumb_func_end BerryBlenderLinkJoinGroup thumb_func_start sub_8116738 @@ -1828,7 +1828,7 @@ _08116760: .4byte _08116CEC _081167C0: ldr r5, _08116800 @ =gUnknown_84570C8 - ldr r4, _08116804 @ =gUnknown_20370C0 + ldr r4, _08116804 @ =gSpecialVar_0x8004 ldrh r0, [r4] adds r0, r5 ldrb r0, [r0] @@ -1855,13 +1855,13 @@ _081167C0: b _08116D06 .align 2, 0 _08116800: .4byte gUnknown_84570C8 -_08116804: .4byte gUnknown_20370C0 +_08116804: .4byte gSpecialVar_0x8004 _08116808: .4byte gUnknown_203B058 _0811680C: adds r0, r6, 0 adds r0, 0x9 ldr r2, _08116830 @ =gUnknown_84591B8 - ldr r1, _08116834 @ =gUnknown_20370C0 + ldr r1, _08116834 @ =gSpecialVar_0x8004 ldrh r1, [r1] lsls r1, 2 adds r1, r2 @@ -1877,7 +1877,7 @@ _08116828: b _08116D06 .align 2, 0 _08116830: .4byte gUnknown_84591B8 -_08116834: .4byte gUnknown_20370C0 +_08116834: .4byte gSpecialVar_0x8004 _08116838: ldr r0, [r6, 0x4] movs r1, 0x4 @@ -1886,7 +1886,7 @@ _08116838: movs r1, 0x10 bl sub_811A5E4 ldr r0, [r6, 0x4] - ldr r1, _081168E8 @ =gUnknown_20370C0 + ldr r1, _081168E8 @ =gSpecialVar_0x8004 ldrh r1, [r1] bl sub_811A054 movs r4, 0 @@ -1950,7 +1950,7 @@ _08116838: strb r0, [r6, 0x8] b _08116D06 .align 2, 0 -_081168E8: .4byte gUnknown_20370C0 +_081168E8: .4byte gSpecialVar_0x8004 _081168EC: .4byte gUnknown_8456CD0 _081168F0: .4byte gUnknown_8456D4C _081168F4: .4byte gUnknown_8456D54 @@ -2361,19 +2361,19 @@ _08116C68: lsls r0, 24 cmp r0, 0 beq _08116D06 - ldr r0, _08116C94 @ =gUnknown_20370D0 + ldr r0, _08116C94 @ =gSpecialVar_Result movs r1, 0x6 b _08116CDC .align 2, 0 _08116C90: .4byte gUnknown_8457754 -_08116C94: .4byte gUnknown_20370D0 +_08116C94: .4byte gSpecialVar_Result _08116C98: bl sub_80FCE44 - ldr r0, _08116CA4 @ =gUnknown_20370D0 + ldr r0, _08116CA4 @ =gSpecialVar_Result movs r1, 0x5 b _08116CDC .align 2, 0 -_08116CA4: .4byte gUnknown_20370D0 +_08116CA4: .4byte gSpecialVar_Result _08116CA8: bl sub_80FCE44 adds r5, r6, 0 @@ -2397,7 +2397,7 @@ _08116CCE: lsls r0, 24 cmp r0, 0 beq _08116D06 - ldr r0, _08116CE8 @ =gUnknown_20370D0 + ldr r0, _08116CE8 @ =gSpecialVar_Result movs r1, 0x8 _08116CDC: strh r1, [r0] @@ -2406,7 +2406,7 @@ _08116CDC: b _08116D06 .align 2, 0 _08116CE4: .4byte gStringVar4 -_08116CE8: .4byte gUnknown_20370D0 +_08116CE8: .4byte gSpecialVar_Result _08116CEC: adds r0, r4, 0 bl DestroyTask @@ -2499,7 +2499,7 @@ sub_8116D60: @ 8116D60 adds r0, r5, 0 bl ConvertInternationalString ldr r1, _08116DD8 @ =gUnknown_84570C8 - ldr r0, _08116DDC @ =gUnknown_20370C0 + ldr r0, _08116DDC @ =gSpecialVar_0x8004 ldrh r0, [r0] adds r0, r1 ldrb r0, [r0] @@ -2525,7 +2525,7 @@ sub_8116D60: @ 8116D60 .align 2, 0 _08116DD4: .4byte gStringVar1 _08116DD8: .4byte gUnknown_84570C8 -_08116DDC: .4byte gUnknown_20370C0 +_08116DDC: .4byte gSpecialVar_0x8004 thumb_func_end sub_8116D60 thumb_func_start sub_8116DE0 @@ -3396,7 +3396,7 @@ sub_81174B4: @ 81174B4 lsrs r5, 24 lsls r1, 16 lsrs r1, 16 - ldr r0, _08117524 @ =gUnknown_20370C0 + ldr r0, _08117524 @ =gSpecialVar_0x8004 strh r1, [r0] ldr r0, _08117528 @ =0x0000406f bl VarSet @@ -3432,7 +3432,7 @@ sub_81174B4: @ 81174B4 pop {r0} bx r0 .align 2, 0 -_08117524: .4byte gUnknown_20370C0 +_08117524: .4byte gSpecialVar_0x8004 _08117528: .4byte 0x0000406f _0811752C: .4byte gUnknown_3005030 _08117530: .4byte gUnknown_300502C @@ -3791,7 +3791,7 @@ _081178C8: _081178E0: adds r0, r4, 0 bl DestroyTask - ldr r1, _081178FC @ =gUnknown_20370D0 + ldr r1, _081178FC @ =gSpecialVar_Result movs r0, 0x1 strh r0, [r1] bl ScriptContext2_Disable @@ -3801,7 +3801,7 @@ _081178E0: bx r0 .align 2, 0 _081178F8: .4byte sub_805671C -_081178FC: .4byte gUnknown_20370D0 +_081178FC: .4byte gSpecialVar_Result thumb_func_end sub_81175BC thumb_func_start sub_8117900 @@ -3832,13 +3832,13 @@ _08117928: beq _08117974 b _08117988 _08117932: - ldr r1, _08117940 @ =gUnknown_20370D0 + ldr r1, _08117940 @ =gSpecialVar_Result movs r0, 0x1 strh r0, [r1] bl EnableBothScriptContexts b _08117968 .align 2, 0 -_08117940: .4byte gUnknown_20370D0 +_08117940: .4byte gSpecialVar_Result _08117944: bl ScriptContext1_IsScriptSetUp lsls r0, 24 @@ -3931,7 +3931,7 @@ sub_81179CC: @ 81179CC strb r2, [r1, 0xC] strb r2, [r1, 0xD] strb r4, [r1, 0x18] - ldr r0, _08117A08 @ =gUnknown_20370D0 + ldr r0, _08117A08 @ =gSpecialVar_Result strh r2, [r0] pop {r4} pop {r0} @@ -3940,7 +3940,7 @@ sub_81179CC: @ 81179CC _081179FC: .4byte sub_8117A0C _08117A00: .4byte gUnknown_203B05C _08117A04: .4byte gTasks+0x8 -_08117A08: .4byte gUnknown_20370D0 +_08117A08: .4byte gSpecialVar_Result thumb_func_end sub_81179CC thumb_func_start sub_8117A0C @@ -4421,13 +4421,13 @@ _08117E26: beq _08117ECA adds r0, r4, 0 bl DestroyTask - ldr r1, _08117E48 @ =gUnknown_20370D0 + ldr r1, _08117E48 @ =gSpecialVar_Result movs r0, 0x5 strh r0, [r1] b _08117ECA .align 2, 0 _08117E44: .4byte gUnknown_84571B8 -_08117E48: .4byte gUnknown_20370D0 +_08117E48: .4byte gSpecialVar_Result _08117E4C: bl sub_80FB9F4 lsls r0, 24 @@ -4513,7 +4513,7 @@ sub_8117ED4: @ 8117ED4 strb r2, [r1, 0x9] subs r4, 0x15 strb r4, [r1, 0x12] - ldr r0, _08117F1C @ =gUnknown_20370D0 + ldr r0, _08117F1C @ =gSpecialVar_Result strh r2, [r0] pop {r4} pop {r0} @@ -4523,7 +4523,7 @@ _08117F0C: .4byte sub_8117F20 _08117F10: .4byte gUnknown_203B05C _08117F14: .4byte gTasks+0x8 _08117F18: .4byte gUnknown_3002028 -_08117F1C: .4byte gUnknown_20370D0 +_08117F1C: .4byte gSpecialVar_Result thumb_func_end sub_8117ED4 thumb_func_start sub_8117F20 @@ -4883,13 +4883,13 @@ _08118252: adds r0, r6, 0 bl DestroyTask bl sub_80F8DC0 - ldr r1, _08118268 @ =gUnknown_20370D0 + ldr r1, _08118268 @ =gSpecialVar_Result movs r0, 0x5 strh r0, [r1] b _08118288 .align 2, 0 _08118264: .4byte gUnknown_84571B8 -_08118268: .4byte gUnknown_20370D0 +_08118268: .4byte gSpecialVar_Result _0811826C: ldrb r0, [r5, 0x8] adds r0, 0x1 @@ -4933,7 +4933,7 @@ sub_8118290: @ 8118290 strb r2, [r1, 0x9] subs r4, 0x15 strb r4, [r1, 0x12] - ldr r0, _081182D8 @ =gUnknown_20370D0 + ldr r0, _081182D8 @ =gSpecialVar_Result strh r2, [r0] pop {r4} pop {r0} @@ -4943,7 +4943,7 @@ _081182C8: .4byte sub_81182DC _081182CC: .4byte gUnknown_203B05C _081182D0: .4byte gTasks+0x8 _081182D4: .4byte gUnknown_3002028 -_081182D8: .4byte gUnknown_20370D0 +_081182D8: .4byte gSpecialVar_Result thumb_func_end sub_8118290 thumb_func_start sub_81182DC @@ -5288,13 +5288,13 @@ _081185C2: adds r0, r4, 0 bl DestroyTask bl sub_80F8DC0 - ldr r1, _081185E4 @ =gUnknown_20370D0 + ldr r1, _081185E4 @ =gSpecialVar_Result movs r0, 0x5 strh r0, [r1] b _08118604 .align 2, 0 _081185E0: .4byte gUnknown_845933C -_081185E4: .4byte gUnknown_20370D0 +_081185E4: .4byte gSpecialVar_Result _081185E8: ldrb r0, [r5, 0x8] adds r0, 0x1 @@ -5334,7 +5334,7 @@ UnionRoomSpecial: @ 811860C strb r1, [r0, 0x16] strh r1, [r0, 0x10] strh r1, [r0, 0x12] - ldr r0, _08118654 @ =gUnknown_20370D0 + ldr r0, _08118654 @ =gSpecialVar_Result strh r1, [r0] movs r0, 0xD0 movs r1, 0x1 @@ -5346,7 +5346,7 @@ UnionRoomSpecial: @ 811860C _08118648: .4byte sub_81186E0 _0811864C: .4byte gUnknown_203B05C _08118650: .4byte gUnknown_300202C -_08118654: .4byte gUnknown_20370D0 +_08118654: .4byte gSpecialVar_Result thumb_func_end UnionRoomSpecial thumb_func_start sub_8118658 @@ -5593,14 +5593,14 @@ _0811887C: ldr r0, [r6, 0xC] movs r1, 0x4 bl sub_811A650 - ldr r1, _081188C8 @ =gUnknown_20370D0 + ldr r1, _081188C8 @ =gSpecialVar_Result movs r0, 0 strh r0, [r1] movs r0, 0x3 bl _081198DA .align 2, 0 _081188C4: .4byte gUnknown_203B06C -_081188C8: .4byte gUnknown_20370D0 +_081188C8: .4byte gSpecialVar_Result _081188CC: bl sub_811FB18 lsls r0, 24 @@ -5703,7 +5703,7 @@ _081189A4: movs r0, 0x4 bl _081198DA _081189AA: - ldr r4, _081189D8 @ =gUnknown_20370D0 + ldr r4, _081189D8 @ =gSpecialVar_Result ldrh r0, [r4] cmp r0, 0 beq _08118A0E @@ -5723,7 +5723,7 @@ _081189AA: movs r0, 0x2A b _08118A06 .align 2, 0 -_081189D8: .4byte gUnknown_20370D0 +_081189D8: .4byte gSpecialVar_Result _081189DC: .4byte gStringVar1 _081189E0: .4byte gSaveBlock2Ptr _081189E4: @@ -7463,14 +7463,14 @@ var_800D_set_xB: @ 81198EC bl InUnionRoom cmp r0, 0x1 bne _081198FC - ldr r1, _08119900 @ =gUnknown_20370D0 + ldr r1, _08119900 @ =gSpecialVar_Result movs r0, 0xB strh r0, [r1] _081198FC: pop {r0} bx r0 .align 2, 0 -_08119900: .4byte gUnknown_20370D0 +_08119900: .4byte gSpecialVar_Result thumb_func_end var_800D_set_xB thumb_func_start sub_8119904 diff --git a/asm/link_rfu_4.s b/asm/link_rfu_4.s index 20381dca1..1ec24a43c 100644 --- a/asm/link_rfu_4.s +++ b/asm/link_rfu_4.s @@ -1662,7 +1662,7 @@ _081430B8: .align 2, 0 _081430D0: .4byte gUnknown_3003F64 _081430D4: - ldr r0, _081430E8 @ =gUnknown_20370D0 + ldr r0, _081430E8 @ =gSpecialVar_Result ldrh r0, [r0] cmp r0, 0x5 beq _081430DE @@ -1672,7 +1672,7 @@ _081430DE: bl sub_81424B8 b _08143464 .align 2, 0 -_081430E8: .4byte gUnknown_20370D0 +_081430E8: .4byte gSpecialVar_Result _081430EC: ldr r0, _081430F8 @ =gUnknown_841E794 bl sub_8142504 @@ -2172,7 +2172,7 @@ _0814349C: .align 2, 0 _081434B0: .4byte gUnknown_3003F64 _081434B4: - ldr r0, _081434CC @ =gUnknown_20370D0 + ldr r0, _081434CC @ =gSpecialVar_Result ldrh r0, [r0] cmp r0, 0x5 beq _081434BE @@ -2185,7 +2185,7 @@ _081434C4: strb r0, [r5, 0x8] b _081435C6 .align 2, 0 -_081434CC: .4byte gUnknown_20370D0 +_081434CC: .4byte gSpecialVar_Result _081434D0: ldr r0, _081434F0 @ =gStringVar1 movs r1, 0xFF diff --git a/asm/map_obj_lock.s b/asm/map_obj_lock.s index 4ff07589a..1b406a74d 100644 --- a/asm/map_obj_lock.s +++ b/asm/map_obj_lock.s @@ -270,7 +270,7 @@ sub_8069740: @ 8069740 lsls r0, 2 ldr r1, _08069760 @ =gMapObjects adds r0, r1 - ldr r1, _08069764 @ =gUnknown_20370D4 + ldr r1, _08069764 @ =gSpecialVar_Facing ldrb r1, [r1] bl FieldObjectFaceOppositeDirection pop {r0} @@ -278,7 +278,7 @@ sub_8069740: @ 8069740 .align 2, 0 _0806975C: .4byte gUnknown_3005074 _08069760: .4byte gMapObjects -_08069764: .4byte gUnknown_20370D4 +_08069764: .4byte gSpecialVar_Facing thumb_func_end sub_8069740 thumb_func_start sub_8069768 diff --git a/asm/party_menu.s b/asm/party_menu.s index 55dd4059c..185e17a84 100644 --- a/asm/party_menu.s +++ b/asm/party_menu.s @@ -1245,13 +1245,13 @@ sub_811F430: @ 811F430 muls r1, r0 ldr r0, _0811F468 @ =gPlayerParty adds r6, r1, r0 - ldr r0, _0811F46C @ =gUnknown_203AD30 + ldr r0, _0811F46C @ =gSpecialVar_ItemId ldrh r4, [r0] ldr r0, _0811F470 @ =gUnknown_203B0A0 ldrb r0, [r0, 0xB] cmp r0, 0xC bne _0811F47C - ldr r0, _0811F474 @ =gUnknown_20370D0 + ldr r0, _0811F474 @ =gSpecialVar_Result movs r1, 0 strh r1, [r0] ldr r0, _0811F478 @ =gSpecialVar_0x8005 @@ -1266,9 +1266,9 @@ sub_811F430: @ 811F430 b _0811F4C6 .align 2, 0 _0811F468: .4byte gPlayerParty -_0811F46C: .4byte gUnknown_203AD30 +_0811F46C: .4byte gSpecialVar_ItemId _0811F470: .4byte gUnknown_203B0A0 -_0811F474: .4byte gUnknown_20370D0 +_0811F474: .4byte gSpecialVar_Result _0811F478: .4byte gSpecialVar_0x8005 _0811F47C: cmp r0, 0x3 @@ -2364,7 +2364,7 @@ _0811FCDA: _0811FCE8: movs r0, 0x5 bl PlaySE - ldr r1, _0811FD24 @ =gUnknown_20370C0 + ldr r1, _0811FD24 @ =gSpecialVar_0x8004 movs r0, 0 ldrsb r0, [r5, r0] strh r0, [r1] @@ -2390,7 +2390,7 @@ _0811FD1A: bl sub_811FA78 b _0811FD56 .align 2, 0 -_0811FD24: .4byte gUnknown_20370C0 +_0811FD24: .4byte gSpecialVar_0x8004 _0811FD28: .4byte gUnknown_203B0A0 _0811FD2C: .4byte gSpecialVar_0x8005 _0811FD30: .4byte gPlayerParty @@ -2498,7 +2498,7 @@ _0811FDF4: lsls r0, 24 cmp r0, 0 bne _0811FE04 - ldr r1, _0811FE1C @ =gUnknown_20370C0 + ldr r1, _0811FE1C @ =gSpecialVar_0x8004 movs r0, 0x7 strh r0, [r1] _0811FE04: @@ -2514,7 +2514,7 @@ _0811FE14: pop {r0} bx r0 .align 2, 0 -_0811FE1C: .4byte gUnknown_20370C0 +_0811FE1C: .4byte gSpecialVar_0x8004 _0811FE20: .4byte gUnknown_203B0C0 thumb_func_end sub_811FD88 @@ -4107,13 +4107,13 @@ sub_81209F4: @ 81209F4 bne _08120A24 movs r0, 0x5 bl PlaySE - ldr r0, _08120A20 @ =gUnknown_20370C0 + ldr r0, _08120A20 @ =gSpecialVar_0x8004 strh r5, [r0] adds r0, r4, 0 bl sub_811FA78 b _08120A46 .align 2, 0 -_08120A20: .4byte gUnknown_20370C0 +_08120A20: .4byte gSpecialVar_0x8004 _08120A24: movs r0, 0x1A bl PlaySE @@ -4215,14 +4215,14 @@ _08120AE4: beq _08120B02 b _08120B10 _08120AEA: - ldr r1, _08120AF8 @ =gUnknown_20370C0 + ldr r1, _08120AF8 @ =gSpecialVar_0x8004 movs r0, 0x7 strh r0, [r1] adds r0, r4, 0 bl sub_811FA78 b _08120B10 .align 2, 0 -_08120AF8: .4byte gUnknown_20370C0 +_08120AF8: .4byte gSpecialVar_0x8004 _08120AFC: movs r0, 0x5 bl PlaySE @@ -9878,7 +9878,7 @@ c2_8123744: @ 8123744 mov r7, r8 push {r7} sub sp, 0xC - ldr r6, _0812376C @ =gUnknown_203AD30 + ldr r6, _0812376C @ =gSpecialVar_ItemId ldrh r0, [r6] cmp r0, 0 bne _08123778 @@ -9894,7 +9894,7 @@ c2_8123744: @ 8123744 ldr r1, [r3] b _081237AE .align 2, 0 -_0812376C: .4byte gUnknown_203AD30 +_0812376C: .4byte gSpecialVar_ItemId _08123770: .4byte gUnknown_203B0A0 _08123774: .4byte sub_8122C30 _08123778: @@ -9992,7 +9992,7 @@ sub_8123824: @ 8123824 ands r0, r1 cmp r0, 0 bne _08123880 - ldr r0, _08123890 @ =gUnknown_203AD30 + ldr r0, _08123890 @ =gSpecialVar_ItemId ldrh r4, [r0] ldr r0, _08123894 @ =gUnknown_203B0A0 mov r8, r0 @@ -10032,7 +10032,7 @@ _08123880: bx r0 .align 2, 0 _0812388C: .4byte gPaletteFade -_08123890: .4byte gUnknown_203AD30 +_08123890: .4byte gSpecialVar_ItemId _08123894: .4byte gUnknown_203B0A0 _08123898: .4byte gPlayerParty _0812389C: .4byte gTasks @@ -10130,7 +10130,7 @@ _08123950: beq _08123A32 b _08123A40 _08123956: - ldr r5, _08123998 @ =gUnknown_203AD30 + ldr r5, _08123998 @ =gSpecialVar_ItemId ldrh r0, [r5] movs r1, 0x1 bl sub_809A1D8 @@ -10158,7 +10158,7 @@ _08123956: str r1, [r0] b _08123A40 .align 2, 0 -_08123998: .4byte gUnknown_203AD30 +_08123998: .4byte gSpecialVar_ItemId _0812399C: .4byte gUnknown_203B0D8 _081239A0: .4byte gStringVar4 _081239A4: .4byte gTasks @@ -10317,7 +10317,7 @@ sub_8123ACC: @ 8123ACC lsls r0, 16 lsrs r0, 16 mov r8, r0 - ldr r0, _08123B40 @ =gUnknown_20370D0 + ldr r0, _08123B40 @ =gSpecialVar_Result ldrh r7, [r0] cmp r7, 0 bne _08123B4C @@ -10350,7 +10350,7 @@ sub_8123ACC: @ 8123ACC .align 2, 0 _08123B38: .4byte gUnknown_203B0A0 _08123B3C: .4byte gPlayerParty -_08123B40: .4byte gUnknown_20370D0 +_08123B40: .4byte gSpecialVar_Result _08123B44: .4byte gUnknown_203B0D8 _08123B48: .4byte sub_8122C30 _08123B4C: @@ -10400,7 +10400,7 @@ sub_8123B78: @ 8123B78 muls r0, r1 ldr r1, _08123BBC @ =gPlayerParty adds r0, r1 - ldr r1, _08123BC0 @ =gUnknown_203AD30 + ldr r1, _08123BC0 @ =gSpecialVar_ItemId ldrh r1, [r1] movs r2, 0 movs r3, 0 @@ -10411,9 +10411,9 @@ _08123BB0: .4byte gPaletteFade _08123BB4: .4byte gUnknown_203B0D8 _08123BB8: .4byte gUnknown_203B0A0 _08123BBC: .4byte gPlayerParty -_08123BC0: .4byte gUnknown_203AD30 +_08123BC0: .4byte gSpecialVar_ItemId _08123BC4: - ldr r0, _08123BE4 @ =gUnknown_203AD30 + ldr r0, _08123BE4 @ =gSpecialVar_ItemId ldrh r0, [r0] ldrh r1, [r1] movs r2, 0 @@ -10431,7 +10431,7 @@ _08123BDE: pop {r0} bx r0 .align 2, 0 -_08123BE4: .4byte gUnknown_203AD30 +_08123BE4: .4byte gSpecialVar_ItemId _08123BE8: .4byte gTasks _08123BEC: .4byte sub_8123BF0 thumb_func_end sub_8123B78 @@ -11337,7 +11337,7 @@ sub_8124354: @ 8124354 lsrs r4, 24 movs r0, 0x5 bl PlaySE - ldr r1, _0812437C @ =gUnknown_20370C0 + ldr r1, _0812437C @ =gSpecialVar_0x8004 ldr r0, _08124380 @ =gUnknown_203B0A0 ldrb r0, [r0, 0x9] lsls r0, 24 @@ -11349,7 +11349,7 @@ sub_8124354: @ 8124354 pop {r0} bx r0 .align 2, 0 -_0812437C: .4byte gUnknown_20370C0 +_0812437C: .4byte gSpecialVar_0x8004 _08124380: .4byte gUnknown_203B0A0 thumb_func_end sub_8124354 @@ -12495,7 +12495,7 @@ _08124CCC: mov r8, r1 movs r7, 0 _08124CD2: - ldr r4, _08124D30 @ =gUnknown_203AD30 + ldr r4, _08124D30 @ =gSpecialVar_ItemId ldrh r0, [r4] bl GetItemEffectType lsls r0, 24 @@ -12529,7 +12529,7 @@ _08124D0C: cmp r5, 0x5 bls _08124CEA _08124D16: - ldr r0, _08124D30 @ =gUnknown_203AD30 + ldr r0, _08124D30 @ =gSpecialVar_ItemId ldrh r0, [r0] bl GetPocketByItemId lsls r0, 24 @@ -12542,7 +12542,7 @@ _08124D28: movs r0, 0x7F b _08124D6A .align 2, 0 -_08124D30: .4byte gUnknown_203AD30 +_08124D30: .4byte gSpecialVar_ItemId _08124D34: .4byte gUnknown_203B0A0 _08124D38: .4byte gPlayerParty _08124D3C: .4byte sub_8124DB0 @@ -12642,7 +12642,7 @@ _08124DDC: .4byte sub_8124DE0 thumb_func_start sub_8124DE0 sub_8124DE0: @ 8124DE0 push {r4,lr} - ldr r4, _08124E0C @ =gUnknown_203AD30 + ldr r4, _08124E0C @ =gSpecialVar_ItemId ldrh r0, [r4] bl sub_80A1150 lsls r0, 24 @@ -12661,7 +12661,7 @@ sub_8124DE0: @ 8124DE0 bl sub_811C540 b _08124E38 .align 2, 0 -_08124E0C: .4byte gUnknown_203AD30 +_08124E0C: .4byte gSpecialVar_ItemId _08124E10: .4byte gUnknown_203B0A0 _08124E14: .4byte sub_8126BD4 _08124E18: @@ -12694,7 +12694,7 @@ sub_8124E48: @ 8124E48 mov r7, r8 push {r7} sub sp, 0xC - ldr r7, _08124EBC @ =gUnknown_203AD30 + ldr r7, _08124EBC @ =gSpecialVar_ItemId ldrh r0, [r7] bl ItemId_GetPocket lsls r0, 24 @@ -12742,7 +12742,7 @@ _08124EB0: bl SetMainCallback2 b _08124EE6 .align 2, 0 -_08124EBC: .4byte gUnknown_203AD30 +_08124EBC: .4byte gSpecialVar_ItemId _08124EC0: .4byte gUnknown_203B0A0 _08124EC4: .4byte gPlayerParty _08124EC8: @@ -12804,7 +12804,7 @@ sub_8124EFC: @ 8124EFC adds r0, r5, 0 adds r1, r4, 0 bl RemoveMonPPBonus - ldr r7, _08124F90 @ =gUnknown_203AD30 + ldr r7, _08124F90 @ =gSpecialVar_ItemId ldrh r0, [r7] bl ItemIdToBattleMoveId adds r1, r0, 0 @@ -12837,7 +12837,7 @@ _08124F7C: .align 2, 0 _08124F88: .4byte gUnknown_203B0A0 _08124F8C: .4byte gPlayerParty -_08124F90: .4byte gUnknown_203AD30 +_08124F90: .4byte gSpecialVar_ItemId _08124F94: ldr r4, _08124FC0 @ =gUnknown_203B0A0 ldrb r0, [r4, 0x8] @@ -13242,7 +13242,7 @@ sub_81252D0: @ 81252D0 muls r1, r0 ldr r0, _08125304 @ =gPlayerParty adds r5, r1, r0 - ldr r0, _08125308 @ =gUnknown_203AD30 + ldr r0, _08125308 @ =gSpecialVar_ItemId ldrh r6, [r0] adds r0, r5, 0 adds r1, r6, 0 @@ -13255,7 +13255,7 @@ sub_81252D0: @ 81252D0 .align 2, 0 _08125300: .4byte gUnknown_203B0A0 _08125304: .4byte gPlayerParty -_08125308: .4byte gUnknown_203AD30 +_08125308: .4byte gSpecialVar_ItemId _0812530C: adds r0, r6, 0 bl IsHPRecoveryItem @@ -13351,7 +13351,7 @@ ItemUseCB_Medicine: @ 81253B0 muls r1, r0 ldr r0, _0812543C @ =gPlayerParty adds r5, r1, r0 - ldr r0, _08125440 @ =gUnknown_203AD30 + ldr r0, _08125440 @ =gSpecialVar_ItemId ldrh r6, [r0] adds r0, r5, 0 adds r1, r6, 0 @@ -13399,7 +13399,7 @@ _08125428: .align 2, 0 _08125438: .4byte gUnknown_203B0A0 _0812543C: .4byte gPlayerParty -_08125440: .4byte gUnknown_203AD30 +_08125440: .4byte gSpecialVar_ItemId _08125444: .4byte gUnknown_203B0C0 _08125448: .4byte gUnknown_84169DC _0812544C: @@ -13735,7 +13735,7 @@ sub_81256F8: @ 81256F8 push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r0, _08125710 @ =gUnknown_203AD30 + ldr r0, _08125710 @ =gSpecialVar_ItemId ldrh r0, [r0] cmp r0, 0xAF bne _0812571C @@ -13745,7 +13745,7 @@ sub_81256F8: @ 81256F8 adds r0, r1 b _08125726 .align 2, 0 -_08125710: .4byte gUnknown_203AD30 +_08125710: .4byte gSpecialVar_ItemId _08125714: .4byte gSaveBlock1Ptr _08125718: .4byte 0x00003108 _0812571C: @@ -13878,7 +13878,7 @@ sub_812580C: @ 812580C muls r0, r1 ldr r1, _08125864 @ =gPlayerParty adds r0, r1 - ldr r1, _08125868 @ =gUnknown_203AD30 + ldr r1, _08125868 @ =gSpecialVar_ItemId ldrh r1, [r1] ldrb r2, [r3, 0x9] ldrb r3, [r3, 0xE] @@ -13909,7 +13909,7 @@ sub_812580C: @ 812580C .align 2, 0 _08125860: .4byte gUnknown_203B0A0 _08125864: .4byte gPlayerParty -_08125868: .4byte gUnknown_203AD30 +_08125868: .4byte gSpecialVar_ItemId _0812586C: .4byte gUnknown_203B0C0 _08125870: .4byte gUnknown_84169DC _08125874: .4byte gTasks @@ -13947,7 +13947,7 @@ sub_8125898: @ 8125898 ldr r0, _08125934 @ =gPlayerParty adds r4, r0 ldrb r0, [r5, 0x9] - ldr r6, _08125938 @ =gUnknown_203AD30 + ldr r6, _08125938 @ =gSpecialVar_ItemId ldrh r1, [r6] ldrb r2, [r5, 0xE] bl ExecuteTableBasedItemEffect__ @@ -14001,7 +14001,7 @@ sub_8125898: @ 8125898 .align 2, 0 _08125930: .4byte gUnknown_203B0A0 _08125934: .4byte gPlayerParty -_08125938: .4byte gUnknown_203AD30 +_08125938: .4byte gSpecialVar_ItemId _0812593C: .4byte gUnknown_203B0C0 _08125940: .4byte 0x0000ffff _08125944: .4byte gStringVar1 @@ -14020,7 +14020,7 @@ sub_8125958: @ 8125958 lsrs r6, r0, 24 movs r4, 0 ldr r7, _08125990 @ =gUnknown_203B0AE - ldr r0, _08125994 @ =gUnknown_203AD30 + ldr r0, _08125994 @ =gSpecialVar_ItemId ldrh r5, [r0] movs r0, 0xE negs r0, r0 @@ -14041,7 +14041,7 @@ sub_8125958: @ 8125958 b _081259F6 .align 2, 0 _08125990: .4byte gUnknown_203B0AE -_08125994: .4byte gUnknown_203AD30 +_08125994: .4byte gSpecialVar_ItemId _08125998: .4byte gUnknown_203B0C0 _0812599C: .4byte gUnknown_84169DC _081259A0: @@ -14275,7 +14275,7 @@ sub_8125B40: @ 8125B40 movs r0, 0xE adds r0, r7 mov r8, r0 - ldr r0, _08125BD8 @ =gUnknown_203AD30 + ldr r0, _08125BD8 @ =gSpecialVar_ItemId ldrh r5, [r0] ldr r1, _08125BDC @ =gStringVar1 adds r0, r4, 0 @@ -14325,7 +14325,7 @@ sub_8125B40: @ 8125B40 .align 2, 0 _08125BD0: .4byte gUnknown_203B0A0 _08125BD4: .4byte gPlayerParty -_08125BD8: .4byte gUnknown_203AD30 +_08125BD8: .4byte gSpecialVar_ItemId _08125BDC: .4byte gStringVar1 _08125BE0: .4byte gStringVar2 _08125BE4: .4byte gMoveNames @@ -14391,7 +14391,7 @@ sub_8125C48: @ 8125C48 adds r5, r1, r0 adds r6, r2, 0 adds r6, 0xE - ldr r0, _08125CD4 @ =gUnknown_203AD30 + ldr r0, _08125CD4 @ =gSpecialVar_ItemId ldrh r4, [r0] movs r1, 0x2 ldrsh r0, [r6, r1] @@ -14441,7 +14441,7 @@ _08125C84: .align 2, 0 _08125CCC: .4byte gUnknown_203B0A0 _08125CD0: .4byte gPlayerParty -_08125CD4: .4byte gUnknown_203AD30 +_08125CD4: .4byte gSpecialVar_ItemId _08125CD8: .4byte gStringVar1 _08125CDC: .4byte gStringVar2 _08125CE0: .4byte gMoveNames @@ -14516,7 +14516,7 @@ _08125D6C: .4byte gUnknown_203B0A0 _08125D70: cmp r0, 0x2 bne _08125D78 - ldr r0, _08125D84 @ =gUnknown_20370D0 + ldr r0, _08125D84 @ =gSpecialVar_Result strh r2, [r0] _08125D78: adds r0, r5, 0 @@ -14526,7 +14526,7 @@ _08125D7E: pop {r0} bx r0 .align 2, 0 -_08125D84: .4byte gUnknown_20370D0 +_08125D84: .4byte gSpecialVar_Result thumb_func_end sub_8125D2C thumb_func_start sub_8125D88 @@ -14684,7 +14684,7 @@ sub_8125E84: @ 8125E84 lsls r2, 16 lsrs r2, 16 ldrb r0, [r4, 0x9] - ldr r1, _08125ED8 @ =gUnknown_203AD30 + ldr r1, _08125ED8 @ =gSpecialVar_ItemId ldrh r1, [r1] ldr r3, _08125EDC @ =sub_8124EFC bl sub_811C568 @@ -14696,7 +14696,7 @@ sub_8125E84: @ 8125E84 .align 2, 0 _08125ED0: .4byte gUnknown_203B0A0 _08125ED4: .4byte gPlayerParty -_08125ED8: .4byte gUnknown_203AD30 +_08125ED8: .4byte gSpecialVar_ItemId _08125EDC: .4byte sub_8124EFC _08125EE0: .4byte gUnknown_3005E98 _08125EE4: .4byte sub_8125F4C @@ -14794,7 +14794,7 @@ sub_8125F5C: @ 8125F5C adds r4, r0, 0 lsls r4, 16 lsrs r4, 16 - ldr r0, _08125FEC @ =gUnknown_203AD30 + ldr r0, _08125FEC @ =gSpecialVar_ItemId ldrh r2, [r0] movs r0, 0x4 adds r1, r6, 0 @@ -14828,7 +14828,7 @@ sub_8125F5C: @ 8125F5C .align 2, 0 _08125FE4: .4byte gUnknown_203B0A0 _08125FE8: .4byte gPlayerParty -_08125FEC: .4byte gUnknown_203AD30 +_08125FEC: .4byte gSpecialVar_ItemId _08125FF0: .4byte gStringVar1 _08125FF4: .4byte gStringVar2 _08125FF8: .4byte gMoveNames @@ -15077,7 +15077,7 @@ _0812620C: .4byte sub_812628C _08126210: cmp r0, 0x2 bne _08126218 - ldr r0, _08126228 @ =gUnknown_20370D0 + ldr r0, _08126228 @ =gSpecialVar_Result strh r5, [r0] _08126218: ldr r0, _0812622C @ =gTasks @@ -15089,7 +15089,7 @@ _08126218: str r0, [r1] b _0812626A .align 2, 0 -_08126228: .4byte gUnknown_20370D0 +_08126228: .4byte gSpecialVar_Result _0812622C: .4byte gTasks _08126230: .4byte sub_81255BC _08126234: @@ -15164,7 +15164,7 @@ dp05_rare_candy: @ 81262AC muls r1, r0 ldr r0, _081262EC @ =gPlayerParty adds r4, r1, r0 - ldr r0, _081262F0 @ =gUnknown_203AD30 + ldr r0, _081262F0 @ =gSpecialVar_ItemId ldrh r5, [r0] adds r0, r4, 0 movs r1, 0x38 @@ -15182,7 +15182,7 @@ dp05_rare_candy: @ 81262AC .align 2, 0 _081262E8: .4byte gUnknown_203B0A0 _081262EC: .4byte gPlayerParty -_081262F0: .4byte gUnknown_203AD30 +_081262F0: .4byte gSpecialVar_ItemId _081262F4: movs r4, 0x1 _081262F6: @@ -15252,7 +15252,7 @@ sub_8126350: @ 8126350 adds r0, r4, 0 bl sub_811D130 ldrb r0, [r6, 0x9] - ldr r5, _0812641C @ =gUnknown_203AD30 + ldr r5, _0812641C @ =gSpecialVar_ItemId ldrh r1, [r5] movs r2, 0 bl ExecuteTableBasedItemEffect__ @@ -15316,7 +15316,7 @@ sub_8126350: @ 8126350 _08126410: .4byte gUnknown_203B0A0 _08126414: .4byte gPlayerParty _08126418: .4byte gUnknown_203B09C -_0812641C: .4byte gUnknown_203AD30 +_0812641C: .4byte gSpecialVar_ItemId _08126420: .4byte gUnknown_203B0C0 _08126424: .4byte 0x0000ffff _08126428: .4byte gStringVar1 @@ -15919,7 +15919,7 @@ sub_81268D4: @ 81268D4 lsrs r0, 16 mov r8, r0 ldrb r0, [r6, 0x9] - ldr r1, _08126938 @ =gUnknown_203AD30 + ldr r1, _08126938 @ =gSpecialVar_ItemId ldrh r1, [r1] movs r2, 0 bl ExecuteTableBasedItemEffect__ @@ -15938,7 +15938,7 @@ _08126920: .align 2, 0 _08126930: .4byte gUnknown_203B0A0 _08126934: .4byte gPlayerParty -_08126938: .4byte gUnknown_203AD30 +_08126938: .4byte gSpecialVar_ItemId _0812693C: .4byte gTasks _08126940: .4byte sub_8126A18 _08126944: @@ -16108,13 +16108,13 @@ _08126A94: beq _08126AB4 ldr r0, _08126AD8 @ =gUnknown_203B0D0 ldr r1, [r0] - ldr r0, _08126ADC @ =gUnknown_203AD30 + ldr r0, _08126ADC @ =gSpecialVar_ItemId ldrh r2, [r0] ldr r3, _08126AE0 @ =0x0000ffff movs r0, 0x4 bl sub_80A2294 _08126AB4: - ldr r0, _08126ADC @ =gUnknown_203AD30 + ldr r0, _08126ADC @ =gSpecialVar_ItemId ldrh r0, [r0] movs r1, 0x1 bl sub_809A1D8 @@ -16133,7 +16133,7 @@ _08126ABE: .align 2, 0 _08126AD4: .4byte gUnknown_203B0C0 _08126AD8: .4byte gUnknown_203B0D0 -_08126ADC: .4byte gUnknown_203AD30 +_08126ADC: .4byte gSpecialVar_ItemId _08126AE0: .4byte 0x0000ffff _08126AE4: .4byte gTasks _08126AE8: .4byte sub_81255BC @@ -16206,7 +16206,7 @@ sub_8126B60: @ 8126B60 muls r0, r1 ldr r1, _08126BB4 @ =gPlayerParty adds r0, r1 - ldr r1, _08126BB8 @ =gUnknown_203AD30 + ldr r1, _08126BB8 @ =gSpecialVar_ItemId ldrh r1, [r1] ldrb r2, [r2, 0x9] movs r3, 0 @@ -16232,7 +16232,7 @@ sub_8126B60: @ 8126B60 .align 2, 0 _08126BB0: .4byte gUnknown_203B0A0 _08126BB4: .4byte gPlayerParty -_08126BB8: .4byte gUnknown_203AD30 +_08126BB8: .4byte gSpecialVar_ItemId _08126BBC: .4byte gUnknown_203B0C0 _08126BC0: .4byte gUnknown_84169DC _08126BC4: .4byte gTasks @@ -16253,7 +16253,7 @@ sub_8126BD4: @ 8126BD4 ldr r0, [r4] str r0, [r1] ldrb r0, [r4, 0x9] - ldr r5, _08126C18 @ =gUnknown_203AD30 + ldr r5, _08126C18 @ =gSpecialVar_ItemId ldrh r1, [r5] movs r2, 0 bl ExecuteTableBasedItemEffect__ @@ -16276,7 +16276,7 @@ sub_8126BD4: @ 8126BD4 .align 2, 0 _08126C10: .4byte gUnknown_300537C _08126C14: .4byte gUnknown_203B0A0 -_08126C18: .4byte gUnknown_203AD30 +_08126C18: .4byte gSpecialVar_ItemId _08126C1C: .4byte gPlayerParty _08126C20: .4byte 0x0000ffff thumb_func_end sub_8126BD4 @@ -16294,7 +16294,7 @@ sub_8126C24: @ 8126C24 muls r0, r1 ldr r1, _08126C58 @ =gPlayerParty adds r0, r1 - ldr r1, _08126C5C @ =gUnknown_203AD30 + ldr r1, _08126C5C @ =gSpecialVar_ItemId ldrh r2, [r1] movs r1, 0x2 bl GetEvolutionTargetSpecies @@ -16307,7 +16307,7 @@ sub_8126C24: @ 8126C24 .align 2, 0 _08126C54: .4byte gUnknown_203B0A0 _08126C58: .4byte gPlayerParty -_08126C5C: .4byte gUnknown_203AD30 +_08126C5C: .4byte gSpecialVar_ItemId _08126C60: movs r0, 0x1 _08126C62: @@ -16653,7 +16653,7 @@ _08126ED8: .4byte sub_80568A8 sub_8126EDC: @ 8126EDC push {lr} sub sp, 0xC - ldr r0, _08126EF8 @ =gUnknown_203AD30 + ldr r0, _08126EF8 @ =gSpecialVar_ItemId ldrh r0, [r0] bl GetPocketByItemId lsls r0, 24 @@ -16665,7 +16665,7 @@ sub_8126EDC: @ 8126EDC ldr r1, _08126EFC @ =sub_8124D90 b _08126F0A .align 2, 0 -_08126EF8: .4byte gUnknown_203AD30 +_08126EF8: .4byte gSpecialVar_ItemId _08126EFC: .4byte sub_8124D90 _08126F00: ldr r1, _08126F04 @ =sub_8124DA0 @@ -16686,7 +16686,7 @@ _08126F0A: movs r3, 0 bl sub_811EA44 ldr r1, _08126F38 @ =gUnknown_203B0A0 - ldr r0, _08126F3C @ =gUnknown_203AD30 + ldr r0, _08126F3C @ =gSpecialVar_ItemId ldrh r0, [r0] strh r0, [r1, 0xC] add sp, 0xC @@ -16696,7 +16696,7 @@ _08126F0A: _08126F30: .4byte sub_8124DB0 _08126F34: .4byte sub_811FB28 _08126F38: .4byte gUnknown_203B0A0 -_08126F3C: .4byte gUnknown_203AD30 +_08126F3C: .4byte gSpecialVar_ItemId thumb_func_end sub_8126EDC thumb_func_start sub_8126F40 @@ -16958,7 +16958,7 @@ sub_812713C: @ 812713C bl GetMonData lsls r0, 16 lsrs r7, r0, 16 - ldr r0, _08127194 @ =gUnknown_20370D0 + ldr r0, _08127194 @ =gSpecialVar_Result ldrh r0, [r0] cmp r0, 0 bne _0812719C @@ -16980,7 +16980,7 @@ sub_812713C: @ 812713C .align 2, 0 _0812718C: .4byte gUnknown_203B0A0 _08127190: .4byte gPlayerParty -_08127194: .4byte gUnknown_20370D0 +_08127194: .4byte gSpecialVar_Result _08127198: .4byte gUnknown_203B0D8 _0812719C: ldrb r0, [r6, 0x8] @@ -17869,7 +17869,7 @@ _08127850: movs r3, 0 bl sub_811EA44 ldr r1, _08127880 @ =gUnknown_203B0A0 - ldr r0, _08127884 @ =gUnknown_20370C6 + ldr r0, _08127884 @ =gSpecialVar_0x8007 ldrh r0, [r0] strb r0, [r1, 0x9] _08127870: @@ -17880,7 +17880,7 @@ _08127870: _08127878: .4byte sub_8126DC8 _0812787C: .4byte c2_exit_to_overworld_1_continue_scripts_restart_music _08127880: .4byte gUnknown_203B0A0 -_08127884: .4byte gUnknown_20370C6 +_08127884: .4byte gSpecialVar_0x8007 thumb_func_end sub_812781C thumb_func_start sub_8127888 @@ -18088,7 +18088,7 @@ _08127A24: .4byte gBattleTypeFlags _08127A28: .4byte sub_8120C3C _08127A2C: .4byte sub_8107ECC _08127A30: - ldr r0, _08127A74 @ =gUnknown_203AD30 + ldr r0, _08127A74 @ =gSpecialVar_ItemId ldrh r0, [r0] bl GetPocketByItemId lsls r0, 24 @@ -18119,7 +18119,7 @@ _08127A62: pop {r0} bx r0 .align 2, 0 -_08127A74: .4byte gUnknown_203AD30 +_08127A74: .4byte gSpecialVar_ItemId _08127A78: .4byte sub_8107ECC _08127A7C: .4byte sub_8124DB0 _08127A80: .4byte sub_811FB28 diff --git a/asm/pokemon_3.s b/asm/pokemon_3.s index c717ac119..0d4ee1bcb 100644 --- a/asm/pokemon_3.s +++ b/asm/pokemon_3.s @@ -424,11 +424,11 @@ _08044834: .4byte gUnknown_825E032 sub_8044838: @ 8044838 push {r4-r7,lr} sub sp, 0x14 - ldr r0, _08044888 @ =gUnknown_20370C0 + ldr r0, _08044888 @ =gSpecialVar_0x8004 ldrh r5, [r0] ldr r0, _0804488C @ =gSpecialVar_0x8005 ldrh r4, [r0] - ldr r0, _08044890 @ =gUnknown_20370C4 + ldr r0, _08044890 @ =gSpecialVar_0x8006 ldrh r6, [r0] bl ZeroEnemyPartyMons ldr r7, _08044894 @ =gEnemyParty @@ -461,9 +461,9 @@ _08044880: pop {r0} bx r0 .align 2, 0 -_08044888: .4byte gUnknown_20370C0 +_08044888: .4byte gSpecialVar_0x8004 _0804488C: .4byte gSpecialVar_0x8005 -_08044890: .4byte gUnknown_20370C4 +_08044890: .4byte gSpecialVar_0x8006 _08044894: .4byte gEnemyParty thumb_func_end sub_8044838 diff --git a/asm/pokemon_size_record.s b/asm/pokemon_size_record.s index 56a5d54f5..ac1f2a017 100644 --- a/asm/pokemon_size_record.s +++ b/asm/pokemon_size_record.s @@ -211,14 +211,14 @@ sub_80A082C: @ 80A082C adds r7, r1, 0 lsls r0, 16 lsrs r6, r0, 16 - ldr r1, _080A0844 @ =gUnknown_20370D0 + ldr r1, _080A0844 @ =gSpecialVar_Result ldrh r0, [r1] cmp r0, 0x5 bls _080A0848 movs r0, 0 b _080A08C4 .align 2, 0 -_080A0844: .4byte gUnknown_20370D0 +_080A0844: .4byte gSpecialVar_Result _080A0848: ldrh r1, [r1] movs r0, 0x64 @@ -343,7 +343,7 @@ sub_80A0930: @ 80A0930 ldr r0, _080A0950 @ =0x0000403d bl GetVarPointer adds r1, r0, 0 - ldr r4, _080A0954 @ =gUnknown_20370D0 + ldr r4, _080A0954 @ =gSpecialVar_Result movs r0, 0xD6 bl sub_80A082C lsls r0, 24 @@ -354,7 +354,7 @@ sub_80A0930: @ 80A0930 bx r0 .align 2, 0 _080A0950: .4byte 0x0000403d -_080A0954: .4byte gUnknown_20370D0 +_080A0954: .4byte gSpecialVar_Result thumb_func_end sub_80A0930 thumb_func_start sub_80A0958 @@ -389,7 +389,7 @@ sub_80A0984: @ 80A0984 ldr r0, _080A09A4 @ =0x00004040 bl GetVarPointer adds r1, r0, 0 - ldr r4, _080A09A8 @ =gUnknown_20370D0 + ldr r4, _080A09A8 @ =gSpecialVar_Result movs r0, 0x81 bl sub_80A082C lsls r0, 24 @@ -400,7 +400,7 @@ sub_80A0984: @ 80A0984 bx r0 .align 2, 0 _080A09A4: .4byte 0x00004040 -_080A09A8: .4byte gUnknown_20370D0 +_080A09A8: .4byte gSpecialVar_Result thumb_func_end sub_80A0984 thumb_func_start GiveGiftRibbonToParty diff --git a/asm/pokemon_storage_system.s b/asm/pokemon_storage_system.s index 8cb95db46..37f9e9762 100644 --- a/asm/pokemon_storage_system.s +++ b/asm/pokemon_storage_system.s @@ -1139,7 +1139,7 @@ _0808C1DC: .4byte gPlayerParty thumb_func_start CountPartyAliveNonEggMons_IgnoreVar0x8004Slot CountPartyAliveNonEggMons_IgnoreVar0x8004Slot: @ 808C1E0 push {lr} - ldr r0, _0808C1F4 @ =gUnknown_20370C0 + ldr r0, _0808C1F4 @ =gSpecialVar_0x8004 ldrb r0, [r0] bl CountPartyAliveNonEggMonsExcept lsls r0, 24 @@ -1147,7 +1147,7 @@ CountPartyAliveNonEggMons_IgnoreVar0x8004Slot: @ 808C1E0 pop {r1} bx r1 .align 2, 0 -_0808C1F4: .4byte gUnknown_20370C0 +_0808C1F4: .4byte gSpecialVar_0x8004 thumb_func_end CountPartyAliveNonEggMons_IgnoreVar0x8004Slot thumb_func_start CountPartyMons @@ -6609,7 +6609,7 @@ _0808EF08: .4byte sub_808CE60 sub_808EF0C: @ 808EF0C push {lr} sub sp, 0x4 - ldr r0, _0808EF40 @ =gUnknown_203AD30 + ldr r0, _0808EF40 @ =gSpecialVar_ItemId ldrh r1, [r0] mov r0, sp strh r1, [r0] @@ -6631,7 +6631,7 @@ sub_808EF0C: @ 808EF0C bl SetMonData b _0808EF56 .align 2, 0 -_0808EF40: .4byte gUnknown_203AD30 +_0808EF40: .4byte gSpecialVar_ItemId _0808EF44: .4byte gUnknown_20397B4 _0808EF48: .4byte gPlayerParty _0808EF4C: diff --git a/asm/prof_pc.s b/asm/prof_pc.s index 2a449ff76..9c9dfa79c 100644 --- a/asm/prof_pc.s +++ b/asm/prof_pc.s @@ -8,7 +8,7 @@ thumb_func_start sub_80CA3D8 sub_80CA3D8: @ 80CA3D8 push {lr} - ldr r0, _080CA3F4 @ =gUnknown_20370C0 + ldr r0, _080CA3F4 @ =gSpecialVar_0x8004 ldrh r0, [r0] cmp r0, 0 bne _080CA3FC @@ -20,7 +20,7 @@ sub_80CA3D8: @ 80CA3D8 bl sub_8088EDC b _080CA40C .align 2, 0 -_080CA3F4: .4byte gUnknown_20370C0 +_080CA3F4: .4byte gSpecialVar_0x8004 _080CA3F8: .4byte gSpecialVar_0x8005 _080CA3FC: movs r0, 0 @@ -30,7 +30,7 @@ _080CA3FC: movs r0, 0x1 bl pokedex_count _080CA40C: - ldr r1, _080CA420 @ =gUnknown_20370C4 + ldr r1, _080CA420 @ =gSpecialVar_0x8006 strh r0, [r1] bl sub_806E25C lsls r0, 16 @@ -39,7 +39,7 @@ _080CA40C: bx r1 .align 2, 0 _080CA41C: .4byte gSpecialVar_0x8005 -_080CA420: .4byte gUnknown_20370C4 +_080CA420: .4byte gSpecialVar_0x8006 thumb_func_end sub_80CA3D8 thumb_func_start sub_80CA424 @@ -47,7 +47,7 @@ sub_80CA424: @ 80CA424 push {lr} lsls r0, 16 lsrs r2, r0, 16 - ldr r1, _080CA440 @ =gUnknown_20370D0 + ldr r1, _080CA440 @ =gSpecialVar_Result movs r0, 0 strh r0, [r1] cmp r2, 0x9 @@ -59,7 +59,7 @@ _080CA436: ldr r0, _080CA444 @ =gUnknown_81A6D6D b _080CA51A .align 2, 0 -_080CA440: .4byte gUnknown_20370D0 +_080CA440: .4byte gSpecialVar_Result _080CA444: .4byte gUnknown_81A6D6D _080CA448: cmp r2, 0x1D @@ -165,10 +165,10 @@ _080CA4F6: .align 2, 0 _080CA4FC: .4byte gUnknown_81A7137 _080CA500: - ldr r1, _080CA504 @ =gUnknown_20370D0 + ldr r1, _080CA504 @ =gSpecialVar_Result b _080CA514 .align 2, 0 -_080CA504: .4byte gUnknown_20370D0 +_080CA504: .4byte gSpecialVar_Result _080CA508: cmp r2, 0x97 beq _080CA514 @@ -191,14 +191,14 @@ _080CA520: .4byte gUnknown_81A7175 thumb_func_start sub_80CA524 sub_80CA524: @ 80CA524 push {lr} - ldr r0, _080CA538 @ =gUnknown_20370C0 + ldr r0, _080CA538 @ =gSpecialVar_0x8004 ldrh r0, [r0] bl sub_80CA424 bl ShowFieldMessage pop {r0} bx r0 .align 2, 0 -_080CA538: .4byte gUnknown_20370C0 +_080CA538: .4byte gSpecialVar_0x8004 thumb_func_end sub_80CA524 .align 2, 0 @ Don't pad with nop. diff --git a/asm/rom6.s b/asm/rom6.s index 6d4ef8bc2..06c2d30a2 100644 --- a/asm/rom6.s +++ b/asm/rom6.s @@ -31,7 +31,7 @@ npc_before_player_of_type: @ 80C97A8 ldrb r0, [r2, 0x5] cmp r0, r5 bne _080C97F4 - ldr r1, _080C97F0 @ =gUnknown_20370D2 + ldr r1, _080C97F0 @ =gSpecialVar_LastTalked ldrb r0, [r2, 0x8] strh r0, [r1] movs r0, 0x1 @@ -39,7 +39,7 @@ npc_before_player_of_type: @ 80C97A8 .align 2, 0 _080C97E8: .4byte gUnknown_2039A04 _080C97EC: .4byte gMapObjects -_080C97F0: .4byte gUnknown_20370D2 +_080C97F0: .4byte gSpecialVar_LastTalked _080C97F4: movs r0, 0 _080C97F6: diff --git a/asm/scrcmd.s b/asm/scrcmd.s index 8053a5abc..e8ffcf3ab 100644 --- a/asm/scrcmd.s +++ b/asm/scrcmd.s @@ -1003,7 +1003,7 @@ ScrCmd_random: @ 806A5DC adds r4, r0, 0 lsls r4, 16 lsrs r4, 16 - ldr r5, _0806A60C @ =gUnknown_20370D0 + ldr r5, _0806A60C @ =gSpecialVar_Result bl Random lsls r0, 16 lsrs r0, 16 @@ -1015,7 +1015,7 @@ ScrCmd_random: @ 806A5DC pop {r1} bx r1 .align 2, 0 -_0806A60C: .4byte gUnknown_20370D0 +_0806A60C: .4byte gSpecialVar_Result thumb_func_end ScrCmd_random thumb_func_start sub_806A610 @@ -1035,7 +1035,7 @@ sub_806A610: @ 806A610 lsrs r0, 16 bl VarGet adds r1, r0, 0 - ldr r5, _0806A658 @ =gUnknown_20370D0 + ldr r5, _0806A658 @ =gSpecialVar_Result lsls r1, 24 lsrs r1, 24 adds r0, r4, 0 @@ -1050,7 +1050,7 @@ sub_806A610: @ 806A610 pop {r1} bx r1 .align 2, 0 -_0806A658: .4byte gUnknown_20370D0 +_0806A658: .4byte gSpecialVar_Result thumb_func_end sub_806A610 thumb_func_start ScrCmd_takeitem @@ -1070,7 +1070,7 @@ ScrCmd_takeitem: @ 806A65C lsrs r0, 16 bl VarGet adds r1, r0, 0 - ldr r5, _0806A69C @ =gUnknown_20370D0 + ldr r5, _0806A69C @ =gSpecialVar_Result lsls r1, 24 lsrs r1, 24 adds r0, r4, 0 @@ -1083,7 +1083,7 @@ ScrCmd_takeitem: @ 806A65C pop {r1} bx r1 .align 2, 0 -_0806A69C: .4byte gUnknown_20370D0 +_0806A69C: .4byte gSpecialVar_Result thumb_func_end ScrCmd_takeitem thumb_func_start sub_806A6A0 @@ -1103,7 +1103,7 @@ sub_806A6A0: @ 806A6A0 lsrs r0, 16 bl VarGet adds r1, r0, 0 - ldr r5, _0806A6E0 @ =gUnknown_20370D0 + ldr r5, _0806A6E0 @ =gSpecialVar_Result lsls r1, 24 lsrs r1, 24 adds r0, r4, 0 @@ -1116,7 +1116,7 @@ sub_806A6A0: @ 806A6A0 pop {r1} bx r1 .align 2, 0 -_0806A6E0: .4byte gUnknown_20370D0 +_0806A6E0: .4byte gSpecialVar_Result thumb_func_end sub_806A6A0 thumb_func_start sub_806A6E4 @@ -1136,7 +1136,7 @@ sub_806A6E4: @ 806A6E4 lsrs r0, 16 bl VarGet adds r1, r0, 0 - ldr r5, _0806A724 @ =gUnknown_20370D0 + ldr r5, _0806A724 @ =gSpecialVar_Result lsls r1, 24 lsrs r1, 24 adds r0, r4, 0 @@ -1149,7 +1149,7 @@ sub_806A6E4: @ 806A6E4 pop {r1} bx r1 .align 2, 0 -_0806A724: .4byte gUnknown_20370D0 +_0806A724: .4byte gSpecialVar_Result thumb_func_end sub_806A6E4 thumb_func_start ScrCmd_checkitemtype @@ -1161,7 +1161,7 @@ ScrCmd_checkitemtype: @ 806A728 bl VarGet lsls r0, 16 lsrs r0, 16 - ldr r4, _0806A750 @ =gUnknown_20370D0 + ldr r4, _0806A750 @ =gSpecialVar_Result bl GetPocketByItemId lsls r0, 24 lsrs r0, 24 @@ -1171,7 +1171,7 @@ ScrCmd_checkitemtype: @ 806A728 pop {r1} bx r1 .align 2, 0 -_0806A750: .4byte gUnknown_20370D0 +_0806A750: .4byte gSpecialVar_Result thumb_func_end ScrCmd_checkitemtype thumb_func_start ScrCmd_givepcitem @@ -1193,7 +1193,7 @@ ScrCmd_givepcitem: @ 806A754 adds r1, r0, 0 lsls r1, 16 lsrs r1, 16 - ldr r5, _0806A794 @ =gUnknown_20370D0 + ldr r5, _0806A794 @ =gSpecialVar_Result adds r0, r4, 0 bl sub_809A3C8 lsls r0, 24 @@ -1204,7 +1204,7 @@ ScrCmd_givepcitem: @ 806A754 pop {r1} bx r1 .align 2, 0 -_0806A794: .4byte gUnknown_20370D0 +_0806A794: .4byte gSpecialVar_Result thumb_func_end ScrCmd_givepcitem thumb_func_start ScrCmd_checkpcitem @@ -1226,7 +1226,7 @@ ScrCmd_checkpcitem: @ 806A798 adds r1, r0, 0 lsls r1, 16 lsrs r1, 16 - ldr r5, _0806A7D8 @ =gUnknown_20370D0 + ldr r5, _0806A7D8 @ =gSpecialVar_Result adds r0, r4, 0 bl sub_809A374 lsls r0, 24 @@ -1237,7 +1237,7 @@ ScrCmd_checkpcitem: @ 806A798 pop {r1} bx r1 .align 2, 0 -_0806A7D8: .4byte gUnknown_20370D0 +_0806A7D8: .4byte gSpecialVar_Result thumb_func_end ScrCmd_checkpcitem thumb_func_start sub_806A7DC @@ -1540,19 +1540,19 @@ sub_806A9D8: @ 806A9D8 thumb_func_start sub_806A9DC sub_806A9DC: @ 806A9DC - ldr r0, _0806A9F0 @ =gUnknown_20370B8 + ldr r0, _0806A9F0 @ =gSpecialVar_0x8000 movs r1, 0 strh r1, [r0] - ldr r0, _0806A9F4 @ =gUnknown_20370BA + ldr r0, _0806A9F4 @ =gSpecialVar_0x8001 strh r1, [r0] - ldr r0, _0806A9F8 @ =gUnknown_20370BC + ldr r0, _0806A9F8 @ =gSpecialVar_0x8002 strh r1, [r0] movs r0, 0 bx lr .align 2, 0 -_0806A9F0: .4byte gUnknown_20370B8 -_0806A9F4: .4byte gUnknown_20370BA -_0806A9F8: .4byte gUnknown_20370BC +_0806A9F0: .4byte gSpecialVar_0x8000 +_0806A9F4: .4byte gSpecialVar_0x8001 +_0806A9F8: .4byte gSpecialVar_0x8002 thumb_func_end sub_806A9DC thumb_func_start ScrCmd_setweather @@ -2344,7 +2344,7 @@ _0806B048: .4byte gSaveBlock1Ptr thumb_func_start ScrCmd_getpartysize ScrCmd_getpartysize: @ 806B04C push {r4,lr} - ldr r4, _0806B064 @ =gUnknown_20370D0 + ldr r4, _0806B064 @ =gSpecialVar_Result bl CalculatePlayerPartyCount lsls r0, 24 lsrs r0, 24 @@ -2354,7 +2354,7 @@ ScrCmd_getpartysize: @ 806B04C pop {r1} bx r1 .align 2, 0 -_0806B064: .4byte gUnknown_20370D0 +_0806B064: .4byte gSpecialVar_Result thumb_func_end ScrCmd_getpartysize thumb_func_start ScrCmd_playse @@ -3569,7 +3569,7 @@ sub_806B96C: @ 806B96C ands r0, r1 cmp r0, 0 beq _0806B990 - ldr r0, _0806B98C @ =gUnknown_20370D4 + ldr r0, _0806B98C @ =gSpecialVar_Facing ldrh r0, [r0] cmp r0, 0x2 beq _0806B990 @@ -3577,49 +3577,49 @@ sub_806B96C: @ 806B96C b _0806BA36 .align 2, 0 _0806B988: .4byte gMain -_0806B98C: .4byte gUnknown_20370D4 +_0806B98C: .4byte gSpecialVar_Facing _0806B990: ldrh r1, [r2, 0x2C] movs r0, 0x80 ands r0, r1 cmp r0, 0 beq _0806B9AC - ldr r0, _0806B9A8 @ =gUnknown_20370D4 + ldr r0, _0806B9A8 @ =gSpecialVar_Facing ldrh r0, [r0] cmp r0, 0x1 beq _0806B9AC movs r0, 0x2 b _0806BA36 .align 2, 0 -_0806B9A8: .4byte gUnknown_20370D4 +_0806B9A8: .4byte gSpecialVar_Facing _0806B9AC: ldrh r1, [r2, 0x2C] movs r0, 0x20 ands r0, r1 cmp r0, 0 beq _0806B9C8 - ldr r0, _0806B9C4 @ =gUnknown_20370D4 + ldr r0, _0806B9C4 @ =gSpecialVar_Facing ldrh r0, [r0] cmp r0, 0x3 beq _0806B9C8 movs r0, 0x3 b _0806BA36 .align 2, 0 -_0806B9C4: .4byte gUnknown_20370D4 +_0806B9C4: .4byte gSpecialVar_Facing _0806B9C8: ldrh r1, [r2, 0x2C] movs r0, 0x10 ands r0, r1 cmp r0, 0 beq _0806B9E4 - ldr r0, _0806B9E0 @ =gUnknown_20370D4 + ldr r0, _0806B9E0 @ =gSpecialVar_Facing ldrh r0, [r0] cmp r0, 0x4 beq _0806B9E4 movs r0, 0x4 b _0806BA36 .align 2, 0 -_0806B9E0: .4byte gUnknown_20370D4 +_0806B9E0: .4byte gSpecialVar_Facing _0806B9E4: ldrh r1, [r2, 0x2E] movs r0, 0x80 @@ -3974,7 +3974,7 @@ sub_806BC40: @ 806BC40 bne _0806BC50 ldr r1, [r4, 0x64] _0806BC50: - ldr r4, _0806BC68 @ =gUnknown_20370C0 + ldr r4, _0806BC68 @ =gSpecialVar_0x8004 movs r2, 0x1 negs r2, r2 movs r0, 0x6 @@ -3985,7 +3985,7 @@ _0806BC50: pop {r1} bx r1 .align 2, 0 -_0806BC68: .4byte gUnknown_20370C0 +_0806BC68: .4byte gSpecialVar_0x8004 thumb_func_end sub_806BC40 thumb_func_start ScrCmd_vmessage @@ -4453,7 +4453,7 @@ ScrCmd_givemon: @ 806BFD0 ldrb r2, [r1] adds r1, 0x1 str r1, [r4, 0x8] - ldr r4, _0806C04C @ =gUnknown_20370D0 + ldr r4, _0806C04C @ =gSpecialVar_Result str r0, [sp] str r2, [sp, 0x4] adds r0, r6, 0 @@ -4473,7 +4473,7 @@ ScrCmd_givemon: @ 806BFD0 pop {r1} bx r1 .align 2, 0 -_0806C04C: .4byte gUnknown_20370D0 +_0806C04C: .4byte gSpecialVar_Result thumb_func_end ScrCmd_givemon thumb_func_start ScrCmd_giveegg @@ -4485,7 +4485,7 @@ ScrCmd_giveegg: @ 806C050 bl VarGet lsls r0, 16 lsrs r0, 16 - ldr r4, _0806C078 @ =gUnknown_20370D0 + ldr r4, _0806C078 @ =gSpecialVar_Result bl sub_80A01AC lsls r0, 24 lsrs r0, 24 @@ -4495,7 +4495,7 @@ ScrCmd_giveegg: @ 806C050 pop {r1} bx r1 .align 2, 0 -_0806C078: .4byte gUnknown_20370D0 +_0806C078: .4byte gSpecialVar_Result thumb_func_end ScrCmd_giveegg thumb_func_start ScrCmd_setmonmove @@ -4527,13 +4527,13 @@ ScrCmd_checkpartymove: @ 806C0A8 bl ScriptReadHalfword lsls r0, 16 lsrs r7, r0, 16 - ldr r1, _0806C0BC @ =gUnknown_20370D0 + ldr r1, _0806C0BC @ =gSpecialVar_Result movs r0, 0x6 strh r0, [r1] movs r6, 0 b _0806C0F6 .align 2, 0 -_0806C0BC: .4byte gUnknown_20370D0 +_0806C0BC: .4byte gSpecialVar_Result _0806C0C0: adds r0, r4, 0 movs r1, 0x2D @@ -4547,14 +4547,14 @@ _0806C0C0: lsrs r0, 24 cmp r0, 0x1 bne _0806C0F0 - ldr r0, _0806C0E8 @ =gUnknown_20370D0 + ldr r0, _0806C0E8 @ =gSpecialVar_Result strh r6, [r0] - ldr r0, _0806C0EC @ =gUnknown_20370C0 + ldr r0, _0806C0EC @ =gSpecialVar_0x8004 strh r5, [r0] b _0806C116 .align 2, 0 -_0806C0E8: .4byte gUnknown_20370D0 -_0806C0EC: .4byte gUnknown_20370C0 +_0806C0E8: .4byte gSpecialVar_Result +_0806C0EC: .4byte gSpecialVar_0x8004 _0806C0F0: adds r0, r6, 0x1 lsls r0, 24 @@ -4652,7 +4652,7 @@ ScrCmd_checkmoney: @ 806C18C str r0, [r4, 0x8] cmp r1, 0 bne _0806C1BA - ldr r4, _0806C1C4 @ =gUnknown_20370D0 + ldr r4, _0806C1C4 @ =gSpecialVar_Result ldr r0, _0806C1C8 @ =gSaveBlock1Ptr ldr r0, [r0] movs r1, 0xA4 @@ -4669,7 +4669,7 @@ _0806C1BA: pop {r1} bx r1 .align 2, 0 -_0806C1C4: .4byte gUnknown_20370D0 +_0806C1C4: .4byte gSpecialVar_Result _0806C1C8: .4byte gSaveBlock1Ptr thumb_func_end ScrCmd_checkmoney @@ -5133,7 +5133,7 @@ ScrCmd_setrespawn: @ 806C4D4 thumb_func_start ScrCmd_checkplayergender ScrCmd_checkplayergender: @ 806C4F0 - ldr r1, _0806C500 @ =gUnknown_20370D0 + ldr r1, _0806C500 @ =gSpecialVar_Result ldr r0, _0806C504 @ =gSaveBlock2Ptr ldr r0, [r0] ldrb r0, [r0, 0x8] @@ -5141,7 +5141,7 @@ ScrCmd_checkplayergender: @ 806C4F0 movs r0, 0 bx lr .align 2, 0 -_0806C500: .4byte gUnknown_20370D0 +_0806C500: .4byte gSpecialVar_Result _0806C504: .4byte gSaveBlock2Ptr thumb_func_end ScrCmd_checkplayergender @@ -5452,13 +5452,13 @@ ScrCmd_givecoins: @ 806C74C lsrs r0, 24 cmp r0, 0x1 bne _0806C774 - ldr r1, _0806C770 @ =gUnknown_20370D0 + ldr r1, _0806C770 @ =gSpecialVar_Result movs r0, 0 b _0806C778 .align 2, 0 -_0806C770: .4byte gUnknown_20370D0 +_0806C770: .4byte gSpecialVar_Result _0806C774: - ldr r1, _0806C780 @ =gUnknown_20370D0 + ldr r1, _0806C780 @ =gSpecialVar_Result movs r0, 0x1 _0806C778: strh r0, [r1] @@ -5466,7 +5466,7 @@ _0806C778: pop {r1} bx r1 .align 2, 0 -_0806C780: .4byte gUnknown_20370D0 +_0806C780: .4byte gSpecialVar_Result thumb_func_end ScrCmd_givecoins thumb_func_start ScrCmd_takecoins @@ -5483,13 +5483,13 @@ ScrCmd_takecoins: @ 806C784 lsrs r0, 24 cmp r0, 0x1 bne _0806C7AC - ldr r1, _0806C7A8 @ =gUnknown_20370D0 + ldr r1, _0806C7A8 @ =gSpecialVar_Result movs r0, 0 b _0806C7B0 .align 2, 0 -_0806C7A8: .4byte gUnknown_20370D0 +_0806C7A8: .4byte gSpecialVar_Result _0806C7AC: - ldr r1, _0806C7B8 @ =gUnknown_20370D0 + ldr r1, _0806C7B8 @ =gSpecialVar_Result movs r0, 0x1 _0806C7B0: strh r0, [r1] @@ -5497,7 +5497,7 @@ _0806C7B0: pop {r1} bx r1 .align 2, 0 -_0806C7B8: .4byte gUnknown_20370D0 +_0806C7B8: .4byte gSpecialVar_Result thumb_func_end ScrCmd_takecoins thumb_func_start sub_806C7BC @@ -5555,7 +5555,7 @@ ScrCmd_checkmonobedience: @ 806C80C bl VarGet lsls r0, 16 lsrs r0, 16 - ldr r4, _0806C83C @ =gUnknown_20370D0 + ldr r4, _0806C83C @ =gSpecialVar_Result movs r1, 0x64 muls r0, r1 ldr r1, _0806C840 @ =gPlayerParty @@ -5569,7 +5569,7 @@ ScrCmd_checkmonobedience: @ 806C80C pop {r1} bx r1 .align 2, 0 -_0806C83C: .4byte gUnknown_20370D0 +_0806C83C: .4byte gSpecialVar_Result _0806C840: .4byte gPlayerParty thumb_func_end ScrCmd_checkmonobedience diff --git a/asm/script_menu.s b/asm/script_menu.s index 239e6860f..f1127591d 100644 --- a/asm/script_menu.s +++ b/asm/script_menu.s @@ -78,7 +78,7 @@ ScriptMenu_Multichoice: @ 809C9B4 lsrs r0, 24 cmp r0, 0x1 beq _0809C9F8 - ldr r0, _0809C9F4 @ =gUnknown_20370D0 + ldr r0, _0809C9F4 @ =gSpecialVar_Result movs r1, 0xFF strh r1, [r0] movs r0, 0 @@ -92,7 +92,7 @@ ScriptMenu_Multichoice: @ 809C9B4 b _0809C9FA .align 2, 0 _0809C9F0: .4byte sub_809CC98 -_0809C9F4: .4byte gUnknown_20370D0 +_0809C9F4: .4byte gSpecialVar_Result _0809C9F8: movs r0, 0 _0809C9FA: @@ -126,7 +126,7 @@ ScriptMenu_MultichoiceWithDefault: @ 809CA04 lsrs r0, 24 cmp r0, 0x1 beq _0809CA54 - ldr r1, _0809CA50 @ =gUnknown_20370D0 + ldr r1, _0809CA50 @ =gSpecialVar_Result movs r0, 0xFF strh r0, [r1] str r4, [sp] @@ -139,7 +139,7 @@ ScriptMenu_MultichoiceWithDefault: @ 809CA04 b _0809CA56 .align 2, 0 _0809CA4C: .4byte sub_809CC98 -_0809CA50: .4byte gUnknown_20370D0 +_0809CA50: .4byte gSpecialVar_Result _0809CA54: movs r0, 0 _0809CA56: @@ -506,15 +506,15 @@ _0809CCF8: bne _0809CD3C movs r0, 0x5 bl PlaySE - ldr r1, _0809CD24 @ =gUnknown_20370D0 + ldr r1, _0809CD24 @ =gSpecialVar_Result movs r0, 0x7F strh r0, [r1] b _0809CD2C .align 2, 0 _0809CD20: .4byte gMain -_0809CD24: .4byte gUnknown_20370D0 +_0809CD24: .4byte gSpecialVar_Result _0809CD28: - ldr r0, _0809CD44 @ =gUnknown_20370D0 + ldr r0, _0809CD44 @ =gSpecialVar_Result strh r1, [r0] _0809CD2C: ldrb r0, [r5, 0xC] @@ -527,7 +527,7 @@ _0809CD3C: pop {r0} bx r0 .align 2, 0 -_0809CD44: .4byte gUnknown_20370D0 +_0809CD44: .4byte gSpecialVar_Result thumb_func_end sub_809CC98 thumb_func_start sub_809CD48 @@ -628,7 +628,7 @@ sub_809CDEC: @ 809CDEC .align 2, 0 _0809CE04: .4byte task_yes_no_maybe _0809CE08: - ldr r1, _0809CE30 @ =gUnknown_20370D0 + ldr r1, _0809CE30 @ =gSpecialVar_Result movs r0, 0xFF strh r0, [r1] ldr r0, _0809CE34 @ =sub_809D6D4 @@ -647,21 +647,21 @@ _0809CE28: pop {r1} bx r1 .align 2, 0 -_0809CE30: .4byte gUnknown_20370D0 +_0809CE30: .4byte gSpecialVar_Result _0809CE34: .4byte sub_809D6D4 thumb_func_end sub_809CDEC thumb_func_start sub_809CE38 sub_809CE38: @ 809CE38 push {lr} - ldr r0, _0809CE48 @ =gUnknown_20370D0 + ldr r0, _0809CE48 @ =gSpecialVar_Result ldrh r0, [r0] cmp r0, 0xFF beq _0809CE4C movs r0, 0x1 b _0809CE4E .align 2, 0 -_0809CE48: .4byte gUnknown_20370D0 +_0809CE48: .4byte gSpecialVar_Result _0809CE4C: movs r0, 0 _0809CE4E: @@ -711,13 +711,13 @@ _0809CE94: _0809CE9C: movs r0, 0x5 bl PlaySE - ldr r1, _0809CEA8 @ =gUnknown_20370D0 + ldr r1, _0809CEA8 @ =gSpecialVar_Result movs r0, 0 b _0809CEB0 .align 2, 0 -_0809CEA8: .4byte gUnknown_20370D0 +_0809CEA8: .4byte gSpecialVar_Result _0809CEAC: - ldr r1, _0809CEC4 @ =gUnknown_20370D0 + ldr r1, _0809CEC4 @ =gSpecialVar_Result movs r0, 0x1 _0809CEB0: strh r0, [r1] @@ -730,7 +730,7 @@ _0809CEBC: pop {r0} bx r0 .align 2, 0 -_0809CEC4: .4byte gUnknown_20370D0 +_0809CEC4: .4byte gSpecialVar_Result thumb_func_end task_yes_no_maybe thumb_func_start sub_809CEC8 @@ -767,7 +767,7 @@ sub_809CEC8: @ 809CEC8 .align 2, 0 _0809CF04: .4byte sub_809CFDC _0809CF08: - ldr r1, _0809CFCC @ =gUnknown_20370D0 + ldr r1, _0809CFCC @ =gSpecialVar_Result movs r0, 0xFF strh r0, [r1] ldr r0, _0809CFD0 @ =sub_809D6D4 @@ -858,7 +858,7 @@ _0809CFBA: pop {r1} bx r1 .align 2, 0 -_0809CFCC: .4byte gUnknown_20370D0 +_0809CFCC: .4byte gSpecialVar_Result _0809CFD0: .4byte sub_809D6D4 _0809CFD4: .4byte gUnknown_83E04B0 _0809CFD8: .4byte gTasks @@ -890,15 +890,15 @@ sub_809CFDC: @ 809CFDC bne _0809D034 movs r0, 0x5 bl PlaySE - ldr r1, _0809D01C @ =gUnknown_20370D0 + ldr r1, _0809D01C @ =gSpecialVar_Result movs r0, 0x7F strh r0, [r1] b _0809D024 .align 2, 0 _0809D018: .4byte gTasks+0x8 -_0809D01C: .4byte gUnknown_20370D0 +_0809D01C: .4byte gSpecialVar_Result _0809D020: - ldr r0, _0809D03C @ =gUnknown_20370D0 + ldr r0, _0809D03C @ =gSpecialVar_Result strh r1, [r0] _0809D024: ldrb r0, [r5, 0xC] @@ -911,7 +911,7 @@ _0809D034: pop {r0} bx r0 .align 2, 0 -_0809D03C: .4byte gUnknown_20370D0 +_0809D03C: .4byte gSpecialVar_Result thumb_func_end sub_809CFDC thumb_func_start sp109_CreatePCMenu @@ -923,7 +923,7 @@ sp109_CreatePCMenu: @ 809D040 lsrs r0, 24 cmp r0, 0x1 beq _0809D068 - ldr r1, _0809D064 @ =gUnknown_20370D0 + ldr r1, _0809D064 @ =gSpecialVar_Result movs r0, 0xFF strh r0, [r1] bl sub_809D070 @@ -931,7 +931,7 @@ sp109_CreatePCMenu: @ 809D040 b _0809D06A .align 2, 0 _0809D060: .4byte sub_809CC98 -_0809D064: .4byte gUnknown_20370D0 +_0809D064: .4byte gSpecialVar_Result _0809D068: movs r0, 0 _0809D06A: @@ -1524,7 +1524,7 @@ sub_809D504: @ 809D504 lsrs r0, 24 cmp r0, 0xFF bne _0809D55C - ldr r0, _0809D54C @ =gUnknown_20370C0 + ldr r0, _0809D54C @ =gSpecialVar_0x8004 ldrh r0, [r0] cmp r0, 0x8D bne _0809D558 @@ -1539,7 +1539,7 @@ sub_809D504: @ 809D504 .align 2, 0 _0809D544: .4byte sub_809D6D4 _0809D548: .4byte sub_809D494 -_0809D54C: .4byte gUnknown_20370C0 +_0809D54C: .4byte gSpecialVar_0x8004 _0809D550: .4byte gUnknown_83E17C0 _0809D554: .4byte gUnknown_83E17A0 _0809D558: @@ -1566,7 +1566,7 @@ _0809D572: lsls r2, 14 adds r1, r2 asrs r1, 16 - ldr r6, _0809D610 @ =gUnknown_20370C4 + ldr r6, _0809D610 @ =gSpecialVar_0x8006 ldrh r2, [r6] lsls r2, 19 movs r3, 0xA0 @@ -1629,7 +1629,7 @@ _0809D600: .4byte gUnknown_83E17D0 _0809D604: .4byte gUnknown_83E0F80 _0809D608: .4byte gUnknown_83E0768 _0809D60C: .4byte gSpecialVar_0x8005 -_0809D610: .4byte gUnknown_20370C4 +_0809D610: .4byte gSpecialVar_0x8006 _0809D614: .4byte gSprites _0809D618: .4byte sub_809D494 _0809D61C: .4byte gTasks @@ -1803,7 +1803,7 @@ sub_809D764: @ 809D764 mov r6, r8 push {r6,r7} sub sp, 0xC - ldr r1, _0809D7A0 @ =gUnknown_20370D0 + ldr r1, _0809D7A0 @ =gSpecialVar_Result movs r0, 0xFF strh r0, [r1] ldr r0, _0809D7A4 @ =sub_809D6D4 @@ -1818,7 +1818,7 @@ _0809D784: ldrh r0, [r0] cmp r0, 0x1 bne _0809D7B0 - ldr r0, _0809D7AC @ =gUnknown_20370C0 + ldr r0, _0809D7AC @ =gSpecialVar_0x8004 ldrh r0, [r0] movs r4, 0x4 cmp r0, 0x4 @@ -1830,10 +1830,10 @@ _0809D798: movs r5, 0x2 b _0809D7B8 .align 2, 0 -_0809D7A0: .4byte gUnknown_20370D0 +_0809D7A0: .4byte gSpecialVar_Result _0809D7A4: .4byte sub_809D6D4 _0809D7A8: .4byte gSpecialVar_0x8005 -_0809D7AC: .4byte gUnknown_20370C0 +_0809D7AC: .4byte gSpecialVar_0x8004 _0809D7B0: movs r4, 0 movs r0, 0x6 @@ -1866,7 +1866,7 @@ _0809D7B8: cmp r6, r5 bge _0809D844 _0809D7F2: - ldr r0, _0809D820 @ =gUnknown_20370C0 + ldr r0, _0809D820 @ =gSpecialVar_0x8004 ldrh r0, [r0] cmp r4, r0 beq _0809D828 @@ -1889,7 +1889,7 @@ _0809D7F2: bl AddTextPrinterParameterized b _0809D82E .align 2, 0 -_0809D820: .4byte gUnknown_20370C0 +_0809D820: .4byte gSpecialVar_0x8004 _0809D824: .4byte gUnknown_83E17E0 _0809D828: subs r0, r6, 0x1 @@ -1970,7 +1970,7 @@ _0809D8BC: .4byte gUnknown_84161C8 thumb_func_start sub_809D8C0 sub_809D8C0: @ 809D8C0 push {lr} - ldr r3, _0809D8EC @ =gUnknown_20370D0 + ldr r3, _0809D8EC @ =gSpecialVar_Result ldrh r2, [r3] adds r1, r2, 0 cmp r1, 0x7F @@ -1985,20 +1985,20 @@ sub_809D8C0: @ 809D8C0 beq _0809D930 cmp r1, 0 bne _0809D8F8 - ldr r0, _0809D8F4 @ =gUnknown_20370C0 + ldr r0, _0809D8F4 @ =gSpecialVar_0x8004 ldrh r0, [r0] cmp r0, 0x4 bls _0809D904 movs r0, 0x4 b _0809D94E .align 2, 0 -_0809D8EC: .4byte gUnknown_20370D0 +_0809D8EC: .4byte gSpecialVar_Result _0809D8F0: .4byte gSpecialVar_0x8005 -_0809D8F4: .4byte gUnknown_20370C0 +_0809D8F4: .4byte gSpecialVar_0x8004 _0809D8F8: cmp r1, 0x1 bne _0809D90C - ldr r0, _0809D908 @ =gUnknown_20370C0 + ldr r0, _0809D908 @ =gSpecialVar_0x8004 ldrh r0, [r0] cmp r0, 0x5 bls _0809D918 @@ -2006,11 +2006,11 @@ _0809D904: movs r0, 0x5 b _0809D94E .align 2, 0 -_0809D908: .4byte gUnknown_20370C0 +_0809D908: .4byte gSpecialVar_0x8004 _0809D90C: cmp r1, 0x2 bne _0809D94C - ldr r0, _0809D91C @ =gUnknown_20370C0 + ldr r0, _0809D91C @ =gSpecialVar_0x8004 ldrh r0, [r0] cmp r0, 0x6 bls _0809D920 @@ -2018,7 +2018,7 @@ _0809D918: movs r0, 0x6 b _0809D94E .align 2, 0 -_0809D91C: .4byte gUnknown_20370C0 +_0809D91C: .4byte gSpecialVar_0x8004 _0809D920: movs r0, 0x7 b _0809D94E @@ -2035,7 +2035,7 @@ _0809D930: movs r0, 0x7F b _0809D94E _0809D934: - ldr r0, _0809D944 @ =gUnknown_20370C0 + ldr r0, _0809D944 @ =gSpecialVar_0x8004 ldrh r0, [r0] cmp r1, r0 bcc _0809D948 @@ -2044,7 +2044,7 @@ _0809D934: lsrs r0, 16 b _0809D94E .align 2, 0 -_0809D944: .4byte gUnknown_20370C0 +_0809D944: .4byte gSpecialVar_0x8004 _0809D948: ldrh r0, [r3] b _0809D94E diff --git a/asm/script_pokemon_util_80A0058.s b/asm/script_pokemon_util_80A0058.s index 4dd5da652..191457abe 100644 --- a/asm/script_pokemon_util_80A0058.s +++ b/asm/script_pokemon_util_80A0058.s @@ -221,13 +221,13 @@ _080A020C: cmp r1, 0x2 bne _080A0214 _080A0210: - ldr r0, _080A0218 @ =gUnknown_20370D0 + ldr r0, _080A0218 @ =gSpecialVar_Result strh r1, [r0] _080A0214: pop {r0} bx r0 .align 2, 0 -_080A0218: .4byte gUnknown_20370D0 +_080A0218: .4byte gSpecialVar_Result thumb_func_end CheckForAlivePartyMons thumb_func_start CheckPartyMonHasHeldItem @@ -400,14 +400,14 @@ sub_80A0350: @ 80A0350 ldrb r1, [r0] cmp r1, 0 bne _080A0368 - ldr r0, _080A0364 @ =gUnknown_20370D0 + ldr r0, _080A0364 @ =gSpecialVar_Result strh r1, [r0] b _080A036E .align 2, 0 _080A0360: .4byte gUnknown_203B0D4 -_080A0364: .4byte gUnknown_20370D0 +_080A0364: .4byte gSpecialVar_Result _080A0368: - ldr r1, _080A0378 @ =gUnknown_20370D0 + ldr r1, _080A0378 @ =gSpecialVar_Result movs r0, 0x1 strh r0, [r1] _080A036E: @@ -416,7 +416,7 @@ _080A036E: pop {r0} bx r0 .align 2, 0 -_080A0378: .4byte gUnknown_20370D0 +_080A0378: .4byte gSpecialVar_Result _080A037C: .4byte c2_exit_to_overworld_1_continue_scripts_restart_music thumb_func_end sub_80A0350 @@ -443,15 +443,15 @@ sub_80A039C: @ 80A039C cmp r4, 0 bne _080A03B8 bl LoadPlayerParty - ldr r0, _080A03B4 @ =gUnknown_20370D0 + ldr r0, _080A03B4 @ =gSpecialVar_Result strh r4, [r0] b _080A03C2 .align 2, 0 _080A03B0: .4byte gUnknown_203B0D4 -_080A03B4: .4byte gUnknown_20370D0 +_080A03B4: .4byte gSpecialVar_Result _080A03B8: bl sub_80A03D8 - ldr r1, _080A03D0 @ =gUnknown_20370D0 + ldr r1, _080A03D0 @ =gSpecialVar_Result movs r0, 0x1 strh r0, [r1] _080A03C2: @@ -461,7 +461,7 @@ _080A03C2: pop {r0} bx r0 .align 2, 0 -_080A03D0: .4byte gUnknown_20370D0 +_080A03D0: .4byte gSpecialVar_Result _080A03D4: .4byte c2_exit_to_overworld_1_continue_scripts_restart_music thumb_func_end sub_80A039C diff --git a/asm/script_pokemon_util_80BF8FC.s b/asm/script_pokemon_util_80BF8FC.s index b8da48f65..eec41cf11 100644 --- a/asm/script_pokemon_util_80BF8FC.s +++ b/asm/script_pokemon_util_80BF8FC.s @@ -105,7 +105,7 @@ sub_80BF9BC: @ 80BF9BC push {r4,lr} sub sp, 0x4 ldr r0, _080BF9F0 @ =gPlayerParty - ldr r1, _080BF9F4 @ =gUnknown_20370C0 + ldr r1, _080BF9F4 @ =gSpecialVar_0x8004 ldrb r1, [r1] ldr r2, _080BF9F8 @ =gPlayerPartyCount ldrb r2, [r2] @@ -127,7 +127,7 @@ sub_80BF9BC: @ 80BF9BC bx r0 .align 2, 0 _080BF9F0: .4byte gPlayerParty -_080BF9F4: .4byte gUnknown_20370C0 +_080BF9F4: .4byte gSpecialVar_0x8004 _080BF9F8: .4byte gPlayerPartyCount _080BF9FC: .4byte c2_exit_to_overworld_2_switch _080BFA00: .4byte gUnknown_3005020 @@ -137,13 +137,13 @@ _080BFA04: .4byte sub_807DD24 thumb_func_start ScrSpecial_CountPokemonMoves ScrSpecial_CountPokemonMoves: @ 80BFA08 push {r4,r5,lr} - ldr r1, _080BFA44 @ =gUnknown_20370D0 + ldr r1, _080BFA44 @ =gSpecialVar_Result movs r0, 0 strh r0, [r1] movs r4, 0 adds r5, r1, 0 _080BFA14: - ldr r0, _080BFA48 @ =gUnknown_20370C0 + ldr r0, _080BFA48 @ =gSpecialVar_0x8004 ldrh r1, [r0] movs r0, 0x64 muls r0, r1 @@ -167,15 +167,15 @@ _080BFA32: pop {r0} bx r0 .align 2, 0 -_080BFA44: .4byte gUnknown_20370D0 -_080BFA48: .4byte gUnknown_20370C0 +_080BFA44: .4byte gSpecialVar_Result +_080BFA48: .4byte gSpecialVar_0x8004 _080BFA4C: .4byte gPlayerParty thumb_func_end ScrSpecial_CountPokemonMoves thumb_func_start ScrSpecial_GetPokemonNicknameAndMoveName ScrSpecial_GetPokemonNicknameAndMoveName: @ 80BFA50 push {r4,r5,lr} - ldr r0, _080BFA90 @ =gUnknown_20370C0 + ldr r0, _080BFA90 @ =gSpecialVar_0x8004 ldrh r1, [r0] movs r0, 0x64 adds r5, r1, 0 @@ -203,7 +203,7 @@ ScrSpecial_GetPokemonNicknameAndMoveName: @ 80BFA50 pop {r0} bx r0 .align 2, 0 -_080BFA90: .4byte gUnknown_20370C0 +_080BFA90: .4byte gSpecialVar_0x8004 _080BFA94: .4byte gPlayerParty _080BFA98: .4byte gSpecialVar_0x8005 _080BFA9C: .4byte gStringVar1 @@ -338,7 +338,7 @@ sub_80BFBA8: @ 80BFBA8 push {r4-r6,lr} mov r6, r8 push {r6} - ldr r0, _080BFC08 @ =gUnknown_20370C0 + ldr r0, _080BFC08 @ =gSpecialVar_0x8004 mov r8, r0 ldrh r0, [r0] movs r6, 0x64 @@ -359,7 +359,7 @@ sub_80BFBA8: @ 80BFBA8 cmp r4, 0x2 bhi _080BFBFC _080BFBDA: - ldr r0, _080BFC08 @ =gUnknown_20370C0 + ldr r0, _080BFC08 @ =gSpecialVar_0x8004 ldrh r1, [r0] movs r0, 0x64 muls r0, r1 @@ -382,7 +382,7 @@ _080BFBFC: pop {r0} bx r0 .align 2, 0 -_080BFC08: .4byte gUnknown_20370C0 +_080BFC08: .4byte gSpecialVar_0x8004 _080BFC0C: .4byte gPlayerParty _080BFC10: .4byte gSpecialVar_0x8005 thumb_func_end sub_80BFBA8 @@ -390,7 +390,7 @@ _080BFC10: .4byte gSpecialVar_0x8005 thumb_func_start sub_80BFC14 sub_80BFC14: @ 80BFC14 push {lr} - ldr r0, _080BFC38 @ =gUnknown_20370C0 + ldr r0, _080BFC38 @ =gSpecialVar_0x8004 ldrh r1, [r0] movs r0, 0x64 muls r0, r1 @@ -401,22 +401,22 @@ sub_80BFC14: @ 80BFC14 adds r1, r0, 0 cmp r1, 0 beq _080BFC44 - ldr r1, _080BFC40 @ =gUnknown_20370D0 + ldr r1, _080BFC40 @ =gSpecialVar_Result movs r0, 0x1 strh r0, [r1] b _080BFC48 .align 2, 0 -_080BFC38: .4byte gUnknown_20370C0 +_080BFC38: .4byte gSpecialVar_0x8004 _080BFC3C: .4byte gPlayerParty -_080BFC40: .4byte gUnknown_20370D0 +_080BFC40: .4byte gSpecialVar_Result _080BFC44: - ldr r0, _080BFC4C @ =gUnknown_20370D0 + ldr r0, _080BFC4C @ =gSpecialVar_Result strh r1, [r0] _080BFC48: pop {r0} bx r0 .align 2, 0 -_080BFC4C: .4byte gUnknown_20370D0 +_080BFC4C: .4byte gSpecialVar_Result thumb_func_end sub_80BFC14 .align 2, 0 @ Don't pad with nop. diff --git a/asm/seagallop.s b/asm/seagallop.s index 7d40b69e0..89f8c2867 100644 --- a/asm/seagallop.s +++ b/asm/seagallop.s @@ -338,7 +338,7 @@ _0814713C: .4byte gPaletteFade sub_8147140: @ 8147140 push {r4,lr} sub sp, 0x4 - ldr r1, _081471AC @ =gUnknown_20370C4 + ldr r1, _081471AC @ =gSpecialVar_0x8006 ldrh r0, [r1] cmp r0, 0xA bls _08147150 @@ -382,7 +382,7 @@ _08147150: pop {r0} bx r0 .align 2, 0 -_081471AC: .4byte gUnknown_20370C4 +_081471AC: .4byte gSpecialVar_0x8006 _081471B0: .4byte gUnknown_846AEFC _081471B4: .4byte gUnknown_3005020 _081471B8: .4byte sub_807DF64 @@ -767,7 +767,7 @@ _081474C6: thumb_func_start sub_81474CC sub_81474CC: @ 81474CC push {lr} - ldr r2, _081474EC @ =gUnknown_20370C0 + ldr r2, _081474EC @ =gSpecialVar_0x8004 ldrh r0, [r2] cmp r0, 0xA bhi _081474F8 @@ -775,16 +775,16 @@ sub_81474CC: @ 81474CC lsls r0, 1 adds r0, r1 ldrh r0, [r0] - ldr r1, _081474F4 @ =gUnknown_20370C4 + ldr r1, _081474F4 @ =gSpecialVar_0x8006 ldrh r1, [r1] asrs r0, r1 movs r1, 0x1 ands r0, r1 b _081474FA .align 2, 0 -_081474EC: .4byte gUnknown_20370C0 +_081474EC: .4byte gSpecialVar_0x8004 _081474F0: .4byte gUnknown_846AF28 -_081474F4: .4byte gUnknown_20370C4 +_081474F4: .4byte gSpecialVar_0x8006 _081474F8: movs r0, 0x1 _081474FA: diff --git a/asm/shop.s b/asm/shop.s index 263e5b3c5..60b92410d 100644 --- a/asm/shop.s +++ b/asm/shop.s @@ -3280,7 +3280,7 @@ sub_809C4A8: @ 809C4A8 adds r0, r1, 0x4 adds r1, 0x6 bl PlayerGetDestCoords - ldr r0, _0809C4E8 @ =gUnknown_20370C0 + ldr r0, _0809C4E8 @ =gSpecialVar_0x8004 ldrh r0, [r0] cmp r0, 0 bne _0809C4EC @@ -3290,7 +3290,7 @@ sub_809C4A8: @ 809C4A8 .align 2, 0 _0809C4E0: .4byte sub_809C500 _0809C4E4: .4byte gTasks -_0809C4E8: .4byte gUnknown_20370C0 +_0809C4E8: .4byte gSpecialVar_0x8004 _0809C4EC: ldrh r0, [r4, 0xC] subs r0, 0x1 diff --git a/asm/start_menu.s b/asm/start_menu.s index 43155b5da..73a82fb5c 100644 --- a/asm/start_menu.s +++ b/asm/start_menu.s @@ -1212,14 +1212,14 @@ task50_save_game: @ 806F6D4 _0806F6F0: cmp r1, 0x3 bgt _0806F704 - ldr r1, _0806F6FC @ =gUnknown_20370D0 + ldr r1, _0806F6FC @ =gSpecialVar_Result movs r0, 0 strh r0, [r1] b _0806F704 .align 2, 0 -_0806F6FC: .4byte gUnknown_20370D0 +_0806F6FC: .4byte gSpecialVar_Result _0806F700: - ldr r0, _0806F718 @ =gUnknown_20370D0 + ldr r0, _0806F718 @ =gSpecialVar_Result strh r1, [r0] _0806F704: adds r0, r4, 0 @@ -1231,7 +1231,7 @@ _0806F712: pop {r0} bx r0 .align 2, 0 -_0806F718: .4byte gUnknown_20370D0 +_0806F718: .4byte gSpecialVar_Result thumb_func_end task50_save_game thumb_func_start sub_806F71C diff --git a/asm/teachy_tv.s b/asm/teachy_tv.s index 48f98a2b4..bdd06dfff 100644 --- a/asm/teachy_tv.s +++ b/asm/teachy_tv.s @@ -2154,7 +2154,7 @@ sub_815BC90: @ 815BC90 ldr r1, _0815BCCC @ =gTasks+0x8 adds r5, r0, r1 bl sub_815B220 - ldr r1, _0815BCD0 @ =gUnknown_20370C0 + ldr r1, _0815BCD0 @ =gSpecialVar_0x8004 ldr r4, _0815BCD4 @ =gUnknown_203F444 ldrb r0, [r4, 0x5] strh r0, [r1] @@ -2172,7 +2172,7 @@ sub_815BC90: @ 815BC90 b _0815BCE2 .align 2, 0 _0815BCCC: .4byte gTasks+0x8 -_0815BCD0: .4byte gUnknown_20370C0 +_0815BCD0: .4byte gSpecialVar_0x8004 _0815BCD4: .4byte gUnknown_203F444 _0815BCD8: .4byte gMain _0815BCDC: .4byte sub_815BD58 diff --git a/asm/tm_case.s b/asm/tm_case.s index 7ab09953f..1539343e8 100644 --- a/asm/tm_case.s +++ b/asm/tm_case.s @@ -1400,7 +1400,7 @@ sub_81322D4: @ 81322D4 bne _08132354 movs r0, 0x5 bl PlaySE - ldr r0, _08132350 @ =gUnknown_203AD30 + ldr r0, _08132350 @ =gSpecialVar_ItemId mov r1, r8 strh r1, [r0] b _08132370 @@ -1409,7 +1409,7 @@ _08132340: .4byte gTasks+0x8 _08132344: .4byte gPaletteFade _08132348: .4byte gUnknown_203B116 _0813234C: .4byte gMain -_08132350: .4byte gUnknown_203AD30 +_08132350: .4byte gSpecialVar_ItemId _08132354: movs r0, 0x2 negs r0, r0 @@ -1422,7 +1422,7 @@ _08132354: _08132364: movs r0, 0x5 bl PlaySE - ldr r1, _08132378 @ =gUnknown_203AD30 + ldr r1, _08132378 @ =gSpecialVar_ItemId movs r0, 0 strh r0, [r1] _08132370: @@ -1430,7 +1430,7 @@ _08132370: bl sub_8132230 b _081323C8 .align 2, 0 -_08132378: .4byte gUnknown_203AD30 +_08132378: .4byte gSpecialVar_ItemId _0813237C: movs r0, 0x5 bl PlaySE @@ -1450,7 +1450,7 @@ _0813237C: movs r0, 0x4 adds r1, r4, 0 bl sub_809A798 - ldr r1, _081323D4 @ =gUnknown_203AD30 + ldr r1, _081323D4 @ =gSpecialVar_ItemId strh r0, [r1] ldr r0, _081323D8 @ =gTasks lsls r1, r7, 2 @@ -1471,7 +1471,7 @@ _081323C8: pop {r0} bx r0 .align 2, 0 -_081323D4: .4byte gUnknown_203AD30 +_081323D4: .4byte gSpecialVar_ItemId _081323D8: .4byte gTasks _081323DC: .4byte gUnknown_8463140 _081323E0: .4byte gUnknown_203B10C @@ -1591,7 +1591,7 @@ _08132468: lsls r0, 1 bl Alloc adds r4, r0, 0 - ldr r6, _08132558 @ =gUnknown_203AD30 + ldr r6, _08132558 @ =gSpecialVar_ItemId ldrh r1, [r6] bl sub_8131D48 ldr r1, _0813255C @ =gUnknown_8416301 @@ -1643,7 +1643,7 @@ _08132528: _0813254C: .4byte gUnknown_203B118 _08132550: .4byte gUnknown_846316B _08132554: .4byte gUnknown_8463150 -_08132558: .4byte gUnknown_203AD30 +_08132558: .4byte gSpecialVar_ItemId _0813255C: .4byte gUnknown_8416301 _08132560: .4byte gTasks _08132564: .4byte sub_8132568 @@ -1852,7 +1852,7 @@ sub_8132714: @ 8132714 adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 - ldr r0, _08132744 @ =gUnknown_203AD30 + ldr r0, _08132744 @ =gSpecialVar_ItemId ldrh r0, [r0] ldr r1, _08132748 @ =gStringVar1 bl sub_8099E90 @@ -1869,7 +1869,7 @@ sub_8132714: @ 8132714 pop {r0} bx r0 .align 2, 0 -_08132744: .4byte gUnknown_203AD30 +_08132744: .4byte gSpecialVar_ItemId _08132748: .4byte gStringVar1 _0813274C: .4byte gStringVar4 _08132750: .4byte gUnknown_841635E @@ -2085,7 +2085,7 @@ sub_8132908: @ 8132908 lsls r0, 3 ldr r1, _08132950 @ =gTasks+0x8 adds r4, r0, r1 - ldr r6, _08132954 @ =gUnknown_203AD30 + ldr r6, _08132954 @ =gSpecialVar_ItemId ldrh r0, [r6] bl itemid_get_market_price lsls r0, 16 @@ -2109,7 +2109,7 @@ sub_8132908: @ 8132908 b _081329AE .align 2, 0 _08132950: .4byte gTasks+0x8 -_08132954: .4byte gUnknown_203AD30 +_08132954: .4byte gSpecialVar_ItemId _08132958: .4byte gStringVar1 _0813295C: .4byte gStringVar4 _08132960: .4byte gUnknown_84168F1 @@ -2503,7 +2503,7 @@ sub_8132CAC: @ 8132CAC bl PutWindowTilemap movs r0, 0 bl schedule_bg_copy_tilemap_to_vram - ldr r0, _08132D1C @ =gUnknown_203AD30 + ldr r0, _08132D1C @ =gSpecialVar_ItemId ldrh r0, [r0] ldr r1, _08132D20 @ =gStringVar1 bl sub_8099E90 @@ -2537,7 +2537,7 @@ sub_8132CAC: @ 8132CAC bx r0 .align 2, 0 _08132D18: .4byte gTasks+0x8 -_08132D1C: .4byte gUnknown_203AD30 +_08132D1C: .4byte gSpecialVar_ItemId _08132D20: .4byte gStringVar1 _08132D24: .4byte gStringVar3 _08132D28: .4byte gStringVar4 @@ -2564,7 +2564,7 @@ sub_8132D34: @ 8132D34 mov r8, r1 movs r0, 0xF8 bl PlaySE - ldr r5, _08132DF8 @ =gUnknown_203AD30 + ldr r5, _08132DF8 @ =gSpecialVar_ItemId ldrh r0, [r5] mov r2, r8 ldrh r1, [r2, 0x10] @@ -2632,7 +2632,7 @@ sub_8132D34: @ 8132D34 bx r0 .align 2, 0 _08132DF4: .4byte gTasks+0x8 -_08132DF8: .4byte gUnknown_203AD30 +_08132DF8: .4byte gSpecialVar_ItemId _08132DFC: .4byte gSaveBlock1Ptr _08132E00: .4byte gUnknown_203B116 _08132E04: .4byte gUnknown_3005E70 diff --git a/asm/trade.s b/asm/trade.s index 8ae34f179..07d939caf 100644 --- a/asm/trade.s +++ b/asm/trade.s @@ -8912,7 +8912,7 @@ _08050EA8: .4byte gStringVar3 _08050EAC: .4byte gPlayerParty _08050EB0: .4byte gStringVar2 _08050EB4: - ldr r0, _08050EF8 @ =gUnknown_20370C0 + ldr r0, _08050EF8 @ =gSpecialVar_0x8004 ldrh r0, [r0] lsls r4, r0, 4 subs r4, r0 @@ -8944,7 +8944,7 @@ _08050EF0: pop {r0} bx r0 .align 2, 0 -_08050EF8: .4byte gUnknown_20370C0 +_08050EF8: .4byte gSpecialVar_0x8004 _08050EFC: .4byte gUnknown_826CF8C _08050F00: .4byte gStringVar1 _08050F04: .4byte gStringVar3 @@ -13782,7 +13782,7 @@ _08053A98: .4byte SpriteCallbackDummy thumb_func_start sub_8053A9C sub_8053A9C: @ 8053A9C push {r4-r6,lr} - ldr r0, _08053AD0 @ =gUnknown_20370C0 + ldr r0, _08053AD0 @ =gSpecialVar_0x8004 ldrh r0, [r0] lsls r4, r0, 4 subs r4, r0 @@ -13806,7 +13806,7 @@ sub_8053A9C: @ 8053A9C pop {r1} bx r1 .align 2, 0 -_08053AD0: .4byte gUnknown_20370C0 +_08053AD0: .4byte gSpecialVar_0x8004 _08053AD4: .4byte gUnknown_826CF8C _08053AD8: .4byte gStringVar1 _08053ADC: .4byte gSpeciesNames @@ -13817,7 +13817,7 @@ _08053AE0: .4byte gStringVar2 sub_8053AE4: @ 8053AE4 push {r4,lr} sub sp, 0x20 - ldr r0, _08053B2C @ =gUnknown_20370C0 + ldr r0, _08053B2C @ =gSpecialVar_0x8004 ldrh r0, [r0] lsls r4, r0, 4 subs r4, r0 @@ -13848,7 +13848,7 @@ sub_8053AE4: @ 8053AE4 pop {r0} bx r0 .align 2, 0 -_08053B2C: .4byte gUnknown_20370C0 +_08053B2C: .4byte gSpecialVar_0x8004 _08053B30: .4byte gUnknown_826CF8C _08053B34: .4byte gSpecialVar_0x8005 _08053B38: .4byte gPlayerParty @@ -14115,14 +14115,14 @@ sub_8053D68: @ 8053D68 push {lr} ldr r0, _08053D7C @ =gSpecialVar_0x8005 ldrb r0, [r0] - ldr r1, _08053D80 @ =gUnknown_20370C0 + ldr r1, _08053D80 @ =gSpecialVar_0x8004 ldrb r1, [r1] bl sub_8053B48 pop {r0} bx r0 .align 2, 0 _08053D7C: .4byte gSpecialVar_0x8005 -_08053D80: .4byte gUnknown_20370C0 +_08053D80: .4byte gSpecialVar_0x8004 thumb_func_end sub_8053D68 thumb_func_start sub_8053D84 diff --git a/asm/trainer_tower.s b/asm/trainer_tower.s index 6ef1e7468..5b65927d5 100644 --- a/asm/trainer_tower.s +++ b/asm/trainer_tower.s @@ -303,7 +303,7 @@ sub_815D9E8: @ 815D9E8 push {lr} bl sub_815DC8C ldr r1, _0815DA08 @ =gUnknown_847A230 - ldr r0, _0815DA0C @ =gUnknown_20370C0 + ldr r0, _0815DA0C @ =gSpecialVar_0x8004 ldrh r0, [r0] lsls r0, 2 adds r0, r1 @@ -314,7 +314,7 @@ sub_815D9E8: @ 815D9E8 bx r0 .align 2, 0 _0815DA08: .4byte gUnknown_847A230 -_0815DA0C: .4byte gUnknown_20370C0 +_0815DA0C: .4byte gSpecialVar_0x8004 thumb_func_end sub_815D9E8 thumb_func_start sub_815DA10 @@ -741,7 +741,7 @@ sub_815DD44: @ 815DD44 ldrb r1, [r4, 0x4] cmp r0, r1 ble _0815DD78 - ldr r0, _0815DD74 @ =gUnknown_20370D0 + ldr r0, _0815DD74 @ =gSpecialVar_Result movs r1, 0x3 strh r1, [r0] movs r0, 0x99 @@ -752,9 +752,9 @@ sub_815DD44: @ 815DD44 _0815DD68: .4byte gMapHeader _0815DD6C: .4byte 0xfffffed7 _0815DD70: .4byte gUnknown_203F458 -_0815DD74: .4byte gUnknown_20370D0 +_0815DD74: .4byte gSpecialVar_Result _0815DD78: - ldr r3, _0815DDA8 @ =gUnknown_20370D0 + ldr r3, _0815DDA8 @ =gSpecialVar_Result ldrb r1, [r4] lsls r0, r1, 5 subs r0, r1 @@ -778,7 +778,7 @@ _0815DDA2: pop {r0} bx r0 .align 2, 0 -_0815DDA8: .4byte gUnknown_20370D0 +_0815DDA8: .4byte gSpecialVar_Result _0815DDAC: .4byte gUnknown_847A284 thumb_func_end sub_815DD44 @@ -1015,7 +1015,7 @@ _0815DF4E: thumb_func_start sub_815DF54 sub_815DF54: @ 815DF54 push {r4,r5,lr} - ldr r0, _0815DF90 @ =gUnknown_20370C4 + ldr r0, _0815DF90 @ =gSpecialVar_0x8006 ldrh r4, [r0] ldr r2, _0815DF94 @ =gUnknown_203F458 ldr r3, [r2] @@ -1046,7 +1046,7 @@ _0815DF7C: beq _0815DFA6 b _0815E05C .align 2, 0 -_0815DF90: .4byte gUnknown_20370C4 +_0815DF90: .4byte gSpecialVar_0x8006 _0815DF94: .4byte gUnknown_203F458 _0815DF98: .4byte gSpecialVar_0x8005 _0815DF9C: @@ -1335,7 +1335,7 @@ sub_815E1C0: @ 815E1C0 ldrh r0, [r0] cmp r0, 0 bne _0815E1DE - ldr r3, _0815E1E8 @ =gUnknown_20370D0 + ldr r3, _0815E1E8 @ =gSpecialVar_Result ldr r0, _0815E1EC @ =gUnknown_203F458 ldr r1, [r0] ldrb r2, [r1] @@ -1350,7 +1350,7 @@ _0815E1DE: bx r0 .align 2, 0 _0815E1E4: .4byte gSpecialVar_0x8005 -_0815E1E8: .4byte gUnknown_20370D0 +_0815E1E8: .4byte gSpecialVar_Result _0815E1EC: .4byte gUnknown_203F458 thumb_func_end sub_815E1C0 @@ -1412,7 +1412,7 @@ sub_815E218: @ 815E218 ldrb r1, [r1, 0xD] cmp r3, r1 bgt _0815E27C - ldr r1, _0815E278 @ =gUnknown_20370D0 + ldr r1, _0815E278 @ =gSpecialVar_Result movs r0, 0 b _0815E280 .align 2, 0 @@ -1422,16 +1422,16 @@ _0815E268: .4byte gSaveBlock1Ptr _0815E26C: .4byte 0x00003d34 _0815E270: .4byte 0xfffffed7 _0815E274: .4byte gUnknown_203F458 -_0815E278: .4byte gUnknown_20370D0 +_0815E278: .4byte gSpecialVar_Result _0815E27C: - ldr r1, _0815E288 @ =gUnknown_20370D0 + ldr r1, _0815E288 @ =gSpecialVar_Result movs r0, 0x1 _0815E280: strh r0, [r1] pop {r0} bx r0 .align 2, 0 -_0815E288: .4byte gUnknown_20370D0 +_0815E288: .4byte gSpecialVar_Result thumb_func_end sub_815E218 thumb_func_start sub_815E28C @@ -1566,7 +1566,7 @@ _0815E390: .4byte 0x00003d38 sub_815E394: @ 815E394 push {lr} bl DisableVBlankCounter1 - ldr r3, _0815E3F8 @ =gUnknown_20370D0 + ldr r3, _0815E3F8 @ =gSpecialVar_Result movs r0, 0 strh r0, [r3] ldr r0, _0815E3FC @ =gSaveBlock1Ptr @@ -1616,7 +1616,7 @@ _0815E3D6: pop {r0} bx r0 .align 2, 0 -_0815E3F8: .4byte gUnknown_20370D0 +_0815E3F8: .4byte gSpecialVar_Result _0815E3FC: .4byte gSaveBlock1Ptr _0815E400: .4byte 0x00003d34 _0815E404: .4byte 0x00003d42 @@ -1651,7 +1651,7 @@ sub_815E408: @ 815E408 lsrs r5, r0, 31 cmp r5, 0 beq _0815E45C - ldr r1, _0815E458 @ =gUnknown_20370D0 + ldr r1, _0815E458 @ =gSpecialVar_Result movs r0, 0x2 b _0815E4A0 .align 2, 0 @@ -1660,7 +1660,7 @@ _0815E448: .4byte gUnknown_203F458 _0815E44C: .4byte gSaveBlock1Ptr _0815E450: .4byte 0x00003d34 _0815E454: .4byte 0x00003d42 -_0815E458: .4byte gUnknown_20370D0 +_0815E458: .4byte gSpecialVar_Result _0815E45C: adds r0, r4, 0 movs r1, 0x1 @@ -1685,14 +1685,14 @@ _0815E45C: movs r2, 0x1 orrs r0, r2 strb r0, [r1] - ldr r0, _0815E498 @ =gUnknown_20370D0 + ldr r0, _0815E498 @ =gSpecialVar_Result strh r5, [r0] b _0815E4A2 .align 2, 0 _0815E494: .4byte gStringVar2 -_0815E498: .4byte gUnknown_20370D0 +_0815E498: .4byte gSpecialVar_Result _0815E49C: - ldr r1, _0815E4AC @ =gUnknown_20370D0 + ldr r1, _0815E4AC @ =gSpecialVar_Result movs r0, 0x1 _0815E4A0: strh r0, [r1] @@ -1703,7 +1703,7 @@ _0815E4A2: pop {r0} bx r0 .align 2, 0 -_0815E4AC: .4byte gUnknown_20370D0 +_0815E4AC: .4byte gSpecialVar_Result thumb_func_end sub_815E408 thumb_func_start sub_815E4B0 @@ -1725,14 +1725,14 @@ sub_815E4B0: @ 815E4B0 lsrs r5, r0, 31 cmp r5, 0 beq _0815E4E8 - ldr r1, _0815E4E4 @ =gUnknown_20370D0 + ldr r1, _0815E4E4 @ =gSpecialVar_Result movs r0, 0x2 b _0815E534 .align 2, 0 _0815E4D8: .4byte gSaveBlock1Ptr _0815E4DC: .4byte 0x00003d34 _0815E4E0: .4byte 0x00003d42 -_0815E4E4: .4byte gUnknown_20370D0 +_0815E4E4: .4byte gSpecialVar_Result _0815E4E8: ldr r4, _0815E520 @ =0x00003d38 adds r0, r1, r4 @@ -1756,16 +1756,16 @@ _0815E4E8: adds r0, r3 adds r1, r4, 0 bl sub_815EDF4 - ldr r0, _0815E52C @ =gUnknown_20370D0 + ldr r0, _0815E52C @ =gSpecialVar_Result strh r5, [r0] b _0815E536 .align 2, 0 _0815E520: .4byte 0x00003d38 _0815E524: .4byte 0x00003d34 _0815E528: .4byte 0x00003d3c -_0815E52C: .4byte gUnknown_20370D0 +_0815E52C: .4byte gSpecialVar_Result _0815E530: - ldr r1, _0815E55C @ =gUnknown_20370D0 + ldr r1, _0815E55C @ =gSpecialVar_Result movs r0, 0x1 _0815E534: strh r0, [r1] @@ -1789,7 +1789,7 @@ _0815E536: pop {r0} bx r0 .align 2, 0 -_0815E55C: .4byte gUnknown_20370D0 +_0815E55C: .4byte gSpecialVar_Result _0815E560: .4byte gSaveBlock1Ptr _0815E564: .4byte 0x00003d34 _0815E568: .4byte 0x00003d42 @@ -1887,14 +1887,14 @@ sub_815E5F0: @ 815E5F0 negs r0, r0 ands r0, r1 strb r0, [r2] - ldr r1, _0815E62C @ =gUnknown_20370D0 + ldr r1, _0815E62C @ =gSpecialVar_Result movs r0, 0 b _0815E64C .align 2, 0 _0815E620: .4byte gSaveBlock1Ptr _0815E624: .4byte 0x00003d34 _0815E628: .4byte 0x00003d42 -_0815E62C: .4byte gUnknown_20370D0 +_0815E62C: .4byte gSpecialVar_Result _0815E630: lsls r0, r1, 27 cmp r0, 0 @@ -1903,20 +1903,20 @@ _0815E630: negs r0, r0 ands r0, r1 strb r0, [r2] - ldr r1, _0815E644 @ =gUnknown_20370D0 + ldr r1, _0815E644 @ =gSpecialVar_Result movs r0, 0x1 b _0815E64C .align 2, 0 -_0815E644: .4byte gUnknown_20370D0 +_0815E644: .4byte gSpecialVar_Result _0815E648: - ldr r1, _0815E654 @ =gUnknown_20370D0 + ldr r1, _0815E654 @ =gSpecialVar_Result movs r0, 0x2 _0815E64C: strh r0, [r1] pop {r0} bx r0 .align 2, 0 -_0815E654: .4byte gUnknown_20370D0 +_0815E654: .4byte gSpecialVar_Result thumb_func_end sub_815E5F0 thumb_func_start sub_815E658 @@ -2187,7 +2187,7 @@ _0815E8B0: .4byte 0x00004001 thumb_func_start sub_815E8B4 sub_815E8B4: @ 815E8B4 push {r4,lr} - ldr r4, _0815E8C8 @ =gUnknown_20370D0 + ldr r4, _0815E8C8 @ =gSpecialVar_Result bl GetMonsStateToDoubles lsls r0, 24 lsrs r0, 24 @@ -2196,7 +2196,7 @@ sub_815E8B4: @ 815E8B4 pop {r0} bx r0 .align 2, 0 -_0815E8C8: .4byte gUnknown_20370D0 +_0815E8C8: .4byte gSpecialVar_Result thumb_func_end sub_815E8B4 thumb_func_start sub_815E8CC @@ -2213,22 +2213,22 @@ sub_815E8CC: @ 815E8CC movs r2, 0 movs r3, 0x1 bl ConvertIntToDecimalStringN - ldr r1, _0815E8F4 @ =gUnknown_20370D0 + ldr r1, _0815E8F4 @ =gSpecialVar_Result movs r0, 0x1 b _0815E8FC .align 2, 0 _0815E8EC: .4byte gUnknown_203F458 _0815E8F0: .4byte gStringVar1 -_0815E8F4: .4byte gUnknown_20370D0 +_0815E8F4: .4byte gSpecialVar_Result _0815E8F8: - ldr r1, _0815E904 @ =gUnknown_20370D0 + ldr r1, _0815E904 @ =gSpecialVar_Result movs r0, 0 _0815E8FC: strh r0, [r1] pop {r0} bx r0 .align 2, 0 -_0815E904: .4byte gUnknown_20370D0 +_0815E904: .4byte gSpecialVar_Result thumb_func_end sub_815E8CC thumb_func_start sub_815E908 @@ -2245,23 +2245,23 @@ sub_815E908: @ 815E908 lsrs r1, r0, 16 cmp r1, 0 bne _0815E938 - ldr r0, _0815E934 @ =gUnknown_20370D0 + ldr r0, _0815E934 @ =gSpecialVar_Result strh r1, [r0] b _0815E93E .align 2, 0 _0815E928: .4byte gMapHeader _0815E92C: .4byte 0x00000129 _0815E930: .4byte 0x00004082 -_0815E934: .4byte gUnknown_20370D0 +_0815E934: .4byte gSpecialVar_Result _0815E938: - ldr r1, _0815E944 @ =gUnknown_20370D0 + ldr r1, _0815E944 @ =gSpecialVar_Result movs r0, 0 strh r0, [r1] _0815E93E: pop {r0} bx r0 .align 2, 0 -_0815E944: .4byte gUnknown_20370D0 +_0815E944: .4byte gSpecialVar_Result thumb_func_end sub_815E908 thumb_func_start sub_815E948 @@ -2332,7 +2332,7 @@ _0815E9C4: .4byte gUnknown_847A2D2 thumb_func_start sub_815E9C8 sub_815E9C8: @ 815E9C8 - ldr r3, _0815E9EC @ =gUnknown_20370D0 + ldr r3, _0815E9EC @ =gSpecialVar_Result ldr r0, _0815E9F0 @ =gSaveBlock1Ptr ldr r1, [r0] ldr r2, _0815E9F4 @ =0x00003d34 @@ -2350,7 +2350,7 @@ sub_815E9C8: @ 815E9C8 strh r0, [r3] bx lr .align 2, 0 -_0815E9EC: .4byte gUnknown_20370D0 +_0815E9EC: .4byte gSpecialVar_Result _0815E9F0: .4byte gSaveBlock1Ptr _0815E9F4: .4byte 0x00003d34 _0815E9F8: .4byte 0x00003d42 diff --git a/asm/unk_8147500.s b/asm/unk_8147500.s index 23a3b1b9c..d9867d69f 100644 --- a/asm/unk_8147500.s +++ b/asm/unk_8147500.s @@ -8,9 +8,9 @@ thumb_func_start sub_8147500 sub_8147500: @ 8147500 push {lr} - ldr r0, _08147518 @ =gUnknown_20370C0 + ldr r0, _08147518 @ =gSpecialVar_0x8004 ldrh r1, [r0] - ldr r0, _0814751C @ =gUnknown_20370C4 + ldr r0, _0814751C @ =gSpecialVar_0x8006 ldrh r2, [r0] cmp r1, 0x8 beq _08147512 @@ -20,8 +20,8 @@ _08147512: movs r0, 0x1 b _0814758E .align 2, 0 -_08147518: .4byte gUnknown_20370C0 -_0814751C: .4byte gUnknown_20370C4 +_08147518: .4byte gSpecialVar_0x8004 +_0814751C: .4byte gSpecialVar_0x8006 _08147520: cmp r1, 0 beq _08147528 diff --git a/asm/unk_8147AA8.s b/asm/unk_8147AA8.s index 1b06167f8..5b4fbd0ad 100644 --- a/asm/unk_8147AA8.s +++ b/asm/unk_8147AA8.s @@ -4267,17 +4267,17 @@ _08149A1C: bl sub_8149A00 cmp r0, 0 beq _08149A54 - ldr r1, _08149A50 @ =gUnknown_20370D0 + ldr r1, _08149A50 @ =gSpecialVar_Result movs r0, 0x1 b _08149A5E .align 2, 0 _08149A4C: .4byte gPlayerParty -_08149A50: .4byte gUnknown_20370D0 +_08149A50: .4byte gSpecialVar_Result _08149A54: adds r5, 0x1 cmp r5, 0x5 ble _08149A1C - ldr r1, _08149A68 @ =gUnknown_20370D0 + ldr r1, _08149A68 @ =gSpecialVar_Result movs r0, 0 _08149A5E: strh r0, [r1] @@ -4285,7 +4285,7 @@ _08149A5E: pop {r0} bx r0 .align 2, 0 -_08149A68: .4byte gUnknown_20370D0 +_08149A68: .4byte gSpecialVar_Result thumb_func_end sub_8149A18 thumb_func_start sub_8149A6C diff --git a/asm/unk_814B6F0.s b/asm/unk_814B6F0.s index cfc756cf8..dc7d8d9f8 100644 --- a/asm/unk_814B6F0.s +++ b/asm/unk_814B6F0.s @@ -189,7 +189,7 @@ _0814B85C: .4byte sub_814BA98 sub_814B860: @ 814B860 push {r4,lr} sub sp, 0xC - ldr r1, _0814B878 @ =gUnknown_203AD30 + ldr r1, _0814B878 @ =gSpecialVar_ItemId ldrh r0, [r1] subs r0, 0x85 lsls r0, 16 @@ -200,7 +200,7 @@ sub_814B860: @ 814B860 strh r0, [r1] b _0814B884 .align 2, 0 -_0814B878: .4byte gUnknown_203AD30 +_0814B878: .4byte gSpecialVar_ItemId _0814B87C: ldrh r0, [r1] movs r1, 0x1 @@ -211,7 +211,7 @@ _0814B884: ldrb r0, [r2, 0x8] lsls r0, 5 adds r0, r2, r0 - ldr r1, _0814B8E4 @ =gUnknown_203AD30 + ldr r1, _0814B8E4 @ =gSpecialVar_ItemId ldrh r1, [r1] subs r1, 0x85 adds r0, 0xA4 @@ -250,7 +250,7 @@ _0814B884: bx r0 .align 2, 0 _0814B8E0: .4byte gUnknown_203F3DC -_0814B8E4: .4byte gUnknown_203AD30 +_0814B8E4: .4byte gSpecialVar_ItemId _0814B8E8: .4byte sub_814BA98 _0814B8EC: .4byte sub_814BA80 thumb_func_end sub_814B860 diff --git a/asm/unk_81507FC.s b/asm/unk_81507FC.s index 97711bd33..141ff4d18 100644 --- a/asm/unk_81507FC.s +++ b/asm/unk_81507FC.s @@ -6310,7 +6310,7 @@ _081537BC: .4byte gUnknown_203F3E0 sub_81537C0: @ 81537C0 push {r4-r6,lr} movs r5, 0 - ldr r6, _081537F0 @ =gUnknown_20370D0 + ldr r6, _081537F0 @ =gSpecialVar_Result _081537C6: movs r0, 0x64 adds r1, r5, 0 @@ -6331,13 +6331,13 @@ _081537C6: strh r0, [r6] b _08153804 .align 2, 0 -_081537F0: .4byte gUnknown_20370D0 +_081537F0: .4byte gSpecialVar_Result _081537F4: .4byte gPlayerParty _081537F8: adds r5, 0x1 cmp r5, 0x5 ble _081537C6 - ldr r1, _0815380C @ =gUnknown_20370D0 + ldr r1, _0815380C @ =gSpecialVar_Result movs r0, 0 strh r0, [r1] _08153804: @@ -6345,7 +6345,7 @@ _08153804: pop {r0} bx r0 .align 2, 0 -_0815380C: .4byte gUnknown_20370D0 +_0815380C: .4byte gSpecialVar_Result thumb_func_end sub_81537C0 thumb_func_start sub_8153810 diff --git a/asm/unk_8159F40.s b/asm/unk_8159F40.s index a8d1b9bf8..aefa4ecff 100644 --- a/asm/unk_8159F40.s +++ b/asm/unk_8159F40.s @@ -23,7 +23,7 @@ sub_8159F40: @ 8159F40 bl ZeroPlayerPartyMons bl ZeroEnemyPartyMons ldr r1, _08159F94 @ =gUnknown_84792D0 - ldr r0, _08159F98 @ =gUnknown_20370C0 + ldr r0, _08159F98 @ =gSpecialVar_0x8004 ldrh r0, [r0] lsls r0, 2 adds r0, r1 @@ -49,7 +49,7 @@ _08159F72: .align 2, 0 _08159F90: .4byte gBattleTypeFlags _08159F94: .4byte gUnknown_84792D0 -_08159F98: .4byte gUnknown_20370C0 +_08159F98: .4byte gSpecialVar_0x8004 _08159F9C: .4byte gPlayerParty _08159FA0: movs r0, 0x64 diff --git a/asm/unk_815EDDC.s b/asm/unk_815EDDC.s index 6acbf447d..116458940 100644 --- a/asm/unk_815EDDC.s +++ b/asm/unk_815EDDC.s @@ -138,7 +138,7 @@ sub_815EEB0: @ 815EEB0 ldr r1, _0815EED0 @ =0x00000af8 adds r0, r1 bl sub_815EE3C - ldr r1, _0815EED4 @ =gUnknown_20370C0 + ldr r1, _0815EED4 @ =gSpecialVar_0x8004 ldrh r1, [r1] cmp r0, r1 bcc _0815EED8 @@ -147,7 +147,7 @@ sub_815EEB0: @ 815EEB0 .align 2, 0 _0815EECC: .4byte gSaveBlock2Ptr _0815EED0: .4byte 0x00000af8 -_0815EED4: .4byte gUnknown_20370C0 +_0815EED4: .4byte gSpecialVar_0x8004 _0815EED8: movs r0, 0 _0815EEDA: @@ -227,7 +227,7 @@ sub_815EF5C: @ 815EF5C ldr r0, [r0] ldr r1, _0815EF90 @ =0x00000af8 adds r4, r0, r1 - ldr r5, _0815EF94 @ =gUnknown_20370C0 + ldr r5, _0815EF94 @ =gSpecialVar_0x8004 ldrh r0, [r5] bl sub_815EE88 lsls r0, 24 @@ -245,7 +245,7 @@ sub_815EF5C: @ 815EF5C .align 2, 0 _0815EF8C: .4byte gSaveBlock2Ptr _0815EF90: .4byte 0x00000af8 -_0815EF94: .4byte gUnknown_20370C0 +_0815EF94: .4byte gSpecialVar_0x8004 _0815EF98: movs r0, 0 _0815EF9A: diff --git a/asm/wild_encounter.s b/asm/wild_encounter.s index c57ca5366..67c159abc 100644 --- a/asm/wild_encounter.s +++ b/asm/wild_encounter.s @@ -1001,15 +1001,15 @@ sub_8082E54: @ 8082E54 bne _08082EB0 bl sub_807F704 _08082E9C: - ldr r0, _08082EAC @ =gUnknown_20370D0 + ldr r0, _08082EAC @ =gSpecialVar_Result strh r4, [r0] b _08082EB6 .align 2, 0 _08082EA4: .4byte 0x0000ffff _08082EA8: .4byte gUnknown_83C9CB8 -_08082EAC: .4byte gUnknown_20370D0 +_08082EAC: .4byte gSpecialVar_Result _08082EB0: - ldr r1, _08082EBC @ =gUnknown_20370D0 + ldr r1, _08082EBC @ =gSpecialVar_Result movs r0, 0 strh r0, [r1] _08082EB6: @@ -1017,7 +1017,7 @@ _08082EB6: pop {r0} bx r0 .align 2, 0 -_08082EBC: .4byte gUnknown_20370D0 +_08082EBC: .4byte gSpecialVar_Result thumb_func_end sub_8082E54 thumb_func_start sub_8082EC0 diff --git a/data/event_scripts.s b/data/event_scripts.s index bc5e09b79..9baa201e5 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -4,22 +4,22 @@ .align 2 gSpecialVars:: @ 815FD0C - .4byte gUnknown_20370B8 - .4byte gUnknown_20370BA - .4byte gUnknown_20370BC - .4byte gUnknown_20370BE - .4byte gUnknown_20370C0 + .4byte gSpecialVar_0x8000 + .4byte gSpecialVar_0x8001 + .4byte gSpecialVar_0x8002 + .4byte gSpecialVar_0x8003 + .4byte gSpecialVar_0x8004 .4byte gSpecialVar_0x8005 - .4byte gUnknown_20370C4 - .4byte gUnknown_20370C6 - .4byte gUnknown_20370C8 - .4byte gUnknown_20370CA - .4byte gUnknown_20370CC - .4byte gUnknown_20370CE - .4byte gUnknown_20370D4 - .4byte gUnknown_20370D0 - .4byte gUnknown_203AD30 - .4byte gUnknown_20370D2 + .4byte gSpecialVar_0x8006 + .4byte gSpecialVar_0x8007 + .4byte gSpecialVar_0x8008 + .4byte gSpecialVar_0x8009 + .4byte gSpecialVar_0x800A + .4byte gSpecialVar_0x800B + .4byte gSpecialVar_Facing + .4byte gSpecialVar_Result + .4byte gSpecialVar_ItemId + .4byte gSpecialVar_LastTalked .4byte gSpecialVar_MonBoxId .4byte gSpecialVar_MonBoxPos .4byte gUnknown_20370DA diff --git a/include/event_data.h b/include/event_data.h index bced2a88f..13e388bf2 100644 --- a/include/event_data.h +++ b/include/event_data.h @@ -56,7 +56,7 @@ extern u16 gSpecialVar_MonBoxId; extern u16 gSpecialVar_MonBoxPos; extern u16 gSpecialVar_0x8014; -extern u16 gUnknown_20370D0; -extern u16 gUnknown_20370C0; +extern u16 gSpecialVar_Result; +extern u16 gSpecialVar_0x8004; #endif // GUARD_EVENT_DATA_H diff --git a/include/item_menu.h b/include/item_menu.h index 2482aa51f..a6128b9fb 100644 --- a/include/item_menu.h +++ b/include/item_menu.h @@ -7,7 +7,7 @@ // Exported RAM declarations -extern u16 gUnknown_203AD30; +extern u16 gSpecialVar_ItemId; // Exported ROM declarations void sub_81AAC50(void); diff --git a/src/fame_checker.c b/src/fame_checker.c index ed38406cb..bbbe02c58 100644 --- a/src/fame_checker.c +++ b/src/fame_checker.c @@ -1038,9 +1038,9 @@ static void FCSetup_ResetBGCoords(void) void SetFlavorTextFlagFromSpecialVars(void) { - if (gUnknown_20370C0 < NUM_FAMECHECKER_PERSONS && gSpecialVar_0x8005 < 6) + if (gSpecialVar_0x8004 < NUM_FAMECHECKER_PERSONS && gSpecialVar_0x8005 < 6) { - gSaveBlock1Ptr->fameChecker[gUnknown_20370C0].flavorTextFlags |= (1 << gSpecialVar_0x8005); + gSaveBlock1Ptr->fameChecker[gSpecialVar_0x8004].flavorTextFlags |= (1 << gSpecialVar_0x8005); gSpecialVar_0x8005 = FCPICKSTATE_SILHOUETTE; UpdatePickStateFromSpecialVar8005(); } @@ -1048,15 +1048,15 @@ void SetFlavorTextFlagFromSpecialVars(void) void UpdatePickStateFromSpecialVar8005(void) { - if (gUnknown_20370C0 < NUM_FAMECHECKER_PERSONS && gSpecialVar_0x8005 < 3) + if (gSpecialVar_0x8004 < NUM_FAMECHECKER_PERSONS && gSpecialVar_0x8005 < 3) { if (gSpecialVar_0x8005 == FCPICKSTATE_NO_DRAW) return; if ( gSpecialVar_0x8005 == FCPICKSTATE_SILHOUETTE - && gSaveBlock1Ptr->fameChecker[gUnknown_20370C0].pickState == FCPICKSTATE_COLORED + && gSaveBlock1Ptr->fameChecker[gSpecialVar_0x8004].pickState == FCPICKSTATE_COLORED ) return; - gSaveBlock1Ptr->fameChecker[gUnknown_20370C0].pickState = gSpecialVar_0x8005; + gSaveBlock1Ptr->fameChecker[gSpecialVar_0x8004].pickState = gSpecialVar_0x8005; } } diff --git a/src/menews_jisan.c b/src/menews_jisan.c index 13c787df7..b4fe080bf 100644 --- a/src/menews_jisan.c +++ b/src/menews_jisan.c @@ -107,7 +107,7 @@ void sub_8146CA4(void) u16 sub_8146CE8(void) { - u16 *r6 = &gUnknown_20370D0; + u16 *r6 = &gSpecialVar_Result; struct MysteryEventStruct *r4 = sub_8143D94(); u16 r5; diff --git a/src/quest_log.c b/src/quest_log.c index 546ff6e05..8e890af21 100644 --- a/src/quest_log.c +++ b/src/quest_log.c @@ -523,7 +523,7 @@ void sub_8110A3C(void) void sub_8110AB4(void) { - gUnknown_20370D0 = gUnknown_203ADFA; + gSpecialVar_Result = gUnknown_203ADFA; } u8 sub_8110AC8(void) @@ -2654,7 +2654,7 @@ bool16 sub_8113364(void) bool16 sub_811337C(struct Var4038Struct * a0) { - return (a0->unk_1 >> gUnknown_20370C0) & 1; + return (a0->unk_1 >> gSpecialVar_0x8004) & 1; } void sub_8113390(struct Var4038Struct * a0) @@ -2669,7 +2669,7 @@ void sub_81133A4(void) u8 r3 = 0; u8 r2 = 0; - switch (gUnknown_20370C0) + switch (gSpecialVar_0x8004) { case 0: r2 = 0; @@ -2770,7 +2770,7 @@ void sub_8113524(struct Var4038Struct * a0) u8 sub_8113530(void) { - return sub_8113114(VAR_0x4038_STRUCT, gUnknown_20370C0); + return sub_8113114(VAR_0x4038_STRUCT, gSpecialVar_0x8004); } static u16 * (*const sQuestLogStorageCBs[])(u16 *, const u16 *) = { diff --git a/src/vs_seeker.c b/src/vs_seeker.c index 17a13ab01..4d42f270d 100644 --- a/src/vs_seeker.c +++ b/src/vs_seeker.c @@ -63,7 +63,7 @@ struct VsSeekerStruct u8 responseCode:5; }; -extern u16 gUnknown_20370D2; +extern u16 gSpecialVar_LastTalked; extern struct MapObject gMapObjects[MAP_OBJECTS_COUNT]; extern u8 gUnknown_3005074; @@ -588,7 +588,7 @@ void Task_VsSeeker_0(u8 taskId) } else if (respval == 2) { - sub_80A2294(4, 0, gUnknown_203AD30, 0xffff); + sub_80A2294(4, 0, gSpecialVar_ItemId, 0xffff); FieldEffectStart(FLDEFF_UNK_41); // TODO: name this enum gTasks[taskId].func = Task_VsSeeker_1; gTasks[taskId].data[0] = 15; @@ -1078,7 +1078,7 @@ static bool8 sub_810CD80(const VsSeekerData *vsSeekerData, u16 trainerBattleOppo return FALSE; if (rematchIdx >= 0 && rematchIdx < ARRAY_COUNT(sVsSeekerData)) { - if (IsThisTrainerRematchable(gUnknown_20370D2)) + if (IsThisTrainerRematchable(gSpecialVar_LastTalked)) return TRUE; } return FALSE; @@ -1097,7 +1097,7 @@ static bool8 HasRematchTrainerAlreadyBeenFought(const VsSeekerData *vsSeekerData void sub_810CDE8(void) { - gSaveBlock1Ptr->trainerRematches[gUnknown_20370D2] = 0; + gSaveBlock1Ptr->trainerRematches[gSpecialVar_LastTalked] = 0; sub_80803FC(); } @@ -1148,7 +1148,7 @@ static bool8 sub_810CED0(const VsSeekerData * a0, u16 a1) return FALSE; if ((u32)r1 >= ARRAY_COUNT(sVsSeekerData)) return FALSE; - if (!IsThisTrainerRematchable(gUnknown_20370D2)) + if (!IsThisTrainerRematchable(gSpecialVar_LastTalked)) return FALSE; return TRUE; } diff --git a/sym_ewram.txt b/sym_ewram.txt index 9c5d6022b..d68a01f8f 100644 --- a/sym_ewram.txt +++ b/sym_ewram.txt @@ -656,49 +656,49 @@ gUnknown_20370B4: @ 20370B4 gUnknown_20370B6: @ 20370B6 .space 0x2 -gUnknown_20370B8: @ 20370B8 +gSpecialVar_0x8000: @ 20370B8 .space 0x2 -gUnknown_20370BA: @ 20370BA +gSpecialVar_0x8001: @ 20370BA .space 0x2 -gUnknown_20370BC: @ 20370BC +gSpecialVar_0x8002: @ 20370BC .space 0x2 -gUnknown_20370BE: @ 20370BE +gSpecialVar_0x8003: @ 20370BE .space 0x2 -gUnknown_20370C0: @ 20370C0 +gSpecialVar_0x8004: @ 20370C0 .space 0x2 gSpecialVar_0x8005: @ 20370C2 .space 0x2 -gUnknown_20370C4: @ 20370C4 +gSpecialVar_0x8006: @ 20370C4 .space 0x2 -gUnknown_20370C6: @ 20370C6 +gSpecialVar_0x8007: @ 20370C6 .space 0x2 -gUnknown_20370C8: @ 20370C8 +gSpecialVar_0x8008: @ 20370C8 .space 0x2 -gUnknown_20370CA: @ 20370CA +gSpecialVar_0x8009: @ 20370CA .space 0x2 -gUnknown_20370CC: @ 20370CC +gSpecialVar_0x800A: @ 20370CC .space 0x2 -gUnknown_20370CE: @ 20370CE +gSpecialVar_0x800B: @ 20370CE .space 0x2 -gUnknown_20370D0: @ 20370D0 +gSpecialVar_Result: @ 20370D0 .space 0x2 -gUnknown_20370D2: @ 20370D2 +gSpecialVar_LastTalked: @ 20370D2 .space 0x2 -gUnknown_20370D4: @ 20370D4 +gSpecialVar_Facing: @ 20370D4 .space 0x2 gSpecialVar_MonBoxId: @ 20370D6 @@ -1397,7 +1397,7 @@ gUnknown_203AD28: @ 203AD28 gUnknown_203AD2C: @ 203AD2C .space 0x4 -gUnknown_203AD30: @ 203AD30 +gSpecialVar_ItemId: @ 203AD30 .space 0x4 gUnknown_203AD34: @ 203AD34 -- cgit v1.2.3 From f91b71d3955e5df5455ec7a302b45c7f174100bf Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sun, 16 Dec 2018 20:17:31 -0500 Subject: Port over berry fix program --- Makefile | 5 + berry_fix/Makefile | 160 ++++ berry_fix/asm/berry_fix_header.inc | 35 + berry_fix/asm/loader.s | 119 +++ berry_fix/asm/macros/asm.inc | 12 + berry_fix/asm/macros/function.inc | 29 + berry_fix/asmdiff.sh | 7 + berry_fix/build_tools.sh | 10 + berry_fix/charmap.txt | 1067 +++++++++++++++++++++++ berry_fix/constants/gba_constants.inc | 490 +++++++++++ berry_fix/data/data.s | 4 + berry_fix/ld_script.sed | 14 + berry_fix/ld_script.txt | 31 + berry_fix/payload/Makefile | 159 ++++ berry_fix/payload/asm/crt0.s | 83 ++ berry_fix/payload/asm/macros/asm.inc | 12 + berry_fix/payload/asm/macros/function.inc | 29 + berry_fix/payload/asmdiff.sh | 7 + berry_fix/payload/charmap.txt | 1067 +++++++++++++++++++++++ berry_fix/payload/common_syms/agb_flash.txt | 10 + berry_fix/payload/common_syms/main.txt | 9 + berry_fix/payload/common_syms/rtc.txt | 2 + berry_fix/payload/constants/gba_constants.inc | 490 +++++++++++ berry_fix/payload/graphics/debug_digits.png | Bin 0 -> 166 bytes berry_fix/payload/graphics/msg_box.png | Bin 0 -> 2631 bytes berry_fix/payload/graphics/msg_box.tilemap | Bin 0 -> 8192 bytes berry_fix/payload/include/constants/game_stat.h | 56 ++ berry_fix/payload/include/constants/vars.h | 196 +++++ berry_fix/payload/include/flash.h | 55 ++ berry_fix/payload/include/global.berry.h | 62 ++ berry_fix/payload/include/global.fieldmap.h | 317 +++++++ berry_fix/payload/include/global.h | 875 +++++++++++++++++++ berry_fix/payload/include/main.h | 45 + berry_fix/payload/include/pokemon.h | 154 ++++ berry_fix/payload/include/rtc.h | 15 + berry_fix/payload/ld_script.sed | 14 + berry_fix/payload/ld_script.txt | 122 +++ berry_fix/payload/rom.sha1 | 1 + berry_fix/payload/src/flash.c | 752 ++++++++++++++++ berry_fix/payload/src/main.c | 289 ++++++ berry_fix/payload/src/rtc.c | 346 ++++++++ berry_fix/payload/sym_bss.txt | 5 + berry_fix/payload/sym_common.txt | 29 + berry_fix/payload/sym_ewram.txt | 3 + berry_fix/rom.sha1 | 1 + data/berry_fix.mb | Bin 15348 -> 0 bytes data/multiboot_berry_glitch_fix.s | 2 +- 47 files changed, 7189 insertions(+), 1 deletion(-) create mode 100644 berry_fix/Makefile create mode 100644 berry_fix/asm/berry_fix_header.inc create mode 100644 berry_fix/asm/loader.s create mode 100644 berry_fix/asm/macros/asm.inc create mode 100644 berry_fix/asm/macros/function.inc create mode 100644 berry_fix/asmdiff.sh create mode 100644 berry_fix/build_tools.sh create mode 100644 berry_fix/charmap.txt create mode 100644 berry_fix/constants/gba_constants.inc create mode 100644 berry_fix/data/data.s create mode 100644 berry_fix/ld_script.sed create mode 100644 berry_fix/ld_script.txt create mode 100644 berry_fix/payload/Makefile create mode 100644 berry_fix/payload/asm/crt0.s create mode 100644 berry_fix/payload/asm/macros/asm.inc create mode 100644 berry_fix/payload/asm/macros/function.inc create mode 100644 berry_fix/payload/asmdiff.sh create mode 100644 berry_fix/payload/charmap.txt create mode 100644 berry_fix/payload/common_syms/agb_flash.txt create mode 100644 berry_fix/payload/common_syms/main.txt create mode 100644 berry_fix/payload/common_syms/rtc.txt create mode 100644 berry_fix/payload/constants/gba_constants.inc create mode 100644 berry_fix/payload/graphics/debug_digits.png create mode 100644 berry_fix/payload/graphics/msg_box.png create mode 100644 berry_fix/payload/graphics/msg_box.tilemap create mode 100644 berry_fix/payload/include/constants/game_stat.h create mode 100644 berry_fix/payload/include/constants/vars.h create mode 100644 berry_fix/payload/include/flash.h create mode 100644 berry_fix/payload/include/global.berry.h create mode 100644 berry_fix/payload/include/global.fieldmap.h create mode 100644 berry_fix/payload/include/global.h create mode 100644 berry_fix/payload/include/main.h create mode 100644 berry_fix/payload/include/pokemon.h create mode 100644 berry_fix/payload/include/rtc.h create mode 100644 berry_fix/payload/ld_script.sed create mode 100644 berry_fix/payload/ld_script.txt create mode 100644 berry_fix/payload/rom.sha1 create mode 100644 berry_fix/payload/src/flash.c create mode 100644 berry_fix/payload/src/main.c create mode 100644 berry_fix/payload/src/rtc.c create mode 100644 berry_fix/payload/sym_bss.txt create mode 100644 berry_fix/payload/sym_common.txt create mode 100644 berry_fix/payload/sym_ewram.txt create mode 100644 berry_fix/rom.sha1 delete mode 100644 data/berry_fix.mb diff --git a/Makefile b/Makefile index 9f8b13141..431475026 100644 --- a/Makefile +++ b/Makefile @@ -84,10 +84,12 @@ clean: tidy rm -f sound/direct_sound_samples/*.bin rm -f $(SONG_OBJS) find . \( -iname '*.1bpp' -o -iname '*.4bpp' -o -iname '*.8bpp' -o -iname '*.gbapal' -o -iname '*.lz' -o -iname '*.latfont' -o -iname '*.hwjpnfont' -o -iname '*.fwjpnfont' \) -exec rm {} + + @$(MAKE) -C berry_fix clean tidy: rm -f $(ROM) $(ELF) $(MAP) rm -r build/* + @$(MAKE) -C berry_fix tidy include graphics_file_rules.mk @@ -169,3 +171,6 @@ $(ELF): $(OBJ_DIR)/ld_script.ld $(OBJS) $(ROM): $(ELF) $(OBJCOPY) -O binary $< $@ $(FIX) $@ -p -t"$(TITLE)" -c$(GAME_CODE) -m$(MAKER_CODE) -r$(REVISION) --silent + +berry_fix/berry_fix.gba: + @$(MAKE) -C berry_fix diff --git a/berry_fix/Makefile b/berry_fix/Makefile new file mode 100644 index 000000000..ffe0cf251 --- /dev/null +++ b/berry_fix/Makefile @@ -0,0 +1,160 @@ +include $(DEVKITARM)/base_tools +export CPP := $(PREFIX)cpp +export LD := $(PREFIX)ld + +ifeq ($(OS),Windows_NT) +EXE := .exe +else +EXE := +endif + +GAME_CODE := AGBJ +MAKER_CODE := 01 +REVISION := 0 + +SHELL := /bin/bash -o pipefail + +CPPFLAGS := -I ../tools/agbcc/include -I ../tools/agbcc -iquote include -nostdinc -undef + +ROM := berry_fix.gba +OBJ_DIR := build +CC1 := ../tools/agbcc/bin/agbcc$(EXE) +override CFLAGS += -mthumb-interwork -Wimplicit -Wparentheses -Werror -O2 -fhex-asm + + +ELF = $(ROM:.gba=.elf) +MAP = $(ROM:.gba=.map) + +C_SUBDIR = src +ASM_SUBDIR = asm +DATA_ASM_SUBDIR = data + +C_BUILDDIR = $(OBJ_DIR)/$(C_SUBDIR) +ASM_BUILDDIR = $(OBJ_DIR)/$(ASM_SUBDIR) +DATA_ASM_BUILDDIR = $(OBJ_DIR)/$(DATA_ASM_SUBDIR) + +ASFLAGS := -mcpu=arm7tdmi + +LDFLAGS = -Map ../$(MAP) + +SHA1 := $(shell { command -v sha1sum || command -v shasum; } 2>/dev/null) -c +GFX := ../tools/gbagfx/gbagfx$(EXE) +AIF := ../tools/aif2pcm/aif2pcm$(EXE) +MID := ../tools/mid2agb/mid2agb$(EXE) +SCANINC := ../tools/scaninc/scaninc$(EXE) +PREPROC := ../tools/preproc/preproc$(EXE) +RAMSCRGEN := ../tools/ramscrgen/ramscrgen$(EXE) +FIX := ../tools/gbafix/gbafix$(EXE) + +# Clear the default suffixes +.SUFFIXES: +# Don't delete intermediate files +.SECONDARY: +# Delete files that weren't built properly +.DELETE_ON_ERROR: + +# Secondary expansion is required for dependency variables in object rules. +.SECONDEXPANSION: + +.PHONY: rom clean compare tidy + +C_SRCS := $(wildcard $(C_SUBDIR)/*.c $(C_SUBDIR)/*/*.c $(C_SUBDIR)/*/*/*.c) +C_OBJS := $(patsubst $(C_SUBDIR)/%.c,$(C_BUILDDIR)/%.o,$(C_SRCS)) + +ASM_SRCS := $(wildcard $(ASM_SUBDIR)/*.s) +ASM_OBJS := $(patsubst $(ASM_SUBDIR)/%.s,$(ASM_BUILDDIR)/%.o,$(ASM_SRCS)) + +DATA_ASM_SRCS := $(wildcard $(DATA_ASM_SUBDIR)/*.s) +DATA_ASM_OBJS := $(patsubst $(DATA_ASM_SUBDIR)/%.s,$(DATA_ASM_BUILDDIR)/%.o,$(DATA_ASM_SRCS)) + +SONG_SRCS := $(wildcard $(SONG_SUBDIR)/*.s) +SONG_OBJS := $(patsubst $(SONG_SUBDIR)/%.s,$(SONG_BUILDDIR)/%.o,$(SONG_SRCS)) + +MID_SRCS := $(wildcard $(MID_SUBDIR)/*.mid) +MID_OBJS := $(patsubst $(MID_SUBDIR)/%.mid,$(MID_BUILDDIR)/%.o,$(MID_SRCS)) + +OBJS := $(C_OBJS) $(ASM_OBJS) $(DATA_ASM_OBJS) $(SONG_OBJS) $(MID_OBJS) +# OBJS_REL := $(patsubst $(OBJ_DIR)/%,%,$(OBJS)) + +SUBDIRS := $(sort $(dir $(OBJS))) + +$(shell mkdir -p $(SUBDIRS)) + +rom: $(ROM) + +# For contributors to make sure a change didn't affect the contents of the ROM. +compare: $(ROM) + @$(SHA1) rom.sha1 + +clean: tidy + rm -f sound/direct_sound_samples/*.bin + rm -f $(SONG_OBJS) $(MID_OBJS) $(MID_SUBDIR)/*.s + find . \( -iname '*.1bpp' -o -iname '*.4bpp' -o -iname '*.8bpp' -o -iname '*.gbapal' -o -iname '*.lz' -o -iname '*.latfont' -o -iname '*.hwjpnfont' -o -iname '*.fwjpnfont' \) -exec rm {} + + make -C payload clean + +tidy: + rm -f $(ROM) $(ELF) $(MAP) + rm -r build/* + make -C payload tidy + +%.s: ; +%.png: ; +%.pal: ; +%.aif: ; + +%.1bpp: %.png ; $(GFX) $< $@ +%.4bpp: %.png ; $(GFX) $< $@ +%.8bpp: %.png ; $(GFX) $< $@ +%.gbapal: %.pal ; $(GFX) $< $@ +%.gbapal: %.png ; $(GFX) $< $@ +%.lz: % ; $(GFX) $< $@ +%.rl: % ; $(GFX) $< $@ + + +ifeq ($(NODEP),1) +$(C_BUILDDIR)/%.o: c_dep := +else +$(C_BUILDDIR)/%.o: c_dep = $(shell $(SCANINC) -I include $(C_SUBDIR)/$*.c) +endif + +$(C_BUILDDIR)/%.o : $(C_SUBDIR)/%.c $$(c_dep) + @$(CPP) $(CPPFLAGS) $< -o $(C_BUILDDIR)/$*.i + @$(PREPROC) $(C_BUILDDIR)/$*.i charmap.txt | $(CC1) $(CFLAGS) -o $(C_BUILDDIR)/$*.s + $(AS) $(ASFLAGS) -o $@ $(C_BUILDDIR)/$*.s + +ifeq ($(NODEP),1) +$(ASM_BUILDDIR)/%.o: asm_dep := +else +$(ASM_BUILDDIR)/%.o: asm_dep = $(shell $(SCANINC) $(ASM_SUBDIR)/$*.s) +endif + +$(ASM_BUILDDIR)/%.o: $(ASM_SUBDIR)/%.s $$(asm_dep) + $(AS) $(ASFLAGS) -o $@ $< + +ifeq ($(NODEP),1) +$(DATA_ASM_BUILDDIR)/%.o: data_dep := +else +$(DATA_ASM_BUILDDIR)/%.o: data_dep = $(shell $(SCANINC) $(DATA_ASM_SUBDIR)/$*.s) +endif + +payload: data/payload.gba.lz + +payload/payload.gba: + $(MAKE) -C payload/ + +data/payload.gba.lz: payload/payload.gba + $(GFX) $< $@ -search 1 + +$(DATA_ASM_BUILDDIR)/%.o: $(DATA_ASM_SUBDIR)/%.s $$(data_dep) + $(PREPROC) $< charmap.txt | $(CPP) -I include | $(AS) $(ASFLAGS) -o $@ + +$(SONG_BUILDDIR)/%.o: $(SONG_SUBDIR)/%.s + $(AS) $(ASFLAGS) -I sound -o $@ $< + +$(ELF): ld_script.txt $(OBJS) + cd $(OBJ_DIR) && $(LD) $(LDFLAGS) -T ../ld_script.txt -o ../$@ + +$(ROM): $(ELF) + $(OBJCOPY) -O binary $< $@ + $(FIX) $@ -c$(GAME_CODE) -m$(MAKER_CODE) -r$(REVISION) --silent + diff --git a/berry_fix/asm/berry_fix_header.inc b/berry_fix/asm/berry_fix_header.inc new file mode 100644 index 000000000..5167d2ff0 --- /dev/null +++ b/berry_fix/asm/berry_fix_header.inc @@ -0,0 +1,35 @@ + .global BerryFixMBHeaderNintendoLogo +BerryFixMBHeaderNintendoLogo: + .space 156 + +BerryFixMBHeaderGameTitle: + .space 12 + + .global BerryFixMBHeaderGameCode +BerryFixMBHeaderGameCode: + .space 4 + +BerryFixMBHeaderMakerCode: + .space 2 + +BerryFixMBHeaderMagic: + .byte 0 + +BerryFixMBHeaderMainUnitCode: + .byte 0 + +BerryFixMBHeaderDeviceType: + .byte 0 + +BerryFixMBHeaderReserved1: + .space 7 + + .global BerryFixMBHeaderSoftwareVersion +BerryFixMBHeaderSoftwareVersion: + .byte 0 + +BerryFixMBHeaderChecksum: + .byte 0 + +BerryFixMBHeaderReserved2: + .space 2 diff --git a/berry_fix/asm/loader.s b/berry_fix/asm/loader.s new file mode 100644 index 000000000..c342e100f --- /dev/null +++ b/berry_fix/asm/loader.s @@ -0,0 +1,119 @@ + .include "asm/macros/asm.inc" + .include "asm/macros/function.inc" + .include "constants/gba_constants.inc" + + .set SIO_ERROR, 0x0040 + .set SIO_MULTI_BUSY, 0x0080 + + .set EWRAM_ORIG, 0x02000000 + .set gCode, 0x02010000 + .set PROG_ORIG, 0x00008000 + + .syntax unified + + .text + + arm_func_start _start +_start: @ 0 + b _entry + arm_func_end _start + + .include "asm/berry_fix_header.inc" + +@ C0 + .word 0 + + .global _GPIOPortData +_GPIOPortData: @ C4 + .2byte 0 + + .global _GPIOPortDirection +_GPIOPortDirection: @ C6 + .2byte 0 + + .global _GPIOPortReadEnable +_GPIOPortReadEnable: @ C8 + .2byte 0 + +@ CA + .2byte 0 + +@ CC + .space 0x34 + + arm_func_start _entry +_entry: @ 100 + b _send + arm_func_end _entry + + .space 0x1C + + arm_func_start _recv +_recv: + @ Waits until link cable is no longer busy. + @ Returns nz if an error has occurred + @ Otherwise, returns the received short in r1. + @ Preserves r0 +_120: + ldrh r1, [r0, 0x8] @ SIOCNT + tst r1, SIO_MULTI_BUSY + beq _120 +_12c: + ldrh r1, [r0, 0x8] @ SIOCNT + tst r1, SIO_MULTI_BUSY + bne _12c + ldrh r1, [r0, 0x8] @ SIOCNT + tst r1, SIO_ERROR + bxne lr + ldrh r1, [r0] @ SIOMULTI0 + bx lr + arm_func_end _recv + + arm_func_start _send +_send: @ 14c + ldr r0, =REG_SIOMULTI0 +_150: + bl _recv + bne _150 + mov r2, 0 + strh r2, [r0, 0xa] @ SIOMLT_SEND + cmp r1, 0 + bne _150 + mov r2, 0x8000 +_16c: + mov r1, 0 +_170: + strh r1, [r0, 0xa] @ SIOMLT_SEND + bl _recv + bne _150 + cmp r1, r2 + bne _16c + lsr r2, 5 + cmp r1, 0 + bne _170 + ldr r3, =BerryFixMBHeaderGameCode + ldrh r2, [r3] + strh r2, [r0, 0xa] @ SIOMLT_SEND + bl _recv +_1a0: + bne _1a0 + cmp r1, r2 + bne _1a0 + ldrh r2, [r3, 0x2] + strh r2, [r0, 0xa] @ SIOMLT_SEND + bl _recv + bne _1a0 + cmp r1, r2 + bne _1a0 + mov r1, 0 + strh r1, [r0, 0xa] @ SIOMLT_SEND + ldr r0, =_data_2f0 + ldr r1, =gCode + swi 0x11 << 16 + ldr lr, =gCode + bx lr + .pool + arm_func_end _send + @ 1f0 + + .align 2, 0 @ don't pad with nop diff --git a/berry_fix/asm/macros/asm.inc b/berry_fix/asm/macros/asm.inc new file mode 100644 index 000000000..4ac003fab --- /dev/null +++ b/berry_fix/asm/macros/asm.inc @@ -0,0 +1,12 @@ + .macro inc x + .set \x, \x + 1 + .endm + + .macro enum_start x=0 + .set __enum__, \x + .endm + + .macro enum constant + .equiv \constant, __enum__ + inc __enum__ + .endm diff --git a/berry_fix/asm/macros/function.inc b/berry_fix/asm/macros/function.inc new file mode 100644 index 000000000..b109595df --- /dev/null +++ b/berry_fix/asm/macros/function.inc @@ -0,0 +1,29 @@ + .macro arm_func_start name + .align 2, 0 + .global \name + .arm + .type \name, %function + .endm + + .macro arm_func_end name + .size \name, .-\name + .endm + + .macro thumb_func_start name + .align 2, 0 + .global \name + .thumb + .thumb_func + .type \name, %function + .endm + + .macro non_word_aligned_thumb_func_start name + .global \name + .thumb + .thumb_func + .type \name, %function + .endm + + .macro thumb_func_end name + .size \name, .-\name + .endm diff --git a/berry_fix/asmdiff.sh b/berry_fix/asmdiff.sh new file mode 100644 index 000000000..4e14e106a --- /dev/null +++ b/berry_fix/asmdiff.sh @@ -0,0 +1,7 @@ +#!/bin/bash + +OBJDUMP="$DEVKITARM/bin/arm-none-eabi-objdump -D -bbinary -marmv4t -Mforce-thumb" +OPTIONS="--start-address=$(($1)) --stop-address=$(($1 + $2))" +$OBJDUMP $OPTIONS baserom.gba > baserom.dump +$OBJDUMP $OPTIONS berry_fix.gba > berry_fix.dump +diff -c baserom.dump berry_fix.dump diff --git a/berry_fix/build_tools.sh b/berry_fix/build_tools.sh new file mode 100644 index 000000000..d9eebf05c --- /dev/null +++ b/berry_fix/build_tools.sh @@ -0,0 +1,10 @@ +#!/bin/sh +make -C tools/gbagfx CXX=${1:-g++} +make -C tools/scaninc CXX=${1:-g++} +make -C tools/preproc CXX=${1:-g++} +make -C tools/bin2c CXX=${1:-g++} +make -C tools/rsfont CXX=${1:-g++} +make -C tools/aif2pcm CXX=${1:-g++} +make -C tools/ramscrgen CXX=${1:-g++} +make -C tools/gbafix CXX=${1:-g++} +make -C tools/mid2agb CXX=${1:-g++} diff --git a/berry_fix/charmap.txt b/berry_fix/charmap.txt new file mode 100644 index 000000000..a736b40f2 --- /dev/null +++ b/berry_fix/charmap.txt @@ -0,0 +1,1067 @@ +' ' = 00 +'À' = 01 +'Ã' = 02 +'Â' = 03 +'Ç' = 04 +'È' = 05 +'É' = 06 +'Ê' = 07 +'Ë' = 08 +'ÃŒ' = 09 +'ÃŽ' = 0B +'Ã' = 0C +'Ã’' = 0D +'Ó' = 0E +'Ô' = 0F +'Å’' = 10 +'Ù' = 11 +'Ú' = 12 +'Û' = 13 +'Ñ' = 14 +'ß' = 15 +'à' = 16 +'á' = 17 +'ç' = 19 +'è' = 1A +'é' = 1B +'ê' = 1C +'ë' = 1D +'ì' = 1E +'î' = 20 +'ï' = 21 +'ò' = 22 +'ó' = 23 +'ô' = 24 +'Å“' = 25 +'ù' = 26 +'ú' = 27 +'û' = 28 +'ñ' = 29 +'º' = 2A +'ª' = 2B +SUPER_ER = 2C +'&' = 2D +'+' = 2E +LV = 34 +'=' = 35 +';' = 36 +'¿' = 51 +'¡' = 52 +PK = 53 +PKMN = 53 54 +POKEBLOCK = 55 56 57 58 59 +'Ã' = 5A +'%' = 5B +'(' = 5C +')' = 5D +'â' = 68 +'í' = 6F +UNK_SPACER = 77 +UP_ARROW = 79 +DOWN_ARROW = 7A +LEFT_ARROW = 7B +RIGHT_ARROW = 7C +'0' = A1 +'1' = A2 +'2' = A3 +'3' = A4 +'4' = A5 +'5' = A6 +'6' = A7 +'7' = A8 +'8' = A9 +'9' = AA +'!' = AB +'?' = AC +'.' = AD +'-' = AE +'·' = AF +'…' = B0 +'“' = B1 +'â€' = B2 +'‘' = B3 +'’' = B4 +'♂' = B5 +'♀' = B6 +'Â¥' = B7 +',' = B8 +'×' = B9 +'/' = BA +'A' = BB +'B' = BC +'C' = BD +'D' = BE +'E' = BF +'F' = C0 +'G' = C1 +'H' = C2 +'I' = C3 +'J' = C4 +'K' = C5 +'L' = C6 +'M' = C7 +'N' = C8 +'O' = C9 +'P' = CA +'Q' = CB +'R' = CC +'S' = CD +'T' = CE +'U' = CF +'V' = D0 +'W' = D1 +'X' = D2 +'Y' = D3 +'Z' = D4 +'a' = D5 +'b' = D6 +'c' = D7 +'d' = D8 +'e' = D9 +'f' = DA +'g' = DB +'h' = DC +'i' = DD +'j' = DE +'k' = DF +'l' = E0 +'m' = E1 +'n' = E2 +'o' = E3 +'p' = E4 +'q' = E5 +'r' = E6 +'s' = E7 +'t' = E8 +'u' = E9 +'v' = EA +'w' = EB +'x' = EC +'y' = ED +'z' = EE +'â–¶' = EF +':' = F0 +'Ä' = F1 +'Ö' = F2 +'Ãœ' = F3 +'ä' = F4 +'ö' = F5 +'ü' = F6 +TALL_PLUS = FC 0C FB +'$' = FF + +@ Hiragana +'ã‚' = 01 +'ã„' = 02 +'ã†' = 03 +'ãˆ' = 04 +'ãŠ' = 05 +'ã‹' = 06 +'ã' = 07 +'ã' = 08 +'ã‘' = 09 +'ã“' = 0A +'ã•' = 0B +'ã—' = 0C +'ã™' = 0D +'ã›' = 0E +'ã' = 0F +'ãŸ' = 10 +'ã¡' = 11 +'ã¤' = 12 +'ã¦' = 13 +'ã¨' = 14 +'ãª' = 15 +'ã«' = 16 +'ã¬' = 17 +'ã­' = 18 +'ã®' = 19 +'ã¯' = 1A +'ã²' = 1B +'ãµ' = 1C +'ã¸' = 1D +'ã»' = 1E +'ã¾' = 1F +'ã¿' = 20 +'ã‚€' = 21 +'ã‚' = 22 +'ã‚‚' = 23 +'ã‚„' = 24 +'ゆ' = 25 +'よ' = 26 +'ら' = 27 +'ã‚Š' = 28 +'ã‚‹' = 29 +'ã‚Œ' = 2A +'ã‚' = 2B +'ã‚' = 2C +'ã‚’' = 2D +'ã‚“' = 2E +'ã' = 2F +'ãƒ' = 30 +'ã…' = 31 +'ã‡' = 32 +'ã‰' = 33 +'ゃ' = 34 +'ã‚…' = 35 +'ょ' = 36 +'ãŒ' = 37 +'ãŽ' = 38 +'ã' = 39 +'ã’' = 3A +'ã”' = 3B +'ã–' = 3C +'ã˜' = 3D +'ãš' = 3E +'ãœ' = 3F +'ãž' = 40 +'ã ' = 41 +'ã¢' = 42 +'ã¥' = 43 +'ã§' = 44 +'ã©' = 45 +'ã°' = 46 +'ã³' = 47 +'ã¶' = 48 +'ã¹' = 49 +'ã¼' = 4A +'ã±' = 4B +'ã´' = 4C +'ã·' = 4D +'ãº' = 4E +'ã½' = 4F +'ã£' = 50 + +@ Katakana +'ã‚¢' = 51 +'イ' = 52 +'ウ' = 53 +'エ' = 54 +'オ' = 55 +'ã‚«' = 56 +'ã‚­' = 57 +'ク' = 58 +'ケ' = 59 +'コ' = 5A +'サ' = 5B +'ã‚·' = 5C +'ス' = 5D +'ã‚»' = 5E +'ソ' = 5F +'ã‚¿' = 60 +'ãƒ' = 61 +'ツ' = 62 +'テ' = 63 +'ト' = 64 +'ナ' = 65 +'ニ' = 66 +'ヌ' = 67 +'ãƒ' = 68 +'ノ' = 69 +'ãƒ' = 6A +'ヒ' = 6B +'フ' = 6C +'ヘ' = 6D +'ホ' = 6E +'マ' = 6F +'ミ' = 70 +'ム' = 71 +'メ' = 72 +'モ' = 73 +'ヤ' = 74 +'ユ' = 75 +'ヨ' = 76 +'ラ' = 77 +'リ' = 78 +'ル' = 79 +'レ' = 7A +'ロ' = 7B +'ワ' = 7C +'ヲ' = 7D +'ン' = 7E +'ã‚¡' = 7F +'ã‚£' = 80 +'ã‚¥' = 81 +'ェ' = 82 +'ã‚©' = 83 +'ャ' = 84 +'ュ' = 85 +'ョ' = 86 +'ガ' = 87 +'ã‚®' = 88 +'ã‚°' = 89 +'ゲ' = 8A +'ã‚´' = 8B +'ザ' = 8C +'ジ' = 8D +'ズ' = 8E +'ゼ' = 8F +'ゾ' = 90 +'ダ' = 91 +'ヂ' = 92 +'ヅ' = 93 +'デ' = 94 +'ド' = 95 +'ãƒ' = 96 +'ビ' = 97 +'ブ' = 98 +'ベ' = 99 +'ボ' = 9A +'パ' = 9B +'ピ' = 9C +'プ' = 9D +'ペ' = 9E +'ãƒ' = 9F +'ッ' = A0 + +@ Japanese punctuation +'　' = 00 +'ï¼' = AB +'？' = AC +'。' = AD +'ー' = AE +'⋯' = B0 + +STRING = FD + +@ string placeholders +PLAYER = FD 01 +STR_VAR_1 = FD 02 +STR_VAR_2 = FD 03 +STR_VAR_3 = FD 04 +KUN = FD 05 +RIVAL = FD 06 +@ version-dependent strings (originally made for Ruby/Sapphire differences) +@ Emerald uses the Sapphire strings (except for VERSION). +VERSION = FD 07 @ "EMERALD" +AQUA = FD 08 +MAGMA = FD 09 +ARCHIE = FD 0A +MAXIE = FD 0B +KYOGRE = FD 0C +GROUDON = FD 0D + +@ battle string placeholders + +B_BUFF1 = FD 00 +B_BUFF2 = FD 01 +B_COPY_VAR_1 = FD 02 +B_COPY_VAR_2 = FD 03 +B_COPY_VAR_3 = FD 04 +B_PLAYER_MON1_NAME = FD 05 +B_OPPONENT_MON1_NAME = FD 06 +B_PLAYER_MON2_NAME = FD 07 +B_OPPONENT_MON2_NAME = FD 08 +B_LINK_PLAYER_MON1_NAME = FD 09 +B_LINK_OPPONENT_MON1_NAME = FD 0A +B_LINK_PLAYER_MON2_NAME = FD 0B +B_LINK_OPPONENT_MON2_NAME = FD 0C +B_ATK_NAME_WITH_PREFIX_MON1 = FD 0D +B_ATK_PARTNER_NAME = FD 0E +B_ATK_NAME_WITH_PREFIX = FD 0F +B_DEF_NAME_WITH_PREFIX = FD 10 +B_EFF_NAME_WITH_PREFIX = FD 11 @ EFF = short for gEffectBattler +B_ACTIVE_NAME_WITH_PREFIX = FD 12 +B_SCR_ACTIVE_NAME_WITH_PREFIX = FD 13 +B_CURRENT_MOVE = FD 14 +B_LAST_MOVE = FD 15 +B_LAST_ITEM = FD 16 +B_LAST_ABILITY = FD 17 +B_ATK_ABILITY = FD 18 +B_DEF_ABILITY = FD 19 +B_SCR_ACTIVE_ABILITY = FD 1A +B_EFF_ABILITY = FD 1B +B_TRAINER1_CLASS = FD 1C +B_TRAINER1_NAME = FD 1D +B_LINK_PLAYER_NAME = FD 1E +B_LINK_PARTNER_NAME = FD 1F +B_LINK_OPPONENT1_NAME = FD 20 +B_LINK_OPPONENT2_NAME = FD 21 +B_LINK_SCR_TRAINER_NAME = FD 22 +B_PLAYER_NAME = FD 23 +B_TRAINER1_LOSE_TEXT = FD 24 +B_TRAINER1_WIN_TEXT = FD 25 +B_26 = FD 26 +B_PC_CREATOR_NAME = FD 27 +B_ATK_PREFIX1 = FD 28 +B_DEF_PREFIX1 = FD 29 +B_ATK_PREFIX2 = FD 2A +B_DEF_PREFIX2 = FD 2B +B_ATK_PREFIX3 = FD 2C +B_DEF_PREFIX3 = FD 2D +B_TRAINER2_CLASS = FD 2E +B_TRAINER2_NAME = FD 2F +B_TRAINER2_LOSE_TEXT = FD 30 +B_TRAINER2_WIN_TEXT = FD 31 +B_PARTNER_CLASS = FD 32 +B_PARTNER_NAME = FD 33 +B_BUFF3 = FD 34 + +@ indicates the end of a town/city name (before " TOWN" or " CITY") +NAME_END = FC 00 + +@ special 0xF7 character +SPECIAL_F7 = F7 + +@ more text functions + +COLOR = FC 01 @ use a color listed below right after +HIGHLIGHT = FC 02 @ same as fc 01 +SHADOW = FC 03 @ same as fc 01 +COLOR_HIGHLIGHT_SHADOW = FC 04 @ takes 3 bytes +PALETTE = FC 05 @ used in credits +SIZE = FC 06 @ note that anything other than "SMALL" is invalid +UNKNOWN_7 = FC 07 +PAUSE = FC 08 @ manually print the wait byte after this, havent mapped them +PAUSE_UNTIL_PRESS = FC 09 +UNKNOWN_A = FC 0A +PLAY_BGM = FC 0B +ESCAPE = FC 0C +SHIFT_TEXT = FC 0D +UNKNOWN_E = FC 0E +UNKNOWN_F = FC 0F +PLAY_SE = FC 10 +CLEAR = FC 11 +SKIP = FC 12 +CLEAR_TO = FC 13 +UNKNOWN_14 = FC 14 +JPN = FC 15 +ENG = FC 16 +PAUSE_MUSIC = FC 17 +RESUME_MUSIC = FC 18 + +@ colors + +TRANSPARENT = 00 +WHITE = 01 +DARK_GREY = 02 +LIGHT_GREY = 03 +RED = 04 +LIGHT_RED = 05 +GREEN = 06 +LIGHT_GREEN = 07 +BLUE = 08 +LIGHT_BLUE = 09 +@ these next colors can be set to anything arbitrary at runtime +@ usually though they'll have the textbox border colors as described below +DYNAMIC_COLOR1 = 0A @ white +DYNAMIC_COLOR2 = 0B @ white with a tinge of green +DYNAMIC_COLOR3 = 0C @ white 2 +DYNAMIC_COLOR4 = 0D @ aquamarine +DYNAMIC_COLOR5 = 0E @ blue-green +DYNAMIC_COLOR6 = 0F @ cerulean + +@ sound and music + +MUS_DUMMY = 00 00 +SE_KAIFUKU = 01 00 +SE_PC_LOGIN = 02 00 +SE_PC_OFF = 03 00 +SE_PC_ON = 04 00 +SE_SELECT = 05 00 +SE_WIN_OPEN = 06 00 +SE_WALL_HIT = 07 00 +SE_DOOR = 08 00 +SE_KAIDAN = 09 00 +SE_DANSA = 0A 00 +SE_JITENSYA = 0B 00 +SE_KOUKA_L = 0C 00 +SE_KOUKA_M = 0D 00 +SE_KOUKA_H = 0E 00 +SE_BOWA2 = 0F 00 +SE_POKE_DEAD = 10 00 +SE_NIGERU = 11 00 +SE_JIDO_DOA = 12 00 +SE_NAMINORI = 13 00 +SE_BAN = 14 00 +SE_PIN = 15 00 +SE_BOO = 16 00 +SE_BOWA = 17 00 +SE_JYUNI = 18 00 +SE_A = 19 00 +SE_I = 1A 00 +SE_U = 1B 00 +SE_E = 1C 00 +SE_O = 1D 00 +SE_N = 1E 00 +SE_SEIKAI = 1F 00 +SE_HAZURE = 20 00 +SE_EXP = 21 00 +SE_JITE_PYOKO = 22 00 +SE_MU_PACHI = 23 00 +SE_TK_KASYA = 24 00 +SE_FU_ZAKU = 25 00 +SE_FU_ZAKU2 = 26 00 +SE_FU_ZUZUZU = 27 00 +SE_RU_GASHIN = 28 00 +SE_RU_GASYAN = 29 00 +SE_RU_BARI = 2A 00 +SE_RU_HYUU = 2B 00 +SE_KI_GASYAN = 2C 00 +SE_TK_WARPIN = 2D 00 +SE_TK_WARPOUT = 2E 00 +SE_TU_SAA = 2F 00 +SE_HI_TURUN = 30 00 +SE_TRACK_MOVE = 31 00 +SE_TRACK_STOP = 32 00 +SE_TRACK_HAIKI = 33 00 +SE_TRACK_DOOR = 34 00 +SE_MOTER = 35 00 +SE_CARD = 36 00 +SE_SAVE = 37 00 +SE_KON = 38 00 +SE_KON2 = 39 00 +SE_KON3 = 3A 00 +SE_KON4 = 3B 00 +SE_SUIKOMU = 3C 00 +SE_NAGERU = 3D 00 +SE_TOY_C = 3E 00 +SE_TOY_D = 3F 00 +SE_TOY_E = 40 00 +SE_TOY_F = 41 00 +SE_TOY_G = 42 00 +SE_TOY_A = 43 00 +SE_TOY_B = 44 00 +SE_TOY_C1 = 45 00 +SE_MIZU = 46 00 +SE_HASHI = 47 00 +SE_DAUGI = 48 00 +SE_PINPON = 49 00 +SE_FUUSEN1 = 4A 00 +SE_FUUSEN2 = 4B 00 +SE_FUUSEN3 = 4C 00 +SE_TOY_KABE = 4D 00 +SE_TOY_DANGO = 4E 00 +SE_DOKU = 4F 00 +SE_ESUKA = 50 00 +SE_T_AME = 51 00 +SE_T_AME_E = 52 00 +SE_T_OOAME = 53 00 +SE_T_OOAME_E = 54 00 +SE_T_KOAME = 55 00 +SE_T_KOAME_E = 56 00 +SE_T_KAMI = 57 00 +SE_T_KAMI2 = 58 00 +SE_ELEBETA = 59 00 +SE_HINSI = 5A 00 +SE_EXPMAX = 5B 00 +SE_TAMAKORO = 5C 00 +SE_TAMAKORO_E = 5D 00 +SE_BASABASA = 5E 00 +SE_REGI = 5F 00 +SE_C_GAJI = 60 00 +SE_C_MAKU_U = 61 00 +SE_C_MAKU_D = 62 00 +SE_C_PASI = 63 00 +SE_C_SYU = 64 00 +SE_C_PIKON = 65 00 +SE_REAPOKE = 66 00 +SE_OP_BASYU = 67 00 +SE_BT_START = 68 00 +SE_DENDOU = 69 00 +SE_JIHANKI = 6A 00 +SE_TAMA = 6B 00 +SE_Z_SCROLL = 6C 00 +SE_Z_PAGE = 6D 00 +SE_PN_ON = 6E 00 +SE_PN_OFF = 6F 00 +SE_Z_SEARCH = 70 00 +SE_TAMAGO = 71 00 +SE_TB_START = 72 00 +SE_TB_KON = 73 00 +SE_TB_KARA = 74 00 +SE_BIDORO = 75 00 +SE_W085 = 76 00 +SE_W085B = 77 00 +SE_W231 = 78 00 +SE_W171 = 79 00 +SE_W233 = 7A 00 +SE_W233B = 7B 00 +SE_W145 = 7C 00 +SE_W145B = 7D 00 +SE_W145C = 7E 00 +SE_W240 = 7F 00 +SE_W015 = 80 00 +SE_W081 = 81 00 +SE_W081B = 82 00 +SE_W088 = 83 00 +SE_W016 = 84 00 +SE_W016B = 85 00 +SE_W003 = 86 00 +SE_W104 = 87 00 +SE_W013 = 88 00 +SE_W196 = 89 00 +SE_W086 = 8A 00 +SE_W004 = 8B 00 +SE_W025 = 8C 00 +SE_W025B = 8D 00 +SE_W152 = 8E 00 +SE_W026 = 8F 00 +SE_W172 = 90 00 +SE_W172B = 91 00 +SE_W053 = 92 00 +SE_W007 = 93 00 +SE_W092 = 94 00 +SE_W221 = 95 00 +SE_W221B = 96 00 +SE_W052 = 97 00 +SE_W036 = 98 00 +SE_W059 = 99 00 +SE_W059B = 9A 00 +SE_W010 = 9B 00 +SE_W011 = 9C 00 +SE_W017 = 9D 00 +SE_W019 = 9E 00 +SE_W028 = 9F 00 +SE_W013B = A0 00 +SE_W044 = A1 00 +SE_W029 = A2 00 +SE_W057 = A3 00 +SE_W056 = A4 00 +SE_W250 = A5 00 +SE_W030 = A6 00 +SE_W039 = A7 00 +SE_W054 = A8 00 +SE_W077 = A9 00 +SE_W020 = AA 00 +SE_W082 = AB 00 +SE_W047 = AC 00 +SE_W195 = AD 00 +SE_W006 = AE 00 +SE_W091 = AF 00 +SE_W146 = B0 00 +SE_W120 = B1 00 +SE_W153 = B2 00 +SE_W071B = B3 00 +SE_W071 = B4 00 +SE_W103 = B5 00 +SE_W062 = B6 00 +SE_W062B = B7 00 +SE_W048 = B8 00 +SE_W187 = B9 00 +SE_W118 = BA 00 +SE_W155 = BB 00 +SE_W122 = BC 00 +SE_W060 = BD 00 +SE_W185 = BE 00 +SE_W014 = BF 00 +SE_W043 = C0 00 +SE_W207 = C1 00 +SE_W207B = C2 00 +SE_W215 = C3 00 +SE_W109 = C4 00 +SE_W173 = C5 00 +SE_W280 = C6 00 +SE_W202 = C7 00 +SE_W060B = C8 00 +SE_W076 = C9 00 +SE_W080 = CA 00 +SE_W100 = CB 00 +SE_W107 = CC 00 +SE_W166 = CD 00 +SE_W129 = CE 00 +SE_W115 = CF 00 +SE_W112 = D0 00 +SE_W197 = D1 00 +SE_W199 = D2 00 +SE_W236 = D3 00 +SE_W204 = D4 00 +SE_W268 = D5 00 +SE_W070 = D6 00 +SE_W063 = D7 00 +SE_W127 = D8 00 +SE_W179 = D9 00 +SE_W151 = DA 00 +SE_W201 = DB 00 +SE_W161 = DC 00 +SE_W161B = DD 00 +SE_W227 = DE 00 +SE_W227B = DF 00 +SE_W226 = E0 00 +SE_W208 = E1 00 +SE_W213 = E2 00 +SE_W213B = E3 00 +SE_W234 = E4 00 +SE_W260 = E5 00 +SE_W328 = E6 00 +SE_W320 = E7 00 +SE_W255 = E8 00 +SE_W291 = E9 00 +SE_W089 = EA 00 +SE_W239 = EB 00 +SE_W230 = EC 00 +SE_W281 = ED 00 +SE_W327 = EE 00 +SE_W287 = EF 00 +SE_W257 = F0 00 +SE_W253 = F1 00 +SE_W258 = F2 00 +SE_W322 = F3 00 +SE_W298 = F4 00 +SE_W287B = F5 00 +SE_W114 = F6 00 +SE_W063B = F7 00 +SE_RG_W_DOOR = F8 00 +SE_RG_CARD1 = F9 00 +SE_RG_CARD2 = FA 00 +SE_RG_CARD3 = FB 00 +SE_RG_BAG1 = FC 00 +SE_RG_BAG2 = FD 00 +SE_RG_GETTING = FE 00 +SE_RG_SHOP = FF 00 +SE_RG_KITEKI = 00 01 +SE_RG_HELP_OP = 01 01 +SE_RG_HELP_CL = 02 01 +SE_RG_HELP_NG = 03 01 +SE_RG_DEOMOV = 04 01 +SE_RG_EXCELLENT = 05 01 +SE_RG_NAWAMISS = 06 01 +SE_TOREEYE = 07 01 +SE_TOREOFF = 08 01 +SE_HANTEI1 = 09 01 +SE_HANTEI2 = 0A 01 +SE_CURTAIN = 0B 01 +SE_CURTAIN1 = 0C 01 +SE_USSOKI = 0D 01 +MUS_TETSUJI = 5E 01 +MUS_FIELD13 = 5F 01 +MUS_KACHI22 = 60 01 +MUS_KACHI2 = 61 01 +MUS_KACHI3 = 62 01 +MUS_KACHI5 = 63 01 +MUS_PCC = 64 01 +MUS_NIBI = 65 01 +MUS_SUIKUN = 66 01 +MUS_DOORO1 = 67 01 +MUS_DOORO_X1 = 68 01 +MUS_DOORO_X3 = 69 01 +MUS_MACHI_S2 = 6A 01 +MUS_MACHI_S4 = 6B 01 +MUS_GIM = 6C 01 +MUS_NAMINORI = 6D 01 +MUS_DAN01 = 6E 01 +MUS_FANFA1 = 6F 01 +MUS_ME_ASA = 70 01 +MUS_ME_BACHI = 71 01 +MUS_FANFA4 = 72 01 +MUS_FANFA5 = 73 01 +MUS_ME_WAZA = 74 01 +MUS_BIJYUTU = 75 01 +MUS_DOORO_X4 = 76 01 +MUS_FUNE_KAN = 77 01 +MUS_ME_SHINKA = 78 01 +MUS_SHINKA = 79 01 +MUS_ME_WASURE = 7A 01 +MUS_SYOUJOEYE = 7B 01 +MUS_BOYEYE = 7C 01 +MUS_DAN02 = 7D 01 +MUS_MACHI_S3 = 7E 01 +MUS_ODAMAKI = 7F 01 +MUS_B_TOWER = 80 01 +MUS_SWIMEYE = 81 01 +MUS_DAN03 = 82 01 +MUS_ME_KINOMI = 83 01 +MUS_ME_TAMA = 84 01 +MUS_ME_B_BIG = 85 01 +MUS_ME_B_SMALL = 86 01 +MUS_ME_ZANNEN = 87 01 +MUS_BD_TIME = 88 01 +MUS_TEST1 = 89 01 +MUS_TEST2 = 8A 01 +MUS_TEST3 = 8B 01 +MUS_TEST4 = 8C 01 +MUS_TEST = 8D 01 +MUS_GOMACHI0 = 8E 01 +MUS_GOTOWN = 8F 01 +MUS_POKECEN = 90 01 +MUS_NEXTROAD = 91 01 +MUS_GRANROAD = 92 01 +MUS_CYCLING = 93 01 +MUS_FRIENDLY = 94 01 +MUS_MISHIRO = 95 01 +MUS_TOZAN = 96 01 +MUS_GIRLEYE = 97 01 +MUS_MINAMO = 98 01 +MUS_ASHROAD = 99 01 +MUS_EVENT0 = 9A 01 +MUS_DEEPDEEP = 9B 01 +MUS_KACHI1 = 9C 01 +MUS_TITLE3 = 9D 01 +MUS_DEMO1 = 9E 01 +MUS_GIRL_SUP = 9F 01 +MUS_HAGESHII = A0 01 +MUS_KAKKOII = A1 01 +MUS_KAZANBAI = A2 01 +MUS_AQA_0 = A3 01 +MUS_TSURETEK = A4 01 +MUS_BOY_SUP = A5 01 +MUS_RAINBOW = A6 01 +MUS_AYASII = A7 01 +MUS_KACHI4 = A8 01 +MUS_ROPEWAY = A9 01 +MUS_CASINO = AA 01 +MUS_HIGHTOWN = AB 01 +MUS_SAFARI = AC 01 +MUS_C_ROAD = AD 01 +MUS_AJITO = AE 01 +MUS_M_BOAT = AF 01 +MUS_M_DUNGON = B0 01 +MUS_FINECITY = B1 01 +MUS_MACHUPI = B2 01 +MUS_P_SCHOOL = B3 01 +MUS_DENDOU = B4 01 +MUS_TONEKUSA = B5 01 +MUS_MABOROSI = B6 01 +MUS_CON_FAN = B7 01 +MUS_CONTEST0 = B8 01 +MUS_MGM0 = B9 01 +MUS_T_BATTLE = BA 01 +MUS_OOAME = BB 01 +MUS_HIDERI = BC 01 +MUS_RUNECITY = BD 01 +MUS_CON_K = BE 01 +MUS_EIKOU_R = BF 01 +MUS_KARAKURI = C0 01 +MUS_HUTAGO = C1 01 +MUS_SITENNOU = C2 01 +MUS_YAMA_EYE = C3 01 +MUS_CONLOBBY = C4 01 +MUS_INTER_V = C5 01 +MUS_DAIGO = C6 01 +MUS_THANKFOR = C7 01 +MUS_END = C8 01 +MUS_B_FRONTIER = C9 01 +MUS_B_ARENA = CA 01 +MUS_ME_POINTGET = CB 01 +MUS_ME_TORE_EYE = CC 01 +MUS_PYRAMID = CD 01 +MUS_PYRAMID_TOP = CE 01 +MUS_B_PALACE = CF 01 +MUS_REKKUU_KOURIN = D0 01 +MUS_SATTOWER = D1 01 +MUS_ME_SYMBOLGET = D2 01 +MUS_B_DOME = D3 01 +MUS_B_TUBE = D4 01 +MUS_B_FACTORY = D5 01 +MUS_VS_REKKU = D6 01 +MUS_VS_FRONT = D7 01 +MUS_VS_MEW = D8 01 +MUS_B_DOME1 = D9 01 +MUS_BATTLE27 = DA 01 +MUS_BATTLE31 = DB 01 +MUS_BATTLE20 = DC 01 +MUS_BATTLE32 = DD 01 +MUS_BATTLE33 = DE 01 +MUS_BATTLE36 = DF 01 +MUS_BATTLE34 = E0 01 +MUS_BATTLE35 = E1 01 +MUS_BATTLE38 = E2 01 +MUS_BATTLE30 = E3 01 +MUS_RG_ANNAI = E4 01 +MUS_RG_SLOT = E5 01 +MUS_RG_AJITO = E6 01 +MUS_RG_GYM = E7 01 +MUS_RG_PURIN = E8 01 +MUS_RG_DEMO = E9 01 +MUS_RG_TITLE = EA 01 +MUS_RG_GUREN = EB 01 +MUS_RG_SHION = EC 01 +MUS_RG_KAIHUKU = ED 01 +MUS_RG_CYCLING = EE 01 +MUS_RG_ROCKET = EF 01 +MUS_RG_SHOUJO = F0 01 +MUS_RG_SHOUNEN = F1 01 +MUS_RG_DENDOU = F2 01 +MUS_RG_T_MORI = F3 01 +MUS_RG_OTSUKIMI = F4 01 +MUS_RG_POKEYASHI = F5 01 +MUS_RG_ENDING = F6 01 +MUS_RG_LOAD01 = F7 01 +MUS_RG_OPENING = F8 01 +MUS_RG_LOAD02 = F9 01 +MUS_RG_LOAD03 = FA 01 +MUS_RG_CHAMP_R = FB 01 +MUS_RG_VS_GYM = FC 01 +MUS_RG_VS_TORE = FD 01 +MUS_RG_VS_YASEI = FE 01 +MUS_RG_VS_LAST = FF 01 +MUS_RG_MASARA = 00 02 +MUS_RG_KENKYU = 01 02 +MUS_RG_OHKIDO = 02 02 +MUS_RG_POKECEN = 03 02 +MUS_RG_SANTOAN = 04 02 +MUS_RG_NAMINORI = 05 02 +MUS_RG_P_TOWER = 06 02 +MUS_RG_SHIRUHU = 07 02 +MUS_RG_HANADA = 08 02 +MUS_RG_TAMAMUSI = 09 02 +MUS_RG_WIN_TRE = 0A 02 +MUS_RG_WIN_YASEI = 0B 02 +MUS_RG_WIN_GYM = 0C 02 +MUS_RG_KUCHIBA = 0D 02 +MUS_RG_NIBI = 0E 02 +MUS_RG_RIVAL1 = 0F 02 +MUS_RG_RIVAL2 = 10 02 +MUS_RG_FAN2 = 11 02 +MUS_RG_FAN5 = 12 02 +MUS_RG_FAN6 = 13 02 +MUS_ME_RG_PHOTO = 14 02 +MUS_RG_TITLEROG = 15 02 +MUS_RG_GET_YASEI = 16 02 +MUS_RG_SOUSA = 17 02 +MUS_RG_SEKAIKAN = 18 02 +MUS_RG_SEIBETU = 19 02 +MUS_RG_JUMP = 1A 02 +MUS_RG_UNION = 1B 02 +MUS_RG_NETWORK = 1C 02 +MUS_RG_OKURIMONO = 1D 02 +MUS_RG_KINOMIKUI = 1E 02 +MUS_RG_NANADUNGEON = 1F 02 +MUS_RG_OSHIE_TV = 20 02 +MUS_RG_NANASHIMA = 21 02 +MUS_RG_NANAISEKI = 22 02 +MUS_RG_NANA123 = 23 02 +MUS_RG_NANA45 = 24 02 +MUS_RG_NANA67 = 25 02 +MUS_RG_POKEFUE = 26 02 +MUS_RG_VS_DEO = 27 02 +MUS_RG_VS_MYU2 = 28 02 +MUS_RG_VS_DEN = 29 02 +MUS_RG_EXEYE = 2A 02 +MUS_RG_DEOEYE = 2B 02 +MUS_RG_T_TOWER = 2C 02 +MUS_RG_SLOWMASARA = 2D 02 +MUS_RG_TVNOIZE = 2E 02 +PH_TRAP_BLEND = 2F 02 +PH_TRAP_HELD = 30 02 +PH_TRAP_SOLO = 31 02 +PH_FACE_BLEND = 32 02 +PH_FACE_HELD = 33 02 +PH_FACE_SOLO = 34 02 +PH_CLOTH_BLEND = 35 02 +PH_CLOTH_HELD = 36 02 +PH_CLOTH_SOLO = 37 02 +PH_DRESS_BLEND = 38 02 +PH_DRESS_HELD = 39 02 +PH_DRESS_SOLO = 3A 02 +PH_FLEECE_BLEND = 3B 02 +PH_FLEECE_HELD = 3C 02 +PH_FLEECE_SOLO = 3D 02 +PH_KIT_BLEND = 3E 02 +PH_KIT_HELD = 3F 02 +PH_KIT_SOLO = 40 02 +PH_PRICE_BLEND = 41 02 +PH_PRICE_HELD = 42 02 +PH_PRICE_SOLO = 43 02 +PH_LOT_BLEND = 44 02 +PH_LOT_HELD = 45 02 +PH_LOT_SOLO = 46 02 +PH_GOAT_BLEND = 47 02 +PH_GOAT_HELD = 48 02 +PH_GOAT_SOLO = 49 02 +PH_THOUGHT_BLEND = 4A 02 +PH_THOUGHT_HELD = 4B 02 +PH_THOUGHT_SOLO = 4C 02 +PH_CHOICE_BLEND = 4D 02 +PH_CHOICE_HELD = 4E 02 +PH_CHOICE_SOLO = 4F 02 +PH_MOUTH_BLEND = 50 02 +PH_MOUTH_HELD = 51 02 +PH_MOUTH_SOLO = 52 02 +PH_FOOT_BLEND = 53 02 +PH_FOOT_HELD = 54 02 +PH_FOOT_SOLO = 55 02 +PH_GOOSE_BLEND = 56 02 +PH_GOOSE_HELD = 57 02 +PH_GOOSE_SOLO = 58 02 +PH_STRUT_BLEND = 59 02 +PH_STRUT_HELD = 5A 02 +PH_STRUT_SOLO = 5B 02 +PH_CURE_BLEND = 5C 02 +PH_CURE_HELD = 5D 02 +PH_CURE_SOLO = 5E 02 +PH_NURSE_BLEND = 5F 02 +PH_NURSE_HELD = 60 02 +PH_NURSE_SOLO = 61 02 + +A_BUTTON = F8 00 +B_BUTTON = F8 01 +DPAD_UPDOWN = F8 0A +DPAD_NONE = F8 0C + +UP_ARROW_2 = F9 00 +DOWN_ARROW_2 = F9 01 +LEFT_ARROW_2 = F9 02 +RIGHT_ARROW_2 = F9 03 +PLUS = F9 04 +LV_2 = F9 05 +PP = F9 06 +ID = F9 07 +NO = F9 08 +UNDERSCORE = F9 09 +CIRCLE_1 = F9 0A +CIRCLE_2 = F9 0B +CIRCLE_3 = F9 0C +CIRCLE_4 = F9 0D +CIRCLE_5 = F9 0E +CIRCLE_6 = F9 0F +CIRCLE_7 = F9 10 +CIRCLE_8 = F9 11 +CIRCLE_9 = F9 12 +ROUND_LEFT_PAREN = F9 13 +ROUND_RIGHT_PAREN = F9 14 +CIRCLE_DOT = F9 15 +TRIANGLE = F9 16 +BIG_MULT_X = F9 17 + +EMOJI_UNDERSCORE = F9 D0 +EMOJI_PIPE = F9 D1 +EMOJI_HIGHBAR = F9 D2 +EMOJI_TILDE = F9 D3 +EMOJI_LEFT_PAREN = F9 D4 +EMOJI_RIGHT_PAREN = F9 D5 +EMOJI_UNION = F9 D6 @ ⊂ +EMOJI_GREATER_THAN = F9 D7 +EMOJI_LEFT_EYE = F9 D8 +EMOJI_RIGHT_EYE = F9 D9 +EMOJI_AT = F9 DA +EMOJI_SEMICOLON = F9 DB +EMOJI_PLUS = F9 DC +EMOJI_MINUS = F9 DD +EMOJI_EQUALS = F9 DE +EMOJI_SPIRAL = F9 DF +EMOJI_TONGUE = F9 E0 +EMOJI_TRIANGLE_OUTLINE = F9 E1 +EMOJI_ACUTE = F9 E2 +EMOJI_GRAVE = F9 E3 +EMOJI_CIRCLE = F9 E4 +EMOJI_TRIANGLE = F9 E5 +EMOJI_SQUARE = F9 E6 +EMOJI_HEART = F9 E7 +EMOJI_MOON = F9 E8 +EMOJI_NOTE = F9 E9 +EMOJI_BALL = F9 EA +EMOJI_BOLT = F9 EB +EMOJI_LEAF = F9 EC +EMOJI_FIRE = F9 ED +EMOJI_WATER = F9 EE +EMOJI_LEFT_FIST = F9 EF +EMOJI_RIGHT_FIST = F9 F0 +EMOJI_BIGWHEEL = F9 F1 +EMOJI_SMALLWHEEL = F9 F2 +EMOJI_SPHERE = F9 F3 +EMOJI_IRRITATED = F9 F4 +EMOJI_MISCHIEVOUS = F9 F5 +EMOJI_HAPPY = F9 F6 +EMOJI_ANGRY = F9 F7 +EMOJI_SURPRISED = F9 F8 +EMOJI_BIGSMILE = F9 F9 +EMOJI_EVIL = F9 FA +EMOJI_TIRED = F9 FB +EMOJI_NEUTRAL = F9 FC +EMOJI_SHOCKED = F9 FD +EMOJI_BIGANGER = F9 FE + +'\l' = FA @ scroll up window text +'\p' = FB @ new paragraph +'\n' = FE @ new line diff --git a/berry_fix/constants/gba_constants.inc b/berry_fix/constants/gba_constants.inc new file mode 100644 index 000000000..9d59c8fcd --- /dev/null +++ b/berry_fix/constants/gba_constants.inc @@ -0,0 +1,490 @@ + .set PSR_USR_MODE, 0x00000010 + .set PSR_FIQ_MODE, 0x00000011 + .set PSR_IRQ_MODE, 0x00000012 + .set PSR_SVC_MODE, 0x00000013 + .set PSR_ABT_MODE, 0x00000017 + .set PSR_UND_MODE, 0x0000001b + .set PSR_SYS_MODE, 0x0000001f + .set PSR_MODE_MASK, 0x0000001f + .set PSR_T_BIT, 0x00000020 + .set PSR_F_BIT, 0x00000040 + .set PSR_I_BIT, 0x00000080 + + .set EWRAM_START, 0x02000000 + .set EWRAM_END, EWRAM_START + 0x40000 + .set IWRAM_START, 0x03000000 + .set IWRAM_END, IWRAM_START + 0x8000 + + .set PLTT, 0x5000000 + .set BG_PLTT, PLTT + .set OBJ_PLTT, PLTT + 0x200 + + .set VRAM, 0x6000000 + .set BG_VRAM, VRAM + .set OBJ_VRAM0, VRAM + 0x10000 @ text-mode BG + .set OBJ_VRAM1, VRAM + 0x14000 @ bitmap-mode BG + + .set OAM, 0x7000000 + + .set SOUND_INFO_PTR, 0x3007FF0 + .set INTR_CHECK, 0x3007FF8 + .set INTR_VECTOR, 0x3007FFC + + .set INTR_FLAG_VBLANK, 1 << 0 + .set INTR_FLAG_HBLANK, 1 << 1 + .set INTR_FLAG_VCOUNT, 1 << 2 + .set INTR_FLAG_TIMER0, 1 << 3 + .set INTR_FLAG_TIMER1, 1 << 4 + .set INTR_FLAG_TIMER2, 1 << 5 + .set INTR_FLAG_TIMER3, 1 << 6 + .set INTR_FLAG_SERIAL, 1 << 7 + .set INTR_FLAG_DMA0, 1 << 8 + .set INTR_FLAG_DMA1, 1 << 9 + .set INTR_FLAG_DMA2, 1 << 10 + .set INTR_FLAG_DMA3, 1 << 11 + .set INTR_FLAG_KEYPAD, 1 << 12 + .set INTR_FLAG_GAMEPAK, 1 << 13 + + .set VCOUNT_VBLANK, 160 + .set TOTAL_SCANLINES, 228 + + .set REG_BASE, 0x4000000 @ I/O register base address + +@ I/O register offsets + .set OFFSET_REG_DISPCNT, 0x0 + .set OFFSET_REG_DISPSTAT, 0x4 + .set OFFSET_REG_VCOUNT, 0x6 + .set OFFSET_REG_BG0CNT, 0x8 + .set OFFSET_REG_BG1CNT, 0xa + .set OFFSET_REG_BG2CNT, 0xc + .set OFFSET_REG_BG3CNT, 0xe + .set OFFSET_REG_BG0HOFS, 0x10 + .set OFFSET_REG_BG0VOFS, 0x12 + .set OFFSET_REG_BG1HOFS, 0x14 + .set OFFSET_REG_BG1VOFS, 0x16 + .set OFFSET_REG_BG2HOFS, 0x18 + .set OFFSET_REG_BG2VOFS, 0x1a + .set OFFSET_REG_BG3HOFS, 0x1c + .set OFFSET_REG_BG3VOFS, 0x1e + .set OFFSET_REG_BG2PA, 0x20 + .set OFFSET_REG_BG2PB, 0x22 + .set OFFSET_REG_BG2PC, 0x24 + .set OFFSET_REG_BG2PD, 0x26 + .set OFFSET_REG_BG2X_L, 0x28 + .set OFFSET_REG_BG2X_H, 0x2a + .set OFFSET_REG_BG2Y_L, 0x2c + .set OFFSET_REG_BG2Y_H, 0x2e + .set OFFSET_REG_BG3PA, 0x30 + .set OFFSET_REG_BG3PB, 0x32 + .set OFFSET_REG_BG3PC, 0x34 + .set OFFSET_REG_BG3PD, 0x36 + .set OFFSET_REG_BG3X_L, 0x38 + .set OFFSET_REG_BG3X_H, 0x3a + .set OFFSET_REG_BG3Y_L, 0x3c + .set OFFSET_REG_BG3Y_H, 0x3e + .set OFFSET_REG_WIN0H, 0x40 + .set OFFSET_REG_WIN1H, 0x42 + .set OFFSET_REG_WIN0V, 0x44 + .set OFFSET_REG_WIN1V, 0x46 + .set OFFSET_REG_WININ, 0x48 + .set OFFSET_REG_WINOUT, 0x4a + .set OFFSET_REG_MOSAIC, 0x4c + .set OFFSET_REG_BLDCNT, 0x50 + .set OFFSET_REG_BLDALPHA, 0x52 + .set OFFSET_REG_BLDY, 0x54 + + .set OFFSET_REG_SOUND1CNT, 0x60 + .set OFFSET_REG_SOUND1CNT_L, 0x60 + .set OFFSET_REG_NR10, 0x60 + .set OFFSET_REG_SOUND1CNT_H, 0x62 + .set OFFSET_REG_NR11, 0x62 + .set OFFSET_REG_NR12, 0x63 + .set OFFSET_REG_SOUND1CNT_X, 0x64 + .set OFFSET_REG_NR13, 0x64 + .set OFFSET_REG_NR14, 0x65 + .set OFFSET_REG_SOUND2CNT, 0x68 + .set OFFSET_REG_SOUND2CNT_L, 0x68 + .set OFFSET_REG_NR21, 0x68 + .set OFFSET_REG_NR22, 0x69 + .set OFFSET_REG_SOUND2CNT_H, 0x6c + .set OFFSET_REG_NR23, 0x6c + .set OFFSET_REG_NR24, 0x6d + .set OFFSET_REG_SOUND3CNT, 0x70 + .set OFFSET_REG_SOUND3CNT_L, 0x70 + .set OFFSET_REG_NR30, 0x70 + .set OFFSET_REG_SOUND3CNT_H, 0x72 + .set OFFSET_REG_NR31, 0x72 + .set OFFSET_REG_NR32, 0x73 + .set OFFSET_REG_SOUND3CNT_X, 0x74 + .set OFFSET_REG_NR33, 0x74 + .set OFFSET_REG_NR34, 0x75 + .set OFFSET_REG_SOUND4CNT, 0x78 + .set OFFSET_REG_SOUND4CNT_L, 0x78 + .set OFFSET_REG_NR41, 0x78 + .set OFFSET_REG_NR42, 0x79 + .set OFFSET_REG_SOUND4CNT_H, 0x7c + .set OFFSET_REG_NR43, 0x7c + .set OFFSET_REG_NR44, 0x7d + .set OFFSET_REG_SOUNDCNT, 0x80 + .set OFFSET_REG_SOUNDCNT_L, 0x80 + .set OFFSET_REG_NR50, 0x80 + .set OFFSET_REG_NR51, 0x81 + .set OFFSET_REG_SOUNDCNT_H, 0x82 + .set OFFSET_REG_SOUNDCNT_X, 0x84 + .set OFFSET_REG_NR52, 0x84 + .set OFFSET_REG_SOUNDBIAS, 0x88 + .set OFFSET_REG_WAVE_RAM, 0x90 + .set OFFSET_REG_WAVE_RAM0, 0x90 + .set OFFSET_REG_WAVE_RAM0_L, 0x90 + .set OFFSET_REG_WAVE_RAM0_H, 0x92 + .set OFFSET_REG_WAVE_RAM1, 0x94 + .set OFFSET_REG_WAVE_RAM1_L, 0x94 + .set OFFSET_REG_WAVE_RAM1_H, 0x96 + .set OFFSET_REG_WAVE_RAM2, 0x98 + .set OFFSET_REG_WAVE_RAM2_L, 0x98 + .set OFFSET_REG_WAVE_RAM2_H, 0x9a + .set OFFSET_REG_WAVE_RAM3, 0x9c + .set OFFSET_REG_WAVE_RAM3_L, 0x9c + .set OFFSET_REG_WAVE_RAM3_H, 0x9e + .set OFFSET_REG_FIFO, 0xa0 + .set OFFSET_REG_FIFO_A, 0xa0 + .set OFFSET_REG_FIFO_A_L, 0xa0 + .set OFFSET_REG_FIFO_A_H, 0xa2 + .set OFFSET_REG_FIFO_B, 0xa4 + .set OFFSET_REG_FIFO_B_L, 0xa4 + .set OFFSET_REG_FIFO_B_H, 0xa6 + + .set OFFSET_REG_DMA0, 0xb0 + .set OFFSET_REG_DMA0SAD, 0xb0 + .set OFFSET_REG_DMA0SAD_L, 0xb0 + .set OFFSET_REG_DMA0SAD_H, 0xb2 + .set OFFSET_REG_DMA0DAD, 0xb4 + .set OFFSET_REG_DMA0DAD_L, 0xb4 + .set OFFSET_REG_DMA0DAD_H, 0xb6 + .set OFFSET_REG_DMA0CNT, 0xb8 + .set OFFSET_REG_DMA0CNT_L, 0xb8 + .set OFFSET_REG_DMA0CNT_H, 0xba + .set OFFSET_REG_DMA1, 0xbc + .set OFFSET_REG_DMA1SAD, 0xbc + .set OFFSET_REG_DMA1SAD_L, 0xbc + .set OFFSET_REG_DMA1SAD_H, 0xbe + .set OFFSET_REG_DMA1DAD, 0xc0 + .set OFFSET_REG_DMA1DAD_L, 0xc0 + .set OFFSET_REG_DMA1DAD_H, 0xc2 + .set OFFSET_REG_DMA1CNT, 0xc4 + .set OFFSET_REG_DMA1CNT_L, 0xc4 + .set OFFSET_REG_DMA1CNT_H, 0xc6 + .set OFFSET_REG_DMA2, 0xc8 + .set OFFSET_REG_DMA2SAD, 0xc8 + .set OFFSET_REG_DMA2SAD_L, 0xc8 + .set OFFSET_REG_DMA2SAD_H, 0xca + .set OFFSET_REG_DMA2DAD, 0xcc + .set OFFSET_REG_DMA2DAD_L, 0xcc + .set OFFSET_REG_DMA2DAD_H, 0xce + .set OFFSET_REG_DMA2CNT, 0xd0 + .set OFFSET_REG_DMA2CNT_L, 0xd0 + .set OFFSET_REG_DMA2CNT_H, 0xd2 + .set OFFSET_REG_DMA3, 0xd4 + .set OFFSET_REG_DMA3SAD, 0xd4 + .set OFFSET_REG_DMA3SAD_L, 0xd4 + .set OFFSET_REG_DMA3SAD_H, 0xd6 + .set OFFSET_REG_DMA3DAD, 0xd8 + .set OFFSET_REG_DMA3DAD_L, 0xd8 + .set OFFSET_REG_DMA3DAD_H, 0xda + .set OFFSET_REG_DMA3CNT, 0xdc + .set OFFSET_REG_DMA3CNT_L, 0xdc + .set OFFSET_REG_DMA3CNT_H, 0xde + + .set OFFSET_REG_TM0CNT, 0x100 + .set OFFSET_REG_TM0CNT_L, 0x100 + .set OFFSET_REG_TM0CNT_H, 0x102 + .set OFFSET_REG_TM1CNT, 0x104 + .set OFFSET_REG_TM1CNT_L, 0x104 + .set OFFSET_REG_TM1CNT_H, 0x106 + .set OFFSET_REG_TM2CNT, 0x108 + .set OFFSET_REG_TM2CNT_L, 0x108 + .set OFFSET_REG_TM2CNT_H, 0x10a + .set OFFSET_REG_TM3CNT, 0x10c + .set OFFSET_REG_TM3CNT_L, 0x10c + .set OFFSET_REG_TM3CNT_H, 0x10e + + .set OFFSET_REG_SIOCNT, 0x128 + .set OFFSET_REG_SIODATA8, 0x12a + .set OFFSET_REG_SIODATA32, 0x120 + .set OFFSET_REG_SIOMLT_SEND, 0x12a + .set OFFSET_REG_SIOMLT_RECV, 0x120 + .set OFFSET_REG_SIOMULTI0, 0x120 + .set OFFSET_REG_SIOMULTI1, 0x122 + .set OFFSET_REG_SIOMULTI2, 0x124 + .set OFFSET_REG_SIOMULTI3, 0x126 + + .set OFFSET_REG_KEYINPUT, 0x130 + .set OFFSET_REG_KEYCNT, 0x132 + + .set OFFSET_REG_RCNT, 0x134 + + .set OFFSET_REG_JOYCNT, 0x140 + .set OFFSET_REG_JOYSTAT, 0x158 + .set OFFSET_REG_JOY_RECV, 0x150 + .set OFFSET_REG_JOY_RECV_L, 0x150 + .set OFFSET_REG_JOY_RECV_H, 0x152 + .set OFFSET_REG_JOY_TRANS, 0x154 + .set OFFSET_REG_JOY_TRANS_L, 0x154 + .set OFFSET_REG_JOY_TRANS_H, 0x156 + + .set OFFSET_REG_IME, 0x208 + .set OFFSET_REG_IE, 0x200 + .set OFFSET_REG_IF, 0x202 + + .set OFFSET_REG_WAITCNT, 0x204 + +@ I/O register addresses + .set REG_DISPCNT, REG_BASE + OFFSET_REG_DISPCNT + .set REG_DISPSTAT, REG_BASE + OFFSET_REG_DISPSTAT + .set REG_VCOUNT, REG_BASE + OFFSET_REG_VCOUNT + .set REG_BG0CNT, REG_BASE + OFFSET_REG_BG0CNT + .set REG_BG1CNT, REG_BASE + OFFSET_REG_BG1CNT + .set REG_BG2CNT, REG_BASE + OFFSET_REG_BG2CNT + .set REG_BG3CNT, REG_BASE + OFFSET_REG_BG3CNT + .set REG_BG0HOFS, REG_BASE + OFFSET_REG_BG0HOFS + .set REG_BG0VOFS, REG_BASE + OFFSET_REG_BG0VOFS + .set REG_BG1HOFS, REG_BASE + OFFSET_REG_BG1HOFS + .set REG_BG1VOFS, REG_BASE + OFFSET_REG_BG1VOFS + .set REG_BG2HOFS, REG_BASE + OFFSET_REG_BG2HOFS + .set REG_BG2VOFS, REG_BASE + OFFSET_REG_BG2VOFS + .set REG_BG3HOFS, REG_BASE + OFFSET_REG_BG3HOFS + .set REG_BG3VOFS, REG_BASE + OFFSET_REG_BG3VOFS + .set REG_BG2PA, REG_BASE + OFFSET_REG_BG2PA + .set REG_BG2PB, REG_BASE + OFFSET_REG_BG2PB + .set REG_BG2PC, REG_BASE + OFFSET_REG_BG2PC + .set REG_BG2PD, REG_BASE + OFFSET_REG_BG2PD + .set REG_BG2X_L, REG_BASE + OFFSET_REG_BG2X_L + .set REG_BG2X_H, REG_BASE + OFFSET_REG_BG2X_H + .set REG_BG2Y_L, REG_BASE + OFFSET_REG_BG2Y_L + .set REG_BG2Y_H, REG_BASE + OFFSET_REG_BG2Y_H + .set REG_BG3PA, REG_BASE + OFFSET_REG_BG3PA + .set REG_BG3PB, REG_BASE + OFFSET_REG_BG3PB + .set REG_BG3PC, REG_BASE + OFFSET_REG_BG3PC + .set REG_BG3PD, REG_BASE + OFFSET_REG_BG3PD + .set REG_BG3X_L, REG_BASE + OFFSET_REG_BG3X_L + .set REG_BG3X_H, REG_BASE + OFFSET_REG_BG3X_H + .set REG_BG3Y_L, REG_BASE + OFFSET_REG_BG3Y_L + .set REG_BG3Y_H, REG_BASE + OFFSET_REG_BG3Y_H + .set REG_WIN0H, REG_BASE + OFFSET_REG_WIN0H + .set REG_WIN1H, REG_BASE + OFFSET_REG_WIN1H + .set REG_WIN0V, REG_BASE + OFFSET_REG_WIN0V + .set REG_WIN1V, REG_BASE + OFFSET_REG_WIN1V + .set REG_WININ, REG_BASE + OFFSET_REG_WININ + .set REG_WINOUT, REG_BASE + OFFSET_REG_WINOUT + .set REG_MOSAIC, REG_BASE + OFFSET_REG_MOSAIC + .set REG_BLDCNT, REG_BASE + OFFSET_REG_BLDCNT + .set REG_BLDALPHA, REG_BASE + OFFSET_REG_BLDALPHA + .set REG_BLDY, REG_BASE + OFFSET_REG_BLDY + + .set REG_SOUND1CNT, REG_BASE + OFFSET_REG_SOUND1CNT + .set REG_SOUND1CNT_L, REG_BASE + OFFSET_REG_SOUND1CNT_L + .set REG_NR10, REG_BASE + OFFSET_REG_NR10 + .set REG_SOUND1CNT_H, REG_BASE + OFFSET_REG_SOUND1CNT_H + .set REG_NR11, REG_BASE + OFFSET_REG_NR11 + .set REG_NR12, REG_BASE + OFFSET_REG_NR12 + .set REG_SOUND1CNT_X, REG_BASE + OFFSET_REG_SOUND1CNT_X + .set REG_NR13, REG_BASE + OFFSET_REG_NR13 + .set REG_NR14, REG_BASE + OFFSET_REG_NR14 + .set REG_SOUND2CNT, REG_BASE + OFFSET_REG_SOUND2CNT + .set REG_SOUND2CNT_L, REG_BASE + OFFSET_REG_SOUND2CNT_L + .set REG_NR21, REG_BASE + OFFSET_REG_NR21 + .set REG_NR22, REG_BASE + OFFSET_REG_NR22 + .set REG_SOUND2CNT_H, REG_BASE + OFFSET_REG_SOUND2CNT_H + .set REG_NR23, REG_BASE + OFFSET_REG_NR23 + .set REG_NR24, REG_BASE + OFFSET_REG_NR24 + .set REG_SOUND3CNT, REG_BASE + OFFSET_REG_SOUND3CNT + .set REG_SOUND3CNT_L, REG_BASE + OFFSET_REG_SOUND3CNT_L + .set REG_NR30, REG_BASE + OFFSET_REG_NR30 + .set REG_SOUND3CNT_H, REG_BASE + OFFSET_REG_SOUND3CNT_H + .set REG_NR31, REG_BASE + OFFSET_REG_NR31 + .set REG_NR32, REG_BASE + OFFSET_REG_NR32 + .set REG_SOUND3CNT_X, REG_BASE + OFFSET_REG_SOUND3CNT_X + .set REG_NR33, REG_BASE + OFFSET_REG_NR33 + .set REG_NR34, REG_BASE + OFFSET_REG_NR34 + .set REG_SOUND4CNT, REG_BASE + OFFSET_REG_SOUND4CNT + .set REG_SOUND4CNT_L, REG_BASE + OFFSET_REG_SOUND4CNT_L + .set REG_NR41, REG_BASE + OFFSET_REG_NR41 + .set REG_NR42, REG_BASE + OFFSET_REG_NR42 + .set REG_SOUND4CNT_H, REG_BASE + OFFSET_REG_SOUND4CNT_H + .set REG_NR43, REG_BASE + OFFSET_REG_NR43 + .set REG_NR44, REG_BASE + OFFSET_REG_NR44 + .set REG_SOUNDCNT, REG_BASE + OFFSET_REG_SOUNDCNT + .set REG_SOUNDCNT_L, REG_BASE + OFFSET_REG_SOUNDCNT_L + .set REG_NR50, REG_BASE + OFFSET_REG_NR50 + .set REG_NR51, REG_BASE + OFFSET_REG_NR51 + .set REG_SOUNDCNT_H, REG_BASE + OFFSET_REG_SOUNDCNT_H + .set REG_SOUNDCNT_X, REG_BASE + OFFSET_REG_SOUNDCNT_X + .set REG_NR52, REG_BASE + OFFSET_REG_NR52 + .set REG_SOUNDBIAS, REG_BASE + OFFSET_REG_SOUNDBIAS + .set REG_WAVE_RAM, REG_BASE + OFFSET_REG_WAVE_RAM + .set REG_WAVE_RAM0, REG_BASE + OFFSET_REG_WAVE_RAM0 + .set REG_WAVE_RAM0_L, REG_BASE + OFFSET_REG_WAVE_RAM0_L + .set REG_WAVE_RAM0_H, REG_BASE + OFFSET_REG_WAVE_RAM0_H + .set REG_WAVE_RAM1, REG_BASE + OFFSET_REG_WAVE_RAM1 + .set REG_WAVE_RAM1_L, REG_BASE + OFFSET_REG_WAVE_RAM1_L + .set REG_WAVE_RAM1_H, REG_BASE + OFFSET_REG_WAVE_RAM1_H + .set REG_WAVE_RAM2, REG_BASE + OFFSET_REG_WAVE_RAM2 + .set REG_WAVE_RAM2_L, REG_BASE + OFFSET_REG_WAVE_RAM2_L + .set REG_WAVE_RAM2_H, REG_BASE + OFFSET_REG_WAVE_RAM2_H + .set REG_WAVE_RAM3, REG_BASE + OFFSET_REG_WAVE_RAM3 + .set REG_WAVE_RAM3_L, REG_BASE + OFFSET_REG_WAVE_RAM3_L + .set REG_WAVE_RAM3_H, REG_BASE + OFFSET_REG_WAVE_RAM3_H + .set REG_FIFO, REG_BASE + OFFSET_REG_FIFO + .set REG_FIFO_A, REG_BASE + OFFSET_REG_FIFO_A + .set REG_FIFO_A_L, REG_BASE + OFFSET_REG_FIFO_A_L + .set REG_FIFO_A_H, REG_BASE + OFFSET_REG_FIFO_A_H + .set REG_FIFO_B, REG_BASE + OFFSET_REG_FIFO_B + .set REG_FIFO_B_L, REG_BASE + OFFSET_REG_FIFO_B_L + .set REG_FIFO_B_H, REG_BASE + OFFSET_REG_FIFO_B_H + + .set REG_DMA0, REG_BASE + OFFSET_REG_DMA0 + .set REG_DMA0SAD, REG_BASE + OFFSET_REG_DMA0SAD + .set REG_DMA0SAD_L, REG_BASE + OFFSET_REG_DMA0SAD_L + .set REG_DMA0SAD_H, REG_BASE + OFFSET_REG_DMA0SAD_H + .set REG_DMA0DAD, REG_BASE + OFFSET_REG_DMA0DAD + .set REG_DMA0DAD_L, REG_BASE + OFFSET_REG_DMA0DAD_L + .set REG_DMA0DAD_H, REG_BASE + OFFSET_REG_DMA0DAD_H + .set REG_DMA0CNT, REG_BASE + OFFSET_REG_DMA0CNT + .set REG_DMA0CNT_L, REG_BASE + OFFSET_REG_DMA0CNT_L + .set REG_DMA0CNT_H, REG_BASE + OFFSET_REG_DMA0CNT_H + .set REG_DMA1, REG_BASE + OFFSET_REG_DMA1 + .set REG_DMA1SAD, REG_BASE + OFFSET_REG_DMA1SAD + .set REG_DMA1SAD_L, REG_BASE + OFFSET_REG_DMA1SAD_L + .set REG_DMA1SAD_H, REG_BASE + OFFSET_REG_DMA1SAD_H + .set REG_DMA1DAD, REG_BASE + OFFSET_REG_DMA1DAD + .set REG_DMA1DAD_L, REG_BASE + OFFSET_REG_DMA1DAD_L + .set REG_DMA1DAD_H, REG_BASE + OFFSET_REG_DMA1DAD_H + .set REG_DMA1CNT, REG_BASE + OFFSET_REG_DMA1CNT + .set REG_DMA1CNT_L, REG_BASE + OFFSET_REG_DMA1CNT_L + .set REG_DMA1CNT_H, REG_BASE + OFFSET_REG_DMA1CNT_H + .set REG_DMA2, REG_BASE + OFFSET_REG_DMA2 + .set REG_DMA2SAD, REG_BASE + OFFSET_REG_DMA2SAD + .set REG_DMA2SAD_L, REG_BASE + OFFSET_REG_DMA2SAD_L + .set REG_DMA2SAD_H, REG_BASE + OFFSET_REG_DMA2SAD_H + .set REG_DMA2DAD, REG_BASE + OFFSET_REG_DMA2DAD + .set REG_DMA2DAD_L, REG_BASE + OFFSET_REG_DMA2DAD_L + .set REG_DMA2DAD_H, REG_BASE + OFFSET_REG_DMA2DAD_H + .set REG_DMA2CNT, REG_BASE + OFFSET_REG_DMA2CNT + .set REG_DMA2CNT_L, REG_BASE + OFFSET_REG_DMA2CNT_L + .set REG_DMA2CNT_H, REG_BASE + OFFSET_REG_DMA2CNT_H + .set REG_DMA3, REG_BASE + OFFSET_REG_DMA3 + .set REG_DMA3SAD, REG_BASE + OFFSET_REG_DMA3SAD + .set REG_DMA3SAD_L, REG_BASE + OFFSET_REG_DMA3SAD_L + .set REG_DMA3SAD_H, REG_BASE + OFFSET_REG_DMA3SAD_H + .set REG_DMA3DAD, REG_BASE + OFFSET_REG_DMA3DAD + .set REG_DMA3DAD_L, REG_BASE + OFFSET_REG_DMA3DAD_L + .set REG_DMA3DAD_H, REG_BASE + OFFSET_REG_DMA3DAD_H + .set REG_DMA3CNT, REG_BASE + OFFSET_REG_DMA3CNT + .set REG_DMA3CNT_L, REG_BASE + OFFSET_REG_DMA3CNT_L + .set REG_DMA3CNT_H, REG_BASE + OFFSET_REG_DMA3CNT_H + + .set REG_TM0CNT, REG_BASE + OFFSET_REG_TM0CNT + .set REG_TM0CNT_L, REG_BASE + OFFSET_REG_TM0CNT_L + .set REG_TM0CNT_H, REG_BASE + OFFSET_REG_TM0CNT_H + .set REG_TM1CNT, REG_BASE + OFFSET_REG_TM1CNT + .set REG_TM1CNT_L, REG_BASE + OFFSET_REG_TM1CNT_L + .set REG_TM1CNT_H, REG_BASE + OFFSET_REG_TM1CNT_H + .set REG_TM2CNT, REG_BASE + OFFSET_REG_TM2CNT + .set REG_TM2CNT_L, REG_BASE + OFFSET_REG_TM2CNT_L + .set REG_TM2CNT_H, REG_BASE + OFFSET_REG_TM2CNT_H + .set REG_TM3CNT, REG_BASE + OFFSET_REG_TM3CNT + .set REG_TM3CNT_L, REG_BASE + OFFSET_REG_TM3CNT_L + .set REG_TM3CNT_H, REG_BASE + OFFSET_REG_TM3CNT_H + + .set REG_SIOCNT, REG_BASE + OFFSET_REG_SIOCNT + .set REG_SIODATA8, REG_BASE + OFFSET_REG_SIODATA8 + .set REG_SIODATA32, REG_BASE + OFFSET_REG_SIODATA32 + .set REG_SIOMLT_SEND, REG_BASE + OFFSET_REG_SIOMLT_SEND + .set REG_SIOMLT_RECV, REG_BASE + OFFSET_REG_SIOMLT_RECV + .set REG_SIOMULTI0, REG_BASE + OFFSET_REG_SIOMULTI0 + .set REG_SIOMULTI1, REG_BASE + OFFSET_REG_SIOMULTI1 + .set REG_SIOMULTI2, REG_BASE + OFFSET_REG_SIOMULTI2 + .set REG_SIOMULTI3, REG_BASE + OFFSET_REG_SIOMULTI3 + + .set REG_KEYINPUT, REG_BASE + OFFSET_REG_KEYINPUT + .set REG_KEYCNT, REG_BASE + OFFSET_REG_KEYCNT + + .set REG_RCNT, REG_BASE + OFFSET_REG_RCNT + + .set REG_JOYCNT, REG_BASE + OFFSET_REG_JOYCNT + .set REG_JOYSTAT, REG_BASE + OFFSET_REG_JOYSTAT + .set REG_JOY_RECV, REG_BASE + OFFSET_REG_JOY_RECV + .set REG_JOY_RECV_L, REG_BASE + OFFSET_REG_JOY_RECV_L + .set REG_JOY_RECV_H, REG_BASE + OFFSET_REG_JOY_RECV_H + .set REG_JOY_TRANS, REG_BASE + OFFSET_REG_JOY_TRANS + .set REG_JOY_TRANS_L, REG_BASE + OFFSET_REG_JOY_TRANS_L + .set REG_JOY_TRANS_H, REG_BASE + OFFSET_REG_JOY_TRANS_H + + .set REG_IME, REG_BASE + OFFSET_REG_IME + .set REG_IE, REG_BASE + OFFSET_REG_IE + .set REG_IF, REG_BASE + OFFSET_REG_IF + + .set REG_WAITCNT, REG_BASE + OFFSET_REG_WAITCNT + +@ DMA register constants + + .set DMA_DEST_INC, 0x0000 + .set DMA_DEST_DEC, 0x0020 + .set DMA_DEST_FIXED, 0x0040 + .set DMA_DEST_RELOAD, 0x0060 + .set DMA_SRC_INC, 0x0000 + .set DMA_SRC_DEC, 0x0080 + .set DMA_SRC_FIXED, 0x0100 + .set DMA_REPEAT, 0x0200 + .set DMA_16BIT, 0x0000 + .set DMA_32BIT, 0x0400 + .set DMA_DREQ_ON, 0x0800 + .set DMA_START_NOW, 0x0000 + .set DMA_START_VBLANK, 0x1000 + .set DMA_START_HBLANK, 0x2000 + .set DMA_START_SPECIAL, 0x3000 + .set DMA_INTR_ENABLE, 0x4000 + .set DMA_ENABLE, 0x8000 + +@ OAM attribute constants + + .set OAM_OBJ_NORMAL, 0x00000000 + .set OAM_OBJ_BLEND, 0x00000400 + .set OAM_OBJ_WINDOW, 0x00000800 + + .set OAM_AFFINE_NONE, 0x00000000 + .set OAM_AFFINE_NORMAL_SIZE, 0x00000100 + .set OAM_OBJ_DISABLED, 0x00000200 + .set OAM_AFFINE_DOUBLE_SIZE, 0x00000300 + + .set OAM_MOSAIC_OFF, 0x00000000 + .set OAM_MOSAIC_ON, 0x00001000 + + .set OAM_4BPP, 0x00000000 + .set OAM_8BPP, 0x00002000 + + .set OAM_H_FLIP, 0x10000000 + .set OAM_V_FLIP, 0x20000000 + + .set OAM_SQUARE, 0x00000000 + .set OAM_H_RECTANGLE, 0x00004000 + .set OAM_V_RECTANGLE, 0x00008000 + .set OAM_SIZE_0, 0x00000000 + .set OAM_SIZE_1, 0x40000000 + .set OAM_SIZE_2, 0x80000000 + .set OAM_SIZE_3, 0xc0000000 + + .set OAM_SIZE_8x8, OAM_SIZE_0 | OAM_SQUARE + .set OAM_SIZE_16x16, OAM_SIZE_1 | OAM_SQUARE + .set OAM_SIZE_32x32, OAM_SIZE_2 | OAM_SQUARE + .set OAM_SIZE_64x64, OAM_SIZE_3 | OAM_SQUARE + + .set OAM_SIZE_16x8, OAM_SIZE_0 | OAM_H_RECTANGLE + .set OAM_SIZE_32x8, OAM_SIZE_1 | OAM_H_RECTANGLE + .set OAM_SIZE_32x16, OAM_SIZE_2 | OAM_H_RECTANGLE + .set OAM_SIZE_64x32, OAM_SIZE_3 | OAM_H_RECTANGLE + + .set OAM_SIZE_8x16, OAM_SIZE_0 | OAM_V_RECTANGLE + .set OAM_SIZE_8x32, OAM_SIZE_1 | OAM_V_RECTANGLE + .set OAM_SIZE_16x32, OAM_SIZE_2 | OAM_V_RECTANGLE + .set OAM_SIZE_32x64, OAM_SIZE_3 | OAM_V_RECTANGLE diff --git a/berry_fix/data/data.s b/berry_fix/data/data.s new file mode 100644 index 000000000..dbb86b13b --- /dev/null +++ b/berry_fix/data/data.s @@ -0,0 +1,4 @@ + .section .rodata + +_data_2f0:: + .incbin "data/payload.gba.lz" diff --git a/berry_fix/ld_script.sed b/berry_fix/ld_script.sed new file mode 100644 index 000000000..b91542b6f --- /dev/null +++ b/berry_fix/ld_script.sed @@ -0,0 +1,14 @@ +// { + r sym_ewram.ld + d +} + +// { + r sym_bss.ld + d +} + +// { + r sym_common.ld + d +} diff --git a/berry_fix/ld_script.txt b/berry_fix/ld_script.txt new file mode 100644 index 000000000..2edeaef7c --- /dev/null +++ b/berry_fix/ld_script.txt @@ -0,0 +1,31 @@ +ENTRY(_start) + +SECTIONS { + . = 0x2000000; + + .text : + ALIGN(4) + { + asm/loader.o(.text); + } =0 + + . += 0x100; + .rodata : + ALIGN(4) + { + data/data.o(.rodata); + } =0 + + . = 0x2010000; + + ewram (NOLOAD) : + ALIGN(4) + { + gCode = .; + } + + /DISCARD/ : + { + *(*); + } +} diff --git a/berry_fix/payload/Makefile b/berry_fix/payload/Makefile new file mode 100644 index 000000000..e63d74234 --- /dev/null +++ b/berry_fix/payload/Makefile @@ -0,0 +1,159 @@ +include $(DEVKITARM)/base_tools +export CPP := $(PREFIX)cpp +export LD := $(PREFIX)ld + +ifeq ($(OS),Windows_NT) +EXE := .exe +else +EXE := +endif + +SHELL := /bin/bash -o pipefail + +CPPFLAGS := -I ../../tools/agbcc/include -I ../../tools/agbcc -iquote include -nostdinc -undef + +ROM := payload.gba +OBJ_DIR := build +CC1 := ../../tools/agbcc/bin/agbcc$(EXE) +override CFLAGS += -mthumb-interwork -Wimplicit -Wparentheses -Werror -O2 -fhex-asm + + +ELF = $(ROM:.gba=.elf) +MAP = $(ROM:.gba=.map) + +C_SUBDIR = src +ASM_SUBDIR = asm +DATA_ASM_SUBDIR = data + +C_BUILDDIR = $(OBJ_DIR)/$(C_SUBDIR) +ASM_BUILDDIR = $(OBJ_DIR)/$(ASM_SUBDIR) +DATA_ASM_BUILDDIR = $(OBJ_DIR)/$(DATA_ASM_SUBDIR) + +ASFLAGS := -mcpu=arm7tdmi + +LDFLAGS = -Map ../$(MAP) + +LIB := -L ../../../tools/agbcc/lib -lagb_flash -lsiirtc -lagbsyscall -lgcc + +SHA1 := $(shell { command -v sha1sum || command -v shasum; } 2>/dev/null) -c +GFX := ../../tools/gbagfx/gbagfx$(EXE) +AIF := ../../tools/aif2pcm/aif2pcm$(EXE) +MID := ../../tools/mid2agb/mid2agb$(EXE) +SCANINC := ../../tools/scaninc/scaninc$(EXE) +PREPROC := ../../tools/preproc/preproc$(EXE) +RAMSCRGEN := ../../tools/ramscrgen/ramscrgen$(EXE) +FIX := ../../tools/gbafix/gbafix$(EXE) + +# Clear the default suffixes +.SUFFIXES: +# Don't delete intermediate files +.SECONDARY: +# Delete files that weren't built properly +.DELETE_ON_ERROR: + +# Secondary expansion is required for dependency variables in object rules. +.SECONDEXPANSION: + +.PHONY: rom clean compare tidy + +C_SRCS := $(wildcard $(C_SUBDIR)/*.c $(C_SUBDIR)/*/*.c $(C_SUBDIR)/*/*/*.c) +C_OBJS := $(patsubst $(C_SUBDIR)/%.c,$(C_BUILDDIR)/%.o,$(C_SRCS)) + +ASM_SRCS := $(wildcard $(ASM_SUBDIR)/*.s) +ASM_OBJS := $(patsubst $(ASM_SUBDIR)/%.s,$(ASM_BUILDDIR)/%.o,$(ASM_SRCS)) + +DATA_ASM_SRCS := $(wildcard $(DATA_ASM_SUBDIR)/*.s) +DATA_ASM_OBJS := $(patsubst $(DATA_ASM_SUBDIR)/%.s,$(DATA_ASM_BUILDDIR)/%.o,$(DATA_ASM_SRCS)) + +SONG_SRCS := $(wildcard $(SONG_SUBDIR)/*.s) +SONG_OBJS := $(patsubst $(SONG_SUBDIR)/%.s,$(SONG_BUILDDIR)/%.o,$(SONG_SRCS)) + +MID_SRCS := $(wildcard $(MID_SUBDIR)/*.mid) +MID_OBJS := $(patsubst $(MID_SUBDIR)/%.mid,$(MID_BUILDDIR)/%.o,$(MID_SRCS)) + +OBJS := $(C_OBJS) $(ASM_OBJS) $(DATA_ASM_OBJS) $(SONG_OBJS) $(MID_OBJS) +# OBJS_REL := $(patsubst $(OBJ_DIR)/%,%,$(OBJS)) + +SUBDIRS := $(sort $(dir $(OBJS))) + +$(shell mkdir -p $(SUBDIRS)) + +rom: $(ROM) + +# For contributors to make sure a change didn't affect the contents of the ROM. +compare: $(ROM) + @$(SHA1) rom.sha1 + +clean: tidy + rm -f sound/direct_sound_samples/*.bin + rm -f $(SONG_OBJS) $(MID_OBJS) $(MID_SUBDIR)/*.s + find . \( -iname '*.1bpp' -o -iname '*.4bpp' -o -iname '*.8bpp' -o -iname '*.gbapal' -o -iname '*.lz' -o -iname '*.latfont' -o -iname '*.hwjpnfont' -o -iname '*.fwjpnfont' \) -exec rm {} + + +tidy: + rm -f $(ROM) $(ELF) $(MAP) + rm -r build/* + +%.s: ; +%.png: ; +%.pal: ; +%.aif: ; + +%.1bpp: %.png ; $(GFX) $< $@ +%.4bpp: %.png ; $(GFX) $< $@ +%.8bpp: %.png ; $(GFX) $< $@ +%.gbapal: %.pal ; $(GFX) $< $@ +%.gbapal: %.png ; $(GFX) $< $@ +%.lz: % ; $(GFX) $< $@ +%.rl: % ; $(GFX) $< $@ + + +ifeq ($(NODEP),1) +$(C_BUILDDIR)/%.o: c_dep := +else +$(C_BUILDDIR)/%.o: c_dep = $(shell $(SCANINC) -I include $(C_SUBDIR)/$*.c) +endif + +$(C_BUILDDIR)/%.o : $(C_SUBDIR)/%.c $$(c_dep) + @$(CPP) $(CPPFLAGS) $< -o $(C_BUILDDIR)/$*.i + @$(PREPROC) $(C_BUILDDIR)/$*.i charmap.txt | $(CC1) $(CFLAGS) -o $(C_BUILDDIR)/$*.s + $(AS) $(ASFLAGS) -o $@ $(C_BUILDDIR)/$*.s + +ifeq ($(NODEP),1) +$(ASM_BUILDDIR)/%.o: asm_dep := +else +$(ASM_BUILDDIR)/%.o: asm_dep = $(shell $(SCANINC) $(ASM_SUBDIR)/$*.s) +endif + +$(ASM_BUILDDIR)/%.o: $(ASM_SUBDIR)/%.s $$(asm_dep) + $(AS) $(ASFLAGS) -o $@ $< + +ifeq ($(NODEP),1) +$(DATA_ASM_BUILDDIR)/%.o: data_dep := +else +$(DATA_ASM_BUILDDIR)/%.o: data_dep = $(shell $(SCANINC) $(DATA_ASM_SUBDIR)/$*.s) +endif + +$(DATA_ASM_BUILDDIR)/%.o: $(DATA_ASM_SUBDIR)/%.s $$(data_dep) + $(PREPROC) $< charmap.txt | $(CPP) -I include | $(AS) $(ASFLAGS) -o $@ + +$(SONG_BUILDDIR)/%.o: $(SONG_SUBDIR)/%.s + $(AS) $(ASFLAGS) -I sound -o $@ $< + +$(OBJ_DIR)/sym_bss.ld: sym_bss.txt + $(RAMSCRGEN) .bss $< ENGLISH > $@ + +$(OBJ_DIR)/sym_common.ld: sym_common.txt $(C_OBJS) $(wildcard common_syms/*.txt) + $(RAMSCRGEN) COMMON $< ENGLISH -c $(C_BUILDDIR),common_syms,../../tools/agbcc/lib > $@ + +$(OBJ_DIR)/sym_ewram.ld: sym_ewram.txt + $(RAMSCRGEN) ewram_data $< ENGLISH > $@ + +$(OBJ_DIR)/ld_script.ld: ld_script.txt $(OBJ_DIR)/sym_bss.ld $(OBJ_DIR)/sym_common.ld $(OBJ_DIR)/sym_ewram.ld + cd $(OBJ_DIR) && sed -f ../../ld_script.sed ../$< | sed "s#tools/#../tools/#g" > ld_script.ld + +$(ELF): $(OBJ_DIR)/ld_script.ld $(OBJS) + cd $(OBJ_DIR) && $(LD) $(LDFLAGS) -T ld_script.ld -o ../$@ $(LIB) + +$(ROM): $(ELF) + $(OBJCOPY) -O binary $< $@ + diff --git a/berry_fix/payload/asm/crt0.s b/berry_fix/payload/asm/crt0.s new file mode 100644 index 000000000..66536914a --- /dev/null +++ b/berry_fix/payload/asm/crt0.s @@ -0,0 +1,83 @@ + .include "asm/macros/asm.inc" + .include "asm/macros/function.inc" + .include "constants/gba_constants.inc" + + .syntax unified + + .text + + .arm + .align 2, 0 + .global Init +Init: + mov r0, PSR_IRQ_MODE + msr cpsr_cf, r0 + ldr sp, sp_irq + mov r0, PSR_SYS_MODE + msr cpsr_cf, r0 + ldr sp, sp_sys + ldr r1, =INTR_VECTOR + ldr r0, =IntrMain + str r0, [r1] + ldr r1, =AgbMain + 1 + mov lr, pc + bx r1 + b Init + + .align 2, 0 +sp_sys: .word IWRAM_END - 0x100 +sp_irq: .word IWRAM_END - 0x60 + + .pool + .size Init, .-Init + + .arm + .align 2, 0 + .global IntrMain +IntrMain: @ 0x2010048 + mov ip, REG_BASE + add r3, ip, OFFSET_REG_IE + ldr r2, [r3] + and r1, r2, r2, lsr #16 + mov r2, #0 + ands r0, r1, #0x2000 + strbne r0, [r3, #-0x17c] +_02010064: + bne _02010064 + ands r0, r1, #0xc0 + bne _020100DC + add r2, r2, #4 + ands r0, r1, #1 + strhne r0, [ip, #-8] + bne _020100DC + add r2, r2, #4 + ands r0, r1, #2 + bne _020100DC + add r2, r2, #4 + ands r0, r1, #4 + bne _020100DC + add r2, r2, #4 + ands r0, r1, #0x100 + bne _020100DC + add r2, r2, #4 + ands r0, r1, #0x200 + bne _020100DC + add r2, r2, #4 + ands r0, r1, #0x400 + bne _020100DC + add r2, r2, #4 + ands r0, r1, #0x800 + bne _020100DC + add r2, r2, #4 + ands r0, r1, #0x1000 + bne _020100DC + add r2, r2, #4 + ands r0, r1, #8 +_020100DC: + strh r0, [r3, #2] + ldr r1, =gIntrTable + add r1, r1, r2 + ldr r0, [r1] + bx r0 + .pool + .size IntrMain, .-IntrMain diff --git a/berry_fix/payload/asm/macros/asm.inc b/berry_fix/payload/asm/macros/asm.inc new file mode 100644 index 000000000..4ac003fab --- /dev/null +++ b/berry_fix/payload/asm/macros/asm.inc @@ -0,0 +1,12 @@ + .macro inc x + .set \x, \x + 1 + .endm + + .macro enum_start x=0 + .set __enum__, \x + .endm + + .macro enum constant + .equiv \constant, __enum__ + inc __enum__ + .endm diff --git a/berry_fix/payload/asm/macros/function.inc b/berry_fix/payload/asm/macros/function.inc new file mode 100644 index 000000000..b109595df --- /dev/null +++ b/berry_fix/payload/asm/macros/function.inc @@ -0,0 +1,29 @@ + .macro arm_func_start name + .align 2, 0 + .global \name + .arm + .type \name, %function + .endm + + .macro arm_func_end name + .size \name, .-\name + .endm + + .macro thumb_func_start name + .align 2, 0 + .global \name + .thumb + .thumb_func + .type \name, %function + .endm + + .macro non_word_aligned_thumb_func_start name + .global \name + .thumb + .thumb_func + .type \name, %function + .endm + + .macro thumb_func_end name + .size \name, .-\name + .endm diff --git a/berry_fix/payload/asmdiff.sh b/berry_fix/payload/asmdiff.sh new file mode 100644 index 000000000..5f86ac620 --- /dev/null +++ b/berry_fix/payload/asmdiff.sh @@ -0,0 +1,7 @@ +#!/bin/bash + +OBJDUMP="$DEVKITARM/bin/arm-none-eabi-objdump -D -bbinary -marmv4t -Mforce-thumb" +OPTIONS="--start-address=$(($1)) --stop-address=$(($1 + $2))" +$OBJDUMP $OPTIONS baserom.gba > baserom.dump +$OBJDUMP $OPTIONS payload.gba > payload.dump +diff baserom.dump payload.dump diff --git a/berry_fix/payload/charmap.txt b/berry_fix/payload/charmap.txt new file mode 100644 index 000000000..a736b40f2 --- /dev/null +++ b/berry_fix/payload/charmap.txt @@ -0,0 +1,1067 @@ +' ' = 00 +'À' = 01 +'Ã' = 02 +'Â' = 03 +'Ç' = 04 +'È' = 05 +'É' = 06 +'Ê' = 07 +'Ë' = 08 +'ÃŒ' = 09 +'ÃŽ' = 0B +'Ã' = 0C +'Ã’' = 0D +'Ó' = 0E +'Ô' = 0F +'Å’' = 10 +'Ù' = 11 +'Ú' = 12 +'Û' = 13 +'Ñ' = 14 +'ß' = 15 +'à' = 16 +'á' = 17 +'ç' = 19 +'è' = 1A +'é' = 1B +'ê' = 1C +'ë' = 1D +'ì' = 1E +'î' = 20 +'ï' = 21 +'ò' = 22 +'ó' = 23 +'ô' = 24 +'Å“' = 25 +'ù' = 26 +'ú' = 27 +'û' = 28 +'ñ' = 29 +'º' = 2A +'ª' = 2B +SUPER_ER = 2C +'&' = 2D +'+' = 2E +LV = 34 +'=' = 35 +';' = 36 +'¿' = 51 +'¡' = 52 +PK = 53 +PKMN = 53 54 +POKEBLOCK = 55 56 57 58 59 +'Ã' = 5A +'%' = 5B +'(' = 5C +')' = 5D +'â' = 68 +'í' = 6F +UNK_SPACER = 77 +UP_ARROW = 79 +DOWN_ARROW = 7A +LEFT_ARROW = 7B +RIGHT_ARROW = 7C +'0' = A1 +'1' = A2 +'2' = A3 +'3' = A4 +'4' = A5 +'5' = A6 +'6' = A7 +'7' = A8 +'8' = A9 +'9' = AA +'!' = AB +'?' = AC +'.' = AD +'-' = AE +'·' = AF +'…' = B0 +'“' = B1 +'â€' = B2 +'‘' = B3 +'’' = B4 +'♂' = B5 +'♀' = B6 +'Â¥' = B7 +',' = B8 +'×' = B9 +'/' = BA +'A' = BB +'B' = BC +'C' = BD +'D' = BE +'E' = BF +'F' = C0 +'G' = C1 +'H' = C2 +'I' = C3 +'J' = C4 +'K' = C5 +'L' = C6 +'M' = C7 +'N' = C8 +'O' = C9 +'P' = CA +'Q' = CB +'R' = CC +'S' = CD +'T' = CE +'U' = CF +'V' = D0 +'W' = D1 +'X' = D2 +'Y' = D3 +'Z' = D4 +'a' = D5 +'b' = D6 +'c' = D7 +'d' = D8 +'e' = D9 +'f' = DA +'g' = DB +'h' = DC +'i' = DD +'j' = DE +'k' = DF +'l' = E0 +'m' = E1 +'n' = E2 +'o' = E3 +'p' = E4 +'q' = E5 +'r' = E6 +'s' = E7 +'t' = E8 +'u' = E9 +'v' = EA +'w' = EB +'x' = EC +'y' = ED +'z' = EE +'â–¶' = EF +':' = F0 +'Ä' = F1 +'Ö' = F2 +'Ãœ' = F3 +'ä' = F4 +'ö' = F5 +'ü' = F6 +TALL_PLUS = FC 0C FB +'$' = FF + +@ Hiragana +'ã‚' = 01 +'ã„' = 02 +'ã†' = 03 +'ãˆ' = 04 +'ãŠ' = 05 +'ã‹' = 06 +'ã' = 07 +'ã' = 08 +'ã‘' = 09 +'ã“' = 0A +'ã•' = 0B +'ã—' = 0C +'ã™' = 0D +'ã›' = 0E +'ã' = 0F +'ãŸ' = 10 +'ã¡' = 11 +'ã¤' = 12 +'ã¦' = 13 +'ã¨' = 14 +'ãª' = 15 +'ã«' = 16 +'ã¬' = 17 +'ã­' = 18 +'ã®' = 19 +'ã¯' = 1A +'ã²' = 1B +'ãµ' = 1C +'ã¸' = 1D +'ã»' = 1E +'ã¾' = 1F +'ã¿' = 20 +'ã‚€' = 21 +'ã‚' = 22 +'ã‚‚' = 23 +'ã‚„' = 24 +'ゆ' = 25 +'よ' = 26 +'ら' = 27 +'ã‚Š' = 28 +'ã‚‹' = 29 +'ã‚Œ' = 2A +'ã‚' = 2B +'ã‚' = 2C +'ã‚’' = 2D +'ã‚“' = 2E +'ã' = 2F +'ãƒ' = 30 +'ã…' = 31 +'ã‡' = 32 +'ã‰' = 33 +'ゃ' = 34 +'ã‚…' = 35 +'ょ' = 36 +'ãŒ' = 37 +'ãŽ' = 38 +'ã' = 39 +'ã’' = 3A +'ã”' = 3B +'ã–' = 3C +'ã˜' = 3D +'ãš' = 3E +'ãœ' = 3F +'ãž' = 40 +'ã ' = 41 +'ã¢' = 42 +'ã¥' = 43 +'ã§' = 44 +'ã©' = 45 +'ã°' = 46 +'ã³' = 47 +'ã¶' = 48 +'ã¹' = 49 +'ã¼' = 4A +'ã±' = 4B +'ã´' = 4C +'ã·' = 4D +'ãº' = 4E +'ã½' = 4F +'ã£' = 50 + +@ Katakana +'ã‚¢' = 51 +'イ' = 52 +'ウ' = 53 +'エ' = 54 +'オ' = 55 +'ã‚«' = 56 +'ã‚­' = 57 +'ク' = 58 +'ケ' = 59 +'コ' = 5A +'サ' = 5B +'ã‚·' = 5C +'ス' = 5D +'ã‚»' = 5E +'ソ' = 5F +'ã‚¿' = 60 +'ãƒ' = 61 +'ツ' = 62 +'テ' = 63 +'ト' = 64 +'ナ' = 65 +'ニ' = 66 +'ヌ' = 67 +'ãƒ' = 68 +'ノ' = 69 +'ãƒ' = 6A +'ヒ' = 6B +'フ' = 6C +'ヘ' = 6D +'ホ' = 6E +'マ' = 6F +'ミ' = 70 +'ム' = 71 +'メ' = 72 +'モ' = 73 +'ヤ' = 74 +'ユ' = 75 +'ヨ' = 76 +'ラ' = 77 +'リ' = 78 +'ル' = 79 +'レ' = 7A +'ロ' = 7B +'ワ' = 7C +'ヲ' = 7D +'ン' = 7E +'ã‚¡' = 7F +'ã‚£' = 80 +'ã‚¥' = 81 +'ェ' = 82 +'ã‚©' = 83 +'ャ' = 84 +'ュ' = 85 +'ョ' = 86 +'ガ' = 87 +'ã‚®' = 88 +'ã‚°' = 89 +'ゲ' = 8A +'ã‚´' = 8B +'ザ' = 8C +'ジ' = 8D +'ズ' = 8E +'ゼ' = 8F +'ゾ' = 90 +'ダ' = 91 +'ヂ' = 92 +'ヅ' = 93 +'デ' = 94 +'ド' = 95 +'ãƒ' = 96 +'ビ' = 97 +'ブ' = 98 +'ベ' = 99 +'ボ' = 9A +'パ' = 9B +'ピ' = 9C +'プ' = 9D +'ペ' = 9E +'ãƒ' = 9F +'ッ' = A0 + +@ Japanese punctuation +'　' = 00 +'ï¼' = AB +'？' = AC +'。' = AD +'ー' = AE +'⋯' = B0 + +STRING = FD + +@ string placeholders +PLAYER = FD 01 +STR_VAR_1 = FD 02 +STR_VAR_2 = FD 03 +STR_VAR_3 = FD 04 +KUN = FD 05 +RIVAL = FD 06 +@ version-dependent strings (originally made for Ruby/Sapphire differences) +@ Emerald uses the Sapphire strings (except for VERSION). +VERSION = FD 07 @ "EMERALD" +AQUA = FD 08 +MAGMA = FD 09 +ARCHIE = FD 0A +MAXIE = FD 0B +KYOGRE = FD 0C +GROUDON = FD 0D + +@ battle string placeholders + +B_BUFF1 = FD 00 +B_BUFF2 = FD 01 +B_COPY_VAR_1 = FD 02 +B_COPY_VAR_2 = FD 03 +B_COPY_VAR_3 = FD 04 +B_PLAYER_MON1_NAME = FD 05 +B_OPPONENT_MON1_NAME = FD 06 +B_PLAYER_MON2_NAME = FD 07 +B_OPPONENT_MON2_NAME = FD 08 +B_LINK_PLAYER_MON1_NAME = FD 09 +B_LINK_OPPONENT_MON1_NAME = FD 0A +B_LINK_PLAYER_MON2_NAME = FD 0B +B_LINK_OPPONENT_MON2_NAME = FD 0C +B_ATK_NAME_WITH_PREFIX_MON1 = FD 0D +B_ATK_PARTNER_NAME = FD 0E +B_ATK_NAME_WITH_PREFIX = FD 0F +B_DEF_NAME_WITH_PREFIX = FD 10 +B_EFF_NAME_WITH_PREFIX = FD 11 @ EFF = short for gEffectBattler +B_ACTIVE_NAME_WITH_PREFIX = FD 12 +B_SCR_ACTIVE_NAME_WITH_PREFIX = FD 13 +B_CURRENT_MOVE = FD 14 +B_LAST_MOVE = FD 15 +B_LAST_ITEM = FD 16 +B_LAST_ABILITY = FD 17 +B_ATK_ABILITY = FD 18 +B_DEF_ABILITY = FD 19 +B_SCR_ACTIVE_ABILITY = FD 1A +B_EFF_ABILITY = FD 1B +B_TRAINER1_CLASS = FD 1C +B_TRAINER1_NAME = FD 1D +B_LINK_PLAYER_NAME = FD 1E +B_LINK_PARTNER_NAME = FD 1F +B_LINK_OPPONENT1_NAME = FD 20 +B_LINK_OPPONENT2_NAME = FD 21 +B_LINK_SCR_TRAINER_NAME = FD 22 +B_PLAYER_NAME = FD 23 +B_TRAINER1_LOSE_TEXT = FD 24 +B_TRAINER1_WIN_TEXT = FD 25 +B_26 = FD 26 +B_PC_CREATOR_NAME = FD 27 +B_ATK_PREFIX1 = FD 28 +B_DEF_PREFIX1 = FD 29 +B_ATK_PREFIX2 = FD 2A +B_DEF_PREFIX2 = FD 2B +B_ATK_PREFIX3 = FD 2C +B_DEF_PREFIX3 = FD 2D +B_TRAINER2_CLASS = FD 2E +B_TRAINER2_NAME = FD 2F +B_TRAINER2_LOSE_TEXT = FD 30 +B_TRAINER2_WIN_TEXT = FD 31 +B_PARTNER_CLASS = FD 32 +B_PARTNER_NAME = FD 33 +B_BUFF3 = FD 34 + +@ indicates the end of a town/city name (before " TOWN" or " CITY") +NAME_END = FC 00 + +@ special 0xF7 character +SPECIAL_F7 = F7 + +@ more text functions + +COLOR = FC 01 @ use a color listed below right after +HIGHLIGHT = FC 02 @ same as fc 01 +SHADOW = FC 03 @ same as fc 01 +COLOR_HIGHLIGHT_SHADOW = FC 04 @ takes 3 bytes +PALETTE = FC 05 @ used in credits +SIZE = FC 06 @ note that anything other than "SMALL" is invalid +UNKNOWN_7 = FC 07 +PAUSE = FC 08 @ manually print the wait byte after this, havent mapped them +PAUSE_UNTIL_PRESS = FC 09 +UNKNOWN_A = FC 0A +PLAY_BGM = FC 0B +ESCAPE = FC 0C +SHIFT_TEXT = FC 0D +UNKNOWN_E = FC 0E +UNKNOWN_F = FC 0F +PLAY_SE = FC 10 +CLEAR = FC 11 +SKIP = FC 12 +CLEAR_TO = FC 13 +UNKNOWN_14 = FC 14 +JPN = FC 15 +ENG = FC 16 +PAUSE_MUSIC = FC 17 +RESUME_MUSIC = FC 18 + +@ colors + +TRANSPARENT = 00 +WHITE = 01 +DARK_GREY = 02 +LIGHT_GREY = 03 +RED = 04 +LIGHT_RED = 05 +GREEN = 06 +LIGHT_GREEN = 07 +BLUE = 08 +LIGHT_BLUE = 09 +@ these next colors can be set to anything arbitrary at runtime +@ usually though they'll have the textbox border colors as described below +DYNAMIC_COLOR1 = 0A @ white +DYNAMIC_COLOR2 = 0B @ white with a tinge of green +DYNAMIC_COLOR3 = 0C @ white 2 +DYNAMIC_COLOR4 = 0D @ aquamarine +DYNAMIC_COLOR5 = 0E @ blue-green +DYNAMIC_COLOR6 = 0F @ cerulean + +@ sound and music + +MUS_DUMMY = 00 00 +SE_KAIFUKU = 01 00 +SE_PC_LOGIN = 02 00 +SE_PC_OFF = 03 00 +SE_PC_ON = 04 00 +SE_SELECT = 05 00 +SE_WIN_OPEN = 06 00 +SE_WALL_HIT = 07 00 +SE_DOOR = 08 00 +SE_KAIDAN = 09 00 +SE_DANSA = 0A 00 +SE_JITENSYA = 0B 00 +SE_KOUKA_L = 0C 00 +SE_KOUKA_M = 0D 00 +SE_KOUKA_H = 0E 00 +SE_BOWA2 = 0F 00 +SE_POKE_DEAD = 10 00 +SE_NIGERU = 11 00 +SE_JIDO_DOA = 12 00 +SE_NAMINORI = 13 00 +SE_BAN = 14 00 +SE_PIN = 15 00 +SE_BOO = 16 00 +SE_BOWA = 17 00 +SE_JYUNI = 18 00 +SE_A = 19 00 +SE_I = 1A 00 +SE_U = 1B 00 +SE_E = 1C 00 +SE_O = 1D 00 +SE_N = 1E 00 +SE_SEIKAI = 1F 00 +SE_HAZURE = 20 00 +SE_EXP = 21 00 +SE_JITE_PYOKO = 22 00 +SE_MU_PACHI = 23 00 +SE_TK_KASYA = 24 00 +SE_FU_ZAKU = 25 00 +SE_FU_ZAKU2 = 26 00 +SE_FU_ZUZUZU = 27 00 +SE_RU_GASHIN = 28 00 +SE_RU_GASYAN = 29 00 +SE_RU_BARI = 2A 00 +SE_RU_HYUU = 2B 00 +SE_KI_GASYAN = 2C 00 +SE_TK_WARPIN = 2D 00 +SE_TK_WARPOUT = 2E 00 +SE_TU_SAA = 2F 00 +SE_HI_TURUN = 30 00 +SE_TRACK_MOVE = 31 00 +SE_TRACK_STOP = 32 00 +SE_TRACK_HAIKI = 33 00 +SE_TRACK_DOOR = 34 00 +SE_MOTER = 35 00 +SE_CARD = 36 00 +SE_SAVE = 37 00 +SE_KON = 38 00 +SE_KON2 = 39 00 +SE_KON3 = 3A 00 +SE_KON4 = 3B 00 +SE_SUIKOMU = 3C 00 +SE_NAGERU = 3D 00 +SE_TOY_C = 3E 00 +SE_TOY_D = 3F 00 +SE_TOY_E = 40 00 +SE_TOY_F = 41 00 +SE_TOY_G = 42 00 +SE_TOY_A = 43 00 +SE_TOY_B = 44 00 +SE_TOY_C1 = 45 00 +SE_MIZU = 46 00 +SE_HASHI = 47 00 +SE_DAUGI = 48 00 +SE_PINPON = 49 00 +SE_FUUSEN1 = 4A 00 +SE_FUUSEN2 = 4B 00 +SE_FUUSEN3 = 4C 00 +SE_TOY_KABE = 4D 00 +SE_TOY_DANGO = 4E 00 +SE_DOKU = 4F 00 +SE_ESUKA = 50 00 +SE_T_AME = 51 00 +SE_T_AME_E = 52 00 +SE_T_OOAME = 53 00 +SE_T_OOAME_E = 54 00 +SE_T_KOAME = 55 00 +SE_T_KOAME_E = 56 00 +SE_T_KAMI = 57 00 +SE_T_KAMI2 = 58 00 +SE_ELEBETA = 59 00 +SE_HINSI = 5A 00 +SE_EXPMAX = 5B 00 +SE_TAMAKORO = 5C 00 +SE_TAMAKORO_E = 5D 00 +SE_BASABASA = 5E 00 +SE_REGI = 5F 00 +SE_C_GAJI = 60 00 +SE_C_MAKU_U = 61 00 +SE_C_MAKU_D = 62 00 +SE_C_PASI = 63 00 +SE_C_SYU = 64 00 +SE_C_PIKON = 65 00 +SE_REAPOKE = 66 00 +SE_OP_BASYU = 67 00 +SE_BT_START = 68 00 +SE_DENDOU = 69 00 +SE_JIHANKI = 6A 00 +SE_TAMA = 6B 00 +SE_Z_SCROLL = 6C 00 +SE_Z_PAGE = 6D 00 +SE_PN_ON = 6E 00 +SE_PN_OFF = 6F 00 +SE_Z_SEARCH = 70 00 +SE_TAMAGO = 71 00 +SE_TB_START = 72 00 +SE_TB_KON = 73 00 +SE_TB_KARA = 74 00 +SE_BIDORO = 75 00 +SE_W085 = 76 00 +SE_W085B = 77 00 +SE_W231 = 78 00 +SE_W171 = 79 00 +SE_W233 = 7A 00 +SE_W233B = 7B 00 +SE_W145 = 7C 00 +SE_W145B = 7D 00 +SE_W145C = 7E 00 +SE_W240 = 7F 00 +SE_W015 = 80 00 +SE_W081 = 81 00 +SE_W081B = 82 00 +SE_W088 = 83 00 +SE_W016 = 84 00 +SE_W016B = 85 00 +SE_W003 = 86 00 +SE_W104 = 87 00 +SE_W013 = 88 00 +SE_W196 = 89 00 +SE_W086 = 8A 00 +SE_W004 = 8B 00 +SE_W025 = 8C 00 +SE_W025B = 8D 00 +SE_W152 = 8E 00 +SE_W026 = 8F 00 +SE_W172 = 90 00 +SE_W172B = 91 00 +SE_W053 = 92 00 +SE_W007 = 93 00 +SE_W092 = 94 00 +SE_W221 = 95 00 +SE_W221B = 96 00 +SE_W052 = 97 00 +SE_W036 = 98 00 +SE_W059 = 99 00 +SE_W059B = 9A 00 +SE_W010 = 9B 00 +SE_W011 = 9C 00 +SE_W017 = 9D 00 +SE_W019 = 9E 00 +SE_W028 = 9F 00 +SE_W013B = A0 00 +SE_W044 = A1 00 +SE_W029 = A2 00 +SE_W057 = A3 00 +SE_W056 = A4 00 +SE_W250 = A5 00 +SE_W030 = A6 00 +SE_W039 = A7 00 +SE_W054 = A8 00 +SE_W077 = A9 00 +SE_W020 = AA 00 +SE_W082 = AB 00 +SE_W047 = AC 00 +SE_W195 = AD 00 +SE_W006 = AE 00 +SE_W091 = AF 00 +SE_W146 = B0 00 +SE_W120 = B1 00 +SE_W153 = B2 00 +SE_W071B = B3 00 +SE_W071 = B4 00 +SE_W103 = B5 00 +SE_W062 = B6 00 +SE_W062B = B7 00 +SE_W048 = B8 00 +SE_W187 = B9 00 +SE_W118 = BA 00 +SE_W155 = BB 00 +SE_W122 = BC 00 +SE_W060 = BD 00 +SE_W185 = BE 00 +SE_W014 = BF 00 +SE_W043 = C0 00 +SE_W207 = C1 00 +SE_W207B = C2 00 +SE_W215 = C3 00 +SE_W109 = C4 00 +SE_W173 = C5 00 +SE_W280 = C6 00 +SE_W202 = C7 00 +SE_W060B = C8 00 +SE_W076 = C9 00 +SE_W080 = CA 00 +SE_W100 = CB 00 +SE_W107 = CC 00 +SE_W166 = CD 00 +SE_W129 = CE 00 +SE_W115 = CF 00 +SE_W112 = D0 00 +SE_W197 = D1 00 +SE_W199 = D2 00 +SE_W236 = D3 00 +SE_W204 = D4 00 +SE_W268 = D5 00 +SE_W070 = D6 00 +SE_W063 = D7 00 +SE_W127 = D8 00 +SE_W179 = D9 00 +SE_W151 = DA 00 +SE_W201 = DB 00 +SE_W161 = DC 00 +SE_W161B = DD 00 +SE_W227 = DE 00 +SE_W227B = DF 00 +SE_W226 = E0 00 +SE_W208 = E1 00 +SE_W213 = E2 00 +SE_W213B = E3 00 +SE_W234 = E4 00 +SE_W260 = E5 00 +SE_W328 = E6 00 +SE_W320 = E7 00 +SE_W255 = E8 00 +SE_W291 = E9 00 +SE_W089 = EA 00 +SE_W239 = EB 00 +SE_W230 = EC 00 +SE_W281 = ED 00 +SE_W327 = EE 00 +SE_W287 = EF 00 +SE_W257 = F0 00 +SE_W253 = F1 00 +SE_W258 = F2 00 +SE_W322 = F3 00 +SE_W298 = F4 00 +SE_W287B = F5 00 +SE_W114 = F6 00 +SE_W063B = F7 00 +SE_RG_W_DOOR = F8 00 +SE_RG_CARD1 = F9 00 +SE_RG_CARD2 = FA 00 +SE_RG_CARD3 = FB 00 +SE_RG_BAG1 = FC 00 +SE_RG_BAG2 = FD 00 +SE_RG_GETTING = FE 00 +SE_RG_SHOP = FF 00 +SE_RG_KITEKI = 00 01 +SE_RG_HELP_OP = 01 01 +SE_RG_HELP_CL = 02 01 +SE_RG_HELP_NG = 03 01 +SE_RG_DEOMOV = 04 01 +SE_RG_EXCELLENT = 05 01 +SE_RG_NAWAMISS = 06 01 +SE_TOREEYE = 07 01 +SE_TOREOFF = 08 01 +SE_HANTEI1 = 09 01 +SE_HANTEI2 = 0A 01 +SE_CURTAIN = 0B 01 +SE_CURTAIN1 = 0C 01 +SE_USSOKI = 0D 01 +MUS_TETSUJI = 5E 01 +MUS_FIELD13 = 5F 01 +MUS_KACHI22 = 60 01 +MUS_KACHI2 = 61 01 +MUS_KACHI3 = 62 01 +MUS_KACHI5 = 63 01 +MUS_PCC = 64 01 +MUS_NIBI = 65 01 +MUS_SUIKUN = 66 01 +MUS_DOORO1 = 67 01 +MUS_DOORO_X1 = 68 01 +MUS_DOORO_X3 = 69 01 +MUS_MACHI_S2 = 6A 01 +MUS_MACHI_S4 = 6B 01 +MUS_GIM = 6C 01 +MUS_NAMINORI = 6D 01 +MUS_DAN01 = 6E 01 +MUS_FANFA1 = 6F 01 +MUS_ME_ASA = 70 01 +MUS_ME_BACHI = 71 01 +MUS_FANFA4 = 72 01 +MUS_FANFA5 = 73 01 +MUS_ME_WAZA = 74 01 +MUS_BIJYUTU = 75 01 +MUS_DOORO_X4 = 76 01 +MUS_FUNE_KAN = 77 01 +MUS_ME_SHINKA = 78 01 +MUS_SHINKA = 79 01 +MUS_ME_WASURE = 7A 01 +MUS_SYOUJOEYE = 7B 01 +MUS_BOYEYE = 7C 01 +MUS_DAN02 = 7D 01 +MUS_MACHI_S3 = 7E 01 +MUS_ODAMAKI = 7F 01 +MUS_B_TOWER = 80 01 +MUS_SWIMEYE = 81 01 +MUS_DAN03 = 82 01 +MUS_ME_KINOMI = 83 01 +MUS_ME_TAMA = 84 01 +MUS_ME_B_BIG = 85 01 +MUS_ME_B_SMALL = 86 01 +MUS_ME_ZANNEN = 87 01 +MUS_BD_TIME = 88 01 +MUS_TEST1 = 89 01 +MUS_TEST2 = 8A 01 +MUS_TEST3 = 8B 01 +MUS_TEST4 = 8C 01 +MUS_TEST = 8D 01 +MUS_GOMACHI0 = 8E 01 +MUS_GOTOWN = 8F 01 +MUS_POKECEN = 90 01 +MUS_NEXTROAD = 91 01 +MUS_GRANROAD = 92 01 +MUS_CYCLING = 93 01 +MUS_FRIENDLY = 94 01 +MUS_MISHIRO = 95 01 +MUS_TOZAN = 96 01 +MUS_GIRLEYE = 97 01 +MUS_MINAMO = 98 01 +MUS_ASHROAD = 99 01 +MUS_EVENT0 = 9A 01 +MUS_DEEPDEEP = 9B 01 +MUS_KACHI1 = 9C 01 +MUS_TITLE3 = 9D 01 +MUS_DEMO1 = 9E 01 +MUS_GIRL_SUP = 9F 01 +MUS_HAGESHII = A0 01 +MUS_KAKKOII = A1 01 +MUS_KAZANBAI = A2 01 +MUS_AQA_0 = A3 01 +MUS_TSURETEK = A4 01 +MUS_BOY_SUP = A5 01 +MUS_RAINBOW = A6 01 +MUS_AYASII = A7 01 +MUS_KACHI4 = A8 01 +MUS_ROPEWAY = A9 01 +MUS_CASINO = AA 01 +MUS_HIGHTOWN = AB 01 +MUS_SAFARI = AC 01 +MUS_C_ROAD = AD 01 +MUS_AJITO = AE 01 +MUS_M_BOAT = AF 01 +MUS_M_DUNGON = B0 01 +MUS_FINECITY = B1 01 +MUS_MACHUPI = B2 01 +MUS_P_SCHOOL = B3 01 +MUS_DENDOU = B4 01 +MUS_TONEKUSA = B5 01 +MUS_MABOROSI = B6 01 +MUS_CON_FAN = B7 01 +MUS_CONTEST0 = B8 01 +MUS_MGM0 = B9 01 +MUS_T_BATTLE = BA 01 +MUS_OOAME = BB 01 +MUS_HIDERI = BC 01 +MUS_RUNECITY = BD 01 +MUS_CON_K = BE 01 +MUS_EIKOU_R = BF 01 +MUS_KARAKURI = C0 01 +MUS_HUTAGO = C1 01 +MUS_SITENNOU = C2 01 +MUS_YAMA_EYE = C3 01 +MUS_CONLOBBY = C4 01 +MUS_INTER_V = C5 01 +MUS_DAIGO = C6 01 +MUS_THANKFOR = C7 01 +MUS_END = C8 01 +MUS_B_FRONTIER = C9 01 +MUS_B_ARENA = CA 01 +MUS_ME_POINTGET = CB 01 +MUS_ME_TORE_EYE = CC 01 +MUS_PYRAMID = CD 01 +MUS_PYRAMID_TOP = CE 01 +MUS_B_PALACE = CF 01 +MUS_REKKUU_KOURIN = D0 01 +MUS_SATTOWER = D1 01 +MUS_ME_SYMBOLGET = D2 01 +MUS_B_DOME = D3 01 +MUS_B_TUBE = D4 01 +MUS_B_FACTORY = D5 01 +MUS_VS_REKKU = D6 01 +MUS_VS_FRONT = D7 01 +MUS_VS_MEW = D8 01 +MUS_B_DOME1 = D9 01 +MUS_BATTLE27 = DA 01 +MUS_BATTLE31 = DB 01 +MUS_BATTLE20 = DC 01 +MUS_BATTLE32 = DD 01 +MUS_BATTLE33 = DE 01 +MUS_BATTLE36 = DF 01 +MUS_BATTLE34 = E0 01 +MUS_BATTLE35 = E1 01 +MUS_BATTLE38 = E2 01 +MUS_BATTLE30 = E3 01 +MUS_RG_ANNAI = E4 01 +MUS_RG_SLOT = E5 01 +MUS_RG_AJITO = E6 01 +MUS_RG_GYM = E7 01 +MUS_RG_PURIN = E8 01 +MUS_RG_DEMO = E9 01 +MUS_RG_TITLE = EA 01 +MUS_RG_GUREN = EB 01 +MUS_RG_SHION = EC 01 +MUS_RG_KAIHUKU = ED 01 +MUS_RG_CYCLING = EE 01 +MUS_RG_ROCKET = EF 01 +MUS_RG_SHOUJO = F0 01 +MUS_RG_SHOUNEN = F1 01 +MUS_RG_DENDOU = F2 01 +MUS_RG_T_MORI = F3 01 +MUS_RG_OTSUKIMI = F4 01 +MUS_RG_POKEYASHI = F5 01 +MUS_RG_ENDING = F6 01 +MUS_RG_LOAD01 = F7 01 +MUS_RG_OPENING = F8 01 +MUS_RG_LOAD02 = F9 01 +MUS_RG_LOAD03 = FA 01 +MUS_RG_CHAMP_R = FB 01 +MUS_RG_VS_GYM = FC 01 +MUS_RG_VS_TORE = FD 01 +MUS_RG_VS_YASEI = FE 01 +MUS_RG_VS_LAST = FF 01 +MUS_RG_MASARA = 00 02 +MUS_RG_KENKYU = 01 02 +MUS_RG_OHKIDO = 02 02 +MUS_RG_POKECEN = 03 02 +MUS_RG_SANTOAN = 04 02 +MUS_RG_NAMINORI = 05 02 +MUS_RG_P_TOWER = 06 02 +MUS_RG_SHIRUHU = 07 02 +MUS_RG_HANADA = 08 02 +MUS_RG_TAMAMUSI = 09 02 +MUS_RG_WIN_TRE = 0A 02 +MUS_RG_WIN_YASEI = 0B 02 +MUS_RG_WIN_GYM = 0C 02 +MUS_RG_KUCHIBA = 0D 02 +MUS_RG_NIBI = 0E 02 +MUS_RG_RIVAL1 = 0F 02 +MUS_RG_RIVAL2 = 10 02 +MUS_RG_FAN2 = 11 02 +MUS_RG_FAN5 = 12 02 +MUS_RG_FAN6 = 13 02 +MUS_ME_RG_PHOTO = 14 02 +MUS_RG_TITLEROG = 15 02 +MUS_RG_GET_YASEI = 16 02 +MUS_RG_SOUSA = 17 02 +MUS_RG_SEKAIKAN = 18 02 +MUS_RG_SEIBETU = 19 02 +MUS_RG_JUMP = 1A 02 +MUS_RG_UNION = 1B 02 +MUS_RG_NETWORK = 1C 02 +MUS_RG_OKURIMONO = 1D 02 +MUS_RG_KINOMIKUI = 1E 02 +MUS_RG_NANADUNGEON = 1F 02 +MUS_RG_OSHIE_TV = 20 02 +MUS_RG_NANASHIMA = 21 02 +MUS_RG_NANAISEKI = 22 02 +MUS_RG_NANA123 = 23 02 +MUS_RG_NANA45 = 24 02 +MUS_RG_NANA67 = 25 02 +MUS_RG_POKEFUE = 26 02 +MUS_RG_VS_DEO = 27 02 +MUS_RG_VS_MYU2 = 28 02 +MUS_RG_VS_DEN = 29 02 +MUS_RG_EXEYE = 2A 02 +MUS_RG_DEOEYE = 2B 02 +MUS_RG_T_TOWER = 2C 02 +MUS_RG_SLOWMASARA = 2D 02 +MUS_RG_TVNOIZE = 2E 02 +PH_TRAP_BLEND = 2F 02 +PH_TRAP_HELD = 30 02 +PH_TRAP_SOLO = 31 02 +PH_FACE_BLEND = 32 02 +PH_FACE_HELD = 33 02 +PH_FACE_SOLO = 34 02 +PH_CLOTH_BLEND = 35 02 +PH_CLOTH_HELD = 36 02 +PH_CLOTH_SOLO = 37 02 +PH_DRESS_BLEND = 38 02 +PH_DRESS_HELD = 39 02 +PH_DRESS_SOLO = 3A 02 +PH_FLEECE_BLEND = 3B 02 +PH_FLEECE_HELD = 3C 02 +PH_FLEECE_SOLO = 3D 02 +PH_KIT_BLEND = 3E 02 +PH_KIT_HELD = 3F 02 +PH_KIT_SOLO = 40 02 +PH_PRICE_BLEND = 41 02 +PH_PRICE_HELD = 42 02 +PH_PRICE_SOLO = 43 02 +PH_LOT_BLEND = 44 02 +PH_LOT_HELD = 45 02 +PH_LOT_SOLO = 46 02 +PH_GOAT_BLEND = 47 02 +PH_GOAT_HELD = 48 02 +PH_GOAT_SOLO = 49 02 +PH_THOUGHT_BLEND = 4A 02 +PH_THOUGHT_HELD = 4B 02 +PH_THOUGHT_SOLO = 4C 02 +PH_CHOICE_BLEND = 4D 02 +PH_CHOICE_HELD = 4E 02 +PH_CHOICE_SOLO = 4F 02 +PH_MOUTH_BLEND = 50 02 +PH_MOUTH_HELD = 51 02 +PH_MOUTH_SOLO = 52 02 +PH_FOOT_BLEND = 53 02 +PH_FOOT_HELD = 54 02 +PH_FOOT_SOLO = 55 02 +PH_GOOSE_BLEND = 56 02 +PH_GOOSE_HELD = 57 02 +PH_GOOSE_SOLO = 58 02 +PH_STRUT_BLEND = 59 02 +PH_STRUT_HELD = 5A 02 +PH_STRUT_SOLO = 5B 02 +PH_CURE_BLEND = 5C 02 +PH_CURE_HELD = 5D 02 +PH_CURE_SOLO = 5E 02 +PH_NURSE_BLEND = 5F 02 +PH_NURSE_HELD = 60 02 +PH_NURSE_SOLO = 61 02 + +A_BUTTON = F8 00 +B_BUTTON = F8 01 +DPAD_UPDOWN = F8 0A +DPAD_NONE = F8 0C + +UP_ARROW_2 = F9 00 +DOWN_ARROW_2 = F9 01 +LEFT_ARROW_2 = F9 02 +RIGHT_ARROW_2 = F9 03 +PLUS = F9 04 +LV_2 = F9 05 +PP = F9 06 +ID = F9 07 +NO = F9 08 +UNDERSCORE = F9 09 +CIRCLE_1 = F9 0A +CIRCLE_2 = F9 0B +CIRCLE_3 = F9 0C +CIRCLE_4 = F9 0D +CIRCLE_5 = F9 0E +CIRCLE_6 = F9 0F +CIRCLE_7 = F9 10 +CIRCLE_8 = F9 11 +CIRCLE_9 = F9 12 +ROUND_LEFT_PAREN = F9 13 +ROUND_RIGHT_PAREN = F9 14 +CIRCLE_DOT = F9 15 +TRIANGLE = F9 16 +BIG_MULT_X = F9 17 + +EMOJI_UNDERSCORE = F9 D0 +EMOJI_PIPE = F9 D1 +EMOJI_HIGHBAR = F9 D2 +EMOJI_TILDE = F9 D3 +EMOJI_LEFT_PAREN = F9 D4 +EMOJI_RIGHT_PAREN = F9 D5 +EMOJI_UNION = F9 D6 @ ⊂ +EMOJI_GREATER_THAN = F9 D7 +EMOJI_LEFT_EYE = F9 D8 +EMOJI_RIGHT_EYE = F9 D9 +EMOJI_AT = F9 DA +EMOJI_SEMICOLON = F9 DB +EMOJI_PLUS = F9 DC +EMOJI_MINUS = F9 DD +EMOJI_EQUALS = F9 DE +EMOJI_SPIRAL = F9 DF +EMOJI_TONGUE = F9 E0 +EMOJI_TRIANGLE_OUTLINE = F9 E1 +EMOJI_ACUTE = F9 E2 +EMOJI_GRAVE = F9 E3 +EMOJI_CIRCLE = F9 E4 +EMOJI_TRIANGLE = F9 E5 +EMOJI_SQUARE = F9 E6 +EMOJI_HEART = F9 E7 +EMOJI_MOON = F9 E8 +EMOJI_NOTE = F9 E9 +EMOJI_BALL = F9 EA +EMOJI_BOLT = F9 EB +EMOJI_LEAF = F9 EC +EMOJI_FIRE = F9 ED +EMOJI_WATER = F9 EE +EMOJI_LEFT_FIST = F9 EF +EMOJI_RIGHT_FIST = F9 F0 +EMOJI_BIGWHEEL = F9 F1 +EMOJI_SMALLWHEEL = F9 F2 +EMOJI_SPHERE = F9 F3 +EMOJI_IRRITATED = F9 F4 +EMOJI_MISCHIEVOUS = F9 F5 +EMOJI_HAPPY = F9 F6 +EMOJI_ANGRY = F9 F7 +EMOJI_SURPRISED = F9 F8 +EMOJI_BIGSMILE = F9 F9 +EMOJI_EVIL = F9 FA +EMOJI_TIRED = F9 FB +EMOJI_NEUTRAL = F9 FC +EMOJI_SHOCKED = F9 FD +EMOJI_BIGANGER = F9 FE + +'\l' = FA @ scroll up window text +'\p' = FB @ new paragraph +'\n' = FE @ new line diff --git a/berry_fix/payload/common_syms/agb_flash.txt b/berry_fix/payload/common_syms/agb_flash.txt new file mode 100644 index 000000000..cb421ec80 --- /dev/null +++ b/berry_fix/payload/common_syms/agb_flash.txt @@ -0,0 +1,10 @@ +gFlashTimeoutFlag +PollFlashStatus +WaitForFlashWrite +ProgramFlashSector +gFlash +ProgramFlashByte +gFlashNumRemainingBytes +EraseFlashChip +EraseFlashSector +gFlashMaxTime diff --git a/berry_fix/payload/common_syms/main.txt b/berry_fix/payload/common_syms/main.txt new file mode 100644 index 000000000..b62c72124 --- /dev/null +++ b/berry_fix/payload/common_syms/main.txt @@ -0,0 +1,9 @@ +gIntrTable +gHeldKeys +gNewKeys +gIntrVector +gUpdateSuccessful +gUnknown_3001194 +gUnknown_30011A0 +gMainCallbackState +gGameVersion diff --git a/berry_fix/payload/common_syms/rtc.txt b/berry_fix/payload/common_syms/rtc.txt new file mode 100644 index 000000000..7aafbe65d --- /dev/null +++ b/berry_fix/payload/common_syms/rtc.txt @@ -0,0 +1,2 @@ +gTimeSinceBerryUpdate +gRtcUTCTime diff --git a/berry_fix/payload/constants/gba_constants.inc b/berry_fix/payload/constants/gba_constants.inc new file mode 100644 index 000000000..9d59c8fcd --- /dev/null +++ b/berry_fix/payload/constants/gba_constants.inc @@ -0,0 +1,490 @@ + .set PSR_USR_MODE, 0x00000010 + .set PSR_FIQ_MODE, 0x00000011 + .set PSR_IRQ_MODE, 0x00000012 + .set PSR_SVC_MODE, 0x00000013 + .set PSR_ABT_MODE, 0x00000017 + .set PSR_UND_MODE, 0x0000001b + .set PSR_SYS_MODE, 0x0000001f + .set PSR_MODE_MASK, 0x0000001f + .set PSR_T_BIT, 0x00000020 + .set PSR_F_BIT, 0x00000040 + .set PSR_I_BIT, 0x00000080 + + .set EWRAM_START, 0x02000000 + .set EWRAM_END, EWRAM_START + 0x40000 + .set IWRAM_START, 0x03000000 + .set IWRAM_END, IWRAM_START + 0x8000 + + .set PLTT, 0x5000000 + .set BG_PLTT, PLTT + .set OBJ_PLTT, PLTT + 0x200 + + .set VRAM, 0x6000000 + .set BG_VRAM, VRAM + .set OBJ_VRAM0, VRAM + 0x10000 @ text-mode BG + .set OBJ_VRAM1, VRAM + 0x14000 @ bitmap-mode BG + + .set OAM, 0x7000000 + + .set SOUND_INFO_PTR, 0x3007FF0 + .set INTR_CHECK, 0x3007FF8 + .set INTR_VECTOR, 0x3007FFC + + .set INTR_FLAG_VBLANK, 1 << 0 + .set INTR_FLAG_HBLANK, 1 << 1 + .set INTR_FLAG_VCOUNT, 1 << 2 + .set INTR_FLAG_TIMER0, 1 << 3 + .set INTR_FLAG_TIMER1, 1 << 4 + .set INTR_FLAG_TIMER2, 1 << 5 + .set INTR_FLAG_TIMER3, 1 << 6 + .set INTR_FLAG_SERIAL, 1 << 7 + .set INTR_FLAG_DMA0, 1 << 8 + .set INTR_FLAG_DMA1, 1 << 9 + .set INTR_FLAG_DMA2, 1 << 10 + .set INTR_FLAG_DMA3, 1 << 11 + .set INTR_FLAG_KEYPAD, 1 << 12 + .set INTR_FLAG_GAMEPAK, 1 << 13 + + .set VCOUNT_VBLANK, 160 + .set TOTAL_SCANLINES, 228 + + .set REG_BASE, 0x4000000 @ I/O register base address + +@ I/O register offsets + .set OFFSET_REG_DISPCNT, 0x0 + .set OFFSET_REG_DISPSTAT, 0x4 + .set OFFSET_REG_VCOUNT, 0x6 + .set OFFSET_REG_BG0CNT, 0x8 + .set OFFSET_REG_BG1CNT, 0xa + .set OFFSET_REG_BG2CNT, 0xc + .set OFFSET_REG_BG3CNT, 0xe + .set OFFSET_REG_BG0HOFS, 0x10 + .set OFFSET_REG_BG0VOFS, 0x12 + .set OFFSET_REG_BG1HOFS, 0x14 + .set OFFSET_REG_BG1VOFS, 0x16 + .set OFFSET_REG_BG2HOFS, 0x18 + .set OFFSET_REG_BG2VOFS, 0x1a + .set OFFSET_REG_BG3HOFS, 0x1c + .set OFFSET_REG_BG3VOFS, 0x1e + .set OFFSET_REG_BG2PA, 0x20 + .set OFFSET_REG_BG2PB, 0x22 + .set OFFSET_REG_BG2PC, 0x24 + .set OFFSET_REG_BG2PD, 0x26 + .set OFFSET_REG_BG2X_L, 0x28 + .set OFFSET_REG_BG2X_H, 0x2a + .set OFFSET_REG_BG2Y_L, 0x2c + .set OFFSET_REG_BG2Y_H, 0x2e + .set OFFSET_REG_BG3PA, 0x30 + .set OFFSET_REG_BG3PB, 0x32 + .set OFFSET_REG_BG3PC, 0x34 + .set OFFSET_REG_BG3PD, 0x36 + .set OFFSET_REG_BG3X_L, 0x38 + .set OFFSET_REG_BG3X_H, 0x3a + .set OFFSET_REG_BG3Y_L, 0x3c + .set OFFSET_REG_BG3Y_H, 0x3e + .set OFFSET_REG_WIN0H, 0x40 + .set OFFSET_REG_WIN1H, 0x42 + .set OFFSET_REG_WIN0V, 0x44 + .set OFFSET_REG_WIN1V, 0x46 + .set OFFSET_REG_WININ, 0x48 + .set OFFSET_REG_WINOUT, 0x4a + .set OFFSET_REG_MOSAIC, 0x4c + .set OFFSET_REG_BLDCNT, 0x50 + .set OFFSET_REG_BLDALPHA, 0x52 + .set OFFSET_REG_BLDY, 0x54 + + .set OFFSET_REG_SOUND1CNT, 0x60 + .set OFFSET_REG_SOUND1CNT_L, 0x60 + .set OFFSET_REG_NR10, 0x60 + .set OFFSET_REG_SOUND1CNT_H, 0x62 + .set OFFSET_REG_NR11, 0x62 + .set OFFSET_REG_NR12, 0x63 + .set OFFSET_REG_SOUND1CNT_X, 0x64 + .set OFFSET_REG_NR13, 0x64 + .set OFFSET_REG_NR14, 0x65 + .set OFFSET_REG_SOUND2CNT, 0x68 + .set OFFSET_REG_SOUND2CNT_L, 0x68 + .set OFFSET_REG_NR21, 0x68 + .set OFFSET_REG_NR22, 0x69 + .set OFFSET_REG_SOUND2CNT_H, 0x6c + .set OFFSET_REG_NR23, 0x6c + .set OFFSET_REG_NR24, 0x6d + .set OFFSET_REG_SOUND3CNT, 0x70 + .set OFFSET_REG_SOUND3CNT_L, 0x70 + .set OFFSET_REG_NR30, 0x70 + .set OFFSET_REG_SOUND3CNT_H, 0x72 + .set OFFSET_REG_NR31, 0x72 + .set OFFSET_REG_NR32, 0x73 + .set OFFSET_REG_SOUND3CNT_X, 0x74 + .set OFFSET_REG_NR33, 0x74 + .set OFFSET_REG_NR34, 0x75 + .set OFFSET_REG_SOUND4CNT, 0x78 + .set OFFSET_REG_SOUND4CNT_L, 0x78 + .set OFFSET_REG_NR41, 0x78 + .set OFFSET_REG_NR42, 0x79 + .set OFFSET_REG_SOUND4CNT_H, 0x7c + .set OFFSET_REG_NR43, 0x7c + .set OFFSET_REG_NR44, 0x7d + .set OFFSET_REG_SOUNDCNT, 0x80 + .set OFFSET_REG_SOUNDCNT_L, 0x80 + .set OFFSET_REG_NR50, 0x80 + .set OFFSET_REG_NR51, 0x81 + .set OFFSET_REG_SOUNDCNT_H, 0x82 + .set OFFSET_REG_SOUNDCNT_X, 0x84 + .set OFFSET_REG_NR52, 0x84 + .set OFFSET_REG_SOUNDBIAS, 0x88 + .set OFFSET_REG_WAVE_RAM, 0x90 + .set OFFSET_REG_WAVE_RAM0, 0x90 + .set OFFSET_REG_WAVE_RAM0_L, 0x90 + .set OFFSET_REG_WAVE_RAM0_H, 0x92 + .set OFFSET_REG_WAVE_RAM1, 0x94 + .set OFFSET_REG_WAVE_RAM1_L, 0x94 + .set OFFSET_REG_WAVE_RAM1_H, 0x96 + .set OFFSET_REG_WAVE_RAM2, 0x98 + .set OFFSET_REG_WAVE_RAM2_L, 0x98 + .set OFFSET_REG_WAVE_RAM2_H, 0x9a + .set OFFSET_REG_WAVE_RAM3, 0x9c + .set OFFSET_REG_WAVE_RAM3_L, 0x9c + .set OFFSET_REG_WAVE_RAM3_H, 0x9e + .set OFFSET_REG_FIFO, 0xa0 + .set OFFSET_REG_FIFO_A, 0xa0 + .set OFFSET_REG_FIFO_A_L, 0xa0 + .set OFFSET_REG_FIFO_A_H, 0xa2 + .set OFFSET_REG_FIFO_B, 0xa4 + .set OFFSET_REG_FIFO_B_L, 0xa4 + .set OFFSET_REG_FIFO_B_H, 0xa6 + + .set OFFSET_REG_DMA0, 0xb0 + .set OFFSET_REG_DMA0SAD, 0xb0 + .set OFFSET_REG_DMA0SAD_L, 0xb0 + .set OFFSET_REG_DMA0SAD_H, 0xb2 + .set OFFSET_REG_DMA0DAD, 0xb4 + .set OFFSET_REG_DMA0DAD_L, 0xb4 + .set OFFSET_REG_DMA0DAD_H, 0xb6 + .set OFFSET_REG_DMA0CNT, 0xb8 + .set OFFSET_REG_DMA0CNT_L, 0xb8 + .set OFFSET_REG_DMA0CNT_H, 0xba + .set OFFSET_REG_DMA1, 0xbc + .set OFFSET_REG_DMA1SAD, 0xbc + .set OFFSET_REG_DMA1SAD_L, 0xbc + .set OFFSET_REG_DMA1SAD_H, 0xbe + .set OFFSET_REG_DMA1DAD, 0xc0 + .set OFFSET_REG_DMA1DAD_L, 0xc0 + .set OFFSET_REG_DMA1DAD_H, 0xc2 + .set OFFSET_REG_DMA1CNT, 0xc4 + .set OFFSET_REG_DMA1CNT_L, 0xc4 + .set OFFSET_REG_DMA1CNT_H, 0xc6 + .set OFFSET_REG_DMA2, 0xc8 + .set OFFSET_REG_DMA2SAD, 0xc8 + .set OFFSET_REG_DMA2SAD_L, 0xc8 + .set OFFSET_REG_DMA2SAD_H, 0xca + .set OFFSET_REG_DMA2DAD, 0xcc + .set OFFSET_REG_DMA2DAD_L, 0xcc + .set OFFSET_REG_DMA2DAD_H, 0xce + .set OFFSET_REG_DMA2CNT, 0xd0 + .set OFFSET_REG_DMA2CNT_L, 0xd0 + .set OFFSET_REG_DMA2CNT_H, 0xd2 + .set OFFSET_REG_DMA3, 0xd4 + .set OFFSET_REG_DMA3SAD, 0xd4 + .set OFFSET_REG_DMA3SAD_L, 0xd4 + .set OFFSET_REG_DMA3SAD_H, 0xd6 + .set OFFSET_REG_DMA3DAD, 0xd8 + .set OFFSET_REG_DMA3DAD_L, 0xd8 + .set OFFSET_REG_DMA3DAD_H, 0xda + .set OFFSET_REG_DMA3CNT, 0xdc + .set OFFSET_REG_DMA3CNT_L, 0xdc + .set OFFSET_REG_DMA3CNT_H, 0xde + + .set OFFSET_REG_TM0CNT, 0x100 + .set OFFSET_REG_TM0CNT_L, 0x100 + .set OFFSET_REG_TM0CNT_H, 0x102 + .set OFFSET_REG_TM1CNT, 0x104 + .set OFFSET_REG_TM1CNT_L, 0x104 + .set OFFSET_REG_TM1CNT_H, 0x106 + .set OFFSET_REG_TM2CNT, 0x108 + .set OFFSET_REG_TM2CNT_L, 0x108 + .set OFFSET_REG_TM2CNT_H, 0x10a + .set OFFSET_REG_TM3CNT, 0x10c + .set OFFSET_REG_TM3CNT_L, 0x10c + .set OFFSET_REG_TM3CNT_H, 0x10e + + .set OFFSET_REG_SIOCNT, 0x128 + .set OFFSET_REG_SIODATA8, 0x12a + .set OFFSET_REG_SIODATA32, 0x120 + .set OFFSET_REG_SIOMLT_SEND, 0x12a + .set OFFSET_REG_SIOMLT_RECV, 0x120 + .set OFFSET_REG_SIOMULTI0, 0x120 + .set OFFSET_REG_SIOMULTI1, 0x122 + .set OFFSET_REG_SIOMULTI2, 0x124 + .set OFFSET_REG_SIOMULTI3, 0x126 + + .set OFFSET_REG_KEYINPUT, 0x130 + .set OFFSET_REG_KEYCNT, 0x132 + + .set OFFSET_REG_RCNT, 0x134 + + .set OFFSET_REG_JOYCNT, 0x140 + .set OFFSET_REG_JOYSTAT, 0x158 + .set OFFSET_REG_JOY_RECV, 0x150 + .set OFFSET_REG_JOY_RECV_L, 0x150 + .set OFFSET_REG_JOY_RECV_H, 0x152 + .set OFFSET_REG_JOY_TRANS, 0x154 + .set OFFSET_REG_JOY_TRANS_L, 0x154 + .set OFFSET_REG_JOY_TRANS_H, 0x156 + + .set OFFSET_REG_IME, 0x208 + .set OFFSET_REG_IE, 0x200 + .set OFFSET_REG_IF, 0x202 + + .set OFFSET_REG_WAITCNT, 0x204 + +@ I/O register addresses + .set REG_DISPCNT, REG_BASE + OFFSET_REG_DISPCNT + .set REG_DISPSTAT, REG_BASE + OFFSET_REG_DISPSTAT + .set REG_VCOUNT, REG_BASE + OFFSET_REG_VCOUNT + .set REG_BG0CNT, REG_BASE + OFFSET_REG_BG0CNT + .set REG_BG1CNT, REG_BASE + OFFSET_REG_BG1CNT + .set REG_BG2CNT, REG_BASE + OFFSET_REG_BG2CNT + .set REG_BG3CNT, REG_BASE + OFFSET_REG_BG3CNT + .set REG_BG0HOFS, REG_BASE + OFFSET_REG_BG0HOFS + .set REG_BG0VOFS, REG_BASE + OFFSET_REG_BG0VOFS + .set REG_BG1HOFS, REG_BASE + OFFSET_REG_BG1HOFS + .set REG_BG1VOFS, REG_BASE + OFFSET_REG_BG1VOFS + .set REG_BG2HOFS, REG_BASE + OFFSET_REG_BG2HOFS + .set REG_BG2VOFS, REG_BASE + OFFSET_REG_BG2VOFS + .set REG_BG3HOFS, REG_BASE + OFFSET_REG_BG3HOFS + .set REG_BG3VOFS, REG_BASE + OFFSET_REG_BG3VOFS + .set REG_BG2PA, REG_BASE + OFFSET_REG_BG2PA + .set REG_BG2PB, REG_BASE + OFFSET_REG_BG2PB + .set REG_BG2PC, REG_BASE + OFFSET_REG_BG2PC + .set REG_BG2PD, REG_BASE + OFFSET_REG_BG2PD + .set REG_BG2X_L, REG_BASE + OFFSET_REG_BG2X_L + .set REG_BG2X_H, REG_BASE + OFFSET_REG_BG2X_H + .set REG_BG2Y_L, REG_BASE + OFFSET_REG_BG2Y_L + .set REG_BG2Y_H, REG_BASE + OFFSET_REG_BG2Y_H + .set REG_BG3PA, REG_BASE + OFFSET_REG_BG3PA + .set REG_BG3PB, REG_BASE + OFFSET_REG_BG3PB + .set REG_BG3PC, REG_BASE + OFFSET_REG_BG3PC + .set REG_BG3PD, REG_BASE + OFFSET_REG_BG3PD + .set REG_BG3X_L, REG_BASE + OFFSET_REG_BG3X_L + .set REG_BG3X_H, REG_BASE + OFFSET_REG_BG3X_H + .set REG_BG3Y_L, REG_BASE + OFFSET_REG_BG3Y_L + .set REG_BG3Y_H, REG_BASE + OFFSET_REG_BG3Y_H + .set REG_WIN0H, REG_BASE + OFFSET_REG_WIN0H + .set REG_WIN1H, REG_BASE + OFFSET_REG_WIN1H + .set REG_WIN0V, REG_BASE + OFFSET_REG_WIN0V + .set REG_WIN1V, REG_BASE + OFFSET_REG_WIN1V + .set REG_WININ, REG_BASE + OFFSET_REG_WININ + .set REG_WINOUT, REG_BASE + OFFSET_REG_WINOUT + .set REG_MOSAIC, REG_BASE + OFFSET_REG_MOSAIC + .set REG_BLDCNT, REG_BASE + OFFSET_REG_BLDCNT + .set REG_BLDALPHA, REG_BASE + OFFSET_REG_BLDALPHA + .set REG_BLDY, REG_BASE + OFFSET_REG_BLDY + + .set REG_SOUND1CNT, REG_BASE + OFFSET_REG_SOUND1CNT + .set REG_SOUND1CNT_L, REG_BASE + OFFSET_REG_SOUND1CNT_L + .set REG_NR10, REG_BASE + OFFSET_REG_NR10 + .set REG_SOUND1CNT_H, REG_BASE + OFFSET_REG_SOUND1CNT_H + .set REG_NR11, REG_BASE + OFFSET_REG_NR11 + .set REG_NR12, REG_BASE + OFFSET_REG_NR12 + .set REG_SOUND1CNT_X, REG_BASE + OFFSET_REG_SOUND1CNT_X + .set REG_NR13, REG_BASE + OFFSET_REG_NR13 + .set REG_NR14, REG_BASE + OFFSET_REG_NR14 + .set REG_SOUND2CNT, REG_BASE + OFFSET_REG_SOUND2CNT + .set REG_SOUND2CNT_L, REG_BASE + OFFSET_REG_SOUND2CNT_L + .set REG_NR21, REG_BASE + OFFSET_REG_NR21 + .set REG_NR22, REG_BASE + OFFSET_REG_NR22 + .set REG_SOUND2CNT_H, REG_BASE + OFFSET_REG_SOUND2CNT_H + .set REG_NR23, REG_BASE + OFFSET_REG_NR23 + .set REG_NR24, REG_BASE + OFFSET_REG_NR24 + .set REG_SOUND3CNT, REG_BASE + OFFSET_REG_SOUND3CNT + .set REG_SOUND3CNT_L, REG_BASE + OFFSET_REG_SOUND3CNT_L + .set REG_NR30, REG_BASE + OFFSET_REG_NR30 + .set REG_SOUND3CNT_H, REG_BASE + OFFSET_REG_SOUND3CNT_H + .set REG_NR31, REG_BASE + OFFSET_REG_NR31 + .set REG_NR32, REG_BASE + OFFSET_REG_NR32 + .set REG_SOUND3CNT_X, REG_BASE + OFFSET_REG_SOUND3CNT_X + .set REG_NR33, REG_BASE + OFFSET_REG_NR33 + .set REG_NR34, REG_BASE + OFFSET_REG_NR34 + .set REG_SOUND4CNT, REG_BASE + OFFSET_REG_SOUND4CNT + .set REG_SOUND4CNT_L, REG_BASE + OFFSET_REG_SOUND4CNT_L + .set REG_NR41, REG_BASE + OFFSET_REG_NR41 + .set REG_NR42, REG_BASE + OFFSET_REG_NR42 + .set REG_SOUND4CNT_H, REG_BASE + OFFSET_REG_SOUND4CNT_H + .set REG_NR43, REG_BASE + OFFSET_REG_NR43 + .set REG_NR44, REG_BASE + OFFSET_REG_NR44 + .set REG_SOUNDCNT, REG_BASE + OFFSET_REG_SOUNDCNT + .set REG_SOUNDCNT_L, REG_BASE + OFFSET_REG_SOUNDCNT_L + .set REG_NR50, REG_BASE + OFFSET_REG_NR50 + .set REG_NR51, REG_BASE + OFFSET_REG_NR51 + .set REG_SOUNDCNT_H, REG_BASE + OFFSET_REG_SOUNDCNT_H + .set REG_SOUNDCNT_X, REG_BASE + OFFSET_REG_SOUNDCNT_X + .set REG_NR52, REG_BASE + OFFSET_REG_NR52 + .set REG_SOUNDBIAS, REG_BASE + OFFSET_REG_SOUNDBIAS + .set REG_WAVE_RAM, REG_BASE + OFFSET_REG_WAVE_RAM + .set REG_WAVE_RAM0, REG_BASE + OFFSET_REG_WAVE_RAM0 + .set REG_WAVE_RAM0_L, REG_BASE + OFFSET_REG_WAVE_RAM0_L + .set REG_WAVE_RAM0_H, REG_BASE + OFFSET_REG_WAVE_RAM0_H + .set REG_WAVE_RAM1, REG_BASE + OFFSET_REG_WAVE_RAM1 + .set REG_WAVE_RAM1_L, REG_BASE + OFFSET_REG_WAVE_RAM1_L + .set REG_WAVE_RAM1_H, REG_BASE + OFFSET_REG_WAVE_RAM1_H + .set REG_WAVE_RAM2, REG_BASE + OFFSET_REG_WAVE_RAM2 + .set REG_WAVE_RAM2_L, REG_BASE + OFFSET_REG_WAVE_RAM2_L + .set REG_WAVE_RAM2_H, REG_BASE + OFFSET_REG_WAVE_RAM2_H + .set REG_WAVE_RAM3, REG_BASE + OFFSET_REG_WAVE_RAM3 + .set REG_WAVE_RAM3_L, REG_BASE + OFFSET_REG_WAVE_RAM3_L + .set REG_WAVE_RAM3_H, REG_BASE + OFFSET_REG_WAVE_RAM3_H + .set REG_FIFO, REG_BASE + OFFSET_REG_FIFO + .set REG_FIFO_A, REG_BASE + OFFSET_REG_FIFO_A + .set REG_FIFO_A_L, REG_BASE + OFFSET_REG_FIFO_A_L + .set REG_FIFO_A_H, REG_BASE + OFFSET_REG_FIFO_A_H + .set REG_FIFO_B, REG_BASE + OFFSET_REG_FIFO_B + .set REG_FIFO_B_L, REG_BASE + OFFSET_REG_FIFO_B_L + .set REG_FIFO_B_H, REG_BASE + OFFSET_REG_FIFO_B_H + + .set REG_DMA0, REG_BASE + OFFSET_REG_DMA0 + .set REG_DMA0SAD, REG_BASE + OFFSET_REG_DMA0SAD + .set REG_DMA0SAD_L, REG_BASE + OFFSET_REG_DMA0SAD_L + .set REG_DMA0SAD_H, REG_BASE + OFFSET_REG_DMA0SAD_H + .set REG_DMA0DAD, REG_BASE + OFFSET_REG_DMA0DAD + .set REG_DMA0DAD_L, REG_BASE + OFFSET_REG_DMA0DAD_L + .set REG_DMA0DAD_H, REG_BASE + OFFSET_REG_DMA0DAD_H + .set REG_DMA0CNT, REG_BASE + OFFSET_REG_DMA0CNT + .set REG_DMA0CNT_L, REG_BASE + OFFSET_REG_DMA0CNT_L + .set REG_DMA0CNT_H, REG_BASE + OFFSET_REG_DMA0CNT_H + .set REG_DMA1, REG_BASE + OFFSET_REG_DMA1 + .set REG_DMA1SAD, REG_BASE + OFFSET_REG_DMA1SAD + .set REG_DMA1SAD_L, REG_BASE + OFFSET_REG_DMA1SAD_L + .set REG_DMA1SAD_H, REG_BASE + OFFSET_REG_DMA1SAD_H + .set REG_DMA1DAD, REG_BASE + OFFSET_REG_DMA1DAD + .set REG_DMA1DAD_L, REG_BASE + OFFSET_REG_DMA1DAD_L + .set REG_DMA1DAD_H, REG_BASE + OFFSET_REG_DMA1DAD_H + .set REG_DMA1CNT, REG_BASE + OFFSET_REG_DMA1CNT + .set REG_DMA1CNT_L, REG_BASE + OFFSET_REG_DMA1CNT_L + .set REG_DMA1CNT_H, REG_BASE + OFFSET_REG_DMA1CNT_H + .set REG_DMA2, REG_BASE + OFFSET_REG_DMA2 + .set REG_DMA2SAD, REG_BASE + OFFSET_REG_DMA2SAD + .set REG_DMA2SAD_L, REG_BASE + OFFSET_REG_DMA2SAD_L + .set REG_DMA2SAD_H, REG_BASE + OFFSET_REG_DMA2SAD_H + .set REG_DMA2DAD, REG_BASE + OFFSET_REG_DMA2DAD + .set REG_DMA2DAD_L, REG_BASE + OFFSET_REG_DMA2DAD_L + .set REG_DMA2DAD_H, REG_BASE + OFFSET_REG_DMA2DAD_H + .set REG_DMA2CNT, REG_BASE + OFFSET_REG_DMA2CNT + .set REG_DMA2CNT_L, REG_BASE + OFFSET_REG_DMA2CNT_L + .set REG_DMA2CNT_H, REG_BASE + OFFSET_REG_DMA2CNT_H + .set REG_DMA3, REG_BASE + OFFSET_REG_DMA3 + .set REG_DMA3SAD, REG_BASE + OFFSET_REG_DMA3SAD + .set REG_DMA3SAD_L, REG_BASE + OFFSET_REG_DMA3SAD_L + .set REG_DMA3SAD_H, REG_BASE + OFFSET_REG_DMA3SAD_H + .set REG_DMA3DAD, REG_BASE + OFFSET_REG_DMA3DAD + .set REG_DMA3DAD_L, REG_BASE + OFFSET_REG_DMA3DAD_L + .set REG_DMA3DAD_H, REG_BASE + OFFSET_REG_DMA3DAD_H + .set REG_DMA3CNT, REG_BASE + OFFSET_REG_DMA3CNT + .set REG_DMA3CNT_L, REG_BASE + OFFSET_REG_DMA3CNT_L + .set REG_DMA3CNT_H, REG_BASE + OFFSET_REG_DMA3CNT_H + + .set REG_TM0CNT, REG_BASE + OFFSET_REG_TM0CNT + .set REG_TM0CNT_L, REG_BASE + OFFSET_REG_TM0CNT_L + .set REG_TM0CNT_H, REG_BASE + OFFSET_REG_TM0CNT_H + .set REG_TM1CNT, REG_BASE + OFFSET_REG_TM1CNT + .set REG_TM1CNT_L, REG_BASE + OFFSET_REG_TM1CNT_L + .set REG_TM1CNT_H, REG_BASE + OFFSET_REG_TM1CNT_H + .set REG_TM2CNT, REG_BASE + OFFSET_REG_TM2CNT + .set REG_TM2CNT_L, REG_BASE + OFFSET_REG_TM2CNT_L + .set REG_TM2CNT_H, REG_BASE + OFFSET_REG_TM2CNT_H + .set REG_TM3CNT, REG_BASE + OFFSET_REG_TM3CNT + .set REG_TM3CNT_L, REG_BASE + OFFSET_REG_TM3CNT_L + .set REG_TM3CNT_H, REG_BASE + OFFSET_REG_TM3CNT_H + + .set REG_SIOCNT, REG_BASE + OFFSET_REG_SIOCNT + .set REG_SIODATA8, REG_BASE + OFFSET_REG_SIODATA8 + .set REG_SIODATA32, REG_BASE + OFFSET_REG_SIODATA32 + .set REG_SIOMLT_SEND, REG_BASE + OFFSET_REG_SIOMLT_SEND + .set REG_SIOMLT_RECV, REG_BASE + OFFSET_REG_SIOMLT_RECV + .set REG_SIOMULTI0, REG_BASE + OFFSET_REG_SIOMULTI0 + .set REG_SIOMULTI1, REG_BASE + OFFSET_REG_SIOMULTI1 + .set REG_SIOMULTI2, REG_BASE + OFFSET_REG_SIOMULTI2 + .set REG_SIOMULTI3, REG_BASE + OFFSET_REG_SIOMULTI3 + + .set REG_KEYINPUT, REG_BASE + OFFSET_REG_KEYINPUT + .set REG_KEYCNT, REG_BASE + OFFSET_REG_KEYCNT + + .set REG_RCNT, REG_BASE + OFFSET_REG_RCNT + + .set REG_JOYCNT, REG_BASE + OFFSET_REG_JOYCNT + .set REG_JOYSTAT, REG_BASE + OFFSET_REG_JOYSTAT + .set REG_JOY_RECV, REG_BASE + OFFSET_REG_JOY_RECV + .set REG_JOY_RECV_L, REG_BASE + OFFSET_REG_JOY_RECV_L + .set REG_JOY_RECV_H, REG_BASE + OFFSET_REG_JOY_RECV_H + .set REG_JOY_TRANS, REG_BASE + OFFSET_REG_JOY_TRANS + .set REG_JOY_TRANS_L, REG_BASE + OFFSET_REG_JOY_TRANS_L + .set REG_JOY_TRANS_H, REG_BASE + OFFSET_REG_JOY_TRANS_H + + .set REG_IME, REG_BASE + OFFSET_REG_IME + .set REG_IE, REG_BASE + OFFSET_REG_IE + .set REG_IF, REG_BASE + OFFSET_REG_IF + + .set REG_WAITCNT, REG_BASE + OFFSET_REG_WAITCNT + +@ DMA register constants + + .set DMA_DEST_INC, 0x0000 + .set DMA_DEST_DEC, 0x0020 + .set DMA_DEST_FIXED, 0x0040 + .set DMA_DEST_RELOAD, 0x0060 + .set DMA_SRC_INC, 0x0000 + .set DMA_SRC_DEC, 0x0080 + .set DMA_SRC_FIXED, 0x0100 + .set DMA_REPEAT, 0x0200 + .set DMA_16BIT, 0x0000 + .set DMA_32BIT, 0x0400 + .set DMA_DREQ_ON, 0x0800 + .set DMA_START_NOW, 0x0000 + .set DMA_START_VBLANK, 0x1000 + .set DMA_START_HBLANK, 0x2000 + .set DMA_START_SPECIAL, 0x3000 + .set DMA_INTR_ENABLE, 0x4000 + .set DMA_ENABLE, 0x8000 + +@ OAM attribute constants + + .set OAM_OBJ_NORMAL, 0x00000000 + .set OAM_OBJ_BLEND, 0x00000400 + .set OAM_OBJ_WINDOW, 0x00000800 + + .set OAM_AFFINE_NONE, 0x00000000 + .set OAM_AFFINE_NORMAL_SIZE, 0x00000100 + .set OAM_OBJ_DISABLED, 0x00000200 + .set OAM_AFFINE_DOUBLE_SIZE, 0x00000300 + + .set OAM_MOSAIC_OFF, 0x00000000 + .set OAM_MOSAIC_ON, 0x00001000 + + .set OAM_4BPP, 0x00000000 + .set OAM_8BPP, 0x00002000 + + .set OAM_H_FLIP, 0x10000000 + .set OAM_V_FLIP, 0x20000000 + + .set OAM_SQUARE, 0x00000000 + .set OAM_H_RECTANGLE, 0x00004000 + .set OAM_V_RECTANGLE, 0x00008000 + .set OAM_SIZE_0, 0x00000000 + .set OAM_SIZE_1, 0x40000000 + .set OAM_SIZE_2, 0x80000000 + .set OAM_SIZE_3, 0xc0000000 + + .set OAM_SIZE_8x8, OAM_SIZE_0 | OAM_SQUARE + .set OAM_SIZE_16x16, OAM_SIZE_1 | OAM_SQUARE + .set OAM_SIZE_32x32, OAM_SIZE_2 | OAM_SQUARE + .set OAM_SIZE_64x64, OAM_SIZE_3 | OAM_SQUARE + + .set OAM_SIZE_16x8, OAM_SIZE_0 | OAM_H_RECTANGLE + .set OAM_SIZE_32x8, OAM_SIZE_1 | OAM_H_RECTANGLE + .set OAM_SIZE_32x16, OAM_SIZE_2 | OAM_H_RECTANGLE + .set OAM_SIZE_64x32, OAM_SIZE_3 | OAM_H_RECTANGLE + + .set OAM_SIZE_8x16, OAM_SIZE_0 | OAM_V_RECTANGLE + .set OAM_SIZE_8x32, OAM_SIZE_1 | OAM_V_RECTANGLE + .set OAM_SIZE_16x32, OAM_SIZE_2 | OAM_V_RECTANGLE + .set OAM_SIZE_32x64, OAM_SIZE_3 | OAM_V_RECTANGLE diff --git a/berry_fix/payload/graphics/debug_digits.png b/berry_fix/payload/graphics/debug_digits.png new file mode 100644 index 000000000..edf0d36c9 Binary files /dev/null and b/berry_fix/payload/graphics/debug_digits.png differ diff --git a/berry_fix/payload/graphics/msg_box.png b/berry_fix/payload/graphics/msg_box.png new file mode 100644 index 000000000..00d1bbe37 Binary files /dev/null and b/berry_fix/payload/graphics/msg_box.png differ diff --git a/berry_fix/payload/graphics/msg_box.tilemap b/berry_fix/payload/graphics/msg_box.tilemap new file mode 100644 index 000000000..5b82401ba Binary files /dev/null and b/berry_fix/payload/graphics/msg_box.tilemap differ diff --git a/berry_fix/payload/include/constants/game_stat.h b/berry_fix/payload/include/constants/game_stat.h new file mode 100644 index 000000000..47d703d85 --- /dev/null +++ b/berry_fix/payload/include/constants/game_stat.h @@ -0,0 +1,56 @@ +#ifndef GUARD_CONSTANTS_GAME_STAT_H +#define GUARD_CONSTANTS_GAME_STAT_H + +#define GAME_STAT_SAVED_GAME 0 +#define GAME_STAT_FIRST_HOF_PLAY_TIME 1 +#define GAME_STAT_STARTED_TRENDS 2 +#define GAME_STAT_PLANTED_BERRIES 3 +#define GAME_STAT_TRADED_BIKES 4 +#define GAME_STAT_STEPS 5 +#define GAME_STAT_GOT_INTERVIEWED 6 +#define GAME_STAT_TOTAL_BATTLES 7 +#define GAME_STAT_WILD_BATTLES 8 +#define GAME_STAT_TRAINER_BATTLES 9 +#define GAME_STAT_ENTERED_HOF 10 +#define GAME_STAT_POKEMON_CAPTURES 11 +#define GAME_STAT_FISHING_CAPTURES 12 +#define GAME_STAT_HATCHED_EGGS 13 +#define GAME_STAT_EVOLVED_POKEMON 14 +#define GAME_STAT_USED_POKECENTER 15 +#define GAME_STAT_RESTED_AT_HOME 16 +#define GAME_STAT_ENTERED_SAFARI_ZONE 17 +#define GAME_STAT_USED_CUT 18 +#define GAME_STAT_USED_ROCK_SMASH 19 +#define GAME_STAT_MOVED_SECRET_BASE 20 +#define GAME_STAT_POKEMON_TRADES 21 +#define GAME_STAT_UNKNOWN_22 22 +#define GAME_STAT_LINK_BATTLE_WINS 23 +#define GAME_STAT_LINK_BATTLE_LOSSES 24 +#define GAME_STAT_LINK_BATTLE_DRAWS 25 +#define GAME_STAT_USED_SPLASH 26 +#define GAME_STAT_USED_STRUGGLE 27 +#define GAME_STAT_SLOT_JACKPOTS 28 +#define GAME_STAT_CONSECUTIVE_ROULETTE_WINS 29 +#define GAME_STAT_ENTERED_BATTLE_TOWER 30 +#define GAME_STAT_UNKNOWN_31 31 +#define GAME_STAT_BATTLE_TOWER_BEST_STREAK 32 +#define GAME_STAT_POKEBLOCKS 33 +#define GAME_STAT_POKEBLOCKS_WITH_FRIENDS 34 +#define GAME_STAT_WON_LINK_CONTEST 35 +#define GAME_STAT_ENTERED_CONTEST 36 +#define GAME_STAT_WON_CONTEST 37 +#define GAME_STAT_SHOPPED 38 +#define GAME_STAT_USED_ITEMFINDER 39 +#define GAME_STAT_GOT_RAINED_ON 40 +#define GAME_STAT_CHECKED_POKEDEX 41 +#define GAME_STAT_RECEIVED_RIBBONS 42 +#define GAME_STAT_JUMPED_DOWN_LEDGES 43 +#define GAME_STAT_WATCHED_TV 44 +#define GAME_STAT_CHECKED_CLOCK 45 +#define GAME_STAT_WON_POKEMON_LOTTERY 46 +#define GAME_STAT_USED_DAYCARE 47 +#define GAME_STAT_RODE_CABLE_CAR 48 +#define GAME_STAT_ENTERED_HOT_SPRINGS 49 +#define NUM_GAME_STATS 50 + +#endif // GUARD_CONSTANTS_GAME_STAT_H diff --git a/berry_fix/payload/include/constants/vars.h b/berry_fix/payload/include/constants/vars.h new file mode 100644 index 000000000..856aba069 --- /dev/null +++ b/berry_fix/payload/include/constants/vars.h @@ -0,0 +1,196 @@ +#ifndef GUARD_CONSTANTS_VARS_H +#define GUARD_CONSTANTS_VARS_H + +#define VAR_0x3F20 0x3F20 + +#define VARS_START 0x4000 + +// temporary vars +// The first 0x10 vars are are temporary--they are cleared every time a map is loaded. +#define VAR_TEMP_0 0x4000 +#define VAR_TEMP_1 0x4001 +#define VAR_TEMP_2 0x4002 +#define VAR_TEMP_3 0x4003 +#define VAR_TEMP_4 0x4004 +#define VAR_TEMP_5 0x4005 +#define VAR_TEMP_6 0x4006 +#define VAR_TEMP_7 0x4007 +#define VAR_TEMP_8 0x4008 +#define VAR_TEMP_9 0x4009 +#define VAR_TEMP_A 0x400A +#define VAR_TEMP_B 0x400B +#define VAR_TEMP_C 0x400C +#define VAR_TEMP_D 0x400D +#define VAR_TEMP_E 0x400E +#define VAR_TEMP_F 0x400F + +// object gfx id vars +// These 0x10 vars are used to dynamically control a event object's sprite. +// For example, the rival's sprite id is dynamically set based on the player's gender. +// See VarGetEventObjectGraphicsId(). +#define VAR_OBJ_GFX_ID_0 0x4010 +#define VAR_OBJ_GFX_ID_1 0x4011 +#define VAR_OBJ_GFX_ID_2 0x4012 +#define VAR_OBJ_GFX_ID_3 0x4013 +#define VAR_OBJ_GFX_ID_4 0x4014 +#define VAR_OBJ_GFX_ID_5 0x4015 +#define VAR_OBJ_GFX_ID_6 0x4016 +#define VAR_OBJ_GFX_ID_7 0x4017 +#define VAR_OBJ_GFX_ID_8 0x4018 +#define VAR_OBJ_GFX_ID_9 0x4019 +#define VAR_OBJ_GFX_ID_A 0x401A +#define VAR_OBJ_GFX_ID_B 0x401B +#define VAR_OBJ_GFX_ID_C 0x401C +#define VAR_OBJ_GFX_ID_D 0x401D +#define VAR_OBJ_GFX_ID_E 0x401E +#define VAR_OBJ_GFX_ID_F 0x401F + +// general purpose vars +#define VAR_RECYCLE_GOODS 0x4020 +#define VAR_REPEL_STEP_COUNT 0x4021 +#define VAR_ICE_STEP_COUNT 0x4022 +#define VAR_STARTER_MON 0x4023 // 0=Treecko, 1=Torchic, 2=Mudkip +#define VAR_MIRAGE_RND_H 0x4024 +#define VAR_MIRAGE_RND_L 0x4025 +#define VAR_SECRET_BASE_MAP 0x4026 +#define VAR_CYCLING_ROAD_RECORD_COLLISIONS 0x4027 +#define VAR_CYCLING_ROAD_RECORD_TIME_L 0x4028 +#define VAR_CYCLING_ROAD_RECORD_TIME_H 0x4029 +#define VAR_HAPPINESS_STEP_COUNTER 0x402A +#define VAR_POISON_STEP_COUNTER 0x402B +#define VAR_RESET_RTC_ENABLE 0x402C +#define VAR_ENIGMA_BERRY_AVAILABLE 0x402D + +#define VAR_DAYS 0x4040 +#define VAR_FANCLUB_UNKNOWN_1 0x4041 // TODO: document these two fanclub vars +#define VAR_FANCLUB_UNKNOWN_2 0x4042 +#define VAR_DEPT_STORE_FLOOR 0x4043 +#define VAR_TRICK_HOUSE_ROOMS_COMPLETED 0x4044 +#define VAR_LOTTERY_PRIZE 0x4045 +#define VAR_NATIONAL_DEX 0x4046 +#define VAR_SHROOMISH_SIZE_RECORD 0x4047 +#define VAR_ASH_GATHER_COUNT 0x4048 +#define VAR_BIRCH_STATE 0x4049 +#define VAR_CRUISE_STEP_COUNT 0x404A +#define VAR_LOTTERY_RND_L 0x404B +#define VAR_LOTTERY_RND_H 0x404C + +#define VAR_BARBOACH_SIZE_RECORD 0x404F +#define VAR_LITTLEROOT_STATE 0x4050 +#define VAR_ROUTE102_ACCESSIBLE 0x4051 + +#define VAR_LAVARIDGE_RIVAL_STATE 0x4053 +#define VAR_CURRENT_SECRET_BASE 0x4054 + +#define VAR_PETALBURG_STATE 0x4057 +#define VAR_SLATEPORT_STATE 0x4058 + +#define VAR_RUSTBORO_STATE 0x405A + +#define VAR_SOOTOPOLIS_STATE 0x405E + +#define VAR_ROUTE101_STATE 0x4060 + +#define VAR_ROUTE103_STATE 0x4062 + +#define VAR_ROUTE110_STATE 0x4069 + +#define VAR_ROUTE116_STATE 0x406F + +#define VAR_ROUTE118_STATE 0x4071 +#define VAR_ROUTE119_STATE 0x4072 + +#define VAR_ROUTE121_STATE 0x4074 +#define VAR_ROUTE128_STATE 0x407B + +#define VAR_LITTLEROOT_HOUSES_STATE 0x4082 // TODO: needs more investigation + +#define VAR_BIRCH_LAB_STATE 0x4084 +#define VAR_PETALBURG_GYM_STATE 0x4085 +#define VAR_LINK_CONTEST_ROOM_STATE 0x4086 +#define VAR_CABLE_CLUB_STATE 0x4087 +#define VAR_CONTEST_LOCATION 0x4088 +#define VAR_0x4089 0x4089 // TODO: related to decorations +#define VAR_CONTEST_PRIZE_PICKUP 0x408A + +#define VAR_LITTLEROOT_HOUSES_STATE_2 0x408C // TODO: needs more investigation +#define VAR_LITTLEROOT_RIVAL_STATE 0x408D +#define VAR_BOARD_BRINEY_BOAT_ROUTE104_STATE 0x408E +#define VAR_DEVON_CORP_3F_STATE 0x408F +#define VAR_BRINEY_HOUSE_STATE 0x4090 + +#define VAR_LITTLEROOT_INTRO_STATE 0x4092 +#define VAR_MAUVILLE_GYM_STATE 0x4093 +#define VAR_LILYCOVE_MUSEUM_2F_STATE 0x4094 +#define VAR_LILYCOVE_FAN_CLUB_STATE 0x4095 +#define VAR_BRINEY_LOCATION 0x4096 +#define VAR_0x4097 0x4097 // TODO: related to creating new secret base +#define VAR_PETALBURG_WOODS_STATE 0x4098 +#define VAR_LILYCOVE_CONTEST_LOBBY_STATE 0x4099 +#define VAR_RUSTURF_TUNNEL_STATE 0x409a +#define VAR_CAVE_OF_ORIGIN_B4F_STATE 0x409B +#define VAR_ELITE_4_STATE 0x409C + +#define VAR_SLATEPORT_HARBOR_STATE 0x40A0 + +#define VAR_SEAFLOOR_CAVERN_STATE 0x40A2 +#define VAR_CABLE_CAR_STATION_STATE 0x40A3 +#define VAR_SAFARI_ZONE_STATE 0x40A4 +#define VAR_TRICK_HOUSE_ENTRANCE_STATE 0x40A5 +#define VAR_TRICK_HOUSE_ENTRANCE_STATE_2 0x40A6 +#define VAR_TRICK_HOUSE_ENTRANCE_STATE_3 0x40A7 + +#define VAR_CYCLING_CHALLENGE_STATE 0x40A9 +#define VAR_SLATEPORT_MUSEUM_1F_STATE 0x40AA +#define VAR_TRICK_HOUSE_PUZZLE_1_STATE 0x40AB +#define VAR_TRICK_HOUSE_PUZZLE_2_STATE 0x40AC +#define VAR_TRICK_HOUSE_PUZZLE_3_STATE 0x40AD +#define VAR_TRICK_HOUSE_PUZZLE_4_STATE 0x40AE +#define VAR_TRICK_HOUSE_PUZZLE_5_STATE 0x40AF +#define VAR_TRICK_HOUSE_PUZZLE_6_STATE 0x40B0 +#define VAR_TRICK_HOUSE_PUZZLE_7_STATE 0x40B1 +#define VAR_TRICK_HOUSE_PUZZLE_8_STATE 0x40B2 +#define VAR_WEATHER_INSTITUTE_STATE 0x40B3 +#define VAR_PORTHOLE_STATE 0x40B4 +#define VAR_TRICK_HOUSE_STATE 0x40B5 // TODO: needs some further investigation +#define VAR_TRICK_HOUSE_PUZZLE_7_STATE_2 0x40B6 +#define VAR_SLATEPORT_FAN_CLUB_STATE 0x40B7 + +#define VAR_MT_PYRE_STATE 0x40B9 +#define VAR_NEW_MAUVILLE_STATE 0x40BA + +#define VAR_BRAVO_TRAINER_BATTLE_TOWER_ON 0x40BC +#define VAR_JAGGED_PASS_ASH_WEATHER 0x40BD +#define VAR_GLASS_WORKSHOP_STATE 0x40BE +#define VAR_METEOR_FALLS_STATE 0x40BF +#define VAR_GAME_CORNER_STATE 0x40C0 +#define VAR_TRICK_HOUSE_PRIZE_PICKUP 0x40C1 +#define VAR_PACIFIDLOG_TM_RECEIVED_DAY 0x40C2 +#define VAR_VICTORY_ROAD_1F_STATE 0x40C3 +#define VAR_FOSSIL_RESURRECTION_STATE 0x40C4 +#define VAR_WHICH_FOSSIL_REVIVED 0x40C5 +#define VAR_STEVENS_HOUSE_STATE 0x40C6 +#define VAR_OLDALE_STATE 0x40C7 + +// special vars +// They are commonly used as parameters to commands, or return values from commands. +#define VAR_SPECIAL_0 0x8000 +#define VAR_SPECIAL_1 0x8001 +#define VAR_SPECIAL_2 0x8002 +#define VAR_SPECIAL_3 0x8003 +#define VAR_SPECIAL_4 0x8004 +#define VAR_SPECIAL_5 0x8005 +#define VAR_SPECIAL_6 0x8006 +#define VAR_SPECIAL_7 0x8007 +#define VAR_SPECIAL_8 0x8008 +#define VAR_SPECIAL_9 0x8009 +#define VAR_SPECIAL_A 0x800A +#define VAR_SPECIAL_B 0x800B +#define FACING 0x800C +#define RESULT 0x800D +#define ITEM_ID 0x800E +#define LAST_TALKED 0x800F +#define CONTEST_RANK 0x8010 +#define CONTEST_CATEGORY 0x8011 + +#endif // GUARD_CONSTANTS_VARS_H diff --git a/berry_fix/payload/include/flash.h b/berry_fix/payload/include/flash.h new file mode 100644 index 000000000..26de88216 --- /dev/null +++ b/berry_fix/payload/include/flash.h @@ -0,0 +1,55 @@ +#ifndef GUARD_FLASH_H +#define GUARD_FLASH_H + +#include + +enum +{ + SECTOR_DAMAGED, + SECTOR_OK, + SECTOR_CHECK, // unused +}; + +enum MsgBoxUpdateMessage +{ + MSGBOX_WILL_NOW_UPDATE = 0, + MSGBOX_HAS_BEEN_UPDATED, + MSGBOX_UNABLE_TO_UPDATE, + MSGBOX_NO_NEED_TO_UPDATE, + MSGBOX_UPDATING +}; + +struct SaveSector +{ + u8 data[0xFF4]; + u16 id; + u16 checksum; + u32 signature; + u32 counter; +}; // size is 0x1000 + +// headless save section? +struct UnkSaveSection +{ + u8 data[0xFF4]; + u32 signature; +}; // size is 0xFF8 + +#define eSaveSection ((struct SaveSector *)0x2020000) + +#define NUM_SECTORS_PER_SAVE_SLOT 14 // Number of sectors occupied by a save slot +#define FILE_SIGNATURE 0x08012025 + +#define SAVE_STATUS_EMPTY 0 +#define SAVE_STATUS_OK 1 +#define SAVE_STATUS_NO_FLASH 4 +#define SAVE_STATUS_ERROR 0xFF + +bool32 flash_maincb_ident_is_valid(void); +bool8 flash_maincb_read_save(u32); +void msg_load_gfx(void); +void msg_display(enum MsgBoxUpdateMessage); +bool32 flash_maincb_check_need_reset_pacifidlog_tm(void); +bool32 flash_maincb_reset_pacifidlog_tm(void); + +#endif //GUARD_FLASH_H diff --git a/berry_fix/payload/include/global.berry.h b/berry_fix/payload/include/global.berry.h new file mode 100644 index 000000000..8f185c8f9 --- /dev/null +++ b/berry_fix/payload/include/global.berry.h @@ -0,0 +1,62 @@ +#ifndef GUARD_GLOBAL_BERRY_H +#define GUARD_GLOBAL_BERRY_H + +struct Berry +{ + /*0x00*/ u8 name[7]; + /*0x07*/ u8 firmness; + /*0x08*/ u16 size; + /*0x0A*/ u8 maxYield; + /*0x0B*/ u8 minYield; + /*0x0C*/ const u8 *description1; + /*0x10*/ const u8 *description2; + /*0x14*/ u8 stageDuration; + /*0x15*/ u8 spicy; + /*0x16*/ u8 dry; + /*0x17*/ u8 sweet; + /*0x18*/ u8 bitter; + /*0x19*/ u8 sour; + /*0x1A*/ u8 smoothness; +}; + +struct EnigmaBerry +{ + /*0x000*/ struct Berry berry; + /*0x01B*/ u8 pic[(6 * 6) * TILE_SIZE_4BPP]; + /*0x49C*/ u16 palette[16]; + /*0x4BC*/ u8 description1[45]; + /*0x4E9*/ u8 description2[45]; + /*0x516*/ u8 itemEffect[18]; + /*0x528*/ u8 holdEffect; + /*0x529*/ u8 holdEffectParam; + /*0x52C*/ u32 checksum; +}; + +struct BattleEnigmaBerry +{ + /*0x00*/ u8 name[7]; + /*0x07*/ u8 holdEffect; + /*0x08*/ u8 itemEffect[18]; + /*0x1A*/ u8 holdEffectParam; +}; + +struct BerryTree +{ + /*0x00*/ u8 berry; + /*0x01*/ u8 stage:7; + /* + A berry sparkle is a state that a berry tree + can be in after growing within the player's + viewport. + */ + /*0x01*/ bool8 growthSparkle:1; + /*0x02*/ u16 minutesUntilNextStage; + /*0x04*/ u8 berryYield; + /*0x05*/ u8 regrowthCount:4; + /*0x05*/ u8 watered1:1; + /*0x05*/ u8 watered2:1; + /*0x05*/ u8 watered3:1; + /*0x05*/ u8 watered4:1; +}; + +#endif // GUARD_GLOBAL_BERRY_H diff --git a/berry_fix/payload/include/global.fieldmap.h b/berry_fix/payload/include/global.fieldmap.h new file mode 100644 index 000000000..81f805ee2 --- /dev/null +++ b/berry_fix/payload/include/global.fieldmap.h @@ -0,0 +1,317 @@ +#ifndef GUARD_GLOBAL_FIELDMAP_H +#define GUARD_GLOBAL_FIELDMAP_H + +enum +{ + CONNECTION_SOUTH = 1, + CONNECTION_NORTH, + CONNECTION_WEST, + CONNECTION_EAST, + CONNECTION_DIVE, + CONNECTION_EMERGE +}; + +typedef void (*TilesetCB)(void); + +struct Tileset +{ + /*0x00*/ bool8 isCompressed; + /*0x01*/ bool8 isSecondary; + /*0x04*/ void *tiles; + /*0x08*/ void *palettes; + /*0x0c*/ void *metatiles; + /*0x10*/ void *metatileAttributes; + /*0x14*/ TilesetCB callback; +}; + +struct MapLayout +{ + /*0x00*/ s32 width; + /*0x04*/ s32 height; + /*0x08*/ u16 *border; + /*0x0c*/ u16 *map; + /*0x10*/ struct Tileset *primaryTileset; + /*0x14*/ struct Tileset *secondaryTileset; +}; + +struct BackupMapLayout +{ + s32 width; + s32 height; + u16 *map; +}; + +struct EventObjectTemplate +{ + /*0x00*/ u8 localId; + /*0x01*/ u8 graphicsId; + /*0x02*/ u8 unk2; + /*0x04*/ s16 x; + /*0x06*/ s16 y; + /*0x08*/ u8 elevation; + /*0x09*/ u8 movementType; + /*0x0A*/ u8 movementRangeX:4; + u8 movementRangeY:4; + /*0x0C*/ u16 trainerType; + /*0x0E*/ u16 trainerRange_berryTreeId; + /*0x10*/ u8 *script; + /*0x14*/ u16 flagId; +}; + +struct WarpEvent +{ + s16 x, y; + u8 elevation; + u8 warpId; + u8 mapNum; + u8 mapGroup; +}; + +struct CoordEvent +{ + s16 x, y; + u8 elevation; + u16 trigger; + u16 index; + u8 filler_A[0x2]; + u8 *script; +}; + +struct BgEvent +{ + /*0x00*/u16 x; + /*0x02*/u16 y; + /*0x04*/u8 elevation; + /*0x05*/u8 kind; + /*0x08*/union { // carried over from diego's FR/LG work, seems to be the same struct + // in gen 3, "kind" (0x3 in BgEvent struct) determines the method to read the union. + u8 *script; + + // hidden item type + struct { + u16 item; + u16 hiddenItemId; // flag offset to determine flag lookup + } hiddenItem; + + // secret base type + u32 secretBaseId; + + } bgUnion; +}; + +struct MapEvents +{ + u8 eventObjectCount; + u8 warpCount; + u8 coordEventCount; + u8 bgEventCount; + + struct EventObjectTemplate *eventObjects; + struct WarpEvent *warps; + struct CoordEvent *coordEvents; + struct BgEvent *bgEvents; +}; + +struct MapConnection +{ + /*0x00*/ u8 direction; + /*0x01*/ u32 offset; + /*0x05*/ u8 mapGroup; + /*0x06*/ u8 mapNum; +}; + +struct MapConnections +{ + s32 count; + struct MapConnection *connections; +}; + +struct MapHeader +{ + /* 0x00 */ struct MapLayout *mapLayout; + /* 0x04 */ struct MapEvents *events; + /* 0x08 */ u8 *mapScripts; + /* 0x0C */ struct MapConnections *connections; + /* 0x10 */ u16 music; + /* 0x12 */ u16 mapLayoutId; + /* 0x14 */ u8 regionMapSectionId; + /* 0x15 */ u8 cave; + /* 0x16 */ u8 weather; + /* 0x17 */ u8 mapType; + /* 0x18 */ u8 filler_18; + /* 0x19 */ u8 escapeRope; + /* 0x1A */ u8 flags; + /* 0x1B */ u8 battleType; +}; + +struct EventObject +{ + /*0x00*/ u32 active:1; + u32 singleMovementActive:1; + u32 triggerGroundEffectsOnMove:1; + u32 triggerGroundEffectsOnStop:1; + u32 disableCoveringGroundEffects:1; // disables ground effects that cover parts of the object's sprite + u32 landingJump:1; + u32 heldMovementActive:1; + u32 heldMovementFinished:1; + /*0x01*/ u32 frozen:1; + u32 facingDirectionLocked:1; + u32 disableAnim:1; // used to disable forced movement sliding animations (like on ice) + u32 enableAnim:1; + u32 inanimate:1; + u32 invisible:1; + u32 offScreen:1; + u32 trackedByCamera:1; // only set for the player object + /*0x02*/ u32 isPlayer:1; + u32 hasReflection:1; + u32 inShortGrass:1; + u32 inShallowFlowingWater:1; + u32 inSandPile:1; + u32 inHotSprings:1; + u32 hasShadow:1; + u32 spriteAnimPausedBackup:1; + /*0x03*/ u32 spriteAffineAnimPausedBackup:1; + u32 disableJumpLandingGroundEffect:1; + u32 fixedPriority:1; + /*0x04*/ u8 spriteId; + /*0x05*/ u8 graphicsId; + /*0x06*/ u8 movementType; + /*0x07*/ u8 trainerType; + /*0x08*/ u8 localId; + /*0x09*/ u8 mapNum; + /*0x0A*/ u8 mapGroup; + /*0x0B*/ u8 currentElevation:4; + u8 previousElevation:4; + /*0x0C*/ struct Coords16 initialCoords; + /*0x10*/ struct Coords16 currentCoords; + /*0x14*/ struct Coords16 previousCoords; + /*0x18*/ u8 facingDirection:4; + /*0x18*/ u8 movementDirection:4; + /*0x19*/ union __attribute__((packed)) { + u8 as_byte; + struct __attribute__((packed)) { + u16 x:4; + u16 y:4; + } as_nybbles; + } range; + /*0x1A*/ u8 fieldEffectSpriteId; + /*0x1B*/ u8 warpArrowSpriteId; + /*0x1C*/ u8 movementActionId; + /*0x1D*/ u8 trainerRange_berryTreeId; + /*0x1E*/ u8 currentMetatileBehavior; + /*0x1F*/ u8 previousMetatileBehavior; + /*0x20*/ u8 previousMovementDirection; + /*0x21*/ u8 directionSequenceIndex; + /*0x22*/ u8 playerCopyableMovement; // used as an index to gCopyPlayerMovementFuncs for the "copy player" movement types + /*size = 0x24*/ +}; + +struct EventObjectGraphicsInfo +{ + /*0x00*/ u16 tileTag; + /*0x02*/ u16 paletteTag; + /*0x04*/ u16 bridgeReflectionPaletteTag; + /*0x06*/ u16 size; + /*0x08*/ s16 width; + /*0x0A*/ s16 height; + /*0x0C*/ u8 paletteSlot:4; + u8 shadowSize:2; + u8 inanimate:1; + u8 disableReflectionPaletteLoad:1; + /*0x0D*/ u8 tracks; + /*0x10*/ const struct OamData *oam; + /*0x14*/ const struct SubspriteTable *subspriteTables; + /*0x18*/ const union AnimCmd *const *anims; + /*0x1C*/ const struct SpriteFrameImage *images; + /*0x20*/ const union AffineAnimCmd *const *affineAnims; +}; + +#define PLAYER_AVATAR_FLAG_ON_FOOT (1 << 0) +#define PLAYER_AVATAR_FLAG_MACH_BIKE (1 << 1) +#define PLAYER_AVATAR_FLAG_ACRO_BIKE (1 << 2) +#define PLAYER_AVATAR_FLAG_SURFING (1 << 3) +#define PLAYER_AVATAR_FLAG_UNDERWATER (1 << 4) +#define PLAYER_AVATAR_FLAG_5 (1 << 5) +#define PLAYER_AVATAR_FLAG_6 (1 << 6) +#define PLAYER_AVATAR_FLAG_DASH (1 << 7) + +enum +{ + ACRO_BIKE_NORMAL, + ACRO_BIKE_TURNING, + ACRO_BIKE_WHEELIE_STANDING, + ACRO_BIKE_BUNNY_HOP, + ACRO_BIKE_WHEELIE_MOVING, + ACRO_BIKE_STATE5, + ACRO_BIKE_STATE6, +}; + +enum +{ + DIR_NONE, + DIR_SOUTH, + DIR_NORTH, + DIR_WEST, + DIR_EAST, + DIR_SOUTHWEST, + DIR_SOUTHEAST, + DIR_NORTHWEST, + DIR_NORTHEAST, +}; + +enum +{ + COLLISION_LEDGE_JUMP = 6 +}; + +// player running states +enum +{ + NOT_MOVING, + TURN_DIRECTION, // not the same as turning! turns your avatar without moving. also known as a turn frame in some circles + MOVING, +}; + +// player tile transition states +enum +{ + T_NOT_MOVING, + T_TILE_TRANSITION, + T_TILE_CENTER, // player is on a frame in which they are centered on a tile during which the player either stops or keeps their momentum and keeps going, changing direction if necessary. +}; + +struct PlayerAvatar /* 0x202E858 */ +{ + /*0x00*/ u8 flags; + /*0x01*/ u8 unk1; // used to be named bike, but its definitely not that. seems to be some transition flags + /*0x02*/ u8 runningState; // this is a static running state. 00 is not moving, 01 is turn direction, 02 is moving. + /*0x03*/ u8 tileTransitionState; // this is a transition running state: 00 is not moving, 01 is transition between tiles, 02 means you are on the frame in which you have centered on a tile but are about to keep moving, even if changing directions. 2 is also used for a ledge hop, since you are transitioning. + /*0x04*/ u8 spriteId; + /*0x05*/ u8 eventObjectId; + /*0x06*/ bool8 preventStep; + /*0x07*/ u8 gender; + /*0x08*/ u8 acroBikeState; // 00 is normal, 01 is turning, 02 is standing wheelie, 03 is hopping wheelie + /*0x09*/ u8 newDirBackup; // during bike movement, the new direction as opposed to player's direction is backed up here. + /*0x0A*/ u8 bikeFrameCounter; // on the mach bike, when this value is 1, the bike is moving but not accelerating yet for 1 tile. on the acro bike, this acts as a timer for acro bike. + /*0x0B*/ u8 bikeSpeed; + // acro bike only + /*0x0C*/ u32 directionHistory; // up/down/left/right history is stored in each nybble, but using the field directions and not the io inputs. + /*0x10*/ u32 abStartSelectHistory; // same as above but for A + B + start + select only + // these two are timer history arrays which [0] is the active timer for acro bike. every element is backed up to the next element upon update. + /*0x14*/ u8 dirTimerHistory[8]; + /*0x1C*/ u8 abStartSelectTimerHistory[8]; +}; + +struct Camera +{ + bool8 active:1; + s32 x; + s32 y; +}; + +extern struct EventObject gEventObjects[]; +extern u8 gSelectedEventObject; +extern struct MapHeader gMapHeader; +extern struct PlayerAvatar gPlayerAvatar; + +#endif // GUARD_GLOBAL_FIELDMAP_H diff --git a/berry_fix/payload/include/global.h b/berry_fix/payload/include/global.h new file mode 100644 index 000000000..ad83b544c --- /dev/null +++ b/berry_fix/payload/include/global.h @@ -0,0 +1,875 @@ +#ifndef GUARD_GLOBAL_H +#define GUARD_GLOBAL_H + +#include + +// global.h from pokemon ruby + +// IDE support +#if defined(__APPLE__) || defined(__CYGWIN__) +#define _(x) x +#define __(x) x +#define INCBIN(x) {0} +#define INCBIN_U8 INCBIN +#define INCBIN_U16 INCBIN +#define INCBIN_U32 INCBIN +#define INCBIN_S8 INCBIN +#define INCBIN_S16 INCBIN +#define INCBIN_S32 INCBIN +#endif + +// Prevent cross-jump optimization. +#define BLOCK_CROSS_JUMP asm(""); + +// to help in decompiling +#define asm_comment(x) asm volatile("@ -- " x " -- ") + +#define asm_unified(x) asm(".syntax unified\n" x "\n.syntax divided\n") + +#define ARRAY_COUNT(array) (sizeof(array) / sizeof((array)[0])) + + +#define POKEMON_SLOTS_NUMBER 412 +#define POKEMON_NAME_LENGTH 10 +#define OT_NAME_LENGTH 7 + +#define min(a, b) ((a) < (b) ? (a) : (b)) +#define max(a, b) ((a) >= (b) ? (a) : (b)) + +// why does GF hate 2d arrays +#define MULTI_DIM_ARR(x, dim, y) ((x) * dim + (y)) + +// dim access enums +enum +{ + B_8 = 1, + B_16 = 2, + B_32 = 4 +}; + +// There are many quirks in the source code which have overarching behavioral differences from +// a number of other files. For example, diploma.c seems to declare rodata before each use while +// other files declare out of order and must be at the beginning. There are also a number of +// macros which differ from one file to the next due to the method of obtaining the result, such +// as these below. Because of this, there is a theory (Two Team Theory) that states that these +// programming projects had more than 1 "programming team" which utilized different macros for +// each of the files that were worked on. +#define T1_READ_8(ptr) ((ptr)[0]) +#define T1_READ_16(ptr) ((ptr)[0] | ((ptr)[1] << 8)) +#define T1_READ_32(ptr) ((ptr)[0] | ((ptr)[1] << 8) | ((ptr)[2] << 16) | ((ptr)[3] << 24)) +#define T1_READ_PTR(ptr) (u8*) T1_READ_32(ptr) + +// T2_READ_8 is a duplicate to remain consistent with each group. +#define T2_READ_8(ptr) ((ptr)[0]) +#define T2_READ_16(ptr) ((ptr)[0] + ((ptr)[1] << 8)) +#define T2_READ_32(ptr) ((ptr)[0] + ((ptr)[1] << 8) + ((ptr)[2] << 16) + ((ptr)[3] << 24)) +#define T2_READ_PTR(ptr) (void*) T2_READ_32(ptr) + +// Credits to Made (dolphin emoji) +#define S16TOPOSFLOAT(val) \ +({ \ + s16 v = (val); \ + float f = (float)v; \ + if(v < 0) f += 65536.0f; \ + f; \ +}) + +enum +{ + VERSION_SAPPHIRE = 1, + VERSION_RUBY = 2, + VERSION_EMERALD = 3, +}; + +enum LanguageId +{ + LANGUAGE_JAPANESE = 1, + LANGUAGE_ENGLISH = 2, + LANGUAGE_GERMAN = 5, +}; + +// capacities of various saveblock objects +#define DAYCARE_MON_COUNT 2 +#define POKEBLOCKS_COUNT 40 +#define PARTY_SIZE 6 +#define EVENT_OBJECTS_COUNT 16 +#define BERRY_TREES_COUNT 128 +#define FLAGS_COUNT 288 +#define VARS_COUNT 256 +#define MAIL_COUNT 16 +#define SECRET_BASES_COUNT 20 +#define TV_SHOWS_COUNT 25 +#define POKE_NEWS_COUNT 16 +#define PC_ITEMS_COUNT 50 +#define BAG_ITEMS_COUNT 20 +#define BAG_KEYITEMS_COUNT 20 +#define BAG_POKEBALLS_COUNT 16 +#define BAG_TMHM_COUNT 64 +#define BAG_BERRIES_COUNT 46 + +enum +{ + MALE, + FEMALE +}; + +enum +{ + OPTIONS_BUTTON_MODE_NORMAL, + OPTIONS_BUTTON_MODE_LR, + OPTIONS_BUTTON_MODE_L_EQUALS_A +}; + +enum +{ + OPTIONS_TEXT_SPEED_SLOW, + OPTIONS_TEXT_SPEED_MID, + OPTIONS_TEXT_SPEED_FAST +}; + +enum +{ + OPTIONS_SOUND_MONO, + OPTIONS_SOUND_STEREO +}; + +enum +{ + OPTIONS_BATTLE_STYLE_SHIFT, + OPTIONS_BATTLE_STYLE_SET +}; + +enum +{ + BAG_ITEMS = 1, + BAG_POKEBALLS, + BAG_TMsHMs, + BAG_BERRIES, + BAG_KEYITEMS +}; + +struct Coords16 +{ + s16 x; + s16 y; +}; + +struct UCoords16 +{ + u16 x; + u16 y; +}; + +struct SecretBaseRecord +{ + /*0x1A08*/ u8 secretBaseId; + /*0x1A09*/ u8 sbr_field_1_0:4; + /*0x1A09*/ u8 gender:1; + /*0x1A09*/ u8 sbr_field_1_5:1; + /*0x1A09*/ u8 sbr_field_1_6:2; + /*0x1A0A*/ u8 playerName[OT_NAME_LENGTH]; + /*0x1A11*/ u8 trainerId[4]; // byte 0 is used for determining trainer class + /*0x1A16*/ u16 sbr_field_e; + /*0x1A18*/ u8 sbr_field_10; + /*0x1A19*/ u8 sbr_field_11; + /*0x1A1A*/ u8 decorations[16]; + /*0x1A2A*/ u8 decorationPos[16]; + /*0x1A3C*/ u32 partyPersonality[6]; + /*0x1A54*/ u16 partyMoves[6 * 4]; + /*0x1A84*/ u16 partySpecies[6]; + /*0x1A90*/ u16 partyHeldItems[6]; + /*0x1A9C*/ u8 partyLevels[6]; + /*0x1AA2*/ u8 partyEVs[6]; +}; + +#include "constants/game_stat.h" +#include "global.fieldmap.h" +#include "global.berry.h" +#include "pokemon.h" + +struct WarpData +{ + s8 mapGroup; + s8 mapNum; + s8 warpId; + s16 x, y; +}; + +struct ItemSlot +{ + u16 itemId; + u16 quantity; +}; + +struct Pokeblock +{ + u8 color; + u8 spicy; + u8 dry; + u8 sweet; + u8 bitter; + u8 sour; + u8 feel; +}; + +struct Roamer +{ + /*0x00*/ u32 ivs; + /*0x04*/ u32 personality; + /*0x08*/ u16 species; + /*0x0A*/ u16 hp; + /*0x0C*/ u8 level; + /*0x0D*/ u8 status; + /*0x0E*/ u8 cool; + /*0x0F*/ u8 beauty; + /*0x10*/ u8 cute; + /*0x11*/ u8 smart; + /*0x12*/ u8 tough; + /*0x13*/ bool8 active; + /*0x14*/ u8 filler[0x8]; +}; + +struct RamScriptData +{ + u8 magic; + u8 mapGroup; + u8 mapNum; + u8 objectId; + u8 script[995]; +}; + +struct RamScript +{ + u32 checksum; + struct RamScriptData data; +}; + +struct EasyChatPair +{ + u16 unk0_0:7; + u16 unk0_7:7; + u16 unk1_6:1; + u16 unk2; + u16 words[2]; +}; /*size = 0x8*/ + +struct TVShowCommon +{ + /*0x00*/ u8 kind; + /*0x01*/ bool8 active; + /*0x02*/ u8 pad02[20]; + /*0x16*/ u16 var16[3]; + /*0x1C*/ u8 srcTrainerId3Lo; + /*0x1D*/ u8 srcTrainerId3Hi; + /*0x1E*/ u8 srcTrainerId2Lo; + /*0x1F*/ u8 srcTrainerId2Hi; + /*0x20*/ u8 srcTrainerIdLo; + /*0x21*/ u8 srcTrainerIdHi; + /*0x22*/ u8 trainerIdLo; + /*0x23*/ u8 trainerIdHi; +}; + +struct TVShowFanClubLetter +{ + /*0x00*/ u8 kind; + /*0x01*/ bool8 active; + /*0x02*/ u16 species; + /*0x04*/ u16 pad04[6]; + /*0x10*/ u8 playerName[8]; + /*0x18*/ u8 language; +}; + +struct TVShowRecentHappenings +{ + /*0x00*/ u8 kind; + /*0x01*/ bool8 active; + /*0x02*/ u16 var02; + /*0x04*/ u16 var04[6]; + /*0x10*/ u8 playerName[8]; + /*0x18*/ u8 language; + /*0x19*/ u8 pad19[10]; +}; + +struct TVShowFanclubOpinions +{ + /*0x00*/ u8 kind; + /*0x01*/ bool8 active; + /*0x02*/ u16 var02; + /*0x04*/ u8 var04A:4; + /*0x04*/ u8 var04B:4; + /*0x05*/ u8 playerName[8]; + /*0x0D*/ u8 language; + /*0x0E*/ u8 var0E; + /*0x0F*/ u8 var0F; + /*0x10*/ u8 var10[8]; + /*0x18*/ u16 var18[2]; + /*0x1C*/ u16 var1C[4]; +}; + +struct TVShowUnknownType04 +{ + /*0x00*/ u8 kind; + /*0x01*/ bool8 active; + /*0x02*/ u8 pad02[4]; + /*0x06*/ u16 var06; +}; + +struct TVShowNameRaterShow +{ + /*0x00*/ u8 kind; + /*0x01*/ bool8 active; + /*0x02*/ u16 species; + /*0x04*/ u8 pokemonName[11]; + /*0x0F*/ u8 trainerName[11]; + /*0x1A*/ u8 random; + /*0x1B*/ u8 random2; + /*0x1C*/ u16 var1C; + /*0x1E*/ u8 language; + /*0x1F*/ u8 pokemonNameLanguage; +}; + +struct TVShowBravoTrainerPokemonProfiles +{ + /*0x00*/ u8 kind; + /*0x01*/ bool8 active; + /*0x02*/ u16 species; + /*0x04*/ u16 var04[2]; + /*0x08*/ u8 pokemonNickname[11]; + /*0x13*/ u8 contestCategory:3; + /*0x13*/ u8 contestRank:2; + /*0x13*/ u8 contestResult:2; + /*0x13*/ u8 var13_7:1; + /*0x14*/ u16 var14; + /*0x16*/ u8 playerName[8]; + /*0x1E*/ u8 language; + /*0x1F*/ u8 var1f; +}; + +struct TVShowBravoTrainerBattleTowerSpotlight +{ + /*0x00*/ u8 kind; + /*0x01*/ bool8 active; + /*0x02*/ u8 trainerName[8]; + /*0x0A*/ u16 species; + /*0x0C*/ u8 enemyTrainerName[8]; + /*0x14*/ u16 defeatedSpecies; + /*0x16*/ u16 var16; + /*0x18*/ u16 var18[1]; + /*0x1A*/ u8 btLevel; + /*0x1B*/ u8 var1b; + /*0x1C*/ u8 var1c; + /*0x1D*/ u8 language; +}; + +struct TVShowPokemonToday +{ + /*0x00*/ u8 kind; + /*0x01*/ bool8 active; + /*0x02*/ u8 language; + /*0x03*/ u8 language2; + /*0x04*/ u8 nickname[11]; + /*0x0F*/ u8 ball; + /*0x10*/ u16 species; + /*0x12*/ u8 var12; + /*0x13*/ u8 playerName[8]; +}; + +struct TVShowSmartShopper +{ + /*0x00*/ u8 kind; + /*0x01*/ bool8 active; + /*0x02*/ u8 priceReduced; + /*0x03*/ u8 language; + /*0x04*/ u8 pad04[2]; + /*0x06*/ u16 itemIds[3]; + /*0x0C*/ u16 itemAmounts[3]; + /*0x12*/ u8 shopLocation; + /*0x13*/ u8 playerName[8]; +}; + +struct TVShowPokemonTodayFailed +{ + /*0x00*/ u8 kind; + /*0x01*/ bool8 active; + /*0x02*/ u8 language; + /*0x03*/ u8 pad03[9]; + /*0x0c*/ u16 species; + /*0x0e*/ u16 species2; + /*0x10*/ u8 var10; + /*0x11*/ u8 var11; + /*0x12*/ u8 var12; + /*0x13*/ u8 playerName[8]; +}; + +struct TVShowPokemonAngler +{ + /*0x00*/ u8 kind; + /*0x01*/ bool8 active; + /*0x02*/ u8 var02; + /*0x03*/ u8 var03; + /*0x04*/ u16 var04; + /*0x06*/ u8 language; + u8 pad07[12]; + /*0x13*/ u8 playerName[8]; +}; + +struct TVShowWorldOfMasters +{ + /*0x00*/ u8 kind; + /*0x01*/ bool8 active; + /*0x02*/ u16 var02; + /*0x04*/ u16 var04; + /*0x06*/ u16 var06; + /*0x08*/ u16 var08; + /*0x0a*/ u8 var0a; + /*0x0b*/ u8 language; + u8 pad0c[7]; + /*0x13*/ u8 playerName[8]; +}; + +struct TVShowMassOutbreak +{ + /*0x00*/ u8 kind; + /*0x01*/ bool8 active; + /*0x02*/ u8 var02; + /*0x03*/ u8 var03; + /*0x04*/ u16 moves[4]; + /*0x0C*/ u16 species; + /*0x0E*/ u16 var0E; + /*0x10*/ u8 locationMapNum; + /*0x11*/ u8 locationMapGroup; + /*0x12*/ u8 var12; + /*0x13*/ u8 probability; + /*0x14*/ u8 level; + /*0x15*/ u8 var15; + /*0x16*/ u16 daysLeft; + /*0x18*/ u8 language; + u8 pad19[11]; +}; + +typedef union TVShow +{ + struct TVShowCommon common; + struct TVShowFanClubLetter fanclubLetter; + struct TVShowRecentHappenings recentHappenings; + struct TVShowFanclubOpinions fanclubOpinions; + struct TVShowUnknownType04 unkShow04; + struct TVShowNameRaterShow nameRaterShow; + struct TVShowBravoTrainerPokemonProfiles bravoTrainer; + struct TVShowBravoTrainerBattleTowerSpotlight bravoTrainerTower; + struct TVShowPokemonToday pokemonToday; + struct TVShowSmartShopper smartshopperShow; + struct TVShowPokemonTodayFailed pokemonTodayFailed; + struct TVShowPokemonAngler pokemonAngler; + struct TVShowWorldOfMasters worldOfMasters; + struct TVShowMassOutbreak massOutbreak; +} TVShow; + +struct MailStruct +{ + /*0x00*/ u16 words[9]; + /*0x12*/ u8 playerName[8]; + /*0x1A*/ u8 trainerId[4]; + /*0x1E*/ u16 species; + /*0x20*/ u16 itemId; +}; + + +// Mauville Pokemon Center men + +struct MauvilleManCommon +{ + u8 id; +}; + +struct MauvilleManBard +{ + /*0x00*/ u8 id; + /*0x02*/ u16 songLyrics[6]; + /*0x0E*/ u16 temporaryLyrics[6]; + /*0x1A*/ u8 playerName[8]; + /*0x22*/ u8 filler_2DB6[0x3]; + /*0x25*/ u8 playerTrainerId[4]; + /*0x29*/ bool8 hasChangedSong; +}; /*size = 0x2C*/ + +struct MauvilleManHipster +{ + u8 id; + bool8 alreadySpoken; +}; + +struct MauvilleManTrader +{ + u8 id; + u8 unk1[4]; + u8 unk5[4][11]; + bool8 alreadyTraded; +}; + +struct MauvilleManStoryteller +{ + u8 id; + bool8 alreadyRecorded; + u8 filler2[2]; + u8 gameStatIDs[4]; + u8 trainerNames[4][7]; + u8 statValues[4][4]; +}; + +struct MauvilleManGiddy +{ + /*0x00*/ u8 id; + /*0x01*/ u8 taleCounter; + /*0x02*/ u8 questionNum; + /*0x04*/ u16 randomWords[10]; + /*0x18*/ u8 questionList[12]; +}; /*size = 0x2C*/ + + +union MauvilleMan +{ + struct MauvilleManCommon common; + struct MauvilleManBard bard; + struct MauvilleManHipster hipster; + struct MauvilleManTrader trader; + struct MauvilleManStoryteller storyteller; + struct MauvilleManGiddy giddy; + u8 filler[0x40]; // needed to pad out the struct +}; + +struct PokeNews +{ + u8 kind; + u8 state; + u16 days; +}; + +struct GabbyAndTyData +{ + /*2b10*/ u16 mon1; + /*2b12*/ u16 mon2; + /*2b14*/ u16 lastMove; + /*2b16*/ u16 quote; + /*2b18*/ u8 mapnum; + /*2b19*/ u8 battleNum; + /*2b1a*/ u8 valA_0:1; + /*2b1a*/ u8 valA_1:1; + /*2b1a*/ u8 valA_2:1; + /*2b1a*/ u8 valA_3:1; + /*2b1a*/ u8 valA_4:1; + /*2b1a*/ u8 valA_5:3; + /*2b1b*/ u8 valB_0:1; + /*2b1b*/ u8 valB_1:1; + /*2b1b*/ u8 valB_2:1; + /*2b1b*/ u8 valB_3:1; + /*2b1b*/ u8 valB_4:1; + /*2b1b*/ u8 valB_5:3; +}; + +struct DayCareMail +{ + /*0x00*/ struct MailStruct message; + /*0x24*/ u8 names[19]; +}; + +struct DayCareStepCountersEtc { + u32 steps[DAYCARE_MON_COUNT]; + u16 pendingEggPersonality; + u8 eggCycleStepsRemaining; +}; + +struct RecordMixingDayCareMail +{ + struct DayCareMail mail[DAYCARE_MON_COUNT]; + u32 numDaycareMons; + u16 itemsHeld[DAYCARE_MON_COUNT]; // marks whether or not each daycare mon is currently holding an item. +}; + +struct DayCareMisc +{ + struct DayCareMail mail[DAYCARE_MON_COUNT]; + struct DayCareStepCountersEtc countersEtc; +}; + +struct DayCare { + struct BoxPokemon mons[DAYCARE_MON_COUNT]; + struct DayCareMisc misc; +}; + +struct LinkBattleRecord +{ + u8 name[8]; + u16 trainerId; + u16 wins; + u16 losses; + u16 draws; +}; + +struct RecordMixingGiftData +{ + u8 unk0; + u8 quantity; + u16 itemId; + u8 filler4[8]; +}; + +struct RecordMixingGift +{ + int checksum; + struct RecordMixingGiftData data; +}; + +struct ContestWinner +{ + /*0x00*/ u32 personality; // personality + /*0x04*/ u32 otId; // otId + /*0x08*/ u16 species; // species + /*0x0A*/ u8 contestCategory; + /*0x0B*/ u8 nickname[11]; + /*0x16*/ u8 trainerName[8]; +}; + +// there should be enough flags for all 412 slots +// each slot takes up 8 flags +// if the value is not divisible by 8, we need to account for the reminder as well +#define DEX_FLAGS_NO ((POKEMON_SLOTS_NUMBER / 8) + ((POKEMON_SLOTS_NUMBER % 8) ? 1 : 0)) + +struct SaveBlock1 /* 0x02025734 */ +{ + /*0x00*/ struct Coords16 pos; + /*0x04*/ struct WarpData location; + /*0x0C*/ struct WarpData warp1; + /*0x14*/ struct WarpData warp2; + /*0x1C*/ struct WarpData lastHealLocation; + /*0x24*/ struct WarpData warp4; + /*0x2C*/ u16 savedMusic; + /*0x2E*/ u8 weather; + /*0x2F*/ u8 weatherCycleStage; + /*0x30*/ u8 flashLevel; // flash level on current map, 0 being normal and 4 being the darkest + /*0x32*/ u16 mapLayoutId; + /*0x34*/ u16 mapView[0x100]; + /*0x234*/ u8 playerPartyCount; + /*0x238*/ struct Pokemon playerParty[6]; + /*0x490*/ u32 money; + /*0x494*/ u16 coins; + /*0x496*/ u16 registeredItem; // registered for use with SELECT button + /*0x498*/ struct ItemSlot pcItems[PC_ITEMS_COUNT]; + /*0x560*/ struct ItemSlot bagPocket_Items[BAG_ITEMS_COUNT]; + /*0x5B0*/ struct ItemSlot bagPocket_KeyItems[BAG_KEYITEMS_COUNT]; + /*0x600*/ struct ItemSlot bagPocket_PokeBalls[BAG_POKEBALLS_COUNT]; + /*0x640*/ struct ItemSlot bagPocket_TMHM[BAG_TMHM_COUNT]; + /*0x740*/ struct ItemSlot bagPocket_Berries[BAG_BERRIES_COUNT]; + /*0x7F8*/ struct Pokeblock pokeblocks[POKEBLOCKS_COUNT]; + /*0x938*/ u8 dexSeen2[DEX_FLAGS_NO]; + /*0x96C*/ u16 berryBlenderRecords[3]; + /*0x972*/ u8 filler_972[0x6]; + /*0x978*/ u16 trainerRematchStepCounter; + /*0x97A*/ u8 trainerRematches[100]; + /*0x9E0*/ struct EventObject eventObjects[EVENT_OBJECTS_COUNT]; + /*0xC20*/ struct EventObjectTemplate eventObjectTemplates[64]; + /*0x1220*/ u8 flags[FLAGS_COUNT]; + /*0x1340*/ u16 vars[VARS_COUNT]; + /*0x1540*/ u32 gameStats[NUM_GAME_STATS]; + /*0x1608*/ struct BerryTree berryTrees[BERRY_TREES_COUNT]; + /*0x1A08*/ struct SecretBaseRecord secretBases[SECRET_BASES_COUNT]; + /*0x2688*/ u8 playerRoomDecor[12]; + /*0x2694*/ u8 playerRoomDecorPos[12]; + /*0x26A0*/ u8 decorDesk[10]; + /*0x26AA*/ u8 decorChair[10]; + /*0x26B4*/ u8 decorPlant[10]; + /*0x26BE*/ u8 decorOrnament[30]; + /*0x26DC*/ u8 decorMat[30]; + /*0x26FA*/ u8 decorPoster[10]; + /*0x2704*/ u8 decorDoll[40]; + /*0x272C*/ u8 decorCushion[10]; + /*0x2736*/ u8 padding_2736[2]; + /*0x2738*/ TVShow tvShows[TV_SHOWS_COUNT]; + /*0x2ABC*/ struct PokeNews pokeNews[POKE_NEWS_COUNT]; + /*0x2AFC*/ u16 outbreakPokemonSpecies; + /*0x2AFE*/ u8 outbreakLocationMapNum; + /*0x2AFF*/ u8 outbreakLocationMapGroup; + /*0x2B00*/ u8 outbreakPokemonLevel; + /*0x2B01*/ u8 outbreakUnk1; + /*0x2B02*/ u16 outbreakUnk2; + /*0x2B04*/ u16 outbreakPokemonMoves[4]; + /*0x2B0C*/ u8 outbreakUnk4; + /*0x2B0D*/ u8 outbreakPokemonProbability; + /*0x2B0E*/ u16 outbreakUnk5; + /*0x2B10*/ struct GabbyAndTyData gabbyAndTyData; + /*0x2B1C*/ struct { + /*0x2B1C*/ u16 unk2B1C[6]; + /*0x2B28*/ u16 unk2B28[6]; + /*0x2B34*/ u16 unk2B34[6]; + /*0x2B40*/ u16 unk2B40[6]; + } easyChats; + /*0x2B4C*/ struct MailStruct mail[MAIL_COUNT]; + /*0x2D8C*/ u8 unk2D8C[4]; // What is this? Apparently it's supposed to be 64 bytes in size. + /*0x2D90*/ u8 filler_2D90[0x4]; + /*0x2D94*/ union MauvilleMan mauvilleMan; + /*0x2DD4*/ struct EasyChatPair easyChatPairs[5]; //Dewford trend [0] and some other stuff + /*0x2DFC*/ struct ContestWinner contestWinners[8]; + /*0x2EFC*/ struct ContestWinner museumPortraits[5]; + /*0x2F9C*/ struct DayCare daycare; + /*0x30B8*/ struct LinkBattleRecord linkBattleRecords[5]; + struct { + /*0x3108*/ u8 unknown1[8]; + /*0x3110*/ u8 giftRibbons[11]; + /*0x311B*/ u8 unknown2[8]; + /*0x3123*/ u32 currentPokeCoupons; + /*0x3127*/ u32 totalEarnedPokeCoupons; + /*0x312B*/ u8 unknown3[6]; + /*0x3131*/ u8 receivedWishmakerJirachi; + /*0x3132*/ u8 unknown4[18]; + } __attribute__((packed)) externalReservedData; + /*0x3144*/ struct Roamer roamer; + /*0x3160*/ struct EnigmaBerry enigmaBerry; + /*0x3690*/ struct RamScript ramScript; + /*0x3A7C*/ struct RecordMixingGift recordMixingGift; + /*0x3A8C*/ u8 dexSeen3[DEX_FLAGS_NO]; +}; + +extern struct SaveBlock1 gSaveBlock1; + +struct Time +{ + /*0x00*/ s16 days; + /*0x02*/ s8 hours; + /*0x03*/ s8 minutes; + /*0x04*/ s8 seconds; +}; + +struct Pokedex +{ + /*0x00*/ u8 order; + /*0x01*/ u8 unknown1; + /*0x02*/ u8 nationalMagic; // must equal 0xDA in order to have National mode + /*0x03*/ u8 unknown2; + /*0x04*/ u32 unownPersonality; // set when you first see Unown + /*0x08*/ u32 spindaPersonality; // set when you first see Spinda + /*0x0C*/ u32 unknown3; + /*0x10*/ u8 owned[DEX_FLAGS_NO]; + /*0x44*/ u8 seen[DEX_FLAGS_NO]; +}; + +struct BattleTowerTrainer +{ + /*0x00*/ u8 trainerClass; + /*0x01*/ u8 name[8]; + /*0x09*/ u8 teamFlags; + u8 filler0A[2]; + /*0x0C*/ u16 greeting[6]; +}; + +struct BattleTowerRecord // record mixing +{ + /*0x00*/ u8 battleTowerLevelType; // 0 = level 50, 1 = level 100 + /*0x01*/ u8 trainerClass; + /*0x02*/ u16 winStreak; + /*0x04*/ u8 name[8]; + /*0x0C*/ u8 trainerId[4]; + /*0x10*/ u16 greeting[6]; + /*0x1C*/ struct BattleTowerPokemon party[3]; + /*0xA0*/ u32 checksum; +}; + +struct BattleTowerEReaderTrainer +{ + /*0x00*/ u8 unk0; + /*0x01*/ u8 trainerClass; + /*0x02*/ u16 winStreak; + /*0x04*/ u8 name[8]; + /*0x0C*/ u8 trainerId[4]; + /*0x10*/ u16 greeting[6]; + /*0x1C*/ u16 farewellPlayerLost[6]; + /*0x28*/ u16 farewellPlayerWon[6]; + /*0x34*/ struct BattleTowerPokemon party[3]; + /*0xB8*/ u32 checksum; +}; + +struct BattleTowerData +{ + /*0x0000, 0x00A8*/ struct BattleTowerRecord playerRecord; + /*0x00A4, 0x014C*/ struct BattleTowerRecord records[5]; // from record mixing + /*0x03D8, 0x0480*/ u16 firstMonSpecies; // species of the first pokemon in the player's battle tower party + /*0x03DA, 0x0482*/ u16 defeatedBySpecies; // species of the pokemon that defated the player + /*0x03DC, 0x0484*/ u8 defeatedByTrainerName[8]; + /*0x03E4, 0x048C*/ u8 firstMonNickname[POKEMON_NAME_LENGTH]; // nickname of the first pokemon in the player's battle tower party + /*0x03F0, 0x0498*/ struct BattleTowerEReaderTrainer ereaderTrainer; + /*0x04AC, 0x0554*/ u8 battleTowerLevelType:1; // 0 = level 50; 1 = level 100 + /*0x04AC, 0x0554*/ u8 unk_554:1; + /*0x04AD, 0x0555*/ u8 battleOutcome; + /*0x04AE, 0x0556*/ u8 var_4AE[2]; + /*0x04B0, 0x0558*/ u16 curChallengeBattleNum[2]; // 1-based index of battle in the current challenge. (challenges consist of 7 battles) + /*0x04B4, 0x055C*/ u16 curStreakChallengesNum[2]; // 1-based index of the current challenge in the current streak. + /*0x04B8, 0x0560*/ u16 recordWinStreaks[2]; + /*0x04BC, 0x0564*/ u8 battleTowerTrainerId; // index for gBattleTowerTrainers table + /*0x04BD, 0x0565*/ u8 selectedPartyMons[0x3]; // indices of the 3 selected player party mons. + /*0x04C0, 0x0568*/ u16 prizeItem; + /*0x04C2, 0x056A*/ u8 battledTrainerIds[6]; + /*0x04C8, 0x0570*/ u16 totalBattleTowerWins; + /*0x04CA, 0x0572*/ u16 bestBattleTowerWinStreak; + /*0x04CC, 0x0574*/ u16 currentWinStreaks[2]; + /*0x04D0, 0x0578*/ u8 lastStreakLevelType; // 0 = level 50, 1 = level 100. level type of the last streak. Used by tv to report the level mode. + /*0x04D1, 0x0579*/ u8 filler_4D1[0x317]; +}; + +struct SaveBlock2 /* 0x02024EA4 */ +{ + /*0x00*/ u8 playerName[8]; + /*0x08*/ u8 playerGender; // MALE, FEMALE + /*0x09*/ u8 specialSaveWarp; + /*0x0A*/ u8 playerTrainerId[4]; + /*0x0E*/ u16 playTimeHours; + /*0x10*/ u8 playTimeMinutes; + /*0x11*/ u8 playTimeSeconds; + /*0x12*/ u8 playTimeVBlanks; + /*0x13*/ u8 optionsButtonMode; // OPTIONS_BUTTON_MODE_[NORMAL/LR/L_EQUALS_A] + /*0x14*/ u16 optionsTextSpeed:3; // OPTIONS_TEXT_SPEED_[SLOW/MID/FAST] + u16 optionsWindowFrameType:5; // Specifies one of the 20 decorative borders for text boxes + u16 optionsSound:1; // OPTIONS_SOUND_[MONO/STEREO] + u16 optionsBattleStyle:1; // OPTIONS_BATTLE_STYLE_[SHIFT/SET] + u16 optionsBattleSceneOff:1; // whether battle animations are disabled + u16 regionMapZoom:1; // whether the map is zoomed in + /*0x18*/ struct Pokedex pokedex; + /*0x90*/ u8 filler_90[0x8]; + /*0x98*/ struct Time localTimeOffset; + /*0xA0*/ struct Time lastBerryTreeUpdate; + /*0xA8*/ struct BattleTowerData battleTower; +}; + +struct MapPosition +{ + s16 x; + s16 y; + s8 height; +}; + +struct UnkStruct_8054FF8 +{ + u8 a; + u8 b; + u8 c; + u8 d; + struct MapPosition sub; + u16 field_C; +}; + +// wasnt defined so I had to define it +struct HallOfFame +{ + u8 filler[0x1F00]; +}; + +extern struct SaveBlock2 gSaveBlock2; + +#define RomHeaderGameTitle ((const char *)0x080000A0) +#define RomHeaderGameCode ((const char *)0x080000AC) +#define RomHeaderMakerCode ((const char *)0x080000B0) +#define RomHeaderMagic ((const u8 *) 0x080000B2) +#define RomHeaderSoftwareVersion ((const u8 *) 0x080000BC) + +#define LocalTimeOffset ((struct Time *)0x02028098) +#define LastBerryTreeUpdate ((struct Time *)0x020280A0) + +#endif //GUARD_GLOBAL_H diff --git a/berry_fix/payload/include/main.h b/berry_fix/payload/include/main.h new file mode 100644 index 000000000..8f7ef1a5a --- /dev/null +++ b/berry_fix/payload/include/main.h @@ -0,0 +1,45 @@ +#ifndef GUARD_MAIN_H +#define GUARD_MAIN_H + +#include + +enum RomHeaderValidationResult +{ + SAPPHIRE_UPDATABLE = 2, + RUBY_UPDATABLE, + SAPPHIRE_NONEED, + RUBY_NONEED, + INVALID +}; + +enum MainCallbackState +{ + MAINCB_INIT = 0, + MAINCB_CHECK_RTC, + MAINCB_CHECK_FLASH, + MAINCB_READ_SAVE, + MAINCB_CHECK_TIME, + MAINCB_FIX_DATE, + MAINCB_NO_NEED_TO_FIX, + MAINCB_YEAR_MAKES_NO_SENSE, + MAINCB_FINISHED, + MAINCB_CHECK_PACIFIDLOG_TM, + MAINCB_FIX_PACIFIDLOG_TM, + MAINCB_ERROR +}; + +extern IntrFunc gIntrTable[]; +extern u16 gHeldKeys; +extern u16 gNewKeys; +extern u8 gIntrVector[]; +extern u32 gUpdateSuccessful; +extern u32 gUnknown_3001194; +extern u32 gUnknown_30011A0[]; +extern u32 gMainCallbackState; +extern u32 gGameVersion; + +extern u8 gSharedMem[0x8000]; + +extern const IntrFunc gIntrFuncPointers[]; + +#endif //GUARD_MAIN_H diff --git a/berry_fix/payload/include/pokemon.h b/berry_fix/payload/include/pokemon.h new file mode 100644 index 000000000..d3a14ffff --- /dev/null +++ b/berry_fix/payload/include/pokemon.h @@ -0,0 +1,154 @@ +#ifndef GUARD_POKEMON_H +#define GUARD_POKEMON_H + +struct PokemonSubstruct0 +{ + u16 species; + u16 heldItem; + u32 experience; + u8 ppBonuses; + u8 friendship; +}; + +struct PokemonSubstruct1 +{ + u16 moves[4]; + u8 pp[4]; +}; + +struct PokemonSubstruct2 +{ + u8 hpEV; + u8 attackEV; + u8 defenseEV; + u8 speedEV; + u8 spAttackEV; + u8 spDefenseEV; + u8 cool; + u8 beauty; + u8 cute; + u8 smart; + u8 tough; + u8 sheen; +}; + +struct PokemonSubstruct3 +{ + /*0x00*/ u8 pokerus; + /*0x01*/ u8 metLocation; + + /*0x02*/ u16 metLevel:7; + /*0x02*/ u16 metGame:4; + /*0x03*/ u16 pokeball:4; + /*0x03*/ u16 otGender:1; + + /*0x04*/ u32 hpIV:5; + /*0x04*/ u32 attackIV:5; + /*0x05*/ u32 defenseIV:5; + /*0x05*/ u32 speedIV:5; + /*0x05*/ u32 spAttackIV:5; + /*0x06*/ u32 spDefenseIV:5; + /*0x07*/ u32 isEgg:1; + /*0x07*/ u32 altAbility:1; + + /*0x08*/ u32 coolRibbon:3; + /*0x08*/ u32 beautyRibbon:3; + /*0x08*/ u32 cuteRibbon:3; + /*0x09*/ u32 smartRibbon:3; + /*0x09*/ u32 toughRibbon:3; + /*0x09*/ u32 championRibbon:1; + /*0x0A*/ u32 winningRibbon:1; + /*0x0A*/ u32 victoryRibbon:1; + /*0x0A*/ u32 artistRibbon:1; + /*0x0A*/ u32 effortRibbon:1; + /*0x0A*/ u32 giftRibbon1:1; + /*0x0A*/ u32 giftRibbon2:1; + /*0x0A*/ u32 giftRibbon3:1; + /*0x0A*/ u32 giftRibbon4:1; + /*0x0B*/ u32 giftRibbon5:1; + /*0x0B*/ u32 giftRibbon6:1; + /*0x0B*/ u32 giftRibbon7:1; + /*0x0B*/ u32 fatefulEncounter:5; // unused in Ruby/Sapphire, but the high bit must be set for Mew/Deoxys to obey in FR/LG/Emerald +}; + +union PokemonSubstruct +{ + struct PokemonSubstruct0 type0; + struct PokemonSubstruct1 type1; + struct PokemonSubstruct2 type2; + struct PokemonSubstruct3 type3; + u16 raw[6]; +}; + +struct BoxPokemon +{ + /*0x00*/ u32 personality; + /*0x04*/ u32 otId; + /*0x08*/ u8 nickname[POKEMON_NAME_LENGTH]; + /*0x12*/ u8 language; + /*0x13*/ u8 isBadEgg:1; + u8 hasSpecies:1; + u8 isEgg:1; + /*0x14*/ u8 otName[OT_NAME_LENGTH]; + /*0x1B*/ u8 markings; + /*0x1C*/ u16 checksum; + /*0x1E*/ u16 unknown; + + union + { + u32 raw[12]; + union PokemonSubstruct substructs[4]; + } secure; +}; /*size = 0x50*/ + +struct Pokemon +{ + /*0x00*/ struct BoxPokemon box; + /*0x50*/ u32 status; + /*0x54*/ u8 level; + /*0x55*/ u8 mail; + /*0x56*/ u16 hp; + /*0x58*/ u16 maxHP; + /*0x5A*/ u16 attack; + /*0x5C*/ u16 defense; + /*0x5E*/ u16 speed; + /*0x60*/ u16 spAttack; + /*0x62*/ u16 spDefense; +}; + +struct BattleTowerPokemon +{ + /*0x00*/u16 species; + /*0x02*/u16 heldItem; + /*0x04*/u16 moves[4]; + /*0x0C*/u8 level; + /*0x0D*/u8 ppBonuses; + /*0x0E*/u8 hpEV; + /*0x0F*/u8 attackEV; + /*0x10*/u8 defenseEV; + /*0x11*/u8 speedEV; + /*0x12*/u8 spAttackEV; + /*0x13*/u8 spDefenseEV; + /*0x14*/u32 otId; + /*0x18*/u32 hpIV:5; + /*0x18*/u32 attackIV:5; + /*0x19*/u32 defenseIV:5; + /*0x19*/u32 speedIV:5; + /*0x1A*/u32 spAttackIV:5; + /*0x1A*/u32 spDefenseIV:5; + /*0x1B*/u32 gap:1; + /*0x1B*/u32 altAbility:1; + /*0x1C*/u32 personality; + /*0x20*/u8 nickname[POKEMON_NAME_LENGTH + 1]; + /*0x2B*/u8 friendship; +}; + +struct PokemonStorage +{ + /*0x0000*/ u8 currentBox; + /*0x0004*/ struct BoxPokemon boxes[14][30]; + /*0x8344*/ u8 boxNames[14][9]; + /*0x83c2*/ u8 wallpaper[14]; +}; + +#endif // GUARD_POKEMON_H diff --git a/berry_fix/payload/include/rtc.h b/berry_fix/payload/include/rtc.h new file mode 100644 index 000000000..64a1f2295 --- /dev/null +++ b/berry_fix/payload/include/rtc.h @@ -0,0 +1,15 @@ +#ifndef GUARD_RTC_H +#define GUARD_RTC_H + +#include +#include +#include "global.h" + +extern struct Time gTimeSinceBerryUpdate; +extern struct Time gRtcUTCTime; + +bool32 rtc_maincb_is_rtc_working(void); +bool32 rtc_maincb_is_time_since_last_berry_update_positive(u8 *); +void rtc_maincb_fix_date(void); + +#endif //GUARD_RTC_H diff --git a/berry_fix/payload/ld_script.sed b/berry_fix/payload/ld_script.sed new file mode 100644 index 000000000..b91542b6f --- /dev/null +++ b/berry_fix/payload/ld_script.sed @@ -0,0 +1,14 @@ +// { + r sym_ewram.ld + d +} + +// { + r sym_bss.ld + d +} + +// { + r sym_common.ld + d +} diff --git a/berry_fix/payload/ld_script.txt b/berry_fix/payload/ld_script.txt new file mode 100644 index 000000000..a70ecac09 --- /dev/null +++ b/berry_fix/payload/ld_script.txt @@ -0,0 +1,122 @@ +ENTRY(Init) + +SECTIONS { + . = 0x2010000; + + .text : + ALIGN(4) + { + asm/crt0.o(.text); + src/main.o(.text); + src/rtc.o(.text); + src/flash.o(.text); + } =0 + + lib_text : + ALIGN(4) + { + *libagb_flash.a:agb_flash.o(.text); + *libagb_flash.a:agb_flash_1m.o(.text); + *libagb_flash.a:agb_flash_mx.o(.text); + *libagbsyscall.a:ArcTan2.o(.text); + *libagbsyscall.a:BgAffineSet.o(.text); + *libagbsyscall.a:CpuFastSet.o(.text); + *libagbsyscall.a:CpuSet.o(.text); + *libagbsyscall.a:Div.o(.text); + *libagbsyscall.a:Mod.o(.text); + *libagbsyscall.a:LZ77UnCompVram.o(.text); + *libagbsyscall.a:LZ77UnCompWram.o(.text); + *libagbsyscall.a:MultiBoot.o(.text); + *libagbsyscall.a:ObjAffineSet.o(.text); + *libagbsyscall.a:RLUnCompVram.o(.text); + *libagbsyscall.a:RLUnCompWram.o(.text); + *libagbsyscall.a:RegisterRamReset.o(.text); + *libagbsyscall.a:SoftReset.o(.text); + *libagbsyscall.a:Sqrt.o(.text); + *libagbsyscall.a:VBlankIntrWait.o(.text); + *libsiirtc.a:siirtc.o(.text); + *libgcc.a:_call_via_rX.o(.text); + *libgcc.a:_modsi3.o(.text); + *libgcc.a:_umodsi3.o(.text); + *libgcc.a:_dvmd_tls.o(.text); + } =0 + + .rodata : + ALIGN(4) + { + src/main.o(.rodata); + src/rtc.o(.rodata); + src/flash.o(.rodata); + } =0 + + lib_rodata : + ALIGN(4) + { + *libagb_flash.a:agb_flash.o(.rodata); + *libagb_flash.a:agb_flash_1m.o(.rodata); + *libagb_flash.a:agb_flash_mx.o(.rodata); + *libagb_flash.a:agb_flash_le.o(.rodata); + *libsiirtc.a:siirtc.o(.rodata); + } + + . = 0x2020000; + + ewram (NOLOAD) : + ALIGN(4) + { + + } + + . = 0x3001000; + + iwram (NOLOAD) : + ALIGN(4) + { + + . = 0x40; + + end = .; + } + + . = 0x8000000; + + RS_Rom (NOLOAD) : + ALIGN(4) + { + _start = .; + . += 4; + RomHeaderNintendoLogo = .; + . += 156; + RS_RomHeader = .; + RomHeaderGameTitle = .; + . += 12; + RomHeaderGameCode = .; + . += 4; + RomHeaderMakerCode = .; + . += 2; + RomHeaderMagic = .; + . += 1; + RomHeaderMainUnitCode = .; + . += 1; + RomHeaderDeviceType = .; + . += 1; + RomHeaderReserved1 = .; + . += 7; + RomHeaderSoftwareVersion = .; + . += 1; + RomHeaderChecksum = .; + . += 1; + RomHeaderReserved2 = .; + . += 6; + GPIOPortData = .; + . += 2; + GPIOPortDirection = .; + . += 2; + GPIOPortReadEnable = .; + } =0 + + /DISCARD/ : + { + *(*); + } +} diff --git a/berry_fix/payload/rom.sha1 b/berry_fix/payload/rom.sha1 new file mode 100644 index 000000000..92eee7e87 --- /dev/null +++ b/berry_fix/payload/rom.sha1 @@ -0,0 +1 @@ +866991e2b5a8de02d12f53abe0ee9af03a2b6e01 payload.gba diff --git a/berry_fix/payload/src/flash.c b/berry_fix/payload/src/flash.c new file mode 100644 index 000000000..3a0369dda --- /dev/null +++ b/berry_fix/payload/src/flash.c @@ -0,0 +1,752 @@ +#include +#include +#include "constants/vars.h" +#include "global.h" +#include "main.h" +#include "flash.h" +#include "rtc.h" + +struct SaveBlockChunk +{ + u8 * data; + u16 size; +}; + +u8 WriteSaveBlockChunks(u16 a0, const struct SaveBlockChunk * a1); +u8 WriteSingleChunk(u16 a0, const struct SaveBlockChunk * a1); +u8 TryWriteSector(u8, u8 *); +u8 EraseCurrentChunk(u16 a0, const struct SaveBlockChunk * a1); +u8 TryReadAllSaveSectorsCurrentSlot(u16 a0, const struct SaveBlockChunk * a1); +u8 ReadAllSaveSectorsCurrentSlot(u16 a0, const struct SaveBlockChunk * a1); +u8 GetSaveValidStatus(const struct SaveBlockChunk * a1); +u32 DoReadFlashWholeSection(u8 a0, struct SaveSector * a1); +u16 CalculateChecksum(const void *, u16); + +u16 gFirstSaveSector; +u32 gPrevSaveCounter; +u16 gLastKnownGoodSector; +u32 gDamagedSaveSectors; +u32 gSaveCounter; +struct SaveSector * gFastSaveSection; +u16 gCurSaveChunk; +bool32 gFlashIdentIsValid; + +EWRAM_DATA struct SaveBlock2 gSaveBlock2 = {}; +EWRAM_DATA struct SaveBlock1 gSaveBlock1 = {}; +EWRAM_DATA struct PokemonStorage gPokemonStorage = {}; + +// Each 4 KiB flash sector contains 3968 bytes of actual data followed by a 128 byte footer +#define SECTOR_DATA_SIZE 3968 +#define SECTOR_FOOTER_SIZE 128 + +#define SAVEBLOCK_CHUNK(structure, chunkNum) \ +{ \ + (u8 *)&structure + chunkNum * SECTOR_DATA_SIZE, \ + min(sizeof(structure) - chunkNum * SECTOR_DATA_SIZE, SECTOR_DATA_SIZE) \ +} \ + +static const struct SaveBlockChunk sSaveBlockChunks[] = +{ + SAVEBLOCK_CHUNK(gSaveBlock2, 0), + + SAVEBLOCK_CHUNK(gSaveBlock1, 0), + SAVEBLOCK_CHUNK(gSaveBlock1, 1), + SAVEBLOCK_CHUNK(gSaveBlock1, 2), + SAVEBLOCK_CHUNK(gSaveBlock1, 3), + + SAVEBLOCK_CHUNK(gPokemonStorage, 0), + SAVEBLOCK_CHUNK(gPokemonStorage, 1), + SAVEBLOCK_CHUNK(gPokemonStorage, 2), + SAVEBLOCK_CHUNK(gPokemonStorage, 3), + SAVEBLOCK_CHUNK(gPokemonStorage, 4), + SAVEBLOCK_CHUNK(gPokemonStorage, 5), + SAVEBLOCK_CHUNK(gPokemonStorage, 6), + SAVEBLOCK_CHUNK(gPokemonStorage, 7), + SAVEBLOCK_CHUNK(gPokemonStorage, 8), +}; + +const u16 gInfoMessagesPal[] = INCBIN_U16("graphics/msg_box.gbapal"); +const u8 gInfoMessagesTilemap[] = INCBIN_U8("graphics/msg_box.tilemap.lz"); +const u8 gInfoMessagesGfx[] = INCBIN_U8("graphics/msg_box.4bpp.lz"); + +bool32 flash_maincb_ident_is_valid(void) +{ + gFlashIdentIsValid = TRUE; + if (!IdentifyFlash()) + { + SetFlashTimerIntr(0, &((IntrFunc *)gIntrFuncPointers)[9]); + return TRUE; + } + gFlashIdentIsValid = FALSE; + return FALSE; +} + +void Call_ReadFlash(u16 sectorNum, ptrdiff_t offset, void * dest, size_t size) +{ + ReadFlash(sectorNum, offset, dest, size); +} + +u8 Call_WriteSaveBlockChunks(u16 a0, const struct SaveBlockChunk * a1) +{ + return WriteSaveBlockChunks(a0, a1); +} + +u8 Call_TryReadAllSaveSectorsCurrentSlot(u16 a0, const struct SaveBlockChunk * a1) +{ + return TryReadAllSaveSectorsCurrentSlot(a0, a1); +} + +u32 * GetDamagedSaveSectorsPtr(void) +{ + return &gDamagedSaveSectors; +} + +s32 flash_write_save_block_chunks(u8 a0) +{ + u8 i; + + switch (a0) + { + case 0: + default: + Call_WriteSaveBlockChunks(0xFFFF, sSaveBlockChunks); + break; + case 1: + for (i = 0; i < 5; i++) + { + Call_WriteSaveBlockChunks(i, sSaveBlockChunks); + } + break; + case 2: + Call_WriteSaveBlockChunks(0, sSaveBlockChunks); + break; + } + + return 0; +} + +u8 flash_write_save_block_chunks_check_damage(u8 a0) +{ + flash_write_save_block_chunks(a0); + if (*GetDamagedSaveSectorsPtr() == 0) + return 1; + return 0xFF; +} + +u8 flash_maincb_read_save(u32 unused) +{ + return Call_TryReadAllSaveSectorsCurrentSlot(0xFFFF, sSaveBlockChunks); +} + +void msg_load_gfx(void) +{ + REG_DISPCNT = 0; + REG_BG0HOFS = 0; + REG_BG0VOFS = 0; + REG_BLDCNT = 0; + LZ77UnCompVram(gInfoMessagesGfx, (void *)BG_VRAM); + LZ77UnCompVram(gInfoMessagesTilemap, (void *)BG_SCREEN_ADDR(28)); + CpuCopy16(gInfoMessagesPal, (void *)BG_PLTT, 0x200); + REG_BG0CNT = BGCNT_SCREENBASE(28) | BGCNT_TXT512x512; + REG_DISPCNT = DISPCNT_BG0_ON; +} + +void msg_display(enum MsgBoxUpdateMessage a0) +{ + switch (a0) + { + case MSGBOX_WILL_NOW_UPDATE: + REG_BG0HOFS = 0; + REG_BG0VOFS = 0; + break; + case MSGBOX_HAS_BEEN_UPDATED: + REG_BG0HOFS = 0x100; + REG_BG0VOFS = 0; + break; + case MSGBOX_UNABLE_TO_UPDATE: + REG_BG0HOFS = 0x100; + REG_BG0VOFS = 0xB0; + break; + case MSGBOX_NO_NEED_TO_UPDATE: + REG_BG0HOFS = 0; + REG_BG0VOFS = 0xB0; + break; + case MSGBOX_UPDATING: + REG_BG0HOFS = 0; + REG_BG0VOFS = 0x160; + break; + } +} + +void Save_EraseAllData(void) +{ + u16 i; + for (i = 0; i < 32; i++) + EraseFlashSector(i); +} + +void Save_ResetSaveCounters(void) +{ + gSaveCounter = 0; + gFirstSaveSector = 0; + gDamagedSaveSectors = 0; +} + +bool32 SetSectorDamagedStatus(u8 op, u8 sectorNum) +{ + bool32 retVal = FALSE; + + switch (op) + { + case SECTOR_DAMAGED: + gDamagedSaveSectors |= (1 << sectorNum); + break; + case SECTOR_OK: + gDamagedSaveSectors &= ~(1 << sectorNum); + break; + case SECTOR_CHECK: // unused + if (gDamagedSaveSectors & (1 << sectorNum)) + retVal = TRUE; + break; + } + + return retVal; +} + +u8 WriteSaveBlockChunks(u16 chunkId, const struct SaveBlockChunk *chunks) +{ + u32 retVal; + u16 i; + + gFastSaveSection = eSaveSection; + + if (chunkId != 0xFFFF) // write single chunk + { + retVal = WriteSingleChunk(chunkId, chunks); + } + else // write all chunks + { + gLastKnownGoodSector = gFirstSaveSector; + gPrevSaveCounter = gSaveCounter; + gFirstSaveSector++; + gFirstSaveSector %= NUM_SECTORS_PER_SAVE_SLOT; + gSaveCounter++; + retVal = SAVE_STATUS_OK; + + for (i = 0; i < NUM_SECTORS_PER_SAVE_SLOT; i++) + WriteSingleChunk(i, chunks); + + // Check for any bad sectors + if (gDamagedSaveSectors != 0) // skip the damaged sector. + { + retVal = SAVE_STATUS_ERROR; + gFirstSaveSector = gLastKnownGoodSector; + gSaveCounter = gPrevSaveCounter; + } + } + + return retVal; +} + +u8 WriteSingleChunk(u16 chunkId, const struct SaveBlockChunk * chunks) +{ + u16 i; + u16 sectorNum; + u8 *chunkData; + u16 chunkSize; + + // select sector number + sectorNum = chunkId + gFirstSaveSector; + sectorNum %= NUM_SECTORS_PER_SAVE_SLOT; + // select save slot + sectorNum += NUM_SECTORS_PER_SAVE_SLOT * (gSaveCounter % 2); + + chunkData = chunks[chunkId].data; + chunkSize = chunks[chunkId].size; + + // clear save section. + for (i = 0; i < sizeof(struct SaveSector); i++) + ((u8 *)gFastSaveSection)[i] = 0; + + gFastSaveSection->id = chunkId; + gFastSaveSection->signature = FILE_SIGNATURE; + gFastSaveSection->counter = gSaveCounter; + for (i = 0; i < chunkSize; i++) + gFastSaveSection->data[i] = chunkData[i]; + gFastSaveSection->checksum = CalculateChecksum(chunkData, chunkSize); + + return TryWriteSector(sectorNum, gFastSaveSection->data); +} + +u8 HandleWriteSectorNBytes(u8 sectorNum, u8 *data, u16 size) +{ + u16 i; + struct SaveSector *section = eSaveSection; + + for (i = 0; i < sizeof(struct SaveSector); i++) + ((char *)section)[i] = 0; + + section->signature = FILE_SIGNATURE; + for (i = 0; i < size; i++) + section->data[i] = data[i]; + section->id = CalculateChecksum(data, size); // though this appears to be incorrect, it might be some sector checksum instead of a whole save checksum and only appears to be relevent to HOF data, if used. + + return TryWriteSector(sectorNum, section->data); +} + +u8 TryWriteSector(u8 sectorNum, u8 *data) +{ + if (ProgramFlashSectorAndVerify(sectorNum, data) != 0) // is damaged? + { + SetSectorDamagedStatus(SECTOR_DAMAGED, sectorNum); // set damaged sector bits. + return SAVE_STATUS_ERROR; + } + else + { + SetSectorDamagedStatus(SECTOR_OK, sectorNum); // unset damaged sector bits. it's safe now. + return SAVE_STATUS_OK; + } +} + +u32 RestoreSaveBackupVarsAndIncrement(const struct SaveBlockChunk *chunk) // chunk is unused +{ + gFastSaveSection = eSaveSection; + gLastKnownGoodSector = gFirstSaveSector; + gPrevSaveCounter = gSaveCounter; + gFirstSaveSector++; + gFirstSaveSector %= NUM_SECTORS_PER_SAVE_SLOT; + gSaveCounter++; + gCurSaveChunk = 0; + gDamagedSaveSectors = 0; + return 0; +} + +u32 RestoreSaveBackupVars(const struct SaveBlockChunk *chunk) +{ + gFastSaveSection = eSaveSection; + gLastKnownGoodSector = gFirstSaveSector; + gPrevSaveCounter = gSaveCounter; + gCurSaveChunk = 0; + gDamagedSaveSectors = 0; + return 0; +} + +u8 WriteSingleChunkAndIncrement(u16 a1, const struct SaveBlockChunk * chunk) +{ + u8 retVal; + + if (gCurSaveChunk < a1 - 1) + { + retVal = SAVE_STATUS_OK; + WriteSingleChunk(gCurSaveChunk, chunk); + gCurSaveChunk++; + if (gDamagedSaveSectors) + { + retVal = SAVE_STATUS_ERROR; + gFirstSaveSector = gLastKnownGoodSector; + gSaveCounter = gPrevSaveCounter; + } + } + else + { + retVal = SAVE_STATUS_ERROR; + } + + return retVal; +} + +u8 ErasePreviousChunk(u16 a1, const struct SaveBlockChunk *chunk) +{ + u8 retVal = SAVE_STATUS_OK; + + EraseCurrentChunk(a1 - 1, chunk); + + if (gDamagedSaveSectors) + { + retVal = SAVE_STATUS_ERROR; + gFirstSaveSector = gLastKnownGoodSector; + gSaveCounter = gPrevSaveCounter; + } + return retVal; +} + +u8 EraseCurrentChunk(u16 chunkId, const struct SaveBlockChunk *chunks) +{ + u16 i; + u16 sector; + u8 *data; + u16 size; + u8 status; + + // select sector number + sector = chunkId + gFirstSaveSector; + sector %= NUM_SECTORS_PER_SAVE_SLOT; + // select save slot + sector += NUM_SECTORS_PER_SAVE_SLOT * (gSaveCounter % 2); + + data = chunks[chunkId].data; + size = chunks[chunkId].size; + + // clear temp save section. + for (i = 0; i < sizeof(struct SaveSector); i++) + ((char *)gFastSaveSection)[i] = 0; + + gFastSaveSection->id = chunkId; + gFastSaveSection->signature = FILE_SIGNATURE; + gFastSaveSection->counter = gSaveCounter; + + // set temp section's data. + for (i = 0; i < size; i++) + gFastSaveSection->data[i] = data[i]; + + // calculate checksum. + gFastSaveSection->checksum = CalculateChecksum(data, size); + + EraseFlashSector(sector); + + status = SAVE_STATUS_OK; + + for (i = 0; i < sizeof(struct UnkSaveSection); i++) + { + if (ProgramFlashByte(sector, i, gFastSaveSection->data[i])) + { + status = SAVE_STATUS_ERROR; + break; + } + } + + if (status == SAVE_STATUS_ERROR) + { + SetSectorDamagedStatus(SECTOR_DAMAGED, sector); + return SAVE_STATUS_ERROR; + } + else + { + status = SAVE_STATUS_OK; + + for (i = 0; i < 7; i++) + { + if (ProgramFlashByte(sector, 0xFF9 + i, ((u8 *)gFastSaveSection)[0xFF9 + i])) + { + status = SAVE_STATUS_ERROR; + break; + } + } + + if (status == SAVE_STATUS_ERROR) + { + SetSectorDamagedStatus(SECTOR_DAMAGED, sector); + return SAVE_STATUS_ERROR; + } + else + { + SetSectorDamagedStatus(SECTOR_OK, sector); + return SAVE_STATUS_OK; + } + } +} + +u8 WriteSomeFlashByteToPrevSector(u16 a1, const struct SaveBlockChunk *chunk) +{ + u16 sector; + + // select sector number + sector = a1 + gFirstSaveSector - 1; + sector %= NUM_SECTORS_PER_SAVE_SLOT; + // select save slot + sector += NUM_SECTORS_PER_SAVE_SLOT * (gSaveCounter % 2); + + if (ProgramFlashByte(sector, sizeof(struct UnkSaveSection), ((u8 *)gFastSaveSection)[sizeof(struct UnkSaveSection)])) + { + // sector is damaged, so enable the bit in gDamagedSaveSectors and restore the last written sector and save counter. + SetSectorDamagedStatus(SECTOR_DAMAGED, sector); + gFirstSaveSector = gLastKnownGoodSector; + gSaveCounter = gPrevSaveCounter; + return SAVE_STATUS_ERROR; + } + else + { + SetSectorDamagedStatus(SECTOR_OK, sector); + return SAVE_STATUS_OK; + } +} + +u8 WriteSomeFlashByte0x25ToPrevSector(u16 a1, const struct SaveBlockChunk *chunk) +{ + u16 sector; + + sector = a1 + gFirstSaveSector - 1; + sector %= NUM_SECTORS_PER_SAVE_SLOT; + sector += NUM_SECTORS_PER_SAVE_SLOT * (gSaveCounter % 2); + + if (ProgramFlashByte(sector, sizeof(struct UnkSaveSection), 0x25)) + { + // sector is damaged, so enable the bit in gDamagedSaveSectors and restore the last written sector and save counter. + SetSectorDamagedStatus(SECTOR_DAMAGED, sector); + gFirstSaveSector = gLastKnownGoodSector; + gSaveCounter = gPrevSaveCounter; + return SAVE_STATUS_ERROR; + } + else + { + SetSectorDamagedStatus(SECTOR_OK, sector); + return SAVE_STATUS_OK; + } +} + +u8 TryReadAllSaveSectorsCurrentSlot(u16 a1, const struct SaveBlockChunk *chunk) +{ + u8 retVal; + gFastSaveSection = eSaveSection; + if (a1 != 0xFFFF) + { + retVal = SAVE_STATUS_ERROR; + } + else + { + retVal = GetSaveValidStatus(chunk); + ReadAllSaveSectorsCurrentSlot(0xFFFF, chunk); + } + + return retVal; +} + +u8 ReadAllSaveSectorsCurrentSlot(u16 a1, const struct SaveBlockChunk *chunks) +{ + u16 i; + u16 checksum; + u16 sector = NUM_SECTORS_PER_SAVE_SLOT * (gSaveCounter % 2); + u16 id; + + for (i = 0; i < NUM_SECTORS_PER_SAVE_SLOT; i++) + { + DoReadFlashWholeSection(i + sector, gFastSaveSection); + id = gFastSaveSection->id; + if (id == 0) + gFirstSaveSector = i; + checksum = CalculateChecksum(gFastSaveSection->data, chunks[id].size); + if (gFastSaveSection->signature == FILE_SIGNATURE + && gFastSaveSection->checksum == checksum) + { + u16 j; + for (j = 0; j < chunks[id].size; j++) + chunks[id].data[j] = gFastSaveSection->data[j]; + } + } + + return 1; +} + +u8 GetSaveValidStatus(const struct SaveBlockChunk *chunks) +{ + u16 sector; + bool8 signatureValid; + u16 checksum; + u32 slot1saveCounter = 0; + u32 slot2saveCounter = 0; + u8 slot1Status; + u8 slot2Status; + u32 validSectors; + const u32 ALL_SECTORS = (1 << NUM_SECTORS_PER_SAVE_SLOT) - 1; // bitmask of all saveblock sectors + + // check save slot 1. + validSectors = 0; + signatureValid = FALSE; + for (sector = 0; sector < NUM_SECTORS_PER_SAVE_SLOT; sector++) + { + DoReadFlashWholeSection(sector, gFastSaveSection); + if (gFastSaveSection->signature == FILE_SIGNATURE) + { + signatureValid = TRUE; + checksum = CalculateChecksum(gFastSaveSection->data, chunks[gFastSaveSection->id].size); + if (gFastSaveSection->checksum == checksum) + { + slot1saveCounter = gFastSaveSection->counter; + validSectors |= 1 << gFastSaveSection->id; + } + } + } + + if (signatureValid) + { + if (validSectors == ALL_SECTORS) + slot1Status = SAVE_STATUS_OK; + else + slot1Status = SAVE_STATUS_ERROR; + } + else + { + slot1Status = SAVE_STATUS_EMPTY; + } + + // check save slot 2. + validSectors = 0; + signatureValid = FALSE; + for (sector = 0; sector < NUM_SECTORS_PER_SAVE_SLOT; sector++) + { + DoReadFlashWholeSection(NUM_SECTORS_PER_SAVE_SLOT + sector, gFastSaveSection); + if (gFastSaveSection->signature == FILE_SIGNATURE) + { + signatureValid = TRUE; + checksum = CalculateChecksum(gFastSaveSection->data, chunks[gFastSaveSection->id].size); + if (gFastSaveSection->checksum == checksum) + { + slot2saveCounter = gFastSaveSection->counter; + validSectors |= 1 << gFastSaveSection->id; + } + } + } + + if (signatureValid) + { + if (validSectors == ALL_SECTORS) + slot2Status = SAVE_STATUS_OK; + else + slot2Status = SAVE_STATUS_ERROR; + } + else + { + slot2Status = SAVE_STATUS_EMPTY; + } + + if (slot1Status == SAVE_STATUS_OK && slot2Status == SAVE_STATUS_OK) + { + // Choose counter of the most recent save file + if ((slot1saveCounter == -1 && slot2saveCounter == 0) || (slot1saveCounter == 0 && slot2saveCounter == -1)) + { + if ((unsigned)(slot1saveCounter + 1) < (unsigned)(slot2saveCounter + 1)) + gSaveCounter = slot2saveCounter; + else + gSaveCounter = slot1saveCounter; + } + else + { + if (slot1saveCounter < slot2saveCounter) + gSaveCounter = slot2saveCounter; + else + gSaveCounter = slot1saveCounter; + } + return SAVE_STATUS_OK; + } + + if (slot1Status == SAVE_STATUS_OK) + { + gSaveCounter = slot1saveCounter; + if (slot2Status == SAVE_STATUS_ERROR) + return SAVE_STATUS_ERROR; + else + return SAVE_STATUS_OK; + } + + if (slot2Status == SAVE_STATUS_OK) + { + gSaveCounter = slot2saveCounter; + if (slot1Status == SAVE_STATUS_ERROR) + return SAVE_STATUS_ERROR; + else + return SAVE_STATUS_OK; + } + + if (slot1Status == SAVE_STATUS_EMPTY && slot2Status == SAVE_STATUS_EMPTY) + { + gSaveCounter = 0; + gFirstSaveSector = 0; + return SAVE_STATUS_EMPTY; + } + + gSaveCounter = 0; + gFirstSaveSector = 0; + return 2; +} + +u8 ReadSomeUnknownSectorAndVerify(u8 sector, u8 *data, u16 size) +{ + u16 i; + struct SaveSector *section = eSaveSection; + + DoReadFlashWholeSection(sector, section); + if (section->signature == FILE_SIGNATURE) + { + u16 checksum = CalculateChecksum(section->data, size); + if (section->id == checksum) + { + for (i = 0; i < size; i++) + data[i] = section->data[i]; + return SAVE_STATUS_OK; + } + else + { + return 2; + } + } + else + { + return SAVE_STATUS_EMPTY; + } +} + +u32 DoReadFlashWholeSection(u8 sector, struct SaveSector *section) +{ + ReadFlash(sector, 0, section->data, sizeof(struct SaveSector)); + return 1; +} + +u16 CalculateChecksum(const void *data, u16 size) +{ + u16 i; + u32 checksum = 0; + + for (i = 0; i < (size / 4); i++) + { + checksum += *((u32 *)data); + data += sizeof(u32); + } + + return ((checksum >> 16) + checksum); +} + +void nullsub_0201182C() +{ +} + +void nullsub_02011830() +{ +} + +void nullsub_02011834() +{ +} + +u16 * get_var_addr(u16 a0) +{ + if (a0 < VARS_START) + return NULL; + if (a0 < VAR_SPECIAL_0) + return &gSaveBlock1.vars[a0 - VARS_START]; + return NULL; +} + +bool32 flash_maincb_check_need_reset_pacifidlog_tm(void) +{ + u8 sp0; + u16 * data = get_var_addr(VAR_PACIFIDLOG_TM_RECEIVED_DAY); + rtc_maincb_is_time_since_last_berry_update_positive(&sp0); + if (*data <= gRtcUTCTime.days) + return TRUE; + else + return FALSE; +} + +bool32 flash_maincb_reset_pacifidlog_tm(void) +{ + u8 sp0; + if (flash_maincb_check_need_reset_pacifidlog_tm() == TRUE) + return TRUE; + rtc_maincb_is_time_since_last_berry_update_positive(&sp0); + if (gRtcUTCTime.days < 0) + return FALSE; + *get_var_addr(VAR_PACIFIDLOG_TM_RECEIVED_DAY) = 1; + if (flash_write_save_block_chunks_check_damage(0) != TRUE) + return FALSE; + return TRUE; +} diff --git a/berry_fix/payload/src/main.c b/berry_fix/payload/src/main.c new file mode 100644 index 000000000..249150665 --- /dev/null +++ b/berry_fix/payload/src/main.c @@ -0,0 +1,289 @@ +#include +#include "global.h" +#include "main.h" +#include "rtc.h" +#include "flash.h" + +static s32 gInitialWaitTimer; +IntrFunc gIntrTable[16]; +u16 gHeldKeys; +u16 gNewKeys; +u8 gIntrVector[0x100]; +u32 gUpdateSuccessful; +u32 gUnknown_3001194; +u32 gUnknown_30011A0[0x19]; +u32 gMainCallbackState; +u32 gGameVersion; + +EWRAM_DATA u8 gSharedMem[0x8000] = {}; + +void IntrMain(void); +void ReadKeys(void); +void dummy_intr_0(void); +void dummy_intr_1(void); +void main_callback(u32 *, void *, void *); + + +const char gBerryFixGameCode[] = "AGBJ"; +const IntrFunc gIntrFuncPointers[] = { + dummy_intr_0, + dummy_intr_1, + dummy_intr_0, + dummy_intr_0, + dummy_intr_0, + dummy_intr_0, + dummy_intr_0, + dummy_intr_0, + dummy_intr_0, + dummy_intr_0, + NULL, + NULL, + NULL +}; +const char gVersionData[][2] = { + {'J', 1}, + {'E', 2}, + {'D', 1}, + {'F', 1}, + {'I', 1}, + {'S', 1} +}; +const char gRubyTitleAndCode[] = "POKEMON RUBYAXV"; +const char gSapphireTitleAndCode[] = "POKEMON SAPPAXP"; +const u16 sDebugPals[20] = { + RGB(00, 00, 00), + RGB(31, 00, 00), + RGB(00, 31, 00), + RGB(00, 00, 31) +}; +const u16 sDebugDigitsGfx[] = INCBIN_U16("graphics/debug_digits.4bpp"); + +void AgbMain(void) +{ + RegisterRamReset(0x1E); + DmaCopy32(3, gIntrFuncPointers, gIntrTable, sizeof gIntrFuncPointers); + DmaCopy32(3, IntrMain, gIntrVector, sizeof(gIntrVector)); + INTR_VECTOR = gIntrVector; + REG_IE = INTR_FLAG_VBLANK; + if (*RomHeaderMagic == 0x96 && *(u32 *)RomHeaderGameCode == *(u32 *)gBerryFixGameCode) + REG_IE |= INTR_FLAG_GAMEPAK; + REG_DISPSTAT = DISPSTAT_VBLANK_INTR; + REG_IME = INTR_FLAG_VBLANK; + msg_load_gfx(); + gMainCallbackState = MAINCB_INIT; + gUnknown_3001194 = 0; + for (;;) + { + VBlankIntrWait(); + ReadKeys(); + main_callback(&gMainCallbackState, gUnknown_30011A0, gSharedMem); + } +} + +void dummy_intr_1(void) +{} + +void dummy_intr_0(void) +{} + +void ReadKeys(void) +{ + u16 keyInput = REG_KEYINPUT ^ KEYS_MASK; + gNewKeys = keyInput & ~gHeldKeys; + gHeldKeys = keyInput; +} + +void fill_palette(const u8 * src, u16 * dest, u8 value) +{ + s32 i; + for (i = 0; src[i] != 0; i++) + dest[i] = src[i] | value << 12; +} + +bool32 berry_fix_memcmp(const char * src1, const char * src2, size_t size) +{ + s32 i; + for (i = 0; i < size; i++) + { + if (src1[i] != src2[i]) + return FALSE; + } + return TRUE; +} + +s32 validate_rom_header_internal(void) +{ + char languageCode = *(RomHeaderGameCode + 3); + s32 softwareVersion = *RomHeaderSoftwareVersion; + s32 shouldUpdate = -1; + s32 i; + for (i = 0; i < ARRAY_COUNT(gVersionData); i++) + { + if (languageCode == gVersionData[i][0]) + { + if (softwareVersion >= gVersionData[i][1]) + { + shouldUpdate = 0; + } + else + { + shouldUpdate = 1; + } + break; + } + } + if (shouldUpdate != -1) + { + if (berry_fix_memcmp(RomHeaderGameTitle, gRubyTitleAndCode, 15) == TRUE) + { + if (shouldUpdate == 0) + return RUBY_NONEED; + else + { + gGameVersion = VERSION_RUBY; + return RUBY_UPDATABLE; + } + } + else if (berry_fix_memcmp(RomHeaderGameTitle, gSapphireTitleAndCode, 15) == TRUE) + { + if (shouldUpdate == 0) + return SAPPHIRE_NONEED; + else + { + gGameVersion = VERSION_SAPPHIRE; + return SAPPHIRE_UPDATABLE; + } + } + } + return INVALID; +} + +s32 validate_rom_header(void) +{ + if (*RomHeaderMakerCode == '0' && *(RomHeaderMakerCode + 1) == '1' && *RomHeaderMagic == 0x96) + return validate_rom_header_internal(); + else + return INVALID; +} + +void main_callback(u32 * state, void * unused1, void * unused2) +{ + u8 year; + switch (*state) + { + case MAINCB_INIT: + msg_display(MSGBOX_WILL_NOW_UPDATE); + if (++gInitialWaitTimer >= 180) + { + gInitialWaitTimer = 0; + gUpdateSuccessful = 0; + switch (validate_rom_header()) + { + case SAPPHIRE_UPDATABLE: + case RUBY_UPDATABLE: // Should Update Ruby + ++(*state); // MAINCB_CHECK_RTC + break; + case INVALID: // Invalid header + *state = MAINCB_ERROR; + break; + case SAPPHIRE_NONEED: // Should not update Sapphire + case RUBY_NONEED: // Should not update Ruby + *state = MAINCB_NO_NEED_TO_FIX; + break; + } + } + break; + case MAINCB_CHECK_RTC: + if (!rtc_maincb_is_rtc_working()) + *state = MAINCB_ERROR; + else + ++(*state); // MAINCB_CHECK_FLASH + break; + case MAINCB_CHECK_FLASH: + if (flash_maincb_ident_is_valid() == TRUE) + ++(*state); // MAINCB_READ_SAVE + else + *state = MAINCB_ERROR; + break; + case MAINCB_READ_SAVE: + if (flash_maincb_read_save(0) == SAVE_STATUS_OK) + ++(*state); // MAINCB_CHECK_TIME + else + *state = MAINCB_ERROR; + break; + case MAINCB_CHECK_TIME: + if (rtc_maincb_is_time_since_last_berry_update_positive(&year) == TRUE) + { + if (year == 0) + ++(*state); // MAINCB_FIX_DATE + else + *state = MAINCB_CHECK_PACIFIDLOG_TM; + } + else + { + if (year != 1) + *state = MAINCB_YEAR_MAKES_NO_SENSE; + else + ++(*state); // MAINCB_FIX_DATE + } + break; + case MAINCB_FIX_DATE: + rtc_maincb_fix_date(); + gUpdateSuccessful |= 1; + *state = MAINCB_CHECK_PACIFIDLOG_TM; + break; + case MAINCB_CHECK_PACIFIDLOG_TM: + if (flash_maincb_check_need_reset_pacifidlog_tm() == TRUE) + *state = MAINCB_FINISHED; + else + *state = MAINCB_FIX_PACIFIDLOG_TM; + break; + case MAINCB_FIX_PACIFIDLOG_TM: + msg_display(MSGBOX_UPDATING); + if (flash_maincb_reset_pacifidlog_tm() == TRUE) + { + gUpdateSuccessful |= 1; + *state = MAINCB_FINISHED; + } + else + *state = MAINCB_ERROR; + break; + case MAINCB_FINISHED: + if (gUpdateSuccessful == 0) + *state = MAINCB_NO_NEED_TO_FIX; + else + msg_display(MSGBOX_HAS_BEEN_UPDATED); + break; + case MAINCB_NO_NEED_TO_FIX: + msg_display(MSGBOX_NO_NEED_TO_UPDATE); + break; + case MAINCB_YEAR_MAKES_NO_SENSE: + msg_display(MSGBOX_UNABLE_TO_UPDATE); + break; + case MAINCB_ERROR: + msg_display(MSGBOX_UNABLE_TO_UPDATE); + break; + } +} + +void DBG_LoadDigitsPal(void) +{ + const u16 * src; + s32 i; + register vu16 * dest asm("r3") = (vu16 *)BG_PLTT + 1; + DmaFill16(3, RGB(31, 31, 31), (vu16 *)BG_PLTT, BG_PLTT_SIZE); + src = sDebugPals; + for (i = 0; i < 4; i++) + { + *dest = *src; + dest += 16; + src++; + } +} + +void DBG_LoadDigits(void) +{ + DmaFill16(3, 0x1111, (void *)VRAM + 0x8420, 0x1800); + DmaCopy32(3, sDebugDigitsGfx, (void *)VRAM + 0x8600, 0x200); + DBG_LoadDigitsPal(); +} diff --git a/berry_fix/payload/src/rtc.c b/berry_fix/payload/src/rtc.c new file mode 100644 index 000000000..97692e205 --- /dev/null +++ b/berry_fix/payload/src/rtc.c @@ -0,0 +1,346 @@ +#include +#include +#include "global.h" +#include "main.h" + +struct Time gTimeSinceBerryUpdate; +struct Time gRtcUTCTime; + +static u16 sRtcProbeStatus; +static struct SiiRtcInfo sRtcInfoBuffer; +static u8 sRtcProbeCode; +static u16 sImeBak; +static struct SiiRtcInfo sRtcInfoWork; + +const struct SiiRtcInfo sDefaultRTC = { + .year = 0, // 2000 + .month = 1, // January + .day = 1, // 01 + .dayOfWeek = 0, + .hour = 0, + .minute = 0, + .second = 0, + .status = 0, + .alarmHour = 0, + .alarmMinute = 0 +}; +const s32 sDaysPerMonth[] = { + 31, + 28, + 31, + 30, + 31, + 30, + 31, + 31, + 30, + 31, + 30, + 31 +}; + +void rtc_get_status_and_datetime(struct SiiRtcInfo *); +u16 rtc_validate_datetime(struct SiiRtcInfo *); + + +void rtc_intr_disable(void) +{ + sImeBak = REG_IME; + REG_IME = 0; +} + +void rtc_intr_enable(void) +{ + REG_IME = sImeBak; +} + +s32 bcd_to_hex(u8 a0) +{ + if (a0 >= 0xa0 || (a0 & 0xF) >= 10) + return 0xFF; + return ((a0 >> 4) & 0xF) * 10 + (a0 & 0xF); +} + +bool8 is_leap_year(u8 year) +{ + if ((year % 4 == 0 && year % 100 != 0) || year % 400 == 0) + return TRUE; + return FALSE; +} + +u16 rtc_count_days_parameterized(u8 year, u8 month, u8 day) +{ + u16 numDays = 0; + s32 i; + for (i = year - 1; i > 0; i--) + { + numDays += 365; + if (is_leap_year(i) == TRUE) + numDays++; + } + for (i = 0; i < month - 1; i++) + numDays += sDaysPerMonth[i]; + if (month > MONTH_FEB && is_leap_year(year) == TRUE) + numDays++; + numDays += day; + return numDays; +} + +u16 rtc_count_days_from_info(struct SiiRtcInfo *info) +{ + return rtc_count_days_parameterized(bcd_to_hex(info->year), bcd_to_hex(info->month), bcd_to_hex(info->day)); +} + +static void rtc_probe_status(void) +{ + sRtcProbeStatus = 0; + rtc_intr_disable(); + SiiRtcUnprotect(); + sRtcProbeCode = SiiRtcProbe(); + rtc_intr_enable(); + if ((sRtcProbeCode & 0xF) != 1) + sRtcProbeStatus = 1; + else + { + if (sRtcProbeCode & 0xF0) + sRtcProbeStatus = 2; + else + sRtcProbeStatus = 0; + rtc_get_status_and_datetime(&sRtcInfoBuffer); + sRtcProbeStatus = rtc_validate_datetime(&sRtcInfoBuffer); + } +} + +u16 rtc_get_probe_status(void) +{ + return sRtcProbeStatus; +} + +void sub_020106EC(struct SiiRtcInfo * info) +{ + if (sRtcProbeStatus & 0xFF0) + *info = sDefaultRTC; + else + rtc_get_status_and_datetime(info); +} + +void rtc_get_datetime(struct SiiRtcInfo * info) +{ + rtc_intr_disable(); + SiiRtcGetDateTime(info); + rtc_intr_enable(); +} + +void rtc_get_status(struct SiiRtcInfo * info) +{ + rtc_intr_disable(); + SiiRtcGetStatus(info); + rtc_intr_enable(); +} + +void rtc_get_status_and_datetime(struct SiiRtcInfo * info) +{ + rtc_get_status(info); + rtc_get_datetime(info); +} + +u16 rtc_validate_datetime(struct SiiRtcInfo * info) +{ + s32 year, month, day; + u16 r4 = (info->status & SIIRTCINFO_POWER) ? 0x20 : 0; + if (!(info->status & SIIRTCINFO_24HOUR)) + r4 |= 0x10; + year = bcd_to_hex(info->year); + if (year == 0xFF) + r4 |= 0x40; + month = bcd_to_hex(info->month); + if (month == 0xFF || month == 0 || month > 12) + r4 |= 0x80; + day = bcd_to_hex(info->day); + if (day == 0xFF) + r4 |= 0x100; + if (month == MONTH_FEB) + { + if (day > is_leap_year(year) + sDaysPerMonth[1]) + r4 |= 0x100; + } + else + { + if (day > sDaysPerMonth[month - 1]) + r4 |= 0x100; + } + day = bcd_to_hex(info->hour); + if (day > 24) + r4 |= 0x200; + day = bcd_to_hex(info->minute); + if (day > 60) + r4 |= 0x400; + day = bcd_to_hex(info->second); + if (day > 60) + r4 |= 0x800; + return r4; +} + +void rtc_reset(void) +{ + rtc_intr_disable(); + SiiRtcReset(); + rtc_intr_enable(); +} + +void rtc_sub_time_from_datetime(struct SiiRtcInfo * datetime, struct Time * dest, struct Time * timediff) +{ + u16 r4 = rtc_count_days_from_info(datetime); + dest->seconds = bcd_to_hex(datetime->second) - timediff->seconds; + dest->minutes = bcd_to_hex(datetime->minute) - timediff->minutes; + dest->hours = bcd_to_hex(datetime->hour) - timediff->hours; + dest->days = r4 - timediff->days; + if (dest->seconds < 0) + { + dest->seconds += 60; + dest->minutes--; + } + if (dest->minutes < 0) + { + dest->minutes += 60; + dest->hours--; + } + if (dest->hours < 0) + { + dest->hours += 24; + dest->days--; + } +} + +void rtc_sub_time_from_time(struct Time * dest, struct Time * diff, struct Time * src) +{ + dest->seconds = src->seconds - diff->seconds; + dest->minutes = src->minutes - diff->minutes; + dest->hours = src->hours - diff->hours; + dest->days = src->days - diff->days; + if (dest->seconds < 0) + { + dest->seconds += 60; + dest->minutes--; + } + if (dest->minutes < 0) + { + dest->minutes += 60; + dest->hours--; + } + if (dest->hours < 0) + { + dest->hours += 24; + dest->days--; + } +} + +bool32 rtc_maincb_is_rtc_working(void) +{ + rtc_probe_status(); + if (rtc_get_probe_status() & 0xFF0) + return FALSE; + return TRUE; +} + +void rtc_set_datetime(struct SiiRtcInfo * info) +{ + vu16 imeBak = REG_IME; + REG_IME = 0; + SiiRtcSetDateTime(info); + REG_IME = imeBak; +} + +bool32 rtc_maincb_is_time_since_last_berry_update_positive(u8 * a0) +{ + rtc_get_status_and_datetime(&sRtcInfoWork); + *a0 = bcd_to_hex(sRtcInfoWork.year); + rtc_sub_time_from_datetime(&sRtcInfoWork, &gRtcUTCTime, LocalTimeOffset); + rtc_sub_time_from_time(&gTimeSinceBerryUpdate, LastBerryTreeUpdate, &gRtcUTCTime); + if (gTimeSinceBerryUpdate.days * 1440 + gTimeSinceBerryUpdate.hours * 60 + gTimeSinceBerryUpdate.minutes >= 0) + return TRUE; + return FALSE; +} + +u32 hex_to_bcd(u8 a0) +{ + u32 r4; + if (a0 > 99) + return 0xFF; + r4 = Div(a0, 10) << 4; + r4 |= Mod(a0, 10); + return r4; +} + +void sii_rtc_inc(u8 * a0) +{ + *a0 = hex_to_bcd(bcd_to_hex(*a0) + 1); +} + +void sii_rtc_inc_month(struct SiiRtcInfo * a0) +{ + sii_rtc_inc(&a0->month); + if (bcd_to_hex(a0->month) > 12) + { + sii_rtc_inc(&a0->year); + a0->month = MONTH_JAN; + } +} + +void sii_rtc_inc_day(struct SiiRtcInfo * a0) +{ + sii_rtc_inc(&a0->day); + if (bcd_to_hex(a0->day) > sDaysPerMonth[bcd_to_hex(a0->month) - 1]) + { + if (!is_leap_year(bcd_to_hex(a0->year)) || bcd_to_hex(a0->month) != MONTH_FEB || bcd_to_hex(a0->day) != 29) + { + a0->day = 1; + sii_rtc_inc_month(a0); + } + } +} + +bool32 rtc_is_past_feb_28_2000(struct SiiRtcInfo * a0) +{ + if (bcd_to_hex(a0->year) == 0) + { + if (bcd_to_hex(a0->month) == MONTH_JAN) + return FALSE; + if (bcd_to_hex(a0->month) > MONTH_FEB) + return TRUE; + if (bcd_to_hex(a0->day) == 29) + return TRUE; + return FALSE; + } + if (bcd_to_hex(a0->year) == 1) + return TRUE; + return FALSE; +} + +void rtc_maincb_fix_date(void) +{ + rtc_get_status_and_datetime(&sRtcInfoWork); + if (bcd_to_hex(sRtcInfoWork.year) == 0 || bcd_to_hex(sRtcInfoWork.year) == 1) + { + if (bcd_to_hex(sRtcInfoWork.year) == 1) + { + sRtcInfoWork.year = 2; + sRtcInfoWork.month = MONTH_JAN; + sRtcInfoWork.day = 2; + rtc_set_datetime(&sRtcInfoWork); + } + else + { + if (rtc_is_past_feb_28_2000(&sRtcInfoWork) == TRUE) + { + sii_rtc_inc_day(&sRtcInfoWork); + sii_rtc_inc(&sRtcInfoWork.year); + } + else + { + sii_rtc_inc(&sRtcInfoWork.year); + } + rtc_set_datetime(&sRtcInfoWork); + } + } +} diff --git a/berry_fix/payload/sym_bss.txt b/berry_fix/payload/sym_bss.txt new file mode 100644 index 000000000..17bb7f204 --- /dev/null +++ b/berry_fix/payload/sym_bss.txt @@ -0,0 +1,5 @@ + .include "src/main.o" + .include "src/rtc.o" + .include "src/flash.o" + .include "*libagb_flash.a:agb_flash.o" + .include "*libsiirtc.a:siirtc.o" diff --git a/berry_fix/payload/sym_common.txt b/berry_fix/payload/sym_common.txt new file mode 100644 index 000000000..e284737fc --- /dev/null +++ b/berry_fix/payload/sym_common.txt @@ -0,0 +1,29 @@ + .include "main.o" + .include "rtc.o" + + .align 4 +gFirstSaveSector: @ 0x03001220 + .space 0x4 + +gPrevSaveCounter: @ 0x03001224 + .space 0x4 + +gLastKnownGoodSector: @ 0x03001228 + .space 0x4 + +gDamagedSaveSectors: @ 0x0300122C + .space 0x4 + +gSaveCounter: @ 0x03001230 + .space 0x4 + +gFastSaveSection: @ 0x03001234 + .space 0x4 + +gCurSaveChunk: + .space 0x4 + +gFlashIdentIsValid: @ 0x0300123C + .space 0x4 + + .include "*libagb_flash.a:agb_flash.o" diff --git a/berry_fix/payload/sym_ewram.txt b/berry_fix/payload/sym_ewram.txt new file mode 100644 index 000000000..2c61f5e7e --- /dev/null +++ b/berry_fix/payload/sym_ewram.txt @@ -0,0 +1,3 @@ + .include "src/main.o" + .include "src/rtc.o" + .include "src/flash.o" diff --git a/berry_fix/rom.sha1 b/berry_fix/rom.sha1 new file mode 100644 index 000000000..145b083b2 --- /dev/null +++ b/berry_fix/rom.sha1 @@ -0,0 +1 @@ +2eb0a94a913bebfb4cb59ceb57f3f965da55ef6d berry_fix.gba diff --git a/data/berry_fix.mb b/data/berry_fix.mb deleted file mode 100644 index 0afff07f5..000000000 Binary files a/data/berry_fix.mb and /dev/null differ diff --git a/data/multiboot_berry_glitch_fix.s b/data/multiboot_berry_glitch_fix.s index bc417a8ba..1eb843d3f 100644 --- a/data/multiboot_berry_glitch_fix.s +++ b/data/multiboot_berry_glitch_fix.s @@ -1,5 +1,5 @@ .section .rodata gMultiBootProgram_BerryGlitchFix_Start:: @ 86FFC6C - .incbin "data/berry_fix.mb" + .incbin "berry_fix/berry_fix.gba" gMultiBootProgram_BerryGlitchFix_End:: -- cgit v1.2.3 From 0aceac2d340328b1d2af539820e872f04bda6214 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sun, 16 Dec 2018 20:24:01 -0500 Subject: Remove extraneous macros and constants from berry fix --- berry_fix/asm/loader.s | 6 +- berry_fix/asm/macros/asm.inc | 12 - berry_fix/asm/macros/function.inc | 29 -- berry_fix/constants/gba_constants.inc | 490 -------------------------- berry_fix/payload/asm/crt0.s | 6 +- berry_fix/payload/asm/macros/asm.inc | 12 - berry_fix/payload/asm/macros/function.inc | 29 -- berry_fix/payload/constants/gba_constants.inc | 490 -------------------------- 8 files changed, 6 insertions(+), 1068 deletions(-) delete mode 100644 berry_fix/asm/macros/asm.inc delete mode 100644 berry_fix/asm/macros/function.inc delete mode 100644 berry_fix/constants/gba_constants.inc delete mode 100644 berry_fix/payload/asm/macros/asm.inc delete mode 100644 berry_fix/payload/asm/macros/function.inc delete mode 100644 berry_fix/payload/constants/gba_constants.inc diff --git a/berry_fix/asm/loader.s b/berry_fix/asm/loader.s index c342e100f..39e0b768a 100644 --- a/berry_fix/asm/loader.s +++ b/berry_fix/asm/loader.s @@ -1,6 +1,6 @@ - .include "asm/macros/asm.inc" - .include "asm/macros/function.inc" - .include "constants/gba_constants.inc" + .include "../asm/macros/asm.inc" + .include "../asm/macros/function.inc" + .include "../constants/gba_constants.inc" .set SIO_ERROR, 0x0040 .set SIO_MULTI_BUSY, 0x0080 diff --git a/berry_fix/asm/macros/asm.inc b/berry_fix/asm/macros/asm.inc deleted file mode 100644 index 4ac003fab..000000000 --- a/berry_fix/asm/macros/asm.inc +++ /dev/null @@ -1,12 +0,0 @@ - .macro inc x - .set \x, \x + 1 - .endm - - .macro enum_start x=0 - .set __enum__, \x - .endm - - .macro enum constant - .equiv \constant, __enum__ - inc __enum__ - .endm diff --git a/berry_fix/asm/macros/function.inc b/berry_fix/asm/macros/function.inc deleted file mode 100644 index b109595df..000000000 --- a/berry_fix/asm/macros/function.inc +++ /dev/null @@ -1,29 +0,0 @@ - .macro arm_func_start name - .align 2, 0 - .global \name - .arm - .type \name, %function - .endm - - .macro arm_func_end name - .size \name, .-\name - .endm - - .macro thumb_func_start name - .align 2, 0 - .global \name - .thumb - .thumb_func - .type \name, %function - .endm - - .macro non_word_aligned_thumb_func_start name - .global \name - .thumb - .thumb_func - .type \name, %function - .endm - - .macro thumb_func_end name - .size \name, .-\name - .endm diff --git a/berry_fix/constants/gba_constants.inc b/berry_fix/constants/gba_constants.inc deleted file mode 100644 index 9d59c8fcd..000000000 --- a/berry_fix/constants/gba_constants.inc +++ /dev/null @@ -1,490 +0,0 @@ - .set PSR_USR_MODE, 0x00000010 - .set PSR_FIQ_MODE, 0x00000011 - .set PSR_IRQ_MODE, 0x00000012 - .set PSR_SVC_MODE, 0x00000013 - .set PSR_ABT_MODE, 0x00000017 - .set PSR_UND_MODE, 0x0000001b - .set PSR_SYS_MODE, 0x0000001f - .set PSR_MODE_MASK, 0x0000001f - .set PSR_T_BIT, 0x00000020 - .set PSR_F_BIT, 0x00000040 - .set PSR_I_BIT, 0x00000080 - - .set EWRAM_START, 0x02000000 - .set EWRAM_END, EWRAM_START + 0x40000 - .set IWRAM_START, 0x03000000 - .set IWRAM_END, IWRAM_START + 0x8000 - - .set PLTT, 0x5000000 - .set BG_PLTT, PLTT - .set OBJ_PLTT, PLTT + 0x200 - - .set VRAM, 0x6000000 - .set BG_VRAM, VRAM - .set OBJ_VRAM0, VRAM + 0x10000 @ text-mode BG - .set OBJ_VRAM1, VRAM + 0x14000 @ bitmap-mode BG - - .set OAM, 0x7000000 - - .set SOUND_INFO_PTR, 0x3007FF0 - .set INTR_CHECK, 0x3007FF8 - .set INTR_VECTOR, 0x3007FFC - - .set INTR_FLAG_VBLANK, 1 << 0 - .set INTR_FLAG_HBLANK, 1 << 1 - .set INTR_FLAG_VCOUNT, 1 << 2 - .set INTR_FLAG_TIMER0, 1 << 3 - .set INTR_FLAG_TIMER1, 1 << 4 - .set INTR_FLAG_TIMER2, 1 << 5 - .set INTR_FLAG_TIMER3, 1 << 6 - .set INTR_FLAG_SERIAL, 1 << 7 - .set INTR_FLAG_DMA0, 1 << 8 - .set INTR_FLAG_DMA1, 1 << 9 - .set INTR_FLAG_DMA2, 1 << 10 - .set INTR_FLAG_DMA3, 1 << 11 - .set INTR_FLAG_KEYPAD, 1 << 12 - .set INTR_FLAG_GAMEPAK, 1 << 13 - - .set VCOUNT_VBLANK, 160 - .set TOTAL_SCANLINES, 228 - - .set REG_BASE, 0x4000000 @ I/O register base address - -@ I/O register offsets - .set OFFSET_REG_DISPCNT, 0x0 - .set OFFSET_REG_DISPSTAT, 0x4 - .set OFFSET_REG_VCOUNT, 0x6 - .set OFFSET_REG_BG0CNT, 0x8 - .set OFFSET_REG_BG1CNT, 0xa - .set OFFSET_REG_BG2CNT, 0xc - .set OFFSET_REG_BG3CNT, 0xe - .set OFFSET_REG_BG0HOFS, 0x10 - .set OFFSET_REG_BG0VOFS, 0x12 - .set OFFSET_REG_BG1HOFS, 0x14 - .set OFFSET_REG_BG1VOFS, 0x16 - .set OFFSET_REG_BG2HOFS, 0x18 - .set OFFSET_REG_BG2VOFS, 0x1a - .set OFFSET_REG_BG3HOFS, 0x1c - .set OFFSET_REG_BG3VOFS, 0x1e - .set OFFSET_REG_BG2PA, 0x20 - .set OFFSET_REG_BG2PB, 0x22 - .set OFFSET_REG_BG2PC, 0x24 - .set OFFSET_REG_BG2PD, 0x26 - .set OFFSET_REG_BG2X_L, 0x28 - .set OFFSET_REG_BG2X_H, 0x2a - .set OFFSET_REG_BG2Y_L, 0x2c - .set OFFSET_REG_BG2Y_H, 0x2e - .set OFFSET_REG_BG3PA, 0x30 - .set OFFSET_REG_BG3PB, 0x32 - .set OFFSET_REG_BG3PC, 0x34 - .set OFFSET_REG_BG3PD, 0x36 - .set OFFSET_REG_BG3X_L, 0x38 - .set OFFSET_REG_BG3X_H, 0x3a - .set OFFSET_REG_BG3Y_L, 0x3c - .set OFFSET_REG_BG3Y_H, 0x3e - .set OFFSET_REG_WIN0H, 0x40 - .set OFFSET_REG_WIN1H, 0x42 - .set OFFSET_REG_WIN0V, 0x44 - .set OFFSET_REG_WIN1V, 0x46 - .set OFFSET_REG_WININ, 0x48 - .set OFFSET_REG_WINOUT, 0x4a - .set OFFSET_REG_MOSAIC, 0x4c - .set OFFSET_REG_BLDCNT, 0x50 - .set OFFSET_REG_BLDALPHA, 0x52 - .set OFFSET_REG_BLDY, 0x54 - - .set OFFSET_REG_SOUND1CNT, 0x60 - .set OFFSET_REG_SOUND1CNT_L, 0x60 - .set OFFSET_REG_NR10, 0x60 - .set OFFSET_REG_SOUND1CNT_H, 0x62 - .set OFFSET_REG_NR11, 0x62 - .set OFFSET_REG_NR12, 0x63 - .set OFFSET_REG_SOUND1CNT_X, 0x64 - .set OFFSET_REG_NR13, 0x64 - .set OFFSET_REG_NR14, 0x65 - .set OFFSET_REG_SOUND2CNT, 0x68 - .set OFFSET_REG_SOUND2CNT_L, 0x68 - .set OFFSET_REG_NR21, 0x68 - .set OFFSET_REG_NR22, 0x69 - .set OFFSET_REG_SOUND2CNT_H, 0x6c - .set OFFSET_REG_NR23, 0x6c - .set OFFSET_REG_NR24, 0x6d - .set OFFSET_REG_SOUND3CNT, 0x70 - .set OFFSET_REG_SOUND3CNT_L, 0x70 - .set OFFSET_REG_NR30, 0x70 - .set OFFSET_REG_SOUND3CNT_H, 0x72 - .set OFFSET_REG_NR31, 0x72 - .set OFFSET_REG_NR32, 0x73 - .set OFFSET_REG_SOUND3CNT_X, 0x74 - .set OFFSET_REG_NR33, 0x74 - .set OFFSET_REG_NR34, 0x75 - .set OFFSET_REG_SOUND4CNT, 0x78 - .set OFFSET_REG_SOUND4CNT_L, 0x78 - .set OFFSET_REG_NR41, 0x78 - .set OFFSET_REG_NR42, 0x79 - .set OFFSET_REG_SOUND4CNT_H, 0x7c - .set OFFSET_REG_NR43, 0x7c - .set OFFSET_REG_NR44, 0x7d - .set OFFSET_REG_SOUNDCNT, 0x80 - .set OFFSET_REG_SOUNDCNT_L, 0x80 - .set OFFSET_REG_NR50, 0x80 - .set OFFSET_REG_NR51, 0x81 - .set OFFSET_REG_SOUNDCNT_H, 0x82 - .set OFFSET_REG_SOUNDCNT_X, 0x84 - .set OFFSET_REG_NR52, 0x84 - .set OFFSET_REG_SOUNDBIAS, 0x88 - .set OFFSET_REG_WAVE_RAM, 0x90 - .set OFFSET_REG_WAVE_RAM0, 0x90 - .set OFFSET_REG_WAVE_RAM0_L, 0x90 - .set OFFSET_REG_WAVE_RAM0_H, 0x92 - .set OFFSET_REG_WAVE_RAM1, 0x94 - .set OFFSET_REG_WAVE_RAM1_L, 0x94 - .set OFFSET_REG_WAVE_RAM1_H, 0x96 - .set OFFSET_REG_WAVE_RAM2, 0x98 - .set OFFSET_REG_WAVE_RAM2_L, 0x98 - .set OFFSET_REG_WAVE_RAM2_H, 0x9a - .set OFFSET_REG_WAVE_RAM3, 0x9c - .set OFFSET_REG_WAVE_RAM3_L, 0x9c - .set OFFSET_REG_WAVE_RAM3_H, 0x9e - .set OFFSET_REG_FIFO, 0xa0 - .set OFFSET_REG_FIFO_A, 0xa0 - .set OFFSET_REG_FIFO_A_L, 0xa0 - .set OFFSET_REG_FIFO_A_H, 0xa2 - .set OFFSET_REG_FIFO_B, 0xa4 - .set OFFSET_REG_FIFO_B_L, 0xa4 - .set OFFSET_REG_FIFO_B_H, 0xa6 - - .set OFFSET_REG_DMA0, 0xb0 - .set OFFSET_REG_DMA0SAD, 0xb0 - .set OFFSET_REG_DMA0SAD_L, 0xb0 - .set OFFSET_REG_DMA0SAD_H, 0xb2 - .set OFFSET_REG_DMA0DAD, 0xb4 - .set OFFSET_REG_DMA0DAD_L, 0xb4 - .set OFFSET_REG_DMA0DAD_H, 0xb6 - .set OFFSET_REG_DMA0CNT, 0xb8 - .set OFFSET_REG_DMA0CNT_L, 0xb8 - .set OFFSET_REG_DMA0CNT_H, 0xba - .set OFFSET_REG_DMA1, 0xbc - .set OFFSET_REG_DMA1SAD, 0xbc - .set OFFSET_REG_DMA1SAD_L, 0xbc - .set OFFSET_REG_DMA1SAD_H, 0xbe - .set OFFSET_REG_DMA1DAD, 0xc0 - .set OFFSET_REG_DMA1DAD_L, 0xc0 - .set OFFSET_REG_DMA1DAD_H, 0xc2 - .set OFFSET_REG_DMA1CNT, 0xc4 - .set OFFSET_REG_DMA1CNT_L, 0xc4 - .set OFFSET_REG_DMA1CNT_H, 0xc6 - .set OFFSET_REG_DMA2, 0xc8 - .set OFFSET_REG_DMA2SAD, 0xc8 - .set OFFSET_REG_DMA2SAD_L, 0xc8 - .set OFFSET_REG_DMA2SAD_H, 0xca - .set OFFSET_REG_DMA2DAD, 0xcc - .set OFFSET_REG_DMA2DAD_L, 0xcc - .set OFFSET_REG_DMA2DAD_H, 0xce - .set OFFSET_REG_DMA2CNT, 0xd0 - .set OFFSET_REG_DMA2CNT_L, 0xd0 - .set OFFSET_REG_DMA2CNT_H, 0xd2 - .set OFFSET_REG_DMA3, 0xd4 - .set OFFSET_REG_DMA3SAD, 0xd4 - .set OFFSET_REG_DMA3SAD_L, 0xd4 - .set OFFSET_REG_DMA3SAD_H, 0xd6 - .set OFFSET_REG_DMA3DAD, 0xd8 - .set OFFSET_REG_DMA3DAD_L, 0xd8 - .set OFFSET_REG_DMA3DAD_H, 0xda - .set OFFSET_REG_DMA3CNT, 0xdc - .set OFFSET_REG_DMA3CNT_L, 0xdc - .set OFFSET_REG_DMA3CNT_H, 0xde - - .set OFFSET_REG_TM0CNT, 0x100 - .set OFFSET_REG_TM0CNT_L, 0x100 - .set OFFSET_REG_TM0CNT_H, 0x102 - .set OFFSET_REG_TM1CNT, 0x104 - .set OFFSET_REG_TM1CNT_L, 0x104 - .set OFFSET_REG_TM1CNT_H, 0x106 - .set OFFSET_REG_TM2CNT, 0x108 - .set OFFSET_REG_TM2CNT_L, 0x108 - .set OFFSET_REG_TM2CNT_H, 0x10a - .set OFFSET_REG_TM3CNT, 0x10c - .set OFFSET_REG_TM3CNT_L, 0x10c - .set OFFSET_REG_TM3CNT_H, 0x10e - - .set OFFSET_REG_SIOCNT, 0x128 - .set OFFSET_REG_SIODATA8, 0x12a - .set OFFSET_REG_SIODATA32, 0x120 - .set OFFSET_REG_SIOMLT_SEND, 0x12a - .set OFFSET_REG_SIOMLT_RECV, 0x120 - .set OFFSET_REG_SIOMULTI0, 0x120 - .set OFFSET_REG_SIOMULTI1, 0x122 - .set OFFSET_REG_SIOMULTI2, 0x124 - .set OFFSET_REG_SIOMULTI3, 0x126 - - .set OFFSET_REG_KEYINPUT, 0x130 - .set OFFSET_REG_KEYCNT, 0x132 - - .set OFFSET_REG_RCNT, 0x134 - - .set OFFSET_REG_JOYCNT, 0x140 - .set OFFSET_REG_JOYSTAT, 0x158 - .set OFFSET_REG_JOY_RECV, 0x150 - .set OFFSET_REG_JOY_RECV_L, 0x150 - .set OFFSET_REG_JOY_RECV_H, 0x152 - .set OFFSET_REG_JOY_TRANS, 0x154 - .set OFFSET_REG_JOY_TRANS_L, 0x154 - .set OFFSET_REG_JOY_TRANS_H, 0x156 - - .set OFFSET_REG_IME, 0x208 - .set OFFSET_REG_IE, 0x200 - .set OFFSET_REG_IF, 0x202 - - .set OFFSET_REG_WAITCNT, 0x204 - -@ I/O register addresses - .set REG_DISPCNT, REG_BASE + OFFSET_REG_DISPCNT - .set REG_DISPSTAT, REG_BASE + OFFSET_REG_DISPSTAT - .set REG_VCOUNT, REG_BASE + OFFSET_REG_VCOUNT - .set REG_BG0CNT, REG_BASE + OFFSET_REG_BG0CNT - .set REG_BG1CNT, REG_BASE + OFFSET_REG_BG1CNT - .set REG_BG2CNT, REG_BASE + OFFSET_REG_BG2CNT - .set REG_BG3CNT, REG_BASE + OFFSET_REG_BG3CNT - .set REG_BG0HOFS, REG_BASE + OFFSET_REG_BG0HOFS - .set REG_BG0VOFS, REG_BASE + OFFSET_REG_BG0VOFS - .set REG_BG1HOFS, REG_BASE + OFFSET_REG_BG1HOFS - .set REG_BG1VOFS, REG_BASE + OFFSET_REG_BG1VOFS - .set REG_BG2HOFS, REG_BASE + OFFSET_REG_BG2HOFS - .set REG_BG2VOFS, REG_BASE + OFFSET_REG_BG2VOFS - .set REG_BG3HOFS, REG_BASE + OFFSET_REG_BG3HOFS - .set REG_BG3VOFS, REG_BASE + OFFSET_REG_BG3VOFS - .set REG_BG2PA, REG_BASE + OFFSET_REG_BG2PA - .set REG_BG2PB, REG_BASE + OFFSET_REG_BG2PB - .set REG_BG2PC, REG_BASE + OFFSET_REG_BG2PC - .set REG_BG2PD, REG_BASE + OFFSET_REG_BG2PD - .set REG_BG2X_L, REG_BASE + OFFSET_REG_BG2X_L - .set REG_BG2X_H, REG_BASE + OFFSET_REG_BG2X_H - .set REG_BG2Y_L, REG_BASE + OFFSET_REG_BG2Y_L - .set REG_BG2Y_H, REG_BASE + OFFSET_REG_BG2Y_H - .set REG_BG3PA, REG_BASE + OFFSET_REG_BG3PA - .set REG_BG3PB, REG_BASE + OFFSET_REG_BG3PB - .set REG_BG3PC, REG_BASE + OFFSET_REG_BG3PC - .set REG_BG3PD, REG_BASE + OFFSET_REG_BG3PD - .set REG_BG3X_L, REG_BASE + OFFSET_REG_BG3X_L - .set REG_BG3X_H, REG_BASE + OFFSET_REG_BG3X_H - .set REG_BG3Y_L, REG_BASE + OFFSET_REG_BG3Y_L - .set REG_BG3Y_H, REG_BASE + OFFSET_REG_BG3Y_H - .set REG_WIN0H, REG_BASE + OFFSET_REG_WIN0H - .set REG_WIN1H, REG_BASE + OFFSET_REG_WIN1H - .set REG_WIN0V, REG_BASE + OFFSET_REG_WIN0V - .set REG_WIN1V, REG_BASE + OFFSET_REG_WIN1V - .set REG_WININ, REG_BASE + OFFSET_REG_WININ - .set REG_WINOUT, REG_BASE + OFFSET_REG_WINOUT - .set REG_MOSAIC, REG_BASE + OFFSET_REG_MOSAIC - .set REG_BLDCNT, REG_BASE + OFFSET_REG_BLDCNT - .set REG_BLDALPHA, REG_BASE + OFFSET_REG_BLDALPHA - .set REG_BLDY, REG_BASE + OFFSET_REG_BLDY - - .set REG_SOUND1CNT, REG_BASE + OFFSET_REG_SOUND1CNT - .set REG_SOUND1CNT_L, REG_BASE + OFFSET_REG_SOUND1CNT_L - .set REG_NR10, REG_BASE + OFFSET_REG_NR10 - .set REG_SOUND1CNT_H, REG_BASE + OFFSET_REG_SOUND1CNT_H - .set REG_NR11, REG_BASE + OFFSET_REG_NR11 - .set REG_NR12, REG_BASE + OFFSET_REG_NR12 - .set REG_SOUND1CNT_X, REG_BASE + OFFSET_REG_SOUND1CNT_X - .set REG_NR13, REG_BASE + OFFSET_REG_NR13 - .set REG_NR14, REG_BASE + OFFSET_REG_NR14 - .set REG_SOUND2CNT, REG_BASE + OFFSET_REG_SOUND2CNT - .set REG_SOUND2CNT_L, REG_BASE + OFFSET_REG_SOUND2CNT_L - .set REG_NR21, REG_BASE + OFFSET_REG_NR21 - .set REG_NR22, REG_BASE + OFFSET_REG_NR22 - .set REG_SOUND2CNT_H, REG_BASE + OFFSET_REG_SOUND2CNT_H - .set REG_NR23, REG_BASE + OFFSET_REG_NR23 - .set REG_NR24, REG_BASE + OFFSET_REG_NR24 - .set REG_SOUND3CNT, REG_BASE + OFFSET_REG_SOUND3CNT - .set REG_SOUND3CNT_L, REG_BASE + OFFSET_REG_SOUND3CNT_L - .set REG_NR30, REG_BASE + OFFSET_REG_NR30 - .set REG_SOUND3CNT_H, REG_BASE + OFFSET_REG_SOUND3CNT_H - .set REG_NR31, REG_BASE + OFFSET_REG_NR31 - .set REG_NR32, REG_BASE + OFFSET_REG_NR32 - .set REG_SOUND3CNT_X, REG_BASE + OFFSET_REG_SOUND3CNT_X - .set REG_NR33, REG_BASE + OFFSET_REG_NR33 - .set REG_NR34, REG_BASE + OFFSET_REG_NR34 - .set REG_SOUND4CNT, REG_BASE + OFFSET_REG_SOUND4CNT - .set REG_SOUND4CNT_L, REG_BASE + OFFSET_REG_SOUND4CNT_L - .set REG_NR41, REG_BASE + OFFSET_REG_NR41 - .set REG_NR42, REG_BASE + OFFSET_REG_NR42 - .set REG_SOUND4CNT_H, REG_BASE + OFFSET_REG_SOUND4CNT_H - .set REG_NR43, REG_BASE + OFFSET_REG_NR43 - .set REG_NR44, REG_BASE + OFFSET_REG_NR44 - .set REG_SOUNDCNT, REG_BASE + OFFSET_REG_SOUNDCNT - .set REG_SOUNDCNT_L, REG_BASE + OFFSET_REG_SOUNDCNT_L - .set REG_NR50, REG_BASE + OFFSET_REG_NR50 - .set REG_NR51, REG_BASE + OFFSET_REG_NR51 - .set REG_SOUNDCNT_H, REG_BASE + OFFSET_REG_SOUNDCNT_H - .set REG_SOUNDCNT_X, REG_BASE + OFFSET_REG_SOUNDCNT_X - .set REG_NR52, REG_BASE + OFFSET_REG_NR52 - .set REG_SOUNDBIAS, REG_BASE + OFFSET_REG_SOUNDBIAS - .set REG_WAVE_RAM, REG_BASE + OFFSET_REG_WAVE_RAM - .set REG_WAVE_RAM0, REG_BASE + OFFSET_REG_WAVE_RAM0 - .set REG_WAVE_RAM0_L, REG_BASE + OFFSET_REG_WAVE_RAM0_L - .set REG_WAVE_RAM0_H, REG_BASE + OFFSET_REG_WAVE_RAM0_H - .set REG_WAVE_RAM1, REG_BASE + OFFSET_REG_WAVE_RAM1 - .set REG_WAVE_RAM1_L, REG_BASE + OFFSET_REG_WAVE_RAM1_L - .set REG_WAVE_RAM1_H, REG_BASE + OFFSET_REG_WAVE_RAM1_H - .set REG_WAVE_RAM2, REG_BASE + OFFSET_REG_WAVE_RAM2 - .set REG_WAVE_RAM2_L, REG_BASE + OFFSET_REG_WAVE_RAM2_L - .set REG_WAVE_RAM2_H, REG_BASE + OFFSET_REG_WAVE_RAM2_H - .set REG_WAVE_RAM3, REG_BASE + OFFSET_REG_WAVE_RAM3 - .set REG_WAVE_RAM3_L, REG_BASE + OFFSET_REG_WAVE_RAM3_L - .set REG_WAVE_RAM3_H, REG_BASE + OFFSET_REG_WAVE_RAM3_H - .set REG_FIFO, REG_BASE + OFFSET_REG_FIFO - .set REG_FIFO_A, REG_BASE + OFFSET_REG_FIFO_A - .set REG_FIFO_A_L, REG_BASE + OFFSET_REG_FIFO_A_L - .set REG_FIFO_A_H, REG_BASE + OFFSET_REG_FIFO_A_H - .set REG_FIFO_B, REG_BASE + OFFSET_REG_FIFO_B - .set REG_FIFO_B_L, REG_BASE + OFFSET_REG_FIFO_B_L - .set REG_FIFO_B_H, REG_BASE + OFFSET_REG_FIFO_B_H - - .set REG_DMA0, REG_BASE + OFFSET_REG_DMA0 - .set REG_DMA0SAD, REG_BASE + OFFSET_REG_DMA0SAD - .set REG_DMA0SAD_L, REG_BASE + OFFSET_REG_DMA0SAD_L - .set REG_DMA0SAD_H, REG_BASE + OFFSET_REG_DMA0SAD_H - .set REG_DMA0DAD, REG_BASE + OFFSET_REG_DMA0DAD - .set REG_DMA0DAD_L, REG_BASE + OFFSET_REG_DMA0DAD_L - .set REG_DMA0DAD_H, REG_BASE + OFFSET_REG_DMA0DAD_H - .set REG_DMA0CNT, REG_BASE + OFFSET_REG_DMA0CNT - .set REG_DMA0CNT_L, REG_BASE + OFFSET_REG_DMA0CNT_L - .set REG_DMA0CNT_H, REG_BASE + OFFSET_REG_DMA0CNT_H - .set REG_DMA1, REG_BASE + OFFSET_REG_DMA1 - .set REG_DMA1SAD, REG_BASE + OFFSET_REG_DMA1SAD - .set REG_DMA1SAD_L, REG_BASE + OFFSET_REG_DMA1SAD_L - .set REG_DMA1SAD_H, REG_BASE + OFFSET_REG_DMA1SAD_H - .set REG_DMA1DAD, REG_BASE + OFFSET_REG_DMA1DAD - .set REG_DMA1DAD_L, REG_BASE + OFFSET_REG_DMA1DAD_L - .set REG_DMA1DAD_H, REG_BASE + OFFSET_REG_DMA1DAD_H - .set REG_DMA1CNT, REG_BASE + OFFSET_REG_DMA1CNT - .set REG_DMA1CNT_L, REG_BASE + OFFSET_REG_DMA1CNT_L - .set REG_DMA1CNT_H, REG_BASE + OFFSET_REG_DMA1CNT_H - .set REG_DMA2, REG_BASE + OFFSET_REG_DMA2 - .set REG_DMA2SAD, REG_BASE + OFFSET_REG_DMA2SAD - .set REG_DMA2SAD_L, REG_BASE + OFFSET_REG_DMA2SAD_L - .set REG_DMA2SAD_H, REG_BASE + OFFSET_REG_DMA2SAD_H - .set REG_DMA2DAD, REG_BASE + OFFSET_REG_DMA2DAD - .set REG_DMA2DAD_L, REG_BASE + OFFSET_REG_DMA2DAD_L - .set REG_DMA2DAD_H, REG_BASE + OFFSET_REG_DMA2DAD_H - .set REG_DMA2CNT, REG_BASE + OFFSET_REG_DMA2CNT - .set REG_DMA2CNT_L, REG_BASE + OFFSET_REG_DMA2CNT_L - .set REG_DMA2CNT_H, REG_BASE + OFFSET_REG_DMA2CNT_H - .set REG_DMA3, REG_BASE + OFFSET_REG_DMA3 - .set REG_DMA3SAD, REG_BASE + OFFSET_REG_DMA3SAD - .set REG_DMA3SAD_L, REG_BASE + OFFSET_REG_DMA3SAD_L - .set REG_DMA3SAD_H, REG_BASE + OFFSET_REG_DMA3SAD_H - .set REG_DMA3DAD, REG_BASE + OFFSET_REG_DMA3DAD - .set REG_DMA3DAD_L, REG_BASE + OFFSET_REG_DMA3DAD_L - .set REG_DMA3DAD_H, REG_BASE + OFFSET_REG_DMA3DAD_H - .set REG_DMA3CNT, REG_BASE + OFFSET_REG_DMA3CNT - .set REG_DMA3CNT_L, REG_BASE + OFFSET_REG_DMA3CNT_L - .set REG_DMA3CNT_H, REG_BASE + OFFSET_REG_DMA3CNT_H - - .set REG_TM0CNT, REG_BASE + OFFSET_REG_TM0CNT - .set REG_TM0CNT_L, REG_BASE + OFFSET_REG_TM0CNT_L - .set REG_TM0CNT_H, REG_BASE + OFFSET_REG_TM0CNT_H - .set REG_TM1CNT, REG_BASE + OFFSET_REG_TM1CNT - .set REG_TM1CNT_L, REG_BASE + OFFSET_REG_TM1CNT_L - .set REG_TM1CNT_H, REG_BASE + OFFSET_REG_TM1CNT_H - .set REG_TM2CNT, REG_BASE + OFFSET_REG_TM2CNT - .set REG_TM2CNT_L, REG_BASE + OFFSET_REG_TM2CNT_L - .set REG_TM2CNT_H, REG_BASE + OFFSET_REG_TM2CNT_H - .set REG_TM3CNT, REG_BASE + OFFSET_REG_TM3CNT - .set REG_TM3CNT_L, REG_BASE + OFFSET_REG_TM3CNT_L - .set REG_TM3CNT_H, REG_BASE + OFFSET_REG_TM3CNT_H - - .set REG_SIOCNT, REG_BASE + OFFSET_REG_SIOCNT - .set REG_SIODATA8, REG_BASE + OFFSET_REG_SIODATA8 - .set REG_SIODATA32, REG_BASE + OFFSET_REG_SIODATA32 - .set REG_SIOMLT_SEND, REG_BASE + OFFSET_REG_SIOMLT_SEND - .set REG_SIOMLT_RECV, REG_BASE + OFFSET_REG_SIOMLT_RECV - .set REG_SIOMULTI0, REG_BASE + OFFSET_REG_SIOMULTI0 - .set REG_SIOMULTI1, REG_BASE + OFFSET_REG_SIOMULTI1 - .set REG_SIOMULTI2, REG_BASE + OFFSET_REG_SIOMULTI2 - .set REG_SIOMULTI3, REG_BASE + OFFSET_REG_SIOMULTI3 - - .set REG_KEYINPUT, REG_BASE + OFFSET_REG_KEYINPUT - .set REG_KEYCNT, REG_BASE + OFFSET_REG_KEYCNT - - .set REG_RCNT, REG_BASE + OFFSET_REG_RCNT - - .set REG_JOYCNT, REG_BASE + OFFSET_REG_JOYCNT - .set REG_JOYSTAT, REG_BASE + OFFSET_REG_JOYSTAT - .set REG_JOY_RECV, REG_BASE + OFFSET_REG_JOY_RECV - .set REG_JOY_RECV_L, REG_BASE + OFFSET_REG_JOY_RECV_L - .set REG_JOY_RECV_H, REG_BASE + OFFSET_REG_JOY_RECV_H - .set REG_JOY_TRANS, REG_BASE + OFFSET_REG_JOY_TRANS - .set REG_JOY_TRANS_L, REG_BASE + OFFSET_REG_JOY_TRANS_L - .set REG_JOY_TRANS_H, REG_BASE + OFFSET_REG_JOY_TRANS_H - - .set REG_IME, REG_BASE + OFFSET_REG_IME - .set REG_IE, REG_BASE + OFFSET_REG_IE - .set REG_IF, REG_BASE + OFFSET_REG_IF - - .set REG_WAITCNT, REG_BASE + OFFSET_REG_WAITCNT - -@ DMA register constants - - .set DMA_DEST_INC, 0x0000 - .set DMA_DEST_DEC, 0x0020 - .set DMA_DEST_FIXED, 0x0040 - .set DMA_DEST_RELOAD, 0x0060 - .set DMA_SRC_INC, 0x0000 - .set DMA_SRC_DEC, 0x0080 - .set DMA_SRC_FIXED, 0x0100 - .set DMA_REPEAT, 0x0200 - .set DMA_16BIT, 0x0000 - .set DMA_32BIT, 0x0400 - .set DMA_DREQ_ON, 0x0800 - .set DMA_START_NOW, 0x0000 - .set DMA_START_VBLANK, 0x1000 - .set DMA_START_HBLANK, 0x2000 - .set DMA_START_SPECIAL, 0x3000 - .set DMA_INTR_ENABLE, 0x4000 - .set DMA_ENABLE, 0x8000 - -@ OAM attribute constants - - .set OAM_OBJ_NORMAL, 0x00000000 - .set OAM_OBJ_BLEND, 0x00000400 - .set OAM_OBJ_WINDOW, 0x00000800 - - .set OAM_AFFINE_NONE, 0x00000000 - .set OAM_AFFINE_NORMAL_SIZE, 0x00000100 - .set OAM_OBJ_DISABLED, 0x00000200 - .set OAM_AFFINE_DOUBLE_SIZE, 0x00000300 - - .set OAM_MOSAIC_OFF, 0x00000000 - .set OAM_MOSAIC_ON, 0x00001000 - - .set OAM_4BPP, 0x00000000 - .set OAM_8BPP, 0x00002000 - - .set OAM_H_FLIP, 0x10000000 - .set OAM_V_FLIP, 0x20000000 - - .set OAM_SQUARE, 0x00000000 - .set OAM_H_RECTANGLE, 0x00004000 - .set OAM_V_RECTANGLE, 0x00008000 - .set OAM_SIZE_0, 0x00000000 - .set OAM_SIZE_1, 0x40000000 - .set OAM_SIZE_2, 0x80000000 - .set OAM_SIZE_3, 0xc0000000 - - .set OAM_SIZE_8x8, OAM_SIZE_0 | OAM_SQUARE - .set OAM_SIZE_16x16, OAM_SIZE_1 | OAM_SQUARE - .set OAM_SIZE_32x32, OAM_SIZE_2 | OAM_SQUARE - .set OAM_SIZE_64x64, OAM_SIZE_3 | OAM_SQUARE - - .set OAM_SIZE_16x8, OAM_SIZE_0 | OAM_H_RECTANGLE - .set OAM_SIZE_32x8, OAM_SIZE_1 | OAM_H_RECTANGLE - .set OAM_SIZE_32x16, OAM_SIZE_2 | OAM_H_RECTANGLE - .set OAM_SIZE_64x32, OAM_SIZE_3 | OAM_H_RECTANGLE - - .set OAM_SIZE_8x16, OAM_SIZE_0 | OAM_V_RECTANGLE - .set OAM_SIZE_8x32, OAM_SIZE_1 | OAM_V_RECTANGLE - .set OAM_SIZE_16x32, OAM_SIZE_2 | OAM_V_RECTANGLE - .set OAM_SIZE_32x64, OAM_SIZE_3 | OAM_V_RECTANGLE diff --git a/berry_fix/payload/asm/crt0.s b/berry_fix/payload/asm/crt0.s index 66536914a..73da8a38f 100644 --- a/berry_fix/payload/asm/crt0.s +++ b/berry_fix/payload/asm/crt0.s @@ -1,6 +1,6 @@ - .include "asm/macros/asm.inc" - .include "asm/macros/function.inc" - .include "constants/gba_constants.inc" + .include "../../asm/macros/asm.inc" + .include "../../asm/macros/function.inc" + .include "../../constants/gba_constants.inc" .syntax unified diff --git a/berry_fix/payload/asm/macros/asm.inc b/berry_fix/payload/asm/macros/asm.inc deleted file mode 100644 index 4ac003fab..000000000 --- a/berry_fix/payload/asm/macros/asm.inc +++ /dev/null @@ -1,12 +0,0 @@ - .macro inc x - .set \x, \x + 1 - .endm - - .macro enum_start x=0 - .set __enum__, \x - .endm - - .macro enum constant - .equiv \constant, __enum__ - inc __enum__ - .endm diff --git a/berry_fix/payload/asm/macros/function.inc b/berry_fix/payload/asm/macros/function.inc deleted file mode 100644 index b109595df..000000000 --- a/berry_fix/payload/asm/macros/function.inc +++ /dev/null @@ -1,29 +0,0 @@ - .macro arm_func_start name - .align 2, 0 - .global \name - .arm - .type \name, %function - .endm - - .macro arm_func_end name - .size \name, .-\name - .endm - - .macro thumb_func_start name - .align 2, 0 - .global \name - .thumb - .thumb_func - .type \name, %function - .endm - - .macro non_word_aligned_thumb_func_start name - .global \name - .thumb - .thumb_func - .type \name, %function - .endm - - .macro thumb_func_end name - .size \name, .-\name - .endm diff --git a/berry_fix/payload/constants/gba_constants.inc b/berry_fix/payload/constants/gba_constants.inc deleted file mode 100644 index 9d59c8fcd..000000000 --- a/berry_fix/payload/constants/gba_constants.inc +++ /dev/null @@ -1,490 +0,0 @@ - .set PSR_USR_MODE, 0x00000010 - .set PSR_FIQ_MODE, 0x00000011 - .set PSR_IRQ_MODE, 0x00000012 - .set PSR_SVC_MODE, 0x00000013 - .set PSR_ABT_MODE, 0x00000017 - .set PSR_UND_MODE, 0x0000001b - .set PSR_SYS_MODE, 0x0000001f - .set PSR_MODE_MASK, 0x0000001f - .set PSR_T_BIT, 0x00000020 - .set PSR_F_BIT, 0x00000040 - .set PSR_I_BIT, 0x00000080 - - .set EWRAM_START, 0x02000000 - .set EWRAM_END, EWRAM_START + 0x40000 - .set IWRAM_START, 0x03000000 - .set IWRAM_END, IWRAM_START + 0x8000 - - .set PLTT, 0x5000000 - .set BG_PLTT, PLTT - .set OBJ_PLTT, PLTT + 0x200 - - .set VRAM, 0x6000000 - .set BG_VRAM, VRAM - .set OBJ_VRAM0, VRAM + 0x10000 @ text-mode BG - .set OBJ_VRAM1, VRAM + 0x14000 @ bitmap-mode BG - - .set OAM, 0x7000000 - - .set SOUND_INFO_PTR, 0x3007FF0 - .set INTR_CHECK, 0x3007FF8 - .set INTR_VECTOR, 0x3007FFC - - .set INTR_FLAG_VBLANK, 1 << 0 - .set INTR_FLAG_HBLANK, 1 << 1 - .set INTR_FLAG_VCOUNT, 1 << 2 - .set INTR_FLAG_TIMER0, 1 << 3 - .set INTR_FLAG_TIMER1, 1 << 4 - .set INTR_FLAG_TIMER2, 1 << 5 - .set INTR_FLAG_TIMER3, 1 << 6 - .set INTR_FLAG_SERIAL, 1 << 7 - .set INTR_FLAG_DMA0, 1 << 8 - .set INTR_FLAG_DMA1, 1 << 9 - .set INTR_FLAG_DMA2, 1 << 10 - .set INTR_FLAG_DMA3, 1 << 11 - .set INTR_FLAG_KEYPAD, 1 << 12 - .set INTR_FLAG_GAMEPAK, 1 << 13 - - .set VCOUNT_VBLANK, 160 - .set TOTAL_SCANLINES, 228 - - .set REG_BASE, 0x4000000 @ I/O register base address - -@ I/O register offsets - .set OFFSET_REG_DISPCNT, 0x0 - .set OFFSET_REG_DISPSTAT, 0x4 - .set OFFSET_REG_VCOUNT, 0x6 - .set OFFSET_REG_BG0CNT, 0x8 - .set OFFSET_REG_BG1CNT, 0xa - .set OFFSET_REG_BG2CNT, 0xc - .set OFFSET_REG_BG3CNT, 0xe - .set OFFSET_REG_BG0HOFS, 0x10 - .set OFFSET_REG_BG0VOFS, 0x12 - .set OFFSET_REG_BG1HOFS, 0x14 - .set OFFSET_REG_BG1VOFS, 0x16 - .set OFFSET_REG_BG2HOFS, 0x18 - .set OFFSET_REG_BG2VOFS, 0x1a - .set OFFSET_REG_BG3HOFS, 0x1c - .set OFFSET_REG_BG3VOFS, 0x1e - .set OFFSET_REG_BG2PA, 0x20 - .set OFFSET_REG_BG2PB, 0x22 - .set OFFSET_REG_BG2PC, 0x24 - .set OFFSET_REG_BG2PD, 0x26 - .set OFFSET_REG_BG2X_L, 0x28 - .set OFFSET_REG_BG2X_H, 0x2a - .set OFFSET_REG_BG2Y_L, 0x2c - .set OFFSET_REG_BG2Y_H, 0x2e - .set OFFSET_REG_BG3PA, 0x30 - .set OFFSET_REG_BG3PB, 0x32 - .set OFFSET_REG_BG3PC, 0x34 - .set OFFSET_REG_BG3PD, 0x36 - .set OFFSET_REG_BG3X_L, 0x38 - .set OFFSET_REG_BG3X_H, 0x3a - .set OFFSET_REG_BG3Y_L, 0x3c - .set OFFSET_REG_BG3Y_H, 0x3e - .set OFFSET_REG_WIN0H, 0x40 - .set OFFSET_REG_WIN1H, 0x42 - .set OFFSET_REG_WIN0V, 0x44 - .set OFFSET_REG_WIN1V, 0x46 - .set OFFSET_REG_WININ, 0x48 - .set OFFSET_REG_WINOUT, 0x4a - .set OFFSET_REG_MOSAIC, 0x4c - .set OFFSET_REG_BLDCNT, 0x50 - .set OFFSET_REG_BLDALPHA, 0x52 - .set OFFSET_REG_BLDY, 0x54 - - .set OFFSET_REG_SOUND1CNT, 0x60 - .set OFFSET_REG_SOUND1CNT_L, 0x60 - .set OFFSET_REG_NR10, 0x60 - .set OFFSET_REG_SOUND1CNT_H, 0x62 - .set OFFSET_REG_NR11, 0x62 - .set OFFSET_REG_NR12, 0x63 - .set OFFSET_REG_SOUND1CNT_X, 0x64 - .set OFFSET_REG_NR13, 0x64 - .set OFFSET_REG_NR14, 0x65 - .set OFFSET_REG_SOUND2CNT, 0x68 - .set OFFSET_REG_SOUND2CNT_L, 0x68 - .set OFFSET_REG_NR21, 0x68 - .set OFFSET_REG_NR22, 0x69 - .set OFFSET_REG_SOUND2CNT_H, 0x6c - .set OFFSET_REG_NR23, 0x6c - .set OFFSET_REG_NR24, 0x6d - .set OFFSET_REG_SOUND3CNT, 0x70 - .set OFFSET_REG_SOUND3CNT_L, 0x70 - .set OFFSET_REG_NR30, 0x70 - .set OFFSET_REG_SOUND3CNT_H, 0x72 - .set OFFSET_REG_NR31, 0x72 - .set OFFSET_REG_NR32, 0x73 - .set OFFSET_REG_SOUND3CNT_X, 0x74 - .set OFFSET_REG_NR33, 0x74 - .set OFFSET_REG_NR34, 0x75 - .set OFFSET_REG_SOUND4CNT, 0x78 - .set OFFSET_REG_SOUND4CNT_L, 0x78 - .set OFFSET_REG_NR41, 0x78 - .set OFFSET_REG_NR42, 0x79 - .set OFFSET_REG_SOUND4CNT_H, 0x7c - .set OFFSET_REG_NR43, 0x7c - .set OFFSET_REG_NR44, 0x7d - .set OFFSET_REG_SOUNDCNT, 0x80 - .set OFFSET_REG_SOUNDCNT_L, 0x80 - .set OFFSET_REG_NR50, 0x80 - .set OFFSET_REG_NR51, 0x81 - .set OFFSET_REG_SOUNDCNT_H, 0x82 - .set OFFSET_REG_SOUNDCNT_X, 0x84 - .set OFFSET_REG_NR52, 0x84 - .set OFFSET_REG_SOUNDBIAS, 0x88 - .set OFFSET_REG_WAVE_RAM, 0x90 - .set OFFSET_REG_WAVE_RAM0, 0x90 - .set OFFSET_REG_WAVE_RAM0_L, 0x90 - .set OFFSET_REG_WAVE_RAM0_H, 0x92 - .set OFFSET_REG_WAVE_RAM1, 0x94 - .set OFFSET_REG_WAVE_RAM1_L, 0x94 - .set OFFSET_REG_WAVE_RAM1_H, 0x96 - .set OFFSET_REG_WAVE_RAM2, 0x98 - .set OFFSET_REG_WAVE_RAM2_L, 0x98 - .set OFFSET_REG_WAVE_RAM2_H, 0x9a - .set OFFSET_REG_WAVE_RAM3, 0x9c - .set OFFSET_REG_WAVE_RAM3_L, 0x9c - .set OFFSET_REG_WAVE_RAM3_H, 0x9e - .set OFFSET_REG_FIFO, 0xa0 - .set OFFSET_REG_FIFO_A, 0xa0 - .set OFFSET_REG_FIFO_A_L, 0xa0 - .set OFFSET_REG_FIFO_A_H, 0xa2 - .set OFFSET_REG_FIFO_B, 0xa4 - .set OFFSET_REG_FIFO_B_L, 0xa4 - .set OFFSET_REG_FIFO_B_H, 0xa6 - - .set OFFSET_REG_DMA0, 0xb0 - .set OFFSET_REG_DMA0SAD, 0xb0 - .set OFFSET_REG_DMA0SAD_L, 0xb0 - .set OFFSET_REG_DMA0SAD_H, 0xb2 - .set OFFSET_REG_DMA0DAD, 0xb4 - .set OFFSET_REG_DMA0DAD_L, 0xb4 - .set OFFSET_REG_DMA0DAD_H, 0xb6 - .set OFFSET_REG_DMA0CNT, 0xb8 - .set OFFSET_REG_DMA0CNT_L, 0xb8 - .set OFFSET_REG_DMA0CNT_H, 0xba - .set OFFSET_REG_DMA1, 0xbc - .set OFFSET_REG_DMA1SAD, 0xbc - .set OFFSET_REG_DMA1SAD_L, 0xbc - .set OFFSET_REG_DMA1SAD_H, 0xbe - .set OFFSET_REG_DMA1DAD, 0xc0 - .set OFFSET_REG_DMA1DAD_L, 0xc0 - .set OFFSET_REG_DMA1DAD_H, 0xc2 - .set OFFSET_REG_DMA1CNT, 0xc4 - .set OFFSET_REG_DMA1CNT_L, 0xc4 - .set OFFSET_REG_DMA1CNT_H, 0xc6 - .set OFFSET_REG_DMA2, 0xc8 - .set OFFSET_REG_DMA2SAD, 0xc8 - .set OFFSET_REG_DMA2SAD_L, 0xc8 - .set OFFSET_REG_DMA2SAD_H, 0xca - .set OFFSET_REG_DMA2DAD, 0xcc - .set OFFSET_REG_DMA2DAD_L, 0xcc - .set OFFSET_REG_DMA2DAD_H, 0xce - .set OFFSET_REG_DMA2CNT, 0xd0 - .set OFFSET_REG_DMA2CNT_L, 0xd0 - .set OFFSET_REG_DMA2CNT_H, 0xd2 - .set OFFSET_REG_DMA3, 0xd4 - .set OFFSET_REG_DMA3SAD, 0xd4 - .set OFFSET_REG_DMA3SAD_L, 0xd4 - .set OFFSET_REG_DMA3SAD_H, 0xd6 - .set OFFSET_REG_DMA3DAD, 0xd8 - .set OFFSET_REG_DMA3DAD_L, 0xd8 - .set OFFSET_REG_DMA3DAD_H, 0xda - .set OFFSET_REG_DMA3CNT, 0xdc - .set OFFSET_REG_DMA3CNT_L, 0xdc - .set OFFSET_REG_DMA3CNT_H, 0xde - - .set OFFSET_REG_TM0CNT, 0x100 - .set OFFSET_REG_TM0CNT_L, 0x100 - .set OFFSET_REG_TM0CNT_H, 0x102 - .set OFFSET_REG_TM1CNT, 0x104 - .set OFFSET_REG_TM1CNT_L, 0x104 - .set OFFSET_REG_TM1CNT_H, 0x106 - .set OFFSET_REG_TM2CNT, 0x108 - .set OFFSET_REG_TM2CNT_L, 0x108 - .set OFFSET_REG_TM2CNT_H, 0x10a - .set OFFSET_REG_TM3CNT, 0x10c - .set OFFSET_REG_TM3CNT_L, 0x10c - .set OFFSET_REG_TM3CNT_H, 0x10e - - .set OFFSET_REG_SIOCNT, 0x128 - .set OFFSET_REG_SIODATA8, 0x12a - .set OFFSET_REG_SIODATA32, 0x120 - .set OFFSET_REG_SIOMLT_SEND, 0x12a - .set OFFSET_REG_SIOMLT_RECV, 0x120 - .set OFFSET_REG_SIOMULTI0, 0x120 - .set OFFSET_REG_SIOMULTI1, 0x122 - .set OFFSET_REG_SIOMULTI2, 0x124 - .set OFFSET_REG_SIOMULTI3, 0x126 - - .set OFFSET_REG_KEYINPUT, 0x130 - .set OFFSET_REG_KEYCNT, 0x132 - - .set OFFSET_REG_RCNT, 0x134 - - .set OFFSET_REG_JOYCNT, 0x140 - .set OFFSET_REG_JOYSTAT, 0x158 - .set OFFSET_REG_JOY_RECV, 0x150 - .set OFFSET_REG_JOY_RECV_L, 0x150 - .set OFFSET_REG_JOY_RECV_H, 0x152 - .set OFFSET_REG_JOY_TRANS, 0x154 - .set OFFSET_REG_JOY_TRANS_L, 0x154 - .set OFFSET_REG_JOY_TRANS_H, 0x156 - - .set OFFSET_REG_IME, 0x208 - .set OFFSET_REG_IE, 0x200 - .set OFFSET_REG_IF, 0x202 - - .set OFFSET_REG_WAITCNT, 0x204 - -@ I/O register addresses - .set REG_DISPCNT, REG_BASE + OFFSET_REG_DISPCNT - .set REG_DISPSTAT, REG_BASE + OFFSET_REG_DISPSTAT - .set REG_VCOUNT, REG_BASE + OFFSET_REG_VCOUNT - .set REG_BG0CNT, REG_BASE + OFFSET_REG_BG0CNT - .set REG_BG1CNT, REG_BASE + OFFSET_REG_BG1CNT - .set REG_BG2CNT, REG_BASE + OFFSET_REG_BG2CNT - .set REG_BG3CNT, REG_BASE + OFFSET_REG_BG3CNT - .set REG_BG0HOFS, REG_BASE + OFFSET_REG_BG0HOFS - .set REG_BG0VOFS, REG_BASE + OFFSET_REG_BG0VOFS - .set REG_BG1HOFS, REG_BASE + OFFSET_REG_BG1HOFS - .set REG_BG1VOFS, REG_BASE + OFFSET_REG_BG1VOFS - .set REG_BG2HOFS, REG_BASE + OFFSET_REG_BG2HOFS - .set REG_BG2VOFS, REG_BASE + OFFSET_REG_BG2VOFS - .set REG_BG3HOFS, REG_BASE + OFFSET_REG_BG3HOFS - .set REG_BG3VOFS, REG_BASE + OFFSET_REG_BG3VOFS - .set REG_BG2PA, REG_BASE + OFFSET_REG_BG2PA - .set REG_BG2PB, REG_BASE + OFFSET_REG_BG2PB - .set REG_BG2PC, REG_BASE + OFFSET_REG_BG2PC - .set REG_BG2PD, REG_BASE + OFFSET_REG_BG2PD - .set REG_BG2X_L, REG_BASE + OFFSET_REG_BG2X_L - .set REG_BG2X_H, REG_BASE + OFFSET_REG_BG2X_H - .set REG_BG2Y_L, REG_BASE + OFFSET_REG_BG2Y_L - .set REG_BG2Y_H, REG_BASE + OFFSET_REG_BG2Y_H - .set REG_BG3PA, REG_BASE + OFFSET_REG_BG3PA - .set REG_BG3PB, REG_BASE + OFFSET_REG_BG3PB - .set REG_BG3PC, REG_BASE + OFFSET_REG_BG3PC - .set REG_BG3PD, REG_BASE + OFFSET_REG_BG3PD - .set REG_BG3X_L, REG_BASE + OFFSET_REG_BG3X_L - .set REG_BG3X_H, REG_BASE + OFFSET_REG_BG3X_H - .set REG_BG3Y_L, REG_BASE + OFFSET_REG_BG3Y_L - .set REG_BG3Y_H, REG_BASE + OFFSET_REG_BG3Y_H - .set REG_WIN0H, REG_BASE + OFFSET_REG_WIN0H - .set REG_WIN1H, REG_BASE + OFFSET_REG_WIN1H - .set REG_WIN0V, REG_BASE + OFFSET_REG_WIN0V - .set REG_WIN1V, REG_BASE + OFFSET_REG_WIN1V - .set REG_WININ, REG_BASE + OFFSET_REG_WININ - .set REG_WINOUT, REG_BASE + OFFSET_REG_WINOUT - .set REG_MOSAIC, REG_BASE + OFFSET_REG_MOSAIC - .set REG_BLDCNT, REG_BASE + OFFSET_REG_BLDCNT - .set REG_BLDALPHA, REG_BASE + OFFSET_REG_BLDALPHA - .set REG_BLDY, REG_BASE + OFFSET_REG_BLDY - - .set REG_SOUND1CNT, REG_BASE + OFFSET_REG_SOUND1CNT - .set REG_SOUND1CNT_L, REG_BASE + OFFSET_REG_SOUND1CNT_L - .set REG_NR10, REG_BASE + OFFSET_REG_NR10 - .set REG_SOUND1CNT_H, REG_BASE + OFFSET_REG_SOUND1CNT_H - .set REG_NR11, REG_BASE + OFFSET_REG_NR11 - .set REG_NR12, REG_BASE + OFFSET_REG_NR12 - .set REG_SOUND1CNT_X, REG_BASE + OFFSET_REG_SOUND1CNT_X - .set REG_NR13, REG_BASE + OFFSET_REG_NR13 - .set REG_NR14, REG_BASE + OFFSET_REG_NR14 - .set REG_SOUND2CNT, REG_BASE + OFFSET_REG_SOUND2CNT - .set REG_SOUND2CNT_L, REG_BASE + OFFSET_REG_SOUND2CNT_L - .set REG_NR21, REG_BASE + OFFSET_REG_NR21 - .set REG_NR22, REG_BASE + OFFSET_REG_NR22 - .set REG_SOUND2CNT_H, REG_BASE + OFFSET_REG_SOUND2CNT_H - .set REG_NR23, REG_BASE + OFFSET_REG_NR23 - .set REG_NR24, REG_BASE + OFFSET_REG_NR24 - .set REG_SOUND3CNT, REG_BASE + OFFSET_REG_SOUND3CNT - .set REG_SOUND3CNT_L, REG_BASE + OFFSET_REG_SOUND3CNT_L - .set REG_NR30, REG_BASE + OFFSET_REG_NR30 - .set REG_SOUND3CNT_H, REG_BASE + OFFSET_REG_SOUND3CNT_H - .set REG_NR31, REG_BASE + OFFSET_REG_NR31 - .set REG_NR32, REG_BASE + OFFSET_REG_NR32 - .set REG_SOUND3CNT_X, REG_BASE + OFFSET_REG_SOUND3CNT_X - .set REG_NR33, REG_BASE + OFFSET_REG_NR33 - .set REG_NR34, REG_BASE + OFFSET_REG_NR34 - .set REG_SOUND4CNT, REG_BASE + OFFSET_REG_SOUND4CNT - .set REG_SOUND4CNT_L, REG_BASE + OFFSET_REG_SOUND4CNT_L - .set REG_NR41, REG_BASE + OFFSET_REG_NR41 - .set REG_NR42, REG_BASE + OFFSET_REG_NR42 - .set REG_SOUND4CNT_H, REG_BASE + OFFSET_REG_SOUND4CNT_H - .set REG_NR43, REG_BASE + OFFSET_REG_NR43 - .set REG_NR44, REG_BASE + OFFSET_REG_NR44 - .set REG_SOUNDCNT, REG_BASE + OFFSET_REG_SOUNDCNT - .set REG_SOUNDCNT_L, REG_BASE + OFFSET_REG_SOUNDCNT_L - .set REG_NR50, REG_BASE + OFFSET_REG_NR50 - .set REG_NR51, REG_BASE + OFFSET_REG_NR51 - .set REG_SOUNDCNT_H, REG_BASE + OFFSET_REG_SOUNDCNT_H - .set REG_SOUNDCNT_X, REG_BASE + OFFSET_REG_SOUNDCNT_X - .set REG_NR52, REG_BASE + OFFSET_REG_NR52 - .set REG_SOUNDBIAS, REG_BASE + OFFSET_REG_SOUNDBIAS - .set REG_WAVE_RAM, REG_BASE + OFFSET_REG_WAVE_RAM - .set REG_WAVE_RAM0, REG_BASE + OFFSET_REG_WAVE_RAM0 - .set REG_WAVE_RAM0_L, REG_BASE + OFFSET_REG_WAVE_RAM0_L - .set REG_WAVE_RAM0_H, REG_BASE + OFFSET_REG_WAVE_RAM0_H - .set REG_WAVE_RAM1, REG_BASE + OFFSET_REG_WAVE_RAM1 - .set REG_WAVE_RAM1_L, REG_BASE + OFFSET_REG_WAVE_RAM1_L - .set REG_WAVE_RAM1_H, REG_BASE + OFFSET_REG_WAVE_RAM1_H - .set REG_WAVE_RAM2, REG_BASE + OFFSET_REG_WAVE_RAM2 - .set REG_WAVE_RAM2_L, REG_BASE + OFFSET_REG_WAVE_RAM2_L - .set REG_WAVE_RAM2_H, REG_BASE + OFFSET_REG_WAVE_RAM2_H - .set REG_WAVE_RAM3, REG_BASE + OFFSET_REG_WAVE_RAM3 - .set REG_WAVE_RAM3_L, REG_BASE + OFFSET_REG_WAVE_RAM3_L - .set REG_WAVE_RAM3_H, REG_BASE + OFFSET_REG_WAVE_RAM3_H - .set REG_FIFO, REG_BASE + OFFSET_REG_FIFO - .set REG_FIFO_A, REG_BASE + OFFSET_REG_FIFO_A - .set REG_FIFO_A_L, REG_BASE + OFFSET_REG_FIFO_A_L - .set REG_FIFO_A_H, REG_BASE + OFFSET_REG_FIFO_A_H - .set REG_FIFO_B, REG_BASE + OFFSET_REG_FIFO_B - .set REG_FIFO_B_L, REG_BASE + OFFSET_REG_FIFO_B_L - .set REG_FIFO_B_H, REG_BASE + OFFSET_REG_FIFO_B_H - - .set REG_DMA0, REG_BASE + OFFSET_REG_DMA0 - .set REG_DMA0SAD, REG_BASE + OFFSET_REG_DMA0SAD - .set REG_DMA0SAD_L, REG_BASE + OFFSET_REG_DMA0SAD_L - .set REG_DMA0SAD_H, REG_BASE + OFFSET_REG_DMA0SAD_H - .set REG_DMA0DAD, REG_BASE + OFFSET_REG_DMA0DAD - .set REG_DMA0DAD_L, REG_BASE + OFFSET_REG_DMA0DAD_L - .set REG_DMA0DAD_H, REG_BASE + OFFSET_REG_DMA0DAD_H - .set REG_DMA0CNT, REG_BASE + OFFSET_REG_DMA0CNT - .set REG_DMA0CNT_L, REG_BASE + OFFSET_REG_DMA0CNT_L - .set REG_DMA0CNT_H, REG_BASE + OFFSET_REG_DMA0CNT_H - .set REG_DMA1, REG_BASE + OFFSET_REG_DMA1 - .set REG_DMA1SAD, REG_BASE + OFFSET_REG_DMA1SAD - .set REG_DMA1SAD_L, REG_BASE + OFFSET_REG_DMA1SAD_L - .set REG_DMA1SAD_H, REG_BASE + OFFSET_REG_DMA1SAD_H - .set REG_DMA1DAD, REG_BASE + OFFSET_REG_DMA1DAD - .set REG_DMA1DAD_L, REG_BASE + OFFSET_REG_DMA1DAD_L - .set REG_DMA1DAD_H, REG_BASE + OFFSET_REG_DMA1DAD_H - .set REG_DMA1CNT, REG_BASE + OFFSET_REG_DMA1CNT - .set REG_DMA1CNT_L, REG_BASE + OFFSET_REG_DMA1CNT_L - .set REG_DMA1CNT_H, REG_BASE + OFFSET_REG_DMA1CNT_H - .set REG_DMA2, REG_BASE + OFFSET_REG_DMA2 - .set REG_DMA2SAD, REG_BASE + OFFSET_REG_DMA2SAD - .set REG_DMA2SAD_L, REG_BASE + OFFSET_REG_DMA2SAD_L - .set REG_DMA2SAD_H, REG_BASE + OFFSET_REG_DMA2SAD_H - .set REG_DMA2DAD, REG_BASE + OFFSET_REG_DMA2DAD - .set REG_DMA2DAD_L, REG_BASE + OFFSET_REG_DMA2DAD_L - .set REG_DMA2DAD_H, REG_BASE + OFFSET_REG_DMA2DAD_H - .set REG_DMA2CNT, REG_BASE + OFFSET_REG_DMA2CNT - .set REG_DMA2CNT_L, REG_BASE + OFFSET_REG_DMA2CNT_L - .set REG_DMA2CNT_H, REG_BASE + OFFSET_REG_DMA2CNT_H - .set REG_DMA3, REG_BASE + OFFSET_REG_DMA3 - .set REG_DMA3SAD, REG_BASE + OFFSET_REG_DMA3SAD - .set REG_DMA3SAD_L, REG_BASE + OFFSET_REG_DMA3SAD_L - .set REG_DMA3SAD_H, REG_BASE + OFFSET_REG_DMA3SAD_H - .set REG_DMA3DAD, REG_BASE + OFFSET_REG_DMA3DAD - .set REG_DMA3DAD_L, REG_BASE + OFFSET_REG_DMA3DAD_L - .set REG_DMA3DAD_H, REG_BASE + OFFSET_REG_DMA3DAD_H - .set REG_DMA3CNT, REG_BASE + OFFSET_REG_DMA3CNT - .set REG_DMA3CNT_L, REG_BASE + OFFSET_REG_DMA3CNT_L - .set REG_DMA3CNT_H, REG_BASE + OFFSET_REG_DMA3CNT_H - - .set REG_TM0CNT, REG_BASE + OFFSET_REG_TM0CNT - .set REG_TM0CNT_L, REG_BASE + OFFSET_REG_TM0CNT_L - .set REG_TM0CNT_H, REG_BASE + OFFSET_REG_TM0CNT_H - .set REG_TM1CNT, REG_BASE + OFFSET_REG_TM1CNT - .set REG_TM1CNT_L, REG_BASE + OFFSET_REG_TM1CNT_L - .set REG_TM1CNT_H, REG_BASE + OFFSET_REG_TM1CNT_H - .set REG_TM2CNT, REG_BASE + OFFSET_REG_TM2CNT - .set REG_TM2CNT_L, REG_BASE + OFFSET_REG_TM2CNT_L - .set REG_TM2CNT_H, REG_BASE + OFFSET_REG_TM2CNT_H - .set REG_TM3CNT, REG_BASE + OFFSET_REG_TM3CNT - .set REG_TM3CNT_L, REG_BASE + OFFSET_REG_TM3CNT_L - .set REG_TM3CNT_H, REG_BASE + OFFSET_REG_TM3CNT_H - - .set REG_SIOCNT, REG_BASE + OFFSET_REG_SIOCNT - .set REG_SIODATA8, REG_BASE + OFFSET_REG_SIODATA8 - .set REG_SIODATA32, REG_BASE + OFFSET_REG_SIODATA32 - .set REG_SIOMLT_SEND, REG_BASE + OFFSET_REG_SIOMLT_SEND - .set REG_SIOMLT_RECV, REG_BASE + OFFSET_REG_SIOMLT_RECV - .set REG_SIOMULTI0, REG_BASE + OFFSET_REG_SIOMULTI0 - .set REG_SIOMULTI1, REG_BASE + OFFSET_REG_SIOMULTI1 - .set REG_SIOMULTI2, REG_BASE + OFFSET_REG_SIOMULTI2 - .set REG_SIOMULTI3, REG_BASE + OFFSET_REG_SIOMULTI3 - - .set REG_KEYINPUT, REG_BASE + OFFSET_REG_KEYINPUT - .set REG_KEYCNT, REG_BASE + OFFSET_REG_KEYCNT - - .set REG_RCNT, REG_BASE + OFFSET_REG_RCNT - - .set REG_JOYCNT, REG_BASE + OFFSET_REG_JOYCNT - .set REG_JOYSTAT, REG_BASE + OFFSET_REG_JOYSTAT - .set REG_JOY_RECV, REG_BASE + OFFSET_REG_JOY_RECV - .set REG_JOY_RECV_L, REG_BASE + OFFSET_REG_JOY_RECV_L - .set REG_JOY_RECV_H, REG_BASE + OFFSET_REG_JOY_RECV_H - .set REG_JOY_TRANS, REG_BASE + OFFSET_REG_JOY_TRANS - .set REG_JOY_TRANS_L, REG_BASE + OFFSET_REG_JOY_TRANS_L - .set REG_JOY_TRANS_H, REG_BASE + OFFSET_REG_JOY_TRANS_H - - .set REG_IME, REG_BASE + OFFSET_REG_IME - .set REG_IE, REG_BASE + OFFSET_REG_IE - .set REG_IF, REG_BASE + OFFSET_REG_IF - - .set REG_WAITCNT, REG_BASE + OFFSET_REG_WAITCNT - -@ DMA register constants - - .set DMA_DEST_INC, 0x0000 - .set DMA_DEST_DEC, 0x0020 - .set DMA_DEST_FIXED, 0x0040 - .set DMA_DEST_RELOAD, 0x0060 - .set DMA_SRC_INC, 0x0000 - .set DMA_SRC_DEC, 0x0080 - .set DMA_SRC_FIXED, 0x0100 - .set DMA_REPEAT, 0x0200 - .set DMA_16BIT, 0x0000 - .set DMA_32BIT, 0x0400 - .set DMA_DREQ_ON, 0x0800 - .set DMA_START_NOW, 0x0000 - .set DMA_START_VBLANK, 0x1000 - .set DMA_START_HBLANK, 0x2000 - .set DMA_START_SPECIAL, 0x3000 - .set DMA_INTR_ENABLE, 0x4000 - .set DMA_ENABLE, 0x8000 - -@ OAM attribute constants - - .set OAM_OBJ_NORMAL, 0x00000000 - .set OAM_OBJ_BLEND, 0x00000400 - .set OAM_OBJ_WINDOW, 0x00000800 - - .set OAM_AFFINE_NONE, 0x00000000 - .set OAM_AFFINE_NORMAL_SIZE, 0x00000100 - .set OAM_OBJ_DISABLED, 0x00000200 - .set OAM_AFFINE_DOUBLE_SIZE, 0x00000300 - - .set OAM_MOSAIC_OFF, 0x00000000 - .set OAM_MOSAIC_ON, 0x00001000 - - .set OAM_4BPP, 0x00000000 - .set OAM_8BPP, 0x00002000 - - .set OAM_H_FLIP, 0x10000000 - .set OAM_V_FLIP, 0x20000000 - - .set OAM_SQUARE, 0x00000000 - .set OAM_H_RECTANGLE, 0x00004000 - .set OAM_V_RECTANGLE, 0x00008000 - .set OAM_SIZE_0, 0x00000000 - .set OAM_SIZE_1, 0x40000000 - .set OAM_SIZE_2, 0x80000000 - .set OAM_SIZE_3, 0xc0000000 - - .set OAM_SIZE_8x8, OAM_SIZE_0 | OAM_SQUARE - .set OAM_SIZE_16x16, OAM_SIZE_1 | OAM_SQUARE - .set OAM_SIZE_32x32, OAM_SIZE_2 | OAM_SQUARE - .set OAM_SIZE_64x64, OAM_SIZE_3 | OAM_SQUARE - - .set OAM_SIZE_16x8, OAM_SIZE_0 | OAM_H_RECTANGLE - .set OAM_SIZE_32x8, OAM_SIZE_1 | OAM_H_RECTANGLE - .set OAM_SIZE_32x16, OAM_SIZE_2 | OAM_H_RECTANGLE - .set OAM_SIZE_64x32, OAM_SIZE_3 | OAM_H_RECTANGLE - - .set OAM_SIZE_8x16, OAM_SIZE_0 | OAM_V_RECTANGLE - .set OAM_SIZE_8x32, OAM_SIZE_1 | OAM_V_RECTANGLE - .set OAM_SIZE_16x32, OAM_SIZE_2 | OAM_V_RECTANGLE - .set OAM_SIZE_32x64, OAM_SIZE_3 | OAM_V_RECTANGLE -- cgit v1.2.3 From fe9491f40931b9c3c391be723294154b99eda480 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Mon, 17 Dec 2018 09:47:09 -0500 Subject: Delete build_tools.sh --- berry_fix/build_tools.sh | 10 ---------- 1 file changed, 10 deletions(-) delete mode 100644 berry_fix/build_tools.sh diff --git a/berry_fix/build_tools.sh b/berry_fix/build_tools.sh deleted file mode 100644 index d9eebf05c..000000000 --- a/berry_fix/build_tools.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/sh -make -C tools/gbagfx CXX=${1:-g++} -make -C tools/scaninc CXX=${1:-g++} -make -C tools/preproc CXX=${1:-g++} -make -C tools/bin2c CXX=${1:-g++} -make -C tools/rsfont CXX=${1:-g++} -make -C tools/aif2pcm CXX=${1:-g++} -make -C tools/ramscrgen CXX=${1:-g++} -make -C tools/gbafix CXX=${1:-g++} -make -C tools/mid2agb CXX=${1:-g++} -- cgit v1.2.3 From 975b787e2059b33e5ae6c3c31c9da51a24414523 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Mon, 17 Dec 2018 09:49:19 -0500 Subject: Delete asmdiff.sh --- berry_fix/asmdiff.sh | 7 ------- 1 file changed, 7 deletions(-) delete mode 100644 berry_fix/asmdiff.sh diff --git a/berry_fix/asmdiff.sh b/berry_fix/asmdiff.sh deleted file mode 100644 index 4e14e106a..000000000 --- a/berry_fix/asmdiff.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/bash - -OBJDUMP="$DEVKITARM/bin/arm-none-eabi-objdump -D -bbinary -marmv4t -Mforce-thumb" -OPTIONS="--start-address=$(($1)) --stop-address=$(($1 + $2))" -$OBJDUMP $OPTIONS baserom.gba > baserom.dump -$OBJDUMP $OPTIONS berry_fix.gba > berry_fix.dump -diff -c baserom.dump berry_fix.dump -- cgit v1.2.3 From 808c3bcbbd5cf7b70bb5e6d5e09c77128319f58a Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Mon, 17 Dec 2018 09:49:33 -0500 Subject: Delete asmdiff.sh --- berry_fix/payload/asmdiff.sh | 7 ------- 1 file changed, 7 deletions(-) delete mode 100644 berry_fix/payload/asmdiff.sh diff --git a/berry_fix/payload/asmdiff.sh b/berry_fix/payload/asmdiff.sh deleted file mode 100644 index 5f86ac620..000000000 --- a/berry_fix/payload/asmdiff.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/bash - -OBJDUMP="$DEVKITARM/bin/arm-none-eabi-objdump -D -bbinary -marmv4t -Mforce-thumb" -OPTIONS="--start-address=$(($1)) --stop-address=$(($1 + $2))" -$OBJDUMP $OPTIONS baserom.gba > baserom.dump -$OBJDUMP $OPTIONS payload.gba > payload.dump -diff baserom.dump payload.dump -- cgit v1.2.3 From 2761c0f0a5a0411020bd9853329d402b663121cd Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Mon, 17 Dec 2018 15:43:45 -0500 Subject: Drop devkitARM dependency entirely --- Makefile | 9 +++++---- berry_fix/Makefile | 9 +++++---- berry_fix/payload/Makefile | 9 +++++---- include/global.h | 2 +- 4 files changed, 16 insertions(+), 13 deletions(-) diff --git a/Makefile b/Makefile index 431475026..a2059db74 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,7 @@ -include $(DEVKITARM)/base_tools -export CPP := $(PREFIX)cpp -export LD := $(PREFIX)ld +AS := tools/binutils/bin/arm-none-eabi-as +CPP := $(CC) -E +LD := tools/binutils/bin/arm-none-eabi-ld +OBJCOPY := tools/binutils/bin/arm-none-eabi-objcopy TITLE := POKEMON FIRE GAME_CODE := BPRE @@ -166,7 +167,7 @@ $(OBJ_DIR)/ld_script.ld: ld_script.txt $(OBJ_DIR)/sym_bss.ld $(OBJ_DIR)/sym_comm cd $(OBJ_DIR) && sed -f ../../ld_script.sed ../../$< | sed "s#tools/#../../tools/#g" > ld_script.ld $(ELF): $(OBJ_DIR)/ld_script.ld $(OBJS) - cd $(OBJ_DIR) && $(LD) $(LDFLAGS) -T ld_script.ld -o ../../$@ $(LIB) + cd $(OBJ_DIR) && ../../$(LD) $(LDFLAGS) -T ld_script.ld -o ../../$@ $(LIB) $(ROM): $(ELF) $(OBJCOPY) -O binary $< $@ diff --git a/berry_fix/Makefile b/berry_fix/Makefile index ffe0cf251..d449fdbef 100644 --- a/berry_fix/Makefile +++ b/berry_fix/Makefile @@ -1,6 +1,7 @@ -include $(DEVKITARM)/base_tools -export CPP := $(PREFIX)cpp -export LD := $(PREFIX)ld +AS := ../tools/binutils/bin/arm-none-eabi-as +CPP := $(CC) -E +LD := ../tools/binutils/bin/arm-none-eabi-ld +OBJCOPY := ../tools/binutils/bin/arm-none-eabi-objcopy ifeq ($(OS),Windows_NT) EXE := .exe @@ -152,7 +153,7 @@ $(SONG_BUILDDIR)/%.o: $(SONG_SUBDIR)/%.s $(AS) $(ASFLAGS) -I sound -o $@ $< $(ELF): ld_script.txt $(OBJS) - cd $(OBJ_DIR) && $(LD) $(LDFLAGS) -T ../ld_script.txt -o ../$@ + cd $(OBJ_DIR) && ../$(LD) $(LDFLAGS) -T ../ld_script.txt -o ../$@ $(ROM): $(ELF) $(OBJCOPY) -O binary $< $@ diff --git a/berry_fix/payload/Makefile b/berry_fix/payload/Makefile index e63d74234..b97556774 100644 --- a/berry_fix/payload/Makefile +++ b/berry_fix/payload/Makefile @@ -1,6 +1,7 @@ -include $(DEVKITARM)/base_tools -export CPP := $(PREFIX)cpp -export LD := $(PREFIX)ld +AS := ../../tools/binutils/bin/arm-none-eabi-as +CPP := $(CC) -E +LD := ../../tools/binutils/bin/arm-none-eabi-ld +OBJCOPY := ../../tools/binutils/bin/arm-none-eabi-objcopy ifeq ($(OS),Windows_NT) EXE := .exe @@ -152,7 +153,7 @@ $(OBJ_DIR)/ld_script.ld: ld_script.txt $(OBJ_DIR)/sym_bss.ld $(OBJ_DIR)/sym_comm cd $(OBJ_DIR) && sed -f ../../ld_script.sed ../$< | sed "s#tools/#../tools/#g" > ld_script.ld $(ELF): $(OBJ_DIR)/ld_script.ld $(OBJS) - cd $(OBJ_DIR) && $(LD) $(LDFLAGS) -T ld_script.ld -o ../$@ $(LIB) + cd $(OBJ_DIR) && ../$(LD) $(LDFLAGS) -T ld_script.ld -o ../$@ $(LIB) $(ROM): $(ELF) $(OBJCOPY) -O binary $< $@ diff --git a/include/global.h b/include/global.h index 775b3115e..1d2152af7 100644 --- a/include/global.h +++ b/include/global.h @@ -705,7 +705,7 @@ struct SaveBlock1 /*0x30D0*/ struct Roamer roamer; /*0x30EC*/ struct EnigmaBerry enigmaBerry; /*0x3120*/ struct MEventBuffers unk_3120; - /*0x348C*/ u8 filler_348C[0x190]; + /*0x348C*/ u8 filler_348C[400]; /*0x361C*/ struct RamScript ramScript; /*0x3A08*/ u8 filler3A08[12]; /*0x3A14*/ u8 seen2[DEX_FLAGS_NO]; -- cgit v1.2.3 From 74137d7448c62e462e39b373693bc4b9f0d72055 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Mon, 17 Dec 2018 15:45:15 -0500 Subject: Remove dkP dependency notes from INSTALL.md --- INSTALL.md | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/INSTALL.md b/INSTALL.md index 5ba0ee484..745f70007 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -1,18 +1,11 @@ -Install [devkitARM](https://devkitpro.org/wiki/Getting_Started) (if you are on **Windows 10**, [do this instead](#windows-10)). - Run the following commands (first, see [this](#macos) if you are on **macOS** or [this](#old-windows) if you are on **old Windows**): - export DEVKITPRO=/opt/devkitpro - echo "export DEVKITPRO=$DEVKITPRO" >> ~/.bashrc - export DEVKITARM=$DEVKITPRO/devkitARM - echo "export DEVKITARM=$DEVKITARM" >> ~/.bashrc - git clone https://github.com/pret/pokefirered - git clone https://github.com/pret/agbcc + git clone https://github.com/pikalaxalt/agbcc -b new_layout_with_libs cd agbcc - ./build.sh - ./install.sh ../pokefirered + make + make install prefix=../pokefirered cd ../pokefirered @@ -49,7 +42,7 @@ If the command for building pokefirered.gba does not work, run `nproc` and use t ## Windows 10 -Install the [Windows Subsystem for Linux](https://docs.microsoft.com/windows/wsl/install-win10), then install [devkitARM](https://devkitpro.org/wiki/Getting_Started) inside the subsystem, and run the commands. +Install the [Windows Subsystem for Linux](https://docs.microsoft.com/windows/wsl/install-win10), and run the commands. ## Important note for all users -- cgit v1.2.3 From d141011e7fcc564625118e69649f965384cb5be7 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Thu, 20 Dec 2018 20:43:40 -0500 Subject: Track tools --- .gitignore | 2 +- tools/aif2pcm/.gitignore | 2 + tools/aif2pcm/LICENSE | 20 + tools/aif2pcm/Makefile | 15 + tools/aif2pcm/extended.c | 172 +++++++ tools/aif2pcm/main.c | 830 ++++++++++++++++++++++++++++++++++ tools/bin2c/.gitignore | 1 + tools/bin2c/LICENSE | 19 + tools/bin2c/Makefile | 13 + tools/bin2c/bin2c.c | 201 +++++++++ tools/gbafix/.gitignore | 2 + tools/gbafix/COPYING | 674 ++++++++++++++++++++++++++++ tools/gbafix/Makefile | 10 + tools/gbafix/gbafix.c | 289 ++++++++++++ tools/gbagfx/.gitignore | 1 + tools/gbagfx/LICENSE | 19 + tools/gbagfx/Makefile | 18 + tools/gbagfx/convert_png.c | 254 +++++++++++ tools/gbagfx/convert_png.h | 12 + tools/gbagfx/font.c | 326 ++++++++++++++ tools/gbagfx/font.h | 16 + tools/gbagfx/gfx.c | 535 ++++++++++++++++++++++ tools/gbagfx/gfx.h | 53 +++ tools/gbagfx/global.h | 31 ++ tools/gbagfx/jasc_pal.c | 172 +++++++ tools/gbagfx/jasc_pal.h | 9 + tools/gbagfx/lz.c | 153 +++++++ tools/gbagfx/lz.h | 9 + tools/gbagfx/main.c | 539 ++++++++++++++++++++++ tools/gbagfx/options.h | 26 ++ tools/gbagfx/rl.c | 149 +++++++ tools/gbagfx/rl.h | 9 + tools/gbagfx/util.c | 124 ++++++ tools/gbagfx/util.h | 14 + tools/mid2agb/.gitignore | 1 + tools/mid2agb/LICENSE | 19 + tools/mid2agb/Makefile | 18 + tools/mid2agb/agb.cpp | 547 +++++++++++++++++++++++ tools/mid2agb/agb.h | 33 ++ tools/mid2agb/error.cpp | 36 ++ tools/mid2agb/error.h | 26 ++ tools/mid2agb/main.cpp | 233 ++++++++++ tools/mid2agb/main.h | 39 ++ tools/mid2agb/midi.cpp | 964 ++++++++++++++++++++++++++++++++++++++++ tools/mid2agb/midi.h | 87 ++++ tools/mid2agb/tables.cpp | 286 ++++++++++++ tools/mid2agb/tables.h | 29 ++ tools/preproc/.gitignore | 1 + tools/preproc/LICENSE | 19 + tools/preproc/Makefile | 17 + tools/preproc/asm_file.cpp | 529 ++++++++++++++++++++++ tools/preproc/asm_file.h | 72 +++ tools/preproc/c_file.cpp | 429 ++++++++++++++++++ tools/preproc/c_file.h | 58 +++ tools/preproc/char_util.h | 71 +++ tools/preproc/charmap.cpp | 408 +++++++++++++++++ tools/preproc/charmap.h | 64 +++ tools/preproc/preproc.cpp | 156 +++++++ tools/preproc/preproc.h | 54 +++ tools/preproc/string_parser.cpp | 355 +++++++++++++++ tools/preproc/string_parser.h | 55 +++ tools/preproc/utf8.cpp | 92 ++++ tools/preproc/utf8.h | 34 ++ tools/ramscrgen/.gitignore | 1 + tools/ramscrgen/LICENSE | 19 + tools/ramscrgen/Makefile | 15 + tools/ramscrgen/char_util.h | 71 +++ tools/ramscrgen/elf.cpp | 272 ++++++++++++ tools/ramscrgen/elf.h | 30 ++ tools/ramscrgen/main.cpp | 187 ++++++++ tools/ramscrgen/ramscrgen.h | 49 ++ tools/ramscrgen/sym_file.cpp | 492 ++++++++++++++++++++ tools/ramscrgen/sym_file.h | 71 +++ tools/rsfont/.gitignore | 1 + tools/rsfont/LICENSE | 19 + tools/rsfont/Makefile | 15 + tools/rsfont/convert_png.c | 169 +++++++ tools/rsfont/convert_png.h | 11 + tools/rsfont/font.c | 455 +++++++++++++++++++ tools/rsfont/font.h | 30 ++ tools/rsfont/gfx.h | 50 +++ tools/rsfont/global.h | 31 ++ tools/rsfont/main.c | 93 ++++ tools/rsfont/util.c | 124 ++++++ tools/rsfont/util.h | 14 + tools/scaninc/.gitignore | 1 + tools/scaninc/LICENSE | 19 + tools/scaninc/Makefile | 15 + tools/scaninc/asm_file.cpp | 191 ++++++++ tools/scaninc/asm_file.h | 119 +++++ tools/scaninc/c_file.cpp | 307 +++++++++++++ tools/scaninc/c_file.h | 57 +++ tools/scaninc/scaninc.cpp | 165 +++++++ tools/scaninc/scaninc.h | 59 +++ 94 files changed, 12602 insertions(+), 1 deletion(-) create mode 100644 tools/aif2pcm/.gitignore create mode 100644 tools/aif2pcm/LICENSE create mode 100644 tools/aif2pcm/Makefile create mode 100644 tools/aif2pcm/extended.c create mode 100644 tools/aif2pcm/main.c create mode 100644 tools/bin2c/.gitignore create mode 100644 tools/bin2c/LICENSE create mode 100644 tools/bin2c/Makefile create mode 100644 tools/bin2c/bin2c.c create mode 100644 tools/gbafix/.gitignore create mode 100644 tools/gbafix/COPYING create mode 100644 tools/gbafix/Makefile create mode 100644 tools/gbafix/gbafix.c create mode 100644 tools/gbagfx/.gitignore create mode 100644 tools/gbagfx/LICENSE create mode 100644 tools/gbagfx/Makefile create mode 100644 tools/gbagfx/convert_png.c create mode 100644 tools/gbagfx/convert_png.h create mode 100644 tools/gbagfx/font.c create mode 100644 tools/gbagfx/font.h create mode 100644 tools/gbagfx/gfx.c create mode 100644 tools/gbagfx/gfx.h create mode 100644 tools/gbagfx/global.h create mode 100644 tools/gbagfx/jasc_pal.c create mode 100644 tools/gbagfx/jasc_pal.h create mode 100644 tools/gbagfx/lz.c create mode 100644 tools/gbagfx/lz.h create mode 100644 tools/gbagfx/main.c create mode 100644 tools/gbagfx/options.h create mode 100644 tools/gbagfx/rl.c create mode 100644 tools/gbagfx/rl.h create mode 100644 tools/gbagfx/util.c create mode 100644 tools/gbagfx/util.h create mode 100644 tools/mid2agb/.gitignore create mode 100644 tools/mid2agb/LICENSE create mode 100644 tools/mid2agb/Makefile create mode 100644 tools/mid2agb/agb.cpp create mode 100644 tools/mid2agb/agb.h create mode 100644 tools/mid2agb/error.cpp create mode 100644 tools/mid2agb/error.h create mode 100644 tools/mid2agb/main.cpp create mode 100644 tools/mid2agb/main.h create mode 100644 tools/mid2agb/midi.cpp create mode 100644 tools/mid2agb/midi.h create mode 100644 tools/mid2agb/tables.cpp create mode 100644 tools/mid2agb/tables.h create mode 100644 tools/preproc/.gitignore create mode 100644 tools/preproc/LICENSE create mode 100644 tools/preproc/Makefile create mode 100644 tools/preproc/asm_file.cpp create mode 100644 tools/preproc/asm_file.h create mode 100644 tools/preproc/c_file.cpp create mode 100644 tools/preproc/c_file.h create mode 100644 tools/preproc/char_util.h create mode 100644 tools/preproc/charmap.cpp create mode 100644 tools/preproc/charmap.h create mode 100644 tools/preproc/preproc.cpp create mode 100644 tools/preproc/preproc.h create mode 100644 tools/preproc/string_parser.cpp create mode 100644 tools/preproc/string_parser.h create mode 100644 tools/preproc/utf8.cpp create mode 100644 tools/preproc/utf8.h create mode 100644 tools/ramscrgen/.gitignore create mode 100644 tools/ramscrgen/LICENSE create mode 100644 tools/ramscrgen/Makefile create mode 100644 tools/ramscrgen/char_util.h create mode 100644 tools/ramscrgen/elf.cpp create mode 100644 tools/ramscrgen/elf.h create mode 100644 tools/ramscrgen/main.cpp create mode 100644 tools/ramscrgen/ramscrgen.h create mode 100644 tools/ramscrgen/sym_file.cpp create mode 100644 tools/ramscrgen/sym_file.h create mode 100644 tools/rsfont/.gitignore create mode 100644 tools/rsfont/LICENSE create mode 100644 tools/rsfont/Makefile create mode 100644 tools/rsfont/convert_png.c create mode 100644 tools/rsfont/convert_png.h create mode 100644 tools/rsfont/font.c create mode 100644 tools/rsfont/font.h create mode 100644 tools/rsfont/gfx.h create mode 100644 tools/rsfont/global.h create mode 100644 tools/rsfont/main.c create mode 100644 tools/rsfont/util.c create mode 100644 tools/rsfont/util.h create mode 100644 tools/scaninc/.gitignore create mode 100644 tools/scaninc/LICENSE create mode 100644 tools/scaninc/Makefile create mode 100644 tools/scaninc/asm_file.cpp create mode 100644 tools/scaninc/asm_file.h create mode 100644 tools/scaninc/c_file.cpp create mode 100644 tools/scaninc/c_file.h create mode 100644 tools/scaninc/scaninc.cpp create mode 100644 tools/scaninc/scaninc.h diff --git a/.gitignore b/.gitignore index 7a8836759..3e38a227e 100644 --- a/.gitignore +++ b/.gitignore @@ -17,6 +17,7 @@ sound/**/*.bin src/*.s tools/agbcc +tools/binutils ld_script_ruby.txt ld_script_sapphire.txt *.map @@ -39,4 +40,3 @@ build/ .idea/ *.DS_Store *.pl -tools/ diff --git a/tools/aif2pcm/.gitignore b/tools/aif2pcm/.gitignore new file mode 100644 index 000000000..31531797e --- /dev/null +++ b/tools/aif2pcm/.gitignore @@ -0,0 +1,2 @@ +aif2pcm + diff --git a/tools/aif2pcm/LICENSE b/tools/aif2pcm/LICENSE new file mode 100644 index 000000000..966b92bd6 --- /dev/null +++ b/tools/aif2pcm/LICENSE @@ -0,0 +1,20 @@ +Copyright (c) 2016 huderlem +Copyright (c) 2005, 2006 by Marco Trillo + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. diff --git a/tools/aif2pcm/Makefile b/tools/aif2pcm/Makefile new file mode 100644 index 000000000..e5cb6ad31 --- /dev/null +++ b/tools/aif2pcm/Makefile @@ -0,0 +1,15 @@ +CC = gcc + +CFLAGS = -Wall -Wextra -Wno-switch -Werror -std=c11 -O2 + +LIBS = -lm + +SRCS = main.c extended.c + +.PHONY: clean + +aif2pcm: $(SRCS) + $(CC) $(CFLAGS) $(SRCS) -o $@ $(LDFLAGS) $(LIBS) + +clean: + $(RM) aif2pcm aif2pcm.exe diff --git a/tools/aif2pcm/extended.c b/tools/aif2pcm/extended.c new file mode 100644 index 000000000..94449164b --- /dev/null +++ b/tools/aif2pcm/extended.c @@ -0,0 +1,172 @@ +/* $Id: extended.c,v 1.8 2006/12/23 11:17:49 toad32767 Exp $ */ +/*- + * Copyright (c) 2005, 2006 by Marco Trillo + * + * Permission is hereby granted, free of charge, to any + * person obtaining a copy of this software and associated + * documentation files (the "Software"), to deal in the + * Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, + * distribute, sublicense, and/or sell copies of the + * Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice + * shall be included in all copies or substantial portions of + * the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY + * KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE + * WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR + * PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS + * OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR + * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR + * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE + * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + +#include +#include +#include + +/* + * Infinite & NAN values + * for non-IEEE systems + */ +#ifndef HUGE_VAL +#ifdef HUGE +#define INFINITE_VALUE HUGE +#define NAN_VALUE HUGE +#endif +#else +#define INFINITE_VALUE HUGE_VAL +#define NAN_VALUE HUGE_VAL +#endif + +/* + * IEEE 754 Extended Precision + * + * Implementation here is the 80-bit extended precision + * format of Motorola 68881, Motorola 68882 and Motorola + * 68040 FPUs, as well as Intel 80x87 FPUs. + * + * See: + * http://www.freescale.com/files/32bit/doc/fact_sheet/BR509.pdf + */ +/* + * Exponent range: [-16383,16383] + * Precision for mantissa: 64 bits with no hidden bit + * Bias: 16383 + */ + +/* + * Write IEEE Extended Precision Numbers + */ +void +ieee754_write_extended(double in, uint8_t* out) +{ + int sgn, exp, shift; + double fraction, t; + unsigned int lexp, hexp; + unsigned long low, high; + + if (in == 0.0) { + memset(out, 0, 10); + return; + } + if (in < 0.0) { + in = fabs(in); + sgn = 1; + } else + sgn = 0; + + fraction = frexp(in, &exp); + + if (exp == 0 || exp > 16384) { + if (exp > 16384) /* infinite value */ + low = high = 0; + else { + low = 0x80000000; + high = 0; + } + exp = 32767; + goto done; + } + fraction = ldexp(fraction, 32); + t = floor(fraction); + low = (unsigned long) t; + fraction -= t; + t = floor(ldexp(fraction, 32)); + high = (unsigned long) t; + + /* Convert exponents < -16382 to -16382 (then they will be + * stored as -16383) */ + if (exp < -16382) { + shift = 0 - exp - 16382; + high >>= shift; + high |= (low << (32 - shift)); + low >>= shift; + exp = -16382; + } + exp += 16383 - 1; /* bias */ + +done: + lexp = ((unsigned int) exp) >> 8; + hexp = ((unsigned int) exp) & 0xFF; + + /* big endian */ + out[0] = ((uint8_t) sgn) << 7; + out[0] |= (uint8_t) lexp; + out[1] = (uint8_t) hexp; + out[2] = (uint8_t) (low >> 24); + out[3] = (uint8_t) ((low >> 16) & 0xFF); + out[4] = (uint8_t) ((low >> 8) & 0xFF); + out[5] = (uint8_t) (low & 0xFF); + out[6] = (uint8_t) (high >> 24); + out[7] = (uint8_t) ((high >> 16) & 0xFF); + out[8] = (uint8_t) ((high >> 8) & 0xFF); + out[9] = (uint8_t) (high & 0xFF); + + return; +} + + +/* + * Read IEEE Extended Precision Numbers + */ +double +ieee754_read_extended(uint8_t* in) +{ + int sgn, exp; + unsigned long low, high; + double out; + + /* Extract the components from the big endian buffer */ + sgn = (int) (in[0] >> 7); + exp = ((int) (in[0] & 0x7F) << 8) | ((int) in[1]); + low = (((unsigned long) in[2]) << 24) + | (((unsigned long) in[3]) << 16) + | (((unsigned long) in[4]) << 8) | (unsigned long) in[5]; + high = (((unsigned long) in[6]) << 24) + | (((unsigned long) in[7]) << 16) + | (((unsigned long) in[8]) << 8) | (unsigned long) in[9]; + + if (exp == 0 && low == 0 && high == 0) + return (sgn ? -0.0 : 0.0); + + switch (exp) { + case 32767: + if (low == 0 && high == 0) + return (sgn ? -INFINITE_VALUE : INFINITE_VALUE); + else + return (sgn ? -NAN_VALUE : NAN_VALUE); + default: + exp -= 16383; /* unbias exponent */ + + } + + out = ldexp((double) low, -31 + exp); + out += ldexp((double) high, -63 + exp); + + return (sgn ? -out : out); +} diff --git a/tools/aif2pcm/main.c b/tools/aif2pcm/main.c new file mode 100644 index 000000000..51dbf1bb9 --- /dev/null +++ b/tools/aif2pcm/main.c @@ -0,0 +1,830 @@ +// Copyright(c) 2016 huderlem +// +// Permission is hereby granted, free of charge, to any person obtaining a copy +// of this software and associated documentation files (the "Software"), to deal +// in the Software without restriction, including without limitation the rights +// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +// copies of the Software, and to permit persons to whom the Software is +// furnished to do so, subject to the following conditions: +// +// The above copyright notice and this permission notice shall be included in +// all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +// THE SOFTWARE. + +#include +#include +#include +#include +#include +#include + +/* extended.c */ +void ieee754_write_extended (double, uint8_t*); +double ieee754_read_extended (uint8_t*); + +#ifdef _MSC_VER + +#define FATAL_ERROR(format, ...) \ +do \ +{ \ + fprintf(stderr, format, __VA_ARGS__); \ + exit(1); \ +} while (0) + +#else + +#define FATAL_ERROR(format, ...) \ +do \ +{ \ + fprintf(stderr, format, ##__VA_ARGS__); \ + exit(1); \ +} while (0) + +#endif // _MSC_VER + +typedef struct { + unsigned long num_samples; + uint8_t *samples; + uint8_t midi_note; + bool has_loop; + unsigned long loop_offset; + double sample_rate; + unsigned long real_num_samples; +} AifData; + +struct Bytes { + unsigned long length; + uint8_t *data; +}; + +struct Bytes *read_bytearray(const char *filename) +{ + struct Bytes *bytes = malloc(sizeof(struct Bytes)); + FILE *f = fopen(filename, "rb"); + if (!f) + { + FATAL_ERROR("Failed to open '%s' for reading!\n", filename); + } + fseek(f, 0, SEEK_END); + bytes->length = ftell(f); + fseek(f, 0, SEEK_SET); + bytes->data = malloc(bytes->length); + unsigned long read = fread(bytes->data, bytes->length, 1, f); + fclose(f); + if (read <= 0) + { + FATAL_ERROR("Failed to read data from '%s'!\n", filename); + } + return bytes; +} + +void write_bytearray(const char *filename, struct Bytes *bytes) +{ + FILE *f = fopen(filename, "wb"); + if (!f) + { + FATAL_ERROR("Failed to open '%s' for writing!\n", filename); + } + fwrite(bytes->data, bytes->length, 1, f); + fclose(f); +} + +void free_bytearray(struct Bytes *bytes) +{ + free(bytes->data); + free(bytes); +} + +char *get_file_extension(char *filename) +{ + char *index = strrchr(filename, '.'); + if (!index || index == filename) + { + return NULL; + } + return index + 1; +} + +char *new_file_extension(char *filename, char *ext) +{ + char *index = strrchr(filename, '.'); + if (!index || index == filename) + { + index = filename + strlen(filename); + } + int length = index - filename; + char *new_filename = malloc(length + 1 + strlen(ext) + 1); + if (new_filename) + { + strcpy(new_filename, filename); + new_filename[length] = '.'; + strcpy(new_filename + length + 1, ext); + } + return new_filename; +} + +void read_aif(struct Bytes *aif, AifData *aif_data) +{ + aif_data->has_loop = false; + aif_data->num_samples = 0; + + unsigned long pos = 0; + char chunk_name[5]; chunk_name[4] = '\0'; + char chunk_type[5]; chunk_type[4] = '\0'; + + // Check for FORM Chunk + memcpy(chunk_name, &aif->data[pos], 4); + pos += 4; + if (strcmp(chunk_name, "FORM") != 0) + { + FATAL_ERROR("Input .aif file has invalid header Chunk '%s'!\n", chunk_name); + } + + // Read size of whole file. + unsigned long whole_chunk_size = aif->data[pos++] << 24; + whole_chunk_size |= (aif->data[pos++] << 16); + whole_chunk_size |= (aif->data[pos++] << 8); + whole_chunk_size |= (uint8_t)aif->data[pos++]; + + unsigned long expected_whole_chunk_size = aif->length - 8; + if (whole_chunk_size != expected_whole_chunk_size) + { + FATAL_ERROR("FORM Chunk ckSize '%lu' doesn't match actual size '%lu'!\n", whole_chunk_size, expected_whole_chunk_size); + } + + // Check for AIFF Form Type + memcpy(chunk_type, &aif->data[pos], 4); + pos += 4; + if (strcmp(chunk_type, "AIFF") != 0) + { + FATAL_ERROR("FORM Type is '%s', but it must be AIFF!", chunk_type); + } + + unsigned long num_sample_frames = 0; + + // Read all the Chunks to populate the AifData struct. + while ((pos + 8) < aif->length) + { + // Read Chunk id + memcpy(chunk_name, &aif->data[pos], 4); + pos += 4; + + unsigned long chunk_size = (aif->data[pos++] << 24); + chunk_size |= (aif->data[pos++] << 16); + chunk_size |= (aif->data[pos++] << 8); + chunk_size |= aif->data[pos++]; + + if ((pos + chunk_size) > aif->length) + { + FATAL_ERROR("%s chunk at 0x%lx reached end of file before finishing\n", chunk_name, pos); + } + + if (strcmp(chunk_name, "COMM") == 0) + { + short num_channels = (aif->data[pos++] << 8); + num_channels |= (uint8_t)aif->data[pos++]; + if (num_channels != 1) + { + FATAL_ERROR("numChannels (%d) in the COMM Chunk must be 1!\n", num_channels); + } + + num_sample_frames = (aif->data[pos++] << 24); + num_sample_frames |= (aif->data[pos++] << 16); + num_sample_frames |= (aif->data[pos++] << 8); + num_sample_frames |= (uint8_t)aif->data[pos++]; + + short sample_size = (aif->data[pos++] << 8); + sample_size |= (uint8_t)aif->data[pos++]; + if (sample_size != 8) + { + FATAL_ERROR("sampleSize (%d) in the COMM Chunk must be 8!\n", sample_size); + } + + double sample_rate = ieee754_read_extended((uint8_t*)(aif->data + pos)); + pos += 10; + + aif_data->sample_rate = sample_rate; + + if (aif_data->num_samples == 0) + { + aif_data->num_samples = num_sample_frames; + } + } + else if (strcmp(chunk_name, "MARK") == 0) + { + unsigned short num_markers = (aif->data[pos++] << 8); + num_markers |= (uint8_t)aif->data[pos++]; + + // Read each marker and look for the "START" marker. + for (int i = 0; i < num_markers; i++) + { + unsigned short marker_id = (aif->data[pos++] << 8); + marker_id |= (uint8_t)aif->data[pos++]; + + unsigned long marker_position = (aif->data[pos++] << 24); + marker_position |= (aif->data[pos++] << 16); + marker_position |= (aif->data[pos++] << 8); + marker_position |= (uint8_t)aif->data[pos++]; + + // Marker id is a pascal-style string. + uint8_t marker_name_size = aif->data[pos++]; + char *marker_name = (char *)malloc((marker_name_size + 1) * sizeof(char)); + memcpy(marker_name, &aif->data[pos], marker_name_size); + marker_name[marker_name_size] = '\0'; + pos += marker_name_size; + + if (strcmp(marker_name, "START") == 0) + { + aif_data->loop_offset = marker_position; + aif_data->has_loop = true; + } + else if (strcmp(marker_name, "END") == 0) + { + if (!aif_data->has_loop) { + aif_data->loop_offset = marker_position; + aif_data->has_loop = true; + } + aif_data->num_samples = marker_position; + } + + free(marker_name); + } + } + else if (strcmp(chunk_name, "INST") == 0) + { + uint8_t midi_note = (uint8_t)aif->data[pos++]; + + aif_data->midi_note = midi_note; + + // Skip over data we don't need. + pos += 19; + } + else if (strcmp(chunk_name, "SSND") == 0) + { + // SKip offset and blockSize + pos += 8; + + unsigned long num_samples = chunk_size - 8; + uint8_t *sample_data = (uint8_t *)malloc(num_samples * sizeof(uint8_t)); + memcpy(sample_data, &aif->data[pos], num_samples); + + aif_data->samples = sample_data; + aif_data->real_num_samples = num_samples; + pos += chunk_size - 8; + } + else + { + // Skip over unsupported chunks. + pos += chunk_size; + } + } +} + +// This is a table of deltas between sample values in compressed PCM data. +const int gDeltaEncodingTable[] = { + 0, 1, 4, 9, 16, 25, 36, 49, + -64, -49, -36, -25, -16, -9, -4, -1, +}; + +struct Bytes *delta_decompress(struct Bytes *delta, unsigned int expected_length) +{ + struct Bytes *pcm = malloc(sizeof(struct Bytes)); + pcm->length = expected_length; + pcm->data = malloc(pcm->length + 0x40); + + uint8_t hi, lo; + unsigned int i = 0; + unsigned int j = 0; + int k; + int8_t base; + while (i < delta->length) + { + base = (int8_t)delta->data[i++]; + pcm->data[j++] = (uint8_t)base; + if (i >= delta->length) + { + break; + } + if (j >= pcm->length) + { + break; + } + lo = delta->data[i] & 0xf; + base += gDeltaEncodingTable[lo]; + pcm->data[j++] = base; + i++; + if (i >= delta->length) + { + break; + } + if (j >= pcm->length) + { + break; + } + for (k = 0; k < 31; k++) + { + hi = (delta->data[i] >> 4) & 0xf; + base += gDeltaEncodingTable[hi]; + pcm->data[j++] = base; + if (j >= pcm->length) + { + break; + } + lo = delta->data[i] & 0xf; + base += gDeltaEncodingTable[lo]; + pcm->data[j++] = base; + i++; + if (i >= delta->length) + { + break; + } + if (j >= pcm->length) + { + break; + } + } + if (j >= pcm->length) + { + break; + } + } + + pcm->length = j; + return pcm; +} + +int get_delta_index(uint8_t sample, uint8_t prev_sample) +{ + int best_error = INT_MAX; + int best_index = -1; + + for (int i = 0; i < 16; i++) + { + uint8_t new_sample = prev_sample + gDeltaEncodingTable[i]; + int error = sample > new_sample ? sample - new_sample : new_sample - sample; + + if (error < best_error) + { + best_error = error; + best_index = i; + } + } + + return best_index; +} + +struct Bytes *delta_compress(struct Bytes *pcm) +{ + struct Bytes *delta = malloc(sizeof(struct Bytes)); + // estimate the length so we can malloc + int num_blocks = pcm->length / 64; + delta->length = num_blocks * 33; + + int extra = pcm->length % 64; + if (extra) + { + delta->length += 1; + extra -= 1; + } + if (extra) + { + delta->length += 1; + extra -= 1; + } + if (extra) + { + delta->length += (extra + 1) / 2; + } + + delta->data = malloc(delta->length + 33); + + unsigned int i = 0; + unsigned int j = 0; + int k; + uint8_t base; + int delta_index; + + while (i < pcm->length) + { + base = pcm->data[i++]; + delta->data[j++] = base; + + if (i >= pcm->length) + { + break; + } + delta_index = get_delta_index(pcm->data[i++], base); + base += gDeltaEncodingTable[delta_index]; + delta->data[j++] = delta_index; + + for (k = 0; k < 31; k++) + { + if (i >= pcm->length) + { + break; + } + delta_index = get_delta_index(pcm->data[i++], base); + base += gDeltaEncodingTable[delta_index]; + delta->data[j] = (delta_index << 4); + + if (i >= pcm->length) + { + break; + } + delta_index = get_delta_index(pcm->data[i++], base); + base += gDeltaEncodingTable[delta_index]; + delta->data[j++] |= delta_index; + } + } + + delta->length = j; + + return delta; +} + +#define STORE_U32_LE(dest, value) \ +do { \ + *(dest) = (value) & 0xff; \ + *((dest) + 1) = ((value) >> 8) & 0xff; \ + *((dest) + 2) = ((value) >> 16) & 0xff; \ + *((dest) + 3) = ((value) >> 24) & 0xff; \ +} while (0) + +#define LOAD_U32_LE(var, src) \ +do { \ + (var) = *(src); \ + (var) |= (*((src) + 1) << 8); \ + (var) |= (*((src) + 2) << 16); \ + (var) |= (*((src) + 3) << 24); \ +} while (0) + +// Reads an .aif file and produces a .pcm file containing an array of 8-bit samples. +void aif2pcm(const char *aif_filename, const char *pcm_filename, bool compress) +{ + struct Bytes *aif = read_bytearray(aif_filename); + AifData aif_data = {0,0,0,0,0,0,0}; + read_aif(aif, &aif_data); + + int header_size = 0x10; + struct Bytes *pcm; + struct Bytes output = {0,0}; + + if (compress) + { + struct Bytes *input = malloc(sizeof(struct Bytes)); + input->data = aif_data.samples; + input->length = aif_data.real_num_samples; + pcm = delta_compress(input); + free(input); + } + else + { + pcm = malloc(sizeof(struct Bytes)); + pcm->data = aif_data.samples; + pcm->length = aif_data.real_num_samples; + } + output.length = header_size + pcm->length; + output.data = malloc(output.length); + + uint32_t pitch_adjust = (uint32_t)(aif_data.sample_rate * 1024); + uint32_t loop_offset = (uint32_t)(aif_data.loop_offset); + uint32_t adjusted_num_samples = (uint32_t)(aif_data.num_samples - 1); + uint32_t flags = 0; + if (aif_data.has_loop) flags |= 0x40000000; + if (compress) flags |= 1; + STORE_U32_LE(output.data + 0, flags); + STORE_U32_LE(output.data + 4, pitch_adjust); + STORE_U32_LE(output.data + 8, loop_offset); + STORE_U32_LE(output.data + 12, adjusted_num_samples); + memcpy(&output.data[header_size], pcm->data, pcm->length); + write_bytearray(pcm_filename, &output); + + free(aif->data); + free(aif); + free(pcm); + free(output.data); + free(aif_data.samples); +} + +// Reads a .pcm file containing an array of 8-bit samples and produces an .aif file. +// See http://www-mmsp.ece.mcgill.ca/documents/audioformats/aiff/Docs/AIFF-1.3.pdf for .aif file specification. +void pcm2aif(const char *pcm_filename, const char *aif_filename, uint32_t base_note) +{ + struct Bytes *pcm = read_bytearray(pcm_filename); + + AifData *aif_data = malloc(sizeof(AifData)); + + uint32_t flags; + LOAD_U32_LE(flags, pcm->data + 0); + aif_data->has_loop = flags & 0x40000000; + bool compressed = flags & 1; + + uint32_t pitch_adjust; + LOAD_U32_LE(pitch_adjust, pcm->data + 4); + aif_data->sample_rate = pitch_adjust / 1024.0; + + LOAD_U32_LE(aif_data->loop_offset, pcm->data + 8); + LOAD_U32_LE(aif_data->num_samples, pcm->data + 12); + aif_data->num_samples += 1; + + if (compressed) + { + struct Bytes *delta = pcm; + uint8_t *pcm_data = pcm->data; + delta->length -= 0x10; + delta->data += 0x10; + pcm = delta_decompress(delta, aif_data->num_samples); + free(pcm_data); + free(delta); + } + else + { + pcm->length -= 0x10; + pcm->data += 0x10; + } + + aif_data->samples = malloc(pcm->length); + memcpy(aif_data->samples, pcm->data, pcm->length); + + struct Bytes *aif = malloc(sizeof(struct Bytes)); + aif->length = 54 + 60 + pcm->length; + aif->data = malloc(aif->length); + + long pos = 0; + + // First, write the FORM header chunk. + // FORM Chunk ckID + aif->data[pos++] = 'F'; + aif->data[pos++] = 'O'; + aif->data[pos++] = 'R'; + aif->data[pos++] = 'M'; + + // FORM Chunk ckSize + unsigned long form_size = pos; + unsigned long data_size = aif->length - 8; + aif->data[pos++] = ((data_size >> 24) & 0xFF); + aif->data[pos++] = ((data_size >> 16) & 0xFF); + aif->data[pos++] = ((data_size >> 8) & 0xFF); + aif->data[pos++] = (data_size & 0xFF); + + // FORM Chunk formType + aif->data[pos++] = 'A'; + aif->data[pos++] = 'I'; + aif->data[pos++] = 'F'; + aif->data[pos++] = 'F'; + + // Next, write the Common Chunk + // Common Chunk ckID + aif->data[pos++] = 'C'; + aif->data[pos++] = 'O'; + aif->data[pos++] = 'M'; + aif->data[pos++] = 'M'; + + // Common Chunk ckSize + aif->data[pos++] = 0; + aif->data[pos++] = 0; + aif->data[pos++] = 0; + aif->data[pos++] = 18; + + // Common Chunk numChannels + aif->data[pos++] = 0; + aif->data[pos++] = 1; // 1 channel + + // Common Chunk numSampleFrames + aif->data[pos++] = ((aif_data->num_samples >> 24) & 0xFF); + aif->data[pos++] = ((aif_data->num_samples >> 16) & 0xFF); + aif->data[pos++] = ((aif_data->num_samples >> 8) & 0xFF); + aif->data[pos++] = (aif_data->num_samples & 0xFF); + + // Common Chunk sampleSize + aif->data[pos++] = 0; + aif->data[pos++] = 8; // 8 bits per sample + + // Common Chunk sampleRate + //double sample_rate = pitch_adjust / 1024.0; + uint8_t sample_rate_buffer[10]; + ieee754_write_extended(aif_data->sample_rate, sample_rate_buffer); + for (int i = 0; i < 10; i++) + { + aif->data[pos++] = sample_rate_buffer[i]; + } + + if (aif_data->has_loop) + { + + // Marker Chunk ckID + aif->data[pos++] = 'M'; + aif->data[pos++] = 'A'; + aif->data[pos++] = 'R'; + aif->data[pos++] = 'K'; + + // Marker Chunk ckSize + aif->data[pos++] = 0; + aif->data[pos++] = 0; + aif->data[pos++] = 0; + aif->data[pos++] = 12 + (aif_data->has_loop ? 12 : 0); + + // Marker Chunk numMarkers + aif->data[pos++] = 0; + aif->data[pos++] = (aif_data->has_loop ? 2 : 1); + + // Marker loop start + aif->data[pos++] = 0; + aif->data[pos++] = 1; // id = 1 + + long loop_start = aif_data->loop_offset; + aif->data[pos++] = ((loop_start >> 24) & 0xFF); + aif->data[pos++] = ((loop_start >> 16) & 0xFF); + aif->data[pos++] = ((loop_start >> 8) & 0xFF); + aif->data[pos++] = (loop_start & 0xFF); // position + + aif->data[pos++] = 5; // pascal-style string length + aif->data[pos++] = 'S'; + aif->data[pos++] = 'T'; + aif->data[pos++] = 'A'; + aif->data[pos++] = 'R'; + aif->data[pos++] = 'T'; // markerName + + // Marker loop end + aif->data[pos++] = 0; + aif->data[pos++] = (aif_data->has_loop ? 2 : 1); // id = 2 + + long loop_end = aif_data->num_samples; + aif->data[pos++] = ((loop_end >> 24) & 0xFF); + aif->data[pos++] = ((loop_end >> 16) & 0xFF); + aif->data[pos++] = ((loop_end >> 8) & 0xFF); + aif->data[pos++] = (loop_end & 0xFF); // position + + aif->data[pos++] = 3; // pascal-style string length + aif->data[pos++] = 'E'; + aif->data[pos++] = 'N'; + aif->data[pos++] = 'D'; + } + + // Instrument Chunk ckID + aif->data[pos++] = 'I'; + aif->data[pos++] = 'N'; + aif->data[pos++] = 'S'; + aif->data[pos++] = 'T'; + + // Instrument Chunk ckSize + aif->data[pos++] = 0; + aif->data[pos++] = 0; + aif->data[pos++] = 0; + aif->data[pos++] = 20; + + aif->data[pos++] = base_note; // baseNote + aif->data[pos++] = 0; // detune + aif->data[pos++] = 0; // lowNote + aif->data[pos++] = 127; // highNote + aif->data[pos++] = 1; // lowVelocity + aif->data[pos++] = 127; // highVelocity + aif->data[pos++] = 0; // gain (hi) + aif->data[pos++] = 0; // gain (lo) + + // Instrument Chunk sustainLoop + aif->data[pos++] = 0; + aif->data[pos++] = 1; // playMode = ForwardLooping + + aif->data[pos++] = 0; + aif->data[pos++] = 1; // beginLoop marker id + + aif->data[pos++] = 0; + aif->data[pos++] = 2; // endLoop marker id + + // Instrument Chunk releaseLoop + aif->data[pos++] = 0; + aif->data[pos++] = 1; // playMode = ForwardLooping + + aif->data[pos++] = 0; + aif->data[pos++] = 1; // beginLoop marker id + + aif->data[pos++] = 0; + aif->data[pos++] = 2; // endLoop marker id + + // Finally, write the Sound Data Chunk + // Sound Data Chunk ckID + aif->data[pos++] = 'S'; + aif->data[pos++] = 'S'; + aif->data[pos++] = 'N'; + aif->data[pos++] = 'D'; + + // Sound Data Chunk ckSize + unsigned long sound_data_size = pcm->length + 8; + aif->data[pos++] = ((sound_data_size >> 24) & 0xFF); + aif->data[pos++] = ((sound_data_size >> 16) & 0xFF); + aif->data[pos++] = ((sound_data_size >> 8) & 0xFF); + aif->data[pos++] = (sound_data_size & 0xFF); + + // Sound Data Chunk offset + aif->data[pos++] = 0; + aif->data[pos++] = 0; + aif->data[pos++] = 0; + aif->data[pos++] = 0; + + // Sound Data Chunk blockSize + aif->data[pos++] = 0; + aif->data[pos++] = 0; + aif->data[pos++] = 0; + aif->data[pos++] = 0; + + // Sound Data Chunk soundData + for (unsigned int i = 0; i < aif_data->loop_offset; i++) + { + aif->data[pos++] = aif_data->samples[i]; + } + + int j = 0; + for (unsigned int i = aif_data->loop_offset; i < pcm->length; i++) + { + int pcm_index = aif_data->loop_offset + (j++ % (pcm->length - aif_data->loop_offset)); + aif->data[pos++] = aif_data->samples[pcm_index]; + } + + aif->length = pos; + + // Go back and rewrite ckSize + data_size = aif->length - 8; + aif->data[form_size + 0] = ((data_size >> 24) & 0xFF); + aif->data[form_size + 1] = ((data_size >> 16) & 0xFF); + aif->data[form_size + 2] = ((data_size >> 8) & 0xFF); + aif->data[form_size + 3] = (data_size & 0xFF); + + write_bytearray(aif_filename, aif); + + free(aif->data); + free(aif); +} + +void usage(void) +{ + fprintf(stderr, "Usage: aif2pcm bin_file [aif_file]\n"); + fprintf(stderr, " aif2pcm aif_file [bin_file] [--compress]\n"); +} + +int main(int argc, char **argv) +{ + if (argc < 2) + { + usage(); + exit(1); + } + + char *input_file = argv[1]; + char *extension = get_file_extension(input_file); + char *output_file; + bool compressed = false; + + if (argc > 3) + { + for (int i = 3; i < argc; i++) + { + if (strcmp(argv[i], "--compress") == 0) + { + compressed = true; + } + } + } + + if (strcmp(extension, "aif") == 0 || strcmp(extension, "aiff") == 0) + { + if (argc >= 3) + { + output_file = argv[2]; + aif2pcm(input_file, output_file, compressed); + } + else + { + output_file = new_file_extension(input_file, "bin"); + aif2pcm(input_file, output_file, compressed); + free(output_file); + } + } + else if (strcmp(extension, "bin") == 0) + { + if (argc >= 3) + { + output_file = argv[2]; + pcm2aif(input_file, output_file, 60); + } + else + { + output_file = new_file_extension(input_file, "aif"); + pcm2aif(input_file, output_file, 60); + free(output_file); + } + } + else + { + FATAL_ERROR("Input file must be .aif or .bin: '%s'\n", input_file); + } + + return 0; +} diff --git a/tools/bin2c/.gitignore b/tools/bin2c/.gitignore new file mode 100644 index 000000000..366f3d3e9 --- /dev/null +++ b/tools/bin2c/.gitignore @@ -0,0 +1 @@ +bin2c diff --git a/tools/bin2c/LICENSE b/tools/bin2c/LICENSE new file mode 100644 index 000000000..534d15349 --- /dev/null +++ b/tools/bin2c/LICENSE @@ -0,0 +1,19 @@ +Copyright (c) 2016 YamaArashi + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. diff --git a/tools/bin2c/Makefile b/tools/bin2c/Makefile new file mode 100644 index 000000000..73f78980e --- /dev/null +++ b/tools/bin2c/Makefile @@ -0,0 +1,13 @@ +CC = gcc + +CFLAGS = -Wall -Wextra -Werror -std=c11 -O2 + +.PHONY: clean + +SRCS = bin2c.c + +bin2c: $(SRCS) + $(CC) $(CFLAGS) $(SRCS) -o $@ $(LDFLAGS) + +clean: + $(RM) bin2c bin2c.exe diff --git a/tools/bin2c/bin2c.c b/tools/bin2c/bin2c.c new file mode 100644 index 000000000..b4bd437f0 --- /dev/null +++ b/tools/bin2c/bin2c.c @@ -0,0 +1,201 @@ +// Copyright(c) 2015-2016 YamaArashi +// +// Permission is hereby granted, free of charge, to any person obtaining a copy +// of this software and associated documentation files (the "Software"), to deal +// in the Software without restriction, including without limitation the rights +// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +// copies of the Software, and to permit persons to whom the Software is +// furnished to do so, subject to the following conditions: +// +// The above copyright notice and this permission notice shall be included in +// all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +// THE SOFTWARE. + +#include +#include +#include +#include + +#ifdef _MSC_VER + +#define FATAL_ERROR(format, ...) \ +do \ +{ \ + fprintf(stderr, format, __VA_ARGS__); \ + exit(1); \ +} while (0) + +#else + +#define FATAL_ERROR(format, ...) \ +do \ +{ \ + fprintf(stderr, format, ##__VA_ARGS__); \ + exit(1); \ +} while (0) + +#endif // _MSC_VER + +unsigned char *ReadWholeFile(char *path, int *size) +{ + FILE *fp = fopen(path, "rb"); + + if (fp == NULL) + FATAL_ERROR("Failed to open \"%s\" for reading.\n", path); + + fseek(fp, 0, SEEK_END); + + *size = ftell(fp); + + unsigned char *buffer = malloc(*size); + + if (buffer == NULL) + FATAL_ERROR("Failed to allocate memory for reading \"%s\".\n", path); + + rewind(fp); + + if (fread(buffer, *size, 1, fp) != 1) + FATAL_ERROR("Failed to read \"%s\".\n", path); + + fclose(fp); + + return buffer; +} + +int ExtractData(unsigned char *buffer, int offset, int size) +{ + switch (size) + { + case 1: + return buffer[offset]; + case 2: + return (buffer[offset + 1] << 8) + | buffer[offset]; + case 4: + return (buffer[offset + 3] << 24) + | (buffer[offset + 2] << 16) + | (buffer[offset + 1] << 8) + | buffer[offset]; + default: + FATAL_ERROR("Invalid size passed to ExtractData.\n"); + } +} + +int main(int argc, char **argv) +{ + if (argc < 3) + FATAL_ERROR("Usage: bin2c INPUT_FILE VAR_NAME [OPTIONS...]\n"); + + int fileSize; + unsigned char *buffer = ReadWholeFile(argv[1], &fileSize); + char *var_name = argv[2]; + int col = 1; + int pad = 0; + int size = 1; + bool isSigned = false; + bool isStatic = false; + bool isDecimal = false; + + for (int i = 3; i < argc; i++) + { + if (!strcmp(argv[i], "-col")) + { + i++; + + if (i >= argc) + FATAL_ERROR("Missing argument after '-col'.\n"); + + col = atoi(argv[i]); + } + else if (!strcmp(argv[i], "-pad")) + { + i++; + + if (i >= argc) + FATAL_ERROR("Missing argument after '-pad'.\n"); + + pad = atoi(argv[i]); + } + else if (!strcmp(argv[i], "-size")) + { + i++; + + if (i >= argc) + FATAL_ERROR("Missing argument after '-size'.\n"); + + size = atoi(argv[i]); + + if (size != 1 && size != 2 && size != 4) + FATAL_ERROR("Size must be 1, 2, or 4.\n"); + } + else if (!strcmp(argv[i], "-signed")) + { + isSigned = true; + isDecimal = true; + } + else if (!strcmp(argv[i], "-static")) + { + isStatic = true; + } + else if (!strcmp(argv[i], "-decimal")) + { + isDecimal = true; + } + else + { + FATAL_ERROR("Unrecognized option '%s'.\n", argv[i]); + } + } + + if ((fileSize & (size - 1)) != 0) + FATAL_ERROR("Size %d doesn't evenly divide file size %d.\n", size, fileSize); + + printf("// Generated file. Do not edit.\n\n"); + + if (isStatic) + printf("static "); + + printf("const "); + + if (isSigned) + printf("s%d ", 8 * size); + else + printf("u%d ", 8 * size); + + printf("%s[] =\n{", var_name); + + int count = fileSize / size; + int offset = 0; + + for (int i = 0; i < count; i++) + { + if (i % col == 0) + printf("\n "); + + int data = ExtractData(buffer, offset, size); + offset += size; + + if (isDecimal) + { + if (isSigned) + printf("%*d, ", pad, data); + else + printf("%*uu, ", pad, data); + } + else + { + printf("%#*xu, ", pad, data); + } + } + + printf("\n};\n"); + + return 0; +} diff --git a/tools/gbafix/.gitignore b/tools/gbafix/.gitignore new file mode 100644 index 000000000..3cebf8ae8 --- /dev/null +++ b/tools/gbafix/.gitignore @@ -0,0 +1,2 @@ +gbafix +README diff --git a/tools/gbafix/COPYING b/tools/gbafix/COPYING new file mode 100644 index 000000000..94a9ed024 --- /dev/null +++ b/tools/gbafix/COPYING @@ -0,0 +1,674 @@ + GNU GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU General Public License is a free, copyleft license for +software and other kinds of works. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +the GNU General Public License is intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. We, the Free Software Foundation, use the +GNU General Public License for most of our software; it applies also to +any other work released this way by its authors. You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + To protect your rights, we need to prevent others from denying you +these rights or asking you to surrender the rights. Therefore, you have +certain responsibilities if you distribute copies of the software, or if +you modify it: responsibilities to respect the freedom of others. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must pass on to the recipients the same +freedoms that you received. You must make sure that they, too, receive +or can get the source code. And you must show them these terms so they +know their rights. + + Developers that use the GNU GPL protect your rights with two steps: +(1) assert copyright on the software, and (2) offer you this License +giving you legal permission to copy, distribute and/or modify it. + + For the developers' and authors' protection, the GPL clearly explains +that there is no warranty for this free software. For both users' and +authors' sake, the GPL requires that modified versions be marked as +changed, so that their problems will not be attributed erroneously to +authors of previous versions. + + Some devices are designed to deny users access to install or run +modified versions of the software inside them, although the manufacturer +can do so. This is fundamentally incompatible with the aim of +protecting users' freedom to change the software. The systematic +pattern of such abuse occurs in the area of products for individuals to +use, which is precisely where it is most unacceptable. Therefore, we +have designed this version of the GPL to prohibit the practice for those +products. If such problems arise substantially in other domains, we +stand ready to extend this provision to those domains in future versions +of the GPL, as needed to protect the freedom of users. + + Finally, every program is threatened constantly by software patents. +States should not allow patents to restrict development and use of +software on general-purpose computers, but in those that do, we wish to +avoid the special danger that patents applied to a free program could +make it effectively proprietary. To prevent this, the GPL assures that +patents cannot be used to render the program non-free. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Use with the GNU Affero General Public License. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU Affero General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the special requirements of the GNU Affero General Public License, +section 13, concerning interaction through a network will apply to the +combination as such. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . + +Also add information on how to contact you by electronic and paper mail. + + If the program does terminal interaction, make it output a short +notice like this when it starts in an interactive mode: + + Copyright (C) + This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, your program's commands +might be different; for a GUI interface, you would use an "about box". + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU GPL, see +. + + The GNU General Public License does not permit incorporating your program +into proprietary programs. If your program is a subroutine library, you +may consider it more useful to permit linking proprietary applications with +the library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. But first, please read +. diff --git a/tools/gbafix/Makefile b/tools/gbafix/Makefile new file mode 100644 index 000000000..f12c8cc4f --- /dev/null +++ b/tools/gbafix/Makefile @@ -0,0 +1,10 @@ +CC = gcc +.PHONY: clean + +SRCS = gbafix.c + +gbafix: $(SRCS) + $(CC) $(SRCS) -o $@ $(LDFLAGS) + +clean: + $(RM) gbafix gbafix.exe diff --git a/tools/gbafix/gbafix.c b/tools/gbafix/gbafix.c new file mode 100644 index 000000000..d5e2f62ab --- /dev/null +++ b/tools/gbafix/gbafix.c @@ -0,0 +1,289 @@ +/* + "$Id: gbafix.c,v 1.2 2008-07-30 17:12:51 wntrmute Exp $" + + DevkitPro GBA ROM fix utility + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public + License as published by the Free Software Foundation; either + version 2 of the License, or (at your option) any later version. + + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public + License along with this library; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 + USA. + + Please report all bugs and problems through the bug tracker at + "http://sourceforge.net/tracker/?group_id=114505&atid=668551". + + "$Header: /lvm/shared/ds/ds/cvs/devkitpro-cvsbackup/tools/gba/gbatools/gbafix.c,v 1.2 2008-07-30 17:12:51 wntrmute Exp $" + +*/ +//--------------------------------------------------------------------------------- +// gbafix.c +//--------------------------------------------------------------------------------- +/* + Gameboy Advance ROM fixer (by Dark Fader / BlackThunder / WinterMute / Diegoisawesome) + Validates header of GBA roms. + + History + ------- + v1.06 - added output silencing, (Diegoisawesome) + v1.05 - added debug offset argument, (Diegoisawesome) + v1.04 - converted to plain C, (WinterMute) + v1.03 - header.fixed, header.device_type + v1.02 - redefined the options (rgbfix style), checksum=0 + v1.01 - fix in parameters + v1.00 - logo, complement +*/ + +#pragma pack(1) + +#include +#include +#include +#include + +#define VER "1.06" +#define ARGV argv[arg] +#define VALUE (ARGV+2) +#define NUMBER strtoul(VALUE, NULL, 0) + +typedef struct +{ + uint32_t start_code; // B instruction + uint8_t logo[0xA0-0x04]; // logo data + uint8_t title[0xC]; // game title name + uint32_t game_code; // + uint16_t maker_code; // + uint8_t fixed; // 0x96 + uint8_t unit_code; // 0x00 + uint8_t device_type; // 0x00 + uint8_t unused[7]; // + uint8_t game_version; // 0x00 + uint8_t complement; // 800000A0..800000BC + uint16_t checksum; // 0x0000 +} Header; + + +Header header; + +unsigned short checksum_without_header = 0; + +const Header good_header = +{ + // start_code + 0xEA00002E, + // logo + { 0x24,0xFF,0xAE,0x51,0x69,0x9A,0xA2,0x21,0x3D,0x84,0x82,0x0A,0x84,0xE4,0x09,0xAD, + 0x11,0x24,0x8B,0x98,0xC0,0x81,0x7F,0x21,0xA3,0x52,0xBE,0x19,0x93,0x09,0xCE,0x20, + 0x10,0x46,0x4A,0x4A,0xF8,0x27,0x31,0xEC,0x58,0xC7,0xE8,0x33,0x82,0xE3,0xCE,0xBF, + 0x85,0xF4,0xDF,0x94,0xCE,0x4B,0x09,0xC1,0x94,0x56,0x8A,0xC0,0x13,0x72,0xA7,0xFC, + 0x9F,0x84,0x4D,0x73,0xA3,0xCA,0x9A,0x61,0x58,0x97,0xA3,0x27,0xFC,0x03,0x98,0x76, + 0x23,0x1D,0xC7,0x61,0x03,0x04,0xAE,0x56,0xBF,0x38,0x84,0x00,0x40,0xA7,0x0E,0xFD, + 0xFF,0x52,0xFE,0x03,0x6F,0x95,0x30,0xF1,0x97,0xFB,0xC0,0x85,0x60,0xD6,0x80,0x25, + 0xA9,0x63,0xBE,0x03,0x01,0x4E,0x38,0xE2,0xF9,0xA2,0x34,0xFF,0xBB,0x3E,0x03,0x44, + 0x78,0x00,0x90,0xCB,0x88,0x11,0x3A,0x94,0x65,0xC0,0x7C,0x63,0x87,0xF0,0x3C,0xAF, + 0xD6,0x25,0xE4,0x8B,0x38,0x0A,0xAC,0x72,0x21,0xD4,0xF8,0x07 } , + // title + { 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 }, + // game code + 0x00000000, + // maker code + 0x3130, + // fixed + 0x96, + // unit_code + 0x00, + // device type + 0x00, + // unused + { 0x00,0x00,0x00,0x00,0x00,0x00,0x00 }, + // game version + 0x00, + // complement + 0x00, + // checksum + 0x0000 +}; + +//--------------------------------------------------------------------------------- +char HeaderComplement() +/*--------------------------------------------------------------------------------- + Calculate Header complement check +---------------------------------------------------------------------------------*/ +{ + int n; + char c = 0; + char *p = (char *)&header + 0xA0; + for (n=0; n<0xBD-0xA0; n++) + { + c += *p++; + } + return -(0x19+c); +} + + +//--------------------------------------------------------------------------------- +int main(int argc, char *argv[]) +//--------------------------------------------------------------------------------- +{ + int arg; + char *argfile = 0; + FILE *infile; + int silent = 0; + + int size,bit; + + // show syntax + if (argc <= 1) + { + printf("GBA ROM fixer v"VER" by Dark Fader / BlackThunder / WinterMute / Diegoisawesome \n"); + printf("Syntax: gbafix [-p] [-t[title]] [-c] [-m] [-r] [-d] [--silent]\n"); + printf("\n"); + printf("parameters:\n"); + printf(" -p Pad to next exact power of 2. No minimum size!\n"); + printf(" -t[] Patch title. Stripped filename if none given.\n"); + printf(" -c<game_code> Patch game code (four characters)\n"); + printf(" -m<maker_code> Patch maker code (two characters)\n"); + printf(" -r<version> Patch game version (number)\n"); + printf(" -d<debug> Enable debugging handler and set debug entry point (0 or 1)\n"); + printf(" --silent Silence non-error output\n"); + return -1; + } + + // get filename + for (arg=1; arg<argc; arg++) + { + if ((ARGV[0] != '-')) { argfile=ARGV; } + if (strncmp("--silent", &ARGV[0], 7) == 0) { silent = 1; } + } + + // check filename + if (!argfile) + { + fprintf(stderr, "Filename needed!\n"); + return -1; + } + + // read file + infile = fopen(argfile, "r+b"); + if (!infile) { fprintf(stderr, "Error opening input file!\n"); return -1; } + fseek(infile, 0, SEEK_SET); + fread(&header, sizeof(header), 1, infile); + + // fix some data + memcpy(header.logo, good_header.logo, sizeof(header.logo)); + memcpy(&header.fixed, &good_header.fixed, sizeof(header.fixed)); + memcpy(&header.device_type, &good_header.device_type, sizeof(header.device_type)); + + // parse command line + for (arg=1; arg<argc; arg++) + { + if ((ARGV[0] == '-')) + { + switch (ARGV[1]) + { + case 'p': // pad + { + fseek(infile, 0, SEEK_END); + size = ftell(infile); + for (bit=31; bit>=0; bit--) if (size & (1<<bit)) break; + if (size != (1<<bit)) + { + int todo = (1<<(bit+1)) - size; + while (todo--) fputc(0xFF, infile); + } + fseek(infile, 0, SEEK_SET); + break; + } + + case 't': // title + { + char title[256]; + memset(title, 0, sizeof(title)); + if (VALUE[0]) + { + strncpy(title, VALUE, sizeof(header.title)); + } + else + { + // use filename + char s[256], *begin=s, *t; strcpy(s, argfile); + t = strrchr(s, '\\'); if (t) begin = t+1; + t = strrchr(s, '/'); if (t) begin = t+1; + t = strrchr(s, '.'); if (t) *t = 0; + strncpy(title, begin, sizeof(header.title)); + if (!silent) printf("%s\n",begin); + } + memcpy(header.title, title, sizeof(header.title)); // copy + break; + } + + case 'c': // game code + { + //if (!VALUE[0]) { fprintf(stderr, "Need value for %s\n", ARGV); break; } + //header.game_code = NUMBER; + header.game_code = VALUE[0] | VALUE[1]<<8 | VALUE[2]<<16 | VALUE[3]<<24; + break; + } + + case 'm': // maker code + { + //if (!VALUE[0]) { fprintf(stderr, "Need value for %s\n", ARGV); break; } + //header.maker_code = (unsigned short)NUMBER; + header.maker_code = VALUE[0] | VALUE[1]<<8; + break; + } + + case 'v': // ignored, compatability with other gbafix + { + break; + } + + case 'r': // version + { + if (!VALUE[0]) { fprintf(stderr, "Need value for %s\n", ARGV); break; } + header.game_version = (unsigned char)NUMBER; + break; + } + + case 'd': // debug + { + if (!VALUE[0]) { fprintf(stderr, "Need value for %s\n", ARGV); break; } + header.logo[0x9C-0x04] = 0xA5; // debug enable + header.device_type = (unsigned char)((NUMBER & 1) << 7); // debug handler entry point + break; + } + case '-': // long arguments + { + if (strncmp("silent", &ARGV[2], 6) == 0) { continue; } + break; + } + default: + { + printf("Invalid option: %s\n", ARGV); + } + } + } + } + + // update complement check & total checksum + header.complement = 0; + header.checksum = 0; // must be 0 + header.complement = HeaderComplement(); + //header.checksum = checksum_without_header + HeaderChecksum(); + + fseek(infile, 0, SEEK_SET); + fwrite(&header, sizeof(header), 1, infile); + fclose(infile); + + if (!silent) printf("ROM fixed!\n"); + + return 0; +} diff --git a/tools/gbagfx/.gitignore b/tools/gbagfx/.gitignore new file mode 100644 index 000000000..dbbb3f04c --- /dev/null +++ b/tools/gbagfx/.gitignore @@ -0,0 +1 @@ +gbagfx diff --git a/tools/gbagfx/LICENSE b/tools/gbagfx/LICENSE new file mode 100644 index 000000000..b66bf81c0 --- /dev/null +++ b/tools/gbagfx/LICENSE @@ -0,0 +1,19 @@ +Copyright (c) 2015 YamaArashi + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. diff --git a/tools/gbagfx/Makefile b/tools/gbagfx/Makefile new file mode 100644 index 000000000..339585b92 --- /dev/null +++ b/tools/gbagfx/Makefile @@ -0,0 +1,18 @@ +CC = gcc + +CFLAGS = -Wall -Wextra -Werror -std=c11 -O2 -DPNG_SKIP_SETJMP_CHECK + +LIBS = -lpng -lz + +SRCS = main.c convert_png.c gfx.c jasc_pal.c lz.c rl.c util.c font.c + +.PHONY: all clean + +all: gbagfx + @: + +gbagfx: $(SRCS) convert_png.h gfx.h global.h jasc_pal.h lz.h rl.h util.h font.h + $(CC) $(CFLAGS) $(SRCS) -o $@ $(LDFLAGS) $(LIBS) + +clean: + $(RM) gbagfx gbagfx.exe diff --git a/tools/gbagfx/convert_png.c b/tools/gbagfx/convert_png.c new file mode 100644 index 000000000..cdfa39a7a --- /dev/null +++ b/tools/gbagfx/convert_png.c @@ -0,0 +1,254 @@ +// Copyright (c) 2015 YamaArashi + +#include <stdio.h> +#include <setjmp.h> +#include <png.h> +#include "global.h" +#include "convert_png.h" +#include "gfx.h" + +static FILE *PngReadOpen(char *path, png_structp *pngStruct, png_infop *pngInfo) +{ + FILE *fp = fopen(path, "rb"); + + if (fp == NULL) + FATAL_ERROR("Failed to open \"%s\" for reading.\n", path); + + unsigned char sig[8]; + + if (fread(sig, 8, 1, fp) != 1) + FATAL_ERROR("Failed to read PNG signature from \"%s\".\n", path); + + if (png_sig_cmp(sig, 0, 8)) + FATAL_ERROR("\"%s\" does not have a valid PNG signature.\n", path); + + png_structp png_ptr = png_create_read_struct(PNG_LIBPNG_VER_STRING, NULL, NULL, NULL); + + if (!png_ptr) + FATAL_ERROR("Failed to create PNG read struct.\n"); + + png_infop info_ptr = png_create_info_struct(png_ptr); + + if (!info_ptr) + FATAL_ERROR("Failed to create PNG info struct.\n"); + + if (setjmp(png_jmpbuf(png_ptr))) + FATAL_ERROR("Failed to init I/O for reading \"%s\".\n", path); + + png_init_io(png_ptr, fp); + png_set_sig_bytes(png_ptr, 8); + png_read_info(png_ptr, info_ptr); + + *pngStruct = png_ptr; + *pngInfo = info_ptr; + + return fp; +} + +static unsigned char *ConvertBitDepth(unsigned char *src, int srcBitDepth, int destBitDepth, int numPixels) +{ + // Round the number of bits up to the next 8 and divide by 8 to get the number of bytes. + int srcSize = ((numPixels * srcBitDepth + 7) & ~7) / 8; + int destSize = ((numPixels * destBitDepth + 7) & ~7) / 8; + unsigned char *output = calloc(destSize, 1); + unsigned char *dest = output; + int i; + int j; + int destBit = 8 - destBitDepth; + + for (i = 0; i < srcSize; i++) + { + unsigned char srcByte = src[i]; + + for (j = 8 - srcBitDepth; j >= 0; j -= srcBitDepth) + { + unsigned char pixel = (srcByte >> j) % (1 << srcBitDepth); + + if (pixel >= (1 << destBitDepth)) + FATAL_ERROR("Image exceeds the maximum color value for a %ibpp image.\n", destBitDepth); + *dest |= pixel << destBit; + destBit -= destBitDepth; + if (destBit < 0) + { + dest++; + destBit = 8 - destBitDepth; + } + } + } + + return output; +} + +void ReadPng(char *path, struct Image *image) +{ + png_structp png_ptr; + png_infop info_ptr; + + FILE *fp = PngReadOpen(path, &png_ptr, &info_ptr); + + int bit_depth = png_get_bit_depth(png_ptr, info_ptr); + + int color_type = png_get_color_type(png_ptr, info_ptr); + + if (color_type != PNG_COLOR_TYPE_GRAY && color_type != PNG_COLOR_TYPE_PALETTE) + FATAL_ERROR("\"%s\" has an unsupported color type.\n", path); + + // Check if the image has a palette so that we can tell if the colors need to be inverted later. + // Don't read the palette because it's not needed for now. + image->hasPalette = (color_type == PNG_COLOR_TYPE_PALETTE); + + image->width = png_get_image_width(png_ptr, info_ptr); + image->height = png_get_image_height(png_ptr, info_ptr); + + int rowbytes = png_get_rowbytes(png_ptr, info_ptr); + + image->pixels = malloc(image->height * rowbytes); + + if (image->pixels == NULL) + FATAL_ERROR("Failed to allocate pixel buffer.\n"); + + png_bytepp row_pointers = malloc(image->height * sizeof(png_bytep)); + + if (row_pointers == NULL) + FATAL_ERROR("Failed to allocate row pointers.\n"); + + for (int i = 0; i < image->height; i++) + row_pointers[i] = (png_bytep)(image->pixels + (i * rowbytes)); + + if (setjmp(png_jmpbuf(png_ptr))) + FATAL_ERROR("Error reading from \"%s\".\n", path); + + png_read_image(png_ptr, row_pointers); + + png_destroy_read_struct(&png_ptr, &info_ptr, NULL); + + free(row_pointers); + fclose(fp); + + if (bit_depth != image->bitDepth) + { + unsigned char *src = image->pixels; + + if (bit_depth != 1 && bit_depth != 2 && bit_depth != 4 && bit_depth != 8) + FATAL_ERROR("Bit depth of image must be 1, 2, 4, or 8.\n"); + image->pixels = ConvertBitDepth(image->pixels, bit_depth, image->bitDepth, image->width * image->height); + free(src); + image->bitDepth = bit_depth; + } +} + +void ReadPngPalette(char *path, struct Palette *palette) +{ + png_structp png_ptr; + png_infop info_ptr; + png_colorp colors; + int numColors; + + FILE *fp = PngReadOpen(path, &png_ptr, &info_ptr); + + if (png_get_color_type(png_ptr, info_ptr) != PNG_COLOR_TYPE_PALETTE) + FATAL_ERROR("The image \"%s\" does not contain a palette.\n", path); + + if (png_get_PLTE(png_ptr, info_ptr, &colors, &numColors) != PNG_INFO_PLTE) + FATAL_ERROR("Failed to retrieve palette from \"%s\".\n", path); + + if (numColors > 256) + FATAL_ERROR("Images with more than 256 colors are not supported.\n"); + + palette->numColors = numColors; + for (int i = 0; i < numColors; i++) { + palette->colors[i].red = colors[i].red; + palette->colors[i].green = colors[i].green; + palette->colors[i].blue = colors[i].blue; + } + + png_destroy_read_struct(&png_ptr, &info_ptr, NULL); + + fclose(fp); +} + +void SetPngPalette(png_structp png_ptr, png_infop info_ptr, struct Palette *palette) +{ + png_colorp colors = malloc(palette->numColors * sizeof(png_color)); + + if (colors == NULL) + FATAL_ERROR("Failed to allocate PNG palette.\n"); + + for (int i = 0; i < palette->numColors; i++) { + colors[i].red = palette->colors[i].red; + colors[i].green = palette->colors[i].green; + colors[i].blue = palette->colors[i].blue; + } + + png_set_PLTE(png_ptr, info_ptr, colors, palette->numColors); + + free(colors); +} + +void WritePng(char *path, struct Image *image) +{ + FILE *fp = fopen(path, "wb"); + + if (fp == NULL) + FATAL_ERROR("Failed to open \"%s\" for writing.\n", path); + + png_structp png_ptr = png_create_write_struct(PNG_LIBPNG_VER_STRING, NULL, NULL, NULL); + + if (!png_ptr) + FATAL_ERROR("Failed to create PNG write struct.\n"); + + png_infop info_ptr = png_create_info_struct(png_ptr); + + if (!info_ptr) + FATAL_ERROR("Failed to create PNG info struct.\n"); + + if (setjmp(png_jmpbuf(png_ptr))) + FATAL_ERROR("Failed to init I/O for writing \"%s\".\n", path); + + png_init_io(png_ptr, fp); + + if (setjmp(png_jmpbuf(png_ptr))) + FATAL_ERROR("Error writing header for \"%s\".\n", path); + + int color_type = image->hasPalette ? PNG_COLOR_TYPE_PALETTE : PNG_COLOR_TYPE_GRAY; + + png_set_IHDR(png_ptr, info_ptr, image->width, image->height, + image->bitDepth, color_type, PNG_INTERLACE_NONE, + PNG_COMPRESSION_TYPE_BASE, PNG_FILTER_TYPE_BASE); + + if (image->hasPalette) { + SetPngPalette(png_ptr, info_ptr, &image->palette); + + if (image->hasTransparency) { + png_byte trans = 0; + png_set_tRNS(png_ptr, info_ptr, &trans, 1, 0); + } + } + + png_write_info(png_ptr, info_ptr); + + png_bytepp row_pointers = malloc(image->height * sizeof(png_bytep)); + + if (row_pointers == NULL) + FATAL_ERROR("Failed to allocate row pointers.\n"); + + int rowbytes = png_get_rowbytes(png_ptr, info_ptr); + + for (int i = 0; i < image->height; i++) + row_pointers[i] = (png_bytep)(image->pixels + (i * rowbytes)); + + if (setjmp(png_jmpbuf(png_ptr))) + FATAL_ERROR("Error writing \"%s\".\n", path); + + png_write_image(png_ptr, row_pointers); + + if (setjmp(png_jmpbuf(png_ptr))) + FATAL_ERROR("Error ending write of \"%s\".\n", path); + + png_write_end(png_ptr, NULL); + + fclose(fp); + + png_destroy_write_struct(&png_ptr, &info_ptr); + free(row_pointers); +} diff --git a/tools/gbagfx/convert_png.h b/tools/gbagfx/convert_png.h new file mode 100644 index 000000000..caf081b73 --- /dev/null +++ b/tools/gbagfx/convert_png.h @@ -0,0 +1,12 @@ +// Copyright (c) 2015 YamaArashi + +#ifndef CONVERT_PNG_H +#define CONVERT_PNG_H + +#include "gfx.h" + +void ReadPng(char *path, struct Image *image); +void WritePng(char *path, struct Image *image); +void ReadPngPalette(char *path, struct Palette *palette); + +#endif // CONVERT_PNG_H diff --git a/tools/gbagfx/font.c b/tools/gbagfx/font.c new file mode 100644 index 000000000..0dd6fbc3e --- /dev/null +++ b/tools/gbagfx/font.c @@ -0,0 +1,326 @@ +// Copyright (c) 2015 YamaArashi + +#include <stdio.h> +#include <stdlib.h> +#include <stdint.h> +#include <stdbool.h> +#include "global.h" +#include "font.h" +#include "gfx.h" +#include "util.h" + +unsigned char gFontPalette[][3] = { + {0x90, 0xC8, 0xFF}, // bg (saturated blue that contrasts well with the shadow color) + {0x38, 0x38, 0x38}, // fg (dark grey) + {0xD8, 0xD8, 0xD8}, // shadow (light grey) + {0xFF, 0xFF, 0xFF} // box (white) +}; + +static void ConvertFromLatinFont(unsigned char *src, unsigned char *dest, unsigned int numRows) +{ + unsigned int srcPixelsOffset = 0; + + for (unsigned int row = 0; row < numRows; row++) { + for (unsigned int column = 0; column < 16; column++) { + for (unsigned int glyphTile = 0; glyphTile < 4; glyphTile++) { + unsigned int pixelsX = (column * 16) + ((glyphTile & 1) * 8); + + for (unsigned int i = 0; i < 8; i++) { + unsigned int pixelsY = (row * 16) + ((glyphTile >> 1) * 8) + i; + unsigned int destPixelsOffset = (pixelsY * 64) + (pixelsX / 4); + + dest[destPixelsOffset] = src[srcPixelsOffset + 1]; + dest[destPixelsOffset + 1] = src[srcPixelsOffset]; + + srcPixelsOffset += 2; + } + } + } + } +} + +static void ConvertToLatinFont(unsigned char *src, unsigned char *dest, unsigned int numRows) +{ + unsigned int destPixelsOffset = 0; + + for (unsigned int row = 0; row < numRows; row++) { + for (unsigned int column = 0; column < 16; column++) { + for (unsigned int glyphTile = 0; glyphTile < 4; glyphTile++) { + unsigned int pixelsX = (column * 16) + ((glyphTile & 1) * 8); + + for (unsigned int i = 0; i < 8; i++) { + unsigned int pixelsY = (row * 16) + ((glyphTile >> 1) * 8) + i; + unsigned int srcPixelsOffset = (pixelsY * 64) + (pixelsX / 4); + + dest[destPixelsOffset] = src[srcPixelsOffset + 1]; + dest[destPixelsOffset + 1] = src[srcPixelsOffset]; + + destPixelsOffset += 2; + } + } + } + } +} + +static void ConvertFromHalfwidthJapaneseFont(unsigned char *src, unsigned char *dest, unsigned int numRows) +{ + for (unsigned int row = 0; row < numRows; row++) { + for (unsigned int column = 0; column < 16; column++) { + unsigned int glyphIndex = (row * 16) + column; + + for (unsigned int glyphTile = 0; glyphTile < 2; glyphTile++) { + unsigned int pixelsX = column * 8; + unsigned int srcPixelsOffset = 512 * (glyphIndex >> 4) + 16 * (glyphIndex & 0xF) + 256 * glyphTile; + + for (unsigned int i = 0; i < 8; i++) { + unsigned int pixelsY = (row * 16) + (glyphTile * 8) + i; + unsigned int destPixelsOffset = (pixelsY * 32) + (pixelsX / 4); + + dest[destPixelsOffset] = src[srcPixelsOffset + 1]; + dest[destPixelsOffset + 1] = src[srcPixelsOffset]; + + srcPixelsOffset += 2; + } + } + } + } +} + +static void ConvertToHalfwidthJapaneseFont(unsigned char *src, unsigned char *dest, unsigned int numRows) +{ + for (unsigned int row = 0; row < numRows; row++) { + for (unsigned int column = 0; column < 16; column++) { + unsigned int glyphIndex = (row * 16) + column; + + for (unsigned int glyphTile = 0; glyphTile < 2; glyphTile++) { + unsigned int pixelsX = column * 8; + unsigned int destPixelsOffset = 512 * (glyphIndex >> 4) + 16 * (glyphIndex & 0xF) + 256 * glyphTile; + + for (unsigned int i = 0; i < 8; i++) { + unsigned int pixelsY = (row * 16) + (glyphTile * 8) + i; + unsigned int srcPixelsOffset = (pixelsY * 32) + (pixelsX / 4); + + dest[destPixelsOffset] = src[srcPixelsOffset + 1]; + dest[destPixelsOffset + 1] = src[srcPixelsOffset]; + + destPixelsOffset += 2; + } + } + } + } +} + +static void ConvertFromFullwidthJapaneseFont(unsigned char *src, unsigned char *dest, unsigned int numRows) +{ + for (unsigned int row = 0; row < numRows; row++) { + for (unsigned int column = 0; column < 16; column++) { + unsigned int glyphIndex = (row * 16) + column; + + for (unsigned int glyphTile = 0; glyphTile < 4; glyphTile++) { + unsigned int pixelsX = (column * 16) + ((glyphTile & 1) * 8); + unsigned int srcPixelsOffset = 512 * (glyphIndex >> 3) + 32 * (glyphIndex & 7) + 256 * (glyphTile >> 1) + 16 * (glyphTile & 1); + + for (unsigned int i = 0; i < 8; i++) { + unsigned int pixelsY = (row * 16) + ((glyphTile >> 1) * 8) + i; + unsigned int destPixelsOffset = (pixelsY * 64) + (pixelsX / 4); + + dest[destPixelsOffset] = src[srcPixelsOffset + 1]; + dest[destPixelsOffset + 1] = src[srcPixelsOffset]; + + srcPixelsOffset += 2; + } + } + } + } +} + +static void ConvertToFullwidthJapaneseFont(unsigned char *src, unsigned char *dest, unsigned int numRows) +{ + for (unsigned int row = 0; row < numRows; row++) { + for (unsigned int column = 0; column < 16; column++) { + unsigned int glyphIndex = (row * 16) + column; + + for (unsigned int glyphTile = 0; glyphTile < 4; glyphTile++) { + unsigned int pixelsX = (column * 16) + ((glyphTile & 1) * 8); + unsigned int destPixelsOffset = 512 * (glyphIndex >> 3) + 32 * (glyphIndex & 7) + 256 * (glyphTile >> 1) + 16 * (glyphTile & 1); + + for (unsigned int i = 0; i < 8; i++) { + unsigned int pixelsY = (row * 16) + ((glyphTile >> 1) * 8) + i; + unsigned int srcPixelsOffset = (pixelsY * 64) + (pixelsX / 4); + + dest[destPixelsOffset] = src[srcPixelsOffset + 1]; + dest[destPixelsOffset + 1] = src[srcPixelsOffset]; + + destPixelsOffset += 2; + } + } + } + } +} + +static void SetFontPalette(struct Image *image) +{ + image->hasPalette = true; + + image->palette.numColors = 4; + + for (int i = 0; i < image->palette.numColors; i++) { + image->palette.colors[i].red = gFontPalette[i][0]; + image->palette.colors[i].green = gFontPalette[i][1]; + image->palette.colors[i].blue = gFontPalette[i][2]; + } + + image->hasTransparency = false; +} + +void ReadLatinFont(char *path, struct Image *image) +{ + int fileSize; + unsigned char *buffer = ReadWholeFile(path, &fileSize); + + int numGlyphs = fileSize / 64; + + if (numGlyphs % 16 != 0) + FATAL_ERROR("The number of glyphs (%d) is not a multiple of 16.\n", numGlyphs); + + int numRows = numGlyphs / 16; + + image->width = 256; + image->height = numRows * 16; + image->bitDepth = 2; + image->pixels = malloc(fileSize); + + if (image->pixels == NULL) + FATAL_ERROR("Failed to allocate memory for font.\n"); + + ConvertFromLatinFont(buffer, image->pixels, numRows); + + free(buffer); + + SetFontPalette(image); +} + +void WriteLatinFont(char *path, struct Image *image) +{ + if (image->width != 256) + FATAL_ERROR("The width of the font image (%d) is not 256.\n", image->width); + + if (image->height % 16 != 0) + FATAL_ERROR("The height of the font image (%d) is not a multiple of 16.\n", image->height); + + int numRows = image->height / 16; + int bufferSize = numRows * 16 * 64; + unsigned char *buffer = malloc(bufferSize); + + if (buffer == NULL) + FATAL_ERROR("Failed to allocate memory for font.\n"); + + ConvertToLatinFont(image->pixels, buffer, numRows); + + WriteWholeFile(path, buffer, bufferSize); + + free(buffer); +} + +void ReadHalfwidthJapaneseFont(char *path, struct Image *image) +{ + int fileSize; + unsigned char *buffer = ReadWholeFile(path, &fileSize); + + int glyphSize = 32; + + if (fileSize % glyphSize != 0) + FATAL_ERROR("The file size (%d) is not a multiple of %d.\n", fileSize, glyphSize); + + int numGlyphs = fileSize / glyphSize; + + if (numGlyphs % 16 != 0) + FATAL_ERROR("The number of glyphs (%d) is not a multiple of 16.\n", numGlyphs); + + int numRows = numGlyphs / 16; + + image->width = 128; + image->height = numRows * 16; + image->bitDepth = 2; + image->pixels = malloc(fileSize); + + if (image->pixels == NULL) + FATAL_ERROR("Failed to allocate memory for font.\n"); + + ConvertFromHalfwidthJapaneseFont(buffer, image->pixels, numRows); + + free(buffer); + + SetFontPalette(image); +} + +void WriteHalfwidthJapaneseFont(char *path, struct Image *image) +{ + if (image->width != 128) + FATAL_ERROR("The width of the font image (%d) is not 128.\n", image->width); + + if (image->height % 16 != 0) + FATAL_ERROR("The height of the font image (%d) is not a multiple of 16.\n", image->height); + + int numRows = image->height / 16; + int bufferSize = numRows * 16 * 32; + unsigned char *buffer = malloc(bufferSize); + + if (buffer == NULL) + FATAL_ERROR("Failed to allocate memory for font.\n"); + + ConvertToHalfwidthJapaneseFont(image->pixels, buffer, numRows); + + WriteWholeFile(path, buffer, bufferSize); + + free(buffer); +} + +void ReadFullwidthJapaneseFont(char *path, struct Image *image) +{ + int fileSize; + unsigned char *buffer = ReadWholeFile(path, &fileSize); + + int numGlyphs = fileSize / 64; + + if (numGlyphs % 16 != 0) + FATAL_ERROR("The number of glyphs (%d) is not a multiple of 16.\n", numGlyphs); + + int numRows = numGlyphs / 16; + + image->width = 256; + image->height = numRows * 16; + image->bitDepth = 2; + image->pixels = malloc(fileSize); + + if (image->pixels == NULL) + FATAL_ERROR("Failed to allocate memory for font.\n"); + + ConvertFromFullwidthJapaneseFont(buffer, image->pixels, numRows); + + free(buffer); + + SetFontPalette(image); +} + +void WriteFullwidthJapaneseFont(char *path, struct Image *image) +{ + if (image->width != 256) + FATAL_ERROR("The width of the font image (%d) is not 256.\n", image->width); + + if (image->height % 16 != 0) + FATAL_ERROR("The height of the font image (%d) is not a multiple of 16.\n", image->height); + + int numRows = image->height / 16; + int bufferSize = numRows * 16 * 64; + unsigned char *buffer = malloc(bufferSize); + + if (buffer == NULL) + FATAL_ERROR("Failed to allocate memory for font.\n"); + + ConvertToFullwidthJapaneseFont(image->pixels, buffer, numRows); + + WriteWholeFile(path, buffer, bufferSize); + + free(buffer); +} diff --git a/tools/gbagfx/font.h b/tools/gbagfx/font.h new file mode 100644 index 000000000..45086d02a --- /dev/null +++ b/tools/gbagfx/font.h @@ -0,0 +1,16 @@ +// Copyright (c) 2015 YamaArashi + +#ifndef FONT_H +#define FONT_H + +#include <stdbool.h> +#include "gfx.h" + +void ReadLatinFont(char *path, struct Image *image); +void WriteLatinFont(char *path, struct Image *image); +void ReadHalfwidthJapaneseFont(char *path, struct Image *image); +void WriteHalfwidthJapaneseFont(char *path, struct Image *image); +void ReadFullwidthJapaneseFont(char *path, struct Image *image); +void WriteFullwidthJapaneseFont(char *path, struct Image *image); + +#endif // FONT_H diff --git a/tools/gbagfx/gfx.c b/tools/gbagfx/gfx.c new file mode 100644 index 000000000..da92771b9 --- /dev/null +++ b/tools/gbagfx/gfx.c @@ -0,0 +1,535 @@ +// Copyright (c) 2015 YamaArashi + +#include <stdio.h> +#include <stdlib.h> +#include <stdint.h> +#include <stdbool.h> +#include <string.h> +#include "global.h" +#include "gfx.h" +#include "util.h" + +#define GET_GBA_PAL_RED(x) (((x) >> 0) & 0x1F) +#define GET_GBA_PAL_GREEN(x) (((x) >> 5) & 0x1F) +#define GET_GBA_PAL_BLUE(x) (((x) >> 10) & 0x1F) + +#define SET_GBA_PAL(r, g, b) (((b) << 10) | ((g) << 5) | (r)) + +#define UPCONVERT_BIT_DEPTH(x) (((x) * 255) / 31) + +#define DOWNCONVERT_BIT_DEPTH(x) ((x) / 8) + +static inline void swap_bytes(unsigned char * orig, unsigned char * dest) { + unsigned char tmp = *orig; + *orig = *dest; + *dest = tmp; +} + +static inline unsigned char swap_nybbles(unsigned char orig) +{ + return (orig >> 4) | (orig << 4); +} + +static inline void swap_bytes_nybswap(unsigned char * orig, unsigned char * dest) { + unsigned char tmp = swap_nybbles(*orig); + *orig = swap_nybbles(*dest); + *dest = tmp; +} + +static inline unsigned char reverse_bits(unsigned char orig) { + unsigned char dest = 0; + for (int i = 0; i < 8; i++) + { + dest <<= 1; + dest |= orig & 1; + orig >>= 1; + } + return dest; +} + +static void vflip(unsigned char * tile, int bitDepth) { + for (int x = 0; x < bitDepth; x++) + { + unsigned char * col = tile + x; + swap_bytes(col + 0 * bitDepth, col + 7 * bitDepth); + swap_bytes(col + 1 * bitDepth, col + 6 * bitDepth); + swap_bytes(col + 2 * bitDepth, col + 5 * bitDepth); + swap_bytes(col + 3 * bitDepth, col + 4 * bitDepth); + } +} + +static void hflip(unsigned char * tile, int bitDepth) { + for (int y = 0; y < 8; y++) + { + unsigned char * row = tile + y * bitDepth; + switch (bitDepth) + { + case 1: + *row = reverse_bits(*row); + break; + case 4: + swap_bytes_nybswap(row + 0, row + 3); + swap_bytes_nybswap(row + 1, row + 2); + break; + case 8: + swap_bytes(row + 0, row + 56); + swap_bytes(row + 8, row + 48); + swap_bytes(row + 16, row + 40); + swap_bytes(row + 24, row + 32); + break; + } + } +} + +static unsigned char * ApplyTilemap(struct Image *image, unsigned char * buffer, int bitDepth) +{ + int tileSize = bitDepth * 8; + unsigned char * tiles = calloc(image->tileMap.numTiles, tileSize); + int i; + struct Tile tileInfo; + + for (i = 0; i < image->tileMap.numTiles; i++) { + tileInfo = image->tileMap.data[i]; + unsigned char * tile = tiles + i * tileSize; + memcpy(tile, buffer + tileInfo.index * tileSize, tileSize); + if (tileInfo.xflip) + hflip(tile, bitDepth); + if (tileInfo.yflip) + vflip(tile, bitDepth); + } + free(buffer); + return tiles; +} + +static unsigned char * BuildTilemap(struct Image *image, unsigned char * buffer, int * bufferSize) +{ + int tileSize = image->bitDepth * 8; + unsigned char * outputPixels = calloc(1024, tileSize); + int nTilesIn = image->height * image->width / 64; + image->tileMap.data = calloc(nTilesIn, sizeof(struct Tilemap)); + image->tileMap.numTiles = nTilesIn; + int nTilesOut = 0; + unsigned char curTile1[tileSize]; + unsigned char curTile2[tileSize]; + + for (int i = 0; i < nTilesIn; i++) { + bool xflip = false; + bool yflip = false; + int j; + memcpy(curTile1, buffer + i * tileSize, tileSize); + + for (j = 0; j < nTilesOut; j++) { + memcpy(curTile2, outputPixels + j * tileSize, tileSize); + if (memcmp(curTile1, curTile2, tileSize) == 0) + break; + xflip = true; + hflip(curTile2, image->bitDepth); + if (memcmp(curTile1, curTile2, tileSize) == 0) + break; + yflip = true; + vflip(curTile2, image->bitDepth); + if (memcmp(curTile1, curTile2, tileSize) == 0) + break; + xflip = false; + hflip(curTile2, image->bitDepth); + if (memcmp(curTile1, curTile2, tileSize) == 0) + break; + yflip = false; + } + image->tileMap.data[i].index = j; + image->tileMap.data[i].xflip = xflip; + image->tileMap.data[i].yflip = yflip; + image->tileMap.data[i].palno = 0; + if (j >= nTilesOut) { + if (nTilesOut >= 1024) + FATAL_ERROR("Cannot reduce image to 1024 or fewer tiles.\n"); + memcpy(outputPixels + nTilesOut * tileSize, curTile1, tileSize); + nTilesOut++; + } + } + + free(buffer); + *bufferSize = nTilesOut * tileSize; + return outputPixels; +} + +static void AdvanceMetatilePosition(int *subTileX, int *subTileY, int *metatileX, int *metatileY, int metatilesWide, int metatileWidth, int metatileHeight) +{ + (*subTileX)++; + if (*subTileX == metatileWidth) { + *subTileX = 0; + (*subTileY)++; + if (*subTileY == metatileHeight) { + *subTileY = 0; + (*metatileX)++; + if (*metatileX == metatilesWide) { + *metatileX = 0; + (*metatileY)++; + } + } + } +} + +static void ConvertFromTiles1Bpp(unsigned char *src, unsigned char *dest, int numTiles, int metatilesWide, int metatileWidth, int metatileHeight, bool invertColors) +{ + int subTileX = 0; + int subTileY = 0; + int metatileX = 0; + int metatileY = 0; + int pitch = metatilesWide * metatileWidth; + + for (int i = 0; i < numTiles; i++) { + for (int j = 0; j < 8; j++) { + int destY = (metatileY * metatileHeight + subTileY) * 8 + j; + int destX = metatileX * metatileWidth + subTileX; + unsigned char srcPixelOctet = *src++; + unsigned char *destPixelOctet = &dest[destY * pitch + destX]; + + for (int k = 0; k < 8; k++) { + *destPixelOctet <<= 1; + *destPixelOctet |= (srcPixelOctet & 1) ^ invertColors; + srcPixelOctet >>= 1; + } + } + + AdvanceMetatilePosition(&subTileX, &subTileY, &metatileX, &metatileY, metatilesWide, metatileWidth, metatileHeight); + } +} + +static void ConvertFromTiles4Bpp(unsigned char *src, unsigned char *dest, int numTiles, int metatilesWide, int metatileWidth, int metatileHeight, bool invertColors) +{ + int subTileX = 0; + int subTileY = 0; + int metatileX = 0; + int metatileY = 0; + int pitch = (metatilesWide * metatileWidth) * 4; + + for (int i = 0; i < numTiles; i++) { + for (int j = 0; j < 8; j++) { + int destY = (metatileY * metatileHeight + subTileY) * 8 + j; + + for (int k = 0; k < 4; k++) { + int destX = (metatileX * metatileWidth + subTileX) * 4 + k; + unsigned char srcPixelPair = *src++; + unsigned char leftPixel = srcPixelPair & 0xF; + unsigned char rightPixel = srcPixelPair >> 4; + + if (invertColors) { + leftPixel = 15 - leftPixel; + rightPixel = 15 - rightPixel; + } + + dest[destY * pitch + destX] = (leftPixel << 4) | rightPixel; + } + } + + AdvanceMetatilePosition(&subTileX, &subTileY, &metatileX, &metatileY, metatilesWide, metatileWidth, metatileHeight); + } +} + +static void ConvertFromTiles8Bpp(unsigned char *src, unsigned char *dest, int numTiles, int metatilesWide, int metatileWidth, int metatileHeight, bool invertColors) +{ + int subTileX = 0; + int subTileY = 0; + int metatileX = 0; + int metatileY = 0; + int pitch = (metatilesWide * metatileWidth) * 8; + + for (int i = 0; i < numTiles; i++) { + for (int j = 0; j < 8; j++) { + int destY = (metatileY * metatileHeight + subTileY) * 8 + j; + + for (int k = 0; k < 8; k++) { + int destX = (metatileX * metatileWidth + subTileX) * 8 + k; + unsigned char srcPixel = *src++; + + if (invertColors) + srcPixel = 255 - srcPixel; + + dest[destY * pitch + destX] = srcPixel; + } + } + + AdvanceMetatilePosition(&subTileX, &subTileY, &metatileX, &metatileY, metatilesWide, metatileWidth, metatileHeight); + } +} + +static void ConvertToTiles1Bpp(unsigned char *src, unsigned char *dest, int numTiles, int metatilesWide, int metatileWidth, int metatileHeight, bool invertColors) +{ + int subTileX = 0; + int subTileY = 0; + int metatileX = 0; + int metatileY = 0; + int pitch = metatilesWide * metatileWidth; + + for (int i = 0; i < numTiles; i++) { + for (int j = 0; j < 8; j++) { + int srcY = (metatileY * metatileHeight + subTileY) * 8 + j; + int srcX = metatileX * metatileWidth + subTileX; + unsigned char srcPixelOctet = src[srcY * pitch + srcX]; + unsigned char *destPixelOctet = dest++; + + for (int k = 0; k < 8; k++) { + *destPixelOctet <<= 1; + *destPixelOctet |= (srcPixelOctet & 1) ^ invertColors; + srcPixelOctet >>= 1; + } + } + + AdvanceMetatilePosition(&subTileX, &subTileY, &metatileX, &metatileY, metatilesWide, metatileWidth, metatileHeight); + } +} + +static void ConvertToTiles4Bpp(unsigned char *src, unsigned char *dest, int numTiles, int metatilesWide, int metatileWidth, int metatileHeight, bool invertColors) +{ + int subTileX = 0; + int subTileY = 0; + int metatileX = 0; + int metatileY = 0; + int pitch = (metatilesWide * metatileWidth) * 4; + + for (int i = 0; i < numTiles; i++) { + for (int j = 0; j < 8; j++) { + int srcY = (metatileY * metatileHeight + subTileY) * 8 + j; + + for (int k = 0; k < 4; k++) { + int srcX = (metatileX * metatileWidth + subTileX) * 4 + k; + unsigned char srcPixelPair = src[srcY * pitch + srcX]; + unsigned char leftPixel = srcPixelPair >> 4; + unsigned char rightPixel = srcPixelPair & 0xF; + + if (invertColors) { + leftPixel = 15 - leftPixel; + rightPixel = 15 - rightPixel; + } + + *dest++ = (rightPixel << 4) | leftPixel; + } + } + + AdvanceMetatilePosition(&subTileX, &subTileY, &metatileX, &metatileY, metatilesWide, metatileWidth, metatileHeight); + } +} + +static void ConvertToTiles8Bpp(unsigned char *src, unsigned char *dest, int numTiles, int metatilesWide, int metatileWidth, int metatileHeight, bool invertColors) +{ + int subTileX = 0; + int subTileY = 0; + int metatileX = 0; + int metatileY = 0; + int pitch = (metatilesWide * metatileWidth) * 8; + + for (int i = 0; i < numTiles; i++) { + for (int j = 0; j < 8; j++) { + int srcY = (metatileY * metatileHeight + subTileY) * 8 + j; + + for (int k = 0; k < 8; k++) { + int srcX = (metatileX * metatileWidth + subTileX) * 8 + k; + unsigned char srcPixel = src[srcY * pitch + srcX]; + + if (invertColors) + srcPixel = 255 - srcPixel; + + *dest++ = srcPixel; + } + } + + AdvanceMetatilePosition(&subTileX, &subTileY, &metatileX, &metatileY, metatilesWide, metatileWidth, metatileHeight); + } +} + +void ReadImage(char *path, int tilesWidth, int bitDepth, int metatileWidth, int metatileHeight, struct Image *image, bool invertColors) +{ + int tileSize = bitDepth * 8; + + int fileSize; + unsigned char *buffer = ReadWholeFile(path, &fileSize); + + int numTiles; + if (image->hasTilemap) { + buffer = ApplyTilemap(image, buffer, bitDepth); + numTiles = image->tileMap.numTiles; + } + else + numTiles = fileSize / tileSize; + + int tilesHeight = (numTiles + tilesWidth - 1) / tilesWidth; + + if (tilesWidth % metatileWidth != 0) + FATAL_ERROR("The width in tiles (%d) isn't a multiple of the specified metatile width (%d)\n", tilesWidth, metatileWidth); + + if (tilesHeight % metatileHeight != 0) + FATAL_ERROR("The height in tiles (%d) isn't a multiple of the specified metatile height (%d)\n", tilesHeight, metatileHeight); + + image->width = tilesWidth * 8; + image->height = tilesHeight * 8; + image->bitDepth = bitDepth; + image->pixels = calloc(tilesWidth * tilesHeight, tileSize); + + if (image->pixels == NULL) + FATAL_ERROR("Failed to allocate memory for pixels.\n"); + + int metatilesWide = tilesWidth / metatileWidth; + + switch (bitDepth) { + case 1: + ConvertFromTiles1Bpp(buffer, image->pixels, numTiles, metatilesWide, metatileWidth, metatileHeight, invertColors); + break; + case 4: + ConvertFromTiles4Bpp(buffer, image->pixels, numTiles, metatilesWide, metatileWidth, metatileHeight, invertColors); + break; + case 8: + ConvertFromTiles8Bpp(buffer, image->pixels, numTiles, metatilesWide, metatileWidth, metatileHeight, invertColors); + break; + } + + free(buffer); +} + +void WriteImage(char *path, int numTiles, int bitDepth, int metatileWidth, int metatileHeight, struct Image *image, bool invertColors) +{ + int tileSize = bitDepth * 8; + + if (image->width % 8 != 0) + FATAL_ERROR("The width in pixels (%d) isn't a multiple of 8.\n", image->width); + + if (image->height % 8 != 0) + FATAL_ERROR("The height in pixels (%d) isn't a multiple of 8.\n", image->height); + + int tilesWidth = image->width / 8; + int tilesHeight = image->height / 8; + + if (tilesWidth % metatileWidth != 0) + FATAL_ERROR("The width in tiles (%d) isn't a multiple of the specified metatile width (%d)", tilesWidth, metatileWidth); + + if (tilesHeight % metatileHeight != 0) + FATAL_ERROR("The height in tiles (%d) isn't a multiple of the specified metatile height (%d)", tilesHeight, metatileHeight); + + int maxNumTiles = tilesWidth * tilesHeight; + + if (numTiles == 0) + numTiles = maxNumTiles; + else if (numTiles > maxNumTiles) + FATAL_ERROR("The specified number of tiles (%d) is greater than the maximum possible value (%d).\n", numTiles, maxNumTiles); + + int bufferSize = numTiles * tileSize; + unsigned char *buffer = malloc(bufferSize); + + if (buffer == NULL) + FATAL_ERROR("Failed to allocate memory for pixels.\n"); + + int metatilesWide = tilesWidth / metatileWidth; + + switch (bitDepth) { + case 1: + ConvertToTiles1Bpp(image->pixels, buffer, numTiles, metatilesWide, metatileWidth, metatileHeight, invertColors); + break; + case 4: + ConvertToTiles4Bpp(image->pixels, buffer, numTiles, metatilesWide, metatileWidth, metatileHeight, invertColors); + break; + case 8: + ConvertToTiles8Bpp(image->pixels, buffer, numTiles, metatilesWide, metatileWidth, metatileHeight, invertColors); + break; + } + + if (image->hasTilemap) + buffer = BuildTilemap(image, buffer, &bufferSize); + + WriteWholeFile(path, buffer, bufferSize); + + free(buffer); +} + +void FreeImage(struct Image *image) +{ + free(image->pixels); + image->pixels = NULL; + if (image->hasTilemap && image->tileMap.data != NULL) { + free(image->tileMap.data); + image->tileMap.data = NULL; + image->tileMap.numTiles = 0; + } +} + +void ReadGbaPalette(char *path, struct Palette *palette) +{ + int fileSize; + unsigned char *data = ReadWholeFile(path, &fileSize); + + if (fileSize % 2 != 0) + FATAL_ERROR("The file size (%d) is not a multiple of 2.\n", fileSize); + + palette->numColors = fileSize / 2; + + for (int i = 0; i < palette->numColors; i++) { + uint16_t paletteEntry = (data[i * 2 + 1] << 8) | data[i * 2]; + palette->colors[i].red = UPCONVERT_BIT_DEPTH(GET_GBA_PAL_RED(paletteEntry)); + palette->colors[i].green = UPCONVERT_BIT_DEPTH(GET_GBA_PAL_GREEN(paletteEntry)); + palette->colors[i].blue = UPCONVERT_BIT_DEPTH(GET_GBA_PAL_BLUE(paletteEntry)); + } + + free(data); +} + +void WriteGbaPalette(char *path, struct Palette *palette) +{ + FILE *fp = fopen(path, "wb"); + + if (fp == NULL) + FATAL_ERROR("Failed to open \"%s\" for writing.\n", path); + + for (int i = 0; i < palette->numColors; i++) { + unsigned char red = DOWNCONVERT_BIT_DEPTH(palette->colors[i].red); + unsigned char green = DOWNCONVERT_BIT_DEPTH(palette->colors[i].green); + unsigned char blue = DOWNCONVERT_BIT_DEPTH(palette->colors[i].blue); + + uint16_t paletteEntry = SET_GBA_PAL(red, green, blue); + + fputc(paletteEntry & 0xFF, fp); + fputc(paletteEntry >> 8, fp); + } + + fclose(fp); +} + +void ReadGbaTilemap(char *path, struct Tilemap *tileMap) +{ + int fileSize; + unsigned char *data = ReadWholeFile(path, &fileSize); + + if (fileSize % 2 != 0) + FATAL_ERROR("The file size (%d) is not a multiple of 2.\n", fileSize); + + tileMap->numTiles = fileSize / 2; + tileMap->data = malloc(tileMap->numTiles * sizeof(struct Tile)); + + for (int i = 0; i < tileMap->numTiles; i++) + { + uint16_t raw = data[2 * i + 0] | (data[2 * i + 1] << 8); + tileMap->data[i].index = raw & 0x3FF; + tileMap->data[i].xflip = raw & 0x400 ? 1 : 0; + tileMap->data[i].yflip = raw & 0x800 ? 1 : 0; + tileMap->data[i].palno = raw >> 12; + } + + free(data); +} + +void WriteGbaTilemap(char *path, struct Tilemap *tileMap) +{ + FILE *fp = fopen(path, "wb"); + + if (fp == NULL) + FATAL_ERROR("Failed to open \"%s\" for writing.\n", path); + + for (int i = 0; i < tileMap->numTiles; i++) { + uint16_t raw = tileMap->data[i].index + | (tileMap->data[i].xflip << 10) + | (tileMap->data[i].yflip << 11) + | (tileMap->data[i].palno << 12); + fputc(raw & 0xFF, fp); + fputc(raw >> 8, fp); + } + + fclose(fp); +} diff --git a/tools/gbagfx/gfx.h b/tools/gbagfx/gfx.h new file mode 100644 index 000000000..15a3c6a6c --- /dev/null +++ b/tools/gbagfx/gfx.h @@ -0,0 +1,53 @@ +// Copyright (c) 2015 YamaArashi + +#ifndef GFX_H +#define GFX_H + +#include <stdint.h> +#include <stdbool.h> + +struct Color { + unsigned char red; + unsigned char green; + unsigned char blue; +}; + +struct Palette { + struct Color colors[256]; + int numColors; +}; + +struct __attribute__((packed)) Tile { + unsigned short index:10; + unsigned short xflip:1; + unsigned short yflip:1; + unsigned short palno:4; +}; + +struct Tilemap { + struct Tile *data; + int numTiles; +}; + +struct Image { + int width; + int height; + int bitDepth; + unsigned char *pixels; + bool hasPalette; + struct Palette palette; + bool hasTransparency; + struct Tilemap tileMap; + bool hasTilemap; + +}; + +void ReadImage(char *path, int tilesWidth, int bitDepth, int metatileWidth, int metatileHeight, struct Image *image, bool invertColors); +void WriteImage(char *path, int numTiles, int bitDepth, int metatileWidth, int metatileHeight, struct Image *image, bool invertColors); +void FreeImage(struct Image *image); +void ReadGbaPalette(char *path, struct Palette *palette); +void WriteGbaPalette(char *path, struct Palette *palette); +void ReadGbaTilemap(char *path, struct Tilemap *tileMap); +void WriteGbaTilemap(char *path, struct Tilemap *tileMap); + +#endif // GFX_H diff --git a/tools/gbagfx/global.h b/tools/gbagfx/global.h new file mode 100644 index 000000000..65dd351d2 --- /dev/null +++ b/tools/gbagfx/global.h @@ -0,0 +1,31 @@ +// Copyright (c) 2015 YamaArashi + +#ifndef GLOBAL_H +#define GLOBAL_H + +#include <stdio.h> +#include <stdlib.h> + +#ifdef _MSC_VER + +#define FATAL_ERROR(format, ...) \ +do { \ + fprintf(stderr, format, __VA_ARGS__); \ + exit(1); \ +} while (0) + +#define UNUSED + +#else + +#define FATAL_ERROR(format, ...) \ +do { \ + fprintf(stderr, format, ##__VA_ARGS__); \ + exit(1); \ +} while (0) + +#define UNUSED __attribute__((__unused__)) + +#endif // _MSC_VER + +#endif // GLOBAL_H diff --git a/tools/gbagfx/jasc_pal.c b/tools/gbagfx/jasc_pal.c new file mode 100644 index 000000000..e5ba9c3c2 --- /dev/null +++ b/tools/gbagfx/jasc_pal.c @@ -0,0 +1,172 @@ +// Copyright (c) 2015 YamaArashi + +#include <stdio.h> +#include <string.h> +#include "global.h" +#include "gfx.h" +#include "util.h" + +// Read/write Paint Shop Pro palette files. + +// Format of a Paint Shop Pro palette file, line by line: +// "JASC-PAL\r\n" (signature) +// "0100\r\n" (version; seems to always be "0100") +// "<NUMBER_OF_COLORS>\r\n" (number of colors in decimal) +// +// <NUMBER_OF_COLORS> times: +// "<RED> <GREEN> <BLUE>\r\n" (color entry) +// +// Each color component is a decimal number from 0 to 255. +// Examples: +// Black - "0 0 0\r\n" +// Blue - "0 0 255\r\n" +// Brown - "150 75 0\r\n" + +#define MAX_LINE_LENGTH 11 + +void ReadJascPaletteLine(FILE *fp, char *line) +{ + int c; + int length = 0; + + for (;;) + { + c = fgetc(fp); + + if (c == '\r') + { + c = fgetc(fp); + + if (c != '\n') + FATAL_ERROR("CR line endings aren't supported.\n"); + + line[length] = 0; + + return; + } + + if (c == '\n') + FATAL_ERROR("LF line endings aren't supported.\n"); + + if (c == EOF) + FATAL_ERROR("Unexpected EOF. No CRLF at end of file.\n"); + + if (c == 0) + FATAL_ERROR("NUL character in file.\n"); + + if (length == MAX_LINE_LENGTH) + { + line[length] = 0; + FATAL_ERROR("The line \"%s\" is too long.\n", line); + } + + line[length++] = c; + } +} + +void ReadJascPalette(char *path, struct Palette *palette) +{ + char line[MAX_LINE_LENGTH + 1]; + + FILE *fp = fopen(path, "rb"); + + if (fp == NULL) + FATAL_ERROR("Failed to open JASC-PAL file \"%s\" for reading.\n", path); + + ReadJascPaletteLine(fp, line); + + if (strcmp(line, "JASC-PAL") != 0) + FATAL_ERROR("Invalid JASC-PAL signature.\n"); + + ReadJascPaletteLine(fp, line); + + if (strcmp(line, "0100") != 0) + FATAL_ERROR("Unsuported JASC-PAL version.\n"); + + ReadJascPaletteLine(fp, line); + + if (!ParseNumber(line, NULL, 10, &palette->numColors)) + FATAL_ERROR("Failed to parse number of colors.\n"); + + if (palette->numColors < 1 || palette->numColors > 256) + FATAL_ERROR("%d is an invalid number of colors. The number of colors must be in the range [1, 256].\n", palette->numColors); + + for (int i = 0; i < palette->numColors; i++) + { + ReadJascPaletteLine(fp, line); + + char *s = line; + char *end; + + int red; + int green; + int blue; + + if (!ParseNumber(s, &end, 10, &red)) + FATAL_ERROR("Failed to parse red color component.\n"); + + s = end; + + if (*s != ' ') + FATAL_ERROR("Expected a space after red color component.\n"); + + s++; + + if (*s < '0' || *s > '9') + FATAL_ERROR("Expected only a space between red and green color components.\n"); + + if (!ParseNumber(s, &end, 10, &green)) + FATAL_ERROR("Failed to parse green color component.\n"); + + s = end; + + if (*s != ' ') + FATAL_ERROR("Expected a space after green color component.\n"); + + s++; + + if (*s < '0' || *s > '9') + FATAL_ERROR("Expected only a space between green and blue color components.\n"); + + if (!ParseNumber(s, &end, 10, &blue)) + FATAL_ERROR("Failed to parse blue color component.\n"); + + if (*end != 0) + FATAL_ERROR("Garbage after blue color component.\n"); + + if (red < 0 || red > 255) + FATAL_ERROR("Red color component (%d) is outside the range [0, 255].\n", red); + + if (green < 0 || green > 255) + FATAL_ERROR("Green color component (%d) is outside the range [0, 255].\n", green); + + if (blue < 0 || blue > 255) + FATAL_ERROR("Blue color component (%d) is outside the range [0, 255].\n", blue); + + palette->colors[i].red = red; + palette->colors[i].green = green; + palette->colors[i].blue = blue; + } + + if (fgetc(fp) != EOF) + FATAL_ERROR("Garbage after color data.\n"); + + fclose(fp); +} + +void WriteJascPalette(char *path, struct Palette *palette) +{ + FILE *fp = fopen(path, "wb"); + + fputs("JASC-PAL\r\n", fp); + fputs("0100\r\n", fp); + fprintf(fp, "%d\r\n", palette->numColors); + + for (int i = 0; i < palette->numColors; i++) + { + struct Color *color = &palette->colors[i]; + fprintf(fp, "%d %d %d\r\n", color->red, color->green, color->blue); + } + + fclose(fp); +} diff --git a/tools/gbagfx/jasc_pal.h b/tools/gbagfx/jasc_pal.h new file mode 100644 index 000000000..b60b31fc8 --- /dev/null +++ b/tools/gbagfx/jasc_pal.h @@ -0,0 +1,9 @@ +// Copyright (c) 2015 YamaArashi + +#ifndef JASC_PAL_H +#define JASC_PAL_H + +void ReadJascPalette(char *path, struct Palette *palette); +void WriteJascPalette(char *path, struct Palette *palette); + +#endif // JASC_PAL_H diff --git a/tools/gbagfx/lz.c b/tools/gbagfx/lz.c new file mode 100644 index 000000000..97434ce50 --- /dev/null +++ b/tools/gbagfx/lz.c @@ -0,0 +1,153 @@ +// Copyright (c) 2015 YamaArashi + +#include <stdlib.h> +#include <stdbool.h> +#include "global.h" +#include "lz.h" + +unsigned char *LZDecompress(unsigned char *src, int srcSize, int *uncompressedSize) +{ + if (srcSize < 4) + goto fail; + + int destSize = (src[3] << 16) | (src[2] << 8) | src[1]; + + unsigned char *dest = malloc(destSize); + + if (dest == NULL) + goto fail; + + int srcPos = 4; + int destPos = 0; + + for (;;) { + if (srcPos >= srcSize) + goto fail; + + unsigned char flags = src[srcPos++]; + + for (int i = 0; i < 8; i++) { + if (flags & 0x80) { + if (srcPos + 1 >= srcSize) + goto fail; + + int blockSize = (src[srcPos] >> 4) + 3; + int blockDistance = (((src[srcPos] & 0xF) << 8) | src[srcPos + 1]) + 1; + + srcPos += 2; + + int blockPos = destPos - blockDistance; + + // Some Ruby/Sapphire tilesets overflow. + if (destPos + blockSize > destSize) { + blockSize = destSize - destPos; + fprintf(stderr, "Destination buffer overflow.\n"); + } + + if (blockPos < 0) + goto fail; + + for (int j = 0; j < blockSize; j++) + dest[destPos++] = dest[blockPos + j]; + } else { + if (srcPos >= srcSize || destPos >= destSize) + goto fail; + + dest[destPos++] = src[srcPos++]; + } + + if (destPos == destSize) { + *uncompressedSize = destSize; + return dest; + } + + flags <<= 1; + } + } + +fail: + FATAL_ERROR("Fatal error while decompressing LZ file.\n"); +} + +unsigned char *LZCompress(unsigned char *src, int srcSize, int *compressedSize, const int minDistance) +{ + if (srcSize <= 0) + goto fail; + + int worstCaseDestSize = 4 + srcSize + ((srcSize + 7) / 8); + + // Round up to the next multiple of four. + worstCaseDestSize = (worstCaseDestSize + 3) & ~3; + + unsigned char *dest = malloc(worstCaseDestSize); + + if (dest == NULL) + goto fail; + + // header + dest[0] = 0x10; // LZ compression type + dest[1] = (unsigned char)srcSize; + dest[2] = (unsigned char)(srcSize >> 8); + dest[3] = (unsigned char)(srcSize >> 16); + + int srcPos = 0; + int destPos = 4; + + for (;;) { + unsigned char *flags = &dest[destPos++]; + *flags = 0; + + for (int i = 0; i < 8; i++) { + int bestBlockDistance = 0; + int bestBlockSize = 0; + int blockDistance = minDistance; + + while (blockDistance <= srcPos && blockDistance <= 0x1000) { + int blockStart = srcPos - blockDistance; + int blockSize = 0; + + while (blockSize < 18 + && srcPos + blockSize < srcSize + && src[blockStart + blockSize] == src[srcPos + blockSize]) + blockSize++; + + if (blockSize > bestBlockSize) { + bestBlockDistance = blockDistance; + bestBlockSize = blockSize; + + if (blockSize == 18) + break; + } + + blockDistance++; + } + + if (bestBlockSize >= 3) { + *flags |= (0x80 >> i); + srcPos += bestBlockSize; + bestBlockSize -= 3; + bestBlockDistance--; + dest[destPos++] = (bestBlockSize << 4) | ((unsigned int)bestBlockDistance >> 8); + dest[destPos++] = (unsigned char)bestBlockDistance; + } else { + dest[destPos++] = src[srcPos++]; + } + + if (srcPos == srcSize) { + // Pad to multiple of 4 bytes. + int remainder = destPos % 4; + + if (remainder != 0) { + for (int i = 0; i < 4 - remainder; i++) + dest[destPos++] = 0; + } + + *compressedSize = destPos; + return dest; + } + } + } + +fail: + FATAL_ERROR("Fatal error while compressing LZ file.\n"); +} diff --git a/tools/gbagfx/lz.h b/tools/gbagfx/lz.h new file mode 100644 index 000000000..90f56b643 --- /dev/null +++ b/tools/gbagfx/lz.h @@ -0,0 +1,9 @@ +// Copyright (c) 2015 YamaArashi + +#ifndef LZ_H +#define LZ_H + +unsigned char *LZDecompress(unsigned char *src, int srcSize, int *uncompressedSize); +unsigned char *LZCompress(unsigned char *src, int srcSize, int *compressedSize, const int minDistance); + +#endif // LZ_H diff --git a/tools/gbagfx/main.c b/tools/gbagfx/main.c new file mode 100644 index 000000000..2174e37a5 --- /dev/null +++ b/tools/gbagfx/main.c @@ -0,0 +1,539 @@ +// Copyright (c) 2015 YamaArashi + +#include <stdio.h> +#include <string.h> +#include <stdbool.h> +#include "global.h" +#include "util.h" +#include "options.h" +#include "gfx.h" +#include "convert_png.h" +#include "jasc_pal.h" +#include "lz.h" +#include "rl.h" +#include "font.h" + +struct CommandHandler +{ + const char *inputFileExtension; + const char *outputFileExtension; + void(*function)(char *inputPath, char *outputPath, int argc, char **argv); +}; + +void ConvertGbaToPng(char *inputPath, char *outputPath, struct GbaToPngOptions *options) +{ + struct Image image; + + if (options->paletteFilePath != NULL) + { + ReadGbaPalette(options->paletteFilePath, &image.palette); + image.hasPalette = true; + } + else + { + image.hasPalette = false; + } + + if (options->tilemapFilePath != NULL) + { + ReadGbaTilemap(options->tilemapFilePath, &image.tileMap); + image.hasTilemap = true; + } + else + { + image.tileMap.data = NULL; + image.hasTilemap = false; + } + + ReadImage(inputPath, options->width, options->bitDepth, options->metatileWidth, options->metatileHeight, &image, !image.hasPalette); + + image.hasTransparency = options->hasTransparency; + + WritePng(outputPath, &image); + + FreeImage(&image); +} + +void ConvertPngToGba(char *inputPath, char *outputPath, struct PngToGbaOptions *options) +{ + struct Image image; + + image.bitDepth = options->bitDepth; + image.hasTilemap = options->tilemapFilePath == NULL ? false : true; + image.tileMap.data = NULL; + image.tileMap.numTiles = 0; + + ReadPng(inputPath, &image); + + WriteImage(outputPath, options->numTiles, options->bitDepth, options->metatileWidth, options->metatileHeight, &image, !image.hasPalette); + + if (image.hasTilemap) + WriteGbaTilemap(options->tilemapFilePath, &image.tileMap); + + FreeImage(&image); +} + +void HandleGbaToPngCommand(char *inputPath, char *outputPath, int argc, char **argv) +{ + char *inputFileExtension = GetFileExtension(inputPath); + struct GbaToPngOptions options; + options.paletteFilePath = NULL; + options.tilemapFilePath = NULL; + options.bitDepth = inputFileExtension[0] - '0'; + options.hasTransparency = false; + options.width = 1; + options.metatileWidth = 1; + options.metatileHeight = 1; + + for (int i = 3; i < argc; i++) + { + char *option = argv[i]; + + if (strcmp(option, "-palette") == 0) + { + if (i + 1 >= argc) + FATAL_ERROR("No palette file path following \"-palette\".\n"); + + i++; + + options.paletteFilePath = argv[i]; + } + else if (strcmp(option, "-tilemap") == 0) + { + if (i + 1 >= argc) + FATAL_ERROR("No tilemap file path following \"-tilemap\".\n"); + + i++; + + options.tilemapFilePath = argv[i]; + } + else if (strcmp(option, "-object") == 0) + { + options.hasTransparency = true; + } + else if (strcmp(option, "-width") == 0) + { + if (i + 1 >= argc) + FATAL_ERROR("No width following \"-width\".\n"); + + i++; + + if (!ParseNumber(argv[i], NULL, 10, &options.width)) + FATAL_ERROR("Failed to parse width.\n"); + + if (options.width < 1) + FATAL_ERROR("Width must be positive.\n"); + } + else if (strcmp(option, "-mwidth") == 0) + { + if (i + 1 >= argc) + FATAL_ERROR("No metatile width value following \"-mwidth\".\n"); + + i++; + + if (!ParseNumber(argv[i], NULL, 10, &options.metatileWidth)) + FATAL_ERROR("Failed to parse metatile width.\n"); + + if (options.metatileWidth < 1) + FATAL_ERROR("metatile width must be positive.\n"); + } + else if (strcmp(option, "-mheight") == 0) + { + if (i + 1 >= argc) + FATAL_ERROR("No metatile height value following \"-mheight\".\n"); + + i++; + + if (!ParseNumber(argv[i], NULL, 10, &options.metatileHeight)) + FATAL_ERROR("Failed to parse metatile height.\n"); + + if (options.metatileHeight < 1) + FATAL_ERROR("metatile height must be positive.\n"); + } + else + { + FATAL_ERROR("Unrecognized option \"%s\".\n", option); + } + } + + if (options.metatileWidth > options.width) + options.width = options.metatileWidth; + + ConvertGbaToPng(inputPath, outputPath, &options); +} + +void HandlePngToGbaCommand(char *inputPath, char *outputPath, int argc, char **argv) +{ + char *outputFileExtension = GetFileExtension(outputPath); + int bitDepth = outputFileExtension[0] - '0'; + struct PngToGbaOptions options; + options.numTiles = 0; + options.bitDepth = bitDepth; + options.metatileWidth = 1; + options.metatileHeight = 1; + options.tilemapFilePath = NULL; + + for (int i = 3; i < argc; i++) + { + char *option = argv[i]; + + if (strcmp(option, "-num_tiles") == 0) + { + if (i + 1 >= argc) + FATAL_ERROR("No number of tiles following \"-num_tiles\".\n"); + + i++; + + if (!ParseNumber(argv[i], NULL, 10, &options.numTiles)) + FATAL_ERROR("Failed to parse number of tiles.\n"); + + if (options.numTiles < 1) + FATAL_ERROR("Number of tiles must be positive.\n"); + } + else if (strcmp(option, "-tilemap") == 0) + { + if (i + 1 >= argc) + FATAL_ERROR("No tilemap path following \"-tilemap\".\n"); + + i++; + options.tilemapFilePath = argv[i]; + } + else if (strcmp(option, "-mwidth") == 0) + { + if (i + 1 >= argc) + FATAL_ERROR("No metatile width value following \"-mwidth\".\n"); + + i++; + + if (!ParseNumber(argv[i], NULL, 10, &options.metatileWidth)) + FATAL_ERROR("Failed to parse metatile width.\n"); + + if (options.metatileWidth < 1) + FATAL_ERROR("metatile width must be positive.\n"); + } + else if (strcmp(option, "-mheight") == 0) + { + if (i + 1 >= argc) + FATAL_ERROR("No metatile height value following \"-mheight\".\n"); + + i++; + + if (!ParseNumber(argv[i], NULL, 10, &options.metatileHeight)) + FATAL_ERROR("Failed to parse metatile height.\n"); + + if (options.metatileHeight < 1) + FATAL_ERROR("metatile height must be positive.\n"); + } + else + { + FATAL_ERROR("Unrecognized option \"%s\".\n", option); + } + } + + ConvertPngToGba(inputPath, outputPath, &options); +} + +void HandlePngToGbaPaletteCommand(char *inputPath, char *outputPath, int argc UNUSED, char **argv UNUSED) +{ + struct Palette palette; + + ReadPngPalette(inputPath, &palette); + WriteGbaPalette(outputPath, &palette); +} + +void HandleGbaToJascPaletteCommand(char *inputPath, char *outputPath, int argc UNUSED, char **argv UNUSED) +{ + struct Palette palette; + + ReadGbaPalette(inputPath, &palette); + WriteJascPalette(outputPath, &palette); +} + +void HandleJascToGbaPaletteCommand(char *inputPath, char *outputPath, int argc, char **argv) +{ + int numColors = 0; + + for (int i = 3; i < argc; i++) + { + char *option = argv[i]; + + if (strcmp(option, "-num_colors") == 0) + { + if (i + 1 >= argc) + FATAL_ERROR("No number of colors following \"-num_colors\".\n"); + + i++; + + if (!ParseNumber(argv[i], NULL, 10, &numColors)) + FATAL_ERROR("Failed to parse number of colors.\n"); + + if (numColors < 1) + FATAL_ERROR("Number of colors must be positive.\n"); + } + else + { + FATAL_ERROR("Unrecognized option \"%s\".\n", option); + } + } + + struct Palette palette; + + ReadJascPalette(inputPath, &palette); + + if (numColors != 0) + palette.numColors = numColors; + + WriteGbaPalette(outputPath, &palette); +} + +void HandleLatinFontToPngCommand(char *inputPath, char *outputPath, int argc UNUSED, char **argv UNUSED) +{ + struct Image image; + + image.hasTilemap = false; + image.tileMap.data = NULL; + image.tileMap.numTiles = 0; + + ReadLatinFont(inputPath, &image); + WritePng(outputPath, &image); + + FreeImage(&image); +} + +void HandlePngToLatinFontCommand(char *inputPath, char *outputPath, int argc UNUSED, char **argv UNUSED) +{ + struct Image image; + + image.hasTilemap = false; + image.tileMap.data = NULL; + image.tileMap.numTiles = 0; + + image.bitDepth = 2; + + ReadPng(inputPath, &image); + WriteLatinFont(outputPath, &image); + + FreeImage(&image); +} + +void HandleHalfwidthJapaneseFontToPngCommand(char *inputPath, char *outputPath, int argc UNUSED, char **argv UNUSED) +{ + struct Image image; + + image.hasTilemap = false; + image.tileMap.data = NULL; + image.tileMap.numTiles = 0; + + ReadHalfwidthJapaneseFont(inputPath, &image); + WritePng(outputPath, &image); + + FreeImage(&image); +} + +void HandlePngToHalfwidthJapaneseFontCommand(char *inputPath, char *outputPath, int argc UNUSED, char **argv UNUSED) +{ + struct Image image; + + image.hasTilemap = false; + image.tileMap.data = NULL; + image.tileMap.numTiles = 0; + + image.bitDepth = 2; + + ReadPng(inputPath, &image); + WriteHalfwidthJapaneseFont(outputPath, &image); + + FreeImage(&image); +} + +void HandleFullwidthJapaneseFontToPngCommand(char *inputPath, char *outputPath, int argc UNUSED, char **argv UNUSED) +{ + struct Image image; + + image.hasTilemap = false; + image.tileMap.data = NULL; + image.tileMap.numTiles = 0; + + ReadFullwidthJapaneseFont(inputPath, &image); + WritePng(outputPath, &image); + + FreeImage(&image); +} + +void HandlePngToFullwidthJapaneseFontCommand(char *inputPath, char *outputPath, int argc UNUSED, char **argv UNUSED) +{ + struct Image image; + + image.hasTilemap = false; + image.tileMap.data = NULL; + image.tileMap.numTiles = 0; + + image.bitDepth = 2; + + ReadPng(inputPath, &image); + WriteFullwidthJapaneseFont(outputPath, &image); + + FreeImage(&image); +} + +void HandleLZCompressCommand(char *inputPath, char *outputPath, int argc, char **argv) +{ + int overflowSize = 0; + int minDistance = 2; // default, for compatibility with LZ77UnCompVram() + + for (int i = 3; i < argc; i++) + { + char *option = argv[i]; + + if (strcmp(option, "-overflow") == 0) + { + if (i + 1 >= argc) + FATAL_ERROR("No size following \"-overflow\".\n"); + + i++; + + if (!ParseNumber(argv[i], NULL, 10, &overflowSize)) + FATAL_ERROR("Failed to parse overflow size.\n"); + + if (overflowSize < 1) + FATAL_ERROR("Overflow size must be positive.\n"); + } + else if (strcmp(option, "-search") == 0) + { + if (i + 1 >= argc) + FATAL_ERROR("No size following \"-overflow\".\n"); + + i++; + + if (!ParseNumber(argv[i], NULL, 10, &minDistance)) + FATAL_ERROR("Failed to parse LZ min search distance.\n"); + + if (minDistance < 1) + FATAL_ERROR("LZ min search distance must be positive.\n"); + } + else + { + FATAL_ERROR("Unrecognized option \"%s\".\n", option); + } + } + + // The overflow option allows a quirk in some of Ruby/Sapphire's tilesets + // to be reproduced. It works by appending a number of zeros to the data + // before compressing it and then amending the LZ header's size field to + // reflect the expected size. This will cause an overflow when decompressing + // the data. + + int fileSize; + unsigned char *buffer = ReadWholeFileZeroPadded(inputPath, &fileSize, overflowSize); + + int compressedSize; + unsigned char *compressedData = LZCompress(buffer, fileSize + overflowSize, &compressedSize, minDistance); + + compressedData[1] = (unsigned char)fileSize; + compressedData[2] = (unsigned char)(fileSize >> 8); + compressedData[3] = (unsigned char)(fileSize >> 16); + + free(buffer); + + WriteWholeFile(outputPath, compressedData, compressedSize); + + free(compressedData); +} + +void HandleLZDecompressCommand(char *inputPath, char *outputPath, int argc UNUSED, char **argv UNUSED) +{ + int fileSize; + unsigned char *buffer = ReadWholeFile(inputPath, &fileSize); + + int uncompressedSize; + unsigned char *uncompressedData = LZDecompress(buffer, fileSize, &uncompressedSize); + + free(buffer); + + WriteWholeFile(outputPath, uncompressedData, uncompressedSize); + + free(uncompressedData); +} + +void HandleRLCompressCommand(char *inputPath, char *outputPath, int argc UNUSED, char **argv UNUSED) +{ + int fileSize; + unsigned char *buffer = ReadWholeFile(inputPath, &fileSize); + + int compressedSize; + unsigned char *compressedData = RLCompress(buffer, fileSize, &compressedSize); + + free(buffer); + + WriteWholeFile(outputPath, compressedData, compressedSize); + + free(compressedData); +} + +void HandleRLDecompressCommand(char *inputPath, char *outputPath, int argc UNUSED, char **argv UNUSED) +{ + int fileSize; + unsigned char *buffer = ReadWholeFile(inputPath, &fileSize); + + int uncompressedSize; + unsigned char *uncompressedData = RLDecompress(buffer, fileSize, &uncompressedSize); + + free(buffer); + + WriteWholeFile(outputPath, uncompressedData, uncompressedSize); + + free(uncompressedData); +} + +int main(int argc, char **argv) +{ + if (argc < 3) + FATAL_ERROR("Usage: gbagfx INPUT_PATH OUTPUT_PATH [options...]\n"); + + struct CommandHandler handlers[] = + { + { "1bpp", "png", HandleGbaToPngCommand }, + { "4bpp", "png", HandleGbaToPngCommand }, + { "8bpp", "png", HandleGbaToPngCommand }, + { "png", "1bpp", HandlePngToGbaCommand }, + { "png", "4bpp", HandlePngToGbaCommand }, + { "png", "8bpp", HandlePngToGbaCommand }, + { "png", "gbapal", HandlePngToGbaPaletteCommand }, + { "gbapal", "pal", HandleGbaToJascPaletteCommand }, + { "pal", "gbapal", HandleJascToGbaPaletteCommand }, + { "latfont", "png", HandleLatinFontToPngCommand }, + { "png", "latfont", HandlePngToLatinFontCommand }, + { "hwjpnfont", "png", HandleHalfwidthJapaneseFontToPngCommand }, + { "png", "hwjpnfont", HandlePngToHalfwidthJapaneseFontCommand }, + { "fwjpnfont", "png", HandleFullwidthJapaneseFontToPngCommand }, + { "png", "fwjpnfont", HandlePngToFullwidthJapaneseFontCommand }, + { NULL, "lz", HandleLZCompressCommand }, + { "lz", NULL, HandleLZDecompressCommand }, + { NULL, "rl", HandleRLCompressCommand }, + { "rl", NULL, HandleRLDecompressCommand }, + { NULL, NULL, NULL } + }; + + char *inputPath = argv[1]; + char *outputPath = argv[2]; + char *inputFileExtension = GetFileExtension(inputPath); + char *outputFileExtension = GetFileExtension(outputPath); + + if (inputFileExtension == NULL) + FATAL_ERROR("Input file \"%s\" has no extension.\n", inputPath); + + if (outputFileExtension == NULL) + FATAL_ERROR("Output file \"%s\" has no extension.\n", outputPath); + + for (int i = 0; handlers[i].function != NULL; i++) + { + if ((handlers[i].inputFileExtension == NULL || strcmp(handlers[i].inputFileExtension, inputFileExtension) == 0) + && (handlers[i].outputFileExtension == NULL || strcmp(handlers[i].outputFileExtension, outputFileExtension) == 0)) + { + handlers[i].function(inputPath, outputPath, argc, argv); + return 0; + } + } + + FATAL_ERROR("Don't know how to convert \"%s\" to \"%s\".\n", inputPath, outputPath); +} diff --git a/tools/gbagfx/options.h b/tools/gbagfx/options.h new file mode 100644 index 000000000..463ee2455 --- /dev/null +++ b/tools/gbagfx/options.h @@ -0,0 +1,26 @@ +// Copyright (c) 2018 huderlem + +#ifndef OPTIONS_H +#define OPTIONS_H + +#include <stdbool.h> + +struct GbaToPngOptions { + char *paletteFilePath; + char *tilemapFilePath; + int bitDepth; + bool hasTransparency; + int width; + int metatileWidth; + int metatileHeight; +}; + +struct PngToGbaOptions { + char *tilemapFilePath; + int numTiles; + int bitDepth; + int metatileWidth; + int metatileHeight; +}; + +#endif // OPTIONS_H diff --git a/tools/gbagfx/rl.c b/tools/gbagfx/rl.c new file mode 100644 index 000000000..968c9347e --- /dev/null +++ b/tools/gbagfx/rl.c @@ -0,0 +1,149 @@ +// Copyright (c) 2016 YamaArashi + +#include <stdlib.h> +#include <stdbool.h> +#include "global.h" +#include "rl.h" + +unsigned char *RLDecompress(unsigned char *src, int srcSize, int *uncompressedSize) +{ + if (srcSize < 4) + goto fail; + + int destSize = (src[3] << 16) | (src[2] << 8) | src[1]; + + unsigned char *dest = malloc(destSize); + + if (dest == NULL) + goto fail; + + int srcPos = 4; + int destPos = 0; + + for (;;) + { + if (srcPos >= srcSize) + goto fail; + + unsigned char flags = src[srcPos++]; + bool compressed = ((flags & 0x80) != 0); + + if (compressed) + { + int length = (flags & 0x7F) + 3; + unsigned char data = src[srcPos++]; + + if (destPos + length > destSize) + goto fail; + + for (int i = 0; i < length; i++) + dest[destPos++] = data; + } + else + { + int length = (flags & 0x7F) + 1; + + if (destPos + length > destSize) + goto fail; + + for (int i = 0; i < length; i++) + dest[destPos++] = src[srcPos++]; + } + + if (destPos == destSize) + { + *uncompressedSize = destSize; + return dest; + } + } + +fail: + FATAL_ERROR("Fatal error while decompressing RL file.\n"); +} + +unsigned char *RLCompress(unsigned char *src, int srcSize, int *compressedSize) +{ + if (srcSize <= 0) + goto fail; + + int worstCaseDestSize = 4 + srcSize * 2; + + // Round up to the next multiple of four. + worstCaseDestSize = (worstCaseDestSize + 3) & ~3; + + unsigned char *dest = malloc(worstCaseDestSize); + + if (dest == NULL) + goto fail; + + // header + dest[0] = 0x30; // RL compression type + dest[1] = (unsigned char)srcSize; + dest[2] = (unsigned char)(srcSize >> 8); + dest[3] = (unsigned char)(srcSize >> 16); + + int srcPos = 0; + int destPos = 4; + + for (;;) + { + bool compress = false; + int uncompressedStart = srcPos; + int uncompressedLength = 0; + + while (srcPos < srcSize && uncompressedLength < (0x7F + 1)) + { + compress = (srcPos + 2 < srcSize && src[srcPos] == src[srcPos + 1] && src[srcPos] == src[srcPos + 2]); + + if (compress) + break; + + srcPos++; + uncompressedLength++; + } + + if (uncompressedLength > 0) + { + dest[destPos++] = uncompressedLength - 1; + + for (int i = 0; i < uncompressedLength; i++) + dest[destPos++] = src[uncompressedStart + i]; + } + + if (compress) + { + unsigned char data = src[srcPos]; + int compressedLength = 0; + + while (compressedLength < (0x7F + 3) + && srcPos + compressedLength < srcSize + && src[srcPos + compressedLength] == data) + { + compressedLength++; + } + + dest[destPos++] = 0x80 | (compressedLength - 3); + dest[destPos++] = data; + + srcPos += compressedLength; + } + + if (srcPos == srcSize) + { + // Pad to multiple of 4 bytes. + int remainder = destPos % 4; + + if (remainder != 0) + { + for (int i = 0; i < 4 - remainder; i++) + dest[destPos++] = 0; + } + + *compressedSize = destPos; + return dest; + } + } + +fail: + FATAL_ERROR("Fatal error while compressing RL file.\n"); +} diff --git a/tools/gbagfx/rl.h b/tools/gbagfx/rl.h new file mode 100644 index 000000000..02ad8d6d3 --- /dev/null +++ b/tools/gbagfx/rl.h @@ -0,0 +1,9 @@ +// Copyright (c) 2016 YamaArashi + +#ifndef RL_H +#define RL_H + +unsigned char *RLDecompress(unsigned char *src, int srcSize, int *uncompressedSize); +unsigned char *RLCompress(unsigned char *src, int srcSize, int *compressedSize); + +#endif // RL_H diff --git a/tools/gbagfx/util.c b/tools/gbagfx/util.c new file mode 100644 index 000000000..87abeb31c --- /dev/null +++ b/tools/gbagfx/util.c @@ -0,0 +1,124 @@ +// Copyright (c) 2015 YamaArashi + +#include <stdio.h> +#include <stdlib.h> +#include <string.h> +#include <stdbool.h> +#include <errno.h> +#include <limits.h> +#include "global.h" +#include "util.h" + +bool ParseNumber(char *s, char **end, int radix, int *intValue) +{ + char *localEnd; + + if (end == NULL) + end = &localEnd; + + errno = 0; + + const long longValue = strtol(s, end, radix); + + if (*end == s) + return false; // not a number + + if ((longValue == LONG_MIN || longValue == LONG_MAX) && errno == ERANGE) + return false; + + if (longValue > INT_MAX) + return false; + + if (longValue < INT_MIN) + return false; + + *intValue = (int)longValue; + + return true; +} + +char *GetFileExtension(char *path) +{ + char *extension = path; + + while (*extension != 0) + extension++; + + while (extension > path && *extension != '.') + extension--; + + if (extension == path) + return NULL; + + extension++; + + if (*extension == 0) + return NULL; + + return extension; +} + +unsigned char *ReadWholeFile(char *path, int *size) +{ + FILE *fp = fopen(path, "rb"); + + if (fp == NULL) + FATAL_ERROR("Failed to open \"%s\" for reading.\n", path); + + fseek(fp, 0, SEEK_END); + + *size = ftell(fp); + + unsigned char *buffer = malloc(*size); + + if (buffer == NULL) + FATAL_ERROR("Failed to allocate memory for reading \"%s\".\n", path); + + rewind(fp); + + if (fread(buffer, *size, 1, fp) != 1) + FATAL_ERROR("Failed to read \"%s\".\n", path); + + fclose(fp); + + return buffer; +} + +unsigned char *ReadWholeFileZeroPadded(char *path, int *size, int padAmount) +{ + FILE *fp = fopen(path, "rb"); + + if (fp == NULL) + FATAL_ERROR("Failed to open \"%s\" for reading.\n", path); + + fseek(fp, 0, SEEK_END); + + *size = ftell(fp); + + unsigned char *buffer = calloc(*size + padAmount, 1); + + if (buffer == NULL) + FATAL_ERROR("Failed to allocate memory for reading \"%s\".\n", path); + + rewind(fp); + + if (fread(buffer, *size, 1, fp) != 1) + FATAL_ERROR("Failed to read \"%s\".\n", path); + + fclose(fp); + + return buffer; +} + +void WriteWholeFile(char *path, void *buffer, int bufferSize) +{ + FILE *fp = fopen(path, "wb"); + + if (fp == NULL) + FATAL_ERROR("Failed to open \"%s\" for writing.\n", path); + + if (fwrite(buffer, bufferSize, 1, fp) != 1) + FATAL_ERROR("Failed to write to \"%s\".\n", path); + + fclose(fp); +} diff --git a/tools/gbagfx/util.h b/tools/gbagfx/util.h new file mode 100644 index 000000000..6d7a9c21e --- /dev/null +++ b/tools/gbagfx/util.h @@ -0,0 +1,14 @@ +// Copyright (c) 2015 YamaArashi + +#ifndef UTIL_H +#define UTIL_H + +#include <stdbool.h> + +bool ParseNumber(char *s, char **end, int radix, int *intValue); +char *GetFileExtension(char *path); +unsigned char *ReadWholeFile(char *path, int *size); +unsigned char *ReadWholeFileZeroPadded(char *path, int *size, int padAmount); +void WriteWholeFile(char *path, void *buffer, int bufferSize); + +#endif // UTIL_H diff --git a/tools/mid2agb/.gitignore b/tools/mid2agb/.gitignore new file mode 100644 index 000000000..0e7264c86 --- /dev/null +++ b/tools/mid2agb/.gitignore @@ -0,0 +1 @@ +mid2agb diff --git a/tools/mid2agb/LICENSE b/tools/mid2agb/LICENSE new file mode 100644 index 000000000..534d15349 --- /dev/null +++ b/tools/mid2agb/LICENSE @@ -0,0 +1,19 @@ +Copyright (c) 2016 YamaArashi + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. diff --git a/tools/mid2agb/Makefile b/tools/mid2agb/Makefile new file mode 100644 index 000000000..77f96db5a --- /dev/null +++ b/tools/mid2agb/Makefile @@ -0,0 +1,18 @@ +CXX := g++ + +CXXFLAGS := -std=c++11 -O2 -Wall -Wno-switch -Werror + +SRCS := agb.cpp error.cpp main.cpp midi.cpp tables.cpp + +HEADERS := agb.h error.h main.h midi.h tables.h + +.PHONY: all clean + +all: mid2agb + @: + +mid2agb: $(SRCS) $(HEADERS) + $(CXX) $(CXXFLAGS) $(SRCS) -o $@ $(LDFLAGS) + +clean: + $(RM) mid2agb mid2agb.exe diff --git a/tools/mid2agb/agb.cpp b/tools/mid2agb/agb.cpp new file mode 100644 index 000000000..d4d79f133 --- /dev/null +++ b/tools/mid2agb/agb.cpp @@ -0,0 +1,547 @@ +// Copyright(c) 2016 YamaArashi +// +// Permission is hereby granted, free of charge, to any person obtaining a copy +// of this software and associated documentation files (the "Software"), to deal +// in the Software without restriction, including without limitation the rights +// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +// copies of the Software, and to permit persons to whom the Software is +// furnished to do so, subject to the following conditions: +// +// The above copyright notice and this permission notice shall be included in +// all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +// THE SOFTWARE. + +#include <cstdio> +#include <cstdarg> +#include <cstring> +#include <vector> +#include "agb.h" +#include "main.h" +#include "midi.h" +#include "tables.h" + +int g_agbTrack; + +static std::string s_lastOpName; +static int s_blockNum; +static bool s_keepLastOpName; +static int s_lastNote; +static int s_lastVelocity; +static bool s_noteChanged; +static bool s_velocityChanged; +static bool s_inPattern; +static int s_extendedCommand; +static int s_memaccOp; +static int s_memaccParam1; +static int s_memaccParam2; + +void PrintAgbHeader() +{ + std::fprintf(g_outputFile, "\t.include \"MPlayDef.s\"\n\n"); + std::fprintf(g_outputFile, "\t.equ\t%s_grp, voicegroup%03u\n", g_asmLabel.c_str(), g_voiceGroup); + std::fprintf(g_outputFile, "\t.equ\t%s_pri, %u\n", g_asmLabel.c_str(), g_priority); + + if (g_reverb >= 0) + std::fprintf(g_outputFile, "\t.equ\t%s_rev, reverb_set+%u\n", g_asmLabel.c_str(), g_reverb); + else + std::fprintf(g_outputFile, "\t.equ\t%s_rev, 0\n", g_asmLabel.c_str()); + + std::fprintf(g_outputFile, "\t.equ\t%s_mvl, %u\n", g_asmLabel.c_str(), g_masterVolume); + std::fprintf(g_outputFile, "\t.equ\t%s_key, %u\n", g_asmLabel.c_str(), 0); + std::fprintf(g_outputFile, "\t.equ\t%s_tbs, %u\n", g_asmLabel.c_str(), g_clocksPerBeat); + std::fprintf(g_outputFile, "\t.equ\t%s_exg, %u\n", g_asmLabel.c_str(), g_exactGateTime); + std::fprintf(g_outputFile, "\t.equ\t%s_cmp, %u\n", g_asmLabel.c_str(), g_compressionEnabled); + + std::fprintf(g_outputFile, "\n\t.section .rodata\n"); + std::fprintf(g_outputFile, "\t.global\t%s\n", g_asmLabel.c_str()); + + std::fprintf(g_outputFile, "\t.align\t2\n"); +} + +void ResetTrackVars() +{ + s_lastVelocity = -1; + s_lastNote = -1; + s_velocityChanged = false; + s_noteChanged = false; + s_keepLastOpName = false; + s_lastOpName = ""; + s_inPattern = false; +} + +void PrintWait(int wait) +{ + if (wait > 0) + { + std::fprintf(g_outputFile, "\t.byte\tW%02d\n", wait); + s_velocityChanged = true; + s_noteChanged = true; + s_keepLastOpName = true; + } +} + +void PrintOp(int wait, std::string name, const char *format, ...) +{ + std::va_list args; + va_start(args, format); + std::fprintf(g_outputFile, "\t.byte\t\t"); + + if (format != nullptr) + { + if (!g_compressionEnabled || s_lastOpName != name) + { + std::fprintf(g_outputFile, "%s, ", name.c_str()); + s_lastOpName = name; + } + else + { + std::fprintf(g_outputFile, " "); + } + std::vfprintf(g_outputFile, format, args); + } + else + { + std::fputs(name.c_str(), g_outputFile); + s_lastOpName = name; + } + + std::fprintf(g_outputFile, "\n"); + + va_end(args); + + PrintWait(wait); +} + +void PrintByte(const char *format, ...) +{ + std::va_list args; + va_start(args, format); + std::fprintf(g_outputFile, "\t.byte\t"); + std::vfprintf(g_outputFile, format, args); + std::fprintf(g_outputFile, "\n"); + s_velocityChanged = true; + s_noteChanged = true; + s_keepLastOpName = true; + va_end(args); +} + +void PrintWord(const char *format, ...) +{ + std::va_list args; + va_start(args, format); + std::fprintf(g_outputFile, "\t .word\t"); + std::vfprintf(g_outputFile, format, args); + std::fprintf(g_outputFile, "\n"); + va_end(args); +} + +void PrintNote(const Event& event) +{ + int note = event.note; + int velocity = g_noteVelocityLUT[event.param1]; + int duration = -1; + + if (event.param2 != -1) + duration = g_noteDurationLUT[event.param2]; + + int gateTimeParam = 0; + + if (g_exactGateTime && duration != -1) + gateTimeParam = event.param2 - duration; + + char gtpBuf[16]; + + if (gateTimeParam > 0) + std::snprintf(gtpBuf, sizeof(gtpBuf), ", gtp%u", gateTimeParam); + else + gtpBuf[0] = 0; + + char opName[16]; + + if (duration == -1) + std::strcpy(opName, "TIE "); + else + std::snprintf(opName, sizeof(opName), "N%02u ", duration); + + bool noteChanged = true; + bool velocityChanged = true; + + if (g_compressionEnabled) + { + noteChanged = (note != s_lastNote); + velocityChanged = (velocity != s_lastVelocity); + } + + if (s_keepLastOpName) + s_keepLastOpName = false; + else + s_lastOpName = ""; + + if (noteChanged || velocityChanged || (gateTimeParam > 0)) + { + s_lastNote = note; + + char noteBuf[16]; + + if (note >= 24) + std::snprintf(noteBuf, sizeof(noteBuf), g_noteTable[note % 12], note / 12 - 2); + else + std::snprintf(noteBuf, sizeof(noteBuf), g_minusNoteTable[note % 12], note / -12 + 2); + + char velocityBuf[16]; + + if (velocityChanged || (gateTimeParam > 0)) + { + s_lastVelocity = velocity; + std::snprintf(velocityBuf, sizeof(velocityBuf), ", v%03u", velocity); + } + else + { + velocityBuf[0] = 0; + } + + PrintOp(event.time, opName, "%s%s%s", noteBuf, velocityBuf, gtpBuf); + } + else + { + PrintOp(event.time, opName, 0); + } + + s_noteChanged = noteChanged; + s_velocityChanged = velocityChanged; +} + +void PrintEndOfTieOp(const Event& event) +{ + int note = event.note; + bool noteChanged = (note != s_lastNote); + + if (!noteChanged || !s_noteChanged) + s_lastOpName = ""; + + if (!noteChanged && g_compressionEnabled) + { + PrintOp(event.time, "EOT ", nullptr); + } + else + { + s_lastNote = note; + if (note >= 24) + PrintOp(event.time, "EOT ", g_noteTable[note % 12], note / 12 - 2); + else + PrintOp(event.time, "EOT ", g_minusNoteTable[note % 12], note / -12 + 2); + } + + s_noteChanged = noteChanged; +} + +void PrintSeqLoopLabel(const Event& event) +{ + s_blockNum = event.param1 + 1; + std::fprintf(g_outputFile, "%s_%u_B%u:\n", g_asmLabel.c_str(), g_agbTrack, s_blockNum); + PrintWait(event.time); + ResetTrackVars(); +} + +void PrintMemAcc(const Event& event) +{ + switch (s_memaccOp) + { + case 0x00: + PrintByte("MEMACC, mem_set, 0x%02X, %u", s_memaccParam1, event.param2); + break; + case 0x01: + PrintByte("MEMACC, mem_add, 0x%02X, %u", s_memaccParam1, event.param2); + break; + case 0x02: + PrintByte("MEMACC, mem_sub, 0x%02X, %u", s_memaccParam1, event.param2); + break; + case 0x03: + PrintByte("MEMACC, mem_mem_set, 0x%02X, 0x%02X", s_memaccParam1, event.param2); + break; + case 0x04: + PrintByte("MEMACC, mem_mem_add, 0x%02X, 0x%02X", s_memaccParam1, event.param2); + break; + case 0x05: + PrintByte("MEMACC, mem_mem_sub, 0x%02X, 0x%02X", s_memaccParam1, event.param2); + break; + // TODO: everything else + case 0x06: + break; + case 0x07: + break; + case 0x08: + break; + case 0x09: + break; + case 0x0A: + break; + case 0x0B: + break; + case 0x0C: + break; + case 0x0D: + break; + case 0x0E: + break; + case 0x0F: + break; + case 0x10: + break; + case 0x11: + break; + case 0x46: + break; + case 0x47: + break; + case 0x48: + break; + case 0x49: + break; + case 0x4A: + break; + case 0x4B: + break; + case 0x4C: + break; + case 0x4D: + break; + case 0x4E: + break; + case 0x4F: + break; + case 0x50: + break; + case 0x51: + break; + default: + break; + } + + PrintWait(event.time); +} + +void PrintExtendedOp(const Event& event) +{ + // TODO: support for other extended commands + + switch (s_extendedCommand) + { + case 0x08: + PrintOp(event.time, "XCMD ", "xIECV , %u", event.param2); + break; + case 0x09: + PrintOp(event.time, "XCMD ", "xIECL , %u", event.param2); + break; + default: + PrintWait(event.time); + break; + } +} + +void PrintControllerOp(const Event& event) +{ + switch (event.param1) + { + case 0x01: + PrintOp(event.time, "MOD ", "%u", event.param2); + break; + case 0x07: + PrintOp(event.time, "VOL ", "%u*%s_mvl/mxv", event.param2, g_asmLabel.c_str()); + break; + case 0x0A: + PrintOp(event.time, "PAN ", "c_v%+d", event.param2 - 64); + break; + case 0x0C: + case 0x10: + PrintMemAcc(event); + break; + case 0x0D: + s_memaccOp = event.param2; + PrintWait(event.time); + break; + case 0x0E: + s_memaccParam1 = event.param2; + PrintWait(event.time); + break; + case 0x0F: + s_memaccParam2 = event.param2; + PrintWait(event.time); + break; + case 0x11: + std::fprintf(g_outputFile, "%s_%u_L%u:\n", g_asmLabel.c_str(), g_agbTrack, event.param2); + PrintWait(event.time); + ResetTrackVars(); + break; + case 0x14: + PrintOp(event.time, "BENDR ", "%u", event.param2); + break; + case 0x15: + PrintOp(event.time, "LFOS ", "%u", event.param2); + break; + case 0x16: + PrintOp(event.time, "MODT ", "%u", event.param2); + break; + case 0x18: + PrintOp(event.time, "TUNE ", "c_v%+d", event.param2 - 64); + break; + case 0x1A: + PrintOp(event.time, "LFODL ", "%u", event.param2); + break; + case 0x1D: + case 0x1F: + PrintExtendedOp(event); + break; + case 0x1E: + s_extendedCommand = event.param2; + // TODO: loop op + break; + case 0x21: + case 0x27: + PrintByte("PRIO , %u", event.param2); + PrintWait(event.time); + break; + default: + PrintWait(event.time); + break; + } +} + +void PrintAgbTrack(std::vector<Event>& events) +{ + std::fprintf(g_outputFile, "\n@**************** Track %u (Midi-Chn.%u) ****************@\n\n", g_agbTrack, g_midiChan + 1); + std::fprintf(g_outputFile, "%s_%u:\n", g_asmLabel.c_str(), g_agbTrack); + + int wholeNoteCount = 0; + int loopEndBlockNum = 0; + + ResetTrackVars(); + + bool foundVolBeforeNote = false; + + for (const Event& event : events) + { + if (event.type == EventType::Note) + break; + + if (event.type == EventType::Controller && event.param1 == 0x07) + { + foundVolBeforeNote = true; + break; + } + } + + if (!foundVolBeforeNote) + PrintByte("\tVOL , 127*%s_mvl/mxv", g_asmLabel.c_str()); + + PrintWait(g_initialWait); + PrintByte("KEYSH , %s_key%+d", g_asmLabel.c_str(), 0); + + for (unsigned i = 0; events[i].type != EventType::EndOfTrack; i++) + { + const Event& event = events[i]; + + if (IsPatternBoundary(event.type)) + { + if (s_inPattern) + PrintByte("PEND"); + s_inPattern = false; + } + + if (event.type == EventType::WholeNoteMark || event.type == EventType::Pattern) + std::fprintf(g_outputFile, "@ %03d ----------------------------------------\n", wholeNoteCount++); + + switch (event.type) + { + case EventType::Note: + PrintNote(event); + break; + case EventType::EndOfTie: + PrintEndOfTieOp(event); + break; + case EventType::Label: + PrintSeqLoopLabel(event); + break; + case EventType::LoopEnd: + PrintByte("GOTO"); + PrintWord("%s_%u_B%u", g_asmLabel.c_str(), g_agbTrack, loopEndBlockNum); + PrintSeqLoopLabel(event); + break; + case EventType::LoopEndBegin: + PrintByte("GOTO"); + PrintWord("%s_%u_B%u", g_asmLabel.c_str(), g_agbTrack, loopEndBlockNum); + PrintSeqLoopLabel(event); + loopEndBlockNum = s_blockNum; + break; + case EventType::LoopBegin: + PrintSeqLoopLabel(event); + loopEndBlockNum = s_blockNum; + break; + case EventType::WholeNoteMark: + if (event.param2 & 0x80000000) + { + std::fprintf(g_outputFile, "%s_%u_%03lu:\n", g_asmLabel.c_str(), g_agbTrack, (unsigned long)(event.param2 & 0x7FFFFFFF)); + ResetTrackVars(); + s_inPattern = true; + } + PrintWait(event.time); + break; + case EventType::Pattern: + PrintByte("PATT"); + PrintWord("%s_%u_%03lu", g_asmLabel.c_str(), g_agbTrack, event.param2); + + while (!IsPatternBoundary(events[i + 1].type)) + i++; + + ResetTrackVars(); + break; + case EventType::Tempo: + PrintByte("TEMPO , %u*%s_tbs/2", 60000000 / event.param2, g_asmLabel.c_str()); + PrintWait(event.time); + break; + case EventType::InstrumentChange: + PrintOp(event.time, "VOICE ", "%u", event.param1); + break; + case EventType::PitchBend: + PrintOp(event.time, "BEND ", "c_v%+d", event.param2 - 64); + break; + case EventType::Controller: + PrintControllerOp(event); + break; + default: + PrintWait(event.time); + break; + } + } + + PrintByte("FINE"); +} + +void PrintAgbFooter() +{ + int trackCount = g_agbTrack - 1; + + std::fprintf(g_outputFile, "\n@******************************************************@\n"); + std::fprintf(g_outputFile, "\t.align\t2\n"); + std::fprintf(g_outputFile, "\n%s:\n", g_asmLabel.c_str()); + std::fprintf(g_outputFile, "\t.byte\t%u\t@ NumTrks\n", trackCount); + std::fprintf(g_outputFile, "\t.byte\t%u\t@ NumBlks\n", 0); + std::fprintf(g_outputFile, "\t.byte\t%s_pri\t@ Priority\n", g_asmLabel.c_str()); + std::fprintf(g_outputFile, "\t.byte\t%s_rev\t@ Reverb.\n", g_asmLabel.c_str()); + std::fprintf(g_outputFile, "\n"); + std::fprintf(g_outputFile, "\t.word\t%s_grp\n", g_asmLabel.c_str()); + std::fprintf(g_outputFile, "\n"); + + // track pointers + for (int i = 1; i <= trackCount; i++) + std::fprintf(g_outputFile, "\t.word\t%s_%u\n", g_asmLabel.c_str(), i); + + std::fprintf(g_outputFile, "\n\t.end\n"); +} diff --git a/tools/mid2agb/agb.h b/tools/mid2agb/agb.h new file mode 100644 index 000000000..7eab3c143 --- /dev/null +++ b/tools/mid2agb/agb.h @@ -0,0 +1,33 @@ +// Copyright(c) 2016 YamaArashi +// +// Permission is hereby granted, free of charge, to any person obtaining a copy +// of this software and associated documentation files (the "Software"), to deal +// in the Software without restriction, including without limitation the rights +// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +// copies of the Software, and to permit persons to whom the Software is +// furnished to do so, subject to the following conditions: +// +// The above copyright notice and this permission notice shall be included in +// all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +// THE SOFTWARE. + +#ifndef AGB_H +#define AGB_H + +#include <vector> +#include "midi.h" + +void PrintAgbHeader(); +void PrintAgbTrack(std::vector<Event>& events); +void PrintAgbFooter(); + +extern int g_agbTrack; + +#endif // AGB_H diff --git a/tools/mid2agb/error.cpp b/tools/mid2agb/error.cpp new file mode 100644 index 000000000..13e38ffa8 --- /dev/null +++ b/tools/mid2agb/error.cpp @@ -0,0 +1,36 @@ +// Copyright(c) 2016 YamaArashi +// +// Permission is hereby granted, free of charge, to any person obtaining a copy +// of this software and associated documentation files (the "Software"), to deal +// in the Software without restriction, including without limitation the rights +// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +// copies of the Software, and to permit persons to whom the Software is +// furnished to do so, subject to the following conditions: +// +// The above copyright notice and this permission notice shall be included in +// all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +// THE SOFTWARE. + +#include <cstdio> +#include <cstdlib> +#include <cstdarg> + +// Reports an error diagnostic and terminates the program. +[[noreturn]] void RaiseError(const char* format, ...) +{ + const int bufferSize = 1024; + char buffer[bufferSize]; + std::va_list args; + va_start(args, format); + std::vsnprintf(buffer, bufferSize, format, args); + std::fprintf(stderr, "error: %s\n", buffer); + va_end(args); + std::exit(1); +} diff --git a/tools/mid2agb/error.h b/tools/mid2agb/error.h new file mode 100644 index 000000000..da4f01142 --- /dev/null +++ b/tools/mid2agb/error.h @@ -0,0 +1,26 @@ +// Copyright(c) 2016 YamaArashi +// +// Permission is hereby granted, free of charge, to any person obtaining a copy +// of this software and associated documentation files (the "Software"), to deal +// in the Software without restriction, including without limitation the rights +// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +// copies of the Software, and to permit persons to whom the Software is +// furnished to do so, subject to the following conditions: +// +// The above copyright notice and this permission notice shall be included in +// all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +// THE SOFTWARE. + +#ifndef ERROR_H +#define ERROR_H + +[[noreturn]] void RaiseError(const char* format, ...); + +#endif // ERROR_H diff --git a/tools/mid2agb/main.cpp b/tools/mid2agb/main.cpp new file mode 100644 index 000000000..ea2b294ac --- /dev/null +++ b/tools/mid2agb/main.cpp @@ -0,0 +1,233 @@ +// Copyright(c) 2016 YamaArashi +// +// Permission is hereby granted, free of charge, to any person obtaining a copy +// of this software and associated documentation files (the "Software"), to deal +// in the Software without restriction, including without limitation the rights +// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +// copies of the Software, and to permit persons to whom the Software is +// furnished to do so, subject to the following conditions: +// +// The above copyright notice and this permission notice shall be included in +// all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +// THE SOFTWARE. + +#include <cstdio> +#include <cstdlib> +#include <cstring> +#include <cctype> +#include <cassert> +#include <string> +#include <set> +#include "main.h" +#include "error.h" +#include "midi.h" +#include "agb.h" + +FILE* g_inputFile = nullptr; +FILE* g_outputFile = nullptr; + +std::string g_asmLabel; +int g_masterVolume = 127; +int g_voiceGroup = 0; +int g_priority = 0; +int g_reverb = -1; +int g_clocksPerBeat = 1; +bool g_exactGateTime = false; +bool g_compressionEnabled = true; + +[[noreturn]] static void PrintUsage() +{ + std::printf( + "Usage: MID2AGB name [options]\n" + "\n" + " input_file filename(.mid) of MIDI file\n" + " output_file filename(.s) for AGB file (default:input_file)\n" + "\n" + "options -L??? label for assembler (default:output_file)\n" + " -V??? master volume (default:127)\n" + " -G??? voice group number (default:0)\n" + " -P??? priority (default:0)\n" + " -R??? reverb (default:off)\n" + " -X 48 clocks/beat (default:24 clocks/beat)\n" + " -E exact gate-time\n" + " -N no compression\n" + ); + std::exit(1); +} + +static std::string StripExtension(std::string s) +{ + std::size_t pos = s.find_last_of('.'); + + if (pos > 0 && pos != std::string::npos) + { + s = s.substr(0, pos); + } + + return s; +} + +static std::string GetExtension(std::string s) +{ + std::size_t pos = s.find_last_of('.'); + + if (pos > 0 && pos != std::string::npos) + { + return s.substr(pos + 1); + } + + return ""; +} + +static std::string BaseName(std::string s) +{ + std::size_t posAfterSlash = s.find_last_of("/\\"); + + if (posAfterSlash == std::string::npos) + posAfterSlash = 0; + else + posAfterSlash++; + + std::size_t dotPos = s.find_first_of('.', posAfterSlash); + if (dotPos > posAfterSlash && dotPos != std::string::npos) + s = s.substr(posAfterSlash, dotPos - posAfterSlash); + + return s; +} + +static const char *GetArgument(int argc, char **argv, int& index) +{ + assert(index >= 0 && index < argc); + + const char *option = argv[index]; + + assert(option != nullptr); + assert(option[0] == '-'); + + // If there is text following the letter, return that. + if (std::strlen(option) >= 3) + return option + 2; + + // Otherwise, try to get the next arg. + if (index + 1 < argc) + { + index++; + return argv[index]; + } + else + { + return nullptr; + } +} + +int main(int argc, char** argv) +{ + std::string inputFilename; + std::string outputFilename; + + for (int i = 1; i < argc; i++) + { + const char *option = argv[i]; + + if (option[0] == '-' && option[1] != '\0') + { + const char *arg; + + switch (std::toupper(option[1])) + { + case 'E': + g_exactGateTime = true; + break; + case 'G': + arg = GetArgument(argc, argv, i); + if (arg == nullptr) + PrintUsage(); + g_voiceGroup = std::stoi(arg); + break; + case 'L': + arg = GetArgument(argc, argv, i); + if (arg == nullptr) + PrintUsage(); + g_asmLabel = arg; + break; + case 'N': + g_compressionEnabled = false; + break; + case 'P': + arg = GetArgument(argc, argv, i); + if (arg == nullptr) + PrintUsage(); + g_priority = std::stoi(arg); + break; + case 'R': + arg = GetArgument(argc, argv, i); + if (arg == nullptr) + PrintUsage(); + g_reverb = std::stoi(arg); + break; + case 'V': + arg = GetArgument(argc, argv, i); + if (arg == nullptr) + PrintUsage(); + g_masterVolume = std::stoi(arg); + break; + case 'X': + g_clocksPerBeat = 2; + break; + default: + PrintUsage(); + } + } + else + { + if (inputFilename.empty()) + inputFilename = argv[i]; + else if (outputFilename.empty()) + outputFilename = argv[i]; + else + PrintUsage(); + } + } + + if (inputFilename.empty()) + PrintUsage(); + + if (GetExtension(inputFilename) != "mid") + RaiseError("input filename extension is not \"mid\""); + + if (outputFilename.empty()) + outputFilename = StripExtension(inputFilename) + ".s"; + + if (GetExtension(outputFilename) != "s") + RaiseError("output filename extension is not \"s\""); + + if (g_asmLabel.empty()) + g_asmLabel = BaseName(outputFilename); + + g_inputFile = std::fopen(inputFilename.c_str(), "rb"); + + if (g_inputFile == nullptr) + RaiseError("failed to open \"%s\" for reading", inputFilename.c_str()); + + g_outputFile = std::fopen(outputFilename.c_str(), "w"); + + if (g_outputFile == nullptr) + RaiseError("failed to open \"%s\" for writing", outputFilename.c_str()); + + ReadMidiFileHeader(); + PrintAgbHeader(); + ReadMidiTracks(); + PrintAgbFooter(); + + std::fclose(g_inputFile); + std::fclose(g_outputFile); + + return 0; +} diff --git a/tools/mid2agb/main.h b/tools/mid2agb/main.h new file mode 100644 index 000000000..6e71e73fd --- /dev/null +++ b/tools/mid2agb/main.h @@ -0,0 +1,39 @@ +// Copyright(c) 2016 YamaArashi +// +// Permission is hereby granted, free of charge, to any person obtaining a copy +// of this software and associated documentation files (the "Software"), to deal +// in the Software without restriction, including without limitation the rights +// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +// copies of the Software, and to permit persons to whom the Software is +// furnished to do so, subject to the following conditions: +// +// The above copyright notice and this permission notice shall be included in +// all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +// THE SOFTWARE. + +#ifndef MAIN_H +#define MAIN_H + +#include <cstdio> +#include <string> + +extern FILE* g_inputFile; +extern FILE* g_outputFile; + +extern std::string g_asmLabel; +extern int g_masterVolume; +extern int g_voiceGroup; +extern int g_priority; +extern int g_reverb; +extern int g_clocksPerBeat; +extern bool g_exactGateTime; +extern bool g_compressionEnabled; + +#endif // MAIN_H diff --git a/tools/mid2agb/midi.cpp b/tools/mid2agb/midi.cpp new file mode 100644 index 000000000..fa7d9ce28 --- /dev/null +++ b/tools/mid2agb/midi.cpp @@ -0,0 +1,964 @@ +// Copyright(c) 2016 YamaArashi +// +// Permission is hereby granted, free of charge, to any person obtaining a copy +// of this software and associated documentation files (the "Software"), to deal +// in the Software without restriction, including without limitation the rights +// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +// copies of the Software, and to permit persons to whom the Software is +// furnished to do so, subject to the following conditions: +// +// The above copyright notice and this permission notice shall be included in +// all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +// THE SOFTWARE. + +#include <cstdio> +#include <cassert> +#include <string> +#include <vector> +#include <algorithm> +#include <memory> +#include "midi.h" +#include "main.h" +#include "error.h" +#include "agb.h" +#include "tables.h" + +enum class MidiEventCategory +{ + Control, + SysEx, + Meta, + Invalid, +}; + +MidiFormat g_midiFormat; +std::int_fast32_t g_midiTrackCount; +std::int16_t g_midiTimeDiv; + +int g_midiChan; +std::int32_t g_initialWait; + +static long s_trackDataStart; +static std::vector<Event> s_seqEvents; +static std::vector<Event> s_trackEvents; +static std::int32_t s_absoluteTime; +static int s_blockCount = 0; +static int s_minNote; +static int s_maxNote; +static int s_runningStatus; + +void Seek(long offset) +{ + if (std::fseek(g_inputFile, offset, SEEK_SET) != 0) + RaiseError("failed to seek to %l", offset); +} + +void Skip(long offset) +{ + if (std::fseek(g_inputFile, offset, SEEK_CUR) != 0) + RaiseError("failed to skip %l bytes", offset); +} + +std::string ReadSignature() +{ + char signature[4]; + + if (std::fread(signature, 4, 1, g_inputFile) != 1) + RaiseError("failed to read signature"); + + return std::string(signature, 4); +} + +std::uint32_t ReadInt8() +{ + int c = std::fgetc(g_inputFile); + + if (c < 0) + RaiseError("unexpected EOF"); + + return c; +} + +std::uint32_t ReadInt16() +{ + std::uint32_t val = 0; + val |= ReadInt8() << 8; + val |= ReadInt8(); + return val; +} + +std::uint32_t ReadInt24() +{ + std::uint32_t val = 0; + val |= ReadInt8() << 16; + val |= ReadInt8() << 8; + val |= ReadInt8(); + return val; +} + +std::uint32_t ReadInt32() +{ + std::uint32_t val = 0; + val |= ReadInt8() << 24; + val |= ReadInt8() << 16; + val |= ReadInt8() << 8; + val |= ReadInt8(); + return val; +} + +std::uint32_t ReadVLQ() +{ + std::uint32_t val = 0; + std::uint32_t c; + + do + { + c = ReadInt8(); + val <<= 7; + val |= (c & 0x7F); + } while (c & 0x80); + + return val; +} + +void ReadMidiFileHeader() +{ + Seek(0); + + if (ReadSignature() != "MThd") + RaiseError("MIDI file header signature didn't match \"MThd\""); + + std::uint32_t headerLength = ReadInt32(); + + if (headerLength != 6) + RaiseError("MIDI file header length isn't 6"); + + std::uint16_t midiFormat = ReadInt16(); + + if (midiFormat >= 2) + RaiseError("unsupported MIDI format (%u)", midiFormat); + + g_midiFormat = (MidiFormat)midiFormat; + g_midiTrackCount = ReadInt16(); + g_midiTimeDiv = ReadInt16(); + + if (g_midiTimeDiv < 0) + RaiseError("unsupported MIDI time division (%d)", g_midiTimeDiv); +} + +long ReadMidiTrackHeader(long offset) +{ + Seek(offset); + + if (ReadSignature() != "MTrk") + RaiseError("MIDI track header signature didn't match \"MTrk\""); + + long size = ReadInt32(); + + s_trackDataStart = std::ftell(g_inputFile); + + return size + 8; +} + +void StartTrack() +{ + Seek(s_trackDataStart); + s_absoluteTime = 0; + s_runningStatus = 0; +} + +void SkipEventData() +{ + Skip(ReadVLQ()); +} + +void DetermineEventCategory(MidiEventCategory& category, int& typeChan, int& size) +{ + typeChan = ReadInt8(); + + if (typeChan < 0x80) + { + // If data byte was found, use the running status. + ungetc(typeChan, g_inputFile); + typeChan = s_runningStatus; + } + + if (typeChan == 0xFF) + { + category = MidiEventCategory::Meta; + size = 0; + s_runningStatus = 0; + } + else if (typeChan >= 0xF0) + { + category = MidiEventCategory::SysEx; + size = 0; + s_runningStatus = 0; + } + else if (typeChan >= 0x80) + { + category = MidiEventCategory::Control; + + switch (typeChan >> 4) + { + case 0xC: + case 0xD: + size = 1; + break; + default: + size = 2; + break; + } + s_runningStatus = typeChan; + } + else + { + category = MidiEventCategory::Invalid; + } +} + +void MakeBlockEvent(Event& event, EventType type) +{ + event.type = type; + event.param1 = s_blockCount++; + event.param2 = 0; +} + +std::string ReadEventText() +{ + char buffer[2]; + std::uint32_t length = ReadVLQ(); + + if (length <= 2) + { + if (fread(buffer, length, 1, g_inputFile) != 1) + RaiseError("failed to read event text"); + } + else + { + Skip(length); + length = 0; + } + + return std::string(buffer, length); +} + +bool ReadSeqEvent(Event& event) +{ + s_absoluteTime += ReadVLQ(); + event.time = s_absoluteTime; + + MidiEventCategory category; + int typeChan; + int size; + + DetermineEventCategory(category, typeChan, size); + + if (category == MidiEventCategory::Control) + { + Skip(size); + return false; + } + + if (category == MidiEventCategory::SysEx) + { + SkipEventData(); + return false; + } + + if (category == MidiEventCategory::Invalid) + RaiseError("invalid event"); + + // meta event + int metaEventType = ReadInt8(); + + if (metaEventType >= 1 && metaEventType <= 7) + { + // text event + std::string text = ReadEventText(); + + if (text == "[") + MakeBlockEvent(event, EventType::LoopBegin); + else if (text == "][") + MakeBlockEvent(event, EventType::LoopEndBegin); + else if (text == "]") + MakeBlockEvent(event, EventType::LoopEnd); + else if (text == ":") + MakeBlockEvent(event, EventType::Label); + else + return false; + } + else + { + switch (metaEventType) + { + case 0x2F: // end of track + SkipEventData(); + event.type = EventType::EndOfTrack; + event.param1 = 0; + event.param2 = 0; + break; + case 0x51: // tempo + if (ReadVLQ() != 3) + RaiseError("invalid tempo size"); + + event.type = EventType::Tempo; + event.param1 = 0; + event.param2 = ReadInt24(); + break; + case 0x58: // time signature + { + if (ReadVLQ() != 4) + RaiseError("invalid time signature size"); + + int numerator = ReadInt8(); + int denominatorExponent = ReadInt8(); + + if (denominatorExponent >= 16) + RaiseError("invalid time signature denominator"); + + Skip(2); // ignore other values + + int clockTicks = 96 * numerator * g_clocksPerBeat; + int denominator = 1 << denominatorExponent; + int timeSig = clockTicks / denominator; + + if (timeSig <= 0 || timeSig >= 0x10000) + RaiseError("invalid time signature"); + + event.type = EventType::TimeSignature; + event.param1 = 0; + event.param2 = timeSig; + break; + } + default: + SkipEventData(); + return false; + } + } + + return true; +} + +void ReadSeqEvents() +{ + StartTrack(); + + for (;;) + { + Event event = {}; + + if (ReadSeqEvent(event)) + { + s_seqEvents.push_back(event); + + if (event.type == EventType::EndOfTrack) + return; + } + } +} + +bool CheckNoteEnd(Event& event) +{ + event.param2 += ReadVLQ(); + + MidiEventCategory category; + int typeChan; + int size; + + DetermineEventCategory(category, typeChan, size); + + if (category == MidiEventCategory::Control) + { + int chan = typeChan & 0xF; + + if (chan != g_midiChan) + { + Skip(size); + return false; + } + + switch (typeChan & 0xF0) + { + case 0x80: // note off + { + int note = ReadInt8(); + ReadInt8(); // ignore velocity + if (note == event.note) + return true; + break; + } + case 0x90: // note on + { + int note = ReadInt8(); + int velocity = ReadInt8(); + if (velocity == 0 && note == event.note) + return true; + break; + } + default: + Skip(size); + break; + } + + return false; + } + + if (category == MidiEventCategory::SysEx) + { + SkipEventData(); + return false; + } + + if (category == MidiEventCategory::Meta) + { + int metaEventType = ReadInt8(); + SkipEventData(); + + if (metaEventType == 0x2F) + RaiseError("note doesn't end"); + + return false; + } + + RaiseError("invalid event"); +} + +void FindNoteEnd(Event& event) +{ + // Save the current file position and running status + // which get modified by CheckNoteEnd. + long startPos = ftell(g_inputFile); + int savedRunningStatus = s_runningStatus; + + event.param2 = 0; + + while (!CheckNoteEnd(event)) + ; + + Seek(startPos); + s_runningStatus = savedRunningStatus; +} + +bool ReadTrackEvent(Event& event) +{ + s_absoluteTime += ReadVLQ(); + event.time = s_absoluteTime; + + MidiEventCategory category; + int typeChan; + int size; + + DetermineEventCategory(category, typeChan, size); + + if (category == MidiEventCategory::Control) + { + int chan = typeChan & 0xF; + + if (chan != g_midiChan) + { + Skip(size); + return false; + } + + switch (typeChan & 0xF0) + { + case 0x90: // note on + { + int note = ReadInt8(); + int velocity = ReadInt8(); + + if (velocity != 0) + { + event.type = EventType::Note; + event.note = note; + event.param1 = velocity; + FindNoteEnd(event); + if (event.param2 > 0) + { + if (note < s_minNote) + s_minNote = note; + if (note > s_maxNote) + s_maxNote = note; + } + } + break; + } + case 0xB0: // controller event + event.type = EventType::Controller; + event.param1 = ReadInt8(); // controller index + event.param2 = ReadInt8(); // value + break; + case 0xC0: // instrument change + event.type = EventType::InstrumentChange; + event.param1 = ReadInt8(); // instrument + event.param2 = 0; + break; + case 0xE0: // pitch bend + event.type = EventType::PitchBend; + event.param1 = ReadInt8(); + event.param2 = ReadInt8(); + break; + default: + Skip(size); + return false; + } + + return true; + } + + if (category == MidiEventCategory::SysEx) + { + SkipEventData(); + return false; + } + + if (category == MidiEventCategory::Meta) + { + int metaEventType = ReadInt8(); + SkipEventData(); + + if (metaEventType == 0x2F) + { + event.type = EventType::EndOfTrack; + event.param1 = 0; + event.param2 = 0; + return true; + } + + return false; + } + + RaiseError("invalid event"); +} + +void ReadTrackEvents() +{ + StartTrack(); + + s_trackEvents.clear(); + + s_minNote = 0xFF; + s_maxNote = 0; + + for (;;) + { + Event event = {}; + + if (ReadTrackEvent(event)) + { + s_trackEvents.push_back(event); + + if (event.type == EventType::EndOfTrack) + return; + } + } +} + +bool EventCompare(const Event& event1, const Event& event2) +{ + if (event1.time < event2.time) + return true; + + if (event1.time > event2.time) + return false; + + unsigned event1Type = (unsigned)event1.type; + unsigned event2Type = (unsigned)event2.type; + + if (event1.type == EventType::Note) + event1Type += event1.note; + + if (event2.type == EventType::Note) + event2Type += event2.note; + + if (event1Type < event2Type) + return true; + + if (event1Type > event2Type) + return false; + + if (event1.type == EventType::EndOfTie) + { + if (event1.note < event2.note) + return true; + + if (event1.note > event2.note) + return false; + } + + return false; +} + +std::unique_ptr<std::vector<Event>> MergeEvents() +{ + std::unique_ptr<std::vector<Event>> events(new std::vector<Event>()); + + unsigned trackEventPos = 0; + unsigned seqEventPos = 0; + + while (s_trackEvents[trackEventPos].type != EventType::EndOfTrack + && s_seqEvents[seqEventPos].type != EventType::EndOfTrack) + { + if (EventCompare(s_trackEvents[trackEventPos], s_seqEvents[seqEventPos])) + events->push_back(s_trackEvents[trackEventPos++]); + else + events->push_back(s_seqEvents[seqEventPos++]); + } + + while (s_trackEvents[trackEventPos].type != EventType::EndOfTrack) + events->push_back(s_trackEvents[trackEventPos++]); + + while (s_seqEvents[seqEventPos].type != EventType::EndOfTrack) + events->push_back(s_seqEvents[seqEventPos++]); + + // Push the EndOfTrack event with the larger time. + if (EventCompare(s_trackEvents[trackEventPos], s_seqEvents[seqEventPos])) + events->push_back(s_seqEvents[seqEventPos]); + else + events->push_back(s_trackEvents[trackEventPos]); + + return events; +} + +void ConvertTimes(std::vector<Event>& events) +{ + for (Event& event : events) + { + event.time = (24 * g_clocksPerBeat * event.time) / g_midiTimeDiv; + + if (event.type == EventType::Note) + { + event.param1 = g_noteVelocityLUT[event.param1]; + + std::uint32_t duration = (24 * g_clocksPerBeat * event.param2) / g_midiTimeDiv; + + if (duration == 0) + duration = 1; + + if (!g_exactGateTime && duration < 96) + duration = g_noteDurationLUT[duration]; + + event.param2 = duration; + } + } +} + +std::unique_ptr<std::vector<Event>> InsertTimingEvents(std::vector<Event>& inEvents) +{ + std::unique_ptr<std::vector<Event>> outEvents(new std::vector<Event>()); + + Event timingEvent = {}; + timingEvent.time = 0; + timingEvent.type = EventType::TimeSignature; + timingEvent.param2 = 96 * g_clocksPerBeat; + + for (const Event& event : inEvents) + { + while (EventCompare(timingEvent, event)) + { + outEvents->push_back(timingEvent); + timingEvent.time += timingEvent.param2; + } + + if (event.type == EventType::TimeSignature) + { + if (g_agbTrack == 1 && event.param2 != timingEvent.param2) + { + Event originalTimingEvent = event; + originalTimingEvent.type = EventType::OriginalTimeSignature; + outEvents->push_back(originalTimingEvent); + } + timingEvent.param2 = event.param2; + timingEvent.time = event.time + timingEvent.param2; + } + + outEvents->push_back(event); + } + + return outEvents; +} + +std::unique_ptr<std::vector<Event>> SplitTime(std::vector<Event>& inEvents) +{ + std::unique_ptr<std::vector<Event>> outEvents(new std::vector<Event>()); + + std::int32_t time = 0; + + for (const Event& event : inEvents) + { + std::int32_t diff = event.time - time; + + if (diff > 96) + { + int wholeNoteCount = (diff - 1) / 96; + diff -= 96 * wholeNoteCount; + + for (int i = 0; i < wholeNoteCount; i++) + { + time += 96; + Event timeSplitEvent = {}; + timeSplitEvent.time = time; + timeSplitEvent.type = EventType::TimeSplit; + outEvents->push_back(timeSplitEvent); + } + } + + std::int32_t lutValue = g_noteDurationLUT[diff]; + + if (lutValue != diff) + { + Event timeSplitEvent = {}; + timeSplitEvent.time = time + lutValue; + timeSplitEvent.type = EventType::TimeSplit; + outEvents->push_back(timeSplitEvent); + } + + time = event.time; + + outEvents->push_back(event); + } + + return outEvents; +} + +std::unique_ptr<std::vector<Event>> CreateTies(std::vector<Event>& inEvents) +{ + std::unique_ptr<std::vector<Event>> outEvents(new std::vector<Event>()); + + for (const Event& event : inEvents) + { + if (event.type == EventType::Note && event.param2 > 96) + { + Event tieEvent = event; + tieEvent.param2 = -1; + outEvents->push_back(tieEvent); + + Event eotEvent = {}; + eotEvent.time = event.time + event.param2; + eotEvent.type = EventType::EndOfTie; + eotEvent.note = event.note; + outEvents->push_back(eotEvent); + } + else + { + outEvents->push_back(event); + } + } + + return outEvents; +} + +void CalculateWaits(std::vector<Event>& events) +{ + g_initialWait = events[0].time; + int wholeNoteCount = 0; + + for (unsigned i = 0; i < events.size() && events[i].type != EventType::EndOfTrack; i++) + { + events[i].time = events[i + 1].time - events[i].time; + + if (events[i].type == EventType::TimeSignature) + { + events[i].type = EventType::WholeNoteMark; + events[i].param2 = wholeNoteCount++; + } + } +} + +int CalculateCompressionScore(std::vector<Event>& events, int index) +{ + int score = 0; + std::uint8_t lastParam1 = events[index].param1; + std::uint8_t lastVelocity = 0x80u; + EventType lastType = events[index].type; + std::int32_t lastDuration = 0x80000000; + std::uint8_t lastNote = 0x40u; + + if (events[index].time > 0) + score++; + + for (int i = index + 1; !IsPatternBoundary(events[i].type); i++) + { + if (events[i].type == EventType::Note) + { + int val = 0; + + if (events[i].note != lastNote) + { + val++; + lastNote = events[i].note; + } + + if (events[i].param1 != lastVelocity) + { + val++; + lastVelocity = events[i].param1; + } + + std::int32_t duration = events[i].param2; + + if (g_noteDurationLUT[duration] != lastDuration) + { + val++; + lastDuration = g_noteDurationLUT[duration]; + } + + if (duration != lastDuration) + val++; + + if (val == 0) + val = 1; + + score += val; + } + else + { + lastDuration = 0x80000000; + + if (events[i].type == lastType) + { + if ((lastType != EventType::Controller && (int)lastType != 0x25 && lastType != EventType::EndOfTie) || events[i].param1 == lastParam1) + { + score++; + } + else + { + score += 2; + } + } + else + { + score += 2; + } + } + + lastParam1 = events[i].param1; + lastType = events[i].type; + + if (events[i].time) + score++; + } + + return score; +} + +bool IsCompressionMatch(std::vector<Event>& events, int index1, int index2) +{ + if (events[index1].type != events[index2].type || + events[index1].note != events[index2].note || + events[index1].param1 != events[index2].param1 || + events[index1].time != events[index2].time) + return false; + + index1++; + index2++; + + do + { + if (events[index1] != events[index2]) + return false; + + index1++; + index2++; + } while (!IsPatternBoundary(events[index1].type)); + + return IsPatternBoundary(events[index2].type); +} + +void CompressWholeNote(std::vector<Event>& events, int index) +{ + for (int j = index + 1; events[j].type != EventType::EndOfTrack; j++) + { + while (events[j].type != EventType::WholeNoteMark) + { + j++; + + if (events[j].type == EventType::EndOfTrack) + return; + } + + if (IsCompressionMatch(events, index, j)) + { + events[j].type = EventType::Pattern; + events[j].param2 = events[index].param2 & 0x7FFFFFFF; + events[index].param2 |= 0x80000000; + } + } +} + +void Compress(std::vector<Event>& events) +{ + for (int i = 0; events[i].type != EventType::EndOfTrack; i++) + { + while (events[i].type != EventType::WholeNoteMark) + { + i++; + + if (events[i].type == EventType::EndOfTrack) + return; + } + + if (CalculateCompressionScore(events, i) >= 6) + { + CompressWholeNote(events, i); + } + } +} + +void ReadMidiTracks() +{ + long trackHeaderStart = 14; + + ReadMidiTrackHeader(trackHeaderStart); + ReadSeqEvents(); + + g_agbTrack = 1; + + for (int midiTrack = 0; midiTrack < g_midiTrackCount; midiTrack++) + { + trackHeaderStart += ReadMidiTrackHeader(trackHeaderStart); + + for (g_midiChan = 0; g_midiChan < 16; g_midiChan++) + { + ReadTrackEvents(); + + if (s_minNote != 0xFF) + { +#ifdef DEBUG + printf("Track%d = Midi-Ch.%d\n", g_agbTrack, g_midiChan + 1); +#endif + + std::unique_ptr<std::vector<Event>> events(MergeEvents()); + + // We don't need TEMPO in anything but track 1. + if (g_agbTrack == 1) + { + auto it = std::remove_if(s_seqEvents.begin(), s_seqEvents.end(), [](const Event& event) { return event.type == EventType::Tempo; }); + s_seqEvents.erase(it, s_seqEvents.end()); + } + + ConvertTimes(*events); + events = InsertTimingEvents(*events); + events = CreateTies(*events); + std::stable_sort(events->begin(), events->end(), EventCompare); + events = SplitTime(*events); + CalculateWaits(*events); + + if (g_compressionEnabled) + Compress(*events); + + PrintAgbTrack(*events); + + g_agbTrack++; + } + } + } +} diff --git a/tools/mid2agb/midi.h b/tools/mid2agb/midi.h new file mode 100644 index 000000000..434c8e8e8 --- /dev/null +++ b/tools/mid2agb/midi.h @@ -0,0 +1,87 @@ +// Copyright(c) 2016 YamaArashi +// +// Permission is hereby granted, free of charge, to any person obtaining a copy +// of this software and associated documentation files (the "Software"), to deal +// in the Software without restriction, including without limitation the rights +// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +// copies of the Software, and to permit persons to whom the Software is +// furnished to do so, subject to the following conditions: +// +// The above copyright notice and this permission notice shall be included in +// all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +// THE SOFTWARE. + +#ifndef MIDI_H +#define MIDI_H + +#include <cstdint> + +enum class MidiFormat +{ + SingleTrack, + MultiTrack +}; + +enum class EventType +{ + EndOfTie = 0x01, + Label = 0x11, + LoopEnd = 0x12, + LoopEndBegin = 0x13, + LoopBegin = 0x14, + OriginalTimeSignature = 0x15, + WholeNoteMark = 0x16, + Pattern = 0x17, + TimeSignature = 0x18, + Tempo = 0x19, + InstrumentChange = 0x21, + Controller = 0x22, + PitchBend = 0x23, + KeyShift = 0x31, + Note = 0x40, + TimeSplit = 0xFE, + EndOfTrack = 0xFF, +}; + +struct Event +{ + std::int32_t time; + EventType type; + std::uint8_t note; + std::uint8_t param1; + std::int32_t param2; + + bool operator==(const Event& other) + { + return (time == other.time + && type == other.type + && note == other.note + && param1 == other.param1 + && param2 == other.param2); + } + + bool operator!=(const Event& other) + { + return !(*this == other); + } +}; + +void ReadMidiFileHeader(); +void ReadMidiTracks(); + +extern int g_midiChan; +extern std::int32_t g_initialWait; + +inline bool IsPatternBoundary(EventType type) +{ + return type == EventType::EndOfTrack || (int)type <= 0x17; +} + +#endif // MIDI_H diff --git a/tools/mid2agb/tables.cpp b/tools/mid2agb/tables.cpp new file mode 100644 index 000000000..f254664a4 --- /dev/null +++ b/tools/mid2agb/tables.cpp @@ -0,0 +1,286 @@ +// Copyright(c) 2016 YamaArashi +// +// Permission is hereby granted, free of charge, to any person obtaining a copy +// of this software and associated documentation files (the "Software"), to deal +// in the Software without restriction, including without limitation the rights +// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +// copies of the Software, and to permit persons to whom the Software is +// furnished to do so, subject to the following conditions: +// +// The above copyright notice and this permission notice shall be included in +// all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +// THE SOFTWARE. + +#include "tables.h" + +const int g_noteDurationLUT[] = +{ + 0, // 0 + 1, // 1 + 2, // 2 + 3, // 3 + 4, // 4 + 5, // 5 + 6, // 6 + 7, // 7 + 8, // 8 + 9, // 9 + 10, // 10 + 11, // 11 + 12, // 12 + 13, // 13 + 14, // 14 + 15, // 15 + 16, // 16 + 17, // 17 + 18, // 18 + 19, // 19 + 20, // 20 + 21, // 21 + 22, // 22 + 23, // 23 + 24, // 24 + 24, // 25 + 24, // 26 + 24, // 27 + 28, // 28 + 28, // 29 + 30, // 30 + 30, // 31 + 32, // 32 + 32, // 33 + 32, // 34 + 32, // 35 + 36, // 36 + 36, // 37 + 36, // 38 + 36, // 39 + 40, // 40 + 40, // 41 + 42, // 42 + 42, // 43 + 44, // 44 + 44, // 45 + 44, // 46 + 44, // 47 + 48, // 48 + 48, // 49 + 48, // 50 + 48, // 51 + 52, // 52 + 52, // 53 + 54, // 54 + 54, // 55 + 56, // 56 + 56, // 57 + 56, // 58 + 56, // 59 + 60, // 60 + 60, // 61 + 60, // 62 + 60, // 63 + 64, // 64 + 64, // 65 + 66, // 66 + 66, // 67 + 68, // 68 + 68, // 69 + 68, // 70 + 68, // 71 + 72, // 72 + 72, // 73 + 72, // 74 + 72, // 75 + 76, // 76 + 76, // 77 + 78, // 78 + 78, // 79 + 80, // 80 + 80, // 81 + 80, // 82 + 80, // 83 + 84, // 84 + 84, // 85 + 84, // 86 + 84, // 87 + 88, // 88 + 88, // 89 + 90, // 90 + 90, // 91 + 92, // 92 + 92, // 93 + 92, // 94 + 92, // 95 + 96, // 96 +}; + +const int g_noteVelocityLUT[] = +{ + 0, // 0 + 4, // 1 + 4, // 2 + 4, // 3 + 4, // 4 + 8, // 5 + 8, // 6 + 8, // 7 + 8, // 8 + 12, // 9 + 12, // 10 + 12, // 11 + 12, // 12 + 16, // 13 + 16, // 14 + 16, // 15 + 16, // 16 + 20, // 17 + 20, // 18 + 20, // 19 + 20, // 20 + 24, // 21 + 24, // 22 + 24, // 23 + 24, // 24 + 28, // 25 + 28, // 26 + 28, // 27 + 28, // 28 + 32, // 29 + 32, // 30 + 32, // 31 + 32, // 32 + 36, // 33 + 36, // 34 + 36, // 35 + 36, // 36 + 40, // 37 + 40, // 38 + 40, // 39 + 40, // 40 + 44, // 41 + 44, // 42 + 44, // 43 + 44, // 44 + 48, // 45 + 48, // 46 + 48, // 47 + 48, // 48 + 52, // 49 + 52, // 50 + 52, // 51 + 52, // 52 + 56, // 53 + 56, // 54 + 56, // 55 + 56, // 56 + 60, // 57 + 60, // 58 + 60, // 59 + 60, // 60 + 64, // 61 + 64, // 62 + 64, // 63 + 64, // 64 + 68, // 65 + 68, // 66 + 68, // 67 + 68, // 68 + 72, // 69 + 72, // 70 + 72, // 71 + 72, // 72 + 76, // 73 + 76, // 74 + 76, // 75 + 76, // 76 + 80, // 77 + 80, // 78 + 80, // 79 + 80, // 80 + 84, // 81 + 84, // 82 + 84, // 83 + 84, // 84 + 88, // 85 + 88, // 86 + 88, // 87 + 88, // 88 + 92, // 89 + 92, // 90 + 92, // 91 + 92, // 92 + 96, // 93 + 96, // 94 + 96, // 95 + 96, // 96 + 100, // 97 + 100, // 98 + 100, // 99 + 100, // 100 + 104, // 101 + 104, // 102 + 104, // 103 + 104, // 104 + 108, // 105 + 108, // 106 + 108, // 107 + 108, // 108 + 112, // 109 + 112, // 110 + 112, // 111 + 112, // 112 + 116, // 113 + 116, // 114 + 116, // 115 + 116, // 116 + 120, // 117 + 120, // 118 + 120, // 119 + 120, // 120 + 124, // 121 + 124, // 122 + 124, // 123 + 124, // 124 + 127, // 125 + 127, // 126 + 127, // 127 +}; + +const char* g_noteTable[] = +{ + "Cn%01u ", + "Cs%01u ", + "Dn%01u ", + "Ds%01u ", + "En%01u ", + "Fn%01u ", + "Fs%01u ", + "Gn%01u ", + "Gs%01u ", + "An%01u ", + "As%01u ", + "Bn%01u ", +}; + +const char* g_minusNoteTable[] = +{ + "CnM%01u", + "CsM%01u", + "DnM%01u", + "DsM%01u", + "EnM%01u", + "FnM%01u", + "FsM%01u", + "GnM%01u", + "GsM%01u", + "AnM%01u", + "AsM%01u", + "BnM%01u", +}; diff --git a/tools/mid2agb/tables.h b/tools/mid2agb/tables.h new file mode 100644 index 000000000..da3c9072d --- /dev/null +++ b/tools/mid2agb/tables.h @@ -0,0 +1,29 @@ +// Copyright(c) 2016 YamaArashi +// +// Permission is hereby granted, free of charge, to any person obtaining a copy +// of this software and associated documentation files (the "Software"), to deal +// in the Software without restriction, including without limitation the rights +// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +// copies of the Software, and to permit persons to whom the Software is +// furnished to do so, subject to the following conditions: +// +// The above copyright notice and this permission notice shall be included in +// all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +// THE SOFTWARE. + +#ifndef TABLES_H +#define TABLES_H + +extern const int g_noteDurationLUT[]; +extern const int g_noteVelocityLUT[]; +extern const char* g_noteTable[]; +extern const char* g_minusNoteTable[]; + +#endif // TABLES_H diff --git a/tools/preproc/.gitignore b/tools/preproc/.gitignore new file mode 100644 index 000000000..eb3470879 --- /dev/null +++ b/tools/preproc/.gitignore @@ -0,0 +1 @@ +preproc diff --git a/tools/preproc/LICENSE b/tools/preproc/LICENSE new file mode 100644 index 000000000..534d15349 --- /dev/null +++ b/tools/preproc/LICENSE @@ -0,0 +1,19 @@ +Copyright (c) 2016 YamaArashi + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. diff --git a/tools/preproc/Makefile b/tools/preproc/Makefile new file mode 100644 index 000000000..3d3275819 --- /dev/null +++ b/tools/preproc/Makefile @@ -0,0 +1,17 @@ +CXX := g++ + +CXXFLAGS := -std=c++11 -O2 -Wall -Wno-switch -Werror + +SRCS := asm_file.cpp c_file.cpp charmap.cpp preproc.cpp string_parser.cpp \ + utf8.cpp + +HEADERS := asm_file.h c_file.h char_util.h charmap.h preproc.h string_parser.h \ + utf8.h + +.PHONY: clean + +preproc: $(SRCS) $(HEADERS) + $(CXX) $(CXXFLAGS) $(SRCS) -o $@ $(LDFLAGS) + +clean: + $(RM) preproc preproc.exe diff --git a/tools/preproc/asm_file.cpp b/tools/preproc/asm_file.cpp new file mode 100644 index 000000000..383010aa3 --- /dev/null +++ b/tools/preproc/asm_file.cpp @@ -0,0 +1,529 @@ +// Copyright(c) 2016 YamaArashi +// +// Permission is hereby granted, free of charge, to any person obtaining a copy +// of this software and associated documentation files (the "Software"), to deal +// in the Software without restriction, including without limitation the rights +// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +// copies of the Software, and to permit persons to whom the Software is +// furnished to do so, subject to the following conditions: +// +// The above copyright notice and this permission notice shall be included in +// all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +// THE SOFTWARE. + +#include <cstdio> +#include <cstdarg> +#include "preproc.h" +#include "asm_file.h" +#include "char_util.h" +#include "utf8.h" +#include "string_parser.h" + +AsmFile::AsmFile(std::string filename) : m_filename(filename) +{ + FILE *fp = std::fopen(filename.c_str(), "rb"); + + if (fp == NULL) + FATAL_ERROR("Failed to open \"%s\" for reading.\n", filename.c_str()); + + std::fseek(fp, 0, SEEK_END); + + m_size = std::ftell(fp); + + if (m_size < 0) + FATAL_ERROR("File size of \"%s\" is less than zero.\n", filename.c_str()); + + m_buffer = new char[m_size + 1]; + + std::rewind(fp); + + if (std::fread(m_buffer, m_size, 1, fp) != 1) + FATAL_ERROR("Failed to read \"%s\".\n", filename.c_str()); + + m_buffer[m_size] = 0; + + std::fclose(fp); + + m_pos = 0; + m_lineNum = 1; + m_lineStart = 0; + + RemoveComments(); +} + +AsmFile::AsmFile(AsmFile&& other) : m_filename(std::move(other.m_filename)) +{ + m_buffer = other.m_buffer; + m_pos = other.m_pos; + m_size = other.m_size; + m_lineNum = other.m_lineNum; + m_lineStart = other.m_lineStart; + + other.m_buffer = nullptr; +} + +AsmFile::~AsmFile() +{ + delete[] m_buffer; +} + +// Removes comments to simplify further processing. +// It stops upon encountering a null character, +// which may or may not be the end of file marker. +// If it's not, the error will be caught later. +void AsmFile::RemoveComments() +{ + long pos = 0; + char stringChar = 0; + + for (;;) + { + if (m_buffer[pos] == 0) + return; + + if (stringChar != 0) + { + if (m_buffer[pos] == '\\' && m_buffer[pos + 1] == stringChar) + { + pos += 2; + } + else + { + if (m_buffer[pos] == stringChar) + stringChar = 0; + pos++; + } + } + else if (m_buffer[pos] == '@' && (pos == 0 || m_buffer[pos - 1] != '\\')) + { + while (m_buffer[pos] != '\n' && m_buffer[pos] != 0) + m_buffer[pos++] = ' '; + } + else if (m_buffer[pos] == '/' && m_buffer[pos + 1] == '*') + { + m_buffer[pos++] = ' '; + m_buffer[pos++] = ' '; + + for (;;) + { + if (m_buffer[pos] == 0) + return; + + if (m_buffer[pos] == '*' && m_buffer[pos + 1] == '/') + { + m_buffer[pos++] = ' '; + m_buffer[pos++] = ' '; + break; + } + else + { + if (m_buffer[pos] != '\n') + m_buffer[pos] = ' '; + pos++; + } + } + } + else + { + if (m_buffer[pos] == '"' || m_buffer[pos] == '\'') + stringChar = m_buffer[pos]; + pos++; + } + } +} + +// Checks if we're at a particular directive and if so, consumes it. +// Returns whether the directive was found. +bool AsmFile::CheckForDirective(std::string name) +{ + long i; + long length = static_cast<long>(name.length()); + + for (i = 0; i < length && m_pos + i < m_size; i++) + if (name[i] != m_buffer[m_pos + i]) + return false; + + if (i < length) + return false; + + m_pos += length; + + return true; +} + +// Checks if we're at a known directive and if so, consumes it. +// Returns which directive was found. +Directive AsmFile::GetDirective() +{ + SkipWhitespace(); + + if (CheckForDirective(".include")) + return Directive::Include; + else if (CheckForDirective(".string")) + return Directive::String; + else if (CheckForDirective(".braille")) + return Directive::Braille; + else + return Directive::Unknown; +} + +// Checks if we're at label that ends with '::'. +// Returns the name if so and an empty string if not. +std::string AsmFile::GetGlobalLabel() +{ + long start = m_pos; + long pos = m_pos; + + if (IsIdentifierStartingChar(m_buffer[pos])) + { + pos++; + + while (IsIdentifierChar(m_buffer[pos])) + pos++; + } + + if (m_buffer[pos] == ':' && m_buffer[pos + 1] == ':') + { + m_pos = pos + 2; + ExpectEmptyRestOfLine(); + return std::string(&m_buffer[start], pos - start); + } + + return std::string(); +} + +// Skips tabs and spaces. +void AsmFile::SkipWhitespace() +{ + while (m_buffer[m_pos] == '\t' || m_buffer[m_pos] == ' ') + m_pos++; +} + +// Reads include path. +std::string AsmFile::ReadPath() +{ + SkipWhitespace(); + + if (m_buffer[m_pos] != '"') + RaiseError("expected file path"); + + m_pos++; + + int length = 0; + long startPos = m_pos; + + while (m_buffer[m_pos] != '"') + { + unsigned char c = m_buffer[m_pos++]; + + if (c == 0) + { + if (m_pos >= m_size) + RaiseError("unexpected EOF in include string"); + else + RaiseError("unexpected null character in include string"); + } + + if (!IsAsciiPrintable(c)) + RaiseError("unexpected character '\\x%02X' in include string", c); + + // Don't bother allowing any escape sequences. + if (c == '\\') + { + c = m_buffer[m_pos]; + RaiseError("unexpected escape '\\%c' in include string", c); + } + + length++; + + if (length > kMaxPath) + RaiseError("path is too long"); + } + + m_pos++; // Go past the right quote. + + ExpectEmptyRestOfLine(); + + return std::string(&m_buffer[startPos], length); +} + +// Reads a charmap string. +int AsmFile::ReadString(unsigned char* s) +{ + SkipWhitespace(); + + int length; + StringParser stringParser(m_buffer, m_size); + + try + { + m_pos += stringParser.ParseString(m_pos, s, length); + } + catch (std::runtime_error& e) + { + RaiseError(e.what()); + } + + SkipWhitespace(); + + if (ConsumeComma()) + { + SkipWhitespace(); + int padLength = ReadPadLength(); + + while (length < padLength) + { + s[length++] = 0; + } + } + + ExpectEmptyRestOfLine(); + + return length; +} + +int AsmFile::ReadBraille(unsigned char* s) +{ + static std::map<char, unsigned char> encoding = + { + { 'A', 0x01 }, + { 'B', 0x05 }, + { 'C', 0x03 }, + { 'D', 0x0B }, + { 'E', 0x09 }, + { 'F', 0x07 }, + { 'G', 0x0F }, + { 'H', 0x0D }, + { 'I', 0x06 }, + { 'J', 0x0E }, + { 'K', 0x11 }, + { 'L', 0x15 }, + { 'M', 0x13 }, + { 'N', 0x1B }, + { 'O', 0x19 }, + { 'P', 0x17 }, + { 'Q', 0x1F }, + { 'R', 0x1D }, + { 'S', 0x16 }, + { 'T', 0x1E }, + { 'U', 0x31 }, + { 'V', 0x35 }, + { 'W', 0x2E }, + { 'X', 0x33 }, + { 'Y', 0x3B }, + { 'Z', 0x39 }, + { ' ', 0x00 }, + { ',', 0x04 }, + { '.', 0x2C }, + { '$', 0xFF }, + }; + + SkipWhitespace(); + + int length = 0; + + if (m_buffer[m_pos] != '"') + RaiseError("expected braille string literal"); + + m_pos++; + + while (m_buffer[m_pos] != '"') + { + if (length == kMaxStringLength) + RaiseError("mapped string longer than %d bytes", kMaxStringLength); + + if (m_buffer[m_pos] == '\\' && m_buffer[m_pos + 1] == 'n') + { + s[length++] = 0xFE; + m_pos += 2; + } + else + { + char c = m_buffer[m_pos]; + + if (encoding.count(c) == 0) + { + if (IsAsciiPrintable(c)) + RaiseError("character '%c' not valid in braille string", m_buffer[m_pos]); + else + RaiseError("character '\\x%02X' not valid in braille string", m_buffer[m_pos]); + } + + s[length++] = encoding[c]; + m_pos++; + } + } + + m_pos++; // Go past the right quote. + + ExpectEmptyRestOfLine(); + + return length; +} + +// If we're at a comma, consumes it. +// Returns whether a comma was found. +bool AsmFile::ConsumeComma() +{ + if (m_buffer[m_pos] == ',') + { + m_pos++; + return true; + } + + return false; +} + +// Converts digit character to numerical value. +static int ConvertDigit(char c, int radix) +{ + int digit; + + if (c >= '0' && c <= '9') + digit = c - '0'; + else if (c >= 'A' && c <= 'F') + digit = 10 + c - 'A'; + else if (c >= 'a' && c <= 'f') + digit = 10 + c - 'a'; + else + return -1; + + return (digit < radix) ? digit : -1; +} + +// Reads an integer. If the integer is greater than maxValue, it returns -1. +int AsmFile::ReadPadLength() +{ + if (!IsAsciiDigit(m_buffer[m_pos])) + RaiseError("expected integer"); + + int radix = 10; + + if (m_buffer[m_pos] == '0' && m_buffer[m_pos + 1] == 'x') + { + radix = 16; + m_pos += 2; + } + + unsigned n = 0; + int digit; + + while ((digit = ConvertDigit(m_buffer[m_pos], radix)) != -1) + { + n = n * radix + digit; + + if (n > kMaxStringLength) + RaiseError("pad length greater than maximum length (%d)", kMaxStringLength); + + m_pos++; + } + + return n; +} + +// Outputs the current line and moves to the next one. +void AsmFile::OutputLine() +{ + while (m_buffer[m_pos] != '\n' && m_buffer[m_pos] != 0) + m_pos++; + + if (m_buffer[m_pos] == 0) + { + if (m_pos >= m_size) + { + RaiseWarning("file doesn't end with newline"); + puts(&m_buffer[m_lineStart]); + } + else + { + RaiseError("unexpected null character"); + } + } + else + { + m_buffer[m_pos] = 0; + puts(&m_buffer[m_lineStart]); + m_buffer[m_pos] = '\n'; + m_pos++; + m_lineStart = m_pos; + m_lineNum++; + } +} + +// Asserts that the rest of the line is empty and moves to the next one. +void AsmFile::ExpectEmptyRestOfLine() +{ + SkipWhitespace(); + + if (m_buffer[m_pos] == 0) + { + if (m_pos >= m_size) + RaiseWarning("file doesn't end with newline"); + else + RaiseError("unexpected null character"); + } + else if (m_buffer[m_pos] == '\n') + { + m_pos++; + m_lineStart = m_pos; + m_lineNum++; + } + else if (m_buffer[m_pos] == '\r') + { + RaiseError("only Unix-style LF newlines are supported"); + } + else + { + RaiseError("junk at end of line"); + } +} + +// Checks if we're at the end of the file. +bool AsmFile::IsAtEnd() +{ + return (m_pos >= m_size); +} + +// Output the current location to set gas's logical file and line numbers. +void AsmFile::OutputLocation() +{ + std::printf("# %ld \"%s\"\n", m_lineNum, m_filename.c_str()); +} + +// Reports a diagnostic message. +void AsmFile::ReportDiagnostic(const char* type, const char* format, std::va_list args) +{ + const int bufferSize = 1024; + char buffer[bufferSize]; + std::vsnprintf(buffer, bufferSize, format, args); + std::fprintf(stderr, "%s:%ld: %s: %s\n", m_filename.c_str(), m_lineNum, type, buffer); +} + +#define DO_REPORT(type) \ +do \ +{ \ + std::va_list args; \ + va_start(args, format); \ + ReportDiagnostic(type, format, args); \ + va_end(args); \ +} while (0) + +// Reports an error diagnostic and terminates the program. +void AsmFile::RaiseError(const char* format, ...) +{ + DO_REPORT("error"); + std::exit(1); +} + +// Reports a warning diagnostic. +void AsmFile::RaiseWarning(const char* format, ...) +{ + DO_REPORT("warning"); +} diff --git a/tools/preproc/asm_file.h b/tools/preproc/asm_file.h new file mode 100644 index 000000000..d73b36e90 --- /dev/null +++ b/tools/preproc/asm_file.h @@ -0,0 +1,72 @@ +// Copyright(c) 2016 YamaArashi +// +// Permission is hereby granted, free of charge, to any person obtaining a copy +// of this software and associated documentation files (the "Software"), to deal +// in the Software without restriction, including without limitation the rights +// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +// copies of the Software, and to permit persons to whom the Software is +// furnished to do so, subject to the following conditions: +// +// The above copyright notice and this permission notice shall be included in +// all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +// THE SOFTWARE. + +#ifndef ASM_FILE_H +#define ASM_FILE_H + +#include <cstdarg> +#include <cstdint> +#include <string> +#include "preproc.h" + +enum class Directive +{ + Include, + String, + Braille, + Unknown +}; + +class AsmFile +{ +public: + AsmFile(std::string filename); + AsmFile(AsmFile&& other); + AsmFile(const AsmFile&) = delete; + ~AsmFile(); + Directive GetDirective(); + std::string GetGlobalLabel(); + std::string ReadPath(); + int ReadString(unsigned char* s); + int ReadBraille(unsigned char* s); + bool IsAtEnd(); + void OutputLine(); + void OutputLocation(); + +private: + char* m_buffer; + long m_pos; + long m_size; + long m_lineNum; + long m_lineStart; + std::string m_filename; + + bool ConsumeComma(); + int ReadPadLength(); + void RemoveComments(); + bool CheckForDirective(std::string name); + void SkipWhitespace(); + void ExpectEmptyRestOfLine(); + void ReportDiagnostic(const char* type, const char* format, std::va_list args); + void RaiseError(const char* format, ...); + void RaiseWarning(const char* format, ...); +}; + +#endif // ASM_FILE_H diff --git a/tools/preproc/c_file.cpp b/tools/preproc/c_file.cpp new file mode 100644 index 000000000..229f568fa --- /dev/null +++ b/tools/preproc/c_file.cpp @@ -0,0 +1,429 @@ +// Copyright(c) 2016 YamaArashi +// +// Permission is hereby granted, free of charge, to any person obtaining a copy +// of this software and associated documentation files (the "Software"), to deal +// in the Software without restriction, including without limitation the rights +// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +// copies of the Software, and to permit persons to whom the Software is +// furnished to do so, subject to the following conditions: +// +// The above copyright notice and this permission notice shall be included in +// all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +// THE SOFTWARE. + +#include <cstdio> +#include <cstdarg> +#include <string> +#include <memory> +#include "preproc.h" +#include "c_file.h" +#include "char_util.h" +#include "utf8.h" +#include "string_parser.h" + +CFile::CFile(std::string filename) : m_filename(filename) +{ + FILE *fp = std::fopen(filename.c_str(), "rb"); + + if (fp == NULL) + FATAL_ERROR("Failed to open \"%s\" for reading.\n", filename.c_str()); + + std::fseek(fp, 0, SEEK_END); + + m_size = std::ftell(fp); + + if (m_size < 0) + FATAL_ERROR("File size of \"%s\" is less than zero.\n", filename.c_str()); + + m_buffer = new char[m_size + 1]; + + std::rewind(fp); + + if (std::fread(m_buffer, m_size, 1, fp) != 1) + FATAL_ERROR("Failed to read \"%s\".\n", filename.c_str()); + + m_buffer[m_size] = 0; + + std::fclose(fp); + + m_pos = 0; + m_lineNum = 1; +} + +CFile::CFile(CFile&& other) : m_filename(std::move(other.m_filename)) +{ + m_buffer = other.m_buffer; + m_pos = other.m_pos; + m_size = other.m_size; + m_lineNum = other.m_lineNum; + + other.m_buffer = nullptr; +} + +CFile::~CFile() +{ + delete[] m_buffer; +} + +void CFile::Preproc() +{ + char stringChar = 0; + + while (m_pos < m_size) + { + if (stringChar) + { + if (m_buffer[m_pos] == stringChar) + { + std::putchar(stringChar); + m_pos++; + stringChar = 0; + } + else if (m_buffer[m_pos] == '\\' && m_buffer[m_pos + 1] == stringChar) + { + std::putchar('\\'); + std::putchar(stringChar); + m_pos += 2; + } + else + { + if (m_buffer[m_pos] == '\n') + m_lineNum++; + std::putchar(m_buffer[m_pos]); + m_pos++; + } + } + else + { + TryConvertString(); + TryConvertIncbin(); + + if (m_pos >= m_size) + break; + + char c = m_buffer[m_pos++]; + + std::putchar(c); + + if (c == '\n') + m_lineNum++; + else if (c == '"') + stringChar = '"'; + else if (c == '\'') + stringChar = '\''; + } + } +} + +bool CFile::ConsumeHorizontalWhitespace() +{ + if (m_buffer[m_pos] == '\t' || m_buffer[m_pos] == ' ') + { + m_pos++; + return true; + } + + return false; +} + +bool CFile::ConsumeNewline() +{ + if (m_buffer[m_pos] == '\r' && m_buffer[m_pos + 1] == '\n') + { + m_pos += 2; + m_lineNum++; + std::putchar('\n'); + return true; + } + + if (m_buffer[m_pos] == '\n') + { + m_pos++; + m_lineNum++; + std::putchar('\n'); + return true; + } + + return false; +} + +void CFile::SkipWhitespace() +{ + while (ConsumeHorizontalWhitespace() || ConsumeNewline()) + ; +} + +void CFile::TryConvertString() +{ + long oldPos = m_pos; + long oldLineNum = m_lineNum; + bool noTerminator = false; + + if (m_buffer[m_pos] != '_' || (m_pos > 0 && IsIdentifierChar(m_buffer[m_pos - 1]))) + return; + + m_pos++; + + if (m_buffer[m_pos] == '_') + { + noTerminator = true; + m_pos++; + } + + SkipWhitespace(); + + if (m_buffer[m_pos] != '(') + { + m_pos = oldPos; + m_lineNum = oldLineNum; + return; + } + + m_pos++; + + SkipWhitespace(); + + std::printf("{ "); + + while (1) + { + SkipWhitespace(); + + if (m_buffer[m_pos] == '"') + { + unsigned char s[kMaxStringLength]; + int length; + StringParser stringParser(m_buffer, m_size); + + try + { + m_pos += stringParser.ParseString(m_pos, s, length); + } + catch (std::runtime_error& e) + { + RaiseError(e.what()); + } + + for (int i = 0; i < length; i++) + printf("0x%02X, ", s[i]); + } + else if (m_buffer[m_pos] == ')') + { + m_pos++; + break; + } + else + { + if (m_pos >= m_size) + RaiseError("unexpected EOF"); + if (IsAsciiPrintable(m_buffer[m_pos])) + RaiseError("unexpected character '%c'", m_buffer[m_pos]); + else + RaiseError("unexpected character '\\x%02X'", m_buffer[m_pos]); + } + } + + if (noTerminator) + std::printf(" }"); + else + std::printf("0xFF }"); +} + +bool CFile::CheckIdentifier(const std::string& ident) +{ + unsigned int i; + + for (i = 0; i < ident.length() && m_pos + i < (unsigned)m_size; i++) + if (ident[i] != m_buffer[m_pos + i]) + return false; + + return (i == ident.length()); +} + +std::unique_ptr<unsigned char[]> CFile::ReadWholeFile(const std::string& path, int& size) +{ + FILE* fp = std::fopen(path.c_str(), "rb"); + + if (fp == nullptr) + RaiseError("Failed to open \"%s\" for reading.\n", path.c_str()); + + std::fseek(fp, 0, SEEK_END); + + size = std::ftell(fp); + + std::unique_ptr<unsigned char[]> buffer = std::unique_ptr<unsigned char[]>(new unsigned char[size]); + + std::rewind(fp); + + if (std::fread(buffer.get(), size, 1, fp) != 1) + RaiseError("Failed to read \"%s\".\n", path.c_str()); + + std::fclose(fp); + + return buffer; +} + +int ExtractData(const std::unique_ptr<unsigned char[]>& buffer, int offset, int size) +{ + switch (size) + { + case 1: + return buffer[offset]; + case 2: + return (buffer[offset + 1] << 8) + | buffer[offset]; + case 4: + return (buffer[offset + 3] << 24) + | (buffer[offset + 2] << 16) + | (buffer[offset + 1] << 8) + | buffer[offset]; + default: + FATAL_ERROR("Invalid size passed to ExtractData.\n"); + } +} + +void CFile::TryConvertIncbin() +{ + std::string idents[6] = { "INCBIN_S8", "INCBIN_U8", "INCBIN_S16", "INCBIN_U16", "INCBIN_S32", "INCBIN_U32" }; + int incbinType = -1; + + for (int i = 0; i < 6; i++) + { + if (CheckIdentifier(idents[i])) + { + incbinType = i; + break; + } + } + + if (incbinType == -1) + return; + + int size = 1 << (incbinType / 2); + bool isSigned = ((incbinType % 2) == 0); + + long oldPos = m_pos; + long oldLineNum = m_lineNum; + + m_pos += idents[incbinType].length(); + + SkipWhitespace(); + + if (m_buffer[m_pos] != '(') + { + m_pos = oldPos; + m_lineNum = oldLineNum; + return; + } + + m_pos++; + + std::printf("{"); + + while (true) + { + SkipWhitespace(); + + if (m_buffer[m_pos] != '"') + RaiseError("expected double quote"); + + m_pos++; + + int startPos = m_pos; + + while (m_buffer[m_pos] != '"') + { + if (m_buffer[m_pos] == 0) + { + if (m_pos >= m_size) + RaiseError("unexpected EOF in path string"); + else + RaiseError("unexpected null character in path string"); + } + + if (m_buffer[m_pos] == '\r' || m_buffer[m_pos] == '\n') + RaiseError("unexpected end of line character in path string"); + + if (m_buffer[m_pos] == '\\') + RaiseError("unexpected escape in path string"); + + m_pos++; + } + + std::string path(&m_buffer[startPos], m_pos - startPos); + + m_pos++; + + int fileSize; + std::unique_ptr<unsigned char[]> buffer = ReadWholeFile(path, fileSize); + + if ((fileSize % size) != 0) + RaiseError("Size %d doesn't evenly divide file size %d.\n", size, fileSize); + + int count = fileSize / size; + int offset = 0; + + for (int i = 0; i < count; i++) + { + int data = ExtractData(buffer, offset, size); + offset += size; + + if (isSigned) + std::printf("%d,", data); + else + std::printf("%uu,", data); + } + + SkipWhitespace(); + + if (m_buffer[m_pos] != ',') + break; + + m_pos++; + } + + if (m_buffer[m_pos] != ')') + RaiseError("expected ')'"); + + m_pos++; + + std::printf("}"); +} + +// Reports a diagnostic message. +void CFile::ReportDiagnostic(const char* type, const char* format, std::va_list args) +{ + const int bufferSize = 1024; + char buffer[bufferSize]; + std::vsnprintf(buffer, bufferSize, format, args); + std::fprintf(stderr, "%s:%ld: %s: %s\n", m_filename.c_str(), m_lineNum, type, buffer); +} + +#define DO_REPORT(type) \ +do \ +{ \ + std::va_list args; \ + va_start(args, format); \ + ReportDiagnostic(type, format, args); \ + va_end(args); \ +} while (0) + +// Reports an error diagnostic and terminates the program. +void CFile::RaiseError(const char* format, ...) +{ + DO_REPORT("error"); + std::exit(1); +} + +// Reports a warning diagnostic. +void CFile::RaiseWarning(const char* format, ...) +{ + DO_REPORT("warning"); +} diff --git a/tools/preproc/c_file.h b/tools/preproc/c_file.h new file mode 100644 index 000000000..7369aba85 --- /dev/null +++ b/tools/preproc/c_file.h @@ -0,0 +1,58 @@ +// Copyright(c) 2016 YamaArashi +// +// Permission is hereby granted, free of charge, to any person obtaining a copy +// of this software and associated documentation files (the "Software"), to deal +// in the Software without restriction, including without limitation the rights +// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +// copies of the Software, and to permit persons to whom the Software is +// furnished to do so, subject to the following conditions: +// +// The above copyright notice and this permission notice shall be included in +// all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +// THE SOFTWARE. + +#ifndef C_FILE_H +#define C_FILE_H + +#include <cstdarg> +#include <cstdint> +#include <string> +#include <memory> +#include "preproc.h" + +class CFile +{ +public: + CFile(std::string filename); + CFile(CFile&& other); + CFile(const CFile&) = delete; + ~CFile(); + void Preproc(); + +private: + char* m_buffer; + long m_pos; + long m_size; + long m_lineNum; + std::string m_filename; + + bool ConsumeHorizontalWhitespace(); + bool ConsumeNewline(); + void SkipWhitespace(); + void TryConvertString(); + std::unique_ptr<unsigned char[]> ReadWholeFile(const std::string& path, int& size); + bool CheckIdentifier(const std::string& ident); + void TryConvertIncbin(); + void ReportDiagnostic(const char* type, const char* format, std::va_list args); + void RaiseError(const char* format, ...); + void RaiseWarning(const char* format, ...); +}; + +#endif // C_FILE_H diff --git a/tools/preproc/char_util.h b/tools/preproc/char_util.h new file mode 100644 index 000000000..02a6e1ceb --- /dev/null +++ b/tools/preproc/char_util.h @@ -0,0 +1,71 @@ +// Copyright(c) 2016 YamaArashi +// +// Permission is hereby granted, free of charge, to any person obtaining a copy +// of this software and associated documentation files (the "Software"), to deal +// in the Software without restriction, including without limitation the rights +// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +// copies of the Software, and to permit persons to whom the Software is +// furnished to do so, subject to the following conditions: +// +// The above copyright notice and this permission notice shall be included in +// all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +// THE SOFTWARE. + +#ifndef CHAR_UTIL_H +#define CHAR_UTIL_H + +#include <cstdint> +#include <cassert> + +inline bool IsAscii(unsigned char c) +{ + return (c < 128); +} + +inline bool IsAsciiAlpha(unsigned char c) +{ + return ((c >= 'A' && c <= 'Z') || (c >= 'a' && c <= 'z')); +} + +inline bool IsAsciiDigit(unsigned char c) +{ + return (c >= '0' && c <= '9'); +} + +inline bool IsAsciiHexDigit(unsigned char c) +{ + return ((c >= '0' && c <= '9') + || (c >= 'a' && c <= 'f') + || (c >= 'A' && c <= 'F')); +} + +inline bool IsAsciiAlphanum(unsigned char c) +{ + return (IsAsciiAlpha(c) || IsAsciiDigit(c)); +} + +inline bool IsAsciiPrintable(unsigned char c) +{ + return (c >= ' ' && c <= '~'); +} + +// Returns whether the character can start a C identifier or the identifier of a "{FOO}" constant in strings. +inline bool IsIdentifierStartingChar(unsigned char c) +{ + return IsAsciiAlpha(c) || c == '_'; +} + +// Returns whether the character can be used in a C identifier or the identifier of a "{FOO}" constant in strings. +inline bool IsIdentifierChar(unsigned char c) +{ + return IsAsciiAlphanum(c) || c == '_'; +} + +#endif // CHAR_UTIL_H diff --git a/tools/preproc/charmap.cpp b/tools/preproc/charmap.cpp new file mode 100644 index 000000000..a7bedfe26 --- /dev/null +++ b/tools/preproc/charmap.cpp @@ -0,0 +1,408 @@ +// Copyright(c) 2016 YamaArashi +// +// Permission is hereby granted, free of charge, to any person obtaining a copy +// of this software and associated documentation files (the "Software"), to deal +// in the Software without restriction, including without limitation the rights +// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +// copies of the Software, and to permit persons to whom the Software is +// furnished to do so, subject to the following conditions: +// +// The above copyright notice and this permission notice shall be included in +// all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +// THE SOFTWARE. + +#include <cstdio> +#include <cstdint> +#include <cstdarg> +#include "preproc.h" +#include "charmap.h" +#include "char_util.h" +#include "utf8.h" + +enum LhsType +{ + Char, + Escape, + Constant, + None +}; + +struct Lhs +{ + LhsType type; + std::string name; + std::int32_t code; +}; + +class CharmapReader +{ +public: + CharmapReader(std::string filename); + CharmapReader(const CharmapReader&) = delete; + ~CharmapReader(); + Lhs ReadLhs(); + void ExpectEqualsSign(); + std::string ReadSequence(); + void ExpectEmptyRestOfLine(); + void RaiseError(const char* format, ...); + +private: + char* m_buffer; + long m_pos; + long m_size; + long m_lineNum; + std::string m_filename; + + void RemoveComments(); + std::string ReadConstant(); + void SkipWhitespace(); +}; + +CharmapReader::CharmapReader(std::string filename) : m_filename(filename) +{ + FILE *fp = std::fopen(filename.c_str(), "rb"); + + if (fp == NULL) + FATAL_ERROR("Failed to open \"%s\" for reading.\n", filename.c_str()); + + std::fseek(fp, 0, SEEK_END); + + m_size = std::ftell(fp); + + if (m_size < 0) + FATAL_ERROR("File size of \"%s\" is less than zero.\n", filename.c_str()); + + m_buffer = new char[m_size + 1]; + + std::rewind(fp); + + if (std::fread(m_buffer, m_size, 1, fp) != 1) + FATAL_ERROR("Failed to read \"%s\".\n", filename.c_str()); + + m_buffer[m_size] = 0; + + std::fclose(fp); + + m_pos = 0; + m_lineNum = 1; + + RemoveComments(); +} + +CharmapReader::~CharmapReader() +{ + delete[] m_buffer; +} + +Lhs CharmapReader::ReadLhs() +{ + Lhs lhs; + + for (;;) + { + SkipWhitespace(); + + if (m_buffer[m_pos] == '\n') + { + m_pos++; + m_lineNum++; + } + else + { + break; + } + } + + if (m_buffer[m_pos] == '\'') + { + m_pos++; + + bool isEscape = (m_buffer[m_pos] == '\\'); + + if (isEscape) + { + m_pos++; + } + + unsigned char c = m_buffer[m_pos]; + + if (c == 0) + { + if (m_pos >= m_size) + RaiseError("unexpected EOF in UTF-8 character literal"); + else + RaiseError("unexpected null character in UTF-8 character literal"); + } + + if (IsAscii(c) && !IsAsciiPrintable(c)) + RaiseError("unexpected character U+%X in UTF-8 character literal", c); + + UnicodeChar unicodeChar = DecodeUtf8(&m_buffer[m_pos]); + std::int32_t code = unicodeChar.code; + + if (code == -1) + RaiseError("invalid encoding in UTF-8 character literal"); + + m_pos += unicodeChar.encodingLength; + + if (m_buffer[m_pos] != '\'') + RaiseError("unterminated character literal"); + + m_pos++; + + lhs.code = code; + + if (isEscape) + { + if (code >= 128) + RaiseError("escapes using non-ASCII characters are invalid"); + + switch (code) + { + case '\'': + lhs.type = LhsType::Char; + break; + case '\\': + lhs.type = LhsType::Char; + case '"': + RaiseError("cannot escape double quote"); + break; + default: + lhs.type = LhsType::Escape; + } + } + else + { + if (code == '\'') + RaiseError("empty character literal"); + + lhs.type = LhsType::Char; + } + } + else if (IsIdentifierStartingChar(m_buffer[m_pos])) + { + lhs.type = LhsType::Constant; + lhs.name = ReadConstant(); + } + else if (m_buffer[m_pos] == '\r') + { + RaiseError("only Unix-style LF newlines are supported"); + } + else if (m_buffer[m_pos] == 0) + { + if (m_pos < m_size) + RaiseError("unexpected null character"); + lhs.type = LhsType::None; + } + else + { + RaiseError("junk at start of line"); + } + + return lhs; +} + +void CharmapReader::ExpectEqualsSign() +{ + SkipWhitespace(); + + if (m_buffer[m_pos] != '=') + RaiseError("expected equals sign"); + + m_pos++; +} + +static unsigned int ConvertHexDigit(char c) +{ + unsigned int digit = 0; + + if (c >= '0' && c <= '9') + digit = c - '0'; + else if (c >= 'A' && c <= 'F') + digit = 10 + c - 'A'; + else if (c >= 'a' && c <= 'f') + digit = 10 + c - 'a'; + + return digit; +} + +std::string CharmapReader::ReadSequence() +{ + SkipWhitespace(); + + long startPos = m_pos; + + unsigned int length = 0; + + while (IsAsciiHexDigit(m_buffer[m_pos]) && IsAsciiHexDigit(m_buffer[m_pos + 1])) + { + m_pos += 2; + length++; + + if (length > kMaxCharmapSequenceLength) + RaiseError("byte sequence too long (max is %lu bytes)", kMaxCharmapSequenceLength); + + SkipWhitespace(); + } + + if (IsAsciiHexDigit(m_buffer[m_pos])) + RaiseError("each byte must have 2 hex digits"); + + if (length == 0) + RaiseError("expected byte sequence"); + + std::string sequence; + sequence.reserve(length); + + m_pos = startPos; + + for (unsigned int i = 0; i < length; i++) + { + unsigned int digit1 = ConvertHexDigit(m_buffer[m_pos]); + unsigned int digit2 = ConvertHexDigit(m_buffer[m_pos + 1]); + unsigned char byte = digit1 * 16 + digit2; + sequence += byte; + + m_pos += 2; + SkipWhitespace(); + } + + return sequence; +} + +void CharmapReader::ExpectEmptyRestOfLine() +{ + SkipWhitespace(); + + if (m_buffer[m_pos] == 0) + { + if (m_pos < m_size) + RaiseError("unexpected null character"); + } + else if (m_buffer[m_pos] == '\n') + { + m_pos++; + m_lineNum++; + } + else if (m_buffer[m_pos] == '\r') + { + RaiseError("only Unix-style LF newlines are supported"); + } + else + { + RaiseError("junk at end of line"); + } +} + +void CharmapReader::RaiseError(const char* format, ...) +{ + const int bufferSize = 1024; + char buffer[bufferSize]; + + std::va_list args; + va_start(args, format); + std::vsnprintf(buffer, bufferSize, format, args); + va_end(args); + + std::fprintf(stderr, "%s:%ld: error: %s\n", m_filename.c_str(), m_lineNum, buffer); + + std::exit(1); +} + +void CharmapReader::RemoveComments() +{ + long pos = 0; + bool inString = false; + + for (;;) + { + if (m_buffer[pos] == 0) + return; + + if (inString) + { + if (m_buffer[pos] == '\\' && m_buffer[pos + 1] == '\'') + { + pos += 2; + } + else + { + if (m_buffer[pos] == '\'') + inString = false; + pos++; + } + } + else if (m_buffer[pos] == '@') + { + while (m_buffer[pos] != '\n' && m_buffer[pos] != 0) + m_buffer[pos++] = ' '; + } + else + { + if (m_buffer[pos] == '\'') + inString = true; + pos++; + } + } +} + +std::string CharmapReader::ReadConstant() +{ + long startPos = m_pos; + + while (IsIdentifierChar(m_buffer[m_pos])) + m_pos++; + + return std::string(&m_buffer[startPos], m_pos - startPos); +} + +void CharmapReader::SkipWhitespace() +{ + while (m_buffer[m_pos] == '\t' || m_buffer[m_pos] == ' ') + m_pos++; +} + +Charmap::Charmap(std::string filename) +{ + CharmapReader reader(filename); + + for (;;) + { + Lhs lhs = reader.ReadLhs(); + + if (lhs.type == LhsType::None) + return; + + reader.ExpectEqualsSign(); + + std::string sequence = reader.ReadSequence(); + + switch (lhs.type) + { + case LhsType::Char: + if (m_chars.find(lhs.code) != m_chars.end()) + reader.RaiseError("redefining char"); + m_chars[lhs.code] = sequence; + break; + case LhsType::Escape: + if (m_escapes[lhs.code].length() != 0) + reader.RaiseError("redefining escape"); + m_escapes[lhs.code] = sequence; + break; + case LhsType::Constant: + if (m_constants.find(lhs.name) != m_constants.end()) + reader.RaiseError("redefining constant"); + m_constants[lhs.name] = sequence; + break; + } + + reader.ExpectEmptyRestOfLine(); + } +} diff --git a/tools/preproc/charmap.h b/tools/preproc/charmap.h new file mode 100644 index 000000000..0d752ac99 --- /dev/null +++ b/tools/preproc/charmap.h @@ -0,0 +1,64 @@ +// Copyright(c) 2016 YamaArashi +// +// Permission is hereby granted, free of charge, to any person obtaining a copy +// of this software and associated documentation files (the "Software"), to deal +// in the Software without restriction, including without limitation the rights +// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +// copies of the Software, and to permit persons to whom the Software is +// furnished to do so, subject to the following conditions: +// +// The above copyright notice and this permission notice shall be included in +// all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +// THE SOFTWARE. + +#ifndef CHARMAP_H +#define CHARMAP_H + +#include <cstdint> +#include <string> +#include <map> +#include <vector> + +class Charmap +{ +public: + Charmap(std::string filename); + + std::string Char(std::int32_t code) + { + auto it = m_chars.find(code); + + if (it == m_chars.end()) + return std::string(); + + return it->second; + } + + std::string Escape(unsigned char code) + { + return m_escapes[code]; + } + + std::string Constant(std::string identifier) + { + auto it = m_constants.find(identifier); + + if (it == m_constants.end()) + return std::string(); + + return it->second; + } +private: + std::map<std::int32_t, std::string> m_chars; + std::string m_escapes[128]; + std::map<std::string, std::string> m_constants; +}; + +#endif // CHARMAP_H diff --git a/tools/preproc/preproc.cpp b/tools/preproc/preproc.cpp new file mode 100644 index 000000000..c9c6042df --- /dev/null +++ b/tools/preproc/preproc.cpp @@ -0,0 +1,156 @@ +// Copyright(c) 2016 YamaArashi +// +// Permission is hereby granted, free of charge, to any person obtaining a copy +// of this software and associated documentation files (the "Software"), to deal +// in the Software without restriction, including without limitation the rights +// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +// copies of the Software, and to permit persons to whom the Software is +// furnished to do so, subject to the following conditions: +// +// The above copyright notice and this permission notice shall be included in +// all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +// THE SOFTWARE. + +#include <string> +#include <stack> +#include "preproc.h" +#include "asm_file.h" +#include "c_file.h" +#include "charmap.h" + +Charmap* g_charmap; + +void PrintAsmBytes(unsigned char *s, int length) +{ + if (length > 0) + { + std::printf("\t.byte "); + for (int i = 0; i < length; i++) + { + std::printf("0x%02X", s[i]); + + if (i < length - 1) + std::printf(", "); + } + std::putchar('\n'); + } +} + +void PreprocAsmFile(std::string filename) +{ + std::stack<AsmFile> stack; + + stack.push(AsmFile(filename)); + + for (;;) + { + while (stack.top().IsAtEnd()) + { + stack.pop(); + + if (stack.empty()) + return; + else + stack.top().OutputLocation(); + } + + Directive directive = stack.top().GetDirective(); + + switch (directive) + { + case Directive::Include: + stack.push(AsmFile(stack.top().ReadPath())); + stack.top().OutputLocation(); + break; + case Directive::String: + { + unsigned char s[kMaxStringLength]; + int length = stack.top().ReadString(s); + PrintAsmBytes(s, length); + break; + } + case Directive::Braille: + { + unsigned char s[kMaxStringLength]; + int length = stack.top().ReadBraille(s); + PrintAsmBytes(s, length); + break; + } + case Directive::Unknown: + { + std::string globalLabel = stack.top().GetGlobalLabel(); + + if (globalLabel.length() != 0) + { + const char *s = globalLabel.c_str(); + std::printf("%s: ; .global %s\n", s, s); + } + else + { + stack.top().OutputLine(); + } + + break; + } + } + } +} + +void PreprocCFile(std::string filename) +{ + CFile cFile(filename); + cFile.Preproc(); +} + +char* GetFileExtension(char* filename) +{ + char* extension = filename; + + while (*extension != 0) + extension++; + + while (extension > filename && *extension != '.') + extension--; + + if (extension == filename) + return nullptr; + + extension++; + + if (*extension == 0) + return nullptr; + + return extension; +} + +int main(int argc, char **argv) +{ + if (argc != 3) + { + std::fprintf(stderr, "Usage: %s SRC_FILE CHARMAP_FILE", argv[0]); + return 1; + } + + g_charmap = new Charmap(argv[2]); + + char* extension = GetFileExtension(argv[1]); + + if (!extension) + FATAL_ERROR("\"%s\" has no file extension.\n", argv[1]); + + if ((extension[0] == 's') && extension[1] == 0) + PreprocAsmFile(argv[1]); + else if ((extension[0] == 'c' || extension[0] == 'i') && extension[1] == 0) + PreprocCFile(argv[1]); + else + FATAL_ERROR("\"%s\" has an unknown file extension of \"%s\".\n", argv[1], extension); + + return 0; +} diff --git a/tools/preproc/preproc.h b/tools/preproc/preproc.h new file mode 100644 index 000000000..515f64e07 --- /dev/null +++ b/tools/preproc/preproc.h @@ -0,0 +1,54 @@ +// Copyright(c) 2016 YamaArashi +// +// Permission is hereby granted, free of charge, to any person obtaining a copy +// of this software and associated documentation files (the "Software"), to deal +// in the Software without restriction, including without limitation the rights +// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +// copies of the Software, and to permit persons to whom the Software is +// furnished to do so, subject to the following conditions: +// +// The above copyright notice and this permission notice shall be included in +// all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +// THE SOFTWARE. + +#ifndef PREPROC_H +#define PREPROC_H + +#include <cstdio> +#include <cstdlib> +#include "charmap.h" + +#ifdef _MSC_VER + +#define FATAL_ERROR(format, ...) \ +do \ +{ \ + std::fprintf(stderr, format, __VA_ARGS__); \ + std::exit(1); \ +} while (0) + +#else + +#define FATAL_ERROR(format, ...) \ +do \ +{ \ + std::fprintf(stderr, format, ##__VA_ARGS__); \ + std::exit(1); \ +} while (0) + +#endif // _MSC_VER + +const int kMaxPath = 256; +const int kMaxStringLength = 1024; +const unsigned long kMaxCharmapSequenceLength = 16; + +extern Charmap* g_charmap; + +#endif // PREPROC_H diff --git a/tools/preproc/string_parser.cpp b/tools/preproc/string_parser.cpp new file mode 100644 index 000000000..dd5196a44 --- /dev/null +++ b/tools/preproc/string_parser.cpp @@ -0,0 +1,355 @@ +// Copyright(c) 2016 YamaArashi +// +// Permission is hereby granted, free of charge, to any person obtaining a copy +// of this software and associated documentation files (the "Software"), to deal +// in the Software without restriction, including without limitation the rights +// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +// copies of the Software, and to permit persons to whom the Software is +// furnished to do so, subject to the following conditions: +// +// The above copyright notice and this permission notice shall be included in +// all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +// THE SOFTWARE. + +#include <cstdio> +#include <cstdarg> +#include <stdexcept> +#include "preproc.h" +#include "string_parser.h" +#include "char_util.h" +#include "utf8.h" + +// Reads a charmap char or escape sequence. +std::string StringParser::ReadCharOrEscape() +{ + std::string sequence; + + bool isEscape = (m_buffer[m_pos] == '\\'); + + if (isEscape) + { + m_pos++; + + if (m_buffer[m_pos] == '"') + { + sequence = g_charmap->Char('"'); + + if (sequence.length() == 0) + RaiseError("no mapping exists for double quote"); + + return sequence; + } + else if (m_buffer[m_pos] == '\\') + { + sequence = g_charmap->Char('\\'); + + if (sequence.length() == 0) + RaiseError("no mapping exists for backslash"); + + return sequence; + } + } + + unsigned char c = m_buffer[m_pos]; + + if (c == 0) + { + if (m_pos >= m_size) + RaiseError("unexpected EOF in UTF-8 string"); + else + RaiseError("unexpected null character in UTF-8 string"); + } + + if (IsAscii(c) && !IsAsciiPrintable(c)) + RaiseError("unexpected character U+%X in UTF-8 string", c); + + UnicodeChar unicodeChar = DecodeUtf8(&m_buffer[m_pos]); + m_pos += unicodeChar.encodingLength; + std::int32_t code = unicodeChar.code; + + if (code == -1) + RaiseError("invalid encoding in UTF-8 string"); + + if (isEscape && code >= 128) + RaiseError("escapes using non-ASCII characters are invalid"); + + sequence = isEscape ? g_charmap->Escape(code) : g_charmap->Char(code); + + if (sequence.length() == 0) + { + if (isEscape) + RaiseError("unknown escape '\\%c'", code); + else + RaiseError("unknown character U+%X", code); + } + + return sequence; +} + +// Reads a charmap constant, i.e. "{FOO}". +std::string StringParser::ReadBracketedConstants() +{ + std::string totalSequence; + + m_pos++; // Assume we're on the left curly bracket. + + while (m_buffer[m_pos] != '}') + { + SkipWhitespace(); + + if (IsIdentifierStartingChar(m_buffer[m_pos])) + { + long startPos = m_pos; + + m_pos++; + + while (IsIdentifierChar(m_buffer[m_pos])) + m_pos++; + + std::string sequence = g_charmap->Constant(std::string(&m_buffer[startPos], m_pos - startPos)); + + if (sequence.length() == 0) + { + m_buffer[m_pos] = 0; + RaiseError("unknown constant '%s'", &m_buffer[startPos]); + } + + totalSequence += sequence; + } + else if (IsAsciiDigit(m_buffer[m_pos])) + { + Integer integer = ReadInteger(); + + switch (integer.size) + { + case 1: + totalSequence += (unsigned char)integer.value; + break; + case 2: + totalSequence += (unsigned char)integer.value; + totalSequence += (unsigned char)(integer.value >> 8); + break; + case 4: + totalSequence += (unsigned char)integer.value; + totalSequence += (unsigned char)(integer.value >> 8); + totalSequence += (unsigned char)(integer.value >> 16); + totalSequence += (unsigned char)(integer.value >> 24); + break; + } + } + else if (m_buffer[m_pos] == 0) + { + if (m_pos >= m_size) + RaiseError("unexpected EOF after left curly bracket"); + else + RaiseError("unexpected null character within curly brackets"); + } + else + { + if (IsAsciiPrintable(m_buffer[m_pos])) + RaiseError("unexpected character '%c' within curly brackets", m_buffer[m_pos]); + else + RaiseError("unexpected character '\\x%02X' within curly brackets", m_buffer[m_pos]); + } + } + + m_pos++; // Go past the right curly bracket. + + return totalSequence; +} + +// Reads a charmap string. +int StringParser::ParseString(long srcPos, unsigned char* dest, int& destLength) +{ + m_pos = srcPos; + + if (m_buffer[m_pos] != '"') + RaiseError("expected UTF-8 string literal"); + + long start = m_pos; + + m_pos++; + + destLength = 0; + + while (m_buffer[m_pos] != '"') + { + std::string sequence = (m_buffer[m_pos] == '{') ? ReadBracketedConstants() : ReadCharOrEscape(); + + for (const char& c : sequence) + { + if (destLength == kMaxStringLength) + RaiseError("mapped string longer than %d bytes", kMaxStringLength); + + dest[destLength++] = c; + } + } + + m_pos++; // Go past the right quote. + + return m_pos - start; +} + +void StringParser::RaiseError(const char* format, ...) +{ + const int bufferSize = 1024; + char buffer[bufferSize]; + + std::va_list args; + va_start(args, format); + std::vsnprintf(buffer, bufferSize, format, args); + va_end(args); + + throw std::runtime_error(buffer); +} + +// Converts digit character to numerical value. +static int ConvertDigit(char c, int radix) +{ + int digit; + + if (c >= '0' && c <= '9') + digit = c - '0'; + else if (c >= 'A' && c <= 'F') + digit = 10 + c - 'A'; + else if (c >= 'a' && c <= 'f') + digit = 10 + c - 'a'; + else + return -1; + + return (digit < radix) ? digit : -1; +} + +void StringParser::SkipRestOfInteger(int radix) +{ + while (ConvertDigit(m_buffer[m_pos], radix) != -1) + m_pos++; +} + +StringParser::Integer StringParser::ReadDecimal() +{ + const int radix = 10; + std::uint64_t n = 0; + int digit; + std::uint64_t max = UINT32_MAX; + long startPos = m_pos; + + while ((digit = ConvertDigit(m_buffer[m_pos], radix)) != -1) + { + n = n * radix + digit; + + if (n >= max) + { + SkipRestOfInteger(radix); + + std::string intLiteral(m_buffer + startPos, m_pos - startPos); + RaiseError("integer literal \"%s\" is too large", intLiteral.c_str()); + } + + m_pos++; + } + + int size; + + if (m_buffer[m_pos] == 'H') + { + if (n >= 0x10000) + { + RaiseError("%lu is too large to be a halfword", (unsigned long)n); + } + + size = 2; + m_pos++; + } + else if (m_buffer[m_pos] == 'W') + { + size = 4; + m_pos++; + } + else + { + if (n >= 0x10000) + size = 4; + else if (n >= 0x100) + size = 2; + else + size = 1; + } + + return{ static_cast<std::uint32_t>(n), size }; +} + +StringParser::Integer StringParser::ReadHex() +{ + const int radix = 16; + std::uint64_t n = 0; + int digit; + std::uint64_t max = UINT32_MAX; + long startPos = m_pos; + + while ((digit = ConvertDigit(m_buffer[m_pos], radix)) != -1) + { + n = n * radix + digit; + + if (n >= max) + { + SkipRestOfInteger(radix); + + std::string intLiteral(m_buffer + startPos, m_pos - startPos); + RaiseError("integer literal \"%s\" is too large", intLiteral.c_str()); + } + + m_pos++; + } + + int length = m_pos - startPos; + int size = 0; + + switch (length) + { + case 2: + size = 1; + break; + case 4: + size = 2; + break; + case 8: + size = 4; + break; + default: + { + std::string intLiteral(m_buffer + startPos, m_pos - startPos); + RaiseError("hex integer literal \"0x%s\" doesn't have length of 2, 4, or 8 digits", intLiteral.c_str()); + } + } + + return{ static_cast<std::uint32_t>(n), size }; +} + +StringParser::Integer StringParser::ReadInteger() +{ + if (!IsAsciiDigit(m_buffer[m_pos])) + RaiseError("expected integer"); + + if (m_buffer[m_pos] == '0' && m_buffer[m_pos + 1] == 'x') + { + m_pos += 2; + return ReadHex(); + } + + return ReadDecimal(); +} + +// Skips tabs and spaces. +void StringParser::SkipWhitespace() +{ + while (m_buffer[m_pos] == '\t' || m_buffer[m_pos] == ' ') + m_pos++; +} diff --git a/tools/preproc/string_parser.h b/tools/preproc/string_parser.h new file mode 100644 index 000000000..abd2bfe9a --- /dev/null +++ b/tools/preproc/string_parser.h @@ -0,0 +1,55 @@ +// Copyright(c) 2016 YamaArashi +// +// Permission is hereby granted, free of charge, to any person obtaining a copy +// of this software and associated documentation files (the "Software"), to deal +// in the Software without restriction, including without limitation the rights +// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +// copies of the Software, and to permit persons to whom the Software is +// furnished to do so, subject to the following conditions: +// +// The above copyright notice and this permission notice shall be included in +// all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +// THE SOFTWARE. + +#ifndef STRING_PARSER_H +#define STRING_PARSER_H + +#include <cstdint> +#include <string> +#include "preproc.h" + +class StringParser +{ +public: + StringParser(char* buffer, long size) : m_buffer(buffer), m_size(size), m_pos(0) {} + int ParseString(long srcPos, unsigned char* dest, int &destLength); + +private: + struct Integer + { + std::uint32_t value; + int size; + }; + + char* m_buffer; + long m_size; + long m_pos; + + Integer ReadInteger(); + Integer ReadDecimal(); + Integer ReadHex(); + std::string ReadCharOrEscape(); + std::string ReadBracketedConstants(); + void SkipWhitespace(); + void SkipRestOfInteger(int radix); + void RaiseError(const char* format, ...); +}; + +#endif // STRING_PARSER_H diff --git a/tools/preproc/utf8.cpp b/tools/preproc/utf8.cpp new file mode 100644 index 000000000..7facfd44e --- /dev/null +++ b/tools/preproc/utf8.cpp @@ -0,0 +1,92 @@ +// Copyright (c) 2008-2009 Bjoern Hoehrmann <bjoern@hoehrmann.de> +// See http://bjoern.hoehrmann.de/utf-8/decoder/dfa/ for details. +// +// Copyright(c) 2016 YamaArashi +// +// Permission is hereby granted, free of charge, to any person obtaining a copy +// of this software and associated documentation files (the "Software"), to deal +// in the Software without restriction, including without limitation the rights +// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +// copies of the Software, and to permit persons to whom the Software is +// furnished to do so, subject to the following conditions: +// +// The above copyright notice and this permission notice shall be included in +// all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +// THE SOFTWARE. + +#include <cstdint> +#include "utf8.h" + +static const unsigned char s_byteTypeTable[] = +{ + 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, // 00..1f + 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, // 20..3f + 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, // 40..5f + 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, // 60..7f + 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9, // 80..9f + 7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7, // a0..bf + 8,8,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2, // c0..df + 0xa,0x3,0x3,0x3,0x3,0x3,0x3,0x3,0x3,0x3,0x3,0x3,0x3,0x4,0x3,0x3, // e0..ef + 0xb,0x6,0x6,0x6,0x5,0x8,0x8,0x8,0x8,0x8,0x8,0x8,0x8,0x8,0x8,0x8, // f0..ff +}; + +const unsigned char s0 = 0 * 12; +const unsigned char s1 = 1 * 12; +const unsigned char s2 = 2 * 12; +const unsigned char s3 = 3 * 12; +const unsigned char s4 = 4 * 12; +const unsigned char s5 = 5 * 12; +const unsigned char s6 = 6 * 12; +const unsigned char s7 = 7 * 12; +const unsigned char s8 = 8 * 12; + +static const unsigned char s_transitionTable[] = +{ + s0,s1,s2,s3,s5,s8,s7,s1,s1,s1,s4,s6, // s0 + s1,s1,s1,s1,s1,s1,s1,s1,s1,s1,s1,s1, // s1 + s1,s0,s1,s1,s1,s1,s1,s0,s1,s0,s1,s1, // s2 + s1,s2,s1,s1,s1,s1,s1,s2,s1,s2,s1,s1, // s3 + s1,s1,s1,s1,s1,s1,s1,s2,s1,s1,s1,s1, // s4 + s1,s2,s1,s1,s1,s1,s1,s1,s1,s2,s1,s1, // s5 + s1,s1,s1,s1,s1,s1,s1,s3,s1,s3,s1,s1, // s6 + s1,s3,s1,s1,s1,s1,s1,s3,s1,s3,s1,s1, // s7 + s1,s3,s1,s1,s1,s1,s1,s1,s1,s1,s1,s1, // s8 +}; + +// Decodes UTF-8 encoded Unicode code point at "s". +UnicodeChar DecodeUtf8(const char* s) +{ + UnicodeChar unicodeChar; + int state = s0; + auto start = s; + + do + { + unsigned char byte = *s++; + int type = s_byteTypeTable[byte]; + + if (state == s0) + unicodeChar.code = (0xFF >> type) & byte; + else + unicodeChar.code = (unicodeChar.code << 6) | (byte & 0x3F); + + state = s_transitionTable[state + type]; + + if (state == s1) + { + unicodeChar.code = -1; + return unicodeChar; + } + } while (state != s0); + + unicodeChar.encodingLength = s - start; + + return unicodeChar; +} diff --git a/tools/preproc/utf8.h b/tools/preproc/utf8.h new file mode 100644 index 000000000..259de67c5 --- /dev/null +++ b/tools/preproc/utf8.h @@ -0,0 +1,34 @@ +// Copyright(c) 2016 YamaArashi +// +// Permission is hereby granted, free of charge, to any person obtaining a copy +// of this software and associated documentation files (the "Software"), to deal +// in the Software without restriction, including without limitation the rights +// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +// copies of the Software, and to permit persons to whom the Software is +// furnished to do so, subject to the following conditions: +// +// The above copyright notice and this permission notice shall be included in +// all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +// THE SOFTWARE. + +#ifndef UTF8_H +#define UTF8_H + +#include <cstdint> + +struct UnicodeChar +{ + std::int32_t code; + int encodingLength; +}; + +UnicodeChar DecodeUtf8(const char* s); + +#endif // UTF8_H diff --git a/tools/ramscrgen/.gitignore b/tools/ramscrgen/.gitignore new file mode 100644 index 000000000..4d0ae82c3 --- /dev/null +++ b/tools/ramscrgen/.gitignore @@ -0,0 +1 @@ +ramscrgen diff --git a/tools/ramscrgen/LICENSE b/tools/ramscrgen/LICENSE new file mode 100644 index 000000000..534d15349 --- /dev/null +++ b/tools/ramscrgen/LICENSE @@ -0,0 +1,19 @@ +Copyright (c) 2016 YamaArashi + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. diff --git a/tools/ramscrgen/Makefile b/tools/ramscrgen/Makefile new file mode 100644 index 000000000..9aa309aa1 --- /dev/null +++ b/tools/ramscrgen/Makefile @@ -0,0 +1,15 @@ +CXX := g++ + +CXXFLAGS := -std=c++11 -O2 -Wall -Wno-switch -Werror + +SRCS := main.cpp sym_file.cpp elf.cpp + +HEADERS := ramscrgen.h sym_file.h elf.h char_util.h + +.PHONY: clean + +ramscrgen: $(SRCS) $(HEADERS) + $(CXX) $(CXXFLAGS) $(SRCS) -o $@ $(LDFLAGS) + +clean: + $(RM) ramscrgen ramscrgen.exe diff --git a/tools/ramscrgen/char_util.h b/tools/ramscrgen/char_util.h new file mode 100644 index 000000000..ab20dbc53 --- /dev/null +++ b/tools/ramscrgen/char_util.h @@ -0,0 +1,71 @@ +// Copyright(c) 2016 YamaArashi +// +// Permission is hereby granted, free of charge, to any person obtaining a copy +// of this software and associated documentation files (the "Software"), to deal +// in the Software without restriction, including without limitation the rights +// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +// copies of the Software, and to permit persons to whom the Software is +// furnished to do so, subject to the following conditions: +// +// The above copyright notice and this permission notice shall be included in +// all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +// THE SOFTWARE. + +#ifndef CHAR_UTIL_H +#define CHAR_UTIL_H + +#include <cstdint> +#include <cassert> + +inline bool IsAscii(unsigned char c) +{ + return (c < 128); +} + +inline bool IsAsciiAlpha(unsigned char c) +{ + return ((c >= 'A' && c <= 'Z') || (c >= 'a' && c <= 'z')); +} + +inline bool IsAsciiDigit(unsigned char c) +{ + return (c >= '0' && c <= '9'); +} + +inline bool IsAsciiHexDigit(unsigned char c) +{ + return ((c >= '0' && c <= '9') + || (c >= 'a' && c <= 'f') + || (c >= 'A' && c <= 'F')); +} + +inline bool IsAsciiAlphanum(unsigned char c) +{ + return (IsAsciiAlpha(c) || IsAsciiDigit(c)); +} + +inline bool IsAsciiPrintable(unsigned char c) +{ + return (c >= ' ' && c <= '~'); +} + +// Returns whether the character can start the identifier of a "{FOO}" constant in strings. +inline bool IsIdentifierStartingChar(unsigned char c) +{ + return IsAsciiAlpha(c) || c == '_'; +} + +// Returns whether the character can be used in the identifier of a "{FOO}" constant in strings. +inline bool IsIdentifierChar(unsigned char c) +{ + return IsAsciiAlphanum(c) || c == '_'; +} + +#endif // CHAR_UTIL_H diff --git a/tools/ramscrgen/elf.cpp b/tools/ramscrgen/elf.cpp new file mode 100644 index 000000000..7e78704b8 --- /dev/null +++ b/tools/ramscrgen/elf.cpp @@ -0,0 +1,272 @@ +#include <cstdio> +#include <cstring> +#include <cstdint> +#include <map> +#include <vector> +#include <string> +#include "ramscrgen.h" +#include "elf.h" + +#define SHN_COMMON 0xFFF2 + +static std::string s_elfPath; +static std::string s_archiveFilePath; +static std::string s_archiveObjectPath; + +static FILE *s_file; + +static std::uint32_t s_sectionHeaderOffset; +static int s_sectionHeaderEntrySize; +static int s_sectionCount; +static int s_shstrtabIndex; + +static std::uint32_t s_symtabOffset; +static std::uint32_t s_strtabOffset; + +static std::uint32_t s_symbolCount; +static std::uint32_t s_elfFileOffset; + +struct Symbol +{ + std::uint32_t nameOffset; + std::uint32_t size; +}; + +static void Seek(long offset) +{ + if (std::fseek(s_file, s_elfFileOffset + offset, SEEK_SET) != 0) + FATAL_ERROR("error: failed to seek to %ld in \"%s\"", offset, s_elfPath.c_str()); +} + +static void Skip(long offset) +{ + if (std::fseek(s_file, offset, SEEK_CUR) != 0) + FATAL_ERROR("error: failed to skip %ld bytes in \"%s\"", offset, s_elfPath.c_str()); +} + +static std::uint32_t ReadInt8() +{ + int c = std::fgetc(s_file); + + if (c < 0) + FATAL_ERROR("error: unexpected EOF when reading ELF file \"%s\"\n", s_elfPath.c_str()); + + return c; +} + +static std::uint32_t ReadInt16() +{ + std::uint32_t val = 0; + val |= ReadInt8(); + val |= ReadInt8() << 8; + return val; +} + +static std::uint32_t ReadInt32() +{ + std::uint32_t val = 0; + val |= ReadInt8(); + val |= ReadInt8() << 8; + val |= ReadInt8() << 16; + val |= ReadInt8() << 24; + return val; +} + +static std::string ReadString() +{ + std::string s; + char c; + + while ((c = ReadInt8()) != 0) + s += c; + + return s; +} + +static void VerifyElfIdent() +{ + char expectedMagic[4] = { 0x7F, 'E', 'L', 'F' }; + char magic[4]; + + if (std::fread(magic, 4, 1, s_file) != 1) + FATAL_ERROR("error: failed to read ELF magic from \"%s\"\n", s_elfPath.c_str()); + + if (std::memcmp(magic, expectedMagic, 4) != 0) + FATAL_ERROR("error: ELF magic did not match in \"%s\"\n", s_elfPath.c_str()); + + if (std::fgetc(s_file) != 1) + FATAL_ERROR("error: \"%s\" not 32-bit ELF\n", s_elfPath.c_str()); + + if (std::fgetc(s_file) != 1) + FATAL_ERROR("error: \"%s\" not little-endian ELF\n", s_elfPath.c_str()); +} + +static void VerifyAr() +{ + char expectedMagic[8] = {'!', '<', 'a', 'r', 'c', 'h', '>', '\n'}; + char magic[8]; + + if (std::fread(magic, 8, 1, s_file) != 1) + FATAL_ERROR("error: failed to read AR magic from \"%s\"\n", s_archiveFilePath.c_str()); + + if (std::memcmp(magic, expectedMagic, 8) != 0) + FATAL_ERROR("error: AR magic did not match in \"%s\"\n", s_archiveFilePath.c_str()); +} + +static void ReadElfHeader() +{ + Seek(0x20); + s_sectionHeaderOffset = ReadInt32(); + Seek(0x2E); + s_sectionHeaderEntrySize = ReadInt16(); + s_sectionCount = ReadInt16(); + s_shstrtabIndex = ReadInt16(); +} + +static void FindArObj() +{ + char file_ident[17] = {0}; + char filesize_s[11] = {0}; + char expectedEndMagic[2] = { 0x60, 0x0a }; + char end_magic[2]; + std::size_t filesize; + + Seek(8); + while (!std::feof(s_file)) { + if (std::fread(file_ident, 16, 1, s_file) != 1) + FATAL_ERROR("error: failed to read file ident in \"%s\"\n", s_archiveFilePath.c_str()); + Skip(32); + if (std::fread(filesize_s, 10, 1, s_file) != 1) + FATAL_ERROR("error: failed to read filesize in \"%s\"\n", s_archiveFilePath.c_str()); + if (std::fread(end_magic, 2, 1, s_file) != 1) + FATAL_ERROR("error: failed to read end sentinel in \"%s\"\n", s_archiveFilePath.c_str()); + if (std::memcmp(end_magic, expectedEndMagic, 2) != 0) + FATAL_ERROR("error: corrupted archive header in \"%s\" at \"%s\"\n", s_archiveFilePath.c_str(), file_ident); + + char * ptr = std::strchr(file_ident, '/'); + if (ptr != nullptr) + *ptr = 0; + filesize = std::strtoul(filesize_s, nullptr, 10); + if (std::strncmp(s_archiveObjectPath.c_str(), file_ident, 16) == 0) { + s_elfFileOffset = std::ftell(s_file); + return; + } + Skip(filesize); + } + + FATAL_ERROR("error: could not find object \"%s\" in archive \"%s\"\n", s_archiveObjectPath.c_str(), s_archiveFilePath.c_str()); +} + +static std::string GetSectionName(std::uint32_t shstrtabOffset, int index) +{ + Seek(s_sectionHeaderOffset + s_sectionHeaderEntrySize * index); + std::uint32_t nameOffset = ReadInt32(); + Seek(shstrtabOffset + nameOffset); + return ReadString(); +} + +static void FindTableOffsets() +{ + s_symtabOffset = 0; + s_strtabOffset = 0; + + Seek(s_sectionHeaderOffset + s_sectionHeaderEntrySize * s_shstrtabIndex + 0x10); + std::uint32_t shstrtabOffset = ReadInt32(); + + for (int i = 0; i < s_sectionCount; i++) + { + std::string name = GetSectionName(shstrtabOffset, i); + + if (name == ".symtab") + { + if (s_symtabOffset) + FATAL_ERROR("error: mutiple .symtab sections found in \"%s\"\n", s_elfPath.c_str()); + Seek(s_sectionHeaderOffset + s_sectionHeaderEntrySize * i + 0x10); + s_symtabOffset = ReadInt32(); + std::uint32_t size = ReadInt32(); + s_symbolCount = size / 16; + } + else if (name == ".strtab") + { + if (s_strtabOffset) + FATAL_ERROR("error: mutiple .strtab sections found in \"%s\"\n", s_elfPath.c_str()); + Seek(s_sectionHeaderOffset + s_sectionHeaderEntrySize * i + 0x10); + s_strtabOffset = ReadInt32(); + } + } + + if (!s_symtabOffset) + FATAL_ERROR("error: couldn't find .symtab section in \"%s\"\n", s_elfPath.c_str()); + + if (!s_strtabOffset) + FATAL_ERROR("error: couldn't find .strtab section in \"%s\"\n", s_elfPath.c_str()); +} + +static std::map<std::string, std::uint32_t> GetCommonSymbols_Shared() +{ + VerifyElfIdent(); + ReadElfHeader(); + FindTableOffsets(); + + std::map<std::string, std::uint32_t> commonSymbols; + + std::vector<Symbol> commonSymbolVec; + + Seek(s_symtabOffset); + + for (std::uint32_t i = 0; i < s_symbolCount; i++) + { + Symbol sym; + sym.nameOffset = ReadInt32(); + Skip(4); + sym.size = ReadInt32(); + Skip(2); + std::uint16_t sectionIndex = ReadInt16(); + if (sectionIndex == SHN_COMMON) + commonSymbolVec.push_back(sym); + } + + for (const Symbol& sym : commonSymbolVec) + { + Seek(s_strtabOffset + sym.nameOffset); + std::string name = ReadString(); + commonSymbols[name] = sym.size; + } + + return commonSymbols; +} + +std::map<std::string, std::uint32_t> GetCommonSymbolsFromLib(std::string sourcePath, std::string libpath) +{ + std::size_t colonPos = libpath.find(':'); + if (colonPos == std::string::npos) + FATAL_ERROR("error: missing colon separator in libfile \"%s\"\n", s_elfPath.c_str()); + + s_archiveObjectPath = libpath.substr(colonPos + 1); + s_archiveFilePath = sourcePath + "/" + libpath.substr(1, colonPos - 1); + s_elfPath = sourcePath + "/" + libpath.substr(1); + + s_file = std::fopen(s_archiveFilePath.c_str(), "rb"); + + if (s_file == NULL) + FATAL_ERROR("error: failed to open \"%s\" for reading\n", s_archiveFilePath.c_str()); + + VerifyAr(); + FindArObj(); + return GetCommonSymbols_Shared(); +} + +std::map<std::string, std::uint32_t> GetCommonSymbols(std::string sourcePath, std::string path) +{ + s_elfFileOffset = 0; + if (path[0] == '*') + return GetCommonSymbolsFromLib(sourcePath, path); + + s_elfPath = sourcePath + "/" + path; + s_file = std::fopen(s_elfPath.c_str(), "rb"); + + if (s_file == NULL) + FATAL_ERROR("error: failed to open \"%s\" for reading\n", path.c_str()); + + return GetCommonSymbols_Shared(); +} diff --git a/tools/ramscrgen/elf.h b/tools/ramscrgen/elf.h new file mode 100644 index 000000000..3704860c0 --- /dev/null +++ b/tools/ramscrgen/elf.h @@ -0,0 +1,30 @@ +// Copyright(c) 2016 YamaArashi +// +// Permission is hereby granted, free of charge, to any person obtaining a copy +// of this software and associated documentation files (the "Software"), to deal +// in the Software without restriction, including without limitation the rights +// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +// copies of the Software, and to permit persons to whom the Software is +// furnished to do so, subject to the following conditions: +// +// The above copyright notice and this permission notice shall be included in +// all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +// THE SOFTWARE. + +#ifndef ELF_H +#define ELF_H + +#include <cstdint> +#include <map> +#include <string> + +std::map<std::string, std::uint32_t> GetCommonSymbols(std::string sourcePath, std::string path); + +#endif // ELF_H diff --git a/tools/ramscrgen/main.cpp b/tools/ramscrgen/main.cpp new file mode 100644 index 000000000..5e5894f47 --- /dev/null +++ b/tools/ramscrgen/main.cpp @@ -0,0 +1,187 @@ +// Copyright(c) 2016 YamaArashi +// +// Permission is hereby granted, free of charge, to any person obtaining a copy +// of this software and associated documentation files (the "Software"), to deal +// in the Software without restriction, including without limitation the rights +// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +// copies of the Software, and to permit persons to whom the Software is +// furnished to do so, subject to the following conditions: +// +// The above copyright notice and this permission notice shall be included in +// all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +// THE SOFTWARE. + +#include <cstdio> +#include <cstring> +#include <string> +#include "ramscrgen.h" +#include "sym_file.h" +#include "elf.h" + +void HandleCommonInclude(std::string filename, std::string sourcePath, std::string symOrderPath, std::string lang) +{ + auto commonSymbols = GetCommonSymbols(sourcePath, filename); + std::size_t dotIndex; + + if (filename[0] == '*') { + dotIndex = filename.find_last_of(':'); + filename = filename.substr(dotIndex + 1); + } + + dotIndex = filename.find_last_of('.'); + + if (dotIndex == std::string::npos) + FATAL_ERROR("error: \"%s\" doesn't have a file extension\n", filename.c_str()); + + std::string symOrderFilename = filename.substr(0, dotIndex + 1) + "txt"; + + SymFile symFile(symOrderPath + "/" + symOrderFilename); + + while (!symFile.IsAtEnd()) + { + symFile.HandleLangConditional(lang); + + std::string label = symFile.GetLabel(false); + + if (label.length() == 0) + { + unsigned long length; + if (symFile.ReadInteger(length)) + { + if (length & 3) + symFile.RaiseWarning("gap length %d is not multiple of 4", length); + printf(". += 0x%lX;\n", length); + } + } + else + { + if (commonSymbols.count(label) == 0) + symFile.RaiseError("no common symbol named \"%s\"", label.c_str()); + unsigned long size = commonSymbols[label]; + int alignment = 4; + if (size > 4) + alignment = 8; + if (size > 8) + alignment = 16; + printf(". = ALIGN(%d);\n", alignment); + printf("%s = .;\n", label.c_str()); + printf(". += 0x%lX;\n", size); + } + + symFile.ExpectEmptyRestOfLine(); + } +} + +void ConvertSymFile(std::string filename, std::string sectionName, std::string lang, bool common, std::string sourcePath, std::string commonSymPath, std::string libSourcePath) +{ + SymFile symFile(filename); + + while (!symFile.IsAtEnd()) + { + symFile.HandleLangConditional(lang); + + Directive directive = symFile.GetDirective(); + + switch (directive) + { + case Directive::Include: + { + std::string incFilename = symFile.ReadPath(); + symFile.ExpectEmptyRestOfLine(); + printf(". = ALIGN(4);\n"); + if (common) + HandleCommonInclude(incFilename, incFilename[0] == '*' ? libSourcePath : sourcePath, commonSymPath, lang); + else + printf("%s(%s);\n", incFilename.c_str(), sectionName.c_str()); + break; + } + case Directive::Space: + { + unsigned long length; + if (!symFile.ReadInteger(length)) + symFile.RaiseError("expected integer after .space directive"); + symFile.ExpectEmptyRestOfLine(); + printf(". += 0x%lX;\n", length); + break; + } + case Directive::Align: + { + unsigned long amount; + if (!symFile.ReadInteger(amount)) + symFile.RaiseError("expected integer after .align directive"); + if (amount > 4) + symFile.RaiseError("max alignment amount is 4"); + amount = 1UL << amount; + symFile.ExpectEmptyRestOfLine(); + printf(". = ALIGN(%lu);\n", amount); + break; + } + case Directive::Unknown: + { + std::string label = symFile.GetLabel(); + + if (label.length() != 0) + { + printf("%s = .;\n", label.c_str()); + } + + symFile.ExpectEmptyRestOfLine(); + + break; + } + } + } +} + +int main(int argc, char **argv) +{ + if (argc < 4) + { + fprintf(stderr, "Usage: %s SECTION_NAME SYM_FILE LANG [-c SRC_PATH,COMMON_SYM_PATH]", argv[0]); + return 1; + } + + bool common = false; + std::string sectionName = std::string(argv[1]); + std::string symFileName = std::string(argv[2]); + std::string lang = std::string(argv[3]); + std::string sourcePath; + std::string commonSymPath; + std::string libSourcePath; + + if (argc > 4) + { + if (std::strcmp(argv[4], "-c") != 0) + FATAL_ERROR("error: unrecognized argument \"%s\"\n", argv[4]); + + if (argc < 6) + FATAL_ERROR("error: missing SRC_PATH,COMMON_SYM_PATH after \"-c\"\n"); + + common = true; + std::string paths = std::string(argv[5]); + std::size_t commaPos = paths.find(','); + + if (commaPos == std::string::npos) + FATAL_ERROR("error: missing comma in argument after \"-c\"\n"); + + sourcePath = paths.substr(0, commaPos); + commonSymPath = paths.substr(commaPos + 1); + commaPos = commonSymPath.find(','); + if (commaPos == std::string::npos) { + libSourcePath = "tools/agbcc/lib"; + } else { + libSourcePath = commonSymPath.substr(commaPos + 1); + commonSymPath = commonSymPath.substr(0, commaPos); + } + } + + ConvertSymFile(symFileName, sectionName, lang, common, sourcePath, commonSymPath, libSourcePath); + return 0; +} diff --git a/tools/ramscrgen/ramscrgen.h b/tools/ramscrgen/ramscrgen.h new file mode 100644 index 000000000..1aed1c05a --- /dev/null +++ b/tools/ramscrgen/ramscrgen.h @@ -0,0 +1,49 @@ +// Copyright(c) 2016 YamaArashi +// +// Permission is hereby granted, free of charge, to any person obtaining a copy +// of this software and associated documentation files (the "Software"), to deal +// in the Software without restriction, including without limitation the rights +// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +// copies of the Software, and to permit persons to whom the Software is +// furnished to do so, subject to the following conditions: +// +// The above copyright notice and this permission notice shall be included in +// all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +// THE SOFTWARE. + +#ifndef RAMSCRGEN_H +#define RAMSCRGEN_H + +#include <cstdio> +#include <cstdlib> + +#ifdef _MSC_VER + +#define FATAL_ERROR(format, ...) \ +do \ +{ \ + std::fprintf(stderr, format, __VA_ARGS__); \ + std::exit(1); \ +} while (0) + +#else + +#define FATAL_ERROR(format, ...) \ +do \ +{ \ + std::fprintf(stderr, format, ##__VA_ARGS__); \ + std::exit(1); \ +} while (0) + +#endif // _MSC_VER + +const int kMaxPath = 256; + +#endif // RAMSCRGEN_H diff --git a/tools/ramscrgen/sym_file.cpp b/tools/ramscrgen/sym_file.cpp new file mode 100644 index 000000000..5379bd93f --- /dev/null +++ b/tools/ramscrgen/sym_file.cpp @@ -0,0 +1,492 @@ +// Copyright(c) 2016 YamaArashi +// +// Permission is hereby granted, free of charge, to any person obtaining a copy +// of this software and associated documentation files (the "Software"), to deal +// in the Software without restriction, including without limitation the rights +// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +// copies of the Software, and to permit persons to whom the Software is +// furnished to do so, subject to the following conditions: +// +// The above copyright notice and this permission notice shall be included in +// all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +// THE SOFTWARE. + +#include <cstdio> +#include <cstdarg> +#include <climits> +#include "ramscrgen.h" +#include "sym_file.h" +#include "char_util.h" + +SymFile::SymFile(std::string filename) : m_filename(filename) +{ + FILE *fp = std::fopen(filename.c_str(), "rb"); + + if (fp == NULL) + FATAL_ERROR("Failed to open \"%s\" for reading.\n", filename.c_str()); + + std::fseek(fp, 0, SEEK_END); + + m_size = std::ftell(fp); + + if (m_size < 0) + FATAL_ERROR("File size of \"%s\" is less than zero.\n", filename.c_str()); + + m_buffer = new char[m_size + 1]; + + std::rewind(fp); + + if (std::fread(m_buffer, m_size, 1, fp) != 1) + FATAL_ERROR("Failed to read \"%s\".\n", filename.c_str()); + + m_buffer[m_size] = 0; + + std::fclose(fp); + + m_pos = 0; + m_lineNum = 1; + m_lineStart = 0; + m_inLangConditional = false; + + RemoveComments(); +} + +SymFile::SymFile(SymFile&& other) : m_filename(std::move(other.m_filename)) +{ + m_buffer = other.m_buffer; + m_pos = other.m_pos; + m_size = other.m_size; + m_lineNum = other.m_lineNum; + m_lineStart = other.m_lineStart; + + other.m_buffer = nullptr; +} + +SymFile::~SymFile() +{ + delete[] m_buffer; +} + +// Removes comments to simplify further processing. +// It stops upon encountering a null character, +// which may or may not be the end of file marker. +// If it's not, the error will be caught later. +void SymFile::RemoveComments() +{ + long pos = 0; + char stringChar = 0; + + for (;;) + { + if (m_buffer[pos] == 0) + return; + + if (stringChar != 0) + { + if (m_buffer[pos] == '\\' && m_buffer[pos + 1] == stringChar) + { + pos += 2; + } + else + { + if (m_buffer[pos] == stringChar) + stringChar = 0; + pos++; + } + } + else if (m_buffer[pos] == '@' && (pos == 0 || m_buffer[pos - 1] != '\\')) + { + while (m_buffer[pos] != '\n' && m_buffer[pos] != 0) + m_buffer[pos++] = ' '; + } + else if (m_buffer[pos] == '/' && m_buffer[pos + 1] == '*') + { + m_buffer[pos++] = ' '; + m_buffer[pos++] = ' '; + + char commentStringChar = 0; + + for (;;) + { + if (m_buffer[pos] == 0) + return; + + if (commentStringChar != 0) + { + if (m_buffer[pos] == '\\' && m_buffer[pos + 1] == commentStringChar) + { + m_buffer[pos++] = ' '; + m_buffer[pos++] = ' '; + } + else + { + if (m_buffer[pos] == commentStringChar) + commentStringChar = 0; + if (m_buffer[pos] != '\n') + m_buffer[pos] = ' '; + pos++; + } + } + else + { + if (m_buffer[pos] == '*' && m_buffer[pos + 1] == '/') + { + m_buffer[pos++] = ' '; + m_buffer[pos++] = ' '; + break; + } + else + { + if (m_buffer[pos] == '"' || m_buffer[pos] == '\'') + commentStringChar = m_buffer[pos]; + if (m_buffer[pos] != '\n') + m_buffer[pos] = ' '; + pos++; + } + } + } + } + else + { + if (m_buffer[pos] == '"' || m_buffer[pos] == '\'') + stringChar = m_buffer[pos]; + pos++; + } + } +} + +// Checks if we're at a particular directive and if so, consumes it. +// Returns whether the directive was found. +bool SymFile::CheckForDirective(std::string name) +{ + long i; + long length = static_cast<long>(name.length()); + + for (i = 0; i < length && m_pos + i < m_size; i++) + if (name[i] != m_buffer[m_pos + i]) + return false; + + if (i < length) + return false; + + m_pos += length; + + return true; +} + +// Checks if we're at a known directive and if so, consumes it. +// Returns which directive was found. +Directive SymFile::GetDirective() +{ + SkipWhitespace(); + + if (CheckForDirective(".include")) + return Directive::Include; + else if (CheckForDirective(".space")) + return Directive::Space; + else if (CheckForDirective(".align")) + return Directive::Align; + else + return Directive::Unknown; +} + +// Checks if we're at label. +// Returns the name if so and an empty string if not. +std::string SymFile::GetLabel(bool requireColon) +{ + long start = m_pos; + long pos = m_pos; + + if (IsIdentifierStartingChar(m_buffer[pos])) + { + pos++; + + while (IsIdentifierChar(m_buffer[pos])) + pos++; + } + + if (requireColon) + { + if (m_buffer[pos] == ':') + { + if (pos != start) + m_pos = pos + 1; + } + else + { + pos = start; + } + } + else + { + m_pos = pos; + } + + return std::string(&m_buffer[start], pos - start); +} + +// Skips tabs and spaces. +void SymFile::SkipWhitespace() +{ + while (m_buffer[m_pos] == '\t' || m_buffer[m_pos] == ' ') + m_pos++; +} + +// Reads include path. +std::string SymFile::ReadPath() +{ + SkipWhitespace(); + + if (m_buffer[m_pos] != '"') + RaiseError("expected file path"); + + m_pos++; + + int length = 0; + long startPos = m_pos; + + while (m_buffer[m_pos] != '"') + { + unsigned char c = m_buffer[m_pos++]; + + if (c == 0) + { + if (m_pos >= m_size) + RaiseError("unexpected EOF in include string"); + else + RaiseError("unexpected null character in include string"); + } + + if (!IsAsciiPrintable(c)) + RaiseError("unexpected character '\\x%02X' in include string", c); + + // Don't bother allowing any escape sequences. + if (c == '\\') + { + c = m_buffer[m_pos]; + RaiseError("unexpected escape '\\%c' in include string", c); + } + + length++; + + if (length > kMaxPath) + RaiseError("path is too long"); + } + + m_pos++; // Go past the right quote. + + return std::string(&m_buffer[startPos], length); +} + +// If we're at a comma, consumes it. +// Returns whether a comma was found. +bool SymFile::ConsumeComma() +{ + if (m_buffer[m_pos] == ',') + { + m_pos++; + return true; + } + + return false; +} + +// Converts digit character to numerical value. +static int ConvertDigit(char c, int radix) +{ + int digit; + + if (c >= '0' && c <= '9') + digit = c - '0'; + else if (c >= 'A' && c <= 'F') + digit = 10 + c - 'A'; + else if (c >= 'a' && c <= 'f') + digit = 10 + c - 'a'; + else + return -1; + + return (digit < radix) ? digit : -1; +} + +// Reads an integer. +bool SymFile::ReadInteger(unsigned long& n) +{ + SkipWhitespace(); + + if (!IsAsciiDigit(m_buffer[m_pos])) + return false; + + int startPos = m_pos; + int radix = 10; + + if (m_buffer[m_pos] == '0' && m_buffer[m_pos + 1] == 'x') + { + radix = 16; + m_pos += 2; + } + + unsigned long cutoff = ULONG_MAX / radix; + unsigned long cutoffRemainder = ULONG_MAX % radix; + int digit; + + n = 0; + + while ((digit = ConvertDigit(m_buffer[m_pos], radix)) != -1) + { + if (n < cutoff || (n == cutoff && (unsigned long)digit <= cutoffRemainder)) + { + n = n * radix + digit; + } + else + { + m_pos++; + + while (ConvertDigit(m_buffer[m_pos], radix) != -1) + m_pos++; + + RaiseError("integer is too large (%s)", std::string(&m_buffer[startPos], m_pos - startPos).c_str()); + } + + m_pos++; + } + + return true; +} + +// Asserts that the rest of the line is empty and moves to the next one. +void SymFile::ExpectEmptyRestOfLine() +{ + SkipWhitespace(); + + if (m_buffer[m_pos] == 0) + { + if (m_pos >= m_size) + RaiseWarning("file doesn't end with newline"); + else + RaiseError("unexpected null character"); + } + else if (m_buffer[m_pos] == '\n') + { + m_pos++; + m_lineStart = m_pos; + m_lineNum++; + } + else if (m_buffer[m_pos] == '\r') + { + RaiseError("only Unix-style LF newlines are supported"); + } + else + { + RaiseError("junk at end of line"); + } +} + + +void SymFile::SkipLine() +{ + while (m_buffer[m_pos] != 0 && m_buffer[m_pos] != '\n') + m_pos++; + + if (m_buffer[m_pos] == '\n') + m_pos++; +} + +// Checks if we're at the end of the file. +bool SymFile::IsAtEnd() +{ + return (m_pos >= m_size); +} + +void SymFile::HandleLangConditional(std::string lang) +{ + if (m_buffer[m_pos] != '#') + return; + + m_pos++; + + if (CheckForDirective("begin")) + { + if (m_inLangConditional) + RaiseError("already inside language conditional"); + + SkipWhitespace(); + + std::string label = GetLabel(false); + + if (label.length() == 0) + RaiseError("no language name after #begin"); + + ExpectEmptyRestOfLine(); + + if (lang == label) + { + m_inLangConditional = true; + } + else + { + while (!IsAtEnd() && m_buffer[m_pos] != '#') + SkipLine(); + + if (m_buffer[m_pos] != '#') + RaiseError("unterminated language conditional"); + + m_pos++; + + if (!CheckForDirective("end")) + RaiseError("expected #end"); + + ExpectEmptyRestOfLine(); + } + } + else if (CheckForDirective("end")) + { + if (!m_inLangConditional) + RaiseError("not inside language conditional"); + + m_inLangConditional = false; + + ExpectEmptyRestOfLine(); + } + else + { + RaiseError("unknown # directive"); + } +} + +// Reports a diagnostic message. +void SymFile::ReportDiagnostic(const char* type, const char* format, std::va_list args) +{ + const int bufferSize = 1024; + char buffer[bufferSize]; + std::vsnprintf(buffer, bufferSize, format, args); + std::fprintf(stderr, "%s:%ld: %s: %s\n", m_filename.c_str(), m_lineNum, type, buffer); +} + +#define DO_REPORT(type) \ +do \ +{ \ + std::va_list args; \ + va_start(args, format); \ + ReportDiagnostic(type, format, args); \ + va_end(args); \ +} while (0) + +// Reports an error diagnostic and terminates the program. +void SymFile::RaiseError(const char* format, ...) +{ + DO_REPORT("error"); + std::exit(1); +} + +// Reports a warning diagnostic. +void SymFile::RaiseWarning(const char* format, ...) +{ + DO_REPORT("warning"); +} diff --git a/tools/ramscrgen/sym_file.h b/tools/ramscrgen/sym_file.h new file mode 100644 index 000000000..bb0c8038d --- /dev/null +++ b/tools/ramscrgen/sym_file.h @@ -0,0 +1,71 @@ +// Copyright(c) 2016 YamaArashi +// +// Permission is hereby granted, free of charge, to any person obtaining a copy +// of this software and associated documentation files (the "Software"), to deal +// in the Software without restriction, including without limitation the rights +// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +// copies of the Software, and to permit persons to whom the Software is +// furnished to do so, subject to the following conditions: +// +// The above copyright notice and this permission notice shall be included in +// all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +// THE SOFTWARE. + +#ifndef SYM_FILE_H +#define SYM_FILE_H + +#include <cstdarg> +#include <cstdint> +#include <string> +#include "ramscrgen.h" + +enum class Directive +{ + Include, + Space, + Align, + Unknown +}; + +class SymFile +{ +public: + SymFile(std::string filename); + SymFile(SymFile&& other); + SymFile(const SymFile&) = delete; + ~SymFile(); + Directive GetDirective(); + std::string GetLabel(bool requireColon = true); + std::string ReadPath(); + bool ReadInteger(unsigned long& value); + void ExpectEmptyRestOfLine(); + void SkipLine(); + bool IsAtEnd(); + void HandleLangConditional(std::string lang); + void RaiseError(const char* format, ...); + void RaiseWarning(const char* format, ...); + +private: + char* m_buffer; + long m_pos; + long m_size; + long m_lineNum; + long m_lineStart; + std::string m_filename; + bool m_inLangConditional; + + bool ConsumeComma(); + void RemoveComments(); + bool CheckForDirective(std::string name); + void SkipWhitespace(); + void ReportDiagnostic(const char* type, const char* format, std::va_list args); +}; + +#endif // SYM_FILE_H diff --git a/tools/rsfont/.gitignore b/tools/rsfont/.gitignore new file mode 100644 index 000000000..3140ececc --- /dev/null +++ b/tools/rsfont/.gitignore @@ -0,0 +1 @@ +rsfont diff --git a/tools/rsfont/LICENSE b/tools/rsfont/LICENSE new file mode 100644 index 000000000..b497950c1 --- /dev/null +++ b/tools/rsfont/LICENSE @@ -0,0 +1,19 @@ +Copyright (c) 2015-2016 YamaArashi + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. diff --git a/tools/rsfont/Makefile b/tools/rsfont/Makefile new file mode 100644 index 000000000..582be7b88 --- /dev/null +++ b/tools/rsfont/Makefile @@ -0,0 +1,15 @@ +CC = gcc + +CFLAGS = -Wall -Wextra -Werror -std=c11 -O2 -DPNG_SKIP_SETJMP_CHECK + +LIBS = -lpng -lz + +SRCS = main.c convert_png.c util.c font.c + +.PHONY: clean + +rsfont: $(SRCS) convert_png.h gfx.h global.h util.h font.h + $(CC) $(CFLAGS) $(SRCS) -o $@ $(LDFLAGS) $(LIBS) + +clean: + $(RM) rsfont rsfont.exe diff --git a/tools/rsfont/convert_png.c b/tools/rsfont/convert_png.c new file mode 100644 index 000000000..f6a30804a --- /dev/null +++ b/tools/rsfont/convert_png.c @@ -0,0 +1,169 @@ +// Copyright (c) 2015 YamaArashi + +#include <stdio.h> +#include <setjmp.h> +#include <png.h> +#include "global.h" +#include "convert_png.h" +#include "gfx.h" + +void ReadPng(char *path, struct Image *image) +{ + FILE *fp = fopen(path, "rb"); + + if (fp == NULL) + FATAL_ERROR("Failed to open \"%s\" for reading.\n", path); + + unsigned char sig[8]; + + if (fread(sig, 8, 1, fp) != 1) + FATAL_ERROR("Failed to read PNG signature from \"%s\".\n", path); + + if (png_sig_cmp(sig, 0, 8)) + FATAL_ERROR("\"%s\" does not have a valid PNG signature.\n", path); + + png_structp png_ptr = png_create_read_struct(PNG_LIBPNG_VER_STRING, NULL, NULL, NULL); + + if (!png_ptr) + FATAL_ERROR("Failed to create PNG read struct.\n"); + + png_infop info_ptr = png_create_info_struct(png_ptr); + + if (!info_ptr) + FATAL_ERROR("Failed to create PNG info struct.\n"); + + if (setjmp(png_jmpbuf(png_ptr))) + FATAL_ERROR("Failed to init I/O for reading \"%s\".\n", path); + + png_init_io(png_ptr, fp); + png_set_sig_bytes(png_ptr, 8); + png_read_info(png_ptr, info_ptr); + + int bit_depth = png_get_bit_depth(png_ptr, info_ptr); + + if (bit_depth != image->bitDepth) + FATAL_ERROR("\"%s\" has a bit depth of %d, but the expected bit depth is %d.\n", path, bit_depth, image->bitDepth); + + int color_type = png_get_color_type(png_ptr, info_ptr); + + if (color_type != PNG_COLOR_TYPE_GRAY && color_type != PNG_COLOR_TYPE_PALETTE) + FATAL_ERROR("\"%s\" has an unsupported color type.\n", path); + + // Check if the image has a palette so that we can tell if the colors need to be inverted later. + // Don't read the palette because it's not needed for now. + image->hasPalette = (color_type == PNG_COLOR_TYPE_PALETTE); + + image->width = png_get_image_width(png_ptr, info_ptr); + image->height = png_get_image_height(png_ptr, info_ptr); + + int rowbytes = png_get_rowbytes(png_ptr, info_ptr); + + image->pixels = malloc(image->height * rowbytes); + + if (image->pixels == NULL) + FATAL_ERROR("Failed to allocate pixel buffer.\n"); + + png_bytepp row_pointers = malloc(image->height * sizeof(png_bytep)); + + if (row_pointers == NULL) + FATAL_ERROR("Failed to allocate row pointers.\n"); + + for (int i = 0; i < image->height; i++) + row_pointers[i] = (png_bytep)(image->pixels + (i * rowbytes)); + + if (setjmp(png_jmpbuf(png_ptr))) + FATAL_ERROR("Error reading from \"%s\".\n", path); + + png_read_image(png_ptr, row_pointers); + + png_destroy_read_struct(&png_ptr, &info_ptr, NULL); + + free(row_pointers); + fclose(fp); +} + +void SetPngPalette(png_structp png_ptr, png_infop info_ptr, struct Palette *palette) +{ + png_colorp colors = malloc(palette->numColors * sizeof(png_color)); + + if (colors == NULL) + FATAL_ERROR("Failed to allocate PNG palette.\n"); + + for (int i = 0; i < palette->numColors; i++) { + colors[i].red = palette->colors[i].red; + colors[i].green = palette->colors[i].green; + colors[i].blue = palette->colors[i].blue; + } + + png_set_PLTE(png_ptr, info_ptr, colors, palette->numColors); + + free(colors); +} + +void WritePng(char *path, struct Image *image) +{ + FILE *fp = fopen(path, "wb"); + + if (fp == NULL) + FATAL_ERROR("Failed to open \"%s\" for writing.\n", path); + + png_structp png_ptr = png_create_write_struct(PNG_LIBPNG_VER_STRING, NULL, NULL, NULL); + + if (!png_ptr) + FATAL_ERROR("Failed to create PNG write struct.\n"); + + png_infop info_ptr = png_create_info_struct(png_ptr); + + if (!info_ptr) + FATAL_ERROR("Failed to create PNG info struct.\n"); + + if (setjmp(png_jmpbuf(png_ptr))) + FATAL_ERROR("Failed to init I/O for writing \"%s\".\n", path); + + png_init_io(png_ptr, fp); + + if (setjmp(png_jmpbuf(png_ptr))) + FATAL_ERROR("Error writing header for \"%s\".\n", path); + + int color_type = image->hasPalette ? PNG_COLOR_TYPE_PALETTE : PNG_COLOR_TYPE_GRAY; + + png_set_IHDR(png_ptr, info_ptr, image->width, image->height, + image->bitDepth, color_type, PNG_INTERLACE_NONE, + PNG_COMPRESSION_TYPE_BASE, PNG_FILTER_TYPE_BASE); + + if (image->hasPalette) { + SetPngPalette(png_ptr, info_ptr, &image->palette); + + if (image->hasTransparency) { + png_byte trans = 0; + png_set_tRNS(png_ptr, info_ptr, &trans, 1, 0); + } + } + + png_write_info(png_ptr, info_ptr); + + png_bytepp row_pointers = malloc(image->height * sizeof(png_bytep)); + + if (row_pointers == NULL) + FATAL_ERROR("Failed to allocate row pointers.\n"); + + int rowbytes = png_get_rowbytes(png_ptr, info_ptr); + + for (int i = 0; i < image->height; i++) + row_pointers[i] = (png_bytep)(image->pixels + (i * rowbytes)); + + if (setjmp(png_jmpbuf(png_ptr))) + FATAL_ERROR("Error writing \"%s\".\n", path); + + png_write_image(png_ptr, row_pointers); + + if (setjmp(png_jmpbuf(png_ptr))) + FATAL_ERROR("Error ending write of \"%s\".\n", path); + + png_write_end(png_ptr, NULL); + + fclose(fp); + + png_destroy_write_struct(&png_ptr, &info_ptr); + free(row_pointers); +} diff --git a/tools/rsfont/convert_png.h b/tools/rsfont/convert_png.h new file mode 100644 index 000000000..55d3d6942 --- /dev/null +++ b/tools/rsfont/convert_png.h @@ -0,0 +1,11 @@ +// Copyright (c) 2015 YamaArashi + +#ifndef CONVERT_PNG_H +#define CONVERT_PNG_H + +#include "gfx.h" + +void ReadPng(char *path, struct Image *image); +void WritePng(char *path, struct Image *image); + +#endif // CONVERT_PNG_H diff --git a/tools/rsfont/font.c b/tools/rsfont/font.c new file mode 100644 index 000000000..ed48b31e6 --- /dev/null +++ b/tools/rsfont/font.c @@ -0,0 +1,455 @@ +// Copyright(c) 2015-2016 YamaArashi +// +// Permission is hereby granted, free of charge, to any person obtaining a copy +// of this software and associated documentation files (the "Software"), to deal +// in the Software without restriction, including without limitation the rights +// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +// copies of the Software, and to permit persons to whom the Software is +// furnished to do so, subject to the following conditions: +// +// The above copyright notice and this permission notice shall be included in +// all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +// THE SOFTWARE. + +#include <stdio.h> +#include <stdlib.h> +#include <stdint.h> +#include <stdbool.h> +#include "global.h" +#include "font.h" +#include "gfx.h" +#include "util.h" + +unsigned char gFontPalette[][3] = +{ + {0xFF, 0xFF, 0xFF}, // bg (white) + {0x38, 0x38, 0x38}, // fg (dark grey) + {0xD8, 0xD8, 0xD8}, // shadow (light grey) +}; + +void ConvertFromTiles1Bpp(unsigned char *src, unsigned char *dest, int numGlyphs, int layout) +{ + for (int glyph = 0; glyph < numGlyphs; glyph++) + { + if (layout == 0) + { + for (int i = 0; i < 8; i++) + { + uint8_t srcRow = src[(glyph * 8) + i]; + + for (int j = 0; j < 8; j++) + { + int x = ((glyph % 16) * 8) + j; + int y = ((glyph / 16) * 8) + i; + dest[(y * 128) + x] = (srcRow >> (7 - j)) & 1; + } + } + } + else + { + // layout type 1 + + int tile1Offset = glyph * 16; + int tile2Offset = tile1Offset + 8; + + for (int i = 0; i < 8; i++) + { + uint8_t srcRow = src[tile1Offset + i]; + + for (int j = 0; j < 8; j++) + { + int x = ((glyph % 16) * 8) + j; + int y = ((glyph / 16) * 16) + i; + dest[(y * 128) + x] = (srcRow >> (7 - j)) & 1; + } + } + + for (int i = 0; i < 8; i++) + { + uint8_t srcRow = src[tile2Offset + i]; + + for (int j = 0; j < 8; j++) + { + int x = ((glyph % 16) * 8) + j; + int y = ((glyph / 16) * 16) + 8 + i; + dest[(y * 128) + x] = (srcRow >> (7 - j)) & 1; + } + } + } + } +} + +void ConvertToTiles1Bpp(unsigned char *src, unsigned char *dest, int numGlyphs, int layout) +{ + for (int glyph = 0; glyph < numGlyphs; glyph++) + { + if (layout == 0) + { + for (int i = 0; i < 8; i++) + { + uint8_t destRow = 0; + + for (int j = 0; j < 8; j++) + { + int x = ((glyph % 16) * 8) + j; + int y = ((glyph / 16) * 8) + i; + unsigned char color = src[(y * 128) + x]; + + if (color > 1) + FATAL_ERROR("More than 2 colors in 1 BPP font.\n"); + + destRow <<= 1; + destRow |= color; + } + + dest[(glyph * 8) + i] = destRow; + } + } + else + { + // layout type 1 + + int tile1Offset = glyph * 16; + int tile2Offset = tile1Offset + 8; + + for (int i = 0; i < 8; i++) + { + uint8_t destRow = 0; + + for (int j = 0; j < 8; j++) + { + int x = ((glyph % 16) * 8) + j; + int y = ((glyph / 16) * 16) + i; + unsigned char color = src[(y * 128) + x]; + + if (color > 1) + FATAL_ERROR("More than 2 colors in 1 BPP font.\n"); + + destRow <<= 1; + destRow |= color; + } + + dest[tile1Offset + i] = destRow; + } + + for (int i = 0; i < 8; i++) + { + uint8_t destRow = 0; + + for (int j = 0; j < 8; j++) + { + int x = ((glyph % 16) * 8) + j; + int y = ((glyph / 16) * 16) + 8 + i; + unsigned char color = src[(y * 128) + x]; + + if (color > 1) + FATAL_ERROR("More than 2 colors in 1 BPP font.\n"); + + destRow <<= 1; + destRow |= color; + } + + dest[tile2Offset + i] = destRow; + } + } + } +} + +void ConvertFromTiles4Bpp(unsigned char *src, unsigned char *dest, int numGlyphs, int layout) +{ + static unsigned char table[16] = + { + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 1, + }; + + for (int glyph = 0; glyph < numGlyphs; glyph++) + { + if (layout == 0) + { + int offset = glyph * 32; + + for (int i = 0; i < 8; i++) + { + uint32_t srcRow = (src[offset + 3] << 24) + | (src[offset + 2] << 16) + | (src[offset + 1] << 8) + | src[offset]; + + for (int j = 0; j < 8; j++) + { + int x = ((glyph % 16) * 8) + j; + int y = ((glyph / 16) * 8) + i; + dest[(y * 128) + x] = table[srcRow & 0xF]; + srcRow >>= 4; + } + + offset += 4; + } + } + else + { + int tile1Offset; + int tile2Offset; + + if (layout == 1) + { + tile1Offset = glyph * 64; + tile2Offset = tile1Offset + 32; + } + else + { + tile1Offset = ((glyph / 16) * 1024) + ((glyph % 16) * 32); + tile2Offset = tile1Offset + 512; + } + + for (int i = 0; i < 8; i++) + { + uint32_t srcRow = (src[tile1Offset + 3] << 24) + | (src[tile1Offset + 2] << 16) + | (src[tile1Offset + 1] << 8) + | src[tile1Offset]; + + for (int j = 0; j < 8; j++) + { + int x = ((glyph % 16) * 8) + j; + int y = ((glyph / 16) * 16) + i; + dest[(y * 128) + x] = table[srcRow & 0xF]; + srcRow >>= 4; + } + + tile1Offset += 4; + } + + for (int i = 0; i < 8; i++) + { + uint32_t srcRow = (src[tile2Offset + 3] << 24) + | (src[tile2Offset + 2] << 16) + | (src[tile2Offset + 1] << 8) + | src[tile2Offset]; + + for (int j = 0; j < 8; j++) + { + int x = ((glyph % 16) * 8) + j; + int y = ((glyph / 16) * 16) + 8 + i; + dest[(y * 128) + x] = table[srcRow & 0xF]; + srcRow >>= 4; + } + + tile2Offset += 4; + } + } + } +} + +void ConvertToTiles4Bpp(unsigned char *src, unsigned char *dest, int numGlyphs, int layout) +{ + static unsigned char table[3] = + { + 0, 15, 14, + }; + + for (int glyph = 0; glyph < numGlyphs; glyph++) + { + if (layout == 0) + { + int offset = glyph * 32; + + for (int i = 0; i < 8; i++) + { + uint32_t destRow = 0; + + for (int j = 0; j < 8; j++) + { + int x = ((glyph % 16) * 8) + j; + int y = ((glyph / 16) * 8) + i; + unsigned char color = src[(y * 128) + x]; + + if (color > 2) + FATAL_ERROR("More than 3 colors in 4 BPP font.\n"); + + destRow >>= 4; + destRow |= (table[color] << 28); + } + + dest[offset] = destRow & 0xFF; + dest[offset + 1] = (destRow >> 8) & 0xFF; + dest[offset + 2] = (destRow >> 16) & 0xFF; + dest[offset + 3] = (destRow >> 24) & 0xFF; + + offset += 4; + } + } + else + { + int tile1Offset; + int tile2Offset; + + if (layout == 1) + { + tile1Offset = glyph * 64; + tile2Offset = tile1Offset + 32; + } + else + { + tile1Offset = ((glyph / 16) * 1024) + ((glyph % 16) * 32); + tile2Offset = tile1Offset + 512; + } + + for (int i = 0; i < 8; i++) + { + uint32_t destRow = 0; + + for (int j = 0; j < 8; j++) + { + int x = ((glyph % 16) * 8) + j; + int y = ((glyph / 16) * 16) + i; + unsigned char color = src[(y * 128) + x]; + + if (color > 2) + FATAL_ERROR("More than 3 colors in 4 BPP font.\n"); + + destRow >>= 4; + destRow |= (table[color] << 28); + } + + dest[tile1Offset] = destRow & 0xFF; + dest[tile1Offset + 1] = (destRow >> 8) & 0xFF; + dest[tile1Offset + 2] = (destRow >> 16) & 0xFF; + dest[tile1Offset + 3] = (destRow >> 24) & 0xFF; + + tile1Offset += 4; + } + + for (int i = 0; i < 8; i++) + { + uint32_t destRow = 0; + + for (int j = 0; j < 8; j++) + { + int x = ((glyph % 16) * 8) + j; + int y = ((glyph / 16) * 16) + 8 + i; + unsigned char color = src[(y * 128) + x]; + + if (color > 2) + FATAL_ERROR("More than 3 colors in 4 BPP font.\n"); + + destRow >>= 4; + destRow |= (table[color] << 28); + } + + dest[tile2Offset] = destRow & 0xFF; + dest[tile2Offset + 1] = (destRow >> 8) & 0xFF; + dest[tile2Offset + 2] = (destRow >> 16) & 0xFF; + dest[tile2Offset + 3] = (destRow >> 24) & 0xFF; + + tile2Offset += 4; + } + } + } +} + +static void SetFontPalette(struct Image *image) +{ + image->hasPalette = true; + + image->palette.numColors = 3; + + for (int i = 0; i < image->palette.numColors; i++) + { + image->palette.colors[i].red = gFontPalette[i][0]; + image->palette.colors[i].green = gFontPalette[i][1]; + image->palette.colors[i].blue = gFontPalette[i][2]; + } + + image->hasTransparency = false; +} + +int CalcFileSize(int numGlyphs, int bpp, int layout) +{ + if (layout == 2) + { + // assume 4 BPP + int numFullRows = numGlyphs / 16; + int remainder = numGlyphs % 16; + int fullRowsSize = numFullRows * 1024; + int remainderSize = 0; + + if (remainder != 0) + remainderSize = 1024 - (16 - remainder) * 32; + + return fullRowsSize + remainderSize; + } + else + { + int tilesPerGlyph = layout > 0 ? 2 : 1; + int bytesPerTile = 8 * bpp; + return numGlyphs * tilesPerGlyph * bytesPerTile; + } +} + +void ReadFont(char *path, struct Image *image, int numGlyphs, int bpp, int layout) +{ + int fileSize; + unsigned char *buffer = ReadWholeFile(path, &fileSize); + + int expectedFileSize = CalcFileSize(numGlyphs, bpp, layout); + + if (fileSize != expectedFileSize) + FATAL_ERROR("The file size is %d but should be %d.\n", fileSize, expectedFileSize); + + int numRows = (numGlyphs + 15) / 16; + int rowHeight = layout > 0 ? 16 : 8; + + image->width = 128; + image->height = numRows * rowHeight; + image->bitDepth = 8; + image->pixels = calloc(image->width * image->height, 1); + + if (image->pixels == NULL) + FATAL_ERROR("Failed to allocate memory for font.\n"); + + if (bpp == 1) + ConvertFromTiles1Bpp(buffer, image->pixels, numGlyphs, layout); + else + ConvertFromTiles4Bpp(buffer, image->pixels, numGlyphs, layout); + + free(buffer); + + SetFontPalette(image); +} + +void WriteFont(char *path, struct Image *image, int numGlyphs, int bpp, int layout) +{ + if (image->width != 128) + FATAL_ERROR("The width of the font image (%d) is not 128.\n", image->width); + + int numRows = (numGlyphs + 15) / 16; + int rowHeight = layout > 0 ? 16 : 8; + int expectedHeight = numRows * rowHeight; + + if (image->height < expectedHeight) + FATAL_ERROR("The height of the font image (%d) is less than %d.\n", image->height, expectedHeight); + + int fileSize = CalcFileSize(numGlyphs, bpp, layout); + + unsigned char *buffer = calloc(fileSize, 1); + + if (buffer == NULL) + FATAL_ERROR("Failed to allocate memory for font.\n"); + + if (bpp == 1) + ConvertToTiles1Bpp(image->pixels, buffer, numGlyphs, layout); + else + ConvertToTiles4Bpp(image->pixels, buffer, numGlyphs, layout); + + WriteWholeFile(path, buffer, fileSize); + + free(buffer); +} diff --git a/tools/rsfont/font.h b/tools/rsfont/font.h new file mode 100644 index 000000000..1cd48757f --- /dev/null +++ b/tools/rsfont/font.h @@ -0,0 +1,30 @@ +// Copyright(c) 2015-2016 YamaArashi +// +// Permission is hereby granted, free of charge, to any person obtaining a copy +// of this software and associated documentation files (the "Software"), to deal +// in the Software without restriction, including without limitation the rights +// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +// copies of the Software, and to permit persons to whom the Software is +// furnished to do so, subject to the following conditions: +// +// The above copyright notice and this permission notice shall be included in +// all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +// THE SOFTWARE. + +#ifndef FONT_H +#define FONT_H + +#include <stdbool.h> +#include "gfx.h" + +void ReadFont(char *path, struct Image *image, int numGlyphs, int bpp, int layout); +void WriteFont(char *path, struct Image *image, int numGlyphs, int bpp, int layout); + +#endif // FONT_H diff --git a/tools/rsfont/gfx.h b/tools/rsfont/gfx.h new file mode 100644 index 000000000..04a3d80c7 --- /dev/null +++ b/tools/rsfont/gfx.h @@ -0,0 +1,50 @@ +// Copyright(c) 2015-2016 YamaArashi +// +// Permission is hereby granted, free of charge, to any person obtaining a copy +// of this software and associated documentation files (the "Software"), to deal +// in the Software without restriction, including without limitation the rights +// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +// copies of the Software, and to permit persons to whom the Software is +// furnished to do so, subject to the following conditions: +// +// The above copyright notice and this permission notice shall be included in +// all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +// THE SOFTWARE. + +#ifndef GFX_H +#define GFX_H + +#include <stdint.h> +#include <stdbool.h> + +struct Color +{ + unsigned char red; + unsigned char green; + unsigned char blue; +}; + +struct Palette +{ + struct Color colors[256]; + int numColors; +}; + +struct Image { + int width; + int height; + int bitDepth; + unsigned char *pixels; + bool hasPalette; + struct Palette palette; + bool hasTransparency; +}; + +#endif // GFX_H diff --git a/tools/rsfont/global.h b/tools/rsfont/global.h new file mode 100644 index 000000000..65dd351d2 --- /dev/null +++ b/tools/rsfont/global.h @@ -0,0 +1,31 @@ +// Copyright (c) 2015 YamaArashi + +#ifndef GLOBAL_H +#define GLOBAL_H + +#include <stdio.h> +#include <stdlib.h> + +#ifdef _MSC_VER + +#define FATAL_ERROR(format, ...) \ +do { \ + fprintf(stderr, format, __VA_ARGS__); \ + exit(1); \ +} while (0) + +#define UNUSED + +#else + +#define FATAL_ERROR(format, ...) \ +do { \ + fprintf(stderr, format, ##__VA_ARGS__); \ + exit(1); \ +} while (0) + +#define UNUSED __attribute__((__unused__)) + +#endif // _MSC_VER + +#endif // GLOBAL_H diff --git a/tools/rsfont/main.c b/tools/rsfont/main.c new file mode 100644 index 000000000..2f5d9d971 --- /dev/null +++ b/tools/rsfont/main.c @@ -0,0 +1,93 @@ +// Copyright(c) 2015-2016 YamaArashi +// +// Permission is hereby granted, free of charge, to any person obtaining a copy +// of this software and associated documentation files (the "Software"), to deal +// in the Software without restriction, including without limitation the rights +// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +// copies of the Software, and to permit persons to whom the Software is +// furnished to do so, subject to the following conditions: +// +// The above copyright notice and this permission notice shall be included in +// all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +// THE SOFTWARE. + +#include <stdio.h> +#include <string.h> +#include <stdbool.h> +#include "global.h" +#include "util.h" +#include "gfx.h" +#include "convert_png.h" +#include "font.h" + +int ExtensionToBpp(const char *extension) +{ + if (!strcmp(extension, "1bpp")) + return 1; + else if (!strcmp(extension, "4bpp")) + return 4; + return 0; +} + +int main(int argc, char **argv) +{ + if (argc < 5) + FATAL_ERROR("Usage: rsfont INPUT_FILE OUTPUT_FILE NUM_GLYPHS LAYOUT_TYPE\n"); + + char *inputPath = argv[1]; + char *outputPath = argv[2]; + char *inputFileExtension = GetFileExtension(inputPath); + char *outputFileExtension = GetFileExtension(outputPath); + + if (inputFileExtension == NULL) + FATAL_ERROR("Input file \"%s\" has no extension.\n", inputPath); + + if (outputFileExtension == NULL) + FATAL_ERROR("Output file \"%s\" has no extension.\n", outputPath); + + int numGlyphs; + int bpp; + int layout; + + if (!ParseNumber(argv[3], NULL, 10, &numGlyphs)) + FATAL_ERROR("Failed to parse number of glyphs.\n"); + + if (!ParseNumber(argv[4], NULL, 10, &layout)) + FATAL_ERROR("Failed to parse layout type.\n"); + + if (layout < 0 || layout > 2) + FATAL_ERROR("Layout type %d is invalid. Layout type must be 0, 1, or 2.\n", layout); + + bool toPng; + + if (!strcmp(inputFileExtension, "png") && (bpp = ExtensionToBpp(outputFileExtension)) != 0) + toPng = false; + else if ((bpp = ExtensionToBpp(inputFileExtension)) != 0 && !strcmp(outputFileExtension, "png")) + toPng = true; + else + FATAL_ERROR("Don't know how to convert \"%s\" to \"%s\".\n", inputPath, outputPath); + + if (bpp == 1 && layout == 2) + FATAL_ERROR("Layout type 2 is not supported with 1 BPP fonts.\n"); + + struct Image image; + + if (toPng) + { + ReadFont(inputPath, &image, numGlyphs, bpp, layout); + WritePng(outputPath, &image); + } + else + { + image.bitDepth = 8; + ReadPng(inputPath, &image); + WriteFont(outputPath, &image, numGlyphs, bpp, layout); + } +} diff --git a/tools/rsfont/util.c b/tools/rsfont/util.c new file mode 100644 index 000000000..87abeb31c --- /dev/null +++ b/tools/rsfont/util.c @@ -0,0 +1,124 @@ +// Copyright (c) 2015 YamaArashi + +#include <stdio.h> +#include <stdlib.h> +#include <string.h> +#include <stdbool.h> +#include <errno.h> +#include <limits.h> +#include "global.h" +#include "util.h" + +bool ParseNumber(char *s, char **end, int radix, int *intValue) +{ + char *localEnd; + + if (end == NULL) + end = &localEnd; + + errno = 0; + + const long longValue = strtol(s, end, radix); + + if (*end == s) + return false; // not a number + + if ((longValue == LONG_MIN || longValue == LONG_MAX) && errno == ERANGE) + return false; + + if (longValue > INT_MAX) + return false; + + if (longValue < INT_MIN) + return false; + + *intValue = (int)longValue; + + return true; +} + +char *GetFileExtension(char *path) +{ + char *extension = path; + + while (*extension != 0) + extension++; + + while (extension > path && *extension != '.') + extension--; + + if (extension == path) + return NULL; + + extension++; + + if (*extension == 0) + return NULL; + + return extension; +} + +unsigned char *ReadWholeFile(char *path, int *size) +{ + FILE *fp = fopen(path, "rb"); + + if (fp == NULL) + FATAL_ERROR("Failed to open \"%s\" for reading.\n", path); + + fseek(fp, 0, SEEK_END); + + *size = ftell(fp); + + unsigned char *buffer = malloc(*size); + + if (buffer == NULL) + FATAL_ERROR("Failed to allocate memory for reading \"%s\".\n", path); + + rewind(fp); + + if (fread(buffer, *size, 1, fp) != 1) + FATAL_ERROR("Failed to read \"%s\".\n", path); + + fclose(fp); + + return buffer; +} + +unsigned char *ReadWholeFileZeroPadded(char *path, int *size, int padAmount) +{ + FILE *fp = fopen(path, "rb"); + + if (fp == NULL) + FATAL_ERROR("Failed to open \"%s\" for reading.\n", path); + + fseek(fp, 0, SEEK_END); + + *size = ftell(fp); + + unsigned char *buffer = calloc(*size + padAmount, 1); + + if (buffer == NULL) + FATAL_ERROR("Failed to allocate memory for reading \"%s\".\n", path); + + rewind(fp); + + if (fread(buffer, *size, 1, fp) != 1) + FATAL_ERROR("Failed to read \"%s\".\n", path); + + fclose(fp); + + return buffer; +} + +void WriteWholeFile(char *path, void *buffer, int bufferSize) +{ + FILE *fp = fopen(path, "wb"); + + if (fp == NULL) + FATAL_ERROR("Failed to open \"%s\" for writing.\n", path); + + if (fwrite(buffer, bufferSize, 1, fp) != 1) + FATAL_ERROR("Failed to write to \"%s\".\n", path); + + fclose(fp); +} diff --git a/tools/rsfont/util.h b/tools/rsfont/util.h new file mode 100644 index 000000000..6d7a9c21e --- /dev/null +++ b/tools/rsfont/util.h @@ -0,0 +1,14 @@ +// Copyright (c) 2015 YamaArashi + +#ifndef UTIL_H +#define UTIL_H + +#include <stdbool.h> + +bool ParseNumber(char *s, char **end, int radix, int *intValue); +char *GetFileExtension(char *path); +unsigned char *ReadWholeFile(char *path, int *size); +unsigned char *ReadWholeFileZeroPadded(char *path, int *size, int padAmount); +void WriteWholeFile(char *path, void *buffer, int bufferSize); + +#endif // UTIL_H diff --git a/tools/scaninc/.gitignore b/tools/scaninc/.gitignore new file mode 100644 index 000000000..94bfbf989 --- /dev/null +++ b/tools/scaninc/.gitignore @@ -0,0 +1 @@ +scaninc diff --git a/tools/scaninc/LICENSE b/tools/scaninc/LICENSE new file mode 100644 index 000000000..b66bf81c0 --- /dev/null +++ b/tools/scaninc/LICENSE @@ -0,0 +1,19 @@ +Copyright (c) 2015 YamaArashi + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. diff --git a/tools/scaninc/Makefile b/tools/scaninc/Makefile new file mode 100644 index 000000000..367a3350b --- /dev/null +++ b/tools/scaninc/Makefile @@ -0,0 +1,15 @@ +CXX = g++ + +CXXFLAGS = -Wall -Werror -std=c++11 -O2 + +SRCS = scaninc.cpp c_file.cpp asm_file.cpp + +HEADERS := scaninc.h asm_file.h c_file.h + +.PHONY: clean + +scaninc: $(SRCS) $(HEADERS) + $(CXX) $(CXXFLAGS) $(SRCS) -o $@ $(LDFLAGS) + +clean: + $(RM) scaninc scaninc.exe diff --git a/tools/scaninc/asm_file.cpp b/tools/scaninc/asm_file.cpp new file mode 100644 index 000000000..6322749e2 --- /dev/null +++ b/tools/scaninc/asm_file.cpp @@ -0,0 +1,191 @@ +// Copyright(c) 2015-2017 YamaArashi +// +// Permission is hereby granted, free of charge, to any person obtaining a copy +// of this software and associated documentation files (the "Software"), to deal +// in the Software without restriction, including without limitation the rights +// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +// copies of the Software, and to permit persons to whom the Software is +// furnished to do so, subject to the following conditions: +// +// The above copyright notice and this permission notice shall be included in +// all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +// THE SOFTWARE. + +#include <cstdio> +#include <string> +#include "scaninc.h" +#include "asm_file.h" + +AsmFile::AsmFile(std::string path) +{ + m_path = path; + + FILE *fp = std::fopen(path.c_str(), "rb"); + + if (fp == NULL) + FATAL_ERROR("Failed to open \"%s\" for reading.\n", path.c_str()); + + std::fseek(fp, 0, SEEK_END); + + m_size = std::ftell(fp); + + m_buffer = new char[m_size]; + + std::rewind(fp); + + if (std::fread(m_buffer, m_size, 1, fp) != 1) + FATAL_ERROR("Failed to read \"%s\".\n", path.c_str()); + + std::fclose(fp); + + m_pos = 0; + m_lineNum = 1; +} + +AsmFile::~AsmFile() +{ + delete[] m_buffer; +} + +IncDirectiveType AsmFile::ReadUntilIncDirective(std::string &path) +{ + // At the beginning of each loop iteration, the current file position + // should be at the start of a line or at the end of the file. + for (;;) + { + SkipTabsAndSpaces(); + + IncDirectiveType incDirectiveType = IncDirectiveType::None; + + if (PeekChar() == '.') + { + m_pos++; + + if (MatchIncDirective("incbin", path)) + incDirectiveType = IncDirectiveType::Incbin; + else if (MatchIncDirective("include", path)) + incDirectiveType = IncDirectiveType::Include; + } + + for (;;) + { + int c = GetChar(); + + if (c == -1) + return incDirectiveType; + + if (c == ';') + { + SkipEndOfLineComment(); + break; + } + else if (c == '/' && PeekChar() == '*') + { + m_pos++; + SkipMultiLineComment(); + } + else if (c == '"') + { + SkipString(); + } + else if (c == '\n') + { + break; + } + } + + if (incDirectiveType != IncDirectiveType::None) + return incDirectiveType; + } +} + +std::string AsmFile::ReadPath() +{ + int length = 0; + int startPos = m_pos; + + for (;;) + { + int c = GetChar(); + + if (c == '"') + break; + + if (c == -1) + FATAL_INPUT_ERROR("unexpected EOF in include string\n"); + + if (c == 0) + FATAL_INPUT_ERROR("unexpected NUL character in include string\n"); + + if (c == '\n') + FATAL_INPUT_ERROR("unexpected end of line character in include string\n"); + + // Don't bother allowing any escape sequences. + if (c == '\\') + FATAL_INPUT_ERROR("unexpected escape in include string\n"); + + length++; + + if (length > SCANINC_MAX_PATH) + FATAL_INPUT_ERROR("path is too long"); + } + + return std::string(m_buffer + startPos, length); +} + +void AsmFile::SkipEndOfLineComment() +{ + int c; + + do + { + c = GetChar(); + } while (c != -1 && c != '\n'); +} + +void AsmFile::SkipMultiLineComment() +{ + for (;;) + { + int c = GetChar(); + + if (c == '*') + { + if (PeekChar() == '/') + { + m_pos++; + return; + } + } + else if (c == -1) + { + return; + } + } +} + +void AsmFile::SkipString() +{ + for (;;) + { + int c = GetChar(); + + if (c == '"') + break; + + if (c == -1) + FATAL_INPUT_ERROR("unexpected EOF in string\n"); + + if (c == '\\') + { + c = GetChar(); + } + } +} diff --git a/tools/scaninc/asm_file.h b/tools/scaninc/asm_file.h new file mode 100644 index 000000000..ad99b757e --- /dev/null +++ b/tools/scaninc/asm_file.h @@ -0,0 +1,119 @@ +// Copyright(c) 2015-2017 YamaArashi +// +// Permission is hereby granted, free of charge, to any person obtaining a copy +// of this software and associated documentation files (the "Software"), to deal +// in the Software without restriction, including without limitation the rights +// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +// copies of the Software, and to permit persons to whom the Software is +// furnished to do so, subject to the following conditions: +// +// The above copyright notice and this permission notice shall be included in +// all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +// THE SOFTWARE. + +#ifndef ASM_FILE_H +#define ASM_FILE_H + +#include <string> +#include "scaninc.h" + +enum class IncDirectiveType +{ + None, + Include, + Incbin +}; + +class AsmFile +{ +public: + AsmFile(std::string path); + ~AsmFile(); + IncDirectiveType ReadUntilIncDirective(std::string& path); + +private: + char *m_buffer; + int m_pos; + int m_size; + int m_lineNum; + std::string m_path; + + int GetChar() + { + if (m_pos >= m_size) + return -1; + + int c = m_buffer[m_pos++]; + + if (c == '\r') + { + if (m_pos < m_size && m_buffer[m_pos++] == '\n') + { + m_lineNum++; + return '\n'; + } + else + { + FATAL_INPUT_ERROR("CR line endings are not supported\n"); + } + } + + if (c == '\n') + m_lineNum++; + + return c; + } + + // No newline translation because it's not needed for any use of this function. + int PeekChar() + { + if (m_pos >= m_size) + return -1; + + return m_buffer[m_pos]; + } + + void SkipTabsAndSpaces() + { + while (m_pos < m_size && (m_buffer[m_pos] == '\t' || m_buffer[m_pos] == ' ')) + m_pos++; + } + + bool MatchIncDirective(std::string directiveName, std::string& path) + { + int length = directiveName.length(); + int i; + + for (i = 0; i < length && m_pos + i < m_size; i++) + if (directiveName[i] != m_buffer[m_pos + i]) + return false; + + if (i < length) + return false; + + m_pos += length; + + SkipTabsAndSpaces(); + + if (GetChar() != '"') + FATAL_INPUT_ERROR("no path after \".%s\" directive\n", directiveName.c_str()); + + path = ReadPath(); + + return true; + } + + std::string ReadPath(); + void SkipEndOfLineComment(); + void SkipMultiLineComment(); + void SkipString(); +}; + +#endif // ASM_FILE_H diff --git a/tools/scaninc/c_file.cpp b/tools/scaninc/c_file.cpp new file mode 100644 index 000000000..d470f959d --- /dev/null +++ b/tools/scaninc/c_file.cpp @@ -0,0 +1,307 @@ +// Copyright(c) 2017 YamaArashi +// +// Permission is hereby granted, free of charge, to any person obtaining a copy +// of this software and associated documentation files (the "Software"), to deal +// in the Software without restriction, including without limitation the rights +// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +// copies of the Software, and to permit persons to whom the Software is +// furnished to do so, subject to the following conditions: +// +// The above copyright notice and this permission notice shall be included in +// all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +// THE SOFTWARE. + +#include "c_file.h" + +CFile::CFile(std::string path) +{ + m_path = path; + + FILE *fp = std::fopen(path.c_str(), "rb"); + + if (fp == NULL) + FATAL_ERROR("Failed to open \"%s\" for reading.\n", path.c_str()); + + std::fseek(fp, 0, SEEK_END); + + m_size = std::ftell(fp); + + m_buffer = new char[m_size + 1]; + m_buffer[m_size] = 0; + + std::rewind(fp); + + if (std::fread(m_buffer, m_size, 1, fp) != 1) + FATAL_ERROR("Failed to read \"%s\".\n", path.c_str()); + + std::fclose(fp); + + m_pos = 0; + m_lineNum = 1; +} + +CFile::~CFile() +{ + delete[] m_buffer; +} + +void CFile::FindIncbins() +{ + char stringChar = 0; + + while (m_pos < m_size) + { + if (stringChar) + { + if (m_buffer[m_pos] == stringChar) + { + m_pos++; + stringChar = 0; + } + else if (m_buffer[m_pos] == '\\' && m_buffer[m_pos + 1] == stringChar) + { + m_pos += 2; + } + else + { + if (m_buffer[m_pos] == '\n') + m_lineNum++; + m_pos++; + } + } + else + { + SkipWhitespace(); + CheckInclude(); + CheckIncbin(); + + if (m_pos >= m_size) + break; + + char c = m_buffer[m_pos++]; + + if (c == '\n') + m_lineNum++; + else if (c == '"') + stringChar = '"'; + else if (c == '\'') + stringChar = '\''; + else if (c == 0) + FATAL_INPUT_ERROR("unexpected null character"); + } + } +} + +bool CFile::ConsumeHorizontalWhitespace() +{ + if (m_buffer[m_pos] == '\t' || m_buffer[m_pos] == ' ') + { + m_pos++; + return true; + } + + return false; +} + +bool CFile::ConsumeNewline() +{ + if (m_buffer[m_pos] == '\n') + { + m_pos++; + m_lineNum++; + return true; + } + + if (m_buffer[m_pos] == '\r' && m_buffer[m_pos + 1] == '\n') + { + m_pos += 2; + m_lineNum++; + return true; + } + + return false; +} + +bool CFile::ConsumeComment() +{ + if (m_buffer[m_pos] == '/' && m_buffer[m_pos + 1] == '*') + { + m_pos += 2; + while (m_buffer[m_pos] != '*' && m_buffer[m_pos + 1] != '/') + { + if (m_buffer[m_pos] == 0) + return false; + if (!ConsumeNewline()) + m_pos++; + } + m_pos += 2; + return true; + } + else if (m_buffer[m_pos] == '/' && m_buffer[m_pos + 1] == '/') + { + m_pos += 2; + while (!ConsumeNewline()) + { + if (m_buffer[m_pos] == 0) + return false; + m_pos++; + } + return true; + } + + return false; +} + +void CFile::SkipWhitespace() +{ + while (ConsumeHorizontalWhitespace() || ConsumeNewline() || ConsumeComment()) + ; +} + +bool CFile::CheckIdentifier(const std::string& ident) +{ + unsigned int i; + + for (i = 0; i < ident.length() && m_pos + i < (unsigned)m_size; i++) + if (ident[i] != m_buffer[m_pos + i]) + return false; + + return (i == ident.length()); +} + +void CFile::CheckInclude() +{ + if (m_buffer[m_pos] != '#') + return; + + std::string ident = "#include"; + + if (!CheckIdentifier(ident)) + { + return; + } + + m_pos += ident.length(); + + ConsumeHorizontalWhitespace(); + + std::string path = ReadPath(); + + if (!path.empty()) { + m_includes.emplace(path); + } +} + +void CFile::CheckIncbin() +{ + // Optimization: assume most lines are not incbins + if (!(m_buffer[m_pos+0] == 'I' + && m_buffer[m_pos+1] == 'N' + && m_buffer[m_pos+2] == 'C' + && m_buffer[m_pos+3] == 'B' + && m_buffer[m_pos+4] == 'I' + && m_buffer[m_pos+5] == 'N' + && m_buffer[m_pos+6] == '_')) + { + return; + } + + std::string idents[6] = { "INCBIN_S8", "INCBIN_U8", "INCBIN_S16", "INCBIN_U16", "INCBIN_S32", "INCBIN_U32" }; + int incbinType = -1; + + for (int i = 0; i < 6; i++) + { + if (CheckIdentifier(idents[i])) + { + incbinType = i; + break; + } + } + + if (incbinType == -1) + return; + + long oldPos = m_pos; + long oldLineNum = m_lineNum; + + m_pos += idents[incbinType].length(); + + SkipWhitespace(); + + if (m_buffer[m_pos] != '(') + { + m_pos = oldPos; + m_lineNum = oldLineNum; + return; + } + + m_pos++; + + while (true) + { + SkipWhitespace(); + + std::string path = ReadPath(); + + SkipWhitespace(); + + m_incbins.emplace(path); + + if (m_buffer[m_pos] != ',') + break; + + m_pos++; + } + + if (m_buffer[m_pos] != ')') + FATAL_INPUT_ERROR("expected ')'"); + + m_pos++; + +} + +std::string CFile::ReadPath() +{ + if (m_buffer[m_pos] != '"') + { + if (m_buffer[m_pos] == '<') + { + return std::string(); + } + FATAL_INPUT_ERROR("expected '\"' or '<'"); + } + + m_pos++; + + int startPos = m_pos; + + while (m_buffer[m_pos] != '"') + { + if (m_buffer[m_pos] == 0) + { + if (m_pos >= m_size) + FATAL_INPUT_ERROR("unexpected EOF in path string"); + else + FATAL_INPUT_ERROR("unexpected null character in path string"); + } + + if (m_buffer[m_pos] == '\r' || m_buffer[m_pos] == '\n') + FATAL_INPUT_ERROR("unexpected end of line character in path string"); + + if (m_buffer[m_pos] == '\\') + FATAL_INPUT_ERROR("unexpected escape in path string"); + + m_pos++; + } + + m_pos++; + + return std::string(m_buffer + startPos, m_pos - 1 - startPos); +} diff --git a/tools/scaninc/c_file.h b/tools/scaninc/c_file.h new file mode 100644 index 000000000..618901b85 --- /dev/null +++ b/tools/scaninc/c_file.h @@ -0,0 +1,57 @@ +// Copyright(c) 2017 YamaArashi +// +// Permission is hereby granted, free of charge, to any person obtaining a copy +// of this software and associated documentation files (the "Software"), to deal +// in the Software without restriction, including without limitation the rights +// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +// copies of the Software, and to permit persons to whom the Software is +// furnished to do so, subject to the following conditions: +// +// The above copyright notice and this permission notice shall be included in +// all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +// THE SOFTWARE. + +#ifndef C_FILE_H +#define C_FILE_H + +#include <string> +#include <set> +#include <memory> +#include "scaninc.h" + +class CFile +{ +public: + CFile(std::string path); + ~CFile(); + void FindIncbins(); + const std::set<std::string>& GetIncbins() { return m_incbins; } + const std::set<std::string>& GetIncludes() { return m_includes; } + +private: + char *m_buffer; + int m_pos; + int m_size; + int m_lineNum; + std::string m_path; + std::set<std::string> m_incbins; + std::set<std::string> m_includes; + + bool ConsumeHorizontalWhitespace(); + bool ConsumeNewline(); + bool ConsumeComment(); + void SkipWhitespace(); + bool CheckIdentifier(const std::string& ident); + void CheckInclude(); + void CheckIncbin(); + std::string ReadPath(); +}; + +#endif // C_FILE_H diff --git a/tools/scaninc/scaninc.cpp b/tools/scaninc/scaninc.cpp new file mode 100644 index 000000000..3dc221479 --- /dev/null +++ b/tools/scaninc/scaninc.cpp @@ -0,0 +1,165 @@ +// Copyright(c) 2015-2017 YamaArashi +// +// Permission is hereby granted, free of charge, to any person obtaining a copy +// of this software and associated documentation files (the "Software"), to deal +// in the Software without restriction, including without limitation the rights +// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +// copies of the Software, and to permit persons to whom the Software is +// furnished to do so, subject to the following conditions: +// +// The above copyright notice and this permission notice shall be included in +// all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +// THE SOFTWARE. + +#include <cstdio> +#include <cstdlib> +#include <list> +#include <queue> +#include <set> +#include <string> +#include "scaninc.h" +#include "asm_file.h" +#include "c_file.h" + +bool CanOpenFile(std::string path) +{ + FILE *fp = std::fopen(path.c_str(), "rb"); + + if (fp == NULL) + return false; + + std::fclose(fp); + return true; +} + +const char *const USAGE = "Usage: scaninc [-I INCLUDE_PATH] FILE_PATH\n"; + +int main(int argc, char **argv) +{ + std::queue<std::string> filesToProcess; + std::set<std::string> dependencies; + + std::list<std::string> includeDirs; + + argc--; + argv++; + + while (argc > 1) + { + std::string arg(argv[0]); + if (arg.substr(0, 2) == "-I") + { + std::string includeDir = arg.substr(2); + if (includeDir.empty()) + { + argc--; + argv++; + includeDir = std::string(argv[0]); + } + if (includeDir.back() != '/') + { + includeDir += '/'; + } + includeDirs.push_back(includeDir); + } + else + { + FATAL_ERROR(USAGE); + } + argc--; + argv++; + } + + if (argc != 1) { + FATAL_ERROR(USAGE); + } + + std::string initialPath(argv[0]); + + std::size_t pos = initialPath.find_last_of('.'); + + if (pos == std::string::npos) + FATAL_ERROR("no file extension in path \"%s\"\n", initialPath.c_str()); + + std::string extension = initialPath.substr(pos + 1); + + std::string srcDir(""); + std::size_t slash = initialPath.rfind('/'); + if (slash != std::string::npos) + { + srcDir = initialPath.substr(0, slash + 1); + } + includeDirs.push_back(srcDir); + + if (extension == "c" || extension == "h") + { + filesToProcess.push(initialPath); + + while (!filesToProcess.empty()) + { + CFile file(filesToProcess.front()); + filesToProcess.pop(); + + file.FindIncbins(); + for (auto incbin : file.GetIncbins()) + { + dependencies.insert(incbin); + } + for (auto include : file.GetIncludes()) + { + for (auto includeDir : includeDirs) + { + std::string path(includeDir + include); + if (CanOpenFile(path)) + { + bool inserted = dependencies.insert(path).second; + if (inserted) + { + filesToProcess.push(path); + } + break; + } + } + } + } + } + else if (extension == "s" || extension == "inc") + { + filesToProcess.push(initialPath); + + while (!filesToProcess.empty()) + { + AsmFile file(filesToProcess.front()); + + filesToProcess.pop(); + + IncDirectiveType incDirectiveType; + std::string path; + + while ((incDirectiveType = file.ReadUntilIncDirective(path)) != IncDirectiveType::None) + { + bool inserted = dependencies.insert(path).second; + if (inserted + && incDirectiveType == IncDirectiveType::Include + && CanOpenFile(path)) + filesToProcess.push(path); + } + } + } + else + { + FATAL_ERROR("unknown extension \"%s\"\n", extension.c_str()); + } + + for (const std::string &path : dependencies) + { + std::printf("%s\n", path.c_str()); + } +} diff --git a/tools/scaninc/scaninc.h b/tools/scaninc/scaninc.h new file mode 100644 index 000000000..30cc9611c --- /dev/null +++ b/tools/scaninc/scaninc.h @@ -0,0 +1,59 @@ +// Copyright(c) 2015-2017 YamaArashi +// +// Permission is hereby granted, free of charge, to any person obtaining a copy +// of this software and associated documentation files (the "Software"), to deal +// in the Software without restriction, including without limitation the rights +// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +// copies of the Software, and to permit persons to whom the Software is +// furnished to do so, subject to the following conditions: +// +// The above copyright notice and this permission notice shall be included in +// all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +// THE SOFTWARE. + +#ifndef SCANINC_H +#define SCANINC_H + +#include <cstdio> +#include <cstdlib> + +#ifdef _MSC_VER + +#define FATAL_INPUT_ERROR(format, ...) \ +do { \ + fprintf(stderr, "%s:%d " format, m_path.c_str(), m_lineNum, __VA_ARGS__); \ + exit(1); \ +} while (0) + +#define FATAL_ERROR(format, ...) \ +do { \ + fprintf(stderr, format, __VA_ARGS__); \ + exit(1); \ +} while (0) + +#else + +#define FATAL_INPUT_ERROR(format, ...) \ +do { \ + fprintf(stderr, "%s:%d " format, m_path.c_str(), m_lineNum, ##__VA_ARGS__); \ + exit(1); \ +} while (0) + +#define FATAL_ERROR(format, ...) \ +do { \ + fprintf(stderr, format, ##__VA_ARGS__); \ + exit(1); \ +} while (0) + +#endif // _MSC_VER + +#define SCANINC_MAX_PATH 255 + +#endif // SCANINC_H -- cgit v1.2.3 From a7ab82a948cdbbe30da4307d2245369980440bea Mon Sep 17 00:00:00 2001 From: PikalaxALT <pikalaxalt@gmail.com> Date: Fri, 21 Dec 2018 11:43:24 -0500 Subject: Guess a small struct in save block 2 --- asm/battle_2.s | 44 ++++++------- asm/battle_controller_player.s | 12 ++-- asm/battle_controllers.s | 16 ++--- asm/cable_club.s | 36 +++++------ asm/evolution_scene.s | 8 +-- asm/field_fadetransition.s | 4 +- asm/help_system_812B1E0.s | 4 +- asm/link.s | 136 ++++++++++++++++++++--------------------- asm/link_rfu_2.s | 64 +++++++++---------- asm/link_rfu_3.s | 52 ++++++++-------- asm/link_rfu_4.s | 8 +-- asm/menu_helpers.s | 4 +- asm/overworld.s | 36 +++++------ asm/pokemon_summary_screen.s | 16 ++--- asm/reshow_battle_screen.s | 8 +-- asm/start_menu.s | 4 +- asm/trade.s | 100 +++++++++++++++--------------- asm/trainer_card.s | 42 ++++++------- asm/union_room_chat.s | 24 ++++---- asm/unk_8147500.s | 4 +- asm/unk_8147AA8.s | 8 +-- asm/unk_814B6F0.s | 8 +-- asm/unk_814BB4C.s | 4 +- asm/unk_81507FC.s | 20 +++--- include/global.h | 49 +++++++++++---- include/link.h | 2 - src/main.c | 4 +- src/mevent.c | 6 +- src/quest_log.c | 8 +-- sym_common.txt | 4 +- 30 files changed, 379 insertions(+), 356 deletions(-) diff --git a/asm/battle_2.s b/asm/battle_2.s index b11014d6b..1ecfe6ad3 100644 --- a/asm/battle_2.s +++ b/asm/battle_2.s @@ -1004,7 +1004,7 @@ _08010590: movs r0, 0x1 strb r0, [r1] _080105BC: - ldr r0, _080105D0 @ =gUnknown_3003F3C + ldr r0, _080105D0 @ =gWirelessCommType ldrb r0, [r0] cmp r0, 0 bne _080105C6 @@ -1014,7 +1014,7 @@ _080105C6: b _080108B8 .align 2, 0 _080105CC: .4byte gUnknown_2023E82 -_080105D0: .4byte gUnknown_3003F3C +_080105D0: .4byte gWirelessCommType _080105D4: ldr r2, _08010640 @ =gBattleTypeFlags ldr r1, [r2] @@ -1023,7 +1023,7 @@ _080105D4: ands r0, r6 cmp r0, 0 beq _08010658 - ldr r0, _08010644 @ =gUnknown_3003F64 + ldr r0, _08010644 @ =gReceivedRemoteLinkPlayers ldrb r0, [r0] cmp r0, 0 bne _080105EC @@ -1056,7 +1056,7 @@ _080105EC: ldr r0, _08010650 @ =gUnknown_2023E82 strb r6, [r0] _0801062A: - ldr r0, _08010654 @ =gUnknown_3003F3C + ldr r0, _08010654 @ =gWirelessCommType ldrb r0, [r0] cmp r0, 0 bne _08010634 @@ -1068,11 +1068,11 @@ _08010634: b _080108B8 .align 2, 0 _08010640: .4byte gBattleTypeFlags -_08010644: .4byte gUnknown_3003F64 +_08010644: .4byte gReceivedRemoteLinkPlayers _08010648: .4byte gBattleStruct _0801064C: .4byte 0x00000185 _08010650: .4byte gUnknown_2023E82 -_08010654: .4byte gUnknown_3003F3C +_08010654: .4byte gWirelessCommType _08010658: movs r0, 0x4 orrs r1, r0 @@ -1515,7 +1515,7 @@ _08010A14: _08010A1E: b _08010B82 _08010A20: - ldr r0, _08010A58 @ =gUnknown_3003F64 + ldr r0, _08010A58 @ =gReceivedRemoteLinkPlayers ldrb r0, [r0] cmp r0, 0 bne _08010A2A @@ -1542,7 +1542,7 @@ _08010A36: strb r0, [r5] b _08010B82 .align 2, 0 -_08010A58: .4byte gUnknown_3003F64 +_08010A58: .4byte gReceivedRemoteLinkPlayers _08010A5C: bl GetBlockReceivedStatus movs r1, 0xF @@ -1628,7 +1628,7 @@ _08010AFC: bne _08010B82 movs r0, 0x3 strb r0, [r5] - ldr r0, _08010B20 @ =gUnknown_3003F3C + ldr r0, _08010B20 @ =gWirelessCommType ldrb r0, [r0] cmp r0, 0 beq _08010B24 @@ -1636,12 +1636,12 @@ _08010AFC: b _08010B82 .align 2, 0 _08010B1C: .4byte gPaletteFade -_08010B20: .4byte gUnknown_3003F3C +_08010B20: .4byte gWirelessCommType _08010B24: bl sub_800AAC0 b _08010B82 _08010B2A: - ldr r0, _08010B54 @ =gUnknown_3003F3C + ldr r0, _08010B54 @ =gWirelessCommType ldrb r0, [r0] cmp r0, 0 beq _08010B64 @@ -1661,12 +1661,12 @@ _08010B2A: bl SetMainCallback2 b _08010B82 .align 2, 0 -_08010B54: .4byte gUnknown_3003F3C +_08010B54: .4byte gWirelessCommType _08010B58: .4byte gBattleTypeFlags _08010B5C: .4byte gMain _08010B60: .4byte sub_800FE24 _08010B64: - ldr r0, _08010B90 @ =gUnknown_3003F64 + ldr r0, _08010B90 @ =gReceivedRemoteLinkPlayers ldrb r0, [r0] cmp r0, 0 bne _08010B82 @@ -1688,7 +1688,7 @@ _08010B82: pop {r0} bx r0 .align 2, 0 -_08010B90: .4byte gUnknown_3003F64 +_08010B90: .4byte gReceivedRemoteLinkPlayers _08010B94: .4byte gBattleTypeFlags _08010B98: .4byte gMain _08010B9C: .4byte sub_800FE24 @@ -1757,7 +1757,7 @@ _08010C18: movs r0, 0x1 strb r0, [r1] _08010C44: - ldr r0, _08010C58 @ =gUnknown_3003F3C + ldr r0, _08010C58 @ =gWirelessCommType ldrb r0, [r0] cmp r0, 0 bne _08010C4E @@ -1767,9 +1767,9 @@ _08010C4E: b _080110F0 .align 2, 0 _08010C54: .4byte gUnknown_2023E82 -_08010C58: .4byte gUnknown_3003F3C +_08010C58: .4byte gWirelessCommType _08010C5C: - ldr r0, _08010CC0 @ =gUnknown_3003F64 + ldr r0, _08010CC0 @ =gReceivedRemoteLinkPlayers ldrb r0, [r0] cmp r0, 0 bne _08010C66 @@ -1805,7 +1805,7 @@ _08010C66: adds r0, 0x1 strb r0, [r1] _08010CAA: - ldr r0, _08010CD0 @ =gUnknown_3003F3C + ldr r0, _08010CD0 @ =gWirelessCommType ldrb r0, [r0] cmp r0, 0 bne _08010CB4 @@ -1816,11 +1816,11 @@ _08010CB4: bl sub_80FCD74 b _080110F0 .align 2, 0 -_08010CC0: .4byte gUnknown_3003F64 +_08010CC0: .4byte gReceivedRemoteLinkPlayers _08010CC4: .4byte gBattleStruct _08010CC8: .4byte 0x00000185 _08010CCC: .4byte gUnknown_2023E82 -_08010CD0: .4byte gUnknown_3003F3C +_08010CD0: .4byte gWirelessCommType _08010CD4: bl GetBlockReceivedStatus movs r1, 0xF @@ -11647,7 +11647,7 @@ _08015B74: ands r0, r5 cmp r0, 0 beq _08015B86 - ldr r0, _08015BE4 @ =gUnknown_3003F64 + ldr r0, _08015BE4 @ =gReceivedRemoteLinkPlayers ldrb r0, [r0] cmp r0, 0 bne _08015BD4 @@ -11696,7 +11696,7 @@ _08015BD4: .align 2, 0 _08015BDC: .4byte gBattleTypeFlags _08015BE0: .4byte gPlayerParty -_08015BE4: .4byte gUnknown_3003F64 +_08015BE4: .4byte gReceivedRemoteLinkPlayers _08015BE8: .4byte gSpecialVar_Result _08015BEC: .4byte gUnknown_2023E8A _08015BF0: .4byte gMain diff --git a/asm/battle_controller_player.s b/asm/battle_controller_player.s index 477f73144..4db1f94c3 100644 --- a/asm/battle_controller_player.s +++ b/asm/battle_controller_player.s @@ -2330,11 +2330,11 @@ _0802F600: thumb_func_start sub_802F610 sub_802F610: @ 802F610 push {lr} - ldr r0, _0802F64C @ =gUnknown_3003F3C + ldr r0, _0802F64C @ =gWirelessCommType ldrb r0, [r0] cmp r0, 0 bne _0802F664 - ldr r0, _0802F650 @ =gUnknown_3003F64 + ldr r0, _0802F650 @ =gReceivedRemoteLinkPlayers ldrb r0, [r0] cmp r0, 0 bne _0802F694 @@ -2356,8 +2356,8 @@ sub_802F610: @ 802F610 bl FreeAllWindowBuffers b _0802F694 .align 2, 0 -_0802F64C: .4byte gUnknown_3003F3C -_0802F650: .4byte gUnknown_3003F64 +_0802F64C: .4byte gWirelessCommType +_0802F650: .4byte gReceivedRemoteLinkPlayers _0802F654: .4byte gMain _0802F658: .4byte 0x00000439 _0802F65C: .4byte gUnknown_3004F80 @@ -2408,7 +2408,7 @@ sub_802F6A8: @ 802F6A8 ands r0, r1 cmp r0, 0 beq _0802F6FC - ldr r0, _0802F6D8 @ =gUnknown_3003F3C + ldr r0, _0802F6D8 @ =gWirelessCommType ldrb r0, [r0] cmp r0, 0 bne _0802F6DC @@ -2417,7 +2417,7 @@ sub_802F6A8: @ 802F6A8 .align 2, 0 _0802F6D0: .4byte gPaletteFade _0802F6D4: .4byte gBattleTypeFlags -_0802F6D8: .4byte gUnknown_3003F3C +_0802F6D8: .4byte gWirelessCommType _0802F6DC: bl sub_800AB9C _0802F6E0: diff --git a/asm/battle_controllers.s b/asm/battle_controllers.s index 8ef9408a0..5d0921323 100644 --- a/asm/battle_controllers.s +++ b/asm/battle_controllers.s @@ -14,13 +14,13 @@ sub_800D230: @ 800D230 ands r0, r1 cmp r0, 0 beq _0800D262 - ldr r0, _0800D26C @ =gUnknown_3003F3C + ldr r0, _0800D26C @ =gWirelessCommType ldrb r0, [r0] cmp r0, 0 beq _0800D24A bl sub_800B1F4 _0800D24A: - ldr r0, _0800D270 @ =gUnknown_3003F64 + ldr r0, _0800D270 @ =gReceivedRemoteLinkPlayers ldrb r0, [r0] cmp r0, 0 bne _0800D256 @@ -35,8 +35,8 @@ _0800D262: bx r0 .align 2, 0 _0800D268: .4byte gBattleTypeFlags -_0800D26C: .4byte gUnknown_3003F3C -_0800D270: .4byte gUnknown_3003F64 +_0800D26C: .4byte gWirelessCommType +_0800D270: .4byte gReceivedRemoteLinkPlayers _0800D274: .4byte sub_8081A90 thumb_func_end sub_800D230 @@ -1229,7 +1229,7 @@ _0800DBDE: ldrh r0, [r1, 0x1E] adds r0, 0x1 strh r0, [r1, 0x1E] - ldr r0, _0800DBF0 @ =gUnknown_3003F64 + ldr r0, _0800DBF0 @ =gReceivedRemoteLinkPlayers ldrb r0, [r0] cmp r0, 0 bne _0800DBEE @@ -1237,7 +1237,7 @@ _0800DBDE: _0800DBEE: b _0800DD1C .align 2, 0 -_0800DBF0: .4byte gUnknown_3003F64 +_0800DBF0: .4byte gReceivedRemoteLinkPlayers _0800DBF4: bl GetLinkPlayerCount_2 lsls r0, 24 @@ -1403,7 +1403,7 @@ sub_800DD28: @ 800DD28 mov r6, r9 mov r5, r8 push {r5-r7} - ldr r0, _0800DD5C @ =gUnknown_3003F64 + ldr r0, _0800DD5C @ =gReceivedRemoteLinkPlayers ldrb r0, [r0] cmp r0, 0 beq _0800DE28 @@ -1424,7 +1424,7 @@ sub_800DD28: @ 800DD28 mov r10, r0 b _0800DE1C .align 2, 0 -_0800DD5C: .4byte gUnknown_3003F64 +_0800DD5C: .4byte gReceivedRemoteLinkPlayers _0800DD60: .4byte gBattleTypeFlags _0800DD64: .4byte gLinkPlayers _0800DD68: .4byte 0x00002211 diff --git a/asm/cable_club.s b/asm/cable_club.s index 03b1e3497..45967283c 100644 --- a/asm/cable_club.s +++ b/asm/cable_club.s @@ -1034,7 +1034,7 @@ sub_8080F78: @ 8080F78 push {r4,r5,lr} lsls r0, 24 lsrs r5, r0, 24 - ldr r0, _08080FAC @ =gUnknown_3003F64 + ldr r0, _08080FAC @ =gReceivedRemoteLinkPlayers ldrb r0, [r0] cmp r0, 0 bne _08080FA6 @@ -1055,7 +1055,7 @@ _08080FA6: pop {r0} bx r0 .align 2, 0 -_08080FAC: .4byte gUnknown_3003F64 +_08080FAC: .4byte gReceivedRemoteLinkPlayers _08080FB0: .4byte gTasks thumb_func_end sub_8080F78 @@ -1472,7 +1472,7 @@ sub_80812D8: @ 80812D8 push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r0, _08081308 @ =gUnknown_3003F64 + ldr r0, _08081308 @ =gReceivedRemoteLinkPlayers ldrb r0, [r0] cmp r0, 0x1 bne _08081300 @@ -1490,7 +1490,7 @@ _08081300: pop {r0} bx r0 .align 2, 0 -_08081308: .4byte gUnknown_3003F64 +_08081308: .4byte gReceivedRemoteLinkPlayers thumb_func_end sub_80812D8 thumb_func_start sub_808130C @@ -1567,7 +1567,7 @@ _0808139C: bl sub_800AAC0 b _080813AA _080813A2: - ldr r0, _080813B4 @ =gUnknown_3003F64 + ldr r0, _080813B4 @ =gReceivedRemoteLinkPlayers ldrb r0, [r0] _080813A6: cmp r0, 0 @@ -1578,7 +1578,7 @@ _080813AA: strh r0, [r4, 0x8] b _0808143A .align 2, 0 -_080813B4: .4byte gUnknown_3003F64 +_080813B4: .4byte gReceivedRemoteLinkPlayers _080813B8: ldr r0, _080813CC @ =gLinkPlayers ldr r0, [r0, 0x4] @@ -1936,7 +1936,7 @@ sub_8081668: @ 8081668 movs r5, 0x1 eors r0, r5 bl sub_80CD98C - ldr r0, _080816C0 @ =gUnknown_3003F3C + ldr r0, _080816C0 @ =gWirelessCommType ldrb r0, [r0] cmp r0, 0 beq _0808170A @@ -1952,7 +1952,7 @@ _080816B0: .4byte gBattleTypeFlags _080816B4: .4byte 0x0000ffdf _080816B8: .4byte gSpecialVar_0x8004 _080816BC: .4byte gUnknown_300502C -_080816C0: .4byte gUnknown_3003F3C +_080816C0: .4byte gWirelessCommType _080816C4: .4byte gUnknown_2023E8A _080816C8: ldr r4, _080816E8 @ =gLinkPlayers @@ -2207,7 +2207,7 @@ _080818B8: .align 2, 0 _080818C0: .4byte gUnknown_2031DA4 _080818C4: - ldr r0, _080818E0 @ =gUnknown_3003F64 + ldr r0, _080818E0 @ =gReceivedRemoteLinkPlayers ldrb r0, [r0] cmp r0, 0 bne _080818D8 @@ -2220,7 +2220,7 @@ _080818D8: pop {r0} bx r0 .align 2, 0 -_080818E0: .4byte gUnknown_3003F64 +_080818E0: .4byte gReceivedRemoteLinkPlayers _080818E4: .4byte sub_804C718 thumb_func_end sub_8081850 @@ -2299,7 +2299,7 @@ _08081970: thumb_func_start sub_8081978 sub_8081978: @ 8081978 push {lr} - ldr r0, _0808198C @ =gUnknown_3003F3C + ldr r0, _0808198C @ =gWirelessCommType ldrb r0, [r0] cmp r0, 0 beq _08081994 @@ -2307,7 +2307,7 @@ sub_8081978: @ 8081978 bl sub_8081828 b _0808199A .align 2, 0 -_0808198C: .4byte gUnknown_3003F3C +_0808198C: .4byte gWirelessCommType _08081990: .4byte sub_80818E8 _08081994: ldr r0, _080819A0 @ =sub_8081850 @@ -2347,7 +2347,7 @@ sub_80819C8: @ 80819C8 ldr r2, _080819E8 @ =0x00002211 adds r0, r2, 0 strh r0, [r1] - ldr r0, _080819EC @ =gUnknown_3003F3C + ldr r0, _080819EC @ =gWirelessCommType ldrb r0, [r0] cmp r0, 0 beq _080819F4 @@ -2357,7 +2357,7 @@ sub_80819C8: @ 80819C8 .align 2, 0 _080819E4: .4byte gLinkType _080819E8: .4byte 0x00002211 -_080819EC: .4byte gUnknown_3003F3C +_080819EC: .4byte gWirelessCommType _080819F0: .4byte sub_8081454 _080819F4: ldr r0, _08081A00 @ =sub_8081318 @@ -2465,7 +2465,7 @@ sub_8081A90: @ 8081A90 adds r0, r4, 0 bl DestroyTask _08081AC2: - ldr r0, _08081AE0 @ =gUnknown_3003F64 + ldr r0, _08081AE0 @ =gReceivedRemoteLinkPlayers ldrb r0, [r0] cmp r0, 0 beq _08081AD0 @@ -2478,7 +2478,7 @@ _08081AD0: .align 2, 0 _08081AD8: .4byte gTasks _08081ADC: .4byte c2_800ACD4 -_08081AE0: .4byte gUnknown_3003F64 +_08081AE0: .4byte gReceivedRemoteLinkPlayers thumb_func_end sub_8081A90 thumb_func_start sub_8081AE4 @@ -2486,7 +2486,7 @@ sub_8081AE4: @ 8081AE4 push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r0, _08081B04 @ =gUnknown_3003F64 + ldr r0, _08081B04 @ =gReceivedRemoteLinkPlayers ldrb r0, [r0] cmp r0, 0 bne _08081AFC @@ -2498,7 +2498,7 @@ _08081AFC: pop {r0} bx r0 .align 2, 0 -_08081B04: .4byte gUnknown_3003F64 +_08081B04: .4byte gReceivedRemoteLinkPlayers thumb_func_end sub_8081AE4 thumb_func_start sub_8081B08 diff --git a/asm/evolution_scene.s b/asm/evolution_scene.s index f6f5a83e2..d343c68d4 100644 --- a/asm/evolution_scene.s +++ b/asm/evolution_scene.s @@ -839,7 +839,7 @@ _080CE4C0: .4byte gSprites _080CE4C4: .4byte nullsub_10 _080CE4C8: .4byte gMain _080CE4CC: - ldr r0, _080CE4FC @ =gUnknown_3003F3C + ldr r0, _080CE4FC @ =gWirelessCommType ldrb r0, [r0] cmp r0, 0 beq _080CE4E0 @@ -864,7 +864,7 @@ _080CE4F4: strb r0, [r1] b _080CE534 .align 2, 0 -_080CE4FC: .4byte gUnknown_3003F3C +_080CE4FC: .4byte gWirelessCommType _080CE500: .4byte gMain _080CE504: movs r0, 0x1 @@ -3687,7 +3687,7 @@ _080CFDAC: beq _080CFDBA b _080D003A _080CFDBA: - ldr r0, _080CFE18 @ =gUnknown_3003F3C + ldr r0, _080CFE18 @ =gWirelessCommType ldrb r0, [r0] cmp r0, 0 beq _080CFDC6 @@ -3725,7 +3725,7 @@ _080CFDC6: b _080D003A .align 2, 0 _080CFE14: .4byte gPaletteFade -_080CFE18: .4byte gUnknown_3003F3C +_080CFE18: .4byte gWirelessCommType _080CFE1C: .4byte gPlayerParty _080CFE20: .4byte gTasks _080CFE24: .4byte gPlayerPartyCount diff --git a/asm/field_fadetransition.s b/asm/field_fadetransition.s index d0176941a..8ccc347e9 100644 --- a/asm/field_fadetransition.s +++ b/asm/field_fadetransition.s @@ -1490,7 +1490,7 @@ _0807E6D4: strh r0, [r4] b _0807E6F4 _0807E6DC: - ldr r0, _0807E6FC @ =gUnknown_3003F64 + ldr r0, _0807E6FC @ =gReceivedRemoteLinkPlayers ldrb r0, [r0] cmp r0, 0 bne _0807E6F4 @@ -1504,7 +1504,7 @@ _0807E6F4: pop {r0} bx r0 .align 2, 0 -_0807E6FC: .4byte gUnknown_3003F64 +_0807E6FC: .4byte gReceivedRemoteLinkPlayers _0807E700: .4byte sub_805671C thumb_func_end sub_807E678 diff --git a/asm/help_system_812B1E0.s b/asm/help_system_812B1E0.s index d254207a4..f9fb50cf7 100644 --- a/asm/help_system_812B1E0.s +++ b/asm/help_system_812B1E0.s @@ -357,14 +357,14 @@ _0812B458: .4byte gUnknown_203B0EE thumb_func_start sub_812B45C sub_812B45C: @ 812B45C push {lr} - ldr r0, _0812B46C @ =gUnknown_3003F64 + ldr r0, _0812B46C @ =gReceivedRemoteLinkPlayers ldrb r0, [r0] cmp r0, 0x1 beq _0812B470 movs r0, 0x1 b _0812B472 .align 2, 0 -_0812B46C: .4byte gUnknown_3003F64 +_0812B46C: .4byte gReceivedRemoteLinkPlayers _0812B470: movs r0, 0 _0812B472: diff --git a/asm/link.s b/asm/link.s index 929180d83..a0ba7f9cb 100644 --- a/asm/link.s +++ b/asm/link.s @@ -434,7 +434,7 @@ _08009800: .4byte gUnknown_3003F84 thumb_func_start sub_8009804 sub_8009804: @ 8009804 push {r4-r6,lr} - ldr r0, _0800984C @ =gUnknown_3003F3C + ldr r0, _0800984C @ =gWirelessCommType ldrb r4, [r0] cmp r4, 0 bne _08009878 @@ -464,7 +464,7 @@ sub_8009804: @ 8009804 bl CreateTask b _0800987C .align 2, 0 -_0800984C: .4byte gUnknown_3003F3C +_0800984C: .4byte gWirelessCommType _08009850: .4byte gUnknown_3003F80 _08009854: .4byte sub_800A720 _08009858: .4byte gLinkVSyncDisabled @@ -478,7 +478,7 @@ _08009874: .4byte task02_080097CC _08009878: bl sub_80F86F4 _0800987C: - ldr r1, _080098A8 @ =gUnknown_3003F64 + ldr r1, _080098A8 @ =gReceivedRemoteLinkPlayers movs r0, 0 strb r0, [r1] movs r1, 0 @@ -501,7 +501,7 @@ _0800988E: pop {r0} bx r0 .align 2, 0 -_080098A8: .4byte gUnknown_3003F64 +_080098A8: .4byte gReceivedRemoteLinkPlayers _080098AC: .4byte gUnknown_3003EB8 _080098B0: .4byte gUnknown_3003F30 _080098B4: .4byte gUnknown_3003F2C @@ -510,10 +510,10 @@ _080098B4: .4byte gUnknown_3003F2C thumb_func_start sub_80098B8 sub_80098B8: @ 80098B8 push {r4,lr} - ldr r0, _080098DC @ =gUnknown_3003F64 + ldr r0, _080098DC @ =gReceivedRemoteLinkPlayers movs r4, 0 strb r4, [r0] - ldr r0, _080098E0 @ =gUnknown_3003F3C + ldr r0, _080098E0 @ =gWirelessCommType ldrb r0, [r0] cmp r0, 0 beq _080098CC @@ -526,8 +526,8 @@ _080098CC: pop {r0} bx r0 .align 2, 0 -_080098DC: .4byte gUnknown_3003F64 -_080098E0: .4byte gUnknown_3003F3C +_080098DC: .4byte gReceivedRemoteLinkPlayers +_080098E0: .4byte gWirelessCommType _080098E4: .4byte gLinkOpen thumb_func_end sub_80098B8 @@ -840,7 +840,7 @@ _08009B48: blt _08009B40 cmp r5, 0 bne _08009B64 - ldr r1, _08009B6C @ =gUnknown_3003F64 + ldr r1, _08009B6C @ =gReceivedRemoteLinkPlayers ldrb r0, [r1] cmp r0, 0 bne _08009B64 @@ -851,7 +851,7 @@ _08009B64: pop {r0} bx r0 .align 2, 0 -_08009B6C: .4byte gUnknown_3003F64 +_08009B6C: .4byte gReceivedRemoteLinkPlayers thumb_func_end HandleReceiveRemoteLinkPlayer thumb_func_start sub_8009B70 @@ -1429,7 +1429,7 @@ _08009FE4: .4byte gUnknown_3003F50 thumb_func_start sub_8009FE8 sub_8009FE8: @ 8009FE8 push {lr} - ldr r0, _0800A000 @ =gUnknown_3003F3C + ldr r0, _0800A000 @ =gWirelessCommType ldrb r0, [r0] cmp r0, 0 beq _08009FF6 @@ -1441,7 +1441,7 @@ _08009FF6: pop {r0} bx r0 .align 2, 0 -_0800A000: .4byte gUnknown_3003F3C +_0800A000: .4byte gWirelessCommType _0800A004: .4byte gUnknown_3003F80 _0800A008: .4byte sub_800A040 thumb_func_end sub_8009FE8 @@ -1449,14 +1449,14 @@ _0800A008: .4byte sub_800A040 thumb_func_start sub_800A00C sub_800A00C: @ 800A00C push {lr} - ldr r0, _0800A01C @ =gUnknown_3003F3C + ldr r0, _0800A01C @ =gWirelessCommType ldrb r0, [r0] cmp r0, 0 beq _0800A020 bl sub_80F9808 b _0800A03A .align 2, 0 -_0800A01C: .4byte gUnknown_3003F3C +_0800A01C: .4byte gWirelessCommType _0800A020: ldr r0, _0800A030 @ =gUnknown_3003F80 ldr r1, [r0] @@ -1478,7 +1478,7 @@ _0800A03A: thumb_func_start sub_800A040 sub_800A040: @ 800A040 push {lr} - ldr r0, _0800A054 @ =gUnknown_3003F64 + ldr r0, _0800A054 @ =gReceivedRemoteLinkPlayers ldrb r0, [r0] cmp r0, 0x1 bne _0800A050 @@ -1488,7 +1488,7 @@ _0800A050: pop {r0} bx r0 .align 2, 0 -_0800A054: .4byte gUnknown_3003F64 +_0800A054: .4byte gReceivedRemoteLinkPlayers _0800A058: .4byte 0x0000cafe thumb_func_end sub_800A040 @@ -1505,14 +1505,14 @@ _0800A064: .4byte gUnknown_3003F80 thumb_func_start sub_800A068 sub_800A068: @ 800A068 push {lr} - ldr r0, _0800A078 @ =gUnknown_3003F3C + ldr r0, _0800A078 @ =gWirelessCommType ldrb r1, [r0] cmp r1, 0 beq _0800A07C bl sub_80F985C b _0800A080 .align 2, 0 -_0800A078: .4byte gUnknown_3003F3C +_0800A078: .4byte gWirelessCommType _0800A07C: ldr r0, _0800A084 @ =gUnknown_3003F80 str r1, [r0] @@ -1526,7 +1526,7 @@ _0800A084: .4byte gUnknown_3003F80 thumb_func_start GetLinkPlayerCount GetLinkPlayerCount: @ 800A088 push {lr} - ldr r0, _0800A0A0 @ =gUnknown_3003F3C + ldr r0, _0800A0A0 @ =gWirelessCommType ldrb r0, [r0] cmp r0, 0 bne _0800A0A8 @@ -1537,7 +1537,7 @@ GetLinkPlayerCount: @ 800A088 lsrs r0, 2 b _0800A0B0 .align 2, 0 -_0800A0A0: .4byte gUnknown_3003F3C +_0800A0A0: .4byte gWirelessCommType _0800A0A4: .4byte gUnknown_3003F20 _0800A0A8: bl sub_80FA4EC @@ -1570,7 +1570,7 @@ sub_800A0D0: @ 800A0D0 adds r5, r0, 0 adds r6, r1, 0 movs r7, 0 - ldr r0, _0800A0F8 @ =gUnknown_3003F64 + ldr r0, _0800A0F8 @ =gReceivedRemoteLinkPlayers ldrb r4, [r0] cmp r4, 0x1 bne _0800A1C8 @@ -1587,7 +1587,7 @@ _0800A0F0: str r0, [r1] b _0800A1E2 .align 2, 0 -_0800A0F8: .4byte gUnknown_3003F64 +_0800A0F8: .4byte gReceivedRemoteLinkPlayers _0800A0FC: .4byte gUnknown_3000E54 _0800A100: bl GetLinkPlayerCount @@ -2012,7 +2012,7 @@ _0800A400: .4byte 0x0000aaaa thumb_func_start GetMultiplayerId GetMultiplayerId: @ 800A404 push {lr} - ldr r0, _0800A418 @ =gUnknown_3003F3C + ldr r0, _0800A418 @ =gWirelessCommType ldrb r0, [r0] cmp r0, 0x1 beq _0800A420 @@ -2022,7 +2022,7 @@ GetMultiplayerId: @ 800A404 lsrs r0, 30 b _0800A428 .align 2, 0 -_0800A418: .4byte gUnknown_3003F3C +_0800A418: .4byte gWirelessCommType _0800A41C: .4byte 0x04000128 _0800A420: bl rfu_get_multiplayer_id @@ -2056,7 +2056,7 @@ SendBlock: @ 800A448 adds r3, r1, 0 lsls r2, 16 lsrs r1, r2, 16 - ldr r0, _0800A460 @ =gUnknown_3003F3C + ldr r0, _0800A460 @ =gWirelessCommType ldrb r0, [r0] cmp r0, 0x1 beq _0800A464 @@ -2064,7 +2064,7 @@ SendBlock: @ 800A448 bl InitBlockSend b _0800A46A .align 2, 0 -_0800A460: .4byte gUnknown_3003F3C +_0800A460: .4byte gWirelessCommType _0800A464: adds r0, r3, 0 bl sub_80F9E60 @@ -2081,7 +2081,7 @@ sub_800A474: @ 800A474 lsls r0, 24 lsrs r1, r0, 24 adds r2, r1, 0 - ldr r0, _0800A490 @ =gUnknown_3003F3C + ldr r0, _0800A490 @ =gWirelessCommType ldrb r0, [r0] cmp r0, 0x1 bne _0800A494 @@ -2091,7 +2091,7 @@ sub_800A474: @ 800A474 lsrs r0, 24 b _0800A4B0 .align 2, 0 -_0800A490: .4byte gUnknown_3003F3C +_0800A490: .4byte gWirelessCommType _0800A494: ldr r0, _0800A4A0 @ =gUnknown_3003F80 ldr r0, [r0] @@ -2118,7 +2118,7 @@ _0800A4B8: .4byte 0x0000cccc thumb_func_start sub_800A4BC sub_800A4BC: @ 800A4BC push {lr} - ldr r0, _0800A4D0 @ =gUnknown_3003F3C + ldr r0, _0800A4D0 @ =gWirelessCommType ldrb r0, [r0] cmp r0, 0x1 bne _0800A4D4 @@ -2127,7 +2127,7 @@ sub_800A4BC: @ 800A4BC lsrs r0, 24 b _0800A4E2 .align 2, 0 -_0800A4D0: .4byte gUnknown_3003F3C +_0800A4D0: .4byte gWirelessCommType _0800A4D4: movs r1, 0 ldr r0, _0800A4E8 @ =gUnknown_3003F80 @@ -2147,7 +2147,7 @@ _0800A4E8: .4byte gUnknown_3003F80 thumb_func_start GetBlockReceivedStatus GetBlockReceivedStatus: @ 800A4EC push {lr} - ldr r0, _0800A510 @ =gUnknown_3003F3C + ldr r0, _0800A510 @ =gWirelessCommType ldrb r0, [r0] cmp r0, 0x1 beq _0800A518 @@ -2164,7 +2164,7 @@ GetBlockReceivedStatus: @ 800A4EC orrs r0, r1 b _0800A51C .align 2, 0 -_0800A510: .4byte gUnknown_3003F3C +_0800A510: .4byte gWirelessCommType _0800A514: .4byte gUnknown_3003EBC _0800A518: bl sub_80F9CC8 @@ -2180,7 +2180,7 @@ sub_800A524: @ 800A524 push {lr} lsls r0, 24 lsrs r1, r0, 24 - ldr r0, _0800A53C @ =gUnknown_3003F3C + ldr r0, _0800A53C @ =gWirelessCommType ldrb r0, [r0] cmp r0, 0x1 bne _0800A540 @@ -2188,7 +2188,7 @@ sub_800A524: @ 800A524 bl sub_80F9720 b _0800A548 .align 2, 0 -_0800A53C: .4byte gUnknown_3003F3C +_0800A53C: .4byte gWirelessCommType _0800A540: ldr r0, _0800A54C @ =gUnknown_3003EBC adds r0, r1, r0 @@ -2204,7 +2204,7 @@ _0800A54C: .4byte gUnknown_3003EBC thumb_func_start ResetBlockReceivedFlags ResetBlockReceivedFlags: @ 800A550 push {r4,lr} - ldr r0, _0800A56C @ =gUnknown_3003F3C + ldr r0, _0800A56C @ =gWirelessCommType ldrb r0, [r0] cmp r0, 0x1 bne _0800A570 @@ -2218,7 +2218,7 @@ _0800A55C: ble _0800A55C b _0800A57E .align 2, 0 -_0800A56C: .4byte gUnknown_3003F3C +_0800A56C: .4byte gWirelessCommType _0800A570: ldr r1, _0800A584 @ =gUnknown_3003EBC movs r2, 0 @@ -2241,7 +2241,7 @@ ResetBlockReceivedFlag: @ 800A588 push {lr} lsls r0, 24 lsrs r1, r0, 24 - ldr r0, _0800A5A0 @ =gUnknown_3003F3C + ldr r0, _0800A5A0 @ =gWirelessCommType ldrb r0, [r0] cmp r0, 0x1 bne _0800A5A4 @@ -2249,7 +2249,7 @@ ResetBlockReceivedFlag: @ 800A588 bl sub_80F974C b _0800A5B2 .align 2, 0 -_0800A5A0: .4byte gUnknown_3003F3C +_0800A5A0: .4byte gWirelessCommType _0800A5A4: ldr r0, _0800A5B8 @ =gUnknown_3003EBC adds r1, r0 @@ -2886,7 +2886,7 @@ _0800AA44: .4byte gUnknown_3003F20 thumb_func_start sub_800AA48 sub_800AA48: @ 800AA48 push {lr} - ldr r0, _0800AA60 @ =gUnknown_3003F3C + ldr r0, _0800AA60 @ =gWirelessCommType ldrb r0, [r0] cmp r0, 0 bne _0800AA68 @@ -2897,7 +2897,7 @@ sub_800AA48: @ 800AA48 ands r0, r1 b _0800AA70 .align 2, 0 -_0800AA60: .4byte gUnknown_3003F3C +_0800AA60: .4byte gWirelessCommType _0800AA64: .4byte gUnknown_3003F20 _0800AA68: bl sub_80FBA2C @@ -2922,14 +2922,14 @@ sub_800AA80: @ 800AA80 push {lr} lsls r0, 16 lsrs r3, r0, 16 - ldr r0, _0800AA94 @ =gUnknown_3003F3C + ldr r0, _0800AA94 @ =gWirelessCommType ldrb r0, [r0] cmp r0, 0x1 bne _0800AA98 bl task_add_05_task_del_08FA224_when_no_RfuFunc b _0800AAAC .align 2, 0 -_0800AA94: .4byte gUnknown_3003F3C +_0800AA94: .4byte gWirelessCommType _0800AA98: ldr r2, _0800AAB0 @ =gUnknown_3003F80 ldr r1, [r2] @@ -2954,14 +2954,14 @@ _0800AABC: .4byte gUnknown_3003F34 thumb_func_start sub_800AAC0 sub_800AAC0: @ 800AAC0 push {lr} - ldr r0, _0800AAD0 @ =gUnknown_3003F3C + ldr r0, _0800AAD0 @ =gWirelessCommType ldrb r0, [r0] cmp r0, 0x1 bne _0800AAD4 bl task_add_05_task_del_08FA224_when_no_RfuFunc b _0800AAFC .align 2, 0 -_0800AAD0: .4byte gUnknown_3003F3C +_0800AAD0: .4byte gWirelessCommType _0800AAD4: ldr r2, _0800AAE8 @ =gUnknown_3003F80 ldr r1, [r2] @@ -3067,14 +3067,14 @@ _0800AB98: .4byte gUnknown_3003F24 thumb_func_start sub_800AB9C sub_800AB9C: @ 800AB9C push {lr} - ldr r0, _0800ABAC @ =gUnknown_3003F3C + ldr r0, _0800ABAC @ =gWirelessCommType ldrb r0, [r0] cmp r0, 0x1 bne _0800ABB0 bl sub_80FA42C b _0800ABC2 .align 2, 0 -_0800ABAC: .4byte gUnknown_3003F3C +_0800ABAC: .4byte gWirelessCommType _0800ABB0: ldr r1, _0800ABC8 @ =gUnknown_3003F80 ldr r0, [r1] @@ -3253,7 +3253,7 @@ c2_800ACD4: @ 800ACD4 bl FillPalette bl ResetTasks bl remove_some_task - ldr r1, _0800ADF0 @ =gUnknown_3003F3C + ldr r1, _0800ADF0 @ =gWirelessCommType ldrb r0, [r1] cmp r0, 0 beq _0800AD30 @@ -3337,7 +3337,7 @@ _0800ADE0: .4byte gMPlayInfo_SE1 _0800ADE4: .4byte gMPlayInfo_SE2 _0800ADE8: .4byte gMPlayInfo_SE3 _0800ADEC: .4byte gHeap -_0800ADF0: .4byte gUnknown_3003F3C +_0800ADF0: .4byte gWirelessCommType _0800ADF4: .4byte sLinkErrorBuffer _0800ADF8: .4byte sub_800978C _0800ADFC: .4byte gUnknown_82345E8 @@ -3508,7 +3508,7 @@ _0800AF72: bl PlaySE b _0800AFC4 _0800AF7A: - ldr r0, _0800AF9C @ =gUnknown_3003F3C + ldr r0, _0800AF9C @ =gWirelessCommType ldrb r0, [r0] cmp r0, 0x2 bne _0800AFA8 @@ -3525,7 +3525,7 @@ _0800AF7A: bl box_print b _0800AFC4 .align 2, 0 -_0800AF9C: .4byte gUnknown_3003F3C +_0800AF9C: .4byte gWirelessCommType _0800AFA0: .4byte gUnknown_8234610 _0800AFA4: .4byte gUnknown_841DF6B _0800AFA8: @@ -3550,7 +3550,7 @@ _0800AFC4: ldrb r1, [r1] cmp r1, 0xA0 bne _0800B03C - ldr r4, _0800B008 @ =gUnknown_3003F3C + ldr r4, _0800B008 @ =gWirelessCommType ldrb r2, [r4] cmp r2, 0x1 bne _0800B010 @@ -3572,7 +3572,7 @@ _0800AFC4: _0800AFFC: .4byte gUnknown_8234610 _0800B000: .4byte gUnknown_841DF4C _0800B004: .4byte gMain -_0800B008: .4byte gUnknown_3003F3C +_0800B008: .4byte gWirelessCommType _0800B00C: .4byte sLinkErrorBuffer _0800B010: cmp r2, 0x2 @@ -3773,7 +3773,7 @@ _0800B174: .4byte c2_800ACD4 thumb_func_start HandleLinkConnection HandleLinkConnection: @ 800B178 push {r4,r5,lr} - ldr r0, _0800B1B0 @ =gUnknown_3003F3C + ldr r0, _0800B1B0 @ =gWirelessCommType ldrb r0, [r0] cmp r0, 0 bne _0800B1C8 @@ -3798,7 +3798,7 @@ _0800B1AA: movs r0, 0x1 b _0800B1EE .align 2, 0 -_0800B1B0: .4byte gUnknown_3003F3C +_0800B1B0: .4byte gWirelessCommType _0800B1B4: .4byte gUnknown_3003F84 _0800B1B8: .4byte gUnknown_3003F50 _0800B1BC: .4byte gUnknown_3003ED0 @@ -3830,59 +3830,59 @@ _0800B1EE: thumb_func_start sub_800B1F4 sub_800B1F4: @ 800B1F4 push {lr} - ldr r0, _0800B208 @ =gUnknown_3003F64 + ldr r0, _0800B208 @ =gReceivedRemoteLinkPlayers ldrb r0, [r0] cmp r0, 0 bne _0800B204 - ldr r1, _0800B20C @ =gUnknown_3003F3C + ldr r1, _0800B20C @ =gWirelessCommType movs r0, 0x1 strb r0, [r1] _0800B204: pop {r0} bx r0 .align 2, 0 -_0800B208: .4byte gUnknown_3003F64 -_0800B20C: .4byte gUnknown_3003F3C +_0800B208: .4byte gReceivedRemoteLinkPlayers +_0800B20C: .4byte gWirelessCommType thumb_func_end sub_800B1F4 thumb_func_start sub_800B210 sub_800B210: @ 800B210 push {lr} - ldr r0, _0800B224 @ =gUnknown_3003F64 + ldr r0, _0800B224 @ =gReceivedRemoteLinkPlayers ldrb r1, [r0] cmp r1, 0 bne _0800B21E - ldr r0, _0800B228 @ =gUnknown_3003F3C + ldr r0, _0800B228 @ =gWirelessCommType strb r1, [r0] _0800B21E: pop {r0} bx r0 .align 2, 0 -_0800B224: .4byte gUnknown_3003F64 -_0800B228: .4byte gUnknown_3003F3C +_0800B224: .4byte gReceivedRemoteLinkPlayers +_0800B228: .4byte gWirelessCommType thumb_func_end sub_800B210 thumb_func_start sub_800B22C sub_800B22C: @ 800B22C push {lr} - ldr r0, _0800B240 @ =gUnknown_3003F64 + ldr r0, _0800B240 @ =gReceivedRemoteLinkPlayers ldrb r1, [r0] cmp r1, 0 bne _0800B23A - ldr r0, _0800B244 @ =gUnknown_3003F3C + ldr r0, _0800B244 @ =gWirelessCommType strb r1, [r0] _0800B23A: pop {r0} bx r0 .align 2, 0 -_0800B240: .4byte gUnknown_3003F64 -_0800B244: .4byte gUnknown_3003F3C +_0800B240: .4byte gReceivedRemoteLinkPlayers +_0800B244: .4byte gWirelessCommType thumb_func_end sub_800B22C thumb_func_start sub_800B248 sub_800B248: @ 800B248 push {lr} - ldr r0, _0800B25C @ =gUnknown_3003F3C + ldr r0, _0800B25C @ =gWirelessCommType ldrb r0, [r0] cmp r0, 0 bne _0800B268 @@ -3892,7 +3892,7 @@ sub_800B248: @ 800B248 ldrb r0, [r0] b _0800B26C .align 2, 0 -_0800B25C: .4byte gUnknown_3003F3C +_0800B25C: .4byte gWirelessCommType _0800B260: .4byte gUnknown_3003FB0 _0800B264: .4byte 0x00000fbd _0800B268: diff --git a/asm/link_rfu_2.s b/asm/link_rfu_2.s index 0bfd71538..d36eeca20 100644 --- a/asm/link_rfu_2.s +++ b/asm/link_rfu_2.s @@ -1470,12 +1470,12 @@ _080F91B0: cmp r4, 0 bne _080F91CC bl sub_80F8DC0 - ldr r0, _080F91C8 @ =gUnknown_3003F64 + ldr r0, _080F91C8 @ =gReceivedRemoteLinkPlayers strb r4, [r0] b _080F91F6 .align 2, 0 _080F91C4: .4byte gUnknown_3005E10 -_080F91C8: .4byte gUnknown_3003F64 +_080F91C8: .4byte gReceivedRemoteLinkPlayers _080F91CC: bl sub_80F8FD4 ldr r0, _080F91E4 @ =gUnknown_3005450 @@ -1972,7 +1972,7 @@ _080F9538: bl sub_80FB9E4 _080F95B0: bl rfu_clearAllSlot - ldr r1, _080F9650 @ =gUnknown_3003F64 + ldr r1, _080F9650 @ =gReceivedRemoteLinkPlayers movs r0, 0 strb r0, [r1] ldr r0, _080F9644 @ =gUnknown_3005450 @@ -2043,7 +2043,7 @@ _080F9640: .4byte gUnknown_3005E10 _080F9644: .4byte gUnknown_3005450 _080F9648: .4byte 0x0000099c _080F964C: .4byte gUnknown_3007460 -_080F9650: .4byte gUnknown_3003F64 +_080F9650: .4byte gReceivedRemoteLinkPlayers _080F9654: .4byte 0x00000988 _080F9658: .4byte gUnknown_3003F50 thumb_func_end sub_80F9514 @@ -2240,7 +2240,7 @@ _080F97B4: .4byte 0x000008f6 thumb_func_start rfu_func_080F97B8 rfu_func_080F97B8: @ 80F97B8 push {lr} - ldr r0, _080F97F0 @ =gUnknown_3003F64 + ldr r0, _080F97F0 @ =gReceivedRemoteLinkPlayers ldrb r0, [r0] cmp r0, 0 beq _080F97EA @@ -2267,7 +2267,7 @@ _080F97EA: pop {r0} bx r0 .align 2, 0 -_080F97F0: .4byte gUnknown_3003F64 +_080F97F0: .4byte gReceivedRemoteLinkPlayers _080F97F4: .4byte gUnknown_3005028 _080F97F8: .4byte gLinkTransferringData _080F97FC: .4byte gUnknown_3001188 @@ -2429,7 +2429,7 @@ _080F9902: ldrb r0, [r4, 0xC] cmp r0, 0 bne _080F9914 - ldr r0, _080F9940 @ =gUnknown_3003F64 + ldr r0, _080F9940 @ =gReceivedRemoteLinkPlayers ldrb r0, [r0] cmp r0, 0 beq _080F9914 @@ -2457,7 +2457,7 @@ _080F9924: b _080F9BF8 .align 2, 0 _080F993C: .4byte gUnknown_3005450 -_080F9940: .4byte gUnknown_3003F64 +_080F9940: .4byte gReceivedRemoteLinkPlayers _080F9944: .4byte gUnknown_3007460 _080F9948: .4byte gUnknown_3003ED2 _080F994C: .4byte gUnknown_3003ED4 @@ -2606,7 +2606,7 @@ _080F9A4C: beq _080F9A6E b _080F9BF8 _080F9A6E: - ldr r0, _080F9A98 @ =gUnknown_3003F64 + ldr r0, _080F9A98 @ =gReceivedRemoteLinkPlayers ldrb r0, [r0] cmp r0, 0 bne _080F9A78 @@ -2625,7 +2625,7 @@ _080F9A88: .4byte gUnknown_3005450 _080F9A8C: .4byte gBlockRecvBuffer _080F9A90: .4byte gUnknown_3003ED0 _080F9A94: .4byte gUnknown_843EBD4 -_080F9A98: .4byte gUnknown_3003F64 +_080F9A98: .4byte gReceivedRemoteLinkPlayers _080F9A9C: ldr r2, _080F9AB8 @ =gUnknown_843EC64 ldr r3, _080F9ABC @ =gUnknown_3003ED2 @@ -2679,7 +2679,7 @@ _080F9B00: ldrb r2, [r7, 0xC] cmp r2, 0 bne _080F9B68 - ldr r3, _080F9B50 @ =gUnknown_3003F64 + ldr r3, _080F9B50 @ =gReceivedRemoteLinkPlayers ldrb r0, [r3] mov r6, r8 adds r6, 0x1 @@ -2713,7 +2713,7 @@ _080F9B38: b _080F9BF8 .align 2, 0 _080F9B4C: .4byte gUnknown_3005450 -_080F9B50: .4byte gUnknown_3003F64 +_080F9B50: .4byte gReceivedRemoteLinkPlayers _080F9B54: .4byte gUnknown_3003ED2 _080F9B58: .4byte gUnknown_3007460 _080F9B5C: .4byte gUnknown_3003ED4 @@ -3482,7 +3482,7 @@ sub_80FA114: @ 80FA114 push {lr} bl rfu_clearAllSlot bl sub_80FD52C - ldr r1, _080FA138 @ =gUnknown_3003F64 + ldr r1, _080FA138 @ =gReceivedRemoteLinkPlayers movs r0, 0 strb r0, [r1] ldr r2, _080FA13C @ =gUnknown_3005450 @@ -3495,7 +3495,7 @@ sub_80FA114: @ 80FA114 pop {r0} bx r0 .align 2, 0 -_080FA138: .4byte gUnknown_3003F64 +_080FA138: .4byte gReceivedRemoteLinkPlayers _080FA13C: .4byte gUnknown_3005450 thumb_func_end sub_80FA114 @@ -4515,7 +4515,7 @@ _080FA8B4: ldrb r0, [r5, 0xC] cmp r0, 0x1 bne _080FA8F4 - ldr r0, _080FA8CC @ =gUnknown_3003F64 + ldr r0, _080FA8CC @ =gReceivedRemoteLinkPlayers ldrb r0, [r0] cmp r0, 0 beq _080FA8D0 @@ -4524,7 +4524,7 @@ _080FA8B4: bl sub_80F9D04 b _080FA8D8 .align 2, 0 -_080FA8CC: .4byte gUnknown_3003F64 +_080FA8CC: .4byte gReceivedRemoteLinkPlayers _080FA8D0: movs r0, 0xEE lsls r0, 7 @@ -4609,7 +4609,7 @@ _080FA968: .4byte gTasks _080FA96C: adds r0, r6, 0 bl DestroyTask - ldr r1, _080FA9C4 @ =gUnknown_3003F64 + ldr r1, _080FA9C4 @ =gReceivedRemoteLinkPlayers movs r0, 0x1 strb r0, [r1] movs r0, 0x9A @@ -4652,7 +4652,7 @@ _080FA9BC: pop {r0} bx r0 .align 2, 0 -_080FA9C4: .4byte gUnknown_3003F64 +_080FA9C4: .4byte gReceivedRemoteLinkPlayers _080FA9C8: .4byte 0x0000099e _080FA9CC: .4byte 0x0000099d thumb_func_end sub_80FA834 @@ -5123,7 +5123,7 @@ _080FAD66: bl sub_80FA9FC movs r0, 0 bl ResetBlockReceivedFlag - ldr r0, _080FAD94 @ =gUnknown_3003F64 + ldr r0, _080FAD94 @ =gReceivedRemoteLinkPlayers strb r4, [r0] adds r0, r5, 0 bl DestroyTask @@ -5133,7 +5133,7 @@ _080FAD8A: bx r0 .align 2, 0 _080FAD90: .4byte gBlockRecvBuffer -_080FAD94: .4byte gUnknown_3003F64 +_080FAD94: .4byte gReceivedRemoteLinkPlayers thumb_func_end sub_80FACF0 thumb_func_start sub_80FAD98 @@ -5155,7 +5155,7 @@ sub_80FAD98: @ 80FAD98 ldr r0, _080FAE1C @ =sub_814208C cmp r1, r0 bne _080FADC0 - ldr r1, _080FAE20 @ =gUnknown_3003F3C + ldr r1, _080FAE20 @ =gWirelessCommType movs r0, 0x2 strb r0, [r1] _080FADC0: @@ -5200,7 +5200,7 @@ _080FAE10: .4byte gUnknown_3005450 _080FAE14: .4byte gUnknown_3005E10 _080FAE18: .4byte gMain _080FAE1C: .4byte sub_814208C -_080FAE20: .4byte gUnknown_3003F3C +_080FAE20: .4byte gWirelessCommType _080FAE24: .4byte c2_800ACD4 _080FAE28: .4byte 0x0000069e _080FAE2C: .4byte 0x000008d2 @@ -5871,7 +5871,7 @@ _080FB2E4: bics r3, r2 adds r2, r3, 0 strb r2, [r1] - ldr r0, _080FB320 @ =gUnknown_3003F64 + ldr r0, _080FB320 @ =gReceivedRemoteLinkPlayers ldrb r0, [r0] cmp r0, 0x1 bne _080FB328 @@ -5884,7 +5884,7 @@ _080FB2E4: _080FB314: .4byte gUnknown_3005450 _080FB318: .4byte 0x0000099a _080FB31C: .4byte gUnknown_3005E10 -_080FB320: .4byte gUnknown_3003F64 +_080FB320: .4byte gReceivedRemoteLinkPlayers _080FB324: bl sub_80FB174 _080FB328: @@ -6101,7 +6101,7 @@ _080FB4BC: movs r1, 0x5 movs r2, 0x5 bl nullsub_87 - ldr r0, _080FB4E4 @ =gUnknown_3003F64 + ldr r0, _080FB4E4 @ =gReceivedRemoteLinkPlayers ldrb r0, [r0] cmp r0, 0x1 bne _080FB556 @@ -6112,7 +6112,7 @@ _080FB4BC: _080FB4D8: .4byte gUnknown_3005450 _080FB4DC: .4byte 0x0000093e _080FB4E0: .4byte gUnknown_843EDF8 -_080FB4E4: .4byte gUnknown_3003F64 +_080FB4E4: .4byte gReceivedRemoteLinkPlayers _080FB4E8: ldr r0, _080FB4FC @ =gUnknown_3005450 adds r0, 0xF0 @@ -6635,7 +6635,7 @@ _080FB8D8: ldrb r0, [r2, 0xC] cmp r0, 0x1 bne _080FB916 - ldr r0, _080FB904 @ =gUnknown_3003F64 + ldr r0, _080FB904 @ =gReceivedRemoteLinkPlayers ldrb r0, [r0] cmp r0, 0x1 bne _080FB934 @@ -6653,7 +6653,7 @@ _080FB8D8: b _080FB934 .align 2, 0 _080FB900: .4byte gUnknown_3005450 -_080FB904: .4byte gUnknown_3003F64 +_080FB904: .4byte gReceivedRemoteLinkPlayers _080FB908: .4byte 0x0000099a _080FB90C: .4byte gUnknown_3005E10 _080FB910: @@ -6665,7 +6665,7 @@ _080FB916: ldrb r0, [r0] cmp r0, 0x2 beq _080FB934 - ldr r0, _080FB968 @ =gUnknown_3003F64 + ldr r0, _080FB968 @ =gReceivedRemoteLinkPlayers ldrb r0, [r0] cmp r0, 0x1 bne _080FB934 @@ -6699,7 +6699,7 @@ _080FB95A: b _080FB9C2 .align 2, 0 _080FB964: .4byte 0x0000099c -_080FB968: .4byte gUnknown_3003F64 +_080FB968: .4byte gReceivedRemoteLinkPlayers _080FB96C: .4byte gUnknown_3007460 _080FB970: .4byte gUnknown_3005E10 _080FB974: .4byte sub_80F8B34 @@ -9926,7 +9926,7 @@ sub_80FD1A0: @ 80FD1A0 mov r5, r8 push {r5-r7} sub sp, 0x20 - ldr r0, _080FD1C4 @ =gUnknown_3003F3C + ldr r0, _080FD1C4 @ =gWirelessCommType ldrb r0, [r0] cmp r0, 0 bne _080FD1B6 @@ -9938,7 +9938,7 @@ _080FD1B6: movs r4, 0 b _080FD22C .align 2, 0 -_080FD1C4: .4byte gUnknown_3003F3C +_080FD1C4: .4byte gWirelessCommType _080FD1C8: lsls r2, r4, 2 mov r0, sp diff --git a/asm/link_rfu_3.s b/asm/link_rfu_3.s index d9f172a81..c5947ebc0 100644 --- a/asm/link_rfu_3.s +++ b/asm/link_rfu_3.s @@ -1107,7 +1107,7 @@ _081161AC: strb r0, [r5, 0xC] b _081161D8 _081161BA: - ldr r0, _081161E0 @ =gUnknown_3003F64 + ldr r0, _081161E0 @ =gReceivedRemoteLinkPlayers ldrb r0, [r0] cmp r0, 0 beq _081161D8 @@ -1124,7 +1124,7 @@ _081161D8: pop {r0} bx r0 .align 2, 0 -_081161E0: .4byte gUnknown_3003F64 +_081161E0: .4byte gReceivedRemoteLinkPlayers thumb_func_end sub_8115A68 thumb_func_start sub_81161E4 @@ -2082,7 +2082,7 @@ _081169FC: .4byte gStringVar4 _08116A00: .4byte gUnknown_203B058 _08116A04: .4byte gStringVar1 _08116A08: - ldr r0, _08116A3C @ =gUnknown_3003F64 + ldr r0, _08116A3C @ =gReceivedRemoteLinkPlayers ldrb r0, [r0] cmp r0, 0 beq _08116AA4 @@ -2108,7 +2108,7 @@ _08116A08: ldr r0, [r0] mov pc, r0 .align 2, 0 -_08116A3C: .4byte gUnknown_3003F64 +_08116A3C: .4byte gReceivedRemoteLinkPlayers _08116A40: .4byte gUnknown_203B058 _08116A44: .4byte _08116A48 .align 2, 0 @@ -4444,7 +4444,7 @@ _08117E64: strb r0, [r5, 0xC] b _08117ECA _08117E6A: - ldr r0, _08117E7C @ =gUnknown_3003F64 + ldr r0, _08117E7C @ =gReceivedRemoteLinkPlayers ldrb r0, [r0] cmp r0, 0 beq _08117ECA @@ -4452,7 +4452,7 @@ _08117E6A: bl sub_80FAFE0 b _08117EB2 .align 2, 0 -_08117E7C: .4byte gUnknown_3003F64 +_08117E7C: .4byte gReceivedRemoteLinkPlayers _08117E80: ldrb r0, [r5, 0x12] movs r1, 0 @@ -4791,7 +4791,7 @@ _08118150: _08118184: .4byte gUnknown_8459238 _08118188: .4byte gStringVar1 _0811818C: - ldr r0, _081181C4 @ =gUnknown_3003F64 + ldr r0, _081181C4 @ =gReceivedRemoteLinkPlayers ldrb r0, [r0] cmp r0, 0 beq _081181AA @@ -4820,7 +4820,7 @@ _081181AA: blt _08118288 b _081181D0 .align 2, 0 -_081181C4: .4byte gUnknown_3003F64 +_081181C4: .4byte gReceivedRemoteLinkPlayers _081181C8: .4byte gUnknown_203B058 _081181CC: cmp r0, 0x6 @@ -5188,7 +5188,7 @@ _081184C8: _081184FC: .4byte gUnknown_845928C _08118500: .4byte gStringVar1 _08118504: - ldr r0, _0811853C @ =gUnknown_3003F64 + ldr r0, _0811853C @ =gReceivedRemoteLinkPlayers ldrb r0, [r0] cmp r0, 0 beq _08118522 @@ -5217,7 +5217,7 @@ _08118522: blt _08118604 b _08118548 .align 2, 0 -_0811853C: .4byte gUnknown_3003F64 +_0811853C: .4byte gReceivedRemoteLinkPlayers _08118540: .4byte gUnknown_203B058 _08118544: cmp r0, 0x6 @@ -5941,7 +5941,7 @@ _08118BBC: movs r0, 0x40 strb r0, [r1] _08118BC2: - ldr r0, _08118BEC @ =gUnknown_3003F64 + ldr r0, _08118BEC @ =gReceivedRemoteLinkPlayers ldrb r0, [r0] cmp r0, 0 bne _08118BCE @@ -5958,7 +5958,7 @@ _08118BCE: .align 2, 0 _08118BE4: .4byte gUnknown_8457F90 _08118BE8: .4byte gUnknown_203B058 -_08118BEC: .4byte gUnknown_3003F64 +_08118BEC: .4byte gReceivedRemoteLinkPlayers _08118BF0: .4byte gBlockSendBuffer _08118BF4: .4byte sub_8117280 _08118BF8: @@ -5985,7 +5985,7 @@ _08118C28: movs r0, 0x5 bl _081198DA _08118C2E: - ldr r0, _08118C54 @ =gUnknown_3003F64 + ldr r0, _08118C54 @ =gReceivedRemoteLinkPlayers ldrb r0, [r0] cmp r0, 0 beq _08118C3A @@ -6002,7 +6002,7 @@ _08118C3A: movs r0, 0x2 bl _081198DA .align 2, 0 -_08118C54: .4byte gUnknown_3003F64 +_08118C54: .4byte gReceivedRemoteLinkPlayers _08118C58: adds r0, r6, 0 adds r0, 0x16 @@ -6021,7 +6021,7 @@ _08118C58: bne _08118C7C bl _081198DC _08118C7C: - ldr r0, _08118C94 @ =gUnknown_3003F64 + ldr r0, _08118C94 @ =gReceivedRemoteLinkPlayers ldrb r0, [r0] cmp r0, 0 bne _08118C98 @@ -6030,7 +6030,7 @@ _08118C7C: .align 2, 0 _08118C8C: .4byte gUnknown_8456DF4 _08118C90: .4byte gUnknown_8456E1C -_08118C94: .4byte gUnknown_3003F64 +_08118C94: .4byte gReceivedRemoteLinkPlayers _08118C98: adds r1, r6, 0 adds r1, 0x84 @@ -6168,7 +6168,7 @@ _08118DAA: .align 2, 0 _08118DD0: .4byte gUnknown_203B06C _08118DD4: - ldr r0, _08118DEC @ =gUnknown_3003F64 + ldr r0, _08118DEC @ =gReceivedRemoteLinkPlayers ldrb r0, [r0] cmp r0, 0 bne _08118DF8 @@ -6178,7 +6178,7 @@ _08118DD4: movs r0, 0x1C bl _081198DA .align 2, 0 -_08118DEC: .4byte gUnknown_3003F64 +_08118DEC: .4byte gReceivedRemoteLinkPlayers _08118DF0: .4byte gStringVar4 _08118DF4: .4byte gUnknown_8458434 _08118DF8: @@ -6481,7 +6481,7 @@ _08119088: movs r0, 0x1E bl sub_8118664 _08119096: - ldr r0, _081190AC @ =gUnknown_3003F64 + ldr r0, _081190AC @ =gReceivedRemoteLinkPlayers ldrb r0, [r0] cmp r0, 0 bne _081190A2 @@ -6491,7 +6491,7 @@ _081190A2: bl _081198DA .align 2, 0 _081190A8: .4byte gUnknown_84585E8 -_081190AC: .4byte gUnknown_3003F64 +_081190AC: .4byte gReceivedRemoteLinkPlayers _081190B0: movs r0, 0x42 bl PlaySE @@ -6512,7 +6512,7 @@ _081190CA: movs r0, 0x2 bl _081198DA _081190DE: - ldr r0, _08119100 @ =gUnknown_3003F64 + ldr r0, _08119100 @ =gReceivedRemoteLinkPlayers ldrb r0, [r0] cmp r0, 0 bne _081190EA @@ -6527,7 +6527,7 @@ _081190EA: movs r0, 0x27 bl _081198DA .align 2, 0 -_08119100: .4byte gUnknown_3003F64 +_08119100: .4byte gReceivedRemoteLinkPlayers _08119104: .4byte gBlockSendBuffer _08119108: .4byte sub_8117280 _0811910C: @@ -6743,7 +6743,7 @@ _081192E0: movs r0, 0x24 b _081198DA _081192E8: - ldr r0, _08119318 @ =gUnknown_3003F64 + ldr r0, _08119318 @ =gReceivedRemoteLinkPlayers ldrb r4, [r0] cmp r4, 0 beq _081192F2 @@ -6767,7 +6767,7 @@ _081192F2: strh r4, [r0] b _081198DC .align 2, 0 -_08119318: .4byte gUnknown_3003F64 +_08119318: .4byte gReceivedRemoteLinkPlayers _0811931C: .4byte gUnknown_203B058 _08119320: .4byte gStringVar4 _08119324: @@ -13159,7 +13159,7 @@ _0811C4D8: .4byte gUnknown_203B08C _0811C4DC: .4byte gUnknown_841E58D _0811C4E0: .4byte c2_exit_to_overworld_2_switch _0811C4E4: - ldr r0, _0811C4FC @ =gUnknown_3003F64 + ldr r0, _0811C4FC @ =gReceivedRemoteLinkPlayers ldrb r0, [r0] cmp r0, 0 bne _0811C516 @@ -13172,7 +13172,7 @@ _0811C4F2: strb r0, [r1] b _0811C516 .align 2, 0 -_0811C4FC: .4byte gUnknown_3003F64 +_0811C4FC: .4byte gReceivedRemoteLinkPlayers _0811C500: ldr r0, _0811C534 @ =gUnknown_203B08C ldr r0, [r0] diff --git a/asm/link_rfu_4.s b/asm/link_rfu_4.s index 1ec24a43c..dd9c498a4 100644 --- a/asm/link_rfu_4.s +++ b/asm/link_rfu_4.s @@ -1649,7 +1649,7 @@ _081430B2: strb r0, [r5, 0x8] b _081435C6 _081430B8: - ldr r0, _081430D0 @ =gUnknown_3003F64 + ldr r0, _081430D0 @ =gReceivedRemoteLinkPlayers ldrb r0, [r0] cmp r0, 0 beq _081430D4 @@ -1660,7 +1660,7 @@ _081430B8: bl mevent_srv_ish_do_init b _081435C6 .align 2, 0 -_081430D0: .4byte gUnknown_3003F64 +_081430D0: .4byte gReceivedRemoteLinkPlayers _081430D4: ldr r0, _081430E8 @ =gSpecialVar_Result ldrh r0, [r0] @@ -2160,7 +2160,7 @@ _08143492: strb r0, [r5, 0x8] b _081435C6 _0814349C: - ldr r0, _081434B0 @ =gUnknown_3003F64 + ldr r0, _081434B0 @ =gReceivedRemoteLinkPlayers ldrb r0, [r0] cmp r0, 0 beq _081434B4 @@ -2170,7 +2170,7 @@ _0814349C: strb r0, [r5, 0x8] b _081435C6 .align 2, 0 -_081434B0: .4byte gUnknown_3003F64 +_081434B0: .4byte gReceivedRemoteLinkPlayers _081434B4: ldr r0, _081434CC @ =gSpecialVar_Result ldrh r0, [r0] diff --git a/asm/menu_helpers.s b/asm/menu_helpers.s index c0e8f1333..3a0f709da 100644 --- a/asm/menu_helpers.s +++ b/asm/menu_helpers.s @@ -363,7 +363,7 @@ sub_80BF708: @ 80BF708 bl sub_805642C cmp r0, 0x1 beq _080BF71A - ldr r0, _080BF720 @ =gUnknown_3003F64 + ldr r0, _080BF720 @ =gReceivedRemoteLinkPlayers ldrb r0, [r0] cmp r0, 0x1 bne _080BF724 @@ -371,7 +371,7 @@ _080BF71A: movs r0, 0x1 b _080BF726 .align 2, 0 -_080BF720: .4byte gUnknown_3003F64 +_080BF720: .4byte gReceivedRemoteLinkPlayers _080BF724: movs r0, 0 _080BF726: diff --git a/asm/overworld.s b/asm/overworld.s index f1587d154..2b3ca139d 100644 --- a/asm/overworld.s +++ b/asm/overworld.s @@ -3727,7 +3727,7 @@ c2_8056854: @ 8056854 ldr r0, _08056878 @ =c1_link_related bl sub_80565E0 bl sub_80578D8 - ldr r0, _0805687C @ =gUnknown_3003F3C + ldr r0, _0805687C @ =gWirelessCommType ldrb r0, [r0] cmp r0, 0 beq _08056888 @@ -3736,7 +3736,7 @@ c2_8056854: @ 8056854 b _0805688C .align 2, 0 _08056878: .4byte c1_link_related -_0805687C: .4byte gUnknown_3003F3C +_0805687C: .4byte gWirelessCommType _08056880: .4byte gUnknown_3005020 _08056884: .4byte sub_807DE58 _08056888: @@ -3892,7 +3892,7 @@ sub_80569BC: @ 80569BC bne _080569CE bl sub_80098B8 _080569CE: - ldr r0, _080569E4 @ =gUnknown_3003F3C + ldr r0, _080569E4 @ =gWirelessCommType ldrb r0, [r0] cmp r0, 0 beq _080569E8 @@ -3902,7 +3902,7 @@ _080569CE: bl DisableInterrupts b _080569F4 .align 2, 0 -_080569E4: .4byte gUnknown_3003F3C +_080569E4: .4byte gWirelessCommType _080569E8: movs r0, 0x2 bl DisableInterrupts @@ -4054,7 +4054,7 @@ _08056B36: bl cur_mapheader_run_tileset_funcs_after_some_cpuset b _08056B62 _08056B3C: - ldr r0, _08056B54 @ =gUnknown_3003F3C + ldr r0, _08056B54 @ =gWirelessCommType ldrb r0, [r0] cmp r0, 0 beq _08056B62 @@ -4064,7 +4064,7 @@ _08056B3C: bl sub_80FCD74 b _08056B62 .align 2, 0 -_08056B54: .4byte gUnknown_3003F3C +_08056B54: .4byte gWirelessCommType _08056B58: bl map_post_load_hook_exec lsls r0, 24 @@ -4385,7 +4385,7 @@ _08056E12: bl cur_mapheader_run_tileset_funcs_after_some_cpuset b _08056E3E _08056E18: - ldr r0, _08056E30 @ =gUnknown_3003F3C + ldr r0, _08056E30 @ =gWirelessCommType ldrb r0, [r0] cmp r0, 0 beq _08056E3E @@ -4395,7 +4395,7 @@ _08056E18: bl sub_80FCD74 b _08056E3E .align 2, 0 -_08056E30: .4byte gUnknown_3003F3C +_08056E30: .4byte gWirelessCommType _08056E34: bl map_post_load_hook_exec lsls r0, 24 @@ -5636,7 +5636,7 @@ _08057880: .4byte sub_805671C thumb_func_start c1_link_related c1_link_related: @ 8057884 push {r4,lr} - ldr r0, _080578C8 @ =gUnknown_3003F3C + ldr r0, _080578C8 @ =gWirelessCommType ldrb r0, [r0] cmp r0, 0 beq _0805789E @@ -5665,7 +5665,7 @@ _080578C0: pop {r0} bx r0 .align 2, 0 -_080578C8: .4byte gUnknown_3003F3C +_080578C8: .4byte gWirelessCommType _080578CC: .4byte gUnknown_300502C _080578D0: .4byte gUnknown_3003E60 _080578D4: .4byte gUnknown_3000E84 @@ -5710,7 +5710,7 @@ _0805790C: .4byte gUnknown_3000E84 thumb_func_start sub_8057910 sub_8057910: @ 8057910 push {lr} - ldr r0, _08057934 @ =gUnknown_3003F3C + ldr r0, _08057934 @ =gWirelessCommType ldrb r0, [r0] cmp r0, 0 beq _0805792E @@ -5727,7 +5727,7 @@ _0805792E: pop {r0} bx r0 .align 2, 0 -_08057934: .4byte gUnknown_3003F3C +_08057934: .4byte gWirelessCommType _08057938: .4byte gUnknown_3000E89 thumb_func_end sub_8057910 @@ -6137,7 +6137,7 @@ _08057C6C: movs r0, 0x11 strh r0, [r1] _08057C72: - ldr r0, _08057CB4 @ =gUnknown_3003F3C + ldr r0, _08057CB4 @ =gWirelessCommType ldrb r0, [r0] cmp r0, 0 beq _08057CA8 @@ -6168,7 +6168,7 @@ _08057CA8: bx r0 .align 2, 0 _08057CB0: .4byte gUnknown_3005028 -_08057CB4: .4byte gUnknown_3003F3C +_08057CB4: .4byte gWirelessCommType thumb_func_end sub_8057C4C thumb_func_start sub_8057CB8 @@ -7089,7 +7089,7 @@ _08058312: thumb_func_start sub_8058318 sub_8058318: @ 8058318 push {lr} - ldr r0, _08058330 @ =gUnknown_3003F3C + ldr r0, _08058330 @ =gWirelessCommType ldrb r0, [r0] cmp r0, 0 bne _08058334 @@ -7099,7 +7099,7 @@ sub_8058318: @ 8058318 movs r0, 0x1 b _08058336 .align 2, 0 -_08058330: .4byte gUnknown_3003F3C +_08058330: .4byte gWirelessCommType _08058334: movs r0, 0 _08058336: @@ -7110,7 +7110,7 @@ _08058336: thumb_func_start sub_805833C sub_805833C: @ 805833C push {lr} - ldr r0, _08058350 @ =gUnknown_3003F3C + ldr r0, _08058350 @ =gWirelessCommType ldrb r0, [r0] cmp r0, 0 bne _0805835C @@ -7120,7 +7120,7 @@ sub_805833C: @ 805833C ldrb r0, [r0] b _08058364 .align 2, 0 -_08058350: .4byte gUnknown_3003F3C +_08058350: .4byte gWirelessCommType _08058354: .4byte gUnknown_3003FB0 _08058358: .4byte 0x00000339 _0805835C: diff --git a/asm/pokemon_summary_screen.s b/asm/pokemon_summary_screen.s index 05256c776..8db247b2b 100644 --- a/asm/pokemon_summary_screen.s +++ b/asm/pokemon_summary_screen.s @@ -1293,7 +1293,7 @@ _08134FC8: ands r0, r1 cmp r0, 0 bne _08135004 - ldr r0, _08134FFC @ =gUnknown_3003F64 + ldr r0, _08134FFC @ =gReceivedRemoteLinkPlayers ldrb r0, [r0] cmp r0, 0 bne _08135004 @@ -1304,7 +1304,7 @@ _08134FC8: _08134FF0: .4byte gUnknown_8419C39 _08134FF4: .4byte gMain _08134FF8: .4byte 0x00000439 -_08134FFC: .4byte gUnknown_3003F64 +_08134FFC: .4byte gReceivedRemoteLinkPlayers _08135000: .4byte gUnknown_8419C92 _08135004: ldr r0, _0813500C @ =gUnknown_8419CA2 @@ -8439,7 +8439,7 @@ sub_8138B4C: @ 8138B4C lsrs r0, 24 cmp r0, 0x1 bne _08138B84 - ldr r0, _08138B7C @ =gUnknown_3003F64 + ldr r0, _08138B7C @ =gReceivedRemoteLinkPlayers ldrb r0, [r0] cmp r0, 0x1 bne _08138B84 @@ -8453,7 +8453,7 @@ _08138B76: movs r0, 0x1 b _08138B86 .align 2, 0 -_08138B7C: .4byte gUnknown_3003F64 +_08138B7C: .4byte gReceivedRemoteLinkPlayers _08138B80: .4byte gUnknown_203B16C _08138B84: movs r0, 0 @@ -8931,7 +8931,7 @@ _08138EE0: beq _08138EF0 b _08139094 _08138EF0: - ldr r0, _08138F10 @ =gUnknown_3003F64 + ldr r0, _08138F10 @ =gReceivedRemoteLinkPlayers ldrb r0, [r0] cmp r0, 0 beq _08138EFA @@ -8946,7 +8946,7 @@ _08138EFA: _08138F04: .4byte 0x00003268 _08138F08: .4byte 0x00003024 _08138F0C: .4byte 0x00000439 -_08138F10: .4byte gUnknown_3003F64 +_08138F10: .4byte gReceivedRemoteLinkPlayers _08138F14: .4byte gUnknown_203B16E _08138F18: strb r4, [r2] @@ -13242,7 +13242,7 @@ _0813B198: bl sub_805642C cmp r0, 0 bne _0813B1C4 - ldr r0, _0813B1C0 @ =gUnknown_3003F64 + ldr r0, _0813B1C0 @ =gReceivedRemoteLinkPlayers ldrb r0, [r0] cmp r0, 0x1 bne _0813B1C4 @@ -13256,7 +13256,7 @@ _0813B198: bl sub_813B38C b _0813B1CC .align 2, 0 -_0813B1C0: .4byte gUnknown_3003F64 +_0813B1C0: .4byte gReceivedRemoteLinkPlayers _0813B1C4: lsls r0, r5, 24 asrs r0, 24 diff --git a/asm/reshow_battle_screen.s b/asm/reshow_battle_screen.s index f7c412cde..6fb09f439 100644 --- a/asm/reshow_battle_screen.s +++ b/asm/reshow_battle_screen.s @@ -324,11 +324,11 @@ _08077A14: ldrb r0, [r0] movs r1, 0 bl ActionSelectionCreateCursorAt - ldr r0, _08077A54 @ =gUnknown_3003F3C + ldr r0, _08077A54 @ =gWirelessCommType ldrb r0, [r0] cmp r0, 0 beq _08077A8A - ldr r0, _08077A58 @ =gUnknown_3003F64 + ldr r0, _08077A58 @ =gReceivedRemoteLinkPlayers ldrb r0, [r0] cmp r0, 0 beq _08077A8A @@ -342,8 +342,8 @@ _08077A44: .4byte gBattlerPartyIndexes _08077A48: .4byte gEnemyParty _08077A4C: .4byte gUnknown_2023FF8 _08077A50: .4byte gBattlerInMenuId -_08077A54: .4byte gUnknown_3003F3C -_08077A58: .4byte gUnknown_3003F64 +_08077A54: .4byte gWirelessCommType +_08077A58: .4byte gReceivedRemoteLinkPlayers _08077A5C: ldr r0, _08077A9C @ =sub_80116F4 bl SetVBlankCallback diff --git a/asm/start_menu.s b/asm/start_menu.s index 73a82fb5c..1d81d0392 100644 --- a/asm/start_menu.s +++ b/asm/start_menu.s @@ -1925,7 +1925,7 @@ _0806FC14: movs r2, 0x10 movs r3, 0 bl BeginNormalPaletteFade - ldr r0, _0806FC78 @ =gUnknown_3003F3C + ldr r0, _0806FC78 @ =gWirelessCommType ldrb r0, [r0] cmp r0, 0 beq _0806FC7C @@ -1936,7 +1936,7 @@ _0806FC14: b _0806FCE6 .align 2, 0 _0806FC74: .4byte gUnknown_8419F54 -_0806FC78: .4byte gUnknown_3003F3C +_0806FC78: .4byte gWirelessCommType _0806FC7C: movs r0, 0x1 b _0806FCE6 diff --git a/asm/trade.s b/asm/trade.s index 6ce974675..e9fcddf2d 100644 --- a/asm/trade.s +++ b/asm/trade.s @@ -246,7 +246,7 @@ _0804C80A: bl sub_804F5BC movs r0, 0 bl ShowBg - ldr r0, _0804C86C @ =gUnknown_3003F64 + ldr r0, _0804C86C @ =gReceivedRemoteLinkPlayers ldrb r2, [r0] cmp r2, 0 bne _0804C8B4 @@ -258,7 +258,7 @@ _0804C80A: ldr r0, [r0] adds r0, 0xA8 strb r2, [r0] - ldr r0, _0804C87C @ =gUnknown_3003F3C + ldr r0, _0804C87C @ =gWirelessCommType ldrb r0, [r0] cmp r0, 0 beq _0804C880 @@ -269,11 +269,11 @@ _0804C80A: .align 2, 0 _0804C864: .4byte gPaletteFade _0804C868: .4byte gEnemyParty -_0804C86C: .4byte gUnknown_3003F64 +_0804C86C: .4byte gReceivedRemoteLinkPlayers _0804C870: .4byte gLinkType _0804C874: .4byte 0x00001122 _0804C878: .4byte gUnknown_2031DA8 -_0804C87C: .4byte gUnknown_3003F3C +_0804C87C: .4byte gWirelessCommType _0804C880: bl sub_8009804 ldr r1, _0804C8A8 @ =gMain @@ -284,7 +284,7 @@ _0804C880: adds r0, 0x1 strb r0, [r1] _0804C892: - ldr r0, _0804C8AC @ =gUnknown_3003F3C + ldr r0, _0804C8AC @ =gWirelessCommType ldrb r0, [r0] cmp r0, 0 beq _0804C89C @@ -296,7 +296,7 @@ _0804C89C: b _0804CEE6 .align 2, 0 _0804C8A8: .4byte gMain -_0804C8AC: .4byte gUnknown_3003F3C +_0804C8AC: .4byte gWirelessCommType _0804C8B0: .4byte sub_8081A90 _0804C8B4: ldr r0, _0804C8C4 @ =gMain @@ -375,7 +375,7 @@ _0804C940: .align 2, 0 _0804C94C: .4byte gMain _0804C950: - ldr r0, _0804C9A0 @ =gUnknown_3003F64 + ldr r0, _0804C9A0 @ =gReceivedRemoteLinkPlayers ldrb r0, [r0] cmp r0, 0x1 beq _0804C95A @@ -402,7 +402,7 @@ _0804C968: ldr r0, [r0] adds r0, 0xA8 strb r2, [r0] - ldr r0, _0804C9AC @ =gUnknown_3003F3C + ldr r0, _0804C9AC @ =gWirelessCommType ldrb r0, [r0] cmp r0, 0 bne _0804C992 @@ -413,12 +413,12 @@ _0804C992: bl sub_800AB9C b _0804CEE6 .align 2, 0 -_0804C9A0: .4byte gUnknown_3003F64 +_0804C9A0: .4byte gReceivedRemoteLinkPlayers _0804C9A4: .4byte gMain _0804C9A8: .4byte gUnknown_2031DA8 -_0804C9AC: .4byte gUnknown_3003F3C +_0804C9AC: .4byte gWirelessCommType _0804C9B0: - ldr r0, _0804C9E0 @ =gUnknown_3003F3C + ldr r0, _0804C9E0 @ =gWirelessCommType ldrb r0, [r0] cmp r0, 0 beq _0804C9E8 @@ -441,7 +441,7 @@ _0804C9C4: bl sub_80FCD74 b _0804CEE6 .align 2, 0 -_0804C9E0: .4byte gUnknown_3003F3C +_0804C9E0: .4byte gWirelessCommType _0804C9E4: .4byte gMain _0804C9E8: movs r2, 0x87 @@ -1130,7 +1130,7 @@ _0804CFC8: .align 2, 0 _0804CFD8: .4byte gMain _0804CFDC: - ldr r0, _0804CFFC @ =gUnknown_3003F3C + ldr r0, _0804CFFC @ =gWirelessCommType ldrb r0, [r0] cmp r0, 0 beq _0804CFF0 @@ -1145,7 +1145,7 @@ _0804CFF0: adds r1, r3 b _0804D4B4 .align 2, 0 -_0804CFFC: .4byte gUnknown_3003F3C +_0804CFFC: .4byte gWirelessCommType _0804D000: .4byte gMain _0804D004: movs r5, 0x87 @@ -1795,7 +1795,7 @@ sub_804D548: @ 804D548 adds r0, 0x7E ldrb r0, [r0] strb r0, [r1, 0x1] - ldr r0, _0804D58C @ =gUnknown_3003F3C + ldr r0, _0804D58C @ =gWirelessCommType ldrb r0, [r0] cmp r0, 0 beq _0804D590 @@ -1808,7 +1808,7 @@ sub_804D548: @ 804D548 _0804D580: .4byte gPaletteFade _0804D584: .4byte gUnknown_2031DA4 _0804D588: .4byte gUnknown_2031DA8 -_0804D58C: .4byte gUnknown_3003F3C +_0804D58C: .4byte gWirelessCommType _0804D590: movs r0, 0x20 bl sub_800AA80 @@ -1828,7 +1828,7 @@ sub_804D5A4: @ 804D5A4 ldr r5, _0804D5E4 @ =gMain ldr r0, _0804D5E8 @ =sub_804C718 str r0, [r5, 0x8] - ldr r0, _0804D5EC @ =gUnknown_3003F3C + ldr r0, _0804D5EC @ =gWirelessCommType ldrb r0, [r0] cmp r0, 0 beq _0804D5FC @@ -1852,12 +1852,12 @@ sub_804D5A4: @ 804D5A4 .align 2, 0 _0804D5E4: .4byte gMain _0804D5E8: .4byte sub_804C718 -_0804D5EC: .4byte gUnknown_3003F3C +_0804D5EC: .4byte gWirelessCommType _0804D5F0: .4byte gUnknown_2031C90 _0804D5F4: .4byte gUnknown_2031DA8 _0804D5F8: .4byte sub_8050138 _0804D5FC: - ldr r0, _0804D628 @ =gUnknown_3003F64 + ldr r0, _0804D628 @ =gReceivedRemoteLinkPlayers ldrb r4, [r0] cmp r4, 0 bne _0804D620 @@ -1876,7 +1876,7 @@ _0804D620: pop {r0} bx r0 .align 2, 0 -_0804D628: .4byte gUnknown_3003F64 +_0804D628: .4byte gReceivedRemoteLinkPlayers _0804D62C: .4byte gUnknown_2031C90 _0804D630: .4byte gUnknown_2031DA8 _0804D634: .4byte sub_8050138 @@ -4253,7 +4253,7 @@ sub_804E908: @ 804E908 ands r0, r1 cmp r0, 0 bne _0804E93C - ldr r0, _0804E928 @ =gUnknown_3003F3C + ldr r0, _0804E928 @ =gWirelessCommType ldrb r0, [r0] cmp r0, 0 beq _0804E92C @@ -4261,7 +4261,7 @@ sub_804E908: @ 804E908 b _0804E932 .align 2, 0 _0804E924: .4byte gPaletteFade -_0804E928: .4byte gUnknown_3003F3C +_0804E928: .4byte gWirelessCommType _0804E92C: movs r0, 0xC bl sub_800AA80 @@ -4281,7 +4281,7 @@ _0804E940: .4byte gUnknown_2031DA8 thumb_func_start sub_804E944 sub_804E944: @ 804E944 push {lr} - ldr r0, _0804E978 @ =gUnknown_3003F3C + ldr r0, _0804E978 @ =gWirelessCommType ldrb r0, [r0] cmp r0, 0 beq _0804E988 @@ -4301,12 +4301,12 @@ sub_804E944: @ 804E944 bl SetMainCallback2 b _0804E9AA .align 2, 0 -_0804E978: .4byte gUnknown_3003F3C +_0804E978: .4byte gWirelessCommType _0804E97C: .4byte gUnknown_2031C90 _0804E980: .4byte gUnknown_2031DA8 _0804E984: .4byte c2_8056854 _0804E988: - ldr r0, _0804E9B0 @ =gUnknown_3003F64 + ldr r0, _0804E9B0 @ =gReceivedRemoteLinkPlayers ldrb r0, [r0] cmp r0, 0 bne _0804E9AA @@ -4323,7 +4323,7 @@ _0804E9AA: pop {r0} bx r0 .align 2, 0 -_0804E9B0: .4byte gUnknown_3003F64 +_0804E9B0: .4byte gReceivedRemoteLinkPlayers _0804E9B4: .4byte gUnknown_2031C90 _0804E9B8: .4byte gUnknown_2031DA8 _0804E9BC: .4byte c2_8056854 @@ -6573,7 +6573,7 @@ _0804FB24: thumb_func_start sub_804FB34 sub_804FB34: @ 804FB34 push {r4-r7,lr} - ldr r0, _0804FBB4 @ =gUnknown_3003F64 + ldr r0, _0804FBB4 @ =gReceivedRemoteLinkPlayers ldrb r0, [r0] cmp r0, 0 beq _0804FBC0 @@ -6634,7 +6634,7 @@ _0804FB6E: movs r0, 0x2 b _0804FBC2 .align 2, 0 -_0804FBB4: .4byte gUnknown_3003F64 +_0804FBB4: .4byte gReceivedRemoteLinkPlayers _0804FBB8: .4byte gLinkPlayers _0804FBBC: movs r0, 0x1 @@ -7209,14 +7209,14 @@ _0804FFC0: .4byte c2_800ACD4 thumb_func_start sub_804FFC4 sub_804FFC4: @ 804FFC4 push {lr} - ldr r0, _0804FFD4 @ =gUnknown_3003F64 + ldr r0, _0804FFD4 @ =gReceivedRemoteLinkPlayers ldrb r0, [r0] cmp r0, 0 bne _0804FFD8 movs r0, 0 b _0804FFE0 .align 2, 0 -_0804FFD4: .4byte gUnknown_3003F64 +_0804FFD4: .4byte gReceivedRemoteLinkPlayers _0804FFD8: bl GetMultiplayerId lsls r0, 24 @@ -7424,7 +7424,7 @@ _08050160: .4byte _08050430 .4byte _0805044C _08050194: - ldr r0, _08050228 @ =gUnknown_3003F64 + ldr r0, _08050228 @ =gReceivedRemoteLinkPlayers ldrb r0, [r0] cmp r0, 0 bne _080501A8 @@ -7490,14 +7490,14 @@ _080501A8: strh r2, [r0] b _08050472 .align 2, 0 -_08050228: .4byte gUnknown_3003F64 +_08050228: .4byte gReceivedRemoteLinkPlayers _0805022C: .4byte gLinkType _08050230: .4byte 0x00001144 _08050234: .4byte gUnknown_2031DAC _08050238: .4byte sub_804FF0C _0805023C: .4byte gMain _08050240: - ldr r0, _08050270 @ =gUnknown_3003F64 + ldr r0, _08050270 @ =gReceivedRemoteLinkPlayers ldrb r5, [r0] cmp r5, 0 bne _0805027C @@ -7520,7 +7520,7 @@ _08050240: str r5, [r0, 0x64] b _08050472 .align 2, 0 -_08050270: .4byte gUnknown_3003F64 +_08050270: .4byte gReceivedRemoteLinkPlayers _08050274: .4byte gUnknown_2031DAC _08050278: .4byte gMain _0805027C: @@ -7585,7 +7585,7 @@ _080502EC: b _08050472 _080502F2: bl sub_804FF4C - ldr r0, _08050318 @ =gUnknown_3003F64 + ldr r0, _08050318 @ =gReceivedRemoteLinkPlayers ldrb r0, [r0] cmp r0, 0x1 beq _08050300 @@ -7604,7 +7604,7 @@ _0805030E: adds r1, r2 b _08050440 .align 2, 0 -_08050318: .4byte gUnknown_3003F64 +_08050318: .4byte gReceivedRemoteLinkPlayers _0805031C: .4byte gMain _08050320: ldr r2, _08050340 @ =gUnknown_2031DAC @@ -7745,7 +7745,7 @@ _0805044C: ands r0, r1 cmp r0, 0 bne _08050472 - ldr r0, _08050494 @ =gUnknown_3003F3C + ldr r0, _08050494 @ =gWirelessCommType ldrb r0, [r0] cmp r0, 0 beq _0805046C @@ -7768,7 +7768,7 @@ _08050472: bx r0 .align 2, 0 _08050490: .4byte gPaletteFade -_08050494: .4byte gUnknown_3003F3C +_08050494: .4byte gWirelessCommType _08050498: .4byte sub_8053D84 thumb_func_end sub_8050138 @@ -8236,7 +8236,7 @@ _080508A2: _080508B8: mov r0, r9 bl sub_80507A0 - ldr r0, _080508F0 @ =gUnknown_3003F64 + ldr r0, _080508F0 @ =gReceivedRemoteLinkPlayers ldrb r0, [r0] cmp r0, 0 beq _080508CA @@ -8256,7 +8256,7 @@ _080508E0: .4byte gSaveBlock1Ptr _080508E4: .4byte 0x00002cd0 _080508E8: .4byte gUnknown_2031DAC _080508EC: .4byte gUnknown_2031CCC -_080508F0: .4byte gUnknown_3003F64 +_080508F0: .4byte gReceivedRemoteLinkPlayers thumb_func_end sub_805080C thumb_func_start sub_80508F4 @@ -14476,7 +14476,7 @@ _08054120: movs r0, 0x15 bl IncrementGameStat _08054132: - ldr r0, _08054178 @ =gUnknown_3003F3C + ldr r0, _08054178 @ =gWirelessCommType ldrb r0, [r0] cmp r0, 0 beq _0805415A @@ -14508,7 +14508,7 @@ _0805415A: b _080541F2 .align 2, 0 _08054174: .4byte gUnknown_2031DAC -_08054178: .4byte gUnknown_3003F3C +_08054178: .4byte gWirelessCommType _0805417C: .4byte gLinkPlayers _08054180: .4byte gMain _08054184: @@ -14707,7 +14707,7 @@ _08054304: lsrs r0, 24 cmp r0, 0x1 bne _08054396 - ldr r0, _08054328 @ =gUnknown_3003F3C + ldr r0, _08054328 @ =gWirelessCommType ldrb r0, [r0] cmp r0, 0 beq _08054334 @@ -14719,7 +14719,7 @@ _08054304: bl sub_800AB9C b _08054338 .align 2, 0 -_08054328: .4byte gUnknown_3003F3C +_08054328: .4byte gWirelessCommType _0805432C: .4byte gMain _08054330: .4byte sub_804C718 _08054334: @@ -14737,7 +14737,7 @@ _08054340: .align 2, 0 _08054348: .4byte gMain _0805434C: - ldr r0, _08054374 @ =gUnknown_3003F3C + ldr r0, _08054374 @ =gWirelessCommType ldrb r0, [r0] cmp r0, 0 beq _08054384 @@ -14756,12 +14756,12 @@ _0805434C: bl SetMainCallback2 b _08054396 .align 2, 0 -_08054374: .4byte gUnknown_3003F3C +_08054374: .4byte gWirelessCommType _08054378: .4byte sub_804C718 _0805437C: .4byte gSoftResetDisabled _08054380: .4byte sub_80543C4 _08054384: - ldr r0, _080543B8 @ =gUnknown_3003F64 + ldr r0, _080543B8 @ =gReceivedRemoteLinkPlayers ldrb r1, [r0] cmp r1, 0 bne _08054396 @@ -14784,7 +14784,7 @@ _080543A4: pop {r0} bx r0 .align 2, 0 -_080543B8: .4byte gUnknown_3003F64 +_080543B8: .4byte gReceivedRemoteLinkPlayers _080543BC: .4byte gSoftResetDisabled _080543C0: .4byte sub_80543C4 thumb_func_end sub_8053E8C @@ -14815,7 +14815,7 @@ sub_80543C4: @ 80543C4 ldr r0, [r4] bl Free str r5, [r4] - ldr r0, _08054438 @ =gUnknown_3003F3C + ldr r0, _08054438 @ =gWirelessCommType ldrb r0, [r0] cmp r0, 0 beq _08054412 @@ -14835,7 +14835,7 @@ _0805441A: .align 2, 0 _08054430: .4byte gPaletteFade _08054434: .4byte gUnknown_2031DAC -_08054438: .4byte gUnknown_3003F3C +_08054438: .4byte gWirelessCommType _0805443C: .4byte gMain thumb_func_end sub_80543C4 diff --git a/asm/trainer_card.s b/asm/trainer_card.s index 7f330c8f9..e44503915 100644 --- a/asm/trainer_card.s +++ b/asm/trainer_card.s @@ -200,11 +200,11 @@ _08089194: bl sub_808AF74 b _08089214 _0808919A: - ldr r0, _080891D0 @ =gUnknown_3003F3C + ldr r0, _080891D0 @ =gWirelessCommType ldrb r0, [r0] cmp r0, 0x1 bne _080891B6 - ldr r0, _080891D4 @ =gUnknown_3003F64 + ldr r0, _080891D4 @ =gReceivedRemoteLinkPlayers ldrb r0, [r0] cmp r0, 0x1 bne _080891B6 @@ -224,8 +224,8 @@ _080891B6: bl SetVBlankCallback b _08089214 .align 2, 0 -_080891D0: .4byte gUnknown_3003F3C -_080891D4: .4byte gUnknown_3003F64 +_080891D0: .4byte gWirelessCommType +_080891D4: .4byte gReceivedRemoteLinkPlayers _080891D8: .4byte sub_8088FF0 _080891DC: bl UpdatePaletteFade @@ -266,7 +266,7 @@ _08089218: .align 2, 0 _08089220: .4byte gUnknown_20397A4 _08089224: - ldr r0, _08089270 @ =gUnknown_3003F64 + ldr r0, _08089270 @ =gReceivedRemoteLinkPlayers ldrb r5, [r0] cmp r5, 0 bne _0808924A @@ -301,7 +301,7 @@ _0808924A: strb r0, [r1] b _08089416 .align 2, 0 -_08089270: .4byte gUnknown_3003F64 +_08089270: .4byte gReceivedRemoteLinkPlayers _08089274: .4byte 0x00007bce _08089278: .4byte gMain _0808927C: .4byte gUnknown_20397A4 @@ -312,7 +312,7 @@ _08089280: bne _0808928A b _08089416 _0808928A: - ldr r0, _080892B0 @ =gUnknown_3003F64 + ldr r0, _080892B0 @ =gReceivedRemoteLinkPlayers ldrb r0, [r0] cmp r0, 0 beq _080892A4 @@ -331,7 +331,7 @@ _080892A4: str r1, [sp] b _080893C8 .align 2, 0 -_080892B0: .4byte gUnknown_3003F64 +_080892B0: .4byte gReceivedRemoteLinkPlayers _080892B4: .4byte gUnknown_20397A4 _080892B8: bl sub_808B1FC @@ -361,7 +361,7 @@ _080892E4: ands r0, r1 cmp r0, 0 beq _08089344 - ldr r0, _08089320 @ =gUnknown_3003F64 + ldr r0, _08089320 @ =gReceivedRemoteLinkPlayers ldrb r0, [r0] cmp r0, 0 beq _08089324 @@ -373,7 +373,7 @@ _080892E4: cmp r0, 0x1 beq _08089364 _08089308: - ldr r0, _08089320 @ =gUnknown_3003F64 + ldr r0, _08089320 @ =gReceivedRemoteLinkPlayers ldrb r0, [r0] cmp r0, 0 beq _08089324 @@ -384,7 +384,7 @@ _08089308: b _080893C8 .align 2, 0 _0808931C: .4byte gMain -_08089320: .4byte gUnknown_3003F64 +_08089320: .4byte gReceivedRemoteLinkPlayers _08089324: movs r0, 0xA bl sub_812B1F0 @@ -403,7 +403,7 @@ _08089344: ands r0, r1 cmp r0, 0 beq _08089416 - ldr r0, _0808936C @ =gUnknown_3003F64 + ldr r0, _0808936C @ =gReceivedRemoteLinkPlayers ldrb r0, [r0] cmp r0, 0 beq _08089370 @@ -420,7 +420,7 @@ _08089364: strb r0, [r1] b _08089416 .align 2, 0 -_0808936C: .4byte gUnknown_3003F64 +_0808936C: .4byte gReceivedRemoteLinkPlayers _08089370: movs r0, 0x1 negs r0, r0 @@ -454,7 +454,7 @@ _0808937A: _080893B0: .4byte gUnknown_8419D89 _080893B4: .4byte gUnknown_20397A4 _080893B8: - ldr r0, _080893DC @ =gUnknown_3003F64 + ldr r0, _080893DC @ =gReceivedRemoteLinkPlayers ldrb r1, [r0] cmp r1, 0 bne _08089416 @@ -472,7 +472,7 @@ _080893C8: strb r0, [r1] b _08089416 .align 2, 0 -_080893DC: .4byte gUnknown_3003F64 +_080893DC: .4byte gReceivedRemoteLinkPlayers _080893E0: .4byte gUnknown_20397A4 _080893E4: bl UpdatePaletteFade @@ -1418,7 +1418,7 @@ sub_8089B64: @ 8089B64 movs r0, 0x40 movs r1, 0xF0 bl SetGpuReg - ldr r0, _08089BC8 @ =gUnknown_3003F64 + ldr r0, _08089BC8 @ =gReceivedRemoteLinkPlayers ldrb r0, [r0] cmp r0, 0 beq _08089BCC @@ -1426,7 +1426,7 @@ sub_8089B64: @ 8089B64 bl EnableInterrupts b _08089BD2 .align 2, 0 -_08089BC8: .4byte gUnknown_3003F64 +_08089BC8: .4byte gReceivedRemoteLinkPlayers _08089BCC: movs r0, 0x3 bl EnableInterrupts @@ -4482,7 +4482,7 @@ _0808B4B2: ldrb r0, [r1, 0x4] adds r0, 0x1 strb r0, [r1, 0x4] - ldr r0, _0808B4D4 @ =gUnknown_3003F64 + ldr r0, _0808B4D4 @ =gReceivedRemoteLinkPlayers ldrb r0, [r0] cmp r0, 0 beq _0808B3DC @@ -4494,7 +4494,7 @@ _0808B4C4: bx r1 .align 2, 0 _0808B4D0: .4byte gUnknown_20397A4 -_0808B4D4: .4byte gUnknown_3003F64 +_0808B4D4: .4byte gReceivedRemoteLinkPlayers thumb_func_end sub_808B3C4 thumb_func_start sub_808B4D8 @@ -4946,7 +4946,7 @@ sub_808B838: @ 808B838 bl InUnionRoom cmp r0, 0x1 bne _0808B8A4 - ldr r0, _0808B898 @ =gUnknown_3003F64 + ldr r0, _0808B898 @ =gReceivedRemoteLinkPlayers ldrb r0, [r0] cmp r0, 0x1 bne _0808B8A4 @@ -4970,7 +4970,7 @@ _0808B888: .4byte gUnknown_83CD8F4 _0808B88C: .4byte gUnknown_20397A4 _0808B890: .4byte 0x0000045c _0808B894: .4byte 0x00000457 -_0808B898: .4byte gUnknown_3003F64 +_0808B898: .4byte gReceivedRemoteLinkPlayers _0808B89C: .4byte 0x000004ab _0808B8A0: .4byte gUnknown_83CD8EC _0808B8A4: diff --git a/asm/union_room_chat.s b/asm/union_room_chat.s index 4c7d6769f..c61c9a3d8 100644 --- a/asm/union_room_chat.s +++ b/asm/union_room_chat.s @@ -797,7 +797,7 @@ _08128A80: strh r0, [r1, 0x6] b _08128A94 _08128A86: - ldr r0, _08128A9C @ =gUnknown_3003F64 + ldr r0, _08128A9C @ =gReceivedRemoteLinkPlayers ldrb r0, [r0] cmp r0, 0 bne _08128A94 @@ -808,7 +808,7 @@ _08128A94: pop {r0} bx r0 .align 2, 0 -_08128A9C: .4byte gUnknown_3003F64 +_08128A9C: .4byte gReceivedRemoteLinkPlayers thumb_func_end sub_81288D4 thumb_func_start sub_8128AA0 @@ -948,7 +948,7 @@ _08128BC4: adds r0, 0x1 strh r0, [r1, 0xA] _08128BD0: - ldr r0, _08128BE4 @ =gUnknown_3003F64 + ldr r0, _08128BE4 @ =gReceivedRemoteLinkPlayers ldrb r0, [r0] cmp r0, 0 bne _08128BFC @@ -959,7 +959,7 @@ _08128BDA: strh r0, [r1, 0x6] b _08128BFC .align 2, 0 -_08128BE4: .4byte gUnknown_3003F64 +_08128BE4: .4byte gReceivedRemoteLinkPlayers _08128BE8: ldr r1, [r2] ldrh r0, [r1, 0xA] @@ -1035,7 +1035,7 @@ _08128C6E: adds r0, 0x1 strh r0, [r1, 0xA] _08128C78: - ldr r0, _08128C8C @ =gUnknown_3003F64 + ldr r0, _08128C8C @ =gReceivedRemoteLinkPlayers ldrb r0, [r0] cmp r0, 0 bne _08128CA2 @@ -1047,7 +1047,7 @@ _08128C82: strh r0, [r1, 0x6] b _08128CA2 .align 2, 0 -_08128C8C: .4byte gUnknown_3003F64 +_08128C8C: .4byte gReceivedRemoteLinkPlayers _08128C90: ldrh r0, [r1, 0xA] cmp r0, 0x95 @@ -1157,7 +1157,7 @@ _08128D64: adds r0, 0x1 strh r0, [r1, 0xA] _08128D70: - ldr r0, _08128D84 @ =gUnknown_3003F64 + ldr r0, _08128D84 @ =gReceivedRemoteLinkPlayers ldrb r0, [r0] cmp r0, 0 bne _08128D9C @@ -1168,7 +1168,7 @@ _08128D7A: strh r0, [r1, 0x6] b _08128D9C .align 2, 0 -_08128D84: .4byte gUnknown_3003F64 +_08128D84: .4byte gReceivedRemoteLinkPlayers _08128D88: ldr r1, [r2] ldrh r0, [r1, 0xA] @@ -1211,7 +1211,7 @@ _08128DC4: .4byte _08128E42 .4byte _08128E60 _08128DD8: - ldr r0, _08128DE8 @ =gUnknown_3003F64 + ldr r0, _08128DE8 @ =gReceivedRemoteLinkPlayers ldrb r0, [r0] cmp r0, 0 bne _08128DEC @@ -1219,7 +1219,7 @@ _08128DD8: bl sub_8129218 b _08128E70 .align 2, 0 -_08128DE8: .4byte gUnknown_3003F64 +_08128DE8: .4byte gReceivedRemoteLinkPlayers _08128DEC: ldr r0, [r4] movs r1, 0xC8 @@ -2740,7 +2740,7 @@ _08129924: .4byte _08129AD8 .4byte _08129A7C _08129944: - ldr r0, _08129978 @ =gUnknown_3003F64 + ldr r0, _08129978 @ =gReceivedRemoteLinkPlayers ldrb r0, [r0] cmp r0, 0 bne _0812994E @@ -2767,7 +2767,7 @@ _08129952: strb r2, [r0, 0xD] b _08129B08 .align 2, 0 -_08129978: .4byte gUnknown_3003F64 +_08129978: .4byte gReceivedRemoteLinkPlayers _0812997C: .4byte gUnknown_203B0E0 _08129980: bl GetBlockReceivedStatus diff --git a/asm/unk_8147500.s b/asm/unk_8147500.s index d9867d69f..53fc6a8a0 100644 --- a/asm/unk_8147500.s +++ b/asm/unk_8147500.s @@ -704,7 +704,7 @@ sub_8147A34: @ 8147A34 lsls r1, 3 ldr r0, _08147A88 @ =gTasks+0x8 adds r4, r1, r0 - ldr r0, _08147A8C @ =gUnknown_3003F64 + ldr r0, _08147A8C @ =gReceivedRemoteLinkPlayers ldrb r0, [r0] cmp r0, 0 beq _08147A98 @@ -737,7 +737,7 @@ _08147A5C: b _08147A9E .align 2, 0 _08147A88: .4byte gTasks+0x8 -_08147A8C: .4byte gUnknown_3003F64 +_08147A8C: .4byte gReceivedRemoteLinkPlayers _08147A90: .4byte gUnknown_3003ED0 _08147A94: .4byte 0x00007fff _08147A98: diff --git a/asm/unk_8147AA8.s b/asm/unk_8147AA8.s index 5b4fbd0ad..a7761148d 100644 --- a/asm/unk_8147AA8.s +++ b/asm/unk_8147AA8.s @@ -11,7 +11,7 @@ sub_8147AA8: @ 8147AA8 adds r6, r1, 0 lsls r0, 16 lsrs r7, r0, 16 - ldr r0, _08147B20 @ =gUnknown_3003F64 + ldr r0, _08147B20 @ =gReceivedRemoteLinkPlayers ldrb r0, [r0] cmp r0, 0 beq _08147B3C @@ -59,7 +59,7 @@ sub_8147AA8: @ 8147AA8 bl SetMainCallback2 b _08147B42 .align 2, 0 -_08147B20: .4byte gUnknown_3003F64 +_08147B20: .4byte gReceivedRemoteLinkPlayers _08147B24: .4byte gUnknown_203F3D4 _08147B28: .4byte 0x000083b0 _08147B2C: .4byte sub_8147DA0 @@ -2548,14 +2548,14 @@ _08148DFE: _08148E08: .4byte gPaletteFade _08148E0C: .4byte gUnknown_203F3D4 _08148E10: - ldr r0, _08148E1C @ =gUnknown_3003F64 + ldr r0, _08148E1C @ =gReceivedRemoteLinkPlayers ldrb r0, [r0] cmp r0, 0 bne _08148E20 movs r0, 0 b _08148E22 .align 2, 0 -_08148E1C: .4byte gUnknown_3003F64 +_08148E1C: .4byte gReceivedRemoteLinkPlayers _08148E20: movs r0, 0x1 _08148E22: diff --git a/asm/unk_814B6F0.s b/asm/unk_814B6F0.s index dc7d8d9f8..90882d61c 100644 --- a/asm/unk_814B6F0.s +++ b/asm/unk_814B6F0.s @@ -67,11 +67,11 @@ sub_814B754: @ 814B754 adds r4, r0, 0 movs r0, 0 mov r8, r0 - ldr r0, _0814B784 @ =gUnknown_3003F64 + ldr r0, _0814B784 @ =gReceivedRemoteLinkPlayers ldrb r0, [r0] cmp r0, 0 beq _0814B772 - ldr r0, _0814B788 @ =gUnknown_3003F3C + ldr r0, _0814B788 @ =gWirelessCommType ldrb r0, [r0] cmp r0, 0 bne _0814B790 @@ -84,8 +84,8 @@ _0814B772: strh r1, [r0, 0x12] b _0814B7DC .align 2, 0 -_0814B784: .4byte gUnknown_3003F64 -_0814B788: .4byte gUnknown_3003F3C +_0814B784: .4byte gReceivedRemoteLinkPlayers +_0814B788: .4byte gWirelessCommType _0814B78C: .4byte gUnknown_3005450 _0814B790: bl GetLinkPlayerCount diff --git a/asm/unk_814BB4C.s b/asm/unk_814BB4C.s index c3f054fc7..9c0e0503b 100644 --- a/asm/unk_814BB4C.s +++ b/asm/unk_814BB4C.s @@ -3326,7 +3326,7 @@ _0814D488: bl sub_800AAC0 b _0814D4B8 _0814D498: - ldr r0, _0814D4B4 @ =gUnknown_3003F64 + ldr r0, _0814D4B4 @ =gReceivedRemoteLinkPlayers ldrb r0, [r0] cmp r0, 0 bne _0814D4BE @@ -3339,7 +3339,7 @@ _0814D498: strb r4, [r5, 0xC] b _0814D4BE .align 2, 0 -_0814D4B4: .4byte gUnknown_3003F64 +_0814D4B4: .4byte gReceivedRemoteLinkPlayers _0814D4B8: ldrb r0, [r5, 0xC] adds r0, 0x1 diff --git a/asm/unk_81507FC.s b/asm/unk_81507FC.s index 141ff4d18..0118eff4b 100644 --- a/asm/unk_81507FC.s +++ b/asm/unk_81507FC.s @@ -14,7 +14,7 @@ sub_81507FC: @ 81507FC ldr r1, _081508A4 @ =gUnknown_3002044 movs r0, 0 str r0, [r1] - ldr r0, _081508A8 @ =gUnknown_3003F64 + ldr r0, _081508A8 @ =gReceivedRemoteLinkPlayers ldrb r0, [r0] cmp r0, 0 beq _081508CC @@ -81,7 +81,7 @@ sub_81507FC: @ 81507FC b _081508D2 .align 2, 0 _081508A4: .4byte gUnknown_3002044 -_081508A8: .4byte gUnknown_3003F64 +_081508A8: .4byte gReceivedRemoteLinkPlayers _081508AC: .4byte gUnknown_203F3E0 _081508B0: .4byte 0x00003330 _081508B4: .4byte 0x000032cc @@ -389,7 +389,7 @@ _08150B16: lsls r0, 24 cmp r0, 0 beq _08150BFC - ldr r0, _08150B38 @ =gUnknown_3003F64 + ldr r0, _08150B38 @ =gReceivedRemoteLinkPlayers ldrb r0, [r0] cmp r0, 0 beq _08150BDC @@ -399,7 +399,7 @@ _08150B16: bl sub_80FCD74 b _08150BDC .align 2, 0 -_08150B38: .4byte gUnknown_3003F64 +_08150B38: .4byte gReceivedRemoteLinkPlayers _08150B3C: ldr r0, _08150B88 @ =gUnknown_203F3E0 ldr r0, [r0] @@ -1633,7 +1633,7 @@ _081514CC: strb r0, [r1, 0x10] b _081514E4 _081514D6: - ldr r0, _081514EC @ =gUnknown_3003F64 + ldr r0, _081514EC @ =gReceivedRemoteLinkPlayers ldrb r0, [r0] cmp r0, 0 bne _081514E4 @@ -1644,7 +1644,7 @@ _081514E4: pop {r0} bx r0 .align 2, 0 -_081514EC: .4byte gUnknown_3003F64 +_081514EC: .4byte gReceivedRemoteLinkPlayers thumb_func_end sub_8151488 thumb_func_start sub_81514F0 @@ -1852,7 +1852,7 @@ _0815169C: bl sub_8154730 ldr r0, [r4] bl sub_81508EC - ldr r0, _081516D8 @ =gUnknown_3003F64 + ldr r0, _081516D8 @ =gReceivedRemoteLinkPlayers ldrb r0, [r0] cmp r0, 0 bne _081516C2 @@ -1871,7 +1871,7 @@ _081516CC: bx r0 .align 2, 0 _081516D4: .4byte sub_81516DC -_081516D8: .4byte gUnknown_3003F64 +_081516D8: .4byte gReceivedRemoteLinkPlayers thumb_func_end sub_815159C thumb_func_start sub_81516DC @@ -5743,7 +5743,7 @@ sub_81533C4: @ 81533C4 push {lr} lsls r0, 24 lsrs r2, r0, 24 - ldr r0, _081533E4 @ =gUnknown_3003F64 + ldr r0, _081533E4 @ =gReceivedRemoteLinkPlayers ldrb r0, [r0] cmp r0, 0 bne _081533F0 @@ -5756,7 +5756,7 @@ sub_81533C4: @ 81533C4 ldr r0, [r0] b _081533F8 .align 2, 0 -_081533E4: .4byte gUnknown_3003F64 +_081533E4: .4byte gReceivedRemoteLinkPlayers _081533E8: .4byte gUnknown_203F3E0 _081533EC: .4byte 0x000031a0 _081533F0: diff --git a/include/global.h b/include/global.h index 1d2152af7..c47bd2d15 100644 --- a/include/global.h +++ b/include/global.h @@ -224,6 +224,23 @@ struct BerryCrush #define PLAYER_NAME_LENGTH 8 +#define LINK_B_RECORDS_COUNT 5 + +struct LinkBattleRecord +{ + u8 name[PLAYER_NAME_LENGTH]; + u16 trainerId; + u16 wins; + u16 losses; + u16 draws; +}; + +struct LinkBattleRecords +{ + struct LinkBattleRecord entries[LINK_B_RECORDS_COUNT]; + u8 languages[LINK_B_RECORDS_COUNT]; +}; + struct UnknownSaveBlock2Struct { u8 field_0; @@ -244,6 +261,21 @@ struct UnknownSaveBlock2Struct u8 field_EB; }; // sizeof = 0xEC +struct UnkSaveBlock2Substruct_55C +{ + /* 0x000:0x55C */ u8 unk_00_0:1; + u8 unk_00_1:1; + /* 0x001:0x55D */ u8 unk_01; + /* 0x002:0x55E */ u8 unk_02[2]; + /* 0x004:0x560 */ u16 unk_04[2]; + /* 0x008:0x564 */ u16 unk_08[2]; + /* 0x00C:0x568 */ u16 unk_0C[2]; + /* 0x010:0x56C */ u8 unk_10; + /* 0x011:0x56D */ u8 unk_11[3]; + /* 0x014:0x570 */ u16 unk_14; + /* 0x016:0x572 */ u8 unk_16; +}; // size: 0x018 + struct SaveBlock2 { /*0x000*/ u8 playerName[PLAYER_NAME_LENGTH]; @@ -268,9 +300,11 @@ struct SaveBlock2 /*0x0A8*/ u32 field_A8; /*0x0AC*/ u8 filler_AC[0x3F4]; /*0x4A0*/ u32 unk_4A0[0x2F]; - /*0x55c*/ u8 filler_55C[0x53C]; - /*0xA98*/ u8 unk_A98[2][16]; - /*0xAB8*/ u8 filler_AB8[0x468]; + /*0x55c*/ struct UnkSaveBlock2Substruct_55C unk_55C; + /*0x574*/ u8 filler_574[0x524]; + /*0xA98*/ struct LinkBattleRecords linkBattleRecords; + /*0xAF0*/ struct BerryCrush berryCrush; + /*0xB00*/ u8 filler_B00[0x420]; /*0xF20*/ u32 encryptionKey; }; @@ -438,15 +472,6 @@ struct RecordMixing_UnknownStruct u16 unk74[0x2]; }; -struct LinkBattleRecord -{ - u8 name[8]; - u16 trainerId; - u16 wins; - u16 losses; - u16 draws; -}; - struct RecordMixingGiftData { u8 unk0; diff --git a/include/link.h b/include/link.h index ef8776c64..93ad9dfe1 100644 --- a/include/link.h +++ b/include/link.h @@ -146,10 +146,8 @@ extern u16 word_3002910[]; extern bool8 gReceivedRemoteLinkPlayers; extern bool8 gLinkVSyncDisabled; -extern u8 gUnknown_3003F64; extern u8 gUnknown_3003F84; extern u64 gUnknown_3003FB4; -extern u16 gLinkType; void Task_DestroySelf(u8); void OpenLink(void); diff --git a/src/main.c b/src/main.c index a625386b2..068cc8578 100644 --- a/src/main.c +++ b/src/main.c @@ -98,7 +98,7 @@ static IntrFunc * const sTimerIntrFunc = gIntrTable + 0x7; extern u16 gTrainerId; extern bool8 gUnknown_3005ECC; -extern bool8 gUnknown_3003F3C; +extern bool8 gWirelessCommType; extern bool8 gUnknown_3005E88; EWRAM_DATA void (**gFlashTimerIntrFunc)(void) = NULL; @@ -348,7 +348,7 @@ extern void ProcessDma3Requests(void); static void VBlankIntr(void) { - if (gUnknown_3003F3C) + if (gWirelessCommType) RFUVSync(); else if (!gLinkVSyncDisabled) LinkVSync(); diff --git a/src/mevent.c b/src/mevent.c index 7a7fcc399..a62286f21 100644 --- a/src/mevent.c +++ b/src/mevent.c @@ -211,7 +211,7 @@ u32 sub_8143770(u8 * r4, u16 * r5) } else if (IsLinkConnectionEstablished()) { - if (gUnknown_3003F64) + if (gReceivedRemoteLinkPlayers) { if (IsLinkPlayerDataExchangeComplete()) { @@ -230,7 +230,7 @@ u32 sub_8143770(u8 * r4, u16 * r5) *r4 = 5; break; case 5: - if (!gUnknown_3003F64) + if (!gReceivedRemoteLinkPlayers) { *r4 = 0; return 4; @@ -428,7 +428,7 @@ void sub_8143910(u8 taskId) data->t08 = 16; break; case 16: - if (!gUnknown_3003F64) + if (!gReceivedRemoteLinkPlayers) { if (data->t0E == 1) data->t08 = 17; diff --git a/src/quest_log.c b/src/quest_log.c index 8e890af21..4f462505a 100644 --- a/src/quest_log.c +++ b/src/quest_log.c @@ -165,7 +165,7 @@ u16 sub_81132A0(struct Var4038Struct *); void sub_81132E0(struct Var4038Struct *); bool16 sub_811337C(struct Var4038Struct *); void sub_8113390(struct Var4038Struct *); -void sub_8113414(u8 (*)[16], u8, u8); +void sub_8113414(struct LinkBattleRecords *, u8, u8); void sub_81134CC(struct Var4038Struct *); bool8 sub_8113508(struct Var4038Struct * ); void sub_8113524(struct Var4038Struct *); @@ -2693,13 +2693,13 @@ void sub_81133A4(void) r3 = 1; break; } - sub_8113414(gSaveBlock2Ptr->unk_A98, r3, r2); + sub_8113414(&gSaveBlock2Ptr->linkBattleRecords, r3, r2); } -void sub_8113414(u8 (* a0)[16], u8 a1, u8 a2) +void sub_8113414(struct LinkBattleRecords * a0, u8 a1, u8 a2) { u8 * str; - const u8 * src = a0[a1]; + const u8 * src = a0->entries[a1].name; if (src[0] == EOS) { switch (a2) diff --git a/sym_common.txt b/sym_common.txt index d71702d05..f63c4f277 100644 --- a/sym_common.txt +++ b/sym_common.txt @@ -60,7 +60,7 @@ gUnknown_3003F34: @ 3003F34 gUnknown_3003F38: @ 3003F38 .space 0x4 -gUnknown_3003F3C: @ 3003F3C +gWirelessCommType: @ 3003F3C .space 0x4 gUnknown_3003F40: @ 3003F40 @@ -72,7 +72,7 @@ gUnknown_3003F50: @ 3003F50 gUnknown_3003F60: @ 3003F60 .space 0x4 -gUnknown_3003F64: @ 3003F64 +gReceivedRemoteLinkPlayers: @ 3003F64 .space 0xC gUnknown_3003F70: @ 3003F70 -- cgit v1.2.3