diff options
| -rw-r--r-- | common.asm | 56 |
1 files changed, 30 insertions, 26 deletions
@@ -155,7 +155,7 @@ MapHeaderPointers: ; $01AE dw RedsHouse1F_h dw RedsHouse2F_h dw BluesHouse_h - dw OaksLab_h + dw OaksLab_h ;id=40 dw ViridianPokecenter_h dw ViridianMart_h dw School_h @@ -165,7 +165,7 @@ MapHeaderPointers: ; $01AE dw ViridianForestexit_h dw Route2House_h dw Route2Gate_h - dw ViridianForestEntrance_h + dw ViridianForestEntrance_h ;id=50 dw ViridianForest_h dw MuseumF1_h dw MuseumF2_h @@ -175,7 +175,7 @@ MapHeaderPointers: ; $01AE dw PewterHouse2_h dw PewterPokecenter_h dw MtMoon1_h - dw MtMoon2_h + dw MtMoon2_h ;id=60 dw MtMoon3_h dw CeruleanHouseTrashed_h dw CeruleanHouse2_h @@ -195,7 +195,7 @@ MapHeaderPointers: ; $01AE dw UndergroundPathEntranceRoute7_h dw $575d dw Route8Gate_h - dw UndergroundPathEntranceRoute8_h + dw UndergroundPathEntranceRoute8_h ;id=80 dw RockTunnelPokecenter_h dw RockTunnel1_h dw PowerPlant_h @@ -205,7 +205,7 @@ MapHeaderPointers: ; $01AE dw Route12Gate_h dw BillsHouse_h dw VermilionPokecenter_h - dw FanClub_h + dw FanClub_h ;id=90 dw VermilionMart_h dw VermilionGym_h dw VermilionHouse1_h @@ -215,7 +215,7 @@ MapHeaderPointers: ; $01AE dw SSAnne3_h dw SSAnne4_h dw SSAnne5_h - dw SSAnne6_h + dw SSAnne6_h ;id=100 dw SSAnne7_h dw SSAnne8_h dw SSAnne9_h @@ -225,7 +225,7 @@ MapHeaderPointers: ; $01AE dw Lance_h ; unused dw VictoryRoad1_h dw Lance_h ; unused - dw Lance_h ; unused + dw Lance_h ; unused ;id=110 dw Lance_h ; unused dw Lance_h ; unused dw Lance_h @@ -235,7 +235,7 @@ MapHeaderPointers: ; $01AE dw Lance_h ; unused dw HallofFameRoom_h dw UndergroundPathNS_h - dw Gary_h + dw Gary_h ;id=120 dw UndergroundPathWE_h dw CeladonMart1_h dw CeladonMart2_h @@ -245,7 +245,7 @@ MapHeaderPointers: ; $01AE dw CeladonMartElevator_h dw CeladonMansion1_h dw CeladonMansion2_h - dw CeladonMansion3_h + dw CeladonMansion3_h ;id=130 dw CeladonMansion4_h dw CeladonMansion5_h dw CeladonPokecenter_h @@ -255,7 +255,7 @@ MapHeaderPointers: ; $01AE dw CeladonPrizeRoom_h dw CeladonDiner_h dw CeladonHouse_h - dw CeladonHotel_h + dw CeladonHotel_h ;id=140 dw LavenderPokecenter_h dw PokemonTower1_h dw PokemonTower2_h @@ -265,7 +265,7 @@ MapHeaderPointers: ; $01AE dw PokemonTower6_h dw PokemonTower7_h dw LavenderHouse1_h - dw LavenderMart_h + dw LavenderMart_h ;id=150 dw LavenderHouse2_h dw FuchsiaMart_h dw FuchsiaHouse1_h @@ -275,7 +275,7 @@ MapHeaderPointers: ; $01AE dw FuchsiaGym_h dw FuchsiaMeetingRoom_h dw SeafoamIslands2_h - dw SeafoamIslands3_h + dw SeafoamIslands3_h ;id=160 dw SeafoamIslands4_h dw SeafoamIslands5_h dw VermilionHouse2_h @@ -285,7 +285,7 @@ MapHeaderPointers: ; $01AE dw Lab1_h dw Lab2_h dw Lab3_h - dw Lab4_h + dw Lab4_h ;id=170 dw CinnabarPokecenter_h dw CinnabarMart_h dw CinnabarMart_h ; unused @@ -295,7 +295,7 @@ MapHeaderPointers: ; $01AE dw FightingDojo_h dw SaffronGym_h dw SaffronHouse1_h - dw SaffronMart_h + dw SaffronMart_h ;id=180 dw SilphCo1_h dw SaffronPokecenter_h dw SaffronHouse2_h @@ -305,7 +305,7 @@ MapHeaderPointers: ; $01AE dw Route16GateUpstairs_h dw Route16House_h dw Route12House_h - dw Route18Gate_h + dw Route18Gate_h ;id=190 dw Route18GateHeader_h dw SeafoamIslands1_h dw Route22Gate_h @@ -315,7 +315,7 @@ MapHeaderPointers: ; $01AE dw DiglettsCave_h dw VictoryRoad3_h dw RocketHideout1_h - dw RocketHideout2_h + dw RocketHideout2_h ;200 dw RocketHideout3_h dw RocketHideout4_h dw RocketHideoutElevator_h @@ -325,7 +325,7 @@ MapHeaderPointers: ; $01AE dw SilphCo2_h dw SilphCo3_h dw SilphCo4_h - dw SilphCo5_h + dw SilphCo5_h ;210 dw SilphCo6_h dw SilphCo7_h dw SilphCo8_h @@ -335,7 +335,7 @@ MapHeaderPointers: ; $01AE dw SafariZoneEast_h dw SafariZoneNorth_h dw SafariZoneWest_h - dw SafariZoneCenter_h + dw SafariZoneCenter_h ;220 dw SafariZoneRestHouse1_h dw SafariZoneSecretHouse_h dw SafariZoneRestHouse2_h @@ -362,7 +362,7 @@ MapHeaderPointers: ; $01AE dw SilphCo2_h ; unused dw Lorelei_h dw Bruno_h - dw Agatha_h + dw Agatha_h ;247 INCBIN "baserom.gbc",$39E,$1627 - $39E @@ -44673,11 +44673,12 @@ UnnamedText_74ace: ; 0x74ace UnnamedText_74ad3: ; 0x74ad3 TX_FAR _UnnamedText_74ad3 - db $0B - db $50 + db $0b, $50 ; 0x74ad3 + 6 bytes -INCBIN "baserom.gbc",$74AD9,6 +UnnamedText_74ad8: + TX_FAR _UnnamedText_74ad8 + db $0d, $50 ViridianGymText12: ; 0x74adf TX_FAR _ViridianGymText12 @@ -44685,10 +44686,12 @@ ViridianGymText12: ; 0x74adf ; 0x74adf + 5 bytes ViridianGymText13: ; 0x74ae4 + TX_FAR _UnnamedText_74ae4 + db $0b -INCBIN "baserom.gbc",$74ae4, 5 - -INCBIN "baserom.gbc",$74ae9,$74aee - $74ae9 +UnnamedText_74ae9: + TX_FAR _UnnamedText_74ae9 + db $50 ViridianGymText14: ; 0x74aee TX_FAR _UnnamedText_74aee @@ -56874,7 +56877,7 @@ _UnnamedText_74ad3: ; 0x95ed5 db "the EARTHBADGE!@@" ; 0x95ed5 + 85 bytes -_UnnamedText_95f2b: ; 0x95f2b +_UnnamedText_74ad8: ; 0x95f2b db $0, "Having lost, I", $4f db "cannot face my", $55 db "underlings!", $55 @@ -56904,6 +56907,7 @@ _ViridianGymText12: ; 0x95fcc ; 0x95fcc + 182 bytes ReceivedTM27Text: ; 0x96082 +_UnnamedText_74ae4: db $0, $52, " received", $4f db "TM27!@@" ; 0x96082 + 19 bytes |