REMOVE BASEROM

This commit is contained in:
golem galvanize 2018-01-20 22:41:02 -05:00
parent f22d295cfc
commit bce63b3694
23 changed files with 553 additions and 66 deletions

View File

@ -29,14 +29,41 @@ gMapPopUp_Palette_Table:: @ 857F384
.incbin "graphics/interface/map_popup/stone2.gbapal"
gUnknown_0857F444:: @ 857F444
<<<<<<< HEAD
.incbin "graphics/interface/map_popup/857F444.gbapal"
=======
.incbin "baserom.gba", 0x57f444, 0x20
gUnknown_0857F464:: @ 857F464
.incbin "baserom.gba", 0x57f464, 0xe0
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x01, 0x01, 0x01, 0x03, 0x01, 0x03, 0x01, 0x03, 0x00, 0x00, 0x00, 0x00, 0x04, 0x04, 0x04, 0x04, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x05, 0x05, 0x05, 0x05, 0x05, 0x02, 0x02, 0x00, 0x01, 0x00, 0x02, 0x00, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x05, 0x02, 0x00, 0x02, 0x00, 0x02, 0x02, 0x00, 0x00, 0x02, 0x05, 0x02, 0x02, 0x02, 0x02, 0x00, 0x02, 0x02, 0x01, 0x02, 0x02, 0x02, 0x00, 0x00, 0x02, 0x02, 0x05, 0x02, 0x05, 0x05, 0x05, 0x02, 0x02, 0x02, 0x01
gUnknown_0857F4CC:: @ 857F4CC
.string "PYRAMID FLOOR 1$"
gUnknown_0857F4DC:: @ 857F4DC
.string "PYRAMID FLOOR 2$"
gUnknown_0857F4EC:: @ 857F4EC
.string "PYRAMID FLOOR 3$"
gUnknown_0857F4FC:: @ 857F4FC
.string "PYRAMID FLOOR 4$"
gUnknown_0857F50C:: @ 857F50C
.string "PYRAMID FLOOR 5$"
gUnknown_0857F51C:: @ 857F51C
.string "PYRAMID FLOOR 6$"
gUnknown_0857F52C:: @ 857F52C
.string "PYRAMID FLOOR 7$"
gUnknown_0857F53C:: @ 857F53C
.string "PYRAMID$"
gUnknown_0857F544:: @ 857F544
.incbin "baserom.gba", 0x57f544, 0x20
>>>>>>> aca539d5dd97b55d149ca59c0561a721544d3298
.4byte gUnknown_0857F4CC
.4byte gUnknown_0857F4DC
.4byte gUnknown_0857F4EC
.4byte gUnknown_0857F4FC
.4byte gUnknown_0857F50C
.4byte gUnknown_0857F51C
.4byte gUnknown_0857F52C
.4byte gUnknown_0857F53C

View File

@ -8,8 +8,6 @@
.include "asm/macros/event.inc"
.include "constants/constants.inc"
.include "data/specials.inc"
.section .rodata
@ -65,56 +63,313 @@ gText_MysteryGiftStampCard::
.string "Thank you for using the STAMP CARD\nSystem.\pYou have {STR_VAR_1} more to collect to\nfill your STAMP CARD.$"
gUnknown_08674D3D:: @ 8674D3D
.incbin "baserom.gba", 0x00674d3d, 0xa1
setvaddress gUnknown_08674D3D
checkflag 0x1E4
vgoto_if 0, EventScript_674D4C
gotoram
EventScript_674D4C:: @ 8674D4C
specialvar 0x40DD, CalculatePlayerPartyCount
compare_var_to_value 0x40DD, 6
vgoto_if 1, EventScript_674D73
setflag 0x1E4
vcall EventScript_674D7E
lock
faceplayer
vmessage gText_MysteryGiftEgg
waitmessage
waitbuttonpress
playfanfare 370
waitfanfare
release
end
EventScript_674D73:: @ 8674D73
lock
faceplayer
vmessage gText_MysteryGiftEgg_2
waitmessage
waitbuttonpress
release
end
EventScript_674D7E:: @ 8674D7E
giveegg SPECIES_PICHU
setmonobedient 0x40DD
setmonmetlocation 0x40DD, 255
compare_var_to_value 0x40DD, 1
vgoto_if 1, EventScript_674DC0
compare_var_to_value 0x40DD, 2
vgoto_if 1, EventScript_674DC6
compare_var_to_value 0x40DD, 3
vgoto_if 1, EventScript_674DCC
compare_var_to_value 0x40DD, 4
vgoto_if 1, EventScript_674DD2
compare_var_to_value 0x40DD, 5
vgoto_if 1, EventScript_674DD8
return
EventScript_674DC0:: @ 8674DC0
setmonmove 1, 2, 57
return
EventScript_674DC6:: @ 8674DC6
setmonmove 2, 2, 57
return
EventScript_674DCC:: @ 8674DCC
setmonmove 3, 2, 57
return
EventScript_674DD2:: @ 8674DD2
setmonmove 4, 2, 57
return
EventScript_674DD8:: @ 8674DD8
setmonmove 5, 2, 57
return
gText_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.$"
gText_MysteryGiftEgg_2::
.string "Oh, your party appears to be full.\pPlease come see me after storing\na POKéMON on a PC.$"
gUnknown_08674EC1:: @ 8674EC1
.incbin "baserom.gba", 0x00674ec1, 0x29
setvaddress gUnknown_08674EC1
special sub_81652B4
compare_var_to_value 0x800D, 0
vgoto_if 1, EventScript_674EDF
lock
faceplayer
vmessage gText_MysteryGiftVisitingTrainer
waitmessage
waitbuttonpress
release
end
EventScript_674EDF:: @ 8674EDF
lock
faceplayer
vmessage gText_MysteryGiftVisitingTrainer_2
waitmessage
waitbuttonpress
release
end
gText_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.\pLet me give you a secret\npassword for a survey:\pGIVE ME\nAWESOME TRAINER\pWrite that in on a survey and send\nit to the WIRELESS\lCOMMUNICATION SYSTEM.$"
gText_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.$"
gUnknown_0867513C:: @ 867513C
.incbin "baserom.gba", 0x0067513c, 0x48
setvaddress gUnknown_0867513C
checkflag 0x1E4
vgoto_if 1, EventScript_675179
setorcopyvar 0x800D, 2
specialvar 0x8008, sub_813986C
compare_var_to_value 0x8008, 3
vgoto_if 0, EventScript_675179
lock
faceplayer
vmessage gText_MysteryGiftBattleCountCard_2
waitmessage
waitbuttonpress
giveitem_std 13
release
setflag 0x1E4
end
EventScript_675179:: @ 8675179
lock
faceplayer
vmessage gText_MysteryGiftBattleCountCard
waitmessage
waitbuttonpress
release
end
gText_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!$"
gText_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.$"
gUnknown_0867533C:: @ 867533C
.incbin "baserom.gba", 0x0067533c, 0x6d
setvaddress gUnknown_0867533C
lock
faceplayer
checkflag 0x13A
vgoto_if 1, EventScript_6753A0
checkflag 0x1AD
vgoto_if 1, EventScript_6753A0
checkitem 371, 1
compare_var_to_value 0x800D, 1
vgoto_if 1, EventScript_6753A0
vmessage gText_MysteryGiftTicket1
waitmessage
waitbuttonpress
checkitemspace 371, 1
compare_var_to_value 0x800D, 0
vgoto_if 1, EventScript_675397
giveitem_std 371
setflag 0x8D5
setflag 0x13A
vmessage gText_MysteryGiftTicket1_1
waitmessage
waitbuttonpress
release
end
EventScript_675397:: @ 8675397
vmessage gText_MysteryGiftTicket1_3
waitmessage
waitbuttonpress
release
end
EventScript_6753A0:: @ 86753A0
vmessage gText_MysteryGiftTicket1_2
waitmessage
waitbuttonpress
release
end
gText_MysteryGiftTicket1::
.string "Thank you for using the MYSTERY\nGIFT System.\pYou must be {PLAYER}.\nThere is a ticket here for you.$"
gText_MysteryGiftTicket1_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?$"
gText_MysteryGiftTicket1_2::
.string "Thank you for using the MYSTERY\nGIFT System.$"
gText_MysteryGiftTicket1_3::
.string "Oh, Im sorry, {PLAYER}.\nYour BAGs KEY ITEMS POCKET is full.\pPlease store something on your PC,\nthen come back for this.$"
gUnknown_0867550B:: @ 867550B
.incbin "baserom.gba", 0x0067550b, 0x76
setvaddress gUnknown_0867550B
lock
faceplayer
checkflag 0x13B
vgoto_if 1, EventScript_675578
checkflag 0x91
vgoto_if 1, EventScript_675578
checkflag 0x92
vgoto_if 1, EventScript_675578
checkitem 370, 1
compare_var_to_value 0x800D, 1
vgoto_if 1, EventScript_675578
vmessage gText_MysteryGiftTicket2
waitmessage
waitbuttonpress
checkitemspace 370, 1
compare_var_to_value 0x800D, 0
vgoto_if 1, EventScript_67556F
giveitem_std 370
setflag 0x8E0
setflag 0x13B
vmessage gText_MysteryGiftTicket2_1
waitmessage
waitbuttonpress
release
end
EventScript_67556F:: @ 867556F
vmessage gText_MysteryGiftTicket2_3
waitmessage
waitbuttonpress
release
end
EventScript_675578:: @ 8675578
vmessage gText_MysteryGiftTicket2_2
waitmessage
waitbuttonpress
release
end
gText_MysteryGiftTicket2::
.string "Thank you for using the MYSTERY\nGIFT System.\pYou must be {PLAYER}.\nThere is a ticket here for you.$"
gText_MysteryGiftTicket2_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?$"
gText_MysteryGiftTicket2_2::
.string "Thank you for using the MYSTERY\nGIFT System.$"
gText_MysteryGiftTicket2_3::
.string "Oh, Im sorry, {PLAYER}.\nYour BAGs KEY ITEMS POCKET is full.\pPlease store something on your PC,\nthen come back for this.$"
gUnknown_086756E3:: @ 86756E3
.incbin "baserom.gba", 0x006756e3, 0x25
setvaddress gUnknown_086756E3
addvar 0x403E, 1
compare_var_to_value 0x403E, 10
vgoto_if 0, EventScript_6756FD
setvar 0x403E, 0
EventScript_6756FD:: @ 86756FD
lock
faceplayer
vmessage gText_MysteryGiftAlteringCave
waitmessage
waitbuttonpress
release
end
gText_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.$"
gUnknown_086757F4:: @ 86757F4
.incbin "baserom.gba", 0x006757f4, 0x6d
setvaddress gUnknown_086757F4
lock
faceplayer
checkflag 0x13C
vgoto_if 1, EventScript_675858
checkflag 0x1CA
vgoto_if 1, EventScript_675858
checkitem 376, 1
compare_var_to_value 0x800D, 1
vgoto_if 1, EventScript_675858
vmessage gText_MysteryGiftOldSeaMap
waitmessage
waitbuttonpress
checkitemspace 376, 1
compare_var_to_value 0x800D, 0
vgoto_if 1, EventScript_67584F
giveitem_std 376
setflag 0x8D6
setflag 0x13C
vmessage gText_MysteryGiftOldSeaMap_1
waitmessage
waitbuttonpress
release
end
EventScript_67584F:: @ 867584F
vmessage gText_MysteryGiftOldSeaMap_3
waitmessage
waitbuttonpress
release
end
EventScript_675858:: @ 8675858
vmessage gText_MysteryGiftOldSeaMap_2
waitmessage
waitbuttonpress
release
end
gText_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.$"
gText_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?$"
gText_MysteryGiftOldSeaMap_2::
.string "Thank you for using the MYSTERY\nGIFT System.$"
gText_MysteryGiftOldSeaMap_3::
.string "Oh, Im sorry, {PLAYER}.\nYour BAGs KEY ITEMS POCKET is full.\pPlease store something on your PC,\nthen come back for this.$"
.align 2

View File

@ -4,24 +4,50 @@
.section .rodata
gUnknown_0860F074:: @ 860F074
.incbin "baserom.gba", 0x60f074, 0x20
.incbin "graphics/interface/860F074.gbapal"
gUnknown_0860F094:: @ 860F094
.incbin "baserom.gba", 0x60f094, 0x4
.byte 8, 4, 1, 0
gUnknown_0860F098:: @ 860F098
.incbin "baserom.gba", 0x60f098, 0x10
window_template 0, 2, 15, 27, 4, 15, 0x194
null_window_template
gUnknown_0860F0A8:: @ 860F0A8
.incbin "baserom.gba", 0x60f0a8, 0x8
window_template 0, 21, 9, 5, 4, 15, 0x125
@ These are not referenced in src/new_menu_helpers.c; rather, they are in src/menu.c. Regardless, they were plopped here.
gUnknown_0860F0B0:: @ 860F0B0
.incbin "baserom.gba", 0x60f0b0, 0x20
.incbin "graphics/interface/860F0B0.gbapal"
gUnknown_0860F0D0:: @ 860F0D0
.incbin "baserom.gba", 0x60f0d0, 0x4
.byte 15, 1, 2, 0
gUnknown_0860F0D4:: @ 860F0D4
.incbin "baserom.gba", 0x60f0d4, 0x68
.2byte 0xC0C, 0
.2byte 0xC20, 32
.2byte 0xC20, 100
.2byte 0xC20, 0x60
.2byte 0xC20, 0x80
.2byte 0xC20, 0x48
.2byte 0xC20, 0x44
.2byte 0xC20, 0x6C
.2byte 0xC20, 0x68
.2byte 0xC20, 0x88
.2byte 0xC20, 0xA4
.2byte 0xC20, 0x24
.2byte 0xC20, 0x28
.2byte 0xC20, 0x2C
.2byte 0xC20, 0x40
.2byte 0xC20, 0x84
.2byte 0xC20, 0x4C
.2byte 0xC20, 0xA0
.2byte 0xC20, 0x8C
.2byte 0xC2A, 0xA8
.2byte 0xC2A, 0xC0
.2byte 0xC2A, 0xC8
.2byte 0xC2A, 0xE0
.2byte 0xC2A, 0xE8
.2byte 0x808, 0xAE
.2byte 0x808, 0xAF

View File

@ -5,16 +5,26 @@
.align 2, 0
gUnknown_0855C604:: @ 855C604
.incbin "baserom.gba", 0x55c604, 0x60
.incbin "graphics/interface/855C604.gbapal"
.incbin "graphics/interface/855C624.bin"
gUnknown_0855C664:: @ 855C664
.incbin "baserom.gba", 0x55c664, 0x1c
.4byte gUnknown_085EE590
.4byte gUnknown_085EE59B
.4byte gUnknown_085EE5A8
.4byte gUnknown_085EE5B5
.4byte gUnknown_085EE5C8
.4byte gUnknown_085EE5BB
.4byte gUnknown_085EE5C1
gUnknown_0855C680:: @ 855C680
.incbin "baserom.gba", 0x55c680, 0x18
window_template 1, 2, 1, 0x1A, 2, 1, 2
window_template 0, 2, 5, 0x1A, 14, 1, 0x36
null_window_template
gUnknown_0855C698:: @ 855C698
.incbin "baserom.gba", 0x55c698, 0x8
.4byte 0x1E5
.4byte 0x11F4
gUnknown_0855C6A0:: @ 855C6A0
.incbin "baserom.gba", 0x55c6a0, 0x4
.2byte 0x7E51, 0

View File

@ -4,22 +4,49 @@
.section .rodata
.align 2, 0
gUnknown_08339D3C:: @ 8339D3C
.incbin "baserom.gba", 0x339d3c, 0x28
.4byte 0xFFFFFF, 0xFFFFFFFF, 0x4B0, 0xE10, 0x4B0, 0x960, 0x32, 0x50, 0xFFFFFFD4, 0x2C
gUnknown_08339D64:: @ 8339D64
.incbin "baserom.gba", 0x339d64, 0x48
.4byte 0, 0
.4byte 0, 1
.4byte 0, -1
.4byte -1, 0
.4byte 1, 0
.4byte -1, 1
.4byte 1, 1
.4byte -1, -1
.4byte 1, -1
gUnknown_08339DAC:: @ 8339DAC
.incbin "baserom.gba", 0x339dac, 0x10
.4byte 0x1F8
.4byte 0x11D1
.4byte 0x21C2
.4byte 0x31E3
gUnknown_08339DBC:: @ 8339DBC
.incbin "baserom.gba", 0x339dbc, 0xc
.4byte REG_WIN0H
.4byte 0xa2600001
.byte 1, 0
.align 2
gUnknown_08339DC8:: @ 8339DC8
.incbin "baserom.gba", 0x339dc8, 0xc
.4byte sub_80879D8
.4byte sub_80879F8
.4byte sub_80879FC
gUnknown_08339DD4:: @ 8339DD4
.incbin "baserom.gba", 0x339dd4, 0x2c
.4byte sub_8087A1C
.4byte sub_8087A20
.4byte sub_8087A20
.4byte sub_8087A20
.4byte sub_8087A20
.4byte sub_8087A1C
.4byte sub_8087A1C
.4byte sub_8087A88
.4byte sub_8087A88
.4byte sub_8087A88
.4byte sub_8087A88
gUnknown_08339E00:: @ 8339E00
.incbin "baserom.gba", 0x339e00, 0x8
.4byte sub_8087AA0
.4byte sub_8087AA8

View File

@ -5,16 +5,33 @@
.align 2, 0
gUnknown_0858CF8C:: @ 858CF8C
.incbin "baserom.gba", 0x58cf8c, 0x2
.byte 1, 0
gUnknown_0858CF8E:: @ 858CF8E
.incbin "baserom.gba", 0x58cf8e, 0x6
.byte 1, 2, 0
.byte 2, 0, 1
gUnknown_0858CF94:: @ 858CF94
.incbin "baserom.gba", 0x58cf94, 0x24
.byte 1, 0, 3
.byte 2, 3, 0
.byte 1, 2, 2
.byte 0, 3, 1
.byte 1, 3, 0
.byte 2, 2, 3
.byte 0, 1, 3
.byte 2, 0, 1
.byte 1, 2, 3
.byte 0, 2, 3
.byte 1, 0, 3
.byte 2, 1, 0
gUnknown_0858CFB8:: @ 858CFB8
.incbin "baserom.gba", 0x58cfb8, 0x6
.byte 0, 1
.byte 1, 2
.byte 2, 0
gUnknown_0858CFBE:: @ 858CFBE
.incbin "baserom.gba", 0x58cfbe, 0xe
.byte 0, 1, 2, 3
.byte 0, 2, 1, 3
.byte 0, 3, 2, 1
.byte 0, 0

View File

@ -745,19 +745,36 @@ gUnknown_0858BB80:: @ 858BB80
.4byte gText_Exit
gUnknown_0858BB9C:: @ 858BB9C
.incbin "baserom.gba", 0x58bb9c, 0x10
.4byte OldaleTown_PokemonCenter_2F_Text_277F1B
.4byte OldaleTown_PokemonCenter_2F_Text_277F5A
.4byte OldaleTown_PokemonCenter_2F_Text_277F96
.4byte OldaleTown_PokemonCenter_2F_Text_27889C
gUnknown_0858BBAC:: @ 858BBAC
.incbin "baserom.gba", 0x58bbac, 0x10
.4byte OldaleTown_PokemonCenter_2F_Text_27879F
.4byte OldaleTown_PokemonCenter_2F_Text_2787D5
.4byte OldaleTown_PokemonCenter_2F_Text_278831
.4byte OldaleTown_PokemonCenter_2F_Text_27889C
gUnknown_0858BBBC:: @ 858BBBC
.incbin "baserom.gba", 0x58bbbc, 0x10
.4byte OldaleTown_PokemonCenter_2F_Text_27879F
.4byte OldaleTown_PokemonCenter_2F_Text_2787D5
.4byte OldaleTown_PokemonCenter_2F_Text_2787FC
.4byte OldaleTown_PokemonCenter_2F_Text_27889C
gUnknown_0858BBCC:: @ 858BBCC
.incbin "baserom.gba", 0x58bbcc, 0x14
.4byte OldaleTown_PokemonCenter_2F_Text_27879F
.4byte OldaleTown_PokemonCenter_2F_Text_2787D5
.4byte OldaleTown_PokemonCenter_2F_Text_278831
.4byte OldaleTown_PokemonCenter_2F_Text_2787FC
.4byte OldaleTown_PokemonCenter_2F_Text_27889C
gUnknown_0858BBE0:: @ 858BBE0
.incbin "baserom.gba", 0x58bbe0, 0xc
.4byte OldaleTown_PokemonCenter_2F_Text_277F1B
.4byte OldaleTown_PokemonCenter_2F_Text_277F5A
.4byte OldaleTown_PokemonCenter_2F_Text_27889C
gUnknown_0858BBEC:: @ 858BBEC
.incbin "baserom.gba", 0x58bbec, 0xc
.4byte OldaleTown_PokemonCenter_2F_Text_27879F
.4byte OldaleTown_PokemonCenter_2F_Text_2787D5
.4byte OldaleTown_PokemonCenter_2F_Text_27889C

View File

@ -1648,15 +1648,15 @@ OldaleTown_PokemonCenter_2F_Text_277EF1: @ 8277EF1
.string "Which of our services do you wish\n"
.string "to use?$"
OldaleTown_PokemonCenter_2F_Text_277F1B: @ 8277F1B
OldaleTown_PokemonCenter_2F_Text_277F1B:: @ 8277F1B
.string "Trade POKéMON with another player\n"
.string "using a GBA Game Link cable.$"
OldaleTown_PokemonCenter_2F_Text_277F5A: @ 8277F5A
OldaleTown_PokemonCenter_2F_Text_277F5A:: @ 8277F5A
.string "You may battle another TRAINER\n"
.string "using a GBA Game Link cable.$"
OldaleTown_PokemonCenter_2F_Text_277F96: @ 8277F96
OldaleTown_PokemonCenter_2F_Text_277F96:: @ 8277F96
.string "You can use the RECORD CORNER with\n"
.string "others using a GBA Game Link cable.$"
@ -1826,19 +1826,19 @@ OldaleTown_PokemonCenter_2F_Text_27878B: @ 827878B
OldaleTown_PokemonCenter_2F_Text_278792: @ 8278792
.string "Please wait.$"
OldaleTown_PokemonCenter_2F_Text_27879F: @ 827879F
OldaleTown_PokemonCenter_2F_Text_27879F:: @ 827879F
.string "You may trade your POKéMON here\n"
.string "with another TRAINER.$"
OldaleTown_PokemonCenter_2F_Text_2787D5: @ 82787D5
OldaleTown_PokemonCenter_2F_Text_2787D5:: @ 82787D5
.string "You may battle with your friends\n"
.string "here.$"
OldaleTown_PokemonCenter_2F_Text_2787FC: @ 82787FC
OldaleTown_PokemonCenter_2F_Text_2787FC:: @ 82787FC
.string "Two to five TRAINERS can make\n"
.string "BERRY POWDER together.$"
OldaleTown_PokemonCenter_2F_Text_278831: @ 8278831
OldaleTown_PokemonCenter_2F_Text_278831:: @ 8278831
.string "The records of two to four players\n"
.string "can be mixed together.$"
@ -1846,7 +1846,7 @@ OldaleTown_PokemonCenter_2F_Text_27886B: @ 827886B
.string "A guide to the WIRELESS CLUBs\n"
.string "various services.$"
OldaleTown_PokemonCenter_2F_Text_27889C: @ 827889C
OldaleTown_PokemonCenter_2F_Text_27889C:: @ 827889C
.string "Cancels the selected MENU item.$"
OldaleTown_PokemonCenter_2F_Text_2788BC: @ 82788BC

View File

@ -1,6 +1,7 @@
#ifndef GUARD_SPECIALS_H
#define GUARD_SPECIALS_H
.macro def_special ptr
.global SPECIAL_\ptr
.set SPECIAL_\ptr, __special__
.set __special__, __special__ + 1
.4byte \ptr

View File

@ -4,13 +4,14 @@
.section .rodata
gUnknown_0862AD54:: @ 862AD54
.incbin "baserom.gba", 0x62ad54, 0x1dc
.incbin "graphics/battle_transitions/frontier_transition.4bpp.lz"
gUnknown_0862AF30:: @ 862AF30
.incbin "baserom.gba", 0x62af30, 0x1AC
.incbin "graphics/battle_transitions/frontier_transition.bin"
gUnknown_0862B0DC:: @ 862B0DC
.incbin "baserom.gba", 0x62b0dc, 0x460
.incbin "graphics/battle_transitions/frontier_transition_circles.4bpp.lz"
gUnknown_0862B53C:: @ 862B53C
.incbin "baserom.gba", 0x62b53c, 0x1E0
.incbin "graphics/battle_transitions/frontier_transition.gbapal"
.space 0x1c0

View File

@ -4,19 +4,19 @@
.section .rodata
gUnknown_085DFA60:: @ 85DFA60
.incbin "baserom.gba", 0x5dfa60, 0x20
.incbin "graphics/interface/85DFA60.bin"
gUnknown_085DFA80:: @ 85DFA80
.incbin "baserom.gba", 0x5dfa80, 0xe0
.incbin "graphics/interface/85DFA80.4bpp"
gUnknown_085DFB60:: @ 85DFB60
.incbin "baserom.gba", 0x5dfb60, 0xac
.incbin "graphics/interface/85DFB60.bin"
gUnknown_085DFC0C:: @ 85DFC0C
.incbin "baserom.gba", 0x5dfc0c, 0xa4
.incbin "graphics/interface/85DFC0C.bin"
gUnknown_085DFCB0:: @ 85DFCB0
.incbin "baserom.gba", 0x5dfcb0, 0x14
.4byte 22, 47, 33, 24, 23
gUnknown_085DFCC4:: @ 85DFCC4
.byte 0, 4, 3, 2, 1
@ -53,13 +53,58 @@ gUnknown_085DFD20:: @ 85DFD20
obj_pal gUsePokeblockUpDown_Pal, 0
gUnknown_085DFD28:: @ 85DFD28
.incbin "baserom.gba", 0x5dfd28, 0x34
.2byte 0x9c, 0x24
.2byte 0x75, 0x3b
.2byte 0x75, 0x76
.2byte 0xc5, 0x76
.2byte 0xc5, 0x3b
gUnknown_085DFD3C:: @ 85DFD3C
.2byte 0x4000
.2byte 0x8000
.2byte 0x400
.2byte 0
gUnknown_085DFD44:: @ 85DFD44
obj_image_anim_frame 0, 5
obj_image_anim_end
gUnknown_085DFD4C:: @ 85DFD4C
obj_image_anim_frame 8, 5
obj_image_anim_end
gUnknown_085DFD54:: @ 85DFD54
.4byte gUnknown_085DFD44
.4byte gUnknown_085DFD4C
gUnknown_085DFD5C:: @ 85DFD5C
.incbin "baserom.gba", 0x5dfd5c, 0x44
spr_template 0, 0, gUnknown_085DFD3C, gUnknown_085DFD54, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
gUnknown_085DFD74:: @ 85DFD74
.2byte 0x4000
.2byte 0xC000
.2byte 0x400
.2byte 0
gUnknown_085DFD7C:: @ 85DFD7C
obj_image_anim_frame 0, 5
obj_image_anim_end
gUnknown_085DFD84:: @ 85DFD84
obj_image_anim_frame 32, 5
obj_image_anim_end
gUnknown_085DFD8C:: @ 85DFD8C
obj_image_anim_frame 64, 5
obj_image_anim_end
gUnknown_085DFD94:: @ 85DFD94
.4byte gUnknown_085DFD7C
.4byte gUnknown_085DFD84
.4byte gUnknown_085DFD8C
gUnknown_085DFDA0:: @ 85DFDA0
.incbin "baserom.gba", 0x5dfda0, 0x18
spr_template 1, 1, gUnknown_085DFD74, gUnknown_085DFD94, NULL, gDummySpriteAffineAnimTable, sub_8168374
gUnknown_085DFDB8:: @ 85DFDB8
.4byte gUsePokeblockCondition_Pal

Binary file not shown.

Binary file not shown.

After

Width:  |  Height:  |  Size: 448 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 733 B

19
graphics/interface/855C604.pal Executable file
View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
0 0 0
255 255 255
255 180 82
197 123 0
255 139 131
255 49 24
74 74 74
213 213 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

View File

@ -0,0 +1 @@
<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><11><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><11><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>

Binary file not shown.

BIN
graphics/interface/85DFA80.png Executable file

Binary file not shown.

After

Width:  |  Height:  |  Size: 212 B

Binary file not shown.

Binary file not shown.

19
graphics/interface/860F074.pal Executable file
View File

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

19
graphics/interface/860F0B0.pal Executable file
View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
115 205 164
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
255 255 255
74 205 238
49 164 238
0 90 131
24 98 197
0 139 90

View File

@ -634,9 +634,12 @@ $(PSSGFXDIR)/whiscash.4bpp: $(PSSGFXDIR)/friends_frame2.4bpp $(PSSGFXDIR)/whisca
$(MAPOBJGFXDIR)/pics/effects/unknown_4F6D38/0.4bpp: %.4bpp: %.png
$(GFX) $< $@ -num_tiles 11
$(MENUGFXDIR)/selector_outline.4bpp: %.4bpp: %.png
$(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 \